Compare commits

..

No commits in common. "85bb3b8263cf3d9121e0e7f3bf3ba9e048c8b097" and "068baed8cb4d674d3b37d6e04e1c03b2f1720ef2" have entirely different histories.

5 changed files with 4 additions and 29 deletions

View File

@ -1,10 +0,0 @@
--- 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;

BIN
shapelib-1.4.1.tar.gz Normal file

Binary file not shown.

Binary file not shown.

View File

@ -1,16 +1,14 @@
Name: shapelib Name: shapelib
Version: 1.5.0 Version: 1.4.1
Release: 2 Release: 8
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
Patch0: CVE-2022-0699.patch BuildRequires: automake autoconf libtool gcc-c++ make proj-devel >= 4.4.1
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}
@ -74,14 +72,5 @@ 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

View File

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