main/ppp: upgrade to 2.4.7, split to modules

1 files changed, 109 insertions, 42 deletions

diff --git a/main/ppp/APKBUILD b/main/ppp/APKBUILD
index a8038cf37..1417be5dc 100644
--- a/main/ppp/APKBUILD
+++ b/main/ppp/APKBUILD
@@ -1,25 +1,23 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=ppp
-pkgver=2.4.6
+pkgver=2.4.7
 pkgrel=0
 pkgdesc="A daemon which implements the PPP protocol for dial-up networking"
 url="http://www.samba.org/ppp/"
 arch="all"
 license="custom:GPL/BSD"
 depends=
-makedepends="libpcap-dev"
-subpackages="$pkgname-dev $pkgname-doc"
+makedepends=
+subpackages="$pkgname-chat $pkgname-chat-doc:chat_doc
+	    $pkgname-radius $pkgname-radius-doc:radius_doc
+	    $pkgname-atm $pkgname-pppoe $pkgname-l2tp $pkgname-winbind
+	    $pkgname-passprompt $pkgname-passwordfd $pkgname-minconn $pkgname-doc $pkgname-dev"
 source="ftp://ftp.samba.org/pub/$pkgname/$pkgname-$pkgver.tar.gz
 	defaultroute-metric.3.patch
 	musl-fix-headers.patch
