openSUSE Build Service

Overview Repositories Revisions Requests Users Attributes Meta

File project.diff of Package ddclient (Revision 8d76589107dab7efb98872386a42acfe)

Currently displaying revision 8d76589107dab7efb98872386a42acfe , Show latest

--- ddclient.changes.orig
+++ ddclient.changes
@@ -1,4 +1,25 @@
 -------------------------------------------------------------------
+Tue Sep  1 11:01:31 UTC 2009 - chris@computersalat.de
+
+- rework config patch
+  o now one patch
+  o merged
+    - ddclient-3.6.3-config.patch
+    - ddclient-3.7.1-config.patch
+    - ddclient-3.7.1-sysconfig.patch
+    to ddclient-3.8.0-config.patch
+  o defaults for ppp0
+- added update_nic.patch
+  * opt('use') should have priority to global-defaults
+- init script
+  o beautify
+  o should start rp-pppoe
+  o ppp0 as a "use=" default if not set in ddclient.conf
+- sysconfig
+  o added argument list for DDCLIENT_OPTIONS
+- cleanup spec
+
+-------------------------------------------------------------------
 Sun Aug 30 20:12:52 CEST 2009 - coolo@novell.com
 
 - use %patch0
--- ddclient.spec.orig
+++ ddclient.spec
@@ -17,25 +17,27 @@
 
 # norootforbuild
 
+#Distribution:   %dist
+#Packager:       %packager
+#Vendor:         %vendor
 
 Name:           ddclient
+Summary:        A Perl Client to Update Dynamic DNS Entries
+Version:        3.8.0
+Release:        4
 License:        GPL v2 or later
 Group:          Productivity/Networking/DNS/Utilities
-Requires:       perl >= 5.004
-Suggests:       perl-IO-Socket-SSL
-PreReq:         %fillup_prereq
 AutoReqProv:    on
-Version:        3.8.0
-Release:        4
 Url:            http://ddclient.sourceforge.net/
-BuildRoot:      %{_tmppath}/%{name}-%{version}-build
-Summary:        A Perl Client to Update Dynamic DNS Entries
 Source0:        http://switch.dl.sourceforge.net/sourceforge/ddclient/%{name}-%{version}.tar.bz2
 Source1:        rc.ddclient
-Source2:        ddclient.sysconfig
-Patch0:         ddclient-3.6.3-config.patch
-Patch1:         ddclient-3.7.1-config.patch
-Patch2:         ddclient-3.7.1-sysconfig.patch
+Source2:        %{name}.sysconfig
+Patch0:         %{name}-3.8.0-config.patch
+Patch1:         %{name}-3.8.0-update_nic.patch
+BuildRoot:      %{_tmppath}/%{name}-%{version}-build
+PreReq:         %fillup_prereq
+Requires:       perl >= 5.004
+Suggests:       perl-IO-Socket-SSL
 
 %description
 ddclient is a small full-featured client requiring only Perl. Supported
@@ -58,9 +60,8 @@ Authors:
 
 %prep
 %setup
-%patch0 -p1 -b _orig
+%patch0 -p1
 %patch1 -p1
-%patch2 -p1
 rm -f sample-etc_ddclient.conf.orig
 chmod a-x sample-etc*
 mkdir examples
@@ -81,16 +82,16 @@ mv sample-ddclient-wrapper.sh examples
 
 %install
 #make DESTDIR=$RPM_BUILD_ROOT install
-mkdir -p $RPM_BUILD_ROOT/usr/sbin
-mkdir -p $RPM_BUILD_ROOT/%{_sysconfdir}/init.d
-install -m 755 %{name} $RPM_BUILD_ROOT/usr/sbin/
-install -m 644 sample-etc_ddclient.conf $RPM_BUILD_ROOT/%{_sysconfdir}/ddclient.conf
+%{__mkdir_p} $RPM_BUILD_ROOT%{_sbindir}
+%{__mkdir_p} $RPM_BUILD_ROOT/%{_sysconfdir}/init.d
+%{__install} -m 755 %{name} $RPM_BUILD_ROOT%{_sbindir}/
+%{__install} -m 644 sample-etc_ddclient.conf $RPM_BUILD_ROOT/%{_sysconfdir}/%{name}.conf
 # init script and config file
