From mboxrd@z Thu Jan 1 00:00:00 1970 From: Michael Tremer To: development@lists.ipfire.org Subject: Re: [PATCH] rsync: Update to 3.1.2. Date: Wed, 11 May 2016 16:11:20 +0100 Message-ID: <1462979480.18591.192.camel@ipfire.org> In-Reply-To: <1462959140-30778-1-git-send-email-stefan.schantl@ipfire.org> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="===============9215429602955836790==" List-Id: --===============9215429602955836790== Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Hi, I merged this. However, you create /run/rsyncd which is not re-created in a systemd tempfile. Could you please send a new commit that adds that and bump = the release? Best, -Michael On Wed, 2016-05-11 at 11:32 +0200, Stefan Schantl wrote: > This is a minor update to the latest stable version of rsync. >=20 > * 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. >=20 > Fixes #11118. >=20 > Signed-off-by: Stefan Schantl > --- > =C2=A0rsync/patches/rsync-3.0.7-buf-overflow.patch | 39 ------------------- > =C2=A0rsync/rsync.nm=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0= =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2= =A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0| 58 +++++++++++++++= +++++++++++- > - > =C2=A0rsync/rsyncd.conf=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2= =A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0= =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0| 20 ++++++++++ > =C2=A0rsync/systemd/rsyncd.service=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2= =A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0|=C2=A0=C2=A09= +++++ > =C2=A0rsync/systemd/rsyncd.socket=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0= =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0| 10 +++++ > =C2=A0rsync/systemd/rsyncd(a).service=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0= =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0|=C2=A0=C2=A07 ++= ++ > =C2=A06 files changed, 100 insertions(+), 43 deletions(-) > =C2=A0delete mode 100644 rsync/patches/rsync-3.0.7-buf-overflow.patch > =C2=A0create mode 100644 rsync/rsyncd.conf > =C2=A0create mode 100644 rsync/systemd/rsyncd.service > =C2=A0create mode 100644 rsync/systemd/rsyncd.socket > =C2=A0create mode 100644 rsync/systemd/rsyncd(a).service >=20 > diff --git a/rsync/patches/rsync-3.0.7-buf-overflow.patch > b/rsync/patches/rsync-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, > -=C2=A0 } > -=C2=A0 > -=C2=A0 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) { > -=C2=A0 *p++ =3D '/'; > -- *p =3D '\0'; > -- remainder =3D MAXPATHLEN - (p - fbuf); > -+ *p =3D '\0'; > -+ remainder =3D MAXPATHLEN - (len + 1); > -+ } else > -+ remainder =3D 0; > -=C2=A0 > -=C2=A0 for (errno =3D 0, di =3D readdir(d); di; errno =3D 0, di =3D readdi= r(d)) { > -=C2=A0 char *dname =3D d_name(di); > -=C2=A0 if (dname[0] =3D=3D '.' && (dname[1] =3D=3D '\0' > -=C2=A0 =C2=A0=C2=A0=C2=A0=C2=A0|| (dname[1] =3D=3D '.' && dname[2] =3D=3D= '\0'))) > -=C2=A0 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'; > -=C2=A0 io_error |=3D IOERR_GENERAL; > -=C2=A0 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; > -=C2=A0 continue; > -=C2=A0 } > -=C2=A0 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 @@ > =C2=A0#####################################################################= ######## > ## > =C2=A0 > =C2=A0name=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=3D rsync > -version=C2=A0=C2=A0=C2=A0=C2=A0=3D 3.0.7 > +version=C2=A0=C2=A0=C2=A0=C2=A0=3D 3.1.2 > =C2=A0release=C2=A0=C2=A0=C2=A0=C2=A0=3D 1 > =C2=A0 > =C2=A0groups=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=3D Applications/Internet > @@ -31,8 +31,17 @@ build > =C2=A0 libacl-devel > =C2=A0 libattr-devel > =C2=A0 popt-devel > + zlib-devel > + > + # Testsuite. > + %{bindir}/setfacl > =C2=A0 end > =C2=A0 > + configure_options +=3D \ > + --without-included-popt \ > + --without-included-zlib > + > + > =C2=A0 prepare_cmds > =C2=A0 # Fix permission issure. > =C2=A0 cd %{DIR_APP} && chmod -x support/* > @@ -52,19 +61,60 @@ build > =C2=A0 > =C2=A0 make_build_targets =3D proto all > =C2=A0 > + 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 > + > =C2=A0 make_install_targets +=3D \ > =C2=A0 INSTALLCMD=3D"install -p" \ > =C2=A0 INSTALLMAN=3D"install -p" > =C2=A0 > =C2=A0 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 > =C2=A0 end > + > =C2=A0end > =C2=A0 > =C2=A0packages > =C2=A0 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 > =C2=A0 end > =C2=A0 > =C2=A0 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=C2=A0=C2=A0=C2=A0=3D *.gz *.tgz *.zip *.z *.Z *.rpm *.deb = *.bz2 > + > +# [ftp] > +#=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0path =3D /home/ftp > +#=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0comment =3D ftp export ar= ea > 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=C2=A0 > diff --git a/rsync/systemd/rsyncd(a).service b/rsync/systemd/rsyncd(a).serv= ice > 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 --===============9215429602955836790== Content-Type: application/pgp-signature Content-Transfer-Encoding: base64 Content-Disposition: attachment; filename="signature.asc" MIME-Version: 1.0 LS0tLS1CRUdJTiBQR1AgU0lHTkFUVVJFLS0tLS0KVmVyc2lvbjogR251UEcgdjIKCmlRSWNCQUFC Q2dBR0JRSlhNMHVZQUFvSkVJQjU4UDl2a0FrSFpqNFAvUkgzOUt1a3d5WTVGTUZIcmZZclM5QksK L1k5OTNCanBrM2ZqVVNRQ1dsRG45eFhqb2p3d2E2TzdSWEs3THNxNXBRNFFFWEQ1R2VmTVgzbVFm aXluTGgxQwozR2ZZbUdmVlpKN0VwRzJJV1EvZmtoY1pWV2xnMUpBLytrTkxYM0JDaEtkMVpNNkN3 ZnF6YXZoNlFlR2tKWER3CmpPdHBUNmlyNzUvVFp0R0pzR28weTFHOTVib2dIU3VrRFZxNUNkV1Ey Yk5kMzVmS3dmWVRNb0E5RDJXamlmMWgKeGgzYzRITG9ZaDFwVHZGQW1GbzM0THVlM25OWUNpOGhZ aXBIMUVySnpmQis0c1EvRXlxTlB0Nm1tQTZvM2JzUApYUVNMUDZCRHRKY2xlQ1R1WHJHRm5EbnJS dnphcjExOEk3eXhUSlJTWWpUUlZJaXB4YUxYeGpyTnBNK2xYeTJJCjk5VTFxNW83Ukh5Q0NaYmJU c3BONU1mV2F4Z0FFSHhzTnVla2djOGU1amxJS2NzVytjUEd2YkFRalFVRE1YMEMKdDRRUlJ3dEVP Wkw3cUVWRmVDY0U0cnNMbm54QVVUN3ZZd3JiL0JqRTNuYVAwU3IxSWY4SWh6NitiRyswZ2JOTwpU UWNQTytiRkFTTEF3MU1qaGltaE4vYnBGaEtTMC9WbndFdGo1YmlyL2d1Z2k5eDMxaEdSdFBIR2tp ZklFL1loClU4K1VQOHV5V3VvYmNuNDFQOUdNMDhLZzY2aDBDYnYvdXVqbzNKTjBwV0FYNzlMOEVX RlFvblhHRnJHM1h2TzYKb2tQNyt3Q01GQWJ0NEZZdDBpdlJER254eXNhVmY0cFRKUFFCZU9vUlNq SDNjQmUzUzd3dlZNbGVHR2xvODRaWQphS2tNSU8rNTRsVnYvSWpBSmFZcgo9RkZEYwotLS0tLUVO RCBQR1AgU0lHTkFUVVJFLS0tLS0K --===============9215429602955836790==--