| 1 |
commit: 180385176a0d090749aa60a607082f0620716fb5 |
| 2 |
Author: Mike Frysinger <vapier <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Mon Feb 13 20:26:46 2017 +0000 |
| 4 |
Commit: Mike Frysinger <vapier <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Mon Feb 13 20:27:32 2017 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=18038517 |
| 7 |
|
| 8 |
net-libs/libupnp: drop unused patches |
| 9 |
|
| 10 |
net-libs/libupnp/files/CVE-2016-6255.patch | 65 ----------- |
| 11 |
net-libs/libupnp/files/libupnp-1.6.18-suse.patch | 132 ----------------------- |
| 12 |
net-libs/libupnp/files/libupnp-1.6.19-suse.patch | 132 ----------------------- |
| 13 |
3 files changed, 329 deletions(-) |
| 14 |
|
| 15 |
diff --git a/net-libs/libupnp/files/CVE-2016-6255.patch b/net-libs/libupnp/files/CVE-2016-6255.patch |
| 16 |
deleted file mode 100644 |
| 17 |
index 1448ab3081..0000000000 |
| 18 |
--- a/net-libs/libupnp/files/CVE-2016-6255.patch |
| 19 |
+++ /dev/null |
| 20 |
@@ -1,65 +0,0 @@ |
| 21 |
-From be0a01bdb83395d9f3a5ea09c1308a4f1a972cbd Mon Sep 17 00:00:00 2001 |
| 22 |
-From: Matthew Garrett <mjg59@×××××××××.org> |
| 23 |
-Date: Tue, 23 Feb 2016 13:53:20 -0800 |
| 24 |
-Subject: [PATCH] Don't allow unhandled POSTs to write to the filesystem by |
| 25 |
- default |
| 26 |
- |
| 27 |
-If there's no registered handler for a POST request, the default behaviour |
| 28 |
-is to write it to the filesystem. Several million deployed devices appear |
| 29 |
-to have this behaviour, making it possible to (at least) store arbitrary |
| 30 |
-data on them. Add a configure option that enables this behaviour, and change |
| 31 |
-the default to just drop POSTs that aren't directly handled. |
| 32 |
---- |
| 33 |
- configure.ac | 4 ++++ |
| 34 |
- upnp/inc/upnpconfig.h.in | 5 +++++ |
| 35 |
- upnp/src/genlib/net/http/webserver.c | 4 ++++ |
| 36 |
- 3 files changed, 13 insertions(+) |
| 37 |
- |
| 38 |
-diff --git a/configure.ac b/configure.ac |
| 39 |
-index dd88734..ea2bc09 100644 |
| 40 |
---- a/configure.ac |
| 41 |
-+++ b/configure.ac |
| 42 |
-@@ -482,6 +482,10 @@ if test "x$enable_scriptsupport" = xyes ; then |
| 43 |
- AC_DEFINE(IXML_HAVE_SCRIPTSUPPORT, 1, [see upnpconfig.h]) |
| 44 |
- fi |
| 45 |
- |
| 46 |
-+RT_BOOL_ARG_ENABLE([postwrite], [no], [write to the filesystem on otherwise unhandled POST requests]) |
| 47 |
-+if test "x$enable_postwrite" = xyes ; then |
| 48 |
-+ AC_DEFINE(UPNP_ENABLE_POST_WRITE, 1, [see upnpconfig.h]) |
| 49 |
-+fi |
| 50 |
- |
| 51 |
- RT_BOOL_ARG_ENABLE([samples], [yes], [compilation of upnp/sample/ code]) |
| 52 |
- |
| 53 |
-diff --git a/upnp/inc/upnpconfig.h.in b/upnp/inc/upnpconfig.h.in |
| 54 |
-index 46ddc6e..5df8c5a 100644 |
| 55 |
---- a/upnp/inc/upnpconfig.h.in |
| 56 |
-+++ b/upnp/inc/upnpconfig.h.in |
| 57 |
-@@ -135,5 +135,10 @@ |
| 58 |
- * (i.e. configure --enable-open_ssl) */ |
| 59 |
- #undef UPNP_ENABLE_OPEN_SSL |
| 60 |
- |
| 61 |
-+/** Defined to 1 if the library has been compiled to support filesystem writes on POST |
| 62 |
-+ * (i.e. configure --enable-postwrite) */ |
| 63 |
-+#undef UPNP_ENABLE_POST_WRITE |
| 64 |
-+ |
| 65 |
-+ |
| 66 |
- #endif /* UPNP_CONFIG_H */ |
| 67 |
- |
| 68 |
-diff --git a/upnp/src/genlib/net/http/webserver.c b/upnp/src/genlib/net/http/webserver.c |
| 69 |
-index 8991c16..8b2ecf2 100644 |
| 70 |
---- a/upnp/src/genlib/net/http/webserver.c |
| 71 |
-+++ b/upnp/src/genlib/net/http/webserver.c |
| 72 |
-@@ -1369,9 +1369,13 @@ static int http_RecvPostMessage( |
| 73 |
- if (Fp == NULL) |
| 74 |
- return HTTP_INTERNAL_SERVER_ERROR; |
| 75 |
- } else { |
| 76 |
-+#ifdef UPNP_ENABLE_POST_WRITE |
| 77 |
- Fp = fopen(filename, "wb"); |
| 78 |
- if (Fp == NULL) |
| 79 |
- return HTTP_UNAUTHORIZED; |
| 80 |
-+#else |
| 81 |
-+ return HTTP_NOT_FOUND; |
| 82 |
-+#endif |
| 83 |
- } |
| 84 |
- parser->position = POS_ENTITY; |
| 85 |
- do { |
| 86 |
|
| 87 |
diff --git a/net-libs/libupnp/files/libupnp-1.6.18-suse.patch b/net-libs/libupnp/files/libupnp-1.6.18-suse.patch |
| 88 |
deleted file mode 100644 |
| 89 |
index 2e91990c02..0000000000 |
| 90 |
--- a/net-libs/libupnp/files/libupnp-1.6.18-suse.patch |
| 91 |
+++ /dev/null |
| 92 |
@@ -1,132 +0,0 @@ |
| 93 |
---- configure.ac 2013-01-29 16:39:56.000000000 +0100 |
| 94 |
-+++ configure.ac 2013-02-17 10:40:53.680021913 +0100 |
| 95 |
-@@ -7,9 +7,9 @@ |
| 96 |
- # (C) Copyright 2005-2007 Rémi Turboult <r3mi@×××××××××××××××××.net> |
| 97 |
- # |
| 98 |
- |
| 99 |
--AC_PREREQ(2.60) |
| 100 |
-+AC_PREREQ([2.60]) |
| 101 |
- |
| 102 |
--AC_INIT([libupnp], [1.6.18], [mroberto@×××××××××××××××××.net]) |
| 103 |
-+AC_INIT([libupnp],[1.6.18],[mroberto@×××××××××××××××××.net]) |
| 104 |
- dnl ############################################################################ |
| 105 |
- dnl # *Independently* of the above libupnp package version, the libtool version |
| 106 |
- dnl # of the 3 libraries need to be updated whenever there is a change released: |
| 107 |
-@@ -366,7 +366,6 @@ |
| 108 |
- # installed libraries. |
| 109 |
- # |
| 110 |
- AC_CONFIG_HEADERS([autoconfig.h upnp/inc/upnpconfig.h]) |
| 111 |
--#AC_SYS_LARGEFILE_SENSITIVE |
| 112 |
- |
| 113 |
- AC_REVISION([$Revision: 1.1 $]) |
| 114 |
- |
| 115 |
-@@ -506,9 +505,12 @@ |
| 116 |
- # |
| 117 |
- # Checks for programs |
| 118 |
- # |
| 119 |
--AC_PROG_CC |
| 120 |
-+AC_PROG_CC_STDC |
| 121 |
-+AC_USE_SYSTEM_EXTENSIONS |
| 122 |
-+AC_SYS_LARGEFILE |
| 123 |
- AM_PROG_CC_C_O |
| 124 |
--AC_PROG_LIBTOOL |
| 125 |
-+m4_ifdef([AM_PROG_AR], [AM_PROG_AR]) |
| 126 |
-+LT_INIT |
| 127 |
- AC_PROG_INSTALL |
| 128 |
- AC_PROG_MAKE_SET |
| 129 |
- AC_PROG_EGREP |
| 130 |
-@@ -532,9 +534,7 @@ |
| 131 |
- #: |
| 132 |
- # Use -O0 in debug so that variables do not get optimized out |
| 133 |
- AX_CFLAGS_GCC_OPTION([-O0, -g]) |
| 134 |
-- else |
| 135 |
-- # add optimise for size |
| 136 |
-- AX_CFLAGS_GCC_OPTION([-Os]) |
| 137 |
-+ |
| 138 |
- fi |
| 139 |
- ;; |
| 140 |
- esac |
| 141 |
-@@ -548,8 +548,7 @@ |
| 142 |
- # |
| 143 |
- AC_TYPE_SIZE_T |
| 144 |
- AC_TYPE_OFF_T |
| 145 |
--AC_DEFINE([_LARGE_FILE_SOURCE], [], [Large files support]) |
| 146 |
--AC_DEFINE([_FILE_OFFSET_BITS], [64], [File Offset size]) |
| 147 |
-+ |
| 148 |
- |
| 149 |
- |
| 150 |
- # |
| 151 |
---- ixml/Makefile.am.orig |
| 152 |
-+++ ixml/Makefile.am |
| 153 |
-@@ -7,7 +7,7 @@ |
| 154 |
- |
| 155 |
- SUBDIRS = doc |
| 156 |
- |
| 157 |
--AM_CPPFLAGS = -I$(srcdir)/inc -I$(srcdir)/src/inc |
| 158 |
-+AM_CPPFLAGS = -include $(top_builddir)/autoconfig.h -I$(srcdir)/inc -I$(srcdir)/src/inc |
| 159 |
- AM_CFLAGS = |
| 160 |
- |
| 161 |
- LDADD = libixml.la |
| 162 |
---- threadutil/Makefile.am.orig |
| 163 |
-+++ threadutil/Makefile.am |
| 164 |
-@@ -4,7 +4,7 @@ |
| 165 |
- # (C) Copyright 2005 Remi Turboult <r3mi@×××××××××××××××××.net> |
| 166 |
- # |
| 167 |
- |
| 168 |
--AM_CPPFLAGS = -I$(srcdir)/inc -I$(srcdir)/src/inc |
| 169 |
-+AM_CPPFLAGS = -include $(top_builddir)/autoconfig.h -I$(srcdir)/inc -I$(srcdir)/src/inc |
| 170 |
- |
| 171 |
- if ENABLE_DEBUG |
| 172 |
- AM_CPPFLAGS += -DDEBUG -DSTATS |
| 173 |
---- upnp/src/api/UpnpString.c.orig |
| 174 |
-+++ upnp/src/api/UpnpString.c |
| 175 |
-@@ -28,38 +28,6 @@ |
| 176 |
- /* Other systems have strncasecmp */ |
| 177 |
- #endif |
| 178 |
- |
| 179 |
--#ifndef UPNP_USE_MSVCPP |
| 180 |
-- /* VC has strnlen which is already included but with (potentially) different linkage */ |
| 181 |
-- /* strnlen() is a GNU extension. */ |
| 182 |
-- #if HAVE_STRNLEN |
| 183 |
-- extern size_t strnlen(const char *s, size_t maxlen); |
| 184 |
-- #else /* HAVE_STRNLEN */ |
| 185 |
-- static size_t strnlen(const char *s, size_t n) |
| 186 |
-- { |
| 187 |
-- const char *p = (const char *)memchr(s, 0, n); |
| 188 |
-- return p ? p - s : n; |
| 189 |
-- } |
| 190 |
-- #endif /* HAVE_STRNLEN */ |
| 191 |
--#endif /* WIN32 */ |
| 192 |
-- |
| 193 |
--/* strndup() is a GNU extension. */ |
| 194 |
--#if HAVE_STRNDUP && !defined(WIN32) |
| 195 |
-- extern char *strndup(__const char *__string, size_t __n); |
| 196 |
--#else /* HAVE_STRNDUP && !defined(WIN32) */ |
| 197 |
-- static char *strndup(const char *__string, size_t __n) |
| 198 |
-- { |
| 199 |
-- size_t strsize = strnlen(__string, __n); |
| 200 |
-- char *newstr = (char *)malloc(strsize + 1); |
| 201 |
-- if (newstr == NULL) |
| 202 |
-- return NULL; |
| 203 |
-- |
| 204 |
-- strncpy(newstr, __string, strsize); |
| 205 |
-- newstr[strsize] = 0; |
| 206 |
-- |
| 207 |
-- return newstr; |
| 208 |
-- } |
| 209 |
--#endif /* HAVE_STRNDUP && !defined(WIN32) */ |
| 210 |
-- |
| 211 |
- /*! |
| 212 |
- * \brief Internal implementation of the class UpnpString. |
| 213 |
- * |
| 214 |
---- upnp/Makefile.am.orig |
| 215 |
-+++ upnp/Makefile.am |
| 216 |
-@@ -6,7 +6,7 @@ |
| 217 |
- |
| 218 |
- SUBDIRS = doc . sample |
| 219 |
- |
| 220 |
--AM_CPPFLAGS = \ |
| 221 |
-+AM_CPPFLAGS = -include $(top_builddir)/autoconfig.h \ |
| 222 |
- -I$(srcdir)/inc \ |
| 223 |
- -I$(top_srcdir)/threadutil/inc \ |
| 224 |
- -I$(top_srcdir)/ixml/inc |
| 225 |
|
| 226 |
diff --git a/net-libs/libupnp/files/libupnp-1.6.19-suse.patch b/net-libs/libupnp/files/libupnp-1.6.19-suse.patch |
| 227 |
deleted file mode 100644 |
| 228 |
index 75a7f0dac7..0000000000 |
| 229 |
--- a/net-libs/libupnp/files/libupnp-1.6.19-suse.patch |
| 230 |
+++ /dev/null |
| 231 |
@@ -1,132 +0,0 @@ |
| 232 |
---- configure.ac 2013-01-29 16:39:56.000000000 +0100 |
| 233 |
-+++ configure.ac 2013-02-17 10:40:53.680021913 +0100 |
| 234 |
-@@ -7,9 +7,9 @@ |
| 235 |
- # (C) Copyright 2005-2007 Rémi Turboult <r3mi@×××××××××××××××××.net> |
| 236 |
- # |
| 237 |
- |
| 238 |
--AC_PREREQ(2.60) |
| 239 |
-+AC_PREREQ([2.60]) |
| 240 |
- |
| 241 |
--AC_INIT([libupnp], [1.6.19], [mroberto@×××××××××××××××××.net]) |
| 242 |
-+AC_INIT([libupnp],[1.6.19],[mroberto@×××××××××××××××××.net]) |
| 243 |
- dnl ############################################################################ |
| 244 |
- dnl # *Independently* of the above libupnp package version, the libtool version |
| 245 |
- dnl # of the 3 libraries need to be updated whenever there is a change released: |
| 246 |
-@@ -366,7 +366,6 @@ |
| 247 |
- # installed libraries. |
| 248 |
- # |
| 249 |
- AC_CONFIG_HEADERS([autoconfig.h upnp/inc/upnpconfig.h]) |
| 250 |
--#AC_SYS_LARGEFILE_SENSITIVE |
| 251 |
- |
| 252 |
- AC_REVISION([$Revision: 1.1 $]) |
| 253 |
- |
| 254 |
-@@ -519,10 +519,12 @@ |
| 255 |
- # |
| 256 |
- # Checks for programs |
| 257 |
- # |
| 258 |
--AC_PROG_CC |
| 259 |
-+AC_PROG_CC_STDC |
| 260 |
-+AC_USE_SYSTEM_EXTENSIONS |
| 261 |
-+AC_SYS_LARGEFILE |
| 262 |
- AM_PROG_CC_C_O |
| 263 |
- m4_ifdef([AM_PROG_AR], [AM_PROG_AR]) |
| 264 |
--AC_PROG_LIBTOOL |
| 265 |
-+LT_INIT |
| 266 |
- AC_PROG_INSTALL |
| 267 |
- AC_PROG_MAKE_SET |
| 268 |
- AC_PROG_EGREP |
| 269 |
-@@ -532,9 +534,7 @@ |
| 270 |
- #: |
| 271 |
- # Use -O0 in debug so that variables do not get optimized out |
| 272 |
- AX_CFLAGS_GCC_OPTION([-O0, -g]) |
| 273 |
-- else |
| 274 |
-- # add optimise for size |
| 275 |
-- AX_CFLAGS_GCC_OPTION([-Os]) |
| 276 |
-+ |
| 277 |
- fi |
| 278 |
- ;; |
| 279 |
- esac |
| 280 |
-@@ -548,8 +548,7 @@ |
| 281 |
- # |
| 282 |
- AC_TYPE_SIZE_T |
| 283 |
- AC_TYPE_OFF_T |
| 284 |
--AC_DEFINE([_LARGE_FILE_SOURCE], [], [Large files support]) |
| 285 |
--AC_DEFINE([_FILE_OFFSET_BITS], [64], [File Offset size]) |
| 286 |
-+ |
| 287 |
- |
| 288 |
- |
| 289 |
- # |
| 290 |
---- ixml/Makefile.am.orig |
| 291 |
-+++ ixml/Makefile.am |
| 292 |
-@@ -7,7 +7,7 @@ |
| 293 |
- |
| 294 |
- SUBDIRS = doc |
| 295 |
- |
| 296 |
--AM_CPPFLAGS = -I$(srcdir)/inc -I$(srcdir)/src/inc |
| 297 |
-+AM_CPPFLAGS = -include $(top_builddir)/autoconfig.h -I$(srcdir)/inc -I$(srcdir)/src/inc |
| 298 |
- AM_CFLAGS = |
| 299 |
- |
| 300 |
- LDADD = libixml.la |
| 301 |
---- threadutil/Makefile.am.orig |
| 302 |
-+++ threadutil/Makefile.am |
| 303 |
-@@ -4,7 +4,7 @@ |
| 304 |
- # (C) Copyright 2005 Remi Turboult <r3mi@×××××××××××××××××.net> |
| 305 |
- # |
| 306 |
- |
| 307 |
--AM_CPPFLAGS = -I$(srcdir)/inc -I$(srcdir)/src/inc |
| 308 |
-+AM_CPPFLAGS = -include $(top_builddir)/autoconfig.h -I$(srcdir)/inc -I$(srcdir)/src/inc |
| 309 |
- |
| 310 |
- if ENABLE_DEBUG |
| 311 |
- AM_CPPFLAGS += -DDEBUG -DSTATS |
| 312 |
---- upnp/src/api/UpnpString.c.orig |
| 313 |
-+++ upnp/src/api/UpnpString.c |
| 314 |
-@@ -28,38 +28,6 @@ |
| 315 |
- /* Other systems have strncasecmp */ |
| 316 |
- #endif |
| 317 |
- |
| 318 |
--#ifndef UPNP_USE_MSVCPP |
| 319 |
-- /* VC has strnlen which is already included but with (potentially) different linkage */ |
| 320 |
-- /* strnlen() is a GNU extension. */ |
| 321 |
-- #if HAVE_STRNLEN |
| 322 |
-- extern size_t strnlen(const char *s, size_t maxlen); |
| 323 |
-- #else /* HAVE_STRNLEN */ |
| 324 |
-- static size_t strnlen(const char *s, size_t n) |
| 325 |
-- { |
| 326 |
-- const char *p = (const char *)memchr(s, 0, n); |
| 327 |
-- return p ? p - s : n; |
| 328 |
-- } |
| 329 |
-- #endif /* HAVE_STRNLEN */ |
| 330 |
--#endif /* WIN32 */ |
| 331 |
-- |
| 332 |
--/* strndup() is a GNU extension. */ |
| 333 |
--#if HAVE_STRNDUP && !defined(WIN32) |
| 334 |
-- extern char *strndup(__const char *__string, size_t __n); |
| 335 |
--#else /* HAVE_STRNDUP && !defined(WIN32) */ |
| 336 |
-- static char *strndup(const char *__string, size_t __n) |
| 337 |
-- { |
| 338 |
-- size_t strsize = strnlen(__string, __n); |
| 339 |
-- char *newstr = (char *)malloc(strsize + 1); |
| 340 |
-- if (newstr == NULL) |
| 341 |
-- return NULL; |
| 342 |
-- |
| 343 |
-- strncpy(newstr, __string, strsize); |
| 344 |
-- newstr[strsize] = 0; |
| 345 |
-- |
| 346 |
-- return newstr; |
| 347 |
-- } |
| 348 |
--#endif /* HAVE_STRNDUP && !defined(WIN32) */ |
| 349 |
-- |
| 350 |
- /*! |
| 351 |
- * \brief Internal implementation of the class UpnpString. |
| 352 |
- * |
| 353 |
---- upnp/Makefile.am.orig |
| 354 |
-+++ upnp/Makefile.am |
| 355 |
-@@ -6,7 +6,7 @@ |
| 356 |
- |
| 357 |
- SUBDIRS = doc . sample |
| 358 |
- |
| 359 |
--AM_CPPFLAGS = \ |
| 360 |
-+AM_CPPFLAGS = -include $(top_builddir)/autoconfig.h \ |
| 361 |
- -I$(srcdir)/inc \ |
| 362 |
- -I$(top_srcdir)/threadutil/inc \ |
| 363 |
- -I$(top_srcdir)/ixml/inc |
Archives