Compare commits

...

10 Commits

Author SHA1 Message Date
openeuler-ci-bot
85bb3b8263
!15 【轻量级 PR】:add shapelib.yaml
From: @swf504 
Reviewed-by: @liqingqing_1229 
Signed-off-by: @liqingqing_1229
2022-12-28 06:28:37 +00:00
swf504
78314372c7
add shapelib.yaml
add shapelib.yaml

Signed-off-by: swf504 <suweifeng1@huawei.com>
2022-12-28 03:53:16 +00:00
openeuler-ci-bot
7636344603
!13 [sync] PR-11: fix CVE-2022-0699
From: @openeuler-sync-bot 
Reviewed-by: @liqingqing_1229 
Signed-off-by: @liqingqing_1229
2022-08-17 11:17:40 +00:00
phluo
d2a667afb9 Fix CVE-2022-0699
reset author

(cherry picked from commit c8d0cd4690dd7f9b751be875650951fb00bf750c)
2022-08-17 18:47:49 +08:00
openeuler-ci-bot
34522288a1
!10 [sync] PR-8: 【轻量级 PR】:fix bogus date in %changelog
From: @openeuler-sync-bot 
Reviewed-by: @liqingqing_1229 
Signed-off-by: @liqingqing_1229
2022-06-20 00:58:52 +00:00
zhangkea
b01d8a8b45 fix bogus date in %changelog
(cherry picked from commit cc93083ce742fb21200ba2ab7403f497b9acc673)
2022-06-20 08:56:57 +08:00
openeuler-ci-bot
fc4c4d0a4c
!6 [sync] PR-4: Upgrage shapelib 1.5.0
From: @openeuler-sync-bot 
Reviewed-by: @liqingqing_1229 
Signed-off-by: @liqingqing_1229
2022-04-18 01:59:16 +00:00
cherry530
baeab31661 Upgrade 1.5.0
Signed-off-by: cherry530 <xuping33@huawei.com>
(cherry picked from commit 17cfc0a818e60699bf01fac93c01a90016931b47)
2022-02-17 09:14:41 +08:00
openeuler-ci-bot
8c0cc4617b !2 Switch ronn-ng to disable ronn
From: @hht8
Reviewed-by: @SuperSix173
Signed-off-by: @SuperSix173
2021-02-08 17:03:41 +08:00
hht8
02da18dfa8 Switch ronn-ng to disable ronn 2021-02-08 16:18:27 +08:00
5 changed files with 29 additions and 4 deletions

10
CVE-2022-0699.patch Normal file
View File

@ -0,0 +1,10 @@
--- a/contrib/shpsort.c 2022-08-17 14:48:59.276669116 +0800
+++ b/contrib/shpsort.c 2022-08-17 14:49:22.836834517 +0800
@@ -279,7 +279,6 @@
free(result[--i]);
}
free(result);
- free(copy);
return NULL;
}
result = tmp;

Binary file not shown.

BIN
shapelib-1.5.0.tar.gz Normal file

Binary file not shown.

View File

@ -1,14 +1,16 @@
Name: shapelib Name: shapelib
Version: 1.4.1 Version: 1.5.0
Release: 8 Release: 2
Summary: A Shapefile C Library Summary: A Shapefile C Library
License: (LGPLv2+ or MIT) and GPLv2+ and Public Domain License: (LGPLv2+ or MIT) and GPLv2+ and Public Domain
URL: http://shapelib.maptools.org/ URL: http://shapelib.maptools.org/
Source0: http://download.osgeo.org/shapelib/%{name}-%{version}.tar.gz Source0: http://download.osgeo.org/shapelib/%{name}-%{version}.tar.gz
Source1: https://salsa.debian.org/debian-gis-team/shapelib/-/archive/master/shapelib-master.tar.gz Source1: https://salsa.debian.org/debian-gis-team/shapelib/-/archive/master/shapelib-master.tar.gz
BuildRequires: automake autoconf libtool gcc-c++ make proj-devel >= 4.4.1 Patch0: CVE-2022-0699.patch
BuildRequires: rubygem-ronn
BuildRequires: automake autoconf libtool gcc-c++ make
BuildRequires: rubygem-ronn-ng
Provides: %{name}-tools = %{version}-%{release} Provides: %{name}-tools = %{version}-%{release}
Obsoletes: %{name}-tools < %{version}-%{release} Obsoletes: %{name}-tools < %{version}-%{release}
@ -72,5 +74,14 @@ install -pm 0644 man/*.1 %{buildroot}%{_mandir}/man1/
%{_mandir}/man1/*.1* %{_mandir}/man1/*.1*
%changelog %changelog
* Wed Aug 17 2022 luopihui <luopihui@ncti-gba.cn> - 1.5.0-2
- Fix CVE-2022-0699
* Tue Feb 15 2022 xu_ping <xuping33@huawei.com> - 1.5.0-1
- Upgrage 1.5.0
* Fri Feb 07 2020 huanghaitao <huanghaitao8@huawei.com> - 1.4.1-9
- Swith rubygem-ronn-ng to drop rubygem-ronn
* Fri Feb 14 2020 gulining<gulining1@huawei.com> - 1.4.1-8 * Fri Feb 14 2020 gulining<gulining1@huawei.com> - 1.4.1-8
- Package init - Package init

4
shapelib.yaml Normal file
View File

@ -0,0 +1,4 @@
version_control: github
src_repo: OSGeo/shapelib
tag_prefix: "^shapelib"
seperator: "."