Accepting request 240313 from network

1

OBS-URL: https://build.opensuse.org/request/show/240313
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/rsync?expand=0&rev=50

0001-use-lp_num_modules-instead-of-the-removed-lp_numserv.patch

@@ -1,25 +0,0 @@
-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
-

rsync-3.1.0.tar.gz

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

rsync-3.1.0.tar.gz.asc

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

rsync-3.1.1.tar.gz

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

rsync-3.1.1.tar.gz.asc

@@ -0,0 +1,7 @@
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.11 (GNU/Linux)
+
+iEYEABECAAYFAlOnDrAACgkQbIWfsUuWqMW0kgCg6VKDRxUCliMYEUFNxH2kTx7a
+mCgAoLtqQlvkbhMxNFZdYpgFlNWYGu/9
+=R7rl
+-----END PGP SIGNATURE-----

rsync-CVE-2014-2855.patch

@@ -1,84 +0,0 @@
-From 0dedfbce2c1b851684ba658861fe9d620636c56a Mon Sep 17 00:00:00 2001
-From: Wayne Davison <wayned@samba.org>
-Date: Sun, 13 Apr 2014 13:44:58 -0700
-Subject: [PATCH] Avoid infinite wait reading secrets file.
-
----
- authenticate.c |   24 +++++++++++++-----------
- 1 files changed, 13 insertions(+), 11 deletions(-)
-
-diff --git a/authenticate.c b/authenticate.c
-index 3381b8c..c92746c 100644
---- a/authenticate.c
-+++ b/authenticate.c
-@@ -102,15 +102,16 @@ static const char *check_secret(int module, const char *user, const char *group,
- 	char pass2[MAX_DIGEST_LEN*2];
- 	const char *fname = lp_secrets_file(module);
- 	STRUCT_STAT st;
--	int fd, ok = 1;
-+	int ok = 1;
- 	int user_len = strlen(user);
- 	int group_len = group ? strlen(group) : 0;
- 	char *err;
-+	FILE *fh;
- 
--	if (!fname || !*fname || (fd = open(fname, O_RDONLY)) < 0)
-+	if (!fname || !*fname || (fh = fopen(fname, "r")) == NULL)
- 		return "no secrets file";
- 
--	if (do_fstat(fd, &st) == -1) {
-+	if (do_fstat(fileno(fh), &st) == -1) {
- 		rsyserr(FLOG, errno, "fstat(%s)", fname);
- 		ok = 0;
- 	} else if (lp_strict_modes(module)) {
-@@ -123,29 +124,30 @@ static const char *check_secret(int module, const char *user, const char *group,
- 		}
- 	}
- 	if (!ok) {
--		close(fd);
-+		fclose(fh);
- 		return "ignoring secrets file";
- 	}
- 
- 	if (*user == '#') {
- 		/* Reject attempt to match a comment. */
--		close(fd);
-+		fclose(fh);
- 		return "invalid username";
- 	}
- 
- 	/* Try to find a line that starts with the user (or @group) name and a ':'. */
- 	err = "secret not found";
--	while ((user || group) && read_line_old(fd, line, sizeof line, 1)) {
--		const char **ptr, *s;
-+	while ((user || group) && fgets(line, sizeof line, fh) != NULL) {
-+		const char **ptr, *s = strtok(line, "\n\r");
- 		int len;
--		if (*line == '@') {
-+		if (!s)
-+			continue;
-+		if (*s == '@') {
- 			ptr = &group;
- 			len = group_len;
--			s = line+1;
-+			s++;
- 		} else {
- 			ptr = &user;
- 			len = user_len;
--			s = line;
- 		}
- 		if (!*ptr || strncmp(s, *ptr, len) != 0 || s[len] != ':')
- 			continue;
-@@ -158,7 +160,7 @@ static const char *check_secret(int module, const char *user, const char *group,
- 		*ptr = NULL; /* Don't look for name again. */
- 	}
- 
--	close(fd);
-+	fclose(fh);
- 
- 	memset(line, 0, sizeof line);
- 	memset(pass2, 0, sizeof pass2);
--- 
-1.7.0.4
-
-

rsync-patches-3.1.0.tar.gz

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

rsync-patches-3.1.0.tar.gz.asc

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

rsync-patches-3.1.1.tar.gz

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

rsync-patches-3.1.1.tar.gz.asc

@@ -0,0 +1,7 @@
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.11 (GNU/Linux)
+
+iEYEABECAAYFAlOnDrAACgkQbIWfsUuWqMUt9gCg2WI1tL9DZVyeWiG15jAKjC7U
+3q0AoJq9N/4dRiOBzXVnKFj5e1XAH1hH
+=Fk/v
+-----END PGP SIGNATURE-----

rsync.changes

@@ -1,3 +1,11 @@
+-------------------------------------------------------------------
+Thu Jul 10 15:28:03 UTC 2014 - kruber@zib.de
+
+- update to 3.1.1
+- drop rsync-CVE-2014-2855.patch (applied upstream)
+- drop 0001-use-lp_num_modules-instead-of-the-removed-lp_numserv.patch
+  (applied upstream)
+
 -------------------------------------------------------------------
 Fri Jun 20 21:11:04 UTC 2014 - crrodriguez@opensuse.org
 

rsync.spec

@@ -22,7 +22,7 @@
 %endif
 
 Name:           rsync
-Version:        3.1.0
+Version:        3.1.1
 Release:        0
 Summary:        Versatile tool for fast incremental file transfer
 License:        GPL-3.0+
@@ -42,8 +42,6 @@ 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
-Patch5:         rsync-CVE-2014-2855.patch
 BuildRequires:  autoconf
 BuildRequires:  libacl-devel
 BuildRequires:  openslp-devel
@@ -85,8 +83,6 @@ for backups and mirroring and as an improved copy command for everyday use.
 rm -f zlib/*.h
 %patch3
 %endif
-%patch4 -p1
-%patch5 -p1
 patch -p1 < patches/acls.diff
 patch -p1 < patches/xattrs.diff
 patch -p1 < patches/slp.diff