diff options
| author | Nicolas Reynolds <fauno@kiwwwi.com.ar> | 2012-02-26 01:16:44 -0300 |
|---|---|---|
| committer | Nicolas Reynolds <fauno@kiwwwi.com.ar> | 2012-02-26 01:16:44 -0300 |
| commit | 92155342158c2dbcc0c840325d63d1742d3583ec (patch) | |
| tree | f0900a2867d221c79742e7a06ca4244a21abf8f3 /community/partimage | |
| parent | 78fa3fcb824603de4b7bc558a423edca6bc18836 (diff) | |
| parent | e4a5730eb358cb0d78bc022204ddccac068c2bf2 (diff) | |
Merge branch 'master' of ssh://vparabola/home/parabola/abslibre-pre-mips64el
Conflicts:
community/astyle/PKGBUILD
community/gavl/PKGBUILD
community/lmms/PKGBUILD
community/portaudio/PKGBUILD
community/redshift/PKGBUILD
extra/gnutls/PKGBUILD
extra/libglade/PKGBUILD
extra/libgnome/PKGBUILD
extra/orbit2/PKGBUILD
extra/pypgsql/PKGBUILD
extra/vlc/PKGBUILD
extra/xorg-appres/PKGBUILD
extra/xorg-xdriinfo/PKGBUILD
extra/xorg-xfs/PKGBUILD
extra/xorg-xgamma/PKGBUILD
extra/xorg-xhost/PKGBUILD
extra/xorg-xkbevd/PKGBUILD
extra/xorg-xkbutils/PKGBUILD
extra/xorg-xload/PKGBUILD
extra/xorg-xlogo/PKGBUILD
extra/xorg-xlsatoms/PKGBUILD
extra/xorg-xlsclients/PKGBUILD
extra/xorg-xmag/PKGBUILD
extra/xorg-xmodmap/PKGBUILD
extra/xorg-xrdb/PKGBUILD
extra/xorg-xrefresh/PKGBUILD
extra/xorg-xsetroot/PKGBUILD
extra/xorg-xvidtune/PKGBUILD
extra/xorg-xwd/PKGBUILD
extra/xorg-xwud/PKGBUILD
extra/zile/PKGBUILD
multilib/wine/PKGBUILD
testing/xf86-video-intel/PKGBUILD
Diffstat (limited to 'community/partimage')
| -rw-r--r-- | community/partimage/PKGBUILD | 8 | ||||
| -rw-r--r-- | community/partimage/partimage-0.6.9-zlib-1.2.6.patch | 35 |
2 files changed, 41 insertions, 2 deletions
diff --git a/community/partimage/PKGBUILD b/community/partimage/PKGBUILD index 9f8737f5f..8b9579ed6 100644 --- a/community/partimage/PKGBUILD +++ b/community/partimage/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 42823 2011-03-21 09:06:51Z lfleischer $ +# $Id: PKGBUILD 66450 2012-02-25 01:26:42Z lfleischer $ # Maintainer: Lukas Fleischer <archlinux at cryptocrack dot de> # Contributor: Roman Kyrylych <roman@archlinux.org> # Contributor: Sven Kauber <celeon@gmail.com> @@ -7,7 +7,7 @@ pkgname=partimage pkgver=0.6.9 -pkgrel=1 +pkgrel=2 pkgdesc='Partition Image saves partitions in many formats to an image file.' arch=('i686' 'x86_64' 'mips64el') url='http://www.partimage.org/' @@ -16,15 +16,19 @@ depends=('libnewt' 'lzo' 'bzip2' 'openssl') backup=('etc/partimaged/partimagedusers') install='partimage.install' source=("http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.bz2" + 'partimage-0.6.9-zlib-1.2.6.patch' 'partimaged' 'partimaged-gencrt') md5sums=('1bc046fd915c5debbafc85729464e513' + '202c4334766041d98c5f67c9d62c3063' 'f3b517a62de5540f3b1a8b7edf65b7ec' '2316b116227b07efb48266e660ca1ba1') build() { cd "${srcdir}/${pkgname}-${pkgver}" + patch -p1 -i ../partimage-0.6.9-zlib-1.2.6.patch + ./configure --prefix=/usr --sysconfdir=/etc --enable-pam make make pamfile diff --git a/community/partimage/partimage-0.6.9-zlib-1.2.6.patch b/community/partimage/partimage-0.6.9-zlib-1.2.6.patch new file mode 100644 index 000000000..0f311d261 --- /dev/null +++ b/community/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; |