-
-	options
-	pon
-	poff
-	plog
-	pon.1
-	ip-up
-	ip-down"
+	fix-paths.patch
+	ip-down
+	ip-up"
 
 _builddir="$srcdir"/$pkgname-$pkgver
 prepare() {
@@ -64,45 +62,114 @@ package() {
 	make INSTROOT="$pkgdir" install || return 1
 	install -Dm644 include/net/ppp_defs.h \
 		"$pkgdir"/usr/include/net/ppp_defs.h || return 1
-
-	install -D -m644 "$srcdir"/options "$pkgdir"/etc/ppp/options
 	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"/pon "$pkgdir"/usr/bin/pon
-	install -D -m755 "$srcdir"/poff "$pkgdir"/usr/bin/poff
-	install -D -m755 "$srcdir"/plog "$pkgdir"/usr/sbin/plog
+	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"/pon.1 "$pkgdir"/usr/share/man/man1/pon.1
-	mkdir -p "$pkgdir"/etc/ppp/peers
+	install -D -m644 scripts/pon.1 "$pkgdir"/usr/share/man/man1/pon.1
+	install -d "$pkgdir"/usr/share/doc/ppp
+	cp scripts/* "$pkgdir"/usr/share/doc/ppp/
+	rm "$pkgdir"/usr/share/doc/ppp/pon.1
+	install -d "$pkgdir"/etc/ppp/peers
+}
+
+atm() {
+	pkgdesc="pppd plugin to implement PPPoATM protocol"
+	depends="ppp"
+	_mv usr/lib/pppd/$pkgver/pppoatm.so 755
+}
+
+minconn() {
+	pkgdesc="pppd plugin to implement a 'minconnect' option"
+	depends="ppp"
+	_mv usr/lib/pppd/$pkgver/minconn.so 755
+}
+
+winbind() {
+	pkgdesc="WINBIND plugin for pppd"
+	depends="ppp"
+	_mv usr/lib/pppd/$pkgver/winbind.so 755
+}
+
+
+passprompt() {
+	pkgdesc="pppd plugin to invoke an external PAP password prompter"
+	depends="ppp"
+	_mv usr/lib/pppd/$pkgver/passprompt.so 755
+}
+
+passwordfd() {
+	pkgdesc="pppd plugin let's you pass the password via a file descriptor"
+	depends="ppp"
+	_mv usr/lib/pppd/$pkgver/passwordfd.so 755
+}
+
+chat() {
+	pkgdesc="a program for automatic ppp session establishment"
+	_mv usr/sbin/chat 755
+}
+
+chat_doc() {
+	arch="noarch"
+	_mv usr/share/man/man8/chat.8 644 doc
+}
+
+l2tp() {
+	pkgdesc="pppd plugin to implement PPPoL2TP protocol"
+	depends="ppp"
+	_mv usr/lib/pppd/$pkgver/openl2tp.so 755
+	_mv usr/lib/pppd/$pkgver/pppol2tp.so 755
+}
+
+pppoe() {
+	pkgdesc="pppd plugin for kernel-mode PPPoE on Linux"
+	depends="ppp"
+	_mv usr/lib/pppd/$pkgver/rp-pppoe.so 755
+	_mv usr/sbin/pppoe-discovery 755
+}
+
+radius() {
+	pkgdesc="RADIUS plugin for pppd"
+	depends="ppp"
+	_mv usr/lib/pppd/$pkgver/radius.so 755
+	_mv usr/lib/pppd/$pkgver/radattr.so 755
+	_mv usr/lib/pppd/$pkgver/radrealms.so 755
+	install -d "$subpkgdir"/etc/radiusclient
+	cp -r "$_builddir"/pppd/plugins/radius/etc/* "$subpkgdir"/etc/radiusclient
+	mv "$subpkgdir"/etc/radiusclient/radiusclient.conf.in "$subpkgdir"/etc/radiusclient/radiusclient.conf
+	sed -i "s:@pkgsysconfdir@:/etc/radiusclient:g" "$subpkgdir"/etc/radiusclient/radiusclient.conf
+	sed -i "s:@sbindir@:/usr/sbin:g" "$subpkgdir"/etc/radiusclient/radiusclient.conf
+}
+
+radius_doc() {
+	arch="noarch"
+	_mv usr/share/man/man8/pppd-radius.8 644 doc
+	_mv usr/share/man/man8/pppd-radattr.8 644 doc
+}
+
+_mv() {
+	install -m $2 -D "$pkgdir"/$1 "$subpkgdir"/$1
+	if [ "$3" = "doc" ]; then
+		gzip -9 "$subpkgdir"/$1
+	fi
+	rm "$pkgdir"/$1
 }
-md5sums="3434d2cc9327167a0723aaaa8670083b  ppp-2.4.6.tar.gz
+md5sums="78818f40e6d33a1d1de68a1551f6595a  ppp-2.4.7.tar.gz
 5a5c2d1bdca62979d9ed7a5a648e86d1  defaultroute-metric.3.patch
 8d2128c74d62a2844491a24794b05a3e  musl-fix-headers.patch
-9185f645bb433b22a9951d9d12f79c35  options
-48c024f73a80c8b69c4def22f86902cc  pon
-2d811f8470ccdea3b8c4505a438483e9  poff
-86cdaf133f7a79fb464f02d83afc7734  plog
-44cc662ba9aa61dd9add3ddd4c5ded57  pon.1
-fac0c773490371ea673f4be0977a230f  ip-up
-a88b40b1bf91eb5cca3762b7195e4fe2  ip-down"
-sha256sums="1b33181a03962c8a092c055fb9980e9722728a8d98a4bb7ec7acda17c1b1b49d  ppp-2.4.6.tar.gz
+c8f78e010a776d114d687b1a742ca6bb  fix-paths.patch
+a88b40b1bf91eb5cca3762b7195e4fe2  ip-down
+fac0c773490371ea673f4be0977a230f  ip-up"
+sha256sums="02e0a3dd3e4799e33103f70ec7df75348c8540966ee7c948e4ed8a42bbccfb30  ppp-2.4.7.tar.gz
 1f69c03747ed68eaaaa8b2f0a239e57f167967fc90a6f89d802dcfe77026846f  defaultroute-metric.3.patch
 b136d5366e64a686a3ea24baaaeb4a37c2654c098dd7fcb263caebf9e9281956  musl-fix-headers.patch
-9f473800a48bbaec41b465817ae9c4c53d6b0ce865b4298d9353b30707a39605  options
-c92e0721c4f53987dd0a02fe7089d0f5a58cdb7bb9f26d1bddc28111406ce6c2  pon
-ee1e1e5f164effe49bc7ffab3fbde6efbd46d186c58192913f749257026d75e2  poff
-43608081ab9d6a755eb4e6fa2011f88b16b1702745d76bced6d546a7c579b39f  plog
-9bb35eac78898cdc75184bb70fea11fb2e2889e1e2cadf0b7bb8320d7cae0959  pon.1
-7d44e21ed945434c32a385f44c690826f74c3d5ddac353deae8174692d8d1beb  ip-up
-84f2b44c9f4b8abdbc9cfbfffb669fa19385b80da55f9c292df115189dc62bd6  ip-down"
-sha512sums="65d6967ba43cd8b4d3f63f52ff69f6fed964f748fc780dff982629668213c2cd1891671f6f4a0c1c22118a382e282fabdd2328e60a120d9b984d3c17f9355cc6  ppp-2.4.6.tar.gz
+b6453eeb32a78d6748b3fc5ef9f21a7862f70f8316c3903097ad63f00497266b  fix-paths.patch
+84f2b44c9f4b8abdbc9cfbfffb669fa19385b80da55f9c292df115189dc62bd6  ip-down
+7d44e21ed945434c32a385f44c690826f74c3d5ddac353deae8174692d8d1beb  ip-up"
+sha512sums="e34ce24020af6a73e7a26c83c4f73a9c83fa455b7b363794dba27bf01f70368be06bff779777843949bd77f4bc9385d6ad455ea48bf8fff4e0d73cc8fef16ae2  ppp-2.4.7.tar.gz
 fccc7a6809ae4a617796ccf1d2132de8edb1cc0c71d76a95393585a5970b92be2a54da558702db355c8aea8d37b4dfffc64406129a2b3322f0b10e8f0481f685  defaultroute-metric.3.patch
 2f071ea9db15e4abf1bed6cce8130dc81b710a31bfef5fa8f9370c353f845dbc47674b1551b8e040478e5156add6f98d480530206125e8bb308f0f4288d1eec6  musl-fix-headers.patch
-cabcaa8d44f0da399326b7f93267d4786b32f69c6fa7a78ab451575a8cc594f2a259406166c874d88ecfc0861b8b4abdb3b653cf1cb00e2f2838ea880962f6ee  options
-29233c8010f511792c2dcf54ee06ede271994ef029b6b526aeeb17433233ef6b638b96346d81db55c2a6bb25fb07633328415cd3af55dadd78a32b1d45b07dd8  pon
-3605ce49bad21473ef5f3ff2421e1ef7687e9267986503deca63ae3a2baa6308e8d031cb1da2f93b5b73dc292206a49c59cea17b80c129272cc975e07e3c6142  poff
-f40ab2549c2e05adc018197911c4820187aa5e9920004b0b1d68ebf38688a1fcab1f79966eb73f36237ec84f056ab9e0c05e32cbfd73fdd0c368216cf54741fd  plog
-c5dc475940a34a2b489279f89d9b428b0e811abb6b22ef53b926784ab39e92981cd1eab79f8ff0c91de618c3bf890701fd7a8138537cdb036f8771e7ca16b5c4  pon.1
-8258c95a6b6e8e94d6001b5cd3a99bd3270f29ba0f2e5050a26c8d5f1b67eead8d039e71ce86a784d45e620047b0a2bb14b258d80a9ea62084ba588a4c2e2d84  ip-up
-160260bd2a788beaac395eadb38efbfd1e0e1a458fe151555acacf2c4f3a12381d644672c664f9793db6e3459a4f05a54e3ff6d407b0d37e8014b15bd0f11bcc  ip-down"
+8384afb992a98a7f97b484866e6aa1b1de51e901d7837f84f7ce2beba6815591450fab43957f03b65804424c4940c59640a9cd878979240a171aa77427e9c4ff  fix-paths.patch
+160260bd2a788beaac395eadb38efbfd1e0e1a458fe151555acacf2c4f3a12381d644672c664f9793db6e3459a4f05a54e3ff6d407b0d37e8014b15bd0f11bcc  ip-down
+8258c95a6b6e8e94d6001b5cd3a99bd3270f29ba0f2e5050a26c8d5f1b67eead8d039e71ce86a784d45e620047b0a2bb14b258d80a9ea62084ba588a4c2e2d84  ip-up"