MFH: r551336

devel/upnp: update to 1.14.0

Update to newer release which contains a fix for CVE-2020-13848:
	https://github.com/pupnp/pupnp/commit/c805c1de1141cb22f74c0d94dd5664bda37398e0

Security:	CVE-2020-13848

Approved by:	ports-secteam (joneum)

7 files changed, 30 insertions, 22 deletions

diff --git a/devel/upnp/Makefile b/devel/upnp/Makefile
index 4f0d7ed1c829..0b0c0aa28663 100644
--- a/devel/upnp/Makefile
+++ b/devel/upnp/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	upnp
 DISTVERSIONPREFIX=	release-
-DISTVERSION=	1.12.1
+DISTVERSION=	1.14.0
 PORTEPOCH=	1
 CATEGORIES=	devel
 
@@ -68,7 +68,7 @@ UNSPECIFIED_SERVER_CONFIGURE_ENABLE=	unspecified_server
 
 do-install-DOCS-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
-	${INSTALL_MAN} ${WRKSRC}/upnp/doc/UPnP_Programming_Guide.pdf \
+	${INSTALL_MAN} ${WRKSRC}/docs/UPnP_Programming_Guide.pdf \
 		${STAGEDIR}${DOCSDIR}
 
 .include <bsd.port.mk>
diff --git a/devel/upnp/distinfo b/devel/upnp/distinfo
index 895202976d22..04991b593588 100644
--- a/devel/upnp/distinfo
+++ b/devel/upnp/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1586644035
-SHA256 (mrjimenez-pupnp-release-1.12.1_GH0.tar.gz) = b4fc8f8e78d5d3259f321aecab1bc9d9ef7b9cea816c4b4d850b264120773290
-SIZE (mrjimenez-pupnp-release-1.12.1_GH0.tar.gz) = 786818
+TIMESTAMP = 1601746007
+SHA256 (mrjimenez-pupnp-release-1.14.0_GH0.tar.gz) = 8f8ef5eb7c434984a32b2fd614262855652b402418d4c453b5204823de1aa2de
+SIZE (mrjimenez-pupnp-release-1.14.0_GH0.tar.gz) = 788668
diff --git a/devel/upnp/files/patch-upnp_src_genlib_net_http_httpreadwrite.c b/devel/upnp/files/patch-upnp_src_genlib_net_http_httpreadwrite.c
new file mode 100644
index 000000000000..ccc25e69bfbf
--- /dev/null
+++ b/devel/upnp/files/patch-upnp_src_genlib_net_http_httpreadwrite.c
@@ -0,0 +1,10 @@
+--- upnp/src/genlib/net/http/httpreadwrite.c.orig	2020-10-03 17:28:40 UTC
++++ upnp/src/genlib/net/http/httpreadwrite.c
+@@ -55,7 +55,6 @@
+ #include "uri.h"
+ #include "webserver.h"
+ 
+-#include <alloca.h>
+ #include <assert.h>
+ #include <stdarg.h>
+ #include <string.h>
diff --git a/devel/upnp/pkg-plist b/devel/upnp/pkg-plist
index dc99f41737dd..815e7489fde4 100644
--- a/devel/upnp/pkg-plist
+++ b/devel/upnp/pkg-plist
@@ -1,22 +1,19 @@
-include/upnp/ActionComplete.h
-include/upnp/ActionRequest.h
 include/upnp/Callback.h
-include/upnp/Discovery.h
-include/upnp/Event.h
-include/upnp/EventSubscribe.h
-include/upnp/ExtraHeaders.h
-include/upnp/FileInfo.h
-include/upnp/StateVarComplete.h
-include/upnp/StateVarRequest.h
-include/upnp/SubscriptionRequest.h
-include/upnp/TemplateInclude.h
-include/upnp/TemplateSource.h
-include/upnp/TemplateUndef.h
+include/upnp/UpnpActionComplete.h
+include/upnp/UpnpActionRequest.h
+include/upnp/UpnpDiscovery.h
+include/upnp/UpnpEvent.h
+include/upnp/UpnpEventSubscribe.h
+include/upnp/UpnpExtraHeaders.h
+include/upnp/UpnpFileInfo.h
 include/upnp/UpnpGlobal.h
 include/upnp/UpnpInet.h
 include/upnp/UpnpIntTypes.h
+include/upnp/UpnpStateVarComplete.h
+include/upnp/UpnpStateVarRequest.h
 include/upnp/UpnpStdInt.h
 include/upnp/UpnpString.h
+include/upnp/UpnpSubscriptionRequest.h
 include/upnp/UpnpUniStd.h
 include/upnp/ithread.h
 include/upnp/ixml.h
@@ -32,7 +29,7 @@ lib/libixml.so.11
 lib/libixml.so.11.0.0
 lib/libupnp.a
 lib/libupnp.so
-lib/libupnp.so.16
-lib/libupnp.so.16.0.1
+lib/libupnp.so.17
+lib/libupnp.so.17.0.0
 libdata/pkgconfig/libupnp.pc
 %%PORTDOCS%%%%DOCSDIR%%/UPnP_Programming_Guide.pdf
diff --git a/multimedia/vlc/Makefile b/multimedia/vlc/Makefile
index f657e6629af1..9e0fb5303bf1 100644
--- a/multimedia/vlc/Makefile
+++ b/multimedia/vlc/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	vlc
 DISTVERSION=	3.0.11
-PORTREVISION=	4
+PORTREVISION=	5
 PORTEPOCH=	4
 CATEGORIES=	multimedia audio net www
 MASTER_SITES=	http://download.videolan.org/pub/videolan/${PORTNAME}/${DISTVERSION:S/a$//}/ \
diff --git a/net-p2p/amule-devel/Makefile b/net-p2p/amule-devel/Makefile
index 980d48b13301..3fc9336289e7 100644
--- a/net-p2p/amule-devel/Makefile
+++ b/net-p2p/amule-devel/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	amule
 PORTVERSION=	11055
+PORTREVISION=	1
 CATEGORIES=	net-p2p
 MASTER_SITES=	http://amule.sourceforge.net/tarballs/
 PKGNAMESUFFIX=	-devel
diff --git a/net-p2p/amule/Makefile b/net-p2p/amule/Makefile
index eba63c7d26ad..19511ceb63d2 100644
--- a/net-p2p/amule/Makefile
+++ b/net-p2p/amule/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	amule
 PORTVERSION=	2.3.2
-PORTREVISION=	10
+PORTREVISION=	11
 CATEGORIES=	net-p2p
 MASTER_SITES=	SF/${PORTNAME}/aMule/${PORTVERSION}
 DISTNAME=	aMule-${PORTVERSION}