upgrade to rsync 2.5.4 and fix naming (rsycnd -> rsync)

rsync/rc.rsync

@@ -0,0 +1,43 @@
+#!@l_prefix@/lib/openpkg/bash @l_prefix@/etc/rc
+##
+##  rc.rsync -- Run-Commands for RSYNC Daemon
+##
+
+%config
+    rsync_enable="yes"
+    rsync_flags=""
+    rsync_log_numfiles="5"
+    rsync_log_minsize="512K"
+    rsync_log_complevel="9"
+
+%start -p 200 -u root
+    if opServiceEnabled rsync; then
+        @l_prefix@/bin/rsync $rsync_flags --daemon --config=@l_prefix@/etc/rsync/rsync.conf
+    fi
+
+%stop -p 200 -u root
+    if opServiceEnabled rsync; then
+        kill -TERM `cat @l_prefix@/var/rsync/rsync.pid`
+    fi
+
+%restart -u root
+    if opServiceEnabled rsync; then
+        kill -TERM `cat @l_prefix@/var/rsync/rsync.pid`
+        sleep 2
+        @l_prefix@/bin/rsync $rsync_flags --daemon --config=@l_prefix@/etc/rsync/rsync.conf
+    fi
+
+%reload -u root
+    if opServiceEnabled rsync; then
+        kill -HUP `cat @l_prefix@/var/rsync/rsync.pid`
+    fi
+
+%daily -u root
+    if opServiceEnabled rsync; then
+        shtool rotate -f \
+            -n${rsync_log_numfiles} -s${rsync_log_minsize} \
+            -d -z${rsync_log_complevel} -o@l_musr@ -g@l_mgrp@ -m644 \
+            -E "kill -HUP `cat @l_prefix@/var/rsync/rsync.pid`" \
+            @l_prefix@/var/rsync/rsync.log 
+    fi
+

rsync/rc.rsyncd

@@ -1,43 +0,0 @@
-#!@l_prefix@/lib/openpkg/bash @l_prefix@/etc/rc
-##
-##  rc.rsyncd -- Run-Commands for RSYNC Daemon
-##
-
-%config
-    rsyncd_enable="yes"
-    rsyncd_flags=""
-    rsyncd_log_numfiles="5"
-    rsyncd_log_minsize="512K"
-    rsyncd_log_complevel="9"
-
-%start -p 200 -u root
-    if opServiceEnabled rsyncd; then
-        @l_prefix@/bin/rsync $rsyncd_flags --daemon --config=@l_prefix@/etc/rsync/rsyncd.conf
-    fi
-
-%stop -p 200 -u root
-    if opServiceEnabled rsyncd; then
-        kill -TERM `cat @l_prefix@/var/rsync/rsyncd.pid`
-    fi
-
-%restart -u root
-    if opServiceEnabled rsyncd; then
-        kill -TERM `cat @l_prefix@/var/rsync/rsyncd.pid`
-        sleep 2
-        @l_prefix@/bin/rsync $rsyncd_flags --daemon --config=@l_prefix@/etc/rsync/rsyncd.conf
-    fi
-
-%reload -u root
-    if opServiceEnabled rsyncd; then
-        kill -HUP `cat @l_prefix@/var/rsync/rsyncd.pid`
-    fi
-
-%daily -u root
-    if opServiceEnabled rsyncd; then
-        shtool rotate -f \
-            -n${rsyncd_log_numfiles} -s${rsyncd_log_minsize} \
-            -d -z${rsyncd_log_complevel} -o@l_musr@ -g@l_mgrp@ -m644 \
-            -E "kill -HUP `cat @l_prefix@/var/rsync/rsyncd.pid`" \
-            @l_prefix@/var/rsync/rsyncd.log 
-    fi
-

rsync/rsync.conf

@@ -1,12 +1,12 @@
 ##
-##  rsyncd.conf -- RSYNC Configuration for Server Mode
+##  rsync.conf -- RSYNC Configuration for Server Mode
 ##
 
