wok-next rev 18968
Up slitaz-configs(274), tazpkg(899); fix deps in libnotify-dev
Change post_install messaging in bash, dropbear
Change post_install messaging in bash, dropbear
author | Aleksej Bobylev <al.bobylev@gmail.com> |
---|---|
date | Fri Mar 11 15:31:29 2016 +0200 (2016-03-11) |
parents | bdbe0c96744b |
children | a70cb5c35d8f |
files | bash/receipt dropbear/receipt libnotify-dev/receipt slitaz-configs-base/receipt slitaz-configs/receipt tazpkg/receipt |
line diff
1.1 --- a/bash/receipt Fri Mar 11 12:19:47 2016 +0100 1.2 +++ b/bash/receipt Fri Mar 11 15:31:29 2016 +0200 1.3 @@ -93,7 +93,7 @@ 1.4 mkdir -p "$1/etc/skel"; cp -a "$1/etc/bashrc" "$1/etc/skel/.bashrc" 1.5 1.6 # Exit function in non-interactive mode (when user can't answer question) 1.7 - tty -s || return 1.8 + ! tty -s && return 1.9 1.10 echo -n 'Do you want to set Bash to default (y/N) ? : ' 1.11 read -t 30 answer
2.1 --- a/dropbear/receipt Fri Mar 11 12:19:47 2016 +0100 2.2 +++ b/dropbear/receipt Fri Mar 11 15:31:29 2016 +0200 2.3 @@ -34,7 +34,7 @@ 2.4 DROPBEARS="dropbearkey dropbearconvert dbclient scp" 2.5 sed -i -e 's|/usr/.*/xauth|/usr/bin/xauth|' \ 2.6 -e 's|/usr/.*/sftp-server|/usr/sbin/sftp-server|' \ 2.7 - -e 's|ENABLE_SVR_PAM_AUTH|ENABLE_SVR_PASSWORD_AUTH|' \ 2.8 + -e 's|ENABLE_SVR_PAM_AUTH|ENABLE_SVR_PASSWORD_AUTH|' \ 2.9 options.h 2.10 ./configure --prefix=/usr --without-pam $CONFIGURE_ARGS $CROSS_ARGS && 2.11 make PROGRAMS="dropbear $DROPBEARS" MULTI=1 SCPPROGRESS=1 && 2.12 @@ -97,6 +97,7 @@ 2.13 grep -q ssh "$1/etc/inetd.conf" || cat >> "$1/etc/inetd.conf" <<EOT 2.14 #ssh stream tcp nowait root dropbear dropbear -i -b /etc/dropbear/banner 2.15 EOT 2.16 + [ -n "$quiet" ] && return 2.17 echo -e "\nTo starts $PACKAGE server you can run :\n" 2.18 echo "/etc/init.d/$PACKAGE start" 2.19 echo -e "Or add $PACKAGE to RUN_DAEMONS in /etc/rcS.conf\n"
3.1 --- a/libnotify-dev/receipt Fri Mar 11 12:19:47 2016 +0100 3.2 +++ b/libnotify-dev/receipt Fri Mar 11 15:31:29 2016 +0200 3.3 @@ -6,18 +6,17 @@ 3.4 SHORT_DESC="Notification library" 3.5 MAINTAINER="fabrice.thiroux@free.fr" 3.6 LICENSE="LGPL2.1" 3.7 -WANTED="libnotify" 3.8 WEB_SITE="http://www.galago-project.org/" 3.9 HOST_ARCH="i486 arm" 3.10 3.11 -DEPENDS="libnotify dbus-glib-dev pkg-config" 3.12 +WANTED="libnotify" 3.13 +DEPENDS="libnotify gdk-pixbuf-dev glib-dev libgio-dev dbus-glib-dev" 3.14 3.15 # Rules to gen a SliTaz package suitable for Tazpkg. 3.16 genpkg_rules() 3.17 { 3.18 - mkdir -p $fs/usr/lib 3.19 - cp -a $install/usr/include $fs/usr 3.20 - cp -a $install/usr/lib/*.*a $fs/usr/lib 3.21 - cp -a $install/usr/lib/pkgconfig $fs/usr/lib 3.22 + mkdir -p $fs/usr/lib 3.23 + cp -a $install/usr/include $fs/usr 3.24 + cp -a $install/usr/lib/*.*a $fs/usr/lib 3.25 + cp -a $install/usr/lib/pkgconfig $fs/usr/lib 3.26 } 3.27 -
4.1 --- a/slitaz-configs-base/receipt Fri Mar 11 12:19:47 2016 +0100 4.2 +++ b/slitaz-configs-base/receipt Fri Mar 11 15:31:29 2016 +0200 4.3 @@ -1,7 +1,7 @@ 4.4 # SliTaz package receipt. 4.5 4.6 PACKAGE="slitaz-configs-base" 4.7 -VERSION="273" 4.8 +VERSION="274" 4.9 CATEGORY="base-system" 4.10 SHORT_DESC="SliTaz config files for text based systems." 4.11 MAINTAINER="pankso@slitaz.org"
5.1 --- a/slitaz-configs/receipt Fri Mar 11 12:19:47 2016 +0100 5.2 +++ b/slitaz-configs/receipt Fri Mar 11 15:31:29 2016 +0200 5.3 @@ -1,7 +1,7 @@ 5.4 # SliTaz package receipt. 5.5 5.6 PACKAGE="slitaz-configs" 5.7 -VERSION="273" 5.8 +VERSION="274" 5.9 CATEGORY="base-system" 5.10 SHORT_DESC="SliTaz config files and artwork." 5.11 MAINTAINER="pankso@slitaz.org"
6.1 --- a/tazpkg/receipt Fri Mar 11 12:19:47 2016 +0100 6.2 +++ b/tazpkg/receipt Fri Mar 11 15:31:29 2016 +0200 6.3 @@ -1,7 +1,7 @@ 6.4 # SliTaz package receipt. 6.5 6.6 PACKAGE="tazpkg" 6.7 -VERSION="898" 6.8 +VERSION="899" 6.9 CATEGORY="base-system" 6.10 SHORT_DESC="SliTaz packages manager" 6.11 MAINTAINER="pankso@slitaz.org" 6.12 @@ -14,7 +14,7 @@ 6.13 6.14 DEPENDS="busybox gettext-base" 6.15 SUGGESTED="tazpanel" 6.16 -BUILD_DEPENDS="gettext tidy-html5" 6.17 +BUILD_DEPENDS="gettext tidy-html5 libnotify-dev" 6.18 6.19 # Gettext is part of cross-chroot 6.20 case "$ARCH" in