[arch-commits] Commit in partimage/repos (20 files)
Lukas Fleischer
lfleischer at archlinux.org
Sun Sep 27 12:47:09 UTC 2015
Date: Sunday, September 27, 2015 @ 14:47:08
Author: lfleischer
Revision: 141692
archrelease: copy trunk to community-i686, community-x86_64
Added:
partimage/repos/community-i686/PKGBUILD
(from rev 141691, partimage/trunk/PKGBUILD)
partimage/repos/community-i686/partimage-0.6.9-zlib-1.2.6.patch
(from rev 141691, partimage/trunk/partimage-0.6.9-zlib-1.2.6.patch)
partimage/repos/community-i686/partimage.install
(from rev 141691, partimage/trunk/partimage.install)
partimage/repos/community-i686/partimaged-gencrt
(from rev 141691, partimage/trunk/partimaged-gencrt)
partimage/repos/community-i686/partimaged.service
(from rev 141691, partimage/trunk/partimaged.service)
partimage/repos/community-x86_64/PKGBUILD
(from rev 141691, partimage/trunk/PKGBUILD)
partimage/repos/community-x86_64/partimage-0.6.9-zlib-1.2.6.patch
(from rev 141691, partimage/trunk/partimage-0.6.9-zlib-1.2.6.patch)
partimage/repos/community-x86_64/partimage.install
(from rev 141691, partimage/trunk/partimage.install)
partimage/repos/community-x86_64/partimaged-gencrt
(from rev 141691, partimage/trunk/partimaged-gencrt)
partimage/repos/community-x86_64/partimaged.service
(from rev 141691, partimage/trunk/partimaged.service)
Deleted:
partimage/repos/community-i686/PKGBUILD
partimage/repos/community-i686/partimage-0.6.9-zlib-1.2.6.patch
partimage/repos/community-i686/partimage.install
partimage/repos/community-i686/partimaged-gencrt
partimage/repos/community-i686/partimaged.service
partimage/repos/community-x86_64/PKGBUILD
partimage/repos/community-x86_64/partimage-0.6.9-zlib-1.2.6.patch
partimage/repos/community-x86_64/partimage.install
partimage/repos/community-x86_64/partimaged-gencrt
partimage/repos/community-x86_64/partimaged.service
---------------------------------------------------+
/PKGBUILD | 96 ++++++++++++++++++++
/partimage-0.6.9-zlib-1.2.6.patch | 70 ++++++++++++++
/partimage.install | 8 +
/partimaged-gencrt | 36 +++++++
/partimaged.service | 20 ++++
community-i686/PKGBUILD | 47 ---------
community-i686/partimage-0.6.9-zlib-1.2.6.patch | 35 -------
community-i686/partimage.install | 22 ----
community-i686/partimaged-gencrt | 18 ---
community-i686/partimaged.service | 10 --
community-x86_64/PKGBUILD | 47 ---------
community-x86_64/partimage-0.6.9-zlib-1.2.6.patch | 35 -------
community-x86_64/partimage.install | 22 ----
community-x86_64/partimaged-gencrt | 18 ---
community-x86_64/partimaged.service | 10 --
15 files changed, 230 insertions(+), 264 deletions(-)
Deleted: community-i686/PKGBUILD
===================================================================
--- community-i686/PKGBUILD 2015-09-27 12:46:50 UTC (rev 141691)
+++ community-i686/PKGBUILD 2015-09-27 12:47:08 UTC (rev 141692)
@@ -1,47 +0,0 @@
-# $Id$
-# Maintainer: Lukas Fleischer <archlinux at cryptocrack dot de>
-# Contributor: Roman Kyrylych <roman at archlinux.org>
-# Contributor: Sven Kauber <celeon at gmail.com>
-# Contributor: tardo <tardo at nagi-fanboi.net>
-# Contributor: Daniel J Griffiths <ghost1227 at archlinux.us>
-
-pkgname=partimage
-pkgver=0.6.9
-pkgrel=6
-pkgdesc='Partition Image saves partitions in many formats to an image file.'
-arch=('i686' 'x86_64')
-url='http://www.partimage.org/'
-license=('GPL')
-depends=('libnewt' '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-gencrt'
- 'partimaged.service')
-md5sums=('1bc046fd915c5debbafc85729464e513'
- '202c4334766041d98c5f67c9d62c3063'
- '2316b116227b07efb48266e660ca1ba1'
- '5f8dae511cdfbf097409a45e9642a372')
-
-build() {
- cd "${srcdir}/${pkgname}-${pkgver}"
-
- patch -p1 -i ../partimage-0.6.9-zlib-1.2.6.patch
-
- ./configure --prefix=/usr --sysconfdir=/etc --sbindir=/usr/bin --enable-pam
- make
- make pamfile
-}
-
-package() {
- cd "${srcdir}/${pkgname}-${pkgver}"
-
- make DESTDIR="${pkgdir}" install
-
- install -Dm0644 partimaged.pam "${pkgdir}/etc/pam.d/partimaged"
- install -Dm0755 "${srcdir}/partimaged-gencrt" "${pkgdir}/usr/bin/partimaged-gencrt"
- chmod 644 "${pkgdir}/etc/partimaged/partimagedusers"
-
- install -Dm0644 ../partimaged.service "${pkgdir}/usr/lib/systemd/system/partimaged.service"
-}
Copied: partimage/repos/community-i686/PKGBUILD (from rev 141691, partimage/trunk/PKGBUILD)
===================================================================
--- community-i686/PKGBUILD (rev 0)
+++ community-i686/PKGBUILD 2015-09-27 12:47:08 UTC (rev 141692)
@@ -0,0 +1,48 @@
+# Maintainer: Lukas Fleischer <lfleischer at archlinux.org>
+# Contributor: Roman Kyrylych <roman at archlinux.org>
+# Contributor: Sven Kauber <celeon at gmail.com>
+# Contributor: tardo <tardo at nagi-fanboi.net>
+# Contributor: Daniel J Griffiths <ghost1227 at archlinux.us>
+
+pkgname=partimage
+pkgver=0.6.9
+pkgrel=7
+pkgdesc='Partition Image saves partitions in many formats to an image file.'
+arch=('i686' 'x86_64')
+url='http://www.partimage.org/'
+license=('GPL')
+depends=('libnewt' '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-gencrt'
+ 'partimaged.service')
+md5sums=('1bc046fd915c5debbafc85729464e513'
+ '202c4334766041d98c5f67c9d62c3063'
+ '2316b116227b07efb48266e660ca1ba1'
+ '5f8dae511cdfbf097409a45e9642a372')
+
+build() {
+ cd "${srcdir}/${pkgname}-${pkgver}"
+
+ patch -p1 -i ../partimage-0.6.9-zlib-1.2.6.patch
+
+ ./configure --prefix=/usr --sysconfdir=/etc --sbindir=/usr/bin --enable-pam
+ make
+ make pamfile
+}
+
+package() {
+ cd "${srcdir}/${pkgname}-${pkgver}"
+
+ make DESTDIR="${pkgdir}" install
+
+ install -Dm0644 partimaged.pam "${pkgdir}/etc/pam.d/partimaged"
+ install -Dm0755 "${srcdir}/partimaged-gencrt" "${pkgdir}/usr/bin/partimaged-gencrt"
+
+ chmod 644 "${pkgdir}/etc/partimaged/partimagedusers"
+ chown 110:110 "${pkgdir}/etc/partimaged/partimagedusers"
+
+ install -Dm0644 ../partimaged.service "${pkgdir}/usr/lib/systemd/system/partimaged.service"
+}
Deleted: community-i686/partimage-0.6.9-zlib-1.2.6.patch
===================================================================
--- community-i686/partimage-0.6.9-zlib-1.2.6.patch 2015-09-27 12:46:50 UTC (rev 141691)
+++ community-i686/partimage-0.6.9-zlib-1.2.6.patch 2015-09-27 12:47:08 UTC (rev 141692)
@@ -1,35 +0,0 @@
-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;
Copied: partimage/repos/community-i686/partimage-0.6.9-zlib-1.2.6.patch (from rev 141691, partimage/trunk/partimage-0.6.9-zlib-1.2.6.patch)
===================================================================
--- community-i686/partimage-0.6.9-zlib-1.2.6.patch (rev 0)
+++ community-i686/partimage-0.6.9-zlib-1.2.6.patch 2015-09-27 12:47:08 UTC (rev 141692)
@@ -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;
Deleted: community-i686/partimage.install
===================================================================
--- community-i686/partimage.install 2015-09-27 12:46:50 UTC (rev 141691)
+++ community-i686/partimage.install 2015-09-27 12:47:08 UTC (rev 141692)
@@ -1,22 +0,0 @@
-pre_install() {
- groupadd -g 110 partimag &> /dev/null
- useradd -u 110 -g partimag -c "Partimage user" -d /dev/null -s /bin/false partimag &> /dev/null
-}
-
-post_install() {
- chown partimag:partimag /etc/partimaged/partimagedusers
-}
-
-post_upgrade() {
- if [ "$(getent group partimag | cut -d ':' -f 3)" != '110' ]; then
- post_remove
- pre_install
- echo ">> partimage UID/GID has been changed"
- echo ">> if you have some directories owned by partimage - please chown them again"
- fi
-}
-
-post_remove() {
- userdel partimag > /dev/null
- groupdel partimag > /dev/null
-}
Copied: partimage/repos/community-i686/partimage.install (from rev 141691, partimage/trunk/partimage.install)
===================================================================
--- community-i686/partimage.install (rev 0)
+++ community-i686/partimage.install 2015-09-27 12:47:08 UTC (rev 141692)
@@ -0,0 +1,4 @@
+pre_install() {
+ groupadd -g 110 partimag &> /dev/null
+ useradd -u 110 -g partimag -c "Partimage user" -d /dev/null -s /bin/false partimag &> /dev/null
+}
Deleted: community-i686/partimaged-gencrt
===================================================================
--- community-i686/partimaged-gencrt 2015-09-27 12:46:50 UTC (rev 141691)
+++ community-i686/partimaged-gencrt 2015-09-27 12:47:08 UTC (rev 141692)
@@ -1,18 +0,0 @@
-#!/bin/sh
-
-if [ `whoami` != "root" ]; then
- echo "You must be root to generate certificates."
- exit
-fi
-
-echo -n "==> Generating certificate for Partimage/PartimageD SSL... "
-cd /etc/partimaged
-openssl req -new -x509 -outform PEM > partimaged.csr
-openssl rsa -in privkey.pem -out partimaged.key
-rm privkey.pem
-openssl x509 -in partimaged.csr -out partimaged.cert -signkey partimaged.key
-rm partimaged.csr
-chmod 600 partimaged.key
-chmod 600 partimaged.cert
-chown partimag:partimag partimaged.key
-chown partimag:partimag partimaged.cert
Copied: partimage/repos/community-i686/partimaged-gencrt (from rev 141691, partimage/trunk/partimaged-gencrt)
===================================================================
--- community-i686/partimaged-gencrt (rev 0)
+++ community-i686/partimaged-gencrt 2015-09-27 12:47:08 UTC (rev 141692)
@@ -0,0 +1,18 @@
+#!/bin/sh
+
+if [ `whoami` != "root" ]; then
+ echo "You must be root to generate certificates."
+ exit
+fi
+
+echo -n "==> Generating certificate for Partimage/PartimageD SSL... "
+cd /etc/partimaged
+openssl req -new -x509 -outform PEM > partimaged.csr
+openssl rsa -in privkey.pem -out partimaged.key
+rm privkey.pem
+openssl x509 -in partimaged.csr -out partimaged.cert -signkey partimaged.key
+rm partimaged.csr
+chmod 600 partimaged.key
+chmod 600 partimaged.cert
+chown partimag:partimag partimaged.key
+chown partimag:partimag partimaged.cert
Deleted: community-i686/partimaged.service
===================================================================
--- community-i686/partimaged.service 2015-09-27 12:46:50 UTC (rev 141691)
+++ community-i686/partimaged.service 2015-09-27 12:47:08 UTC (rev 141692)
@@ -1,10 +0,0 @@
-[Unit]
-Description=A partition imaging daemon
-After=syslog.target network.target
-
-[Service]
-Type=forking
-ExecStart=/usr/bin/partimaged --daemon
-
-[Install]
-WantedBy=multi-user.target
Copied: partimage/repos/community-i686/partimaged.service (from rev 141691, partimage/trunk/partimaged.service)
===================================================================
--- community-i686/partimaged.service (rev 0)
+++ community-i686/partimaged.service 2015-09-27 12:47:08 UTC (rev 141692)
@@ -0,0 +1,10 @@
+[Unit]
+Description=A partition imaging daemon
+After=syslog.target network.target
+
+[Service]
+Type=forking
+ExecStart=/usr/bin/partimaged --daemon
+
+[Install]
+WantedBy=multi-user.target
Deleted: community-x86_64/PKGBUILD
===================================================================
--- community-x86_64/PKGBUILD 2015-09-27 12:46:50 UTC (rev 141691)
+++ community-x86_64/PKGBUILD 2015-09-27 12:47:08 UTC (rev 141692)
@@ -1,47 +0,0 @@
-# $Id$
-# Maintainer: Lukas Fleischer <archlinux at cryptocrack dot de>
-# Contributor: Roman Kyrylych <roman at archlinux.org>
-# Contributor: Sven Kauber <celeon at gmail.com>
-# Contributor: tardo <tardo at nagi-fanboi.net>
-# Contributor: Daniel J Griffiths <ghost1227 at archlinux.us>
-
-pkgname=partimage
-pkgver=0.6.9
-pkgrel=6
-pkgdesc='Partition Image saves partitions in many formats to an image file.'
-arch=('i686' 'x86_64')
-url='http://www.partimage.org/'
-license=('GPL')
-depends=('libnewt' '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-gencrt'
- 'partimaged.service')
-md5sums=('1bc046fd915c5debbafc85729464e513'
- '202c4334766041d98c5f67c9d62c3063'
- '2316b116227b07efb48266e660ca1ba1'
- '5f8dae511cdfbf097409a45e9642a372')
-
-build() {
- cd "${srcdir}/${pkgname}-${pkgver}"
-
- patch -p1 -i ../partimage-0.6.9-zlib-1.2.6.patch
-
- ./configure --prefix=/usr --sysconfdir=/etc --sbindir=/usr/bin --enable-pam
- make
- make pamfile
-}
-
-package() {
- cd "${srcdir}/${pkgname}-${pkgver}"
-
- make DESTDIR="${pkgdir}" install
-
- install -Dm0644 partimaged.pam "${pkgdir}/etc/pam.d/partimaged"
- install -Dm0755 "${srcdir}/partimaged-gencrt" "${pkgdir}/usr/bin/partimaged-gencrt"
- chmod 644 "${pkgdir}/etc/partimaged/partimagedusers"
-
- install -Dm0644 ../partimaged.service "${pkgdir}/usr/lib/systemd/system/partimaged.service"
-}
Copied: partimage/repos/community-x86_64/PKGBUILD (from rev 141691, partimage/trunk/PKGBUILD)
===================================================================
--- community-x86_64/PKGBUILD (rev 0)
+++ community-x86_64/PKGBUILD 2015-09-27 12:47:08 UTC (rev 141692)
@@ -0,0 +1,48 @@
+# Maintainer: Lukas Fleischer <lfleischer at archlinux.org>
+# Contributor: Roman Kyrylych <roman at archlinux.org>
+# Contributor: Sven Kauber <celeon at gmail.com>
+# Contributor: tardo <tardo at nagi-fanboi.net>
+# Contributor: Daniel J Griffiths <ghost1227 at archlinux.us>
+
+pkgname=partimage
+pkgver=0.6.9
+pkgrel=7
+pkgdesc='Partition Image saves partitions in many formats to an image file.'
+arch=('i686' 'x86_64')
+url='http://www.partimage.org/'
+license=('GPL')
+depends=('libnewt' '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-gencrt'
+ 'partimaged.service')
+md5sums=('1bc046fd915c5debbafc85729464e513'
+ '202c4334766041d98c5f67c9d62c3063'
+ '2316b116227b07efb48266e660ca1ba1'
+ '5f8dae511cdfbf097409a45e9642a372')
+
+build() {
+ cd "${srcdir}/${pkgname}-${pkgver}"
+
+ patch -p1 -i ../partimage-0.6.9-zlib-1.2.6.patch
+
+ ./configure --prefix=/usr --sysconfdir=/etc --sbindir=/usr/bin --enable-pam
+ make
+ make pamfile
+}
+
+package() {
+ cd "${srcdir}/${pkgname}-${pkgver}"
+
+ make DESTDIR="${pkgdir}" install
+
+ install -Dm0644 partimaged.pam "${pkgdir}/etc/pam.d/partimaged"
+ install -Dm0755 "${srcdir}/partimaged-gencrt" "${pkgdir}/usr/bin/partimaged-gencrt"
+
+ chmod 644 "${pkgdir}/etc/partimaged/partimagedusers"
+ chown 110:110 "${pkgdir}/etc/partimaged/partimagedusers"
+
+ install -Dm0644 ../partimaged.service "${pkgdir}/usr/lib/systemd/system/partimaged.service"
+}
Deleted: community-x86_64/partimage-0.6.9-zlib-1.2.6.patch
===================================================================
--- community-x86_64/partimage-0.6.9-zlib-1.2.6.patch 2015-09-27 12:46:50 UTC (rev 141691)
+++ community-x86_64/partimage-0.6.9-zlib-1.2.6.patch 2015-09-27 12:47:08 UTC (rev 141692)
@@ -1,35 +0,0 @@
-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;
Copied: partimage/repos/community-x86_64/partimage-0.6.9-zlib-1.2.6.patch (from rev 141691, partimage/trunk/partimage-0.6.9-zlib-1.2.6.patch)
===================================================================
--- community-x86_64/partimage-0.6.9-zlib-1.2.6.patch (rev 0)
+++ community-x86_64/partimage-0.6.9-zlib-1.2.6.patch 2015-09-27 12:47:08 UTC (rev 141692)
@@ -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;
Deleted: community-x86_64/partimage.install
===================================================================
--- community-x86_64/partimage.install 2015-09-27 12:46:50 UTC (rev 141691)
+++ community-x86_64/partimage.install 2015-09-27 12:47:08 UTC (rev 141692)
@@ -1,22 +0,0 @@
-pre_install() {
- groupadd -g 110 partimag &> /dev/null
- useradd -u 110 -g partimag -c "Partimage user" -d /dev/null -s /bin/false partimag &> /dev/null
-}
-
-post_install() {
- chown partimag:partimag /etc/partimaged/partimagedusers
-}
-
-post_upgrade() {
- if [ "$(getent group partimag | cut -d ':' -f 3)" != '110' ]; then
- post_remove
- pre_install
- echo ">> partimage UID/GID has been changed"
- echo ">> if you have some directories owned by partimage - please chown them again"
- fi
-}
-
-post_remove() {
- userdel partimag > /dev/null
- groupdel partimag > /dev/null
-}
Copied: partimage/repos/community-x86_64/partimage.install (from rev 141691, partimage/trunk/partimage.install)
===================================================================
--- community-x86_64/partimage.install (rev 0)
+++ community-x86_64/partimage.install 2015-09-27 12:47:08 UTC (rev 141692)
@@ -0,0 +1,4 @@
+pre_install() {
+ groupadd -g 110 partimag &> /dev/null
+ useradd -u 110 -g partimag -c "Partimage user" -d /dev/null -s /bin/false partimag &> /dev/null
+}
Deleted: community-x86_64/partimaged-gencrt
===================================================================
--- community-x86_64/partimaged-gencrt 2015-09-27 12:46:50 UTC (rev 141691)
+++ community-x86_64/partimaged-gencrt 2015-09-27 12:47:08 UTC (rev 141692)
@@ -1,18 +0,0 @@
-#!/bin/sh
-
-if [ `whoami` != "root" ]; then
- echo "You must be root to generate certificates."
- exit
-fi
-
-echo -n "==> Generating certificate for Partimage/PartimageD SSL... "
-cd /etc/partimaged
-openssl req -new -x509 -outform PEM > partimaged.csr
-openssl rsa -in privkey.pem -out partimaged.key
-rm privkey.pem
-openssl x509 -in partimaged.csr -out partimaged.cert -signkey partimaged.key
-rm partimaged.csr
-chmod 600 partimaged.key
-chmod 600 partimaged.cert
-chown partimag:partimag partimaged.key
-chown partimag:partimag partimaged.cert
Copied: partimage/repos/community-x86_64/partimaged-gencrt (from rev 141691, partimage/trunk/partimaged-gencrt)
===================================================================
--- community-x86_64/partimaged-gencrt (rev 0)
+++ community-x86_64/partimaged-gencrt 2015-09-27 12:47:08 UTC (rev 141692)
@@ -0,0 +1,18 @@
+#!/bin/sh
+
+if [ `whoami` != "root" ]; then
+ echo "You must be root to generate certificates."
+ exit
+fi
+
+echo -n "==> Generating certificate for Partimage/PartimageD SSL... "
+cd /etc/partimaged
+openssl req -new -x509 -outform PEM > partimaged.csr
+openssl rsa -in privkey.pem -out partimaged.key
+rm privkey.pem
+openssl x509 -in partimaged.csr -out partimaged.cert -signkey partimaged.key
+rm partimaged.csr
+chmod 600 partimaged.key
+chmod 600 partimaged.cert
+chown partimag:partimag partimaged.key
+chown partimag:partimag partimaged.cert
Deleted: community-x86_64/partimaged.service
===================================================================
--- community-x86_64/partimaged.service 2015-09-27 12:46:50 UTC (rev 141691)
+++ community-x86_64/partimaged.service 2015-09-27 12:47:08 UTC (rev 141692)
@@ -1,10 +0,0 @@
-[Unit]
-Description=A partition imaging daemon
-After=syslog.target network.target
-
-[Service]
-Type=forking
-ExecStart=/usr/bin/partimaged --daemon
-
-[Install]
-WantedBy=multi-user.target
Copied: partimage/repos/community-x86_64/partimaged.service (from rev 141691, partimage/trunk/partimaged.service)
===================================================================
--- community-x86_64/partimaged.service (rev 0)
+++ community-x86_64/partimaged.service 2015-09-27 12:47:08 UTC (rev 141692)
@@ -0,0 +1,10 @@
+[Unit]
+Description=A partition imaging daemon
+After=syslog.target network.target
+
+[Service]
+Type=forking
+ExecStart=/usr/bin/partimaged --daemon
+
+[Install]
+WantedBy=multi-user.target
More information about the arch-commits
mailing list