diff --git a/.gitignore b/.gitignore index db3079f..74b8a1e 100644 --- a/.gitignore +++ b/.gitignore @@ -1,4 +1,2 @@ adns-1.4.tar.gz /adns-1.5.1.tar.gz -/adns-1.6.0.tar.gz -/adns-1.6.1.tar.gz diff --git a/adns.spec b/adns.spec index 3e2faa6..177cab9 100644 --- a/adns.spec +++ b/adns.spec @@ -1,17 +1,18 @@ Name: adns -Version: 1.6.1 -Release: 5%{?dist} +Version: 1.5.1 +Release: 1%{?dist} Summary: Advanced, easy to use, asynchronous-capable DNS client library -License: GPL-1.0-or-later +Group: System Environment/Libraries +License: GPL+ URL: http://www.chiark.greenend.org.uk/~ian/adns/ Source0: http://www.chiark.greenend.org.uk/~ian/adns/ftp/%{name}-%{version}.tar.gz - BuildRequires: autoconf -BuildRequires: gcc -BuildRequires: make +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) +# http://debbugs.gnu.org/cgi/bugreport.cgi?bug=25757 +Patch0: adns14-rh514838.patch %description adns is a resolver library for C (and C++) programs. In contrast with @@ -44,6 +45,7 @@ following features: %package devel Summary: Asynchronous-capable DNS client library - development files +Group: Development/Libraries Requires: %{name} = %{version} %description devel @@ -51,7 +53,7 @@ Asynchronous-capable DNS client library - development files. %package progs Summary: Asynchronous-capable DNS client library - utility programs -Requires: %{name} = %{version} +Group: Applications/System %description progs DNS utility programs: adns also comes with a number of utility @@ -70,6 +72,8 @@ programs for use from the command line and in scripts: %prep %setup -q +%patch0 -p1 -b .rh514838 + %build %ifarch sparcv9 sparc64 s390 s390x export CFLAGS="$RPM_OPT_FLAGS -D_GNU_SOURCE -fPIC" @@ -91,100 +95,27 @@ make \ rm -f $RPM_BUILD_ROOT%{_libdir}/libadns.a -%ldconfig_scriptlets +%clean +rm -fr $RPM_BUILD_ROOT + +%post -p /sbin/ldconfig +%postun -p /sbin/ldconfig %files +%defattr(644,root,root,755) %doc README TODO changelog %attr(755,root,root) %{_libdir}/lib*.so.* %files devel +%defattr(644,root,root,755) %{_includedir}/* %{_libdir}/lib*.so %files progs +%defattr(644,root,root,755) %attr(755,root,root) %{_bindir}/* %changelog -* Fri Jan 16 2026 Fedora Release Engineering - 1.6.1-5 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild - -* Wed Jul 23 2025 Fedora Release Engineering - 1.6.1-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild - -* Thu Jan 16 2025 Fedora Release Engineering - 1.6.1-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild - -* Wed Jul 17 2024 Fedora Release Engineering - 1.6.1-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild - -* Sun May 05 2024 Fedora Release Monitoring - 1.6.1-1 -- Update to 1.6.1 (#2279207) - -* Mon Jan 22 2024 Fedora Release Engineering - 1.6.0-12 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild - -* Fri Jan 19 2024 Fedora Release Engineering - 1.6.0-11 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild - -* Wed Jul 19 2023 Fedora Release Engineering - 1.6.0-10 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild - -* Sat Jun 24 2023 Sérgio Basto - 1.6.0-9 -- Migrate to SPDX license format - -* Wed Jan 18 2023 Fedora Release Engineering - 1.6.0-8 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild - -* Wed Jul 20 2022 Fedora Release Engineering - 1.6.0-7 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild - -* Wed Jan 19 2022 Fedora Release Engineering - 1.6.0-6 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild - -* Wed Jul 21 2021 Fedora Release Engineering - 1.6.0-5 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild - -* Mon Jan 25 2021 Fedora Release Engineering - 1.6.0-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild - -* Fri Jul 31 2020 Fedora Release Engineering - 1.6.0-3 -- Second attempt - Rebuilt for - https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild - -* Mon Jul 27 2020 Fedora Release Engineering - 1.6.0-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild - -* Sun Jun 21 2020 Sérgio Basto - 1.6.0-1 -- Update adns to 1.6.0 (#1846479) -- Drop patch0, upstream fixed patch0 in another way - -* Tue Feb 18 2020 Than Ngo - 1.5.1-10 -- Fixed FTBFS - -* Tue Jan 28 2020 Fedora Release Engineering - 1.5.1-9 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild - -* Wed Jul 24 2019 Fedora Release Engineering - 1.5.1-8 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild - -* Thu Jan 31 2019 Fedora Release Engineering - 1.5.1-7 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild - -* Thu Jul 12 2018 Fedora Release Engineering - 1.5.1-6 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild - -* Thu Apr 26 2018 Tomas Hozza - 1.5.1-5 -- Added Build dependency on gcc and explicit dependency on main package in -progs - -* Wed Feb 07 2018 Fedora Release Engineering - 1.5.1-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild - -* Wed Aug 02 2017 Fedora Release Engineering - 1.5.1-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild - -* Wed Jul 26 2017 Fedora Release Engineering - 1.5.1-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild - * Thu Feb 16 2017 Tomas Hozza - 1.5.1-1 - New upstream version 1.5.1 (#1369297) diff --git a/adns14-rh514838.patch b/adns14-rh514838.patch new file mode 100644 index 0000000..645fe58 --- /dev/null +++ b/adns14-rh514838.patch @@ -0,0 +1,22 @@ +diff --git a/src/general.c b/src/general.c +index c4d1f55..bacdd81 100644 +--- a/src/general.c ++++ b/src/general.c +@@ -272,6 +272,8 @@ static const struct sinfo { + SINFO( nodata, "No such data" ) + }; + ++static const char *unknown_error_str = "unknown error code"; ++ + static int si_compar(const void *key, const void *elem) { + const adns_status *st= key; + const struct sinfo *si= elem; +@@ -288,7 +290,7 @@ const char *adns_strerror(adns_status st) { + const struct sinfo *si; + + si= findsinfo(st); +- return si->string; ++ return (si == NULL) ? unknown_error_str : si->string; + } + + const char *adns_errabbrev(adns_status st) { diff --git a/sources b/sources index b011f3f..634e055 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (adns-1.6.1.tar.gz) = 71d8b3368f8055bbf558d7828e772f6689b3370945d7c2061b835c43d4f71971569d1a17c0cfd6e8ebe0602d78cdf22d4915eeb06836e2193f521d51e87fa0a0 +SHA512 (adns-1.5.1.tar.gz) = f7bf8ff2b8faa1d7be0b27c732714240a27d6dfd7f70af8ae364e5de382427a79c484099f73f85eb1c77fb1a9845884e2f63d5831bc34a6212f206b24e7e1574