diff --git a/ddclient-3.7.1-sysconfig.patch b/ddclient-3.7.1-sysconfig.patch new file mode 100644 index 0000000..83f1b02 --- /dev/null +++ b/ddclient-3.7.1-sysconfig.patch @@ -0,0 +1,10 @@ +--- ddclient-3.7.1/sample-etc_ddclient.conf.orig 2007-05-03 14:25:43.000000000 +0200 ++++ ddclient-3.7.1/sample-etc_ddclient.conf 2007-05-03 14:29:36.000000000 +0200 +@@ -18,6 +18,7 @@ + ## are mentioned here. + ## + ###################################################################### ++# daemon: consider to use /etc/sysconfig/ddclient instead of modifying here + daemon=300 # check every 300 seconds + syslog=yes # log update msgs to syslog + #mail=root # mail all msgs to root diff --git a/ddclient.changes b/ddclient.changes index da48370..455bb0e 100644 --- a/ddclient.changes +++ b/ddclient.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Thu May 3 14:26:56 CEST 2007 - kssingvo@suse.de + +- added sysconfig file, as suggested in bugzilla#268138 +- added /var/cache/ddclient (bugzilla#268138) + ------------------------------------------------------------------- Tue Apr 3 20:38:18 CEST 2007 - kssingvo@suse.de diff --git a/ddclient.spec b/ddclient.spec index 5c93acf..8514a86 100644 --- a/ddclient.spec +++ b/ddclient.spec @@ -17,15 +17,17 @@ Requires: perl >= 5.004 Suggests: perl-IO-Socket-SSL Autoreqprov: on Version: 3.7.1 -Release: 9 +Release: 15 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-fw_debug.patch +Patch3: ddclient-3.7.1-sysconfig.patch %description ddclient is a small full-featured client requiring only Perl. Supported @@ -51,6 +53,7 @@ Authors: %patch0 -p1 -b _orig %patch1 -p1 %patch2 -p1 +%patch3 -p1 %build #export CFLAGS="$RPM_OPT_FLAGS" @@ -72,10 +75,15 @@ 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 -# init script +# 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 + +%post +%{fillup_only} %preun %stop_on_removal ddclient @@ -94,9 +102,14 @@ ln -s %{_sysconfdir}/init.d/ddclient $RPM_BUILD_ROOT/usr/sbin/rcddclient %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* %changelog +* Thu May 03 2007 - kssingvo@suse.de +- added sysconfig file, as suggested in bugzilla#268138 +- added /var/cache/ddclient (bugzilla#268138) * Tue Apr 03 2007 - kssingvo@suse.de - fixed issue in debug messages (bugzilla#250170) * Tue Feb 13 2007 - kssingvo@suse.de diff --git a/ddclient.sysconfig b/ddclient.sysconfig new file mode 100644 index 0000000..fa12879 --- /dev/null +++ b/ddclient.sysconfig @@ -0,0 +1,18 @@ +## Path: Network/DNS/Utilities +## Description: ddclient intervall option +## Type: integer +## Default: 300 +## ServiceRestart: ddclient +# +# intervall to check (in daemon mode) +# +DDCLIENT_INTERVALL="300" + +## Description: ddclient start options +## Type: string +## Default: "" +## ServiceRestart: ddclient +# +# additional startup options, e.g. "-debug" +# +DDCLIENT_OPTIONS="" diff --git a/rc.ddclient b/rc.ddclient index ad95679..4e0a1b1 100644 --- a/rc.ddclient +++ b/rc.ddclient @@ -28,17 +28,22 @@ # 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 test -s "$DDCLIENT_CONFIG" || exit 6 +test -s "$DDCLIENT_SYSCONFIG" && . "$DDCLIENT_SYSCONFIG" + +dd_intervall=${DDCLIENT_INTERVALL:-300} + rc_reset case "$1" in start) echo -n "Starting ddclient daemon" - startproc "$DDCLIENT_BIN" -daemon 300 + startproc "$DDCLIENT_BIN" -daemon $dd_intervall $DDCLIENT_OPTIONS rc_status -v ;; stop)