diff options
Diffstat (limited to 'main/ppp/APKBUILD')
| -rw-r--r-- | main/ppp/APKBUILD | 143 |
1 files changed, 93 insertions, 50 deletions
diff --git a/main/ppp/APKBUILD b/main/ppp/APKBUILD index bbee2ac2c2d..2630b615505 100644 --- a/main/ppp/APKBUILD +++ b/main/ppp/APKBUILD @@ -1,77 +1,104 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=ppp -pkgver=2.4.9 -pkgrel=2 +pkgver=2.5.0 +pkgrel=5 pkgdesc="A daemon which implements the PPP protocol for dial-up networking" url="https://ppp.samba.org/" arch="all" -license="BSD and LGPL-2.0-or-later and GPL-2.0-or-later and Public-Domain" -makedepends="bsd-compat-headers linux-headers openssl1.1-compat-dev libpcap-dev" -subpackages="$pkgname-doc $pkgname-dev $pkgname-chat $pkgname-radius - $pkgname-atm $pkgname-pppoe $pkgname-l2tp $pkgname-winbind - $pkgname-passprompt $pkgname-passwordfd $pkgname-minconn - $pkgname-openrc $pkgname-daemon - " - +license="BSD-3-Clause AND BSD-4-Clause AND BSD-4-Clause-Shortened AND GPL-2.0-or-later AND HPND AND LGPL-2.0-or-later AND Public-Domain AND RSA-MD" # for compatibility reasons the 'ppp' package is an empty meta package # that pulls in all except -dev and -doc subpackages -depends="$pkgname-chat $pkgname-radius - $pkgname-atm $pkgname-pppoe $pkgname-l2tp $pkgname-winbind - $pkgname-passprompt $pkgname-passwordfd $pkgname-minconn - $pkgname-daemon - " - +depends=" + $pkgname-chat + $pkgname-radius + $pkgname-atm + $pkgname-pppoe + $pkgname-l2tp + $pkgname-winbind + $pkgname-passprompt + $pkgname-passwordfd + $pkgname-minconn + $pkgname-daemon + " +makedepends=" + autoconf + automake + bsd-compat-headers + libpcap-dev + libtool + linux-headers + openssl-dev>3 + " +subpackages=" + $pkgname-doc + $pkgname-dev + $pkgname-chat + $pkgname-radius + $pkgname-atm + $pkgname-pppoe + $pkgname-l2tp + $pkgname-winbind + $pkgname-passprompt + $pkgname-passwordfd + $pkgname-minconn + $pkgname-openrc + $pkgname-daemon + " source="https://github.com/paulusmack/ppp/archive/ppp-$pkgver.tar.gz - musl-fix-headers.patch - fix-paths.patch 0011-build-sys-don-t-put-connect-errors-log-to-etc-ppp.patch - fix-pppd-magic.h.patch + fix-paths.patch + musl-fix-headers.patch + 0001-Revert-lock-path-to-var-lock-435.patch ip-down ip-up - pppd.initd" - + pppd.initd + pppd.confd + " builddir="$srcdir"/$pkgname-$pkgname-$pkgver +options="!check" # secfixes: +# 2.4.9-r6: +# - CVE-2022-4603 # 2.4.8-r1: # - CVE-2020-8597 -build() { +prepare() { + default_prepare + autoreconf -fvi +} + +build() { # fix CFLAGS # -D_GNU_SOURCE is needed for IPv6 to work apparently export CFLAGS="$CFLAGS -D_GNU_SOURCE" - sed -i "s:-O2 -pipe -Wall -g:${CFLAGS}:" pppd/Makefile.linux - sed -i "s:-g -O2:${CFLAGS}:" pppd/plugins/Makefile.linux - sed -i "s:-O2:${CFLAGS}:" pppstats/Makefile.linux - sed -i "s:-O2 -g -pipe:${CFLAGS}:" chat/Makefile.linux - sed -i "s:-O:${CFLAGS}:" pppdump/Makefile.linux - # enable active filter - sed -i "s:^#FILTER=y:FILTER=y:" pppd/Makefile.linux - # enable ipv6 support - sed -i "s:^#HAVE_INET6=y:HAVE_INET6=y:" pppd/Makefile.linux - # Enable Microsoft proprietary Callback Control Protocol - sed -i "s:^#CBCP=y:CBCP=y:" pppd/Makefile.linux - sed -i "s:^#CBCP=y:CBCP=y:" pppd/Makefile.linux - sed -i "s:^#USE_CRYPT=y:USE_CRYPT=y:" pppd/Makefile.linux ./configure \ --build=$CBUILD \ --host=$CHOST \ --prefix=/usr \ - --localstatedir=/var - make COPTS="$CFLAGS" + --localstatedir=/var \ + --sysconfdir=/etc \ + --with-runtime-dir=/run/ppp \ + --with-logfile-dir=/var/log/ppp \ + --enable-cbcp \ + --enable-microsoft-extensions \ + --enable-multilink \ + --enable-peap \ + --disable-systemd + make } package() { - make INSTROOT="$pkgdir" install + make DESTDIR="$pkgdir" install install -Dm644 include/net/ppp_defs.h \ "$pkgdir"/usr/include/net/ppp_defs.h install -D -m755 "$srcdir"/ip-up "$pkgdir"/etc/ppp/ip-up install -D -m755 "$srcdir"/ip-down "$pkgdir"/etc/ppp/ip-down install -D -m755 "$srcdir"/pppd.initd "$pkgdir"/etc/init.d/pppd - install -D -m644 etc.ppp/options "$pkgdir"/etc/ppp/options - install -D -m600 etc.ppp/pap-secrets "$pkgdir"/etc/ppp/pap-secrets - install -D -m600 etc.ppp/chap-secrets "$pkgdir"/etc/ppp/chap-secrets + install -D -m644 "$srcdir"/pppd.confd "$pkgdir"/etc/conf.d/pppd + + mkdir -p "$pkgdir"/var/log/ppp/ # busybox ifup/ifdown needs pon/poff install -D -m644 scripts/pon.1 "$pkgdir"/usr/share/man/man1/pon.1 @@ -81,7 +108,7 @@ package() { install -d "$pkgdir"/usr/share/doc/ppp for i in scripts/*; do case $i in - pon|poff|*.1) continue; + pon|poff|*.1|Makefile*) continue; esac if [ -f "$i" ]; then cp $i "$pkgdir"/usr/share/doc/ppp/ @@ -93,25 +120,28 @@ package() { atm() { pkgdesc="pppd plugin to implement PPPoATM protocol" depends="ppp-daemon" + license="GPL-2.0-or-later AND LGPL-2.0-or-later" _mv usr/lib/pppd/$pkgver/pppoatm.so 755 } minconn() { pkgdesc="pppd plugin to implement a 'minconnect' option" depends="ppp-daemon" + license="BSD-4-Clause" _mv usr/lib/pppd/$pkgver/minconn.so 755 } winbind() { pkgdesc="WINBIND plugin for pppd" depends="ppp-daemon" + license="GPL-2.0-or-later" _mv usr/lib/pppd/$pkgver/winbind.so 755 } - passprompt() { pkgdesc="pppd plugin to invoke an external PAP password prompter" depends="ppp-daemon" + license="GPL-2.0-or-later" _mv usr/lib/pppd/$pkgver/passprompt.so 755 } @@ -124,12 +154,14 @@ passwordfd() { chat() { pkgdesc="a program for automatic ppp session establishment" depends= + license="Public-Domain" _mv usr/sbin/chat 755 } l2tp() { pkgdesc="pppd plugin to implement PPPoL2TP protocol" depends="ppp-daemon" + license="GPL-2.0-or-later" _mv usr/lib/pppd/$pkgver/openl2tp.so 755 _mv usr/lib/pppd/$pkgver/pppol2tp.so 755 } @@ -137,13 +169,15 @@ l2tp() { pppoe() { pkgdesc="pppd plugin for kernel-mode PPPoE on Linux" depends="ppp-daemon" - _mv usr/lib/pppd/$pkgver/rp-pppoe.so 755 + license="GPL-2.0-or-later" + _mv usr/lib/pppd/$pkgver/pppoe.so 755 _mv usr/sbin/pppoe-discovery 755 } radius() { pkgdesc="RADIUS plugin for pppd" depends="ppp-daemon" + license="GPL-2.0-or-later AND HPND" _mv usr/lib/pppd/$pkgver/radius.so 755 _mv usr/lib/pppd/$pkgver/radattr.so 755 _mv usr/lib/pppd/$pkgver/radrealms.so 755 @@ -162,15 +196,24 @@ _mv() { daemon() { pkgdesc="A daemon which implements the PPP protocol" depends= + license="BSD-3-Clause AND BSD-4-Clause AND BSD-4-Clause-Shortened AND GPL-2.0-or-later AND LGPL-2.0-or-later AND Public-Domain AND RSA-MD" mkdir -p "$subpkgdir" mv "$pkgdir"/* "$subpkgdir"/ } -sha512sums="c309f8f69f534c05547cd2f66dade0e0f198ea4c2928a7e899e660280786b3e965437a67b8c5bb81c59d0fa1818b4eb7b701d2dce015a420d380422d2bca4e1a ppp-2.4.9.tar.gz -29fe71a64d1370aa9a939767261a5d3b69c35e56e2fba0598477cf4986ad6dc4aff3dfa12562e8acf38272bad5b3773c8a5104599da872f7dd995bf2e64bfb58 musl-fix-headers.patch -7b84e2085c5e399a8f9e0cb928a7b4d5077f42755efa8961c848e287a8b8b78f3a123b59fbac76610ce8fe1f81fa103188b2e3ad4ffd82d14cb82243e2edeb91 fix-paths.patch -b490971d03fef4de66b61123f80a0087270bcb88466ae8ed98ea9a08b35d4c7c46b2dadd304e2970a4206bb5760a14370d7e3873de6240119d88e927ecef840c 0011-build-sys-don-t-put-connect-errors-log-to-etc-ppp.patch -d1067defff79d6c9f67121a9214e41a1bcca1e3b8a345ad905d223fdb8835142bad7cc3b556a3eca509ddf51cf808741773f31f4dca74e834b612a15854a5e6b fix-pppd-magic.h.patch +openrc() { + default_openrc + install_if="ppp-daemon=$pkgver-r$pkgrel openrc" +} + +sha512sums=" +cf62410a952053f9aa71c5179453831152e958fcad9e77df2ddac864e39aa71af0b746e54b91e8fa3ad6295d6d2b1bb736e36dc05521b495f573468679133324 ppp-2.5.0.tar.gz +1e1962503ea7639b2683920c73a848d680d1daf444fb978a42639f1671b2c38282d181be120fbf035220bcfe8768229897b7e5a59e6ddf09d4edb3666ebf3399 0011-build-sys-don-t-put-connect-errors-log-to-etc-ppp.patch +f8ad85423ccf19a6cea66e9debea81dc1842bf499b279b77c058cc2ff10aae7f48c3430a63050b97c4f535f5dcca449261fc7476f90cb2d30dfca9359490d6bd fix-paths.patch +8efb0750fb64cc6cbb3e5fce4a79e842db3c7fd08c3c1899cda4201a80f9ec7a4c88d88be833579b9470c1d851f01fbf2cd82b51912ebc4f05bbb168f6e73bc3 musl-fix-headers.patch +218f5ae25f059f4ab614d6c613f8317dd136a59378f31e3b7c868f79869a17a79f1d88bf226828e7a21db07337f5c2328ce3f4579d747b9bfe1082b1023193f0 0001-Revert-lock-path-to-var-lock-435.patch 160260bd2a788beaac395eadb38efbfd1e0e1a458fe151555acacf2c4f3a12381d644672c664f9793db6e3459a4f05a54e3ff6d407b0d37e8014b15bd0f11bcc ip-down 8258c95a6b6e8e94d6001b5cd3a99bd3270f29ba0f2e5050a26c8d5f1b67eead8d039e71ce86a784d45e620047b0a2bb14b258d80a9ea62084ba588a4c2e2d84 ip-up -bd6f43588b037367ffdb57f5e331492dcaa5969003e219c2dc8b90e6be1aa407282ff6114b91d1379ebeff766983fa0622456520cc0ac592b4f0b1496acf21bf pppd.initd" +845d99cefd9e3ebfd4ff61dbf86d5bc1a698abbf204fed5a577fbc873e378c6d5d35712331b97dfd9fa37d1f7157a034f2584521f3a28ec18b883ab8d420e028 pppd.initd +9ffc7c98662491694f305bd4b2e245acef0a6b36d31a8b6b8d7aea742c350369b780285745b111529373a4b5b7fe46f4673efd60b4a3250030d33204a30f5b8c pppd.confd +" |