Attachment #113087 for bug #154614

View | Details | Raw Unified | Return to bug 154614
Collapse All | Expand All




#

PORTNAME=	upnp
PORTVERSION=	1.6.12
PORTEPOCH=	1
CATEGORIES=	devel
MASTER_SITES=	SF/p${PORTNAME}/p${PORTNAME}/libUPnP%20${PORTVERSION}

		PTHREAD_LIBS="${PTHREAD_LIBS}"

.if defined(NOPORTDOCS)
CONFIGURE_ARGS+=	--without-documentation
.else
CONFIGURE_ARGS+=	--with-documentation=${DOCSDIR}
PORTDOCS=	*
.endif

.if defined(WITH_DEBUG)
CONFIGURE_ARGS+=	--enable-debug
.endif

post-patch:	.SILENT
	${REINPLACE_CMD} '/^pkgconfigexecdir/s|$$(libdir)|$$(prefix)/libdata|' \
		${WRKSRC}/Makefile.in

.include <bsd.port.mk>

# strndup(3) was added in 7.2-RELEASE
.if ${OSVERSION} < 702000
EXTRA_PATCHES+=	${FILESDIR}/extra-upnp-src-api-UpnpString.c
.endif

.include <bsd.port.post.mk>

Lines 1-2 Link Here

(-)/home/corn/devel/upnp/distinfo (-2 / +2 lines)
1	SHA256 (libupnp-1.6.10.tar.bz2) = 7148e449774ce233fb46304a4124d3dc88030f1a0f2713dd7ee08980d98df188	1	SHA256 (libupnp-1.6.12.tar.bz2) = 45530b5f72dbb9dd037388ad28010d1fdeb128fa05c18c33456947bd3d6de90f
2	SIZE (libupnp-1.6.10.tar.bz2) = 1179304	2	SIZE (libupnp-1.6.12.tar.bz2) = 1178639




