Attachment 113087 Details for Bug 154614 – upnp-1.6.12,1.patch

[patch] upnp-1.6.12,1.patch

upnp-1.6.12,1.patch (text/plain), 3.95 KB, created by Pawel Pekala on 2011-02-09 13:40:04 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Pawel Pekala

Created: 2011-02-09 13:40:04 UTC

Size: 3.95 KB

patch

obsolete

>diff -ruN --exclude=CVS /usr/ports/devel/upnp/Makefile /home/corn/devel/upnp/Makefile
>--- /usr/ports/devel/upnp/Makefile	2011-02-05 04:34:12.000000000 +0100
>+++ /home/corn/devel/upnp/Makefile	2011-02-09 14:23:51.000000000 +0100
>@@ -6,7 +6,7 @@
> #
> 
> PORTNAME=	upnp
>-PORTVERSION=	1.6.10
>+PORTVERSION=	1.6.12
> PORTEPOCH=	1
> CATEGORIES=	devel
> MASTER_SITES=	SF/p${PORTNAME}/p${PORTNAME}/libUPnP%20${PORTVERSION}
>@@ -27,21 +27,18 @@
> 		PTHREAD_LIBS="${PTHREAD_LIBS}"
> 
> .if defined(NOPORTDOCS)
>-CONFIGURE_ARGS=	--without-documentation
>+CONFIGURE_ARGS+=	--without-documentation
> .else
>-CONFIGURE_ARGS=	--with-documentation=${DOCSDIR}
>+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.pre.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>
>+.include <bsd.port.mk>
>diff -ruN --exclude=CVS /usr/ports/devel/upnp/distinfo /home/corn/devel/upnp/distinfo
>--- /usr/ports/devel/upnp/distinfo	2011-02-05 04:34:12.000000000 +0100
>+++ /home/corn/devel/upnp/distinfo	2011-02-09 10:19:14.000000000 +0100
>@@ -1,2 +1,2 @@
>-SHA256 (libupnp-1.6.10.tar.bz2) = 7148e449774ce233fb46304a4124d3dc88030f1a0f2713dd7ee08980d98df188
>-SIZE (libupnp-1.6.10.tar.bz2) = 1179304
>+SHA256 (libupnp-1.6.12.tar.bz2) = 45530b5f72dbb9dd037388ad28010d1fdeb128fa05c18c33456947bd3d6de90f
>+SIZE (libupnp-1.6.12.tar.bz2) = 1178639
>diff -ruN --exclude=CVS /usr/ports/devel/upnp/files/extra-upnp-src-api-UpnpString.c /home/corn/devel/upnp/files/extra-upnp-src-api-UpnpString.c
>--- /usr/ports/devel/upnp/files/extra-upnp-src-api-UpnpString.c	2010-11-08 01:24:52.000000000 +0100
>+++ /home/corn/devel/upnp/files/extra-upnp-src-api-UpnpString.c	1970-01-01 01:00:00.000000000 +0100
>@@ -1,14 +0,0 @@
>---- 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;
>diff -ruN --exclude=CVS /usr/ports/devel/upnp/files/patch-upnp__src__api__upnpapi.c /home/corn/devel/upnp/files/patch-upnp__src__api__upnpapi.c
>--- /usr/ports/devel/upnp/files/patch-upnp__src__api__upnpapi.c	2009-04-22 03:33:33.000000000 +0200
>+++ /home/corn/devel/upnp/files/patch-upnp__src__api__upnpapi.c	1970-01-01 01:00:00.000000000 +0100
>@@ -1,15 +0,0 @@
>---- ./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>
>- 
>diff -ruN --exclude=CVS /usr/ports/devel/upnp/pkg-plist /home/corn/devel/upnp/pkg-plist
>--- /usr/ports/devel/upnp/pkg-plist	2011-02-05 04:34:12.000000000 +0100
>+++ /home/corn/devel/upnp/pkg-plist	2011-02-09 10:28:35.000000000 +0100
>@@ -8,6 +8,9 @@
> include/upnp/upnpconfig.h
> include/upnp/UpnpGlobal.h
> include/upnp/UpnpInet.h
>+include/upnp/UpnpIntTypes.h
>+include/upnp/UpnpStdInt.h
>+include/upnp/UpnpUniStd.h
> include/upnp/upnp.h
> include/upnp/upnpdebug.h
> include/upnp/UpnpString.h
>@@ -19,10 +22,10 @@
> lib/libthreadutil.a
> lib/libthreadutil.la
> lib/libthreadutil.so
>-lib/libthreadutil.so.5
>+lib/libthreadutil.so.6
> lib/libupnp.a
> lib/libupnp.la
> lib/libupnp.so
>-lib/libupnp.so.5
>+lib/libupnp.so.6
> libdata/pkgconfig/libupnp.pc
> @dirrm include/upnp

Actions: View | Diff

Attachments on bug 154614: 113087