diff --git a/.cvsignore b/.cvsignore deleted file mode 100644 index 571b863..0000000 --- a/.cvsignore +++ /dev/null @@ -1,2 +0,0 @@ -adns-1.1.tar.gz -adns-1.2.tar.gz diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..db3079f --- /dev/null +++ b/.gitignore @@ -0,0 +1,4 @@ +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/Makefile b/Makefile deleted file mode 100644 index cabbdd5..0000000 --- a/Makefile +++ /dev/null @@ -1,21 +0,0 @@ -# Makefile for source rpm: adns -# $Id: Makefile,v 1.1 2004/11/08 04:00:44 cvsextras Exp $ -NAME := adns -SPECFILE = $(firstword $(wildcard *.spec)) - -define find-makefile-common -for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done -endef - -MAKEFILE_COMMON := $(shell $(find-makefile-common)) - -ifeq ($(MAKEFILE_COMMON),) -# attept a checkout -define checkout-makefile-common -test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2 -endef - -MAKEFILE_COMMON := $(shell $(checkout-makefile-common)) -endif - -include $(MAKEFILE_COMMON) diff --git a/adns-DESTDIR.patch b/adns-DESTDIR.patch deleted file mode 100644 index 3750a49..0000000 --- a/adns-DESTDIR.patch +++ /dev/null @@ -1,88 +0,0 @@ -diff -Nru adns-1.0/Makefile.in adns-1.0.new/Makefile.in ---- adns-1.0/Makefile.in Sun Sep 17 16:10:57 2000 -+++ adns-1.0.new/Makefile.in Mon Nov 19 02:34:14 2001 -@@ -38,7 +38,7 @@ - SUBDIRS= src $(SUBDIRS_DYNAMIC) client regress - - all install uninstall clean distclean mostlyclean maintainer-clean distprep: -- set -e; for d in $(SUBDIRS); do $(MAKE) -C $$d $@; done -+ set -e; for d in $(SUBDIRS); do $(MAKE) DESTDIR=$(DESTDIR) -C $$d $@; done - $(MAKE) $@-here - - all-here install-here uninstall-here distprep-here: README -diff -Nru adns-1.0/client/Makefile.in adns-1.0.new/client/Makefile.in ---- adns-1.0/client/Makefile.in Sun Sep 17 02:43:10 2000 -+++ adns-1.0.new/client/Makefile.in Mon Nov 19 02:36:50 2001 -@@ -59,11 +59,12 @@ - all: $(TARGETS) - - install: $(TARG_INSTALL) -+ $(INSTALL) -d $(DESTDIR)$(bindir) - set -xe; for f in $(TARG_INSTALL); \ -- do $(INSTALL_PROGRAM) $$f $(bin_dir)/$$f; done -+ do $(INSTALL_PROGRAM) $$f $(DESTDIR)$(bindir)/$$f; done - - uninstall: -- for f in $(TARGETS); do rm -f $(bin_dir)/$$f; done -+ for f in $(TARGETS); do rm -f $(DESTDIR)$(bindir)/$$f; done - - adnshost: $(ADH_OBJS) $(DYNAMIC_DEP) - $(CC) $(LDFLAGS) $(ADH_OBJS) $(DYNAMIC_LINK) -o $@ $(LDLIBS) -diff -Nru adns-1.0/settings.make.in adns-1.0.new/settings.make.in ---- adns-1.0/settings.make.in Sun Sep 17 03:01:11 2000 -+++ adns-1.0.new/settings.make.in Mon Nov 19 02:36:25 2001 -@@ -47,10 +47,10 @@ - MKSHLIB_3= @MKSHLIB_3@ - - prefix= @prefix@ --exec_prefix= @exec_prefix@ --bin_dir= $(exec_prefix)/bin --lib_dir= $(exec_prefix)/lib --include_dir= $(prefix)/include -+execprefix= @execprefix@ -+bindir= @bindir@ -+libdir= @libdir@ -+includedir= @includedir@ - - AC_INSTALL= @INSTALL@ - ifeq ($(AC_INSTALL),./install-sh -c) -diff -Nru adns-1.0/src/Makefile.in adns-1.0.new/src/Makefile.in ---- adns-1.0/src/Makefile.in Sun Sep 17 02:24:24 2000 -+++ adns-1.0.new/src/Makefile.in Mon Nov 19 02:35:18 2001 -@@ -29,13 +29,14 @@ - include adns.make - - install: -+ $(INSTALL) -d $(DESTDIR)$(libdir) $(DESTDIR)$(includedir) - set -xe; for f in $(TARGETS); \ -- do $(INSTALL_DATA) $$f $(lib_dir)/$$f; done -- $(INSTALL_DATA) $(srcdir)/../src/adns.h $(include_dir)/adns.h -+ do $(INSTALL_DATA) $$f $(DESTDIR)$(libdir)/$$f; done -+ $(INSTALL_DATA) $(srcdir)/../src/adns.h $(DESTDIR)$(includedir)/adns.h - - uninstall: -- for f in $(TARGETS); do rm -f $(lib_dir)/$$f; done -- rm -f $(include_dir)/adns.h -+ for f in $(TARGETS); do rm -f $(DESTDIR)$(libdir)/$$f; done -+ rm -f $(DESTDIR)$(includedir)/adns.h - - ALLOBJS= $(LIBOBJS) - ---- adns-1.0/dynamic/Makefile.in~ Mon Nov 19 03:01:54 2001 -+++ adns-1.0/dynamic/Makefile.in Mon Nov 19 03:01:54 2001 -@@ -31,11 +31,12 @@ - ALLOBJS= $(addsuffix _p.o, $(basename $(LIBOBJS))) - - install: -- $(INSTALL_PROGRAM) $(SHLIBFILE) $(lib_dir)/$(SHLIBFILE) -- ln -sf $(SHLIBFILE) $(lib_dir)/$(SHLIBSONAME) -+ $(INSTALL) -d $(DESTDIR)$(libdir) -+ $(INSTALL_PROGRAM) $(SHLIBFILE) $(DESTDIR)$(libdir)/$(SHLIBFILE) -+ ln -sf $(SHLIBFILE) $(DESTDIR)$(libdir)/$(SHLIBSONAME) - - uninstall: -- rm -f $(lib_dir)/$(SHLIBFILE) $(lib_dir)/$(SHLIBSONAME) -+ rm -f $(DESTDIR)$(libdir)/$(SHLIBFILE) $(DESTDIR)$(libdir)/$(SHLIBSONAME) - - $(SHLIBFORLINK): - ln -s $(SHLIBSONAME) $(SHLIBFORLINK) diff --git a/adns-ac_fix.patch b/adns-ac_fix.patch deleted file mode 100644 index 4565ef0..0000000 --- a/adns-ac_fix.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- adns-1.0/configure.in~ Mon Nov 19 02:41:12 2001 -+++ adns-1.0/configure.in Mon Nov 19 02:41:12 2001 -@@ -25,7 +25,7 @@ - AC_CONFIG_HEADER(src/config.h) - - dnl DPKG_CACHED_TRY_COMPILE(,,,,,) --define(DPKG_CACHED_TRY_COMPILE,[ -+define([DPKG_CACHED_TRY_COMPILE],[ - AC_MSG_CHECKING($1) - AC_CACHE_VAL($2,[ - AC_TRY_COMPILE([$3],[$4],[$2=yes],[$2=no]) diff --git a/adns-autoconf-noexpand.patch b/adns-autoconf-noexpand.patch deleted file mode 100644 index efd5b41..0000000 --- a/adns-autoconf-noexpand.patch +++ /dev/null @@ -1,15 +0,0 @@ ---- adns-1.2/settings.make.in.noexpand 2006-05-08 10:24:44.000000000 -0400 -+++ adns-1.2/settings.make.in 2006-05-08 10:25:46.000000000 -0400 -@@ -47,9 +47,9 @@ - - prefix= @prefix@ - exec_prefix= @exec_prefix@ --bin_dir= $(exec_prefix)/bin --lib_dir= $(exec_prefix)/lib --include_dir= $(prefix)/include -+bin_dir= @bindir@ -+lib_dir= @libdir@ -+include_dir= @includedir@ - - AC_INSTALL= @INSTALL@ - ifeq ($(AC_INSTALL),./install-sh -c) diff --git a/adns.spec b/adns.spec index 5fd81be..3e2faa6 100644 --- a/adns.spec +++ b/adns.spec @@ -1,17 +1,17 @@ Name: adns -Version: 1.2 -Release: 6%{?dist} +Version: 1.6.1 +Release: 5%{?dist} Summary: Advanced, easy to use, asynchronous-capable DNS client library -Group: System Environment/Libraries -License: GPL+ +License: GPL-1.0-or-later URL: http://www.chiark.greenend.org.uk/~ian/adns/ -Source0: ftp://ftp.chiark.greenend.org.uk/users/ian/adns/%{name}-%{version}.tar.gz -Patch1: %{name}-ac_fix.patch -Patch2: %{name}-autoconf-noexpand.patch -#BuildRequires: autoconf -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) +Source0: http://www.chiark.greenend.org.uk/~ian/adns/ftp/%{name}-%{version}.tar.gz + +BuildRequires: autoconf +BuildRequires: gcc +BuildRequires: make + %description adns is a resolver library for C (and C++) programs. In contrast with @@ -44,7 +44,6 @@ following features: %package devel Summary: Asynchronous-capable DNS client library - development files -Group: Development/Libraries Requires: %{name} = %{version} %description devel @@ -52,7 +51,7 @@ Asynchronous-capable DNS client library - development files. %package progs Summary: Asynchronous-capable DNS client library - utility programs -Group: Applications/System +Requires: %{name} = %{version} %description progs DNS utility programs: adns also comes with a number of utility @@ -70,46 +69,188 @@ programs for use from the command line and in scripts: %prep %setup -q -%patch1 -p1 -b .ac_fix -%patch2 -p1 -b .noexpand %build -#aclocal -#%{__autoconf} +%ifarch sparcv9 sparc64 s390 s390x export CFLAGS="$RPM_OPT_FLAGS -D_GNU_SOURCE -fPIC" +%else +export CFLAGS="$RPM_OPT_FLAGS -D_GNU_SOURCE -fpic" +%endif +autoreconf -fiv %configure --enable-dynamic make %{?_smp_mflags} %install rm -rf $RPM_BUILD_ROOT -make install \ - prefix=$RPM_BUILD_ROOT/usr \ - bin_dir=$RPM_BUILD_ROOT%{_bindir} \ - include_dir=$RPM_BUILD_ROOT%{_includedir} \ - lib_dir=$RPM_BUILD_ROOT%{_libdir} +make \ + prefix=$RPM_BUILD_ROOT%{_prefix} \ + bindir=$RPM_BUILD_ROOT%{_bindir} \ + includedir=$RPM_BUILD_ROOT%{_includedir} \ + libdir=$RPM_BUILD_ROOT%{_libdir} \ + install -%clean -rm -fr $RPM_BUILD_ROOT +rm -f $RPM_BUILD_ROOT%{_libdir}/libadns.a -%post -p /sbin/ldconfig -%postun -p /sbin/ldconfig +%ldconfig_scriptlets %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 -%{_libdir}/*.a %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) + +* Fri Feb 10 2017 Fedora Release Engineering - 1.4-20 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild + +* Wed Feb 03 2016 Fedora Release Engineering - 1.4-19 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild + +* Tue Jun 16 2015 Fedora Release Engineering - 1.4-18 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild + +* Fri Aug 15 2014 Fedora Release Engineering - 1.4-17 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild + +* Sat Jun 07 2014 Fedora Release Engineering - 1.4-16 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild + +* Sat Aug 03 2013 Fedora Release Engineering - 1.4-15 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild + +* Wed Feb 13 2013 Fedora Release Engineering - 1.4-14 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild + +* Wed Jul 18 2012 Fedora Release Engineering - 1.4-13 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild + +* Tue May 22 2012 Adam Tkac - 1.4-12 +- adnsresfilter: fix segfault when --brackets option is used (#761513) + +* Thu Jan 12 2012 Fedora Release Engineering - 1.4-11 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild + +* Mon Feb 07 2011 Fedora Release Engineering - 1.4-10 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild + +* Fri Jun 04 2010 Adam Tkac 1.4-9 +- update source URL + +* Thu Aug 06 2009 Adam Tkac 1.4-8 +- rebuild + +* Thu Aug 06 2009 Adam Tkac 1.4-7 +- don't crash in adns_strerror if parameter is unknown error code (#514838) + +* Fri Jul 24 2009 Fedora Release Engineering - 1.4-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild + +* Mon Feb 23 2009 Fedora Release Engineering - 1.4-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild + +* Thu May 29 2008 Dennis Gilmore - 1.4-4 +- some arches need -fPIC + +* Mon Feb 18 2008 Fedora Release Engineering - 1.4-3 +- Autorebuild for GCC 4.3 + +* Wed Dec 19 2007 Adam Tkac 1.4-2 +- don't ship static libadns.a + +* Wed Dec 19 2007 Adam Tkac 1.4-1 +- updated to 1.4 +- CVS cleanup +- use autoreconf +- build with -fpic instead -fPIC + * Fri Aug 31 2007 Radek Vokál 1.2-6 - rebuilt @@ -132,7 +273,7 @@ rm -fr $RPM_BUILD_ROOT - Removed dependency on autoconf/automake since it builds just fine without that -* Fri Apr 7 2005 Michael Schwendt +* Thu Apr 7 2005 Michael Schwendt - rebuilt * Tue Jul 13 2004 Michael Schwendt 0:1.1-0.fdr.4 diff --git a/sources b/sources index 0ffcdc0..b011f3f 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -4d9ad052125ddd295ee75ea608b992b7 adns-1.2.tar.gz +SHA512 (adns-1.6.1.tar.gz) = 71d8b3368f8055bbf558d7828e772f6689b3370945d7c2061b835c43d4f71971569d1a17c0cfd6e8ebe0602d78cdf22d4915eeb06836e2193f521d51e87fa0a0