Buildroot Archive on lore.kernel.org
 help / color / mirror / Atom feed
* [Buildroot] [PATCH] package/shapelib: bump to version 1.6.0
@ 2023-12-29 13:19 Zoltan Gyarmati
  2023-12-29 18:09 ` Zoltan Gyarmati
  0 siblings, 1 reply; 3+ messages in thread
From: Zoltan Gyarmati @ 2023-12-29 13:19 UTC (permalink / raw)
  To: buildroot; +Cc: Zoltan Gyarmati, Fabrice Fontaine

From: Fabrice Fontaine <fontaine.fabrice@gmail.com>

- Drop patch (already in version)
- Update hash of web/license.html because SPDX identifier is used since
  https://github.com/OSGeo/shapelib/commit/6bf68d3086f49245470fc24b121afbbeb8e9c4f2
- COPYING has been replaced by LICENSE-LGPL and LICENSE-MIT since
  https://github.com/OSGeo/shapelib/commit/1638416feefcee4a1eeef9aab573a5ce44be1f3e

https://github.com/OSGeo/shapelib/releases/tag/v1.6.0

Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
Acked-by: Zoltan Gyarmati <zgyarmati@zgyarmati.de>
---
 .checkpackageignore                           |  1 -
 ...Remove-double-free-in-contrib-shpsrt.patch | 26 -------------------
 package/shapelib/shapelib.hash                |  7 ++---
 package/shapelib/shapelib.mk                  |  7 ++---
 4 files changed, 6 insertions(+), 35 deletions(-)
 delete mode 100644 package/shapelib/0001-Remove-double-free-in-contrib-shpsrt.patch

diff --git a/.checkpackageignore b/.checkpackageignore
index 0868593a92..dd5d2735fe 100644
--- a/.checkpackageignore
+++ b/.checkpackageignore
@@ -1259,7 +1259,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?= <laeder.keps@gmail.com>
-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 <fontaine.fabrice@gmail.com>
----
- 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))
--
2.39.2

_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

^ permalink raw reply related	[flat|nested] 3+ messages in thread
* Re: [Buildroot] [PATCH] package/shapelib: bump to version 1.6.0
  2023-12-29 13:19 [Buildroot] [PATCH] package/shapelib: bump to version 1.6.0 Zoltan Gyarmati
@ 2023-12-29 18:09 ` Zoltan Gyarmati
  2023-12-29 22:00   ` Yann E. MORIN
  0 siblings, 1 reply; 3+ messages in thread
From: Zoltan Gyarmati @ 2023-12-29 18:09 UTC (permalink / raw)
  To: buildroot, Fabrice Fontaine


[-- Attachment #1.1: Type: text/plain, Size: 4991 bytes --]



Dear Fabrice&All,

please ignore this, i just wanted to add an Acked-by: trailer and not 
resend the patch. Sorry about the noise...

On 2023-12-29 14:19, Zoltan Gyarmati wrote:

> From: Fabrice Fontaine <fontaine.fabrice@gmail.com>
> 
> - Drop patch (already in version)
> - Update hash of web/license.html because SPDX identifier is used since
> https://github.com/OSGeo/shapelib/commit/6bf68d3086f49245470fc24b121afbbeb8e9c4f2
> - COPYING has been replaced by LICENSE-LGPL and LICENSE-MIT since
> https://github.com/OSGeo/shapelib/commit/1638416feefcee4a1eeef9aab573a5ce44be1f3e
> 
> https://github.com/OSGeo/shapelib/releases/tag/v1.6.0
> 
> Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
> Acked-by: Zoltan Gyarmati <zgyarmati@zgyarmati.de>
> ---
> .checkpackageignore                           |  1 -
> ...Remove-double-free-in-contrib-shpsrt.patch | 26 -------------------
> package/shapelib/shapelib.hash                |  7 ++---
> package/shapelib/shapelib.mk                  |  7 ++---
> 4 files changed, 6 insertions(+), 35 deletions(-)
> delete mode 100644 
> package/shapelib/0001-Remove-double-free-in-contrib-shpsrt.patch
> 
> diff --git a/.checkpackageignore b/.checkpackageignore
> index 0868593a92..dd5d2735fe 100644
> --- a/.checkpackageignore
> +++ b/.checkpackageignore
> @@ -1259,7 +1259,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?= <laeder.keps@gmail.com>
> -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 <fontaine.fabrice@gmail.com>
> ----
> - 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))
> --
> 2.39.2

-- 
https://zgyarmati.de

[-- Attachment #1.2: Type: text/html, Size: 7421 bytes --]

[-- Attachment #2: Type: text/plain, Size: 150 bytes --]

_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

^ permalink raw reply	[flat|nested] 3+ messages in thread
* Re: [Buildroot] [PATCH] package/shapelib: bump to version 1.6.0
  2023-12-29 18:09 ` Zoltan Gyarmati
