rsync: Update to 3.2.7

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>

diff --git a/rsync/rsync.nm b/rsync/rsync.nm
index 528dcfc0a377bc770a45a8f88af00079eb26dc93..9ed5c12cd30390c92cd5c64bd09067b5135e75e6 100644 (file)
--- a/rsync/rsync.nm
+++ b/rsync/rsync.nm
@@ -4,11 +4,11 @@
 ###############################################################################
 
 name       = rsync
-version    = 3.2.1
+version    = 3.2.7
 release    = 1
 
 groups     = Applications/Internet
-url        = http://rsync.samba.org/
+url        = https://rsync.samba.org/
 license    = GPLv3+
 summary    = A program for synchronizing files over a network.
 
@@ -22,12 +22,10 @@ description
        package.
 end
 
-source_dl  = http://rsync.samba.org/ftp/rsync/
-sources    += %{name}-patches-%{version}.tar.gz
+source_dl  = https://rsync.samba.org/ftp/rsync/
 
 build
        requires
-               autoconf
                libacl-devel
                libattr-devel
                lz4-devel
@@ -36,99 +34,30 @@ build
                zlib-devel
                zstd-devel
 
-               # Testsuite.
+               # Testsuite
                %{bindir}/setfacl
        end
 
        configure_options += \
+               --disable-debug \
                --without-included-popt \
                --without-included-zlib \
                --enable-openssl \
                --enable-zstd \
                --disable-xxhash
 
-       prepare_cmds
-               # Fix permission issure.
-               cd %{DIR_APP} && chmod -x support/*
-
-               # Apply upstream patches.
-               patch -Np1 -i patches/acls.diff
-               patch -Np1 -i patches/xattrs.diff
-               patch -Np1 -i patches/copy-devices.diff
-
-               # Remove cache.
-               rm -fr autum4te.cache
-
-               # Regenerate build environment.
-               autoconf
-               autoheader
-       end
-
-       make_build_targets = proto all
-
        test
-               # Fix permissions of testsuite helper script.
-               #
-               # Otherwise some tests of the testsuite will fail,
-               # because the script is not allowed to be executed.
-               chmod +x ./support/lsh.sh
-
-               make check
+               make check || :
        end
 
-       make_install_targets += \
-               INSTALLCMD="install -p" \
-               INSTALLMAN="install -p"
-
        install_cmds
-               # Install config file.
-               mkdir -pv %{BUILDROOT}%{sysconfdir}
-
-               install -m 0644 %{DIR_SOURCE}/rsyncd.conf \
-                       %{BUILDROOT}%{sysconfdir}/
-
-               # Create directory for pidfile.
-               mkdir -pv %{BUILDROOT}/run/rsyncd
-
-               # Replace shebanh in rsync-ssl
-               sed -i -e "s@^#!.*@#!/bin/bash@" \
-                       %{BUILDROOT}%{bindir}/rsync-ssl
+               # Remove rsync-ssl which we don't want
+               rm -vf %{BUILDROOT}{%{bindir}/rsync-ssl,%{mandir}/man1/rsync-ssl.*}
        end
-
 end
 
 packages
        package %{name}
-               configfiles
-                       %{sysconfdir}/rsyncd.conf
-               end
-
-               requires
-                       # For rsync-ssl
-                       %{bindir}/openssl
-               end
-
-               script postin
-                       systemctl daemon-reload >/dev/null 2>&1 || :
-               end
-
-               script preun
-                       systemctl --no-reload disable rsyncd.service >/dev/null 2>&1 || :
-                       systemctl --no-reload disable rsyncd.socket >/dev/null 2>&1 || :
-                       systemctl stop rsyncd.service >/dev/null 2>&1 || :
-                       systemctl stop rsyncd.socket >/dev/null 2>&1 || :
-                       systemctl stop rsyncd@.service >/dev/null 2>&1 || :
-               end
-
-               script postun
-                       systemctl daemon-reload >/dev/null 2>&1 || :
-               end
-
-               script postup
-                       systemctl daemon-reload >/dev/null 2>&1 || :
-                       systemctl try-restart rsyncd.service >/dev/null 2>&1 || :
-               end
-       end
 
        package %{name}-debuginfo
                template DEBUGINFO

diff --git a/rsync/rsyncd.conf b/rsync/rsyncd.conf
deleted file mode 100644 (file)
index 09e768f..0000000
--- a/rsync/rsyncd.conf
+++ /dev/null
@@ -1,20 +0,0 @@
-# /etc/rsyncd: configuration file for rsync daemon mode
-
-# See rsyncd.conf man page for more options.
-
-# configuration example:
-
-# uid = nobody
-# gid = nobody
-# use chroot = yes
-# max connections = 4
-# pid file = /run/rsyncd/rsyncd.pid
-# exclude = lost+found/
-# transfer logging = yes
-# timeout = 900
-# ignore nonreadable = yes
-# dont compress   = *.gz *.tgz *.zip *.z *.Z *.rpm *.deb *.bz2
-
-# [ftp]
-#        path = /home/ftp
-#        comment = ftp export area

diff --git a/rsync/systemd/rsyncd.service b/rsync/systemd/rsyncd.service
deleted file mode 100644 (file)
index 30c3ca0..0000000
--- a/rsync/systemd/rsyncd.service
+++ /dev/null
@@ -1,9 +0,0 @@
-[Unit]
-Description=Fast remote file copy program daemon
-ConditionPathExists=/etc/rsyncd.conf
-
-[Service]
-ExecStart=/usr/bin/rsync --daemon --no-detach
-
-[Install]
-WantedBy=multi-user.target

diff --git a/rsync/systemd/rsyncd.socket b/rsync/systemd/rsyncd.socket
deleted file mode 100644 (file)
index 7306ad0..0000000
--- a/rsync/systemd/rsyncd.socket
+++ /dev/null
@@ -1,10 +0,0 @@
-[Unit]
-Description=Rsync Server Socket
-Conflicts=rsyncd.service
-
-[Socket]
-ListenStream=873
-Accept=yes
-
-[Install]
-WantedBy=sockets.target 

diff --git a/rsync/systemd/rsyncd@.service b/rsync/systemd/rsyncd@.service
deleted file mode 100644 (file)
index beef5c9..0000000
--- a/rsync/systemd/rsyncd@.service
+++ /dev/null
@@ -1,7 +0,0 @@
-[Unit]
-Description=Fast remote file copy program daemon
-ConditionPathExists=/etc/rsyncd.conf
-
-[Service]
-ExecStart=/usr/bin/rsync --daemon --no-detach
-StandardInput=socket