rpms/pptp
7
0
Fork 0
Code Issues Pull Requests Releases Activity

Drop compiler optimization level to -O0

Browse Source 
- Drop compiler optimization level to -O0 as per upstream in attempt to
  resolve occasional segfault in pptpcm (#749455)
- Add patch to fix highly-parallel build (e.g. -j16)
This commit is contained in:
Paul Howarth 2011-11-11 12:49:09 +00:00
parent 7c161dbd73
commit d7cf92742a
2 changed files with 36 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
pptp-1.7.2-parallel-build.patch Normal file
View File

@ -0,0 +1,26 @@
Index: Makefile
===================================================================
RCS file: /cvsroot/pptpclient/pptp-linux/Makefile,v
retrieving revision 1.50
diff -u -r1.50 Makefile
--- Makefile 4 Jun 2010 01:04:12 -0000 1.50
+++ Makefile 11 Nov 2011 13:31:16 -0000
@@ -48,11 +48,13 @@
pptpsetup.8: pptpsetup
pod2man $? > $@
-config.h:
- echo "/* text added by Makefile target config.h */" > config.h
- echo "#define PPTP_LINUX_VERSION \"$(VERSION)$(RELEASE)\"" >> config.h
- echo "#define PPPD_BINARY \"$(PPPD)\"" >> config.h
- echo "#define IP_BINARY \"$(IP)\"" >> config.h
+config.h:
+ ( \
+ echo "/* text added by Makefile target config.h */"; \
+ echo "#define PPTP_LINUX_VERSION \"$(VERSION)$(RELEASE)\""; \
+ echo "#define PPPD_BINARY \"$(PPPD)\""; \
+ echo "#define IP_BINARY \"$(IP)\"" \
+ ) > config.h
vector_test: vector_test.o vector.o
$(CC) -o vector_test vector_test.o vector.o

12
pptp.spec
View File

@ -1,6 +1,6 @@
Name: pptp
Version: 1.7.2
Release: 13%{?dist}
Release: 13.1%{?dist}
Summary: Point-to-Point Tunneling Protocol (PPTP) Client
Group: Applications/Internet
License: GPLv2+
@ -19,6 +19,7 @@ Patch8: pptp-1.7.2-conn-free2.patch
Patch9: pptp-1.7.2-call-disconnect-notify.patch
Patch10: pptp-1.7.2-so_mark.patch
Patch11: pptp-1.7.2-nohostroute-option.patch
Patch12: pptp-1.7.2-parallel-build.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(id -nu)
Requires: ppp >= 2.4.2, /sbin/ip
%if 0%{?fedora} > 14
@ -53,6 +54,7 @@ tunnels.
# Fix Makefile dependencies to support parallel make (applied upstream)
%patch3 -p0 -b .makedeps
%patch12 -p0 -b .parallel
# Don't check for MPPE capability in kernel or pppd unless we're creating a
# tunnel that requires encryption (applied upstream)
@ -86,7 +88,8 @@ tunnels.
perl -pi -e 's/install -o root -m 555 pptp/install -m 755 pptp/;' Makefile
%build
make %{?_smp_mflags} CFLAGS="-Wall %{optflags}" IP=/sbin/ip
OUR_CFLAGS="$(echo X%{optflags} | sed -e 's/^X//; s/-O[0-9]* /-O0 /')"
make %{?_smp_mflags} CFLAGS="-Wall $OUR_CFLAGS" IP=/sbin/ip
%install
rm -rf %{buildroot}
@ -123,6 +126,11 @@ rm -rf %{buildroot}
%{_mandir}/man8/pptpsetup.8*
%changelog
* Fri Nov 11 2011 Paul Howarth <paul@city-fan.org> 1.7.2-13.1
- Drop compiler optimization level to -O0 as per upstream in attempt to
resolve occasional segfault in pptpcm (#749455)
- Add patch to fix highly-parallel build (e.g. -j16)
* Tue Nov 8 2011 Paul Howarth <paul@city-fan.org> 1.7.2-13
- Patch to fix broken Call-Disconnect-Notify code accepted upstream
- Add upstream patch to support setting SO_MARK for the PPTP TCP control