cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Don't leak host info by default (upstream).

Browse Source 
Don't add 0pointer.de and zeroconf.org to default browse list (upstream).
regen WANTLIB.
This commit is contained in:
ajacoutot 2013-01-26 10:25:31 +00:00
parent 9ca15ca9f7
commit 66d1bee23e
3 changed files with 46 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
net/avahi/Makefile
View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.86 2013/01/20 15:19:00 ajacoutot Exp $
# $OpenBSD: Makefile,v 1.87 2013/01/26 10:25:31 ajacoutot Exp $
ONLY_FOR_ARCHS-mono= ${MONO_ARCHS}
@ -24,10 +24,10 @@ PKGNAME-qt3= avahi-qt3-${V}
PKGNAME-qt4= avahi-qt4-${V}
PKGNAME-ui= avahi-ui-${V}
REVISION-main= 5
REVISION-gtk= 2
REVISION-gtk3= 2
REVISION-gui= 2
REVISION-main= 6
REVISION-gtk= 3
REVISION-gtk3= 3
REVISION-gui= 3
REVISION-mono= 1
REVISION-qt3= 1
REVISION-qt4= 2
@ -118,7 +118,7 @@ WANTLIB-gtk= X11 Xau Xcomposite Xcursor Xdamage Xdmcp Xext Xfixes \
gdk_pixbuf-2.0 gio-2.0 glib-2.0 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 z \
xcb-render avahi-client avahi-common GL xcb-shm \
xcb-render avahi-client avahi-common xcb-shm \
avahi-glib ffi harfbuzz icudata icule icuuc \
${MODGETTEXT_WANTLIB}
@ -129,7 +129,7 @@ LIB_DEPENDS-gtk3= ${MODGETTEXT_LIB_DEPENDS} \
${BUILD_PKGPATH}
RUN_DEPENDS-gtk3= ${MODGETTEXT_RUN_DEPENDS} \
${BUILD_PKGPATH},-ui
WANTLIB-gtk3 += GL X11 Xau Xcomposite Xcursor Xdamage Xdmcp Xext Xfixes
WANTLIB-gtk3 += X11 Xau Xcomposite Xcursor Xdamage Xdmcp Xext Xfixes
WANTLIB-gtk3 += Xi Xinerama Xrandr Xrender atk-1.0 avahi-client
WANTLIB-gtk3 += avahi-common avahi-glib cairo cairo-gobject
WANTLIB-gtk3 += dbus-1 expat fontconfig freetype gdbm gdk-3 gdk_pixbuf-2.0
@ -150,7 +150,7 @@ RUN_DEPENDS-gui= ${MODGETTEXT_RUN_DEPENDS} \
x11/dbus-python \
devel/py-twisted/web \
devel/desktop-file-utils
WANTLIB-gui += GL X11 Xau Xcomposite Xcursor Xdamage Xdmcp Xext Xfixes
WANTLIB-gui += X11 Xau Xcomposite Xcursor Xdamage Xdmcp Xext Xfixes
WANTLIB-gui += Xi Xinerama Xrandr Xrender atk-1.0 avahi-client
WANTLIB-gui += avahi-common avahi-core avahi-glib avahi-ui-gtk3 c
WANTLIB-gui += cairo cairo-gobject dbus-1 expat fontconfig freetype

34
net/avahi/patches/patch-avahi-daemon_avahi-daemon_conf Normal file
View File

@ -0,0 +1,34 @@
$OpenBSD: patch-avahi-daemon_avahi-daemon_conf,v 1.6 2013/01/26 10:25:31 ajacoutot Exp $
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] avahi-daemon: don't add 0pointer.de and zeroconf.org to default browse list
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] avahi-daemon: don't leak host info by default
--- avahi-daemon/avahi-daemon.conf.orig Sat Jan 26 10:41:50 2013
+++ avahi-daemon/avahi-daemon.conf Sat Jan 26 10:42:02 2013
@@ -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
@@ -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

8
net/avahi/patches/patch-avahi-daemon_main_c
View File

@ -1,7 +1,7 @@
$OpenBSD: patch-avahi-daemon_main_c,v 1.6 2013/01/20 10:44:17 ajacoutot Exp $
--- avahi-daemon/main.c.orig Wed Feb 23 14:10:07 2011
+++ avahi-daemon/main.c Mon Apr 25 11:42:00 2011
@@ -1101,8 +1106,10 @@ static int run_server(DaemonConfig *c) {
$OpenBSD: patch-avahi-daemon_main_c,v 1.7 2013/01/26 10:25:31 ajacoutot Exp $
--- avahi-daemon/main.c.orig Thu Nov 18 04:00:26 2010
+++ avahi-daemon/main.c Sat Jan 26 10:40:53 2013
@@ -1101,8 +1101,10 @@ static int run_server(DaemonConfig *c) {
ignore_signal(SIGPIPE);