diff options
Diffstat (limited to 'community/connman/APKBUILD')
| -rw-r--r-- | community/connman/APKBUILD | 75 |
1 files changed, 29 insertions, 46 deletions
diff --git a/community/connman/APKBUILD b/community/connman/APKBUILD index 5ca59d67396..9517d9aa5d3 100644 --- a/community/connman/APKBUILD +++ b/community/connman/APKBUILD @@ -2,8 +2,8 @@ # Contributor: Valery Kartel <valery.kartel@gmail.com> # Contributor: Jakub Jirutka <jakub@jirutka.cz> pkgname=connman -pkgver=1.40 -pkgrel=4 +pkgver=1.42 +pkgrel=1 pkgdesc="Daemon for managing internet connections" url="https://git.kernel.org/pub/scm/network/connman/connman.git" arch="all" @@ -14,7 +14,6 @@ makedepends=" automake dbus-dev glib-dev - iptables-dev libmnl-dev libnftnl-dev libtool @@ -25,11 +24,14 @@ makedepends=" wpa_supplicant xl2tpd " +# For backward compatibility (Alpine <3.19). +provides=" + $pkgname-iptables=$pkgver-r$pkgrel + $pkgname-nftables=$pkgver-r$pkgrel + " install="$pkgname.post-upgrade" subpackages=" $pkgname-dbg - $pkgname-iptables - $pkgname-nftables $pkgname-l2tp $pkgname-openvpn $pkgname-vpnc @@ -40,11 +42,19 @@ subpackages=" " source="https://www.kernel.org/pub/linux/network/connman/connman-$pkgver.tar.xz libresolv.patch + dbus-rules.patch + implicit.patch + ppp-missing-header.patch + openvpn.conf $pkgname.initd $pkgname.confd " # secfixes: +# 1.41-r0: +# - CVE-2022-23096 +# - CVE-2022-23097 +# - CVE-2022-23098 # 1.39-r0: # - CVE-2021-26675 # - CVE-2021-26676 @@ -52,11 +62,9 @@ source="https://www.kernel.org/pub/linux/network/connman/connman-$pkgver.tar.xz prepare() { default_prepare autoreconf -vif - - cp -r "$builddir" "$builddir~nftables" } -_build() { +build() { ./configure \ --build=$CBUILD \ --host=$CHOST \ @@ -73,57 +81,24 @@ _build() { --enable-openvpn \ --enable-l2tp \ --enable-vpnc \ - "$@" + --with-firewall=nftables make } -build() { - cd "$builddir~nftables" - _build --with-firewall=nftables - - cd "$builddir" - _build --with-firewall=iptables # this is the default value -} - check() { make check } package() { - # Provided by connman-iptables or connman-nftables (mutually exclusive). - # NOTE: It must be defined here, not on top-level! - depends="$depends cmd:connmand" - make install DESTDIR="$pkgdir" install -Dm644 src/main.conf "$pkgdir"/etc/$pkgname/main.conf - mv "$pkgdir"/usr/sbin/connmand "$pkgdir"/usr/sbin/connmand.iptables - install -D -m 755 "$builddir~nftables"/src/connmand "$pkgdir"/usr/sbin/connmand.nftables + install -Dm644 "$srcdir"/openvpn.conf -t "$pkgdir"/etc/$pkgname/vpn-plugin/ install -Dm644 "$srcdir"/$pkgname.confd "$pkgdir"/etc/conf.d/$pkgname install -Dm755 "$srcdir"/$pkgname.initd "$pkgdir"/etc/init.d/$pkgname } -iptables() { - pkgdesc="ConnMan daemon built with iptables support" - depends="$pkgname=$pkgver-r$pkgrel !$pkgname-nftables" - provider_priority=20 # highest - replaces="$pkgname $pkgname-nftables" - - amove usr/sbin/connmand.iptables - ln -s connmand.iptables "$subpkgdir"/usr/sbin/connmand -} - -nftables() { - pkgdesc="ConnMan daemon built with nftables support" - depends="$pkgname=$pkgver-r$pkgrel !$pkgname-iptables" - provider_priority=10 # lowest - replaces="$pkgname $pkgname-iptables" - - amove usr/sbin/connmand.nftables - ln -s connmand.nftables "$subpkgdir"/usr/sbin/connmand -} - l2tp() { pkgdesc="L2TP VPN plugin for ConnMan" depends="$pkgname=$pkgver-r$pkgrel xl2tpd" @@ -137,8 +112,12 @@ openvpn() { depends="$pkgname=$pkgver-r$pkgrel openvpn" replaces="$pkgname" # for backward compatibility + amove etc/connman/vpn-plugin/openvpn.conf amove usr/lib/connman/plugins-vpn/openvpn.so amove usr/lib/connman/scripts/openvpn-script + + echo 'tun' | install -Dm644 /dev/stdin \ + "$subpkgdir"/usr/lib/modules-load.d/$subpkgname.conf } vpnc() { @@ -157,8 +136,12 @@ wireguard() { } sha512sums=" -33df90814b7499aeafcd51fca4f8ffbc07efacfa29dda46d3b9bcd3ff26264dc53c3991e7e53a8563ca403015c345e59c7ad29427c38ee3d88dd282479db7a0f connman-1.40.tar.xz +d919080b91fb61806c0e948be14e26bfe5d2501865f76b2e2dddd4cef8c46c0f7aa26406ed938b347889e48adc726e53bbb415bf9c280f9310597045da784ace connman-1.42.tar.xz 122b48fc9e25354e25ba3a3e0864bdd84da84457fed94aeea726bcb189b2f05f2cc361ae15f44af5c49bcee572e91e4c0488ef3b0bc79d20f6efe15853fb6b3a libresolv.patch -17c21c1c3e138790610a30ff397272e8f10b348c630e11f340fc7e97bdb871be00abc2955e11b9dad2c4be44cb6fdbf26c6c73aa18c1a2109f0668b14278593f connman.initd -4d266e0cb30af7aec5359a5456b12c9358c266ce0a7afdff247da7423f91b99748a15e44facec51eaab0f5a193b9c7542d9a3988c85f1bf5027a742aea995326 connman.confd +0223dba51be67c131c297d0e865fe1276e4800be5eee25c4f142df8e651318bf5dae98c1d559bb70c002cdfc3ce3c24d12128ddca5656192f962d91af6906caa dbus-rules.patch +e4095b51de42b31da6bc892e70be6dbcb34451348e90f50f1779c31a11a6b69013f50bafe156aacdfce4b49c2abdbd56cea62ecec20427bf2f6f942777f3c270 implicit.patch +e6caff8721324a5d02465da53fcca9616d0812c3fd36e874e96919bcc252cfcc471ed2d7f95e3cf24a0930fb3611b49171fe29b9e6f25f567c9a5375f34954df ppp-missing-header.patch +7f90bfdbe27a468c401bde04ccedc7d15afba11ca460ee6155233c3ef99285033303cbf7afac3849cbcd6e95a90eae5bdc772e416aef57e5ada7c4eed38f4de9 openvpn.conf +f5cdeba7ebdbe52424ebe74088d57ff57d45dcdbfa6f17cfe7bfa59308c8188174e0f44a86ffaea8a7247793fbffc1463bbd791033e188f1f44f80847fbf71e0 connman.initd +73f505a777df04039ca51bc3959aa89969a0bbc21ea971fb98e04e9b5851553de35955453ed859f5a6273724bbcce38f13012950c6cb4e0a2bc80bc531ccff1e connman.confd " |