Hello community, here is the log from the commit of package rsync.2237 for openSUSE:13.1:Update checked in at 2013-11-25 10:53:51 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:13.1:Update/rsync.2237 (Old) and /work/SRC/openSUSE:13.1:Update/.rsync.2237.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "rsync.2237" Changes: -------- New Changes file: --- /dev/null 2013-11-25 01:44:08.036031256 +0100 +++ /work/SRC/openSUSE:13.1:Update/.rsync.2237.new/rsync.changes 2013-11-25 10:53:51.000000000 +0100 @@ -0,0 +1,752 @@ +------------------------------------------------------------------- +Fri Oct 25 12:25:26 UTC 2013 - [email protected] + +- update to 3.1.0 + * fixes bnc#845185/bnc#847576 +- 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 - [email protected] + +- add time-limit.patch from co-distributed rsync-patches as we do + on SLE (fate#312479) + +------------------------------------------------------------------- +Sun Jun 16 23:59:28 UTC 2013 - [email protected] + +- Explicitly list libattr-devel as BuildRequires +- More robust make install call. Remove redundant %clean section. + +------------------------------------------------------------------- +Fri Apr 5 12:33:30 UTC 2013 - [email protected] + +- Add Source URL, see https://en.opensuse.org/SourceUrls + +------------------------------------------------------------------- +Thu Jul 26 20:46:02 UTC 2012 - [email protected] + +- All daemons that create temporary files must have + PrivateTmp=true set in systemd unit if possible. + +------------------------------------------------------------------- +Sun Feb 5 23:25:26 UTC 2012 - [email protected] + +- Build with PIE and full RELRO + +------------------------------------------------------------------- +Wed Dec 21 10:42:30 UTC 2011 - [email protected] + +- add autoconf as buildrequire to avoid implicit dependency + +------------------------------------------------------------------- +Fri Nov 25 01:38:07 UTC 2011 - [email protected] + +- Add systemd unit +- Do not BuildRequire textlive + +------------------------------------------------------------------- +Wed Oct 12 03:40:40 UTC 2011 - [email protected] + +- Update to version 3.0.9 + * Apply drop-cache patch from rsync-patches tarball, adds option + --drop-cache so rsync is drop the memory cache of files when + finished (aka. stop trashing the system) + * Fix a crash bug in checksum scanning when --inplace is used. + * Fix a memory leak in the xattr code. + * See NEWS for more detail + +------------------------------------------------------------------- +Thu May 12 13:08:59 UTC 2011 - [email protected] + +- fix build for SLE (spec-cleaner changes) + o makeinstall, _initddir + +------------------------------------------------------------------- +Thu May 5 14:43:40 UTC 2011 - [email protected] + +- updated summary (bnc#691944) and description + +------------------------------------------------------------------- +Tue Mar 29 13:53:04 UTC 2011 - [email protected] + +- update to rsync-3.0.8 + - Notable changes: + - Fixed two buffer-overflow issues. + - Fixed a data-corruption issue when preserving hard-links + without preserving file ownership, and doing deletions either + before or during the transfer (CVE-2011-1097). + - Fixed a potential crash when an rsync daemon has a + filter/exclude list and the transfer is using ACLs or xattrs. + - Fixed a hang if a really large file is being processed by an + rsync that can't handle 64-bit numbers. + - For devices and special files, we now avoid gathering useless + ACL and/or xattr information for files that aren't being + copied. + - Properly handle requesting remote filenames that start with a + dash. + - Fixed a bug in the comparing of upper-case letters in file + suffixes for --skip-compress. + - If an rsync daemon has a module configured without a path + setting, rsync will now disallow access to that module. + - Some improvements to the hard-linking code to ensure that + device-number hashing is working right, and to supply more + information if the hard-link code fails. + - Fixed a bug that prevented --numeric-ids from disabling the + translation of user/group IDs for ACLs. + - The --link-dest checking for identical symlinks now avoids + considering attribute differences that cannot be changed on the + receiver. + - Fixed a bug with --fake-super when copying files and dirs that + aren't user writable. + - Fixed a bug where a sparse file could have its last sparse + block turned into a real block when rsync sets the file size + (requires ftruncate). + - Fixed the working of --force when used with --one-file-system. + - Various manpage improvements. +- run spec-cleaner + +------------------------------------------------------------------- +Sun Sep 19 10:55:59 UTC 2010 - [email protected] + +- rsyncd.rc changes: +* Do not use killproc -TERM, but just killproc, so that killproc + waits until the service is actually shut down, before attempting + to restart it (when "restart" is used). Fixes bnc#546977. +* Change the "reload" action to return "missing" because rsyncd + does not handle SIGHUP +* Adjust "force-reload" accordingly + +------------------------------------------------------------------- +Mon Jan 4 14:21:21 UTC 2010 - [email protected] + +- update to rsync-3.0.7 + - Fixed a bogus free when using --xattrs with --backup. + - Avoid an error when --dry-run was trying to stat a prior hard-link + file that hasn't really been created. + - Fixed a problem with --compress (-z) where the receiving side could + return the error "inflate (token) returned -5". + - 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 (both sides of the transfer must be at least 3.0.7). + - Improved --skip-compress's error handling of bad character-sets and + got rid of a lingering debug fprintf(). + - Fixed the daemon's conveyance of io_error value from the sender. + - An rsync daemon use seteuid() (when available) if it used setuid(). + - Get the permissions right on a --fake-super transferred directory + that needs more owner permissions to emulate root behavior. + - An absolute-path filter rule (i.e. with a '/' modifier) no longer + loses its modifier when sending the filter rules to the remote + rsync. + - Improved the "--delete does not work without -r or -d" message. + - Improved rsync's handling of --timeout to avoid a weird timeout case + where the sender could timeout even though it has recently written + data to the socket (but hasn't read data recently, due to the + writing). + - Some misc manpage improvements. + - Fixed the chmod-temp-dir testsuite on a system without /var/tmp. + - Make sure that a timeout specified in the daemon's config is used as + a maximum timeout value when the user also specifies a timeout. + - Improved the error-exit reporting when rsync gets an error trying to + cleanup after an error: the initial error is reported. + - The AIX sysacls routines will now return ENOSYS if ENOTSUP is + missing. + - Made our (only used if missing) getaddrinfo() routine use + inet_pton() (which we also provide) instead of inet_aton(). + - The exit-related debug messages now mention the program's role so it + is clear who output what message. + +------------------------------------------------------------------- +Fri Aug 21 11:09:20 UTC 2009 - [email protected] + +- spec mods + o sorted TAGS + o added missing clean section +- rpmlint + o non-conffile-in-etc /etc/sysconfig/SuSEfirewall2.d/services/rsync-server + +------------------------------------------------------------------- +Wed Aug 5 11:24:00 CEST 2009 - [email protected] + +- bump version to 3.0.6 +- drop rsync-allow-slp-disable.patch (merged upstream) + +------------------------------------------------------------------- +Tue May 5 15:29:12 CEST 2009 - [email protected] + +- add rsync-allow-slp-disable.patch (FATE#306331) + +------------------------------------------------------------------- +Thu Apr 16 12:16:41 CEST 2009 - [email protected] + +- 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. ++++ 555 more lines (skipped) ++++ between /dev/null ++++ and /work/SRC/openSUSE:13.1:Update/.rsync.2237.new/rsync.changes New: ---- 0001-use-lp_num_modules-instead-of-the-removed-lp_numserv.patch logrotate.rsync rsync-3.1.0.tar.gz rsync-3.1.0.tar.gz.asc rsync-patches-3.1.0.tar.gz rsync-patches-3.1.0.tar.gz.asc rsync-server.firewall rsync.changes rsync.keyring rsync.spec rsync.xinetd rsyncd.conf rsyncd.rc rsyncd.secrets rsyncd.service system-zlib.diff ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ rsync.spec ++++++ # # spec file for package rsync # # Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed # upon. The license for this file, and modifications and additions to the # file, is the same license as for the pristine package itself (unless the # license for the pristine package is not an Open Source License, in which # case the license is the MIT License). An "Open Source License" is a # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. # Please submit bugfixes or comments via http://bugs.opensuse.org/ # %define with_system_zlib 0 %if 0%{?suse_version} < 1120 %define _initddir %{_sysconfdir}/init.d %endif Name: rsync Version: 3.1.0 Release: 0 Summary: Versatile tool for fast incremental file transfer License: GPL-3.0+ Group: Productivity/Networking/Other Url: http://rsync.samba.org/ Source: http://rsync.samba.org/ftp/rsync/src/rsync-%{version}.tar.gz Source1: http://rsync.samba.org/ftp/rsync/src/rsync-patches-%{version}.tar.gz Source2: logrotate.rsync Source3: rsync.xinetd Source4: rsyncd.rc 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 PreReq: sed BuildRoot: %{_tmppath}/%{name}-%{version}-build %if 0%{?suse_version} > 1010 Recommends: logrotate %endif %if 0%{?suse_version} > 1140 BuildRequires: systemd %{?systemd_requires} %define has_systemd 1 %endif %description Rsync is a fast and extraordinarily versatile file copying tool. It can copy locally, to/from another host over any remote shell, or to/from a remote rsync daemon. It offers a large number of options that control every aspect of its behavior and permit very flexible specification of the set of files to be copied. It is famous for its delta-transfer algorithm, which reduces the amount of data sent over the network by sending only the differences between the 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 # fate#312479 patch -p1 < patches/time-limit.diff %build autoreconf -fiv export CFLAGS="%optflags -fPIC -DPIC -fPIE" export LDFLAGS="-Wl,-z,relro,-z,now -pie" %configure \ --disable-debug \ --enable-slp \ --enable-acl-support \ --enable-xattr-support make %{?_smp_mflags} %install make install DESTDIR="%buildroot" rm -f %{buildroot}%{_sbindir}/rsyncd install -d %{buildroot}%{_sysconfdir}/logrotate.d install -d %{buildroot}%{_sysconfdir}/init.d install -d %{buildroot}%{_sysconfdir}/xinetd.d install -d %{buildroot}%{_prefix}/sbin ln -sf ../bin/rsync %{buildroot}%{_sbindir}/rsyncd install -m 755 support/rsyncstats %{buildroot}%{_prefix}/bin install -m 644 %{SOURCE2} %{buildroot}%{_sysconfdir}/logrotate.d/rsync install -m 644 %{SOURCE3} %{buildroot}%{_sysconfdir}/xinetd.d/rsync install -m 755 %{SOURCE4} %{buildroot}%{_initddir}/rsyncd install -m 644 %{SOURCE5} %{buildroot}%{_sysconfdir}/rsyncd.conf install -m 600 %{SOURCE6} %{buildroot}%{_sysconfdir}/rsyncd.secrets ln -sf ../../etc/init.d/rsyncd %{buildroot}%{_sbindir}/rcrsyncd mkdir -p %{buildroot}%{_sysconfdir}/sysconfig/SuSEfirewall2.d/services install -m 644 %{SOURCE7} %{buildroot}%{_sysconfdir}/sysconfig/SuSEfirewall2.d/services/rsync-server %if 0%{?has_systemd} install -D -m 0644 %SOURCE8 %{buildroot}%{_unitdir}/rsyncd.service %endif %pre %if 0%{?has_systemd} %service_add_pre rsyncd.service %endif %preun %stop_on_removal rsyncd %if 0%{?has_systemd} %service_del_preun rsyncd.service %endif %post %fillup_and_insserv rsyncd if ! grep -q "^pid file" /etc/rsyncd.conf ; then sed -i -e "/^log file/{;p;s@\(.*\)@pid file = /var/run/rsyncd.pid@;}" /etc/rsyncd.conf fi %if 0%{?has_systemd} %service_add_post rsyncd.service %endif %postun %restart_on_update rsyncd %insserv_cleanup %if 0%{?has_systemd} %service_del_postun rsyncd.service %endif %files %defattr(-,root,root) %if 0%{?has_systemd} %{_unitdir}/rsyncd.service %endif %config(noreplace) %{_sysconfdir}/rsyncd.conf %config(noreplace) %{_sysconfdir}/rsyncd.secrets %config(noreplace) %{_sysconfdir}/logrotate.d/rsync %config(noreplace) %{_sysconfdir}/xinetd.d/rsync %config %{_sysconfdir}/init.d/rsyncd %{_sbindir}/rcrsyncd %{_sbindir}/rsyncd %{_bindir}/rsyncstats %{_bindir}/rsync %config %{_sysconfdir}/sysconfig/SuSEfirewall2.d/services/* %doc %{_mandir}/man1/rsync.1.gz %doc %{_mandir}/man5/rsyncd.conf.5.gz %doc COPYING NEWS README tech_report.tex %changelog ++++++ 0001-use-lp_num_modules-instead-of-the-removed-lp_numserv.patch ++++++ >From 50652ac755815d01a6954258ba7174bb8f4bb158 Mon Sep 17 00:00:00 2001 From: Vitezslav Cizek <[email protected]> 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 ++++++ logrotate.rsync ++++++ /var/log/rsyncd.log { compress dateext maxage 365 rotate 99 size=+1024k notifempty missingok copytruncate } ++++++ rsync-server.firewall ++++++ # Do not edit this file as it's just a template and will be # overwritten on package updates! Copy to a new file instead. # # Only the variables TCP, UDP, RPC, IP and BROADCAST are allowed. # More may be supported in the future. # # For a more detailed description of the individual variables see # the comments for FW_SERVICES_*_EXT in /etc/sysconfig/SuSEfirewall2 # ## Name: Rsync server ## Description: Opens port for rsync server in order to allow remote synchronization # space separated list of allowed TCP ports TCP="rsync" # space separated list of allowed UDP ports UDP="" # space separated list of allowed RPC services RPC="" # space separated list of allowed IP protocols IP="" # space separated list of allowed UDP broadcast ports BROADCAST="" ++++++ rsync.keyring ++++++ pub 1024D/4B96A8C5 2003-12-19 uid Wayne Davison <[email protected]> uid Wayne Davison <[email protected]> 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----- ++++++ rsync.xinetd ++++++ # default: off # description: rsync file transfer daemon service rsync { socket_type = stream protocol = tcp wait = no user = root server = /usr/sbin/rsyncd server_args = --daemon disable = yes } ++++++ rsyncd.conf ++++++ gid = users read only = true use chroot = true transfer logging = true log format = %h %o %f %l %b log file = /var/log/rsyncd.log pid file = /var/run/rsyncd.pid hosts allow = trusted.hosts slp refresh = 300 use slp = false #[Example] # path = /home/Example # comment = An Example # auth users = user # secrets file = /etc/rsyncd.secrets ++++++ rsyncd.rc ++++++ #! /bin/sh # Copyright (c) 1996, 1997, 1998 S.u.S.E. GmbH # Copyright (c) 1998, 1999, 2000, 2001 SuSE GmbH # Copyright (c) 2002 SuSE Linux AG # # Author: Kurt Garloff <[email protected]> # # init.d/rsyncd # # and symbolic its link # # /sbin/rcrsyncd # # System startup script for the rsync daemon # ### BEGIN INIT INFO # Provides: rsync # Required-Start: $remote_fs $syslog # Required-Stop: $remote_fs $syslog # Should-Start: slpd # Should-Stop: slpd # Default-Start: 3 5 # Default-Stop: 0 1 2 6 # Description: Start the rsync server daemon # Short-Description: Start the rsync server daemon ### END INIT INFO RSYNCD_BIN=/usr/sbin/rsyncd test -x $RSYNCD_BIN || exit 5 RSYNCD_PID=/var/run/rsyncd.pid # Shell functions sourced from /etc/rc.status: # rc_check check and set local and overall rc status # rc_status check and set local and overall rc status # rc_status -v ditto but be verbose in local rc status # rc_status -v -r ditto and clear the local rc status # rc_failed set local and overall rc status to failed # rc_failed <num> set local and overall rc status to <num><num> # rc_reset clear local rc status (overall remains) # rc_exit exit appropriate to overall rc status . /etc/rc.status # First reset status of this service rc_reset # Return values acc. to LSB for all commands but status: # 0 - success # 1 - generic or unspecified error # 2 - invalid or excess argument(s) # 3 - unimplemented feature (e.g. "reload") # 4 - insufficient privilege # 5 - program is not installed # 6 - program is not configured # 7 - program is not running # # Note that starting an already running service, stopping # or restarting a not-running service as well as the restart # with force-reload (in case signalling is not supported) are # considered a success. case "$1" in start) echo -n "Starting rsync daemon" ## Start daemon with startproc(8). If this fails ## the echo return value is set appropriate. # NOTE: startproc return 0, even if service is # already running to match LSB spec. startproc -p $RSYNCD_PID -t 1 $RSYNCD_BIN --daemon # Remember status and be verbose rc_status -v ;; stop) echo -n "Shutting down rsync daemon" ## Stop daemon with killproc(8) and if this fails ## set echo the echo return value. killproc -p $RSYNCD_PID $RSYNCD_BIN # Remember status and be verbose rc_status -v ;; try-restart) ## Stop the service and if this succeeds (i.e. the ## service was running before), start it again. ## Note: try-restart is not (yet) part of LSB (as of 0.7.5) $0 status >/dev/null && $0 restart # Remember status and be quiet rc_status ;; restart) ## Stop the service and regardless of whether it was ## running or not, start it again. $0 stop $0 start # Remember status and be quiet rc_status ;; force-reload) ## Signal the daemon to reload its config. Most daemons ## do this on signal 1 (SIGHUP). ## If it does not support it, restart. echo "Reload service rsync" "$0" restart rc_status -v ;; reload) # rsyncd does not catch SIGHUP echo -n "Reload service rsync" rc_failed 3 rc_status -v ;; status) echo -n "Checking for rsync daemon: " ## Check status with checkproc(8), if process is running ## checkproc will return with exit status 0. # Status has a slightly different for the status command: # 0 - service running # 1 - service dead, but /var/run/ pid file exists # 2 - service dead, but /var/lock/ lock file exists # 3 - service not running # NOTE: checkproc returns LSB compliant status values. checkproc -p $RSYNCD_PID $RSYNCD_BIN rc_status -v ;; *) echo "Usage: $0 {start|stop|status|try-restart|restart|force-reload|reload}" exit 1 ;; esac rc_exit ++++++ rsyncd.secrets ++++++ # user:passwd ++++++ rsyncd.service ++++++ [Unit] Description=Start the rsync server daemon After=network.target [Service] ExecStart=/usr/sbin/rsyncd --daemon --no-detach IOSchedulingClass=idle CPUSchedulingPolicy=batch PrivateTmp=true [Install] WantedBy=multi-user.target++++++ system-zlib.diff ++++++ --- Makefile.in +++ Makefile.in @@ -40,7 +40,8 @@ DAEMON_OBJ = params.o loadparm.o clientserver.o access.o connection.o authenticate.o popt_OBJS=popt/findme.o popt/popt.o popt/poptconfig.o \ popt/popthelp.o popt/poptparse.o -OBJS=$(OBJS1) $(OBJS2) $(OBJS3) $(DAEMON_OBJ) $(LIBOBJ) $(ZLIBOBJ) @BUILD_POPT@ +OBJS=$(OBJS1) $(OBJS2) $(OBJS3) $(DAEMON_OBJ) $(LIBOBJ) @BUILD_POPT@ +LIBS += -lz TLS_OBJ = tls.o syscall.o lib/compat.o lib/snprintf.o lib/permstring.o lib/sysxattrs.o @BUILD_POPT@ --- batch.c +++ batch.c @@ -20,7 +20,7 @@ */ #include "rsync.h" -#include "zlib/zlib.h" +#include <zlib.h> #include <time.h> extern int eol_nulls; --- options.c +++ options.c @@ -22,7 +22,7 @@ #include "rsync.h" #include "ifuncs.h" #include <popt.h> -#include "zlib/zlib.h" +#include <zlib.h> extern int module_id; extern int sanitize_paths; --- token.c +++ token.c @@ -21,7 +21,7 @@ #include "rsync.h" #include "ifuncs.h" -#include "zlib/zlib.h" +#include <zlib.h> extern int do_compression; extern int module_id; -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
