Update to 2.2.0

help and ok sthen@
This commit is contained in:
giovanni 2010-05-05 17:03:19 +00:00
parent 9b3be1dff8
commit 33441d84ea
8 changed files with 48 additions and 44 deletions

View File

@ -1,9 +1,9 @@
# $OpenBSD: Makefile,v 1.3 2009/10/22 15:55:10 giovanni Exp $
# $OpenBSD: Makefile,v 1.4 2010/05/05 17:03:19 giovanni Exp $
COMMENT = MySQL backup scripts
V = 2.1.1
DISTNAME = MySQL-zrm-$V
V = 2.2
DISTNAME = MySQL-zrm-$V.0
PKGNAME = ${DISTNAME:L}
CATEGORIES = databases perl5
@ -35,7 +35,7 @@ pre-configure:
${WRKSRC}/usr/bin/mysql-zrm-*
do-install:
@find ${WRKSRC} \( -name "*.bak" -o -name "*.orig" \) -exec rm -f {} \;
@find ${WRKSRC} \( -name "*.bak" -o -name "*.orig" -o -name "*.beforesubst" \) -exec rm -f {} \;
${INSTALL_SCRIPT} ${WRKSRC}/usr/bin/* ${PREFIX}/bin/
cd ${WRKSRC}/usr/lib; \
tar cf - mysql-zrm | tar xf - -C ${PREFIX}/lib/

View File

@ -1,5 +1,5 @@
MD5 (MySQL-zrm-2.1.1.tar.gz) = b30hqVqmXpxXzIx3HlcxdA==
RMD160 (MySQL-zrm-2.1.1.tar.gz) = VupMRF3xaTRz4G63W1aqliB58vU=
SHA1 (MySQL-zrm-2.1.1.tar.gz) = 6durM4LJ+GBUPOaIUKunIOLpWGw=
SHA256 (MySQL-zrm-2.1.1.tar.gz) = Qc5hlz/lhtawhnmZzPtuteRzK5ERqFwSKeI4tsUn1Ng=
SIZE (MySQL-zrm-2.1.1.tar.gz) = 134489
MD5 (MySQL-zrm-2.2.0.tar.gz) = kTaCJB4JcTP/kNz4WBL/ig==
RMD160 (MySQL-zrm-2.2.0.tar.gz) = Mvimt5cv7V+cQuJVDaDv+sEemGE=
SHA1 (MySQL-zrm-2.2.0.tar.gz) = I0inDfKOp/aW5KlSMDyozQ/WgUY=
SHA256 (MySQL-zrm-2.2.0.tar.gz) = EDs8pdRkkXydapo63TzALEtDuTYRI7JyO8tSIZhCNGw=
SIZE (MySQL-zrm-2.2.0.tar.gz) = 149771

View File

@ -1,6 +1,6 @@
$OpenBSD: patch-etc_mysql-zrm_mysql-zrm_conf,v 1.2 2008/12/22 14:44:26 giovanni Exp $
--- etc/mysql-zrm/mysql-zrm.conf.orig Fri Dec 5 01:46:01 2008
+++ etc/mysql-zrm/mysql-zrm.conf Fri Dec 19 11:05:27 2008
$OpenBSD: patch-etc_mysql-zrm_mysql-zrm_conf,v 1.3 2010/05/05 17:03:19 giovanni Exp $
--- etc/mysql-zrm/mysql-zrm.conf.orig Thu Feb 4 01:19:25 2010
+++ etc/mysql-zrm/mysql-zrm.conf Wed May 5 12:10:00 2010
@@ -40,7 +40,7 @@
# mysqldump(1) tool
# This parameter is optional and default value is "raw".
@ -28,7 +28,7 @@ $OpenBSD: patch-etc_mysql-zrm_mysql-zrm_conf,v 1.2 2008/12/22 14:44:26 giovanni
# This specifies the option to be passed to the encryption
# program specified as "encrypt-plugin" parameter for decryption.
@@ -159,7 +159,7 @@
@@ -165,7 +165,7 @@
#Name of Socket file that can be used for connecting to MySQL
#
@ -37,7 +37,7 @@ $OpenBSD: patch-etc_mysql-zrm_mysql-zrm_conf,v 1.2 2008/12/22 14:44:26 giovanni
# ssl-options are arguments that are passed to MySQL client commands
# for SSL connection to the MySQL server. This parameter is optional and is
@@ -261,18 +261,18 @@ mailto="root@localhost"
@@ -272,18 +272,18 @@
#
# Please read the Notes at /usr/share/doc/mysql-zrm/README-plugin-socket-copy
#
@ -59,7 +59,7 @@ $OpenBSD: patch-etc_mysql-zrm_mysql-zrm_conf,v 1.2 2008/12/22 14:44:26 giovanni
# Set of parameters passed to the pre-backup-plugin. These parameters are
# passed to "pre-backup-plugin" before a backup run for the backup set.
@@ -281,7 +281,7 @@ mailto="root@localhost"
@@ -292,7 +292,7 @@
# POST-BACKUP plugin: Plugin that will be called after a backup run for
# the backup set.
@ -68,7 +68,7 @@ $OpenBSD: patch-etc_mysql-zrm_mysql-zrm_conf,v 1.2 2008/12/22 14:44:26 giovanni
# Set of parameters passed to the post-backup-plugin. These parameters are
# passed to "post-backup-plugin" after a backup run for the backup set.
@@ -290,7 +290,7 @@ mailto="root@localhost"
@@ -301,7 +301,7 @@
# PRE-SCHEDULER plugin: Plugin that can be used to dynamically determine the
# start time for a backup run.

View File

@ -1,12 +1,12 @@
$OpenBSD: patch-usr_bin_mysql-zrm,v 1.1.1.1 2008/10/17 23:05:41 sthen Exp $
--- usr/bin/mysql-zrm.orig Fri Oct 3 23:01:21 2008
+++ usr/bin/mysql-zrm Fri Oct 3 23:01:58 2008
@@ -27,7 +27,7 @@ our $oldPATH = $ENV{'PATH'};
$ENV{'PATH'} = "/usr/local/bin:/opt/csw/bin:/usr/bin:/usr/sbin:/sbin:/bin:/usr/ucb";
$OpenBSD: patch-usr_bin_mysql-zrm,v 1.2 2010/05/05 17:03:19 giovanni Exp $
--- usr/bin/mysql-zrm.orig Thu Feb 4 01:19:25 2010
+++ usr/bin/mysql-zrm Wed May 5 12:10:49 2010
@@ -36,7 +36,7 @@ if ( $^O =~ /^MSWin/ ) {
$ZRM_BINPATH= catfile( $ZRM_HOME, "usr", "bin" );
} else {
$ENV{'PATH'} = "/usr/local/bin:/opt/csw/bin:/usr/bin:/usr/sbin:/sbin:/bin:/usr/ucb";
- $ZRM_BINPATH="/usr/bin";
+ $ZRM_BINPATH="${PREFIX}/bin";
}
#path where ZRM utilities are installed
-my $ZRM_BINPATH="/usr/bin";
+my $ZRM_BINPATH="${PREFIX}/bin";
my $USAGE="--action <backup|restore|schedule-backup|report|list|getconf|purge|parse-binlogs|check|verify-backup|extract-backup|abort-backup>\nHelp on individual action items can be obtained by specifying --help with the required action.\nFor example: 'mysql-zrm --action backup --help'";

View File

@ -1,16 +1,16 @@
$OpenBSD: patch-usr_bin_mysql-zrm-backup,v 1.2 2008/12/22 14:44:26 giovanni Exp $
--- usr/bin/mysql-zrm-backup.orig Fri Dec 5 01:46:01 2008
+++ usr/bin/mysql-zrm-backup Fri Dec 19 11:05:27 2008
@@ -38,7 +38,7 @@ use ZRM::MySQL;
$OpenBSD: patch-usr_bin_mysql-zrm-backup,v 1.3 2010/05/05 17:03:19 giovanni Exp $
--- usr/bin/mysql-zrm-backup.orig Thu Feb 4 01:19:25 2010
+++ usr/bin/mysql-zrm-backup Wed May 5 12:11:16 2010
@@ -40,7 +40,7 @@ $SIG{'TERM'} = sub { $abort_flag = 1; };
$SIG{'PIPE'} = sub { &printWarning( "Communication pipe broke. Continuing\n" ); };
$SIG{'TERM'} = sub { $abort_flag = 1; };
-my $MD5SUM="md5sum";
+my $MD5SUM="md5";
my $MAILCMD="mail";
#Neither mysqlhotcopy not mysqldump will do a --flush-logs
@@ -1585,7 +1585,7 @@ sub totalSize()
my $MAILCMD="";
@@ -1889,7 +1889,7 @@ sub totalSize()
$inputs{"synchronous-checksum"} == 1 ){
my $file = $File::Find::fullname;
if( -f $file ){

View File

@ -1,7 +1,7 @@
$OpenBSD: patch-usr_bin_mysql-zrm-verify-backup,v 1.1.1.1 2008/10/17 23:05:41 sthen Exp $
--- usr/bin/mysql-zrm-verify-backup.orig Mon Oct 13 19:26:41 2008
+++ usr/bin/mysql-zrm-verify-backup Mon Oct 13 19:26:58 2008
@@ -30,7 +30,7 @@ use lib '/usr/lib/mysql-zrm';
$OpenBSD: patch-usr_bin_mysql-zrm-verify-backup,v 1.2 2010/05/05 17:03:19 giovanni Exp $
--- usr/bin/mysql-zrm-verify-backup.orig Thu Feb 4 01:19:25 2010
+++ usr/bin/mysql-zrm-verify-backup Wed May 5 12:10:00 2010
@@ -30,7 +30,7 @@ use lib "/usr/lib/mysql-zrm";
use ZRM::Common;

View File

@ -1,9 +1,9 @@
$OpenBSD: patch-usr_lib_mysql-zrm_ZRM_Common_pm,v 1.2 2008/12/22 14:44:26 giovanni Exp $
--- usr/lib/mysql-zrm/ZRM/Common.pm.orig Fri Dec 5 01:46:01 2008
+++ usr/lib/mysql-zrm/ZRM/Common.pm Fri Dec 19 11:05:27 2008
@@ -73,9 +73,9 @@ our $LOGGER;
$OpenBSD: patch-usr_lib_mysql-zrm_ZRM_Common_pm,v 1.3 2010/05/05 17:03:19 giovanni Exp $
--- usr/lib/mysql-zrm/ZRM/Common.pm.orig Thu Feb 4 01:19:25 2010
+++ usr/lib/mysql-zrm/ZRM/Common.pm Wed May 5 12:10:00 2010
@@ -90,9 +90,9 @@ our $LOGGER;
our $INDEX_FILENAME="index";
our $MYSQL_ZRM_CONFIG_FILE=catfile( $MYSQL_ZRM_BASEDIR, "mysql-zrm.conf");
our $MYSQL_ZRM_CONFIG_FILE=catfile( $MYSQL_ZRM_BASEDIR, "mysql-zrm.conf");
#Compress & Encrypt progs
-our $TAR="tar";
-our $TAR_COMPRESS_OPTIONS=" --same-owner -cpsC ";

View File

@ -1,4 +1,4 @@
@comment $OpenBSD: PLIST,v 1.2 2008/12/22 14:44:26 giovanni Exp $
@comment $OpenBSD: PLIST,v 1.3 2010/05/05 17:03:19 giovanni Exp $
bin/mysql-zrm
bin/mysql-zrm-abort-backup
bin/mysql-zrm-backup
@ -74,8 +74,12 @@ share/examples/mysql-zrm/plugins/parse-binlogs.pl
@sample share/mysql-zrm/plugins/parse-binlogs.pl
share/examples/mysql-zrm/plugins/post-backup.pl
@sample share/mysql-zrm/plugins/post-backup.pl
share/examples/mysql-zrm/plugins/post-restore.pl
@sample share/mysql-zrm/plugins/post-restore.pl
share/examples/mysql-zrm/plugins/pre-backup.pl
@sample share/mysql-zrm/plugins/pre-backup.pl
share/examples/mysql-zrm/plugins/pre-restore.pl
@sample share/mysql-zrm/plugins/pre-restore.pl
share/examples/mysql-zrm/plugins/pre-scheduler-plugin.pl
@sample share/mysql-zrm/plugins/pre-scheduler-plugin.pl
share/examples/mysql-zrm/plugins/socket-copy.pl