diff -u pptpd-1.3.0/debian/changelog pptpd-1.3.0/debian/changelog
--- pptpd-1.3.0/debian/changelog
+++ pptpd-1.3.0/debian/changelog
@@ -1,3 +1,11 @@
+pptpd (1.3.0-1ubuntu1+edgy1) edgy-proposed; urgency=low
+
+  * Fixes two serious packet reordering bugs (LP: #107350)
+    - Backported from 1.3.4
+  * Change maintainer to Ubuntu Core Developers
+
+ -- Scott Kitterman <scott@kitterman.com>  Tue, 17 Apr 2007 21:28:10 -0400
+
 pptpd (1.3.0-1ubuntu1) edgy; urgency=low
 
   * Remove stop script symlinks from rc0 and rc6.
diff -u pptpd-1.3.0/debian/control pptpd-1.3.0/debian/control
--- pptpd-1.3.0/debian/control
+++ pptpd-1.3.0/debian/control
@@ -1,7 +1,8 @@
 Source: pptpd
 Section: net
 Priority: optional
-Maintainer: Rene Mayrhofer <rmayr@debian.org>
+Maintainer: Ubuntu Core Developers <ubuntu-devel-discuss@lists.ubuntu.com>
+XSBC-Original-Maintainer: Rene Mayrhofer <rmayr@debian.org>
 Standards-Version: 3.6.1.1
 Build-Depends: libwrap0-dev, debhelper (>= 4.1.16)
 
only in patch2:
unchanged:
--- pptpd-1.3.0.orig/pptpgre.c
+++ pptpd-1.3.0/pptpgre.c
@@ -336,7 +336,7 @@
 	struct pptp_gre_header *header;
 	int status, ip_len = 0;
 
-	dequeue_gre(cb, fd);
+	dequeue_gre(cb, cl);
 	if ((status = read(fd, buffer, sizeof(buffer))) <= 0) {
 		syslog(LOG_ERR, "GRE: read(fd=%d,buffer=%lx,len=%d) from network failed: status = %d error = %s",
 		       fd, (unsigned long) buffer, sizeof(buffer), status, status ? strerror(errno) : "No error");
@@ -398,7 +398,7 @@
 			return 0;
 		}
 		/* check for out-of-order sequence number */
-		if (seq_greater(seq, gre.seq_recv)) {
+		if (seq == gre.seq_recv + 1) {
 			syslog(LOG_DEBUG, "GRE: accepting packet #%d", seq);
 			stats.rx_accepted++;
 			gre.seq_recv = seq;