El 02/12/15 a las 23:38, Santiago Ruano Rincón escribió: > Dear bacula maintainers, > > As an alternative to the no longer supported-by-upstream MySQL 5.1 in > Squeeze, the LTS Team is planning to provide *soon* packages for MySQL > 5.5 as an option. However, the current bacula-director-mysql package in > Squeeze is not fully compatible with it, as you can see at [1]. So, > before going any further with MySQL 5.5, we need to update it first. > > I have already prepared a patch for this, attached to this mail. Would > you like to review/test it and finish to upload this for squeeze lts? > It seems I forgot to attach the debdiff. Cheers, Santiago
diff -u bacula-5.0.2/debian/rules bacula-5.0.2/debian/rules --- bacula-5.0.2/debian/rules +++ bacula-5.0.2/debian/rules @@ -142,7 +142,8 @@ clean: - test ! -f patch-stamp || patch -p1 -R <debian/patches/fix_dump_resources_acl.patch + test ! -f patch-stamp || patch -p1 -R <debian/patches/fix_dump_resources_acl.patch \ + patch -p1 -R < debian/patches/fix-mysql55-sql-syntax.patch $(RM) *stamp* dh_clean @@ -280,6 +281,7 @@ debian/patches/extract_here chmod 755 debian/additions/bconsole patch -p1 < debian/patches/fix_dump_resources_acl.patch + patch -p1 < debian/patches/fix-mysql55-sql-syntax.patch touch patch-stamp # Build architecture-independent files here. diff -u bacula-5.0.2/debian/changelog bacula-5.0.2/debian/changelog --- bacula-5.0.2/debian/changelog +++ bacula-5.0.2/debian/changelog @@ -1,3 +1,12 @@ +bacula (5.0.2-2.2+squeeze2~1) santiago-squeeze-lts; urgency=high + + * Non-maintainer upload by the Squeeze LTS Team. + * Making bacula-director-mysql compatible with MySQL 5.5 + Fix syntax in src/cats/make_mysql_tables.in. + Include debian/patches/fix-mysql55-sql-syntax.patch + + -- Santiago Ruano Rincón <santiagorr@riseup.net> Mon, 30 Nov 2015 22:54:30 +0100 + bacula (5.0.2-2.2+squeeze1) stable-security; urgency=high * debian/patches/fix_dump_resources_acl.patch, debian/rules: only in patch2: unchanged: --- bacula-5.0.2.orig/debian/patches/fix-mysql55-sql-syntax.patch +++ bacula-5.0.2/debian/patches/fix-mysql55-sql-syntax.patch @@ -0,0 +1,21 @@ +Description: fix unnecessary escaping + Since we use this code directly by dbconfig, not from sh-script as upstream, + there is no need to escape symbols. +Author: Scott Moser <smoser@ubuntu.com> +Reviewed-by: Alexander Golovko <alexandro@ankalagon.ru> +Reviewed-by: Santiago R.R. <santiagorr@riseup.net> +Last-Modified: 2015-11-30 + +--- a/src/cats/make_mysql_tables.in ++++ b/src/cats/make_mysql_tables.in +@@ -324,8 +324,8 @@ + + CREATE TABLE Counters ( + Counter TINYBLOB NOT NULL, +- MinValue INTEGER DEFAULT 0, +- MaxValue INTEGER DEFAULT 0, ++ `MinValue` INTEGER DEFAULT 0, ++ `MaxValue` INTEGER DEFAULT 0, + CurrentValue INTEGER DEFAULT 0, + WrapCounter TINYBLOB NOT NULL, + PRIMARY KEY (Counter(128))
Attachment:
signature.asc
Description: Digital signature