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

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

Browse Source
This commit is contained in:
OBS User unknown 2009-08-07 19:45:49 +00:00 committed by Git OBS Bridge
parent d6b6c18fa5
commit d1123d9798
7 changed files with 18 additions and 439 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
rsync-3.0.6.tar.bz2 Normal file
View File

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

3
rsync-3.0.6pre1.tar.bz2
View File

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

98
rsync-allow-slp-disable.patch
View File

@ -1,98 +0,0 @@
diff -Naurp rsync-3.0.6pre1/clientserver.c rsync-3.0.6pre1-slp//clientserver.c
--- rsync-3.0.6pre1/clientserver.c 2009-05-05 14:24:50.000000000 +0200
+++ rsync-3.0.6pre1-slp//clientserver.c 2009-05-05 14:29:01.000000000 +0200
@@ -1065,7 +1065,7 @@ int daemon_main(void)
* local address??? */
#ifdef HAVE_LIBSLP
- if (register_services()) {
+ if (lp_use_slp() && register_services() != 0) {
rprintf(FINFO,
"Couldn't register with service discovery protocol, continuing anyway\n");
}
diff -Naurp rsync-3.0.6pre1/loadparm.c rsync-3.0.6pre1-slp//loadparm.c
--- rsync-3.0.6pre1/loadparm.c 2009-05-05 14:24:50.000000000 +0200
+++ rsync-3.0.6pre1-slp//loadparm.c 2009-05-05 14:29:01.000000000 +0200
@@ -112,6 +112,10 @@ typedef struct
#ifdef HAVE_LIBSLP
int slp_refresh;
#endif
+
+#ifdef HAVE_LIBSLP
+ BOOL use_slp;
+#endif
} global;
static global Globals;
@@ -307,6 +311,9 @@ static struct parm_struct parm_table[] =
{"slp refresh", P_INTEGER,P_GLOBAL,&Globals.slp_refresh, NULL,0},
#endif
{"socket options", P_STRING, P_GLOBAL,&Globals.socket_options, NULL,0},
+#ifdef HAVE_LIBSLP
+ {"use slp", P_BOOL, P_GLOBAL,&Globals.use_slp, NULL,0},
+#endif
{"auth users", P_STRING, P_LOCAL, &sDefault.auth_users, NULL,0},
{"charset", P_STRING, P_LOCAL, &sDefault.charset, NULL,0},
@@ -360,6 +367,7 @@ static struct parm_struct parm_table[] =
static void init_globals(void)
{
memset(&Globals, 0, sizeof Globals);
+ Globals.use_slp = True;
}
/***************************************************************************
@@ -404,6 +412,10 @@ FN_GLOBAL_INTEGER(lp_rsync_port, &Global
FN_GLOBAL_INTEGER(lp_slp_refresh, &Globals.slp_refresh)
#endif
+#ifdef HAVE_LIBSLP
+FN_GLOBAL_BOOL(lp_use_slp, &Globals.use_slp)
+#endif
+
FN_LOCAL_STRING(lp_auth_users, auth_users)
FN_LOCAL_STRING(lp_charset, charset)
FN_LOCAL_STRING(lp_comment, comment)
diff -Naurp rsync-3.0.6pre1/rsyncd.conf.yo rsync-3.0.6pre1-slp//rsyncd.conf.yo
--- rsync-3.0.6pre1/rsyncd.conf.yo 2009-05-05 14:24:50.000000000 +0200
+++ rsync-3.0.6pre1-slp//rsyncd.conf.yo 2009-05-05 14:54:01.000000000 +0200
@@ -104,6 +104,10 @@ details on some of the options you may b
special socket options are set. These settings can also be specified
via the bf(--sockopts) command-line option.
+dit(bf(use slp)) This parameter is used to determine if the module names are
+advertised via slp. The default is for this to be enabled, which will
+advertise your public modules.
+
dit(bf(slp refresh)) This parameter is used to determine how long service
advertisements are valid (measured in seconds), and is only applicable if
you have Service Location Protocol support compiled in. If this is
diff -Naurp rsync-3.0.6pre1/rsyncd.conf.5 rsync-3.0.6pre1-slp//rsyncd.conf.5
--- rsync-3.0.6pre1/rsyncd.conf.5 2009-05-05 14:24:50.000000000 +0200
+++ rsync-3.0.6pre1-slp//rsyncd.conf.5 2009-05-05 14:55:31.000000000 +0200
@@ -121,7 +121,12 @@ details on some of the options you may b
special socket options are set. These settings can also be specified
via the \fB\-\-sockopts\fP command-line option.
.IP
-.IP "\fBslp refresh\fP"
+.IP "\fBuse slp\fP"
+This parameter is used to determine if the module names are
+advertised via slp. The default is for this to be enabled, which will
+advertise your public modules.
+.IP
+.IP "\fBslp refresh\fP"
This parameter is used to determine how long service
advertisements are valid (measured in seconds), and is only applicable if
you have Service Location Protocol support compiled in. If this is
diff -Naurp rsync-3.0.6pre1/socket.c rsync-3.0.6pre1-slp//socket.c
--- rsync-3.0.6pre1/socket.c 2009-05-05 14:24:50.000000000 +0200
+++ rsync-3.0.6pre1-slp//socket.c 2009-05-05 14:29:01.000000000 +0200
@@ -532,7 +532,7 @@ void start_accept_loop(int port, int (*f
int *sp, maxfd, i;
#ifdef HAVE_LIBSLP
time_t next_slp_refresh;
- short slp_timeout = lp_slp_refresh();
+ short slp_timeout = lp_use_slp() ? lp_slp_refresh() : 0;
if (slp_timeout) {
if (slp_timeout < SLP_MIN_TIMEOUT)
slp_timeout = SLP_MIN_TIMEOUT;

3
rsync-patches-3.0.6.tar.bz2 Normal file
View File

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

3
rsync-patches-3.0.6pre1.tar.bz2
View File

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

6
rsync.changes
View File

@ -1,3 +1,9 @@
-------------------------------------------------------------------
Wed Aug 5 11:24:00 CEST 2009 - puzel@novell.com
- bump version to 3.0.6
- drop rsync-allow-slp-disable.patch (merged upstream)
-------------------------------------------------------------------
Tue May 5 15:29:12 CEST 2009 - puzel@suse.cz

341
rsync.spec
View File

@ -1,5 +1,5 @@
#
# spec file for package rsync (Version 3.0.5.91)
# spec file for package rsync (Version 3.0.6)
#
# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
@ -31,12 +31,11 @@ License: GPL v3 or later
Group: Productivity/Networking/Other
PreReq: %fillup_prereq %insserv_prereq sed grep
AutoReqProv: on
Version: 3.0.5.91
Release: 2
%define tar_version 3.0.6pre1
Version: 3.0.6
Release: 1
Summary: Replacement for RCP/mirror that has Many More Features
Source: %{name}-%{tar_version}.tar.bz2
Source1: %{name}-patches-%{tar_version}.tar.bz2
Source: %{name}-%{version}.tar.bz2
Source1: %{name}-patches-%{version}.tar.bz2
Source2: logrotate.rsync
Source3: rsync.xinetd
Source4: rsyncd.rc
@ -46,8 +45,6 @@ Source7: rsync-server.firewall
Patch3: system-zlib.diff
#PATCH-FIX-UPSTREAM rsync-3.0.5-doc-fix.patch bnc487591 petr.uzel@suse.cz -- based on upstream changes to rsync.yo
Patch4: rsync-3.0.5-doc-fix.patch
#PATCH-FEATURE-UPSTREAM rsync-allow-slp-disable.patch fate#306331 -- taken from upstream git
Patch5: rsync-allow-slp-disable.patch
Url: http://rsync.samba.org/
BuildRoot: %{_tmppath}/%{name}-%{version}-build
%define with_system_zlib 0
@ -71,7 +68,7 @@ Authors:
Paul Mackerras <Paul.Mackerras@cs.anu.edu.au>
%prep
%setup -q -b 1 -n %{name}-%{tar_version}
%setup -q -b 1 -n %{name}-%{version}
%if %with_system_zlib
rm -f zlib/*.h
%patch3
@ -80,7 +77,6 @@ patch -p1 < patches/acls.diff
patch -p1 < patches/xattrs.diff
patch -p1 < patches/slp.diff
%patch4 -p1
%patch5 -p1
%build
autoheader
@ -143,328 +139,3 @@ fi
%doc COPYING NEWS README tech_report.ps tech_report.tex
%changelog
* Tue May 05 2009 puzel@suse.cz
- add rsync-allow-slp-disable.patch (FATE#306331)
* Thu Apr 16 2009 puzel@suse.cz
- update to 3.0.6pre1 (bugfix release)
- noteworthy changes:
- Fixed a --read-batch hang when rsync is reading a batch file that was
created from an incremental-recursion transfer
- Fixed the daemon's socket code to handle the simultaneous arrival of
multiple connections.
- Fix --safe-links/--copy-unsafe-links to properly handle symlinks that
have consecutive slashes in the value.
- Fixed the parsing of an [IPv6_LITERAL_ADDR] when a USER@ is prefixed.
- The sender now skips a (bogus) symlink that has a 0-length value, which
avoids a transfer error in the receiver.
- Fixed a case where the sender could die with a tag-0 error if there was
an I/O during the sending of the file list.
- Fixed the rrsync script to avoid a server-side problem when -e is at the
start of the short options.
- Fixed a problem where a vanished directory could turn into an exit code
23 instead of the proper exit code 24.
- Fixed the --iconv conversion of symlinks when doing a local copy.
receiving side when a mount-point directory did not match a directory in
the transfer.
- Fixed the dropping of an ACL mask when no named ACL values were present.
- Fixed an ACL/xattr corruption issue where the --backup option could cause
rsync to associate the wrong ACL/xattr information with received files.
- Fixed the use of --xattrs with --only-write-batch.
- Fixed the use of --dry-run with --read-batch.
- Fixed a run-time issue for systems that can't find iconv_open() by adding
the --disable-iconv-open configure option.
- Complain and die if the user tries to combine --remove-source-files (or
the deprecated --remove-sent-files) with --read-batch.
* Tue Mar 24 2009 puzel@suse.cz
- add rsync-3.0.5-doc-fix.patch (bnc#487591)
* Thu Feb 19 2009 puzel@suse.cz
- update to 3.0.5
- initialize xattr data in a couple spots in the hlink code, which avoids a
crash when the xattr pointer's memory happens to start out non-zero
- don't send a bogus "-" option to an older server if there were no short
options specified - fixes (bnc#476379)
- fixed skipping of unneeded updates in a batch file when incremental
recursion is active
- fix the %%P logfile escape when the daemon logs from inside a chroot.
- fixed the use of -s (--protect-args) when used with a remote source or
destination that had an empty path (e.g. "host:")
- fixed the use of a dot-dir path (e.g. foo/./bar) inside a --files-from
file when the root of the transfer isn't the current directory
- fixed a bug with "-K --delete" removing symlinks to directories when
incremental recursion is active
- fixed a hard to trigger hang when using --remove-source-files
- got rid of an annoying delay when accessing a daemon via a remote-shell
- properly ignore (superfluous) source args on a --read-batch command
- improved the manpage's description of the '*' wildcard to remove the
confusing "non-empty" qualifier
- fixed reverse lookups in the compatibility-library version of
getnameinfo()
- fixed a bug when using --sparse on a sparse file that has over 2GB of
consecutive sparse data
- avoid a hang when using at least 3 --verbose options on a transfer with a
client sender (which includes local copying)
- fixed a problem with --delete-delay reporting an error when it was ready
to remove a directory that was now gone
- got rid of a bunch of "warn_unused_result" compiler warnings
- if an ftruncate() on a received file fails, it now causes a partial-
transfer warning
- add SuSEfirewall2 rule (bnc#251657)
* Wed Oct 08 2008 puzel@suse.cz
- fix build: do not run tests as they fail in chrooted environment
* Mon Sep 22 2008 puzel@suse.cz
- update to 3.0.4
- update to stable release
- removed rsync-3.0.4pre2-xattrs-test-fix.patch
- fixed in upstream
* Thu Sep 04 2008 puzel@suse.cz
- update to 3.0.4pre2
- Fixed the handling of a --partial-dir that cannot be created.
- Fixed a couple issues in the --fake-super handling of xattrs when the
destination files have root-level attributes (e.g. selinux values) that
a non-root copy can't affect.
- The --iconv option now converts the content of a symlink too, instead
of leaving it in the wrong character-set.
- Fixed a bug where --delete-during could delete in a directory before it
noticed that the sending side sent an I/O error for that directory.
- Fixed a crash bug in the hard-link code.
- Fixed the sending of xattr directory information when the code finds a
--link-dest or --copy-dest directory with unchanged xattrs
- Fixed deletion handling when copying a single, empty directory (with no
files) to a differently named, non-existent directory.
- too many other changes and fixes - please, see NEWS and NEWS-rsync-3.0.3
files
- specfile fixes :
- use %%configure and %%makeinstall macros
- use %%_bindir and %%sbindir macros
- removed lutimes-hack.diff (not needed anymore)
- removed rsync-patches-3.0.2.dif (fixed in upstream)
* Tue Aug 12 2008 puzel@suse.cz
- rsyncd.rc: use Should-Start instead of X-UnitedLinux-Should-Start
- specfile fixes:
* added Should-Stop
* 'make test' moved to %%check
* recommend logrotate
* Mon Apr 14 2008 ro@suse.de
- update to version 3.0.2
- Fixed a potential buffer overflow in the xattr code.
- update to version 3.0.1
- Added the 'c'-flag to the itemizing of non-regular files so that the
itemized output doesn't get hidden if there were no attribute changes,
and also so that the itemizing of a --copy-links run will distinguish
between copying an identical non-regular file and the creation of a
revised version with a new value (e.g. a changed symlink referent, a
new device number, etc.).
- quite a lot of other bugfixes, please see OLDNEWS file
* Tue Mar 11 2008 ro@suse.de
- update to version 3.0.0 (shortened, more details see NEWS file)
- The handling of implied directories when using --relative has changed to
send them as directories (e.g. no implied dir is ever sent as a symlink).
- Requesting a remote file-listing without specifying -r (--recursive) now
sends the -d (--dirs) option to the remote rsync rather than sending -r
along with an extra exclude of /*/*.
- In --dry-run mode, the last line of the verbose summary text is output
with a "(DRY RUN)" suffix to help remind you that no updates were made.
Similarly, --only-write-batch outputs "(BATCH ONLY)".
- A writable rsync daemon with "use chroot" disabled now defaults to a
symlink-munging behavior designed to make symlinks safer while also
allowing absolute symlinks to be stored and retrieved.
- Starting up an extra copy of an rsync daemon will not clobber the pidfile
for the running daemon -- if the pidfile exists, the new daemon will exit
with an error.
- re-applied patches from upstream kit:
- acls.diff,xattrs.diff,slp.diff
- removed patches:
- rsync-overlong.patch (upstream code cleaned up)
- lutimes-hack.diff (should not be needed any more)
- rsync-fix_fuzzy.patch (fixed upstream)
- rsync-hlink_crash.patch (upstream cleaned up)
- munge-symlinks-2.6.9.diff (integrated upstream)
* Tue Dec 04 2007 ro@suse.de
- added munge-symlinks patch (#345507) CVE-2007-6199
* Thu Nov 08 2007 ro@suse.de
- fix uninitialized struct sx in hlink.c:hard_link_cluster
to prevent crash when using acls (#338358)
* Fri Sep 14 2007 ro@suse.de
- fix (#300526) restart will start standalone rsync if running
under xinetd
- use a pid file for rsyncd in init script so that rcrsyncd
will not show status running for an rsync started by xinetd
- insert "pid file" entry into rsyncd.conf if not present
* Wed Sep 12 2007 dmueller@suse.de
- build parallel
- fix hardlinks accross partition
* Mon Sep 10 2007 ro@suse.de
- fix abort in rsync when acls and fuzzy are used together
(#306263)
* Fri Aug 17 2007 cthiel@suse.de
- added lutimes-hack.diff to work around a glibc bug in lutimes.c
* Thu Aug 02 2007 ro@suse.de
- protect from overlong filenames (#294073) CVE-2007-4091
* Mon May 14 2007 mrueckert@suse.de
- make build work on older distros again.
* Tue May 08 2007 dmueller@suse.de
- use builtin zlib copy again
* Mon May 07 2007 dmueller@suse.de
- update to 2.6.9:
* several important bugfixes
* new features, see included NEWS file
- build against system zlib instead of own zlib copy
- build against system popt instead of own popt copy
* Wed Apr 18 2007 aj@suse.de
- Use texlive for building.
* Tue Sep 12 2006 ro@suse.de
- apply fix for xattr.diff from rsync mailing list
* Tue Aug 22 2006 ro@suse.de
- apply patches/xattr.diff as well (fate#300565)
* Thu Aug 10 2006 dmueller@suse.de
- fix rc script error code when there's an error in the config
file (#198406)
* Wed Jun 21 2006 ro@suse.de
- added tag-3 patch from cvs (will be in 2.6.9)
to avoid aborts with "unexpected tag 3"
* Mon Jun 12 2006 ro@suse.de
- update to version 2.6.8
- use slp patch as included upstream
- several bugfixes
- errors now include version number
- special files as pipes now printed as "S", no longer "D"
- escaping of unreadable chars has changed
- new --append, --min-size and --prune-empty-dirs options
* Tue Apr 18 2006 ro@suse.de
- ignore testsuite failure on s390x (filesystem mtimes)
* Wed Jan 25 2006 mls@suse.de
- converted neededforbuild to BuildRequires
* Thu Jan 19 2006 schwab@suse.de
- Don't strip binaries.
* Fri Oct 14 2005 ro@suse.de
- fix problem in configure to re-enable ACLs (#128323)
* Tue Aug 02 2005 ro@suse.de
- added acl-fix.patch from wayne to make testsuite pass with acls
* Fri Jul 29 2005 ro@suse.de
- update to 2.6.6
* Mon Jun 06 2005 ro@suse.de
- update to 2.6.5
- use acl patch as shipped in rsync/patches directory
* Fri Feb 18 2005 mmj@suse.de
- Glibc doesn't cache the timezone as much as it used to, so export
the TZ variable after doing chroot. [#49878]
* Thu Feb 10 2005 ro@suse.de
- added libpng to neededforbuild (for tetex)
* Wed Dec 01 2004 ro@suse.de
- re-register before SLP really times out
* Wed Dec 01 2004 ro@suse.de
- re-worked slp.diff
do not use a timer but hook into central select call
* Thu Nov 11 2004 ro@suse.de
- update to 2.6.3 final
* Mon Aug 16 2004 bk@suse.de
- updated to 2.6.3-pre1, which is currently in release-testing
(and includes a security fix)
* Fri Jul 23 2004 ro@suse.de
- fixing problems apparently introduced with the update to 2.6.2:
- fix from cvs to not abort trying to create already created
backup directories (#42780)
- fix from cvs to avoid crash on large trees (#42933)
* Mon May 10 2004 ro@suse.de
- update to 2.6.2 / ported patches
- fixes a problem with non-chroot modules
* Thu Apr 01 2004 mls@suse.de
- fix hostname calculation in slp registration code
* Tue Mar 16 2004 ro@suse.de
- add -4 and -6 options to manpage (#36144)
* Tue Jan 13 2004 ro@suse.de
- update to version 2.6.0
* Thu Dec 04 2003 ro@suse.de
- update to real 2.5.7
* Thu Dec 04 2003 okir@suse.de
- fix heap overflow (#33478)
* Sun Nov 23 2003 adrian@suse.de
- add patch for SLP support, based on Brad Hards demo implementation
* Thu Nov 06 2003 schwab@suse.de
- Fix quoting in configure script.
* Fri Oct 24 2003 ro@suse.de
- added make test
- added acl patch, build with acl support
* Fri Oct 17 2003 ro@suse.de
- don't build as root
* Mon Aug 18 2003 ro@suse.de
- added stop_on_removal and restart_on_update macro calls
* Tue May 13 2003 ro@suse.de
- use defattr
* Wed Mar 05 2003 ro@suse.de
- add xinetd-config to filelist
* Tue Jan 28 2003 ro@suse.de
- update to 2.5.6
- can combine ssh and daemon access
- supports URL like syntax rsync://
- IPv6 support in hosts.allow/deny
- recursive hang fixed upstream
* Fri Jan 24 2003 ro@suse.de
- added xinetd-config snippet
* Wed Jan 15 2003 ro@suse.de
- added logrotate config
* Tue Oct 08 2002 ro@suse.de
- fix recursive hangup in server process on broken pipe
* Wed Aug 14 2002 poeml@suse.de
- fix comment in init script
* Thu Aug 01 2002 ro@suse.de
- use BuildRoot
- added PreReqs
* Mon Jul 22 2002 kukuk@suse.de
- Don't source /etc/rc.config in init script [Bug 17123]
* Mon Jun 17 2002 ro@suse.de
- update to 2.5.5
setgroups patch removed, has been integrated
zfree patch removed, rsync has current zlib fixes
unsigned patch removed, has been integrated
* Wed Mar 06 2002 okir@suse.de
- applied setgroups security fix
* Fri Feb 08 2002 okir@suse.de
- applied zlib security fix
* Wed Feb 06 2002 ro@suse.de
- make rsyncd a hardlink (#13041)
* Fri Feb 01 2002 ro@suse.de
- added patch for segmentation fault
* Mon Jan 21 2002 draht@suse.de
- corrected diff for log.c
* Mon Jan 21 2002 ro@suse.de
- applied security patch for various signed/unsigned fixes
* Fri Dec 14 2001 ro@suse.de
- removed START_RSYNCD
* Tue Aug 28 2001 ro@suse.de
- on uninstall, call insserv to cleanup
* Tue Aug 28 2001 ro@suse.de
- added rc-script and rc-config variable START_RSYNCD
if someone wants to run rsyncd standalone (w/o inetd) (#9496)
* Mon Sep 25 2000 ro@suse.de
- sorted
* Wed Sep 13 2000 aj@suse.de
- Work with LFS; fix spec file to not print while building.
* Mon Sep 11 2000 ro@suse.de
- update to 2.4.6
* Fri Aug 18 2000 ro@suse.de
- update to 2.4.4
* Thu Jan 20 2000 aj@suse.de
- rsync 2.3.2, install man pages -> /usr/share/man.
* Mon Sep 13 1999 bs@suse.de
- ran old prepare_spec on spec file to switch to new prepare_spec.
* Fri Aug 13 1999 fehr@suse.de
- update to 2.3.1
- added rsyncstats shell script
* Thu Dec 17 1998 ro@suse.de
- update to 2.2.1
* Sat Nov 28 1998 bs@suse.de
- added symlink /usr/sbin/rsyncd (to let it work with tcpd)
- added example configs
* Tue Nov 24 1998 ro@suse.de
- update to 2.2.0
* Sat Sep 19 1998 ro@suse.de
- defined _GNU_SOURCE where getopt_long is needed
* Mon Aug 24 1998 ro@suse.de
- update to 2.1.0
added manpage for rsyncd.conf
* Tue May 12 1998 ro@suse.de
- update to 1.7.4
generate tech_report.ps from tex-src
* Mon Nov 10 1997 kfr@suse.de
- first version for S.u.S.E. (1.6.3)