@ 2023-12-29 22:00   ` Yann E. MORIN
  0 siblings, 0 replies; 3+ messages in thread
From: Yann E. MORIN @ 2023-12-29 22:00 UTC (permalink / raw)
  To: Zoltan Gyarmati; +Cc: Fabrice Fontaine, buildroot

Zoltan, All,

On 2023-12-29 19:09 +0100, Zoltan Gyarmati spake thusly:
> please ignore this, i just wanted to add an Acked-by: trailer and not resend
> the patch.

Argh, too bad that I saw your patch after I applied Frabice's patch.

To add your Acked-by tag, just reply to the mail, and just add your tag
(anywhere in the mail will do; I have the habbit of doing so right bewlo
the Signed-off-by line, but that's not a rule).

> Sorry about the noise...

No worries!

Thanks!

Regards,
Yann E. MORIN.

> On 2023-12-29 14:19, Zoltan Gyarmati wrote:
> 
> > From: Fabrice Fontaine <fontaine.fabrice@gmail.com>
> > 
> > - Drop patch (already in version)
> > - Update hash of web/license.html because SPDX identifier is used since
> > https://github.com/OSGeo/shapelib/commit/6bf68d3086f49245470fc24b121afbbeb8e9c4f2
> > - COPYING has been replaced by LICENSE-LGPL and LICENSE-MIT since
> > https://github.com/OSGeo/shapelib/commit/1638416feefcee4a1eeef9aab573a5ce44be1f3e
> > 
> > https://github.com/OSGeo/shapelib/releases/tag/v1.6.0
> > 
> > Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
> > Acked-by: Zoltan Gyarmati <zgyarmati@zgyarmati.de>
> > ---
> > .checkpackageignore                           |  1 -
> > ...Remove-double-free-in-contrib-shpsrt.patch | 26 -------------------
> > package/shapelib/shapelib.hash                |  7 ++---
> > package/shapelib/shapelib.mk                  |  7 ++---
> > 4 files changed, 6 insertions(+), 35 deletions(-)
> > delete mode 100644
> > package/shapelib/0001-Remove-double-free-in-contrib-shpsrt.patch
> > 
> > diff --git a/.checkpackageignore b/.checkpackageignore
> > index 0868593a92..dd5d2735fe 100644
> > --- a/.checkpackageignore
> > +++ b/.checkpackageignore
> > @@ -1259,7 +1259,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?= <laeder.keps@gmail.com>
> > -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 <fontaine.fabrice@gmail.com>
> > ----
> > - 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))
> > --
> > 2.39.2
> 
> -- 
> https://zgyarmati.de

> _______________________________________________
> buildroot mailing list
> buildroot@buildroot.org
> https://lists.buildroot.org/mailman/listinfo/buildroot


-- 
.-----------------.--------------------.------------------.--------------------.
|  Yann E. MORIN  | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: |
| +33 662 376 056 | Software  Designer | \ / CAMPAIGN     |  ___               |
| +33 561 099 427 `------------.-------:  X  AGAINST      |  \e/  There is no  |
| http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL    |   v   conspiracy.  |
'------------------------------^-------^------------------^--------------------'
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

^ permalink raw reply	[flat|nested] 3+ messages in thread
end of thread, other threads:[~2023-12-29 22:00 UTC | newest]

Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2023-12-29 13:19 [Buildroot] [PATCH] package/shapelib: bump to version 1.6.0 Zoltan Gyarmati
2023-12-29 18:09 ` Zoltan Gyarmati
2023-12-29 22:00   ` Yann E. MORIN

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox