[pptp] New version
Jaroslav Škarvada
jskarvad at fedoraproject.org
Fri Oct 25 09:06:04 UTC 2013
commit 5361581b09cd70dea13285f077dc7c237d3c28e0
Author: Jaroslav Škarvada <jskarvad at redhat.com>
Date: Fri Oct 25 11:06:09 2013 +0200
New version
Resolves: rhbz#1022685
- Dropped compat, ip-path, pptpsetup, makedeps, parallel-build,
pptpsetup-encrypt, waitpid, conn-free, conn-free2,
call-disconnect-notify, nohostroute-option, fsf-update
sign-compare, unused, prototype, nested-externs, aliasing
options.pptp, so_mark, const, field-init patches (all upstreamed)
.gitignore | 1 +
pptp-1.7.2-aliasing.patch | 172 ------------------------
pptp-1.7.2-call-disconnect-notify.patch | 39 ------
pptp-1.7.2-compat.patch | 71 ----------
pptp-1.7.2-conn-free.patch | 90 -------------
pptp-1.7.2-conn-free2.patch | 83 ------------
pptp-1.7.2-const.patch | 52 --------
pptp-1.7.2-field-init.patch | 11 --
pptp-1.7.2-fsf-update.patch | 182 -------------------------
pptp-1.7.2-ip-path.patch | 186 --------------------------
pptp-1.7.2-makedeps.patch | 80 -----------
pptp-1.7.2-nested-externs.patch | 23 ----
pptp-1.7.2-nohostroute-option.patch | 150 ---------------------
pptp-1.7.2-options.pptp.patch | 35 -----
pptp-1.7.2-parallel-build.patch | 26 ----
pptp-1.7.2-pptpsetup-encrypt.patch | 22 ---
pptp-1.7.2-pptpsetup.patch | 23 ----
pptp-1.7.2-prototype.patch | 219 -------------------------------
pptp-1.7.2-sign-compare.patch | 150 ---------------------
pptp-1.7.2-so_mark.patch | 134 -------------------
pptp-1.7.2-unused.patch | 73 ----------
pptp-1.7.2-waitpid.patch | 16 ---
pptp.spec | 102 ++-------------
sources | 2 +-
24 files changed, 15 insertions(+), 1927 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 0f09618..0f9f76b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
pptp-1.7.2.tar.gz
+/pptp-1.8.0.tar.gz
diff --git a/pptp.spec b/pptp.spec
index dd301c1..e303361 100644
--- a/pptp.spec
+++ b/pptp.spec
@@ -1,34 +1,13 @@
Name: pptp
-Version: 1.7.2
-Release: 22%{?dist}
+Version: 1.8.0
+Release: 1%{?dist}
Summary: Point-to-Point Tunneling Protocol (PPTP) Client
Group: Applications/Internet
License: GPLv2+
URL: http://pptpclient.sourceforge.net/
Source0: http://downloads.sf.net/pptpclient/pptp-%{version}.tar.gz
Source1: pptp-tmpfs.conf
-Patch0: pptp-1.7.2-compat.patch
-Patch1: pptp-1.7.2-ip-path.patch
-Patch2: pptp-1.7.2-pptpsetup.patch
-Patch3: pptp-1.7.2-makedeps.patch
-Patch4: pptp-1.7.2-pptpsetup-encrypt.patch
-Patch5: pptp-1.7.2-pptpsetup-mppe.patch
-Patch6: pptp-1.7.2-waitpid.patch
-Patch7: pptp-1.7.2-conn-free.patch
-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
-Patch13: pptp-1.7.2-fsf-update.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
-Patch21: pptp-1.7.2-options.pptp.patch
+Patch0: pptp-1.7.2-pptpsetup-mppe.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(id -nu)
BuildRequires: /usr/bin/pod2man
Requires: ppp >= 2.4.2, /sbin/ip
@@ -53,73 +32,9 @@ tunnels.
%prep
%setup -q
-# Remove reference to stropts.h, not shipped in F9 onwards (applied upstream)
-%patch0 -p0 -b .compat
-
-# Make location of "ip" binary build-time configurable (applied upstream)
-%patch1 -p0 -b .ip-path
-
-# Retain permissions on /etc/ppp/chap-secrets (#492090, applied upstream)
-%patch2 -p0 -b .bz492090
-
-# 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)
-%patch4 -p0 -b .encrypt
-
# Don't check for MPPE capability in kernel and pppd at all because current
# Fedora releases and EL ≥ 5 include MPPE support out of the box (#502967)
-%patch5 -p1 -b .mppe
-
-# Fix waitpid usage (upstream patch)
-%patch6 -p0 -b .waitpid
-
-# Move free of connection struct out of main loop (upstream patch)
-%patch7 -p0 -b .conn-free
-
-# Avoid using connection struct after it is freed (upstream patch)
-%patch8 -p0 -b .conn-free2
-
-# Add call ID of outgoing call so that Call-Disconnect-Notify from peer causes
-# correct disconnection sequence (upstream patch)
-%patch9 -p1 -b .cdn
-
-# Add support for setting SO_MARK for the PPTP TCP control connection as well
-# as on the GRE packets (upstream patch)
-%patch10 -p1 -b .so_mark
-
-# Implement the --nohostroute option that routing.c talks about (upstream patch)
-%patch11 -p1 -b .nohostroute
-
-# Update the FSF address references and GPLv2 license text (upstream patch)
-%patch13 -p0 -b .fsf
-
-# Fix comparisons between signed and unsigned integers (upstream patch)
-%patch14 -p1 -b .sign-compare
-
-# Fix const usage (upstream patch)
-%patch15 -p1 -b .const
-
-# Add missing field initializers (upstream patch)
-%patch16 -p1 -b .field
-
-# Suppress warnings about possibly unused variables (upstream patch)
-%patch17 -p1 -b .unused
-
-# Fix declarations that are not prototypes (upstream patch)
-%patch18 -p1 -b .prototype
-
-# Fix warnings about nested externs (upstream patch)
-%patch19 -p1 -b .nested
-
-# Fix aliasing issues (upstream patch)
-%patch20 -p1 -b .alias
-
-# Additional commentary in options.pptp regarding encryption (upstream patch)
-%patch21 -b .options-comments
+%patch0 -p1 -b .mppe
# Pacify rpmlint
perl -pi -e 's/install -o root -m 555 pptp/install -m 755 pptp/;' Makefile
@@ -161,6 +76,15 @@ rm -rf %{buildroot}
%{_mandir}/man8/pptpsetup.8*
%changelog
+* Fri Oct 25 2013 Jaroslav Škarvada <jskarvad at redhat.com> - 1.8.0-1
+- New version
+ Resolves: rhbz#1022685
+- Dropped compat, ip-path, pptpsetup, makedeps, parallel-build,
+ pptpsetup-encrypt, waitpid, conn-free, conn-free2,
+ call-disconnect-notify, nohostroute-option, fsf-update
+ sign-compare, unused, prototype, nested-externs, aliasing
+ options.pptp, so_mark, const, field-init patches (all upstreamed)
+
* Sun Aug 04 2013 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.7.2-22
- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
diff --git a/sources b/sources
index 808f622..2ce9448 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-4c3d19286a37459a632c7128c92a9857 pptp-1.7.2.tar.gz
+4efce9f263e2c3f38d79d9df222476de pptp-1.8.0.tar.gz
More information about the scm-commits
mailing list