X-Git-Url: http://git.pld-linux.org/?p=packages%2Frsync.git;a=blobdiff_plain;f=rsync.spec;h=0100981760295c8dc2ca0a34a3e0924ea0ea4004;hp=0145c6ad8830685c6394d497a0d8f5168865097f;hb=fda2b22;hpb=0150c6b7053071df6883f87bbc599adaca6b4acc diff --git a/rsync.spec b/rsync.spec index 0145c6a..0100981 100644 --- a/rsync.spec +++ b/rsync.spec @@ -1,6 +1,10 @@ +# TODO: +# 3.1.3 rsyncd segfaults very early in server rsync:// mode (both inetd and standalone) +# rsync[27223]: segfault at 7468 ip 00007f4281c56e81 sp 00007ffc29186160 error 4 in libc-2.27.so[7f4281bd3000+1b4000] # # Conditional build: %bcond_with rsh # set remote shell command to rsh instead of ssh (old behaviour) +%bcond_without fadvise # apply fadvise patch %bcond_with tests # perform "make test" # %ifarch alpha @@ -16,28 +20,36 @@ Summary(uk.UTF-8): Програма для ефективного віддале Summary(zh_CN.UTF-8): [通讯]传输工具 Summary(zh_TW.UTF-8): [喙啪]$(B6G?i火(c(B Name: rsync -Version: 3.0.3 -Release: 1 -License: GPL +Version: 3.1.3 +Release: 4 +Epoch: 1 +License: GPL v3+ Group: Networking/Utilities -Source0: http://rsync.samba.org/ftp/rsync/%{name}-%{version}.tar.gz -# Source0-md5: 16d41aab9ece435198af222c5415a304 -Source1: http://rsync.samba.org/ftp/rsync/rsync-patches-%{version}.tar.gz -# Source1-md5: ff814658791187a5f32c1a145714db43 +Source0: https://rsync.samba.org/ftp/rsync/%{name}-%{version}.tar.gz +# Source0-md5: 1581a588fde9d89f6bc6201e8129afaf +Source1: https://rsync.samba.org/ftp/rsync/%{name}-patches-%{version}.tar.gz +# Source1-md5: 753fc37ffc277571c69135e8bc5fae9d Source2: %{name}.inet Source3: %{name}.init Source4: %{name}.sysconfig Source5: %{name}d.logrotate +Patch100: %{name}-fixes.patch Patch0: %{name}-config.patch -URL: http://rsync.samba.org/ +Patch1: %{name}-fadvise.patch +Patch2: %{name}-noatime.patch +Patch3: CVE-2016-9840.patch +Patch4: CVE-2016-9841.patch +Patch5: CVE-2016-9842.patch +Patch6: CVE-2016-9843.patch +URL: https://rsync.samba.org/ BuildRequires: acl-devel -BuildRequires: autoconf >= 2.52 +BuildRequires: autoconf >= 2.59 BuildRequires: automake -BuildRequires: openssl-devel BuildRequires: popt-devel BuildRequires: rpmbuild(macros) >= 1.318 BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) +%define _duplicate_files_terminate_build 0 %define _sysconfdir /etc/rsyncd %description @@ -102,7 +114,7 @@ rsync - це швидша та гнучкіша альтернатива rcp, я Summary: Files necessary to run rsync in daemon mode Summary(pl.UTF-8): Pliki niezbędne do uruchomienia rsynca w trybie serwera Group: Networking/Daemons -Requires: %{name} = %{version}-%{release} +Requires: %{name} = %{epoch}:%{version}-%{release} Requires: rc-inetd Provides: rsyncd Obsoletes: rsyncd @@ -130,7 +142,7 @@ Summary: Files necessary to run rsync in daemon mode Summary(pl.UTF-8): Pliki niezbędne do uruchomienia rsynca w trybie serwera Group: Networking/Daemons Requires(post,preun): /sbin/chkconfig -Requires: %{name} = %{version}-%{release} +Requires: %{name} = %{epoch}:%{version}-%{release} Provides: rsyncd Obsoletes: rsyncd Obsoletes: rsyncd-inetd @@ -154,7 +166,14 @@ techniczna nowego algorytmu została również dołączona do pakietu. %prep %setup -q -b1 +%patch100 -p1 %patch0 -p1 +%{?with_fadvise:%patch1 -p1} +%patch2 -p1 +%patch3 -p1 +%patch4 -p1 +%patch5 -p1 +%patch6 -p1 # for compat with previous patched version patch -p1 -i patches/acls.diff || exit 1 @@ -165,6 +184,7 @@ cp -f /usr/share/automake/config.sub . %{__autoheader} %{__autoconf} %configure \ + LIBS="-lcrypto" \ %{?with_rsh:--with-rsh=rsh} \ --enable-ipv6 \ --enable-acl-support \ @@ -189,7 +209,7 @@ install -d $RPM_BUILD_ROOT{%{_sysconfdir},/etc/{sysconfig/rc-inetd,rc.d/init.d,l :> $RPM_BUILD_ROOT%{_sysconfdir}/rsyncd.secrets cat << EOF > $RPM_BUILD_ROOT%{_sysconfdir}/rsyncd.conf -log file = /var/log/rsyncd.log +#log file = /var/log/rsyncd.log EOF cat << 'EOF' > $RPM_BUILD_ROOT/etc/env.d/CVSIGNORE @@ -205,10 +225,10 @@ cat << 'EOF' > $RPM_BUILD_ROOT/etc/env.d/RSYNC_PASSWORD #RSYNC_PASSWORD= EOF -install %{SOURCE2} $RPM_BUILD_ROOT/etc/sysconfig/rc-inetd/rsyncd -install %{SOURCE3} $RPM_BUILD_ROOT/etc/rc.d/init.d/rsyncd -install %{SOURCE4} $RPM_BUILD_ROOT/etc/sysconfig/rsyncd -install %{SOURCE5} $RPM_BUILD_ROOT/etc/logrotate.d/rsyncd +install -p %{SOURCE3} $RPM_BUILD_ROOT/etc/rc.d/init.d/rsyncd +cp -p %{SOURCE2} $RPM_BUILD_ROOT/etc/sysconfig/rc-inetd/rsyncd +cp -p %{SOURCE4} $RPM_BUILD_ROOT/etc/sysconfig/rsyncd +cp -p %{SOURCE5} $RPM_BUILD_ROOT/etc/logrotate.d/rsyncd %clean rm -rf $RPM_BUILD_ROOT @@ -239,28 +259,31 @@ fi %files %defattr(644,root,root,755) -%doc README NEWS OLDNEWS TODO -%config(noreplace,missingok) %verify(not md5 mtime size) /etc/env.d/* -%attr(755,root,root) %{_bindir}/* -%{_mandir}/man1/* +%doc README NEWS OLDNEWS TODO support +%config(noreplace,missingok) %verify(not md5 mtime size) /etc/env.d/CVSIGNORE +%config(noreplace,missingok) %verify(not md5 mtime size) /etc/env.d/RSYNC_PASSWORD +%config(noreplace,missingok) %verify(not md5 mtime size) /etc/env.d/RSYNC_PROXY +%config(noreplace,missingok) %verify(not md5 mtime size) /etc/env.d/RSYNC_RSH +%attr(755,root,root) %{_bindir}/rsync +%{_mandir}/man1/rsync.1* %files -n rsyncd-inetd %defattr(644,root,root,755) %dir %{_sysconfdir} -%attr(640,root,root) %config(noreplace) %{_sysconfdir}/rsyncd.conf -%attr(640,root,root) %config(noreplace) %{_sysconfdir}/rsyncd.secrets +%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/rsyncd.conf +%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/rsyncd.secrets %attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) /etc/logrotate.d/rsyncd %attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) /etc/sysconfig/rc-inetd/rsyncd %attr(640,root,root) %ghost /var/log/rsyncd.log -%{_mandir}/man5/* +%{_mandir}/man5/rsyncd.conf.5* %files -n rsyncd-standalone %defattr(644,root,root,755) %dir %{_sysconfdir} -%attr(640,root,root) %config(noreplace) %{_sysconfdir}/rsyncd.conf -%attr(640,root,root) %config(noreplace) %{_sysconfdir}/rsyncd.secrets +%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/rsyncd.conf +%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/rsyncd.secrets %attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) /etc/sysconfig/rsyncd %attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) /etc/logrotate.d/rsyncd %attr(640,root,root) %ghost /var/log/rsyncd.log %attr(754,root,root) /etc/rc.d/init.d/rsyncd -%{_mandir}/man5/* +%{_mandir}/man5/rsyncd.conf.5*