From 6b9c0558c2106c7b0aba05e8190b63f696f31eee Mon Sep 17 00:00:00 2001 From: André Fabian Silva Delgado Date: Thu, 14 Jan 2016 15:45:26 -0300 Subject: rp-pppoe-3.12-1.parabola1: updating version --- libre/rp-pppoe/PKGBUILD | 18 ++++++++++-------- libre/rp-pppoe/kmode.patch | 6 +++--- libre/rp-pppoe/libre.patch | 38 ++++++++------------------------------ 3 files changed, 21 insertions(+), 41 deletions(-) diff --git a/libre/rp-pppoe/PKGBUILD b/libre/rp-pppoe/PKGBUILD index 218591511..cc7936b8b 100644 --- a/libre/rp-pppoe/PKGBUILD +++ b/libre/rp-pppoe/PKGBUILD @@ -1,13 +1,13 @@ -# $Id: PKGBUILD 220603 2014-08-23 13:00:49Z heftig $ +# $Id: PKGBUILD 257681 2016-01-09 09:49:01Z arojas $ # Maintainer (Arch): Daniel Isenmann # Contributor (Arch): orelien # Maintainer: André Silva pkgname=rp-pppoe -pkgver=3.11 -pkgrel=7.parabola1 +pkgver=3.12 +pkgrel=1.parabola1 pkgdesc="Roaring Penguin's Point-to-Point Protocol over Ethernet client, without nonfree ServPoET recommendation" -arch=('i686' 'x86_64' 'mips64el') +arch=('i686' 'x86_64') url="http://www.roaringpenguin.com/pppoe/" license=('GPL') depends=('ppp=2.4.7' 'sh' 'net-tools') @@ -21,11 +21,13 @@ source=(http://www.roaringpenguin.com/files/download/rp-pppoe-$pkgver.tar.gz{,.s adsl.service kmode.patch libre.patch) +validpgpkeys=('FC2E9B645468698FD7B21655C1842E2A126F42E0') # Dianne Skoll prepare() { cd "$srcdir/$pkgname-$pkgver" - ## Adding patch to remove nonfree software recommendation (ServPoET) + ## remove nonfree software recommendation (ServPoET) + rm -v SERVPOET patch -Np1 -i "$srcdir/libre.patch" cd "$srcdir/$pkgname-$pkgver/src" @@ -45,8 +47,8 @@ package() { #install -Dm755 "$srcdir/adsl" "$pkgdir/etc/rc.d/adsl" install -Dm644 "$srcdir/adsl.service" "$pkgdir/usr/lib/systemd/system/adsl.service" } -md5sums=('13b5900c56bd602df6cc526e5e520722' +md5sums=('216eb52b69062b92a64ee37fd71f4b66' 'SKIP' '926b00aa2a0c0d3a21970acde9695e47' - 'd38a903a247d689ff0323d7b6caa1c6b' - '3c53d550ac408608abb0b6cd6b76b6c2') + '8df35e67558b6b4567d1ab24c9202898' + '40586f5bc2729d3a56b2fe1aa6bb683a') diff --git a/libre/rp-pppoe/kmode.patch b/libre/rp-pppoe/kmode.patch index 37eef58f7..4ad7440ab 100644 --- a/libre/rp-pppoe/kmode.patch +++ b/libre/rp-pppoe/kmode.patch @@ -1,7 +1,7 @@ diff -up rp-pppoe-3.11/src/configure.orig rp-pppoe-3.11/src/configure --- rp-pppoe-3.11/src/configure.orig 2012-08-17 12:31:25.000000000 -0600 +++ rp-pppoe-3.11/src/configure 2013-02-11 14:23:05.000000000 -0700 -@@ -3679,6 +3679,7 @@ do : +@@ -3709,6 +3709,7 @@ do : #include #include #include @@ -9,10 +9,10 @@ diff -up rp-pppoe-3.11/src/configure.orig rp-pppoe-3.11/src/configure " if test "x$ac_cv_header_linux_if_pppox_h" = x""yes; then : -@@ -4525,6 +4526,7 @@ else +@@ -4559,6 +4559,7 @@ else #include #include - #include + #include +#include #include int main() diff --git a/libre/rp-pppoe/libre.patch b/libre/rp-pppoe/libre.patch index 9cf16d7d7..1e305c861 100644 --- a/libre/rp-pppoe/libre.patch +++ b/libre/rp-pppoe/libre.patch @@ -10,31 +10,9 @@ diff -Nur rp-pppoe-3.11.orig/rp-pppoe.spec rp-pppoe-3.11/rp-pppoe.spec %config(noreplace) /etc/ppp/pppoe.conf %config(noreplace) /etc/ppp/pppoe-server-options %config(noreplace) /etc/ppp/firewall-masq -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 -- --ServPoET ---------- -- --ServPoET is a commercial version of the PPPoE server. While everything --you received in this package is licensed under the GNU General Public --License, ServPoET is not free software and is licensed under a traditional --commercial license. -- --ServPoET features RADIUS support, support for different realms, --real-time server status reporting and a friendly curses-based GUI for --administration. For information on ServPoET: -- --Contact Fine Point Technologies, Inc. (http://www.finepoint.com/) -- ---- --David F. Skoll -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 +diff -Nur rp-pppoe-3.12.orig/src/Makefile.in rp-pppoe-3.12/src/Makefile.in +--- rp-pppoe-3.12.orig/src/Makefile.in 2015-11-11 12:10:02.000000000 -0300 ++++ rp-pppoe-3.12/src/Makefile.in 2016-01-14 15:09:01.441919395 -0300 @@ -44,9 +44,6 @@ PPPOE_PATH=$(sbindir)/pppoe PPPD_PATH=@PPPD@ @@ -45,7 +23,7 @@ diff -Nur rp-pppoe-3.11.orig/src/Makefile.in rp-pppoe-3.11/src/Makefile.in # Kernel-mode plugin gets installed here. PLUGIN_DIR=/etc/ppp/plugins PLUGIN_PATH=$(PLUGIN_DIR)/rp-pppoe.so -@@ -152,7 +149,6 @@ +@@ -171,7 +168,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 +31,7 @@ diff -Nur rp-pppoe-3.11.orig/src/Makefile.in rp-pppoe-3.11/src/Makefile.in $(install) -m 644 ../configs/pap-secrets $(DESTDIR)$(docdir) -mkdir -p $(DESTDIR)$(mandir)/man8 for i in $(TARGETS) ; do \ -@@ -210,25 +206,15 @@ +@@ -229,25 +225,15 @@ @echo "" @echo "Type 'pppoe-setup' to configure the software." @@ -80,7 +58,7 @@ diff -Nur rp-pppoe-3.11.orig/src/Makefile.in rp-pppoe-3.11/src/Makefile.in cp ../$$i ../rp-pppoe-$(VERSION)$(BETA) || exit 1; \ done mkdir ../rp-pppoe-$(VERSION)$(BETA)/gui -@@ -286,10 +272,6 @@ +@@ -305,10 +291,6 @@ /usr/src/redhat/RPMS/i386/rp-pppoe-$(VERSION)-1.i386.rpm \ /usr/src/redhat/RPMS/i386/rp-pppoe-gui-$(VERSION)-1.i386.rpm @@ -91,14 +69,14 @@ diff -Nur rp-pppoe-3.11.orig/src/Makefile.in rp-pppoe-3.11/src/Makefile.in clean: 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 -@@ -304,15 +286,13 @@ +@@ -323,15 +305,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 - test -f ../servpoet.spec && sed -e 's/^Version: .*$$/Version: $(VERSION)/' ../servpoet.spec > ../servpoet.spec.new && mv ../servpoet.spec.new ../servpoet.spec || true - test -f ../servpoet.spec && sed -e 's+^Source: .*$$+Source: http://www.roaringpenguin.com/pppoe/servpoet-$(VERSION).tar.gz+' ../servpoet.spec > ../servpoet.spec.new && mv ../servpoet.spec.new ../servpoet.spec || true - # Convenience target for David! Don't try to use this one. + # Convenience target for Dianne! Don't try to use this one. km: ./configure --enable-plugin=/home/dfs/Archive/PPP/ppp-2.4.0.pppoe4-patched-dfs -- cgit v1.2.3-54-g00ecf