commit 87d07dbf78440905e9c8759e4aea6a7ccbe10cdd Author: Juergen Daubert <jue@jue.li> Date: Tue Feb 18 17:36:31 2020 +0100 ppp: update to 2.4.8 diff --git a/ppp/.footprint b/ppp/.footprint index da04129b2..ca9e681f9 100644 --- a/ppp/.footprint +++ b/ppp/.footprint @@ -31,16 +31,18 @@ drwxr-xr-x root/root usr/include/pppd/ -rw-r--r-- root/root usr/include/pppd/upap.h drwxr-xr-x root/root usr/lib/ drwxr-xr-x root/root usr/lib/pppd/ -drwxr-xr-x root/root usr/lib/pppd/2.4.7/ --rwxr-xr-x root/root usr/lib/pppd/2.4.7/minconn.so --rwxr-xr-x root/root usr/lib/pppd/2.4.7/passprompt.so --rwxr-xr-x root/root usr/lib/pppd/2.4.7/passwordfd.so --rwsr-x--- root/root usr/lib/pppd/2.4.7/pppoatm.so --rwxr-xr-x root/root usr/lib/pppd/2.4.7/radattr.so --rwxr-xr-x root/root usr/lib/pppd/2.4.7/radius.so --rwxr-xr-x root/root usr/lib/pppd/2.4.7/radrealms.so --rwsr-x--- root/root usr/lib/pppd/2.4.7/rp-pppoe.so --rwxr-xr-x root/root usr/lib/pppd/2.4.7/winbind.so +drwxr-xr-x root/root usr/lib/pppd/2.4.8/ +-rwxr-xr-x root/root usr/lib/pppd/2.4.8/minconn.so +-rwxr-xr-x root/root usr/lib/pppd/2.4.8/openl2tp.so +-rwxr-xr-x root/root usr/lib/pppd/2.4.8/passprompt.so +-rwxr-xr-x root/root usr/lib/pppd/2.4.8/passwordfd.so +-rwsr-x--- root/root usr/lib/pppd/2.4.8/pppoatm.so +-rwxr-xr-x root/root usr/lib/pppd/2.4.8/pppol2tp.so +-rwxr-xr-x root/root usr/lib/pppd/2.4.8/radattr.so +-rwxr-xr-x root/root usr/lib/pppd/2.4.8/radius.so +-rwxr-xr-x root/root usr/lib/pppd/2.4.8/radrealms.so +-rwsr-x--- root/root usr/lib/pppd/2.4.8/rp-pppoe.so +-rwxr-xr-x root/root usr/lib/pppd/2.4.8/winbind.so drwxr-xr-x root/root usr/sbin/ -rwxr-xr-x root/root usr/sbin/chat -rwxr-xr-x root/root usr/sbin/pppd diff --git a/ppp/.signature b/ppp/.signature index fcd87ffca..f3425cb51 100644 --- a/ppp/.signature +++ b/ppp/.signature @@ -1,8 +1,5 @@ untrusted comment: verify with /etc/ports/opt.pub -RWSE3ohX2g5d/f0BrfBwKDsmR+a85aneu6Tzm2erbvx7CMwQp0Urn/62qB5d3fUkhKmpWEWCmCgulfBdG2HBcNE2KAwTiCcGiAQ= -SHA256 (Pkgfile) = 4852b75f9a22f332d4239fd6a121dc229bfe3998b6e8fb957c96afa730dec7eb -SHA256 (.footprint) = 02ba8f49c773c5bb70a42ff518804a8343a501ca650fa08a9465a736cece84f2 -SHA256 (ppp-2.4.7.tar.gz) = 02e0a3dd3e4799e33103f70ec7df75348c8540966ee7c948e4ed8a42bbccfb30 -SHA256 (ppp-nofilter.patch) = ac6100526d256e341183aa6470515f85cfb6195277b801339c4f7930942132fa -SHA256 (0029-pppoe-include-netinet-in.h-before-linux-in.h.patch) = 7239409d9e28d2874da41db189e6c45a0c8f3894879783966ddcea0b5462779a -SHA256 (glibc-2.28.patch) = 3f199d83d2632274dbbe7345e5369891469f64642f28e4afb471747a88888b62 +RWSE3ohX2g5d/Xbi5PvSKv6lz6TRRbIQCWojNOyeMZmwe38sMTswOeQacdneH8NqBH3qdWykKRKGecMLlzowCO3joLoj4AYRUgA= +SHA256 (Pkgfile) = 3d342d872212d5a00b351b738540c4d71dc62f134e7b267c78b7e7f525bb4e74 +SHA256 (.footprint) = bb1834209fc26745d6fb712672d10b0cb0df678fdb1beb54db0abd1b747cbd6b +SHA256 (ppp-2.4.8.tar.gz) = 91fbff784ad16a1111a7f22df4675aeb161d958bb79f1cc4c1f0c81944e7cb40 diff --git a/ppp/0029-pppoe-include-netinet-in.h-before-linux-in.h.patch b/ppp/0029-pppoe-include-netinet-in.h-before-linux-in.h.patch deleted file mode 100644 index 9b0920d3b..000000000 --- a/ppp/0029-pppoe-include-netinet-in.h-before-linux-in.h.patch +++ /dev/null @@ -1,35 +0,0 @@ -From 33797aa193a2751da26f9af120e39c110defe4d1 Mon Sep 17 00:00:00 2001 -From: Lubomir Rintel <lkundrak@v3.sk> -Date: Sat, 10 Dec 2016 19:53:56 +0100 -Subject: [PATCH] pppoe: include netinet/in.h before linux/in.h - -To fix build breakage. ---- - pppd/plugins/rp-pppoe/pppoe.h | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/pppd/plugins/rp-pppoe/pppoe.h b/pppd/plugins/rp-pppoe/pppoe.h -index 9ab2eee..f77f5b7 100644 ---- a/pppd/plugins/rp-pppoe/pppoe.h -+++ b/pppd/plugins/rp-pppoe/pppoe.h -@@ -15,6 +15,8 @@ - - #include "config.h" - -+#include <netinet/in.h> -+ - #if defined(HAVE_NETPACKET_PACKET_H) || defined(HAVE_LINUX_IF_PACKET_H) - #define _POSIX_SOURCE 1 /* For sigaction defines */ - #endif -@@ -84,8 +86,6 @@ typedef unsigned long UINT32_t; - #include <linux/if_ether.h> - #endif - --#include <netinet/in.h> -- - #ifdef HAVE_NETINET_IF_ETHER_H - #include <sys/types.h> - --- -2.9.3 - diff --git a/ppp/Pkgfile b/ppp/Pkgfile index 9aa0533e2..f11de4361 100644 --- a/ppp/Pkgfile +++ b/ppp/Pkgfile @@ -1,29 +1,17 @@ # Description: A daemon which implements the PPP protocol for internetworking over dialup lines # URL: https://www.samba.org/ppp/ # Maintainer: CRUX System Team, core-ports at crux dot nu -# Depends on: zlib, openssl +# Depends on: openssl name=ppp -version=2.4.7 -release=4 -source=(https://ppp.samba.org/ftp/ppp/$name-$version.tar.gz \ - $name-nofilter.patch \ - 0029-pppoe-include-netinet-in.h-before-linux-in.h.patch \ - glibc-2.28.patch) +version=2.4.8 +release=1 +source=(https://github.com/paulusmack/ppp/archive/$name-$version.tar.gz) build () { - cd $name-$version - - patch -p1 -i $SRC/$name-nofilter.patch - - # http://pkgs.fedoraproject.org/cgit/rpms/ppp.git/tree/ - patch -p1 -i $SRC/0029-pppoe-include-netinet-in.h-before-linux-in.h.patch - - # from https://dev.gentoo.org/~polynomial-c/ppp-2.4.7-patches-7.tar.xz - patch -p1 -i $SRC/glibc-2.28.patch - + cd $name-$name-$version ./configure --prefix=/usr --sysconfdir=/etc make - make -j1 INSTROOT=$PKG install install-etcppp + make DESTDIR=$PKG/usr INSTROOT=$PKG install install-etcppp chmod +w -R $PKG } diff --git a/ppp/glibc-2.28.patch b/ppp/glibc-2.28.patch deleted file mode 100644 index cbb5857a7..000000000 --- a/ppp/glibc-2.28.patch +++ /dev/null @@ -1,110 +0,0 @@ -From 3c7b86229f7bd2600d74db14b1fe5b3896be3875 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Jaroslav=20=C5=A0karvada?= <jskarvad@redhat.com> -Date: Fri, 6 Apr 2018 14:27:18 +0200 -Subject: [PATCH] pppd: Use openssl for the DES instead of the libcrypt / glibc -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -It seems the latest glibc (in Fedora glibc-2.27.9000-12.fc29) dropped -libcrypt. The libxcrypt standalone package can be used instead, but -it dropped the old setkey/encrypt API which ppp uses for DES. There -is support for using openssl in pppcrypt.c, but it contains typos -preventing it from compiling and seems to be written for an ancient -openssl version. - -This updates the code to use current openssl. - -[paulus@ozlabs.org - wrote the commit description, fixed comment in - Makefile.linux.] - -Signed-off-by: Jaroslav Škarvada <jskarvad@redhat.com> -Signed-off-by: Paul Mackerras <paulus@ozlabs.org> ---- - pppd/Makefile.linux | 7 ++++--- - pppd/pppcrypt.c | 18 +++++++++--------- - 2 files changed, 13 insertions(+), 12 deletions(-) - -diff --git a/pppd/Makefile.linux b/pppd/Makefile.linux -index 36d2b036..8d5ce99d 100644 ---- a/pppd/Makefile.linux -+++ b/pppd/Makefile.linux -@@ -35,10 +35,10 @@ endif - COPTS = -O2 -pipe -Wall -g - LIBS = - --# Uncomment the next 2 lines to include support for Microsoft's -+# Uncomment the next line to include support for Microsoft's - # MS-CHAP authentication protocol. Also, edit plugins/radius/Makefile.linux. - CHAPMS=y --USE_CRYPT=y -+#USE_CRYPT=y - # Don't use MSLANMAN unless you really know what you're doing. - #MSLANMAN=y - # Uncomment the next line to include support for MPPE. CHAPMS (above) must -@@ -137,7 +137,8 @@ endif - - ifdef NEEDDES - ifndef USE_CRYPT --LIBS += -ldes $(LIBS) -+CFLAGS += -I/usr/include/openssl -+LIBS += -lcrypto - else - CFLAGS += -DUSE_CRYPT=1 - endif -diff --git a/pppd/pppcrypt.c b/pppd/pppcrypt.c -index 8b85b132..6b35375e 100644 ---- a/pppd/pppcrypt.c -+++ b/pppd/pppcrypt.c -@@ -64,7 +64,7 @@ u_char *des_key; /* OUT 64 bit DES key with parity bits added */ - des_key[7] = Get7Bits(key, 49); - - #ifndef USE_CRYPT -- des_set_odd_parity((des_cblock *)des_key); -+ DES_set_odd_parity((DES_cblock *)des_key); - #endif - } - -@@ -158,25 +158,25 @@ u_char *clear; /* OUT 8 octets */ - } - - #else /* USE_CRYPT */ --static des_key_schedule key_schedule; -+static DES_key_schedule key_schedule; - - bool - DesSetkey(key) - u_char *key; - { -- des_cblock des_key; -+ DES_cblock des_key; - MakeKey(key, des_key); -- des_set_key(&des_key, key_schedule); -+ DES_set_key(&des_key, &key_schedule); - return (1); - } - - bool --DesEncrypt(clear, key, cipher) -+DesEncrypt(clear, cipher) - u_char *clear; /* IN 8 octets */ - u_char *cipher; /* OUT 8 octets */ - { -- des_ecb_encrypt((des_cblock *)clear, (des_cblock *)cipher, -- key_schedule, 1); -+ DES_ecb_encrypt((DES_cblock *)clear, (DES_cblock *)cipher, -+ &key_schedule, 1); - return (1); - } - -@@ -185,8 +185,8 @@ DesDecrypt(cipher, clear) - u_char *cipher; /* IN 8 octets */ - u_char *clear; /* OUT 8 octets */ - { -- des_ecb_encrypt((des_cblock *)cipher, (des_cblock *)clear, -- key_schedule, 0); -+ DES_ecb_encrypt((DES_cblock *)cipher, (DES_cblock *)clear, -+ &key_schedule, 0); - return (1); - } - diff --git a/ppp/ppp-nofilter.patch b/ppp/ppp-nofilter.patch deleted file mode 100644 index fb68a9abc..000000000 --- a/ppp/ppp-nofilter.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -ru ppp-2.4.3/pppd/Makefile.linux ppp-2.4.3-new/pppd/Makefile.linux ---- ppp-2.4.3/pppd/Makefile.linux 2004-11-13 13:02:22.000000000 +0100 -+++ ppp-2.4.3-new/pppd/Makefile.linux 2004-12-12 00:05:13.582252968 +0100 -@@ -48,7 +48,7 @@ - # Uncomment the next line to include support for PPP packet filtering. - # This requires that the libpcap library and headers be installed - # and that the kernel driver support PPP packet filtering. --FILTER=y -+#FILTER=y - - # Uncomment the next line to enable multilink PPP (enabled by default) - # Linux distributions: Please leave multilink ENABLED in your builds