rpms/ddclient/EL-4 ddclient.rwtab, NONE, 1.1 .cvsignore, 1.2, 1.3 ddclient.initscript, 1.1, 1.2 ddclient.spec, 1.3, 1.4 ddclient.sysconfig, 1.1, 1.2 sources, 1.2, 1.3 ddclient.cache.patch, 1.1, NONE

[Robert Scheck (robert)]

Author: robert

Update of /cvs/pkgs/rpms/ddclient/EL-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1965/EL-4

Modified Files:
	.cvsignore ddclient.initscript ddclient.spec 
	ddclient.sysconfig sources 
Added Files:
	ddclient.rwtab 
Removed Files:
	ddclient.cache.patch 
Log Message:
- Upgrade to 3.7.3 (#429438)
- Updated the license tag according to the guidelines



--- NEW FILE ddclient.rwtab ---
files	/var/cache/ddclient/ddclient.cache


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/ddclient/EL-4/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	8 Nov 2004 04:12:32 -0000	1.2
+++ .cvsignore	23 Jan 2008 19:13:03 -0000	1.3
@@ -1 +1 @@
-ddclient-3.6.3.tar.gz
+ddclient-3.7.3.tar.bz2


Index: ddclient.initscript
===================================================================
RCS file: /cvs/pkgs/rpms/ddclient/EL-4/ddclient.initscript,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ddclient.initscript	8 Nov 2004 04:12:32 -0000	1.1
+++ ddclient.initscript	23 Jan 2008 19:13:03 -0000	1.2
@@ -2,7 +2,7 @@
 #
 # ddclient      This shell script takes care of starting and stopping ddclient.
 #
-# chkconfig:    345 65 35
+# chkconfig:    - 65 35
 # description:  ddclient provides support for updating dynamic DNS services
 # processname:  ddclient
 # config:       /etc/sysconfig/ddclient
@@ -21,10 +21,14 @@
 exec="/usr/sbin/ddclient"
 prog=$(basename $exec)
 lockfile=/var/lock/subsys/$prog
+cache=/var/cache/ddclient/ddclient.cache
+pid=/var/run/ddclient/ddclient.pid
 
 start() {
     echo -n $"Starting $prog: "
-    daemon $exec $DDCLIENT_OPTIONS
+    [ -f $cache ] || touch $cache
+    chown ddclient:ddclient $cache && chmod 600 $cache || exit $?
+    daemon --user=ddclient --pidfile=$pid $exec $DDCLIENT_OPTIONS
     retval=$?
     echo
     [ $retval -eq 0 ] && touch $lockfile
@@ -33,6 +37,8 @@
 
 stop() {
     echo -n $"Stopping $prog: "
+    # FIXME: call killproc with -p $pid; not done yet so that a 3.6.6->3.7.1
+    # update will do the right thing with try-restart during the upgrade
     killproc $prog
     retval=$?
     echo
@@ -53,10 +59,6 @@
     restart
 }
 
-fdrstatus() {
-    status $prog
-}
-
 # See how we were called.
 case "$1" in
     start|stop|restart|reload)
@@ -66,12 +68,12 @@
         force_reload
         ;;
     status)
-        fdrstatus
+        status -p $pid $prog
         ;;
-    condrestart)
+    try-restart|condrestart)
         [ ! -f $lockfile ] || restart
         ;;
     *)
-        echo $"Usage: $0 {start|stop|status|restart|condrestart|reload|force-reload}"
+        echo $"Usage: $0 {start|stop|status|restart|try-restart|reload|force-reload}"
         exit 2
 esac


Index: ddclient.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ddclient/EL-4/ddclient.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- ddclient.spec	10 Dec 2004 22:03:02 -0000	1.3
+++ ddclient.spec	23 Jan 2008 19:13:03 -0000	1.4
@@ -1,36 +1,49 @@
 Name:           ddclient
-Version:        3.6.3
-Release:        4
-Epoch:          0
-Summary:        A client to update dynamic DNS host entries.
+Version:        3.7.3
+Release:        1%{?dist}
+Summary:        Client to update dynamic DNS host entries
 
 Group:          System Environment/Daemons
