From cdcc3c24a23d86989434cad5ec390c4aea06b825 Mon Sep 17 00:00:00 2001 From: bill-auger Date: Fri, 4 Sep 2020 05:30:05 -0400 Subject: [rp-pppoe]: upgrade to v3.14 --- libre/rp-pppoe/PKGBUILD | 9 ++-- libre/rp-pppoe/kmode.patch | 19 -------- libre/rp-pppoe/libre.patch | 70 +++++++++++++++-------------- libre/rp-pppoe/rp-pppoe-linux-headers.patch | 28 ------------ 4 files changed, 41 insertions(+), 85 deletions(-) delete mode 100644 libre/rp-pppoe/kmode.patch delete mode 100644 libre/rp-pppoe/rp-pppoe-linux-headers.patch diff --git a/libre/rp-pppoe/PKGBUILD b/libre/rp-pppoe/PKGBUILD index 289e9c761..6690239af 100644 --- a/libre/rp-pppoe/PKGBUILD +++ b/libre/rp-pppoe/PKGBUILD @@ -8,7 +8,7 @@ # - remove nonfree software recommendation (ServPoET) pkgname=rp-pppoe -pkgver=3.13 +pkgver=3.14 pkgrel=1 pkgrel+=.parabola1 pkgdesc="Roaring Penguin's Point-to-Point Protocol over Ethernet client" @@ -25,11 +25,12 @@ install=rp-pppoe.install source=(https://dianne.skoll.ca/projects/rp-pppoe/download/rp-pppoe-$pkgver.tar.gz{,.sig} adsl.service) source+=(libre.patch) -validpgpkeys=('FC2E9B645468698FD7B21655C1842E2A126F42E0') # Dianne Skoll -sha512sums=('e29ddc39252a0e71d509096e275f6f195f86a5871052dd558e8fb174d13086b1c601e6652f45619279a1eb2fbda96ba0ec85dea9edb27459af56ded4a52b5f36' +validpgpkeys=('FC2E9B645468698FD7B21655C1842E2A126F42E0' # Dianne Skoll + '738E4D954052902C147D07B2685A5A5E511D30E2') # Dianne Skoll +sha512sums=('0fa26e9478d387d4752ab85837dab9d1464f27c1ca832bad265deb01b5c3565aa341e3c75278b43a56aed466f02861af11b3bc64bae932a13cb103c4f0b91a29' 'SKIP' '75fdb55b872e6388053aa0c1ba0b98ab9eda6b6f59a7452843cff8de5a68276be3f48dbd9a6324917254d4fe0d1b2d7442f7a9bbfa1355b6f500db13c9409089' - 'eaaea24d2bd3f9b2a16f20e58c5751523f4c512a3f2e83277e80a2c6e6c61b1d650792b87b0d42dac1437553331fbe429f39c6e0a7fa68591f6ccc81f146996c') + '42865e02b8ae2168a79db9b53eb51f0fb86c53dec254d581e288f56ffc5df7035b19eacc468dd94b551d08653c880b04b2ff0ebbf291685f1593e12ed6439c65') prepare() { cd $pkgname-$pkgver diff --git a/libre/rp-pppoe/kmode.patch b/libre/rp-pppoe/kmode.patch deleted file mode 100644 index 4ad7440ab..000000000 --- a/libre/rp-pppoe/kmode.patch +++ /dev/null @@ -1,19 +0,0 @@ -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 -@@ -3709,6 +3709,7 @@ do : - #include - #include - #include -+#include - - " - if test "x$ac_cv_header_linux_if_pppox_h" = x""yes; then : -@@ -4559,6 +4559,7 @@ else - #include - #include - #include -+#include - #include - int main() - { diff --git a/libre/rp-pppoe/libre.patch b/libre/rp-pppoe/libre.patch index 1e305c861..6f541cb23 100644 --- a/libre/rp-pppoe/libre.patch +++ b/libre/rp-pppoe/libre.patch @@ -1,7 +1,8 @@ -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 @@ +diff --git a/rp-pppoe.spec b/rp-pppoe.spec +index e7b69a9..d375e25 100644 +--- a/rp-pppoe.spec ++++ b/rp-pppoe.spec +@@ -55,7 +55,7 @@ rm -rf $RPM_BUILD_ROOT %files %defattr(-,root,root) @@ -10,10 +11,11 @@ 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.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 @@ +diff --git a/src/Makefile.in b/src/Makefile.in +index 543454a..438d62e 100644 +--- a/src/Makefile.in ++++ b/src/Makefile.in +@@ -45,9 +45,6 @@ PPPOE_RELAY=@PPPOE_RELAY@ PPPOE_PATH=$(sbindir)/pppoe PPPD_PATH=@PPPD@ @@ -23,7 +25,7 @@ diff -Nur rp-pppoe-3.12.orig/src/Makefile.in rp-pppoe-3.12/src/Makefile.in # Kernel-mode plugin gets installed here. PLUGIN_DIR=/etc/ppp/plugins PLUGIN_PATH=$(PLUGIN_DIR)/rp-pppoe.so -@@ -171,7 +168,6 @@ +@@ -172,7 +169,6 @@ install: all $(install) -m 644 ../doc/HOW-TO-CONNECT $(DESTDIR)$(docdir) $(install) -m 644 ../doc/LICENSE $(DESTDIR)$(docdir) $(install) -m 644 ../README $(DESTDIR)$(docdir) @@ -31,58 +33,58 @@ diff -Nur rp-pppoe-3.12.orig/src/Makefile.in rp-pppoe-3.12/src/Makefile.in $(install) -m 644 ../configs/pap-secrets $(DESTDIR)$(docdir) -mkdir -p $(DESTDIR)$(mandir)/man8 for i in $(TARGETS) ; do \ -@@ -229,25 +225,15 @@ +@@ -225,25 +221,15 @@ install: all @echo "" @echo "Type 'pppoe-setup' to configure the software." -servpoet-tgz: distro-servpoet -- cd .. && tar cvf servpoet-$(VERSION)$(BETA).tar servpoet-$(VERSION)$(BETA) -- gzip -f -v -9 ../servpoet-$(VERSION)$(BETA).tar -- rm -rf ../servpoet-$(VERSION)$(BETA) +- cd .. && tar cvf servpoet-$(RP_VERSION)$(BETA).tar servpoet-$(RP_VERSION)$(BETA) +- gzip -f -v -9 ../servpoet-$(RP_VERSION)$(BETA).tar +- rm -rf ../servpoet-$(RP_VERSION)$(BETA) - tgz: distro - cd .. && tar cvf rp-pppoe-$(VERSION)$(BETA).tar rp-pppoe-$(VERSION)$(BETA) - gzip -f -v -9 ../rp-pppoe-$(VERSION)$(BETA).tar - rm -rf ../rp-pppoe-$(VERSION)$(BETA) + cd .. && tar cvf rp-pppoe-$(RP_VERSION)$(BETA).tar rp-pppoe-$(RP_VERSION)$(BETA) + gzip -f -v -9 ../rp-pppoe-$(RP_VERSION)$(BETA).tar + rm -rf ../rp-pppoe-$(RP_VERSION)$(BETA) -distro-servpoet: distro -- cp ../servpoet.spec ../rp-pppoe-$(VERSION)$(BETA) -- $(MAKE) -C licensed-only distro VERSION=$(VERSION) BETA=$(BETA) -- mv ../rp-pppoe-$(VERSION)$(BETA) ../servpoet-$(VERSION)$(BETA) +- cp ../servpoet.spec ../rp-pppoe-$(RP_VERSION)$(BETA) +- $(MAKE) -C licensed-only distro RP_VERSION=$(RP_VERSION) BETA=$(BETA) +- mv ../rp-pppoe-$(RP_VERSION)$(BETA) ../servpoet-$(RP_VERSION)$(BETA) - distro: - rm -rf ../rp-pppoe-$(VERSION)$(BETA) - mkdir ../rp-pppoe-$(VERSION)$(BETA) + rm -rf ../rp-pppoe-$(RP_VERSION)$(BETA) + mkdir ../rp-pppoe-$(RP_VERSION)$(BETA) - for i in README SERVPOET go go-gui rp-pppoe.spec ; do \ + for i in README go go-gui rp-pppoe.spec ; do \ - cp ../$$i ../rp-pppoe-$(VERSION)$(BETA) || exit 1; \ + cp ../$$i ../rp-pppoe-$(RP_VERSION)$(BETA) || exit 1; \ done - mkdir ../rp-pppoe-$(VERSION)$(BETA)/gui -@@ -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 + mkdir ../rp-pppoe-$(RP_VERSION)$(BETA)/gui +@@ -301,10 +287,6 @@ rpms: tgz + /usr/src/redhat/RPMS/i386/rp-pppoe-$(RP_VERSION)-1.i386.rpm \ + /usr/src/redhat/RPMS/i386/rp-pppoe-gui-$(RP_VERSION)-1.i386.rpm -servpoet-rpms: servpoet-tgz -- cp ../servpoet-$(VERSION).tar.gz /usr/src/redhat/SOURCES +- cp ../servpoet-$(RP_VERSION).tar.gz /usr/src/redhat/SOURCES - cd .. && rpm -ba servpoet.spec - 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 -@@ -323,15 +305,13 @@ +@@ -319,15 +301,13 @@ distclean: clean 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 + sed -e 's/^Version: .*$$/Version: $(RP_VERSION)/' ../rp-pppoe.spec > ../rp-pppoe.spec.new && mv ../rp-pppoe.spec.new ../rp-pppoe.spec + sed -e 's+^Source: .*$$+Source: https://dianne.skoll.ca/projects/rp-pppoe/download/rp-pppoe-$(RP_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: $(RP_VERSION)/' ../servpoet.spec > ../servpoet.spec.new && mv ../servpoet.spec.new ../servpoet.spec || true +- test -f ../servpoet.spec && sed -e 's+^Source: .*$$+Source: https://dianne.skoll.ca/projects/rp-pppoe/download/servpoet-$(RP_VERSION).tar.gz+' ../servpoet.spec > ../servpoet.spec.new && mv ../servpoet.spec.new ../servpoet.spec || true # 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 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 RP_VERSION=$(RP_VERSION) SERVPOET_VERSION=$(SERVPOET_VERSION) ++ $(MAKE) -C licensed-only all RP_VERSION=$(RP_VERSION) l2tp: libevent/libevent.a $(MAKE) -C l2tp all diff --git a/libre/rp-pppoe/rp-pppoe-linux-headers.patch b/libre/rp-pppoe/rp-pppoe-linux-headers.patch deleted file mode 100644 index 961eba396..000000000 --- a/libre/rp-pppoe/rp-pppoe-linux-headers.patch +++ /dev/null @@ -1,28 +0,0 @@ -the linux headers have started adding shims to not define types or structs -when C lib headers are active, but in order to work, the C lib headers have -to be included before the linux headers. - -move the netinet/in.h include up above the linux/ includes. - -Mike Frysinger - ---- a/src/pppoe.h -+++ b/src/pppoe.h -@@ -47,6 +47,8 @@ - #include - #endif - -+#include -+ - /* Ugly header files on some Linux boxes... */ - #if defined(HAVE_LINUX_IF_H) - #include -@@ -84,8 +86,6 @@ typedef unsigned long UINT32_t; - #include - #endif - --#include -- - #ifdef HAVE_NETINET_IF_ETHER_H - #include - -- cgit v1.2.2