pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc Update sysutils/rsnapshot to 1.2.9
details: https://anonhg.NetBSD.org/pkgsrc/rev/56d192366857
branches: trunk
changeset: 519409:56d192366857
user: abs <abs%pkgsrc.org@localhost>
date: Mon Oct 02 19:51:37 2006 +0000
description:
Update sysutils/rsnapshot to 1.2.9
VERSION 1.2.9 (May 18 2006)
------------------------------------------------------------------------------
- Added utils/rsnapreport.pl, written by William Bear.
- Detect exit status 23 and 24 from rsync in rsync_cleanup_after_native_cp_al
- Add $! (system error message) to various warning messages in native_cp_al
- Add more examples and comments to rsnapshot.conf.default.in
- In Makefile*, for "make tar", include "t" (testing) in the tar file.
- Do not strip the trailing slash if it's a remote root filesystem.
(This was a bug in rsnapshot 1.2.3 if you use "backup host:/ ...")
- Give a more descriptive error message "cannot have a remote snapshot_root"
if user tries to configure an ssh path or rsync path as snapshot_root.
- Add some more description to the error "rsnapshot refuses to create
snapshot_root when no_create_root is enabled", after checking whether
the snapshot_root is a non-directory file, or just plain non-existent.
- Changed default syslog level to 'info' instead of 'notice'
- Added include_conf directive
- Allowed remote ssh directory paths starting with "~/" as well as "/".
- Changed rsnapshot maintainer from Nathan Rosenquist to David Cantrell
- David Cantrell <david%cantrell.org.uk@localhost> wrote the rsnapshot-diff utility
- Chris Petersen added cwrsync permanent-share support
- Robert Jackson <RobertJ%promedicalinc.com@localhost> added use_lazy_deletes
- Added rollback for backup_scripts
- Added rsnapshot-diff to Autoconf/Automake install/build process
- Added sha1sum to utils/sign_packages.sh
- Added a CVS Id to key files
- Fixed exit value for some test invocations
- Added 'rsnapshot diff' front-end to rsnapshot-diff
- Added cmd_rsnapshot_diff
- Added cmd_preexec
- Added cmd_postexec
- Added db prefs examples to utils/backup_mysql.sh and utils/backup_pgsql.sh
- Fixed formatting with email addresses under AUTHORS section of man page
- Added an extra safety check in copy_symlink()
- Fixed swapped config comments about rsync_long_args in
write_upgrade_config_file()
- Added optional use of the CPAN Lchown module
- Added safe_chown() wrapper to handle chown() calls safely
- Added warning message if we can't properly lchown a symlink
- Added fixes in sync_cp_src_dest() and sync_rm_dest() to properly delete a
file that is being replaced with a directory
- Fixed error message for dest not being specified in sync_rm_dest()
- Changed skip message level to 2 in rsync_backup_point()
- Added better file type checking in sync_cp_src_dest()
- Removed redundant stat() calls in sync_cp_src_dest() and sync_rm_dest()
- Removed trailing slashes from file paths when calling cp -al subroutines
- Changed show_usage() to use here printing
- Changed strip trailing slash operation in rsync_backup_point() to use
strip_trailing_slash()
- Fixed incorrect call to cmd_rm_rf() in handle_interval()
- Fixed trailing slash on call to bail() in handle_interval()
- Added sync_first feature (touches a lot of code)
- When link_dest is enabled, rsnapshot will now hunt for the newest available
directory to use as a link_dest target (up to the oldest directory)
- When use_lazy_deletes is enabled, remove the lockfile before the final
delete
- Expanded on default (no args) and help messages
- Added show_latest_snapshot() subroutine for shell scripts
- Fixed sync_if_different() to allow alternating directories and files to be
created with the same names between runs
- Removed redundant line width and indent values in wrap_cmd() calls
- Anthony Ettinger <apwebdesign%yahoo.com@localhost> wrote utils/mysqlbackup.pl
- Sherman Boyd wrote utils/random_file_verify.sh
VERSION 1.2.3 (Aug ?? ??:?? 2005)
------------------------------------------------------------------------------
- Fixed a bug introduced in 1.2.2 when rsync is not using --relative
- Fixed a bug where the snapshot_root could be included in backups if
the root filesystem was being backed up and --relative was not set
VERSION 1.2.2 (Aug 20 18:07 2005)
------------------------------------------------------------------------------
- David Keegel <djk%cybersource.com.au@localhost> fixed a race condition in
add_lockfile()
- David Keegel <djk%cybersource.com.au@localhost> improved error reporting when config
file isn't present
- Provided a workaround for a bug in some versions of rsync which caused
files to not be deleted properly when the --relative flag was set.
diffstat:
doc/CHANGES-2006 | 3 +-
doc/TODO | 3 +-
sysutils/rsnapshot/Makefile | 9 +-
sysutils/rsnapshot/distinfo | 10 +-
sysutils/rsnapshot/patches/patch-aa | 139 ++---------------------------------
5 files changed, 23 insertions(+), 141 deletions(-)
diffs (219 lines):
diff -r 7b26e5737957 -r 56d192366857 doc/CHANGES-2006
--- a/doc/CHANGES-2006 Mon Oct 02 19:39:24 2006 +0000
+++ b/doc/CHANGES-2006 Mon Oct 02 19:51:37 2006 +0000
@@ -1,4 +1,4 @@
->$NetBSD: CHANGES-2006,v 1.1384 2006/10/02 19:36:36 abs Exp $
+>$NetBSD: CHANGES-2006,v 1.1385 2006/10/02 19:52:21 abs Exp $
Changes to the packages collection and infrastructure in 2006:
@@ -4538,3 +4538,4 @@
Added devel/p5-Carp-Clan version 5.4 [rillig 2006-10-02]
Updated devel/p5-Carp-Clan to 5.4 [rillig 2006-10-02]
Updated pkgtools/pkglint to 4.71 [abs 2006-10-02]
+ Updated sysutils/rsnapshot to 1.2.9 [abs 2006-10-02]
diff -r 7b26e5737957 -r 56d192366857 doc/TODO
--- a/doc/TODO Mon Oct 02 19:39:24 2006 +0000
+++ b/doc/TODO Mon Oct 02 19:51:37 2006 +0000
@@ -1,4 +1,4 @@
-$NetBSD: TODO,v 1.5500 2006/10/02 18:26:45 wiz Exp $
+$NetBSD: TODO,v 1.5501 2006/10/02 19:52:21 abs Exp $
Suggested new packages
======================
@@ -1087,7 +1087,6 @@
o rp-pppoe-3.8
o rpc2-1.28
o rpm-4.4.6
- o rsnapshot-1.2.9
o rt3-3.6.1
o rtcw-1.41.3
o ruby-1.8.5
diff -r 7b26e5737957 -r 56d192366857 sysutils/rsnapshot/Makefile
--- a/sysutils/rsnapshot/Makefile Mon Oct 02 19:39:24 2006 +0000
+++ b/sysutils/rsnapshot/Makefile Mon Oct 02 19:51:37 2006 +0000
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.8 2005/12/29 06:22:18 jlam Exp $
+# $NetBSD: Makefile,v 1.9 2006/10/02 19:51:37 abs Exp $
#
-DISTNAME= rsnapshot-1.2.1
-PKGREVISION= 1
+DISTNAME= rsnapshot-1.2.9
CATEGORIES= net
MASTER_SITES= http://www.rsnapshot.org/downloads/
@@ -28,11 +27,11 @@
CONFIGURE_ARGS+= --with-perl=${PERL5:Q}
CONFIGURE_ARGS+= --with-rsync=${LOCALBASE}/bin/rsync
-INSTALLATION_DIRS= bin man/man1
+INSTALLATION_DIRS= bin ${PKGMANDIR}/man1
do-install:
${INSTALL_SCRIPT} ${WRKSRC}/rsnapshot ${PREFIX}/bin
- ${INSTALL_MAN} ${WRKSRC}/rsnapshot.1 ${PREFIX}/man/man1
+ ${INSTALL_MAN} ${WRKSRC}/rsnapshot.1 ${PREFIX}/${PKGMANDIR}/man1
${INSTALL_DATA_DIR} ${EGDIR}
${INSTALL_DATA} ${WRKSRC}/rsnapshot.conf.default ${EGDIR}
${INSTALL_DATA_DIR} ${DOCDIR}
diff -r 7b26e5737957 -r 56d192366857 sysutils/rsnapshot/distinfo
--- a/sysutils/rsnapshot/distinfo Mon Oct 02 19:39:24 2006 +0000
+++ b/sysutils/rsnapshot/distinfo Mon Oct 02 19:51:37 2006 +0000
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.5 2005/12/27 08:56:47 kim Exp $
+$NetBSD: distinfo,v 1.6 2006/10/02 19:51:37 abs Exp $
-SHA1 (rsnapshot-1.2.1.tar.gz) = 4e13d6a828012b869fa0709f651e3b11c40d0c91
-RMD160 (rsnapshot-1.2.1.tar.gz) = 78d365b45c3a7dbe2034d901afe4937b39687946
-Size (rsnapshot-1.2.1.tar.gz) = 137194 bytes
-SHA1 (patch-aa) = 7b6fb79ce5e47cc552ee3634598b2e2101dc8919
+SHA1 (rsnapshot-1.2.9.tar.gz) = eadf8c68eeba5e75ef84179d54666214ff9e7eb2
+RMD160 (rsnapshot-1.2.9.tar.gz) = 8574739936b6e6b802cbf66f0609807e1b60ee11
+Size (rsnapshot-1.2.9.tar.gz) = 177971 bytes
+SHA1 (patch-aa) = 60fb3b966727ef46bc7c5ea33c2171bb9b102b53
diff -r 7b26e5737957 -r 56d192366857 sysutils/rsnapshot/patches/patch-aa
--- a/sysutils/rsnapshot/patches/patch-aa Mon Oct 02 19:39:24 2006 +0000
+++ b/sysutils/rsnapshot/patches/patch-aa Mon Oct 02 19:51:37 2006 +0000
@@ -1,130 +1,13 @@
-$NetBSD: patch-aa,v 1.3 2005/12/27 08:56:47 kim Exp $
+$NetBSD: patch-aa,v 1.4 2006/10/02 19:51:37 abs Exp $
---- rsnapshot-program.pl.orig 2005-04-10 01:22:29.000000000 +0300
-+++ rsnapshot-program.pl 2005-12-25 11:16:47.000000000 +0200
-@@ -32,6 +32,7 @@
- use File::Path; # mkpath(), rmtree()
- use File::stat; # stat(), lstat()
- use POSIX qw(locale_h); # setlocale()
-+use Lchown qw(lchown LCHOWN_AVAILABLE);
-
- ########################################
- ### DECLARE GLOBAL VARIABLES ###
-@@ -3277,24 +3278,9 @@
-
- # CHOWN DEST (if root)
- if (0 == $<) {
-- # make sure destination is not a symlink
-- if ( ! -l "$dest" ) {
-- # print and/or log this if necessary
-- if (($verbose > 4) or ($loglevel > 4)) {
-- my $cmd_string = "chown(" . $st->uid . ", " . $st->gid . ", \"$dest\")";
--
-- if ($verbose > 4) {
-- print_cmd($cmd_string);
-- } elsif ($loglevel > 4) {
-- log_msg($cmd_string, 4);
-- }
-- }
--
-- $result = chown($st->uid, $st->gid, "$dest");
-- if (! $result) {
-- print_err("Warning! Could not chown(" . $st->uid . ", " . $st->gid . ", \"$dest\");", 2);
-- return(0);
-- }
-+ $result = safe_chown($st->uid, $st->gid, $dest);
-+ if (! $result) {
-+ return(0);
- }
- }
-
-@@ -3501,6 +3487,43 @@
- return (1);
- }
+--- Makefile.in.orig 2006-05-18 11:19:45.000000000 +0100
++++ Makefile.in
+@@ -546,7 +546,7 @@ doc: man html
+ man: rsnapshot.1
+ rsnapshot.1 : rsnapshot
+ @# perl 5.8 for this
+- /usr/bin/pod2man -c '' -n 'rsnapshot' -r '' rsnapshot > rsnapshot.1
++ pod2man -c '' -n 'rsnapshot' -r '' rsnapshot > rsnapshot.1
-+# choose between lchown or chown
-+sub safe_chown {
-+ my $uid = shift(@_);
-+ my $gid = shift(@_);
-+ my $dest = shift(@_);
-+
-+ my $result = 0;
-+
-+ # logging
-+ if (LCHOWN_AVAILABLE || ! -l $dest) {
-+ # print and/or log this if necessary
-+ if (($verbose > 4) or ($loglevel > 4)) {
-+ my $cmd_string = 'chown(' . $uid . ', ' . $gid . ', "' . $dest . '")';
-+ if ($verbose > 4) {
-+ print_cmd($cmd_string);
-+ } elsif ($loglevel > 4) {
-+ log_msg($cmd_string, 4);
-+ }
-+ }
-+ }
-+
-+ if (LCHOWN_AVAILABLE) {
-+ $result = lchown($uid, $gid, $dest);
-+ } else {
-+ # make sure destination is not a symlink
-+ if ( ! -l $dest ) {
-+ $result = chown($uid, $gid, $dest);
-+ }
-+ }
-+
-+ if (! $result) {
-+ print_err('Warning! Could not safe_chown(' . $uid . ', ' . $gid . ', "' . $dest . '")', 2);
-+ }
-+
-+ return($result);
-+}
-+
- # accepts a path
- # displays the rm command according to the config file
- sub display_rm_rf {
-@@ -3777,13 +3800,9 @@
-
- # CHOWN DEST (if root)
- if (0 == $<) {
-- # make sure dest is not a symlink
-- if ( ! -l "$dest" ) {
-- $result = chown($st->uid, $st->gid, "$dest");
-- if (! $result) {
-- print_err("Warning! Could not chown(" . $st->uid . ", " . $st->gid . ", \"$dest\");", 2);
-- return(0);
-- }
-+ $result = safe_chown($st->uid, $st->gid, $dest);
-+ if (! $result) {
-+ return(0);
- }
- }
-
-@@ -3998,25 +4017,9 @@
- # CHOWN DEST (if root)
- if (0 == $<) {
- if ( -e "$dest" ) {
-- # make sure destination is not a symlink
-- if ( ! -l "$dest" ) {
-- # print and/or log this if necessary
-- if (($verbose > 4) or ($loglevel > 4)) {
-- my $cmd_string = "chown(" . $st->uid . ", " . $st->gid . ", \"$dest\");";
--
-- if ($verbose > 4) {
-- print_cmd($cmd_string);
-- } elsif ($loglevel > 4) {
-- log_msg($cmd_string, 4);
-- }
-- }
--
-- $result = chown($st->uid, $st->gid, "$dest");
--
-- if (! $result) {
-- print_err("Warning! Could not chown(" . $st->uid . ", " . $st->gid . ", \"$dest\")", 2);
-- return (0);
-- }
-+ $result = safe_chown($st->uid, $st->gid, $dest);
-+ if (! $result) {
-+ return (0);
- }
- }
- }
+ html: rsnapshot.html
+ rsnapshot.html: rsnapshot
Home |
Main Index |
Thread Index |
Old Index