Gentoo Archives: gentoo-commits

From: "Samuli Suominen (ssuominen)" <ssuominen@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in sys-block/partimage/files: partimage-0.6.9-zlib-1.2.5.2.patch
Date: Sun, 04 Mar 2012 09:57:15
Message-Id: 20120304095705.86B0E2004C@flycatcher.gentoo.org
1 ssuominen 12/03/04 09:57:05
2
3 Added: partimage-0.6.9-zlib-1.2.5.2.patch
4 Log:
5 Fix building with zlib >= 1.2.5.2 wrt #405323 by Xavier Miller and Manfred Knick
6
7 (Portage version: 2.2.0_alpha89/cvs/Linux x86_64)
8
9 Revision Changes Path
10 1.1 sys-block/partimage/files/partimage-0.6.9-zlib-1.2.5.2.patch
11
12 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-block/partimage/files/partimage-0.6.9-zlib-1.2.5.2.patch?rev=1.1&view=markup
13 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-block/partimage/files/partimage-0.6.9-zlib-1.2.5.2.patch?rev=1.1&content-type=text/plain
14
15 Index: partimage-0.6.9-zlib-1.2.5.2.patch
16 ===================================================================
17 http://bugs.gentoo.org/405323
18
19 --- src/client/imagefile.cpp
20 +++ src/client/imagefile.cpp
21 @@ -783,7 +783,7 @@
22 else if (m_options.dwCompression == COMPRESS_GZIP) // Gzip compression
23 {
24 showDebug(1, "open gzip\n");
25 - m_gzImageFile = (gzFile *) gzdopen(m_nFdImage, "wb"); //"wb1h");
26 + m_gzImageFile = gzdopen(m_nFdImage, "wb"); //"wb1h");
27 if (m_gzImageFile == NULL)
28 {
29 showDebug(1, "error:%d %s\n", errno, strerror(errno));
30 @@ -1098,7 +1098,7 @@
31 }
32 else if (m_options.dwCompression == COMPRESS_GZIP) // Gzip compression
33 {
34 - m_gzImageFile = (gzFile *) gzdopen(m_nFdImage, "rb");
35 + m_gzImageFile = gzdopen(m_nFdImage, "rb");
36 if (m_gzImageFile == NULL)
37 THROW(ERR_ERRNO, errno);
38 else
39 --- src/client/imagefile.h
40 +++ src/client/imagefile.h
41 @@ -41,7 +41,7 @@
42 COptions m_options;
43
44 FILE *m_fImageFile;
45 - gzFile *m_gzImageFile;
46 + gzFile m_gzImageFile;
47 BZFILE *m_bzImageFile;
48
49 int m_nFdImage;