diff --git a/.checkpackageignore b/.checkpackageignore index 0bad49c223..7c14305284 100644 --- a/.checkpackageignore +++ b/.checkpackageignore @@ -1256,7 +1256,6 @@ package/shadowsocks-libev/0002-fix-maybe-uninitialized-errors.patch Upstream package/shadowsocks-libev/0003-lib-Makefile.am-remove-static-from-LDFLAGS.patch Upstream package/shairport-sync/0001-configure.ac-find-sndfile-through-pkg-config.patch Upstream package/shairport-sync/S99shairport-sync Indent Shellcheck Variables -package/shapelib/0001-Remove-double-free-in-contrib-shpsrt.patch Upstream package/shared-mime-info/0001-Remove-incorrect-dependency-from-install-data-hook.patch Upstream package/shellinabox/0001-Makefile-disable-always-building-statically.patch Upstream package/shellinabox/0002-CVE-2018-16789-fix-for-broken-multipart-form-data.patch Upstream diff --git a/package/shapelib/0001-Remove-double-free-in-contrib-shpsrt.patch b/package/shapelib/0001-Remove-double-free-in-contrib-shpsrt.patch deleted file mode 100644 index a565874b8c..0000000000 --- a/package/shapelib/0001-Remove-double-free-in-contrib-shpsrt.patch +++ /dev/null @@ -1,26 +0,0 @@ -From c75b9281a5b9452d92e1682bdfe6019a13ed819f Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Albin=20Eldst=C3=A5l-Ahrens?= -Date: Mon, 3 Jan 2022 12:34:41 +0100 -Subject: [PATCH] Remove double free() in contrib/shpsrt, issue #39 - -This fixes issue #39 - -[Retrieved from: -https://github.com/OSGeo/shapelib/commit/c75b9281a5b9452d92e1682bdfe6019a13ed819f] -Signed-off-by: Fabrice Fontaine ---- - contrib/shpsort.c | 1 - - 1 file changed, 1 deletion(-) - -diff --git a/contrib/shpsort.c b/contrib/shpsort.c -index e21e9e0..920cd8c 100644 ---- a/contrib/shpsort.c -+++ b/contrib/shpsort.c -@@ -113,7 +113,6 @@ static char ** split(const char *arg, const char *delim) { - free(result[--i]); - } - free(result); -- free(copy); - return NULL; - } - result = tmp; diff --git a/package/shapelib/shapelib.hash b/package/shapelib/shapelib.hash index b016fef5cf..f542ee79ac 100644 --- a/package/shapelib/shapelib.hash +++ b/package/shapelib/shapelib.hash @@ -1,4 +1,5 @@ # Locally computed -sha256 1fc0a480982caef9e7b9423070b47750ba34cd0ba82668f2e638fab1d07adae1 shapelib-1.5.0.tar.gz -sha256 7eb803a70990017a1c4e38a8342d7413c5dfeec3ed1ac407e15ae2c274e560ff COPYING -sha256 a638278f7f1cb7d0cdc73b47a6c87261b882e356a8e79922e90d44d7ef1dd2c7 web/license.html +sha256 19528b24377241705637320c367943031ad5088665d1fb0e1eaa52a71264a6c4 shapelib-1.6.0.tar.gz +sha256 681e386e44a19d7d0674b4320272c90e66b6610b741e7e6305f8219c42e85366 LICENSE-LGPL +sha256 67f1348ec73ef6343f0dbb3fa0612c321da4073e1ee68ffc99fcd3f2d2a65813 LICENSE-MIT +sha256 15e1205bb007d4d7821f7b1cc461ba8d051647e86dbc9baf1bb6f68b10588eeb web/license.html diff --git a/package/shapelib/shapelib.mk b/package/shapelib/shapelib.mk index 37d2d9ae64..a36a65f80e 100644 --- a/package/shapelib/shapelib.mk +++ b/package/shapelib/shapelib.mk @@ -4,14 +4,11 @@ # ################################################################################ -SHAPELIB_VERSION = 1.5.0 +SHAPELIB_VERSION = 1.6.0 SHAPELIB_SITE = http://download.osgeo.org/shapelib SHAPELIB_LICENSE = MIT or LGPL-2.0 -SHAPELIB_LICENSE_FILES = web/license.html COPYING +SHAPELIB_LICENSE_FILES = LICENSE-LGPL LICENSE-MIT web/license.html SHAPELIB_CPE_ID_VENDOR = osgeo SHAPELIB_INSTALL_STAGING = YES -# 0001-Remove-double-free-in-contrib-shpsrt.patch -SHAPELIB_IGNORE_CVES += CVE-2022-0699 - $(eval $(autotools-package))