Update of /cvsroot/leaf/src/bering-uclibc/contrib/upnpd
In directory sc8-pr-cvs6.sourceforge.net:/tmp/cvs-serv12793
Modified Files:
buildtool.cfg buildtool.mk
Added Files:
libupnp-1.4.1.tar.gz linuxigd-0.95.tar.gz linuxigd.patch
Removed Files:
libupnp-1.2.1a-1.diff libupnp-1.2.1a.orig.tar.gz
libupnp-api.diff libupnp-debug.diff libupnp-static.diff
linux-igd_cvs20050215-2.diff linux-igd_cvs20050215.orig.tar.gz
Log Message:
updated to linuxigd-0.95 and libupnp-1.4.1
--- NEW FILE: libupnp-1.4.1.tar.gz ---
(This appears to be a binary file; contents omitted.)
--- linux-igd_cvs20050215-2.diff DELETED ---
--- libupnp-static.diff DELETED ---
--- libupnp-1.2.1a-1.diff DELETED ---
Index: buildtool.mk
===================================================================
RCS file: /cvsroot/leaf/src/bering-uclibc/contrib/upnpd/buildtool.mk,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** buildtool.mk 30 Jul 2005 23:35:46 -0000 1.3
--- buildtool.mk 18 Nov 2006 19:02:09 -0000 1.4
***************
*** 9,35 ****
TARGET_DIR=$(BT_BUILD_DIR)/upnpd
! UPNPD_DIR:=linux-igd
! LIBUPNP_DIR:=libupnp-1.2.1a
!
! # DEBUG="DEBUG=1"
# ----------------------------------------------------------------------
! LIBUPNP_FLAGS=STATIC=1 $(DEBUG) \
! CC=$(TARGET_CC) LD=$(TARGET_LD) PREFIX=$(TARGET_DIR)
$(LIBUPNP_DIR)/.source:
zcat $(LIBUPNP_SOURCE) | tar -xvf -
- cat $(LIBUPNP_PATCH_STATIC) | patch -d $(LIBUPNP_DIR) -p0
- cat $(LIBUPNP_PATCH_API) | patch -d $(LIBUPNP_DIR) -p0
- # cat $(LIBUPNP_PATCH_DEBUG) | patch -d $(LIBUPNP_DIR) -p0
touch $(LIBUPNP_DIR)/.source
! $(LIBUPNP_DIR)/.build: $(LIBUPNP_DIR)/.source
mkdir -p $(TARGET_DIR)
! make -C $(LIBUPNP_DIR)/upnp $(LIBUPNP_FLAGS)
! make -C $(LIBUPNP_DIR)/upnp $(LIBUPNP_FLAGS) install
! make -C $(LIBUPNP_DIR)/ixml $(LIBUPNP_FLAGS) install
! make -C $(LIBUPNP_DIR)/threadutil $(LIBUPNP_FLAGS) install
touch $(LIBUPNP_DIR)/.build
--- 9,32 ----
TARGET_DIR=$(BT_BUILD_DIR)/upnpd
! UPNPD_DIR:=linuxigd-0.95
! LIBUPNP_DIR:=libupnp-1.4.1
# ----------------------------------------------------------------------
! LIBUPNP_FLAGS= CC=$(TARGET_CC) LD=$(TARGET_LD) DESTDIR=$(TARGET_DIR)
$(LIBUPNP_DIR)/.source:
zcat $(LIBUPNP_SOURCE) | tar -xvf -
touch $(LIBUPNP_DIR)/.source
! $(LIBUPNP_DIR)/.configured: $(LIBUPNP_DIR)/.source
! (cd $(LIBUPNP_DIR); CFLAGS="$(BT_COPT_FLAGS)" CC=$(TARGET_CC)
LD=$(TARGET_LD) \
! ./configure --prefix=/usr --disable-shared );
! touch $(LIBUPNP_DIR)/.configured
!
! $(LIBUPNP_DIR)/.build: $(LIBUPNP_DIR)/.configured
mkdir -p $(TARGET_DIR)
! make -C $(LIBUPNP_DIR) $(LIBUPNP_FLAGS)
! make -C $(LIBUPNP_DIR) $(LIBUPNP_FLAGS) install
touch $(LIBUPNP_DIR)/.build
***************
*** 37,43 ****
UPNPD_FLAGS=$(DEBUG) HAVE_LIBIPTC=YES \
CC=$(TARGET_CC) LD=$(TARGET_LD) \
! CFLAGS="-I$(TARGET_DIR)/usr/include -Wall" \
! LDFLAGS="-L$(BT_STAGING_DIR)/usr/lib -L$(TARGET_DIR)/usr/lib" \
DESTDIR=$(TARGET_DIR)
--- 34,41 ----
UPNPD_FLAGS=$(DEBUG) HAVE_LIBIPTC=YES \
+ LIBUPNP_PREFIX=$(TARGET_DIR)/usr \
+ LIBIPTC_PREFIX=$(TARGET_DIR)/usr \
CC=$(TARGET_CC) LD=$(TARGET_LD) \
! CFLAGS="$(BT_COPT_FLAGS)" \
DESTDIR=$(TARGET_DIR)
--- NEW FILE: linuxigd-0.95.tar.gz ---
(This appears to be a binary file; contents omitted.)
--- libupnp-debug.diff DELETED ---
--- NEW FILE: linuxigd.patch ---
diff -urN linuxigd-0.95.orig/Makefile linuxigd-0.95/Makefile
--- linuxigd-0.95.orig/Makefile 2006-05-24 00:16:36.000000000 +0200
+++ linuxigd-0.95/Makefile 2006-11-12 22:15:17.000000000 +0100
@@ -33,11 +33,11 @@
rm -f *.o upnpd
install: upnpd
- install -d /etc/linuxigd
- install etc/gatedesc.xml /etc/linuxigd
- install etc/gateconnSCPD.xml /etc/linuxigd
- install etc/gateicfgSCPD.xml /etc/linuxigd
- install etc/dummy.xml /etc/linuxigd
- install upnpd $(PREFIX)/sbin
- install upnpd.8 $(PREFIX)/share/man/man8
- if [ ! -f /etc/upnpd.conf ]; then install etc/upnpd.conf /etc; fi
+ install -d $(DESTDIR)/etc/linuxigd
+ install -d $(DESTDIR)/$(PREFIX)/sbin
+ install etc/gatedesc.xml $(DESTDIR)/etc/linuxigd
+ install etc/gateconnSCPD.xml $(DESTDIR)/etc/linuxigd
+ install etc/gateicfgSCPD.xml $(DESTDIR)/etc/linuxigd
+ install etc/dummy.xml $(DESTDIR)/etc/linuxigd
+ install upnpd $(DESTDIR)/$(PREFIX)/sbin
+ install etc/upnpd.conf $(DESTDIR)/etc/upnpd.conf
diff -urN linuxigd-0.95.orig/etc/upnpd.conf linuxigd-0.95/etc/upnpd.conf
--- linuxigd-0.95.orig/etc/upnpd.conf 2006-02-02 00:53:39.000000000 +0100
+++ linuxigd-0.95/etc/upnpd.conf 2006-11-12 22:15:08.000000000 +0100
@@ -2,7 +2,7 @@
# The full path and name of the iptables executable,
# (enclosed in quotes).
#
-iptables_location = "/usr/sbin/iptables"
+iptables_location = "/sbin/iptables"
#
# Daemon debug level. Messages are logged via syslog to debug.
@@ -28,13 +28,17 @@
# 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 intergration with shorewall
+forward_chain_name = forwardUPnP
+prerouting_chain_name = UPnP
#
# The internet line upstream bit rate reported from
@@ -46,7 +50,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 default duration of port mappings, used when the client
--- linux-igd_cvs20050215.orig.tar.gz DELETED ---
--- libupnp-1.2.1a.orig.tar.gz DELETED ---
Index: buildtool.cfg
===================================================================
RCS file: /cvsroot/leaf/src/bering-uclibc/contrib/upnpd/buildtool.cfg,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** buildtool.cfg 26 Jun 2006 18:33:10 -0000 1.7
--- buildtool.cfg 18 Nov 2006 19:02:09 -0000 1.8
***************
*** 11,15 ****
# tar cvfz linux-igd_cvs<date>.orig.tar.gz
! <File linux-igd_cvs20050215.orig.tar.gz>
Server = cvs-contrib-sourceforge
Revision = HEAD
--- 11,15 ----
# tar cvfz linux-igd_cvs<date>.orig.tar.gz
! <File linuxigd-0.95.tar.gz>
Server = cvs-contrib-sourceforge
Revision = HEAD
***************
*** 18,22 ****
</File>
! <File linux-igd_cvs20050215-2.diff>
Server = cvs-contrib-sourceforge
Revision = HEAD
--- 18,22 ----
</File>
! <File linuxigd.patch>
Server = cvs-contrib-sourceforge
Revision = HEAD
***************
*** 27,31 ****
# ---------------------------------------------------------------------
! <File libupnp-1.2.1a.orig.tar.gz>
Server = cvs-contrib-sourceforge
Revision = HEAD
--- 27,31 ----
# ---------------------------------------------------------------------
! <File libupnp-1.4.1.tar.gz>
Server = cvs-contrib-sourceforge
Revision = HEAD
***************
*** 34,85 ****
</File>
- #
- # The following patch is not LEAF specific, it allows libupnp to be
- # compiled staticly.
- #
-
- <File libupnp-static.diff>
- Server = cvs-contrib-sourceforge
- Revision = HEAD
- Directory = upnpd
- Envname = LIBUPNP_PATCH_STATIC
- </File>
-
- #
- # The following patch is not LEAF specific, it fixes a compile-time bug
- # with the libupnp library when not all APIs are required.
- #
-
- <File libupnp-api.diff>
- Server = cvs-contrib-sourceforge
- Revision = HEAD
- Directory = upnpd
- Envname = LIBUPNP_PATCH_API
- </File>
-
- #
- # The following patch is not LEAF specific, it is not normally applied.
- # It turns on extensive debugging inside of the libupnp library.
- # Debug output goes to files in /
- #
-
- <File libupnp-debug.diff>
- Server = cvs-contrib-sourceforge
- Revision = HEAD
- Directory = upnpd
- Envname = LIBUPNP_PATCH_DEBUG
- </File>
-
- #
- # This patch is leaf/buildtool specific.
- #
-
- <File libupnp-1.2.1a-1.diff>
- Server = cvs-contrib-sourceforge
- Revision = HEAD
- Directory = upnpd
- Envname = LIBUPNP_PATCH_LEAF
- </File>
-
# ---------------------------------------------------------------------
--- 34,37 ----
***************
*** 100,105 ****
<Package>
<upnpd>
! Version cvs20050215
! Revision = 2
Help <<EOF
--- 52,57 ----
<Package>
<upnpd>
! Version 0.95
! Revision = 1
Help <<EOF
--- libupnp-api.diff DELETED ---
-------------------------------------------------------------------------
Take Surveys. Earn Cash. Influence the Future of IT
Join SourceForge.net's Techsay panel and you'll get the chance to share your
opinions on IT & business topics through brief surveys - and earn cash
http://www.techsay.com/default.php?page=join.php&p=sourceforge&CID=DEVDEV
_______________________________________________
leaf-cvs-commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/leaf-cvs-commits
