wok-next rev 20286
remove ppp-dev, ppp-pam
| author | Pascal Bellard <pascal.bellard@slitaz.org> |
|---|---|
| date | Wed Nov 08 15:57:06 2017 +0100 (2017-11-08) |
| parents | b8b371b1b165 |
| children | 3d64683c6590 |
| files | ppp-dev/receipt ppp-pam/receipt ppp/receipt |
line diff
1.1 --- a/ppp-dev/receipt Wed Nov 08 15:39:43 2017 +0100 1.2 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 1.3 @@ -1,19 +0,0 @@ 1.4 -# SliTaz package receipt. 1.5 - 1.6 -PACKAGE="ppp-dev" 1.7 -VERSION="2.4.7" 1.8 -CATEGORY="development" 1.9 -SHORT_DESC="Point-to-Point Protocol (PPP) development files." 1.10 -MAINTAINER="pankso@slitaz.org" 1.11 -LICENSE="BSD GPL" 1.12 -WEB_SITE="http://ppp.samba.org/" 1.13 -HOST_ARCH="i486 arm" 1.14 - 1.15 -WANTED="ppp" 1.16 -DEPENDS="ppp" 1.17 - 1.18 -# Rules to gen a SliTaz package suitable for Tazpkg. 1.19 -genpkg_rules() 1.20 -{ 1.21 - copy include/ 1.22 -}
2.1 --- a/ppp-pam/receipt Wed Nov 08 15:39:43 2017 +0100 2.2 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 2.3 @@ -1,41 +0,0 @@ 2.4 -# SliTaz package receipt. 2.5 - 2.6 -PACKAGE="ppp-pam" 2.7 -VERSION="2.4.7" 2.8 -CATEGORY="network" 2.9 -SHORT_DESC="Implements the Point-to-Point Protocol (PPP) with PAM support." 2.10 -MAINTAINER="pascal.bellard@slitaz.org" 2.11 -LICENSE="BSD GPL" 2.12 -WEB_SITE="http://ppp.samba.org/" 2.13 -CONFIG_FILES="/etc/ppp/options /etc/ppp/*secrets" 2.14 -PROVIDE="ppp:pam" 2.15 - 2.16 -TARBALL="ppp-$VERSION.tar.gz" 2.17 -WGET_URL="$GITHUB/paulusmack/ppp/tarball/ppp-$VERSION" 2.18 - 2.19 -DEPENDS="pam" 2.20 -BUILD_DEPENDS="pam-dev" 2.21 -SIBLINGS="ppp" 2.22 - 2.23 -# Rules to configure and make the package. 2.24 -compile_rules() 2.25 -{ 2.26 - sed -i 's/#USE_PAM/USE_PAM/' pppd/Makefile.linux 2.27 - 2.28 - ./configure $CONFIGURE_ARGS && 2.29 - make && 2.30 - make DESTDIR=$DESTDIR/usr install 2.31 -} 2.32 - 2.33 -# Rules to gen a SliTaz package suitable for Tazpkg. 2.34 -genpkg_rules() 2.35 -{ 2.36 - mkdir -p $fs/usr 2.37 - cp -a $install/usr/sbin $fs/usr 2.38 - [ -d "$install/usr/lib" ] && cp -a $install/usr/lib $fs/usr 2.39 -} 2.40 - 2.41 -pre_remove() 2.42 -{ 2.43 - tazpkg get-install ppp 2.44 -}
3.1 --- a/ppp/receipt Wed Nov 08 15:39:43 2017 +0100 3.2 +++ b/ppp/receipt Wed Nov 08 15:57:06 2017 +0100 3.3 @@ -1,9 +1,9 @@ 3.4 -# SliTaz package receipt. 3.5 +# SliTaz package receipt v2. 3.6 3.7 PACKAGE="ppp" 3.8 VERSION="2.4.7" 3.9 CATEGORY="network" 3.10 -SHORT_DESC="Implements the Point-to-Point Protocol (PPP)." 3.11 +SHORT_DESC="Implements the Point-to-Point Protocol (PPP)" 3.12 MAINTAINER="pankso@slitaz.org" 3.13 LICENSE="BSD GPL" 3.14 WEB_SITE="http://ppp.samba.org/" 3.15 @@ -13,8 +13,8 @@ 3.16 3.17 TARBALL="$PACKAGE-$VERSION.tar.gz" 3.18 WGET_URL="$GITHUB/paulusmack/ppp/tarball/ppp-$VERSION" 3.19 - 3.20 -SIBLINGS="ppp-pam" 3.21 +BUILD_DEPENDS="pam-dev" 3.22 +SPLIT="ppp ppp-pam ppp-dev" 3.23 3.24 # Rules to configure and make the package. 3.25 compile_rules() 3.26 @@ -24,36 +24,47 @@ 3.27 export PATH=/cross/arm/tools/arm-slitaz-linux-gnueabi/bin:$PATH 3.28 esac 3.29 3.30 + cp -a $src $src-pam 3.31 ./configure $CONFIGURE_ARGS && 3.32 make && 3.33 make DESTDIR=$DESTDIR/usr install 3.34 + 3.35 + cd $src-pam 3.36 + sed -i 's/#USE_PAM/USE_PAM/' pppd/Makefile.linux 3.37 + ./configure $CONFIGURE_ARGS && 3.38 + make && 3.39 + make DESTDIR=$DESTDIR-pam/usr install 3.40 } 3.41 3.42 # Rules to gen a SliTaz package suitable for Tazpkg. 3.43 genpkg_rules() 3.44 { 3.45 - mkdir -p $fs/usr $fs/var/www/tazpanel/menu.d/network/VPN 3.46 - cp -a $install/usr/sbin $fs/usr 3.47 - [ -d "$install/usr/lib" ] && cp -a $install/usr/lib $fs/usr 3.48 - cp -a $stuff/ppp.cgi $fs/var/www/tazpanel 3.49 - ln -s ../../ppp.cgi $fs/var/www/tazpanel/menu.d/network/ppp 3.50 - ln -s ../../../ppp.cgi $fs/var/www/tazpanel/menu.d/network/VPN/ppp 3.51 + case $PACKAGE in 3.52 + ppp|ppp-pam) 3.53 + [ $PACKAGE == ppp-pam ] && DEPENDS="pam" && PROVIDE="ppp:pam" && 3.54 + CAT="network|with PAM support" && install=$install-pam 3.55 + mkdir -p $fs/usr $fs/var/www/tazpanel/menu.d/network/VPN 3.56 + cp -a $install/usr/sbin $fs/usr 3.57 + [ -d "$install/usr/lib" ] && cp -a $install/usr/lib $fs/usr 3.58 + cp -a $stuff/ppp.cgi $fs/var/www/tazpanel 3.59 + ln -s ../../ppp.cgi $fs/var/www/tazpanel/menu.d/network/ppp 3.60 + ln -s ../../../ppp.cgi $fs/var/www/tazpanel/menu.d/network/VPN/ppp 3.61 3.62 - # Config files. 3.63 - mkdir -p $fs/etc/ppp/scripts $fs/etc/ppp/ip-up.d $fs/etc/ppp/ip-down.d 3.64 - cp $stuff/README.scripts $fs/etc/ppp 3.65 - cp -a $src/etc.ppp/* $fs/etc/ppp 3.66 + # Config files. 3.67 + mkdir -p $fs/etc/ppp/scripts $fs/etc/ppp/ip-up.d $fs/etc/ppp/ip-down.d 3.68 + cp $stuff/README.scripts $fs/etc/ppp 3.69 + cp -a $src/etc.ppp/* $fs/etc/ppp 3.70 3.71 - # PPP scripts. 3.72 - cp -a $src/scripts/ppp-on $fs/etc/ppp/scripts 3.73 - cp -a $src/scripts/ppp-on-dialer $fs/etc/ppp/scripts 3.74 - sed -i 's:ppp/ppp-on-dialer:ppp/scripts/ppp-on-dialer:' \ 3.75 - $fs/etc/ppp/scripts/ppp-on 3.76 + # PPP scripts. 3.77 + cp -a $src/scripts/ppp-on $fs/etc/ppp/scripts 3.78 + cp -a $src/scripts/ppp-on-dialer $fs/etc/ppp/scripts 3.79 + sed -i 's:ppp/ppp-on-dialer:ppp/scripts/ppp-on-dialer:' \ 3.80 + $fs/etc/ppp/scripts/ppp-on 3.81 3.82 - cp -a $src/scripts/ppp-off $fs/etc/ppp/scripts 3.83 - cp -a $src/scripts/callback $fs/etc/ppp/scripts 3.84 - cp -a $src/scripts/redialer $fs/etc/ppp/scripts 3.85 - cat >> $fs/etc/ppp/ip-up <<EOT 3.86 + cp -a $src/scripts/ppp-off $fs/etc/ppp/scripts 3.87 + cp -a $src/scripts/callback $fs/etc/ppp/scripts 3.88 + cp -a $src/scripts/redialer $fs/etc/ppp/scripts 3.89 + cat >> $fs/etc/ppp/ip-up <<EOT 3.90 #!/bin/sh 3.91 3.92 if [ -x /etc/ppp/ip-up.d/\$6 ]; then 3.93 @@ -72,7 +83,7 @@ 3.94 fi 3.95 fi 3.96 EOT 3.97 - cat >> $fs/etc/ppp/ip-down <<EOT 3.98 + cat >> $fs/etc/ppp/ip-down <<EOT 3.99 #!/bin/sh 3.100 3.101 if [ -x /etc/ppp/ip-down.d/\$6 ]; then 3.102 @@ -86,16 +97,22 @@ 3.103 fi 3.104 fi 3.105 EOT 3.106 - # cp -a $src/scripts/ip-up.local.add $fs/etc/ppp/ip-up 3.107 - # cp -a $src/scripts/ip-down.local.add $fs/etc/ppp/ip-down 3.108 - chmod 711 $fs/etc/ppp/ip-up $fs/etc/ppp/ip-down 3.109 + # cp -a $src/scripts/ip-up.local.add $fs/etc/ppp/ip-up 3.110 + # cp -a $src/scripts/ip-down.local.add $fs/etc/ppp/ip-down 3.111 + chmod 711 $fs/etc/ppp/ip-up $fs/etc/ppp/ip-down 3.112 3.113 - # insert #!/bin/sh on top line in ip* scripts 3.114 - sed -i '1i\#!/bin/sh' $fs/etc/ppp/ip* 2>/dev/null 3.115 - # add empty peers dir 3.116 - mkdir -p $fs/etc/ppp/peers 3.117 - # hide login/pass from regular users 3.118 - chmod go-rwx $fs/etc/ppp/*secrets 3.119 - chmod go-rwx $fs/etc/ppp/options 3.120 - chmod 711 $fs/etc/ppp/scripts/* 3.121 + # insert #!/bin/sh on top line in ip* scripts 3.122 + sed -i '1i\#!/bin/sh' $fs/etc/ppp/ip* 2>/dev/null 3.123 + # add empty peers dir 3.124 + mkdir -p $fs/etc/ppp/peers 3.125 + # hide login/pass from regular users 3.126 + chmod go-rwx $fs/etc/ppp/*secrets 3.127 + chmod go-rwx $fs/etc/ppp/options 3.128 + chmod 711 $fs/etc/ppp/scripts/* 3.129 + ;; 3.130 + ppp-dev) 3.131 + CAT="development|development files" 3.132 + copy include/ 3.133 + ;; 3.134 + esac 3.135 }