From 3535ddf60dc7b1825cbeeff2dca0ae865d2d8f45 Mon Sep 17 00:00:00 2001 From: Leonardo Arena Date: Wed, 28 Mar 2012 13:02:58 +0000 Subject: testing/partimage: upgrade to 0.6.9 --- testing/partimage/APKBUILD | 10 +++---- testing/partimage/partimage-0.6.8-gcc44.patch | 24 --------------- testing/partimage/partimage-0.6.9-zlib-1.2.6.patch | 35 ++++++++++++++++++++++ 3 files changed, 40 insertions(+), 29 deletions(-) delete mode 100644 testing/partimage/partimage-0.6.8-gcc44.patch create mode 100644 testing/partimage/partimage-0.6.9-zlib-1.2.6.patch (limited to 'testing/partimage') diff --git a/testing/partimage/APKBUILD b/testing/partimage/APKBUILD index 96896cf61..aacd2d002 100644 --- a/testing/partimage/APKBUILD +++ b/testing/partimage/APKBUILD @@ -1,6 +1,6 @@ # Maintainer: Leonardo Arena pkgname=partimage -pkgver=0.6.8 +pkgver=0.6.9 pkgrel=0 pkgdesc="Saves partitions having a supported filesystem to an image file" url="http://www.partimage.org" @@ -12,14 +12,14 @@ makedepends="bzip2-dev newt-dev zlib-dev gettext-dev slang-dev openssl-dev \ install= subpackages="$pkgname-doc" source="http://downloads.sourceforge.net/project/$pkgname/stable/$pkgver/$pkgname-$pkgver.tar.bz2 - partimage-0.6.8-gcc44.patch + partimage-0.6.9-zlib-1.2.6.patch " _builddir="$srcdir"/$pkgname-$pkgver prepare() { cd "$_builddir" - patch -p1 -i $srcdir/$pkgname-0.6.8-gcc44.patch || return 1 + patch -p1 -i $srcdir/$pkgname-0.6.9-zlib-1.2.6.patch || return 1 } build() { @@ -39,5 +39,5 @@ package() { make DESTDIR="$pkgdir" install } -md5sums="c13c8ede8cdf7745b97ec5827920ece7 partimage-0.6.8.tar.bz2 -a6430cf98c8f236c41dd3addcde1fcb8 partimage-0.6.8-gcc44.patch" +md5sums="1bc046fd915c5debbafc85729464e513 partimage-0.6.9.tar.bz2 +6139caa49838f71e6b8ac11624252cf7 partimage-0.6.9-zlib-1.2.6.patch" diff --git a/testing/partimage/partimage-0.6.8-gcc44.patch b/testing/partimage/partimage-0.6.8-gcc44.patch deleted file mode 100644 index b171dad08..000000000 --- a/testing/partimage/partimage-0.6.8-gcc44.patch +++ /dev/null @@ -1,24 +0,0 @@ -diff -Naur partimage-0.6.8/src/client/netclient.h partimage-0.6.8-new/src/client/netclient.h ---- partimage-0.6.8/src/client/netclient.h 2009-09-24 16:21:42.000000000 -0300 -+++ partimage-0.6.8-new/src/client/netclient.h 2009-11-26 09:23:07.000000000 -0200 -@@ -35,7 +35,7 @@ - #ifdef HAVE_SSL - SSL_CTX * ctx; - X509 * server_cert; -- SSL_METHOD * meth; -+ const SSL_METHOD * meth; - #endif - bool m_bUseSSL; - bool m_bMustLogin; -diff -Naur partimage-0.6.8/src/server/netserver.h partimage-0.6.8-new/src/server/netserver.h ---- partimage-0.6.8/src/server/netserver.h 2009-09-12 05:06:22.000000000 -0300 -+++ partimage-0.6.8-new/src/server/netserver.h 2009-11-26 09:32:02.000000000 -0200 -@@ -41,7 +41,7 @@ - #ifdef HAVE_SSL - SSL_CTX * ctx; - X509 * client_cert; -- SSL_METHOD * meth; -+ const SSL_METHOD * meth; - int err; - #endif - diff --git a/testing/partimage/partimage-0.6.9-zlib-1.2.6.patch b/testing/partimage/partimage-0.6.9-zlib-1.2.6.patch new file mode 100644 index 000000000..9922daa81 --- /dev/null +++ b/testing/partimage/partimage-0.6.9-zlib-1.2.6.patch @@ -0,0 +1,35 @@ +diff --git a/src/client/imagefile.cpp b/src/client/imagefile.cpp +index dd83411..62d0f72 100644 +--- a/src/client/imagefile.cpp ++++ b/src/client/imagefile.cpp +@@ -783,7 +783,7 @@ void CImage::openWriting() + 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 @@ void CImage::openReading(CVolumeHeader *vh /* = NULL */) + } + 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 --git a/src/client/imagefile.h b/src/client/imagefile.h +index 4ba8910..6adb098 100644 +--- a/src/client/imagefile.h ++++ b/src/client/imagefile.h +@@ -41,7 +41,7 @@ class CImage + COptions m_options; + + FILE *m_fImageFile; +- gzFile *m_gzImageFile; ++ gzFile m_gzImageFile; + BZFILE *m_bzImageFile; + + int m_nFdImage; -- cgit v1.2.3