Touchup source code.

Package-Manager: portage-2.1.2

diff --git a/sys-fs/e2fsprogs/ChangeLog b/sys-fs/e2fsprogs/ChangeLog
index 90e1ed6cbde717e5686fbc9d45339e45c40abe42..643249f2f9d337a6749d210b666ce3fe66b1a2f6 100644 (file)
--- a/sys-fs/e2fsprogs/ChangeLog
+++ b/sys-fs/e2fsprogs/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for sys-fs/e2fsprogs
-# Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/e2fsprogs/ChangeLog,v 1.93 2006/12/30 00:40:04 vapier Exp $
+# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/e2fsprogs/ChangeLog,v 1.94 2007/01/17 03:50:59 vapier Exp $
+
+  17 Jan 2007; Mike Frysinger <vapier@gentoo.org>
+  +files/e2fsprogs-1.39-ext4-prototypes.patch,
+  +files/e2fsprogs-1.39-util-strptime.patch, e2fsprogs-1.39-r1.ebuild:
+  Touchup source code.
 
 *e2fsprogs-1.39-r1 (30 Dec 2006)
 

diff --git a/sys-fs/e2fsprogs/Manifest b/sys-fs/e2fsprogs/Manifest
index bec90bc9f9333a30f7ed526d8a80eb5917b5e8aa..1f54fa0d9a4cb41515a2ec427834bfcda4c0af61 100644 (file)
--- a/sys-fs/e2fsprogs/Manifest
+++ b/sys-fs/e2fsprogs/Manifest
@@ -17,6 +17,10 @@ AUX e2fsprogs-1.38-tests-locale.patch 656 RMD160 16c625c16144ed16942fa19988524b7
 MD5 f199f07604566fda4f2a4dabac83a535 files/e2fsprogs-1.38-tests-locale.patch 656
 RMD160 16c625c16144ed16942fa19988524b7b5727c583 files/e2fsprogs-1.38-tests-locale.patch 656
 SHA256 7d12df7c4f00f1c1c81dcbd74cc0f8c1cffaa3b5089fbaa40222a7a9f2fbe598 files/e2fsprogs-1.38-tests-locale.patch 656
+AUX e2fsprogs-1.39-ext4-prototypes.patch 521 RMD160 b758e8bcbb18d5dd7f0a7523eaea740cf9726a38 SHA1 c88b916bac7ed73d095243cec81894294f8cae78 SHA256 bc9201eeba2ee65ada8721cbd58992e09d35c60c8e672985853769e79a552c60
+MD5 f8a337df3326ec8bf51fd27197d0e1cb files/e2fsprogs-1.39-ext4-prototypes.patch 521
+RMD160 b758e8bcbb18d5dd7f0a7523eaea740cf9726a38 files/e2fsprogs-1.39-ext4-prototypes.patch 521
+SHA256 bc9201eeba2ee65ada8721cbd58992e09d35c60c8e672985853769e79a552c60 files/e2fsprogs-1.39-ext4-prototypes.patch 521
 AUX e2fsprogs-1.39-libintl.patch 349 RMD160 af61d02d49ca9653c01c3b318a22adcff5202746 SHA1 93d8272d21c9afc7629243cf46660e67aefdda58 SHA256 d78ef6bc941230136b5b8e877364e7d8c5cdfa476b27d2931798bdfd485125f2
 MD5 f2055563a3d07e89731cb194126c6d66 files/e2fsprogs-1.39-libintl.patch 349
 RMD160 af61d02d49ca9653c01c3b318a22adcff5202746 files/e2fsprogs-1.39-libintl.patch 349
@@ -29,20 +33,24 @@ AUX e2fsprogs-1.39-parse-types.patch 1117 RMD160 5858224739c494ae2e31507b217594c
 MD5 29853daadd9ea0d27abcc57e46d48e25 files/e2fsprogs-1.39-parse-types.patch 1117
 RMD160 5858224739c494ae2e31507b217594cd1bf0440f files/e2fsprogs-1.39-parse-types.patch 1117
 SHA256 f5741d617739d3e04e516bb0c22f385bdc01f598d181c50247f30cb4442d4fdd files/e2fsprogs-1.39-parse-types.patch 1117