-install -m 755 %{SOURCE1} $RPM_BUILD_ROOT/%{_sysconfdir}/init.d/ddclient
-ln -s %{_sysconfdir}/init.d/ddclient $RPM_BUILD_ROOT/usr/sbin/rcddclient
-install -d -m 755 $RPM_BUILD_ROOT/var/adm/fillup-templates
-install -m 644 %{SOURCE2} $RPM_BUILD_ROOT/var/adm/fillup-templates/sysconfig.ddclient
-install -d -m 755 $RPM_BUILD_ROOT/var/cache/ddclient
+%{__install} -m 755 %{SOURCE1} $RPM_BUILD_ROOT/%{_sysconfdir}/init.d/%{name}
+%{__ln_s} %{_sysconfdir}/init.d/%{name} $RPM_BUILD_ROOT%{_sbindir}/rc%{name}
+%{__install} -d -m 755 $RPM_BUILD_ROOT/var/adm/fillup-templates
+%{__install} -m 644 %{SOURCE2} $RPM_BUILD_ROOT/var/adm/fillup-templates/sysconfig.%{name}
+%{__install} -d -m 755 $RPM_BUILD_ROOT/var/cache/%{name}
 
 %post
 %{fillup_only}
@@ -104,16 +105,16 @@ install -d -m 755 $RPM_BUILD_ROOT/var/ca
 
 %clean
 # Clear up the mess
-[ "$RPM_BUILD_ROOT" != "" ] && [ -d $RPM_BUILD_ROOT ] && rm -rf $RPM_BUILD_ROOT;
+%{__rm} -rf $RPM_BUILD_ROOT;
 
 %files
 %defattr(-, root, root)
-%config(noreplace) %attr(600,root,root) %{_sysconfdir}/ddclient.conf
-%config %attr(0755,root,root) /etc/init.d/ddclient
-/usr/sbin/%{name}
-/usr/sbin/rcddclient
-/var/adm/fillup-templates/sysconfig.ddclient
-%dir /var/cache/ddclient
 %doc COPY* README* sample* examples
+%config(noreplace) %attr(600,root,root) %{_sysconfdir}/%{name}.conf
+%config %attr(0755,root,root) /etc/init.d/%{name}
+%{_sbindir}/%{name}
+%{_sbindir}/rc%{name}
+/var/adm/fillup-templates/sysconfig.%{name}
+%dir /var/cache/%{name}
 
 %changelog
--- ddclient.sysconfig.orig
+++ ddclient.sysconfig
@@ -13,6 +13,19 @@ DDCLIENT_INTERVALL="300"
 ## Default:		""
 ## ServiceRestart:	ddclient
 #
-# additional startup options, e.g. "-debug"
+# optional per-service arguments (see below).
+#
+#  -{no}retry            : retry failed updates. (default: noretry).
+#  -{no}force            : force an update even if the update may be unnecessary (default: noforce).
+#  -timeout max          : wait at most 'max' seconds for the host to respond (default: 0).
+#  -{no}syslog           : log messages to syslog (default: nosyslog).
+#  -facility {type}      : log messages to syslog to facility {type} (default: daemon).
+#  -priority {pri}       : log messages to syslog with priority {pri} (default: notice).
+#  -{no}exec             : do {not} execute; just show what would be done (default: exec).
+#  -{no}debug            : print {no} debugging information (default: nodebug).
+#  -{no}verbose          : print {no} verbose information (default: noverbose).
+#  -{no}quiet            : print {no} messages for unnecessary updates (default: noquiet).
+#  -help                 : this message (default: 0).
+#  -{no}query            : print {no} ip addresses and exit.
 #
 DDCLIENT_OPTIONS=""
--- rc.ddclient.orig
+++ rc.ddclient
@@ -12,9 +12,9 @@
 ### BEGIN INIT INFO
 # Provides:          ddclient
 # Required-Start:    $syslog $local_fs $network
-# Should-Start:      $time ypbind sendmail $remote_fs
+# Should-Start:      $time ypbind sendmail $remote_fs rp-pppoe
 # Required-Stop:     $syslog $local_fs
-# Should-Stop:       $time ypbind sendmail $remote_fs
+# Should-Stop:       $time ypbind sendmail $remote_fs rp-pppoe
 # Default-Start:     3 5
 # Default-Stop:      0 1 2 6
 # Short-Description: ddclient a daemon to update dynamic DNS entries
@@ -25,59 +25,104 @@
 # 
 
 
