tags 662582 + patch thanks Hi Mateusz
Only confirming, the patch posted on launchpad let mydumper succeed again the build. Only in case you should be short of time or so, I can prepare a NMU. Regards, Salvatore
diff -Nru mydumper-0.5.1/debian/changelog mydumper-0.5.1/debian/changelog
--- mydumper-0.5.1/debian/changelog 2011-11-22 18:10:58.000000000 +0100
+++ mydumper-0.5.1/debian/changelog 2012-03-17 21:06:43.000000000 +0100
@@ -1,3 +1,11 @@
+mydumper (0.5.1-1.1) unstable; urgency=low
+
+ * Non-maintainer upload.
+ * Add 0005-zlib-file-type-change-fixes.patch patch.
+ Fix FTBFS due to zlib changes. (Closes: #662582) (LP: #948122)
+
+ -- Salvatore Bonaccorso <car...@debian.org> Sat, 17 Mar 2012 21:06:39 +0100
+
mydumper (0.5.1-1) unstable; urgency=low
* Initial release (Closes: #648711)
diff -Nru mydumper-0.5.1/debian/patches/0005-zlib-file-type-change-fixes.patch mydumper-0.5.1/debian/patches/0005-zlib-file-type-change-fixes.patch
--- mydumper-0.5.1/debian/patches/0005-zlib-file-type-change-fixes.patch 1970-01-01 01:00:00.000000000 +0100
+++ mydumper-0.5.1/debian/patches/0005-zlib-file-type-change-fixes.patch 2012-03-06 17:05:38.000000000 +0100
@@ -0,0 +1,103 @@
+From: Mateusz Kijowski <mkijow...@trojmiasto.pl>
+Date: Tue, 6 Mar 2012 16:32:25 +0100
+Subject: zlib file type change fixes
+
+---
+ binlog.c | 4 ++--
+ mydumper.c | 8 ++++----
+ myloader.c | 6 +++---
+ 3 files changed, 9 insertions(+), 9 deletions(-)
+
+diff --git a/binlog.c b/binlog.c
+index e278b6d..0872375 100644
+--- a/binlog.c
++++ b/binlog.c
+@@ -241,7 +241,7 @@ FILE *new_binlog_file(char *binlog_file, const char *binlog_dir) {
+ outfile= g_fopen(filename, "w");
+ } else {
+ filename= g_strdup_printf("%s/%s.gz", binlog_dir, binlog_file);
+- outfile= gzopen(filename, "w");
++ outfile= (void*) gzopen(filename, "w");
+ }
+ g_free(filename);
+
+@@ -252,7 +252,7 @@ void close_binlog_file(FILE *outfile) {
+ if (!compress_output)
+ fclose(outfile);
+ else
+- gzclose(outfile);
++ gzclose((gzFile) outfile);
+ }
+
+ unsigned int get_event(const char *buf, unsigned int len) {
+diff --git a/mydumper.c b/mydumper.c
+index 020c245..8216c90 100644
+--- a/mydumper.c
++++ b/mydumper.c
+@@ -1156,7 +1156,7 @@ void dump_schema_data(MYSQL *conn, char *database, char *table, char *filename)
+ if (!compress_output)
+ outfile= g_fopen(filename, "w");
+ else
+- outfile= gzopen(filename, "w");
++ outfile= (void*) gzopen(filename, "w");
+
+ if (!outfile) {
+ g_critical("Error: DB: %s Could not create output file %s (%d)", database, filename, errno);
+@@ -1202,7 +1202,7 @@ void dump_schema_data(MYSQL *conn, char *database, char *table, char *filename)
+ if (!compress_output)
+ fclose((FILE *)outfile);
+ else
+- gzclose(outfile);
++ gzclose((gzFile)outfile);
+
+
+ g_string_free(statement, TRUE);
+@@ -1218,7 +1218,7 @@ void dump_table_data_file(MYSQL *conn, char *database, char *table, char *where,
+ if (!compress_output)
+ outfile = g_fopen(filename, "w");
+ else
+- outfile = gzopen(filename, "w");
++ outfile = (void*) gzopen(filename, "w");
+
+ if (!outfile) {
+ g_critical("Error: DB: %s TABLE: %s Could not create output file %s (%d)", database, table, filename, errno);
+@@ -1229,7 +1229,7 @@ void dump_table_data_file(MYSQL *conn, char *database, char *table, char *where,
+ if (!compress_output)
+ fclose((FILE *)outfile);
+ else
+- gzclose(outfile);
++ gzclose((gzFile)outfile);
+
+ if (!rows_count && !build_empty_files) {
+ // dropping the useless file
+diff --git a/myloader.c b/myloader.c
+index 394154c..2e02f6c 100644
+--- a/myloader.c
++++ b/myloader.c
+@@ -331,7 +331,7 @@ void restore_data(MYSQL *conn, char *database, char *table, const char *filename
+ infile= g_fopen(path, "r");
+ is_compressed= FALSE;
+ } else {
+- infile= gzopen(path, "r");
++ infile= (void*) gzopen(path, "r");
+ is_compressed= TRUE;
+ }
+
+@@ -392,7 +392,7 @@ void restore_data(MYSQL *conn, char *database, char *table, const char *filename
+ if (!is_compressed) {
+ fclose(infile);
+ } else {
+- gzclose(infile);
++ gzclose((gzFile)infile);
+ }
+ return;
+ }
+@@ -412,7 +412,7 @@ gboolean read_data(FILE *file, gboolean is_compressed, GString *data, gboolean *
+ }
+ } else {
+ if (!gzgets((gzFile)file, buffer, 256)) {
+- if (gzeof(file)) {
++ if (gzeof((gzFile)file)) {
+ *eof= TRUE;
+ buffer[0]= '\0';
+ } else {
diff -Nru mydumper-0.5.1/debian/patches/series mydumper-0.5.1/debian/patches/series
--- mydumper-0.5.1/debian/patches/series 2011-11-22 18:07:03.000000000 +0100
+++ mydumper-0.5.1/debian/patches/series 2012-03-17 21:05:02.000000000 +0100
@@ -2,3 +2,4 @@
0002-manpage-whatis-description.patch
0003-dont-install-documentation-source.patch
0004-typo-fix-in-myloader.patch
+0005-zlib-file-type-change-fixes.patch
signature.asc
Description: Digital signature