+AUX e2fsprogs-1.39-util-strptime.patch 178 RMD160 04d8e04d5e04f9a927a76b36a072c50fb80eae84 SHA1 95d1dd6b457c374a801bfbdddbf8603cbaeeecf3 SHA256 fa300c80bbd679967ff74c361b63a9610f911b0916eff38fd491b797c0ff99c5
+MD5 1fafebe6571f92773e2773deef654d16 files/e2fsprogs-1.39-util-strptime.patch 178
+RMD160 04d8e04d5e04f9a927a76b36a072c50fb80eae84 files/e2fsprogs-1.39-util-strptime.patch 178
+SHA256 fa300c80bbd679967ff74c361b63a9610f911b0916eff38fd491b797c0ff99c5 files/e2fsprogs-1.39-util-strptime.patch 178
 DIST e2fsprogs-1.39.tar.gz 3695111 RMD160 67e77a7cbf0e719fa8b5a8ac6285b334e1c3481b SHA1 c2dad0c9bd76701eafe3804e2a7d072aa198f046 SHA256 dc2033447e69a1612881151f6f163e8a3b80e51d16f5e8b3576f3f8ccb325ea3
 DIST ext4-e2fsprogs-1.39.patch.tar 716800 RMD160 5b20e7f2133e7339d22ee85d39c92cd7af920bb9 SHA1 fce15f60164a6c067c0d5a50cf00d4716e9a4f92 SHA256 0472210d002808f1505f96b1ca0e667f3cc2a6d585bca7d9a00130d6fe0ca38e
-EBUILD e2fsprogs-1.39-r1.ebuild 4308 RMD160 e17ba4c4f2876c77cb9b07dd69f48ac759eedb27 SHA1 114772bbed65e56f10e1313b5861c67286670708 SHA256 4aac8f8dc06fc676dc8e3a50c8a209c5a69705adca612be73bba91096c60c88f
-MD5 048f749d57d360d09ff6a01922a8a358 e2fsprogs-1.39-r1.ebuild 4308
-RMD160 e17ba4c4f2876c77cb9b07dd69f48ac759eedb27 e2fsprogs-1.39-r1.ebuild 4308
-SHA256 4aac8f8dc06fc676dc8e3a50c8a209c5a69705adca612be73bba91096c60c88f e2fsprogs-1.39-r1.ebuild 4308
+EBUILD e2fsprogs-1.39-r1.ebuild 4424 RMD160 a3f2e01fdc290c67c5d63ef3904de14b6e03ab32 SHA1 6763474de5c237de8793bea52b2956be5d712fb4 SHA256 afc3cc3d1e00fac64c2b99c624ebc957611a77ecf83360ca0de7fe6d3e6c4e4b
+MD5 163869eeac06a292d91f31443fc30af3 e2fsprogs-1.39-r1.ebuild 4424
+RMD160 a3f2e01fdc290c67c5d63ef3904de14b6e03ab32 e2fsprogs-1.39-r1.ebuild 4424
+SHA256 afc3cc3d1e00fac64c2b99c624ebc957611a77ecf83360ca0de7fe6d3e6c4e4b e2fsprogs-1.39-r1.ebuild 4424
 EBUILD e2fsprogs-1.39.ebuild 4141 RMD160 5f90fae381443c034a41780c60022ed222b24dad SHA1 32a2e489712a128c26d56cf996d3d3fcaaa03f4d SHA256 1e74cf68c3505cb180fe4f84c04108132612df0d12827a2de3664d1615c95102
 MD5 ade8d4226efba62853b80a0f638f7d23 e2fsprogs-1.39.ebuild 4141
 RMD160 5f90fae381443c034a41780c60022ed222b24dad e2fsprogs-1.39.ebuild 4141
 SHA256 1e74cf68c3505cb180fe4f84c04108132612df0d12827a2de3664d1615c95102 e2fsprogs-1.39.ebuild 4141
-MISC ChangeLog 15419 RMD160 349bad608661333171980c4646e6fe6a7c913f9e SHA1 0d1d869de06b5f6a04a8d01d49ef2498e5706c44 SHA256 dba08ef71e21d944667fff908db85df74afb12adb965a820715f744c74530de7
-MD5 3cb6a3fbfb308d1934818e0c0346d72f ChangeLog 15419
-RMD160 349bad608661333171980c4646e6fe6a7c913f9e ChangeLog 15419
-SHA256 dba08ef71e21d944667fff908db85df74afb12adb965a820715f744c74530de7 ChangeLog 15419
+MISC ChangeLog 15611 RMD160 2838ef4b0ea4b01b3ff2d7921921302469d7e47d SHA1 b337730698bdc6cac322bf7a04fbd772199bbe8f SHA256 dc29ea334b4554d4b33a91ddac30d2bec293ddd7aaef9030cce11765f9d38548
+MD5 bbcd26f5363a562c7b22a722212847f3 ChangeLog 15611
+RMD160 2838ef4b0ea4b01b3ff2d7921921302469d7e47d ChangeLog 15611
+SHA256 dc29ea334b4554d4b33a91ddac30d2bec293ddd7aaef9030cce11765f9d38548 ChangeLog 15611
 MISC metadata.xml 164 RMD160 f43cbec30b7074319087c9acffdb9354b17b0db3 SHA1 9c213f5803676c56439df3716be07d6692588856 SHA256 f5f2891f2a4791cd31350bb2bb572131ad7235cd0eeb124c9912c187ac10ce92
 MD5 9a09f8d531c582e78977dbfd96edc1f2 metadata.xml 164
 RMD160 f43cbec30b7074319087c9acffdb9354b17b0db3 metadata.xml 164
