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

Fix PFRULE_HAS_ONRDOMAIN conditionnal.

Browse Source 
No need to include netinet/in.h several times.
This commit is contained in:
ajacoutot 2012-01-20 07:07:23 +00:00
parent 1087a247ad
commit f4feca39b9
5 changed files with 30 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
net/miniupnp/miniupnpd/Makefile
View File

@ -1,8 +1,9 @@
# $OpenBSD: Makefile,v 1.1.1.1 2012/01/13 09:22:50 ajacoutot Exp $
# $OpenBSD: Makefile,v 1.2 2012/01/20 07:07:23 ajacoutot Exp $
COMMENT= UPnP IGD client lightweight library
DISTNAME= miniupnpd-1.6.20111118
REVISION= 0
WANTLIB += c kvm

14
net/miniupnp/miniupnpd/patches/patch-bsd_getifstats_c
View File

@ -1,11 +1,13 @@
$OpenBSD: patch-bsd_getifstats_c,v 1.1.1.1 2012/01/13 09:22:50 ajacoutot Exp $
--- bsd/getifstats.c.orig Sat Jan 7 09:33:33 2012
+++ bsd/getifstats.c Sat Jan 7 09:33:52 2012
@@ -9,6 +9,7 @@
$OpenBSD: patch-bsd_getifstats_c,v 1.2 2012/01/20 07:07:23 ajacoutot Exp $
--- bsd/getifstats.c.orig Fri Sep 4 11:19:07 2009
+++ bsd/getifstats.c Fri Jan 20 08:04:05 2012
@@ -9,8 +9,8 @@
#include <sys/types.h>
#include <sys/socket.h>
#include <net/if.h>
+#include <netinet/in.h>
#include <arpa/inet.h>
-#include <arpa/inet.h>
#include <netinet/in.h>
+#include <arpa/inet.h>
#if defined(__FreeBSD__) || defined(__DragonFly__)
#include <net/if_var.h>
#endif

8
net/miniupnp/miniupnpd/patches/patch-genconfig_sh
View File

@ -1,12 +1,12 @@
$OpenBSD: patch-genconfig_sh,v 1.1.1.1 2012/01/13 09:22:50 ajacoutot Exp $
--- genconfig.sh.orig Sun Jan 8 10:15:53 2012
+++ genconfig.sh Sun Jan 8 10:16:50 2012
$OpenBSD: patch-genconfig_sh,v 1.2 2012/01/20 07:07:23 ajacoutot Exp $
--- genconfig.sh.orig Mon Jul 25 18:06:27 2011
+++ genconfig.sh Fri Jan 20 08:04:38 2012
@@ -67,6 +67,10 @@ case $OS_NAME in
if [ \( $MAJORVER -ge 5 \) -o \( $MAJORVER -eq 4 -a $MINORVER -ge 7 \) ]; then
echo "#define PF_NEWSTYLE" >> ${CONFIGFILE}
fi
+ # onrdomain was introduced in OpenBSD 5.0
+ if [ $MAJORVER -ge 4 ]; then
+ if [ $MAJORVER -ge 5 ]; then
+ echo "#define PFRULE_HAS_ONRDOMAIN" >> ${CONFIGFILE}
+ fi
echo "#define USE_PF 1" >> ${CONFIGFILE}

14
net/miniupnp/miniupnpd/patches/patch-getifaddr_c
View File

@ -1,11 +1,13 @@
$OpenBSD: patch-getifaddr_c,v 1.1.1.1 2012/01/13 09:22:50 ajacoutot Exp $
--- getifaddr.c.orig Sat Jan 7 09:32:57 2012
+++ getifaddr.c Sat Jan 7 09:33:07 2012
@@ -13,6 +13,7 @@
$OpenBSD: patch-getifaddr_c,v 1.2 2012/01/20 07:07:23 ajacoutot Exp $
--- getifaddr.c.orig Sun May 15 11:00:54 2011
+++ getifaddr.c Fri Jan 20 08:03:57 2012
@@ -13,8 +13,8 @@
#include <sys/types.h>
#include <sys/socket.h>
#include <net/if.h>
+#include <netinet/in.h>
#include <arpa/inet.h>
-#include <arpa/inet.h>
#include <netinet/in.h>
+#include <arpa/inet.h>
#if defined(sun)
#include <sys/sockio.h>
#endif

14
net/miniupnp/miniupnpd/patches/patch-upnpsoap_c
View File

@ -1,11 +1,13 @@
$OpenBSD: patch-upnpsoap_c,v 1.1.1.1 2012/01/13 09:22:50 ajacoutot Exp $
--- upnpsoap.c.orig Sat Jan 7 09:32:13 2012
+++ upnpsoap.c Sat Jan 7 09:32:32 2012
@@ -12,6 +12,7 @@
$OpenBSD: patch-upnpsoap_c,v 1.2 2012/01/20 07:07:23 ajacoutot Exp $
--- upnpsoap.c.orig Fri Nov 18 12:21:22 2011
+++ upnpsoap.c Fri Jan 20 08:03:40 2012
@@ -12,8 +12,8 @@
#include <unistd.h>
#include <syslog.h>
#include <sys/types.h>
+#include <netinet/in.h>
#include <arpa/inet.h>
-#include <arpa/inet.h>
#include <netinet/in.h>
+#include <arpa/inet.h>
#include <netdb.h>
#include "config.h"