[gentoo-commits] repo/gentoo:master commit in: net-libs/libupnp/files/

2022-02-11 Thread Conrad Kostecki 
commit: 11a779dd9fc9b2c7b0a06bb29a4f29a7c72d897d
Author: Michael Mair-Keimberger  levelnine  at>
AuthorDate: Fri Feb 11 15:51:39 2022 +
Commit: Conrad Kostecki  gentoo  org>
CommitDate: Fri Feb 11 17:28:40 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=11a779dd

net-libs/libupnp: remove unused patch

Closes: https://github.com/gentoo/gentoo/pull/24161
Package-Manager: Portage-3.0.30, Repoman-3.0.3
Signed-off-by: Michael Mair-Keimberger  levelnine.at>
Signed-off-by: Conrad Kostecki  gentoo.org>

 .../libupnp/files/libupnp-1.14.7-glibc-2.34.patch  | 32 --
 1 file changed, 32 deletions(-)

diff --git a/net-libs/libupnp/files/libupnp-1.14.7-glibc-2.34.patch 
b/net-libs/libupnp/files/libupnp-1.14.7-glibc-2.34.patch
deleted file mode 100644
index dbcfd5e2cc20..
--- a/net-libs/libupnp/files/libupnp-1.14.7-glibc-2.34.patch
+++ /dev/null
@@ -1,32 +0,0 @@
 a/upnp/inc/ithread.h
-+++ b/upnp/inc/ithread.h
-@@ -304,12 +304,8 @@
-  *  Returns EINVAL if the kind is not supported.
-  *  See man page for pthread_mutexattr_setkind_np
-  
*/
--#if defined(PTHREAD_MUTEX_RECURSIVE) || defined(__DragonFly__)
--  #define ithread_mutexattr_setkind_np pthread_mutexattr_settype
--#else
--  #define ithread_mutexattr_setkind_np pthread_mutexattr_setkind_np
--#endif /* UPNP_USE_RWLOCK */
--
-+#define ithread_mutexattr_setkind_np pthread_mutexattr_settype
-+#define ithread_mutexattr_settype pthread_mutexattr_settype
- /
-  * Function: ithread_mutexattr_getkind_np
-  *
-@@ -329,12 +325,8 @@
-  *  Always returns 0.
-  *  See man page for pthread_mutexattr_getkind_np
-  
*/
--#if defined(PTHREAD_MUTEX_RECURSIVE) || defined(__DragonFly__)
--  #define ithread_mutexattr_getkind_np pthread_mutexattr_gettype
--#else
--  #define ithread_mutexattr_getkind_np pthread_mutexattr_getkind_np
--#endif /* UPNP_USE_RWLOCK */
--
-+#define ithread_mutexattr_getkind_np pthread_mutexattr_gettype
-+#define ithread_mutexattr_gettype pthread_mutexattr_gettype
- /
-  * Function: ithread_mutex_init
-  *

[gentoo-commits] repo/gentoo:master commit in: net-libs/libupnp/files/, net-libs/libupnp/

2021-10-03 Thread Conrad Kostecki 
commit: e0f6588a69a4660646663a71dc0436cb3f8db2e0
Author: Conrad Kostecki  gentoo  org>
AuthorDate: Sun Oct  3 13:15:57 2021 +
Commit: Conrad Kostecki  gentoo  org>
CommitDate: Sun Oct  3 13:15:57 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e0f6588a

net-libs/libupnp: fix compilation with glibc-2.34

Closes: https://bugs.gentoo.org/806610
Package-Manager: Portage-3.0.22, Repoman-3.0.3
Signed-off-by: Conrad Kostecki  gentoo.org>

 .../libupnp/files/libupnp-1.14.7-glibc-2.34.patch  | 32 ++
 net-libs/libupnp/libupnp-1.14.7.ebuild |  5 ++--
 2 files changed, 34 insertions(+), 3 deletions(-)

diff --git a/net-libs/libupnp/files/libupnp-1.14.7-glibc-2.34.patch 
b/net-libs/libupnp/files/libupnp-1.14.7-glibc-2.34.patch
new file mode 100644
index 000..dbcfd5e2cc2
--- /dev/null
+++ b/net-libs/libupnp/files/libupnp-1.14.7-glibc-2.34.patch
@@ -0,0 +1,32 @@
+--- a/upnp/inc/ithread.h
 b/upnp/inc/ithread.h
+@@ -304,12 +304,8 @@
+  *  Returns EINVAL if the kind is not supported.
+  *  See man page for pthread_mutexattr_setkind_np
+  
*/
+-#if defined(PTHREAD_MUTEX_RECURSIVE) || defined(__DragonFly__)
+-  #define ithread_mutexattr_setkind_np pthread_mutexattr_settype
+-#else
+-  #define ithread_mutexattr_setkind_np pthread_mutexattr_setkind_np
+-#endif /* UPNP_USE_RWLOCK */
+-
++#define ithread_mutexattr_setkind_np pthread_mutexattr_settype
++#define ithread_mutexattr_settype pthread_mutexattr_settype
+ /
+  * Function: ithread_mutexattr_getkind_np
+  *
+@@ -329,12 +325,8 @@
+  *  Always returns 0.
+  *  See man page for pthread_mutexattr_getkind_np
+  
*/
+-#if defined(PTHREAD_MUTEX_RECURSIVE) || defined(__DragonFly__)
+-  #define ithread_mutexattr_getkind_np pthread_mutexattr_gettype
+-#else
+-  #define ithread_mutexattr_getkind_np pthread_mutexattr_getkind_np
+-#endif /* UPNP_USE_RWLOCK */
+-
++#define ithread_mutexattr_getkind_np pthread_mutexattr_gettype
++#define ithread_mutexattr_gettype pthread_mutexattr_gettype
+ /
+  * Function: ithread_mutex_init
+  *