@@ -54,9 +62,9 @@ MD5 b9dfcbb27ee58be28e401b8a17bccc0d files/digest-e2fsprogs-1.39-r1 515
 RMD160 7b999a2cd6bb72521fedc467433e23f7d9bde740 files/digest-e2fsprogs-1.39-r1 515
 SHA256 031d234c293c7df0edc6d603c55f54ee8880a322532f0a2c7f98877e2eae189a files/digest-e2fsprogs-1.39-r1 515
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.6 (GNU/Linux)
+Version: GnuPG v2.0.1 (GNU/Linux)
 
-iD8DBQFFlbWj8bi6rjpTunYRArtuAKC3JksoBrfc15DXcJ9yltY4W6+gqwCgqcLU
-Gjs/nNjkg1hvisfh69mgXeU=
-=bY7K
+iD8DBQFFrZ1K8bi6rjpTunYRAnbxAJ0XYM+AOX0zi+09+i1n/3YulT7dFgCgzuYz
+xw6cx/ZJurl7CnLKZvEXy2c=
+=14/d
 -----END PGP SIGNATURE-----

diff --git a/sys-fs/e2fsprogs/e2fsprogs-1.39-r1.ebuild b/sys-fs/e2fsprogs/e2fsprogs-1.39-r1.ebuild
index d3e717d04dd9b74d203a0de8e1a91708733d8ddf..16246e2fb751d56d9f509ff7f242017f77d7b0e8 100644 (file)
--- a/sys-fs/e2fsprogs/e2fsprogs-1.39-r1.ebuild
+++ b/sys-fs/e2fsprogs/e2fsprogs-1.39-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2006 Gentoo Foundation
+# Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/e2fsprogs/e2fsprogs-1.39-r1.ebuild,v 1.1 2006/12/30 00:40:04 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/e2fsprogs/e2fsprogs-1.39-r1.ebuild,v 1.2 2007/01/17 03:50:59 vapier Exp $
 
 inherit eutils flag-o-matic toolchain-funcs
 
@@ -41,6 +41,7 @@ src_unpack() {
        epatch "${FILESDIR}"/${PN}-1.38-locale.patch #131462
        # Fix a cosmetic error in mk_cmds's help output.
        epatch "${FILESDIR}"/e2fsprogs-1.32-mk_cmds-cosmetic.patch
+       epatch "${FILESDIR}"/e2fsprogs-1.39-util-strptime.patch
        chmod u+w po/*.po # Userpriv fix #27348
        # Clean up makefile to suck less
        epatch "${FILESDIR}"/e2fsprogs-1.39-makefile.patch
@@ -49,6 +50,7 @@ src_unpack() {
        epatch "${FILESDIR}"/${PN}-1.39-libintl.patch
        # Add ext4 support #156697
        epatch $(sed -e 's:^:patches/:g' patches/series)
+       epatch "${FILESDIR}"/e2fsprogs-1.39-ext4-prototypes.patch
 
        # kernel headers use the same defines as e2fsprogs and can cause issues #48829
        sed -i \

diff --git a/sys-fs/e2fsprogs/files/e2fsprogs-1.39-ext4-prototypes.patch b/sys-fs/e2fsprogs/files/e2fsprogs-1.39-ext4-prototypes.patch
new file mode 100644 (file)
index 0000000..0da1bbf
--- /dev/null
+++ b/sys-fs/e2fsprogs/files/e2fsprogs-1.39-ext4-prototypes.patch
@@ -0,0 +1,12 @@
+--- e2fsprogs-1.39/lib/ext2fs/ext2fs.h
++++ e2fsprogs-1.39/lib/ext2fs/ext2fs.h
+@@ -963,6 +963,9 @@
+                                  int bufsize);
+ extern void ext2fs_swap_inode(ext2_filsys fs,struct ext2_inode *t,
+                             struct ext2_inode *f, int hostorder);
++extern void ext2fs_swap_extent(struct ext4_extent *ex);
++extern void ext2fs_swap_extent_index(struct ext4_extent_idx *ix);
++extern void ext2fs_swap_extent_header(struct ext4_extent_header *eh);
+ 
+ /* valid_blk.c */
+ extern int ext2fs_inode_has_valid_blocks(struct ext2_inode *inode);

diff --git a/sys-fs/e2fsprogs/files/e2fsprogs-1.39-util-strptime.patch b/sys-fs/e2fsprogs/files/e2fsprogs-1.39-util-strptime.patch
new file mode 100644 (file)
index 0000000..53d85db
--- /dev/null
+++ b/sys-fs/e2fsprogs/files/e2fsprogs-1.39-util-strptime.patch
@@ -0,0 +1,10 @@
+--- e2fsprogs-1.39/debugfs/util.c
++++ e2fsprogs-1.39/debugfs/util.c
+@@ -6,6 +6,7 @@
+  *
+  */
+ 
++#define _GNU_SOURCE
+ #include <stdio.h>
+ #include <unistd.h>
+ #include <stdlib.h>