Update of /cvsroot/leaf/src/bering-uclibc/contrib/upnpd
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv29237
Modified Files:
buildtool.cfg
Added Files:
linux-igd_cvs20050215-2.diff
Removed Files:
linux-igd_cvs20050215-1.diff
Log Message:
Fix bug with configuration option truncation (from Costas Cavouracis & Tom
Eastep)
--- NEW FILE: linux-igd_cvs20050215-2.diff ---
--- 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
-INCLUDES= -I/usr/include/upnp -I../include
-LIBS= -lpthread -lupnp -lixml -lthreadutil -L../libs
-FILES= main.o gatedevice.o pmlist.o util.o config.o
-CFLAGS += -Wall -g
+ifdef DEBUG
+THREADUTIL=threadutil_dbg
+else
+THREADUTIL=threadutil
+endif
+
+LIBS= -lupnp -lixml -l$(THREADUTIL) -lpthread
+FILES= main.o gatedevice.o pmlist.o util.o config.o
ifdef HAVE_LIBIPTC
LIBS += -liptc
@@ -14,7 +17,7 @@
all: upnpd
upnpd: $(FILES)
- $(CC) $(CFLAGS) $(FILES) $(LIBS) -o $@
+ $(CC) $(CFLAGS) $(FILES) $(LDFLAGS) $(LIBS) -o $@
@echo "make $@ finished on `date`"
%.o: %.c
@@ -24,10 +27,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 /usr/sbin
- @install etc/upnpd.conf /etc
+ install -d $(DESTDIR)/etc/linuxigd
+ install -d $(DESTDIR)/usr/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)/usr/sbin
+ 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 @@
{
int match_length;
match_length=submatch[1].rm_eo-submatch[1].rm_so;
- // Make sure we don't write past the end of string[]
- if (sizeof(string) >= match_length) {
- match_length = sizeof(string) - 1;
- }
strncpy(string,&line[submatch[1].rm_so],match_length);
// 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 @@
#
# The full path and name of the iptables executable
#
-iptables_location = /usr/sbin/iptables
+iptables_location = /sbin/iptables
#
# 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.
Index: buildtool.cfg
===================================================================
RCS file: /cvsroot/leaf/src/bering-uclibc/contrib/upnpd/buildtool.cfg,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** buildtool.cfg 2 May 2005 18:33:40 -0000 1.3
--- buildtool.cfg 29 Jul 2005 16:08:05 -0000 1.4
***************
*** 18,22 ****
</File>
! <File linux-igd_cvs20050215-1.diff>
Server = cvs-contrib-sourceforge
Revision = HEAD
--- 18,22 ----
</File>
! <File linux-igd_cvs20050215-2.diff>
Server = cvs-contrib-sourceforge
Revision = HEAD
--- linux-igd_cvs20050215-1.diff DELETED ---
-------------------------------------------------------
SF.Net email is Sponsored by the Better Software Conference & EXPO September
19-22, 2005 * San Francisco, CA * Development Lifecycle Practices
Agile & Plan-Driven Development * Managing Projects & Teams * Testing & QA
Security * Process Improvement & Measurement * http://www.sqe.com/bsce5sf
_______________________________________________
leaf-cvs-commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/leaf-cvs-commits