diff --git a/net-libs/libupnp/libupnp-1.14.7.ebuild 
b/net-libs/libupnp/libupnp-1.14.7.ebuild
index 42645556aca..4dcf90126cf 100644
--- a/net-libs/libupnp/libupnp-1.14.7.ebuild
+++ b/net-libs/libupnp/libupnp-1.14.7.ebuild
@@ -10,6 +10,7 @@ MY_PN="pupnp"
 DESCRIPTION="An Portable Open Source UPnP Development Kit"
 HOMEPAGE="http://pupnp.sourceforge.net/;
 SRC_URI="https://github.com/${MY_PN}/${MY_PN}/archive/release-${PV}.tar.gz -> 
${P}.tar.gz"
+S="${WORKDIR}/${MY_PN}-release-${PV}"
 
 LICENSE="BSD"
 SLOT="0/17"
@@ -19,9 +20,7 @@ IUSE="blocking-tcp debug doc ipv6 +reuseaddr samples 
static-libs"
 # bug 733750
 RESTRICT="test"
 
-DOCS="ChangeLog"
-
-S="${WORKDIR}/${MY_PN}-release-${PV}"
+PATCHES=( "${FILESDIR}/${PN}-1.14.7-glibc-2.34.patch" )
 
 src_prepare() {
default

[gentoo-commits] repo/gentoo:master commit in: net-libs/libupnp/files/

2021-03-20 Thread Conrad Kostecki 
commit: 8edee7a32f9989594582e7a6a5571c98e3c4cfbf
Author: Michael Mair-Keimberger  levelnine  at>
AuthorDate: Thu Mar 18 19:18:42 2021 +
Commit: Conrad Kostecki  gentoo  org>
CommitDate: Sat Mar 20 16:11:27 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8edee7a3

net-libs/libupnp: remove unused patch(es)

Closes: https://github.com/gentoo/gentoo/pull/19992
Package-Manager: Portage-3.0.17, Repoman-3.0.2
Signed-off-by: Michael Mair-Keimberger  levelnine.at>
Signed-off-by: Conrad Kostecki  gentoo.org>

 .../files/libupnp-1.6.19-docs-install.patch| 13 --
 net-libs/libupnp/files/libupnp-1.6.21-cflags.patch | 30 --
 2 files changed, 43 deletions(-)

diff --git a/net-libs/libupnp/files/libupnp-1.6.19-docs-install.patch 
b/net-libs/libupnp/files/libupnp-1.6.19-docs-install.patch
deleted file mode 100644
index 622f58a9003..000
--- a/net-libs/libupnp/files/libupnp-1.6.19-docs-install.patch
+++ /dev/null
@@ -1,13 +0,0 @@
 libupnp-1.6.19/upnp/sample/Makefile.am.orig2013-11-15 
19:50:02.0 +0400
-+++ libupnp-1.6.19/upnp/sample/Makefile.am 2016-06-03 20:30:43.545081667 
+0300
-@@ -65,8 +65,8 @@
- if WITH_DOCUMENTATION
- examplesdir = $(docdir)/examples
- examples_DATA = \
--  $(tv_ctrlpt_SOURCES) \
--  $(tv_device_SOURCES)
-+  $(sort $(tv_ctrlpt_SOURCES) \
-+  $(tv_device_SOURCES) )
- endif
- 
- EXTRA_DIST = \

diff --git a/net-libs/libupnp/files/libupnp-1.6.21-cflags.patch 
b/net-libs/libupnp/files/libupnp-1.6.21-cflags.patch
deleted file mode 100644
index 3eaf66e8041..000
--- a/net-libs/libupnp/files/libupnp-1.6.21-cflags.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-don't append flags like -O0/-Os which clobber the user's settings
-
 a/configure.ac
-+++ b/configure.ac
-@@ -539,25 +539,6 @@ AC_PROG_EGREP
- echo "- Default compilation flags 
---"
- echo host is $host
- echo host_os is $host_os
--case $host_os in
--freebsd*)
--  echo "Using FreeBSD specific compiler settings"
--  # Put FreeBSD specific compiler flags here
--  ;;
--*)
--  echo "Using non-specific system compiler settings"
--  if test x"$enable_debug" = xyes; then
--  # AC_PROG_CC already sets CFLAGS to "-g -O2" by default,
--  # but only if CFLAGS was not previously set.
--  #:
--  # Use -O0 in debug so that variables do not get optimized out
--  AX_CFLAGS_GCC_OPTION([-O0, -g])
--  else
--  # add optimise for size
--  AX_CFLAGS_GCC_OPTION([-Os])
--  fi
--  ;;
--esac
- 
- AX_CFLAGS_WARN_ALL
- echo 
"---"

