Update of /cvsroot/leaf/src/bering-uclibc/contrib/upnpd
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv8370
Modified Files:
buildtool.cfg buildtool.mk linux-igd_cvs20050215-2.diff
Removed Files:
action.allowinUPnP action.allowoutUPnP action.forwardUPnP
Log Message:
Become compatible with Shorewall 2.4.
Unfortunately this breaks compatibility with previous versions due to
the way UPnP support was implemented in shorewall 2.4.
If you need upnpd on a previous version, grab the upnpd package with
the tag SHOREWALL_2_2_COMPATIBLE.
Please refer to the updated documentation for how to install UPNP support
under Bering-uClibc.
Sorry for the flag day. :-(
Index: linux-igd_cvs20050215-2.diff
===================================================================
RCS file:
/cvsroot/leaf/src/bering-uclibc/contrib/upnpd/linux-igd_cvs20050215-2.diff,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** linux-igd_cvs20050215-2.diff 29 Jul 2005 16:08:06 -0000 1.1
--- linux-igd_cvs20050215-2.diff 30 Jul 2005 23:35:46 -0000 1.2
***************
*** 1,4 ****
--- linux-igd/Makefile 2004-11-13 12:05:43.000000000 -0800
! +++ linux-igd/Makefile 2005-07-29 08:57:57.814633160 -0700
@@ -1,9 +1,12 @@
-CC=gcc
--- 1,4 ----
--- linux-igd/Makefile 2004-11-13 12:05:43.000000000 -0800
! +++ linux-igd/Makefile 2005-07-30 16:28:28.525956569 -0700
@@ -1,9 +1,12 @@
-CC=gcc
***************
*** 48,52 ****
+ install etc/upnpd.conf $(DESTDIR)/etc
--- linux-igd/config.c 2003-10-02 12:08:30.000000000 -0700
! +++ linux-igd/config.c 2005-07-29 08:57:36.573095143 -0700
@@ -18,10 +18,6 @@
{
--- 48,52 ----
+ install etc/upnpd.conf $(DESTDIR)/etc
--- linux-igd/config.c 2003-10-02 12:08:30.000000000 -0700
! +++ linux-igd/config.c 2005-07-30 16:28:28.526956424 -0700
@@ -18,10 +18,6 @@
{
***************
*** 60,66 ****
// Make sure string[] is null terminated
strcpy(string + match_length,"");
! diff -u -r linux-igd.dist/etc/upnpd.conf linux-igd/etc/upnpd.conf
--- linux-igd/etc/upnpd.conf 2003-09-24 13:57:32.000000000 -0700
! +++ linux-igd/etc/upnpd.conf 2005-07-29 08:58:02.372890436 -0700
@@ -1,7 +1,7 @@
#
--- 60,66 ----
// Make sure string[] is null terminated
strcpy(string + match_length,"");
! diff -u -r linux-igd/etc/upnpd.conf linux-igd.new/etc/upnpd.conf
--- linux-igd/etc/upnpd.conf 2003-09-24 13:57:32.000000000 -0700
! +++ linux-igd/etc/upnpd.conf 2005-07-30 16:29:45.504779929 -0700
@@ -1,7 +1,7 @@
#
***************
*** 72,85 ****
#
# Daemon debug mode
! @@ -25,7 +25,10 @@
# allowed values: a-z, A-Z, _, -
# default = FORWARD
! #
-forward_chain_name = FORWARD
+#forward_chain_name = FORWARD
+
! +# modified for integration with shorewall in Bering-uClibc
+forward_chain_name = forwardUPnP
#
! # The name of the chain to put prerouting rules in.
--- 72,103 ----
#
# Daemon debug mode
! @@ -24,14 +24,17 @@
! # above.
# allowed values: a-z, A-Z, _, -
# default = FORWARD
! -#
-forward_chain_name = FORWARD
+#forward_chain_name = FORWARD
+
+ #
+ # The name of the chain to put prerouting rules in.
+ # allowed values: a-z, A-Z, _, -
+ # default = PREROUTING
+ -prerouting_chain_name = PREROUTING
+ +#prerouting_chain_name = PREROUTING
+
! +# modified for integration with shorewall 2.4.x
+forward_chain_name = forwardUPnP
+ +prerouting_chain_name = UPnP
#
! # The internet line upstream bit rate reported from
! @@ -43,7 +46,7 @@
! # The internet line downstream bit rate reported from
! # the daemon. Value in bits per second
! # default = 0
! -downstream_bitrate = 512000
! +downstream_bitrate = 1512000
!
! # The name of the igd device xml description document
! # default = gatedesc.xml
Index: buildtool.mk
===================================================================
RCS file: /cvsroot/leaf/src/bering-uclibc/contrib/upnpd/buildtool.mk,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** buildtool.mk 2 May 2005 18:33:40 -0000 1.2
--- buildtool.mk 30 Jul 2005 23:35:46 -0000 1.3
***************
*** 59,70 ****
install -d $(TARGET_DIR)/etc/default
install -d $(TARGET_DIR)/etc/init.d
- #temporary copy the shorewall action files to /etc/upnpd/shorewall
- #to not interact with the shorewall package
- install -d $(TARGET_DIR)/etc/upnpd/shorewall
cp upnpd-default $(TARGET_DIR)/etc/default/upnpd
cp upnpd-init $(TARGET_DIR)/etc/init.d/upnpd
- cp action.forwardUPnP $(TARGET_DIR)/etc/upnpd/shorewall
- cp action.allowinUPnP $(TARGET_DIR)/etc/upnpd/shorewall
- cp action.allowoutUPnP $(TARGET_DIR)/etc/upnpd/shorewall
touch .build
--- 59,64 ----
***************
*** 88,95 ****
rm -f $(BT_STAGING_DIR)/etc/init.d/upnpd
rm -f $(BT_STAGING_DIR)/etc/default/upnpd
- rm -f $(BT_STAGING_DIR)/etc/upnpd/shorewall/forwardUPnP
- rm -f $(BT_STAGING_DIR)/etc/upnpd/shorewall/allowinUPnP
- rm -f $(BT_STAGING_DIR)/etc/upnpd/shorewall/allowoutUPnP
- rm -f $(BT_STAGING_DIR)/etc/shorewall/start.d/upnpd_start
rm -f $(BT_STAGING_DIR)/usr/sbin/upnpd
rm -f $(BT_STAGING_DIR)/usr/lib/libupnp*
--- 82,85 ----
--- action.allowoutUPnP DELETED ---
Index: buildtool.cfg
===================================================================
RCS file: /cvsroot/leaf/src/bering-uclibc/contrib/upnpd/buildtool.cfg,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** buildtool.cfg 29 Jul 2005 16:08:05 -0000 1.4
--- buildtool.cfg 30 Jul 2005 23:35:46 -0000 1.5
***************
*** 96,117 ****
</File>
- <File action.forwardUPnP>
- Server = cvs-contrib-sourceforge
- Revision = HEAD
- Directory = upnpd
- </File>
-
- <File action.allowinUPnP>
- Server = cvs-contrib-sourceforge
- Revision = HEAD
- Directory = upnpd
- </File>
-
- <File action.allowoutUPnP>
- Server = cvs-contrib-sourceforge
- Revision = HEAD
- Directory = upnpd
- </File>
-
# ---------------------------------------------------------------------
--- 96,99 ----
***************
*** 192,210 ****
Type = list
</File>
- <File>
- Filename = etc/shorewall/action.allowinUPnP
- Source =
etc/upnpd/shorewall/action.allowinUPnP
- Type = binary
- </File>
- <File>
- Filename = etc/shorewall/action.allowoutUPnP
- Source =
etc/upnpd/shorewall/action.allowoutUPnP
- Type = binary
- </File>
- <File>
- Filename = etc/shorewall/action.forwardUPnP
- Source =
etc/upnpd/shorewall/action.forwardUPnP
- Type = binary
- </File>
</Contents>
</upnpd>
--- 174,177 ----
--- action.forwardUPnP DELETED ---
--- action.allowinUPnP DELETED ---
-------------------------------------------------------
SF.Net email is sponsored by: Discover Easy Linux Migration Strategies
from IBM. Find simple to follow Roadmaps, straightforward articles,
informative Webcasts and more! Get everything you need to get up to
speed, fast. http://ads.osdn.com/?ad_id=7477&alloc_id=16492&op=click
_______________________________________________
leaf-cvs-commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/leaf-cvs-commits
