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

Implement avahi_exe_name.

Browse Source 
Remove uneeded patch.
This commit is contained in:
ajacoutot 2013-05-23 13:40:38 +00:00
parent f5415b3e8f
commit 325a6542d2
4 changed files with 17 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
net/avahi/Makefile
View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.91 2013/05/09 15:17:32 ajacoutot Exp $
# $OpenBSD: Makefile,v 1.92 2013/05/23 13:40:38 ajacoutot Exp $
ONLY_FOR_ARCHS-mono= ${MONO_ARCHS}
@ -24,7 +24,7 @@ PKGNAME-qt3= avahi-qt3-${V}
PKGNAME-qt4= avahi-qt4-${V}
PKGNAME-ui= avahi-ui-${V}
REVISION-main= 8
REVISION-main= 9
REVISION-gtk= 4
REVISION-gtk3= 4
REVISION-gui= 4

16
net/avahi/patches/patch-avahi-compat-libdns_sd_warn_c
View File

@ -1,10 +1,20 @@
$OpenBSD: patch-avahi-compat-libdns_sd_warn_c,v 1.3 2013/05/09 15:17:32 ajacoutot Exp $
$OpenBSD: patch-avahi-compat-libdns_sd_warn_c,v 1.4 2013/05/23 13:40:38 ajacoutot Exp $
Stop polluting syslog(3).
--- avahi-compat-libdns_sd/warn.c.orig Thu Aug 26 02:51:38 2010
+++ avahi-compat-libdns_sd/warn.c Thu May 9 17:16:59 2013
@@ -110,11 +110,13 @@ void avahi_warn_linkage(void) {
+++ avahi-compat-libdns_sd/warn.c Thu May 23 15:27:58 2013
@@ -75,6 +75,9 @@ const char *avahi_exe_name(void) {
pthread_mutex_unlock(&mutex);
return exe_name;
+#elif defined(__OpenBSD__)
+ extern const char* __progname;
+ return __progname;
#else
#ifdef __GNUC__
#warning "avahi_exe_name() needs to be implemented for your operating system"
@@ -110,11 +113,13 @@ void avahi_warn_linkage(void) {
linkage_warning = 1;
pthread_mutex_unlock(&linkage_mutex);

4
net/avahi/patches/patch-avahi-core_fdutil_c
View File

@ -1,6 +1,6 @@
$OpenBSD: patch-avahi-core_fdutil_c,v 1.2 2010/07/17 14:12:38 ajacoutot Exp $
$OpenBSD: patch-avahi-core_fdutil_c,v 1.3 2013/05/23 13:40:38 ajacoutot Exp $
Missing prototype for memset().
Missing prototype for memset() (FD_ZERO)
--- avahi-core/fdutil.c.orig Fri Jun 25 02:41:25 2010
+++ avahi-core/fdutil.c Mon Jul 5 12:02:37 2010

28
net/avahi/patches/patch-avahi-core_iface-pfroute_c
View File

@ -1,28 +0,0 @@
$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"
+#if defined(__NetBSD__) || defined(__OpenBSD__)
+#define lifreq if_laddrreq
+#define lifr_addr iflr_addr
+#define lifr_flags iflr_flags
+#define SIOCGLIFFLAGS SIOCGIFFLAGS
+#endif
+
static int bitcount (unsigned int n)
{
int count=0 ;
@@ -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",
rtm->rtm_version);
+#endif
return;
}