diff --git a/.gitignore b/.gitignore index d14edf3..8faf9e0 100644 --- a/.gitignore +++ b/.gitignore @@ -24,3 +24,4 @@ ipv6calc-0.73.0.tar.gz /ipv6calc-0.99.2-2017-02-12.patch /ipv6calc-1.0.0.tar.gz /ipv6calc-1.0.0-8522fb6b.patch +/ipv6calc-1.1.0.tar.gz diff --git a/ipv6calc-1.1.0-57d4b44f-9573d560.patch b/ipv6calc-1.1.0-57d4b44f-9573d560.patch new file mode 100644 index 0000000..9f1c51b --- /dev/null +++ b/ipv6calc-1.1.0-57d4b44f-9573d560.patch @@ -0,0 +1,13 @@ +diff --git a/lib/libipv6addr.c b/lib/libipv6addr.c +index b572974..a6b759b 100644 +--- a/lib/libipv6addr.c ++++ b/lib/libipv6addr.c +@@ -1280,7 +1280,7 @@ int addr_to_ipv6addrstruct(const char *addrstring, char *resultstring, const siz + addronlystring = strtok_r(tempstring2, "%%", ptrptr); + + if ( addronlystring == NULL ) { +- fprintf(stderr, "Strange input: %s\n", addronlystring); ++ fprintf(stderr, "Strange input: %s\n", addrstring); + return (1); + }; + diff --git a/ipv6calc.spec b/ipv6calc.spec index d166191..25eda9f 100644 --- a/ipv6calc.spec +++ b/ipv6calc.spec @@ -15,8 +15,8 @@ Summary: IPv6 address format change and calculation utility Name: ipv6calc -Version: 1.0.0 -Release: 27%{?gittag}%{?dist} +Version: 1.1.0 +Release: 29%{?gittag}%{?dist} Group: Applications/Text URL: http://www.deepspace6.net/projects/%{name}.html License: GPLv2 @@ -24,10 +24,9 @@ License: GPLv2 Source: https://github.com/pbiering/%{name}/archive/%{gitcommit}/%{name}-%{gitcommit}.tar.gz %else Source: ftp://ftp.bieringer.de/pub/linux/IPv6/ipv6calc/%{name}-%{version}.tar.gz -Patch1: ipv6calc-1.0.0-8522fb6b.patch -Patch2: ipv6calc-1.0.0-9dc6e5ac.patch +Patch1: ipv6calc-1.1.0-57d4b44f-9573d560.patch %endif -BuildRequires: gcc +BuildRequires: gcc BuildRequires: openssl-devel BuildRequires: perl-generators BuildRequires: perl(Digest::MD5), perl(Digest::SHA1), perl(URI::Escape) @@ -35,7 +34,7 @@ BuildRequires: perl(strict), perl(warnings) BuildRequires: procps-ng Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) %if %{enable_shared} -Provides: ipv6calc-libs = %{version}-%{release}} +Provides: ipv6calc-libs = %{version}-%{release} %else Conflicts: ipv6calc-libs %endif @@ -138,8 +137,8 @@ Available rpmbuild rebuild options: Summary: IP address information web utility Group: Applications/Internet Requires: ipv6calc httpd -Requires: perl(URI) perl(Digest::SHA1) perl(Digest::MD5) perl(HTML::Entities) -BuildRequires: perl(URI) perl(Digest::SHA1) perl(Digest::MD5) perl(HTML::Entities) +Requires: perl(URI) perl(Digest::SHA1) perl(Digest::MD5) perl(HTML::Entities) perl(Proc::ProcessTable) +BuildRequires: perl(URI) perl(Digest::SHA1) perl(Digest::MD5) perl(HTML::Entities) perl(Proc::ProcessTable) %description ipv6calcweb ipv6calcweb contains a CGI program and a configuration file for @@ -158,7 +157,7 @@ Requires: httpd >= 2.4.0 Requires: httpd <= 2.4.99999 Requires: ipv6calc = %{version}-%{release} %if %{enable_shared} -Requires: ipv6calc-libs = %{version}-%{release}} +Requires: ipv6calc-libs = %{version}-%{release} %endif @@ -182,7 +181,6 @@ By default the module is disabled. %else %setup -q %patch1 -p1 -%patch2 -p1 %endif %configure \ @@ -255,10 +253,10 @@ install -m 755 ipv6calcweb/ipv6calcweb.cgi %{buildroot}%{_localstatedir}/www/cg %files %if %{rpm_license_extra} -%doc ChangeLog README CREDITS TODO USAGE doc/ipv6calc.lyx doc/ipv6calc.sgml doc/ipv6calc.html doc/ipv6calc.xml +%doc ChangeLog README README.* CREDITS TODO USAGE doc/ipv6calc.lyx doc/ipv6calc.sgml doc/ipv6calc.html doc/ipv6calc.xml %license COPYING LICENSE %else -%doc ChangeLog README CREDITS TODO USAGE doc/ipv6calc.lyx doc/ipv6calc.sgml doc/ipv6calc.html doc/ipv6calc.xml COPYING LICENSE +%doc ChangeLog README README.* CREDITS TODO USAGE doc/ipv6calc.lyx doc/ipv6calc.sgml doc/ipv6calc.html doc/ipv6calc.xml COPYING LICENSE %endif %defattr(644,root,root,755) @@ -321,6 +319,11 @@ install -m 755 ipv6calcweb/ipv6calcweb.cgi %{buildroot}%{_localstatedir}/www/cg %changelog +* Sat Jan 26 2019 Peter Bieringer - 1.1.0-29 +- new release 1.1.0 +- subpackage ipv6calcweb: add dependency Perl(Proc::ProcessTable) +- fix bug in lib/libipv6addr.c + * Fri Jul 13 2018 Fedora Release Engineering - 1.0.0-27 - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild diff --git a/sources b/sources index 1ed6b00..70bc518 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (ipv6calc-1.0.0.tar.gz) = 46e33697551c4bf0a472c7f2dd51c11ae21d49c7d78fe5213bce60c1d11f9230491c328e425f36733c7262a369644bcedb8392ffe2279031eb2552092a5ac209 +SHA512 (ipv6calc-1.1.0.tar.gz) = 8fe2a4717f2be4ceae051b635d4329b8c438d9741e9a99a3c12cc1c0d0daef89325cc9beb7ca65da3c671586ce2a596191962118005aeaaf7cfe33a1d4549101