-motd file          = @l_prefix@/etc/rsync/rsyncd.motd
+motd file          = @l_prefix@/etc/rsync/rsync.motd
-secrets file       = @l_prefix@/etc/rsync/rsyncd.passwd
+secrets file       = @l_prefix@/etc/rsync/rsync.passwd
-lock file          = @l_prefix@/var/rsync/rsyncd.lck
+lock file          = @l_prefix@/var/rsync/rsync.lck
-pid file           = @l_prefix@/var/rsync/rsyncd.pid
+pid file           = @l_prefix@/var/rsync/rsync.pid
-log file           = @l_prefix@/var/rsync/rsyncd.log
+log file           = @l_prefix@/var/rsync/rsync.log
 
 max connections    = 20
 timeout            = 60

rsync/rsync.motd

@@ -0,0 +1 @@
+RSYNC service ready (OpenPKG rsync @version@)

rsync/rsync.spec

@@ -32,15 +32,14 @@ Packager:     The OpenPKG Project
 Distribution: OpenPKG [REL]
 Group:        Filesystem
 License:      GPL
-Version:      2.5.2
+Version:      2.5.4
-Release:      20020213
+Release:      20020314
 
 #   list of sources
 Source0:      http://rsync.samba.org/ftp/rsync/rsync-%{version}.tar.gz
-Source1:      rsyncd.conf
+Source1:      rsync.conf
-Source2:      rsyncd.motd
+Source2:      rsync.motd
-Source3:      rc.rsyncd
+Source3:      rc.rsync
-Patch0:       rsync.patch-zlib
 
 #   build information
 Prefix:       %{l_prefix}
@@ -61,7 +60,6 @@ AutoReqProv:  no
 
 %prep
     %setup -q
-    %patch -p0
 
 %build
     CC="%{l_cc}" \
@@ -77,28 +75,30 @@ AutoReqProv:  no
         prefix=$RPM_BUILD_ROOT%{l_prefix} \
         exec_prefix=$RPM_BUILD_ROOT%{l_prefix}
     strip $RPM_BUILD_ROOT%{l_prefix}/bin/* >/dev/null 2>&1 || true
+    mv $RPM_BUILD_ROOT%{l_prefix}/man/man5/rsyncd.conf.5 \
+       $RPM_BUILD_ROOT%{l_prefix}/man/man5/rsync.conf.5
     %{l_shtool} mkdir -f -p -m 755 $RPM_BUILD_ROOT%{l_prefix}/etc/rsync
     %{l_shtool} install -c -m 644 \
         -e 's;@l_prefix@;%{l_prefix};g' \
         -e 's;@l_nusr@;%{l_nusr};g' \
         -e 's;@l_ngrp@;%{l_ngrp};g' \
         -e 's;@version@;%{version};g' \
-        %{SOURCE rsyncd.conf} \
+        %{SOURCE rsync.conf} \
-        %{SOURCE rsyncd.motd} \
+        %{SOURCE rsync.motd} \
         $RPM_BUILD_ROOT%{l_prefix}/etc/rsync/
     %{l_shtool} install -c -m 644 /dev/null \
-        $RPM_BUILD_ROOT%{l_prefix}/etc/rsync/rsyncd.passwd
+        $RPM_BUILD_ROOT%{l_prefix}/etc/rsync/rsync.passwd
     %{l_shtool} mkdir -f -p -m 755 $RPM_BUILD_ROOT%{l_prefix}/etc/rc.d
     %{l_shtool} install -c -m 755 \
         -e 's;@l_prefix@;%{l_prefix};g' \
         -e 's;@l_musr@;%{l_musr};g' \
         -e 's;@l_mgrp@;%{l_mgrp};g' \
-        %{SOURCE rc.rsyncd} \
+        %{SOURCE rc.rsync} \
         $RPM_BUILD_ROOT%{l_prefix}/etc/rc.d/
     %{l_shtool} mkdir -f -p -m 755 $RPM_BUILD_ROOT%{l_prefix}/var/rsync
     %{l_rpmtool} files -v -ofiles -r$RPM_BUILD_ROOT \
         %{l_files_std} \
-        '%config %{l_prefix}/etc/rsync/rsyncd.*'
+        '%config %{l_prefix}/etc/rsync/rsync.*'
 
 %files -f files