--- upnp/src/api/UpnpString.c.orig	2010-11-08 08:09:47.000000000 +0800
+++ upnp/src/api/UpnpString.c	2010-11-08 08:11:16.000000000 +0800
@@ -165,8 +165,10 @@
 
 int UpnpString_set_StringN(UpnpString *p, const char *s, size_t n)
 {
-	char *q = strndup(s, n);
+	char *q = malloc(n+1);
 	if (!q) goto error_handler1;
+        strncpy(q, s, n);
+        q[n-1] = '\0';
 	free(((struct SUpnpString *)p)->m_string);
 	((struct SUpnpString *)p)->m_length = strlen(q);
 	((struct SUpnpString *)p)->m_string = q;




--- ./upnp/src/api/upnpapi.c.orig	2009-04-20 09:15:43.000000000 -0300
+++ ./upnp/src/api/upnpapi.c	2009-04-20 09:15:55.000000000 -0300
@@ -44,11 +44,11 @@
 
 #ifndef WIN32
 	#include <arpa/inet.h>
+	#include <sys/socket.h>
 	#include <net/if.h>
 	#include <netinet/in.h>
 	#include <sys/ioctl.h>
 	#include <sys/param.h>
-	#include <sys/socket.h>
 	#include <sys/types.h>
 	#include <sys/utsname.h>
 

Lines 8-13 Link Here

(-)/home/corn/devel/upnp/pkg-plist (-2 / +5 lines)
8	include/upnp/upnpconfig.h	8	include/upnp/upnpconfig.h
9	include/upnp/UpnpGlobal.h	9	include/upnp/UpnpGlobal.h
10	include/upnp/UpnpInet.h	10	include/upnp/UpnpInet.h
		11	include/upnp/UpnpIntTypes.h
		12	include/upnp/UpnpStdInt.h
		13	include/upnp/UpnpUniStd.h
11	include/upnp/upnp.h	14	include/upnp/upnp.h
12	include/upnp/upnpdebug.h	15	include/upnp/upnpdebug.h
13	include/upnp/UpnpString.h	16	include/upnp/UpnpString.h
Lines 19-28 Link Here
19	lib/libthreadutil.a	22	lib/libthreadutil.a
20	lib/libthreadutil.la	23	lib/libthreadutil.la
21	lib/libthreadutil.so	24	lib/libthreadutil.so
22	lib/libthreadutil.so.5	25	lib/libthreadutil.so.6
23	lib/libupnp.a	26	lib/libupnp.a
24	lib/libupnp.la	27	lib/libupnp.la
25	lib/libupnp.so	28	lib/libupnp.so
26	lib/libupnp.so.5	29	lib/libupnp.so.6
27	libdata/pkgconfig/libupnp.pc	30	libdata/pkgconfig/libupnp.pc
28	@dirrm include/upnp	31	@dirrm include/upnp

Return to bug 154614

Lines 6-12 Link Here

(-)/home/corn/devel/upnp/Makefile (-11 / +8 lines)
6	#	6	#
7		7
8	PORTNAME= upnp	8	PORTNAME= upnp
9	PORTVERSION= 1.6.10	9	PORTVERSION= 1.6.12
10	PORTEPOCH= 1	10	PORTEPOCH= 1
11	CATEGORIES= devel	11	CATEGORIES= devel
12	MASTER_SITES= SF/p${PORTNAME}/p${PORTNAME}/libUPnP%20${PORTVERSION}	12	MASTER_SITES= SF/p${PORTNAME}/p${PORTNAME}/libUPnP%20${PORTVERSION}
Lines 27-47 Link Here
27	PTHREAD_LIBS="${PTHREAD_LIBS}"	27	PTHREAD_LIBS="${PTHREAD_LIBS}"
28		28
29	.if defined(NOPORTDOCS)	29	.if defined(NOPORTDOCS)
30	CONFIGURE_ARGS= --without-documentation	30	CONFIGURE_ARGS+= --without-documentation
31	.else	31	.else
32	CONFIGURE_ARGS= --with-documentation=${DOCSDIR}	32	CONFIGURE_ARGS+= --with-documentation=${DOCSDIR}
33	PORTDOCS= *	33	PORTDOCS= *
34	.endif	34	.endif
35		35
		36	.if defined(WITH_DEBUG)
		37	CONFIGURE_ARGS+= --enable-debug
		38	.endif
		39
36	post-patch: .SILENT	40	post-patch: .SILENT
37	${REINPLACE_CMD} '/^pkgconfigexecdir/s\|$$(libdir)\|$$(prefix)/libdata\|' \	41	${REINPLACE_CMD} '/^pkgconfigexecdir/s\|$$(libdir)\|$$(prefix)/libdata\|' \
38	${WRKSRC}/Makefile.in	42	${WRKSRC}/Makefile.in
39		43
40	.include <bsd.port.pre.mk>	44	.include <bsd.port.mk>
41
42	# strndup(3) was added in 7.2-RELEASE
43	.if ${OSVERSION} < 702000
44	EXTRA_PATCHES+= ${FILESDIR}/extra-upnp-src-api-UpnpString.c
45	.endif
46
47	.include <bsd.port.post.mk>

Lines 1-14 Link Here

(-)/home/corn/devel/upnp/files/extra-upnp-src-api-UpnpString.c (-14 lines)
1	--- upnp/src/api/UpnpString.c.orig 2010-11-08 08:09:47.000000000 +0800
2	+++ upnp/src/api/UpnpString.c 2010-11-08 08:11:16.000000000 +0800
3	@@ -165,8 +165,10 @@
4
5	int UpnpString_set_StringN(UpnpString p, const char s, size_t n)
6	{
7	- char *q = strndup(s, n);
8	+ char *q = malloc(n+1);
9	if (!q) goto error_handler1;
10	+ strncpy(q, s, n);
11	+ q[n-1] = '\0';
12	free(((struct SUpnpString *)p)->m_string);
13	((struct SUpnpString *)p)->m_length = strlen(q);
14	((struct SUpnpString *)p)->m_string = q;

Lines 1-15 Link Here

(-)/home/corn/devel/upnp/files/patch-upnp__src__api__upnpapi.c (-15 lines)
1	--- ./upnp/src/api/upnpapi.c.orig 2009-04-20 09:15:43.000000000 -0300
2	+++ ./upnp/src/api/upnpapi.c 2009-04-20 09:15:55.000000000 -0300
3	@@ -44,11 +44,11 @@
4
5	#ifndef WIN32
6	#include <arpa/inet.h>
7	+ #include <sys/socket.h>
8	#include <net/if.h>
9	#include <netinet/in.h>
10	#include <sys/ioctl.h>
11	#include <sys/param.h>
12	- #include <sys/socket.h>
13	#include <sys/types.h>
14	#include <sys/utsname.h>
15