Improved 64bit support, fixed doc/help, fixed misc bugs.

(Portage version: 2.1-r1)

9 files changed, 255 insertions, 13 deletions

diff --git a/sys-block/partimage/ChangeLog b/sys-block/partimage/ChangeLog
index 22bc3c7ee38d..3d876a7de488 100644
--- a/sys-block/partimage/ChangeLog
+++ b/sys-block/partimage/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for sys-block/partimage
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-block/partimage/ChangeLog,v 1.25 2006/10/14 17:07:41 xmerlin Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-block/partimage/ChangeLog,v 1.26 2006/10/14 22:45:43 xmerlin Exp $
+
+  14 Oct 2006; Christian Zoffoli <xmerlin@gentoo.org>
+  +files/partimage-0.6.4-1-lib64.patch,
+  +files/partimage-0.6.4-empty-salt.patch,
+  +files/partimage-0.6.4-help.patch, +files/partimage-0.6.4-port.patch,
+  +files/partimage-0.6.4-xfs.patch, +files/partimaged.pam,
+  partimage-0.6.4-r4.ebuild:
+  Improved 64bit support, fixed doc/help, fixed misc bugs.
 
   14 Oct 2006; Christian Zoffoli <xmerlin@gentoo.org>
   +files/partimage-0.6.4-gui.diff, partimage-0.6.4-r3.ebuild,
