------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-AUX partimage-0.6.4-1-lib64.patch 2483 RMD160 20b936037e223a02237bbc45b4c037fc1e571c51 SHA1 219a6d4524908360722b25a7eb7e619238a562ff SHA256 22686caa9919b9c0f8f248d033cce400bdf004a7cbaa1773d9e4c20dc212dfb9
-AUX partimage-0.6.4-LP64-fixes.patch 1773 RMD160 3a2e1d4d69794aaa4311b716c4a418350774707f SHA1 a76a3af0a0ca6b56e3ad58e8111cda88bf7757c3 SHA256 1f4ad532e1edc0c5772290fde3ed0285e5c09caecd786216c92f78fab2c4075b
-AUX partimage-0.6.4-chown.patch 1660 RMD160 3fc66b6aa0b045a3d184f12c6347be5ef192e602 SHA1 1f77af2bc459b539b767915f19c48b880326b1c0 SHA256 34b851e54dbf4f713b7ecb0d626668556911f8240010b1b86bd3e9c924c0e079
-AUX partimage-0.6.4-datadir-path.patch 1669 RMD160 701849f5cf02564640e41d6bd203efa59c6d6b4b SHA1 2529ab585e27b850c8f446059aea60f17770a684 SHA256 cd58f9dede1b2ea326973d7c1bdefe0ffc418015c189e8a2c93a7dd713dfa152
-AUX partimage-0.6.4-dont-discard-error-message-in-batch-mode.patch 1938 RMD160 e74457b05ec899ca4a5c485bd2b1535f3a99385e SHA1 a7d68483f3950769dc6d99c319bd0b0fecd009a4 SHA256 b260d2c2b81d1d9ec60acd770965c995a98cceb97d468ded3607e276b9d43759
-AUX partimage-0.6.4-empty-salt.patch 295 RMD160 391020c2abb56a370674cb5394a43da8a56a4b12 SHA1 320082297b7a17bf92f7fa042adc9c882cd2b8c1 SHA256 abbfe5dd900c07026cf1057d1cac04dd9bc4d5610e631b2d707fd8306295419d
-AUX partimage-0.6.4-fflush-before-re-read-partition-table.patch 401 RMD160 d1a05f322beeee0265a8cd250fe0d70cc7a0f6b2 SHA1 c63534bc0876c1f496c2055311eacc66883b9c66 SHA256 cd94016ba2cdd4002b451f575c6e1c8308f520c0dc03c5ba6dceb63f937a156b
-AUX partimage-0.6.4-fixserverargs.diff 366 RMD160 24ebbabefcae34529f18d8214c0f6482a6e3a51c SHA1 b7c0572b4b63099b9556ecac443201591e783e05 SHA256 bd74a6376629481454d666d5c7b60bca4c39930c934691634f008290bd0863f5
-AUX partimage-0.6.4-gui.diff 2549 RMD160 9a0fd1c05ccb9eed2a10e19bd7de6f17409a15ce SHA1 b9195a3f12c749b9279f93416afd5b7c8944b841 SHA256 a77815b3ab58b9e7a60a5615201754c13e727990172d357dcf70a9436a67ceef
-AUX partimage-0.6.4-help.patch 7736 RMD160 a12d2e9ac058795f7c4ba15d488e41d3348f31a9 SHA1 a577ff05d95189254b765fe7fe3c26b2038c3cfa SHA256 445deb8aca835eafaee2ced6f7a96e4aaf9ceeb778bbf6cca8e22b53dea12689
-AUX partimage-0.6.4-lib64.patch 2102 RMD160 a5a6aefcc2d204de65a6f779bcb25fc5ee1a7bca SHA1 344aca0b2f1323d0b1a54413cc94ef26a2a568a9 SHA256 32dde7f5e0bfe8c53557a27b2e36450c7b391fdb63ea7479c0dd10c0b88387f3
-AUX partimage-0.6.4-nodumbpermchecks.diff 817 RMD160 75453b94eba208f26fc3ee01003f646083506175 SHA1 21684eb253d0bca1e869aabb84d1cd207ae978af SHA256 52b27384bfb6813763075263f6d8ae3b0dda1b3ce4d6e74be6d156fded7dcc29
-AUX partimage-0.6.4-not_install_info.patch 1200 RMD160 1b41c778c718f4e8be2b465b20fe28b004a1a12a SHA1 86102b193e7896a598b1a42d9ea70ec40e284c0a SHA256 12f8a09d473fbf827d2423c41e499620a6f3b6fa49368f132f1a2f1eff7d1469
-AUX partimage-0.6.4-port.patch 490 RMD160 f6c9df5e3a96546b48304b13a27fd867bd52a480 SHA1 ccb444fba47bc5da534c61d6b07cd6a53057aff6 SHA256 cb20cbc743ab74390c8294a0394165d3980690bed4439425fa0735e6a27729e2
-AUX partimage-0.6.4-save_all_and_rest_all_actions.patch 10301 RMD160 ef483644116534aedf3e1a79ba84cd8b7f7aef1c SHA1 ceae737467f92f6288e1e57d270228a518ee0530 SHA256 1ba5e5b2949b6328c9745c40eaf9909fbe3a166b2df47e4b7e9974b5337d5b37
AUX partimage-0.6.4-save_file_and_rest_file_actions.patch 3921 RMD160 9b6b5a115ca12839207d4c0554961f8743a7b6f6 SHA1 3eb76c8096b3219337876a32a85bd5f662c772f8 SHA256 a78746a720bb5e22298bcdd01b0c2412a4d675efbdd7b2716c571dc798b3e449
-AUX partimage-0.6.4-varargs.patch 570 RMD160 94916f2ad7535d37d49e1d439babd9253ca9d8ec SHA1 26afde042d227a20dc873659ecd0ab6889d0b0bf SHA256 99ccf7696c0c14cb603f5ba2d95c051989cb3226cd7490d00bb26469b08a6099
-AUX partimage-0.6.4-xfs.patch 1022 RMD160 ea6c7649aa2afc40b4bf0279ebc017f8a8d97b3e SHA1 09936d6a766b082871ebe29f7a4bdf17eceaeb6e SHA256 77c7571f31bf6897ce8d0547150a5c48ce6cd56d8cabcb3b5617bf617566e823
-AUX partimage-0.6.6-andre-przywara_amd64.patch 35060 RMD160 cad56cec4a2926cc0b6de8628e505d145398f711 SHA1 1f42a1be139109d36d0a6b0aaca3b4a50fd7fce1 SHA256 23f07b7a41c7a5ad586be71ecbf081fd46fcb83335aa34f9a12fb4f04d904f86
-AUX partimage-0.6.6-andre-przywara_warnings.patch 1367 RMD160 0edfa68cef522a7697a32eb97d636122ce346fa7 SHA1 89f4825299758c803db8a84cb51b373a5f66cea3 SHA256 da0c5e224dbb5e308622277a3aa997ce8335fe9758886b1a9813b983660116ec
-AUX partimage-0.6.6-chown.patch 1842 RMD160 9be712de0afa29c0065c093c7626b5695cd8aeb0 SHA1 211a052cbf243afd2d984ff6c889fd770a8dcf5c SHA256 18d84252ff9acb8b6c1f3aa16bad2a5fb27b6c1db0246732affadf4411bde878
-AUX partimage-0.6.6-clonezilla_ext3_blocks-per-group.patch 4265 RMD160 b78725fddb9a75598a672db1f880d5ff3d96ea43 SHA1 512b9736c61933587d54854fc70437f624eef2ec SHA256 93d320a7a8580228394ed851d945144d8ebc56d74e203e59fe86dfc2a7383223
-AUX partimage-0.6.6-datadir-path.patch 2842 RMD160 337fdc2186a2e31e1839968722e2c015b525312f SHA1 c44e6dfc10ab901c4711f740195c0dbfb7f2b290 SHA256 14a661b72d50fbb0f7d6d67dd2b79017210ea43962bcbb5054a58d83291be032
AUX partimage-0.6.6-disable_header_check.patch 519 RMD160 9ea48aec2a89a7fffe0c097fd6030e7083bd3e1d SHA1 55c478e9ac44fc334a7682938876c180c8e7342a SHA256 3ba99325021238dbb7b7d2023a985b7a9eefa5640b6770b9701f9f20b471ec59
-AUX partimage-0.6.6-dont-discard-error-message-in-batch-mode.patch 2213 RMD160 81a777aed335cca4c1bfdfdef5937631ebcfbe79 SHA1 ead04881cf46eba0786dcd2ffff0780271be1799 SHA256 8d911225cd0549f89cd9be9aa9506784f9e2b49cf85bf988f49536c26198b2e0
-AUX partimage-0.6.6-gui.diff 1164 RMD160 b4252dd6e46612b11bf04f64c75c30c19e776c57 SHA1 b819b37f618bea057b3f121369b1afa2f35dc355 SHA256 816c324c8ea827a6c2508d0b6c4ef6605cc55b957edbca47c6dff8cf29d8a6a2
AUX partimage-0.6.6-not_install_info.patch 937 RMD160 2360cebf931845f6b5d08eb56e4be3df92826a74 SHA1 a6936e9715d88a9705d4238a489de3b2a70672a4 SHA256 ab21eec9e177ae799df0739cc6215cd5538dacaaad6e535376938d351db82002
-AUX partimage-0.6.6-thread-privilege-fix.patch 1301 RMD160 77ef2aa3202731205acebb8ea58faeccb930363a SHA1 2ae3782574f6dc57a7e7aa8e6b6cb55cf1c275fc SHA256 29c49a8ca43fcf3ad0f842d836cb353bf8e3f7420a7b9fbfd8a1b9885fd14daf
AUX partimage-0.6.7+glibc-2.10.patch 508 RMD160 5ca573128b60940635e0dcfcb8e4c3125b2306cc SHA1 19427559cb31db2afe28b244b6e6e707ecea91dc SHA256 908850e484ad51c127fb745723dd606cf49edf931ad137be5ebc7c4d10f6be30
AUX partimage-0.6.7-chown.patch 1888 RMD160 0db2de481cddd206eb47fa8ef4ee37c01c6fe777 SHA1 b66ab9d3a28400a0fe2329ec38c9b9ab4b814784 SHA256 4e07de0f3b8f182bd16d5f45f0f56be2158524492936cf47891db8714cdb0f4e
AUX partimage-0.6.7-datadir-path.patch 673 RMD160 4ba52dcfc6857026864a5fc460dd978164d0b967 SHA1 03e485c794a9ca24fb85e41d8dba2af8a9cc0abb SHA256 84bbb66c69cbd183bb326e17da2a0b7540690c5f1435903d9e5e7ae4c4cbc820
AUX partimaged.pam 266 RMD160 07b472d4ffdf3f5c10e7b04ba0c1df87e3e1cf9d SHA1 8955da1485c3d15d6193a4a405bc841cf7698017 SHA256 6072116adb36c49a4a4c36a134355162bf215ec7b6716593de76de3123c5adbe
AUX partimagedusers.5 1263 RMD160 6416fd7f013e637b99f10c32607994e11728bdd0 SHA1 56afebd408dc14d3270a9a43702d335fa598998e SHA256 6037d086ddcdebd76b2f2477252173e8242ac528bc7025a391364a4da174f0f3
AUX servercert.cnf 1096 RMD160 8786b07466c5330254eb96e1de6f754e8a68e77f SHA1 64fc34b0fbb8a07dc90ea6be932c4e51a6839721 SHA256 9a9cae8cd6c7bbc6f71cd619829b7a6a47d6aae34831cc44a6cc3bf3e7917953
-DIST partimage-0.6.6.tar.bz2 524695 RMD160 8bad0dd706d88dee27531766daf7611d95bb0a04 SHA1 691a5bfe1637fce3d1af3a48a37b63d603c09b7f SHA256 0bf5d720094777ae0aa258a00f30cee6988c026558eea20087aa20d46b81b2bd
DIST partimage-0.6.7.tar.bz2 628214 RMD160 e01315fe6073653c89f2dea3c19483853960d59e SHA1 c02e0db728e72277a78a1fb4140171ba8a9336cf SHA256 0b3ed41ab71a73f83a41fc12e61cd874f5d2799cbfbd1db8e39730ba8a3d6d9e
-EBUILD partimage-0.6.6.ebuild 5103 RMD160 671c05e4da6442d0c078b6aa0f430080c6742596 SHA1 722ee11bffe6dad94809d7bd8c89994b7d2eb31a SHA256 aa98f63daa26e0517bbdd679233683acc2284722190076ac6c6f0c36e40c8270
EBUILD partimage-0.6.7.ebuild 4619 RMD160 273de0a60a7c421cbb3b6b46409e9265f59ab65c SHA1 b81931dc6ff45f346408b084270b935daeca7a14 SHA256 c3a7c92e63cab0037abd54d69e24dee83a56808789e6e870b7f7bce6fad3079c
MISC ChangeLog 11806 RMD160 6948de3a55fb36f81bd391aeb5c6d1e60d4fd135 SHA1 c3b42e02149e0aa6350f8a34a02e55d0b9053a14 SHA256 dfe0d2da91815aefccfd05bb9615bd84220586a08a186d7a145ac02e6a0ee27d
MISC metadata.xml 236 RMD160 792e23524f149a663c9647f206c1a92526c7af4f SHA1 be3cd178e173524f23e11facc564c69332d6d7a2 SHA256 e25fe580c4855de9b289d981fe5de49de9f08ad26e06d5db0cee976bee45a357
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.15 (GNU/Linux)
-
-iEYEARECAAYFAkwF+QkACgkQV3J2n04EauzG+wCgkeq6meYeycio1jz4OHWMVaae
-GqIAoMQ5ojuZh4CnpmiY7KYjzGbNl3Cn
-=9rPw
------END PGP SIGNATURE-----
+++ /dev/null
-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@
-
+++ /dev/null
---- partimage-0.6.4/src/client/fs/fs_xfs.h.LP64-fixes 2004-02-03 19:57:36.000000000 -0500
-+++ partimage-0.6.4/src/client/fs/fs_xfs.h 2005-02-21 10:25:06.220053947 -0500
-@@ -19,6 +19,7 @@
- #define FS_XFS_H
-
- #include <ctype.h>
-+#include <stdint.h>
-
- #include "partimage.h"
- #include "common.h"
-@@ -99,22 +100,14 @@ class CRestoringWindow;
- #define XFS_BTNUM_INO ((xfs_btnum_t)XFS_BTNUM_INOi)
-
- #define XFS_SB_MAGIC 0x58465342 // 'XFSB'
--typedef signed char __int8_t;
--typedef unsigned char __uint8_t;
--typedef signed short int __int16_t;
--typedef unsigned short int __uint16_t;
--typedef signed int __int32_t;
--typedef unsigned int __uint32_t;
--#ifdef __ia64__
--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;
--#endif
-+typedef int8_t __int8_t;
-+typedef uint8_t __uint8_t;
-+typedef int16_t __int16_t;
-+typedef uint16_t __uint16_t;
-+typedef int32_t __int32_t;
-+typedef uint32_t __uint32_t;
-+typedef int64_t __int64_t;
-+typedef uint64_t __uint64_t;
-
- // POSIX Extensions
- typedef unsigned char uchar_t;
-@@ -157,16 +150,8 @@ typedef __uint64_t xfs_drtbno_t; // exte
- 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__
--typedef unsigned long __u64;
--typedef signed long __s64;
--#else
--typedef unsigned long long __u64;
--typedef signed long long __s64;
--#endif
-+typedef uint64_t __u64;
-+typedef int64_t __s64;
-
- typedef __u64 xfs_off_t;
- //typedef __s32 xfs32_off_t;
+++ /dev/null
---- partimage-0.6.2/Makefile.am.orig 2002-11-25 06:08:36.000000000 -0500
-+++ partimage-0.6.2/Makefile.am 2002-11-25 06:08:58.000000000 -0500
-@@ -23,8 +23,6 @@
- rm ${sysconfdir}/partimaged/partimaged.csr ;\
- chmod 600 ${sysconfdir}/partimaged/partimaged.key ;\
- chmod 600 ${sysconfdir}/partimaged/partimaged.cert ;\
-- chown partimag.root ${sysconfdir}/partimaged/partimaged.key ;\
-- chown partimag.root ${sysconfdir}/partimaged/partimaged.cert ;\
- else \
- echo "SSL disabled, no certificate will be generated." ;\
- fi
-@@ -57,7 +55,6 @@
- echo "#sample # user 'sample' is allowed to connect partimaged" >> \
- ${sysconfdir}/partimaged/partimagedusers ;\
- chmod 600 ${sysconfdir}/partimaged/partimagedusers ;\
-- chown partimag.root ${sysconfdir}/partimaged/partimagedusers ;\
- fi
-
- $(mkinstalldirs) ${infodir}
---- partimage-0.6.2/Makefile.in.orig 2002-11-25 06:15:31.000000000 -0500
-+++ partimage-0.6.2/Makefile.in 2002-11-25 06:15:58.000000000 -0500
-@@ -651,8 +651,6 @@
- rm ${sysconfdir}/partimaged/partimaged.csr ;\
- chmod 600 ${sysconfdir}/partimaged/partimaged.key ;\
- chmod 600 ${sysconfdir}/partimaged/partimaged.cert ;\
-- chown partimag.root ${sysconfdir}/partimaged/partimaged.key ;\
-- chown partimag.root ${sysconfdir}/partimaged/partimaged.cert ;\
- else \
- echo "SSL disabled, no certificate will be generated." ;\
- fi
-@@ -684,7 +682,6 @@
- echo "#sample # user 'sample' is allowed to connect partimaged" >> \
- ${sysconfdir}/partimaged/partimagedusers ;\
- chmod 600 ${sysconfdir}/partimaged/partimagedusers ;\
-- chown partimag.root ${sysconfdir}/partimaged/partimagedusers ;\
- fi
-
- $(mkinstalldirs) ${infodir}
+++ /dev/null
---- partimage-0.6.4/Makefile.in.orig 2005-11-13 18:08:05.558622488 +0100
-+++ partimage-0.6.4/Makefile.in 2005-11-13 18:08:47.669220704 +0100
-@@ -668,21 +668,21 @@
- @echo "/etc/pam.d/partimaged"
-
- install-data-local:
-- $(mkinstalldirs) ${sysconfdir}
-- $(mkinstalldirs) ${sysconfdir}/partimaged
-+ $(mkinstalldirs) ${DESTDIR}${sysconfdir}
-+ $(mkinstalldirs) ${DESTDIR}${sysconfdir}/partimaged
-
-- if test ! -f ${sysconfdir}/partimaged/partimagedusers ; then \
-+ if test ! -f ${DESTDIR}${sysconfdir}/partimaged/partimagedusers ; then \
- echo "# note: '#' introduces comments" > \
-- ${sysconfdir}/partimaged/partimagedusers ;\
-+ ${DESTDIR}${sysconfdir}/partimaged/partimagedusers ;\
- echo -n "#add only users allowed to " >> \
-- ${sysconfdir}/partimaged/partimagedusers ;\
-- echo "connect partimaged" >> ${sysconfdir}/partimaged/partimagedusers ;\
-+ ${DESTDIR}${sysconfdir}/partimaged/partimagedusers ;\
-+ echo "connect partimaged" >> ${DESTDIR}${sysconfdir}/partimaged/partimagedusers ;\
- echo "# (only one login per line)" >> \
-- ${sysconfdir}/partimaged/partimagedusers ;\
-- echo "" >> ${sysconfdir}/partimaged/partimagedusers ;\
-+ ${DESTDIR}${sysconfdir}/partimaged/partimagedusers ;\
-+ echo "" >> ${DESTDIR}${sysconfdir}/partimaged/partimagedusers ;\
- echo "#sample # user 'sample' is allowed to connect partimaged" >> \
-- ${sysconfdir}/partimaged/partimagedusers ;\
-- chmod 600 ${sysconfdir}/partimaged/partimagedusers ;\
-+ ${DESTDIR}${sysconfdir}/partimaged/partimagedusers ;\
-+ chmod 600 ${DESTDIR}${sysconfdir}/partimaged/partimagedusers ;\
- fi
-
- #$(mkinstalldirs) ${infodir}
+++ /dev/null
---- partimage-0.6.4/src/client/main.cpp.pix 2004-02-04 01:57:36.000000000 +0100
-+++ partimage-0.6.4/src/client/main.cpp 2005-10-20 17:02:36.000000000 +0200
-@@ -133,6 +133,12 @@
- }*/
- }
-
-+void ensure_interface_is_non_interactive()
-+{
-+ delete g_interface;
-+ g_interface = new CInterfaceNone("");
-+}
-+
- // =======================================================
- int main(int argc, char *argv[])
- {
-@@ -568,8 +574,9 @@
- goto beginMainWin;
- }
-
-- if (!options.bBatchMode)
-- g_interface -> Error(excep, szImageFile, szDevice);
-+ if (options.bBatchMode) ensure_interface_is_non_interactive();
-+
-+ g_interface -> Error(excep, szImageFile, szDevice);
-
- showDebug(1, "\nFINAL ERROR\n\n");
-
-@@ -580,8 +587,10 @@
- else
- {
- showDebug(1, "The file system of [%s] is [%s], and is not supported\n", szDevice, szFileSystem);
-- if (!options.bBatchMode)
-- g_interface->msgBoxError("The file system of [%s] is [%s], and is not supported", szDevice, szFileSystem);
-+
-+ if (options.bBatchMode) ensure_interface_is_non_interactive();
-+
-+ g_interface->msgBoxError("The file system of [%s] is [%s], and is not supported", szDevice, szFileSystem);
- nRes = -1;
- }
- //#endif // DEVEL_SUPPORT
-@@ -661,7 +670,7 @@
- // update the disk IO
- if (options.bSync)
- {
-- g_interface -> StatusLine(i18n("commiting buffer cache to disk."));
-+ if (!options.bBatchMode) g_interface -> StatusLine(i18n("commiting buffer cache to disk."));
- sync();
- }
-
---- partimage-0.6.4/src/client/interface_none.cpp.pix 2004-02-04 01:57:36.000000000 +0100
-+++ partimage-0.6.4/src/client/interface_none.cpp 2005-10-20 17:03:01.000000000 +0200
-@@ -96,7 +96,8 @@
- void CInterfaceNone::msgBoxError(char *title, ...) {
- va_list al;
- va_start(al,title);
-- message_only("Error", title, "", al, 0);
-+ vfprintf(stderr,title,al);
-+ fputc('\n',stderr);
- va_end(al);
- }
-
+++ /dev/null
-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
-
+++ /dev/null
---- partimage-0.6.4/src/client/misc.cpp.pix 2004-02-05 21:19:00.000000000 +0100
-+++ partimage-0.6.4/src/client/misc.cpp 2005-01-21 11:43:19.439462188 +0100
-@@ -294,6 +294,8 @@
- nRes = fwrite(mbrOriginal[dwOriginalMbrNb].cData+MBR_SIZE_BOOT, MBR_SIZE_TABLE+2, 1, fDevice); // table + 0xAA55
- }
-
-+ fflush(fDevice);
-+
- // re-read partition table
- if (ioctl(fileno(fDevice), BLKRRPART))
- {
+++ /dev/null
---- partimage-0.6.4/src/server/partimaged-main.cpp.chris 2005-01-16 16:10:23.273973792 +0100
-+++ partimage-0.6.4/src/server/partimaged-main.cpp 2005-01-16 16:10:48.750100832 +0100
-@@ -78,7 +78,7 @@
- };
- #endif //HAVE_GETOPT_H
-
--static char optstring[]="ip:hvDdr:g:L";
-+static char optstring[]="ip:hvDd:r:g:L";
-
- bool g_bSigKill = false;
- bool g_bSigInt = false;
+++ /dev/null
-diff -uNr partimage-0.6.4.orig/src/server/partimaged-gui_newt.cpp partimage-0.6.4/src/server/partimaged-gui_newt.cpp
---- partimage-0.6.4.orig/src/server/partimaged-gui_newt.cpp 2004-02-04 01:57:36.000000000 +0100
-+++ partimage-0.6.4/src/server/partimaged-gui_newt.cpp 2006-10-14 19:59:17.000000000 +0200
-@@ -188,9 +188,10 @@
- // =============================================================================
- void CPartimagedInterfaceNewt::Status(char * msg)
- {
--/*
-+ char szBuf[1024];
- newtPopHelpLine();
-- newtPushHelpLine(msg);
-+ snprintf(szBuf, sizeof(szBuf),
-+ "%s [Press * to exit]", msg);
-+ newtPushHelpLine(szBuf);
- newtRefresh();
--*/
- }
-diff -uNr partimage-0.6.4.orig/src/server/partimaged-main.cpp partimage-0.6.4/src/server/partimaged-main.cpp
---- partimage-0.6.4.orig/src/server/partimaged-main.cpp 2006-10-14 19:55:07.000000000 +0200
-+++ partimage-0.6.4/src/server/partimaged-main.cpp 2006-10-14 20:02:25.000000000 +0200
-@@ -98,6 +98,11 @@
- else if (signo == SIGINT)
- {
- g_bSigInt = true;
-+ delete g_Server;
-+ delete g_Window;
-+ g_Server = NULL;
-+ g_Window = NULL;
-+ exit(0);
- }
- else if (signo == SIGSEGV)
- {
-@@ -235,7 +240,7 @@
- case 'd':
- if (chdir(optarg) != 0)
- {
-- printf("%s: %s\n", optarg, strerror(errno));
-+ printf("Directory %s: %s\n", optarg, strerror(errno));
- exit(-1);
- }
- break;
-@@ -313,9 +318,9 @@
- #endif
-
- // register signals
--// signal(SIGTERM, catch_sigint);
--// signal(SIGINT, catch_sigint);
--// signal(SIGSEGV, catch_sigint); // segmentation fault
-+ signal(SIGTERM, catch_sigint);
-+ signal(SIGINT, catch_sigint);
-+ signal(SIGSEGV, catch_sigint); // segmentation fault
- // signal(SIGHUP, catch_sigint);
- // signal(SIGQUIT, catch_sigint);
- // signal(SIGCHLD, catch_sigint);
-diff -uNr partimage-0.6.4.orig/src/server/partimaged.cpp partimage-0.6.4/src/server/partimaged.cpp
---- partimage-0.6.4.orig/src/server/partimaged.cpp 2004-02-04 01:57:36.000000000 +0100
-+++ partimage-0.6.4/src/server/partimaged.cpp 2006-10-14 19:59:17.000000000 +0200
-@@ -74,7 +74,7 @@
-
- while (!bQuit)
- {
-- g_Window->Status(i18n("Waitting ..."));
-+ g_Window->Status(i18n("waiting ..."));
-
- n = Server->RecvMsg(nClient, mess);
- if (n != MESSAGE_LEN)
-@@ -115,7 +115,7 @@
- break;
-
- case MSG_WRITE:
-- g_Window->Status(i18n("writting ..."));
-+ g_Window->Status(i18n("writing ..."));
- if (m_size > BUFFER_LEN)
- {
- delete g_Window;
+++ /dev/null
-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,
+++ /dev/null
---- partimage-0.6.4/src/client/Makefile.am.chris 2005-03-29 13:34:39.129627648 +0200
-+++ partimage-0.6.4/src/client/Makefile.am 2005-03-29 13:34:49.238090928 +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
---- partimage-0.6.4/src/client/Makefile.in.chris 2005-03-29 13:33:23.625106080 +0200
-+++ partimage-0.6.4/src/client/Makefile.in 2005-03-29 13:33:53.689535592 +0200
-@@ -253,7 +253,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@
- MAINTAINERCLEANFILES = Makefile.in
- all: all-recursive
---- partimage-0.6.4/src/server/Makefile.am.chris 2005-03-29 13:34:55.995063712 +0200
-+++ partimage-0.6.4/src/server/Makefile.am 2005-03-29 13:35:05.279652240 +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@
-
---- partimage-0.6.4/src/server/Makefile.in.chris 2005-03-29 13:34:10.496980472 +0200
-+++ partimage-0.6.4/src/server/Makefile.in 2005-03-29 13:34:32.172685264 +0200
-@@ -231,7 +231,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@
- MAINTAINERCLEANFILES = Makefile.in
- all: all-am
+++ /dev/null
-diff -urwb partimage-0.6.4.orig/src/shared/access.cpp partimage-0.6.4/src/shared/access.cpp
---- partimage-0.6.4.orig/src/shared/access.cpp 2004-02-03 16:57:36.000000000 -0800
-+++ partimage-0.6.4/src/shared/access.cpp 2004-05-13 21:38:38.000000000 -0700
-@@ -323,12 +323,14 @@
- return 1;
- }
- mode = status.st_mode;
-+ /*
- if (!S_ISREG(mode))
- {
- help(szFile);
- showDebug(0, "file %s is not a regular file\n", szFile);
- return 1;
- }
-+ */
- /*
- if (status.st_uid != 0 || status.st_gid != 0)
- {
-@@ -337,7 +339,7 @@
- return 1;
- }
- */
--
-+ /*
- if (mode != (S_IFREG | S_IRUSR | S_IWUSR))
- {
- help(szFile);
-@@ -346,7 +348,7 @@
- showDebug(0, "it's %o, see stat manpage for help\n");
- return 1;
- }
--
-+ */
- return 0;
- }
- #else // HAVE_PAM
+++ /dev/null
---- partimage-0.6.4/Makefile.in.chris 2005-01-14 01:32:01.000000000 +0100
-+++ partimage-0.6.4/Makefile.in 2005-01-14 01:33:01.483820264 +0100
-@@ -685,16 +685,16 @@
- chmod 600 ${sysconfdir}/partimaged/partimagedusers ;\
- fi
-
-- $(mkinstalldirs) ${infodir}
-- $(INSTALL_DATA) AUTHORS ${infodir}/AUTHORS
-- $(INSTALL_DATA) BUGS ${infodir}/BUGS
-- $(INSTALL_DATA) COPYING ${infodir}/COPYING
-- $(INSTALL_DATA) ChangeLog ${infodir}/ChangeLog
-- $(INSTALL_DATA) INSTALL ${infodir}/INSTALL
-- $(INSTALL_DATA) README ${infodir}/README
-- $(INSTALL_DATA) README.partimaged ${infodir}/README.partimaged
-- $(INSTALL_DATA) TODO ${infodir}/TODO
-- $(INSTALL_DATA) partimage.lsm ${infodir}/partimage.lsm
-+ #$(mkinstalldirs) ${infodir}
-+ #$(INSTALL_DATA) AUTHORS ${infodir}/AUTHORS
-+ #$(INSTALL_DATA) BUGS ${infodir}/BUGS
-+ #$(INSTALL_DATA) COPYING ${infodir}/COPYING
-+ #$(INSTALL_DATA) ChangeLog ${infodir}/ChangeLog
-+ #$(INSTALL_DATA) INSTALL ${infodir}/INSTALL
-+ #$(INSTALL_DATA) README ${infodir}/README
-+ #$(INSTALL_DATA) README.partimaged ${infodir}/README.partimaged
-+ #$(INSTALL_DATA) TODO ${infodir}/TODO
-+ #$(INSTALL_DATA) partimage.lsm ${infodir}/partimage.lsm
-
- uninstall-local:
- -rm -f ${infodir}/AUTHORS
+++ /dev/null
---- 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.
+++ /dev/null
---- partimage-0.6.4/src/client/main.cpp.pix 2004-02-04 01:57:36.000000000 +0100
-+++ partimage-0.6.4/src/client/main.cpp 2005-01-24 13:46:19.388390009 +0100
-@@ -142,6 +142,7 @@
- int nChoice;
- char szDevice[MAX_DEVICENAMELEN];
- char szImageFile[MAXPATHLEN];
-+ char szImageDir[MAXPATHLEN];
- char szTemp[2048];
- char szTemp2[1024];
- char szTemp3[1024];
-@@ -505,13 +506,17 @@
- if (argc - optind == 2) // commands with 1 parameter
- {
- showDebug(8, "full cmdline with 1 param\n");
-- strncpy(szImageFile, argv[optind+1], MAXPATHLEN);
--
- if (strcmp(argv[optind], "restmbr")==0) // restore an MBR
- nChoice = OPERATION_RESTMBR;
- else if (strcmp(argv[optind], "imginfo")==0)
- // show informations about the imagefile
- nChoice = OPERATION_IMGINFO;
-+ else if (strcmp(argv[optind], "save_all")==0)
-+ nChoice = OPERATION_SAVE_ALL;
-+ else if (strcmp(argv[optind], "rest_all")==0)
-+ nChoice = OPERATION_REST_ALL;
-+
-+ strncpy(nChoice == OPERATION_REST_ALL || nChoice == OPERATION_SAVE_ALL ? szImageDir : szImageFile, argv[optind+1], MAXPATHLEN);
- }
-
- // check options
-@@ -644,6 +649,38 @@
- nRes = -1;
- }
- break;
-+
-+ case OPERATION_SAVE_ALL:
-+ showDebug(1, "action=SAVE_ALL\n");
-+ try { save_all(szImageDir, &options); }
-+ catch (CExceptions *excep)
-+ {
-+ showDebug(1, "caught exception: %d\n", excep->GetExcept());
-+
-+ if (!options.bBatchMode && !excep->getCaught())
-+ g_interface -> Error(excep, szImageFile);
-+
-+ showDebug(1, "\nFINAL ERROR\n\n");
-+
-+ nRes = -1;
-+ }
-+ break;
-+
-+ case OPERATION_REST_ALL:
-+ showDebug(1, "action=REST_ALL\n");
-+ try { rest_all(szImageDir, &options); }
-+ catch (CExceptions *excep)
-+ {
-+ showDebug(1, "caught exception: %d\n", excep->GetExcept());
-+
-+ if (!options.bBatchMode && !excep->getCaught())
-+ g_interface -> Error(excep, szImageFile);
-+
-+ showDebug(1, "\nFINAL ERROR\n\n");
-+
-+ nRes = -1;
-+ }
-+ break;
-
- default: // exit
- if (options.bSync)
---- partimage-0.6.4/src/client/misc.cpp.pix 2005-01-24 13:46:19.382388046 +0100
-+++ partimage-0.6.4/src/client/misc.cpp 2005-01-24 14:39:16.454532386 +0100
-@@ -2274,3 +2274,231 @@
- strcpy(szFileSystem, "befs");
- RETURN_int(FS_BEFS);
- }
-+
-+static int str_begins_with(const char *s, const char *prefix)
-+{
-+ return strncmp(s, prefix, strlen(prefix)) == 0;
-+}
-+
-+static char *sfdisk_line_to_disk_device(const char *line)
-+{
-+ static const char *new_disk_prefix = "# partition table of ";
-+ if (str_begins_with(line, new_disk_prefix)) {
-+ const char *device = line + strlen(new_disk_prefix);
-+ return strndup(device, strlen(device) - 1);
-+ } else {
-+ return NULL;
-+ }
-+}
-+
-+static char *sfdisk_line_to_partition_device(const char *line)
-+{
-+ if (char *p = strchr(line, ':')) {
-+ while (p[-1] == ' ' && p > line) p--;
-+ return strndup(line, p - line);
-+ } else {
-+ return NULL;
-+ }
-+}
-+
-+static char *full_device_to_device(char *device)
-+{
-+ char *p;
-+ if (str_begins_with(device, "/dev/")) {
-+ p = device + strlen("/dev/");
-+ } else {
-+ showDebug(2, "full_device_to_device: weird device %s\n", device);
-+ p = strrchr(device, '/');
-+ p = p ? p + 1 : device;
-+ }
-+ p = strdup(p);
-+ char *q;
-+ while (q = strchr(p, '/')) *q = '_';
-+
-+ return p;
-+}
-+
-+static void my_pclose(FILE *f)
-+{
-+ int status = pclose(f);
-+ if (status != 0) showDebug(1, "ERROR: command failed (%d)\n", status);
-+}
-+
-+static void write_unsigned(CImage *image, unsigned int nb)
-+{
-+ image->write((char *) &nb, sizeof(nb), true);
-+}
-+static void write_string(CImage *image, const char *s)
-+{
-+ unsigned int len = strlen(s);
-+ write_unsigned(image, len);
-+ image->write((void *) s, len, true);
-+}
-+static unsigned int read_unsigned(CImage *image)
-+{
-+ unsigned int nb;
-+ image->read((char *) &nb, sizeof(nb), true);
-+ return nb;
-+}
-+static char *read_string(CImage *image)
-+{
-+ unsigned int len = read_unsigned(image);
-+ if (len == 0) return NULL;
-+ char *s = (char *) malloc(len + 1);
-+ image->read(s, len, true);
-+ s[len] = '\0';
-+ return s;
-+}
-+
-+void save_all(char *szImageDir, COptions *options)
-+{
-+ BEGIN;
-+
-+ char *sfdisk[1024];
-+ unsigned int sfdisk_nb_lines = 0;
-+ {
-+ FILE *f = popen("LC_ALL=C sfdisk -d", "r");
-+ char tmp[1024];
-+
-+ while (1) {
-+ if (!fgets(tmp, sizeof(tmp), f)) break;
-+ if (sfdisk_nb_lines >= sizeof(sfdisk)) break;
-+ sfdisk[sfdisk_nb_lines++] = strdup(tmp);
-+ }
-+ my_pclose(f);
-+ }
-+
-+ char aux[MAXPATHLEN];
-+ CImage image(options);
-+ SNPRINTF(aux, "%s/sfdisk.lst", szImageDir);
-+ image.set_szImageFilename(aux);
-+ image.openWriting();
-+
-+ write_unsigned(&image, sfdisk_nb_lines);
-+
-+ for (unsigned int i = 0; i < sfdisk_nb_lines; i++)
-+ write_string(&image, sfdisk[i]);
-+
-+ for (unsigned int i = 0; i < sfdisk_nb_lines; i++)
-+ if (char *device = sfdisk_line_to_disk_device(sfdisk[i])) {
-+ showDebug(2, "opening %s to get its MBR\n", device);
-+ FILE *f = fopen(device, "r");
-+ char mbr[512];
-+ if (f && fread(mbr, 512, 1, f) == 1) {
-+ write_string(&image, device);
-+ image.write(mbr, sizeof(mbr), true);
-+ } else
-+ showDebug(1, "ERROR: can't read MBR of device %s\n", device);
-+ if (f) fclose(f);
-+ }
-+ write_unsigned(&image, 0);
-+
-+ closeFilesSave(false, *options, &image, NULL);
-+
-+ COptions save_part_options(*options);
-+ save_part_options.qwSplitSize = 0;
-+ save_part_options.bAskDesc = false;
-+ save_part_options.bBackupMBR = false;
-+ save_part_options.bCheckBeforeSaving = false; // checking always find an error, so...
-+
-+ for (unsigned int i = 0; i < sfdisk_nb_lines; i++) {
-+ if (!strstr(sfdisk[i], "Id=83")) continue;
-+
-+ char *device = sfdisk_line_to_partition_device(sfdisk[i]);
-+ if (!device) continue;
-+
-+ char *short_device = full_device_to_device(device);
-+ SNPRINTF(aux, "%s/part_%s", szImageDir, short_device);
-+ free(short_device);
-+ showDebug(1, "savePartition(%s, %s, ...)\n", device, aux);
-+ savePartition(device, aux, &save_part_options);
-+
-+ free(device);
-+ }
-+
-+ RETURN;
-+}
-+
-+void rest_all(char *szImageDir, COptions *options)
-+{
-+ BEGIN;
-+
-+ char **sfdisk;
-+ unsigned int sfdisk_nb_lines = 0;
-+
-+ char aux[MAXPATHLEN];
-+ CImage image(options);
-+
-+ {
-+ SNPRINTF(aux, "%s/sfdisk.lst", szImageDir);
-+ image.set_szImageFilename(aux);
-+ image.openReading();
-+
-+ sfdisk_nb_lines = read_unsigned(&image);
-+ showDebug(2, "rest_all got sfdisk_nb_lines = %d\n", sfdisk_nb_lines);
-+ sfdisk = (char **) alloca(sizeof(char *) * sfdisk_nb_lines);
-+ for (unsigned int i = 0; i < sfdisk_nb_lines; i++) {
-+ sfdisk[i] = read_string(&image);
-+ showDebug(2, "rest_all got line = %s\n", sfdisk[i]);
-+ }
-+ while (1) {
-+ char *device = read_string(&image);
-+ if (!device) break;
-+
-+ char mbr[512];
-+ image.read(mbr, 512, true);
-+
-+ FILE *f = fopen(device, "r+b");
-+ if (f && fwrite(mbr, 512, 1, f) == 1)
-+ showDebug(1, "MBR of %s restored\n", device);
-+ else
-+ showDebug(1, "ERROR: restoring MBR of device %s failed: %s\n", device, strerror(errno));
-+ if (f) fclose(f);
-+ }
-+
-+ // since sfdisk.lst is not really nice to the library, we can't close the thread from procReadBufferFromImage which has already exited
-+ image.closeReading(false);
-+ }
-+
-+ {
-+ FILE *f = NULL;
-+ for (unsigned int i = 0; i < sfdisk_nb_lines; i++) {
-+ if (char *device = sfdisk_line_to_disk_device(sfdisk[i])) {
-+ if (f) my_pclose(f);
-+ SNPRINTF(aux, "sfdisk %s >>" PARTIMAGE_LOG " 2>>" PARTIMAGE_LOG, device);
-+ showDebug(1, "calling %s\n", aux);
-+ f = popen(aux, "w");
-+ free(device);
-+ }
-+ if (f)
-+ fputs(sfdisk[i], f);
-+ else
-+ showDebug(1, "dropping line: %s", sfdisk[i]);
-+ }
-+ if (f) my_pclose(f);
-+ }
-+
-+ for (unsigned int i = 0; i < sfdisk_nb_lines; i++) {
-+
-+ char *device = sfdisk_line_to_partition_device(sfdisk[i]);
-+ if (!device) continue;
-+
-+ if (strstr(sfdisk[i], "Id=83")) {
-+ char *short_device = full_device_to_device(device);
-+ SNPRINTF(aux, "%s/part_%s", szImageDir, short_device);
-+ free(short_device);
-+ if (image.getImageDisk()->doesFileExists(aux)) {
-+ showDebug(1, "restorePartition(%s, %s, ...)\n", device, aux);
-+ restorePartition(device, aux, options);
-+ } else
-+ showDebug(1, "no such %s image disk, not restoring it\n", aux);
-+ } else if (strstr(sfdisk[i], "Id=82")) {
-+ SNPRINTF(aux, "mkswap %s >>" PARTIMAGE_LOG, device);
-+ showDebug(2, "%s\n", aux);
-+ system(aux);
-+ }
-+ free(device);
-+ }
-+
-+ RETURN;
-+}
---- partimage-0.6.4/src/client/misc.h.pix 2004-02-04 01:57:36.000000000 +0100
-+++ partimage-0.6.4/src/client/misc.h 2005-01-24 13:46:19.390390663 +0100
-@@ -47,6 +47,8 @@
- void savePartition(char *szDevice, char *szImageName, /*char *szFilesystem, */COptions *options);
- void restorePartition(char *szDevice, char *szImageName, COptions *options);
- void restoreMbr(char *szImageFile, COptions *options);
-+void save_all(char *szImageDir, COptions *options);
-+void rest_all(char *szImageDir, COptions *options);
-
- // =======================================================
- void closeFilesSave(bool on_error, COptions options, CImage *image, FILE *fDeviceFile);
---- partimage-0.6.4/src/client/partimage.h.pix 2004-02-04 01:57:36.000000000 +0100
-+++ partimage-0.6.4/src/client/partimage.h 2005-01-24 13:46:19.390390663 +0100
-@@ -94,6 +94,8 @@
- #define OPERATION_RESTMBR 3
- #define OPERATION_IMGINFO 4
- #define OPERATION_EXIT 5
-+#define OPERATION_SAVE_ALL 6
-+#define OPERATION_REST_ALL 7
-
- // returned by CExceptionsGUI::windowError
- // user canceled the job
---- partimage-0.6.4/src/shared/image_disk.cpp.pix 2004-02-04 01:57:36.000000000 +0100
-+++ partimage-0.6.4/src/shared/image_disk.cpp 2005-01-24 13:46:19.391390990 +0100
-@@ -526,6 +526,7 @@
-
- SNPRINTF(szShortName, "pi%.8lx", (DWORD)generateIdentificator());
- extractFilepathFromFullPath(m_szImageFilename, szPathDir); // filepath without filename
-+ if (access(szPathDir, R_OK) == -1) mkdir(szPathDir, 0755);
- snprintf(m_szSpaceFilename, MAXPATHLEN, "%s/%8s.tmp", szPathDir, szShortName);
- showDebug(1, "TEMP=[%s]\n", m_szSpaceFilename);
-
+++ /dev/null
---- partimage-0.6.4/src/client/imagefile.cpp.varargs 2004-02-03 19:57:36.000000000 -0500
-+++ partimage-0.6.4/src/client/imagefile.cpp 2005-08-23 08:17:08.000000000 -0400
-@@ -470,7 +470,7 @@ void CImage::splitChangeImageFileWrite()
- if (!fork()) // we're the child // no error check maid
- execl("/tmp/partimage-shell",
- get_szImageFilename(), get_szPath(),
-- get_szOriginalFilename(), get_dwVolumeNumber());
-+ get_szOriginalFilename(), get_dwVolumeNumber(), (char *)NULL);
- }
-
- // wait for a keyboard keypress if need
+++ /dev/null
---- 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
+++ /dev/null
-diff -r 0ffb61b8c31d -r 88ac9824fc14 src/client/fs/fs_afs.cpp
---- a/src/client/fs/fs_afs.cpp Tue Sep 04 21:36:14 2007 +0200
-+++ b/src/client/fs/fs_afs.cpp Tue Sep 04 21:43:30 2007 +0200
-@@ -285,10 +285,10 @@ void CAfsPart::printfInformations()
- getStdInfos(szText, sizeof(szText), false);
-
- SNPRINTF(szFullText, i18n("%s" // standard infos
-- "Allocation groups count:......%lu\n"
-- "Byte order:...................%lu\n"
-- "Blocks per group:.............%lu\n"
-- "Boot loader size:.............%lu blocks\n"),
-+ "Allocation groups count:......%u\n"
-+ "Byte order:...................%u\n"
-+ "Blocks per group:.............%u\n"
-+ "Boot loader size:.............%u blocks\n"),
- szText, m_info.dwAllocGroupCount, m_info.dwByteOrder,
- m_info.dwBlockPerGroup, m_info.dwBootLoaderSize);
-
-diff -r 0ffb61b8c31d -r 88ac9824fc14 src/client/fs/fs_base.cpp
---- a/src/client/fs/fs_base.cpp Tue Sep 04 21:36:14 2007 +0200
-+++ b/src/client/fs/fs_base.cpp Tue Sep 04 21:43:30 2007 +0200
-@@ -14,6 +14,9 @@
- * (at your option) any later version. *
- * *
- ***************************************************************************/
-+
-+#define __STDC_FORMAT_MACROS
-+#include <inttypes.h>
-
- #include "fs_base.h"
- #include "partimage.h"
-@@ -727,10 +730,10 @@ int CFSBase::getStdInfos(char *szDest, i
-
- if (bShowBlocksInfo)
- {
-- SNPRINTF(szBlocksInfo, i18n("Block size....................%llu bytes\n"
-- "Total blocks count............%llu\n"
-- "Used blocks count.............%llu\n"
-- "Free blocks count.............%llu\n"),
-+ SNPRINTF(szBlocksInfo, i18n("Block size....................%"PRIu64" bytes\n"
-+ "Total blocks count............%"PRIu64"\n"
-+ "Used blocks count.............%"PRIu64"\n"
-+ "Free blocks count.............%"PRIu64"\n"),
- m_header.qwBlockSize,
- m_header.qwBlocksCount,
- m_header.qwUsedBlocks,
-@@ -742,7 +745,7 @@ int CFSBase::getStdInfos(char *szDest, i
- }
-
- snprintf(szDest, nMaxLen, i18n("%s" // Blocks infos
-- "Space usage:..................%llu %%\n"
-+ "Space usage:..................%"PRIu64" %%\n"
- "Used space....................%s\n"
- "Free space....................%s\n"
- "Bitmap size...................%s\n"
-diff -r 0ffb61b8c31d -r 88ac9824fc14 src/client/fs/fs_ext2.cpp
---- a/src/client/fs/fs_ext2.cpp Tue Sep 04 21:36:14 2007 +0200
-+++ b/src/client/fs/fs_ext2.cpp Tue Sep 04 21:43:30 2007 +0200
-@@ -103,12 +103,12 @@ void CExt2Part::printfInformations()
- getStdInfos(szText, sizeof(szText), false);
-
- SNPRINTF(szFullText, i18n("%s" // standard infos
-- "Number of groups..............%lu\n"
-- "First block...................%lu\n"
-+ "Number of groups..............%u\n"
-+ "First block...................%u\n"
- "Ext3fs journalization.........%s\n"
- "Sparse super block............%s\n"
- "Large files support...........%s\n"
-- "File system revision..........%lu\n"),
-+ "File system revision..........%u\n"),
- szText, m_info.dwGroupsCount, m_info.dwFirstBlock,
- (m_info.dwFeatureCompat & EXT3_FEATURE_COMPAT_HAS_JOURNAL) ? i18n("yes") : i18n("no"),
- (m_info.dwFeatureRoCompat & EXT2_FEATURE_RO_COMPAT_SPARSE_SUPER) ? i18n("yes") : i18n("no"),
-diff -r 0ffb61b8c31d -r 88ac9824fc14 src/client/fs/fs_fat.cpp
---- a/src/client/fs/fs_fat.cpp Tue Sep 04 21:36:14 2007 +0200
-+++ b/src/client/fs/fs_fat.cpp Tue Sep 04 21:43:30 2007 +0200
-@@ -124,14 +124,14 @@ void CFatPart::printfInformations()
- "Sector Size...................%u\n"
- "Sectors per cluster...........%u\n"
- "Reserved Sectors count........%u\n"
-- "Root directory sectors........%lu\n"
-+ "Root directory sectors........%u\n"
- "FAT tables count..............%u\n"
-- "Total Sectors Count...........%lu\n"
-- "Sectors per FAT...............%lu\n"
-- "Clusters count:...............%lu\n"
-- "Used clusters.................%lu\n"
-- "Free clusters.................%lu\n"
-- "Damaged clusters..............%lu\n"),
-+ "Total Sectors Count...........%u\n"
-+ "Sectors per FAT...............%u\n"
-+ "Clusters count:...............%u\n"
-+ "Used clusters.................%u\n"
-+ "Free clusters.................%u\n"
-+ "Damaged clusters..............%u\n"),
- szText, m_info.wBytesPerSector, m_info.cSectorsPerCluster,
- m_info.wReservedSectorsCount, m_info.dwRootDirSectors,
- m_info.cNumberOfFATs,m_info.dwTotalSectorsCount,
-diff -r 0ffb61b8c31d -r 88ac9824fc14 src/client/fs/fs_hfs.cpp
---- a/src/client/fs/fs_hfs.cpp Tue Sep 04 21:36:14 2007 +0200
-+++ b/src/client/fs/fs_hfs.cpp Tue Sep 04 21:43:30 2007 +0200
-@@ -22,6 +22,8 @@
- #include "gui_text.h"
-
- #include <stdio.h>
-+#define __STDC_FORMAT_MACROS
-+#include <inttypes.h>
-
- // =======================================================
- CHfsPart::CHfsPart(char *szDevice, FILE *fDeviceFile, QWORD qwPartSize): CFSBase(szDevice, fDeviceFile, qwPartSize)
-@@ -140,10 +142,10 @@ void CHfsPart::printfInformations()
- getStdInfos(szText, sizeof(szText), true);
-
- SNPRINTF(szFullText, i18n("%s" // standard infos
-- "Allocation Group count:.......%llu\n"
-- "Blocks per Allocation Group...%lu\n"
-+ "Allocation Group count:.......%"PRIu64"\n"
-+ "Blocks per Allocation Group...%u\n"
- "Allocation Group size:........%s\n"
-- "First allocation block:.......%llu\n"),
-+ "First allocation block:.......%"PRIu64"\n"),
- szText, m_info.qwAllocCount, m_info.dwBlocksPerAlloc,
- formatSize(m_info.dwAllocSize,szTemp1), m_info.qwFirstAllocBlock);
-
-diff -r 0ffb61b8c31d -r 88ac9824fc14 src/client/fs/fs_ntfs.cpp
---- a/src/client/fs/fs_ntfs.cpp Tue Sep 04 21:36:14 2007 +0200
-+++ b/src/client/fs/fs_ntfs.cpp Tue Sep 04 21:43:30 2007 +0200
-@@ -18,6 +18,9 @@
- #include "partimage.h"
- #include "imagefile.h"
- #include "fs_ntfs.h"
-+
-+#define __STDC_FORMAT_MACROS
-+#include <inttypes.h>
-
- // =======================================================
- CNtfsPart::CNtfsPart(char *szDevice, FILE *fDeviceFile, QWORD qwPartSize): CFSBase(szDevice, fDeviceFile, qwPartSize)
-@@ -308,8 +311,8 @@ void CNtfsPart::printfInformations()
- SNPRINTF(szFullText, i18n("%s" // standard infos
- "Bytes per sector..............%u\n"
- "Sectors per cluster...........%u\n"
-- "File record size..............%lu\n"
-- "LCN of MFT Data attrib........%llu\n"),
-+ "File record size..............%u\n"
-+ "LCN of MFT Data attrib........%"PRIu64"\n"),
- szText, m_info.nBytesPerSector, m_info.cSectorsPerCluster,
- m_info.dwFileRecordSize, m_info.qwLCNOfMftDataAttrib);
-
-@@ -726,7 +729,7 @@ void CNtfsRunList::show()
- QWORD i;
-
- for (i=0L; i < m_qwClustersCount; i++)
-- fprintf(stderr, "cluster[%llu] = %llu\n", i, m_qwOffset[i]);
-+ fprintf(stderr, "cluster[%llu] = %"PRIu64"\n", i, m_qwOffset[i]);
-
- }
-
-diff -r 0ffb61b8c31d -r 88ac9824fc14 src/client/fs/fs_ufs.cpp
---- a/src/client/fs/fs_ufs.cpp Tue Sep 04 21:36:14 2007 +0200
-+++ b/src/client/fs/fs_ufs.cpp Tue Sep 04 21:43:30 2007 +0200
-@@ -25,6 +25,9 @@
- #include <stdio.h>
- #include <string.h>
- #include <stdlib.h>
-+
-+#define __STDC_FORMAT_MACROS
-+#include <inttypes.h>
-
- #include "fs_ufs.h"
- #include "partimage.h"
-@@ -210,11 +213,11 @@ void CUfsPart::printfInformations()
- getStdInfos(szText, sizeof(szText), true);
-
- SNPRINTF(szFullText, i18n("%s" // standard infos
-- "Cylinder groups count:........%lu\n"
-+ "Cylinder groups count:........%u\n"
- "Cylinder group size:..........%s\n"
-- "Basic blocks per CG:..........%lu\n"
-- "Basic block size:.............%lu\n"
-- "Data frags count:.............%llu\n"),
-+ "Basic blocks per CG:..........%u\n"
-+ "Basic block size:.............%u\n"
-+ "Data frags count:.............%"PRIu64"\n"),
- szText, m_info.dwCylinderGroupsCount,
- formatSize(m_info.dwCylinderGroupSize*m_info.dwBasicBlockSize,szTemp1),
- m_info.dwCylinderGroupSize, m_info.dwBasicBlockSize, m_info.qwDataFrags);
-diff -r 0ffb61b8c31d -r 88ac9824fc14 src/client/fs/fs_xfs.cpp
---- a/src/client/fs/fs_xfs.cpp Tue Sep 04 21:36:14 2007 +0200
-+++ b/src/client/fs/fs_xfs.cpp Tue Sep 04 21:43:30 2007 +0200
-@@ -208,8 +208,8 @@ void CXfsPart::printfInformations()
- getStdInfos(szText, sizeof(szText), true);
-
- SNPRINTF(szFullText, i18n("%s" // standard infos
-- "Allocation Group count:.......%lu\n"
-- "Blocks per Allocation Group...%lu\n"
-+ "Allocation Group count:.......%u\n"
-+ "Blocks per Allocation Group...%u\n"
- "Allocation Group size:........%s\n"),
- szText, m_info.dwAgCount, m_info.dwAgBlocksCount,
- formatSize(m_info.dwAgBlocksCount*m_header.qwBlockSize,szTemp1));
-@@ -300,7 +300,7 @@ char* blocknum(char *szBuffer, DWORD dwB
- char* blocknum(char *szBuffer, DWORD dwBn)
- {
- if (dwBn != NULLAGBLOCK)
-- sprintf(szBuffer, "%lu", dwBn);
-+ sprintf(szBuffer, "%u", dwBn);
- else
- sprintf(szBuffer, "NULLAGBLOCK");
- return szBuffer;
-diff -r 0ffb61b8c31d -r 88ac9824fc14 src/client/gui_text.cpp
---- a/src/client/gui_text.cpp Tue Sep 04 21:36:14 2007 +0200
-+++ b/src/client/gui_text.cpp Tue Sep 04 21:43:30 2007 +0200
-@@ -29,6 +29,8 @@
- #include <stdlib.h>
- #include <errno.h>
-
-+#define __STDC_FORMAT_MACROS
-+#include <inttypes.h>
- // =======================================================
- void CRestoreMbrWindow::addHardDisk(char *szText, DWORD dwNumber)
- {
-@@ -81,12 +83,12 @@ int CRestoreMbrWindow::create()
- }
-
- // =======================================================
--void CRestoreMbrWindow::getValues(DWORD *dwCurrentMbrNb, DWORD *dwOriginalMbrNb, int *nRestoreMode)
--{
-- BEGIN;
--
-- *dwCurrentMbrNb = (DWORD) newtListboxGetCurrent(m_list1);
-- *dwOriginalMbrNb = (DWORD) newtListboxGetCurrent(m_list2);
-+void CRestoreMbrWindow::getValues(uintptr_t *dwCurrentMbrNb, uintptr_t *dwOriginalMbrNb, int *nRestoreMode)
-+{
-+ BEGIN;
-+
-+ *dwCurrentMbrNb = (uintptr_t) newtListboxGetCurrent(m_list1);
-+ *dwOriginalMbrNb = (uintptr_t) newtListboxGetCurrent(m_list2);
-
- if (newtRadioGetCurrent(m_radioFull) == m_radioFull)
- *nRestoreMode = MBR_RESTORE_WHOLE;
-@@ -339,7 +341,7 @@ int CSaveOptWindow::create(char *szImage
- m_labelSplit = newtLabel(1, 12, i18n("Image split mode"));
- m_radioSplitAuto = newtRadiobutton(1, 13, i18n("Automatic split (when no space left)"), !options.qwSplitSize, NULL);
- m_radioSplitSize = newtRadiobutton(1, 14, i18n("Into files whose size is:............"), !!options.qwSplitSize, m_radioSplitAuto);
-- SNPRINTF(szTemp, "%llu", (!!options.qwSplitSize) ? (options.qwSplitSize/1024/1024) : 2048);
-+ SNPRINTF(szTemp, "%"PRIu64"", (!!options.qwSplitSize) ? (options.qwSplitSize/1024/1024) : 2048);
- m_editSplitSize = newtEntry(43, 14, szTemp, 8, NULL, 0);
- m_labelSplitSizeKB = newtLabel(52, 14, i18n("MiB"));
- m_checkSplitWait = newtCheckbox(1, 15, i18n("Wait after each volume change"), (!!options.bSplitWait ? 'X' : ' '), " X", NULL);
-@@ -460,7 +462,7 @@ int CSavingWindow::create(const char *sz
- SNPRINTF(szTemp, i18n("Partition to save:...........%s"), szDevice);
- m_labelPartition = newtLabel(1, 0, szTemp);
-
-- SNPRINTF(szTemp, i18n("Size of the Partition:.......%s = %llu bytes"), formatSize(qwPartSize, szTemp2), qwPartSize);
-+ SNPRINTF(szTemp, i18n("Size of the Partition:.......%s = %"PRIu64" bytes"), formatSize(qwPartSize, szTemp2), qwPartSize);
- m_labelPartitionSize = newtLabel(1, 1, szTemp);
-
- SNPRINTF(szTemp, i18n("Image file to create.........%s"), szImageFile);
-@@ -608,7 +610,7 @@ void CSavingWindow::showImageFileInfo(ch
- newtLabelSetText(m_labelImageFileSize, szTemp);
- }
-
-- SNPRINTF (szTemp, i18n("Available space for image:...%s = %llu bytes"), formatSize(qwFreeSpace, szTemp2), qwFreeSpace);
-+ SNPRINTF (szTemp, i18n("Available space for image:...%s = %"PRIu64" bytes"), formatSize(qwFreeSpace, szTemp2), qwFreeSpace);
- newtLabelSetText(m_labelFreeSpace, szTemp);
-
- //option -B gui=no
-@@ -696,8 +698,27 @@ int CRestoreOptWindow::getValues(COption
- RETURN_int(0);
- }
-
--// =======================================================
--int CRestoringWindow::create(char *szDevice, char *szImageFile, QWORD qwCurPartSize, DWORD dwCompressionMode, char *szOriginalDevice, char *szFileSystem, tm dateCreate, QWORD qwOrigPartSize, COptions * options)
-+static char *asctime_portable (const struct portable_tm *__tp)
-+{
-+struct tm tms;
-+
-+ tms.tm_sec=__tp->tm_sec;
-+ tms.tm_min=__tp->tm_min;
-+ tms.tm_hour=__tp->tm_hour;
-+ tms.tm_mday=__tp->tm_mday;
-+ tms.tm_mon=__tp->tm_mon;
-+ tms.tm_year=__tp->tm_year;
-+ tms.tm_wday=__tp->tm_wday;
-+ tms.tm_yday=__tp->tm_yday;
-+ tms.tm_isdst=__tp->tm_isdst;
-+ tms.tm_gmtoff=__tp->tm_gmtoff;
-+ tms.tm_zone="UTC";
-+
-+ return asctime (&tms);
-+}
-+
-+// =======================================================
-+int CRestoringWindow::create(char *szDevice, char *szImageFile, QWORD qwCurPartSize, DWORD dwCompressionMode, char *szOriginalDevice, char *szFileSystem, struct portable_tm dateCreate, QWORD qwOrigPartSize, COptions * options)
- {
- BEGIN;
-
-@@ -713,7 +734,7 @@ int CRestoringWindow::create(char *szDev
- SNPRINTF(szTemp, i18n("Partition to restore:.............%s"), szDevice);
- m_labelPartition = newtLabel(1, 0, szTemp);
-
-- SNPRINTF(szTemp, i18n("Size of partition to restore:.....%s = %llu bytes"), formatSize(qwCurPartSize, szTemp2), qwCurPartSize);
-+ SNPRINTF(szTemp, i18n("Size of partition to restore:.....%s = %"PRIu64" bytes"), formatSize(qwCurPartSize, szTemp2), qwCurPartSize);
- m_labelPartitionSize = newtLabel(1, 1, szTemp);
-
- SNPRINTF(szTemp, i18n("Image file to use.................%s"), szImageFile);
-@@ -727,10 +748,10 @@ int CRestoringWindow::create(char *szDev
- SNPRINTF(szTemp, i18n("Partition was on device:..........%s\n"), szOriginalDevice);
- m_labelOldDevice = newtLabel(1, 5, szTemp);
-
-- SNPRINTF(szTemp, i18n("Image created on:.................%s\n"), asctime(&dateCreate));
-+ SNPRINTF(szTemp, i18n("Image created on:.................%s\n"), asctime_portable(&dateCreate));
- m_labelDate = newtLabel(1, 6, szTemp);
-
-- SNPRINTF(szTemp, i18n("Size of the original partition:...%s = %llu bytes"), formatSize(qwOrigPartSize, szTemp2), qwOrigPartSize);
-+ SNPRINTF(szTemp, i18n("Size of the original partition:...%s = %"PRIu64" bytes"), formatSize(qwOrigPartSize, szTemp2), qwOrigPartSize);
- m_labelOriginalPartitionSize = newtLabel(1, 7, szTemp);
-
- // stats
-diff -r 0ffb61b8c31d -r 88ac9824fc14 src/client/gui_text.h
---- a/src/client/gui_text.h Tue Sep 04 21:36:14 2007 +0200
-+++ b/src/client/gui_text.h Tue Sep 04 21:43:30 2007 +0200
-@@ -56,7 +56,7 @@ class CRestoreMbrWindow: public COptions
- void addMbr(char *szText, DWORD dwNumber);
- //int runForm();
- //void destroyForm();
-- void getValues(DWORD *dwCurrentMbrNb, DWORD *dwOriginalMbrNb, int *nRestoreMode);
-+ void getValues(uintptr_t *dwCurrentMbrNb, uintptr_t *dwOriginalMbrNb, int *nRestoreMode);
-
- private:
- //newtComponent m_formMain;
-@@ -124,7 +124,7 @@ class CRestoringWindow
- class CRestoringWindow
- {
- public:
-- int create(char *szDevice, char *szImageFile, QWORD qwCurPartSize, DWORD dwCompressionMode, char *szOriginalDevice, char *szFileSystem, tm dateCreate, QWORD qwOrigPartSize, COptions * options);
-+ int create(char *szDevice, char *szImageFile, QWORD qwCurPartSize, DWORD dwCompressionMode, char *szOriginalDevice, char *szFileSystem, struct portable_tm dateCreate, QWORD qwOrigPartSize, COptions * options);
- int runForm();
- void destroyForm();
- void showImageFileInfo(char *szImageFile, int nCompressionMode, char *szFullyBatchMode);
-diff -r 0ffb61b8c31d -r 88ac9824fc14 src/client/imagefile.cpp
---- a/src/client/imagefile.cpp Tue Sep 04 21:36:14 2007 +0200
-+++ b/src/client/imagefile.cpp Tue Sep 04 21:43:30 2007 +0200
-@@ -488,7 +488,7 @@ void CImage::splitChangeImageFileWrite()
- }
-
- set_dwVolumeNumber(get_dwVolumeNumber()+1); // increase the volume number
-- SNPRINTF(aux, "%s/%s.%.3ld", get_szPath(), get_szOriginalFilename(), get_dwVolumeNumber());
-+ SNPRINTF(aux, "%s/%s.%.3d", get_szPath(), get_szOriginalFilename(), get_dwVolumeNumber());
- //*(aux+MAXPATHLEN-1) = '\0';
-
- set_szImageFilename(aux);
-@@ -514,7 +514,7 @@ void CImage::splitChangeImageFileRead()
-
- // increase volume number
- set_dwVolumeNumber(get_dwVolumeNumber()+1);
-- SNPRINTF(aux, "%s/%s.%.3ld", get_szPath(), get_szOriginalFilename(), get_dwVolumeNumber());
-+ SNPRINTF(aux, "%s/%s.%.3d", get_szPath(), get_szOriginalFilename(), get_dwVolumeNumber());
- //*(aux+MAXPATHLEN-1) = '\0';
- set_szImageFilename(aux);
-
-@@ -700,7 +700,7 @@ int CImage::openWritingFdDisk()
- set_szPath(aux2);
- extractFilenameFromFullPath(szAux, aux2); // filename without path
- set_szOriginalFilename(aux2);
-- SNPRINTF(szAux, "%s/%s.%.3ld", get_szPath(), get_szOriginalFilename(), get_dwVolumeNumber());
-+ SNPRINTF(szAux, "%s/%s.%.3d", get_szPath(), get_szOriginalFilename(), get_dwVolumeNumber());
- set_szImageFilename(szAux);
- nRes = openWritingFdDisk();
- RETURN_int(nRes);
-@@ -728,7 +728,7 @@ int CImage::openWritingFdDisk()
- case ERR_RETRY:
- strcpy(szAux, excep->getNewString()); // endding '/' were removed
- set_szPath(szAux);
-- SNPRINTF(aux2, "%s/%s.%.3ld", szAux, get_szOriginalFilename(),
-+ SNPRINTF(aux2, "%s/%s.%.3d", szAux, get_szOriginalFilename(),
- get_dwVolumeNumber());
- set_szImageFilename(aux2);
-
-@@ -1068,7 +1068,7 @@ void CImage::openReading(CVolumeHeader *
- set_szPath(aux2);
- extractFilenameFromFullPath(szAux, aux2);
- set_szOriginalFilename(aux2);
-- SNPRINTF(szAux, "%s/%s.%.3ld", get_szPath(),
-+ SNPRINTF(szAux, "%s/%s.%.3d", get_szPath(),
- get_szOriginalFilename(), get_dwVolumeNumber());
- set_szImageFilename(szAux);
- umountImageLocation();
-@@ -1132,7 +1132,7 @@ void CImage::openReading(CVolumeHeader *
-
- if (strcmp(headVolume.szMagicString, MAGIC_BEGIN_VOLUME) != 0)
- {
-- SNPRINTF(szAux, "%s/%s.%.3ld", get_szPath(), get_szOriginalFilename(), get_dwVolumeNumber());
-+ SNPRINTF(szAux, "%s/%s.%.3d", get_szPath(), get_szOriginalFilename(), get_dwVolumeNumber());
- THROW(ERR_NOTAPARTIMAGEFILE, szAux);
- }
-
-diff -r 0ffb61b8c31d -r 88ac9824fc14 src/client/imginfo.cpp
---- a/src/client/imginfo.cpp Tue Sep 04 21:36:14 2007 +0200
-+++ b/src/client/imginfo.cpp Tue Sep 04 21:43:30 2007 +0200
-@@ -26,6 +26,29 @@
- #include "imagefile.h"
- #include "interface_newt.h"
-
-+#define __STDC_FORMAT_MACROS
-+#include <inttypes.h>
-+
-+static char *asctime_portable (const struct portable_tm *__tp)
-+{
-+struct tm tms;
-+
-+ tms.tm_sec=__tp->tm_sec;
-+ tms.tm_min=__tp->tm_min;
-+ tms.tm_hour=__tp->tm_hour;
-+ tms.tm_mday=__tp->tm_mday;
-+ tms.tm_mon=__tp->tm_mon;
-+ tms.tm_year=__tp->tm_year;
-+ tms.tm_wday=__tp->tm_wday;
-+ tms.tm_yday=__tp->tm_yday;
-+ tms.tm_isdst=__tp->tm_isdst;
-+ tms.tm_gmtoff=__tp->tm_gmtoff;
-+ tms.tm_zone="UTC";
-+
-+ return asctime (&tms);
-+}
-+
-+
- // =======================================================
- void imageInfoShowRegular(char *szText, int nMaxTextLen, CMainHeader *head, char *szImagefile, DWORD dwCompression)
- {
-@@ -65,20 +88,20 @@ void imageInfoShowRegular(char *szText,
- "Description:...........%s\n"
- "Original device:.......%s\n"
- "Original filepath:.... %s\n"
-- "Flags:.................%ld: %s\n"
-+ "Flags:.................%d: %s\n"
- "Creation date:.........%s"
- "Partition size:........%s\n"
- "Hostname:..............%s\n"
- "Compatible Version:....%s\n"
-- "Encryption algorithm:..%ld -> %s\n"
-- "MBR saved count:.......%lu\n\n"
-+ "Encryption algorithm:..%d -> %s\n"
-+ "MBR saved count:.......%u\n\n"
- "System of the backup:\n"
- "- machine:.............%s\n"
- "- operating system:....%s\n"
- "- release:.............%s\n"
- "\n\n"),
- head->szFileSystem, szDescription, head->szOriginalDevice, head->szFirstImageFilepath,
-- head->dwMainFlags, szFlags, asctime(&head->dateCreate), formatSize(head->qwPartSize, cTemp), head->szHostname,
-+ head->dwMainFlags, szFlags, asctime_portable(&head->dateCreate), formatSize(head->qwPartSize, cTemp), head->szHostname,
- head->szVersion, head->dwEncryptAlgo, szEncryption, head->dwMbrCount, head->szUnameMachine,
- head->szUnameSysname, head->szUnameRelease);
- }
-@@ -88,7 +111,7 @@ void imageInfoShowMBR(char *szText, int
- {
- snprintf(szText, nMaxTextLen, i18n("-------------------- MBR %.3d -------------------\n"
- "Device:................%s\n"
-- "Device blocks count:...%llu\n"
-+ "Device blocks count:...%"PRIu64"\n"
- "Device model:..........%s\n\n"),
- i, mbr->szDevice, mbr->qwBlocksCount, mbr->szDescModel);
- }
-@@ -127,10 +150,10 @@ void imageInfoShowVolume(char *szText, i
- break;
- }
-
-- snprintf(szText, nMaxTextLen, i18n("Volume number:.........%lu\n"
-+ snprintf(szText, nMaxTextLen, i18n("Volume number:.........%u\n"
- "Volume size:...........%s\n"
-- "Compression level: ....%ld -> %s\n"
-- "Identificator:.........%llu=%llX\n\n"),
-+ "Compression level: ....%d -> %s\n"
-+ "Identificator:.........%"PRIu64"=%"PRIX64"\n\n"),
- head->dwVolumeNumber, formatSize(qwImageSize, cTemp), dwCompression,
- szCompression, head->qwIdentificator, head->qwIdentificator);
- }
-diff -r 0ffb61b8c31d -r 88ac9824fc14 src/client/interface_newt.cpp
---- a/src/client/interface_newt.cpp Tue Sep 04 21:36:14 2007 +0200
-+++ b/src/client/interface_newt.cpp Tue Sep 04 21:43:30 2007 +0200
-@@ -239,7 +239,7 @@ int CInterfaceNewt::guiInitMainWindow(ch
- labelNetwork = newtLabel(5, 18, i18n("IP/name of the server:"));
- editNetwork = newtEntry(28, 18, szNetworkIP, 25, NULL, 0);
- labelPort = newtLabel(54, 18, i18n("Port:"));
-- SNPRINTF(szTemp, "%lu", *dwServerPort);
-+ SNPRINTF(szTemp, "%u", *dwServerPort);
- editPort = newtEntry(60, 18, szTemp, 6, NULL, 0);
-
- btnContinue = newtCompactButton(50, 12, i18n("Next (F5)"));
-@@ -473,7 +473,7 @@ WORD CInterfaceNewt::askNewPath(char * s
- char szMess[2048];
-
- SNPRINTF(szMess, i18n("Disk full! Can't write next volume file "
-- "(%s.%.3ld)\nto %s\nPlease, enter another directory path "
-+ "(%s.%.3d)\nto %s\nPlease, enter another directory path "
- "(without filename):"), szOrigFilename, dwVolume, szPath);
- //*(szMess+2047) = '\0';
-
-diff -r 0ffb61b8c31d -r 88ac9824fc14 src/client/main.cpp
---- a/src/client/main.cpp Tue Sep 04 21:36:14 2007 +0200
-+++ b/src/client/main.cpp Tue Sep 04 21:43:30 2007 +0200
-@@ -29,6 +29,10 @@
- #include <stdlib.h>
- #include <stdio.h>
- #include <unistd.h>
-+
-+#define __STDC_FORMAT_MACROS
-+#include <inttypes.h>
-+
- #include <sched.h>
- #include <sys/types.h>
- #include <sys/param.h>
-@@ -278,7 +282,7 @@ int main(int argc, char *argv[])
- case 'V': // split image into multiple files
-
- options.qwSplitSize = (QWORD)atol(optarg) * 1024 * 1024;
-- fprintf (stderr, i18n("Volume size: %llu bytes (%ld MiB)\n"),
-+ fprintf (stderr, i18n("Volume size: %"PRIu64" bytes (%ld MiB)\n"),
- options.qwSplitSize, atol(optarg));
- break;
-
-@@ -971,15 +975,15 @@ int checkStructSizes()
- {
- // ---- check types sizes
-
-- if (sizeof(unsigned long int) != 4)
-+ if (sizeof(DWORD) != 4)
- {
-- fprintf (stderr, "Error: sizeof(DWORD) != 4 (%d)\n", sizeof(unsigned long int));
-- goto errcheck;
-- }
--
-- if (sizeof(unsigned long long int) != 8)
-+ fprintf (stderr, "Error: sizeof(DWORD) != 4 (%zd)\n", sizeof(DWORD));
-+ goto errcheck;
-+ }
-+
-+ if (sizeof(QWORD) != 8)
- {
-- fprintf (stderr, "Error: sizeof(QWORD) != 8 (%d)\n", sizeof(unsigned long long int));
-+ fprintf (stderr, "Error: sizeof(QWORD) != 8 (%zd)\n", sizeof(QWORD));
- goto errcheck;
- }
-
-@@ -988,7 +992,7 @@ int checkStructSizes()
- // check main header size is 16384
- if (sizeof(CMainHeader) != 16384)
- {
-- fprintf (stderr, "Error: main header size != 16384 (%d)\n",
-+ fprintf (stderr, "Error: main header size != 16384 (%zd)\n",
- sizeof(CMainHeader));
- goto errcheck;
- }
-@@ -996,7 +1000,7 @@ int checkStructSizes()
- // check ext2 header size is 16384
- if (sizeof(CInfoExt2Header) != INFOS_STRUCT_SIZE)
- {
-- fprintf (stderr, "Error: ext2 header size != %d (%d)\n", INFOS_STRUCT_SIZE,
-+ fprintf (stderr, "Error: ext2 header size != %d (%zd)\n", INFOS_STRUCT_SIZE,
- sizeof(CInfoExt2Header));
- goto errcheck;
- }
-@@ -1004,7 +1008,7 @@ int checkStructSizes()
- // check reiserfs header size is 16384
- if (sizeof(CInfoReiserHeader) != INFOS_STRUCT_SIZE)
- {
-- fprintf (stderr, "Error: reiserfs header size != %d (%d)\n", INFOS_STRUCT_SIZE,
-+ fprintf (stderr, "Error: reiserfs header size != %d (%zd)\n", INFOS_STRUCT_SIZE,
- sizeof(CInfoReiserHeader));
- goto errcheck;
- }
-@@ -1012,7 +1016,7 @@ int checkStructSizes()
- // check fat header size is 16384
- if (sizeof(CInfoFatHeader) != INFOS_STRUCT_SIZE)
- {
-- fprintf (stderr, "Error: fat header size != %d (%d)\n", INFOS_STRUCT_SIZE,
-+ fprintf (stderr, "Error: fat header size != %d (%zd)\n", INFOS_STRUCT_SIZE,
- sizeof(CInfoFatHeader));
- goto errcheck;
- }
-@@ -1020,7 +1024,7 @@ int checkStructSizes()
- // check ntfs header size is 16384
- if (sizeof(CInfoNtfsHeader) != INFOS_STRUCT_SIZE)
- {
-- fprintf (stderr, "Error: ntfs header size != %d (%d)\n", INFOS_STRUCT_SIZE,
-+ fprintf (stderr, "Error: ntfs header size != %d (%zd)\n", INFOS_STRUCT_SIZE,
- sizeof(CInfoNtfsHeader));
- goto errcheck;
- }
-@@ -1028,7 +1032,7 @@ int checkStructSizes()
- // check hpfs header size is 16384
- if (sizeof(CInfoHpfsHeader) != INFOS_STRUCT_SIZE)
- {
-- fprintf (stderr, "Error: hpfs header size != %d (%d)\n", INFOS_STRUCT_SIZE,
-+ fprintf (stderr, "Error: hpfs header size != %d (%zd)\n", INFOS_STRUCT_SIZE,
- sizeof(CInfoHpfsHeader));
- goto errcheck;
- }
-@@ -1036,7 +1040,7 @@ int checkStructSizes()
- // check jfs header size is 16384
- if (sizeof(CInfoJfsHeader) != INFOS_STRUCT_SIZE)
- {
-- fprintf (stderr, "Error: jfs header size != %d (%d)\n", INFOS_STRUCT_SIZE,
-+ fprintf (stderr, "Error: jfs header size != %d (%zd)\n", INFOS_STRUCT_SIZE,
- sizeof(CInfoJfsHeader));
- goto errcheck;
- }
-@@ -1044,7 +1048,7 @@ int checkStructSizes()
- // check xfs header size is 16384
- if (sizeof(CInfoXfsHeader) != INFOS_STRUCT_SIZE)
- {
-- fprintf (stderr, "Error: xfs header size != %d (%d)\n", INFOS_STRUCT_SIZE,
-+ fprintf (stderr, "Error: xfs header size != %d (%zd)\n", INFOS_STRUCT_SIZE,
- sizeof(CInfoXfsHeader));
- goto errcheck;
- }
-@@ -1052,7 +1056,7 @@ int checkStructSizes()
- // check hfs header size is 16384
- if (sizeof(CInfoHfsHeader) != INFOS_STRUCT_SIZE)
- {
-- fprintf (stderr, "Error: hfs header size != %d (%d)\n", INFOS_STRUCT_SIZE,
-+ fprintf (stderr, "Error: hfs header size != %d (%zd)\n", INFOS_STRUCT_SIZE,
- sizeof(CInfoHfsHeader));
- goto errcheck;
- }
-@@ -1060,36 +1064,39 @@ int checkStructSizes()
- // check ufs header size is 16384
- if (sizeof(CInfoUfsHeader) != INFOS_STRUCT_SIZE)
- {
-- fprintf (stderr, "Error: jfs header size != %d (%d)\n", INFOS_STRUCT_SIZE,
-- sizeof(CInfoUfsHeader));
-+ fprintf (stderr, "Error: jfs header size != %d (%zd)\n",
-+ INFOS_STRUCT_SIZE, sizeof(CInfoUfsHeader));
- goto errcheck;
- }
-
- // check tail size is 16384
- if (sizeof(CMainTail) != 16384)
- {
-- fprintf (stderr, "Error: main footer size != 16384 (%d)\n", sizeof(CMainTail));
-+ fprintf (stderr, "Error: main footer size != 16384 (%zd)\n",
-+ sizeof(CMainTail));
- goto errcheck;
- }
-
- // check volume header size is 512
- if (sizeof(CVolumeHeader) != 512)
- {
-- fprintf (stderr, "Error: volume hedaer size != 512 (%d)\n", sizeof(CVolumeHeader));
-+ fprintf (stderr, "Error: volume hedaer size != 512 (%zd)\n",
-+ sizeof(CVolumeHeader));
- goto errcheck;
- }
-
- // check MBR size is 2048
- if (sizeof(CMbr) != 2048)
- {
-- fprintf (stderr, "Error: MBR size != 2048 (%d)\n", sizeof(CMbr));
-+ fprintf (stderr, "Error: MBR size != 2048 (%zd)\n", sizeof(CMbr));
- goto errcheck;
- }
-
- // check volume header size is 512
- if (sizeof(CLocalHeader) != 16384)
- {
-- fprintf (stderr, "Error: local header size != 16384 (%d)\n", sizeof(CLocalHeader));
-+ fprintf (stderr, "Error: local header size != 16384 (%zd)\n",
-+ sizeof(CLocalHeader));
- goto errcheck;
- }
-
-diff -r 0ffb61b8c31d -r 88ac9824fc14 src/client/mbr_backup.cpp
---- a/src/client/mbr_backup.cpp Tue Sep 04 21:36:14 2007 +0200
-+++ b/src/client/mbr_backup.cpp Tue Sep 04 21:43:30 2007 +0200
-@@ -164,7 +164,7 @@ int mbrParseProcPart(char *szHdList, int
- //if (isDriveReady(szTemp))
- {
- nCount++; // number of hard disks
-- SNPRINTF(szTemp, "/dev/%s#%lu#",szDevice, (DWORD)nBlocks);
-+ SNPRINTF(szTemp, "/dev/%s#%u#",szDevice, (DWORD)nBlocks);
- if (szHdList)
- strncat(szHdList, szTemp, nMaxLen);
- }
-diff -r 0ffb61b8c31d -r 88ac9824fc14 src/client/misc.cpp
---- a/src/client/misc.cpp Tue Sep 04 21:36:14 2007 +0200
-+++ b/src/client/misc.cpp Tue Sep 04 21:43:30 2007 +0200
-@@ -22,6 +22,8 @@
- #include <stdio.h>
- #include <stdlib.h>
- #include <unistd.h>
-+#define __STDC_FORMAT_MACROS
-+#include <inttypes.h>
-
- #ifdef HAVE_SYS_PARAM_H
- #include <sys/param.h>
-@@ -88,8 +90,8 @@ void restoreMbr(char *szImageFile, COpti
-
- CRestoreMbrWindow optGui;
- DWORD dwDiskCount;
-- DWORD dwOriginalMbrNb;
-- DWORD dwCurrentMbrNb;
-+ uintptr_t dwOriginalMbrNb;
-+ uintptr_t dwCurrentMbrNb;
- char szHdList[2048];
- char szTemp[512];
- char szTemp2[512];
-@@ -209,7 +211,7 @@ void restoreMbr(char *szImageFile, COpti
- image.closeReading(true);
- throw excep;
- }
-- SNPRINTF(szTemp, "%.3lu: %s [%llu blocks]", i, mbrOriginal[i].szDevice, mbrOriginal[i].qwBlocksCount);
-+ SNPRINTF(szTemp, "%.3u: %s [%"PRIu64" blocks]", i, mbrOriginal[i].szDevice, mbrOriginal[i].qwBlocksCount);
- if (options->bBatchMode == false)
- optGui.addMbr(szTemp, i);
-
-@@ -319,6 +321,28 @@ void restoreMbr(char *szImageFile, COpti
- THROW(ERR_ERRNO, errno);
-
- RETURN;
-+}
-+
-+struct portable_tm *localtime_portable (const time_t *__timer)
-+{
-+static struct portable_tm ret;
-+struct tm *host_tm;
-+
-+ host_tm=localtime (__timer);
-+ ret.tm_sec=host_tm->tm_sec;
-+ ret.tm_min=host_tm->tm_min;
-+ ret.tm_hour=host_tm->tm_hour;
-+ ret.tm_mday=host_tm->tm_mday;
-+ ret.tm_mon=host_tm->tm_mon;
-+ ret.tm_year=host_tm->tm_year;
-+ ret.tm_wday=host_tm->tm_wday;
-+ ret.tm_yday=host_tm->tm_yday;
-+ ret.tm_isdst=host_tm->tm_isdst;
-+
-+ ret.tm_gmtoff=host_tm->tm_gmtoff;
-+ ret.tm_zone=0;
-+
-+ return &ret;
- }
-
- // =======================================================
-@@ -467,7 +491,7 @@ void savePartition(char *szDevice, char
- time(&dt);
-
- // current time/date (date of image creation)
-- headMain.dateCreate = *localtime(&dt);
-+ headMain.dateCreate = *localtime_portable(&dt);
-
- // file format version
- strcpy(headMain.szVersion, CURRENT_IMAGE_FORMAT);
-diff -r 0ffb61b8c31d -r 88ac9824fc14 src/client/partimage.h
---- a/src/client/partimage.h Tue Sep 04 21:36:14 2007 +0200
-+++ b/src/client/partimage.h Tue Sep 04 21:43:30 2007 +0200
-@@ -21,6 +21,7 @@
- #include <errno.h>
- #include <libintl.h> // intl translation
- #include <stdio.h>
-+#include <stdint.h>
- #include <time.h>
-
- #ifdef HAVE_CONFIG_H
-@@ -53,10 +54,10 @@ extern time_t g_timeEnd; // End of the
- extern time_t g_timeEnd; // End of the operation
-
- typedef bool BOOL; // variant size
--typedef unsigned char BYTE; // 8 bits
--typedef unsigned short int WORD; // 16 bits
--typedef unsigned long int DWORD; // 32 bits
--typedef unsigned long long int QWORD; // 64 bits
-+typedef uint8_t BYTE; // 8 bits
-+typedef uint16_t WORD; // 16 bits
-+typedef uint32_t DWORD; // 32 bits
-+typedef uint64_t QWORD; // 64 bits
-
- #include "endianess.h"
-
-diff -r 0ffb61b8c31d -r 88ac9824fc14 src/shared/common.cpp
---- a/src/shared/common.cpp Tue Sep 04 21:36:14 2007 +0200
-+++ b/src/shared/common.cpp Tue Sep 04 21:43:30 2007 +0200
-@@ -23,6 +23,9 @@
- #include <stdlib.h>
- #include <ctype.h>
- #include <fcntl.h>
-+
-+#define __STDC_FORMAT_MACROS
-+#include <inttypes.h>
-
- #include <sys/types.h>
- #include <sys/ioctl.h>
-@@ -268,7 +271,7 @@ char *formatSize2(QWORD qwSize, char *sz
-
- if (qwSize < llKiloB) // In Bytes
- {
-- snprintf(szText, nMaxLen, i18n("%lld bytes"), qwSize);
-+ snprintf(szText, nMaxLen, i18n("%"PRId64" bytes"), qwSize);
- }
- else if (qwSize < llMegaB) // In KiloBytes
- {
-@@ -307,7 +310,7 @@ char *formatSizeNoGui(QWORD qwSize, char
-
- if (qwSize < llKiloB) // In Bytes
- {
-- snprintf(szText, nMaxLen, i18n("%lldb"), qwSize);
-+ snprintf(szText, nMaxLen, i18n("%"PRId64"b"), qwSize);
- }
- else if (qwSize < llMegaB) // In KiloBytes
- {
-diff -r 0ffb61b8c31d -r 88ac9824fc14 src/shared/common.h
---- a/src/shared/common.h Tue Sep 04 21:36:14 2007 +0200
-+++ b/src/shared/common.h Tue Sep 04 21:43:30 2007 +0200
-@@ -146,6 +146,23 @@ struct COptions
-
- #define MAX_UNAMEINFOLEN 65 //SYS_NMLN
-
-+struct portable_tm
-+{
-+ uint32_t tm_sec;
-+ uint32_t tm_min;
-+ uint32_t tm_hour;
-+ uint32_t tm_mday;
-+ uint32_t tm_mon;
-+ uint32_t tm_year;
-+ uint32_t tm_wday;
-+ uint32_t tm_yday;
-+ uint32_t tm_isdst;
-+
-+ uint32_t tm_gmtoff;
-+ uint32_t tm_zone;
-+};
-+
-+
- // ================================================
- struct CMainHeader // size must be 16384 (adjust the reserved data)
- {
-@@ -163,7 +180,7 @@ struct CMainHeader // size must be 16384
-
- DWORD dwCompression; // COMPRESS_XXXXXX
- DWORD dwMainFlags;
-- struct tm dateCreate; // date of image creation
-+ struct portable_tm dateCreate; // date of image creation
- QWORD qwPartSize; // size of the partition in bytes
- char szHostname[MAX_HOSTNAMESIZE];
- char szVersion[64]; // version of the image file
-diff -r 0ffb61b8c31d -r 88ac9824fc14 src/shared/image_disk.cpp
---- a/src/shared/image_disk.cpp Tue Sep 04 21:36:14 2007 +0200
-+++ b/src/shared/image_disk.cpp Tue Sep 04 21:43:30 2007 +0200
-@@ -524,7 +524,7 @@ void CImageDisk::openWriting() // [Main-
- if (m_bIsOpened == true)
- THROW(ERR_OPENED);
-
-- SNPRINTF(szShortName, "pi%.8lx", (DWORD)generateIdentificator());
-+ SNPRINTF(szShortName, "pi%.8x", (DWORD)generateIdentificator());
- extractFilepathFromFullPath(m_szImageFilename, szPathDir); // filepath without filename
- if (access(szPathDir, R_OK) == -1) mkdir(szPathDir, 0755);
- snprintf(m_szSpaceFilename, MAXPATHLEN, "%s/%8s.tmp", szPathDir, szShortName);
+++ /dev/null
-diff -uNr partimage-0.6.6.orig/src/client/fs/fs_base.cpp partimage-0.6.6/src/client/fs/fs_base.cpp
---- partimage-0.6.6.orig/src/client/fs/fs_base.cpp 2008-01-14 01:34:19.000000000 +0100
-+++ partimage-0.6.6/src/client/fs/fs_base.cpp 2008-01-14 01:34:47.000000000 +0100
-@@ -134,6 +134,7 @@
- check.cMagic[0] = 'C';
- check.cMagic[1] = 'H';
- check.cMagic[2] = 'K';
-+ check.cMagic[3] = 0;
-
- dwStats = 0;
- i = 0;
-diff -uNr partimage-0.6.6.orig/src/client/fs/fs_base.h partimage-0.6.6/src/client/fs/fs_base.h
---- partimage-0.6.6.orig/src/client/fs/fs_base.h 2006-04-22 16:24:14.000000000 +0200
-+++ partimage-0.6.6/src/client/fs/fs_base.h 2008-01-14 01:34:47.000000000 +0100
-@@ -39,7 +39,7 @@
- // ================================================
- struct CCheck
- {
-- char cMagic[3]; // must be 'C','H','K'
-+ char cMagic[4]; // must be 'C','H','K'
- DWORD dwCRC; // CRC of the CHECK_FREQUENCY blocks
- QWORD qwPos; // number of the last block written
- };
-diff -uNr partimage-0.6.6.orig/src/client/misc.cpp partimage-0.6.6/src/client/misc.cpp
---- partimage-0.6.6.orig/src/client/misc.cpp 2008-01-14 01:34:19.000000000 +0100
-+++ partimage-0.6.6/src/client/misc.cpp 2008-01-14 01:34:47.000000000 +0100
-@@ -2392,7 +2392,7 @@
- }
- p = strdup(p);
- char *q;
-- while (q = strchr(p, '/')) *q = '_';
-+ while ((q = strchr(p, '/'))!=NULL) *q = '_';
-
- return p;
- }
+++ /dev/null
-diff -uNr partimage-0.6.6.orig/Makefile.am partimage-0.6.6/Makefile.am
---- partimage-0.6.6.orig/Makefile.am 2006-04-22 16:59:22.000000000 +0200
-+++ partimage-0.6.6/Makefile.am 2008-01-14 23:11:00.000000000 +0100
-@@ -23,8 +23,6 @@
- rm ${sysconfdir}/partimaged/partimaged.csr ;\
- chmod 600 ${sysconfdir}/partimaged/partimaged.key ;\
- chmod 600 ${sysconfdir}/partimaged/partimaged.cert ;\
-- chown partimag:root ${sysconfdir}/partimaged/partimaged.key ;\
-- chown partimag:root ${sysconfdir}/partimaged/partimaged.cert ;\
- else \
- echo "SSL disabled, no certificate will be generated." ;\
- fi
-@@ -57,7 +55,6 @@
- echo "#sample # user 'sample' is allowed to connect partimaged" >> \
- ${sysconfdir}/partimaged/partimagedusers ;\
- chmod 600 ${sysconfdir}/partimaged/partimagedusers ;\
-- chown partimag:root ${sysconfdir}/partimaged/partimagedusers ;\
- fi
-
- $(mkinstalldirs) ${infodir}
-diff -uNr partimage-0.6.6.orig/Makefile.in partimage-0.6.6/Makefile.in
---- partimage-0.6.6.orig/Makefile.in 2008-01-14 23:09:15.000000000 +0100
-+++ partimage-0.6.6/Makefile.in 2008-01-14 23:11:07.000000000 +0100
-@@ -670,8 +670,6 @@
- rm ${sysconfdir}/partimaged/partimaged.csr ;\
- chmod 600 ${sysconfdir}/partimaged/partimaged.key ;\
- chmod 600 ${sysconfdir}/partimaged/partimaged.cert ;\
-- chown partimag:root ${sysconfdir}/partimaged/partimaged.key ;\
-- chown partimag:root ${sysconfdir}/partimaged/partimaged.cert ;\
- else \
- echo "SSL disabled, no certificate will be generated." ;\
- fi
-@@ -703,7 +701,6 @@
- echo "#sample # user 'sample' is allowed to connect partimaged" >> \
- ${DESTDIR}${sysconfdir}/partimaged/partimagedusers ;\
- chmod 600 ${DESTDIR}${sysconfdir}/partimaged/partimagedusers ;\
-- chown partimag:root ${DESTDIR}${sysconfdir}/partimaged/partimagedusers ;\
- fi
-
- $(mkinstalldirs) ${DESTDIR}${infodir}
+++ /dev/null
-diff --unified --recursive partimage-0.6.7_beta1.org/src/client/fs/fs_base.cpp partimage-0.6.7_beta1/src/client/fs/fs_base.cpp
---- partimage-0.6.7_beta1.org/src/client/fs/fs_base.cpp 2007-09-17 02:59:23.000000000 +0800
-+++ partimage-0.6.7_beta1/src/client/fs/fs_base.cpp 2007-10-08 16:51:29.000000000 +0800
-@@ -773,6 +773,7 @@
- QWORD qwFreeBlocksCount = 0;
- QWORD i;
-
-+ showDebug(1, "BITMAP: m_header.qwBlocksCount = %llu\n", m_header.qwBlocksCount);
- for (i=0; i < m_header.qwBlocksCount; i++)
- {
- if (m_bitmap.isBitSet(i))
-diff --unified --recursive partimage-0.6.7_beta1.org/src/client/fs/fs_ext2.cpp partimage-0.6.7_beta1/src/client/fs/fs_ext2.cpp
---- partimage-0.6.7_beta1.org/src/client/fs/fs_ext2.cpp 2007-09-17 02:55:59.000000000 +0800
-+++ partimage-0.6.7_beta1/src/client/fs/fs_ext2.cpp 2007-10-08 18:21:03.000000000 +0800
-@@ -158,6 +158,7 @@
- m_info.dwTotalBlocksCount = Le32ToCpu(sb.s_blocks_count);
- showDebug(1, "total blocks=%lu\n", m_info.dwTotalBlocksCount);
- m_info.dwBlocksPerGroup = Le32ToCpu(sb.s_blocks_per_group);
-+ showDebug(1, "BlocksPerGroup=%lu\n", m_info.dwBlocksPerGroup);
-
- m_info.dwGroupsCount = (m_info.dwTotalBlocksCount - m_info.dwFirstBlock + m_info.dwBlocksPerGroup - 1) / Le32ToCpu(sb.s_blocks_per_group);
- showDebug(1, "groups=%lu\n", m_info.dwGroupsCount);
-@@ -211,6 +212,7 @@
- DWORD dwBit, dwByte;
- DWORD dwExt2DataBlock;
- char *cPtr;
-+ int group = 0;
-
- // debug
- DWORD dwUsed;
-@@ -228,6 +230,7 @@
-
- // init bitmap size
- nRes = m_bitmap.init(m_header.qwBitmapSize);
-+ showDebug(1, "m_bitmap.init(m_header.qwBitmapSize = %lu)\n", m_header.qwBitmapSize);
- if (nRes == -1)
- {
- showDebug(1, "CExt2Part::readBitmap(): Error 002\n");
-@@ -236,6 +239,7 @@
-
- // load group descriptors
- desc = new CExt2GroupDesc[m_info.dwGroupsCount+m_info.dwDescPerBlock];
-+ showDebug(1, "dwGroupsCount = %lu, m_info.dwDescPerBlock = %lu\n",m_info.dwGroupsCount, m_info.dwDescPerBlock);
- if (!desc)
- {
- showDebug(1, "CExt2Part::readBitmap(): Error 003\n");
-@@ -243,6 +247,7 @@
- }
-
- // for each descriptor BLOCK (not group descriptor!)
-+ showDebug(1, "readData m_info.dwBlockSize = %lu\n", m_info.dwBlockSize);
- for (cPtr=(char*)desc, i=0; i < m_info.dwDescBlocks; i++,cPtr+=m_info.dwBlockSize)
- {
- nRes = readData(cPtr, ((QWORD)m_info.dwBlockSize) * ((QWORD)(m_info.dwFirstBlock+1+i)), m_info.dwBlockSize);
-@@ -255,7 +260,7 @@
-
- dwUsed=0;
- dwFree=0;
--
-+ showDebug(1, "m_info.dwBlocksPerGroup = %lu\n", m_info.dwBlocksPerGroup);
- for (i = 0; i < m_info.dwGroupsCount; i++)
- {
- if (m_info.dwFirstBlock+((i+1)*m_info.dwBlocksPerGroup) > m_info.dwTotalBlocksCount)
-@@ -267,8 +272,8 @@
- {
- // -- read the bitmap block
- errno = 0;
-- nRes = readData(cTempBitmap+(i*m_info.dwBlockSize), ((QWORD)m_info.dwBlockSize) *
-- ((QWORD)Le32ToCpu(desc[i].bg_block_bitmap)), m_info.dwBlockSize);
-+ nRes = readData(cTempBitmap+(i*(m_info.dwBlocksPerGroup/8)), ((QWORD)m_info.dwBlockSize) *
-+ ((QWORD)Le32ToCpu(desc[i].bg_block_bitmap)), (m_info.dwBlocksPerGroup/8));
- if (nRes == -1)
- {
- showDebug(1, "CExt2Part::readBitmap(): Error 005\n");
-@@ -278,7 +283,7 @@
- }
- else
- {
-- memset(cTempBitmap+(i*m_info.dwBlockSize), 0, m_info.dwBlockSize);
-+ memset(cTempBitmap+(i*(m_info.dwBlocksPerGroup/8)), 0, (m_info.dwBlocksPerGroup/8));
- }
- }
-
-@@ -302,22 +307,25 @@
- {
- dwBit = dwExt2DataBlock % 8;
- dwByte = (dwExt2DataBlock - dwBit) / 8;
-+ group = (dwExt2DataBlock/m_info.dwBlocksPerGroup);
-
- if ((cTempBitmap[dwByte] & (1 << dwBit)) != 0)
- {
- for (j=0; j < m_info.dwLogicalBlocksPerExt2Block; j++, i++)
- m_bitmap.setBit(i, true);
-+ showDebug(3, "m_bitmap.setBit(%1u, true), g = %i\n", (i/4), group);
- dwUsed++;
- }
- else
- {
- for (j=0; j < m_info.dwLogicalBlocksPerExt2Block; j++, i++)
- m_bitmap.setBit(i, false);
-+ showDebug(3, "m_bitmap.setBit(%1u, false), g = %i\n", (i/4), group);
- dwFree++;
- }
- }
-
-- //debugWin("used=%lu\nfree=%lu\ntotal=%lu",dwUsed,dwFree,dwUsed+dwFree);
-+ showDebug(1,"used=%lu\nfree=%lu\ntotal=%lu\n",dwUsed,dwFree,dwUsed+dwFree);
- calculateSpaceFromBitmap();
-
- //success_readBitmap:
+++ /dev/null
---- partimage-0.6.6/Makefile.in.orig 2007-08-11 12:36:57.000000000 +0200
-+++ partimage-0.6.6/Makefile.in 2008-01-14 00:39:42.000000000 +0100
-@@ -688,34 +688,34 @@
- @echo "/etc/pam.d/partimaged"
-
- install-data-local:
-- $(mkinstalldirs) ${sysconfdir}
-- $(mkinstalldirs) ${sysconfdir}/partimaged
-+ $(mkinstalldirs) ${DESTDIR}${sysconfdir}
-+ $(mkinstalldirs) ${DESTDIR}${sysconfdir}/partimaged
-
-- if test ! -f ${sysconfdir}/partimaged/partimagedusers ; then \
-+ if test ! -f ${DESTDIR}${sysconfdir}/partimaged/partimagedusers ; then \
- echo "# note: '#' introduces comments" > \
-- ${sysconfdir}/partimaged/partimagedusers ;\
-+ ${DESTDIR}${sysconfdir}/partimaged/partimagedusers ;\
- echo -n "#add only users allowed to " >> \
-- ${sysconfdir}/partimaged/partimagedusers ;\
-- echo "connect partimaged" >> ${sysconfdir}/partimaged/partimagedusers ;\
-+ ${DESTDIR}${sysconfdir}/partimaged/partimagedusers ;\
-+ echo "connect partimaged" >> ${DESTDIR}${sysconfdir}/partimaged/partimagedusers ;\
- echo "# (only one login per line)" >> \
-- ${sysconfdir}/partimaged/partimagedusers ;\
-- echo "" >> ${sysconfdir}/partimaged/partimagedusers ;\
-+ ${DESTDIR}${sysconfdir}/partimaged/partimagedusers ;\
-+ echo "" >> ${DESTDIR}${sysconfdir}/partimaged/partimagedusers ;\
- echo "#sample # user 'sample' is allowed to connect partimaged" >> \
-- ${sysconfdir}/partimaged/partimagedusers ;\
-- chmod 600 ${sysconfdir}/partimaged/partimagedusers ;\
-- chown partimag:root ${sysconfdir}/partimaged/partimagedusers ;\
-+ ${DESTDIR}${sysconfdir}/partimaged/partimagedusers ;\
-+ chmod 600 ${DESTDIR}${sysconfdir}/partimaged/partimagedusers ;\
-+ chown partimag:root ${DESTDIR}${sysconfdir}/partimaged/partimagedusers ;\
- fi
-
-- $(mkinstalldirs) ${infodir}
-- $(INSTALL_DATA) AUTHORS ${infodir}/AUTHORS
-- $(INSTALL_DATA) BUGS ${infodir}/BUGS
-- $(INSTALL_DATA) COPYING ${infodir}/COPYING
-- $(INSTALL_DATA) ChangeLog ${infodir}/ChangeLog
-- $(INSTALL_DATA) INSTALL ${infodir}/INSTALL
-- $(INSTALL_DATA) README ${infodir}/README
-- $(INSTALL_DATA) README.partimaged ${infodir}/README.partimaged
-- $(INSTALL_DATA) TODO ${infodir}/TODO
-- $(INSTALL_DATA) partimage.lsm ${infodir}/partimage.lsm
-+ $(mkinstalldirs) ${DESTDIR}${infodir}
-+ $(INSTALL_DATA) AUTHORS ${DESTDIR}${infodir}/AUTHORS
-+ $(INSTALL_DATA) BUGS ${DESTDIR}${infodir}/BUGS
-+ $(INSTALL_DATA) COPYING ${DESTDIR}${infodir}/COPYING
-+ $(INSTALL_DATA) ChangeLog ${DESTDIR}${infodir}/ChangeLog
-+ $(INSTALL_DATA) INSTALL ${DESTDIR}${infodir}/INSTALL
-+ $(INSTALL_DATA) README ${DESTDIR}${infodir}/README
-+ $(INSTALL_DATA) README.partimaged ${DESTDIR}${infodir}/README.partimaged
-+ $(INSTALL_DATA) TODO ${DESTDIR}${infodir}/TODO
-+ $(INSTALL_DATA) partimage.lsm ${DESTDIR}${infodir}/partimage.lsm
-
- uninstall-local:
- -rm -f ${infodir}/AUTHORS
+++ /dev/null
-diff -uNr partimage-0.6.6.orig/src/client/interface_none.cpp partimage-0.6.6/src/client/interface_none.cpp
---- partimage-0.6.6.orig/src/client/interface_none.cpp 2006-04-22 16:24:14.000000000 +0200
-+++ partimage-0.6.6/src/client/interface_none.cpp 2008-01-14 01:48:22.000000000 +0100
-@@ -96,7 +96,8 @@
- void CInterfaceNone::msgBoxError(char *title, ...) {
- va_list al;
- va_start(al,title);
-- message_only("Error", title, "", al, 0);
-+ vfprintf(stderr,title,al);
-+ fputc('\n',stderr);
- va_end(al);
- }
-
-diff -uNr partimage-0.6.6.orig/src/client/main.cpp partimage-0.6.6/src/client/main.cpp
---- partimage-0.6.6.orig/src/client/main.cpp 2008-01-14 01:44:21.000000000 +0100
-+++ partimage-0.6.6/src/client/main.cpp 2008-01-14 01:47:46.000000000 +0100
-@@ -139,6 +139,12 @@
- }*/
- }
-
-+void ensure_interface_is_non_interactive()
-+{
-+ delete g_interface;
-+ g_interface = new CInterfaceNone("");
-+}
-+
- // =======================================================
- int main(int argc, char *argv[])
- {
-@@ -579,8 +585,9 @@
- goto beginMainWin;
- }
-
-- if (!options.bBatchMode)
-- g_interface -> Error(excep, szImageFile, szDevice);
-+ if (options.bBatchMode) ensure_interface_is_non_interactive();
-+
-+ g_interface -> Error(excep, szImageFile, szDevice);
-
- showDebug(1, "\nFINAL ERROR\n\n");
-
-@@ -591,8 +598,11 @@
- else
- {
- showDebug(1, "The file system of [%s] is [%s], and is not supported\n", szDevice, szFileSystem);
-- if (!options.bBatchMode)
-- g_interface->msgBoxError("The file system of [%s] is [%s], and is not supported", szDevice, szFileSystem);
-+
-+ if (options.bBatchMode) ensure_interface_is_non_interactive();
-+
-+ g_interface->msgBoxError("The file system of [%s] is [%s], and is not supported", szDevice, szFileSystem);
-+
- nRes = -1;
- }
- //#endif // DEVEL_SUPPORT
-@@ -696,7 +706,7 @@
- {
- if (options.bBatchMode)
- fprintf(stderr,"\n\n");
-- g_interface -> StatusLine(i18n("commiting buffer cache to disk."));
-+ if (!options.bBatchMode) g_interface -> StatusLine(i18n("commiting buffer cache to disk."));
- sync();
- }
- closeDebugFiles();
+++ /dev/null
-diff -uNr partimage-0.6.6.orig/src/server/partimaged-main.cpp partimage-0.6.6/src/server/partimaged-main.cpp
---- partimage-0.6.6.orig/src/server/partimaged-main.cpp 2006-04-22 16:24:14.000000000 +0200
-+++ partimage-0.6.6/src/server/partimaged-main.cpp 2008-01-14 23:30:21.000000000 +0100
-@@ -98,6 +98,11 @@
- else if (signo == SIGINT)
- {
- g_bSigInt = true;
-+ delete g_Server;
-+ delete g_Window;
-+ g_Server = NULL;
-+ g_Window = NULL;
-+ exit(0);
- }
- else if (signo == SIGSEGV)
- {
-@@ -235,7 +240,7 @@
- case 'd':
- if (chdir(optarg) != 0)
- {
-- printf("%s: %s\n", optarg, strerror(errno));
-+ printf("Directory %s: %s\n", optarg, strerror(errno));
- exit(-1);
- }
- break;
-@@ -313,9 +318,9 @@
- #endif
-
- // register signals
--// signal(SIGTERM, catch_sigint);
--// signal(SIGINT, catch_sigint);
--// signal(SIGSEGV, catch_sigint); // segmentation fault
-+ signal(SIGTERM, catch_sigint);
-+ signal(SIGINT, catch_sigint);
-+ signal(SIGSEGV, catch_sigint); // segmentation fault
- // signal(SIGHUP, catch_sigint);
- // signal(SIGQUIT, catch_sigint);
- // signal(SIGCHLD, catch_sigint);
+++ /dev/null
-diff -uNr partimage-0.6.6.orig/src/server/partimaged-main.cpp partimage-0.6.6/src/server/partimaged-main.cpp
---- partimage-0.6.6.orig/src/server/partimaged-main.cpp 2008-01-15 12:32:50.000000000 +0100
-+++ partimage-0.6.6/src/server/partimaged-main.cpp 2008-01-15 12:36:06.000000000 +0100
-@@ -32,6 +32,8 @@
- #include <sys/stat.h>
- #include <signal.h>
- #include <fcntl.h>
-+#include <errno.h>
-+#include <cstring>
-
- #include "net.h"
- #include "netserver.h"
-@@ -321,6 +323,7 @@
- signal(SIGTERM, catch_sigint);
- signal(SIGINT, catch_sigint);
- signal(SIGSEGV, catch_sigint); // segmentation fault
-+ signal(SIGCHLD, SIG_IGN); // ignore child exits
- // signal(SIGHUP, catch_sigint);
- // signal(SIGQUIT, catch_sigint);
- // signal(SIGCHLD, catch_sigint);
-@@ -426,9 +429,15 @@
- g_Window->SetLocation(client, "(wrong password)");
- }
- else
-- pthread_create(&threads[client], NULL,
-- partimaged, &client);
--
-+ {
-+ int rv = fork();
-+ if ( rv < 0 )
-+ {
-+ showDebug(1, "Cannot fork() on incoming connection - %s\n", strerror(errno));
-+ continue;
-+ }
-+ if ( ! rv ) partimaged(&client); // child process
-+ }
- } // infernal loop
-
- showDebug(1, "end of partimaged-main\n");
+++ /dev/null
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-block/partimage/partimage-0.6.6.ebuild,v 1.6 2009/09/23 22:29:59 mr_bones_ Exp $
-
-WANT_AUTOMAKE="1.10"
-
-inherit eutils flag-o-matic pam autotools
-
-DESCRIPTION="Console-based application to efficiently save raw partition data to an image file."
-HOMEPAGE="http://www.partimage.org/"
-SRC_URI="mirror://sourceforge/partimage/${P}.tar.bz2"
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="x86 ~amd64 ~ppc ~sparc"
-IUSE="ssl nologin nls pam static"
-
-DEPEND=">=sys-libs/zlib-1.1.4
- >=dev-libs/newt-0.51.6
- app-arch/bzip2
- >=sys-libs/slang-1.4
- nls? ( sys-devel/gettext )
- ssl? ( >=dev-libs/openssl-0.9.6g )"
-
-RDEPEND="!static? (
- >=sys-libs/zlib-1.1.4
- >=dev-libs/lzo-1.08
- >=dev-libs/newt-0.51.6
- app-arch/bzip2
- >=sys-libs/slang-1.4
- nls? ( sys-devel/gettext ) ssl? ( >=dev-libs/openssl-0.9.6g )
- pam? ( virtual/pam )
- )"
-
-PARTIMAG_GROUP_GID=91
-PARTIMAG_USER_UID=91
-PARTIMAG_GROUP_NAME=partimag
-PARTIMAG_USER_NAME=partimag
-PARTIMAG_USER_SH=-1
-PARTIMAG_USER_HOMEDIR=/var/log/partimage
-PARTIMAG_USER_GROUPS=partimag
-
-pkg_setup() {
- # Now add users if needed
- enewgroup ${PARTIMAG_GROUP_NAME} ${PARTIMAG_GROUP_GID}
- enewuser ${PARTIMAG_USER_NAME} ${PARTIMAG_USER_UID} ${PARTIMAG_USER_SH} ${PARTIMAG_USER_HOMEDIR} ${PARTIMAG_USER_GROUPS}
-}
-
-src_unpack() {
- unpack ${A}
- cd "${S}"
-
- # we can do better security ourselves
- epatch "${FILESDIR}"/${P}-datadir-path.patch || die
- epatch "${FILESDIR}"/${P}-dont-discard-error-message-in-batch-mode.patch || die
- epatch "${FILESDIR}"/${PN}-0.6.4-save_file_and_rest_file_actions.patch || die
- epatch "${FILESDIR}"/${PN}-0.6.4-varargs.patch || die
- epatch "${FILESDIR}"/${PN}-0.6.4-empty-salt.patch || die
- epatch "${FILESDIR}"/${PN}-0.6.4-port.patch || die
- epatch "${FILESDIR}"/${P}-andre-przywara_amd64.patch || die
- epatch "${FILESDIR}"/${P}-andre-przywara_warnings.patch || die
- epatch "${FILESDIR}"/${P}-clonezilla_ext3_blocks-per-group.patch || die
- epatch "${FILESDIR}"/${P}-not_install_info.patch || die
- epatch "${FILESDIR}"/${P}-chown.patch || die
- epatch "${FILESDIR}"/${P}-gui.diff || die
- epatch "${FILESDIR}"/${P}-disable_header_check.patch || die
- epatch "${FILESDIR}"/${P}-thread-privilege-fix.patch || die
-}
-
-src_compile() {
- filter-flags -fno-exceptions
- use ppc && append-flags -fsigned-char
-
- local myconf
- use nologin && myconf="${myconf} --disable-login"
- if use static
- then
- use pam && ewarn "pam and static compilation are mutually exclusive - using static and ignoring pam"
- else
- myconf="${myconf} `use_enable pam`"
- fi
- econf \
- ${myconf} \
- --sysconfdir=/etc \
- `use_enable ssl` \
- `use_enable nls` \
- `use_enable static all-static` \
- || die "econf failed"
-
- emake || die "make failed"
-}
-
-src_install() {
- emake DESTDIR="${D}" \
- MKINSTALLDIRS=/usr/share/automake-1.10/mkinstalldirs install || die
-
- keepdir /var/log/partimage
-
- insinto /etc/partimaged; doins "${FILESDIR}"/servercert.cnf || die
-
- # init.d / conf.d
- newinitd "${FILESDIR}"/${PN}d.init ${PN}d || die
- newconfd "${FILESDIR}"/${PN}d.conf ${PN}d || die
-
- doman "${FILESDIR}"/{partimage.1,partimaged.8,partimagedusers.5} || die
- dodoc AUTHORS BUGS ChangeLog INSTALL README* TODO partimage.lsm
-
- # pam
- if use pam
- then
- newpamd "${FILESDIR}"/partimaged.pam partimaged || die
- fi
-}
-
-# vars for SSL stuff
-confdir="${ROOT}etc/partimaged"
-privkey="${confdir}/partimaged.key"
-cnf="${confdir}/servercert.cnf"
-csr="${confdir}/partimaged.csr"
-cert="${confdir}/partimaged.cert"
-
-pkg_config() {
- if use ssl; then
- ewarn "Please customize /etc/partimaged/servercert.cnf before you continue!"
- ewarn "Press Ctrl-C to break now for it, or press enter to continue."
- read
- if [ ! -f ${privkey} ]; then
- einfo "Generating unencrypted private key: ${privkey}"
- openssl genrsa -out ${privkey} 1024 || die "Failed!"
- else
- einfo "Private key already exists: ${privkey}"
- fi
- if [ ! -f ${csr} ]; then
- einfo "Generating certificate request: ${csr}"
- openssl req -new -x509 -outform PEM -out ${csr} -key ${privkey} -config ${cnf} || die "Failed!"
- else
- einfo "Certificate request already exists: ${csr}"
- fi
- if [ ! -f ${cert} ]; then
- einfo "Generating self-signed certificate: ${cert}"
- openssl x509 -in ${csr} -out ${cert} -signkey ${privkey} || die "Failed!"
- else
- einfo "Self-signed certifcate already exists: ${cert}"
- fi
- einfo "Setting permissions"
- partimagesslperms || die "Failed!"
- einfo "Done"
- else
- einfo "SSL is disabled, not building certificates"
- fi
-}
-
-partimagesslperms() {
- local ret=0
- chmod 600 ${privkey} 2>/dev/null
- ret=$((${ret}+$?))
- chown partimag:0 ${privkey} 2>/dev/null
- ret=$((${ret}+$?))
- chmod 644 ${cert} ${csr} 2>/dev/null
- ret=$((${ret}+$?))
- chown root:0 ${cert} ${csr} 2>/dev/null
- ret=$((${ret}+$?))
- return $ret
-}
-
-pkg_postinst() {
- if use ssl; then
- einfo "To create the required SSL certificates, please do:"
- einfo "emerge --config =${PF}"
- # force a permmissions fixup
- partimagesslperms
- return 0
- fi
- chown partimag:0 /etc/partimaged/partimagedusers || die
-}
projects / gentoo.git / commitdiff