diff options
| author |   Robby Workman <rworkman@slackbuilds.org> | 2019-08-28 23:28:07 -0500 |
|---|---|---|
| committer |   Willy Sudiarto Raharjo <willysr@slackbuilds.org> | 2019-08-31 17:13:20 +0700 |
| commit | 29a2bca7b85ad625ff7003bdf12a0018363edc36 (patch) | |
| tree | 98e523a8aaa83b902995169da65ac9b79f9974dd | |
| parent | b78ad76e4ae8b547b9289bfdc07cff29ce6057d0 (diff) | |
| download | slackbuilds-29a2bca7b85ad625ff7003bdf12a0018363edc36.tar.gz slackbuilds-29a2bca7b85ad625ff7003bdf12a0018363edc36.tar.xz | |
network/nss-mdns: Look in /run for avahi daemon socket
This fixes nss-mdns functionality since avahi was upgraded and
changed to use /run for its socket.
This build could be fixed by using --localstatedir=/ instead,
but it looks wrong (even if it's correct in this case), so I
decided to go with the patch instead.
Thanks to Lioh Moeller for the bug report.
Signed-off-by: Robby Workman <rworkman@slackbuilds.org>
| -rw-r--r-- | network/nss-mdns/look-in-run-for-avahi-socket.patch | 24 | ||||
| -rw-r--r-- | network/nss-mdns/nss-mdns.SlackBuild | 4 |
2 files changed, 27 insertions, 1 deletions
diff --git a/network/nss-mdns/look-in-run-for-avahi-socket.patch b/network/nss-mdns/look-in-run-for-avahi-socket.patch new file mode 100644 index 0000000000..4190ae87f6 --- /dev/null +++ b/network/nss-mdns/look-in-run-for-avahi-socket.patch @@ -0,0 +1,24 @@ +diff -Nur nss-mdns-0.10.orig/src/Makefile.am nss-mdns-0.10/src/Makefile.am +--- nss-mdns-0.10.orig/src/Makefile.am 2007-02-08 10:42:23.000000000 -0600 ++++ nss-mdns-0.10/src/Makefile.am 2019-08-28 23:24:49.690739951 -0500 +@@ -22,7 +22,7 @@ + AM_CFLAGS = \ + -DMDNS_ALLOW_FILE=\"$(sysconfdir)/mdns.allow\" \ + -DRESOLV_CONF_FILE=\"$(sysconfdir)/resolv.conf\" \ +- -DAVAHI_SOCKET=\"$(localstatedir)/run/avahi-daemon/socket\" ++ -DAVAHI_SOCKET=\"/run/avahi-daemon/socket\" + + #AM_CFLAGS += -DNDEBUG=1 -Os + +diff -Nur nss-mdns-0.10.orig/src/Makefile.in nss-mdns-0.10/src/Makefile.in +--- nss-mdns-0.10.orig/src/Makefile.in 2007-05-12 09:55:34.000000000 -0500 ++++ nss-mdns-0.10/src/Makefile.in 2019-08-28 23:24:39.273681707 -0500 +@@ -409,7 +409,7 @@ + # This cool debug trap works on i386/gcc only + AM_CFLAGS = -DMDNS_ALLOW_FILE=\"$(sysconfdir)/mdns.allow\" \ + -DRESOLV_CONF_FILE=\"$(sysconfdir)/resolv.conf\" \ +- -DAVAHI_SOCKET=\"$(localstatedir)/run/avahi-daemon/socket\" \ ++ -DAVAHI_SOCKET=\"/run/avahi-daemon/socket\" \ + '-DDEBUG_TRAP=__asm__("int $$3")' + AM_LDFLAGS = -avoid-version -module -export-dynamic + lib_LTLIBRARIES = $(am__append_1) $(am__append_2) diff --git a/network/nss-mdns/nss-mdns.SlackBuild b/network/nss-mdns/nss-mdns.SlackBuild index e7710120a0..e3984e3cd1 100644 --- a/network/nss-mdns/nss-mdns.SlackBuild +++ b/network/nss-mdns/nss-mdns.SlackBuild @@ -6,7 +6,7 @@ PRGNAM=nss-mdns VERSION=${VERSION:-0.10} -BUILD=${BUILD:-1} +BUILD=${BUILD:-2} TAG=${TAG:-_SBo} if [ -z "$ARCH" ]; then @@ -51,6 +51,8 @@ find -L . \ \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ -exec chmod 644 {} \; +patch -p1 < $CWD/look-in-run-for-avahi-socket.patch + CFLAGS="$SLKCFLAGS" \ CXXFLAGS="$SLKCFLAGS" \ ./configure \ |