rpms
/
avahi
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

0.6.32-0.1.rc 

- avahi-0.6.32-rc
- -devel: move dbus-1/interfaces here
- Avahi's IPv6 support is disabled by default (#821127)
- avahi: script and/or trigger should not directly enable systemd units (#1094899)
This commit is contained in:
Rex Dieter 2015-10-10 07:57:09 -05:00
parent 4ce6c6adad
commit c7eef2fdc5
19 changed files with 22 additions and 1322 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
.gitignore vendored
View File

@ -1,9 +1,6 @@
/avahi-0.6.27.tar.gz
/avahi-0.6.28.tar.gz
/avahi-0.6.29.tar.gz
/x86_64
/.build-*.log
/avahi-0.6.30.tar.gz
/avahi-0.6.3?/
*.src.rpm
/avahi-0.6.31.tar.gz
/avahi-0.6.3?/
/avahi-0.6.32-rc.tar.gz

33
0001-Disable-publish-workstation-and-publish-hinfo-by-def.patch
View File

@ -1,33 +0,0 @@
From 850df1a121b8415c8235cbd2395ad94098ef4ce8 Mon Sep 17 00:00:00 2001
From: Bastien Nocera <hadess@hadess.net>
Date: Fri, 6 Jun 2014 17:43:45 +0200
Subject: [PATCH] Disable publish-workstation= and publish-hinfo= by default
"Publish workstation" and "Publish hinfo" export some metadata about the
machine which aren't necessary for normal operations. If used to monitor
availability of remote machines, such as in a computer lab, system
administrators could enable them remotely.
https://bugzilla.redhat.com/show_bug.cgi?id=1105647
---
avahi-daemon/avahi-daemon.conf | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/avahi-daemon/avahi-daemon.conf b/avahi-daemon/avahi-daemon.conf
index c992842..ce7914e 100644
--- a/avahi-daemon/avahi-daemon.conf
+++ b/avahi-daemon/avahi-daemon.conf
@@ -46,8 +46,8 @@ enable-wide-area=yes
#disable-user-service-publishing=no
#add-service-cookie=no
#publish-addresses=yes
-#publish-hinfo=yes
-#publish-workstation=yes
+publish-hinfo=no
+publish-workstation=no
#publish-domain=yes
#publish-dns-servers=192.168.50.1, 192.168.50.2
#publish-resolv-conf-dns-servers=yes
--
1.9.3

51
0001-Python3-support.patch
View File

@ -1,51 +0,0 @@
From 2ab8bc4d4d393d74dacd23b525715fca7356f996 Mon Sep 17 00:00:00 2001
From: Bastien Nocera <hadess@hadess.net>
Date: Tue, 16 Jun 2015 20:39:36 +0200
Subject: [PATCH] Python3 support
---
avahi-python/avahi/ServiceTypeDatabase.py.in | 20 ++++++++++----------
1 file changed, 10 insertions(+), 10 deletions(-)
diff --git a/avahi-python/avahi/ServiceTypeDatabase.py.in b/avahi-python/avahi/ServiceTypeDatabase.py.in
index b2035fd..4ddd654 100644
--- a/avahi-python/avahi/ServiceTypeDatabase.py.in
+++ b/avahi-python/avahi/ServiceTypeDatabase.py.in
@@ -138,24 +138,24 @@ class ServiceTypeDatabase:
if __name__ == "__main__":
b = ServiceTypeDatabase()
- print b.items()
+ print (b.items())
- print b["_http._tcp"]
- print b["_ftp._tcp"]
- print b["_webdav._tcp"]
- print b["_webdavs._tcp"]
+ print (b["_http._tcp"])
+ print (b["_ftp._tcp"])
+ print (b["_webdav._tcp"])
+ print (b["_webdavs._tcp"])
- print b.get("gurki._tcp")
- print len(b)
+ print (b.get("gurki._tcp"))
+ print (len(b))
for key, _ in zip(b, xrange(3)):
- print key
+ print (key)
for key, _ in zip(b.iteritems(), xrange(3)):
- print key
+ print (key)
for key, _ in zip(b.itervalues(), xrange(3)):
- print key
+ print (key)
--
2.4.3

26
0001-avahi-daemon-don-t-add-0pointer.de-and-zeroconf.org-.patch
View File

@ -1,26 +0,0 @@
From 938b5f883fbaa642e3acb7720e37f95f3d72be62 Mon Sep 17 00:00:00 2001
From: Lennart Poettering <lennart@poettering.net>
Date: Mon, 2 Apr 2012 21:17:19 +0200
Subject: [PATCH 1/8] avahi-daemon: don't add 0pointer.de and zeroconf.org to
default browse list
---
avahi-daemon/avahi-daemon.conf | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/avahi-daemon/avahi-daemon.conf b/avahi-daemon/avahi-daemon.conf
index c992842..1906590 100644
--- a/avahi-daemon/avahi-daemon.conf
+++ b/avahi-daemon/avahi-daemon.conf
@@ -21,7 +21,7 @@
[server]
#host-name=foo
#domain-name=local
-browse-domains=0pointer.de, zeroconf.org
+#browse-domains=0pointer.de, zeroconf.org
use-ipv4=yes
use-ipv6=no
#allow-interfaces=eth0
--
1.9.3

41
0001-netlink-check-that-the-origin-of-the-rtnetlink-messa.patch
View File

@ -1,41 +0,0 @@
From b8b2b4a03de019e14e439d30ab2d929aec5d6524 Mon Sep 17 00:00:00 2001
From: Lubomir Rintel <lkundrak@v3.sk>
Date: Mon, 1 Jun 2015 21:13:40 +0200
Subject: [PATCH] netlink: check that the origin of the rtnetlink messages is
kernel
Instead of asserting it's from UID 0, which breaks in network namespaces.
---
avahi-autoipd/iface-linux.c | 2 +-
avahi-core/netlink.c | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/avahi-autoipd/iface-linux.c b/avahi-autoipd/iface-linux.c
index 83e9e41..1888e37 100644
--- a/avahi-autoipd/iface-linux.c
+++ b/avahi-autoipd/iface-linux.c
@@ -215,7 +215,7 @@ static int process_response(int wait_for_done, unsigned seq) {
ucred = (struct ucred*) CMSG_DATA(cmsghdr);
- if (ucred->uid != 0)
+ if (ucred->pid != 0)
return -1;
bytes = (size_t) r;
diff --git a/avahi-core/netlink.c b/avahi-core/netlink.c
index 4ded5ec..b8c0c06 100644
--- a/avahi-core/netlink.c
+++ b/avahi-core/netlink.c
@@ -82,7 +82,7 @@ int avahi_netlink_work(AvahiNetlink *nl, int block) {
cred = (struct ucred*) CMSG_DATA(cmsg);
- if (cred->uid != 0)
+ if (cred->pid != 0)
return -1;
p = (struct nlmsghdr *) nl->buffer;
--
2.4.3

27
0002-avahi-daemon-don-t-leak-host-info-by-default.patch
View File

@ -1,27 +0,0 @@
From 530fbb59abafb970ef1dd8f61571b13fb0918b23 Mon Sep 17 00:00:00 2001
From: Lennart Poettering <lennart@poettering.net>
Date: Mon, 2 Apr 2012 21:17:36 +0200
Subject: [PATCH 2/8] avahi-daemon: don't leak host info by default
---
avahi-daemon/avahi-daemon.conf | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/avahi-daemon/avahi-daemon.conf b/avahi-daemon/avahi-daemon.conf
index 1906590..27e240d 100644
--- a/avahi-daemon/avahi-daemon.conf
+++ b/avahi-daemon/avahi-daemon.conf
@@ -46,8 +46,8 @@ enable-wide-area=yes
#disable-user-service-publishing=no
#add-service-cookie=no
#publish-addresses=yes
-#publish-hinfo=yes
-#publish-workstation=yes
+publish-hinfo=no
+publish-workstation=no
#publish-domain=yes
#publish-dns-servers=192.168.50.1, 192.168.50.2
#publish-resolv-conf-dns-servers=yes
--
1.9.3

52
0003-core-don-t-leak-hinfo-workstation-even-if-the-config.patch
View File

@ -1,52 +0,0 @@
From 468519681b09f00851e1d4dd658b939e4e938cf6 Mon Sep 17 00:00:00 2001
From: Lennart Poettering <lennart@poettering.net>
Date: Mon, 2 Apr 2012 21:20:34 +0200
Subject: [PATCH 3/8] core: don't leak hinfo/workstation even if the
configuration file doesn't exist
---
avahi-core/server.c | 4 ++--
man/avahi-daemon.conf.5.xml.in | 4 ++--
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/avahi-core/server.c b/avahi-core/server.c
index 86fd4a5..69a1d02 100644
--- a/avahi-core/server.c
+++ b/avahi-core/server.c
@@ -1582,9 +1582,9 @@ AvahiServerConfig* avahi_server_config_init(AvahiServerConfig *c) {
c->host_name = NULL;
c->domain_name = NULL;
c->check_response_ttl = 0;
- c->publish_hinfo = 1;
+ c->publish_hinfo = 0;
c->publish_addresses = 1;
- c->publish_workstation = 1;
+ c->publish_workstation = 0;
c->publish_domain = 1;
c->use_iff_running = 0;
c->enable_reflector = 0;
diff --git a/man/avahi-daemon.conf.5.xml.in b/man/avahi-daemon.conf.5.xml.in
index 487645b..bea7ed5 100644
--- a/man/avahi-daemon.conf.5.xml.in
+++ b/man/avahi-daemon.conf.5.xml.in
@@ -244,7 +244,7 @@
useful for administrative purposes. This is recommended by the
mDNS specification but not required. For the sake of privacy
you might choose to disable this feature. Defaults to
- "yes."</p>
+ "no".</p>
</option>
<option>
@@ -254,7 +254,7 @@
might be useful for administrative purposes (i.e. browse for
all PCs on the LAN), but is not required or recommended by any
specification. Newer MacOS X releases register a service of
- this type. Defaults to "yes".</p>
+ this type. Defaults to "no".</p>
</option>
<option>
--
1.9.3

52
0004-build-sys-fix-MKDIR_P-for-recent-automake.patch
View File

@ -1,52 +0,0 @@
From 8070ec2ac51219c462ac05238eab239461c38454 Mon Sep 17 00:00:00 2001
From: Marc-Antoine Perennou <Marc-Antoine@Perennou.com>
Date: Thu, 7 Jun 2012 16:51:10 +0200
Subject: [PATCH 4/8] build-sys: fix MKDIR_P for recent automake
---
avahi-autoipd/Makefile.am | 2 +-
avahi-daemon/Makefile.am | 2 +-
configure.ac | 1 +
3 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/avahi-autoipd/Makefile.am b/avahi-autoipd/Makefile.am
index 263e991..56f7a35 100644
--- a/avahi-autoipd/Makefile.am
+++ b/avahi-autoipd/Makefile.am
@@ -76,7 +76,7 @@ dhcliententerdir = $(sysconfdir)/dhcp/dhclient-enter-hooks.d
dhclientexitdir = $(sysconfdir)/dhcp/dhclient-exit-hooks.d
install-exec-hook: dhclient-exit-hook dhclient-enter-hook
- $(mkdir_p) $(DESTDIR)$(dhcliententerdir) $(DESTDIR)$(dhclientexitdir)
+ $(MKDIR_P) $(DESTDIR)$(dhcliententerdir) $(DESTDIR)$(dhclientexitdir)
$(INSTALL) dhclient-enter-hook $(DESTDIR)$(dhcliententerdir)/avahi-autoipd
$(INSTALL) dhclient-exit-hook $(DESTDIR)$(dhclientexitdir)/avahi-autoipd
diff --git a/avahi-daemon/Makefile.am b/avahi-daemon/Makefile.am
index b5d2bf4..b6b5a77 100644
--- a/avahi-daemon/Makefile.am
+++ b/avahi-daemon/Makefile.am
@@ -169,7 +169,7 @@ xmllint:
done
install-data-local:
- test -z "$(localstatedir)/run" || $(mkdir_p) "$(DESTDIR)$(localstatedir)/run"
+ test -z "$(localstatedir)/run" || $(MKDIR_P) "$(DESTDIR)$(localstatedir)/run"
update-systemd:
curl http://cgit.freedesktop.org/systemd/plain/src/sd-daemon.c > sd-daemon.c
diff --git a/configure.ac b/configure.ac
index 0e190ba..9debce2 100644
--- a/configure.ac
+++ b/configure.ac
@@ -59,6 +59,7 @@ AC_PROG_CXX
AM_PROG_CC_C_O
AC_USE_SYSTEM_EXTENSIONS
AC_PROG_CPP
+AC_PROG_MKDIR_P
AC_PROG_INSTALL
AC_PROG_LN_S
AC_PROG_MAKE_SET
--
1.9.3

29
0005-build-sys-fix-parallel-install-in-avahi-utils.patch
View File

@ -1,29 +0,0 @@
From a485019966c32af05fb294fb4e20f1d3a82f3fbe Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Diego=20Elio=20Petten=C3=B2?= <flameeyes@flameeyes.eu>
Date: Sun, 17 Jun 2012 07:44:01 -0700
Subject: [PATCH 5/8] build-sys: fix parallel install in avahi-utils
The moment install-exec-local is called, we might still not have
created ${DESTDIR}/${bindir} so we should make sure to create it
first, and then try to chdir into it.
---
avahi-utils/Makefile.am | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/avahi-utils/Makefile.am b/avahi-utils/Makefile.am
index a644b4a..1abc79a 100644
--- a/avahi-utils/Makefile.am
+++ b/avahi-utils/Makefile.am
@@ -54,7 +54,8 @@ avahi_set_host_name_CFLAGS = $(AM_CFLAGS)
avahi_set_host_name_LDADD = $(AM_LDADD) ../avahi-client/libavahi-client.la ../avahi-common/libavahi-common.la
install-exec-local:
- cd $(DESTDIR)/$(bindir) && \
+ $(mkdir_p) $(DESTDIR)/$(bindir) && \
+ cd $(DESTDIR)/$(bindir) && \
rm -f avahi-resolve-host-name avahi-resolve-address avahi-browse-domains avahi-publish-address avahi-publish-service && \
$(LN_S) avahi-resolve avahi-resolve-host-name && \
$(LN_S) avahi-resolve avahi-resolve-address && \
--
1.9.3

25
0006-build-sys-fix-previous-commit-for-recent-automake.patch
View File

@ -1,25 +0,0 @@
From 35ea8dc8954eebd63aad7157d02f97388f679122 Mon Sep 17 00:00:00 2001
From: Marc-Antoine Perennou <Marc-Antoine@Perennou.com>
Date: Tue, 19 Jun 2012 15:50:35 +0200
Subject: [PATCH 6/8] build-sys: fix previous commit for recent automake
---
avahi-utils/Makefile.am | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/avahi-utils/Makefile.am b/avahi-utils/Makefile.am
index 1abc79a..66c4cc6 100644
--- a/avahi-utils/Makefile.am
+++ b/avahi-utils/Makefile.am
@@ -54,7 +54,7 @@ avahi_set_host_name_CFLAGS = $(AM_CFLAGS)
avahi_set_host_name_LDADD = $(AM_LDADD) ../avahi-client/libavahi-client.la ../avahi-common/libavahi-common.la
install-exec-local:
- $(mkdir_p) $(DESTDIR)/$(bindir) && \
+ $(MKDIR_P) $(DESTDIR)/$(bindir) && \
cd $(DESTDIR)/$(bindir) && \
rm -f avahi-resolve-host-name avahi-resolve-address avahi-browse-domains avahi-publish-address avahi-publish-service && \
$(LN_S) avahi-resolve avahi-resolve-host-name && \
--
1.9.3

477
0007-avahi-common-typo-fix.patch
View File

@ -1,477 +0,0 @@
From ccfcd5c42c68752fbd6de318fe5ce4269f5a7c06 Mon Sep 17 00:00:00 2001
From: Lennart Poettering <lennart@poettering.net>
Date: Fri, 7 Sep 2012 16:17:43 +0200
Subject: [PATCH 7/8] avahi-common: typo fix
---
avahi-common/error.c | 2 +-
avahi-common/error.h | 2 +-
po/bg.po | 2 +-
po/ca.po | 2 +-
po/cs.po | 2 +-
po/da.po | 2 +-
po/de.po | 2 +-
po/el.po | 2 +-
po/en_AU.po | 2 +-
po/en_CA.po | 2 +-
po/en_GB.po | 2 +-
po/en_NZ.po | 859 ++++++++++++++++++++++++++++++++++++++++++++++++++-
po/es.po | 2 +-
po/fi.po | 2 +-
po/fo.po | 2 +-
po/fr.po | 2 +-
po/gl.po | 2 +-
po/he.po | 2 +-
po/hu.po | 2 +-
po/id.po | 2 +-
po/it.po | 2 +-
po/ja.po | 2 +-
po/ms.po | 2 +-
po/nl.po | 2 +-
po/pl.po | 2 +-
po/pt_BR.po | 2 +-
po/ro.po | 2 +-
po/ru.po | 2 +-
po/sl.po | 2 +-
po/sl.si | 2 +-
po/sr.po | 2 +-
po/sr@latin.po | 2 +-
po/sv.po | 2 +-
po/uk.po | 2 +-
po/zh_CN.po | 2 +-
po/zh_TW.po | 2 +-
36 files changed, 893 insertions(+), 36 deletions(-)
mode change 120000 => 100644 po/en_NZ.po
diff --git a/avahi-common/error.c b/avahi-common/error.c
index b0b66ea..63c5033 100644
--- a/avahi-common/error.c
+++ b/avahi-common/error.c
@@ -51,7 +51,7 @@ const char *avahi_strerror(int error) {
N_("Access denied"),
N_("Invalid operation"),
- N_("An unexpected D-Bus error occured"),
+ N_("An unexpected D-Bus error occurred"),
N_("Daemon connection failed"),
N_("Memory exhausted"),
N_("The object passed in was not valid"),
diff --git a/avahi-common/error.h b/avahi-common/error.h
index 392aaf5..94511c9 100644
--- a/avahi-common/error.h
+++ b/avahi-common/error.h
@@ -52,7 +52,7 @@ enum {
AVAHI_ERR_ACCESS_DENIED = -20, /**< Access denied */
AVAHI_ERR_INVALID_OPERATION = -21, /**< Invalid operation */
- AVAHI_ERR_DBUS_ERROR = -22, /**< An unexpected D-Bus error occured */
+ AVAHI_ERR_DBUS_ERROR = -22, /**< An unexpected D-Bus error occurred */
AVAHI_ERR_DISCONNECTED = -23, /**< Daemon connection failed */
AVAHI_ERR_NO_MEMORY = -24, /**< Memory exhausted */
AVAHI_ERR_INVALID_OBJECT = -25, /**< The object passed to this function was invalid */
diff --git a/po/bg.po b/po/bg.po
index c20eb6d..f59d43a 100644
--- a/po/bg.po
+++ b/po/bg.po
@@ -106,7 +106,7 @@ msgid "Invalid operation"
msgstr "Неправилна операция"
#: ../avahi-common/error.c:54
-msgid "An unexpected D-Bus error occured"
+msgid "An unexpected D-Bus error occurred"
msgstr "Неочаквана грешка от D-Bus"
#: ../avahi-common/error.c:55
diff --git a/po/ca.po b/po/ca.po
index 0985254..d3cff9c 100644
--- a/po/ca.po
+++ b/po/ca.po
@@ -118,7 +118,7 @@ msgid "Invalid operation"
msgstr "Operació no vàlida"
#: ../avahi-common/error.c:54
-msgid "An unexpected D-Bus error occured"
+msgid "An unexpected D-Bus error occurred"
msgstr "S'ha produït un error inesperat al D-Bus"
#: ../avahi-common/error.c:55
diff --git a/po/cs.po b/po/cs.po
index c6c8e85..349bfbe 100644
--- a/po/cs.po
+++ b/po/cs.po
@@ -111,7 +111,7 @@ msgstr "Neplatná operace"
#: ../avahi-common/error.c:54
#, fuzzy
-msgid "An unexpected D-Bus error occured"
+msgid "An unexpected D-Bus error occurred"
msgstr "Došlo k následující chybě:"
#: ../avahi-common/error.c:55
diff --git a/po/da.po b/po/da.po
index 9984965..0b231cb 100644
--- a/po/da.po
+++ b/po/da.po
@@ -115,7 +115,7 @@ msgid "Invalid operation"
msgstr "Ugyldig handling"
#: ../avahi-common/error.c:54
-msgid "An unexpected D-Bus error occured"
+msgid "An unexpected D-Bus error occurred"
msgstr "Der opstod en uventet D-Bus-fejl"
#: ../avahi-common/error.c:55
diff --git a/po/de.po b/po/de.po
index e4ee917..5b0a017 100644
--- a/po/de.po
+++ b/po/de.po
@@ -108,7 +108,7 @@ msgid "Invalid operation"
msgstr "Ungültige Operation"
#: ../avahi-common/error.c:54
-msgid "An unexpected D-Bus error occured"
+msgid "An unexpected D-Bus error occurred"
msgstr "Ein unerwarteter DBus-Fehler ist aufgetreten"
#: ../avahi-common/error.c:55
diff --git a/po/el.po b/po/el.po
index 2f095ee..53c53fb 100644
--- a/po/el.po
+++ b/po/el.po
@@ -107,7 +107,7 @@ msgid "Invalid operation"
msgstr "Λανθασμένη λειτουργία"
#: ../avahi-common/error.c:54
-msgid "An unexpected D-Bus error occured"
+msgid "An unexpected D-Bus error occurred"
msgstr ""
#: ../avahi-common/error.c:55
diff --git a/po/en_AU.po b/po/en_AU.po
index e510292..5e8918d 100644
--- a/po/en_AU.po
+++ b/po/en_AU.po
@@ -102,7 +102,7 @@ msgid "Invalid operation"
msgstr ""
#: ../avahi-common/error.c:54
-msgid "An unexpected D-Bus error occured"
+msgid "An unexpected D-Bus error occurred"
msgstr ""
#: ../avahi-common/error.c:55
diff --git a/po/en_CA.po b/po/en_CA.po
index 2d70852..3c28764 100644
--- a/po/en_CA.po
+++ b/po/en_CA.po
@@ -102,7 +102,7 @@ msgid "Invalid operation"
msgstr ""
#: ../avahi-common/error.c:54
-msgid "An unexpected D-Bus error occured"
+msgid "An unexpected D-Bus error occurred"
msgstr ""
#: ../avahi-common/error.c:55
diff --git a/po/en_GB.po b/po/en_GB.po
index 4f5b849..aab6526 100644
--- a/po/en_GB.po
+++ b/po/en_GB.po
@@ -105,7 +105,7 @@ msgid "Invalid operation"
msgstr "Invalid operation"
#: ../avahi-common/error.c:54
-msgid "An unexpected D-Bus error occured"
+msgid "An unexpected D-Bus error occurred"
msgstr "An unexpected D-Bus error occurred"
#: ../avahi-common/error.c:55
diff --git a/po/es.po b/po/es.po
index 4d4fef7..56974da 100644
--- a/po/es.po
+++ b/po/es.po
@@ -112,7 +112,7 @@ msgid "Invalid operation"
msgstr "Operación no válida"
#: ../avahi-common/error.c:54
-msgid "An unexpected D-Bus error occured"
+msgid "An unexpected D-Bus error occurred"
msgstr "Ocurrió un error de D-Bus no esperado"
#: ../avahi-common/error.c:55
diff --git a/po/fi.po b/po/fi.po
index cbd0883..d37ec3a 100644
--- a/po/fi.po
+++ b/po/fi.po
@@ -107,7 +107,7 @@ msgid "Invalid operation"
msgstr "Virheellinen toiminto"
#: ../avahi-common/error.c:54
-msgid "An unexpected D-Bus error occured"
+msgid "An unexpected D-Bus error occurred"
msgstr "Tapahtui odottamaton D-Bus-virhe"
#: ../avahi-common/error.c:55
diff --git a/po/fo.po b/po/fo.po
index ff470a2..8b122af 100644
--- a/po/fo.po
+++ b/po/fo.po
@@ -107,7 +107,7 @@ msgid "Invalid operation"
msgstr "Ógildug atgerð"
#: ../avahi-common/error.c:54
-msgid "An unexpected D-Bus error occured"
+msgid "An unexpected D-Bus error occurred"
msgstr "Ein óvantað D-BUS villa hendi"
#: ../avahi-common/error.c:55
diff --git a/po/fr.po b/po/fr.po
index 144756a..59143da 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -111,7 +111,7 @@ msgid "Invalid operation"
msgstr "Opération invalide "
#: ../avahi-common/error.c:54
-msgid "An unexpected D-Bus error occured"
+msgid "An unexpected D-Bus error occurred"
msgstr "Une erreur inattendue de D-Bus s'est produite"
#: ../avahi-common/error.c:55
diff --git a/po/gl.po b/po/gl.po
index f1da293..46f8a8f 100644
--- a/po/gl.po
+++ b/po/gl.po
@@ -107,7 +107,7 @@ msgid "Invalid operation"
msgstr "Operación incorrecta"
#: ../avahi-common/error.c:54
-msgid "An unexpected D-Bus error occured"
+msgid "An unexpected D-Bus error occurred"
msgstr "Produciuse un erro inesperado de D-BUS"
#: ../avahi-common/error.c:55
diff --git a/po/he.po b/po/he.po
index 6f4070b..f5a50c7 100644
--- a/po/he.po
+++ b/po/he.po
@@ -107,7 +107,7 @@ msgid "Invalid operation"
msgstr "פעולה שגויה"
#: ../avahi-common/error.c:54
-msgid "An unexpected D-Bus error occured"
+msgid "An unexpected D-Bus error occurred"
msgstr "ארעה שגיאת D-Bus לא ידועה"
#: ../avahi-common/error.c:55
diff --git a/po/hu.po b/po/hu.po
index 138875e..800b90e 100644
--- a/po/hu.po
+++ b/po/hu.po
@@ -107,7 +107,7 @@ msgid "Invalid operation"
msgstr "Érvénytelen művelet"
#: ../avahi-common/error.c:54
-msgid "An unexpected D-Bus error occured"
+msgid "An unexpected D-Bus error occurred"
msgstr "Váratlan D-Bus hiba történt"
#: ../avahi-common/error.c:55
diff --git a/po/id.po b/po/id.po
index 1d56baa..453086a 100644
--- a/po/id.po
+++ b/po/id.po
@@ -108,7 +108,7 @@ msgid "Invalid operation"
msgstr "Operasi tidak valid"
#: ../avahi-common/error.c:54
-msgid "An unexpected D-Bus error occured"
+msgid "An unexpected D-Bus error occurred"
msgstr "Terjadi galat D-Bus yang tak diharapkan"
#: ../avahi-common/error.c:55
diff --git a/po/it.po b/po/it.po
index fbb51c1..1448cd3 100644
--- a/po/it.po
+++ b/po/it.po
@@ -114,7 +114,7 @@ msgid "Invalid operation"
msgstr "Operazione non valida"
#: ../avahi-common/error.c:54
-msgid "An unexpected D-Bus error occured"
+msgid "An unexpected D-Bus error occurred"
msgstr "Si è verificato un errore D-Bus inatteso"
#: ../avahi-common/error.c:55
diff --git a/po/ja.po b/po/ja.po
index 7f76ff6..ec3a05c 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -106,7 +106,7 @@ msgid "Invalid operation"
msgstr "不正な操作です"
#: ../avahi-common/error.c:54
-msgid "An unexpected D-Bus error occured"
+msgid "An unexpected D-Bus error occurred"
msgstr "予期しない D-Bus のエラーが発生しました"
#: ../avahi-common/error.c:55
diff --git a/po/ms.po b/po/ms.po
index e9267f2..58db564 100644
--- a/po/ms.po
+++ b/po/ms.po
@@ -121,7 +121,7 @@ msgstr "Tanda operasi:"
#: ../avahi-common/error.c:54
#, fuzzy
-msgid "An unexpected D-Bus error occured"
+msgid "An unexpected D-Bus error occurred"
msgstr ""
"Ralat tidak dijangka telah berlaku:\n"
"%s"
diff --git a/po/nl.po b/po/nl.po
index aeb7c91..f287d38 100644
--- a/po/nl.po
+++ b/po/nl.po
@@ -107,7 +107,7 @@ msgid "Invalid operation"
msgstr ""
#: ../avahi-common/error.c:54
-msgid "An unexpected D-Bus error occured"
+msgid "An unexpected D-Bus error occurred"
msgstr ""
#: ../avahi-common/error.c:55
diff --git a/po/pl.po b/po/pl.po
index 6328939..a0b2f10 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -103,7 +103,7 @@ msgid "Invalid operation"
msgstr "Nieprawidłowe działanie"
#: ../avahi-common/error.c:54
-msgid "An unexpected D-Bus error occured"
+msgid "An unexpected D-Bus error occurred"
msgstr "Wystąpił nieoczekiwany błąd usługi D-Bus"
#: ../avahi-common/error.c:55
diff --git a/po/pt_BR.po b/po/pt_BR.po
index 2a38d19..bde3e62 100644
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@@ -110,7 +110,7 @@ msgid "Invalid operation"
msgstr "Operação inválida"
#: ../avahi-common/error.c:54
-msgid "An unexpected D-Bus error occured"
+msgid "An unexpected D-Bus error occurred"
msgstr "Ocorreu um erro inesperado do D-BUS"
#: ../avahi-common/error.c:55
diff --git a/po/ro.po b/po/ro.po
index 662fa8f..e270063 100644
--- a/po/ro.po
+++ b/po/ro.po
@@ -102,7 +102,7 @@ msgid "Invalid operation"
msgstr "Operație nevalidă"
#: ../avahi-common/error.c:54
-msgid "An unexpected D-Bus error occured"
+msgid "An unexpected D-Bus error occurred"
msgstr "S-a produs o eroare D-Bus"
#: ../avahi-common/error.c:55
diff --git a/po/ru.po b/po/ru.po
index 00e8013..675a1d8 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -110,7 +110,7 @@ msgid "Invalid operation"
msgstr "Неверная операция"
#: ../avahi-common/error.c:54
-msgid "An unexpected D-Bus error occured"
+msgid "An unexpected D-Bus error occurred"
msgstr "Неожиданная ошибка D-Bus"
#: ../avahi-common/error.c:55
diff --git a/po/sl.po b/po/sl.po
index e9fed56..ab8e663 100644
--- a/po/sl.po
+++ b/po/sl.po
@@ -113,7 +113,7 @@ msgid "Invalid operation"
msgstr "Neveljavno dejanje"
#: ../avahi-common/error.c:54
-msgid "An unexpected D-Bus error occured"
+msgid "An unexpected D-Bus error occurred"
msgstr "Prišlo je do nepričakovane napake vodila D-Bus."
#: ../avahi-common/error.c:55
diff --git a/po/sr@latin.po b/po/sr@latin.po
index 137c73c..be1779c 100644
--- a/po/sr@latin.po
+++ b/po/sr@latin.po
@@ -109,7 +109,7 @@ msgid "Invalid operation"
msgstr "Netačna operacija"
#: ../avahi-common/error.c:54
-msgid "An unexpected D-Bus error occured"
+msgid "An unexpected D-Bus error occurred"
msgstr "Desila se neočekivana greška u D-Bus softveru"
#: ../avahi-common/error.c:55
diff --git a/po/sv.po b/po/sv.po
index 25abde7..74f9d87 100644
--- a/po/sv.po
+++ b/po/sv.po
@@ -105,7 +105,7 @@ msgid "Invalid operation"
msgstr "Ogiltig åtgärd"
#: ../avahi-common/error.c:54
-msgid "An unexpected D-Bus error occured"
+msgid "An unexpected D-Bus error occurred"
msgstr "Ett oväntat D-Bus-fel har inträffat"
#: ../avahi-common/error.c:55
diff --git a/po/uk.po b/po/uk.po
index f58c875..76f57fe 100644
--- a/po/uk.po
+++ b/po/uk.po
@@ -107,7 +107,7 @@ msgid "Invalid operation"
msgstr "Некоректна дія"
#: ../avahi-common/error.c:54
-msgid "An unexpected D-Bus error occured"
+msgid "An unexpected D-Bus error occurred"
msgstr "Сталася непередбачена помилка D-Bus"
#: ../avahi-common/error.c:55
diff --git a/po/zh_CN.po b/po/zh_CN.po
index d217f7e..de850fa 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -106,7 +106,7 @@ msgid "Invalid operation"
msgstr "无效的操作"
#: ../avahi-common/error.c:54
-msgid "An unexpected D-Bus error occured"
+msgid "An unexpected D-Bus error occurred"
msgstr "发生了一个未预期的 D-Bus 错误"
#: ../avahi-common/error.c:55
diff --git a/po/zh_TW.po b/po/zh_TW.po
index 56ddd8e..696173b 100644
--- a/po/zh_TW.po
+++ b/po/zh_TW.po
@@ -105,7 +105,7 @@ msgid "Invalid operation"
msgstr "無效的操作"
#: ../avahi-common/error.c:54
-msgid "An unexpected D-Bus error occured"
+msgid "An unexpected D-Bus error occurred"
msgstr "遭遇到未預期的 D-Bus 錯誤"
#: ../avahi-common/error.c:55
--
1.9.3

89
0008-avahi-daemon-add-option-host-name-from-machine-id.patch
View File

@ -1,89 +0,0 @@
From 147cdce70b22ae7cee9fb4fe123db40952f31c9e Mon Sep 17 00:00:00 2001
From: David Zeuthen <zeuthen@chromium.org>
Date: Tue, 5 Mar 2013 11:52:38 -0800
Subject: [PATCH 8/8] avahi-daemon: add option "host-name-from-machine-id="
Signed-off-by: David Zeuthen <zeuthen@chromium.org>
---
avahi-daemon/main.c | 33 +++++++++++++++++++++++++++++++++
man/avahi-daemon.conf.5.xml.in | 6 ++++++
2 files changed, 39 insertions(+)
diff --git a/avahi-daemon/main.c b/avahi-daemon/main.c
index d46f40a..8c28fd6 100644
--- a/avahi-daemon/main.c
+++ b/avahi-daemon/main.c
@@ -65,6 +65,7 @@
#include <avahi-core/publish.h>
#include <avahi-core/dns-srv-rr.h>
#include <avahi-core/log.h>
+#include <avahi-core/util.h>
#ifdef ENABLE_CHROOT
#include "chroot.h"
@@ -576,6 +577,29 @@ static int parse_usec(const char *s, AvahiUsec *u) {
return 0;
}
+static char *get_machine_id(void) {
+ int fd;
+ char buf[32];
+
+ fd = open("/etc/machine-id", O_RDONLY|O_CLOEXEC|O_NOCTTY);
+ if (fd == -1 && errno == ENOENT)
+ fd = open("/var/lib/dbus/machine-id", O_RDONLY|O_CLOEXEC|O_NOCTTY);
+ if (fd == -1)
+ return NULL;
+
+ /* File is on a filesystem so we never get EINTR or partial reads */
+ if (read(fd, buf, sizeof buf) != sizeof buf) {
+ close(fd);
+ return NULL;
+ }
+ close(fd);
+
+ /* Contents can be lower, upper and even mixed case so normalize */
+ avahi_strdown(buf);
+
+ return avahi_strndup(buf, sizeof buf);
+}
+
static int load_config_file(DaemonConfig *c) {
int r = -1;
AvahiIniFile *f;
@@ -631,6 +655,15 @@ static int load_config_file(DaemonConfig *c) {
c->server_config.use_iff_running = is_yes(p->value);
else if (strcasecmp(p->key, "disallow-other-stacks") == 0)
c->server_config.disallow_other_stacks = is_yes(p->value);
+ else if (strcasecmp(p->key, "host-name-from-machine-id") == 0) {
+ if (*(p->value) == 'y' || *(p->value) == 'Y') {
+ char *machine_id = get_machine_id();
+ if (machine_id != NULL) {
+ avahi_free(c->server_config.host_name);
+ c->server_config.host_name = machine_id;
+ }
+ }
+ }
#ifdef HAVE_DBUS
else if (strcasecmp(p->key, "enable-dbus") == 0) {
diff --git a/man/avahi-daemon.conf.5.xml.in b/man/avahi-daemon.conf.5.xml.in
index bea7ed5..2d15017 100644
--- a/man/avahi-daemon.conf.5.xml.in
+++ b/man/avahi-daemon.conf.5.xml.in
@@ -40,6 +40,12 @@
</option>
<option>
+ <p><opt>host-name-from-machine-id=</opt> Takes a boolean
+ value ("yes" or "no"). If set to "yes" avahi-daemon
+ will use the machine-id as name on the LAN.</p>
+ </option>
+
+ <option>
<p><opt>domain-name=</opt> Set the default domain name avahi-daemon
tries to register its host name and services on the LAN in. If
omitted defaults to ".local".</p>
--
1.9.3

32
avahi-0.6.30-mono-libdir.patch
View File

@ -14,22 +14,6 @@ diff -uNr avahi-0.6.30.old/avahi-sharp/Makefile.am avahi-0.6.30/avahi-sharp/Make
endif
endif
diff -uNr avahi-0.6.30.old/avahi-sharp/Makefile.in avahi-0.6.30/avahi-sharp/Makefile.in
--- avahi-0.6.30.old/avahi-sharp/Makefile.in 2011-04-04 00:10:46.000000000 +0200
+++ avahi-0.6.30/avahi-sharp/Makefile.in 2011-11-27 17:06:13.316193244 +0100
@@ -615,10 +615,10 @@
@HAVE_DBUS_TRUE@@HAVE_MONODOC_TRUE@@HAVE_MONO_TRUE@ $(AM_V_GEN)$(MDASSEMBLER) --out avahi-sharp-docs --ecma $(srcdir)/en
@HAVE_DBUS_TRUE@@HAVE_MONO_TRUE@install-data-hook: $(ASSEMBLY)
-@HAVE_DBUS_TRUE@@HAVE_MONO_TRUE@ $(AM_V_GEN)MONO_SHARED_DIR=. $(GACUTIL) /i $(ASSEMBLY) /package avahi-sharp /gacdir $(libdir) /root $(DESTDIR)$(libdir)
+@HAVE_DBUS_TRUE@@HAVE_MONO_TRUE@ $(AM_V_GEN)MONO_SHARED_DIR=. $(GACUTIL) /i $(ASSEMBLY) /package avahi-sharp /gacdir $(prefix)/lib /root $(DESTDIR)$(prefix)/lib
@HAVE_DBUS_TRUE@@HAVE_MONO_TRUE@uninstall-hook: $(ASSEMBLY)
-@HAVE_DBUS_TRUE@@HAVE_MONO_TRUE@ $(AM_V_GEN)MONO_SHARED_DIR=. $(GACUTIL) /u avahi-sharp /package avahi-sharp /gacdir $(libdir) /root $(DESTDIR)$(libdir)
+@HAVE_DBUS_TRUE@@HAVE_MONO_TRUE@ $(AM_V_GEN)MONO_SHARED_DIR=. $(GACUTIL) /u avahi-sharp /package avahi-sharp /gacdir $(prefix)/lib /root $(DESTDIR)$(prefix)/lib
# Tell versions [3.59,3.63) of GNU make to not export all variables.
# Otherwise a system limit (for SysV at least) may be exceeded.
diff -uNr avahi-0.6.30.old/avahi-sharp.pc.in avahi-0.6.30/avahi-sharp.pc.in
--- avahi-0.6.30.old/avahi-sharp.pc.in 2010-06-25 02:54:22.000000000 +0200
+++ avahi-0.6.30/avahi-sharp.pc.in 2011-11-27 17:00:05.482192846 +0100
@ -55,22 +39,6 @@ diff -uNr avahi-0.6.30.old/avahi-ui-sharp/Makefile.am avahi-0.6.30/avahi-ui-shar
endif
endif
diff -uNr avahi-0.6.30.old/avahi-ui-sharp/Makefile.in avahi-0.6.30/avahi-ui-sharp/Makefile.in
--- avahi-0.6.30.old/avahi-ui-sharp/Makefile.in 2011-04-04 00:10:46.000000000 +0200
+++ avahi-0.6.30/avahi-ui-sharp/Makefile.in 2011-11-27 17:05:54.197220114 +0100
@@ -604,10 +604,10 @@
@HAVE_DBUS_TRUE@@HAVE_GTK_TRUE@@HAVE_MONODOC_TRUE@@HAVE_MONO_TRUE@ $(AM_V_GEN)$(MDASSEMBLER) --out avahi-ui-sharp-docs --ecma $(srcdir)/en
@HAVE_DBUS_TRUE@@HAVE_GTK_TRUE@@HAVE_MONO_TRUE@install-data-hook: $(ASSEMBLY)
-@HAVE_DBUS_TRUE@@HAVE_GTK_TRUE@@HAVE_MONO_TRUE@ $(GACUTIL) /i $(ASSEMBLY) /package avahi-ui-sharp /gacdir $(libdir) /root $(DESTDIR)$(libdir)
+@HAVE_DBUS_TRUE@@HAVE_GTK_TRUE@@HAVE_MONO_TRUE@ $(GACUTIL) /i $(ASSEMBLY) /package avahi-ui-sharp /gacdir $(prefix)/lib /root $(DESTDIR)$(prefix)/lib
@HAVE_DBUS_TRUE@@HAVE_GTK_TRUE@@HAVE_MONO_TRUE@uninstall-hook: $(ASSEMBLY)
-@HAVE_DBUS_TRUE@@HAVE_GTK_TRUE@@HAVE_MONO_TRUE@ $(GACUTIL) /u avahi-ui-sharp /package avahi-ui-sharp /gacdir $(libdir) /root $(DESTDIR)$(libdir)
+@HAVE_DBUS_TRUE@@HAVE_GTK_TRUE@@HAVE_MONO_TRUE@ $(GACUTIL) /u avahi-ui-sharp /package avahi-ui-sharp /gacdir $(prefix)/lib /root $(DESTDIR)$(prefix)/lib
# Tell versions [3.59,3.63) of GNU make to not export all variables.
# Otherwise a system limit (for SysV at least) may be exceeded.
diff -uNr avahi-0.6.30.old/avahi-ui-sharp.pc.in avahi-0.6.30/avahi-ui-sharp.pc.in
--- avahi-0.6.30.old/avahi-ui-sharp.pc.in 2010-06-25 02:54:22.000000000 +0200
+++ avahi-0.6.30/avahi-ui-sharp.pc.in 2011-11-27 17:04:05.077192737 +0100

17
avahi-0.6.31-invalid_packet.patch
View File

@ -1,17 +0,0 @@
diff -up avahi-0.6.31/avahi-core/server.c.invalid_packet avahi-0.6.31/avahi-core/server.c
--- avahi-0.6.31/avahi-core/server.c.invalid_packet 2015-09-22 08:12:58.544588701 -0500
+++ avahi-0.6.31/avahi-core/server.c 2015-09-22 08:13:39.743862403 -0500
@@ -972,11 +972,9 @@ static void dispatch_packet(AvahiServer
return;
}
- if (avahi_dns_packet_get_field(p, AVAHI_DNS_FIELD_QDCOUNT) != 0 ||
- avahi_dns_packet_get_field(p, AVAHI_DNS_FIELD_ANCOUNT) == 0 ||
- avahi_dns_packet_get_field(p, AVAHI_DNS_FIELD_NSCOUNT) != 0) {
+ if (avahi_dns_packet_get_field(p, AVAHI_DNS_FIELD_ANCOUNT) == 0) {
- avahi_log_warn("Invalid response packet from host %s.", avahi_address_snprint(t, sizeof(t), src_address));
+ avahi_log_debug("Invalid response packet from host %s.", avahi_address_snprint(t, sizeof(t), src_address));
return;
}

22
avahi-0.6.31-no-deprecations.patch
View File

@ -1,22 +0,0 @@
--- avahi-0.6.31/avahi-ui/Makefile.am.orig 2013-09-21 16:47:28.677659361 +0200
+++ avahi-0.6.31/avahi-ui/Makefile.am 2013-09-21 16:47:34.852520537 +0200
@@ -15,7 +15,7 @@
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
# USA.
-AM_CFLAGS=-I$(top_srcdir) -DG_DISABLE_DEPRECATED=1 -DGDK_DISABLE_DEPRECATED=1 -DGTK_DISABLE_DEPRECATED=1
+AM_CFLAGS=-I$(top_srcdir)
# This cool debug trap works on i386/gcc only
AM_CFLAGS+='-DDEBUG_TRAP=__asm__("int $$3")'
--- avahi-0.6.31/configure.ac.orig 2013-09-21 16:46:43.750669413 +0200
+++ avahi-0.6.31/configure.ac 2013-09-21 16:47:02.566246400 +0200
@@ -92,7 +92,7 @@
AC_MSG_CHECKING([whether stack-smashing protection is available])
ssp_old_cflags="$CFLAGS"
ssp_old_ldflags="$LDFLAGS"
- CFLAGS="$CFLAGS -Werror -fstack-protector-all -fPIC"
+ CFLAGS="$CFLAGS -fstack-protector-all -fPIC"
LDFLAGS="$LDFLAGS -Wl,-z,defs"
cat confdefs.h > conftest.c
cat >>conftest.c <<_ACEOF

118
avahi-0.6.31-reserve-space-for-record-data-when-size-estimate.patch
View File

@ -1,118 +0,0 @@
From 5cf2d9e32dffc902ca5a6f0220904f8dca8ec055 Mon Sep 17 00:00:00 2001
From: "Lee, Chun-Yi" <jlee@suse.com>
Date: Fri, 7 Sep 2012 04:37:33 +0800
Subject: [PATCH] avahi-core: reserve space for record data when size estimate
When we tested put a lot of airprint service files(have 45 to 60 flies), found there have cpu loadinghigh problem when start avahi-daemon with those service files.
After traced source code, there have problem in probe-sched.c::elapse_callback causes doesn't have any probe job set to DONE so the daemon unlimited send out DNS package.
The root cause is when compare with the free package space in packet_add_probe_query before attach job key, the free package space doesn't include any record data that will attached after all keys attached. This defect causes whole DNS package is filled by job key, but doesn't remain enough space for any rdata. Then, that means have no job set to DONE.
This patch add a new res_size member to AvahiDnsPacket, it used to sum the reserve size for record data the will attached after all keys attached. It can avoid keys consume whole size until p->size larger then p->max_size.
Signed-off-by: Lee, Chun-Yi <jlee at suse.com>
---
avahi-core/dns.c | 20 ++++++++++++++++++++
avahi-core/dns.h | 4 +++-
avahi-core/probe-sched.c | 10 ++++++++--
3 files changed, 31 insertions(+), 3 deletions(-)
diff --git a/avahi-core/dns.c b/avahi-core/dns.c
index 2fcd91f..523afdc 100644
--- a/avahi-core/dns.c
+++ b/avahi-core/dns.c
@@ -55,6 +55,7 @@ AvahiDnsPacket* avahi_dns_packet_new(unsigned mtu) {
p->size = p->rindex = AVAHI_DNS_PACKET_HEADER_SIZE;
p->max_size = max_size;
+ p->res_size = 0;
p->name_table = NULL;
p->data = NULL;
@@ -833,6 +834,25 @@ size_t avahi_dns_packet_space(AvahiDnsPacket *p) {
return p->max_size - p->size;
}
+size_t avahi_dns_packet_reserve_size(AvahiDnsPacket *p, size_t res_size) {
+ assert(p);
+
+ assert(p->size + p->res_size <= p->max_size);
+
+ if ((p->size + p->res_size + res_size) <= p->max_size)
+ p->res_size += res_size;
+
+ return p->res_size;
+}
+
+size_t avahi_dns_packet_reserved_space(AvahiDnsPacket *p) {
+ assert(p);
+
+ assert(p->size + p->res_size <= p->max_size);
+
+ return p->max_size - p->size - p->res_size;
+}
+
int avahi_rdata_parse(AvahiRecord *record, const void* rdata, size_t size) {
int ret;
AvahiDnsPacket p;
diff --git a/avahi-core/dns.h b/avahi-core/dns.h
index 52e8d88..13b1ac2 100644
--- a/avahi-core/dns.h
+++ b/avahi-core/dns.h
@@ -30,7 +30,7 @@
#define AVAHI_DNS_PACKET_SIZE_MAX (AVAHI_DNS_PACKET_HEADER_SIZE + 256 + 2 + 2 + 4 + 2 + AVAHI_DNS_RDATA_MAX)
typedef struct AvahiDnsPacket {
- size_t size, rindex, max_size;
+ size_t size, rindex, max_size, res_size;
AvahiHashmap *name_table; /* for name compression */
uint8_t *data;
} AvahiDnsPacket;
@@ -78,6 +78,8 @@ int avahi_dns_packet_skip(AvahiDnsPacket *p, size_t length);
int avahi_dns_packet_is_empty(AvahiDnsPacket *p);
size_t avahi_dns_packet_space(AvahiDnsPacket *p);
+size_t avahi_dns_packet_reserve_size(AvahiDnsPacket *p, size_t res_size);
+size_t avahi_dns_packet_reserved_space(AvahiDnsPacket *p);
#define AVAHI_DNS_FIELD_ID 0
#define AVAHI_DNS_FIELD_FLAGS 1
diff --git a/avahi-core/probe-sched.c b/avahi-core/probe-sched.c
index 1e63411..63cb817 100644
--- a/avahi-core/probe-sched.c
+++ b/avahi-core/probe-sched.c
@@ -179,7 +179,7 @@ static int packet_add_probe_query(AvahiProbeScheduler *s, AvahiDnsPacket *p, Ava
avahi_record_get_estimate_size(pj->record);
/* Too large */
- if (size > avahi_dns_packet_space(p))
+ if (size > avahi_dns_packet_reserved_space(p))
return 0;
/* Create the probe query */
@@ -189,6 +189,9 @@ static int packet_add_probe_query(AvahiProbeScheduler *s, AvahiDnsPacket *p, Ava
b = !!avahi_dns_packet_append_key(p, k, 0);
assert(b);
+ /* reserve size for record data */
+ avahi_dns_packet_reserve_size(p, avahi_record_get_estimate_size(pj->record));
+
/* Mark this job for addition to the packet */
pj->chosen = 1;
@@ -202,9 +205,12 @@ static int packet_add_probe_query(AvahiProbeScheduler *s, AvahiDnsPacket *p, Ava
continue;
/* This job wouldn't fit in */
- if (avahi_record_get_estimate_size(pj->record) > avahi_dns_packet_space(p))
+ if (avahi_record_get_estimate_size(pj->record) > avahi_dns_packet_reserved_space(p))
break;
+ /* reserve size for record data */
+ avahi_dns_packet_reserve_size(p, avahi_record_get_estimate_size(pj->record));
+
/* Mark this job for addition to the packet */
pj->chosen = 1;
}
--
1.7.10.4

174
avahi-remove_lennart_prefix.patch
View File

@ -1,174 +0,0 @@
From a69cafac1916223080d1ef8a5df1d0c59ab6f5e4 Mon Sep 17 00:00:00 2001
From: Jan Chaloupka <jchaloup@redhat.com>
Date: Mon, 25 Aug 2014 12:38:29 +0200
Subject: [PATCH] remove lennart prefix
---
man/avahi-autoipd.8 | 2 +-
man/avahi-autoipd.action.8 | 2 +-
man/avahi-daemon.8 | 14 +++++++-------
man/avahi-daemon.conf.5 | 2 +-
man/avahi-dnsconfd.8 | 4 ++--
man/avahi-dnsconfd.action.8 | 2 +-
man/avahi.hosts.5 | 4 ++--
man/avahi.service.5 | 4 ++--
8 files changed, 17 insertions(+), 17 deletions(-)
diff --git a/man/avahi-autoipd.8 b/man/avahi-autoipd.8
index 034804c..862d25f 100644
--- a/man/avahi-autoipd.8
+++ b/man/avahi-autoipd.8
@@ -68,7 +68,7 @@ Show help.
\fB-v | --version\f1
Show version information.
.SH FILES
-\fI/home/lennart/tmp/avahi/etc/avahi/avahi-autoipd.action\f1: the script to run when an IP address as been acquired or is lost.
+\fI/etc/avahi/avahi-autoipd.action\f1: the script to run when an IP address as been acquired or is lost.
.SH SIGNALS
\fISIGINT, SIGTERM\f1: avahi-autoipd will shutdown. (Same as \fB--kill\f1)
diff --git a/man/avahi-autoipd.action.8 b/man/avahi-autoipd.action.8
index 837a762..62b14a4 100644
--- a/man/avahi-autoipd.action.8
+++ b/man/avahi-autoipd.action.8
@@ -2,7 +2,7 @@
.SH NAME
avahi-autoipd.action \- avahi-autoipd action script
.SH SYNOPSIS
-\fB/home/lennart/tmp/avahi/etc/avahi/avahi-autoipd.action
+\fB/etc/avahi/avahi-autoipd.action
\f1
.SH DESCRIPTION
\fIavahi-autoipd.action\f1 is the action script that is called whenever an IP address has been acquired by avahi-autoipd or when it detected an IP address conflict. The script should add or remove the specified address from the specified network interface.
diff --git a/man/avahi-daemon.8 b/man/avahi-daemon.8
index bbf2b43..1e5b9b2 100644
--- a/man/avahi-daemon.8
+++ b/man/avahi-daemon.8
@@ -13,11 +13,11 @@ avahi-daemon --check\fB
.SH DESCRIPTION
The Avahi mDNS/DNS-SD daemon implements Apple's Zeroconf architecture (also known as "Rendezvous" or "Bonjour"). The daemon registers local IP addresses and static services using mDNS/DNS-SD and provides two IPC APIs for local programs to make use of the mDNS record cache the avahi-daemon maintains. First there is the so called "simple protocol" which is used exclusively by avahi-dnsconfd (a daemon which configures unicast DNS servers using server info published via mDNS) and nss-mdns (a libc NSS plugin, providing name resolution via mDNS). Finally there is the D-Bus interface which provides a rich object oriented interface to D-Bus enabled applications.
-Upon startup avahi-daemon interprets its configuration file \fI/home/lennart/tmp/avahi/etc/avahi/avahi-daemon.conf\f1 and reads XML fragments from \fI/home/lennart/tmp/avahi/etc/avahi/services/*.service\f1 which may define static DNS-SD services. If you enable \fBpublish-resolv-conf-dns-servers\f1 in \fIavahi-daemon.conf\f1 the file \fI/etc/resolv.conf\f1 will be read, too.
+Upon startup avahi-daemon interprets its configuration file \fI/etc/avahi/avahi-daemon.conf\f1 and reads XML fragments from \fI/etc/avahi/services/*.service\f1 which may define static DNS-SD services. If you enable \fBpublish-resolv-conf-dns-servers\f1 in \fIavahi-daemon.conf\f1 the file \fI/etc/resolv.conf\f1 will be read, too.
.SH OPTIONS
.TP
\fB-f | --file=\f1 \fIFILE\f1
-Specify the configuration file to read. (default: /home/lennart/tmp/avahi/etc/avahi/avahi-daemon.conf)
+Specify the configuration file to read. (default: /etc/avahi/avahi-daemon.conf)
.TP
\fB-D | --daemonize\f1
Daemonize after startup. Implies \fB--syslog\f1.
@@ -44,7 +44,7 @@ Don't change the process name while running. Unless this option is specified ava
Kill an already running avahi-daemon. (equivalent to sending a SIGTERM)
.TP
\fB-r | --reload\f1
-Tell an already running avahi-daemon to reread \fI/etc/resolv.conf\f1 (in case you enabled \fBpublish-resolv-conf-dns-servers\f1 in \fIavahi-daemon.conf\f1) the files from \fI/home/lennart/tmp/avahi/etc/avahi/services/\f1. Please note that this will not reload the \fI/home/lennart/tmp/avahi/etc/avahi/avahi-daemon.conf\f1. (equivalent to sending a SIGHUP)
+Tell an already running avahi-daemon to reread \fI/etc/resolv.conf\f1 (in case you enabled \fBpublish-resolv-conf-dns-servers\f1 in \fIavahi-daemon.conf\f1) the files from \fI/etc/avahi/services/\f1. Please note that this will not reload the \fI/etc/avahi/avahi-daemon.conf\f1. (equivalent to sending a SIGHUP)
.TP
\fB-c | --check\f1
Return 0 as return code when avahi-daemon is already running.
@@ -55,15 +55,15 @@ Show help
\fB-v | --version\f1
Show version information
.SH FILES
-\fI/home/lennart/tmp/avahi/etc/avahi/avahi-daemon.conf\f1: the default configuration file for avahi-daemon, \fBavahi-daemon.conf(5)\f1 for more information.
+\fI/etc/avahi/avahi-daemon.conf\f1: the default configuration file for avahi-daemon, \fBavahi-daemon.conf(5)\f1 for more information.
-\fI/home/lennart/tmp/avahi/etc/avahi/hosts\f1: additional static hostname mappings to publish in mDNS, see \fBavahi.hosts(5)\f1 for more information.
+\fI/etc/avahi/hosts\f1: additional static hostname mappings to publish in mDNS, see \fBavahi.hosts(5)\f1 for more information.
-\fI/home/lennart/tmp/avahi/etc/avahi/services/*.service\f1: static service definitions, see \fBavahi.service(5)\f1 for more information.
+\fI/etc/avahi/services/*.service\f1: static service definitions, see \fBavahi.service(5)\f1 for more information.
.SH SIGNALS
\fISIGINT, SIGTERM\f1: avahi-daemon will shutdown. (Same as \fB--kill\f1).
-\fISIGHUP\f1: avahi-daemon will reload unicast DNS server data from \fI/etc/resolv.conf\f1 and static service definitions from \fI/home/lennart/tmp/avahi/etc/avahi/services/\f1. (Same as \fB--reload\f1)
+\fISIGHUP\f1: avahi-daemon will reload unicast DNS server data from \fI/etc/resolv.conf\f1 and static service definitions from \fI/etc/avahi/services/\f1. (Same as \fB--reload\f1)
\fISIGUSR1\f1: avahi-daemon will dump local and remote cached resource record data to syslog.
.SH AUTHORS
diff --git a/man/avahi-daemon.conf.5 b/man/avahi-daemon.conf.5
index 0ebc9d4..edddc1e 100644
--- a/man/avahi-daemon.conf.5
+++ b/man/avahi-daemon.conf.5
@@ -2,7 +2,7 @@
.SH NAME
avahi-daemon.conf \- avahi-daemon configuration file
.SH SYNOPSIS
-\fB/home/lennart/tmp/avahi/etc/avahi/avahi-daemon.conf
+\fB/etc/avahi/avahi-daemon.conf
\f1
.SH DESCRIPTION
\fIavahi-daemon.conf\f1 is the configuration file for avahi-daemon.
diff --git a/man/avahi-dnsconfd.8 b/man/avahi-dnsconfd.8
index 4ddee58..418ae36 100644
--- a/man/avahi-dnsconfd.8
+++ b/man/avahi-dnsconfd.8
@@ -11,7 +11,7 @@ avahi-dnsconfd --refresh\fB
avahi-dnsconfd --check\fB
\f1
.SH DESCRIPTION
-avahi-dnsconfd connects to a running avahi-daemon and runs the script \fI/home/lennart/tmp/avahi/etc/avahi/dnsconfd.action\f1 for each unicast DNS server that is announced on the local LAN. This is useful for configuring unicast DNS servers in a DHCP-like fashion with mDNS.
+avahi-dnsconfd connects to a running avahi-daemon and runs the script \fI/etc/avahi/dnsconfd.action\f1 for each unicast DNS server that is announced on the local LAN. This is useful for configuring unicast DNS servers in a DHCP-like fashion with mDNS.
.SH OPTIONS
.TP
\fB-D | --daemonize\f1
@@ -35,7 +35,7 @@ Show help
\fB-v | --version\f1
Show version information
.SH FILES
-\fI/home/lennart/tmp/avahi/etc/avahi/avahi-dnsconfd.action\f1: the script to run when a DNS server is found or removed.
+\fI/etc/avahi/avahi-dnsconfd.action\f1: the script to run when a DNS server is found or removed.
.SH SIGNALS
\fISIGINT, SIGTERM\f1: avahi-dnsconfd will shutdown. This is issued by passing --kill to avahi-daemon.
diff --git a/man/avahi-dnsconfd.action.8 b/man/avahi-dnsconfd.action.8
index 0ad2676..3f2f16a 100644
--- a/man/avahi-dnsconfd.action.8
+++ b/man/avahi-dnsconfd.action.8
@@ -2,7 +2,7 @@
.SH NAME
avahi-dnsconfd.action \- avahi-dnsconfd action script
.SH SYNOPSIS
-\fB/home/lennart/tmp/avahi/etc/avahi/avahi-dnsconfd.action
+\fB/etc/avahi/avahi-dnsconfd.action
\f1
.SH DESCRIPTION
\fIavahi-dnsconfd.action\f1 is the action script that is called whenever a new unicast DNS server is found or removed by avahi-dnsconfd. The default script as shipped with avahi patches \fI/etc/resolv.conf\f1 to reflect the changed unicast DNS server configuration.
diff --git a/man/avahi.hosts.5 b/man/avahi.hosts.5
index fe27077..dc4f73f 100644
--- a/man/avahi.hosts.5
+++ b/man/avahi.hosts.5
@@ -2,10 +2,10 @@
.SH NAME
avahi.hosts \- avahi-daemon static host name file
.SH SYNOPSIS
-\fB/home/lennart/tmp/avahi/etc/avahi/hosts
+\fB/etc/avahi/hosts
\f1
.SH DESCRIPTION
-\fI/home/lennart/tmp/avahi/etc/avahi/hosts\f1 is a file which may be used to define static host name to IP address mappings for multicast DNS. This is especially useful when publishing DNS-SD services on behalf of other hosts. See \fBavahi.service(5)\f1 for more information.
+\fI/etc/avahi/hosts\f1 is a file which may be used to define static host name to IP address mappings for multicast DNS. This is especially useful when publishing DNS-SD services on behalf of other hosts. See \fBavahi.service(5)\f1 for more information.
The file format is similar to the one of \fI/etc/hosts\f1: on each line an IP address and the corresponding host name. The host names should be in FQDN form, i.e. with appended .local suffix.
.SH AUTHORS
diff --git a/man/avahi.service.5 b/man/avahi.service.5
index 2ef8333..1775add 100644
--- a/man/avahi.service.5
+++ b/man/avahi.service.5
@@ -2,10 +2,10 @@
.SH NAME
avahi.service \- avahi-daemon static service file
.SH SYNOPSIS
-\fB/home/lennart/tmp/avahi/etc/avahi/services/*.service
+\fB/etc/avahi/services/*.service
\f1
.SH DESCRIPTION
-\fI/home/lennart/tmp/avahi/etc/avahi/services/*.service\f1 are XML fragments containing static DNS-SD service data. Every service file can contain multiple service definitions which share the same name. This is useful for publishing service data for services which implement multiple protocols. (i.e. a printer implementing _ipp._tcp and _printer._tcp)
+\fI/etc/avahi/services/*.service\f1 are XML fragments containing static DNS-SD service data. Every service file can contain multiple service definitions which share the same name. This is useful for publishing service data for services which implement multiple protocols. (i.e. a printer implementing _ipp._tcp and _printer._tcp)
.SH XML TAGS
.TP
\fB<service-group>\f1 The document tag of avahi service files. Should contain one \fB<name>\f1 and one or more \fB<service>\f1 elements.
--
1.9.3

70
avahi.spec
View File

@ -16,9 +16,11 @@
# trim changelog included in binary rpms
%global _changelog_trimtime %(date +%s -d "1 year ago")
%global beta rc
Name: avahi
Version: 0.6.31
Release: 43%{?dist}
Version: 0.6.32
Release: 0.1.%{beta}%{?dist}
Summary: Local network service discovery
License: LGPLv2+
URL: http://avahi.org
@ -67,36 +69,20 @@ Requires(preun): systemd
Requires(postun): systemd
Requires(post): systemd-sysv
%if 0%{?beta:1}
Source0: https://github.com/lathiat/%{name}/archive/%{version}-%{beta}.tar.gz#/%{name}-%{version}-%{beta}.tar.gz
%else
Source0: http://avahi.org/download/%{name}-%{version}.tar.gz
%endif
## upstream patches
Patch1: 0001-avahi-daemon-don-t-add-0pointer.de-and-zeroconf.org-.patch
Patch2: 0002-avahi-daemon-don-t-leak-host-info-by-default.patch
Patch3: 0003-core-don-t-leak-hinfo-workstation-even-if-the-config.patch
Patch4: 0004-build-sys-fix-MKDIR_P-for-recent-automake.patch
Patch5: 0005-build-sys-fix-parallel-install-in-avahi-utils.patch
Patch6: 0006-build-sys-fix-previous-commit-for-recent-automake.patch
# munged a bit to make it apply against tarball
Patch7: 0007-avahi-common-typo-fix.patch
Patch8: 0008-avahi-daemon-add-option-host-name-from-machine-id.patch
Patch100: avahi-0.6.30-mono-libdir.patch
# Disable -Werror and remove G*_DISABLE_DEPRECATED definitions
Patch101: avahi-0.6.31-no-deprecations.patch
Patch103: 0001-netlink-check-that-the-origin-of-the-rtnetlink-messa.patch
Patch104: 0001-Python3-support.patch
Patch105: avahi-0.6.31-reserve-space-for-record-data-when-size-estimate.patch
# https://bugzilla.redhat.com/show_bug.cgi?id=1240711
# proposed fix from http://avahi.org/ticket/352
Patch106: avahi-0.6.31-invalid_packet.patch
Patch107: avahi-remove_lennart_prefix.patch
%description
Avahi is a system which facilitates service discovery on
a local network -- this means that you can plug your laptop or
@ -361,28 +347,14 @@ Requires: %{name}-libs%{?_isa} = %{version}-%{release}
%prep
%setup -q
%patch1 -p1 -b .0001
%patch2 -p1 -b .0002
%patch3 -p1 -b .0003
%patch4 -p1 -b .0004
%patch5 -p1 -b .0005
%patch6 -p1 -b .0006
%patch7 -p1 -b .0007
%patch8 -p1 -b .0008
%setup -q -n %{name}-%{version}%{?beta:-%{beta}}
%patch100 -p1 -b .mono-libdir
%patch101 -p1 -b .no_deprecations
%patch103 -p1 -b .netlink-userns
%patch104 -p1 -b .python3
%patch105 -p1 -b .reserve-size
%patch106 -p1 -b .invalid_packet
%patch107 -p1 -b .remove_lennart_prefix
rm docs/INSTALL
rm -fv docs/INSTALL
# patch101 requires autogen
rm -v missing
# patch100 requires autogen
rm -fv missing
NOCONFIGURE=1 ./autogen.sh
%build
@ -475,11 +447,6 @@ fi
/sbin/ldconfig >/dev/null 2>&1 || :
%systemd_postun_with_restart avahi-daemon.socket avahi-daemon.service
%triggerun -- avahi < 0.6.28-1
/usr/bin/systemd-sysv-convert --save avahi-daemon >/dev/null 2>&1 || :
/usr/bin/systemctl --no-reload enable avahi-daemon.service >/dev/null 2>&1 || :
/usr/bin/systemctl try-restart avahi-daemon.service >/dev/null 2>&1 || :
%pre autoipd
getent group avahi-autoipd >/dev/null || groupadd -f -g 170 -r avahi-autoipd
if ! getent passwd avahi-autoipd > /dev/null ; then
@ -500,11 +467,6 @@ exit 0
%postun dnsconfd
%systemd_postun_with_restart avahi-dnsconfd.service
%triggerun dnsconfd -- avahi-dnsconfd < 0.6.28-1
/usr/bin/systemd-sysv-convert --save avahi-dnsconfd >/dev/null 2>&1 || :
/usr/bin/systemctl --no-reload enable avahi-dnsconfd.service >/dev/null 2>&1 || :
/usr/bin/systemctl try-restart avahi-dnsconfd.service >/dev/null 2>&1 || :
%post glib -p /sbin/ldconfig
%postun glib -p /sbin/ldconfig
@ -550,7 +512,6 @@ exit 0
%{_datadir}/avahi/service-types
%dir %{_libdir}/avahi
%{_libdir}/avahi/service-types.db
%{_datadir}/dbus-1/interfaces/*.xml
%{_mandir}/man5/*
%{_mandir}/man8/avahi-daemon.*
%{_unitdir}/avahi-daemon.service
@ -602,6 +563,7 @@ exit 0
%{_includedir}/avahi-core
%{_libdir}/pkgconfig/avahi-core.pc
%{_libdir}/pkgconfig/avahi-client.pc
%{_datadir}/dbus-1/interfaces/*.xml
%files libs
%doc README LICENSE
@ -705,6 +667,12 @@ exit 0
%{python3_sitelib}/avahi/
%changelog
* Sat Oct 10 2015 Rex Dieter <rdieter@fedoraproject.org> - 0.6.32-0.1.rc
- avahi-0.6.32-rc
- -devel: move dbus-1/interfaces here
- Avahi's IPv6 support is disabled by default (#821127)
- avahi: script and/or trigger should not directly enable systemd units (#1094899)
* Tue Sep 22 2015 Rafael Fonseca <rdossant@redhat.com> - 0.6.31-43
- use %%{mono_arches} instead of hardcoded list

2
sources
View File

@ -1 +1 @@
2f22745b8f7368ad5a0a3fddac343f2d avahi-0.6.31.tar.gz
40781846af871d043c2ddfc4eb846a1d avahi-0.6.32-rc.tar.gz