update to upnp 1.2.1
Noticed by: Steve Drew <sdrew@shaw.ca>
This commit is contained in:
parent
8b5b847bd3
commit
70050f0ac5
Notes:
svn2git
2021-03-31 03:12:20 +00:00
svn path=/head/; revision=78305
26 changed files with 116 additions and 320 deletions
|
@ -6,11 +6,11 @@
|
|||
#
|
||||
|
||||
PORTNAME= upnp
|
||||
PORTVERSION= 1.0.4
|
||||
PORTVERSION= 1.2.1
|
||||
CATEGORIES= devel
|
||||
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
|
||||
MASTER_SITE_SUBDIR= ${PORTNAME}
|
||||
DISTNAME= ${PORTNAME}sdk-${PORTVERSION}
|
||||
DISTNAME= lib${PORTNAME}-${PORTVERSION}
|
||||
|
||||
MAINTAINER= leeym@FreeBSD.org
|
||||
COMMENT= Universal Plug and Play Software Development Kit
|
||||
|
@ -19,22 +19,22 @@ LIB_DEPENDS= uuid.1:${PORTSDIR}/sysutils/e2fsprogs
|
|||
|
||||
USE_GMAKE= yes
|
||||
USE_REINPLACE= yes
|
||||
WRKSRC= ${WRKDIR}/${DISTNAME}/upnp
|
||||
PATCH_WRKSRC= ${WRKDIR}/${DISTNAME}
|
||||
MAKEFILE= makefile
|
||||
MAKE_ENV= PTHREAD_LIBS=${PTHREAD_LIBS}
|
||||
NOT_FOR_ARCHS= sparc64
|
||||
INSTALLS_SHLIB= yes
|
||||
|
||||
post-patch:
|
||||
@cd ${WRKSRC} && ${REINPLACE_CMD} -e 's,MAKE = make,MAKE = ${GMAKE},' \
|
||||
src/genlib/makefile src/makefile
|
||||
@cd ${WRKSRC} && ${REINPLACE_CMD} -e 's,malloc.h,stdlib.h,' \
|
||||
src/inc/genlib/client_table/client_table.h \
|
||||
src/inc/genlib/http_client/http_client.h \
|
||||
src/inc/genlib/service_table/service_table.h \
|
||||
src/inc/genlib/timer_thread/timer_thread.h \
|
||||
src/upnpdom/domCif.cpp
|
||||
@cd ${WRKSRC} && ${REINPLACE_CMD} -e 's,MSG_NOSIGNAL,0,' \
|
||||
src/genlib/http_client/http_client.c \
|
||||
src/genlib/net/http/readwrite.cpp
|
||||
@${FIND} ${PATCH_WRKSRC} -name "*.[ch]" | \
|
||||
${XARGS} ${REINPLACE_CMD} -e 's,malloc.h,stdlib.h,'
|
||||
@${FIND} ${PATCH_WRKSRC} -name "[Mm]akefile" | ${XARGS} ${REINPLACE_CMD} \
|
||||
-e 's,lpthread,pthread, ; s,/usr,,g ; s,1\.2\.1,1,g' \
|
||||
-e 's,MAKE = make,MAKE = ${GMAKE},' \
|
||||
-e 's,install bin,${INSTALL_PROGRAM} bin,g' \
|
||||
-e 's,install inc,${INSTALL_DATA} inc,g'
|
||||
@${REINPLACE_CMD} -e 's,MSG_NOSIGNAL,0,' ${PATCH_WRKSRC}/upnp/src/genlib/net/sock.c
|
||||
@${REINPLACE_CMD} -e 's,linux/if,net/if,' ${PATCH_WRKSRC}/upnp/src/api/upnpapi.c
|
||||
|
||||
.include <bsd.port.mk>
|
||||
|
|
|
@ -1 +1 @@
|
|||
MD5 (upnpsdk-1.0.4.tar.gz) = d4ebd84d0c809d90ae36c37e5a2d213c
|
||||
MD5 (libupnp-1.2.1.tar.gz) = 14b453406c0f768f875de50bdbf5c802
|
||||
|
|
|
@ -1,45 +0,0 @@
|
|||
--- makefile.orig Thu Aug 16 02:20:11 2001
|
||||
+++ makefile Sat Aug 3 17:22:35 2002
|
||||
@@ -29,11 +29,11 @@
|
||||
##
|
||||
###########################################################################
|
||||
|
||||
-MAKE = make
|
||||
+MAKE = gmake
|
||||
UPNP = bin/libupnp.so
|
||||
SUBDIRS = src
|
||||
|
||||
-VERSION=1.0.4
|
||||
+VERSION=1
|
||||
|
||||
ifeq ($(DEBUG),1)
|
||||
STRIPU =
|
||||
@@ -102,17 +102,17 @@
|
||||
@if [ -f "doc/upnpsdk.aux" ]; then rm doc/upnpsdk.aux; fi
|
||||
|
||||
install: upnp
|
||||
- @install -d /usr/include/upnp
|
||||
- @install -d /usr/include/upnp/upnpdom
|
||||
- @install -d /usr/include/upnp/tools
|
||||
- @install bin/libupnp.so /usr/lib/libupnp.so.$(VERSION)
|
||||
- ln -s /usr/lib/libupnp.so.$(VERSION) /usr/lib/libupnp.so
|
||||
- @install inc/*.h /usr/include/upnp
|
||||
- @install inc/upnpdom/*.h /usr/include/upnp/upnpdom
|
||||
- @install inc/tools/*.h /usr/include/upnp/tools
|
||||
+ @install -d ${PREFIX}/include/upnp
|
||||
+ @install -d ${PREFIX}/include/upnp/upnpdom
|
||||
+ @install -d ${PREFIX}/include/upnp/tools
|
||||
+ @install bin/libupnp.so ${PREFIX}/lib/libupnp.so.$(VERSION)
|
||||
+ ln -fs ${PREFIX}/lib/libupnp.so.$(VERSION) ${PREFIX}/lib/libupnp.so
|
||||
+ @install inc/*.h ${PREFIX}/include/upnp
|
||||
+ @install inc/upnpdom/*.h ${PREFIX}/include/upnp/upnpdom
|
||||
+ @install inc/tools/*.h ${PREFIX}/include/upnp/tools
|
||||
|
||||
uninstall:
|
||||
- @if [ -d /usr/include/upnp ]; then rm -rf /usr/include/upnp; fi
|
||||
- @if [ -f /usr/lib/libupnp.so ]; then rm /usr/lib/libupnp.so; fi
|
||||
- @if [ -f /usr/lib/libupnp.so.$(VERSION) ]; then rm /usr/lib/libupnp.so.$(VERSION); fi
|
||||
+ @if [ -d ${PREFIX}/include/upnp ]; then rm -rf ${PREFIX}/include/upnp; fi
|
||||
+ @if [ -f ${PREFIX}/lib/libupnp.so ]; then rm ${PREFIX}/lib/libupnp.so; fi
|
||||
+ @if [ -f ${PREFIX}/lib/libupnp.so.$(VERSION) ]; then rm ${PREFIX}/lib/libupnp.so.$(VERSION); fi
|
||||
|
|
@ -1,22 +0,0 @@
|
|||
--- src/api/makefile.orig Fri Jun 15 08:21:33 2001
|
||||
+++ src/api/makefile Sat Aug 3 16:29:38 2002
|
||||
@@ -34,15 +34,15 @@
|
||||
CC = gcc
|
||||
CFLAGS = -Wall -fpic $(DEFS)
|
||||
C2FLAGS = -Wall $(DEFS) -shared -Wl,-soname,libupnp.so
|
||||
-INCLUDES = -I ../inc -I ../../inc -I ../../inc/upnpdom -I ../inc/tools
|
||||
-LIBS = -lpthread -luuid
|
||||
+INCLUDES = -I ../inc -I ../../inc -I ../../inc/upnpdom -I ../inc/tools -I $(PREFIX)/include
|
||||
+LIBS = ${PTHREAD_LIBS} -luuid -L$(PREFIX)/lib
|
||||
|
||||
ifeq ($(DEBUG),1)
|
||||
CFLAGS += -g -O -DDEBUG
|
||||
C2FLAGS += -g -O -DDEBUG
|
||||
else
|
||||
-CFLAGS += -O2
|
||||
-C2FLAGS += -O2
|
||||
+CFLAGS += -g -ggdb
|
||||
+C2FLAGS += -g -ggdb
|
||||
endif
|
||||
|
||||
objects = upnpapi.o config.o ../lib/ssdp.o ../lib/soap.o \
|
|
@ -1,11 +0,0 @@
|
|||
--- src/api/upnpapi.c.orig Fri Jun 15 08:22:15 2001
|
||||
+++ src/api/upnpapi.c Sat Aug 3 16:29:38 2002
|
||||
@@ -44,7 +44,7 @@
|
||||
#include<string.h>
|
||||
|
||||
#include <sys/ioctl.h>
|
||||
-#include <linux/if.h>
|
||||
+#include <net/if.h>
|
||||
#include <sys/utsname.h>
|
||||
#include <sys/socket.h>
|
||||
#include <netinet/in.h>
|
|
@ -1,11 +0,0 @@
|
|||
--- src/gena/Makefile.orig Fri Jun 15 08:21:33 2001
|
||||
+++ src/gena/Makefile Sat Aug 3 16:29:39 2002
|
||||
@@ -61,7 +61,7 @@
|
||||
|
||||
TARGET = $(upnp_lib_dir)/gena.o
|
||||
|
||||
-CFLAGS = -I$(upnp_inc_dir) -I$(upnp_src_inc_dir) -fpic -Wall -c -D_REENTRANT
|
||||
+CFLAGS = -I$(upnp_inc_dir) -I$(upnp_src_inc_dir) -I$(PREFIX)/include -fpic -Wall -c -D_REENTRANT
|
||||
|
||||
ifeq ($(DEBUG),1)
|
||||
CFLAGS += -g -O -DDEBUG
|
|
@ -1,11 +0,0 @@
|
|||
--- src/genlib/tpool/interrupts.cpp.orig Fri Jun 15 08:22:16 2001
|
||||
+++ src/genlib/tpool/interrupts.cpp Sat Aug 3 16:29:39 2002
|
||||
@@ -82,7 +82,7 @@
|
||||
int code;
|
||||
|
||||
newset.sa_handler = signal_handler_alpha;
|
||||
- newset.sa_flags = SA_NOMASK;
|
||||
+ newset.sa_flags = SA_NODEFER;
|
||||
code = sigaction( signalNum, &newset, &g_OldAction );
|
||||
if ( code < 0 )
|
||||
{
|
|
@ -1,20 +0,0 @@
|
|||
--- src/genlib/util/gmtdate.cpp.orig Fri Jun 15 08:22:16 2001
|
||||
+++ src/genlib/util/gmtdate.cpp Sat Aug 3 16:29:39 2002
|
||||
@@ -41,7 +41,7 @@
|
||||
#include <stdlib.h>
|
||||
#include <ctype.h>
|
||||
#include <string.h>
|
||||
-#include <values.h>
|
||||
+#include <machine/limits.h>
|
||||
#include <genlib/util/gmtdate.h>
|
||||
#include <genlib/util/miscexceptions.h>
|
||||
|
||||
@@ -254,7 +254,7 @@
|
||||
|
||||
val = (int)strtol( str, &endptr, 10 );
|
||||
|
||||
- if ( val < 0 || val == MAXINT )
|
||||
+ if ( val < 0 || val == INT_MAX )
|
||||
{
|
||||
return -1;
|
||||
}
|
|
@ -1,11 +0,0 @@
|
|||
--- src/ssdp/ssdplib.c.orig Thu Aug 16 02:17:31 2001
|
||||
+++ src/ssdp/ssdplib.c Sat Aug 3 16:29:39 2002
|
||||
@@ -403,7 +403,7 @@
|
||||
bzero((char *)&SelfAddr, sizeof(struct sockaddr_in));
|
||||
|
||||
SelfAddr.sin_family = AF_INET;
|
||||
- SelfAddr.sin_addr.s_addr = inet_addr(SSDP_IP);
|
||||
+ SelfAddr.sin_addr.s_addr = htonl(INADDR_ANY);
|
||||
SelfAddr.sin_port = htons(SSDP_PORT);
|
||||
if (bind( SsdpSock, (struct sockaddr *) &SelfAddr, sizeof(SelfAddr)) != 0)
|
||||
{
|
20
devel/upnp/files/patch-threadutil::src::ThreadPool.c
Normal file
20
devel/upnp/files/patch-threadutil::src::ThreadPool.c
Normal file
|
@ -0,0 +1,20 @@
|
|||
--- threadutil/src/ThreadPool.c.orig Sat Apr 5 23:20:04 2003
|
||||
+++ threadutil/src/ThreadPool.c Sat Apr 5 23:20:47 2003
|
||||
@@ -341,7 +341,7 @@
|
||||
struct timeb t;
|
||||
|
||||
ftime( &t );
|
||||
- srand( ( unsigned int )t.millitm + ithread_get_current_thread_id( ) );
|
||||
+ srand( ( unsigned int )t.millitm + ( unsigned int )ithread_get_current_thread_id( ) );
|
||||
}
|
||||
|
||||
/****************************************************************************
|
||||
@@ -1455,7 +1455,7 @@
|
||||
assert( stats != NULL ); if( stats == NULL ) {
|
||||
return;}
|
||||
|
||||
- printf( "ThreadPoolStats at Time: %ld\n", time( NULL ) );
|
||||
+ printf( "ThreadPoolStats at Time: %lf\n", time( NULL ) );
|
||||
printf
|
||||
( "Average Wait in High Priority Q in milliseconds: %lf\n",
|
||||
stats->avgWaitHQ );
|
11
devel/upnp/files/patch-upnp::src::inc::sysdep.h
Normal file
11
devel/upnp/files/patch-upnp::src::inc::sysdep.h
Normal file
|
@ -0,0 +1,11 @@
|
|||
--- upnp/src/inc/sysdep.h.orig Wed Jan 15 07:57:19 2003
|
||||
+++ upnp/src/inc/sysdep.h Sat Apr 5 23:20:48 2003
|
||||
@@ -19,7 +19,7 @@
|
||||
|
||||
#include <sys/types.h>
|
||||
#include <sys/time.h>
|
||||
-#include <sys/sysinfo.h>
|
||||
+//#include <sys/sysinfo.h>
|
||||
#include "ithread.h"
|
||||
|
||||
/* change to point to where MD5 .h's live */
|
11
devel/upnp/files/patch-upnp::src::uuid::sysdep.c
Normal file
11
devel/upnp/files/patch-upnp::src::uuid::sysdep.c
Normal file
|
@ -0,0 +1,11 @@
|
|||
--- upnp/src/uuid/sysdep.c.orig Thu Jan 16 05:39:44 2003
|
||||
+++ upnp/src/uuid/sysdep.c Sat Apr 5 23:20:48 2003
|
||||
@@ -144,7 +144,7 @@
|
||||
{
|
||||
MD5_CTX c;
|
||||
typedef struct {
|
||||
- struct sysinfo s;
|
||||
+ //struct sysinfo s;
|
||||
struct timeval t;
|
||||
char hostname[257];
|
||||
} randomness;
|
|
@ -1,19 +1,6 @@
|
|||
include/upnp/tools/config.h
|
||||
include/upnp/tools/upnptools.h
|
||||
include/upnp/config.h
|
||||
include/upnp/upnp.h
|
||||
include/upnp/upnpdom/Attr.h
|
||||
include/upnp/upnpdom/DOMException.h
|
||||
include/upnp/upnpdom/Document.h
|
||||
include/upnp/upnpdom/Element.h
|
||||
include/upnp/upnpdom/NamedNodeMap.h
|
||||
include/upnp/upnpdom/Node.h
|
||||
include/upnp/upnpdom/NodeAct.h
|
||||
include/upnp/upnpdom/NodeList.h
|
||||
include/upnp/upnpdom/Parser.h
|
||||
include/upnp/upnpdom/all.h
|
||||
include/upnp/upnpdom/domCif.h
|
||||
include/upnp/upnptools.h
|
||||
lib/libupnp.so
|
||||
lib/libupnp.so.1
|
||||
@dirrm include/upnp/upnpdom
|
||||
@dirrm include/upnp/tools
|
||||
@dirrm include/upnp
|
||||
|
|
|
@ -6,11 +6,11 @@
|
|||
#
|
||||
|
||||
PORTNAME= upnp
|
||||
PORTVERSION= 1.0.4
|
||||
PORTVERSION= 1.2.1
|
||||
CATEGORIES= devel
|
||||
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
|
||||
MASTER_SITE_SUBDIR= ${PORTNAME}
|
||||
DISTNAME= ${PORTNAME}sdk-${PORTVERSION}
|
||||
DISTNAME= lib${PORTNAME}-${PORTVERSION}
|
||||
|
||||
MAINTAINER= leeym@FreeBSD.org
|
||||
COMMENT= Universal Plug and Play Software Development Kit
|
||||
|
@ -19,22 +19,22 @@ LIB_DEPENDS= uuid.1:${PORTSDIR}/sysutils/e2fsprogs
|
|||
|
||||
USE_GMAKE= yes
|
||||
USE_REINPLACE= yes
|
||||
WRKSRC= ${WRKDIR}/${DISTNAME}/upnp
|
||||
PATCH_WRKSRC= ${WRKDIR}/${DISTNAME}
|
||||
MAKEFILE= makefile
|
||||
MAKE_ENV= PTHREAD_LIBS=${PTHREAD_LIBS}
|
||||
NOT_FOR_ARCHS= sparc64
|
||||
INSTALLS_SHLIB= yes
|
||||
|
||||
post-patch:
|
||||
@cd ${WRKSRC} && ${REINPLACE_CMD} -e 's,MAKE = make,MAKE = ${GMAKE},' \
|
||||
src/genlib/makefile src/makefile
|
||||
@cd ${WRKSRC} && ${REINPLACE_CMD} -e 's,malloc.h,stdlib.h,' \
|
||||
src/inc/genlib/client_table/client_table.h \
|
||||
src/inc/genlib/http_client/http_client.h \
|
||||
src/inc/genlib/service_table/service_table.h \
|
||||
src/inc/genlib/timer_thread/timer_thread.h \
|
||||
src/upnpdom/domCif.cpp
|
||||
@cd ${WRKSRC} && ${REINPLACE_CMD} -e 's,MSG_NOSIGNAL,0,' \
|
||||
src/genlib/http_client/http_client.c \
|
||||
src/genlib/net/http/readwrite.cpp
|
||||
@${FIND} ${PATCH_WRKSRC} -name "*.[ch]" | \
|
||||
${XARGS} ${REINPLACE_CMD} -e 's,malloc.h,stdlib.h,'
|
||||
@${FIND} ${PATCH_WRKSRC} -name "[Mm]akefile" | ${XARGS} ${REINPLACE_CMD} \
|
||||
-e 's,lpthread,pthread, ; s,/usr,,g ; s,1\.2\.1,1,g' \
|
||||
-e 's,MAKE = make,MAKE = ${GMAKE},' \
|
||||
-e 's,install bin,${INSTALL_PROGRAM} bin,g' \
|
||||
-e 's,install inc,${INSTALL_DATA} inc,g'
|
||||
@${REINPLACE_CMD} -e 's,MSG_NOSIGNAL,0,' ${PATCH_WRKSRC}/upnp/src/genlib/net/sock.c
|
||||
@${REINPLACE_CMD} -e 's,linux/if,net/if,' ${PATCH_WRKSRC}/upnp/src/api/upnpapi.c
|
||||
|
||||
.include <bsd.port.mk>
|
||||
|
|
|
@ -1 +1 @@
|
|||
MD5 (upnpsdk-1.0.4.tar.gz) = d4ebd84d0c809d90ae36c37e5a2d213c
|
||||
MD5 (libupnp-1.2.1.tar.gz) = 14b453406c0f768f875de50bdbf5c802
|
||||
|
|
|
@ -1,45 +0,0 @@
|
|||
--- makefile.orig Thu Aug 16 02:20:11 2001
|
||||
+++ makefile Sat Aug 3 17:22:35 2002
|
||||
@@ -29,11 +29,11 @@
|
||||
##
|
||||
###########################################################################
|
||||
|
||||
-MAKE = make
|
||||
+MAKE = gmake
|
||||
UPNP = bin/libupnp.so
|
||||
SUBDIRS = src
|
||||
|
||||
-VERSION=1.0.4
|
||||
+VERSION=1
|
||||
|
||||
ifeq ($(DEBUG),1)
|
||||
STRIPU =
|
||||
@@ -102,17 +102,17 @@
|
||||
@if [ -f "doc/upnpsdk.aux" ]; then rm doc/upnpsdk.aux; fi
|
||||
|
||||
install: upnp
|
||||
- @install -d /usr/include/upnp
|
||||
- @install -d /usr/include/upnp/upnpdom
|
||||
- @install -d /usr/include/upnp/tools
|
||||
- @install bin/libupnp.so /usr/lib/libupnp.so.$(VERSION)
|
||||
- ln -s /usr/lib/libupnp.so.$(VERSION) /usr/lib/libupnp.so
|
||||
- @install inc/*.h /usr/include/upnp
|
||||
- @install inc/upnpdom/*.h /usr/include/upnp/upnpdom
|
||||
- @install inc/tools/*.h /usr/include/upnp/tools
|
||||
+ @install -d ${PREFIX}/include/upnp
|
||||
+ @install -d ${PREFIX}/include/upnp/upnpdom
|
||||
+ @install -d ${PREFIX}/include/upnp/tools
|
||||
+ @install bin/libupnp.so ${PREFIX}/lib/libupnp.so.$(VERSION)
|
||||
+ ln -fs ${PREFIX}/lib/libupnp.so.$(VERSION) ${PREFIX}/lib/libupnp.so
|
||||
+ @install inc/*.h ${PREFIX}/include/upnp
|
||||
+ @install inc/upnpdom/*.h ${PREFIX}/include/upnp/upnpdom
|
||||
+ @install inc/tools/*.h ${PREFIX}/include/upnp/tools
|
||||
|
||||
uninstall:
|
||||
- @if [ -d /usr/include/upnp ]; then rm -rf /usr/include/upnp; fi
|
||||
- @if [ -f /usr/lib/libupnp.so ]; then rm /usr/lib/libupnp.so; fi
|
||||
- @if [ -f /usr/lib/libupnp.so.$(VERSION) ]; then rm /usr/lib/libupnp.so.$(VERSION); fi
|
||||
+ @if [ -d ${PREFIX}/include/upnp ]; then rm -rf ${PREFIX}/include/upnp; fi
|
||||
+ @if [ -f ${PREFIX}/lib/libupnp.so ]; then rm ${PREFIX}/lib/libupnp.so; fi
|
||||
+ @if [ -f ${PREFIX}/lib/libupnp.so.$(VERSION) ]; then rm ${PREFIX}/lib/libupnp.so.$(VERSION); fi
|
||||
|
|
@ -1,22 +0,0 @@
|
|||
--- src/api/makefile.orig Fri Jun 15 08:21:33 2001
|
||||
+++ src/api/makefile Sat Aug 3 16:29:38 2002
|
||||
@@ -34,15 +34,15 @@
|
||||
CC = gcc
|
||||
CFLAGS = -Wall -fpic $(DEFS)
|
||||
C2FLAGS = -Wall $(DEFS) -shared -Wl,-soname,libupnp.so
|
||||
-INCLUDES = -I ../inc -I ../../inc -I ../../inc/upnpdom -I ../inc/tools
|
||||
-LIBS = -lpthread -luuid
|
||||
+INCLUDES = -I ../inc -I ../../inc -I ../../inc/upnpdom -I ../inc/tools -I $(PREFIX)/include
|
||||
+LIBS = ${PTHREAD_LIBS} -luuid -L$(PREFIX)/lib
|
||||
|
||||
ifeq ($(DEBUG),1)
|
||||
CFLAGS += -g -O -DDEBUG
|
||||
C2FLAGS += -g -O -DDEBUG
|
||||
else
|
||||
-CFLAGS += -O2
|
||||
-C2FLAGS += -O2
|
||||
+CFLAGS += -g -ggdb
|
||||
+C2FLAGS += -g -ggdb
|
||||
endif
|
||||
|
||||
objects = upnpapi.o config.o ../lib/ssdp.o ../lib/soap.o \
|
|
@ -1,11 +0,0 @@
|
|||
--- src/api/upnpapi.c.orig Fri Jun 15 08:22:15 2001
|
||||
+++ src/api/upnpapi.c Sat Aug 3 16:29:38 2002
|
||||
@@ -44,7 +44,7 @@
|
||||
#include<string.h>
|
||||
|
||||
#include <sys/ioctl.h>
|
||||
-#include <linux/if.h>
|
||||
+#include <net/if.h>
|
||||
#include <sys/utsname.h>
|
||||
#include <sys/socket.h>
|
||||
#include <netinet/in.h>
|
|
@ -1,11 +0,0 @@
|
|||
--- src/gena/Makefile.orig Fri Jun 15 08:21:33 2001
|
||||
+++ src/gena/Makefile Sat Aug 3 16:29:39 2002
|
||||
@@ -61,7 +61,7 @@
|
||||
|
||||
TARGET = $(upnp_lib_dir)/gena.o
|
||||
|
||||
-CFLAGS = -I$(upnp_inc_dir) -I$(upnp_src_inc_dir) -fpic -Wall -c -D_REENTRANT
|
||||
+CFLAGS = -I$(upnp_inc_dir) -I$(upnp_src_inc_dir) -I$(PREFIX)/include -fpic -Wall -c -D_REENTRANT
|
||||
|
||||
ifeq ($(DEBUG),1)
|
||||
CFLAGS += -g -O -DDEBUG
|
|
@ -1,11 +0,0 @@
|
|||
--- src/genlib/tpool/interrupts.cpp.orig Fri Jun 15 08:22:16 2001
|
||||
+++ src/genlib/tpool/interrupts.cpp Sat Aug 3 16:29:39 2002
|
||||
@@ -82,7 +82,7 @@
|
||||
int code;
|
||||
|
||||
newset.sa_handler = signal_handler_alpha;
|
||||
- newset.sa_flags = SA_NOMASK;
|
||||
+ newset.sa_flags = SA_NODEFER;
|
||||
code = sigaction( signalNum, &newset, &g_OldAction );
|
||||
if ( code < 0 )
|
||||
{
|
|
@ -1,20 +0,0 @@
|
|||
--- src/genlib/util/gmtdate.cpp.orig Fri Jun 15 08:22:16 2001
|
||||
+++ src/genlib/util/gmtdate.cpp Sat Aug 3 16:29:39 2002
|
||||
@@ -41,7 +41,7 @@
|
||||
#include <stdlib.h>
|
||||
#include <ctype.h>
|
||||
#include <string.h>
|
||||
-#include <values.h>
|
||||
+#include <machine/limits.h>
|
||||
#include <genlib/util/gmtdate.h>
|
||||
#include <genlib/util/miscexceptions.h>
|
||||
|
||||
@@ -254,7 +254,7 @@
|
||||
|
||||
val = (int)strtol( str, &endptr, 10 );
|
||||
|
||||
- if ( val < 0 || val == MAXINT )
|
||||
+ if ( val < 0 || val == INT_MAX )
|
||||
{
|
||||
return -1;
|
||||
}
|
|
@ -1,11 +0,0 @@
|
|||
--- src/ssdp/ssdplib.c.orig Thu Aug 16 02:17:31 2001
|
||||
+++ src/ssdp/ssdplib.c Sat Aug 3 16:29:39 2002
|
||||
@@ -403,7 +403,7 @@
|
||||
bzero((char *)&SelfAddr, sizeof(struct sockaddr_in));
|
||||
|
||||
SelfAddr.sin_family = AF_INET;
|
||||
- SelfAddr.sin_addr.s_addr = inet_addr(SSDP_IP);
|
||||
+ SelfAddr.sin_addr.s_addr = htonl(INADDR_ANY);
|
||||
SelfAddr.sin_port = htons(SSDP_PORT);
|
||||
if (bind( SsdpSock, (struct sockaddr *) &SelfAddr, sizeof(SelfAddr)) != 0)
|
||||
{
|
20
devel/upnp104/files/patch-threadutil::src::ThreadPool.c
Normal file
20
devel/upnp104/files/patch-threadutil::src::ThreadPool.c
Normal file
|
@ -0,0 +1,20 @@
|
|||
--- threadutil/src/ThreadPool.c.orig Sat Apr 5 23:20:04 2003
|
||||
+++ threadutil/src/ThreadPool.c Sat Apr 5 23:20:47 2003
|
||||
@@ -341,7 +341,7 @@
|
||||
struct timeb t;
|
||||
|
||||
ftime( &t );
|
||||
- srand( ( unsigned int )t.millitm + ithread_get_current_thread_id( ) );
|
||||
+ srand( ( unsigned int )t.millitm + ( unsigned int )ithread_get_current_thread_id( ) );
|
||||
}
|
||||
|
||||
/****************************************************************************
|
||||
@@ -1455,7 +1455,7 @@
|
||||
assert( stats != NULL ); if( stats == NULL ) {
|
||||
return;}
|
||||
|
||||
- printf( "ThreadPoolStats at Time: %ld\n", time( NULL ) );
|
||||
+ printf( "ThreadPoolStats at Time: %lf\n", time( NULL ) );
|
||||
printf
|
||||
( "Average Wait in High Priority Q in milliseconds: %lf\n",
|
||||
stats->avgWaitHQ );
|
11
devel/upnp104/files/patch-upnp::src::inc::sysdep.h
Normal file
11
devel/upnp104/files/patch-upnp::src::inc::sysdep.h
Normal file
|
@ -0,0 +1,11 @@
|
|||
--- upnp/src/inc/sysdep.h.orig Wed Jan 15 07:57:19 2003
|
||||
+++ upnp/src/inc/sysdep.h Sat Apr 5 23:20:48 2003
|
||||
@@ -19,7 +19,7 @@
|
||||
|
||||
#include <sys/types.h>
|
||||
#include <sys/time.h>
|
||||
-#include <sys/sysinfo.h>
|
||||
+//#include <sys/sysinfo.h>
|
||||
#include "ithread.h"
|
||||
|
||||
/* change to point to where MD5 .h's live */
|
11
devel/upnp104/files/patch-upnp::src::uuid::sysdep.c
Normal file
11
devel/upnp104/files/patch-upnp::src::uuid::sysdep.c
Normal file
|
@ -0,0 +1,11 @@
|
|||
--- upnp/src/uuid/sysdep.c.orig Thu Jan 16 05:39:44 2003
|
||||
+++ upnp/src/uuid/sysdep.c Sat Apr 5 23:20:48 2003
|
||||
@@ -144,7 +144,7 @@
|
||||
{
|
||||
MD5_CTX c;
|
||||
typedef struct {
|
||||
- struct sysinfo s;
|
||||
+ //struct sysinfo s;
|
||||
struct timeval t;
|
||||
char hostname[257];
|
||||
} randomness;
|
|
@ -1,19 +1,6 @@
|
|||
include/upnp/tools/config.h
|
||||
include/upnp/tools/upnptools.h
|
||||
include/upnp/config.h
|
||||
include/upnp/upnp.h
|
||||
include/upnp/upnpdom/Attr.h
|
||||
include/upnp/upnpdom/DOMException.h
|
||||
include/upnp/upnpdom/Document.h
|
||||
include/upnp/upnpdom/Element.h
|
||||
include/upnp/upnpdom/NamedNodeMap.h
|
||||
include/upnp/upnpdom/Node.h
|
||||
include/upnp/upnpdom/NodeAct.h
|
||||
include/upnp/upnpdom/NodeList.h
|
||||
include/upnp/upnpdom/Parser.h
|
||||
include/upnp/upnpdom/all.h
|
||||
include/upnp/upnpdom/domCif.h
|
||||
include/upnp/upnptools.h
|
||||
lib/libupnp.so
|
||||
lib/libupnp.so.1
|
||||
@dirrm include/upnp/upnpdom
|
||||
@dirrm include/upnp/tools
|
||||
@dirrm include/upnp
|
||||
|
|
Loading…
Reference in a new issue