From 1c8e673e41c6d1e0336aac1cbe8c40e5740c145d Mon Sep 17 00:00:00 2001 From: fredrik Date: Fri, 22 Jul 2005 03:06:27 +0000 Subject: [PATCH] Changes suggested from fedora-extras-list. git-svn-id: svn+ssh://svn.dolda2000.com/srv/svn/repos/src/icmp-dn@295 959494ce-11ee-0310-bf91-de5d638817bd --- ChangeLog | 4 +++ Makefile.am | 1 + admin/icmpdn.spec.in | 79 ++++++++++++++++++++++++++++------------------------ 3 files changed, 47 insertions(+), 37 deletions(-) diff --git a/ChangeLog b/ChangeLog index 63a85ae..002775f 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +2005-06-27 Fredrik Tolf + * src/icmpdnd.c: Made it possible to set the name explicitly. + * configure.ac: Advance version to 0.3 + 2005-05-25 Fredrik Tolf * admin/Makefile.am: Don't install the RedHat rc script on all systems. diff --git a/Makefile.am b/Makefile.am index ccc8aa6..f8e1b97 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1 +1,2 @@ SUBDIRS = src admin +EXTRA_DIST = COPYING.LIB diff --git a/admin/icmpdn.spec.in b/admin/icmpdn.spec.in index b45a4d0..7074c77 100644 --- a/admin/icmpdn.spec.in +++ b/admin/icmpdn.spec.in @@ -1,68 +1,73 @@ Name: icmpdn Version: @VERSION@ -Release: 1 -Vendor: Fredrik Tolf +Release: 2 License: LGPL for library, GPL for utilities Group: System Environment/Libraries Summary: ICMP host name utilities -Source: %name-%version.tar.gz +Source0: http://www.dolda2000.com/~fredrik/icmp-dn/%name-%version.tar.gz URL: http://www.dolda2000.com/~fredrik/icmp-dn/ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) %description -Since the Linux kernel does not support the ICMP host name facilities as -described in RFC 1788, I wrote a simple implementation in user-space. -It comprises three parts: - - * icmpdnd – The ICMP Domain Name daemon, which listens to ICMP - domain name requests and replies to them. - - * idnlookup – A user utility to query a host for its host name over - ICMP. Like ping and all other utilities that use ICMP, it needs to - be installed SUID root. - - * libnss_icmp.so.2 – A glibc NSS module, which uses idnlookup to - perform queries for the gethostbyaddr function. +icmpdn is an implementation of the RFC 1788 ICMP domain name +facilities for Linux. It includes icmpdnd, a daemon which responds to +ICMP domain name requests from other hosts, idnlookup, which requests +the domain name of another host, and nss_icmp, which is a nameswitch +module for doing reverse hostname lookups via idnlookup. %prep %setup %build -CXXFLAGS="$RPM_OPT_FLAGS" CFLAGS="$RPM_OPT_FLAGS" \ - ./configure \ - --prefix=%_prefix \ - --sysconfdir=%_sysconfdir \ - --libdir=/lib -make +%configure --libdir=/%{_lib} +make %{?_smp_mflags} %install -[ "$RPM_BUILD_ROOT" != "/" ] && [ -d "$RPM_BUILD_ROOT" ] && rm -rf "$RPM_BUILD_ROOT" +rm -rf "$RPM_BUILD_ROOT" mkdir $RPM_BUILD_ROOT make DESTDIR=$RPM_BUILD_ROOT install -mkdir -p $RPM_BUILD_ROOT/etc/init.d -cp admin/icmpdnd "$RPM_BUILD_ROOT/etc/init.d" +mkdir -p $RPM_BUILD_ROOT%{_initrddir} +install -m755 admin/icmpdnd "$RPM_BUILD_ROOT%{_initrddir}" -%post -# $1 = 0 is remove; $1 = 1 is update +%post -p /sbin/ldconfig -%postun -# $1 = 0 is remove; $1 = 1 is update +%postun -p /sbin/ldconfig + +%clean +rm -rf "$RPM_BUILD_ROOT" %files %defattr(-,root,root) -/lib/libnss_icmp.so -/lib/libnss_icmp.la -/lib/libnss_icmp.so.2.0.0 -/lib/libnss_icmp.so.2 +/%{_lib}/libnss_icmp.so +/%{_lib}/libnss_icmp.la +/%{_lib}/libnss_icmp.so.2.0.0 +/%{_lib}/libnss_icmp.so.2 %config %{_sysconfdir}/nss-icmp.conf %attr(4755,root,root) %{_bindir}/idnlookup -%{_sysconfdir}/init.d/icmpdnd +%config %{_initrddir}/icmpdnd %{_sbindir}/icmpdnd -%doc AUTHORS ChangeLog COPYING INSTALL NEWS README +%doc AUTHORS ChangeLog COPYING COPYING.LIB README -%clean -[ "$RPM_BUILD_ROOT" != "/" ] && [ -d "$RPM_BUILD_ROOT" ] && rm -rf "$RPM_BUILD_ROOT" +%changelog +* Thu Jul 07 2005 Fredrik Tolf +- Compressed the description. +- Added COPYING.LIB, which contains the LGPL. + +* Thu Jun 30 2005 Fredrik Tolf +- Fixed more things as from fedora-extras-list: +- Replaced /lib with /%{_lib} +- Run ldconfig in %post and %postun. +- Install init script in %{_initrdddir} instead of %_{sysconfdir}. +* Tue Jun 28 2005 Fredrik Tolf +- Fixed a lot of things after a discussion on fedora-extras-list, + among other things: +- Removed Vendor tag +- Fixed Source tag +- Replaced en-dashes with ASCII hyphens +- Added SMP flags to make +- Removed INSTALL and NEWS from %doc +- Added this ChangeLog section. -- 2.11.0