avahi: move rundir to /run
This commit is contained in:
parent
d02e928c69
commit
fb69d435de
GPG Key ID:
42F8B4E30B673606
|
|
@ -12,6 +12,7 @@ drwxr-xr-x root/root etc/dbus-1/system.d/
|
|||
-rw-r--r-- root/root etc/dbus-1/system.d/avahi-dbus.conf
|
||||
drwxr-xr-x root/root etc/rc.d/
|
||||
-rwxr-xr-x root/root etc/rc.d/avahi-daemon
|
||||
drwxr-xr-x root/root run/
|
||||
drwxr-xr-x root/root usr/
|
||||
drwxr-xr-x root/root usr/bin/
|
||||
-rwxr-xr-x root/root usr/bin/avahi-browse
|
||||
|
|
@ -148,5 +149,3 @@ drwxr-xr-x root/root usr/share/man/man8/
|
|||
-rw-r--r-- root/root usr/share/man/man8/avahi-daemon.8.gz
|
||||
-rw-r--r-- root/root usr/share/man/man8/avahi-dnsconfd.8.gz
|
||||
-rw-r--r-- root/root usr/share/man/man8/avahi-dnsconfd.action.8.gz
|
||||
drwxr-xr-x root/root var/
|
||||
drwxr-xr-x root/root var/run/
|
||||
|
|
|
|||
|
|
@ -1,8 +1,8 @@
|
|||
untrusted comment: verify with /etc/ports/contrib.pub
|
||||
RWSagIOpLGJF37gfQhW2vjwT0CaZVsVNTt0sNmnPqt0Eb5rRhza+ib2EIVU7q/fvCi9RV6M5fxmEZSMOPV0K2JXiTbikenzi0ww=
|
||||
SHA256 (Pkgfile) = 22184808d7c3dd6943bce47a1e7c22519a24e6440e9527edee0b24e02639125d
|
||||
SHA256 (.footprint) = 539745708360fcb1f8e2ec7a7dd993750e5d9b03491f436f5341a76b71aef949
|
||||
RWSagIOpLGJF38x+gV0FhugrZT7bs2H5/ReilNCJlrA0itl2olqJ9Vgs0O3gAAw0dkBaaXDKs8Aynk71V1iCjpKQPzb/1X3QlQQ=
|
||||
SHA256 (Pkgfile) = 4998410b05c5707392900109e4ec54b166057f65f50c2fdfb9a675de2e326012
|
||||
SHA256 (.footprint) = 87b22df66b7ef568b024b7d4dc033cfa5d6b82558122d963655c184dfe96874c
|
||||
SHA256 (avahi-0.8.tar.gz) = 060309d7a333d38d951bc27598c677af1796934dbd98e1024e7ad8de798fedda
|
||||
SHA256 (avahi-0.8-ipv6_race_condition_fix-1.patch) = 218c909581d0ca2c86c8145bb0797050d987a6b0ae3417949dbe2a6d55c49360
|
||||
SHA256 (avahi-daemon.service) = 27fef1ede68353d75f5848dc23daa2f8f5a38fb2ff0fdd87d9c4309896754e0b
|
||||
SHA256 (reverse-move-to-run.patch) = a333bcf15dd3e72ac99b2e883202e7170d2ff27bf61820413235bc9f3c9c2605
|
||||
SHA256 (0001-Fix-avahi-browse-Invalid-service-type.patch) = 1c3a16db8853edf2d36b1c6c0660385becb32cafdcb7764519cd61ac07c77da3
|
||||
SHA256 (avahi-daemon.service) = 6a51ce78dd3b3f44b7d9cc6d5290afc1473e393e8cd317f3eea9bbe9b50927a3
|
||||
|
|
|
|||
|
|
@ -0,0 +1,27 @@
|
|||
From 6fe6c44d953edd50c32ff6ce8fec5ac811fa3b69 Mon Sep 17 00:00:00 2001
|
||||
From: Asger Hautop Drewsen <asger@princh.com>
|
||||
Date: Mon, 9 Aug 2021 14:25:08 +0200
|
||||
Subject: [PATCH] Fix avahi-browse: Invalid service type
|
||||
|
||||
---
|
||||
avahi-core/browse-service.c | 4 +++-
|
||||
1 file changed, 3 insertions(+), 1 deletion(-)
|
||||
|
||||
diff --git a/avahi-core/browse-service.c b/avahi-core/browse-service.c
|
||||
index 5531360..2d3fa75 100644
|
||||
--- a/avahi-core/browse-service.c
|
||||
+++ b/avahi-core/browse-service.c
|
||||
@@ -103,7 +103,9 @@ AvahiSServiceBrowser *avahi_s_service_browser_prepare(
|
||||
AVAHI_CHECK_VALIDITY_RETURN_NULL(server, AVAHI_PROTO_VALID(protocol), AVAHI_ERR_INVALID_PROTOCOL);
|
||||
AVAHI_CHECK_VALIDITY_RETURN_NULL(server, !domain || avahi_is_valid_domain_name(domain), AVAHI_ERR_INVALID_DOMAIN_NAME);
|
||||
AVAHI_CHECK_VALIDITY_RETURN_NULL(server, AVAHI_FLAGS_VALID(flags, AVAHI_LOOKUP_USE_WIDE_AREA|AVAHI_LOOKUP_USE_MULTICAST), AVAHI_ERR_INVALID_FLAGS);
|
||||
- AVAHI_CHECK_VALIDITY_RETURN_NULL(server, avahi_is_valid_service_type_generic(service_type), AVAHI_ERR_INVALID_SERVICE_TYPE);
|
||||
+
|
||||
+ if (!avahi_is_valid_service_type_generic(service_type))
|
||||
+ service_type = "_invalid._tcp";
|
||||
|
||||
if (!domain)
|
||||
domain = server->domain_name;
|
||||
--
|
||||
2.32.0
|
||||
|
||||
|
|
@ -7,11 +7,14 @@ name=avahi
|
|||
version=0.8
|
||||
release=4
|
||||
source=(https://github.com/lathiat/avahi/releases/download/v$version/$name-$version.tar.gz
|
||||
avahi-0.8-ipv6_race_condition_fix-1.patch avahi-daemon.service reverse-move-to-run.patch)
|
||||
avahi-0.8-ipv6_race_condition_fix-1.patch
|
||||
0001-Fix-avahi-browse-Invalid-service-type.patch
|
||||
avahi-daemon.service)
|
||||
|
||||
build() {
|
||||
cd $name-$version
|
||||
patch -Np1 -i $SRC/reverse-move-to-run.patch
|
||||
patch -Np1 -i $SRC/0001-Fix-avahi-browse-Invalid-service-type.patch
|
||||
#patch -Np1 -i $SRC/282.patch
|
||||
patch -Np1 -i $SRC/avahi-0.8-ipv6_race_condition_fix-1.patch
|
||||
|
||||
NOCONFIGURE=1 ./autogen.sh
|
||||
|
|
|
|||
|
|
@ -6,12 +6,15 @@
|
|||
SSD=/sbin/start-stop-daemon
|
||||
PROG=/usr/sbin/avahi-daemon
|
||||
NAME=avahi-daemon
|
||||
PID=/var/run/avahi-daemon/pid
|
||||
RUNDIR=/run/avahi-daemon
|
||||
PID=$RUNDIR/pid
|
||||
USER=avahi
|
||||
GROUP=avahi
|
||||
OPTS="-D"
|
||||
|
||||
case $1 in
|
||||
start)
|
||||
[ -d "$RUNDIR" ] || install -o $USER -g $GROUP -d "$RUNDIR"
|
||||
$SSD --start --pidfile $PID --user $USER --exec $PROG -- $OPTS
|
||||
;;
|
||||
stop)
|
||||
|
|
|
|||
|
|
@ -1,23 +0,0 @@
|
|||
From 60bd97ceeb1f7924df2b347b5ac18fa5949898cc Mon Sep 17 00:00:00 2001
|
||||
From: Dominique Leuenberger <dimstar@opensuse.org>
|
||||
Date: Thu, 28 Jan 2016 00:26:34 +0100
|
||||
Subject: [PATCH] Move to /run
|
||||
|
||||
on modern, systemd based systems, the default directory is /run, no longer /var/run
|
||||
---
|
||||
configure.ac | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/configure.ac b/configure.ac
|
||||
index 607d3343..6c353c35 100644
|
||||
--- a/configure.ac
|
||||
+++ b/configure.ac
|
||||
@@ -957,7 +957,7 @@ AC_DEFINE_UNQUOTED(AVAHI_AUTOIPD_GROUP,"$AVAHI_AUTOIPD_GROUP", [Group for runnin
|
||||
#
|
||||
# Avahi runtime dir
|
||||
#
|
||||
+avahi_runtime_dir="${localstatedir}/run"
|
||||
-avahi_runtime_dir="/run"
|
||||
avahi_socket="${avahi_runtime_dir}/avahi-daemon/socket"
|
||||
AC_SUBST(avahi_runtime_dir)
|
||||
AC_SUBST(avahi_socket)
|
||||
Loading…
Reference in New Issue