rpm/rsync
SHA256
1
0
Fork 0
forked from pool/rsync
Code Pull Requests Activity

Accepting request 204809 from home:vitezslav_cizek:branches:network

Browse Source 
- update to 3.1.0
  * fixes bnc#845185
- don't apply drop-cache.patch (removed from upstream)
- add 0001-use-lp_num_modules-instead-of-the-removed-lp_numserv.patch
- add gpg-offline tarball checking

- add time-limit.patch from co-distributed rsync-patches as we do
  on SLE (fate#312479)

OBS-URL: https://build.opensuse.org/request/show/204809
OBS-URL: https://build.opensuse.org/package/show/network/rsync?expand=0&rev=29
This commit is contained in:
Marcus Meissner 2013-10-25 14:08:03 +00:00 committed by Git OBS Bridge
parent 1830a9cd3d
commit 5ef75e9e84
10 changed files with 106 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
0001-use-lp_num_modules-instead-of-the-removed-lp_numserv.patch Normal file
View File

@ -0,0 +1,25 @@
From 50652ac755815d01a6954258ba7174bb8f4bb158 Mon Sep 17 00:00:00 2001
From: Vitezslav Cizek <vcizek@suse.cz>
Date: Fri, 25 Oct 2013 14:51:38 +0200
Subject: [PATCH] use lp_num_modules instead of the removed lp_numservices
---
slp.diff | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/slp.diff b/slp.diff
index a9703f1..953b400 100644
--- a/patches/slp.diff
+++ b/patches/slp.diff
@@ -479,7 +479,7 @@ new file mode 100644
+ exit_cleanup(RERR_SYNTAX);
+ }
+
-+ n = lp_numservices();
++ n = lp_num_modules();
+
+ if (0 == lp_slp_refresh())
+ timeout = SLP_LIFETIME_MAXIMUM; /* don't expire, ever */
--
1.8.4

3
rsync-3.0.9.tar.gz
View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:30f10f8dd5490d28240d4271bb652b1da7a60b22ed2b9ae28090668de9247c05
size 792725

3
rsync-3.1.0.tar.gz Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:81ca23f77fc9b957eb9845a6024f41af0ff0c619b7f38576887c63fa38e2394e
size 883901

7
rsync-3.1.0.tar.gz.asc Normal file
View File

@ -0,0 +1,7 @@
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.11 (GNU/Linux)
iEYEABECAAYFAlJHmGoACgkQbIWfsUuWqMXMzQCdGO7752JOZRb8V7mWpgSpqRIS
jOoAoOkrhSeGczUGDpLTNDGgCutsQbAU
=S7ps
-----END PGP SIGNATURE-----

3
rsync-patches-3.0.9.tar.gz
View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:0c1e9b56e99667dfc47641124460bac61a04c5d2ee89f575c6bc78c7a69005a9
size 172417

3
rsync-patches-3.1.0.tar.gz Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:b79c489f2864c726a767e0f39c4086df83f401d151bd5dc05a9b2e799b52886a
size 174111

7
rsync-patches-3.1.0.tar.gz.asc Normal file
View File

@ -0,0 +1,7 @@
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.11 (GNU/Linux)
iEYEABECAAYFAlJHmGoACgkQbIWfsUuWqMVJQQCg3F6nIzOpCgIxS1Z9/Om/d/cI
bVQAoK/MfSDUzAPWG8BEX91gTjn1R06m
=/o/M
-----END PGP SIGNATURE-----

15
rsync.changes
View File

