diff options
| -rw-r--r-- | network/avahi/avahi.SlackBuild | 28 | ||||
| -rw-r--r-- | network/avahi/avahi.info | 6 | ||||
| -rw-r--r-- | network/avahi/doinst.sh | 30 |
3 files changed, 33 insertions, 31 deletions
diff --git a/network/avahi/avahi.SlackBuild b/network/avahi/avahi.SlackBuild index eb84934b9ec47..c2e962212327d 100644 --- a/network/avahi/avahi.SlackBuild +++ b/network/avahi/avahi.SlackBuild @@ -2,7 +2,11 @@ # Slackware build script for avahi -# Copyright 2008 David Somero <dsomero@hotmail.com> Athens,TN USA +# Written by David Somero <dsomero@hotmail.com> +# Derived from Slackware's Slackbuilds. +# +# Copyright 2008, 2009 Patrick J. Volkerding, Sebeka, Minnesota, USA +# Copyright 2008-2011 David Somero (dsomero@hotmail.com) Athens, TN, USA # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -11,19 +15,19 @@ # 1. Redistributions of this script must retain the above copyright # notice, this list of conditions and the following disclaimer. # -# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ''AS IS'' AND ANY EXPRESS OR IMPLIED -# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF -# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO -# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, -# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; -# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, -# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR -# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF -# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED +# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF +# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO +# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, +# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; +# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, +# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR +# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF +# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. PRGNAM=avahi -VERSION=0.6.28 +VERSION=0.6.30 BUILD=${BUILD:-1} TAG=${TAG:-_SBo} diff --git a/network/avahi/avahi.info b/network/avahi/avahi.info index 49df5abc66031..bf946d137e3cc 100644 --- a/network/avahi/avahi.info +++ b/network/avahi/avahi.info @@ -1,8 +1,8 @@ PRGNAM="avahi" -VERSION="0.6.28" +VERSION="0.6.30" HOMEPAGE="http://avahi.org/" -DOWNLOAD="http://avahi.org/download/avahi-0.6.28.tar.gz" -MD5SUM="d0143a5aa3265019072e53ab497818d0" +DOWNLOAD="http://avahi.org/download/avahi-0.6.30.tar.gz" +MD5SUM="e4db89a2a403ff4c47d66ac66fad1f43" DOWNLOAD_x86_64="" MD5SUM_x86_64="" MAINTAINER="David Somero" diff --git a/network/avahi/doinst.sh b/network/avahi/doinst.sh index a6a2efd52c37b..d22f3fa39410c 100644 --- a/network/avahi/doinst.sh +++ b/network/avahi/doinst.sh @@ -11,24 +11,22 @@ config() { # Otherwise, we leave the .new copy for the admin to consider... } -# Keep same perms on rc.avahidaemon.new: -if [ -e etc/rc.d/rc.avahidaemon ]; then - cp -a etc/rc.d/rc.avahidaemon etc/rc.d/rc.avahidaemon.new.incoming - cat etc/rc.d/rc.avahidaemon.new > etc/rc.d/rc.avahidaemon.new.incoming - mv etc/rc.d/rc.avahidaemon.new.incoming etc/rc.d/rc.avahidaemon.new -fi +preserve_perms() { + NEW="$1" + OLD="$(dirname $NEW)/$(basename $NEW .new)" + if [ -e $OLD ]; then + cp -a $OLD ${NEW}.incoming + cat $NEW > ${NEW}.incoming + mv ${NEW}.incoming $NEW + fi + config $NEW +} -# Keep same perms on rc.avahidnsconfd.new: -if [ -e etc/rc.d/rc.avahidnsconfd ]; then - cp -a etc/rc.d/rc.avahidnsconfd etc/rc.d/rc.avahidnsconfd.new.incoming - cat etc/rc.d/rc.avahidnsconfd.new > etc/rc.d/rc.avahidnsconfd.new.incoming - mv etc/rc.d/rc.avahidnsconfd.new.incoming etc/rc.d/rc.avahidnsconfd.new -fi -config etc/rc.d/rc.avahidaemon.new -config etc/rc.d/rc.avahidnsconfd.new -config etc/avahi/avahi-daemon.conf.new -config etc/dbus-1/system.d/avahi-dbus.conf.new +preserve_perms etc/rc.d/rc.avahidaemon.new +preserve_perms etc/rc.d/rc.avahidnsconfd.new +preserve_perms etc/avahi/avahi-daemon.conf.new +preserve_perms etc/dbus-1/system.d/avahi-dbus.conf.new if [ -x /usr/bin/update-desktop-database ]; then /usr/bin/update-desktop-database -q usr/share/applications >/dev/null 2>&1 |