-# Source SuSE config, only if exists with size greater zero
-test -s /etc/rc.status && . /etc/rc.status
-
-DDCLIENT_SYSCONFIG=/etc/sysconfig/ddclient
-DDCLIENT_CONFIG=/etc/ddclient.conf
 DDCLIENT_BIN=/usr/sbin/ddclient
+DDCLIENT_CONFIG=/etc/ddclient.conf
+DDCLIENT_SYSCONFIG=/etc/sysconfig/ddclient
 
-test -s "$DDCLIENT_CONFIG" || exit 6
-
-test -s "$DDCLIENT_SYSCONFIG" && . "$DDCLIENT_SYSCONFIG"
+[ -x $DDCLIENT_BIN ] || exit 5
+[ -s $DDCLIENT_CONFIG ] || exit 6
+[ -s $DDCLIENT_SYSCONFIG ] && . $DDCLIENT_SYSCONFIG
 
+# some defaults
 dd_intervall=${DDCLIENT_INTERVALL:-300}
 
+# if no "use=" is set in ddclient.conf try 'ppp0' as a default
+if [ `/bin/cat $DDCLIENT_CONFIG | grep -e "^use=" >/dev/null; echo $?` -eq 0 ]; then
+  dd_use=
+else
+  dd_use="-use if -if ppp0"
+fi
+
+# Shell functions sourced from /etc/rc.status:
+#      rc_check         check and set local and overall rc status
+#      rc_status        check and set local and overall rc status
+#      rc_status -v     ditto but be verbose in local rc status
+#      rc_status -v -r  ditto and clear the local rc status
+#      rc_failed        set local and overall rc status to failed
+#      rc_failed <num>  set local and overall rc status to <num><num>
+#      rc_reset         clear local rc status (overall remains)
+#      rc_exit          exit appropriate to overall rc status
+. /etc/rc.status
+
+# First reset status of this service
 rc_reset
 
+# Return values acc. to LSB for all commands but status:
+# 0 - success
+# 1 - generic or unspecified error
+# 2 - invalid or excess argument(s)
+# 3 - unimplemented feature (e.g. "reload")
+# 4 - insufficient privilege
+# 5 - program is not installed
+# 6 - program is not configured
+# 7 - program is not running
+# 
+# Note that starting an already running service, stopping
+# or restarting a not-running service as well as the restart
+# with force-reload (in case signalling is not supported) are
+# considered a success.
+
 case "$1" in
   start)
-        echo -n "Starting ddclient daemon"
-        startproc "$DDCLIENT_BIN" -daemon $dd_intervall $DDCLIENT_OPTIONS
-        rc_status -v
-        ;;
+	echo -n "Starting ddclient daemon :"
+	/sbin/startproc "$DDCLIENT_BIN" -daemon $dd_intervall "$dd_use" $DDCLIENT_OPTIONS
+
+	# remember status and be verbose
+	rc_status -v
+	;;
   stop)
-        echo -n "Shutting down ddclient daemon"
-        killproc -TERM `basename "$DDCLIENT_BIN"`
-        rc_status -v
-        ;;
+	echo -n "Shutting down ddclient daemon :"
+	/sbin/killproc -TERM `basename "$DDCLIENT_BIN"`
+
+	# remember status and be verbose
+	rc_status -v
+	;;
   try-restart)
 	$0 status >/dev/null &&  $0 restart
+
 	# Remember status and be quiet
 	rc_status
 	;;
   restart)
-        $0 stop
-        $0 start
-        rc_status
-        ;;
+	$0 stop
+	$0 start
+
+	# Remember status and be quiet
+	rc_status
+	;;
   force-reload)
 #	echo -n "Reload service ddclient"
 	rc_failed 3
+
+	# remember status and be verbose
 	rc_status -v
 	;;
   reload)
 	rc_failed 3
+
+	# remember status and be verbose
 	rc_status -v
 	;;
   status)
-        echo -n "Checking for service ddclient "
-        checkproc `basename "$DDCLIENT_BIN"`
-        rc_status -v
-        ;;
+	echo -n "Checking for service ddclient :"
+	/sbin/checkproc `basename "$DDCLIENT_BIN"`
+
+	# remember status and be verbose
+	rc_status -v
+	;;
   *)
-        echo "Usage: ddclient {start|stop|try-restart|restart|status}"
-        exit 1
+	echo "Usage: ddclient {start|stop|try-restart|restart|status}"
+	exit 1
 esac
 
 rc_exit

Places

File project.diff of Package ddclient (Revision 8d76589107dab7efb98872386a42acfe)

Places