-License:        GPL
-URL:            http://burry.ca:4141/ddclient
-Source:         http://members.rogers.com/ddclient/pub/%{name}-%{version}.tar.gz
+License:        GPLv2+
+URL:            http://ddclient.sourceforge.net/
+Source0:        http://downloads.sourceforge.net/sourceforge/%{name}/%{name}-%{version}.tar.bz2
+Source1:        ddclient.rwtab
 Source2:        ddclient.initscript
 Source3:        ddclient.sysconfig
-# Patch hardcodes cache location to /var/cache.
-# This is reflected in install section below.
-Patch:          ddclient.cache.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+
 BuildArch:      noarch
+Requires(pre):  /usr/sbin/useradd
+Requires(pre):  /usr/sbin/groupadd
+Requires(post): /sbin/chkconfig
+Requires(preun): /sbin/chkconfig
+Requires(hint): perl(IO::Socket::SSL)
 
 %description
 ddclient is a Perl client used to update dynamic DNS entries for accounts
 on many dynamic DNS services.
 
-# -----------------------------------------------------------------------------
 
 %prep
 %setup -q
-%patch -p1
+rm sample-etc_rc.d_init.d_ddclient*
+
+# Move pid file location for running as non-root.
+sed -i -e 's|/var/run/ddclient.pid|/var/run/ddclient/ddclient.pid|' \
+    sample-etc_ddclient.conf
+
+# Send less mail by default, eg. not on every shutdown.
+sed -i -e 's|^mail=|#mail=|' sample-etc_ddclient.conf
+
+# http://sourceforge.net/forum/forum.php?forum_id=706446
+sed -i -e 's|"3\.7\.1"|"3.7.2"|' ddclient
+
+# Backwards compatibility from pre-3.6.6-1
+sed -i -e 's|/etc/ddclient/|%{_sysconfdir}/|' ddclient
 
-# -----------------------------------------------------------------------------
 
 %build
 
-# -----------------------------------------------------------------------------
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -39,47 +52,90 @@
 mkdir -p $RPM_BUILD_ROOT%{_initrddir}
 mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig
 install -p ddclient $RPM_BUILD_ROOT%{_sbindir}
-install -p sample-etc_ddclient.conf $RPM_BUILD_ROOT%{_sysconfdir}/ddclient.conf
+install -pm 600 sample-etc_ddclient.conf \
+    $RPM_BUILD_ROOT%{_sysconfdir}/ddclient.conf
+install -Dpm 644 %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/rwtab.d/ddclient
 install -p %{SOURCE2} $RPM_BUILD_ROOT%{_initrddir}/ddclient
-install -p %{SOURCE3} $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/ddclient
-mkdir -p $RPM_BUILD_ROOT/var/cache
-touch $RPM_BUILD_ROOT/var/cache/ddclient.cache
+install -pm 644 %{SOURCE3} $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/ddclient
+mkdir -p $RPM_BUILD_ROOT/var/cache/ddclient
+touch $RPM_BUILD_ROOT/var/cache/ddclient/ddclient.cache
+mkdir -p $RPM_BUILD_ROOT/var/run/ddclient
 
-# -----------------------------------------------------------------------------
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
-# -----------------------------------------------------------------------------
+
+%pre
+/usr/sbin/groupadd -r ddclient >/dev/null 2>&1 || :
+/usr/sbin/useradd -r -M -d /var/cache/ddclient -g ddclient \
+    -s /sbin/nologin -c "Dynamic DNS Client" ddclient >/dev/null 2>&1 || :
 
 %post
 /sbin/chkconfig --add ddclient
-touch /var/cache/ddclient.cache
-chmod 0600 /var/cache/ddclient.cache
+if [ $1 -gt 1 ]; then
+    # 3.6.6->3.7.1: config(noreplace), but we need the ownership change...
+    chown ddclient:ddclient %{_sysconfdir}/ddclient.conf
+    # ...and the pid file location change is nice to have too
+    if grep -qF /var/run/ddclient.pid %{_sysconfdir}/ddclient.conf ; then
+        sed -i -e 's|/var/run/ddclient.pid|/var/run/ddclient/ddclient.pid|' \
+            %{_sysconfdir}/ddclient.conf || :
+    fi
+fi
 
 %preun
-if [ $1 = 0 ]; then
-        /sbin/service ddclient stop > /dev/null 2>&1
-        /sbin/chkconfig --del ddclient
+if [ $1 -eq 0 ]; then
+    %{_initrddir}/ddclient stop > /dev/null 2>&1
+    /sbin/chkconfig --del ddclient
 fi
 
