wok rev 22614
updated connman, connman-dev and connman-tools (1.21 -> 1.37)
author | Hans-G?nter Theisgen |
---|---|
date | Sat Jan 11 17:07:11 2020 +0100 (2020-01-11) |
parents | cdbaf97bfe46 |
children | 3f7f1ad4e622 |
files | connman-dev/receipt connman-tools/receipt connman/receipt |
line diff
1.1 --- a/connman-dev/receipt Fri Jan 10 16:34:05 2020 +0100 1.2 +++ b/connman-dev/receipt Sat Jan 11 17:07:11 2020 +0100 1.3 @@ -1,15 +1,15 @@ 1.4 # SliTaz package receipt. 1.5 1.6 PACKAGE="connman-dev" 1.7 -VERSION="1.21" 1.8 +VERSION="1.37" 1.9 CATEGORY="network" 1.10 -SHORT_DESC="Daemon for managing internet connections, dev files." 1.11 +SHORT_DESC="Daemon for managing internet connections, development files." 1.12 MAINTAINER="slaxemulator@gmail.com" 1.13 LICENSE="GPL2" 1.14 -WEB_SITE="http://connman.net/" 1.15 -WANTED="connman" 1.16 +WEB_SITE="https://01.org/connman" 1.17 1.18 BUILD_DEPENDS="dbus-python pygobject" 1.19 +WANTED="connman" 1.20 1.21 # Rules to gen a SliTaz package suitable for Tazpkg. 1.22 genpkg_rules() 1.23 @@ -17,17 +17,21 @@ 1.24 # vpn 1.25 mkdir -p $fs/usr/lib/connman/plugins-vpn 1.26 cp -a $install/usr/lib/connman/plugins-vpn/*a \ 1.27 - $fs/usr/lib/connman/plugins-vpn 1.28 + $fs/usr/lib/connman/plugins-vpn 1.29 + 1.30 # include 1.31 - cp -a $install/usr/include $fs/usr 1.32 + cp -a $install/usr/include $fs/usr 1.33 + 1.34 # pkg-config 1.35 - cp -a $install/usr/lib/pkgconfig $fs/usr/lib 1.36 + cp -a $install/usr/lib/pkgconfig $fs/usr/lib 1.37 + 1.38 # test tools 1.39 mkdir -p $fs/usr/sbin 1.40 - install -Dm755 $src/tools/*-test $fs/usr/sbin 1.41 - install -Dm755 $src/tools/*-tool $fs/usr/sbin 1.42 - install -Dm755 $src/tools/*-unit $fs/usr/sbin 1.43 - install -Dm755 $src/tools/wispr $fs/usr/sbin 1.44 + install -Dm755 $src/tools/*-test $fs/usr/sbin 1.45 + install -Dm755 $src/tools/*-tool $fs/usr/sbin 1.46 + install -Dm755 $src/tools/*-unit $fs/usr/sbin 1.47 + install -Dm755 $src/tools/wispr $fs/usr/sbin 1.48 + 1.49 # python tools 1.50 - install -Dm755 $src/test/* $fs/usr/sbin 1.51 + install -Dm755 $src/test/* $fs/usr/sbin 1.52 }
2.1 --- a/connman-tools/receipt Fri Jan 10 16:34:05 2020 +0100 2.2 +++ b/connman-tools/receipt Sat Jan 11 17:07:11 2020 +0100 2.3 @@ -1,20 +1,20 @@ 2.4 # SliTaz package receipt. 2.5 2.6 PACKAGE="connman-tools" 2.7 -VERSION="1.21" 2.8 +VERSION="1.37" 2.9 CATEGORY="network" 2.10 -SHORT_DESC="Daemon for managing internet connections, dev tools." 2.11 +SHORT_DESC="Daemon for managing internet connections, tools." 2.12 MAINTAINER="slaxemulator@gmail.com" 2.13 LICENSE="GPL2" 2.14 -WEB_SITE="http://connman.net/" 2.15 +WEB_SITE="https://01.org/connman" 2.16 + 2.17 +DEPENDS="ncursesw readline" 2.18 WANTED="connman" 2.19 2.20 -DEPENDS="readline ncursesw" 2.21 - 2.22 # Rules to gen a SliTaz package suitable for Tazpkg. 2.23 genpkg_rules() 2.24 { 2.25 # client 2.26 mkdir -p $fs/usr/sbin 2.27 - install -Dm755 $src/client/connmanctl $fs/usr/sbin 2.28 + install -Dm755 $src/client/connmanctl $fs/usr/sbin 2.29 }
3.1 --- a/connman/receipt Fri Jan 10 16:34:05 2020 +0100 3.2 +++ b/connman/receipt Sat Jan 11 17:07:11 2020 +0100 3.3 @@ -1,84 +1,102 @@ 3.4 # SliTaz package receipt. 3.5 3.6 PACKAGE="connman" 3.7 -VERSION="1.21" 3.8 +VERSION="1.37" 3.9 CATEGORY="network" 3.10 -SHORT_DESC="Daemon for managing internet connections" 3.11 +SHORT_DESC="Daemon for managing internet connections." 3.12 MAINTAINER="slaxemulator@gmail.com" 3.13 LICENSE="GPL2" 3.14 +WEB_SITE="https://01.org/connman" 3.15 + 3.16 TARBALL="$PACKAGE-$VERSION.tar.xz" 3.17 -WEB_SITE="http://connman.net/" 3.18 WGET_URL="http://linux-kernel.uio.no/pub/linux/network/$PACKAGE/$TARBALL" 3.19 3.20 -DEPENDS="glib dbus iptables gnutls libnl libgcrypt udev wpa_supplicant 3.21 -dbus-helper" 3.22 -BUILD_DEPENDS="glib-dev dbus-dev iptables-dev iptables gnutls-dev libnl-dev 3.23 -openconnect udev-dev wpa_supplicant readline-dev ncursesw-dev openvpn 3.24 -bluez-dev ppp-dev libgnutls" 3.25 SUGGESTED="xl2tpd pptpclient openvpn" 3.26 +DEPENDS="dbus dbus-helper glib gnutls iptables libgcrypt libnl 3.27 + udev wpa_supplicant" 3.28 +BUILD_DEPENDS="bluez-dev dbus-dev glib-dev gnutls-dev iptables 3.29 + iptables-dev libgnutls libnl-dev ncursesw-dev openconnect 3.30 + openvpn ppp-dev readline-dev udev-dev wpa_supplicant" 3.31 3.32 # Rules to configure and make the package. 3.33 compile_rules() 3.34 { 3.35 # add dependency on libncurses.so, 3.36 - sed -i 's/-lreadline/-lreadline -lncurses/' Makefile.in 3.37 - cd $src 3.38 - ./configure \ 3.39 - --prefix=/usr \ 3.40 - --sysconfdir=/etc \ 3.41 - --localstatedir=/var \ 3.42 - --infodir=/usr/share/info \ 3.43 - --mandir=/usr/share/man \ 3.44 - --disable-gtk-doc \ 3.45 - --disable-neard \ 3.46 - --enable-polkit \ 3.47 - --enable-openconnect \ 3.48 - --enable-vpnc \ 3.49 - --enable-openvpn \ 3.50 - --enable-client \ 3.51 - --enable-test \ 3.52 + sed -i 's/-lreadline/-lreadline -lncurses/' \ 3.53 + Makefile.in 3.54 + 3.55 + # not recognised after 1.21 3.56 +# --disable-gtk-doc 3.57 + 3.58 + ./configure \ 3.59 + --prefix=/usr \ 3.60 + --sysconfdir=/etc \ 3.61 + --localstatedir=/var \ 3.62 + --infodir=/usr/share/info \ 3.63 + --mandir=/usr/share/man \ 3.64 + --disable-neard \ 3.65 + --enable-polkit \ 3.66 + --enable-openconnect \ 3.67 + --enable-vpnc \ 3.68 + --enable-openvpn \ 3.69 + --enable-client \ 3.70 + --enable-test \ 3.71 $CONFIGURE_ARGS && 3.72 - make && make DESTDIR=$DESTDIR install 3.73 + make && 3.74 + make DESTDIR=$DESTDIR install 3.75 } 3.76 3.77 # Rules to gen a SliTaz package suitable for Tazpkg. 3.78 genpkg_rules() 3.79 { 3.80 - # dbus conf 3.81 - mkdir -p $fs/etc 3.82 - cp -a $install/etc/dbus-1 $fs/etc 3.83 - # conman exec 3.84 + # dbus configuration 3.85 + mkdir -p $fs/etc/dbus-1 3.86 + cp -a $install/usr/share/dbus-1/system.d \ 3.87 + $fs/etc/dbus-1 3.88 + 3.89 + # connman exec 3.90 mkdir -p $fs/usr 3.91 - cp -a $install/usr/sbin $fs/usr 3.92 - # libs 3.93 + cp -a $install/usr/sbin $fs/usr 3.94 + 3.95 + # libraries 3.96 mkdir -p $fs/usr/lib/connman/plugins-vpn 3.97 cp -a $install/usr/lib/connman/plugins-vpn/*.so \ 3.98 - $fs/usr/lib/connman/plugins-vpn 3.99 + $fs/usr/lib/connman/plugins-vpn 3.100 # vpn scripts 3.101 mkdir -p $fs/usr/lib/connman/scripts 3.102 - cp -a $install/usr/lib/connman/scripts $fs/usr/lib/connman 3.103 + cp -a $install/usr/lib/connman/scripts \ 3.104 + $fs/usr/lib/connman 3.105 + 3.106 # share 3.107 - cp -a $install/usr/share $fs/usr 3.108 + mkdir -p $fs/usr/share 3.109 + cp -a $install/usr/share/man $fs/usr/share 3.110 + cp -a $install/usr/share/polkit-1 \ 3.111 + $fs/usr/share 3.112 + 3.113 # init script 3.114 - cp -a $stuff/etc $fs 3.115 + cp -a $stuff/etc $fs 3.116 } 3.117 3.118 # Pre and post remove commands for Tazpkg 3.119 post_install() 3.120 { 3.121 - if ! grep -qs ^CONNMAND_OPTIONS "$1/etc/daemons.conf"; then 3.122 + if ! grep -qs ^CONNMAND_OPTIONS "$1/etc/daemons.conf" 3.123 + then 3.124 echo '# Connman daemon options.' >> "$1/etc/daemons.conf" 3.125 echo 'CONNMAND_OPTIONS=""' >> "$1/etc/daemons.conf" 3.126 echo '' >> "$1/etc/daemons.conf" 3.127 fi 3.128 - if [ -z "$1" -a -s /etc/network.conf ]; then 3.129 + 3.130 + if [ -z "$1" -a -s /etc/network.conf ] 3.131 + then 3.132 /etc/init.d/connman start || /etc/init.d/connman restart 3.133 fi 3.134 } 3.135 3.136 pre_remove() 3.137 { 3.138 - if [ -z "$1" ]; then 3.139 + if [ -z "$1" ] 3.140 + then 3.141 /etc/init.d/connman stop 2> /dev/null 3.142 fi 3.143 }