ver. 1.4.0 (by Stacho Pal)

diff --git a/pptpd-1.3.4-more-reodering-fixes.patch b/pptpd-1.3.4-more-reodering-fixes.patch
deleted file mode 100644 (file)
index 37a8aaa..0000000
--- a/pptpd-1.3.4-more-reodering-fixes.patch
+++ /dev/null
@@ -1,58 +0,0 @@
-diff -Naur pptpd-1.3.4.orig/ChangeLog pptpd-1.3.4/ChangeLog
---- pptpd-1.3.4.orig/ChangeLog 2007-04-16 04:32:45.000000000 +0400
-+++ pptpd-1.3.4/ChangeLog      2007-05-01 21:42:12.000000000 +0400
-@@ -1,3 +1,17 @@
-+Tue Apr 24 13:11:28 2007  Phil Oester  <kernel@linuxace.com>
-+
-+      * pptpgre.c (decaps_gre): further testing has revealed a couple
-+      more problems with the packet reordering/buffering code:
-+
-+      1) Some clients (notably the PPTP client) start their sequence
-+         numbers at 1 instead of 0 as the RFC mandates.  My previous fix
-+         caused problems with these clients.
-+
-+      2) Duplicate packets were causing corruption when they were placed
-+         on the queue but never used -or- when they were placed on the
-+         queue but already existed on the queue (i.e. they previously
-+         arrived out of order).
-+
- Mon Apr 16 10:32:40 2007  James Cameron  <quozl@us.netrek.org>
- 
-       * pptpd-1.3.4.tar.gz: released.
-diff -Naur pptpd-1.3.4.orig/NEWS pptpd-1.3.4/NEWS
---- pptpd-1.3.4.orig/NEWS      2007-04-16 04:32:20.000000000 +0400
-+++ pptpd-1.3.4/NEWS   2007-05-01 21:42:15.000000000 +0400
-@@ -1,3 +1,5 @@
-+- fix reordering some more [Oester]
-+
- 1.3.4: released 2007-04-16
- 
- - fix two release critical packet reordering bugs [Oester]
-diff -Naur pptpd-1.3.4.orig/pptpgre.c pptpd-1.3.4/pptpgre.c
---- pptpd-1.3.4.orig/pptpgre.c 2007-05-01 21:35:31.000000000 +0400
-+++ pptpd-1.3.4/pptpgre.c      2007-05-01 21:41:17.000000000 +0400
-@@ -403,8 +403,13 @@
-                       stats.rx_truncated++;
-                       return 0;
-               }
--              /* check for out-of-order sequence number */
--              if (seq == gre.seq_recv + 1) {
-+              /* check for out-of-order sequence number
-+               * N.B.: some client implementations violate RFC 2637
-+               * and start their sequence numbers at 1 instead of 0,
-+               * so we have to introduce a kludge to deal with it.
-+               * on wrap we may allow an out of order packet to pass
-+               */
-+              if (seq == gre.seq_recv + 1 || seq == 1) {
-                       if (pptpctrl_debug)
-                               syslog(LOG_DEBUG, "GRE: accepting packet #%d", 
-                                       seq);
-@@ -413,7 +418,7 @@
-                       stats.rx_accepted++;
-                       gre.seq_recv = seq;
-                       return cb(cl, buffer + ip_len + headersize, payload_len);
--              } else if (seq == gre.seq_recv) {
-+              } else if (!seq_greater(seq, gre.seq_recv)) {
-                       if (pptpctrl_debug)
-                               syslog(LOG_DEBUG,
-                                      "GRE: discarding duplicate or old packet #%d (expecting #%d)", 

diff --git a/pptpd.spec b/pptpd.spec
index eec05b6ea357081437f66996cc25d38725b62203..513e4a0a7032f809ffcad8ca71842365d0d7deed 100644 (file)
--- a/pptpd.spec
+++ b/pptpd.spec
@@ -1,20 +1,20 @@
 Summary:       Serves out PPTP connections
 Summary(pl.UTF-8):     Serwer połączeń PPTP
 Name:          pptpd
-Version:       1.3.4
-Release:       2
+Version:       1.4.0
+Release:       1
 License:       GPL
 Group:         Networking/Daemons
 Vendor:                Matthew Ramsay http://www.moretonbay.com/vpn/pptp.html
 Source0:       http://dl.sourceforge.net/poptop/%{name}-%{version}.tar.gz
-# Source0-md5: b38df9c431041922c997c1148bedf591
+# Source0-md5: 36f9f45c6ffa92bc3b6e24ae2d053505
 Source1:       %{name}.init
 Patch0:                %{name}-install.patch
 Patch1:                %{name}-lib64.patch
-Patch2:                %{name}-1.3.4-more-reodering-fixes.patch
 URL:           http://www.poptop.org/
 BuildRequires: autoconf
 BuildRequires: automake
+BuildRequires: ppp-plugin-devel
 BuildRequires: sed >= 4.0
 Requires(post,preun):  /sbin/chkconfig
 Requires:      ppp >= 2.4.3
@@ -46,7 +46,6 @@ a klientem podobnie do innych protokołów klient-serwer.
 %if "%{_lib}" == "lib64"
 %patch1 -p1
 %endif
-%patch2 -p1
 
 sed -i -e "s#/lib#/%{_lib}#g#" plugins/Makefile