packages: ndisc6/ndisc6.spec, ndisc6/rdnssd-uid.patch (NEW), ndisc6/rdnssd....
jajcus
jajcus at pld-linux.org
Wed Jun 15 10:39:37 CEST 2011
Author: jajcus Date: Wed Jun 15 08:39:37 2011 GMT
Module: packages Tag: HEAD
---- Log message:
- rdnssd package added for DNS autoconfiguration in IPv6 networks
- Release: 2
---- Files affected:
packages/ndisc6:
ndisc6.spec (1.9 -> 1.10) , rdnssd-uid.patch (NONE -> 1.1) (NEW), rdnssd.init (NONE -> 1.1) (NEW), rdnssd.sysconfig (NONE -> 1.1) (NEW), rdnssd.upstart (NONE -> 1.1) (NEW)
---- Diffs:
================================================================
Index: packages/ndisc6/ndisc6.spec
diff -u packages/ndisc6/ndisc6.spec:1.9 packages/ndisc6/ndisc6.spec:1.10
--- packages/ndisc6/ndisc6.spec:1.9 Sat Mar 19 12:13:02 2011
+++ packages/ndisc6/ndisc6.spec Wed Jun 15 10:39:32 2011
@@ -3,16 +3,21 @@
Summary(pl.UTF-8): Narzędzia do rozpoznawania sąsiadów dla IPv6
Name: ndisc6
Version: 1.0.1
-Release: 1
+Release: 2
License: GPL v2
Group: Networking/Admin
Source0: http://www.remlab.net/files/ndisc6/%{name}-%{version}.tar.bz2
# Source0-md5: d0b8233a60e29ad78d9aebb8cef0b3f2
+Source1: rdnssd.init
+Source2: rdnssd.sysconfig
+Source3: rdnssd.upstart
Patch0: %{name}-no_chown.patch
+Patch1: rdnssd-uid.patch
URL: http://www.remlab.net/ndisc6/
BuildRequires: autoconf
BuildRequires: automake
BuildRequires: libtool
+BuildRequires: rpmbuild(macros) >= 1.268
BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
%description
@@ -22,7 +27,6 @@
- rdisc6: ICMPv6 Router Discovery tool
- tcptraceroute6: lightweight IPv6 tcptraceroute
- traceroute6: IPv6 traceroute
-- rdnssd: Recursive DNS Servers discovery Daemon
%description -l pl.UTF-8
NDisc6 jest małym zestawem użytecznych narzędzi do dla sieci IPv6.
@@ -35,12 +39,48 @@
- tcptraceroute6: lekki program do pokazywania trasy pakietów TCP
w sieciach IPv6
- traceroute6: program do pokazywania trasy pakietów w sieciach IPv6
-- rdnssd: demon do wykrywania rekursywnych serwerów DNS w sieciach
- IPv6
+
+%package rdnssd
+Summary: Recursive DNS Servers discovery Daemon
+Summary(pl.UTF-8): Demon wykrywający rekursywne serwerów DNS w sieciach IPv6
+Group: Networking/Daemons
+Requires(post,preun): /sbin/chkconfig
+Requires(postun): /usr/sbin/groupdel
+Requires(postun): /usr/sbin/userdel
+Requires(pre): /bin/id
+Requires(pre): /usr/bin/getgid
+Requires(pre): /usr/sbin/groupadd
+Requires(pre): /usr/sbin/useradd
+Requires: rc-scripts >= 0.4.3.0
+Requires: %{name} = %{version}-%{release}
+Provides: group(rdnssd)
+Provides: user(rdnssd)
+
+%description rdnssd
+Recursive DNS Servers discovery Daemon.
+
+%description -l pl.UTF-8 rdnssd
+Demon do wykrywania rekursywnych serwerów DNS w sieciach IPv6.
+
+%package rdnssd-upstart
+Summary: Upstart job sescription for rdnssd
+Summary(pl.UTF-8): Opis zadania Upstart dla rdnssd
+Group: Networking/Daemons
+Requires: upstart >= 0.6
+Requires: %{name}-rdnssd = %{version}-%{release}
+
+%description rdnssd-upstart
+Upstart job description for the Recursive DNS Servers discovery
+Daemon.
+
+%description -l pl.UTF-8 rdnssd-upstart
+Opis zadania Upstart dla demona do wykrywania rekursywnych serwerów
+DNS w sieciach IPv6.
%prep
%setup -q
%patch0 -p1
+%patch1 -p1
%build
%{__libtoolize}
@@ -55,19 +95,51 @@
LDFLAGS="%{rpmldflags}"
%install
+install -d $RPM_BUILD_ROOT/etc/{rc.d/init.d,sysconfig,init}
+
%{__make} install \
DESTDIR=$RPM_BUILD_ROOT
+touch $RPM_BUILD_ROOT/var/run/rdnssd/resolv.conf
+
+install %{SOURCE1} $RPM_BUILD_ROOT/etc/rc.d/init.d/rdnssd
+install %{SOURCE2} $RPM_BUILD_ROOT/etc/sysconfig/rdnssd
+install %{SOURCE3} $RPM_BUILD_ROOT/etc/init/rdnssd.conf
+
%find_lang %{name}
+%pre rdnssd
+%groupadd -g 269 rdnssd
+%useradd -u 269 -d /usr/share/empty -s /bin/false -c "rdnssd" -g rdnssd rdnssd
+
+%post rdnssd
+/sbin/chkconfig --add rdnssd
+%service rdnssd restart "RDNSS daemon"
+
+%preun rdnssd
+if [ "$1" = "0" ]; then
+ %service rdnssd stop
+ /sbin/chkconfig --del rdnssd
+fi
+
+%postun rdnssd
+if [ "$1" = "0" ]; then
+ %userremove rdnssd
+ %groupremove rdnssd
+fi
+
+%post rdnssd-upstart
+%upstart_post rdnssd
+
+%postun rdnssd-upstart
+%upstart_postun rdnssd
+
%clean
rm -rf $RPM_BUILD_ROOT
%files -f %{name}.lang
%defattr(644,root,root,755)
%doc ChangeLog NEWS README
-%dir %{_sysconfdir}/rdnssd
-%attr(755,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/rdnssd/merge-hook
%attr(755,root,root) %{_bindir}/dnssort
%attr(755,root,root) %{_bindir}/name2addr
%attr(755,root,root) %ghost %{_bindir}/addr2name
@@ -86,17 +158,34 @@
%attr(644,root,root) %ghost %{_mandir}/man1/tcpspray6.1
%{_mandir}/man8/ndisc6.8*
%{_mandir}/man8/rdisc6.8*
-%{_mandir}/man8/rdnssd.8*
%{_mandir}/man8/rltraceroute6.8*
%attr(644,root,root) %ghost %{_mandir}/man8/tcptraceroute6.8
%attr(644,root,root) %ghost %{_mandir}/man8/tracert6.8
+%files rdnssd
+%defattr(644,root,root,755)
+%attr(754,root,root) /etc/rc.d/init.d/rdnssd
+%attr(644,root,root) %config(noreplace) %verify(not md5 mtime size) /etc/sysconfig/rdnssd
+%dir %{_sysconfdir}/rdnssd
+%attr(755,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/rdnssd/merge-hook
+%{_mandir}/man8/rdnssd.8*
+%attr(775,root,rdnssd) %dir /var/run/rdnssd
+%ghost %attr(644,rdnssd,rdnssd) /var/run/rdnssd/resolv.conf
+
+%files rdnssd-upstart
+%defattr(644,root,root,755)
+%config(noreplace) %verify(not md5 mtime size) /etc/init/rdnssd.conf
+
%define date %(echo `LC_ALL="C" date +"%a %b %d %Y"`)
%changelog
* %{date} PLD Team <feedback at pld-linux.org>
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.10 2011/06/15 08:39:32 jajcus
+- rdnssd package added for DNS autoconfiguration in IPv6 networks
+- Release: 2
+
Revision 1.9 2011/03/19 11:13:02 duddits
- fixed desc
- updated URL and Source0
================================================================
Index: packages/ndisc6/rdnssd-uid.patch
diff -u /dev/null packages/ndisc6/rdnssd-uid.patch:1.1
--- /dev/null Wed Jun 15 10:39:37 2011
+++ packages/ndisc6/rdnssd-uid.patch Wed Jun 15 10:39:32 2011
@@ -0,0 +1,24 @@
+diff -dur ndisc6-1.0.1.orig/doc/rdnssd.8-in ndisc6-1.0.1/doc/rdnssd.8-in
+--- ndisc6-1.0.1.orig/doc/rdnssd.8-in 2008-02-08 16:39:31.000000000 +0100
++++ ndisc6-1.0.1/doc/rdnssd.8-in 2011-06-15 10:12:43.000000000 +0200
+@@ -63,7 +63,7 @@
+ .TP
+ .BR "\-u username" " or " "\-\-user username"
+ Override the user that the program will run as. By default, it runs as
+-.BR "nobody" "."
++.BR "rdnssd" "."
+
+ .TP
+ .BR "\-V" " or " "\-\-version"
+diff -dur ndisc6-1.0.1.orig/rdnssd/rdnssd.c ndisc6-1.0.1/rdnssd/rdnssd.c
+--- ndisc6-1.0.1.orig/rdnssd/rdnssd.c 2008-03-23 10:54:25.000000000 +0100
++++ ndisc6-1.0.1/rdnssd/rdnssd.c 2011-06-15 10:13:02.000000000 +0200
+@@ -551,7 +551,7 @@
+
+ int main (int argc, char *argv[])
+ {
+- const char *username = "nobody", *hookpath = NULL,
++ const char *username = "rdnssd", *hookpath = NULL,
+ *pidpath = LOCALSTATEDIR "/run/rdnssd.pid",
+ *resolvpath = LOCALSTATEDIR "/run/rdnssd/resolv.conf";
+ int pidfd, val, pipefd = -1;
================================================================
Index: packages/ndisc6/rdnssd.init
diff -u /dev/null packages/ndisc6/rdnssd.init:1.1
--- /dev/null Wed Jun 15 10:39:37 2011
+++ packages/ndisc6/rdnssd.init Wed Jun 15 10:39:32 2011
@@ -0,0 +1,78 @@
+#!/bin/sh
+#
+# rdnssd Starts rdnssd
+#
+# chkconfig: 2345 09 85
+# description: rdnssd configures DNS servers discovered via an IPv6 Router
+# Announcements
+
+# Source function library
+. /etc/rc.d/init.d/functions
+
+MERGE_HOOK=""
+
+# Get service config
+if [ -f /etc/sysconfig/rdnssd ]; then
+ . /etc/sysconfig/rdnssd
+fi
+
+start() {
+ # Check if the service is already running?
+ if [ -f /var/lock/subsys/rdnssd ]; then
+ msg_already_running "rdnssd"
+ return
+ fi
+
+
+ msg_starting "rdnssd"
+ emit starting JOB=rdnssd
+ if [ -n "$MERGE_HOOK" ] ; then
+ daemon /usr/sbin/rdnssd -H $MERGE_HOOK
+ else
+ daemon /usr/sbin/rdnssd
+ fi
+ emit --no-wait started JOB=rdnssd
+ RETVAL=$?
+ [ $RETVAL -eq 0 ] && touch /var/lock/subsys/rdnssd
+}
+
+stop() {
+ if [ ! -f /var/lock/subsys/rdnssd ]; then
+ msg_not_running "rdnssd"
+ return
+ fi
+
+ msg_stopping "rdnssd"
+ emit stopping JOB=rdnssd
+ killproc rdnssd
+ emit --no-wait stopped JOB=rdnssd
+ rm -f /var/lock/subsys/rdnssd >/dev/null 2>&1
+}
+
+upstart_controlled
+
+RETVAL=0
+# See how we were called.
+case "$1" in
+ start)
+ start
+ ;;
+ stop)
+ stop
+ ;;
+ restart|try-restart)
+ stop
+ start
+ ;;
+ reload|force-reload)
+ ;;
+ status)
+ status rdnssd
+ exit $?
+ ;;
+ *)
+ msg_usage "$0 {start|stop|restart|status}"
+ exit 3
+esac
+
+exit $RETVAL
================================================================
Index: packages/ndisc6/rdnssd.sysconfig
diff -u /dev/null packages/ndisc6/rdnssd.sysconfig:1.1
--- /dev/null Wed Jun 15 10:39:37 2011
+++ packages/ndisc6/rdnssd.sysconfig Wed Jun 15 10:39:32 2011
@@ -0,0 +1,7 @@
+# Customized settings for RDNSS Daemon
+
+# Define nice level for rdnssd
+#SERVICE_RUN_NICE_LEVEL="+0"
+
+# Comment-out or change if you don't want rdnssd to modify your resolv.conf
+MERGE_HOOK="/etc/rdnssd/merge-hook"
================================================================
Index: packages/ndisc6/rdnssd.upstart
diff -u /dev/null packages/ndisc6/rdnssd.upstart:1.1
--- /dev/null Wed Jun 15 10:39:37 2011
+++ packages/ndisc6/rdnssd.upstart Wed Jun 15 10:39:32 2011
@@ -0,0 +1,16 @@
+
+start on pld.sysinit-done
+stop on pld.shutdown-started
+
+respawn
+
+script
+ . /etc/sysconfig/rdnssd
+ if [ -n "$MERGE_HOOK" ] ; then
+ exec /usr/sbin/rdnssd -f -H "$MERGE_HOOK"
+ else
+ exec /usr/sbin/rdnssd -f
+ fi
+end script
+
+# vi: ft=upstart
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/ndisc6/ndisc6.spec?r1=1.9&r2=1.10&f=u
More information about the pld-cvs-commit
mailing list