aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGravatar Fabrice Fontaine <fontaine.fabrice@gmail.com>2021-01-25 20:49:49 +0100
committerGravatar Yann E. MORIN <yann.morin.1998@free.fr>2021-01-25 22:23:22 +0100
commiteddc9df972d0b13f451abc0be75f286a2fdb70f0 (patch)
tree88aa3abc4322b73f020c8471d02766114162e1b7
parentf851b36371af0df6c4cf2f368005e80ad907c18b (diff)
downloadbuildroot-eddc9df972d0b13f451abc0be75f286a2fdb70f0.tar.gz
buildroot-eddc9df972d0b13f451abc0be75f286a2fdb70f0.tar.bz2
package/libupnp18: drop package
Drop libupnp18 as libupnp has been bumped to 1.14.x and 1.8.x will not been fixed against CallStranger a.k.a. CVE-2020-12695 mpd and vlc are already compliant with libupnp 1.14.x (i.e those packages use UpnpInit2 instead of the deprecated UpnpInit) Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com> Signed-off-by: Yann E. MORIN <yann.morin.1998@free.fr>
-rw-r--r--Config.in.legacy10
-rw-r--r--DEVELOPERS1
-rw-r--r--package/Config.in1
-rw-r--r--package/libupnp18/Config.in16
-rw-r--r--package/libupnp18/libupnp18.hash5
-rw-r--r--package/libupnp18/libupnp18.mk26
-rw-r--r--package/mpd/Config.in2
-rw-r--r--package/mpd/mpd.mk2
-rw-r--r--package/vlc/vlc.mk4
9 files changed, 14 insertions, 53 deletions
diff --git a/Config.in.legacy b/Config.in.legacy
index e30f678234..2bf39d7175 100644
--- a/Config.in.legacy
+++ b/Config.in.legacy
@@ -146,6 +146,16 @@ endif
comment "Legacy options removed in 2021.02"
+config BR2_PACKAGE_LIBUPNP18
+ bool "libupnp18 package removed"
+ select BR2_LEGACY
+ select BR2_PACKAGE_LIBUPNP
+ help
+ Version 1.8.x of libupnp (i.e. libupnp18) has been removed
+ because it will never be fixed against CallStranger a.k.a.
+ CVE-2020-12695. The libupnp package (which has been updated to
+ version 1.14.x) has been selected instead.
+
config BR2_PACKAGE_BOA
bool "boa package removed"
select BR2_LEGACY
diff --git a/DEVELOPERS b/DEVELOPERS
index 279c37c130..4142406b02 100644
--- a/DEVELOPERS
+++ b/DEVELOPERS
@@ -862,7 +862,6 @@ F: package/librsync/
F: package/libsoup/
F: package/libsoxr/
F: package/libupnp/
-F: package/libupnp18/
F: package/libv4l/
F: package/libxslt/
F: package/mbedtls/
diff --git a/package/Config.in b/package/Config.in
index 12bd0608e3..8ff03635b0 100644
--- a/package/Config.in
+++ b/package/Config.in
@@ -1791,7 +1791,6 @@ menu "Networking"
source "package/libuev/Config.in"
source "package/libuhttpd/Config.in"
source "package/libupnp/Config.in"
- source "package/libupnp18/Config.in"
source "package/libupnpp/Config.in"
source "package/liburiparser/Config.in"
source "package/libuwsc/Config.in"
diff --git a/package/libupnp18/Config.in b/package/libupnp18/Config.in
deleted file mode 100644
index 58508e4e26..0000000000
--- a/package/libupnp18/Config.in
+++ /dev/null
@@ -1,16 +0,0 @@
-config BR2_PACKAGE_LIBUPNP18
- bool "libupnp18"
- depends on BR2_TOOLCHAIN_HAS_THREADS
- depends on !BR2_PACKAGE_LIBUPNP
- help
- The portable SDK for UPnP(tm) Devices (libupnp) provides
- developers with an API and open source code for building
- control points, devices, and bridges that are compliant with
- Version 1.0 of the Universal Plug and Play Device Architecture
- Specification
-
- http://pupnp.sourceforge.net/
-
-comment "libupnp18 needs a toolchain w/ threads"
- depends on !BR2_PACKAGE_LIBUPNP
- depends on !BR2_TOOLCHAIN_HAS_THREADS
diff --git a/package/libupnp18/libupnp18.hash b/package/libupnp18/libupnp18.hash
deleted file mode 100644
index ba9ce1bcdf..0000000000
--- a/package/libupnp18/libupnp18.hash
+++ /dev/null
@@ -1,5 +0,0 @@
-# From https://sourceforge.net/projects/pupnp/files/pupnp/libupnp-1.8.7/libupnp-1.8.7.tar.bz2.sha1
-sha1 2ea3011180c58b0584f0cb73cc8e685a0a1c4ec8 libupnp-1.8.7.tar.bz2
-# Locally computed:
-sha256 e38c69b2b67322e67cd53680db9b02c7c1f720a47a3cd626fd89d57d2dca93b8 libupnp-1.8.7.tar.bz2
-sha256 c8b99423cad48bb44e2cf52a496361404290865eac259a82da6d1e4331ececb3 COPYING
diff --git a/package/libupnp18/libupnp18.mk b/package/libupnp18/libupnp18.mk
deleted file mode 100644
index f17a1a720d..0000000000
--- a/package/libupnp18/libupnp18.mk
+++ /dev/null
@@ -1,26 +0,0 @@
-################################################################################
-#
-# libupnp18
-#
-################################################################################
-
-LIBUPNP18_VERSION = 1.8.7
-LIBUPNP18_SOURCE = libupnp-$(LIBUPNP18_VERSION).tar.bz2
-LIBUPNP18_SITE = http://downloads.sourceforge.net/project/pupnp/pupnp/libupnp-$(LIBUPNP18_VERSION)
-LIBUPNP18_CONF_ENV = ac_cv_lib_compat_ftime=no
-LIBUPNP18_INSTALL_STAGING = YES
-LIBUPNP18_LICENSE = BSD-3-Clause
-LIBUPNP18_LICENSE_FILES = COPYING
-LIBUPNP18_DEPENDENCIES = host-pkgconf
-
-# Bind the internal miniserver socket with reuseaddr to allow clean restarts.
-LIBUPNP18_CONF_OPTS += --enable-reuseaddr
-
-ifeq ($(BR2_PACKAGE_OPENSSL),y)
-LIBUPNP18_CONF_OPTS += --enable-open-ssl
-LIBUPNP18_DEPENDENCIES += openssl
-else
-LIBUPNP18_CONF_OPTS += --disable-open-ssl
-endif
-
-$(eval $(autotools-package))
diff --git a/package/mpd/Config.in b/package/mpd/Config.in
index b19113d8c0..8a8ae69982 100644
--- a/package/mpd/Config.in
+++ b/package/mpd/Config.in
@@ -390,7 +390,7 @@ config BR2_PACKAGE_MPD_TCP
config BR2_PACKAGE_MPD_UPNP
bool "UPnP"
select BR2_PACKAGE_EXPAT
- select BR2_PACKAGE_LIBUPNP18 if !BR2_PACKAGE_LIBUPNP
+ select BR2_PACKAGE_LIBUPNP
select BR2_PACKAGE_MPD_CURL
help
Enable MPD UPnP client support.
diff --git a/package/mpd/mpd.mk b/package/mpd/mpd.mk
index baabb6ff38..3936dfd656 100644
--- a/package/mpd/mpd.mk
+++ b/package/mpd/mpd.mk
@@ -304,7 +304,7 @@ endif
ifeq ($(BR2_PACKAGE_MPD_UPNP),y)
MPD_DEPENDENCIES += \
expat \
- $(if $(BR2_PACKAGE_LIBUPNP),libupnp,libupnp18)
+ libupnp
MPD_CONF_OPTS += -Dupnp=enabled
else
MPD_CONF_OPTS += -Dupnp=disabled
diff --git a/package/vlc/vlc.mk b/package/vlc/vlc.mk
index 95eb7d39a2..020c37aa5d 100644
--- a/package/vlc/vlc.mk
+++ b/package/vlc/vlc.mk
@@ -378,9 +378,9 @@ else
VLC_CONF_OPTS += --disable-theora
endif
-ifeq ($(BR2_PACKAGE_LIBUPNP)$(BR2_PACKAGE_LIBUPNP18),y)
+ifeq ($(BR2_PACKAGE_LIBUPNP),y)
VLC_CONF_OPTS += --enable-upnp
-VLC_DEPENDENCIES += $(if $(BR2_PACKAGE_LIBUPNP),libupnp,libupnp18)
+VLC_DEPENDENCIES += libupnp
else
VLC_CONF_OPTS += --disable-upnp
endif