aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--community/libupnp/APKBUILD10
-rw-r--r--community/libupnp/CVE-2020-13848.patch39
-rw-r--r--testing/amule/APKBUILD2
3 files changed, 5 insertions, 46 deletions
diff --git a/community/libupnp/APKBUILD b/community/libupnp/APKBUILD
index 214951a42c8..d778b21e9a4 100644
--- a/community/libupnp/APKBUILD
+++ b/community/libupnp/APKBUILD
@@ -2,16 +2,15 @@
# Contributor: Francesco Colista <fcolista@alpinelinux.org>
# Contributor: Mike Crute <mike@crute.us>
pkgname=libupnp
-pkgver=1.12.1
-pkgrel=1
+pkgver=1.14.0
+pkgrel=0
pkgdesc="Portable Open Source UPnP Development Kit"
url="http://pupnp.sourceforge.net"
arch="all"
license="BSD-3-Clause"
makedepends="automake autoconf libtool"
subpackages="$pkgname-dev"
-source="https://github.com/pupnp/pupnp/releases/download/release-$pkgver/libupnp-$pkgver.tar.bz2
-CVE-2020-13848.patch"
+source="https://github.com/pupnp/pupnp/releases/download/release-$pkgver/libupnp-$pkgver.tar.bz2"
# secfixes:
# 1.12.1-r1:
@@ -39,5 +38,4 @@ package() {
make DESTDIR="$pkgdir" install
}
-sha512sums="f13833118d08fc05273dc65a12596854b937c505b20d82e58eb1c2e1fa35dba0cafd5799475e030f3c698069046cc5256e6ef5afe398680e7ea881df953b95e6 libupnp-1.12.1.tar.bz2
-ece4d1a27fec40b9714200d66013c105b50dedf41f5435df9122be763b78c74ec419ffc60e75088f9706ab6d8f01afa07f8262c3b9af9134ba42cfe9b5f2fb59 CVE-2020-13848.patch"
+sha512sums="c1ceaa4116dc514607d092126f98a32b6b01d3251464615e3a716254d474559d1df785203daf21b44b0edb34a72e978f8a9fde697336258a8c225b55aa9e0db5 libupnp-1.14.0.tar.bz2"
diff --git a/community/libupnp/CVE-2020-13848.patch b/community/libupnp/CVE-2020-13848.patch
deleted file mode 100644
index ec4e7628120..00000000000
--- a/community/libupnp/CVE-2020-13848.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-diff --git a/upnp/src/genlib/service_table/service_table.c b/upnp/src/genlib/service_table/service_table.c
-index 98c2c0f..c2c4545 100644
---- a/upnp/src/genlib/service_table/service_table.c
-+++ b/upnp/src/genlib/service_table/service_table.c
-@@ -300,12 +300,12 @@ FindServiceEventURLPath( service_table * table,
- uri_type parsed_url;
- uri_type parsed_url_in;
-
-- if( ( table )
-- &&
-- ( parse_uri( eventURLPath,
-- strlen( eventURLPath ),
-- &parsed_url_in ) == HTTP_SUCCESS ) ) {
-+ if (!table || !eventURLPath) {
-+ return NULL;
-+ }
-
-+ if (parse_uri(eventURLPath, strlen(eventURLPath), &parsed_url_in) ==
-+ HTTP_SUCCESS) {
- finger = table->serviceList;
- while( finger ) {
- if( finger->eventURL )
-@@ -352,11 +352,11 @@ FindServiceControlURLPath( service_table * table,
- uri_type parsed_url;
- uri_type parsed_url_in;
-
-- if( ( table )
-- &&
-- ( parse_uri
-- ( controlURLPath, strlen( controlURLPath ),
-- &parsed_url_in ) == HTTP_SUCCESS ) ) {
-+ if (!table || !controlURLPath) {
-+ return NULL;
-+ }
-+ if (parse_uri(controlURLPath, strlen(controlURLPath), &parsed_url_in) ==
-+ HTTP_SUCCESS) {
- finger = table->serviceList;
- while( finger ) {
- if( finger->controlURL )
diff --git a/testing/amule/APKBUILD b/testing/amule/APKBUILD
index 9a0366129d0..7f75866dca6 100644
--- a/testing/amule/APKBUILD
+++ b/testing/amule/APKBUILD
@@ -3,7 +3,7 @@
pkgname=amule
_commit=eba0b7ac753680264a77b3dff12f82665ff180d4
pkgver=11066
-pkgrel=0
+pkgrel=1
pkgdesc="eMule-like client for the eD2k and Kademlia networks"
url="http://www.amule.org"
arch="all"