packages: noip/noip.init, noip/noip.spec, noip/noip.sysconfig (NEW) - rel.2...

[blues]

Author: blues                        Date: Fri Oct 29 16:27:17 2010 GMT
Module: packages                      Tag: HEAD
---- Log message:
- rel.2: add sysconfig with options support; fix config-file ownership
  (see previous commit)

---- Files affected:
packages/noip:
   noip.init (1.4 -> 1.5) , noip.spec (1.31 -> 1.32) , noip.sysconfig (NONE -> 1.1)  (NEW)

---- Diffs:

================================================================
Index: packages/noip/noip.init
diff -u packages/noip/noip.init:1.4 packages/noip/noip.init:1.5
--- packages/noip/noip.init:1.4	Wed May  9 22:46:56 2007
+++ packages/noip/noip.init	Fri Oct 29 18:27:11 2010
@@ -17,6 +17,11 @@
 # Source function library
 . /etc/rc.d/init.d/functions
 
+# Source noip configuration.
+if [ -f /etc/sysconfig/noip ]; then
+	. /etc/sysconfig/noip
+fi
+
 start() {
 	if [ ! -s /etc/noip.conf ]; then
 		echo "You should first run $0 config to prepare configuration";
@@ -24,7 +29,7 @@
 	fi
 	if [ ! -f /var/lock/subsys/noip ]; then
 		msg_starting noip
-		daemon noip
+		daemon noip $OPTIONS
 		RETVAL=$?
 		[ $RETVAL -eq 0 ] && touch /var/lock/subsys/noip
 	else

================================================================
Index: packages/noip/noip.spec
diff -u packages/noip/noip.spec:1.31 packages/noip/noip.spec:1.32
--- packages/noip/noip.spec:1.31	Fri Oct 29 18:16:48 2010
+++ packages/noip/noip.spec	Fri Oct 29 18:27:11 2010
@@ -3,12 +3,13 @@
 Summary(pl.UTF-8):	noip - linuksowy klient serwisu dynamicznego DNS no-ip.com
 Name:		noip
 Version:	2.1.9
-Release:	1
+Release:	2
 License:	GPL
 Group:		Networking/Daemons
 Source0:	http://www.no-ip.com/client/linux/%{name}-duc-linux.tar.gz
 # Source0-md5:	eed8e9ef9edfb7ddc36e187de867fe64
 Source1:	%{name}.init
+Source2:	%{name}.sysconfig
 Patch0:		%{name}-Makefile.patch
 Patch1:		%{name}-config_location.patch
 URL:		http://www.no-ip.com/
@@ -55,14 +56,16 @@
 
 %install
 rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT/etc/rc.d/init.d
+install -d $RPM_BUILD_ROOT/etc/{rc.d/init.d,sysconfig}
 
 %{__make} install \
 	CONFDIR=%{_sysconfdir} \
 	PREFIX=%{_prefix} \
 	DESTDIR=$RPM_BUILD_ROOT
 
-install %{SOURCE1} $RPM_BUILD_ROOT/etc/rc.d/init.d/noip
+install %{SOURCE1} $RPM_BUILD_ROOT/etc/rc.d/init.d/%{name}
+install %{SOURCE2} $RPM_BUILD_ROOT/etc/sysconfig/%{name}
+
 touch $RPM_BUILD_ROOT%{_sysconfdir}/%{name}.conf
 
 %clean
@@ -81,10 +84,10 @@
 %files
 %defattr(644,root,root,755)
 %doc README.FIRST
-%attr(754,root,root) /etc/rc.d/init.d/noip
+%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/%{name}.conf
+%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) /etc/sysconfig/%{name}
 %attr(4750,root,adm) %{_sbindir}/noip
-# FIXME!!!!
-%attr(600,nobody,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/%{name}.conf
+%attr(754,root,root) /etc/rc.d/init.d/%{name}
 
 %define date	%(echo `LC_ALL="C" date +"%a %b %d %Y"`)
 %changelog
@@ -92,6 +95,10 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.32  2010/10/29 16:27:11  blues
+- rel.2: add sysconfig with options support; fix config-file ownership
+  (see previous commit)
+
 Revision 1.31  2010/10/29 16:16:48  blues
 - drop TODO. noip doesn't (and shouldn't) own its config. Privileges are
   dropped _after_ config is read.

================================================================
Index: packages/noip/noip.sysconfig
diff -u /dev/null packages/noip/noip.sysconfig:1.1
--- /dev/null	Fri Oct 29 18:27:17 2010
+++ packages/noip/noip.sysconfig	Fri Oct 29 18:27:11 2010
@@ -0,0 +1,6 @@
+# configuration for noip
+
+# you can specify options for noip here (see 'noip -h')
+# example: OPTIONS="-I eth1"
+OPTIONS=""
+
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/noip/noip.init?r1=1.4&r2=1.5&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/noip/noip.spec?r1=1.31&r2=1.32&f=u