From 75cbf11d2d08db52d22afc2c5c7d0c62996e6a47 Mon Sep 17 00:00:00 2001
From: Paul Howarth <paul@city-fan.org>
Date: Wed, 4 Jan 2012 14:07:52 +0000
Subject: [PATCH] Build with warning-fix patches to address occasional
 segfaults (#749455)

---
 pptp-1.7.2-field-init.patch |  2 +-
 pptp.spec                   | 48 ++++++++++++++++++++-----------------
 2 files changed, 27 insertions(+), 23 deletions(-)

diff --git a/pptp-1.7.2-field-init.patch b/pptp-1.7.2-field-init.patch
index 8164965..57d81d0 100644
--- a/pptp-1.7.2-field-init.patch
+++ b/pptp-1.7.2-field-init.patch
@@ -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 */,
diff --git a/pptp.spec b/pptp.spec
index da1fd67..3eb1d12 100644
--- a/pptp.spec
+++ b/pptp.spec
@@ -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