[gentoo-commits] repo/gentoo:master commit in: net-libs/libupnp/files/

2020-06-19 Thread Conrad Kostecki 
commit: b45a880f836a37d72b6ca0d7f3eb4fcf0e8ec2ac
Author: Michael Mair-Keimberger  gmail  com>
AuthorDate: Thu Jun 18 18:22:56 2020 +
Commit: Conrad Kostecki  gentoo  org>
CommitDate: Fri Jun 19 22:48:09 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b45a880f

net-libs/libupnp: remove unused patch

Closes: https://github.com/gentoo/gentoo/pull/16314
Package-Manager: Portage-2.3.100, Repoman-2.3.22
Signed-off-by: Michael Mair-Keimberger  gmail.com>
Signed-off-by: Conrad Kostecki  gentoo.org>

 .../libupnp/files/libupnp-1.12.0-cxx-compat.patch  | 33 --
 1 file changed, 33 deletions(-)

diff --git a/net-libs/libupnp/files/libupnp-1.12.0-cxx-compat.patch 
b/net-libs/libupnp/files/libupnp-1.12.0-cxx-compat.patch
deleted file mode 100644
index cbb844952be..000
--- a/net-libs/libupnp/files/libupnp-1.12.0-cxx-compat.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-From 5a8e93f1a57cce5cead5c8c566a75f7c7c294c97 Mon Sep 17 00:00:00 2001
-From: Ian Whyman 
-Date: Mon, 27 Jan 2020 21:46:47 +
-Subject: [PATCH] List: Add extern C for C++ users
-

- upnp/inc/list.h | 8 
- 1 file changed, 8 insertions(+)
-
-diff --git a/upnp/inc/list.h b/upnp/inc/list.h
-index 214a53e5..0fbe7efc 100644
 a/upnp/inc/list.h
-+++ b/upnp/inc/list.h
-@@ -40,6 +40,10 @@
- 
- #include "UpnpGlobal.h"
- 
-+#ifdef __cplusplus
-+extern "C" {
-+#endif /* __cplusplus */
-+
- /** List anchor structure. This should be the *first* entry in list
-  *  member objects, except if you want to do member offset arithmetic
-  *  instead of simple casts (look up "containerof"). The list code itself 
-@@ -71,4 +75,8 @@ EXPORT_SPEC UpnpListIter UpnpListInsert(UpnpListHead *list, 
UpnpListIter pos,
- /** Erase element at pos, return next one, or end()*/
- EXPORT_SPEC UpnpListIter UpnpListErase(UpnpListHead *list, UpnpListIter pos);
- 
-+#ifdef __cplusplus
-+}
-+#endif /* __cplusplus */
-+
- #endif /* _UPNPLISTH_ */

[gentoo-commits] repo/gentoo:master commit in: net-libs/libupnp/files/, net-libs/libupnp/

2020-01-29 Thread Ian Whyman 
commit: dc3f7541667cf0ab1cd1b2f445042d4268f4d08d
Author: Ian Whyman  gentoo  org>
AuthorDate: Wed Jan 29 17:45:01 2020 +
Commit: Ian Whyman  gentoo  org>
CommitDate: Wed Jan 29 17:45:33 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=dc3f7541

net-libs/libupnp: 1.12.0: Fix C++ compat

Package-Manager: Portage-2.3.85, Repoman-2.3.20
Signed-off-by: Ian Whyman  gentoo.org>

 .../libupnp/files/libupnp-1.12.0-cxx-compat.patch  | 33 ++
 ...upnp-1.12.0.ebuild => libupnp-1.12.0-r1.ebuild} |  1 +
 2 files changed, 34 insertions(+)

diff --git a/net-libs/libupnp/files/libupnp-1.12.0-cxx-compat.patch 
b/net-libs/libupnp/files/libupnp-1.12.0-cxx-compat.patch
new file mode 100644
index 000..cbb844952be
--- /dev/null
+++ b/net-libs/libupnp/files/libupnp-1.12.0-cxx-compat.patch
@@ -0,0 +1,33 @@
+From 5a8e93f1a57cce5cead5c8c566a75f7c7c294c97 Mon Sep 17 00:00:00 2001
+From: Ian Whyman 
+Date: Mon, 27 Jan 2020 21:46:47 +
+Subject: [PATCH] List: Add extern C for C++ users
+
+---
+ upnp/inc/list.h | 8 
+ 1 file changed, 8 insertions(+)
+
+diff --git a/upnp/inc/list.h b/upnp/inc/list.h
+index 214a53e5..0fbe7efc 100644
+--- a/upnp/inc/list.h
 b/upnp/inc/list.h
+@@ -40,6 +40,10 @@
+ 
+ #include "UpnpGlobal.h"
+ 
++#ifdef __cplusplus
++extern "C" {
++#endif /* __cplusplus */
++
+ /** List anchor structure. This should be the *first* entry in list
+  *  member objects, except if you want to do member offset arithmetic
+  *  instead of simple casts (look up "containerof"). The list code itself 
+@@ -71,4 +75,8 @@ EXPORT_SPEC UpnpListIter UpnpListInsert(UpnpListHead *list, 
UpnpListIter pos,
+ /** Erase element at pos, return next one, or end()*/
+ EXPORT_SPEC UpnpListIter UpnpListErase(UpnpListHead *list, UpnpListIter pos);
+ 
++#ifdef __cplusplus
++}
++#endif /* __cplusplus */
++
+ #endif /* _UPNPLISTH_ */

