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

Updtae to miniupnpd-1.6.20120207.

Browse Source
This commit is contained in:
ajacoutot 2012-02-16 22:27:14 +00:00
parent ce4a24d6d8
commit c65410c366
11 changed files with 32 additions and 128 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
net/miniupnp/miniupnpd/Makefile
View File

@ -1,9 +1,8 @@
# $OpenBSD: Makefile,v 1.2 2012/01/20 07:07:23 ajacoutot Exp $
# $OpenBSD: Makefile,v 1.3 2012/02/16 22:27:14 ajacoutot Exp $
COMMENT= UPnP IGD client lightweight library
DISTNAME= miniupnpd-1.6.20111118
REVISION= 0
DISTNAME= miniupnpd-1.6.20120207
WANTLIB += c kvm

10
net/miniupnp/miniupnpd/distinfo
View File

@ -1,5 +1,5 @@
MD5 (miniupnpd-1.6.20111118.tar.gz) = qUZP7wokc6RvUvDQ2HQfuw==
RMD160 (miniupnpd-1.6.20111118.tar.gz) = GMAPcY9/w6eE5ZnASQRmSMJiGD8=
SHA1 (miniupnpd-1.6.20111118.tar.gz) = CRzUpyklfoCFq5MLWART4W2U+y0=
SHA256 (miniupnpd-1.6.20111118.tar.gz) = c0ldmlEmiwrqLNYbbZq8WfhTK6qFi8JkGYSeAawfDIs=
SIZE (miniupnpd-1.6.20111118.tar.gz) = 125683
MD5 (miniupnpd-1.6.20120207.tar.gz) = dbfbdKdlfbpHT/rqkN+w+g==
RMD160 (miniupnpd-1.6.20120207.tar.gz) = 6bKScdZNVhR+XAcsL1+Uskkk9j8=
SHA1 (miniupnpd-1.6.20120207.tar.gz) = e8XUDsUbk5bTW+ld9lIIfuCmcyI=
SHA256 (miniupnpd-1.6.20120207.tar.gz) = O/LLcdUK449iqkrnm9AvPT+F6Ga5BbOrOWobfiQs2Qg=
SIZE (miniupnpd-1.6.20120207.tar.gz) = 127425

12
net/miniupnp/miniupnpd/patches/patch-Makefile
View File

@ -1,13 +1,13 @@
$OpenBSD: patch-Makefile,v 1.1.1.1 2012/01/13 09:22:50 ajacoutot Exp $
--- Makefile.orig Fri May 27 00:49:17 2011
+++ Makefile Sat Jan 7 09:35:16 2012
$OpenBSD: patch-Makefile,v 1.2 2012/02/16 22:27:14 ajacoutot Exp $
--- Makefile.orig Mon Feb 6 17:28:25 2012
+++ Makefile Tue Feb 14 08:39:54 2012
@@ -11,7 +11,7 @@
# Linux users, please use Makefile.linux :
# make -f Makefile.linux
-CFLAGS = -pipe -Wall -Os
+CFLAGS += -pipe -Wall
#CFLAGS = -pipe -Wall -O -g -DDEBUG
-CFLAGS = -pipe -Wall -Os -ansi
+CFLAGS += -pipe -Wall -ansi
#CFLAGS = -pipe -Wall -O -g -DDEBUG -ansi
CC ?= gcc
RM = rm -f
@@ -128,7 +128,7 @@ clean:

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

@ -1,13 +0,0 @@
$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 <arpa/inet.h>
#include <netinet/in.h>
+#include <arpa/inet.h>
#if defined(__FreeBSD__) || defined(__DragonFly__)
#include <net/if_var.h>
#endif

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

@ -1,14 +0,0 @@
$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 5 ]; then
+ echo "#define PFRULE_HAS_ONRDOMAIN" >> ${CONFIGFILE}
+ fi
echo "#define USE_PF 1" >> ${CONFIGFILE}
FW=pf
echo "#define USE_IFACEWATCHER 1" >> ${CONFIGFILE}

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

@ -1,13 +0,0 @@
$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 <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-miniupnpd_conf
View File

@ -1,6 +1,6 @@
$OpenBSD: patch-miniupnpd_conf,v 1.1.1.1 2012/01/13 09:22:50 ajacoutot Exp $
--- miniupnpd.conf.orig Tue Dec 22 23:49:09 2009
+++ miniupnpd.conf Sat Jan 7 10:43:25 2012
$OpenBSD: patch-miniupnpd_conf,v 1.2 2012/02/16 22:27:14 ajacoutot Exp $
--- miniupnpd.conf.orig Fri Feb 3 22:36:50 2012
+++ miniupnpd.conf Tue Feb 14 08:39:29 2012
@@ -1,6 +1,5 @@
# WAN network interface
-#ext_ifname=eth0
@ -18,7 +18,7 @@ $OpenBSD: patch-miniupnpd_conf,v 1.1.1.1 2012/01/13 09:22:50 ajacoutot Exp $
# enable UPNP support (default is yes)
enable_upnp=yes
@@ -43,8 +42,7 @@ bitrate_down=10000000
@@ -46,8 +45,7 @@ bitrate_down=10000000
# "secure" mode : when enabled, UPnP client are allowed to add mappings only
# to their IP.
@ -28,7 +28,7 @@ $OpenBSD: patch-miniupnpd_conf,v 1.1.1.1 2012/01/13 09:22:50 ajacoutot Exp $
# default presentation url is http address on port 80
# If set to an empty string, no presentationURL element will appear
@@ -57,7 +55,6 @@ system_uptime=yes
@@ -60,7 +58,6 @@ system_uptime=yes
# notify interval in seconds. default is 30 seconds.
#notify_interval=240
@ -36,7 +36,7 @@ $OpenBSD: patch-miniupnpd_conf,v 1.1.1.1 2012/01/13 09:22:50 ajacoutot Exp $
# unused rules cleaning.
# never remove any rule before this threshold for the number
@@ -82,8 +79,8 @@ clean_ruleset_interval=600
@@ -88,8 +85,8 @@ clean_ruleset_interval=600
# active when compiled with PF_ENABLE_FILTER_RULES (see config.h file)
#quickrules=no
@ -47,7 +47,7 @@ $OpenBSD: patch-miniupnpd_conf,v 1.1.1.1 2012/01/13 09:22:50 ajacoutot Exp $
# serial and model number the daemon will report to clients
# in its XML description
@@ -97,9 +94,8 @@ model_number=1
@@ -103,9 +100,8 @@ model_number=1
# ip/mask format must be nn.nn.nn.nn/nn
# it is advised to only allow redirection of port above 1024
# and to finish the rule set with "deny 0-65535 0.0.0.0/0 0-65535"

