diff options
Diffstat (limited to 'network/avahi/avahi.SlackBuild')
| -rw-r--r-- | network/avahi/avahi.SlackBuild | 52 |
1 files changed, 37 insertions, 15 deletions
diff --git a/network/avahi/avahi.SlackBuild b/network/avahi/avahi.SlackBuild index 87ed347164..e81a77cc29 100644 --- a/network/avahi/avahi.SlackBuild +++ b/network/avahi/avahi.SlackBuild @@ -23,11 +23,15 @@ # OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +# 20220301 bkw: Modified by SlackBuilds.org, BUILD=7: +# - don't include empty /run dir in package. +# - remove useless INSTALL from doc dir. + cd $(dirname $0) ; CWD=$(pwd) PRGNAM=avahi VERSION=${VERSION:-0.8} -BUILD=${BUILD:-4} +BUILD=${BUILD:-7} TAG=${TAG:-_SBo} PKGTYPE=${PKGTYPE:-tgz} @@ -39,9 +43,6 @@ if [ -z "$ARCH" ]; then esac fi -# If the variable PRINT_PACKAGE_NAME is set, then this script will report what -# the name of the created package would be, and then exit. This information -# could be useful to other scripts. if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE" exit 0 @@ -100,22 +101,39 @@ cd $PRGNAM-$VERSION chown -R root:root . find -L . \ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \ - -o -perm 511 \) -exec chmod 755 {} \; -o \ + -o -perm 511 \) -exec chmod 755 {} \+ -o \ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \ - -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \; - -patch -p1 --verbose < $CWD/fixup_avahi-dnsconfd.action.patch -patch -p1 --verbose < $CWD/ipv6_race_condition_fix.patch # thanks, LFS + -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \+ + +# This patch is mine --rworkman +patch -p1 --verbose < $CWD/patches/fixup_avahi-dnsconfd.action.patch + +# Thanks to LFS for this patch +patch -p1 --verbose < $CWD/patches/ipv6_race_condition_fix.patch + +# Thanks to Debian for these patches +patch -p1 --verbose < $CWD/patches/man-fix-reference-to-avahi-autoipd.action-8-in-avahi-auto.patch +patch -p1 --verbose < $CWD/patches/man-add-missing-bshell.1-symlink.patch +patch -p1 --verbose < $CWD/patches/Ship-avahi-discover-1-bssh-1-and-bvnc-1-also-for-GTK3.patch +patch -p1 --verbose < $CWD/patches/avahi_dns_packet_consume_uint32-fix-potential-undefined-b.patch +patch -p1 --verbose < $CWD/patches/fix-bytestring-decoding-for-proper-display.patch +patch -p1 --verbose < $CWD/patches/avahi-discover-Don-t-decode-unicode-strings-only-bytestri.patch +patch -p1 --verbose < $CWD/patches/Fetch-build-db-from-upstream-git.patch +patch -p1 --verbose < $CWD/patches/build-db-Use-the-same-database-format-that-the-C-code-exp.patch +patch -p1 --verbose < $CWD/patches/avahi-daemon-chroot-fix-bogus-assignments-in-assertions.patch +patch -p1 --verbose < $CWD/patches/avahi-client-fix-resource-leak.patch +patch -p1 --verbose < $CWD/patches/avoid-infinite-loop-in-avahi-daemon-by-handling-hup-event-in-client-work.patch +patch -p1 --verbose < $CWD/patches/CVE-2021-3502.patch # Okay, I had to cheat a bit on the manual pages; there's a commit # in git that will fix this, so I just built a git checkout, grabbed # the built manual pages, and we'll drop them into place so the build # will work for this released version... -cat $CWD/build-db > service-type-database/build-db -chmod 0755 service-type-database/build-db cat $CWD/bssh.1 > man/bssh.1 cat $CWD/avahi-discover.1 > man/avahi-discover.1 +autoreconf -vif + export PYTHON=python3 CFLAGS="$SLKCFLAGS" \ CXXFLAGS="$SLKCFLAGS" \ @@ -153,12 +171,13 @@ CXXFLAGS="$SLKCFLAGS" \ $MONO make -make install DESTDIR=$PKG +make install-strip DESTDIR=$PKG -rm -rf $PKG/usr/lib${LIBDIRSUFFIX}/*.la +# 20220414 bkw: if this dir is empty, it doesn't need to be included +# in the package. +rmdir $PKG/run &> /dev/null || true -find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \ - | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true +rm -rf $PKG/usr/lib${LIBDIRSUFFIX}/*.la find $PKG/usr/man -type f -exec gzip -9 {} \; for i in $(find $PKG/usr/man -type l); do ln -s $(readlink $i).gz $i.gz; rm $i; done @@ -167,7 +186,10 @@ mv $PKG/etc/rc.d/rc.avahidaemon $PKG/etc/rc.d/rc.avahidaemon.new mv $PKG/etc/rc.d/rc.avahidnsconfd $PKG/etc/rc.d/rc.avahidnsconfd.new mv $PKG/etc/avahi/avahi-daemon.conf $PKG/etc/avahi/avahi-daemon.conf.new +sed -i "s|#!python3|#!/usr/bin/python3|g" $PKG/usr/bin/avahi-{discover,bookmarks} + mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION +rm -f docs/INSTALL cp -a LICENSE docs/* $PKG/usr/doc/$PRGNAM-$VERSION cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild |