From mboxrd@z Thu Jan 1 00:00:00 1970 From: Stefan Schantl To: development@lists.ipfire.org Subject: [PATCH] rsync: Update to 3.1.2. Date: Wed, 11 May 2016 11:32:20 +0200 Message-ID: <1462959140-30778-1-git-send-email-stefan.schantl@ipfire.org> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="===============2542908054969030790==" List-Id: --===============2542908054969030790== Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable This is a minor update to the latest stable version of rsync. * Drop patch which got upstream. * Link/Use system libpopt and zlib instead of bundled ones. * Enable testsuite. * Drop xinetd support and add service files for systemd. * Ship a sample configuration file. Fixes #11118. Signed-off-by: Stefan Schantl --- rsync/patches/rsync-3.0.7-buf-overflow.patch | 39 ------------------- rsync/rsync.nm | 58 ++++++++++++++++++++++++++= -- rsync/rsyncd.conf | 20 ++++++++++ rsync/systemd/rsyncd.service | 9 +++++ rsync/systemd/rsyncd.socket | 10 +++++ rsync/systemd/rsyncd(a).service | 7 ++++ 6 files changed, 100 insertions(+), 43 deletions(-) delete mode 100644 rsync/patches/rsync-3.0.7-buf-overflow.patch create mode 100644 rsync/rsyncd.conf create mode 100644 rsync/systemd/rsyncd.service create mode 100644 rsync/systemd/rsyncd.socket create mode 100644 rsync/systemd/rsyncd(a).service diff --git a/rsync/patches/rsync-3.0.7-buf-overflow.patch b/rsync/patches/rsy= nc-3.0.7-buf-overflow.patch deleted file mode 100644 index 2c6b195..0000000 --- a/rsync/patches/rsync-3.0.7-buf-overflow.patch +++ /dev/null @@ -1,39 +0,0 @@ -index 7139b10..fef15aa 100644 ---- a/flist.c -+++ b/flist.c -@@ -1640,21 +1640,29 @@ static void send_directory(int f, struct file_list *= flist, char *fbuf, int len, - } -=20 - p =3D fbuf + len; -- if (len !=3D 1 || *fbuf !=3D '/') -+ if (len =3D=3D 1 && *fbuf =3D=3D '/') -+ remainder =3D MAXPATHLEN - 1; -+ else if (len < MAXPATHLEN-1) { - *p++ =3D '/'; -- *p =3D '\0'; -- remainder =3D MAXPATHLEN - (p - fbuf); -+ *p =3D '\0'; -+ remainder =3D MAXPATHLEN - (len + 1); -+ } else -+ remainder =3D 0; -=20 - for (errno =3D 0, di =3D readdir(d); di; errno =3D 0, di =3D readdir(d)) { - char *dname =3D d_name(di); - if (dname[0] =3D=3D '.' && (dname[1] =3D=3D '\0' - || (dname[1] =3D=3D '.' && dname[2] =3D=3D '\0'))) - continue; -- if (strlcpy(p, dname, remainder) >=3D remainder) { -+ unsigned name_len =3D strlcpy(p, dname, remainder); -+ if (name_len >=3D remainder) { -+ char save =3D fbuf[len]; -+ fbuf[len] =3D '\0'; - io_error |=3D IOERR_GENERAL; - rprintf(FERROR_XFER, -- "cannot send long-named file %s\n", -- full_fname(fbuf)); -+ "filename overflows max-path len by %u: %s/%s\n", -+ name_len - remainder + 1, fbuf, dname); -+ fbuf[len] =3D save; - continue; - } - if (dname[0] =3D=3D '\0') { diff --git a/rsync/rsync.nm b/rsync/rsync.nm index 3af7d69..36e04b2 100644 --- a/rsync/rsync.nm +++ b/rsync/rsync.nm @@ -4,7 +4,7 @@ ############################################################################= ### =20 name =3D rsync -version =3D 3.0.7 +version =3D 3.1.2 release =3D 1 =20 groups =3D Applications/Internet @@ -31,8 +31,17 @@ build libacl-devel libattr-devel popt-devel + zlib-devel + + # Testsuite. + %{bindir}/setfacl end =20 + configure_options +=3D \ + --without-included-popt \ + --without-included-zlib + + prepare_cmds # Fix permission issure. cd %{DIR_APP} && chmod -x support/* @@ -52,19 +61,60 @@ build =20 make_build_targets =3D proto all =20 + 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 + end + make_install_targets +=3D \ INSTALLCMD=3D"install -p" \ INSTALLMAN=3D"install -p" =20 install_cmds - mkdir -pv %{BUILDROOT}/etc/xinetd.d - install -p -m 644 %{DIR_SOURCE}/rsync.xinetd \ - %{BUILDROOT}/etc/xinetd.d/rsync + + # 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 end + end =20 packages package %{name} + configfiles + %{sysconfdir}/rsyncd.conf + 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(a).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 =20 package %{name}-debuginfo diff --git a/rsync/rsyncd.conf b/rsync/rsyncd.conf new file mode 100644 index 0000000..09e768f --- /dev/null +++ b/rsync/rsyncd.conf @@ -0,0 +1,20 @@ +# /etc/rsyncd: configuration file for rsync daemon mode + +# See rsyncd.conf man page for more options. + +# configuration example: + +# uid =3D nobody +# gid =3D nobody +# use chroot =3D yes +# max connections =3D 4 +# pid file =3D /run/rsyncd/rsyncd.pid +# exclude =3D lost+found/ +# transfer logging =3D yes +# timeout =3D 900 +# ignore nonreadable =3D yes +# dont compress =3D *.gz *.tgz *.zip *.z *.Z *.rpm *.deb *.bz2 + +# [ftp] +# path =3D /home/ftp +# comment =3D ftp export area diff --git a/rsync/systemd/rsyncd.service b/rsync/systemd/rsyncd.service new file mode 100644 index 0000000..30c3ca0 --- /dev/null +++ b/rsync/systemd/rsyncd.service @@ -0,0 +1,9 @@ +[Unit] +Description=3DFast remote file copy program daemon +ConditionPathExists=3D/etc/rsyncd.conf + +[Service] +ExecStart=3D/usr/bin/rsync --daemon --no-detach + +[Install] +WantedBy=3Dmulti-user.target diff --git a/rsync/systemd/rsyncd.socket b/rsync/systemd/rsyncd.socket new file mode 100644 index 0000000..7306ad0 --- /dev/null +++ b/rsync/systemd/rsyncd.socket @@ -0,0 +1,10 @@ +[Unit] +Description=3DRsync Server Socket +Conflicts=3Drsyncd.service + +[Socket] +ListenStream=3D873 +Accept=3Dyes + +[Install] +WantedBy=3Dsockets.target=20 diff --git a/rsync/systemd/rsyncd(a).service b/rsync/systemd/rsyncd(a).service new file mode 100644 index 0000000..beef5c9 --- /dev/null +++ b/rsync/systemd/rsyncd(a).service @@ -0,0 +1,7 @@ +[Unit] +Description=3DFast remote file copy program daemon +ConditionPathExists=3D/etc/rsyncd.conf + +[Service] +ExecStart=3D/usr/bin/rsync --daemon --no-detach +StandardInput=3Dsocket --=20 2.5.5 --===============2542908054969030790==--