44
net/miniupnp/miniupnpd/patches/patch-pf_obsdrdr_c
View File

@ -1,32 +1,12 @@
$OpenBSD: patch-pf_obsdrdr_c,v 1.1.1.1 2012/01/13 09:22:50 ajacoutot Exp $
--- pf/obsdrdr.c.orig Wed Jun 22 23:20:27 2011
+++ pf/obsdrdr.c Sun Jan 8 10:18:32 2012
@@ -33,6 +33,8 @@
* Must be set with OpenBSD version 4.0 and up.
* - PF_NEWSSTYLE
* Must be set with OpenBSD version 4.7 and up.
+ * - PFRULE_HAS_ONRDOMAIN
+ * Must be set with OpenBSD version 5.0 and up.
*/
#include <sys/types.h>
@@ -248,6 +250,9 @@ add_redirect_rule2(const char * ifname,
#ifdef PFRULE_HAS_RTABLEID
pcr.rule.rtableid = -1; /* first appeared in OpenBSD 4.0 */
#endif
+#ifdef PFRULE_HAS_ONRDOMAIN
+ pcr.rule.onrdomain = -1; /* first appeared in OpenBSD 5.0 */
+#endif
pcr.rule.quick = 1;
pcr.rule.keep_state = PF_STATE_NORMAL;
if(tag)
@@ -377,6 +382,9 @@ add_filter_rule2(const char * ifname,
pcr.rule.flagset = (TH_SYN|TH_ACK);
#ifdef PFRULE_HAS_RTABLEID
pcr.rule.rtableid = -1; /* first appeared in OpenBSD 4.0 */
+#endif
+#ifdef PFRULE_HAS_ONRDOMAIN
+ pcr.rule.onrdomain = -1; /* first appeared in OpenBSD 5.0 */
#endif
pcr.rule.keep_state = 1;
strlcpy(pcr.rule.label, desc, PF_RULE_LABEL_SIZE);
$OpenBSD: patch-pf_obsdrdr_c,v 1.2 2012/02/16 22:27:14 ajacoutot Exp $
--- pf/obsdrdr.c.orig Tue Feb 14 08:41:32 2012
+++ pf/obsdrdr.c Tue Feb 14 08:41:44 2012
@@ -211,7 +211,7 @@ add_redirect_rule2(const char * ifname,
if(1)
{
pcr.rule.direction = PF_IN;
- //pcr.rule.src.addr.type = PF_ADDR_NONE;
+ /* pcr.rule.src.addr.type = PF_ADDR_NONE; */
pcr.rule.src.addr.type = PF_ADDR_ADDRMASK;
pcr.rule.dst.addr.type = PF_ADDR_ADDRMASK;
pcr.rule.nat.addr.type = PF_ADDR_NONE;

11
net/miniupnp/miniupnpd/patches/patch-upnphttp_c
View File

@ -1,11 +0,0 @@
$OpenBSD: patch-upnphttp_c,v 1.1.1.1 2012/01/13 09:22:50 ajacoutot Exp $
--- upnphttp.c.orig Sat Jan 7 09:31:10 2012
+++ upnphttp.c Sat Jan 7 09:31:49 2012
@@ -13,6 +13,7 @@
#include <sys/types.h>
#include <sys/socket.h>
#include <sys/param.h>
+#include <netinet/in.h>
#include <arpa/inet.h>
#include <syslog.h>
#include <ctype.h>

11
net/miniupnp/miniupnpd/patches/patch-upnppermissions_c
View File

@ -1,11 +0,0 @@
$OpenBSD: patch-upnppermissions_c,v 1.1.1.1 2012/01/13 09:22:50 ajacoutot Exp $
--- upnppermissions.c.orig Sat Jan 7 09:34:12 2012
+++ upnppermissions.c Sat Jan 7 09:34:19 2012
@@ -10,6 +10,7 @@
#include <stdlib.h>
#include <stdio.h>
#include <syslog.h>
+#include <netinet/in.h>
#include <arpa/inet.h>
#include <unistd.h>
#include "config.h"

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

@ -1,13 +0,0 @@
$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 <arpa/inet.h>
#include <netinet/in.h>
+#include <arpa/inet.h>
#include <netdb.h>
#include "config.h"