Bug#804744: new upstream 0.6.9, updated debian patches

[Gianluigi Tiesi <sherpya@netfarm.it>]

Source: partimage
Severity: normal
Tags: patch

Hi, I'm attaching updated patches to build 0.6.9 release,
02-format-security.patch is incorporated upstream

Regards


-- System Information:
Debian Release: stretch/sid
  APT prefers unstable
  APT policy: (500, 'unstable')
Architecture: amd64 (x86_64)

Kernel: Linux 3.16.0-4-amd64 (SMP w/8 CPU cores)
Locale: LANG=en_US.UTF-8, LC_CTYPE=en_US.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash
Init: sysvinit (via /sbin/init)

diff -ur partimage-0.6.9.orig/src/client/netclient.cpp partimage-0.6.9/src/client/netclient.cpp
--- partimage-0.6.9.orig/src/client/netclient.cpp	2010-07-25 17:30:31.000000000 +0200
+++ partimage-0.6.9/src/client/netclient.cpp	2015-11-11 05:28:52.352665175 +0100
@@ -43,9 +43,8 @@
     {
       showDebug(3, "initializing client ssl\n");
       SSLeay_add_ssl_algorithms();
-      meth = SSLv2_client_method();
       SSL_load_error_strings();
-      ctx = SSL_CTX_new(meth);
+      ctx = SSL_CTX_new(SSLv23_server_method());
       if (!ctx)
         THROW(ERR_SSL_CTX);
       m_bUseSSL = (ctx != NULL);
diff -ur partimage-0.6.9.orig/src/client/netclient.h partimage-0.6.9/src/client/netclient.h
--- partimage-0.6.9.orig/src/client/netclient.h	2010-07-25 17:30:31.000000000 +0200
+++ partimage-0.6.9/src/client/netclient.h	2015-11-11 05:28:27.749038336 +0100
@@ -35,12 +35,6 @@
 #ifdef HAVE_SSL
   SSL_CTX * ctx;
   X509 * server_cert;
-#if OPENSSL_VERSION_NUMBER >= 0x10000000L
-  SSL_METHOD const * meth;
-#else
-  SSL_METHOD * meth;
-#endif // OPENSSL_VERSION_NUMBER
-
 #endif
   bool m_bUseSSL;
   bool m_bMustLogin;

Description: Fix FTBFS errors: cannot convert 'gzFile_s**' to 'gzFile' for argument '1'.
Author: Mònica Ramírez Arceda <monica@probeta.net>
Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=662596
Last-Update: 2012-03-27

diff -ur partimage-0.6.9.orig/src/client/imagefile.cpp partimage-0.6.9/src/client/imagefile.cpp
--- partimage-0.6.9.orig/src/client/imagefile.cpp	2010-07-25 17:30:31.000000000 +0200
+++ partimage-0.6.9/src/client/imagefile.cpp	2015-11-11 05:30:27.491222200 +0100
@@ -783,7 +783,7 @@
   else if (m_options.dwCompression == COMPRESS_GZIP) // Gzip compression
     {
       showDebug(1, "open gzip\n");
-      m_gzImageFile = (gzFile *) gzdopen(m_nFdImage, "wb"); //"wb1h");
+      m_gzImageFile = gzdopen(m_nFdImage, "wb"); //"wb1h");
       if (m_gzImageFile == NULL)
 	{
 	  showDebug(1, "error:%d %s\n", errno, strerror(errno));
@@ -1098,7 +1098,7 @@
     }
   else if (m_options.dwCompression == COMPRESS_GZIP) // Gzip compression
     {
-      m_gzImageFile = (gzFile *) gzdopen(m_nFdImage, "rb");
+      m_gzImageFile = gzdopen(m_nFdImage, "rb");
       if (m_gzImageFile == NULL)
         THROW(ERR_ERRNO, errno);
       else
diff -ur partimage-0.6.9.orig/src/client/imagefile.h partimage-0.6.9/src/client/imagefile.h
--- partimage-0.6.9.orig/src/client/imagefile.h	2010-07-25 17:30:31.000000000 +0200
+++ partimage-0.6.9/src/client/imagefile.h	2015-11-11 05:29:55.915701112 +0100
@@ -41,7 +41,7 @@
   COptions m_options;
 
   FILE *m_fImageFile;
-  gzFile *m_gzImageFile;
+  gzFile m_gzImageFile;
   BZFILE *m_bzImageFile;
 
   int m_nFdImage;