Re: UPDATE: databases/mysql-zrm

2013-12-01 Thread Giovanni Bechis 
On 09/18/13 10:21, Giovanni Bechis wrote:
 On Tue, Sep 17, 2013 at 01:40:47PM +0200, Giovanni Bechis wrote:
 On 09/17/13 09:51, Giovanni Bechis wrote:
 Update to latest version, some bugs fixed and mydumper support added.
 I do not know if it is worth to add mydumper as a run dependency or if it 
 is a too heavy one (it depends on glib2).
  Comments ?
 
ping

Re: UPDATE: databases/mysql-zrm

2013-09-18 Thread Giovanni Bechis 
On Tue, Sep 17, 2013 at 01:40:47PM +0200, Giovanni Bechis wrote:
 On 09/17/13 09:51, Giovanni Bechis wrote:
  Update to latest version, some bugs fixed and mydumper support added.
  I do not know if it is worth to add mydumper as a run dependency or if it 
  is a too heavy one (it depends on glib2).
   Comments ?
Cheers
 Giovanni
  
 Missing patch, new diff.
  Cheers
Giovanni
and finally suppress a warning if you backup all databases with parallel jobs.
 ok anyone ?
  Cheers
   Giovanni
Index: Makefile
===
RCS file: /cvs/ports/databases/mysql-zrm/Makefile,v
retrieving revision 1.18
diff -u -p -u -p -r1.18 Makefile
--- Makefile11 Mar 2013 20:59:05 -  1.18
+++ Makefile18 Sep 2013 08:17:20 -
@@ -2,10 +2,9 @@
 
 COMMENT =  MySQL backup scripts
 
-V =2.2
-DISTNAME = MySQL-zrm-$V.0
-PKGNAME =  ${DISTNAME:L}
-REVISION = 5
+V =3.0
+DISTNAME = MySQL-zrm-${V}-release
+PKGNAME =  mysql-zrm-${V}
 CATEGORIES =   databases perl5
 
 HOMEPAGE = http://www.zmanda.com/
@@ -19,13 +18,18 @@ MASTER_SITES =  http://www.zmanda.com/dow
 
 RUN_DEPENDS =  archivers/gtar \
databases/p5-DBD-mysql \
+   databases/mydumper \
security/gnupg \
textproc/p5-XML-RSS
+
+WRKDIST =  ${WRKDIR}
+
 NO_BUILD = Yes
 NO_TEST =  Yes
 
 pre-configure:
