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

Build with warning-fix patches to address occasional segfaults (#749455)

Browse Source
This commit is contained in:
Paul Howarth 2012-01-04 14:07:52 +00:00
parent a322d1799b
commit 75cbf11d2d
2 changed files with 27 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pptp-1.7.2-field-init.patch
View File

@ -5,7 +5,7 @@
{
struct pptp_start_ctrl_conn fixed_packet = {
- {0}, /* we'll set the header later */
+ {0, 0, 0, 0 , 0}, /* we'll set the header later */
+ {0, 0, 0, 0, 0}, /* we'll set the header later */
hton16(PPTP_VERSION), 0, 0,
hton32(PPTP_FRAME_ASYNC), hton32(PPTP_BEARER_ANALOG),
hton16(0) /* max channels */,

48
pptp.spec
View File

@ -1,6 +1,6 @@
Name: pptp
Version: 1.7.2
Release: 13.2%{?dist}
Release: 14%{?dist}
Summary: Point-to-Point Tunneling Protocol (PPTP) Client
Group: Applications/Internet
License: GPLv2+
@ -21,13 +21,13 @@ Patch10: pptp-1.7.2-so_mark.patch
Patch11: pptp-1.7.2-nohostroute-option.patch
Patch12: pptp-1.7.2-parallel-build.patch
Patch13: pptp-1.7.2-fsf-update.patch
Patch101: pptp-1.7.2-sign-compare.patch
Patch102: pptp-1.7.2-const.patch
Patch103: pptp-1.7.2-field-init.patch
Patch104: pptp-1.7.2-unused.patch
Patch105: pptp-1.7.2-prototype.patch
Patch106: pptp-1.7.2-nested-externs.patch
Patch107: pptp-1.7.2-aliasing.patch
Patch14: pptp-1.7.2-sign-compare.patch
Patch15: pptp-1.7.2-const.patch
Patch16: pptp-1.7.2-field-init.patch
Patch17: pptp-1.7.2-unused.patch
Patch18: pptp-1.7.2-prototype.patch
Patch19: pptp-1.7.2-nested-externs.patch
Patch20: pptp-1.7.2-aliasing.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(id -nu)
Requires: ppp >= 2.4.2, /sbin/ip
%if 0%{?fedora} > 14
@ -95,26 +95,26 @@ tunnels.
# Update the FSF address references and GPLv2 license text (upstream patch)
%patch13 -p0 -b .fsf
# Fix comparisons between signed and unsigned integers
%patch101 -p1 -b .sign-compare
# Fix comparisons between signed and unsigned integers (upstream patch)
%patch14 -p1 -b .sign-compare
# Fix const usage
%patch102 -p1 -b .const
# Fix const usage (upstream patch)
%patch15 -p1 -b .const
# Add missing field initializers
%patch103 -p1 -b .field
# Add missing field initializers (upstream patch)
%patch16 -p1 -b .field
# Suppress warnings about possibly unused variables
%patch104 -p1 -b .unused
# Suppress warnings about possibly unused variables (upstream patch)
%patch17 -p1 -b .unused
# Fix declarations that are not prototypes
%patch105 -p1 -b .prototype
# Fix declarations that are not prototypes (upstream patch)
%patch18 -p1 -b .prototype
# Fix warnings about nested externs
%patch106 -p1 -b .nested
# Fix warnings about nested externs (upstream patch)
%patch19 -p1 -b .nested
# Fix aliasing issues
%patch107 -p1 -b .alias
# Fix aliasing issues (upstream patch)
%patch20 -p1 -b .alias
# Pacify rpmlint
perl -pi -e 's/install -o root -m 555 pptp/install -m 755 pptp/;' Makefile
@ -158,6 +158,10 @@ rm -rf %{buildroot}
%{_mandir}/man8/pptpsetup.8*
%changelog
* Wed Jan 4 2012 Paul Howarth <paul@city-fan.org> 1.7.2-14
- Build with warning-fix patches to address occasional segfaults (#749455)
- Patches have all now been merged upstream
* Wed Nov 30 2011 Paul Howarth <paul@city-fan.org> 1.7.2-13.2
- Add patch to fix highly-parallel build (e.g. -j16)
- Add additional compiler warning flags to highlight questionable code