diff --git a/net-libs/libupnp/libupnp-1.12.0.ebuild 
b/net-libs/libupnp/libupnp-1.12.0-r1.ebuild
similarity index 96%
rename from net-libs/libupnp/libupnp-1.12.0.ebuild
rename to net-libs/libupnp/libupnp-1.12.0-r1.ebuild
index 14fc805526f..70a82fc72df 100644
--- a/net-libs/libupnp/libupnp-1.12.0.ebuild
+++ b/net-libs/libupnp/libupnp-1.12.0-r1.ebuild
@@ -18,6 +18,7 @@ DOCS="ChangeLog"
 
 PATCHES=(
"${FILESDIR}"/${PN}-1.6.21-cflags.patch
+   "${FILESDIR}"/${P}-cxx-compat.patch
 )
 
 src_prepare() {

[gentoo-commits] repo/gentoo:master commit in: net-libs/libupnp/files/

2017-12-06 Thread Michael Palimaka 
commit: 2c04860bf9d510e6006b3bc76087503374f45743
Author: Michael Mair-Keimberger  gmail  com>
AuthorDate: Tue Dec  5 17:32:28 2017 +
Commit: Michael Palimaka  gentoo  org>
CommitDate: Wed Dec  6 11:59:48 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2c04860b

net-libs/libupnp: remove unused patch

Closes: https://github.com/gentoo/gentoo/pull/6454

 net-libs/libupnp/files/libupnp-1.8.0-docs-install.patch | 13 -
 1 file changed, 13 deletions(-)

diff --git a/net-libs/libupnp/files/libupnp-1.8.0-docs-install.patch 
b/net-libs/libupnp/files/libupnp-1.8.0-docs-install.patch
deleted file mode 100644
index f0fbd04fc35..000
--- a/net-libs/libupnp/files/libupnp-1.8.0-docs-install.patch
+++ /dev/null
@@ -1,13 +0,0 @@
 libupnp-1.6.19/upnp/sample/Makefile.am.orig2013-11-15 
19:50:02.0 +0400
-+++ libupnp-1.6.19/upnp/sample/Makefile.am 2016-06-03 20:30:43.545081667 
+0300
-@@ -65,8 +65,8 @@
- if WITH_DOCUMENTATION
- examplesdir = $(docdir)/examples
- examples_DATA = \
--  $(tv_ctrlpt_1_8_SOURCES) \
--  $(tv_device_1_8_SOURCES)
-+  $(sort $(tv_ctrlpt_1_8_SOURCES) \
-+  $(tv_device_1_8_SOURCES) )
- endif
- 
- EXTRA_DIST = \

[gentoo-commits] repo/gentoo:master commit in: net-libs/libupnp/files/, net-libs/libupnp/

2017-02-13 Thread Mike Frysinger 
commit: c8a6c9470bc973290b00373a552cd61b4503db9e
Author: Mike Frysinger  gentoo  org>
AuthorDate: Mon Feb 13 20:27:04 2017 +
Commit: Mike Frysinger  gentoo  org>
CommitDate: Mon Feb 13 20:27:32 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c8a6c947

net-libs/libupnp: do not override user CFLAGS

 net-libs/libupnp/files/libupnp-1.6.21-cflags.patch | 30 ++
 net-libs/libupnp/libupnp-1.6.21.ebuild |  1 +
 net-libs/libupnp/libupnp-1.8.0.ebuild  |  1 +
 3 files changed, 32 insertions(+)

diff --git a/net-libs/libupnp/files/libupnp-1.6.21-cflags.patch 
b/net-libs/libupnp/files/libupnp-1.6.21-cflags.patch
new file mode 100644
index 00..3eaf66e804
--- /dev/null
+++ b/net-libs/libupnp/files/libupnp-1.6.21-cflags.patch
@@ -0,0 +1,30 @@
+don't append flags like -O0/-Os which clobber the user's settings
+
+--- a/configure.ac
 b/configure.ac
+@@ -539,25 +539,6 @@ AC_PROG_EGREP
+ echo "- Default compilation flags 
---"
+ echo host is $host
+ echo host_os is $host_os
+-case $host_os in
+-freebsd*)
+-  echo "Using FreeBSD specific compiler settings"
+-  # Put FreeBSD specific compiler flags here
+-  ;;
+-*)
+-  echo "Using non-specific system compiler settings"
+-  if test x"$enable_debug" = xyes; then
+-  # AC_PROG_CC already sets CFLAGS to "-g -O2" by default,
+-  # but only if CFLAGS was not previously set.
+-  #:
+-  # Use -O0 in debug so that variables do not get optimized out
+-  AX_CFLAGS_GCC_OPTION([-O0, -g])
+-  else
+-  # add optimise for size
+-  AX_CFLAGS_GCC_OPTION([-Os])
+-  fi
+-  ;;
+-esac
+ 
+ AX_CFLAGS_WARN_ALL
+ echo 
"---"