@ -1,3 +1,18 @@
-------------------------------------------------------------------
Fri Oct 25 12:25:26 UTC 2013 - vcizek@suse.com
- update to 3.1.0
* fixes bnc#845185
- don't apply drop-cache.patch (removed from upstream)
- add 0001-use-lp_num_modules-instead-of-the-removed-lp_numserv.patch
- add gpg-offline tarball checking
-------------------------------------------------------------------
Mon Aug 5 12:06:32 UTC 2013 - vcizek@suse.com
- add time-limit.patch from co-distributed rsync-patches as we do
on SLE (fate#312479)
-------------------------------------------------------------------
Sun Jun 16 23:59:28 UTC 2013 - jengelh@inai.de

32
rsync.keyring Normal file
View File

@ -0,0 +1,32 @@
pub 1024D/4B96A8C5 2003-12-19
uid Wayne Davison <wayned@users.sourceforge.net>
uid Wayne Davison <wayned@samba.org>
sub 1024g/29C67D63 2003-12-19
-----BEGIN PGP PUBLIC KEY BLOCK-----
Version: GnuPG v2.0.9 (GNU/Linux)
mQGiBD/ja2cRBACZqtQ/VnuWd2TA/T4nFitXPOF//7uterTWZVMDBrSE3tJdW1lv
90z2g2RJKktJTC3yjs82IH6wWvvFsHDPGXQRuoBr0dPYHBaVhKX85uewigHiE2M1
1Ub8Vv1c/JDGAh1cNmCAWazghV+emamrWJWq0f0hz5eqq4LCcPwo4riUVwCg9W37
YAR8Z4NHa6FWjrEKjl2NIMUD/iXJnp6qJFMK9Fs+2dWyL1m/mRb0h+I/cqgpkUvo
gRhL95Jttg2QQtXJWCsB3hA/L/2Iu2bV8iS1aRlZQsAWogA3/m56ROs8cIyN4ouj
1dpPoG7sKGA8BTvXxuSF9l6ngx7208iX+xiQCDeGfBtBFBy70iJxTFGzp2mP3IiP
pwWtBACJ6l8UPwSRmp0Hz/N6H4RkzqGQnvYsMba/uPkRYou/14JsEGCQqjSB99UX
hsPg9wubCEpo3YFTf1p1j3OlbOhiiMkRFwyYaT1fqGjQK0w8hQ1yXHxbXffnz6e3
gKELz7fNQxS0L/tZkNOT7uyGuwnPsUDCBAzDPMwYVIFRo+MKZLQgV2F5bmUgRGF2
aXNvbiA8d2F5bmVkQHNhbWJhLm9yZz6IWwQTEQIAGwUCP+NrZwYLCQgHAwIDFQID
AxYCAQIeAQIXgAAKCRBshZ+xS5aoxbKaAJ98/UHW+BAmnsWCvCXYw5xAvjKQuwCg
7rJUYSl3xpb6YmIaBbyyw5QTKiC0LFdheW5lIERhdmlzb24gPHdheW5lZEB1c2Vy
cy5zb3VyY2Vmb3JnZS5uZXQ+iF4EExECAB4FAkFgW4ACGwMGCwkIBwMCAxUCAwMW
AgECHgECF4AACgkQbIWfsUuWqMXxFQCg9Dgb5SnWZroPGl25DL2OYFHdqV4An0N2
QQj0mVi18JgadtS4xv7yNiDauQENBD/ja3EQBADkZadXo4zP2P9XjCP9jCel2hIp
E/khYifgu8sLYQ3VOaVM6iczw71a+iM3C44CddioGNv0svJ/cEttbtAE5zZIfqm0
Rd/CYR+kqOkUydss736olRh+4lXLi9dAzDwHoEmlO+i95V6bDdSCAF9+XLhpfUY/
xtgistlUGTd+wyeQMwADBQP9HXUGOcR18VJsQtFOmXaXv9MSKZYMjCf9R5Z7gcPF
PSIWINyUvMEgnLIrUKJ7pgoA6cLDnYm/lBVP801u5C+D4s79oCnjS21wlOxA2Go0
hxG6XpT9mwBOWk4uZUK+g8Emeu7Vi6l3XwH8fACdCIfp3wKlqH/qtkqN7Gts95TM
59uIRgQYEQIABgUCP+NrcQAKCRBshZ+xS5aoxUisAKC2tk0y7PNjh9C9vbfx3fdA
gqiD8gCgg6qjwVbeddcrA0a84BB3zXnb93A=
=0IcW
-----END PGP PUBLIC KEY BLOCK-----

16
rsync.spec
View File

@ -22,7 +22,7 @@
%endif
Name: rsync
Version: 3.0.9
Version: 3.1.0
Release: 0
Summary: Versatile tool for fast incremental file transfer
License: GPL-3.0+
@ -38,13 +38,21 @@ Source5: rsyncd.conf
Source6: rsyncd.secrets
Source7: rsync-server.firewall
Source8: rsyncd.service
Source10: http://rsync.samba.org/ftp/rsync/src/rsync-%{version}.tar.gz.asc
Source11: http://rsync.samba.org/ftp/rsync/src/rsync-patches-%{version}.tar.gz.asc
Source12: %{name}.keyring
Patch3: system-zlib.diff
Patch4: 0001-use-lp_num_modules-instead-of-the-removed-lp_numserv.patch
BuildRequires: autoconf
BuildRequires: libacl-devel
BuildRequires: libattr-devel
BuildRequires: openslp-devel
BuildRequires: popt-devel
BuildRequires: zlib-devel
%if %suse_version >= 1230
BuildRequires: gpg-offline
%endif
PreReq: %fillup_prereq
PreReq: %insserv_prereq
PreReq: grep
@ -70,15 +78,19 @@ source files and the existing files in the destination. Rsync is widely used
for backups and mirroring and as an improved copy command for everyday use.
%prep
%{?gpg_verify: %gpg_verify %{S:10}}
%{?gpg_verify: %gpg_verify %{S:11}}
%setup -q -b 1 -n %{name}-%{version}
%if %with_system_zlib
rm -f zlib/*.h
%patch3
%endif
%patch4 -p1
patch -p1 < patches/acls.diff
patch -p1 < patches/xattrs.diff
patch -p1 < patches/slp.diff
patch -p1 < patches/drop-cache.diff
# fate#312479
patch -p1 < patches/time-limit.diff
%build
autoreconf -fiv