rp-pppoe-libre-3.11-1: fixing libre patch

2 files changed, 18 insertions, 18 deletions

diff --git a/libre/rp-pppoe-libre/PKGBUILD b/libre/rp-pppoe-libre/PKGBUILD
index e319b4ce2..6f698db36 100755
--- a/libre/rp-pppoe-libre/PKGBUILD
+++ b/libre/rp-pppoe-libre/PKGBUILD
@@ -31,7 +31,7 @@ build() {
   cd "$srcdir/$_pkgname-$pkgver/src"
   
   ## Adding patch to remove unfree software recommendation (ServPoET)
-  patch -Np1 -i ../rp-pppoe-libre.patch
+  patch -Np1 -i "$srcdir/rp-pppoe-libre.patch"
 
   ./configure --prefix=/usr --enable-plugin
   make PLUGIN_DIR="/usr/lib/rp-pppoe" all rp-pppoe.so
diff --git a/libre/rp-pppoe-libre/rp-pppoe-libre.patch b/libre/rp-pppoe-libre/rp-pppoe-libre.patch
index 4f2302496..9cf16d7d7 100755..100644
--- a/libre/rp-pppoe-libre/rp-pppoe-libre.patch
+++ b/libre/rp-pppoe-libre/rp-pppoe-libre.patch
@@ -1,7 +1,7 @@
-diff -rauNp rp-pppoe-3.10/rp-pppoe.spec rp-pppoe-3.10-libre//rp-pppoe.spec
---- rp-pppoe-3.10/rp-pppoe.spec	2008-06-30 11:00:41.000000000 -0300
-+++ rp-pppoe-3.10-libre//rp-pppoe.spec	2011-06-05 21:03:06.000000000 -0300
-@@ -55,7 +55,7 @@ rm -rf $RPM_BUILD_ROOT
+diff -Nur rp-pppoe-3.11.orig/rp-pppoe.spec rp-pppoe-3.11/rp-pppoe.spec
+--- rp-pppoe-3.11.orig/rp-pppoe.spec	2012-08-17 15:31:25.000000000 -0300
++++ rp-pppoe-3.11/rp-pppoe.spec	2012-10-05 01:42:29.964508454 -0300
+@@ -55,7 +55,7 @@
  
  %files
  %defattr(-,root,root)
@@ -10,9 +10,9 @@ diff -rauNp rp-pppoe-3.10/rp-pppoe.spec rp-pppoe-3.10-libre//rp-pppoe.spec
  %config(noreplace) /etc/ppp/pppoe.conf
  %config(noreplace) /etc/ppp/pppoe-server-options
  %config(noreplace) /etc/ppp/firewall-masq
-diff -rauNp rp-pppoe-3.10/SERVPOET rp-pppoe-3.10-libre//SERVPOET
---- rp-pppoe-3.10/SERVPOET	2008-06-30 11:00:41.000000000 -0300
-+++ rp-pppoe-3.10-libre//SERVPOET	1969-12-31 21:00:00.000000000 -0300
+diff -Nur rp-pppoe-3.11.orig/SERVPOET /dev/null
+--- rp-pppoe-3.11.orig/SERVPOET	2012-08-17 15:31:25.000000000 -0300
++++ /dev/null	2012-10-05 01:27:08.580078512 -0300
 @@ -1,18 +0,0 @@
 -# LIC: GPL
 -
@@ -32,10 +32,10 @@ diff -rauNp rp-pppoe-3.10/SERVPOET rp-pppoe-3.10-libre//SERVPOET
 -
 ---
 -David F. Skoll <dfs@roaringpenguin.com>
-diff -rauNp rp-pppoe-3.10/src/Makefile.in rp-pppoe-3.10-libre//src/Makefile.in
---- rp-pppoe-3.10/src/Makefile.in	2008-06-30 11:00:42.000000000 -0300
-+++ rp-pppoe-3.10-libre//src/Makefile.in	2011-06-05 21:03:51.000000000 -0300
-@@ -44,9 +44,6 @@ PPPOE_RELAY=@PPPOE_RELAY@
+diff -Nur rp-pppoe-3.11.orig/src/Makefile.in rp-pppoe-3.11/src/Makefile.in
+--- rp-pppoe-3.11.orig/src/Makefile.in	2012-08-17 15:31:25.000000000 -0300
++++ rp-pppoe-3.11/src/Makefile.in	2012-10-05 01:46:13.121336619 -0300
+@@ -44,9 +44,6 @@
  PPPOE_PATH=$(sbindir)/pppoe
  PPPD_PATH=@PPPD@
  
@@ -45,7 +45,7 @@ diff -rauNp rp-pppoe-3.10/src/Makefile.in rp-pppoe-3.10-libre//src/Makefile.in
  # Kernel-mode plugin gets installed here.
  PLUGIN_DIR=/etc/ppp/plugins
  PLUGIN_PATH=$(PLUGIN_DIR)/rp-pppoe.so
-@@ -151,7 +148,6 @@ install: all
+@@ -152,7 +149,6 @@
  	$(install) -m 644 ../doc/HOW-TO-CONNECT $(DESTDIR)$(docdir)
  	$(install) -m 644 ../doc/LICENSE $(DESTDIR)$(docdir)
  	$(install) -m 644 ../README $(DESTDIR)$(docdir)
@@ -53,7 +53,7 @@ diff -rauNp rp-pppoe-3.10/src/Makefile.in rp-pppoe-3.10-libre//src/Makefile.in
  	$(install) -m 644 ../configs/pap-secrets $(DESTDIR)$(docdir)
  	-mkdir -p $(DESTDIR)$(mandir)/man8
  	for i in $(TARGETS) ; do \
-@@ -209,25 +205,15 @@ install: all
+@@ -210,25 +206,15 @@
  	@echo ""
  	@echo "Type 'pppoe-setup' to configure the software."
  
@@ -80,7 +80,7 @@ diff -rauNp rp-pppoe-3.10/src/Makefile.in rp-pppoe-3.10-libre//src/Makefile.in
  		cp ../$$i ../rp-pppoe-$(VERSION)$(BETA) || exit 1; \
  	done
  	mkdir ../rp-pppoe-$(VERSION)$(BETA)/gui
-@@ -282,10 +268,6 @@ rpms: tgz
+@@ -286,10 +272,6 @@
  		/usr/src/redhat/RPMS/i386/rp-pppoe-$(VERSION)-1.i386.rpm \
  		/usr/src/redhat/RPMS/i386/rp-pppoe-gui-$(VERSION)-1.i386.rpm
  
@@ -89,9 +89,9 @@ diff -rauNp rp-pppoe-3.10/src/Makefile.in rp-pppoe-3.10-libre//src/Makefile.in
 -	cd .. && rpm -ba servpoet.spec
 -
  clean:
- 	rm -f *.o pppoe pppoe-sniff pppoe-server core rp-pppoe.so plugin/*.o plugin/libplugin.a *~
+ 	rm -f *.o pppoe-relay pppoe pppoe-sniff pppoe-server core rp-pppoe.so plugin/*.o plugin/libplugin.a *~
  	test -f licensed-only/Makefile && $(MAKE) -C licensed-only clean || true
-@@ -300,15 +282,13 @@ distclean: clean
+@@ -304,15 +286,13 @@
  update-version:
  	sed -e 's/^Version: .*$$/Version: $(VERSION)/' ../rp-pppoe.spec > ../rp-pppoe.spec.new && mv ../rp-pppoe.spec.new ../rp-pppoe.spec
  	sed -e 's+^Source: .*$$+Source: http://www.roaringpenguin.com/pppoe/rp-pppoe-$(VERSION).tar.gz+' ../rp-pppoe.spec > ../rp-pppoe.spec.new && mv ../rp-pppoe.spec.new ../rp-pppoe.spec
@@ -104,7 +104,7 @@ diff -rauNp rp-pppoe-3.10/src/Makefile.in rp-pppoe-3.10-libre//src/Makefile.in
  
  licensed-only:
 -	$(MAKE) -C licensed-only all VERSION=$(VERSION) SERVPOET_VERSION=$(SERVPOET_VERSION)
-+	$(MAKE) -C licensed-only all VERSION=$(VERSION) 
++	$(MAKE) -C licensed-only all VERSION=$(VERSION)
  
  l2tp: libevent/libevent.a
  	$(MAKE) -C l2tp all