diff --git a/net-libs/libupnp/libupnp-1.6.21.ebuild 
b/net-libs/libupnp/libupnp-1.6.21.ebuild
index 4e7f7656a0..4342f131eb 100644
--- a/net-libs/libupnp/libupnp-1.6.21.ebuild
+++ b/net-libs/libupnp/libupnp-1.6.21.ebuild
@@ -19,6 +19,7 @@ DOCS="NEWS README ChangeLog"
 
 PATCHES=(
"${FILESDIR}"/${PN}-1.6.19-docs-install.patch
+   "${FILESDIR}"/${PN}-1.6.21-cflags.patch
 )
 
 src_prepare() {

diff --git a/net-libs/libupnp/libupnp-1.8.0.ebuild 
b/net-libs/libupnp/libupnp-1.8.0.ebuild
index abee901f84..32baec6ad6 100644
--- a/net-libs/libupnp/libupnp-1.8.0.ebuild
+++ b/net-libs/libupnp/libupnp-1.8.0.ebuild
@@ -19,6 +19,7 @@ DOCS="NEWS README.md ChangeLog"
 
 PATCHES=(
"${FILESDIR}"/${PN}-1.8.0-docs-install.patch
+   "${FILESDIR}"/${PN}-1.6.21-cflags.patch
 )
 
 src_prepare() {

[gentoo-commits] repo/gentoo:master commit in: net-libs/libupnp/files/

2017-02-13 Thread Mike Frysinger 
commit: 180385176a0d090749aa60a607082f0620716fb5
Author: Mike Frysinger  gentoo  org>
AuthorDate: Mon Feb 13 20:26:46 2017 +
Commit: Mike Frysinger  gentoo  org>
CommitDate: Mon Feb 13 20:27:32 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=18038517

net-libs/libupnp: drop unused patches

 net-libs/libupnp/files/CVE-2016-6255.patch   |  65 ---
 net-libs/libupnp/files/libupnp-1.6.18-suse.patch | 132 ---
 net-libs/libupnp/files/libupnp-1.6.19-suse.patch | 132 ---
 3 files changed, 329 deletions(-)

diff --git a/net-libs/libupnp/files/CVE-2016-6255.patch 
b/net-libs/libupnp/files/CVE-2016-6255.patch
deleted file mode 100644
index 1448ab3081..00
--- a/net-libs/libupnp/files/CVE-2016-6255.patch
+++ /dev/null
@@ -1,65 +0,0 @@
-From be0a01bdb83395d9f3a5ea09c1308a4f1a972cbd Mon Sep 17 00:00:00 2001
-From: Matthew Garrett 
-Date: Tue, 23 Feb 2016 13:53:20 -0800
-Subject: [PATCH] Don't allow unhandled POSTs to write to the filesystem by
- default
-
-If there's no registered handler for a POST request, the default behaviour
-is to write it to the filesystem. Several million deployed devices appear
-to have this behaviour, making it possible to (at least) store arbitrary
-data on them. Add a configure option that enables this behaviour, and change
-the default to just drop POSTs that aren't directly handled.

- configure.ac | 4 
- upnp/inc/upnpconfig.h.in | 5 +
- upnp/src/genlib/net/http/webserver.c | 4 
- 3 files changed, 13 insertions(+)
-
-diff --git a/configure.ac b/configure.ac
-index dd88734..ea2bc09 100644
 a/configure.ac
-+++ b/configure.ac
-@@ -482,6 +482,10 @@ if test "x$enable_scriptsupport" = xyes ; then
- AC_DEFINE(IXML_HAVE_SCRIPTSUPPORT, 1, [see upnpconfig.h])
- fi
- 
-+RT_BOOL_ARG_ENABLE([postwrite], [no], [write to the filesystem on otherwise 
unhandled POST requests])
-+if test "x$enable_postwrite" = xyes ; then
-+AC_DEFINE(UPNP_ENABLE_POST_WRITE, 1, [see upnpconfig.h])
-+fi
- 
- RT_BOOL_ARG_ENABLE([samples], [yes], [compilation of upnp/sample/ code])
- 
-diff --git a/upnp/inc/upnpconfig.h.in b/upnp/inc/upnpconfig.h.in
-index 46ddc6e..5df8c5a 100644
 a/upnp/inc/upnpconfig.h.in
-+++ b/upnp/inc/upnpconfig.h.in
-@@ -135,5 +135,10 @@
-  *  (i.e. configure --enable-open_ssl) */
- #undef UPNP_ENABLE_OPEN_SSL
- 
-+/** Defined to 1 if the library has been compiled to support filesystem 
writes on POST
-+ *  (i.e. configure --enable-postwrite) */
-+#undef UPNP_ENABLE_POST_WRITE
-+
-+
- #endif /* UPNP_CONFIG_H */
- 
-diff --git a/upnp/src/genlib/net/http/webserver.c 
b/upnp/src/genlib/net/http/webserver.c
-index 8991c16..8b2ecf2 100644
 a/upnp/src/genlib/net/http/webserver.c
-+++ b/upnp/src/genlib/net/http/webserver.c
-@@ -1369,9 +1369,13 @@ static int http_RecvPostMessage(
-   if (Fp == NULL)
-   return HTTP_INTERNAL_SERVER_ERROR;
-   } else {
-+#ifdef UPNP_ENABLE_POST_WRITE
-   Fp = fopen(filename, "wb");
-   if (Fp == NULL)
-   return HTTP_UNAUTHORIZED;
-+#else
-+  return HTTP_NOT_FOUND;
-+#endif
-   }
-   parser->position = POS_ENTITY;
-   do {

diff --git a/net-libs/libupnp/files/libupnp-1.6.18-suse.patch 
b/net-libs/libupnp/files/libupnp-1.6.18-suse.patch
deleted file mode 100644
index 2e91990c02..00
--- a/net-libs/libupnp/files/libupnp-1.6.18-suse.patch
+++ /dev/null
@@ -1,132 +0,0 @@
 configure.ac   2013-01-29 16:39:56.0 +0100
-+++ configure.ac   2013-02-17 10:40:53.680021913 +0100
-@@ -7,9 +7,9 @@
- # (C) Copyright 2005-2007 Rémi Turboult 
- #
- 
--AC_PREREQ(2.60)
-+AC_PREREQ([2.60])
- 
--AC_INIT([libupnp], [1.6.18], [mrobe...@users.sourceforge.net])
-+AC_INIT([libupnp],[1.6.18],[mrobe...@users.sourceforge.net])
- dnl 

- dnl # *Independently* of the above libupnp package version, the libtool 
version
- dnl # of the 3 libraries need to be updated whenever there is a change 
released:
-@@ -366,7 +366,6 @@
- #installed libraries.
- #
- AC_CONFIG_HEADERS([autoconfig.h upnp/inc/upnpconfig.h])
--#AC_SYS_LARGEFILE_SENSITIVE
- 
- AC_REVISION([$Revision: 1.1 $])
- 
-@@ -506,9 +505,12 @@
- #
- # Checks for programs
- #
--AC_PROG_CC
-+AC_PROG_CC_STDC
-+AC_USE_SYSTEM_EXTENSIONS
-+AC_SYS_LARGEFILE
- AM_PROG_CC_C_O
--AC_PROG_LIBTOOL
-+m4_ifdef([AM_PROG_AR], [AM_PROG_AR])
-+LT_INIT
- AC_PROG_INSTALL
- AC_PROG_MAKE_SET
- AC_PROG_EGREP
-@@ -532,9 +534,7 @@
-   #:
-   # Use -O0 in debug so that variables do not get optimized out
-   AX_CFLAGS_GCC_OPTION([-O0, -g])
--  else
--  # add optimise for size
--  AX_CFLAGS_GCC_OPTION([-Os])
-+
-   fi
-   ;;
- esac
-@@ -548,8 +548,7 @@
- #
- AC_TYPE_SIZE_T
-

[gentoo-commits] repo/gentoo:master commit in: net-libs/libupnp/files/, net-libs/libupnp/

2017-01-04 Thread Ian Whyman 
commit: 8e22f7fc1f282cd32e56f0484f90a449ec76b317
Author: Ian Whyman  gentoo  org>
AuthorDate: Wed Jan  4 23:10:17 2017 +
Commit: Ian Whyman  gentoo  org>
CommitDate: Wed Jan  4 23:10:45 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8e22f7fc

net-libs/libupnp: Bump to 1.8.0, introduce 1.8 slot

Package-Manager: Portage-2.3.3, Repoman-2.3.1

 net-libs/libupnp/Manifest  |  1 +
 .../libupnp/files/libupnp-1.8.0-docs-install.patch | 13 ++
 net-libs/libupnp/libupnp-1.8.0.ebuild  | 47 ++
 3 files changed, 61 insertions(+)

diff --git a/net-libs/libupnp/Manifest b/net-libs/libupnp/Manifest
index 63ea80a..f90322e 100644
--- a/net-libs/libupnp/Manifest
+++ b/net-libs/libupnp/Manifest
@@ -2,3 +2,4 @@ DIST libupnp-1.6.18.tar.bz2 1201056 SHA256 
b21bc676365622d3ace1b25292dab8d4d23f6
 DIST libupnp-1.6.19.tar.bz2 1213439 SHA256 
b3142b39601243b50532eec90f4a27dba85eb86f58d4b849ac94edeb29d9b22a SHA512 
97af62a7483cc19cfe80157cbc3383c1b4b7c9c39b848f4ed063784b74df0b9b0527f7b467e01451e0a44dbf9e8a9eab510619146a6ee1e3dce46f3e4af6e661
 WHIRLPOOL 
fe3ed0115c76872b45eb3f16909e23c61b004f028b745be17346b94dffd7c90108420cf71f50f73aa4ef241403b65b9d1c72926af3044ffacdae11f9649dad68
 DIST libupnp-1.6.20.tar.bz2 1243637 SHA256 
ee3537081e3ea56f66ada10387486823989210bc98002f098305551c966e3a63 SHA512 
754a3f587963078fc60e8a58f6b04536dac03d053c8cd14d4fd7e505a3417484fa03b72dd09ef92150f00263f270aa19646b7aab1b8707111aff53c43f8a120a
 WHIRLPOOL 
df2702b30a9e895371ba0647bfdd017fd17b4478feb691efaf754618fa032cb8ba72317030960676584da44dfc144f8b9bd07218799b40c2afa7fdee28e8b164
 DIST libupnp-1.6.21.tar.bz2 1245353 SHA256 
af3f3c0846a1d75baeadae4aa5a2bda427567e2a1fb4559bf73ccff0a4f9a39b SHA512 
65a2989497b941dfa1f7ac09fe44267de4a5231af25a304f0f6e754c7cbb578bdcb3c500188b5ebfbff9f579099db7501817d45e1724ef8e384d6d918bcdcdeb
 WHIRLPOOL 
b4869189054ac00d57394e0919ad2f672af64f2c2b0ecc676c2b3fc4a3c22caa25ac38b57bbb5cf1ef12a5857b4cdfd450c6bd5955a5eacaf8bdf95a058c9dab
+DIST libupnp-1.8.0.tar.gz 1380524 SHA256 
1ddfb4e12e947deb5637e0d5e09bbe7835dfc8fb8a57712346026afa029165b1 SHA512 
e2ae54352d747191f3ffc15c50481da515665fb35ddf6a9e488b6e1962e47803937bf078d0c2c5d56f8339cfd226ffba7433975363dc312e484ed22f83eda061
 WHIRLPOOL 
c3d4abf54d25e87a1d650a18c475097a47633e8bf7691248695a7682ecff8aca4419c8eb2db4d24d62ca5a7905321971adf924166c20876ee18dd32d846748a1

diff --git a/net-libs/libupnp/files/libupnp-1.8.0-docs-install.patch 
b/net-libs/libupnp/files/libupnp-1.8.0-docs-install.patch
new file mode 100644
index ..f0fbd04
--- /dev/null
+++ b/net-libs/libupnp/files/libupnp-1.8.0-docs-install.patch
@@ -0,0 +1,13 @@
+--- libupnp-1.6.19/upnp/sample/Makefile.am.orig2013-11-15 
19:50:02.0 +0400
 libupnp-1.6.19/upnp/sample/Makefile.am 2016-06-03 20:30:43.545081667 
+0300
+@@ -65,8 +65,8 @@
+ if WITH_DOCUMENTATION
+ examplesdir = $(docdir)/examples
+ examples_DATA = \
+-  $(tv_ctrlpt_1_8_SOURCES) \
+-  $(tv_device_1_8_SOURCES)
++  $(sort $(tv_ctrlpt_1_8_SOURCES) \
++  $(tv_device_1_8_SOURCES) )
+ endif
+ 
+ EXTRA_DIST = \

diff --git a/net-libs/libupnp/libupnp-1.8.0.ebuild 
b/net-libs/libupnp/libupnp-1.8.0.ebuild
new file mode 100644
index ..abee901
--- /dev/null
+++ b/net-libs/libupnp/libupnp-1.8.0.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+inherit eutils flag-o-matic autotools vcs-snapshot
+
+DESCRIPTION="An Portable Open Source UPnP Development Kit"
+HOMEPAGE="http://pupnp.sourceforge.net/;
+SRC_URI="https://github.com/mrjimenez/pupnp/archive/release-${PV}.tar.gz -> 
${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="1.8"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd 
~x86-fbsd ~amd64-linux"
+IUSE="debug doc ipv6 static-libs"
+
+DOCS="NEWS README.md ChangeLog"
+
+PATCHES=(
+   "${FILESDIR}"/${PN}-1.8.0-docs-install.patch
+)
+
+src_prepare() {
+   default
+
+   # fix tests
+   chmod +x ixml/test/test_document.sh || die
+
+   eautoreconf
+}
+
+src_configure() {
+   use x86-fbsd && append-flags -O1
+   # w/o docdir to avoid sandbox violations
+   econf \
+   $(use_enable debug) \
+   $(use_enable ipv6) \
+   $(use_enable static-libs static) \
+   $(use_with doc documentation "${EPREFIX}/usr/share/doc/${PF}")
+}
+
+src_install () {
+   default
+   dobin upnp/sample/.libs/tv_{combo,ctrlpt,device}-1.8
+   use static-libs || prune_libtool_files
+}

[gentoo-commits] repo/gentoo:master commit in: net-libs/libupnp/files/, net-libs/libupnp/

2016-09-15 Thread Ian Whyman 
commit: 84d8f21cc2ca94d4f4a3146302726bd1c8fd3f47
Author: Ian Whyman  gentoo  org>
AuthorDate: Thu Sep 15 19:50:47 2016 +
Commit: Ian Whyman  gentoo  org>
CommitDate: Thu Sep 15 19:51:16 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=84d8f21c

net-libs/libupnp: Bump to 1.6.20, fix #546616

 net-libs/libupnp/Manifest  |  1 +
 net-libs/libupnp/files/CVE-2016-6255.patch | 65 ++
 net-libs/libupnp/libupnp-1.6.20.ebuild | 48 ++
 3 files changed, 114 insertions(+)

diff --git a/net-libs/libupnp/Manifest b/net-libs/libupnp/Manifest
index a63cd0c..e5a9f40 100644
--- a/net-libs/libupnp/Manifest
+++ b/net-libs/libupnp/Manifest
@@ -1,2 +1,3 @@
 DIST libupnp-1.6.18.tar.bz2 1201056 SHA256 
b21bc676365622d3ace1b25292dab8d4d23f6e6a80ddc8f029b765d39797e934 SHA512 
2ce9b637a7edf544ae272aea137f735b03761a7925da0578e0073cf6429389f7f2af6cb05f666a02faa839caba3e1798ad31657afd287626b88905a5c45f3cb4
 WHIRLPOOL 
b575b517fb668c5e3af78dc1bc95c1a202404beb42966400b3b1313a1fe0e6cb8437ce392af6ad6de4ccc90715c8df7cc34bf3d0b3b828af4e14f1cc8a5e0eda
 DIST libupnp-1.6.19.tar.bz2 1213439 SHA256 
b3142b39601243b50532eec90f4a27dba85eb86f58d4b849ac94edeb29d9b22a SHA512 
97af62a7483cc19cfe80157cbc3383c1b4b7c9c39b848f4ed063784b74df0b9b0527f7b467e01451e0a44dbf9e8a9eab510619146a6ee1e3dce46f3e4af6e661
 WHIRLPOOL 
fe3ed0115c76872b45eb3f16909e23c61b004f028b745be17346b94dffd7c90108420cf71f50f73aa4ef241403b65b9d1c72926af3044ffacdae11f9649dad68
+DIST libupnp-1.6.20.tar.bz2 1243637 SHA256 
ee3537081e3ea56f66ada10387486823989210bc98002f098305551c966e3a63 SHA512 
754a3f587963078fc60e8a58f6b04536dac03d053c8cd14d4fd7e505a3417484fa03b72dd09ef92150f00263f270aa19646b7aab1b8707111aff53c43f8a120a
 WHIRLPOOL 
df2702b30a9e895371ba0647bfdd017fd17b4478feb691efaf754618fa032cb8ba72317030960676584da44dfc144f8b9bd07218799b40c2afa7fdee28e8b164

diff --git a/net-libs/libupnp/files/CVE-2016-6255.patch 
b/net-libs/libupnp/files/CVE-2016-6255.patch
new file mode 100644
index ..1448ab3
--- /dev/null
+++ b/net-libs/libupnp/files/CVE-2016-6255.patch
@@ -0,0 +1,65 @@
+From be0a01bdb83395d9f3a5ea09c1308a4f1a972cbd Mon Sep 17 00:00:00 2001
+From: Matthew Garrett 
+Date: Tue, 23 Feb 2016 13:53:20 -0800
+Subject: [PATCH] Don't allow unhandled POSTs to write to the filesystem by
+ default
+
+If there's no registered handler for a POST request, the default behaviour
+is to write it to the filesystem. Several million deployed devices appear
+to have this behaviour, making it possible to (at least) store arbitrary
+data on them. Add a configure option that enables this behaviour, and change
+the default to just drop POSTs that aren't directly handled.
+---
+ configure.ac | 4 
+ upnp/inc/upnpconfig.h.in | 5 +
+ upnp/src/genlib/net/http/webserver.c | 4 
+ 3 files changed, 13 insertions(+)
+
+diff --git a/configure.ac b/configure.ac
+index dd88734..ea2bc09 100644
+--- a/configure.ac
 b/configure.ac
+@@ -482,6 +482,10 @@ if test "x$enable_scriptsupport" = xyes ; then
+ AC_DEFINE(IXML_HAVE_SCRIPTSUPPORT, 1, [see upnpconfig.h])
+ fi
+ 
++RT_BOOL_ARG_ENABLE([postwrite], [no], [write to the filesystem on otherwise 
unhandled POST requests])
++if test "x$enable_postwrite" = xyes ; then
++AC_DEFINE(UPNP_ENABLE_POST_WRITE, 1, [see upnpconfig.h])
++fi
+ 
+ RT_BOOL_ARG_ENABLE([samples], [yes], [compilation of upnp/sample/ code])
+ 
+diff --git a/upnp/inc/upnpconfig.h.in b/upnp/inc/upnpconfig.h.in
+index 46ddc6e..5df8c5a 100644
+--- a/upnp/inc/upnpconfig.h.in
 b/upnp/inc/upnpconfig.h.in
+@@ -135,5 +135,10 @@
+  *  (i.e. configure --enable-open_ssl) */
+ #undef UPNP_ENABLE_OPEN_SSL
+ 
++/** Defined to 1 if the library has been compiled to support filesystem 
writes on POST
++ *  (i.e. configure --enable-postwrite) */
++#undef UPNP_ENABLE_POST_WRITE
++
++
+ #endif /* UPNP_CONFIG_H */
+ 
+diff --git a/upnp/src/genlib/net/http/webserver.c 
b/upnp/src/genlib/net/http/webserver.c
+index 8991c16..8b2ecf2 100644
+--- a/upnp/src/genlib/net/http/webserver.c
 b/upnp/src/genlib/net/http/webserver.c
+@@ -1369,9 +1369,13 @@ static int http_RecvPostMessage(
+   if (Fp == NULL)
+   return HTTP_INTERNAL_SERVER_ERROR;
+   } else {
++#ifdef UPNP_ENABLE_POST_WRITE
+   Fp = fopen(filename, "wb");
+   if (Fp == NULL)
+   return HTTP_UNAUTHORIZED;
++#else
++  return HTTP_NOT_FOUND;
++#endif
+   }
+   parser->position = POS_ENTITY;
+   do {

diff --git a/net-libs/libupnp/libupnp-1.6.20.ebuild 
b/net-libs/libupnp/libupnp-1.6.20.ebuild
new file mode 100644
index ..83c50e8
--- /dev/null
+++ b/net-libs/libupnp/libupnp-1.6.20.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+inherit eutils flag-o-matic