+%postun
+if [ $1 -ge 1 ]; then
+    %{_initrddir}/ddclient try-restart >/dev/null
+fi
 
 %files
 %defattr(-,root,root,-)
-%doc README* COPYING COPYRIGHT
-%doc %attr(0644, root, root) sample*
-%{_sbindir}/ddclient
-%config(noreplace) %attr(0600,root,root) %{_sysconfdir}/ddclient.conf
+%doc README* COPYING COPYRIGHT Changelog sample-*
+%attr(600,ddclient,ddclient) %config(noreplace) %{_sysconfdir}/ddclient.conf
+%config(noreplace) %{_sysconfdir}/rwtab.d/ddclient
 %config(noreplace) %{_sysconfdir}/sysconfig/ddclient
-%ghost %attr(0600, root, root) /var/cache/ddclient.cache
+%attr(0700,ddclient,ddclient) %dir /var/cache/ddclient/
+%attr(0600,ddclient,ddclient) %ghost /var/cache/ddclient/ddclient.cache
 %{_initrddir}/ddclient
+%{_sbindir}/ddclient
+%attr(0755,ddclient,ddclient) %dir /var/run/ddclient/
 
-# -----------------------------------------------------------------------------
 
 %changelog
+* Wed Jan 23 2008 Robert Scheck <robert at fedoraproject.org> 3.7.3-1
+- Upgrade to 3.7.3 (#429438)
+- Updated the license tag according to the guidelines
+
+* Thu Jun 14 2007 Ville Skyttä <ville.skytta at iki.fi> - 3.7.2-1
+- 3.7.2.
+- Tweak default config to send less mail (eg. not on every shutdown).
+
+* Fri Mar  2 2007 Ville Skyttä <ville.skytta at iki.fi> - 3.7.1-1
+- 3.7.1, cache file moved to /var/cache/ddclient.
+- Run as a dedicated ddclient user (#220539).
+- Add read only root/temporary state config (#220540).
+- Create/chmod cache in init script instead of %%post.
+- Add scriptlet dependencies, try-restart action and other minor tweaks.
+
+* Sat Jul 30 2005 Ville Skyttä <ville.skytta at iki.fi> - 3.6.6-1
+- 3.6.6, update URLs (#165272).
+- Restart service on future package upgrades (still manually needed this time).
+- Don't set service to autostart on "chkconfig --add".
+- Fix sysconfig/ddclient permissions.
+- Drop non-useful samples.
+
+* Fri Apr  7 2005 Michael Schwendt <mschwendt[AT]users.sf.net> - 3.6.3-5
+- rebuilt
+
 * Mon Apr 05 2004 Toshio Kuratomi <toshio[+]tiki-lounge.com> - 0:3.6.3-0.fdr.4.fc1
 - Fix %%doc %%attr ownership
-- Touch the cache file in %post
+- Touch the cache file in %%post
 
 * Mon Sep 08 2003 Michael Schwendt <mschwendt[AT]users.sf.net> - 0:3.6.3-0.fdr.3
 - Add own Fedora-style initscript and /etc/sysconfig/ddclient file.


Index: ddclient.sysconfig
===================================================================
RCS file: /cvs/pkgs/rpms/ddclient/EL-4/ddclient.sysconfig,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ddclient.sysconfig	8 Nov 2004 04:12:32 -0000	1.1
+++ ddclient.sysconfig	23 Jan 2008 19:13:03 -0000	1.2
@@ -1,4 +1,4 @@
-#
-# ddclient service options
+#                                                                     -*- sh -*-
+# ddclient service options, see ddclient --help for what's available.
 #
 DDCLIENT_OPTIONS="-daemon 300"


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/ddclient/EL-4/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	8 Nov 2004 04:12:32 -0000	1.2
+++ sources	23 Jan 2008 19:13:03 -0000	1.3
@@ -1 +1 @@
-dfa5ff6967cb854de804d4e7b9633fdc  ddclient-3.6.3.tar.gz
+f6a55bc68cf73ffe7e80d2fa5cd44f85  ddclient-3.7.3.tar.bz2


--- ddclient.cache.patch DELETED ---