X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=rsync.spec;h=335131255812dfa788d0d58e89ee1b0c76bd7d4e;hb=9b2493acae55c732dd01780bb6bab83a9c0e177a;hp=100494217cccffe3e93f2eab447decb9f0d776ba;hpb=a6f1905905e3548f73b21f86bed01792fd0a70ed;p=packages%2Frsync.git diff --git a/rsync.spec b/rsync.spec index 1004942..3351312 100644 --- a/rsync.spec +++ b/rsync.spec @@ -1,11 +1,12 @@ +# 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_with tests # perform "make test" +%bcond_with fadvise # apply fadvise patch +%bcond_without tests # perform "make test" # -%ifarch alpha -%undefine with_tests -%endif Summary: Program for efficient remote updates of files Summary(es.UTF-8): Programa para actualizar archivos remotos de forma eficiente Summary(ko.UTF-8): 네트워크를 통한 파일동기화를 위한 프로그램 @@ -16,29 +17,41 @@ 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: 2 -License: GPL +Version: 3.2.3 +Release: 3 +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: 209f8326f5137d8817a6276d9577a2f1 +Source1: https://rsync.samba.org/ftp/rsync/%{name}-patches-%{version}.tar.gz +# Source1-md5: 884c872b55c7431f4c4e8d8bf182fafa Source2: %{name}.inet Source3: %{name}.init Source4: %{name}.sysconfig Source5: %{name}d.logrotate Patch0: %{name}-config.patch -Patch1: %{name}-dparam.patch -URL: http://rsync.samba.org/ +Patch1: %{name}-fadvise.patch +Patch2: lchmod.patch +URL: https://rsync.samba.org/ BuildRequires: acl-devel -BuildRequires: autoconf >= 2.52 +BuildRequires: autoconf >= 2.69 BuildRequires: automake +BuildRequires: libstdc++-devel +BuildRequires: lz4-devel BuildRequires: openssl-devel BuildRequires: popt-devel +BuildRequires: python3 >= 1:3 +BuildRequires: python3-commonmark BuildRequires: rpmbuild(macros) >= 1.318 +BuildRequires: xxHash-devel >= 0.8.0 +BuildRequires: zstd-devel +%if %{with tests} +BuildRequires: fakeroot >= 1.26 +%endif BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) +%define _duplicate_files_terminate_build 0 %define _sysconfdir /etc/rsyncd %description @@ -103,7 +116,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 @@ -131,7 +144,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 @@ -156,22 +169,22 @@ techniczna nowego algorytmu została również dołączona do pakietu. %prep %setup -q -b1 %patch0 -p1 -%patch1 -p1 +%{?with_fadvise:%patch1 -p1} +%patch2 -p1 -# for compat with previous patched version -patch -p1 -i patches/acls.diff || exit 1 -patch -p1 -i patches/xattrs.diff || exit 1 +sed -i -e 's|#!/usr/bin/env bash|#!/bin/bash|' rsync-ssl %build cp -f /usr/share/automake/config.sub . %{__autoheader} %{__autoconf} %configure \ - %{?with_rsh:--with-rsh=rsh} \ - --enable-ipv6 \ + LIBS="-lcrypto" \ --enable-acl-support \ - --enable-xattr-support \ --disable-debug \ + --enable-ipv6 \ + --enable-xattr-support \ + %{?with_rsh:--with-rsh=rsh} \ --with-rsyncd-conf=%{_sysconfdir}/rsyncd.conf %{__make} proto %{__make} @@ -207,10 +220,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 @@ -241,28 +254,33 @@ 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.md NEWS.md 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 +%attr(755,root,root) %{_bindir}/rsync-ssl +%{_mandir}/man1/rsync.1* +%{_mandir}/man1/rsync-ssl.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*