diff --git a/pptp-1.8.0-call-init-fix.patch b/pptp-1.8.0-call-init-fix.patch new file mode 100644 index 0000000..9dbdb26 --- /dev/null +++ b/pptp-1.8.0-call-init-fix.patch @@ -0,0 +1,12 @@ +diff --git a/pptp_ctrl.c b/pptp_ctrl.c +index 9864374..1948bce 100644 +--- a/pptp_ctrl.c ++++ b/pptp_ctrl.c +@@ -351,6 +351,7 @@ PPTP_CALL * pptp_call_open(PPTP_CONN * conn, pptp_call_cb callback, + /* allocate structure. */ + if ((call = malloc(sizeof(*call))) == NULL) return NULL; + /* Initialize call structure */ ++ memset(call, 0, sizeof(*call)); + call->call_type = PPTP_CALL_PNS; + call->state.pns = PNS_IDLE; + call->call_id = (u_int16_t) i; diff --git a/pptp.spec b/pptp.spec index 3afcbdf..3e48b94 100644 --- a/pptp.spec +++ b/pptp.spec @@ -1,6 +1,6 @@ Name: pptp Version: 1.8.0 -Release: 4%{?dist} +Release: 5%{?dist} Summary: Point-to-Point Tunneling Protocol (PPTP) Client Group: Applications/Internet License: GPLv2+ @@ -8,6 +8,8 @@ URL: http://pptpclient.sourceforge.net/ Source0: http://downloads.sf.net/pptpclient/pptp-%{version}.tar.gz Source1: pptp-tmpfs.conf Patch0: pptp-1.7.2-pptpsetup-mppe.patch +# patch sent upstream +Patch1: pptp-1.8.0-call-init-fix.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(id -nu) BuildRequires: /usr/bin/pod2man Requires: ppp >= 2.4.2, /sbin/ip @@ -36,6 +38,8 @@ tunnels. # Fedora releases and EL ≥ 5 include MPPE support out of the box (#502967) %patch0 -p1 -b .mppe +%patch1 -p1 -b .call-init-fix + # Pacify rpmlint perl -pi -e 's/install -o root -m 555 pptp/install -m 755 pptp/;' Makefile @@ -76,6 +80,10 @@ rm -rf %{buildroot} %{_mandir}/man8/pptpsetup.8* %changelog +* Tue Jan 20 2015 Jaroslav Škarvada - 1.8.0-5 +- Fixed initialization of the call structure + Resolves: rhbz#1183627 + * Sun Aug 17 2014 Fedora Release Engineering - 1.8.0-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild