From 3d69a0a2fe7ecca5bd72d77a3f0e921eee0135117cbb930edfbf5e257acbb57d Mon Sep 17 00:00:00 2001
From: Marcus Meissner <meissner@suse.com>
Date: Thu, 25 Apr 2013 12:54:25 +0000
Subject: [PATCH] Accepting request 173008 from home:BinLi:branches:network

upgrade to 3.11

OBS-URL: https://build.opensuse.org/request/show/173008
OBS-URL: https://build.opensuse.org/package/show/network/rp-pppoe?expand=0&rev=7
---
 release-buildsystem.diff |  6 ++++--
 resolve-conf.diff        |  4 ++--
 rp-pppoe-3.10.tar.bz2    |  3 ---
 rp-pppoe-3.11.tar.bz2    |  3 +++
 rp-pppoe.changes         | 18 ++++++++++++++++++
 rp-pppoe.spec            |  7 +++----
 6 files changed, 30 insertions(+), 11 deletions(-)
 delete mode 100644 rp-pppoe-3.10.tar.bz2
 create mode 100644 rp-pppoe-3.11.tar.bz2

diff --git a/release-buildsystem.diff b/release-buildsystem.diff
index 071b5ec..6716a62 100644
--- a/release-buildsystem.diff
+++ b/release-buildsystem.diff
@@ -1,6 +1,8 @@
---- src/Makefile.in
+Index: src/Makefile.in
+===================================================================
+--- src/Makefile.in.orig
 +++ src/Makefile.in
-@@ -194,11 +194,9 @@
+@@ -195,11 +195,9 @@ install: all
  		mkdir -p $(DESTDIR)/etc/rc.d/init.d ;\
  		$(install) -m 755 ../scripts/pppoe-init-turbolinux $(DESTDIR)/etc/rc.d/init.d/pppoe ; \
  	fi
diff --git a/resolve-conf.diff b/resolve-conf.diff
index 2bcba66..48949a4 100644
--- a/resolve-conf.diff
+++ b/resolve-conf.diff
@@ -2,8 +2,8 @@ Index: scripts/pppoe-connect.in
 ===================================================================
 --- scripts/pppoe-connect.in.orig
 +++ scripts/pppoe-connect.in
-@@ -214,11 +214,12 @@ fi
- PPP_STD_OPTIONS="$PLUGIN_OPTS noipdefault noauth default-asyncmap $DEFAULTROUTE hide-password nodetach $PEERDNS mtu 1492 mru 1492 noaccomp nodeflate nopcomp novj novjccomp user $USER lcp-echo-interval $LCP_INTERVAL lcp-echo-failure $LCP_FAILURE $PPPD_EXTRA"
+@@ -232,11 +232,12 @@ fi
+ PPP_STD_OPTIONS="$PLUGIN_OPTS $DOUNIT noipdefault noauth default-asyncmap $DEFAULTROUTE hide-password nodetach $PEERDNS mtu $MTU mru $MRU noaccomp nodeflate nopcomp novj novjccomp user $USER lcp-echo-interval $LCP_INTERVAL lcp-echo-failure $LCP_FAILURE $PPPD_EXTRA"
  
  # Jigger DNS if required...
 -if test "$DNSTYPE" = "SERVER" ; then
diff --git a/rp-pppoe-3.10.tar.bz2 b/rp-pppoe-3.10.tar.bz2
deleted file mode 100644
index 87dfe44..0000000
--- a/rp-pppoe-3.10.tar.bz2
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:7256f4a68dfc0aafe637dcf515c51b9ccc53cee264f04931113ea460fd409299
-size 185624
diff --git a/rp-pppoe-3.11.tar.bz2 b/rp-pppoe-3.11.tar.bz2
new file mode 100644
index 0000000..efbddc0
--- /dev/null
+++ b/rp-pppoe-3.11.tar.bz2
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:5abf7dc6b22a81e31bd0120faa784c21fa43397a80d40b6cac1a39058e84d138
+size 191887
diff --git a/rp-pppoe.changes b/rp-pppoe.changes
index 47907fd..1156b27 100644
--- a/rp-pppoe.changes
+++ b/rp-pppoe.changes
@@ -1,3 +1,21 @@
+-------------------------------------------------------------------
+Tue Apr 23 10:01:52 UTC 2013 - binli@opensuse.org
+
+- update to version 3.11
+  * Make the rp-pppoe.so plugin avoid calling exit() if
+    the "persist" pppd option was given.
+  * Get rid of hard-coded nobsdcomp, nodeflate, novj and novjccomp
+    options in pppoe-server.
+  * Handle UNIT=xxx directive in pppoe-connect.
+  * Add "-i" flag to pppoe-server to ignore PADIs if there are
+    no free sessions.
+  * Add "-X <pidfile>" option to pppoe-server.
+  * In plugin, don't set devnam if it's already set.
+  * Eliminate race condition in signal handling.
+  * pppoe-server: Add -q and -Q options to allow specification of
+    path to pppd and pppoe programs respectively.
+  * Add a few more sanity checks to pppoe-server packet handling.
+
 -------------------------------------------------------------------
 Tue Jan 24 00:48:39 UTC 2012 - crrodriguez@opensuse.org
 
diff --git a/rp-pppoe.spec b/rp-pppoe.spec
index 31d73ca..a752926 100644
--- a/rp-pppoe.spec
+++ b/rp-pppoe.spec
@@ -1,7 +1,7 @@
 #
 # spec file for package rp-pppoe
 #
-# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -15,7 +15,6 @@
 # Please submit bugfixes or comments via http://bugs.opensuse.org/
 #
 
-# norootforbuild
 
 %if %{?rel:0}%{!?rel:1}
 %define rel 1
@@ -23,10 +22,10 @@
 
 Name:           rp-pppoe
 Summary:        A PPP Over Ethernet Redirector for PPPD
-Version:        3.10
-Release:        28
 License:        GPL-2.0+
 Group:          Productivity/Networking/PPP
+Version:        3.11
+Release:        0
 Source:         http://www.roaringpenguin.com/pppoe/rp-pppoe-%{version}.tar.bz2
 Url:            http://www.roaringpenguin.com/pppoe
 #Patch0:         init-suse.diff