wok-next rev 18668
Change messaging... (again); libgtop-dev, libsecret-dev: implicit dependencies don't works?
| author | Aleksej Bobylev <al.bobylev@gmail.com> |
|---|---|
| date | Fri Dec 04 17:18:44 2015 +0200 (2015-12-04) |
| parents | d5f9f516b706 |
| children | e56b92028f72 |
| files | backuppc/receipt barnyard2/receipt beep/receipt bind-client/receipt blinder-theme/receipt bootchart/receipt boxbackup-client/receipt boxbackup-server/receipt libgtop-dev/receipt libsecret-dev/receipt wget/receipt |
line diff
1.1 --- a/backuppc/receipt Fri Dec 04 16:32:53 2015 +0200 1.2 +++ b/backuppc/receipt Fri Dec 04 17:18:44 2015 +0200 1.3 @@ -73,6 +73,7 @@ 1.4 /etc/init.d/apache start 1.5 fi 1.6 cat <<EOT 1.7 + 1.8 Now you should : 1.9 - append $1/etc/BackupPC/.ssh/id_rsa.pub to every unix client /root/.ssh/authorized_keys file 1.10 - update \$Conf{CgiAdminUsers} in $1/etc/BackupPC/config.pl
2.1 --- a/barnyard2/receipt Fri Dec 04 16:32:53 2015 +0200 2.2 +++ b/barnyard2/receipt Fri Dec 04 17:18:44 2015 +0200 2.3 @@ -16,38 +16,38 @@ 2.4 # Rules to configure and make the package. 2.5 compile_rules() 2.6 { 2.7 - cd $src 2.8 - ./configure --sysconfdir=/etc/barnyard2 $CONFIGURE_ARGS && make && make install 2.9 + ./configure \ 2.10 + --sysconfdir=/etc/barnyard2 \ 2.11 + $CONFIGURE_ARGS && 2.12 + make && make install 2.13 } 2.14 2.15 # Rules to gen a SliTaz package suitable for Tazpkg. 2.16 genpkg_rules() 2.17 { 2.18 - 2.19 cp -a $install/* $fs 2.20 - 2.21 - mkdir -p /var/log/barnyard2 2.22 + mkdir -p $fs/var/log/barnyard2 2.23 } 2.24 2.25 # Post install commands 2.26 post_install() 2.27 { 2.28 - echo "Processing post install commands..." 2.29 + [ -z "$quiet" ] && echo 2.30 2.31 - # addgroup snort if needed 2.32 - if ! grep -q 'snort:' $1/etc/group; then 2.33 - echo -n "Adding group Snort..." 2.34 - chroot $1/ /bin/addgroup snort 2.35 - status 2.36 - fi 2.37 - # adduser snort if needed 2.38 - if ! grep -q 'snort:' $1/etc/passwd; then 2.39 - echo -n "Adding user Snort..." 2.40 - chroot $1/ /bin/adduser -s /bin/false -h /dev/null \ 2.41 - -g "Snort Daemon user" -H -D -S -G snort snort 2.42 - status 2.43 - fi 2.44 + # addgroup snort if needed 2.45 + if ! grep -q 'snort:' "$1/etc/group"; then 2.46 + action 'Adding group Snort...' 2.47 + chroot "$1/" /bin/addgroup snort 2.48 + status 2.49 + fi 2.50 2.51 - chroot $1/ chown snort.snort /var/log/barnyard2 2.52 + # adduser snort if needed 2.53 + if ! grep -q 'snort:' $1/etc/passwd; then 2.54 + action 'Adding user Snort...' 2.55 + chroot "$1/" /bin/adduser -s /bin/false -h /dev/null \ 2.56 + -g "Snort Daemon user" -H -D -S -G snort snort 2.57 + status 2.58 + fi 2.59 + 2.60 + chroot "$1/" chown snort.snort /var/log/barnyard2 2.61 } 2.62 -
3.1 --- a/beep/receipt Fri Dec 04 16:32:53 2015 +0200 3.2 +++ b/beep/receipt Fri Dec 04 17:18:44 2015 +0200 3.3 @@ -13,7 +13,6 @@ 3.4 # Rules to configure and make the package. 3.5 compile_rules() 3.6 { 3.7 - cd $src 3.8 make 3.9 } 3.10 3.11 @@ -24,13 +23,7 @@ 3.12 cp $src/beep $fs/usr/bin 3.13 } 3.14 3.15 -# Overlap busybox 3.16 -pre_install() 3.17 -{ 3.18 - rm -f $1/usr/bin/beep 3.19 -} 3.20 - 3.21 post_remove() 3.22 { 3.23 - ln -s /bin/busybox /usr/bin/beep 3.24 + ln -s /bin/busybox "$1/usr/bin/beep" 3.25 }
4.1 --- a/bind-client/receipt Fri Dec 04 16:32:53 2015 +0200 4.2 +++ b/bind-client/receipt Fri Dec 04 17:18:44 2015 +0200 4.3 @@ -18,14 +18,7 @@ 4.4 cp -a $install/usr/bin $fs/usr 4.5 } 4.6 4.7 -# Overlap busybox 4.8 -pre_install() 4.9 -{ 4.10 - rm -f $1/usr/bin/nslookup 4.11 -} 4.12 - 4.13 post_remove() 4.14 { 4.15 - ln -s /bin/busybox $1/usr/bin/nslookup 4.16 + ln -s /bin/busybox "$1/usr/bin/nslookup" 4.17 } 4.18 -
5.1 --- a/blinder-theme/receipt Fri Dec 04 16:32:53 2015 +0200 5.2 +++ b/blinder-theme/receipt Fri Dec 04 17:18:44 2015 +0200 5.3 @@ -13,11 +13,6 @@ 5.4 # Rules to gen a SliTaz package suitable for Tazpkg. 5.5 genpkg_rules() 5.6 { 5.7 - mkdir -p $fs/usr/share/themes 5.8 - cp -a stuff/* $fs/usr/share/themes 5.9 + mkdir -p $fs/usr/share/themes 5.10 + cp -a stuff/* $fs/usr/share/themes 5.11 } 5.12 - 5.13 -post_install() 5.14 -{ 5.15 - tazbox notify "Blinder Theme \n\n Successfully installed!" 5.16 -} 5.17 \ No newline at end of file
6.1 --- a/bootchart/receipt Fri Dec 04 16:32:53 2015 +0200 6.2 +++ b/bootchart/receipt Fri Dec 04 17:18:44 2015 +0200 6.3 @@ -37,6 +37,7 @@ 6.4 root_dev=`sed -n 's/.*root=\([^ ]*\).*/\1/p' "$MENU" | head -n1` 6.5 grub_dev=`sed -n '/^[^#]*root.* (/p' "$MENU" | head -n1` 6.6 # Add new kernel entry for bootchart and display information message 6.7 + echo 6.8 echo "----" 6.9 echo "GRUB is installed, these tree lines has been added to the menu.lst:" 6.10 tee -a "$MENU" << EOT 6.11 @@ -47,6 +48,7 @@ 6.12 EOT 6.13 echo "----" 6.14 else 6.15 + echo 6.16 echo "Grub menu.lst seems already configured to boot new Kernel..." 6.17 fi 6.18 fi
7.1 --- a/boxbackup-client/receipt Fri Dec 04 16:32:53 2015 +0200 7.2 +++ b/boxbackup-client/receipt Fri Dec 04 17:18:44 2015 +0200 7.3 @@ -13,7 +13,7 @@ 7.4 7.5 DEPENDS="db libedit libssl perl zlib gcc-lib-base" 7.6 7.7 -# Configuration variables 7.8 +# Configuration variables 7.9 CONF_DIR="/etc/boxbackup" 7.10 DATA_DIR="/var/lib/bbackupd" 7.11 RUN_DMON=0 7.12 @@ -33,7 +33,7 @@ 7.13 pre_install() 7.14 { 7.15 # Stop daemon 7.16 - if [ -e /var/run/bbackupd.pid ]; then 7.17 + if [ -z "$1" -a -e /var/run/bbackupd.pid ]; then 7.18 /etc/init.d/bbackupd stop 7.19 RUN_DMON=1 7.20 fi 7.21 @@ -42,13 +42,13 @@ 7.22 post_install() 7.23 { 7.24 # Creating conf dir 7.25 - if [ ! -e $1/$CONF_DIR ]; then 7.26 - mkdir -p $1/$CONF_DIR && chmod 755 $1/$CONF_DIR 7.27 + if [ ! -e "$1/$CONF_DIR" ]; then 7.28 + mkdir -p "$1/$CONF_DIR" && chmod 755 "$1/$CONF_DIR" 7.29 fi 7.30 - if [ ! -e $1/$DATA_DIR ]; then 7.31 - mkdir -p $1/$DATA_DIR && chmod 700 $1/$DATA_DIR 7.32 + if [ ! -e "$1/$DATA_DIR" ]; then 7.33 + mkdir -p "$1/$DATA_DIR" && chmod 700 "$1/$DATA_DIR" 7.34 fi 7.35 - if [ -z $1 ]; then 7.36 + if [ -z "$1" ]; then 7.37 # Start daemon (if stopped by install) 7.38 if [ $RUN_DMON -eq 1 ]; then 7.39 /etc/init.d/bbackupd start 7.40 @@ -60,8 +60,8 @@ 7.41 7.42 pre_remove() 7.43 { 7.44 - # Stop daemon 7.45 - if [ -z $1 ]; then 7.46 + # Stop daemon 7.47 + if [ -z "$1" ]; then 7.48 if [ -e /var/run/bbackupd.pid ]; then 7.49 /etc/init.d/bbackupd stop 7.50 fi 7.51 @@ -71,14 +71,15 @@ 7.52 post_remove() 7.53 { 7.54 # Delete DATA directory 7.55 - rm -rf $1/$DATA_DIR 7.56 + rm -rf "$1/$DATA_DIR" 7.57 7.58 # Delete Client config files 7.59 - rm -rf $1/$CONF_DIR/bbackupd* 7.60 + rm -rf "$1/$CONF_DIR"/bbackupd* 7.61 7.62 # Delete CONF dir (if empty) 7.63 if [ $(ls -lA $CONF_DIR | wc -l) -eq 0 ]; then 7.64 - echo -n "Removing $CONF_DIR..." 7.65 + echo 7.66 + action "Removing $CONF_DIR..." 7.67 rm -rf $1/$CONF_DIR 7.68 status 7.69 fi
8.1 --- a/boxbackup-server/receipt Fri Dec 04 16:32:53 2015 +0200 8.2 +++ b/boxbackup-server/receipt Fri Dec 04 17:18:44 2015 +0200 8.3 @@ -53,7 +53,7 @@ 8.4 pre_install() 8.5 { 8.6 # Stop daemon 8.7 - if [ -e /var/run/bbstored.pid ]; then 8.8 + if [ -z "$1" -a -e /var/run/bbstored.pid ]; then 8.9 /etc/init.d/bbstored stop 8.10 fi 8.11 } 8.12 @@ -67,7 +67,8 @@ 8.13 8.14 # adduser BBUSER if needed 8.15 if ! grep -q $BBUSER $1/etc/passwd; then 8.16 - echo -n "Adding user '$BBUSER'..." 8.17 + echo 8.18 + action "Adding user '$BBUSER'..." 8.19 echo $BBUSER':x:505:505:BoxBackup Network Backup:/dev/null:/bin/false' >> $1/etc/passwd 8.20 echo $BBUSER':!:14013:0:99999:7:::' >> $1/etc/shadow 8.21 echo $BBUSER':x:505:' >> $1/etc/group 8.22 @@ -84,7 +85,7 @@ 8.23 8.24 if [ ! -e $1$DATA_DIR/backup ]; then 8.25 # Creating backup dir 8.26 - echo -n "Creating backup directory..." 8.27 + action "Creating backup directory..." 8.28 mkdir -p $1$DATA_DIR/backup && 8.29 chroot $1/ chown -R $BBUSER $DATA_DIR && 8.30 chmod -R 700 $1$DATA_DIR 8.31 @@ -93,7 +94,7 @@ 8.32 8.33 if [ ! -e $1$CONF_DIR/raidfile.conf ]; then 8.34 # RAID Setup 8.35 - echo -n "Disabling deprecated userland RAID..." 8.36 + action "Disabling deprecated userland RAID..." 8.37 chroot $1/ /usr/bin/raidfile-config $CONF_DIR 2048 $DATA_DIR 2>1 > /dev/null 8.38 status 8.39 chroot $1/ chown -R $BBUSER $CONF_DIR/raidfile.conf && 8.40 @@ -102,7 +103,7 @@ 8.41 8.42 if [ ! -e $1$CONF_DIR/bbstored.conf ]; then 8.43 # Setting hostname 8.44 - echo -n "Setting hostname... " 8.45 + action "Setting hostname... " 8.46 if [ $(chroot $1/ hostname -f 2>1 > /dev/null;echo $?) -eq 0 ]; then 8.47 HOSTNAME=$(chroot $1/ hostname -f) 8.48 fi 8.49 @@ -113,17 +114,17 @@ 8.50 echo $HOSTNAME 8.51 8.52 # Setting up the CA environment 8.53 - echo -n "Creating certificates..." 8.54 + action "Creating certificates..." 8.55 chroot $1/ /usr/bin/bbstored-certs $CA_DIR init 2>1 > /dev/null 8.56 status 8.57 8.58 # Generate server certificate request 8.59 - echo -n "Generate server certificate request..." 8.60 + action "Generate server certificate request..." 8.61 chroot $1/ bbstored-config $CONF_DIR $HOSTNAME $BBUSER 2>1 > /dev/null 8.62 status 8.63 8.64 # Sign the server certificate 8.65 - echo -n "Sign the server certificate..." 8.66 + action "Sign the server certificate..." 8.67 chroot $1/ openssl x509 -req -sha1 -extensions usr_crt \ 8.68 -in $CONF_DIR/$BBUSER/${HOSTNAME}-csr.pem \ 8.69 -CA $CA_DIR/roots/serverCA.pem \ 8.70 @@ -133,10 +134,10 @@ 8.71 status 8.72 8.73 # Preparing the server certificates 8.74 - echo -n "Installing server certificate..." 8.75 + action "Installing server certificate..." 8.76 cp -a $1$CA_DIR/servers/${HOSTNAME}-cert.pem $1$CONF_DIR/$BBUSER 8.77 status 8.78 - echo -n "Installing client certificate..." 8.79 + action "Installing client certificate..." 8.80 cp -a $1$CA_DIR/roots/clientCA.pem $1$CONF_DIR/$BBUSER 8.81 status 8.82 8.83 @@ -165,20 +166,21 @@ 8.84 8.85 post_remove() 8.86 { 8.87 + echo 8.88 if grep -q $BBUSER $1/etc/passwd; then 8.89 - echo -n "Removing $BBUSER user..." 8.90 + action "Removing $BBUSER user..." 8.91 deluser bbstored 8.92 status 8.93 fi 8.94 # Delete data 8.95 if [ -e $DATA_DIR ]; then 8.96 - echo -n "Removing all backup data..." 8.97 + action "Removing all backup data..." 8.98 rm -r $DATA_DIR 8.99 status 8.100 fi 8.101 # Delete bbstored conf files 8.102 if [ -e $CONF_DIR/bbstored.conf ]; then 8.103 - echo -n "Removing config files..." 8.104 + action "Removing config files..." 8.105 rm -rf $CONF_DIR/bbstored 8.106 rm -f $CONF_DIR/raidfile.conf 8.107 rm -f $CONF_DIR/bbstored.conf 8.108 @@ -186,13 +188,13 @@ 8.109 fi 8.110 # Delete certificates 8.111 if [ -e $CA_DIR ]; then 8.112 - echo -n "Removing certificates..." 8.113 - rm -r $CA_DIR 8.114 + action "Removing certificates..." 8.115 + rm -r $CA_DIR 8.116 status 8.117 - fi 8.118 + fi 8.119 # Delete $CONF_DIR (if empty) 8.120 if [ $(ls -lA $CONF_DIR | wc -l) -eq 0 ]; then 8.121 - echo -n "Removing $CONF_DIR..." 8.122 + action "Removing $CONF_DIR..." 8.123 rm -r $CONF_DIR 8.124 status 8.125 fi
9.1 --- a/libgtop-dev/receipt Fri Dec 04 16:32:53 2015 +0200 9.2 +++ b/libgtop-dev/receipt Fri Dec 04 17:18:44 2015 +0200 9.3 @@ -7,9 +7,9 @@ 9.4 MAINTAINER="pascal.bellard@slitaz.org" 9.5 LICENSE="GPL2" 9.6 WEB_SITE="http://www.gnome.org" 9.7 + 9.8 WANTED="libgtop" 9.9 - 9.10 -DEPENDS="pkg-config" 9.11 +DEPENDS="libgtop pkg-config" 9.12 9.13 # Rules to gen a SliTaz package suitable for Tazpkg. 9.14 genpkg_rules() 9.15 @@ -19,4 +19,3 @@ 9.16 cp -a $install/usr/lib/*a $fs/usr/lib 9.17 cp -a $install/usr/lib/pkgconfig $fs/usr/lib 9.18 } 9.19 -
10.1 --- a/libsecret-dev/receipt Fri Dec 04 16:32:53 2015 +0200 10.2 +++ b/libsecret-dev/receipt Fri Dec 04 17:18:44 2015 +0200 10.3 @@ -6,10 +6,12 @@ 10.4 SHORT_DESC="libsecret Secret Service API devel files." 10.5 MAINTAINER="devl547@gmail.com" 10.6 LICENSE="LGPL2.1" 10.7 -WANTED="libsecret" 10.8 WEB_SITE="http://gnome.org" 10.9 HOST_ARCH="i486 arm" 10.10 10.11 +WANTED="libsecret" 10.12 +DEPENDS="libsecret" 10.13 + 10.14 # Rules to gen a SliTaz package suitable for Tazpkg. 10.15 genpkg_rules() 10.16 {