diff --git a/sys-block/partimage/files/digest-partimage-0.6.4-r4 b/sys-block/partimage/files/digest-partimage-0.6.4-r4
index d519787e7018..351641a2a9a9 100644
--- a/sys-block/partimage/files/digest-partimage-0.6.4-r4
+++ b/sys-block/partimage/files/digest-partimage-0.6.4-r4
@@ -1,3 +1,3 @@
-MD5 ee56df4a6be1f78f53dc48454655aa8a partimage-0.6.4.tar.bz2 654707
-RMD160 9de0195c0bc2a83088b054be63102d6ac2350428 partimage-0.6.4.tar.bz2 654707
-SHA256 e4741d383edb59359b565f6623fc773c704735e65b85a5a378efc922205f14d3 partimage-0.6.4.tar.bz2 654707
+MD5 9f804b417b23c3951302468aca308679 partimage-0.6.4-1.tar.bz2 706438
+RMD160 cc452f064d7b26d10ffde7b196f6121ade2a619b partimage-0.6.4-1.tar.bz2 706438
+SHA256 180c443d85def5bbc02fe21fb31014799259d026c820633246c92c536397fba7 partimage-0.6.4-1.tar.bz2 706438
diff --git a/sys-block/partimage/files/partimage-0.6.4-1-lib64.patch b/sys-block/partimage/files/partimage-0.6.4-1-lib64.patch
new file mode 100644
index 000000000000..2e754b5f334f
--- /dev/null
+++ b/sys-block/partimage/files/partimage-0.6.4-1-lib64.patch
@@ -0,0 +1,48 @@
+diff -uNr partimage-0.6.4-1.orig/src/client/Makefile.am partimage-0.6.4-1/src/client/Makefile.am
+--- partimage-0.6.4-1.orig/src/client/Makefile.am	2004-02-04 01:57:36.000000000 +0100
++++ partimage-0.6.4-1/src/client/Makefile.am	2006-10-15 00:41:34.000000000 +0200
+@@ -33,7 +33,7 @@
+     mbr_backup.cpp 
+ 
+ # all libs are added in LIBS, we needn't add them to partimage_LDADD 
+-partimage_LDADD = -L/usr/lib -lslang fs/libfs.a ../shared/libshared.a
++partimage_LDADD = -L$(libdir) -lslang fs/libfs.a ../shared/libshared.a
+ partimage_LDFLAGS = @PARTIMAGE_LDFLAGS@
+ 
+ DEFS=@DEFS@ -DLOCALEDIR=\"${localedir}\" -D_REENTRANT -D_FILE_OFFSET_BITS=64
+diff -uNr partimage-0.6.4-1.orig/src/client/Makefile.in partimage-0.6.4-1/src/client/Makefile.in
+--- partimage-0.6.4-1.orig/src/client/Makefile.in	2004-04-29 22:08:53.000000000 +0200
++++ partimage-0.6.4-1/src/client/Makefile.in	2006-10-15 00:42:11.000000000 +0200
+@@ -271,7 +271,7 @@
+ 
+ 
+ # all libs are added in LIBS, we needn't add them to partimage_LDADD 
+-partimage_LDADD = -L/usr/lib -lslang fs/libfs.a ../shared/libshared.a
++partimage_LDADD = -L$(libdir) -lslang fs/libfs.a ../shared/libshared.a
+ partimage_LDFLAGS = @PARTIMAGE_LDFLAGS@
+ 
+ DEFS = @DEFS@ -DLOCALEDIR=\"${localedir}\" -D_REENTRANT -D_FILE_OFFSET_BITS=64
+diff -uNr partimage-0.6.4-1.orig/src/server/Makefile.am partimage-0.6.4-1/src/server/Makefile.am
+--- partimage-0.6.4-1.orig/src/server/Makefile.am	2004-02-04 01:57:36.000000000 +0100
++++ partimage-0.6.4-1/src/server/Makefile.am	2006-10-15 00:42:52.000000000 +0200
+@@ -21,7 +21,7 @@
+                  partimaged-gui_dummy.h partimaged-gui_newt.h partimaged.h
+ 
+ #partimaged_LDADD = -L/usr/lib -lz -lbz2 -lnewt -lpthread -lcrypt -lslang -lcom_err -lext2fs ../shared/libshared.a
+-partimaged_LDADD = -L/usr/lib -lslang ../shared/libshared.a
++partimaged_LDADD = -L$(libdir) -lslang ../shared/libshared.a
+ 
+ partimaged_LDFLAGS = @PARTIMAGE_LDFLAGS@
+ 
+diff -uNr partimage-0.6.4-1.orig/src/server/Makefile.in partimage-0.6.4-1/src/server/Makefile.in
+--- partimage-0.6.4-1.orig/src/server/Makefile.in	2004-04-29 22:08:53.000000000 +0200
++++ partimage-0.6.4-1/src/server/Makefile.in	2006-10-15 00:43:38.000000000 +0200
+@@ -269,7 +269,7 @@
+ 
+ 
+ #partimaged_LDADD = -L/usr/lib -lz -lbz2 -lnewt -lpthread -lcrypt -lslang -lcom_err -lext2fs ../shared/libshared.a
+-partimaged_LDADD = -L/usr/lib -lslang ../shared/libshared.a
++partimaged_LDADD = -L$(libdir) -lslang ../shared/libshared.a
+ 
+ partimaged_LDFLAGS = @PARTIMAGE_LDFLAGS@
+ 
diff --git a/sys-block/partimage/files/partimage-0.6.4-empty-salt.patch b/sys-block/partimage/files/partimage-0.6.4-empty-salt.patch
new file mode 100644
index 000000000000..4c5b1a7ffc9e
--- /dev/null
+++ b/sys-block/partimage/files/partimage-0.6.4-empty-salt.patch
@@ -0,0 +1,13 @@
+Index: src/shared/access.cpp
+===================================================================
+--- src/shared/access.cpp	(Revision 73)
++++ src/shared/access.cpp	(Arbeitskopie)
+@@ -105,7 +105,7 @@
+ #else // HAVE_PAM
+ char * GetSalt(char * szLogin)
+ {
+-  return "";
++  return NULL;
+ }
+ #endif
+ 
diff --git a/sys-block/partimage/files/partimage-0.6.4-help.patch b/sys-block/partimage/files/partimage-0.6.4-help.patch
new file mode 100644
index 000000000000..45e202617e8a
--- /dev/null
+++ b/sys-block/partimage/files/partimage-0.6.4-help.patch
@@ -0,0 +1,113 @@
+Index: src/client/main.cpp
+===================================================================
+--- src/client/main.cpp	(Revision 76)
++++ src/client/main.cpp	(Arbeitskopie)
+@@ -842,7 +842,8 @@
+   printf("===============================================================================\n");
+   printf(i18n("Partition Image (http://www.partimage.org/) version %s [%s]\n"
+ 	      "---- distributed under the GPL 2 license (GNU General Public License) ----\n\n"
+-	      "Supported file systems:....ext2fs, reiserfs, fat16, fat32, ntfs(exp), hpfs\n\n"
++	      "Supported file systems: Ext2/3, Reiser3, FAT16/32, HPFS, JFS, XFS, \n"
++	      "                        UFS(beta), HFS(beta), NTFS(experimental)\n\n"
+ 	      "usage: partimage [options] <action> <device> <image_file>\n"
+ 	      "       partimage <imginfo/restmbr> <image_file>\n\n"
+ 	      "ex: partimage -z1 -o -d save /dev/hda12 /mnt/backup/redhat-6.2.partimg.gz\n"
+@@ -858,39 +859,42 @@
+ 	      "  - restmbr: restore a MBR of the image file to an hard disk\n"
+ 	      "  - imginfo: show informations about the image file\n"
+ 	      "* <device>: partition to save/restore (example: /dev/hda1)\n"
+-	      "* <image_file>: file where data will be read/written. can be very big\n\n"
++	      "* <image_file>: file where data will be read/written. Can be very big.\n"
++	      "                For restore, <image_file> can have the value 'stdin'. This allows\n"
++              "                for providing image files through a pipe.\n\n"
+ 	      "Options:\n"
+-	      "* -z,  --compress     (image file compression level):\n"
+-	      "  -z0, --compress=0   don't compress: very fast but very big image file\n"
+-	      "  -z1, --compress=1   compress using gzip: fast and small image file (default)\n"
+-	      "  -z2, --compress=2   (compress using bzip2: very slow and very small image file):\n"
+-	      "* -c,  --nocheck      don't check the partition before saving\n"
+-	      "* -o,  --overwrite    overwrite the existing image file without confirmation\n"
+-	      "* -d,  --nodesc       don't ask any description for the image file\n"
+-	      "* -V,  --volume       (split image into multiple volumes files)\n"
+-	      "  -VX, --volume=X     create volumes with a size of X KB\n"
+-	      "* -w,  --waitvol      wait for a confirmation after each volume change\n"
+-	      "* -e,  --erase        erase empty blocks on restore with zero bytes\n"
+-	      "* -m,  --allowmnt     don't fail if the partition is mounted. Dangerous !\n"
+-	      "* -M,  --nombr        don't create a backup of the MBR (Mast Boot Record) in the image file\n"
+-	      "* -h,  --help         show help\n"
+-	      "* -v,  --version      show version\n"
+-	      "* -i,  --compilinfo   show compilation options used\n"
+-	      "* -f,  --finish       (action to do if finished successfully):\n"
+-	      "  -f0, --finish=0     wait: don't make anything\n"
+-	      "  -f1, --finish=1     halt (power off) the computer\n"
+-	      "  -f2, --finish=2     reboot (restart the computer):\n"
+-	      "  -f3, --finish=3     quit\n"
+-	      "* -b,  --batch        batch mode: the GUI won't wait for an user action\n"
+-	      "* -y,  --nosync       don't synchronize the disks at the end of the operation (dangerous)\n"
+-	      "* -sX, --server=X     give partimaged server's ip address\n"
+-	      "* -pX, --port=X       give partimaged server's listening port\n"
+-	      "* -g,  --debug=X      set the debug level to X (default: 1):\n"
+-	      "* -n,  --nossl        disable SSL in network mode\n"
+-	      "* -S,  --simulate     simulation of restoration mode\n"
+-	      "* -aX, --automnt=X    Automatic mount with X options. Read the doc for more details\n"
+-		  "* -UX  --username=X   Username to authenticate to server\n"
+-		  "* -PX  --Password=X   Password for authentication of user to server\n"),
++	      "* -z,  --compress      (image file compression level):\n"
++	      "  -z0, --compress=0    don't compress: very fast but very big image file\n"
++	      "  -z1, --compress=1    compress using gzip: fast and small image file (default)\n"
++	      "  -z2, --compress=2    (compress using bzip2: very slow and very small image file):\n"
++	      "* -c,  --nocheck       don't check the partition before saving\n"
++	      "* -o,  --overwrite     overwrite the existing image file without confirmation\n"
++	      "* -d,  --nodesc        don't ask any description for the image file\n"
++	      "* -V,  --volume        (split image into multiple volumes files)\n"
++	      "  -VX, --volume=X      create volumes with a size of X MB\n"
++	      "* -w,  --waitvol       wait for a confirmation after each volume change\n"
++	      "* -e,  --erase         erase empty blocks on restore with zero bytes\n"
++	      "* -m,  --allowmnt      don't fail if the partition is mounted. Dangerous !\n"
++	      "* -M,  --nombr         don't create a backup of the MBR (Mast Boot Record) in the image file\n"
++	      "* -h,  --help          show help\n"
++	      "* -v,  --version       show version\n"
++	      "* -i,  --compilinfo    show compilation options used\n"
++	      "* -f,  --finish        (action to do if finished successfully):\n"
++	      "  -f0, --finish=0      wait: don't make anything\n"
++	      "  -f1, --finish=1      halt (power off) the computer\n"
++	      "  -f2, --finish=2      reboot (restart the computer):\n"
++	      "  -f3, --finish=3      quit\n"
++	      "* -b,  --batch         batch mode: the GUI won't wait for an user action\n"
++              "* -BX, --fully-batch=X batch mode without GUI, X is a challenge response string\n"
++	      "* -y,  --nosync        don't synchronize the disks at the end of the operation (dangerous)\n"
++	      "* -sX, --server=X      give partimaged server's ip address\n"
++	      "* -pX, --port=X        give partimaged server's listening port\n"
++	      "* -g,  --debug=X       set the debug level to X (default: 1):\n"
++	      "* -n,  --nossl         disable SSL in network mode\n"
++	      "* -S,  --simulate      simulation of restoration mode\n"
++	      "* -aX, --automnt=X     automatic mount with X options. Read the doc for more details\n"
++	      "* -UX  --username=X    username to authenticate to server\n"
++	      "* -PX  --password=X    password for authentication of user to server\n"),
+ 	 PACKAGE_VERSION, isVersionStable(PACKAGE_VERSION) ? i18n("stable") : i18n("unstable")); 
+   printf("===============================================================================\n");
+ }
+Index: README
+===================================================================
+--- README	(Revision 73)
++++ README	(Arbeitskopie)
+@@ -12,8 +12,17 @@
+ the Free Software Foundation; either version 2 of the License, or
+ at your option) any later version.
+ 
+-Partition Image is a Linux utility which saves partitions in the ext2fs, reiserfs, fat16, and fat32
+-formats an image file. Only used blocks are copied to save the space and to increase the speed.
++Partition Image is a partition imaging utility which has support for the following file systems:
++  * Ext2/3, the linux standard
++  * Reiser3, a journalised and powerful file system
++  * FAT16/32, DOS and Windows file systems
++  * HPFS, IBM OS/2 File System
++  * JFS, journalised File System, from IBM, used on AIX
++  * XFS, another journalised and efficient File System, from sgi, used on Irix
++  * UFS (beta), Unix File System
++  * HFS (beta), MacOS File System
++  * NTFS (experimental), Windows NT, 2000 and XP
++Only used blocks are copied to save the space and to increase the speed.
+ The image file can be compressed, in gzip, or bzip2 formats, and can be splitted into
+ small files to be copied on floppies (1,44 MB, ZIP, ...).
+ Then, the partition can be restored if there is a problem on the partition (file system error,
diff --git a/sys-block/partimage/files/partimage-0.6.4-port.patch b/sys-block/partimage/files/partimage-0.6.4-port.patch
new file mode 100644
index 000000000000..ee5fb94b59fe
--- /dev/null
+++ b/sys-block/partimage/files/partimage-0.6.4-port.patch
@@ -0,0 +1,11 @@
+--- README.partimaged	2005-09-06 15:48:52.000000000 +0200
++++ README.partimaged	2005-08-12 02:44:26.000000000 +0200
+@@ -24,7 +24,7 @@
+ It can be a serious hole in your network if not used behind a firewall since
+ it can access ANY file with root rigths.
+ 
+-To use, your just need to run it. By default, it listens on port 13000.
++To use, your just need to run it. By default, it listens on port 4025.
+ 
+ To use SSL, you need a certificate file and a private key file for this
+ certificate.
diff --git a/sys-block/partimage/files/partimage-0.6.4-xfs.patch b/sys-block/partimage/files/partimage-0.6.4-xfs.patch
new file mode 100644
index 000000000000..82f801f5468e
--- /dev/null
+++ b/sys-block/partimage/files/partimage-0.6.4-xfs.patch
@@ -0,0 +1,28 @@
+--- src/client/fs/fs_xfs.h	2005-09-06 15:48:52.000000000 +0200
++++ src/client/fs/fs_xfs.h	2005-08-10 05:08:28.000000000 +0200
+@@ -105,12 +105,9 @@
+ typedef unsigned short int	__uint16_t;
+ typedef signed int	__int32_t;
+ typedef unsigned int	__uint32_t;
+-#ifdef __ia64__
++#if defined(__alpha__) || defined(__ia64__) || defined(__powerpc64__) || defined(__x86_64__)
+ typedef signed long int	__int64_t;
+ typedef unsigned long int	__uint64_t;
+-#elif __alpha__
+-typedef signed long int    __int64_t;
+-typedef unsigned long int  __uint64_t;
+ #else
+ typedef signed long long int    __int64_t;
+ typedef unsigned long long int  __uint64_t;
+@@ -157,10 +154,7 @@
+ typedef	__uint64_t	xfs_dfiloff_t;	// block number in a file 
+ typedef	__uint64_t	xfs_dfilblks_t;	// number of blocks in a file 
+ 
+-#ifdef __ia64__
+-typedef unsigned long  __u64; 
+-typedef signed long    __s64; 
+-#elif __alpha__
++#if defined(__alpha__) || defined(__ia64__) || defined(__powerpc64__)
+ typedef unsigned long  __u64; 
+ typedef signed long    __s64; 
+ #else
diff --git a/sys-block/partimage/files/partimaged.pam b/sys-block/partimage/files/partimaged.pam
new file mode 100644
index 000000000000..de21a2d035b1
--- /dev/null
+++ b/sys-block/partimage/files/partimaged.pam
@@ -0,0 +1,12 @@
+# PAM config file for Partimaged
+
+auth 	required	pam_unix.so
+auth	required	pam.warn.so
+auth	sufficient	pam_userdb.so \
+	db=/etc/partimaged/passwd
+auth 	required	pam_listfile.so \
+	onerr=fail item=user sense=allow \
+	file=/etc/partimaged/partimagedusers
+
+account	sufficient	pam_userdb.so \
+	debug db=/etc/partimaged/passwd
diff --git a/sys-block/partimage/partimage-0.6.4-r4.ebuild b/sys-block/partimage/partimage-0.6.4-r4.ebuild
index ea31d4cc762a..bc503d4be93a 100644
--- a/sys-block/partimage/partimage-0.6.4-r4.ebuild
+++ b/sys-block/partimage/partimage-0.6.4-r4.ebuild
@@ -1,14 +1,15 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-block/partimage/partimage-0.6.4-r4.ebuild,v 1.13 2006/10/14 17:07:41 xmerlin Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-block/partimage/partimage-0.6.4-r4.ebuild,v 1.14 2006/10/14 22:45:43 xmerlin Exp $
 
 WANT_AUTOMAKE="1.8"
 
 inherit eutils flag-o-matic pam autotools
 
+MY_P="${PN}-${PV}-1"
 DESCRIPTION="Console-based application to efficiently save raw partition data to an image file. Optional encryption/compression support."
 HOMEPAGE="http://www.partimage.org/"
-SRC_URI="mirror://sourceforge/partimage/${P}.tar.bz2"
+SRC_URI="mirror://sourceforge/partimage/${MY_P}.tar.bz2"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~x86 ~ppc ~sparc"
@@ -41,6 +42,8 @@ PARTIMAG_USER_SH=-1
 PARTIMAG_USER_HOMEDIR=/var/log/partimage
 PARTIMAG_USER_GROUPS=partimag
 
+S="${WORKDIR}/${MY_P}"
+
 pkg_setup() {
 	# Now add users if needed
 	enewgroup ${PARTIMAG_GROUP_NAME} ${PARTIMAG_GROUP_GID}
@@ -56,15 +59,18 @@ src_unpack() {
 	epatch ${FILESDIR}/${P}-chown.patch || die
 	epatch ${FILESDIR}/${P}-not_install_info.patch || die
 	epatch ${FILESDIR}/${P}-fixserverargs.diff || die
-	epatch ${FILESDIR}/${P}-lib64.patch || die
+	epatch ${FILESDIR}/${P}-1-lib64.patch
 	epatch ${FILESDIR}/${P}-fflush-before-re-read-partition-table.patch || die
-	epatch ${FILESDIR}/${P}-LP64-fixes.patch || die
 	epatch ${FILESDIR}/${P}-save_all_and_rest_all_actions.patch || die
 	epatch ${FILESDIR}/${P}-datadir-path.patch || die
 	epatch ${FILESDIR}/${P}-dont-discard-error-message-in-batch-mode.patch || die
 	epatch ${FILESDIR}/${P}-save_file_and_rest_file_actions.patch || die
 	epatch ${FILESDIR}/${P}-varargs.patch || die
 	epatch ${FILESDIR}/${P}-gui.diff || die
+	epatch ${FILESDIR}/${P}-empty-salt.patch || die
+	epatch ${FILESDIR}/${P}-help.patch || die
+	epatch ${FILESDIR}/${P}-xfs.patch || die
+	epatch ${FILESDIR}/${P}-port.patch || die
 }
 
 src_compile() {
@@ -88,10 +94,10 @@ src_compile() {
 		|| die "econf failed"
 
 	emake || die "make failed"
-	if use pam
-	then
-		make pamfile || die  "couldn't create pam file"
-	fi
+	#if use pam
+	#then
+	#	make pamfile || die  "couldn't create pam file"
+	#fi
 }
 
 src_install() {
@@ -110,7 +116,10 @@ src_install() {
 	dodoc AUTHORS BUGS COPYING ChangeLog INSTALL README* TODO partimage.lsm
 
 	# pam
-	newpamd partimaged.pam partimaged
+	if use pam
+	then
+		newpamd ${FILESDIR}/partimaged.pam partimaged || die
+	fi
 }
 
 # vars for SSL stuff