Update to avahi-0.6.26.
Lots of bugfixes. Refer to HOMEPAGE for detail information.
This commit is contained in:
ajacoutot
parent
7adf58310c
commit
45323bcc2b
@ -1,4 +1,4 @@
|
||||
# $OpenBSD: Makefile,v 1.28 2010/07/12 22:07:37 sthen Exp $
|
||||
# $OpenBSD: Makefile,v 1.29 2010/07/17 14:12:38 ajacoutot Exp $
|
||||
|
||||
COMMENT-main= framework for Multicast DNS Service Discovery
|
||||
COMMENT-gtk= GUI client utilities for avahi
|
||||
@ -6,12 +6,7 @@ COMMENT-mono= mono (.NET) bindings for avahi
|
||||
COMMENT-qt3= qt3 bindings for avahi
|
||||
COMMENT-qt4= qt4 bindings for avahi
|
||||
|
||||
V= 0.6.25
|
||||
REVISION-main= 10
|
||||
REVISION-gtk= 6
|
||||
REVISION-mono= 5
|
||||
REVISION-qt3= 3
|
||||
REVISION-qt4= 2
|
||||
V= 0.6.26
|
||||
DISTNAME= avahi-${V}
|
||||
CATEGORIES= net devel
|
||||
|
||||
@ -56,11 +51,13 @@ WANTLIB= c expat glib-2.0 gobject-2.0 pcre pthread
|
||||
|
||||
BUILD_DEPENDS= ::converters/xmltoman
|
||||
|
||||
WANTLIB-main= ${WANTLIB} glib-2.0 gobject-2.0 gthread-2.0 gdbm \
|
||||
daemon dbus-1
|
||||
LIB_DEPENDS-main= ${MODGETTEXT_LIB_DEPENDS} \
|
||||
glib-2.0.>=1800,gobject-2.0,gthread-2.0::devel/glib2 \
|
||||
gdbm::databases/gdbm \
|
||||
daemon::devel/libdaemon \
|
||||
dbus-1::x11/dbus
|
||||
::devel/glib2 \
|
||||
::databases/gdbm \
|
||||
::devel/libdaemon \
|
||||
::x11/dbus
|
||||
|
||||
ONLY_FOR_ARCHS-mono = i386 amd64 powerpc
|
||||
|
||||
@ -95,8 +92,7 @@ BUILD_DEPENDS+= :python-gdbm-*:lang/python/${MODPY_VERSION},-gdbm \
|
||||
::x11/py-gtk2 \
|
||||
::x11/dbus-python
|
||||
LIB_DEPENDS-gtk= ${MODGETTEXT_LIB_DEPENDS} \
|
||||
avahi-client,avahi-common,avahi-core,avahi-glib::net/avahi \
|
||||
glade-2.0.>=1::devel/libglade2
|
||||
::net/avahi
|
||||
RUN_DEPENDS-gtk= ${MODPY_RUN_DEPENDS} \
|
||||
:python-gdbm-*:lang/python/${MODPY_VERSION},-gdbm \
|
||||
::x11/py-gtk2 \
|
||||
@ -105,11 +101,12 @@ RUN_DEPENDS-gtk= ${MODPY_RUN_DEPENDS} \
|
||||
::devel/desktop-file-utils
|
||||
WANTLIB-gtk= X11 Xau Xcomposite Xcursor Xdamage Xdmcp Xext Xfixes \
|
||||
Xi Xinerama Xrandr Xrender atk-1.0 c cairo dbus-1 \
|
||||
expat fontconfig freetype gdbm gdk-x11-2.0 \
|
||||
expat fontconfig freetype gdbm gdk-x11-2.0 gthread-2.0 \
|
||||
gdk_pixbuf-2.0 gio-2.0 glib-2.0 glitz gmodule-2.0 \
|
||||
gobject-2.0 gtk-x11-2.0 m pango-1.0 pangocairo-1.0 \
|
||||
pangoft2-1.0 pcre pixman-1 png pthread pthread-stubs xcb xml2 z \
|
||||
xcb-render xcb-render-util
|
||||
pangoft2-1.0 pcre pixman-1 png pthread pthread-stubs xcb z \
|
||||
xcb-render xcb-render-util avahi-client avahi-common avahi-core \
|
||||
avahi-glib
|
||||
.else
|
||||
CONFIGURE_ARGS+= -disable-gtk \
|
||||
--disable-python \
|
||||
@ -122,10 +119,11 @@ MULTI_PACKAGES+= -qt3
|
||||
MODULES+= x11/qt3
|
||||
LIB_DEPENDS-qt3= ${MODGETTEXT_LIB_DEPENDS} \
|
||||
${MODQT3_LIB_DEPENDS} \
|
||||
avahi-common::net/avahi
|
||||
::net/avahi
|
||||
WANTLIB-qt3= GL ICE SM X11 Xau Xcursor Xdmcp Xext Xfixes Xft Xi \
|
||||
Xinerama Xmu Xrandr Xrender Xt expat fontconfig \
|
||||
freetype jpeg lcms m mng png pthread-stubs xcb z
|
||||
freetype jpeg lcms m mng png pthread-stubs xcb z \
|
||||
avahi-common stdc++
|
||||
.else
|
||||
CONFIGURE_ARGS+= --disable-qt3
|
||||
.endif
|
||||
@ -134,9 +132,9 @@ CONFIGURE_ARGS+= --disable-qt3
|
||||
MULTI_PACKAGES+= -qt4
|
||||
MODULES+= x11/qt4
|
||||
LIB_DEPENDS-qt4= ${MODGETTEXT_LIB_DEPENDS} \
|
||||
QtCore.>=7::x11/qt4 \
|
||||
avahi-common::net/avahi
|
||||
WANTLIB-qt4=
|
||||
::x11/qt4 \
|
||||
::net/avahi
|
||||
WANTLIB-qt4= QtCore avahi-common m stdc++
|
||||
.else
|
||||
CONFIGURE_ARGS+= --disable-qt4
|
||||
.endif
|
||||
@ -148,9 +146,9 @@ USE_LIBTOOL= Yes
|
||||
MODPY_RUNDEP= No
|
||||
MODMONO_DEPS= No
|
||||
|
||||
AUTOCONF_VERSION= 2.63
|
||||
AUTOCONF_VERSION= 2.65
|
||||
|
||||
CONFIGURE_STYLE=autoconf
|
||||
CONFIGURE_STYLE=autoconf no-autoheader
|
||||
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \
|
||||
LDFLAGS="-L${LOCALBASE}/lib -L${X11BASE}/lib" \
|
||||
PTHREAD_CFLAGS="-pthread" \
|
||||
@ -170,10 +168,13 @@ CONFIGURE_ARGS+=${CONFIGURE_SHARED} \
|
||||
--enable-compat-libdns_sd \
|
||||
--enable-core-docs \
|
||||
--enable-tests \
|
||||
--disable-silent-rules \
|
||||
--disable-doxygen-doc \
|
||||
--disable-doxygen-dot \
|
||||
--disable-doxygen-xml \
|
||||
--disable-doxygen-html
|
||||
--disable-doxygen-html \
|
||||
--disable-introspection \
|
||||
--disable-gtk3
|
||||
|
||||
# don't link with libssp from gcc4; __guard and __stack_smash_handler
|
||||
# are part of libc (see LIBS in CONFIGURE_ENV)
|
||||
@ -188,12 +189,17 @@ PC_FILES= avahi-ui.pc avahi-client.pc avahi-compat-howl.pc \
|
||||
avahi-compat-libdns_sd.pc avahi-core.pc avahi-glib.pc \
|
||||
avahi-gobject.pc avahi-qt3.pc avahi-qt4.pc
|
||||
|
||||
post-extract:
|
||||
find ${WRKSRC} -type d -name PaxHeaders.24570 | \
|
||||
xargs rm -r
|
||||
rm ${WRKSRC}/configure
|
||||
|
||||
pre-configure:
|
||||
find ${WRKSRC} -name Makefile.in -exec \
|
||||
perl -pi -e 's,LIBINTL,INTLLIBS,g;' \
|
||||
-e 's,LIBICONV,LTLIBICONV,g' {} \;
|
||||
perl -pi -e 's,/etc/avahi,${SYSCONFDIR}/avahi,g' \
|
||||
${WRKSRC}/man/*.*
|
||||
find ${WRKSRC}/man -type f | xargs \
|
||||
perl -pi -e 's,/etc/avahi,${SYSCONFDIR}/avahi,g'
|
||||
perl -pi -e 's,dbus_connection_disconnect,dbus_connection_close,g' \
|
||||
${WRKSRC}/avahi-client/client.c \
|
||||
${WRKSRC}/avahi-daemon/dbus-protocol.c
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
MD5 (avahi-0.6.25.tar.gz) = qDFVpuKeOYjwfl7qMoeyHg==
|
||||
RMD160 (avahi-0.6.25.tar.gz) = MCX3dDYKjqO53ofi3wsAOHVpqvI=
|
||||
SHA1 (avahi-0.6.25.tar.gz) = fOjtWklNckAd2B9kWU/aWdLskf0=
|
||||
SHA256 (avahi-0.6.25.tar.gz) = kiDZdPVRW4zPo5AM1yztysD6TMh8o8ZEBffFU0bLulk=
|
||||
SIZE (avahi-0.6.25.tar.gz) = 1103653
|
||||
MD5 (avahi-0.6.26.tar.gz) = KysYmfzsWudOkvERWYkToQ==
|
||||
RMD160 (avahi-0.6.26.tar.gz) = m52iHoYHHiKoTBlBMzgdxa+KYaw=
|
||||
SHA1 (avahi-0.6.26.tar.gz) = JI/p1NyaaCp8DKSR67fe9vgqAGs=
|
||||
SHA256 (avahi-0.6.26.tar.gz) = aZtFD1xjBxl4myYaRCPHcxED7ZbS4zOQFieVbWAWZg8=
|
||||
SIZE (avahi-0.6.26.tar.gz) = 1205318
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
$OpenBSD: patch-avahi-autoipd_Makefile_am,v 1.1.1.1 2009/06/03 16:27:12 ajacoutot Exp $
|
||||
--- avahi-autoipd/Makefile.am.orig Wed Jul 9 18:29:35 2008
|
||||
+++ avahi-autoipd/Makefile.am Wed Jul 9 18:41:13 2008
|
||||
@@ -46,6 +46,9 @@ avahi_autoipd_LDADD = $(AM_LDADD) $(LIBDAEMON_LIBS)
|
||||
$OpenBSD: patch-avahi-autoipd_Makefile_am,v 1.2 2010/07/17 14:12:38 ajacoutot Exp $
|
||||
--- avahi-autoipd/Makefile.am.orig Mon Jun 28 18:23:15 2010
|
||||
+++ avahi-autoipd/Makefile.am Mon Jul 5 12:04:12 2010
|
||||
@@ -44,6 +44,9 @@ avahi_autoipd_LDADD = $(AM_LDADD) $(LIBDAEMON_LIBS)
|
||||
if TARGET_FREEBSD
|
||||
avahi_autoipd_SOURCES += iface-bsd.c
|
||||
avahi_autoipd_LDADD += -lpcap
|
||||
@ -11,13 +11,13 @@ $OpenBSD: patch-avahi-autoipd_Makefile_am,v 1.1.1.1 2009/06/03 16:27:12 ajacouto
|
||||
else
|
||||
avahi_autoipd_SOURCES += iface-linux.c
|
||||
endif
|
||||
@@ -55,6 +58,9 @@ nodist_pkgsysconf_SCRIPTS = avahi-autoipd.action
|
||||
@@ -53,6 +56,9 @@ nodist_pkgsysconf_SCRIPTS = avahi-autoipd.action
|
||||
if TARGET_FREEBSD
|
||||
avahi-autoipd.action: avahi-autoipd.action.bsd
|
||||
cp $< $@
|
||||
$(AM_V_GEN)cp $< $@
|
||||
+ifelse TARGET_OPENBSD
|
||||
+avahi_autoipd_SOURCES += iface-bsd.c
|
||||
+avahi_autoipd_LDADD += -lpcap
|
||||
else
|
||||
avahi-autoipd.action: avahi-autoipd.action.linux
|
||||
cp $< $@
|
||||
$(AM_V_GEN)cp $< $@
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
$OpenBSD: patch-avahi-autoipd_main_c,v 1.1.1.1 2009/06/03 16:27:12 ajacoutot Exp $
|
||||
--- avahi-autoipd/main.c.orig Wed Jun 18 01:13:44 2008
|
||||
+++ avahi-autoipd/main.c Wed Jul 9 18:10:51 2008
|
||||
@@ -29,19 +29,26 @@
|
||||
$OpenBSD: patch-avahi-autoipd_main_c,v 1.2 2010/07/17 14:12:38 ajacoutot Exp $
|
||||
--- avahi-autoipd/main.c.orig Fri Jun 25 21:12:15 2010
|
||||
+++ avahi-autoipd/main.c Mon Jul 5 12:02:37 2010
|
||||
@@ -27,19 +27,26 @@
|
||||
#include <sys/ioctl.h>
|
||||
#include <sys/socket.h>
|
||||
#include <sys/wait.h>
|
||||
@ -34,7 +34,7 @@ $OpenBSD: patch-avahi-autoipd_main_c,v 1.1.1.1 2009/06/03 16:27:12 ajacoutot Exp
|
||||
#include <arpa/inet.h>
|
||||
|
||||
#include <assert.h>
|
||||
@@ -64,7 +71,7 @@
|
||||
@@ -62,7 +69,7 @@
|
||||
#include <pcap.h>
|
||||
|
||||
/* Old versions of PCAP defined it as D_IN */
|
||||
@ -43,30 +43,3 @@ $OpenBSD: patch-avahi-autoipd_main_c,v 1.1.1.1 2009/06/03 16:27:12 ajacoutot Exp
|
||||
#define PCAP_D_IN D_IN
|
||||
#endif
|
||||
|
||||
@@ -729,7 +736,7 @@ open_socket(int iface, uint8_t *hw_address)
|
||||
}
|
||||
|
||||
static void
|
||||
-close_socket(int fd __unused)
|
||||
+close_socket(int fd)
|
||||
{
|
||||
|
||||
assert(__pp != NULL);
|
||||
@@ -742,7 +749,7 @@ close_socket(int fd __unused)
|
||||
* and prepend the required ethernet header information before sending.
|
||||
*/
|
||||
static int
|
||||
-send_packet(int fd __unused, int iface __unused, ArpPacket *packet,
|
||||
+send_packet(int fd, int iface, ArpPacket *packet,
|
||||
size_t packet_len)
|
||||
{
|
||||
struct ether_header *eh;
|
||||
@@ -759,7 +766,7 @@ send_packet(int fd __unused, int iface __unused, ArpPa
|
||||
}
|
||||
|
||||
static int
|
||||
-recv_packet(int fd __unused, ArpPacket **packet, size_t *packet_len)
|
||||
+recv_packet(int fd, ArpPacket **packet, size_t *packet_len)
|
||||
{
|
||||
struct pcap_pkthdr *ph;
|
||||
u_char *pd;
|
||||
|
||||
@ -1,10 +1,10 @@
|
||||
$OpenBSD: patch-avahi-compat-libdns_sd_warn_c,v 1.1 2009/06/03 19:42:55 ajacoutot Exp $
|
||||
$OpenBSD: patch-avahi-compat-libdns_sd_warn_c,v 1.2 2010/07/17 14:12:38 ajacoutot Exp $
|
||||
|
||||
Reverse logic to stop polluting syslog(3).
|
||||
|
||||
--- avahi-compat-libdns_sd/warn.c.orig Wed Jun 3 21:07:44 2009
|
||||
+++ avahi-compat-libdns_sd/warn.c Wed Jun 3 21:08:33 2009
|
||||
@@ -112,7 +112,7 @@ void avahi_warn_linkage(void) {
|
||||
--- avahi-compat-libdns_sd/warn.c.orig Fri Jun 25 02:41:26 2010
|
||||
+++ avahi-compat-libdns_sd/warn.c Mon Jul 5 12:02:37 2010
|
||||
@@ -110,7 +110,7 @@ void avahi_warn_linkage(void) {
|
||||
linkage_warning = 1;
|
||||
pthread_mutex_unlock(&linkage_mutex);
|
||||
|
||||
|
||||
@ -1,15 +0,0 @@
|
||||
$OpenBSD: patch-avahi-core_announce_c,v 1.1 2009/06/26 22:12:20 ajacoutot Exp $
|
||||
|
||||
http://avahi.org/ticket/267
|
||||
|
||||
--- avahi-core/announce.c.orig Wed Jun 18 01:13:44 2008
|
||||
+++ avahi-core/announce.c Thu Jun 25 17:32:51 2009
|
||||
@@ -376,7 +376,7 @@ static int is_duplicate_entry(AvahiServer *s, AvahiEnt
|
||||
|
||||
for (i = avahi_hashmap_lookup(s->entries_by_key, e->record->key); i; i = i->by_key_next) {
|
||||
|
||||
- if (i == e)
|
||||
+ if ((i == e) || (i->dead))
|
||||
continue;
|
||||
|
||||
if (!avahi_record_equal_no_ttl(i->record, e->record))
|
||||
@ -1,24 +0,0 @@
|
||||
$OpenBSD: patch-avahi-core_entry_c,v 1.1 2009/06/26 22:12:20 ajacoutot Exp $
|
||||
|
||||
http://avahi.org/ticket/267
|
||||
|
||||
--- avahi-core/entry.c.orig Wed Jun 18 01:13:44 2008
|
||||
+++ avahi-core/entry.c Thu Jun 25 17:32:54 2009
|
||||
@@ -1087,6 +1087,8 @@ void avahi_s_entry_group_free(AvahiSEntryGroup *g) {
|
||||
|
||||
g->server->need_group_cleanup = 1;
|
||||
g->server->need_entry_cleanup = 1;
|
||||
+
|
||||
+ avahi_cleanup_dead_entries(g->server);
|
||||
}
|
||||
|
||||
static void entry_group_commit_real(AvahiSEntryGroup *g) {
|
||||
@@ -1166,6 +1168,8 @@ void avahi_s_entry_group_reset(AvahiSEntryGroup *g) {
|
||||
g->n_probing = 0;
|
||||
|
||||
avahi_s_entry_group_change_state(g, AVAHI_ENTRY_GROUP_UNCOMMITED);
|
||||
+
|
||||
+ avahi_cleanup_dead_entries(g->server);
|
||||
}
|
||||
|
||||
int avahi_entry_is_commited(AvahiEntry *e) {
|
||||
@ -1,10 +1,10 @@
|
||||
$OpenBSD: patch-avahi-core_fdutil_c,v 1.1 2009/06/16 21:50:01 jasper Exp $
|
||||
$OpenBSD: patch-avahi-core_fdutil_c,v 1.2 2010/07/17 14:12:38 ajacoutot Exp $
|
||||
|
||||
Missing prototype for memset().
|
||||
|
||||
--- avahi-core/fdutil.c.orig Tue Jun 16 19:07:15 2009
|
||||
+++ avahi-core/fdutil.c Tue Jun 16 19:07:35 2009
|
||||
@@ -27,6 +27,7 @@
|
||||
--- avahi-core/fdutil.c.orig Fri Jun 25 02:41:25 2010
|
||||
+++ avahi-core/fdutil.c Mon Jul 5 12:02:37 2010
|
||||
@@ -25,6 +25,7 @@
|
||||
#include <unistd.h>
|
||||
#include <fcntl.h>
|
||||
#include <assert.h>
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
$OpenBSD: patch-avahi-core_iface-pfroute_c,v 1.3 2009/06/26 22:12:20 ajacoutot Exp $
|
||||
--- avahi-core/iface-pfroute.c.orig Fri Dec 12 22:36:15 2008
|
||||
+++ avahi-core/iface-pfroute.c Thu Jun 25 21:31:39 2009
|
||||
@@ -48,6 +48,13 @@
|
||||
$OpenBSD: patch-avahi-core_iface-pfroute_c,v 1.4 2010/07/17 14:12:38 ajacoutot Exp $
|
||||
--- avahi-core/iface-pfroute.c.orig Fri Jun 25 02:41:25 2010
|
||||
+++ avahi-core/iface-pfroute.c Mon Jul 5 12:06:35 2010
|
||||
@@ -46,6 +46,13 @@
|
||||
#include "iface-pfroute.h"
|
||||
#include "util.h"
|
||||
|
||||
@ -12,12 +12,12 @@ $OpenBSD: patch-avahi-core_iface-pfroute_c,v 1.3 2009/06/26 22:12:20 ajacoutot E
|
||||
+#define SIOCGLIFFLAGS SIOCGIFFLAGS
|
||||
+#endif
|
||||
+
|
||||
static int bitcount (unsigned int n)
|
||||
{
|
||||
static int bitcount (unsigned int n)
|
||||
{
|
||||
int count=0 ;
|
||||
@@ -242,8 +249,10 @@ static void parse_rtmsg(struct rt_msghdr *rtm, AvahiIn
|
||||
@@ -240,8 +247,10 @@ static void parse_rtmsg(struct rt_msghdr *rtm, AvahiIn
|
||||
assert(rtm);
|
||||
|
||||
|
||||
if (rtm->rtm_version != RTM_VERSION) {
|
||||
+#ifndef __OpenBSD__
|
||||
avahi_log_warn("routing message version %d not understood",
|
||||
|
||||
@ -1,10 +1,7 @@
|
||||
$OpenBSD: patch-avahi-core_server_c,v 1.2 2009/06/26 22:12:20 ajacoutot Exp $
|
||||
|
||||
CVE-2008-5081 + http://avahi.org/ticket/267
|
||||
|
||||
--- avahi-core/server.c.orig Tue Apr 14 03:28:56 2009
|
||||
+++ avahi-core/server.c Thu Jun 25 17:36:04 2009
|
||||
@@ -904,6 +904,11 @@ static void dispatch_packet(AvahiServer *s, AvahiDnsPa
|
||||
$OpenBSD: patch-avahi-core_server_c,v 1.3 2010/07/17 14:12:38 ajacoutot Exp $
|
||||
--- avahi-core/server.c.orig Tue Jun 29 02:12:38 2010
|
||||
+++ avahi-core/server.c Mon Jul 5 12:02:37 2010
|
||||
@@ -903,6 +903,11 @@ static void dispatch_packet(AvahiServer *s, AvahiDnsPa
|
||||
return;
|
||||
}
|
||||
|
||||
@ -16,35 +13,3 @@ CVE-2008-5081 + http://avahi.org/ticket/267
|
||||
if (avahi_address_is_ipv4_in_ipv6(src_address))
|
||||
/* This is an IPv4 address encapsulated in IPv6, so let's ignore it. */
|
||||
return;
|
||||
@@ -1009,13 +1014,6 @@ static void dispatch_legacy_unicast_packet(AvahiServer
|
||||
avahi_dns_packet_set_field(p, AVAHI_DNS_FIELD_ID, slot->id);
|
||||
}
|
||||
|
||||
-static void cleanup_dead(AvahiServer *s) {
|
||||
- assert(s);
|
||||
-
|
||||
- avahi_cleanup_dead_entries(s);
|
||||
- avahi_browser_cleanup(s);
|
||||
-}
|
||||
-
|
||||
static void mcast_socket_event(AvahiWatch *w, int fd, AvahiWatchEvent events, void *userdata) {
|
||||
AvahiServer *s = userdata;
|
||||
AvahiAddress dest, src;
|
||||
@@ -1048,7 +1046,7 @@ static void mcast_socket_event(AvahiWatch *w, int fd,
|
||||
|
||||
avahi_dns_packet_free(p);
|
||||
|
||||
- cleanup_dead(s);
|
||||
+ avahi_cleanup_dead_entries(s);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -1071,7 +1069,7 @@ static void legacy_unicast_socket_event(AvahiWatch *w,
|
||||
dispatch_legacy_unicast_packet(s, p);
|
||||
avahi_dns_packet_free(p);
|
||||
|
||||
- cleanup_dead(s);
|
||||
+ avahi_cleanup_dead_entries(s);
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@ -1,31 +0,0 @@
|
||||
$OpenBSD: patch-avahi-core_socket_c,v 1.1 2010/07/07 18:57:38 ajacoutot Exp $
|
||||
|
||||
Fix for CVE-2010-2244: 2b2844b10d7b7e5c97f9c667d664d9418bb7769a
|
||||
zero size is reported for corrupt packets. recvmsg() later could
|
||||
nevertheless get data from a good packet that followed the bad one.
|
||||
So get out early to avoid hitting an assertion.
|
||||
|
||||
--- avahi-core/socket.c.orig Wed Jun 18 01:13:44 2008
|
||||
+++ avahi-core/socket.c Wed Jul 7 20:53:39 2010
|
||||
@@ -652,6 +652,10 @@ AvahiDnsPacket *avahi_recv_dns_packet_ipv4(
|
||||
goto fail;
|
||||
}
|
||||
|
||||
+ /* For corrupt packets FIONREAD returns zero size (See rhbz #607297) */
|
||||
+ if (!ms)
|
||||
+ goto fail;
|
||||
+
|
||||
p = avahi_dns_packet_new(ms + AVAHI_DNS_PACKET_EXTRA_SIZE);
|
||||
|
||||
io.iov_base = AVAHI_DNS_PACKET_DATA(p);
|
||||
@@ -804,6 +808,10 @@ AvahiDnsPacket *avahi_recv_dns_packet_ipv6(
|
||||
avahi_log_warn("FIONREAD returned negative value.");
|
||||
goto fail;
|
||||
}
|
||||
+
|
||||
+ /* For corrupt packets FIONREAD returns zero size (See rhbz #607297) */
|
||||
+ if (!ms)
|
||||
+ goto fail;
|
||||
|
||||
p = avahi_dns_packet_new(ms + AVAHI_DNS_PACKET_EXTRA_SIZE);
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
$OpenBSD: patch-avahi-daemon_avahi-daemon_conf,v 1.3 2009/06/26 22:12:20 ajacoutot Exp $
|
||||
--- avahi-daemon/avahi-daemon.conf.orig Fri Dec 12 22:36:15 2008
|
||||
+++ avahi-daemon/avahi-daemon.conf Thu Jun 25 19:48:37 2009
|
||||
@@ -23,15 +23,15 @@
|
||||
$OpenBSD: patch-avahi-daemon_avahi-daemon_conf,v 1.4 2010/07/17 14:12:38 ajacoutot Exp $
|
||||
--- avahi-daemon/avahi-daemon.conf.orig Tue Jun 29 02:19:57 2010
|
||||
+++ avahi-daemon/avahi-daemon.conf Mon Jul 5 12:02:37 2010
|
||||
@@ -21,15 +21,15 @@
|
||||
[server]
|
||||
#host-name=foo
|
||||
#domain-name=local
|
||||
@ -18,5 +18,5 @@ $OpenBSD: patch-avahi-daemon_avahi-daemon_conf,v 1.3 2009/06/26 22:12:20 ajacout
|
||||
-#disallow-other-stacks=no
|
||||
+disallow-other-stacks=yes
|
||||
#allow-point-to-point=no
|
||||
|
||||
[wide-area]
|
||||
#cache-entries-max=4096
|
||||
#clients-max=4096
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
$OpenBSD: patch-avahi-daemon_main_c,v 1.2 2009/06/03 19:42:55 ajacoutot Exp $
|
||||
--- avahi-daemon/main.c.orig Fri Dec 12 22:36:15 2008
|
||||
+++ avahi-daemon/main.c Wed Jun 3 21:30:51 2009
|
||||
@@ -318,6 +318,11 @@ static void update_browse_domains(void) {
|
||||
$OpenBSD: patch-avahi-daemon_main_c,v 1.3 2010/07/17 14:12:38 ajacoutot Exp $
|
||||
--- avahi-daemon/main.c.orig Tue Jun 29 02:15:59 2010
|
||||
+++ avahi-daemon/main.c Mon Jul 5 12:02:37 2010
|
||||
@@ -320,6 +320,11 @@ static void update_browse_domains(void) {
|
||||
return;
|
||||
}
|
||||
|
||||
@ -13,7 +13,7 @@ $OpenBSD: patch-avahi-daemon_main_c,v 1.2 2009/06/03 19:42:55 ajacoutot Exp $
|
||||
l = avahi_string_list_copy(config.server_config.browse_domains);
|
||||
|
||||
for (p = resolv_conf_search_domains, n = 0; *p && n < BROWSE_DOMAINS_MAX; p++, n++) {
|
||||
@@ -985,8 +990,10 @@ static int run_server(DaemonConfig *c) {
|
||||
@@ -1086,8 +1091,10 @@ static int run_server(DaemonConfig *c) {
|
||||
|
||||
assert(c);
|
||||
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
$OpenBSD: patch-configure_ac,v 1.1.1.1 2009/06/03 16:27:12 ajacoutot Exp $
|
||||
--- configure.ac.orig Tue Apr 14 03:55:55 2009
|
||||
+++ configure.ac Sun May 31 16:58:24 2009
|
||||
@@ -244,7 +244,7 @@ AC_TRY_COMPILE([#include <netinet/in.h>], [
|
||||
$OpenBSD: patch-configure_ac,v 1.2 2010/07/17 14:12:38 ajacoutot Exp $
|
||||
--- configure.ac.orig Tue Jun 29 02:30:32 2010
|
||||
+++ configure.ac Wed Jul 14 16:57:21 2010
|
||||
@@ -250,7 +250,7 @@ AC_TRY_COMPILE([#include <netinet/in.h>], [
|
||||
#
|
||||
# Detecting the linux distribution for specific things like init scripts.
|
||||
#
|
||||
@ -10,7 +10,7 @@ $OpenBSD: patch-configure_ac,v 1.1.1.1 2009/06/03 16:27:12 ajacoutot Exp $
|
||||
if test "z$with_distro" = "z"; then
|
||||
if test "$cross_compiling" = yes; then
|
||||
AC_MSG_WARN([Target distribution cannot be reliably detected when cross-compiling. You should specify it with --with-distro (see $0 --help for recognized distros)])
|
||||
@@ -267,7 +267,7 @@ with_distro=`echo ${with_distro} | tr '[[:upper:]]' '[
|
||||
@@ -273,7 +273,7 @@ with_distro=`echo ${with_distro} | tr '[[:upper:]]' '[
|
||||
case $with_distro in
|
||||
lfs|debian|gentoo|archlinux|suse|fedora|mandriva|darwin|freebsd|slackware|none)
|
||||
;;
|
||||
@ -19,7 +19,7 @@ $OpenBSD: patch-configure_ac,v 1.1.1.1 2009/06/03 16:27:12 ajacoutot Exp $
|
||||
AC_MSG_WARN([Your distribution (${with_distro}) is supported but no init script exist yet! (patches welcome)])
|
||||
;;
|
||||
linux)
|
||||
@@ -288,6 +288,7 @@ AM_CONDITIONAL(TARGET_MANDRIVA, test x"$with_distro" =
|
||||
@@ -294,6 +294,7 @@ AM_CONDITIONAL(TARGET_MANDRIVA, test x"$with_distro" =
|
||||
AM_CONDITIONAL(TARGET_DARWIN, test x"$with_distro" = xdarwin)
|
||||
AM_CONDITIONAL(TARGET_NETBSD, test x"$with_distro" = xnetbsd)
|
||||
AM_CONDITIONAL(TARGET_FREEBSD, test x"$with_distro" = xfreebsd)
|
||||
@ -27,21 +27,21 @@ $OpenBSD: patch-configure_ac,v 1.1.1.1 2009/06/03 16:27:12 ajacoutot Exp $
|
||||
AM_CONDITIONAL(TARGET_SLACKWARE, test x"$with_distro" = xslackware)
|
||||
|
||||
test_gcc_flag() {
|
||||
@@ -350,7 +351,8 @@ AC_HEADER_SYS_WAIT
|
||||
@@ -356,7 +357,7 @@ AC_HEADER_SYS_WAIT
|
||||
# Solaris stuff
|
||||
AC_SEARCH_LIBS([inet_ntop],[nsl])
|
||||
AC_SEARCH_LIBS([recv],[socket])
|
||||
- AC_CHECK_DECL([CMSG_SPACE],,CFLAGS="$CFLAGS -D_XOPEN_SOURCE=500 -D__EXTENSIONS__")
|
||||
+ AC_CHECK_DECL([CMSG_SPACE],,CFLAGS="$CFLAGS -D_XOPEN_SOURCE=500 -D__EXTENSIONS__",[[#include <arpa/inet.h>
|
||||
+#include <sys/socket.h>]])
|
||||
- AC_CHECK_DECL([CMSG_SPACE],,CFLAGS="$CFLAGS -D_XOPEN_SOURCE=500 -D__EXTENSIONS__", [[#include <sys/socket.h>]])
|
||||
+ AC_CHECK_DECL([CMSG_SPACE],,CFLAGS="$CFLAGS -D__EXTENSIONS__", [[#include <sys/socket.h>]])
|
||||
|
||||
# Checks for library functions.
|
||||
AC_FUNC_MEMCMP
|
||||
@@ -1127,7 +1129,6 @@ echo "
|
||||
Group for avahi-autoipd: ${AVAHI_AUTOIPD_GROUP}
|
||||
Enable chroot(): ${enable_chroot}
|
||||
Enable Linux inotify: ${have_inotify}
|
||||
- Enable stack-smashing protection: ${enable_ssp}
|
||||
"
|
||||
@@ -564,7 +565,7 @@ if test "x$HAVE_GTK3" = "xyes" ; then
|
||||
fi
|
||||
AM_CONDITIONAL(HAVE_GTK3, test "x$HAVE_GTK3" = "xyes")
|
||||
|
||||
BUILD_DAEMON="no (You need libdaemon and expat/bsdxml!)"
|
||||
-AM_CONDITIONAL(HAVE_GTK2OR3, test "x$HAVE_GTK3" = "xyes" -o "x$HAVE_GTK2" = "xyes" )
|
||||
+AM_CONDITIONAL(HAVE_GTK2OR3, test "x$HAVE_GTK3" = "xyes" -o "x$HAVE_GTK" = "xyes" )
|
||||
|
||||
#
|
||||
# D-Bus
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
@comment $OpenBSD: PLIST-gtk,v 1.3 2009/12/22 00:31:22 sthen Exp $
|
||||
@comment $OpenBSD: PLIST-gtk,v 1.4 2010/07/17 14:12:38 ajacoutot Exp $
|
||||
bin/avahi-bookmarks
|
||||
bin/avahi-discover
|
||||
@bin bin/avahi-discover-standalone
|
||||
@ -19,9 +19,6 @@ lib/python${MODPY_VERSION}/site-packages/avahi/__init__.py
|
||||
lib/python${MODPY_VERSION}/site-packages/avahi/__init__.pyc
|
||||
lib/python${MODPY_VERSION}/site-packages/avahi/__init__.pyo
|
||||
lib/python${MODPY_VERSION}/site-packages/avahi_discover/
|
||||
lib/python${MODPY_VERSION}/site-packages/avahi_discover/SimpleGladeApp.py
|
||||
lib/python${MODPY_VERSION}/site-packages/avahi_discover/SimpleGladeApp.pyc
|
||||
lib/python${MODPY_VERSION}/site-packages/avahi_discover/SimpleGladeApp.pyo
|
||||
lib/python${MODPY_VERSION}/site-packages/avahi_discover/__init__.py
|
||||
lib/python${MODPY_VERSION}/site-packages/avahi_discover/__init__.pyc
|
||||
lib/python${MODPY_VERSION}/site-packages/avahi_discover/__init__.pyo
|
||||
@ -33,6 +30,6 @@ share/applications/avahi-discover.desktop
|
||||
share/applications/bssh.desktop
|
||||
share/applications/bvnc.desktop
|
||||
share/avahi/interfaces/
|
||||
share/avahi/interfaces/avahi-discover.glade
|
||||
@exec %D/bin/update-desktop-database
|
||||
@unexec-delete %D/bin/update-desktop-database
|
||||
share/avahi/interfaces/avahi-discover.ui
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
@comment $OpenBSD: PLIST-main,v 1.4 2010/06/28 18:52:31 robert Exp $
|
||||
@comment $OpenBSD: PLIST-main,v 1.5 2010/07/17 14:12:38 ajacoutot Exp $
|
||||
@conflict howl-*
|
||||
@newgroup _avahi:629
|
||||
@newgroup _avahi-autoipd:630
|
||||
@ -109,17 +109,17 @@ lib/pkgconfig/avahi-gobject.pc
|
||||
@bin sbin/avahi-dnsconfd
|
||||
share/avahi/
|
||||
share/avahi/avahi-service.dtd
|
||||
share/avahi/introspection/
|
||||
share/avahi/introspection/AddressResolver.introspect
|
||||
share/avahi/introspection/DomainBrowser.introspect
|
||||
share/avahi/introspection/EntryGroup.introspect
|
||||
share/avahi/introspection/HostNameResolver.introspect
|
||||
share/avahi/introspection/RecordBrowser.introspect
|
||||
share/avahi/introspection/Server.introspect
|
||||
share/avahi/introspection/ServiceBrowser.introspect
|
||||
share/avahi/introspection/ServiceResolver.introspect
|
||||
share/avahi/introspection/ServiceTypeBrowser.introspect
|
||||
share/avahi/service-types
|
||||
share/dbus-1/interfaces/
|
||||
share/dbus-1/interfaces/org.freedesktop.Avahi.AddressResolver.xml
|
||||
share/dbus-1/interfaces/org.freedesktop.Avahi.DomainBrowser.xml
|
||||
share/dbus-1/interfaces/org.freedesktop.Avahi.EntryGroup.xml
|
||||
share/dbus-1/interfaces/org.freedesktop.Avahi.HostNameResolver.xml
|
||||
share/dbus-1/interfaces/org.freedesktop.Avahi.RecordBrowser.xml
|
||||
share/dbus-1/interfaces/org.freedesktop.Avahi.Server.xml
|
||||
share/dbus-1/interfaces/org.freedesktop.Avahi.ServiceBrowser.xml
|
||||
share/dbus-1/interfaces/org.freedesktop.Avahi.ServiceResolver.xml
|
||||
share/dbus-1/interfaces/org.freedesktop.Avahi.ServiceTypeBrowser.xml
|
||||
share/examples/avahi/
|
||||
@sample ${SYSCONFDIR}/avahi/
|
||||
share/examples/avahi/avahi-daemon.conf
|
||||
@ -138,7 +138,9 @@ share/examples/dbus-1/
|
||||
@sample ${SYSCONFDIR}/dbus-1/
|
||||
share/examples/dbus-1/avahi-dbus.conf
|
||||
@sample ${SYSCONFDIR}/dbus-1/system.d/avahi-dbus.conf
|
||||
share/locale/bg/LC_MESSAGES/avahi.mo
|
||||
share/locale/ca/LC_MESSAGES/avahi.mo
|
||||
share/locale/cs/LC_MESSAGES/avahi.mo
|
||||
share/locale/de/LC_MESSAGES/avahi.mo
|
||||
share/locale/el/LC_MESSAGES/avahi.mo
|
||||
share/locale/en_AU/
|
||||
@ -152,9 +154,12 @@ share/locale/en_NZ/LC_MESSAGES/avahi.mo
|
||||
share/locale/es/LC_MESSAGES/avahi.mo
|
||||
share/locale/fi/LC_MESSAGES/avahi.mo
|
||||
share/locale/fr/LC_MESSAGES/avahi.mo
|
||||
share/locale/gl/LC_MESSAGES/avahi.mo
|
||||
share/locale/hu/LC_MESSAGES/avahi.mo
|
||||
share/locale/it/LC_MESSAGES/avahi.mo
|
||||
share/locale/ja/LC_MESSAGES/avahi.mo
|
||||
share/locale/ms/LC_MESSAGES/avahi.mo
|
||||
share/locale/nl/LC_MESSAGES/avahi.mo
|
||||
share/locale/pl/LC_MESSAGES/avahi.mo
|
||||
share/locale/pt_BR/LC_MESSAGES/avahi.mo
|
||||
share/locale/ro/LC_MESSAGES/avahi.mo
|
||||
@ -162,4 +167,6 @@ share/locale/ru/LC_MESSAGES/avahi.mo
|
||||
share/locale/sr/LC_MESSAGES/avahi.mo
|
||||
share/locale/sr@latin/LC_MESSAGES/avahi.mo
|
||||
share/locale/sv/LC_MESSAGES/avahi.mo
|
||||
share/locale/uk/LC_MESSAGES/avahi.mo
|
||||
share/locale/zh_CN/LC_MESSAGES/avahi.mo
|
||||
share/locale/zh_TW/LC_MESSAGES/avahi.mo
|
||||
|
||||
Loading…
Reference in New Issue
Block a user