${SUBST_CMD} ${WRKSRC}/usr/bin/mysql-zrm
+   ${SUBST_CMD} ${WRKSRC}/usr/lib/mysql-zrm/ZRM/MySQL.pm
${SUBST_CMD} ${WRKSRC}/etc/mysql-zrm/mysql-zrm.conf
@perl -pi -e 's,/usr/lib,${PREFIX}/lib,g;' \
-e 's,/usr/bin/mysql-,${PREFIX}/bin/mysql-,g;' \
@@ -41,7 +45,7 @@ do-install:
${INSTALL_DATA_DIR} ${PREFIX}/share/examples/mysql-zrm/plugins/
${INSTALL_SCRIPT} ${WRKSRC}/usr/share/mysql-zrm/plugins/*.pl 
${PREFIX}/share/examples/mysql-zrm/plugins/
${INSTALL_DATA_DIR} ${PREFIX}/share/doc/mysql-zrm/
-   ${INSTALL_DATA} ${WRKSRC}/usr/share/doc/${DISTNAME}/README-* 
${PREFIX}/share/doc/mysql-zrm/
+   ${INSTALL_DATA} ${WRKSRC}/usr/share/doc/MySQL-zrm-${V}/README-* 
${PREFIX}/share/doc/mysql-zrm/
${INSTALL_DATA_DIR} ${PREFIX}/share/examples/mysql-zrm/
${INSTALL_DATA} ${WRKSRC}/etc/mysql-zrm/* 
${PREFIX}/share/examples/mysql-zrm/
 .for s in 1 5
Index: distinfo
===
RCS file: /cvs/ports/databases/mysql-zrm/distinfo,v
retrieving revision 1.4
diff -u -p -u -p -r1.4 distinfo
--- distinfo5 May 2010 17:03:19 -   1.4
+++ distinfo18 Sep 2013 08:17:20 -
@@ -1,5 +1,2 @@
-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
+SHA256 (MySQL-zrm-3.0-release.tar.gz) = 
BeA0KxkLZHXyIAFKEm7SE0QuJK97bjKV+pFPy0exuTE=
+SIZE (MySQL-zrm-3.0-release.tar.gz) = 152711
Index: patches/patch-etc_mysql-zrm_mysql-zrm_conf
===
RCS file: 
/cvs/ports/databases/mysql-zrm/patches/patch-etc_mysql-zrm_mysql-zrm_conf,v
retrieving revision 1.3
diff -u -p -u -p -r1.3 patch-etc_mysql-zrm_mysql-zrm_conf
--- patches/patch-etc_mysql-zrm_mysql-zrm_conf  5 May 2010 17:03:19 -   
1.3
+++ patches/patch-etc_mysql-zrm_mysql-zrm_conf  18 Sep 2013 08:17:20 -
@@ -1,16 +1,20 @@
 $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 @@
+--- etc/mysql-zrm/mysql-zrm.conf.orig  Mon Aug 26 22:45:37 2013
 etc/mysql-zrm/mysql-zrm.conf   Sat Sep 14 09:39:01 2013
+@@ -40,8 +40,11 @@
  # mysqldump(1) tool
  # This parameter is optional and default value is raw.
  #
 -#backup-mode=raw
 +backup-mode=logical
  
++# Enable to use mydumper utility
++logical-parallel=0
++
  # Size of LVM snapshot. This parameter is optional and  is required only 
  # for raw backup-mode and if the MySQL database data are stored in 
-@@ -64,7 +64,7 @@
+ # LVM logical volumes. 
+@@ -64,7 +67,7 @@
  # directory.  This parameter is optional and the default 
  # value is /var/lib/mysql-zrm
  #
@@ -19,7 +23,7 @@ $OpenBSD: patch-etc_mysql-zrm_mysql-zrm_
  
  # Specifies how long the backup should be retained. The value can be 
  # specified in days (suffix D), weeks (suffix: W), months (suffix: M) or 
-@@ -97,7 +97,7 @@
+@@ -97,7 +100,7 @@
  
  # This parameter specifies that the program that should be used for 
  # backup data encryption. decrypt-option parameter should also be specified.
@@ -28,7 +32,7 @@ $OpenBSD: patch-etc_mysql-zrm_mysql-zrm_
  
  # This specifies the option to be passed to the encryption 
  #

Re: UPDATE: databases/mysql-zrm

2013-09-17 Thread Giovanni Bechis 
On 09/17/13 09:51, Giovanni Bechis wrote:
 Update to latest version, some bugs fixed and mydumper support added.
 I do not know if it is worth to add mydumper as a run dependency or if it is 
 a too heavy one (it depends on glib2).
  Comments ?
   Cheers
Giovanni
 
Missing patch, new diff.
 Cheers
   Giovanni
Index: Makefile
===
RCS file: /cvs/ports/databases/mysql-zrm/Makefile,v
retrieving revision 1.18
diff -u -p -u -p -r1.18 Makefile
--- Makefile	11 Mar 2013 20:59:05 -	1.18
+++ Makefile	17 Sep 2013 11:39:36 -
@@ -2,10 +2,9 @@
 
 COMMENT =	MySQL backup scripts
 
-V =		2.2
-DISTNAME =	MySQL-zrm-$V.0
-PKGNAME =	${DISTNAME:L}
-REVISION =	5
+V =		3.0
+DISTNAME =	MySQL-zrm-${V}-release
+PKGNAME =	mysql-zrm-${V}
 CATEGORIES =	databases perl5
 
 HOMEPAGE =	http://www.zmanda.com/
@@ -19,13 +18,18 @@ MASTER_SITES =	http://www.zmanda.com/dow
 
 RUN_DEPENDS =	archivers/gtar \
 		databases/p5-DBD-mysql \
+		databases/mydumper \
 		security/gnupg \
 		textproc/p5-XML-RSS
+
+WRKDIST =	${WRKDIR}
+
 NO_BUILD =	Yes
 NO_TEST =	Yes
 
 pre-configure:
 	${SUBST_CMD} ${WRKSRC}/usr/bin/mysql-zrm
+	${SUBST_CMD} ${WRKSRC}/usr/lib/mysql-zrm/ZRM/MySQL.pm
 	${SUBST_CMD} ${WRKSRC}/etc/mysql-zrm/mysql-zrm.conf
 	@perl -pi -e 's,/usr/lib,${PREFIX}/lib,g;' \
 	-e 's,/usr/bin/mysql-,${PREFIX}/bin/mysql-,g;' \
@@ -41,7 +45,7 @@ do-install:
 	${INSTALL_DATA_DIR} ${PREFIX}/share/examples/mysql-zrm/plugins/
 	${INSTALL_SCRIPT} ${WRKSRC}/usr/share/mysql-zrm/plugins/*.pl ${PREFIX}/share/examples/mysql-zrm/plugins/
 	${INSTALL_DATA_DIR} ${PREFIX}/share/doc/mysql-zrm/
-	${INSTALL_DATA} ${WRKSRC}/usr/share/doc/${DISTNAME}/README-* ${PREFIX}/share/doc/mysql-zrm/
+	${INSTALL_DATA} ${WRKSRC}/usr/share/doc/MySQL-zrm-${V}/README-* ${PREFIX}/share/doc/mysql-zrm/
 	${INSTALL_DATA_DIR} ${PREFIX}/share/examples/mysql-zrm/
 	${INSTALL_DATA} ${WRKSRC}/etc/mysql-zrm/* ${PREFIX}/share/examples/mysql-zrm/
 .for s in 1 5
Index: distinfo
===
RCS file: /cvs/ports/databases/mysql-zrm/distinfo,v
retrieving revision 1.4
diff -u -p -u -p -r1.4 distinfo
--- distinfo	5 May 2010 17:03:19 -	1.4
+++ distinfo	17 Sep 2013 11:39:36 -
@@ -1,5 +1,2 @@
-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
+SHA256 (MySQL-zrm-3.0-release.tar.gz) = BeA0KxkLZHXyIAFKEm7SE0QuJK97bjKV+pFPy0exuTE=
+SIZE (MySQL-zrm-3.0-release.tar.gz) = 152711
Index: patches/patch-etc_mysql-zrm_mysql-zrm_conf
===
RCS file: /cvs/ports/databases/mysql-zrm/patches/patch-etc_mysql-zrm_mysql-zrm_conf,v
retrieving revision 1.3
diff -u -p -u -p -r1.3 patch-etc_mysql-zrm_mysql-zrm_conf
--- patches/patch-etc_mysql-zrm_mysql-zrm_conf	5 May 2010 17:03:19 -	1.3
+++ patches/patch-etc_mysql-zrm_mysql-zrm_conf	17 Sep 2013 11:39:36 -
@@ -1,16 +1,20 @@
 $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 @@
+--- etc/mysql-zrm/mysql-zrm.conf.orig	Mon Aug 26 22:45:37 2013
 etc/mysql-zrm/mysql-zrm.conf	Sat Sep 14 09:39:01 2013
+@@ -40,8 +40,11 @@
  # mysqldump(1) tool
  # This parameter is optional and default value is raw.
  #
 -#backup-mode=raw
 +backup-mode=logical
  
++# Enable to use mydumper utility
++logical-parallel=0
++
  # Size of LVM snapshot. This parameter is optional and  is required only 
  # for raw backup-mode and if the MySQL database data are stored in 
-@@ -64,7 +64,7 @@
+ # LVM logical volumes. 
+@@ -64,7 +67,7 @@
  # directory.  This parameter is optional and the default 
  # value is /var/lib/mysql-zrm
  #
@@ -19,7 +23,7 @@ $OpenBSD: patch-etc_mysql-zrm_mysql-zrm_
  
  # Specifies how long the backup should be retained. The value can be 
  # specified in days (suffix D), weeks (suffix: W), months (suffix: M) or 
-@@ -97,7 +97,7 @@
+@@ -97,7 +100,7 @@
  
  # This parameter specifies that the program that should be used for 
  # backup data encryption. decrypt-option parameter should also be specified.
@@ -28,7 +32,7 @@ $OpenBSD: patch-etc_mysql-zrm_mysql-zrm_
  
  # This specifies the option to be passed to the encryption 
  # program specified as encrypt-plugin parameter for decryption.
-@@ -165,7 +165,7 @@
+@@ -165,7 +168,7 @@
  
  #Name of Socket file that can be used for connecting to MySQL
  #
@@ -37,7 +41,7 @@ $OpenBSD: patch-etc_mysql-zrm_mysql-zrm_
  
  # ssl-options are arguments that are passed to MySQL client commands 
  # for SSL connection to the MySQL server. This parameter is optional and is
-@@ -272,18 +272,18 @@
+@@ -272,18 +275,18 @@
  #
  #

Re: UPDATE: databases/mysql

2011-08-31 Thread Giovanni Bechis 
On 08/24/11 17:36, Giovanni Bechis wrote:
 Update to latest 5.1 release, some bug fixes and some new features added
 (mysqlcheck finally supports partitioned tables).

Better diff from Brad, ok ?
 Cheers
  Giovanni

Index: Makefile
===
RCS file: /home/cvs/ports/databases/mysql/Makefile,v
retrieving revision 1.193
diff -u -p -r1.193 Makefile
--- Makefile22 Jun 2011 07:28:17 -  1.193
+++ Makefile26 Aug 2011 02:44:07 -
@@ -6,19 +6,17 @@ COMMENT-main= multithreaded SQL database
 COMMENT-server=multithreaded SQL database (server)
 COMMENT-tests= multithreaded SQL database (regression test suite/benchmark)
 
-VERSION=   5.1.54
+VERSION=   5.1.58
 DISTNAME=  mysql-${VERSION}
 PKGNAME-main=  mysql-client-${VERSION}
-REVISION-main= 0
 PKGNAME-server=mysql-server-${VERSION}
-REVISION-server=9
 PKGNAME-tests= mysql-tests-${VERSION}
 CATEGORIES=databases
 V= MySQL-5.1
 MASTER_SITES=  ${MASTER_SITE_MYSQL:=Downloads/$V/}
 
-SHARED_LIBS=   mysqlclient_r   20.0 \
-   mysqlclient 20.0
+SHARED_LIBS=   mysqlclient_r   20.0 \
+   mysqlclient 20.0
 
 HOMEPAGE=  http://www.mysql.com/
 
@@ -35,8 +33,10 @@ DB_DIR?= /var/mysql
 SOCKET_DIR=/var/run/mysql
 SUBST_VARS=DB_DIR SOCKET_DIR VERSION
 
+.include bsd.own.mk
+
 # XXX gcc bug, gcc/3.3.5
-.if ${MACHINE_ARCH} == alpha
+.if ${MACHINE_ARCH} == alpha  ${COMPILER_VERSION} != gcc4
 CFLAGS+=   -mbwx
 .endif
 
@@ -64,8 +64,6 @@ CONFIGURE_ARGS+= --localstatedir=${DB_D
 --without-docs \
 --without-readline
 
-.include bsd.own.mk
-
 .if ${COMPILER_VERSION:L:Mgcc[34]}
 CONFIGURE_ARGS+= --with-client-ldflags=-lsupc++ \
 --with-mysqld-ldflags=-lsupc++
@@ -81,7 +79,7 @@ RUN_DEPENDS-server=   ${BASE_PKGPATH}=5.1
databases/p5-DBD-mysql
 LIB_DEPENDS-server=${BASE_PKGPATH}=5.1,5.2
 
-WANTLIB-server=${WANTLIB} crypto mysqlclient ssl stdc++ wrap z
+WANTLIB-server=${WANTLIB} crypto mysqlclient ssl wrap z
 WANTLIB-main=  ${WANTLIB} crypto ncursesw readline ssl z
 WANTLIB-tests= ${WANTLIB}
 
Index: distinfo
===
RCS file: /home/cvs/ports/databases/mysql/distinfo,v
retrieving revision 1.53
diff -u -p -r1.53 distinfo
--- distinfo26 Dec 2010 08:23:17 -  1.53
+++ distinfo26 Aug 2011 01:33:22 -
@@ -1,5 +1,5 @@
-MD5 (mysql-5.1.54.tar.gz) = Kg9Fovi1oEO5XOdXV5ajCw==
-RMD160 (mysql-5.1.54.tar.gz) = +SUsmmIni0puF9R7yQG+NzLDKxg=
-SHA1 (mysql-5.1.54.tar.gz) = w9H7fBmFUp59zcaJrHl3z/8AfJw=
-SHA256 (mysql-5.1.54.tar.gz) = hDcP/8T+J3ZF+zpQQNFT/1Z1drZk8GY0Ur4HeCa3qx8=
-SIZE (mysql-5.1.54.tar.gz) = 23672236
+MD5 (mysql-5.1.58.tar.gz) = rlrvUGCI5SHkscxPZo6W0g==
+RMD160 (mysql-5.1.58.tar.gz) = GZcpxwHHZM0iWEwrlSIwwH0PMaY=
+SHA1 (mysql-5.1.58.tar.gz) = z9cL7getmVdu7N4BeFt7KnTsh6s=
+SHA256 (mysql-5.1.58.tar.gz) = PGlWI5llX8YtFCRDfm71nvfB7SJflA+BVY9Um4A/P9c=
+SIZE (mysql-5.1.58.tar.gz) = 24333490
Index: patches/patch-configure_in
===
RCS file: /home/cvs/ports/databases/mysql/patches/patch-configure_in,v
retrieving revision 1.33
diff -u -p -r1.33 patch-configure_in
--- patches/patch-configure_in  11 Jan 2011 11:03:03 -  1.33
+++ patches/patch-configure_in  26 Aug 2011 01:46:14 -
@@ -1,6 +1,6 @@
 $OpenBSD: patch-configure_in,v 1.33 2011/01/11 11:03:03 ajacoutot Exp $
 configure.in.orig  Mon Nov 29 05:38:01 2010
-+++ configure.in   Fri Jan  7 19:15:03 2011
+--- configure.in.orig  Fri Jul  1 11:22:18 2011
 configure.in   Thu Aug 25 21:46:08 2011
 @@ -464,44 +464,7 @@ AC_SUBST(ABI_CHECK)
  AC_PATH_PROG(PS, ps, ps)
  AC_MSG_CHECKING(how to check if pid exists)
@@ -57,19 +57,3 @@ $OpenBSD: patch-configure_in,v 1.33 2011
  int allow_severity = 0;
  int deny_severity  = 0;
  
-@@ -1884,6 +1848,15 @@ dnl
- 
- MYSQL_CHECK_TIME_T
- 
-+dnl
-+dnl check size of time_t
-+dnl
-+
-+AC_CHECK_SIZEOF(time_t, 8)
-+if test $ac_cv_sizeof_time_t -eq 0
-+then
-+  AC_MSG_ERROR(MySQL needs a time_t type.)
-+fi
- 
- # do we need #pragma interface/#pragma implementation ?
- # yes if it's gcc 2.x, and not icc pretending to be gcc, and not cygwin
Index: patches/patch-include_my_time_h
===
RCS file: patches/patch-include_my_time_h
diff -N patches/patch-include_my_time_h
--- patches/patch-include_my_time_h 11 Jan 2011 11:03:03 -  1.1
+++ /dev/null   1 Jan 1970 00:00:00 -
@@ -1,21 +0,0 @@
-$OpenBSD: patch-include_my_time_h,v 1.1 2011/01/11 11:03:03 ajacoutot Exp $
 include/my_time.h.orig Fri Jan  7 19:15:25 2011
-+++ include/my_time.h  Fri Jan  7 19:16:04 2011
-@@ -43,6 +43,17 @@ typedef long my_time_t;
- #define MY_TIME_T_MAX LONG_MAX
- #define MY_TIME_T_MIN LONG_MIN
- 
-+/*