diff --git a/sdk_container/src/third_party/portage-stable/metadata/md5-cache/sys-fs/e2fsprogs-1.42.10 b/sdk_container/src/third_party/portage-stable/metadata/md5-cache/sys-fs/e2fsprogs-1.42.10 deleted file mode 100644 index a15ef207e0..0000000000 --- a/sdk_container/src/third_party/portage-stable/metadata/md5-cache/sys-fs/e2fsprogs-1.42.10 +++ /dev/null @@ -1,13 +0,0 @@ -DEFINED_PHASES=compile configure install preinst prepare -DEPEND=~sys-libs/e2fsprogs-libs-1.42.10 >=sys-apps/util-linux-2.16 nls? ( virtual/libintl ) nls? ( sys-devel/gettext ) virtual/pkgconfig sys-apps/texinfo !=sys-devel/automake-1.14.1:1.14 >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 -DESCRIPTION=Standard EXT2/EXT3/EXT4 filesystem utilities -EAPI=4 -HOMEPAGE=http://e2fsprogs.sourceforge.net/ -IUSE=nls static-libs elibc_FreeBSD -KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 -x86-fbsd ~amd64-linux ~arm-linux ~x86-linux -LICENSE=GPL-2 BSD -RDEPEND=~sys-libs/e2fsprogs-libs-1.42.10 >=sys-apps/util-linux-2.16 nls? ( virtual/libintl ) -SLOT=0 -SRC_URI=mirror://sourceforge/e2fsprogs/e2fsprogs-1.42.10.tar.gz -_eclasses_=autotools a9597abac7226d89ad9d010abeef6cfb eutils 9fb270e417e0e83d64ca52586c4a79de flag-o-matic c9602887773166fe300444712fc7ff98 libtool 52d0e17251d04645ffaa61bfdd858944 multilib 62927b3db3a589b0806255f3a002d5d3 toolchain-funcs 42408102d713fbad60ca21349865edb4 -_md5_=1aba262a58bc0cd7ad462a065a7adb6f diff --git a/sdk_container/src/third_party/portage-stable/metadata/md5-cache/sys-fs/e2fsprogs-1.42.11 b/sdk_container/src/third_party/portage-stable/metadata/md5-cache/sys-fs/e2fsprogs-1.42.11 deleted file mode 100644 index 802ff78bbe..0000000000 --- a/sdk_container/src/third_party/portage-stable/metadata/md5-cache/sys-fs/e2fsprogs-1.42.11 +++ /dev/null @@ -1,13 +0,0 @@ -DEFINED_PHASES=compile configure install preinst prepare -DEPEND=~sys-libs/e2fsprogs-libs-1.42.11 >=sys-apps/util-linux-2.16 nls? ( virtual/libintl ) nls? ( sys-devel/gettext ) virtual/pkgconfig sys-apps/texinfo !=sys-devel/automake-1.14.1:1.14 >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 -DESCRIPTION=Standard EXT2/EXT3/EXT4 filesystem utilities -EAPI=4 -HOMEPAGE=http://e2fsprogs.sourceforge.net/ -IUSE=nls static-libs elibc_FreeBSD -KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 -x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~m68k-mint -LICENSE=GPL-2 BSD -RDEPEND=~sys-libs/e2fsprogs-libs-1.42.11 >=sys-apps/util-linux-2.16 nls? ( virtual/libintl ) -SLOT=0 -SRC_URI=mirror://sourceforge/e2fsprogs/e2fsprogs-1.42.11.tar.gz elibc_mintlib? ( mirror://gentoo/e2fsprogs-1.42.9-mint-r1.patch.xz ) -_eclasses_=autotools a9597abac7226d89ad9d010abeef6cfb eutils 9fb270e417e0e83d64ca52586c4a79de flag-o-matic c9602887773166fe300444712fc7ff98 libtool 52d0e17251d04645ffaa61bfdd858944 multilib 62927b3db3a589b0806255f3a002d5d3 toolchain-funcs 42408102d713fbad60ca21349865edb4 -_md5_=9ef81018b43c45fae31074ba54cdae65 diff --git a/sdk_container/src/third_party/portage-stable/metadata/md5-cache/sys-fs/e2fsprogs-1.42.12 b/sdk_container/src/third_party/portage-stable/metadata/md5-cache/sys-fs/e2fsprogs-1.42.12 index 4e7679a5c8..2b9b9f806f 100644 --- a/sdk_container/src/third_party/portage-stable/metadata/md5-cache/sys-fs/e2fsprogs-1.42.12 +++ b/sdk_container/src/third_party/portage-stable/metadata/md5-cache/sys-fs/e2fsprogs-1.42.12 @@ -1,13 +1,13 @@ -DEFINED_PHASES=compile configure install preinst prepare -DEPEND=~sys-libs/e2fsprogs-libs-1.42.12 >=sys-apps/util-linux-2.16 nls? ( virtual/libintl ) nls? ( sys-devel/gettext ) virtual/pkgconfig sys-apps/texinfo !=sys-devel/automake-1.14.1:1.14 >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 +DEFINED_PHASES=compile configure install prepare +DEPEND=~sys-libs/e2fsprogs-libs-1.42.12 >=sys-apps/util-linux-2.16 nls? ( virtual/libintl ) nls? ( sys-devel/gettext ) virtual/pkgconfig sys-apps/texinfo DESCRIPTION=Standard EXT2/EXT3/EXT4 filesystem utilities EAPI=4 HOMEPAGE=http://e2fsprogs.sourceforge.net/ IUSE=nls static-libs elibc_FreeBSD -KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 -x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~m68k-mint +KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 -x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~m68k-mint LICENSE=GPL-2 BSD RDEPEND=~sys-libs/e2fsprogs-libs-1.42.12 >=sys-apps/util-linux-2.16 nls? ( virtual/libintl ) SLOT=0 SRC_URI=mirror://sourceforge/e2fsprogs/e2fsprogs-1.42.12.tar.gz elibc_mintlib? ( mirror://gentoo/e2fsprogs-1.42.9-mint-r1.patch.xz ) -_eclasses_=autotools a9597abac7226d89ad9d010abeef6cfb eutils 9fb270e417e0e83d64ca52586c4a79de flag-o-matic c9602887773166fe300444712fc7ff98 libtool 52d0e17251d04645ffaa61bfdd858944 multilib 62927b3db3a589b0806255f3a002d5d3 toolchain-funcs 42408102d713fbad60ca21349865edb4 -_md5_=0c61398a6428c1732423ffc2db5e2e8a +_eclasses_=eutils 9fb270e417e0e83d64ca52586c4a79de flag-o-matic c9602887773166fe300444712fc7ff98 multilib 62927b3db3a589b0806255f3a002d5d3 toolchain-funcs 42408102d713fbad60ca21349865edb4 +_md5_=6cbfa33bac8733f4d5e8ab6d0f5e112c diff --git a/sdk_container/src/third_party/portage-stable/metadata/md5-cache/sys-fs/e2fsprogs-1.42.13 b/sdk_container/src/third_party/portage-stable/metadata/md5-cache/sys-fs/e2fsprogs-1.42.13 new file mode 100644 index 0000000000..331043d40d --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/metadata/md5-cache/sys-fs/e2fsprogs-1.42.13 @@ -0,0 +1,13 @@ +DEFINED_PHASES=compile configure install prepare +DEPEND=~sys-libs/e2fsprogs-libs-1.42.13 >=sys-apps/util-linux-2.16 nls? ( virtual/libintl ) nls? ( sys-devel/gettext ) virtual/pkgconfig sys-apps/texinfo +DESCRIPTION=Standard EXT2/EXT3/EXT4 filesystem utilities +EAPI=4 +HOMEPAGE=http://e2fsprogs.sourceforge.net/ +IUSE=nls static-libs elibc_FreeBSD +KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 -x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~m68k-mint +LICENSE=GPL-2 BSD +RDEPEND=~sys-libs/e2fsprogs-libs-1.42.13 >=sys-apps/util-linux-2.16 nls? ( virtual/libintl ) +SLOT=0 +SRC_URI=mirror://sourceforge/e2fsprogs/e2fsprogs-1.42.13.tar.gz elibc_mintlib? ( mirror://gentoo/e2fsprogs-1.42.9-mint-r1.patch.xz ) +_eclasses_=eutils 9fb270e417e0e83d64ca52586c4a79de flag-o-matic c9602887773166fe300444712fc7ff98 multilib 62927b3db3a589b0806255f3a002d5d3 toolchain-funcs 42408102d713fbad60ca21349865edb4 +_md5_=9760bb8fd0c9e5c180bb9d68c5f540ef diff --git a/sdk_container/src/third_party/portage-stable/metadata/md5-cache/sys-fs/e2fsprogs-1.42.7 b/sdk_container/src/third_party/portage-stable/metadata/md5-cache/sys-fs/e2fsprogs-1.42.7 deleted file mode 100644 index 60473aece7..0000000000 --- a/sdk_container/src/third_party/portage-stable/metadata/md5-cache/sys-fs/e2fsprogs-1.42.7 +++ /dev/null @@ -1,13 +0,0 @@ -DEFINED_PHASES=compile configure install preinst prepare setup -DEPEND=~sys-libs/e2fsprogs-libs-1.42.7 >=sys-apps/util-linux-2.16 nls? ( virtual/libintl ) nls? ( sys-devel/gettext ) virtual/pkgconfig sys-apps/texinfo -DESCRIPTION=Standard EXT2/EXT3/EXT4 filesystem utilities -EAPI=3 -HOMEPAGE=http://e2fsprogs.sourceforge.net/ -IUSE=nls static-libs elibc_FreeBSD -KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 -x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x86-macos ~m68k-mint -LICENSE=GPL-2 BSD -RDEPEND=~sys-libs/e2fsprogs-libs-1.42.7 >=sys-apps/util-linux-2.16 nls? ( virtual/libintl ) -SLOT=0 -SRC_URI=mirror://sourceforge/e2fsprogs/e2fsprogs-1.42.7.tar.gz -_eclasses_=eutils 9fb270e417e0e83d64ca52586c4a79de flag-o-matic c9602887773166fe300444712fc7ff98 multilib 62927b3db3a589b0806255f3a002d5d3 toolchain-funcs 42408102d713fbad60ca21349865edb4 -_md5_=7df2de5a06a4d77f8012459445036312 diff --git a/sdk_container/src/third_party/portage-stable/sys-fs/e2fsprogs/ChangeLog b/sdk_container/src/third_party/portage-stable/sys-fs/e2fsprogs/ChangeLog index 9922390647..c7b94c0412 100644 --- a/sdk_container/src/third_party/portage-stable/sys-fs/e2fsprogs/ChangeLog +++ b/sdk_container/src/third_party/portage-stable/sys-fs/e2fsprogs/ChangeLog @@ -1,6 +1,99 @@ # ChangeLog for sys-fs/e2fsprogs -# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sys-fs/e2fsprogs/ChangeLog,v 1.298 2014/10/27 01:38:27 vapier Exp $ +# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/sys-fs/e2fsprogs/ChangeLog,v 1.321 2015/07/23 09:35:36 ago Exp $ + + 23 Jul 2015; Agostino Sarubbo e2fsprogs-1.42.13.ebuild: + Stable for sparc, wrt bug #540536 + + 23 Jul 2015; Agostino Sarubbo e2fsprogs-1.42.13.ebuild: + Stable for ppc, wrt bug #540536 + + 22 Jul 2015; Mikle Kolyada e2fsprogs-1.42.13.ebuild: + ia64 stable wrt bug #540536 + + 18 Jul 2015; Markus Meier e2fsprogs-1.42.13.ebuild: + arm stable, bug #540536 + + 17 Jul 2015; Mikle Kolyada e2fsprogs-1.42.13.ebuild: + x86 stable wrt bug #540536 + + 17 Jul 2015; Jeroen Roovers e2fsprogs-1.42.13.ebuild: + Stable for HPPA PPC64 (bug #540536). + + 16 Jul 2015; Mikle Kolyada e2fsprogs-1.42.13.ebuild: + amd64 stable wrt bug #540536 + + 16 Jul 2015; Tobias Klausmann e2fsprogs-1.42.13.ebuild: + Stable on alpha, bug 540536 + + 07 Jul 2015; Lars Wendler + -e2fsprogs-1.42.10.ebuild: + Removed vulnerable version. + + 25 May 2015; Mike Frysinger e2fsprogs-1.42.10.ebuild, + e2fsprogs-1.42.12.ebuild, e2fsprogs-1.42.13.ebuild, + files/e2fsprogs-1.42.10-fix-build-cflags.patch, + files/e2fsprogs-1.42.13-fix-build-cflags.patch: + Change build-cflags patch to apply to configure since it is super tiny and the + other modifications in src_prepare expect to patch the generated autotools + #549926 by Patrick McLean. + + 25 May 2015; Mike Frysinger e2fsprogs-1.42.10.ebuild, + e2fsprogs-1.42.12.ebuild, e2fsprogs-1.42.13.ebuild, + files/e2fsprogs-1.42.10-fix-build-cflags.patch, + files/e2fsprogs-1.42.13-fix-build-cflags.patch: + Add missing documentation on build-cflags patch #516854 by Ian Stakenvicius. + + 21 May 2015; Anthony G. Basile + +files/e2fsprogs-1.42.10-e2fsck-fix-makefile-dependency.patch: + Restore missing patch. + +*e2fsprogs-1.42.10 (21 May 2015) + + 21 May 2015; Anthony G. Basile + +e2fsprogs-1.42.10.ebuild: + Readd 1.42.10 because of bug #548950. + +*e2fsprogs-1.42.13 (19 May 2015) + + 19 May 2015; Lars Wendler -e2fsprogs-1.42.7.ebuild, + -e2fsprogs-1.42.10.ebuild, -e2fsprogs-1.42.11.ebuild, + +e2fsprogs-1.42.13.ebuild, -files/e2fsprogs-1.41.12-darwin-makefile.patch, + -files/e2fsprogs-1.41.12-mint-blkid.patch, -files/e2fsprogs-1.41-mint.patch, + -files/e2fsprogs-1.42.7-libext2fs-fix-return-value.patch, + -files/e2fsprogs-1.42.10-e2fsck-fix-makefile-dependency.patch, + -files/e2fsprogs-1.42.11-prototypes.patch, + +files/e2fsprogs-1.42.13-fix-build-cflags.patch: + Version bump. Removed old. + + 04 Apr 2015; Mike Frysinger e2fsprogs-1.42.12.ebuild: + Mark arm64/m68k/s390/sh stable. + + 22 Feb 2015; Mike Frysinger e2fsprogs-1.42.10.ebuild, + e2fsprogs-1.42.11.ebuild, e2fsprogs-1.42.12.ebuild: + Drop /etc/mtab test logic from pkg_preinst too #516972#2 by Arfrever Frehtes + Taifersar Arahesis. + + 16 Feb 2015; Mikle Kolyada e2fsprogs-1.42.12.ebuild: + alpha/ia64 stable wrt bug #538930 + + 16 Feb 2015; Agostino Sarubbo e2fsprogs-1.42.12.ebuild: + Stable for sparc, wrt bug #538930 + + 10 Feb 2015; Agostino Sarubbo e2fsprogs-1.42.12.ebuild: + Stable for x86, wrt bug #538930 + + 10 Feb 2015; Agostino Sarubbo e2fsprogs-1.42.12.ebuild: + Stable for amd64, wrt bug #538930 + + 09 Feb 2015; Anthony G. Basile e2fsprogs-1.42.12.ebuild: + Stable on arm, bug #538930. + + 09 Feb 2015; Anthony G. Basile e2fsprogs-1.42.12.ebuild: + Stable for ppc/ppc64, bug #538930. + + 06 Feb 2015; Jeroen Roovers e2fsprogs-1.42.12.ebuild: + Stable for HPPA (bug #538930). 27 Oct 2014; Mike Frysinger e2fsprogs-1.42.10.ebuild: Mark s390/sh/m68k stable. diff --git a/sdk_container/src/third_party/portage-stable/sys-fs/e2fsprogs/Manifest b/sdk_container/src/third_party/portage-stable/sys-fs/e2fsprogs/Manifest index 87c148be52..10c9df0e9c 100644 --- a/sdk_container/src/third_party/portage-stable/sys-fs/e2fsprogs/Manifest +++ b/sdk_container/src/third_party/portage-stable/sys-fs/e2fsprogs/Manifest @@ -5,44 +5,36 @@ AUX 0001-resize2fs-Fix-error-message-so-the-mountpoint-is-pri.patch 1251 SHA256 AUX e2fsck.conf 138 SHA256 c2864aa7c5c5bf27227909bdb9af395fc07294d1f93d372ef10c79309d7aec08 SHA512 d10a8ef566a60815b6f65414d84d23f3ec535c2a93cd780d4425488465f4eff6910c20d0163d1b7d334e9f4c707beab35bf63078b9ec3a5602763ea219bddbef WHIRLPOOL b05c69b375411efe850a993a244e26513d6e4a8c1cfb3ea91617a283c819a47f2200a459849285a0e60288e86869d624aeee0589f4a6b9243572c500671f3b31 AUX e2fsprogs-1.38-tests-locale.patch 656 SHA256 7d12df7c4f00f1c1c81dcbd74cc0f8c1cffaa3b5089fbaa40222a7a9f2fbe598 SHA512 ac15d1c0d0e56a53429c722049f73fdcc01134085993cbd7f7fe555faa6fb5ca6347ce721a43cf68ed2170e44f6330bfd168b4163b07091241b731e4b539b73b WHIRLPOOL 148c248d02a798402b99c4818ca404102ca1d5db64e82f8842928d488231a523e4db6f9b9ccee19ab1f0a130b73d6015eca67d6ef581858befa76d9dd4338766 AUX e2fsprogs-1.40-fbsd.patch 352 SHA256 52865c6600fa0f601a89e4396797ae2d23a1ed895e64b098c36e8bcab1ac8505 SHA512 86374e641f958d7c4b53eb44abf7933af064b55a38fef6ca26f848bb63f0c6bf2966852c7cf0770337aef95ff965de95ef282205771e86be36e7ad74e8f81146 WHIRLPOOL b8889db0ced2312a06cbf2ca135340a9cb6c88aa0e3fc467f4cb4dc3c40c90f4be57d1678a735ef42a1d4b8313bcd1a3130d899cf5e9af39bfd13a37d1b1d449 -AUX e2fsprogs-1.41-mint.patch 39366 SHA256 5a0027d6897cbe025ea393daac8e2ad9f5e887e2a1a22409f31e663edc6c4976 SHA512 c87421a5c45a60b0e7820a4f78d310d0a4aab6685cda3a262355fa8dd9d374254e6d198e2138f0707f1b40a256964f86cc6e4ccdf1cde078e6f1e95408168aba WHIRLPOOL cda64d1ee27cf9bc78b2de9a032e4b259318992c689b6621abf37c06475353d5366d351a70db7f4592c5f5ae9241f929d3a20c7f974c026704df313bf15339e7 -AUX e2fsprogs-1.41.12-darwin-makefile.patch 3967 SHA256 d1b5718b965ff1e9be820082827b2685efd3a4d3dac16e41b283647f790ec5b0 SHA512 e7028b06059904fd67363350ac89b886b23bdae9b5afdb9f66bfc4ac91db4578db248f0731cce89b313f0eb4bbd90d971b7d331dc7614acf8a557184452b9f91 WHIRLPOOL d65b5ce185a1e1c7a0dd996bcecdfe2831f67656974c4f4a8d0e5dbcca751e18f36e95b06c2fb6be3aa4e595ed0bccad9f2368e409b027b8c7316e25ed0ec63e -AUX e2fsprogs-1.41.12-mint-blkid.patch 1522 SHA256 158c94152e81e065499fbd365a5915b54eabd2a5789440360259104de37cef60 SHA512 07124e568e4bddefb977727300968fe1e9b5b5e6ce82ec08d4010e2e79ccae09fd9fa9607037447c6137a5bc0cb4c334f0491d592d71eabfbf0a646c001e073f WHIRLPOOL 3597da11daad99d6ec057572acb9a09a35be8f8dfd762afee502e3fea444174fab3fc3dcc7cde0a4810720ba282c906125afd6395eaa84d19a666175a5b3dcb5 AUX e2fsprogs-1.41.5-makefile.patch 3253 SHA256 7d2d075a475e47d90dd181fdaaf6554b80939802e7bf161fcd6b72d2b1510b10 SHA512 096579bf4bf3dd1ae32ce9c03111f143a750cb6ee3a46e153ddb834505e62978920c9ad07719beaa1a7d713e95eb26f2587f87003a2c6786ed7db3709cf15f41 WHIRLPOOL c03540de2dcaeb304be6e58f50260a399051de627cb639d927499eb29e7234752bc232ff8fa68dbcf8e1661d8887835b8f0f70be7843cbd1bec09295e01756c9 AUX e2fsprogs-1.41.8-makefile.patch 317 SHA256 f8a4e2180f557c3bb9a50c38300e406420b3df296f50d6eab59d0b28cb65904d SHA512 dbd738affe910d3812ca4d969a6d4295b09abc413cab23f29dcbd0c1e82eefa095a61a377c494dd9b7e1d189d4edadc469dbf2d1a1068c11dd5fc8311bd83f8f WHIRLPOOL f81ecb87217bb312bbbb08357f76b2d5d7c2dc9cdee69d37e67e7b34632f4a3f3d2bab66aa600fa98776808b30cada735de05135ac60a5c2f9b59daf88b7eb53 AUX e2fsprogs-1.42.10-e2fsck-fix-makefile-dependency.patch 1285 SHA256 a1090094da6b858d51d7a8d2d03ec96b97468672785a824cef774c5d0090da30 SHA512 a892e92fbe1e1238b72cd5b53d9825c5bd2116aeb0b1fb9eb60a14bc984a16b65624265d108ffc0f9e638a773b655999eb3ec0056c46084b4291ff639a3c72ef WHIRLPOOL 20d7b4d36774e4bfd52f37d06b98fb13245a820e4d9bac54e33846e90451a94aa510d08649e035791a9ca301fc883043415eb8e4726cb21653c29a20e38003b8 -AUX e2fsprogs-1.42.10-fix-build-cflags.patch 370 SHA256 11871291de4605c6a469327e698e51a611c786451ef3ecedf20bcdef75c9e50a SHA512 a268390656dbc6ff5217efce5d38686de70de8d2c566b117a53c42fd829178ab07f300e10017623dc3931084214ded620e05500992ff8371d47c2d90764f58b7 WHIRLPOOL be6a71d843a1f9250e0fcb4ffc7ac0d4c2eb5e56749bbb9fa4da6eed181270c3cff2a36241738beb959959bb9de8ceba079cbdde844f16d5e302c4ab84eb2e71 -AUX e2fsprogs-1.42.11-prototypes.patch 3473 SHA256 bb4f0bf7be6b28c8be5162ee311ca9eaf6e9ec4d204c458e3543c22c4f2c2958 SHA512 6d44ddf4677d056113ef25515c8fbba65447df61354c0c02cfc3f86979a798f7ab9a41182a04feb86eaf48a31add4dddf0663dc2ac2c637a6f91f4f9808d82ca WHIRLPOOL 3cf51c8099bcb444e35ec6500efeeb17a9eae5b893bc01359f722f3d9645a6dec1676696e594819b72a0e2c4208b1a2c6b9b6b9b147383fdb7a057927eb9c79d -AUX e2fsprogs-1.42.7-libext2fs-fix-return-value.patch 1082 SHA256 8cabc57993ef8c03636a645c1415db7ed0e56a24cca261dae2aec5be91940940 SHA512 f2874dcccfdbd4604b178920e839fe66d63a5d3f433d5bacf0ccfbbcbc0c64eced2a861c7e024fcfaf86d15f6ef6e12edeb27af1b4eb8670ad0b9281e563e472 WHIRLPOOL c74b28d1351c8309398704a22c4dec167a3a9569da293e04198171eba637e846e8f3a3073d571ffc2f985e4ee23ad03a48ed55c3f6da7d20cd063187ae9ab05c +AUX e2fsprogs-1.42.10-fix-build-cflags.patch 302 SHA256 757d0307ad5dcdd1b30b2c64918a675e1883f15c001ff07f97acd2352691e3ed SHA512 058826bb2684a00f7b0cdd8c3e4578c2d2428c3685f2514d098d8c702b83218681c4be3968ef9ac993b6abe66da5f092a8222ffff27423f45f3d48c4a33a61fd WHIRLPOOL d7e6c28a05d72f99a8eb039be3a3b14dce72fc9bbae31b3fddf89a51f140e231cbfed72e835ac1f21c07f340a3dfafcfc7274b42ce3b270e90e095b007d4927d +AUX e2fsprogs-1.42.13-fix-build-cflags.patch 290 SHA256 3dc8246ee1d00d1ff4652aad0c4768d8a94317a5e8580507da33d23d8dbcf622 SHA512 fed2a8502fafb56a21c88d680a42848bdc8921b228f74842ce3f702279917b6e6c0d1204ee060ea0d2d5ebb02465fc1f3d1a4304068a59b45bf1ddfbdfd46507 WHIRLPOOL d68c4944734a67320a75f8e951b714b3fda08b220680797412ce946bb3c4f531074e4e8417ae92afec5b3d997ac20322f6e87c328b9269ef497a9a33da2c48e7 AUX fsck_ext2fs.8 3806 SHA256 fc1155e67f17aebc8762d75a25d25511a1463be3da05baf7a322d0b5f91938e0 SHA512 eacd1968267f320587e01f75a66ceaa5a9b899f368686df893b6335c25ce8f304ebb5852df6f1b22a125642720ab110fc3b0878bc3560c628e8beb3a4583ef08 WHIRLPOOL e8343c2ae959075b043998894486fa5a33d36e339e511ae22102b60c2c482900d73f3322dd2b8daf91b5009b3da0639aa192d3ff1183d31db748a1143af97a94 AUX fsck_ext2fs.c 2797 SHA256 a7c3614e76c89ab7882191c14a469789d4b5b54f3c61c5888e5bd72840816e22 SHA512 525c88a3dd9178ef2dca056db9226a2bebf537b9a333cce32f2ef82d6d7a6a56a59dfc2ebf9aa3e891d9690fde13588cf619f89d6b806405810de5dcfcf08040 WHIRLPOOL d71a13f80694a39ae2faf4fafaaf0ce342a0963ca2fb5b4bce279c9a9816139fedeefb5a3c565b6c6829a237e39b7e4dcab54aacea8b72fc3f1ab0122c667ab0 DIST e2fsprogs-1.41.7.tar.gz 4425159 SHA256 2e2eeb5201e952dd02b77f609a0e630acdbce5d2b823ec11668e34f6bfde2f2c SHA512 c17c5f23feb7747941e7f019f197cca1cd4a84c067ad27d1a578ae213c7d7274aa79f3a64c7d69515f3f94db80df01ca71d4af83e9ea84c578a7257205395f7c WHIRLPOOL f760d7e658a1c78835ca470d077c7076a21f727f7d0a2411f5428363d12b7cd1676e2f221be9d9d1f5843c25320f7ef2f896ea47c9d4dc91190e0bc7df89ef36 -DIST e2fsprogs-1.42.10.tar.gz 6126111 SHA256 7b6e85c666d8fdd6062c75ba953de0e5481673bebef5f40f749a52a46476e29f SHA512 9ac99152722af3a9de03cdbb49a3095df59c488978da825527c99c86959a6ef8edd4953a03beba491fd281cb2fc3e917504682e36c3bc7208463812788807826 WHIRLPOOL ecebefeccbb8b68ca816d02a272a882c69daeec70e8ee8260e2c021ce307509225d91da11397627cfd28258a6dcc58dbd3a6e628eb3de3882bdeafb9c99a8e4a -DIST e2fsprogs-1.42.11.tar.gz 6353078 SHA256 4bd8a770b6925c3f4ec5dce82c55774e4566cd6f3ffb5805177e3c92c8910b76 SHA512 633e686d5bc8d8d195c4522bfa206ef751ba6ab01117338523998caadfecba7fbc47ecb231d0d5518b0deef2fd587c021ad2d8fdb0eeede1ab6c90e28a709615 WHIRLPOOL 4aa1566bbba25e6d3bfb04333f2651ed199f20300a9ab34b6cfe12bdaf4db4a08df1ec95b631b6eda03cda33f87b9c489495a4f4f521daedd7bb1b2fdaf60aae DIST e2fsprogs-1.42.12.tar.gz 6381695 SHA256 e17846d91a0edd89fa59b064bde8f8e5cec5851e35f587bcccb4014dbd63186c SHA512 a4b03470ed8f3e6c353250d80807070b8d5529ce219f7ec3076af89bd7cd674fbd443aab4d07dccff74606c9f620e349da32b451e3896a0635f6c700419f7cbf WHIRLPOOL 15f85fe969b174a99f06d875afafc83cc3e85cde0d8f1d833cb045c30259b3bfa9293ee84eeb793d9c60ece2cba4ca6bacbb8c861f11f3b56bd863ca1a2296f2 -DIST e2fsprogs-1.42.7.tar.gz 5981006 SHA256 dc6501b2e75d205e425196d753d92b129c568525d8aad08085c0aa69ee9e7345 SHA512 954dbb832c2614d20cfaa5233033b469f16bf96612cf25074a66da79a5b3abf5eb1b340781e351bde06daf13bbbf5db4643774858aa494b8a8394ea742b6f07b WHIRLPOOL dd48dd13acb485eb8b8646bf4198e45e3ad8e8c6bd53b8186011a1cd2ee4a8ae7db75b6de982fd0d2f9d252f480645bd882cc95d76e614bd8bc10a36755d679c +DIST e2fsprogs-1.42.13.tar.gz 6511931 SHA256 59993ff3a44f82e504561e0ebf95e8c8fa9f9f5746eb6a7182239605d2a4e2d4 SHA512 d341790f55c3bff34425369063757280b9ba6ac08f405e14f94f299345ae76c0dc6e90871b746cc98c73467448d888fe5bc029688b5eed5fd22c3c37bf285cd0 WHIRLPOOL 2b26e355ad8e378cc7402be5fd5f5abe0af2aa6a1214b357dca682b922aa07c97af427b369ef21ddb3ee731768234a5f5faf488b92a68b0175d07845dbe7783f DIST e2fsprogs-1.42.9-mint-r1.patch.xz 9012 SHA256 3904654080b7f7776e97b703d17e1b59ae1d6f5e0cf32193b86e986bc0a9b396 SHA512 591a7c80d65082eebcdc455028be6ade05c9aae96c94f654106be0facef330a8875dae82891e6e3ad2b48dece2b4e1c1940dbc47cd3eba3e6eea3b5ddba9a8fc WHIRLPOOL ae6fc015fa77bfbde7a4ba2205c014b655e736c4ed5cb63a913245c6c40fa0637b65fa3eec6399dd1793c494892b76e0bbc12ffa6ac9c39d4da27333d8bbf6c7 EBUILD e2fsprogs-1.41.7-r1.ebuild 4157 SHA256 8bf16f0634e1fa357fc2235f22c619328c10f8d37ba22d75889ab6a1309c5a14 SHA512 cad0f30208422b49221dca0c8c31287f011b2f7a992efa265a53220f6304e0f81f5214ca03e3b885963462f5618257662f68c73b342fe9bfe4d2c27aff1722b6 WHIRLPOOL 8ea704eb90382e405092fb03564b9a947be0139d4dd09974d1838e1525c5cb5ecb976a3789c6a73eb83f3c817731ee7d5fa9d8435024109580307749a1cbc83a -EBUILD e2fsprogs-1.42.10.ebuild 3750 SHA256 1953a5a4b8dff636f95cc6c986c6957efaf1833eb067ce811cf48bff79bed01b SHA512 3a60c4f32546f6201cddbe25445dba07eb46f9a36ad7046847cb63d6fb01b4e09359b9012313d8ccbf42e3299fdd216780beb1bb95d52255b7ec3dd32fff850b WHIRLPOOL 4d083e82d445bcf2e455a69876d25a5204b33159e8ac2c6d4592bf5ca9e86b62970f9c84cff46400e1f46b268cef58793f019deabe02a1e39b6cc52f7605847a -EBUILD e2fsprogs-1.42.11.ebuild 3927 SHA256 ba3c218b98ade04c4d98dd74a457c811e2431ccf812af6810354adac1f6c9c42 SHA512 03e339cb7def10323b7d0b9d82ef53ccf78afc09ccab71112b613acfc32e077aed8d31c0c8f1bc18a4aadfc1c894ec1431b72ffa62928b96bfcd7917fb7d65dc WHIRLPOOL 68e9cc8039d15940867b961ee8ba1f6b9afdf005d4f6ef27a902ef1b44205d7270431bf77f384604a8be3631db079b7be7ad98d1b7b72f1b1676f66fe1f06a27 -EBUILD e2fsprogs-1.42.12.ebuild 3880 SHA256 5ead8a73dc11b3081502c81c41b40a433ffc428e8fc589a5e4db51f71c957ca8 SHA512 3d6021a0f3d6a5abd41d9639edc0de83888ae23aee22074c9a8a615bb8e4695c0039344e5f88aaaaa7e57c9400258fae329bebebb268db936542b67fddff05b9 WHIRLPOOL 3fd5467cc9115a8500ac66e3a25ee56fc5185a6d0d5ce0ee11475aa2df17e8c2f3c19c2e21f64cf5aee186958fc3dca6477bf78d13c03977157d624fe7bc7fdc -EBUILD e2fsprogs-1.42.7.ebuild 4352 SHA256 3a94e1adf66909468588c7c9ad908abc5dbf7e0c70f8da277e7b1f0066c69d9d SHA512 97df9b66620fde3242968e507da4e9d05ceb878abe7d01291d7198eec481c8e7a60869dde11b595d0d392bd5184e9b336fd1f831aaa563452ea9a98ebe6e4a8e WHIRLPOOL af0744c81d58e4392011266776839d9def671cdd8943ab74cd2e99f2f551a3924d0cf4b50d4163d7ce592582269128b3945516e8cb3551473220849dfc73e471 -MISC ChangeLog 44400 SHA256 9ae043e8575d613cc73928f9ab410b8a5bb210cab3dacdc53918002357699d6d SHA512 27c952703bdcc5cd8a2c96506d02252294a50724a6661e1dd119498fd2359be9b6b22310df76d372a805193e55444484b4bff0c2d3fa97f3af4fe56424a24152 WHIRLPOOL b984ef403e73f012ca19e6da98a03512d0d3ca4b54c57df819c60de2f7d9512cc0f25b2f5213d2677f5a832fa945d29ba64593ca62b988267c6208e1233c43dc -MISC metadata.xml 267 SHA256 b88609559861f59092d42a34388b78e59a1eeae8324a6f79c94fd24598c2b5a3 SHA512 979da7eb8495724d938e6445cc7878b2b484373e750a82a48cdf11b6e46257a1c1ab1cd85b08b854789ffcea5c54120cc5aaabd2f830cce2b2d0bea9de7011ee WHIRLPOOL b671ec8a7c10856e977c7cbb5b7d55b8463f0cf86ded627d9407e1099e376d6381c1a23ec5aabae788419db3187b6737f008ea7c6f2ed714c8dce2d773b8df4a +EBUILD e2fsprogs-1.42.12.ebuild 3681 SHA256 6214b2dba09e9b9f750717748a896695b3b245ea10b8ffc67b05f8a1b8cce057 SHA512 6fd357f4b2fa698c1d19651e4e4e9a7d31d099739965db2343a77b3b858cab5736afba4829de786b2e1c01ec66801bf507e3d811edd7853098e400311ec5d777 WHIRLPOOL a9f2dfcb3014941232f3eaa5dd32b5216d3555ac79f45890c693f4d41f4cbe046631a0c6abd66d6e3a9701fa95a06b2bb240d8ad7ceae24e48c7ae0f583dbd5a +EBUILD e2fsprogs-1.42.13.ebuild 3682 SHA256 36592c0e8cba64639eb56bc0ee116c919e0961c70eecee08d6399edbf81725d9 SHA512 15bb8e67557f9e11e83f478e2c90281eb2d0b6d1d39d5dd366d4238cbf886b5c5fef804b8eb56ff1eab079751c48d6ada713542fa0bf65406d0fb58a5abd9858 WHIRLPOOL 0cd7892e7f373ed46fb8ac15f7a06fda27acbf70518680bd13b2fab794ed7e4d399ef5cff4736bf78c17078242763b2aba5302dac9fa80ceb973b07115e65b32 +MISC ChangeLog 48117 SHA256 fd49ccd4dc8e7a53c8cba64fb936f960ee7c58fcf4150485321b23475a193f84 SHA512 82134fcce2aaa6bf15f3339b79b657b4e0827a132cca8c89a6521f7c6bc1246d3d55cd46d6c9adbd5b3e6f458e9f4e5e267d10f4c9929f15c9cd985949f5ee85 WHIRLPOOL ed9f1377d27424101d492f92a515cdf60f723cd6f519ea8a82b16d46ec86c7f297b8224b6d2833c83a6ca5e4c6f2140e7155beb1ce0d45f503debc51d71b9db2 +MISC metadata.xml 331 SHA256 c951ebab261c6eb78dbb1b90e7e8e63fe59847806ec7eee668806b629ba4ab32 SHA512 e06aab896567d0836c1ae005116f3ec1dbbab1b89986ea3b7095788be4cd50bb9afe2d8c3d81556bb49a9818930637c96c9de3d6024fc29e9c2aa16860d090a4 WHIRLPOOL a159b3ed9ede424a1d836add1dddff30f2ff32f0fcee62bb4353f66455d1032449ac42f5637660e37b20d0ac9f7433a1137fa3e51427cfc3b0bde054ceeedbb1 -----BEGIN PGP SIGNATURE----- Version: GnuPG v2 -iQIcBAEBCAAGBQJUTaIVAAoJEPGu1DbS6WIAxAcQAI+Iz8sG+HZIKIta6CQJcfbn -drjzVH/LZ73VOWeQd66Id1QQZDryj8HbxSopDEHWt7CQ8RzZKLXFLQG0uO4o2Q7v -V74TGz06hHkPhzJ3nRbTaj/JHQDkqmfpd9cEn1G//iZWHYzKfWfK8oU3hKzRc8qA -vsgWc1c09o183zc5chPFxWKNebeR5NdrbmrgMCzNxBhMzdESMqp0iNRVz7bemwso -Qpsz6Eer3Kjlb6QbmlLlszzqIw3XN8lFpcov3dR5TYcE1olGfZKbvUSdPmLdOazn -1LHW9R+jtiBD4cTbpkMjg/WOkmVpCpEcZbuvufU6Cqq2DVrQbA7zKHG4LJFBS5NT -HpNOQfOYjjRIIUo7SHOa4D8tOrjiSuXxjcJFvOxsQX9ogBzYL6yNuQvCE2h6ghJi -JtRcdzz17kRl2ErOOxpR8FFysyZp2oGwvZR/pT4n3SlrJiX0/ka7/nIz80nwpzSS -t6Na2Ijj74aEt2f9hmiMwTlYHfHSkcJ8VaouxmDcDkXuyKuLlB/oo9I28fVmpqW0 -c8tsnUgqxA1/8P+RD9ckggHDH/umoY6NU4pRf6sOkZrjBuhX4ayr7ReFq0CvtBfa -kT+TqKxowb7nyTU6FaHCfd0IeyFXejpGzmWHeFUnErDfpGsspi0On7nATsM9ju0I -Q/IhppDn2eZtgakT/j1j -=1LnE +iQIcBAEBCAAGBQJVsLVpAAoJELp701BxlEWfDXoP/jQzB78liXaHbcbBBYvXHf3a +MB/nJHuF/i+ah34wC+yedrT6aPUqsnKYwzi+xZ3/qQcoy2pWEdfeq3COGeoIRvmz +7XDiiEpPj45aKLsksO1xmu8lMh3XDvI5rHcoIgyz7AtPEMy9/g1FrgIyd8Nmkljk +kCbNvM/F4p3NaE7AGrGFrJSkT9wl/EaWyzYOhlOlVrut501Gv0krmWktUUrdWdnS +ewlRg5lQWMYUZyN5aLA3Ahd4Df6ChjgLJP1g2FUqU3kBA+MkfH2xPWHDxk59bKHC +fS3z3XiiOMQgRP/e6/2+K4hk37wXKEJfAOCU6y7KnH1vlF386CrbEuQ/JXO95QSw +bCn4M+1LFatCezktj20vn5opX/REsHsGBuWOJVmJbJPrklxzy8pCr0kHt6Fy8a0d +DbajlwSDlmUuhj09KEkB7paTcTv3JMCqRir2OJihi4zva+S/d4XKFbgz4ij+d872 +y9ySww3Nly10APsiv335x4bR5PZSMBgdDtkqt3Vd0fXes8udSCem1xXD6YnbxqaN +Y2N2X/1SCYKw08GCmuYCMLjaH+BwPug1kjeUwzLPF+89ecs7Tdwi0PSYxn6rxFq+ +uXYE/YAjK304KjEBMcCIHOrdDfPESl1xNXpLlUJsXDaDya+wcElAUZBdR1+GGSyX +RrFfO3a5Vzbxj8ilrwFD +=kkvh -----END PGP SIGNATURE----- diff --git a/sdk_container/src/third_party/portage-stable/sys-fs/e2fsprogs/e2fsprogs-1.42.10.ebuild b/sdk_container/src/third_party/portage-stable/sys-fs/e2fsprogs/e2fsprogs-1.42.10.ebuild deleted file mode 100644 index 6878018834..0000000000 --- a/sdk_container/src/third_party/portage-stable/sys-fs/e2fsprogs/e2fsprogs-1.42.10.ebuild +++ /dev/null @@ -1,132 +0,0 @@ -# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-fs/e2fsprogs/e2fsprogs-1.42.10.ebuild,v 1.20 2014/10/27 01:38:27 vapier Exp $ - -EAPI=4 - -case ${PV} in -*_pre*) UP_PV="${PV%_pre*}-WIP-${PV#*_pre}" ;; -*) UP_PV=${PV} ;; -esac - -inherit autotools eutils flag-o-matic multilib toolchain-funcs - -DESCRIPTION="Standard EXT2/EXT3/EXT4 filesystem utilities" -HOMEPAGE="http://e2fsprogs.sourceforge.net/" -SRC_URI="mirror://sourceforge/e2fsprogs/${PN}-${UP_PV}.tar.gz" - -LICENSE="GPL-2 BSD" -SLOT="0" -KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 -x86-fbsd ~amd64-linux ~arm-linux ~x86-linux" -IUSE="nls static-libs elibc_FreeBSD" - -RDEPEND="~sys-libs/${PN}-libs-${PV} - >=sys-apps/util-linux-2.16 - nls? ( virtual/libintl )" -DEPEND="${RDEPEND} - nls? ( sys-devel/gettext ) - virtual/pkgconfig - sys-apps/texinfo" - -S=${WORKDIR}/${P%_pre*} - -src_prepare() { - epatch "${FILESDIR}"/${PN}-1.41.8-makefile.patch - epatch "${FILESDIR}"/${PN}-1.40-fbsd.patch - epatch "${FILESDIR}"/${P}-e2fsck-fix-makefile-dependency.patch - epatch "${FILESDIR}"/${P}-fix-build-cflags.patch - - # blargh ... trick e2fsprogs into using e2fsprogs-libs - rm -rf doc - sed -i -r \ - -e 's:@LIBINTL@:@LTLIBINTL@:' \ - -e '/^(STATIC_)?LIB(COM_ERR|SS)/s:[$][(]LIB[)]/lib([^@]*)@(STATIC_)?LIB_EXT@:-l\1:' \ - -e '/^DEP(STATIC_)?LIB(COM_ERR|SS)/s:=.*:=:' \ - MCONFIG.in || die "muck libs" #122368 - sed -i -r \ - -e '/^LIB_SUBDIRS/s:lib/(et|ss)::g' \ - Makefile.in || die "remove subdirs" - ln -s $(which mk_cmds) lib/ss/ || die - - # Avoid rebuild - echo '#include_next ' > lib/ss/ss_err.h - eautoreconf -} - -src_configure() { - # Keep the package from doing silly things #261411 - export VARTEXFONTS=${T}/fonts - - # needs open64() prototypes and friends - append-cppflags -D_GNU_SOURCE - - ac_cv_path_LDCONFIG=: \ - econf \ - --with-root-prefix="${EPREFIX}/" \ - --enable-symlink-install \ - $(tc-is-static-only || echo --enable-elf-shlibs) \ - $(tc-has-tls || echo --disable-tls) \ - --without-included-gettext \ - $(use_enable nls) \ - --disable-libblkid \ - --disable-libuuid \ - --disable-quota \ - --disable-fsck \ - --disable-uuidd - if [[ ${CHOST} != *-uclibc ]] && grep -qs 'USE_INCLUDED_LIBINTL.*yes' config.{log,status} ; then - eerror "INTL sanity check failed, aborting build." - eerror "Please post your ${S}/config.log file as an" - eerror "attachment to http://bugs.gentoo.org/show_bug.cgi?id=81096" - die "Preventing included intl cruft from building" - fi -} - -src_compile() { - emake V=1 COMPILE_ET=compile_et MK_CMDS=mk_cmds - - # Build the FreeBSD helper - if use elibc_FreeBSD ; then - cp "${FILESDIR}"/fsck_ext2fs.c . - emake V=1 fsck_ext2fs - fi -} - -pkg_preinst() { - if [[ -r ${EROOT}/etc/mtab ]] ; then - if [[ $(<"${EROOT}"/etc/mtab) == "${PN} crap for src_test" ]] ; then - rm -f "${EROOT}"/etc/mtab - fi - fi -} - -src_install() { - # need to set root_libdir= manually as any --libdir options in the - # econf above (i.e. multilib) will screw up the default #276465 - emake \ - STRIP=: \ - root_libdir="${EPREFIX}/usr/$(get_libdir)" \ - DESTDIR="${D}" \ - install install-libs - dodoc README RELEASE-NOTES - - insinto /etc - doins "${FILESDIR}"/e2fsck.conf - - # Move shared libraries to /lib/, install static libraries to - # /usr/lib/, and install linker scripts to /usr/lib/. - gen_usr_ldscript -a e2p ext2fs - # configure doesn't have an option to disable static libs :/ - use static-libs || find "${D}" -name '*.a' -delete - - if use elibc_FreeBSD ; then - # Install helpers for us - into / - dosbin "${S}"/fsck_ext2fs - doman "${FILESDIR}"/fsck_ext2fs.8 - - # filefrag is linux only - rm \ - "${ED}"/usr/sbin/filefrag \ - "${ED}"/usr/share/man/man8/filefrag.8 || die - fi -} diff --git a/sdk_container/src/third_party/portage-stable/sys-fs/e2fsprogs/e2fsprogs-1.42.12.ebuild b/sdk_container/src/third_party/portage-stable/sys-fs/e2fsprogs/e2fsprogs-1.42.12.ebuild index eb30c532af..9ad06f6c7a 100644 --- a/sdk_container/src/third_party/portage-stable/sys-fs/e2fsprogs/e2fsprogs-1.42.12.ebuild +++ b/sdk_container/src/third_party/portage-stable/sys-fs/e2fsprogs/e2fsprogs-1.42.12.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2014 Gentoo Foundation +# Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-fs/e2fsprogs/e2fsprogs-1.42.12.ebuild,v 1.1 2014/09/05 18:40:53 polynomial-c Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-fs/e2fsprogs/e2fsprogs-1.42.12.ebuild,v 1.12 2015/05/25 10:29:17 vapier Exp $ EAPI=4 @@ -9,7 +9,7 @@ case ${PV} in *) UP_PV=${PV} ;; esac -inherit autotools eutils flag-o-matic multilib toolchain-funcs +inherit eutils flag-o-matic multilib toolchain-funcs DESCRIPTION="Standard EXT2/EXT3/EXT4 filesystem utilities" HOMEPAGE="http://e2fsprogs.sourceforge.net/" @@ -18,7 +18,7 @@ SRC_URI="mirror://sourceforge/e2fsprogs/${PN}-${UP_PV}.tar.gz LICENSE="GPL-2 BSD" SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 -x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~m68k-mint" +KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 -x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~m68k-mint" IUSE="nls static-libs elibc_FreeBSD" RDEPEND="~sys-libs/${PN}-libs-${PV} @@ -37,7 +37,7 @@ src_prepare() { if [[ ${CHOST} == *-mint* ]] ; then epatch "${WORKDIR}"/${PN}-1.42.9-mint-r1.patch fi - epatch "${FILESDIR}"/${PN}-1.42.10-fix-build-cflags.patch + epatch "${FILESDIR}"/${PN}-1.42.10-fix-build-cflags.patch #516854 # blargh ... trick e2fsprogs into using e2fsprogs-libs rm -rf doc @@ -53,7 +53,6 @@ src_prepare() { # Avoid rebuild echo '#include_next ' > lib/ss/ss_err.h - eautoreconf } src_configure() { @@ -94,14 +93,6 @@ src_compile() { fi } -pkg_preinst() { - if [[ -r ${EROOT}/etc/mtab ]] ; then - if [[ $(<"${EROOT}"/etc/mtab) == "${PN} crap for src_test" ]] ; then - rm -f "${EROOT}"/etc/mtab - fi - fi -} - src_install() { # need to set root_libdir= manually as any --libdir options in the # econf above (i.e. multilib) will screw up the default #276465 diff --git a/sdk_container/src/third_party/portage-stable/sys-fs/e2fsprogs/e2fsprogs-1.42.11.ebuild b/sdk_container/src/third_party/portage-stable/sys-fs/e2fsprogs/e2fsprogs-1.42.13.ebuild similarity index 84% rename from sdk_container/src/third_party/portage-stable/sys-fs/e2fsprogs/e2fsprogs-1.42.11.ebuild rename to sdk_container/src/third_party/portage-stable/sys-fs/e2fsprogs/e2fsprogs-1.42.13.ebuild index 07f36a46ef..52e786099d 100644 --- a/sdk_container/src/third_party/portage-stable/sys-fs/e2fsprogs/e2fsprogs-1.42.11.ebuild +++ b/sdk_container/src/third_party/portage-stable/sys-fs/e2fsprogs/e2fsprogs-1.42.13.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2014 Gentoo Foundation +# Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-fs/e2fsprogs/e2fsprogs-1.42.11.ebuild,v 1.5 2014/08/05 09:32:43 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-fs/e2fsprogs/e2fsprogs-1.42.13.ebuild,v 1.11 2015/07/23 09:35:36 ago Exp $ EAPI=4 @@ -9,7 +9,7 @@ case ${PV} in *) UP_PV=${PV} ;; esac -inherit autotools eutils flag-o-matic multilib toolchain-funcs +inherit eutils flag-o-matic multilib toolchain-funcs DESCRIPTION="Standard EXT2/EXT3/EXT4 filesystem utilities" HOMEPAGE="http://e2fsprogs.sourceforge.net/" @@ -18,7 +18,7 @@ SRC_URI="mirror://sourceforge/e2fsprogs/${PN}-${UP_PV}.tar.gz LICENSE="GPL-2 BSD" SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 -x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~m68k-mint" +KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 -x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~m68k-mint" IUSE="nls static-libs elibc_FreeBSD" RDEPEND="~sys-libs/${PN}-libs-${PV} @@ -37,8 +37,7 @@ src_prepare() { if [[ ${CHOST} == *-mint* ]] ; then epatch "${WORKDIR}"/${PN}-1.42.9-mint-r1.patch fi - epatch "${FILESDIR}"/${PN}-1.42.10-fix-build-cflags.patch - epatch "${FILESDIR}"/${PN}-1.42.11-prototypes.patch + epatch "${FILESDIR}"/${PN}-1.42.13-fix-build-cflags.patch #516854 # blargh ... trick e2fsprogs into using e2fsprogs-libs rm -rf doc @@ -54,7 +53,6 @@ src_prepare() { # Avoid rebuild echo '#include_next ' > lib/ss/ss_err.h - eautoreconf } src_configure() { @@ -95,14 +93,6 @@ src_compile() { fi } -pkg_preinst() { - if [[ -r ${EROOT}/etc/mtab ]] ; then - if [[ $(<"${EROOT}"/etc/mtab) == "${PN} crap for src_test" ]] ; then - rm -f "${EROOT}"/etc/mtab - fi - fi -} - src_install() { # need to set root_libdir= manually as any --libdir options in the # econf above (i.e. multilib) will screw up the default #276465 diff --git a/sdk_container/src/third_party/portage-stable/sys-fs/e2fsprogs/e2fsprogs-1.42.7.ebuild b/sdk_container/src/third_party/portage-stable/sys-fs/e2fsprogs/e2fsprogs-1.42.7.ebuild deleted file mode 100644 index f41bb432ce..0000000000 --- a/sdk_container/src/third_party/portage-stable/sys-fs/e2fsprogs/e2fsprogs-1.42.7.ebuild +++ /dev/null @@ -1,150 +0,0 @@ -# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-fs/e2fsprogs/e2fsprogs-1.42.7.ebuild,v 1.15 2014/01/18 05:15:33 vapier Exp $ - -EAPI=3 - -case ${PV} in -*_pre*) UP_PV="${PV%_pre*}-WIP-${PV#*_pre}" ;; -*) UP_PV=${PV} ;; -esac - -inherit eutils flag-o-matic multilib toolchain-funcs - -DESCRIPTION="Standard EXT2/EXT3/EXT4 filesystem utilities" -HOMEPAGE="http://e2fsprogs.sourceforge.net/" -SRC_URI="mirror://sourceforge/e2fsprogs/${PN}-${UP_PV}.tar.gz" - -LICENSE="GPL-2 BSD" -SLOT="0" -KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 -x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x86-macos ~m68k-mint" -IUSE="nls static-libs elibc_FreeBSD" - -RDEPEND="~sys-libs/${PN}-libs-${PV} - >=sys-apps/util-linux-2.16 - nls? ( virtual/libintl )" -DEPEND="${RDEPEND} - nls? ( sys-devel/gettext ) - virtual/pkgconfig - sys-apps/texinfo" - -S=${WORKDIR}/${P%_pre*} - -pkg_setup() { - if [[ ! -e ${EROOT}/etc/mtab ]] ; then - # add some crap to deal with missing /etc/mtab #217719 - ewarn "No /etc/mtab file, creating one temporarily" - echo "${PN} crap for src_test" > "${EROOT}"/etc/mtab - fi -} - -src_prepare() { - epatch "${FILESDIR}"/${PN}-1.41.8-makefile.patch - epatch "${FILESDIR}"/${PN}-1.40-fbsd.patch - epatch "${FILESDIR}"/${PN}-1.41.12-darwin-makefile.patch - epatch "${FILESDIR}"/${PN}-1.42.7-libext2fs-fix-return-value.patch #467986 - if [[ ${CHOST} == *-mint* ]] ; then - epatch "${FILESDIR}"/${PN}-1.41-mint.patch - epatch "${FILESDIR}"/${PN}-1.41.12-mint-blkid.patch - fi - # blargh ... trick e2fsprogs into using e2fsprogs-libs - rm -rf doc - sed -i -r \ - -e 's:@LIBINTL@:@LTLIBINTL@:' \ - -e '/^LIB(COM_ERR|SS)/s:[$][(]LIB[)]/lib([^@]*)@LIB_EXT@:-l\1:' \ - -e '/^DEPLIB(COM_ERR|SS)/s:=.*:=:' \ - MCONFIG.in || die "muck libs" #122368 - sed -i -r \ - -e '/^LIB_SUBDIRS/s:lib/(et|ss)::g' \ - Makefile.in || die "remove subdirs" - - # Avoid rebuild - touch lib/ss/ss_err.h -} - -src_configure() { - # Keep the package from doing silly things #261411 - export VARTEXFONTS=${T}/fonts - - # needs open64() prototypes and friends - append-cppflags -D_GNU_SOURCE - - # We want to use the "bsd" libraries while building on Darwin, but while - # building on other Gentoo/*BSD we prefer elf-naming scheme. - local libtype - case ${CHOST} in - *-darwin*) libtype=--enable-bsd-shlibs ;; - *-mint*) libtype= ;; - *) libtype=--enable-elf-shlibs ;; - esac - - ac_cv_path_LDCONFIG=: \ - econf \ - --with-root-prefix="${EPREFIX}/" \ - --enable-symlink-install \ - ${libtype} \ - $(tc-has-tls || echo --disable-tls) \ - --without-included-gettext \ - $(use_enable nls) \ - --disable-libblkid \ - --disable-libuuid \ - --disable-quota \ - --disable-fsck \ - --disable-uuidd - if [[ ${CHOST} != *-uclibc ]] && grep -qs 'USE_INCLUDED_LIBINTL.*yes' config.{log,status} ; then - eerror "INTL sanity check failed, aborting build." - eerror "Please post your ${S}/config.log file as an" - eerror "attachment to http://bugs.gentoo.org/show_bug.cgi?id=81096" - die "Preventing included intl cruft from building" - fi -} - -src_compile() { - emake COMPILE_ET=compile_et MK_CMDS=mk_cmds || die - - # Build the FreeBSD helper - if use elibc_FreeBSD ; then - cp "${FILESDIR}"/fsck_ext2fs.c . - emake fsck_ext2fs || die - fi -} - -pkg_preinst() { - if [[ -r ${EROOT}/etc/mtab ]] ; then - if [[ $(<"${EROOT}"/etc/mtab) == "${PN} crap for src_test" ]] ; then - rm -f "${EROOT}"/etc/mtab - fi - fi -} - -src_install() { - # need to set root_libdir= manually as any --libdir options in the - # econf above (i.e. multilib) will screw up the default #276465 - emake \ - STRIP=: \ - root_libdir="${EPREFIX}/usr/$(get_libdir)" \ - DESTDIR="${D}" \ - install install-libs || die - dodoc README RELEASE-NOTES - - insinto /etc - doins "${FILESDIR}"/e2fsck.conf || die - - # Move shared libraries to /lib/, install static libraries to - # /usr/lib/, and install linker scripts to /usr/lib/. - gen_usr_ldscript -a e2p ext2fs - # configure doesn't have an option to disable static libs :/ - use static-libs || find "${D}" -name '*.a' -delete - - if use elibc_FreeBSD ; then - # Install helpers for us - into / - dosbin "${S}"/fsck_ext2fs || die - doman "${FILESDIR}"/fsck_ext2fs.8 || die - - # filefrag is linux only - rm \ - "${ED}"/usr/sbin/filefrag \ - "${ED}"/usr/share/man/man8/filefrag.8 || die - fi -} diff --git a/sdk_container/src/third_party/portage-stable/sys-fs/e2fsprogs/files/e2fsprogs-1.41-mint.patch b/sdk_container/src/third_party/portage-stable/sys-fs/e2fsprogs/files/e2fsprogs-1.41-mint.patch deleted file mode 100644 index 43ed92d959..0000000000 --- a/sdk_container/src/third_party/portage-stable/sys-fs/e2fsprogs/files/e2fsprogs-1.41-mint.patch +++ /dev/null @@ -1,1947 +0,0 @@ -http://bugs.gentoo.org/show_bug.cgi?id=256234 -http://sourceforge.net/tracker/?func=detail&aid=2550325&group_id=2406&atid=302406 - -diff -ur --new-file e2fsprogs-1.41.3/lib/ext2fs/Makefile.in e2fsprogs-1.41.3-mint/lib/ext2fs/Makefile.in ---- e2fsprogs-1.41.3/lib/ext2fs/Makefile.in 2008-10-07 14:22:39.000000000 +0000 -+++ e2fsprogs-1.41.3-mint/lib/ext2fs/Makefile.in 2009-01-23 10:48:50.000000000 +0000 -@@ -74,7 +74,9 @@ - unix_io.o \ - unlink.o \ - valid_blk.o \ -- version.o -+ version.o \ -+ mint_io.o \ -+ xhdi.o - - SRCS= ext2_err.c \ - $(srcdir)/alloc.c \ -@@ -146,6 +148,8 @@ - $(srcdir)/unlink.c \ - $(srcdir)/valid_blk.c \ - $(srcdir)/version.c \ -+ $(srcdir)/mint_io.c \ -+ $(srcdir)/xhdi.c \ - $(srcdir)/write_bb_file.c - - HFILES= bitops.h ext2fs.h ext2_io.h ext2_fs.h ext2_ext_attr.h ext3_extents.h \ -diff -ur --new-file e2fsprogs-1.41.3/lib/ext2fs/bitops.h e2fsprogs-1.41.3-mint/lib/ext2fs/bitops.h ---- e2fsprogs-1.41.3/lib/ext2fs/bitops.h 2008-10-07 14:22:39.000000000 +0000 -+++ e2fsprogs-1.41.3-mint/lib/ext2fs/bitops.h 2009-01-23 10:47:35.000000000 +0000 -@@ -125,7 +125,7 @@ - */ - #ifdef NO_INLINE_FUNCS - #if (defined(__GNUC__) && (defined(__i386__) || defined(__i486__) || \ -- defined(__i586__) || defined(__mc68000__))) -+ defined(__i586__) || defined(__mc68020__))) - /* This prevents bitops.c from trying to include the C */ - /* function version of these functions */ - #define _EXT2_HAVE_ASM_BITOPS_ -@@ -246,7 +246,7 @@ - #endif /* i386 */ - - #if ((defined __GNUC__) && !defined(_EXT2_USE_C_VERSIONS_) && \ -- (defined(__mc68000__))) -+ (defined(__mc68020__))) - - #define _EXT2_HAVE_ASM_BITOPS_ - -@@ -280,6 +280,50 @@ - return retval; - } - -+#elif defined(__mc68000__) -+ -+#define _EXT2_HAVE_ASM_BITOPS_ -+ -+_INLINE_ int -+ext2fs_set_bit (unsigned int nr, void *addr) -+{ -+ int mask, retval; -+ unsigned char *ADDR = (unsigned char *) addr; -+ -+ ADDR += nr >> 3; -+ mask = 1UL << (nr & 0x07); -+ retval = (mask & *ADDR) != 0; -+ *ADDR |= mask; -+ -+ return retval; -+} -+ -+_INLINE_ int -+ext2fs_clear_bit (unsigned int nr, void *addr) -+{ -+ int mask, retval; -+ unsigned char *ADDR = (unsigned char *) addr; -+ -+ ADDR += nr >> 3; -+ mask = 1UL << (nr & 0x07); -+ retval = (mask & *ADDR) != 0; -+ *ADDR &= ~mask; -+ -+ return retval; -+} -+ -+_INLINE_ int -+ext2fs_test_bit (unsigned int nr, const void *addr) -+{ -+ int mask; -+ const unsigned char *ADDR = (const unsigned char *) addr; -+ -+ ADDR += nr >> 3; -+ mask = 1UL << (nr & 0x07); -+ -+ return ((mask & *ADDR) != 0); -+} -+ - #endif /* __mc68000__ */ - - -diff -ur --new-file e2fsprogs-1.41.3/lib/ext2fs/ext2_fs.h e2fsprogs-1.41.3-mint/lib/ext2fs/ext2_fs.h ---- e2fsprogs-1.41.3/lib/ext2fs/ext2_fs.h 2009-01-23 10:01:34.000000000 +0000 -+++ e2fsprogs-1.41.3-mint/lib/ext2fs/ext2_fs.h 2009-01-23 10:49:44.000000000 +0000 -@@ -307,6 +307,7 @@ - #define _IOT_ext2_new_group_input _IOT (_IOTS(__u32), 5, _IOTS(__u16), 2, 0, 0) - #endif - -+#ifndef __MINT__ - #define EXT2_IOC_GETFLAGS _IOR('f', 1, long) - #define EXT2_IOC_SETFLAGS _IOW('f', 2, long) - #define EXT2_IOC_GETVERSION _IOR('v', 1, long) -@@ -316,6 +317,9 @@ - #define EXT2_IOC_GROUP_EXTEND _IOW('f', 7, unsigned long) - #define EXT2_IOC_GROUP_ADD _IOW('f', 8,struct ext2_new_group_input) - #define EXT4_IOC_GROUP_ADD _IOW('f', 8,struct ext4_new_group_input) -+#else -+#include -+#endif - - /* - * Structure of an inode on the disk -diff -ur --new-file e2fsprogs-1.41.3/lib/ext2fs/getsize.c e2fsprogs-1.41.3-mint/lib/ext2fs/getsize.c ---- e2fsprogs-1.41.3/lib/ext2fs/getsize.c 2008-10-07 14:22:39.000000000 +0000 -+++ e2fsprogs-1.41.3-mint/lib/ext2fs/getsize.c 2009-01-23 10:47:35.000000000 +0000 -@@ -58,6 +58,11 @@ - #define BLKGETSIZE DKIOCGETBLOCKCOUNT32 - #endif /* APPLE_DARWIN */ - -+#ifdef __MINT__ -+#include -+#include "mint_io.h" -+#endif -+ - #include "ext2_fs.h" - #include "ext2fs.h" - -diff -ur --new-file e2fsprogs-1.41.3/lib/ext2fs/llseek.c e2fsprogs-1.41.3-mint/lib/ext2fs/llseek.c ---- e2fsprogs-1.41.3/lib/ext2fs/llseek.c 2008-10-07 14:22:39.000000000 +0000 -+++ e2fsprogs-1.41.3-mint/lib/ext2fs/llseek.c 2009-01-23 10:47:35.000000000 +0000 -@@ -115,6 +115,8 @@ - - #else /* !linux */ - -+#ifndef __MINT__ -+ - #ifndef EINVAL - #define EINVAL EXT2_ET_INVALID_ARGUMENT - #endif -@@ -133,6 +135,8 @@ - #endif - } - -+#endif /* __MINT__ */ -+ - #endif /* linux */ - - -diff -ur --new-file e2fsprogs-1.41.3/lib/ext2fs/mint_io.c e2fsprogs-1.41.3-mint/lib/ext2fs/mint_io.c ---- e2fsprogs-1.41.3/lib/ext2fs/mint_io.c 1970-01-01 00:00:00.000000000 +0000 -+++ e2fsprogs-1.41.3-mint/lib/ext2fs/mint_io.c 2009-01-23 10:49:51.000000000 +0000 -@@ -0,0 +1,858 @@ -+/* -+ * $Id: e2fsprogs-1.41-mint.patch,v 1.1 2010/11/19 18:49:02 jlec Exp $ -+ * -+ * This file belongs to FreeMiNT. It's not in the original MiNT 1.12 -+ * distribution. See the file CHANGES for a detailed log of changes. -+ * -+ * -+ * Copyright 2000 Frank Naumann -+ * All rights reserved. -+ * -+ * This program is free software; you can redistribute it and/or modify -+ * it under the terms of the GNU General Public License as published by -+ * the Free Software Foundation; either version 2, or (at your option) -+ * any later version. -+ * -+ * This file is distributed in the hope that it will be useful, -+ * but WITHOUT ANY WARRANTY; without even the implied warranty of -+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -+ * GNU General Public License for more details. -+ * -+ * You should have received a copy of the GNU General Public License -+ * along with this program; if not, write to the Free Software -+ * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. -+ * -+ * -+ * Author: Frank Naumann -+ * Started: 200-06-14 -+ * -+ * Please send suggestions, patches or bug reports to me or -+ * the MiNT mailing list. -+ * -+ */ -+ -+# ifdef __MINT__ -+ -+# include -+# include -+# include -+# include -+# include -+# include -+# include -+# include -+# include -+# include -+# include -+ -+# include "et/com_err.h" -+# include "ext2fs/ext2_io.h" -+# include -+# include -+# define loff_t ext2_loff_t -+# define llseek ext2fs_llseek -+ -+# include -+# include "mint_io.h" -+# include "xhdi.h" -+ -+ -+# if 0 -+# define DEBUG(x) printf x -+# else -+# define DEBUG(x) -+# endif -+ -+ -+/* prototypes */ -+ -+int __open_v(const char *_filename, int iomode, va_list argp); -+ -+int open(__const char *__file, int __oflag, ...) __THROW; -+int __open(__const char *__file, int __oflag, ...) __THROW; -+ -+int ioctl(int fd, int cmd, void *arg); -+int __ioctl(int fd, int cmd, void *arg); -+ -+int fsync(int __fd) __THROW; -+int __fsync(int __fd) __THROW; -+ -+__off_t lseek(int __fd, __off_t __offset, int __whence) __THROW; -+__off_t __lseek(int __fd, __off_t __offset, int __whence) __THROW; -+ -+int close(int __fd) __THROW; -+int __close(int __fd) __THROW; -+ -+ssize_t read(int __fd, void *__buf, size_t __nbytes) __THROW; -+ssize_t __read(int __fd, void *__buf, size_t __nbytes) __THROW; -+ -+ssize_t write(int __fd, __const void *__buf, size_t __n) __THROW; -+ssize_t __write(int __fd, __const void *__buf, size_t __n) __THROW; -+ -+int fstat(int __fd, struct stat *__buf) __THROW; -+int __fstat(int __fd, struct stat *__buf) __THROW; -+ -+int stat(const char *filename, struct stat *st) __THROW; -+ -+ -+struct device -+{ -+ int used; -+ -+ int drv; -+ int open_flags; -+ -+ ushort xhdi_maj; -+ ushort xhdi_min; -+ ulong xhdi_start; -+ ulong xhdi_blocks; -+ ulong xhdi_blocksize; -+ char xhdi_id[4]; -+ -+ loff_t pos; -+}; -+ -+# define DEVS 16 -+static struct device devs[DEVS]; -+ -+static void -+init_device(struct device *dev) -+{ -+ dev->used = 0; -+ -+ dev->drv = -1; -+ dev->open_flags = 0; -+ dev->xhdi_maj = 0; -+ dev->xhdi_min = 0; -+ dev->xhdi_start = 0; -+ dev->xhdi_blocks = 0; -+ dev->xhdi_blocksize = 0; -+ -+ dev->pos = 0; -+} -+ -+static inline void -+init(void) -+{ -+ static int done = 0; -+ int i; -+ -+ if (done) -+ return; -+ -+ assert(sizeof(loff_t) == sizeof(long long)); -+ -+ for (i = 0; i < DEVS; i++) -+ init_device (&devs[i]); -+ -+ init_XHDI(); -+ -+ /* we are now initialized */ -+ done = 1; -+} -+ -+static struct device * -+get_device(int fd) -+{ -+ struct device *dev; -+ -+ if ((fd < 1024) || (fd >= (1024 + DEVS))) -+ return NULL; -+ -+ fd -= 1024; -+ dev = &devs[fd]; -+ -+ assert(dev->used); -+ -+ return dev; -+} -+ -+static int -+alloc_device(void) -+{ -+ int i; -+ -+ for (i = 0; i < DEVS; i++) -+ { -+ struct device *dev = &devs[i]; -+ -+ if (!dev->used) -+ { -+ dev->used = 1; -+ return (i + 1024); -+ } -+ } -+ -+ __set_errno(ENOMEM); -+ return -1; -+} -+ -+static void -+free_device(struct device *dev) -+{ -+ assert(dev->used); -+ -+ init_device (dev); -+} -+ -+ -+int -+open(const char *filename, int iomode, ...) -+{ -+ const char *f = filename; -+ struct device *mydev = NULL; -+ int dev = -1; -+ long ret; -+ -+ init(); -+ -+ if (!filename) -+ { -+ __set_errno(EINVAL); -+ return -1; -+ } -+ -+ if ((f[1] == ':') && (f[2] == '\0')) -+ { -+ int c = tolower(f[0]); -+ -+ if (c >= 'a' && c <= 'z') -+ c = c - 'a'; -+ else if (c >= '1' && c <= '6') -+ c = 26 + (c - '1'); -+ -+ if ((c >= 0) && (c < 32)) -+ { -+ dev = alloc_device(); -+ if (dev != -1) -+ { -+ mydev = get_device(dev); -+ assert(mydev); -+ -+ mydev->drv = c; -+ mydev->open_flags = iomode; -+ } -+ } -+ } -+ -+ if (dev == -1) -+ { -+ /* fall through */ -+ -+ va_list args; -+ int retval; -+ -+ va_start(args, iomode); -+ retval = __open_v(filename, iomode, args); -+ va_end(args); -+ -+ return retval; -+ } -+ -+ if (mydev->open_flags == O_RDONLY) -+ { -+ DEBUG(("readonly mode!\n")); -+ sync(); -+ } -+ else if (Dlock(1, mydev->drv)) -+ { -+ printf("Can't lock partition %c:!\n", mydev->drv+'A'); -+ -+ if (mydev) -+ free_device(mydev); -+ -+ __set_errno(EACCES); -+ return -1; -+ } -+ -+ __set_errno(EERROR); -+ -+ ret = XHGetVersion (); -+ DEBUG(("XHDI version: %lx\n", ret)); -+ -+ ret = XHInqDev2(mydev->drv, -+ &mydev->xhdi_maj, &mydev->xhdi_min, -+ &mydev->xhdi_start, NULL, -+ &mydev->xhdi_blocks, mydev->xhdi_id); -+ if (ret) -+ { -+ printf("XHInqDev2 [%c] fail (ret = %li, errno = %i)\n", -+ mydev->drv+'A', ret, errno); -+ ret = -1; -+ } -+ else -+ { -+ ret = XHInqTarget(mydev->xhdi_maj, mydev->xhdi_min, -+ &mydev->xhdi_blocksize, NULL, NULL); -+ if (ret) -+ { -+ printf("XHInqTarget [%i:%i] fail (ret = %li, errno = %i)\n", -+ mydev->xhdi_maj, mydev->xhdi_min, ret, errno); -+ ret = -1; -+ } -+ else -+ { -+ char *xhdi_id = mydev->xhdi_id; -+ -+ if ( 0 -+ || ((xhdi_id[0] == 'G') && (xhdi_id[1] == 'E') && (xhdi_id[2] == 'M')) /* GEM */ -+ || ((xhdi_id[0] == 'B') && (xhdi_id[1] == 'G') && (xhdi_id[2] == 'M')) /* BGM */ -+ || ((xhdi_id[0] == 'F') && (xhdi_id[1] == '3') && (xhdi_id[2] == '2')) /* F32 */ -+ || ((xhdi_id[0] == 'M') && (xhdi_id[1] == 'I') && (xhdi_id[2] == 'X')) /* MIX */ -+ || ((xhdi_id[0] == 'R') && (xhdi_id[1] == 'A') && (xhdi_id[2] == 'W')) /* RAW */ -+ || ((xhdi_id[0] == 'L') && (xhdi_id[1] == 'N') && (xhdi_id[2] == 'X')) /* LNX */ -+ || ((xhdi_id[0] == '\0') && (xhdi_id[1] == 'D'))) /* any DOS */ -+ { -+ DEBUG(("Partition ok and accepted!\n")); -+ DEBUG(("start = %lu, blocks = %lu, blocksize = %lu\n", -+ mydev->xhdi_start, mydev->xhdi_blocks, -+ mydev->xhdi_blocksize)); -+ } -+ else -+ { -+ xhdi_id [3] = '\0'; -+ printf("Wrong partition ID [%s]!\n", xhdi_id); -+ printf("Only 'RAW', 'LNX' and DOS partitions are supported.\n"); -+ -+ __set_errno(EPERM); -+ ret = -1; -+ } -+ } -+ } -+ -+ if (ret) -+ { -+ if (mydev) -+ free_device(mydev); -+ -+ dev = -1; -+ } -+ -+ return dev; -+} -+ -+int -+close(int fd) -+{ -+ struct device *mydev = get_device(fd); -+ int ret = 0; -+ -+ if (!mydev) -+ /* fall through */ -+ return __close(fd); -+ -+ if (mydev->open_flags == O_RDONLY) -+ { -+ ; -+ } -+ else if (Dlock(0, mydev->drv)) -+ { -+ printf("Can't unlock partition %c:!\n", 'A'+mydev->drv); -+ -+ __set_errno(EACCES); -+ ret = -1; -+ } -+ -+ free_device(mydev); -+ return ret; -+} -+ -+/* simple buffer */ -+static char buffer[1024L * 128]; -+static ulong buf_recno = 0; -+static long buf_n = 0; -+ -+static long -+rwabs_xhdi(struct device *mydev, ushort rw, void *buf, ulong size, ulong recno) -+{ -+ ulong n = size / mydev->xhdi_blocksize; -+ long r; -+ -+ assert((size % mydev->xhdi_blocksize) == 0); -+ -+ if (!n || (recno + n) > mydev->xhdi_blocks) -+ { -+ printf("rwabs_xhdi: access outside partition (drv = %c:)\n", 'A'+mydev->drv); -+ exit(2); -+ } -+ -+ if (n > 65535UL) -+ { -+ printf("rwabs_xhdi: n to large (drv = %c)\n", 'A'+mydev->drv); -+ exit(2); -+ } -+ -+ if (!rw && (buf_recno == recno) && (buf_n == n)) -+ { -+ bcopy(buffer, buf, buf_n * mydev->xhdi_blocksize); -+ return 0; -+ } -+ -+ r = XHReadWrite (mydev->xhdi_maj, mydev->xhdi_min, rw, mydev->xhdi_start + recno, n, buf); -+ -+ if (!r && (n * mydev->xhdi_blocksize) <= sizeof(buffer)) -+ { -+ bcopy(buf, buffer, n * mydev->xhdi_blocksize); -+ -+ buf_recno = recno; -+ buf_n = n; -+ } -+ else -+ buf_n = 0; -+ -+ return r; -+} -+ -+# define max(a,b) (a > b ? a : b) -+# define min(a,b) (a > b ? b : a) -+ -+int -+read(int fd, void *_buf, size_t size) -+{ -+ struct device *mydev = get_device(fd); -+ -+ if (!mydev) -+ /* fall through */ -+ return __read(fd, _buf, size); -+ -+{ -+ char *buf = _buf; -+ long todo; /* characters remaining */ -+ long done; /* characters processed */ -+ -+ todo = size; -+ done = 0; -+ -+ if (todo == 0) -+ return 0; -+ -+ /* partial block copy -+ */ -+ if (mydev->pos % mydev->xhdi_blocksize) -+ { -+ char tmp[mydev->xhdi_blocksize]; -+ -+ ulong recno = mydev->pos / mydev->xhdi_blocksize; -+ ulong offset = mydev->pos % mydev->xhdi_blocksize; -+ ulong data; -+ long ret; -+ -+ ret = rwabs_xhdi(mydev, 0, tmp, mydev->xhdi_blocksize, recno); -+ if (ret) -+ { -+ DEBUG(("read: partial part: read failure (r = %li, errno = %i)\n", ret, errno)); -+ goto out; -+ } -+ -+ data = mydev->xhdi_blocksize - offset; -+ data = min (todo, data); -+ -+ memcpy(buf, tmp + offset, data); -+ -+ buf += data; -+ todo -= data; -+ done += data; -+ mydev->pos += data; -+ } -+ -+ if (todo) -+ { -+ assert((todo > 0)); -+ assert((mydev->pos % mydev->xhdi_blocksize) == 0); -+ } -+ -+ -+ /* full blocks -+ */ -+ if (todo / mydev->xhdi_blocksize) -+ { -+ ulong recno = mydev->pos / mydev->xhdi_blocksize; -+ ulong data = (todo / mydev->xhdi_blocksize) * mydev->xhdi_blocksize; -+ long ret; -+ -+ ret = rwabs_xhdi (mydev, 0, buf, data, recno); -+ if (ret) -+ { -+ DEBUG(("read: full blocks: read failure (r = %li, errno = %i)\n", ret, errno)); -+ goto out; -+ } -+ -+ buf += data; -+ todo -= data; -+ done += data; -+ mydev->pos += data; -+ } -+ -+ if (todo) -+ { -+ assert((todo > 0) && (todo < mydev->xhdi_blocksize)); -+ assert((mydev->pos % mydev->xhdi_blocksize) == 0); -+ } -+ -+ /* anything left? -+ */ -+ if (todo) -+ { -+ char tmp[mydev->xhdi_blocksize]; -+ -+ ulong recno = mydev->pos / mydev->xhdi_blocksize; -+ long ret; -+ -+ ret = rwabs_xhdi (mydev, 0, tmp, mydev->xhdi_blocksize, recno); -+ if (ret) -+ { -+ DEBUG(("read: left part: read failure (r = %li, errno = %i)]\n", ret, errno)); -+ goto out; -+ } -+ -+ memcpy(buf, tmp, todo); -+ -+ done += todo; -+ mydev->pos += todo; -+ } -+ -+ assert(done == size); -+ -+out: -+ return done; -+} -+} -+ -+int -+write(int fd, const void *_buf, size_t size) -+{ -+ struct device *mydev = get_device(fd); -+ -+ if (!mydev) -+ /* fall through */ -+ return __write(fd, _buf, size); -+ -+ if (mydev->open_flags == O_RDONLY) -+ { -+ __set_errno(EPERM); -+ return -1; -+ } -+{ -+ const char *buf = _buf; -+ long todo; /* characters remaining */ -+ long done; /* characters processed */ -+ -+ todo = size; -+ done = 0; -+ -+ if (todo == 0) -+ return 0; -+ -+ /* partial block copy -+ */ -+ if (mydev->pos % mydev->xhdi_blocksize) -+ { -+ char tmp[mydev->xhdi_blocksize]; -+ -+ ulong recno = mydev->pos / mydev->xhdi_blocksize; -+ ulong offset = mydev->pos % mydev->xhdi_blocksize; -+ ulong data; -+ long ret; -+ -+ ret = rwabs_xhdi(mydev, 0, tmp, mydev->xhdi_blocksize, recno); -+ if (ret) -+ { -+ DEBUG(("write: partial part: read failure (r = %li, errno = %i)\n", ret, errno)); -+ goto out; -+ } -+ -+ data = mydev->xhdi_blocksize - offset; -+ data = min (todo, data); -+ -+ memcpy(tmp + offset, buf, data); -+ -+ ret = rwabs_xhdi(mydev, 1, tmp, mydev->xhdi_blocksize, recno); -+ if (ret) -+ { -+ DEBUG(("write: partial part: write failure (r = %li, errno = %i)\n", ret, errno)); -+ goto out; -+ } -+ -+ buf += data; -+ todo -= data; -+ done += data; -+ mydev->pos += data; -+ } -+ -+ if (todo) -+ { -+ assert((todo > 0)); -+ assert((mydev->pos % mydev->xhdi_blocksize) == 0); -+ } -+ -+ /* full blocks -+ */ -+ if (todo / mydev->xhdi_blocksize) -+ { -+ ulong recno = mydev->pos / mydev->xhdi_blocksize; -+ ulong data = (todo / mydev->xhdi_blocksize) * mydev->xhdi_blocksize; -+ long ret; -+ -+ ret = rwabs_xhdi(mydev, 1, (void *)buf, data, recno); -+ if (ret) -+ { -+ DEBUG(("write: full blocks: write failure (r = %li, errno = %i)\n", ret, errno)); -+ goto out; -+ } -+ -+ buf += data; -+ todo -= data; -+ done += data; -+ mydev->pos += data; -+ } -+ -+ if (todo) -+ { -+ assert((todo > 0) && (todo < mydev->xhdi_blocksize)); -+ assert((mydev->pos % mydev->xhdi_blocksize) == 0); -+ } -+ -+ /* anything left? -+ */ -+ if (todo) -+ { -+ char tmp[mydev->xhdi_blocksize]; -+ -+ ulong recno = mydev->pos / mydev->xhdi_blocksize; -+ long ret; -+ -+ ret = rwabs_xhdi(mydev, 0, tmp, mydev->xhdi_blocksize, recno); -+ if (ret) -+ { -+ DEBUG(("write: left part: read failure (r = %li, errno = %i)]\n", ret, errno)); -+ goto out; -+ } -+ -+ memcpy(tmp, buf, todo); -+ -+ ret = rwabs_xhdi(mydev, 1, tmp, mydev->xhdi_blocksize, recno); -+ if (ret) -+ { -+ DEBUG(("write: partial part: write failure (r = %li, errno = %i)\n", ret, errno)); -+ goto out; -+ } -+ -+ done += todo; -+ mydev->pos += todo; -+ } -+ -+ assert(done == size); -+ -+out: -+ return done; -+} -+} -+ -+int -+ioctl(int fd, int cmd, void *arg) -+{ -+ struct device *mydev = get_device(fd); -+ -+ if (!mydev) -+ /* fall through */ -+ return __ioctl(fd, cmd, arg); -+ -+ DEBUG(("ioctl: cmd = %i\n", cmd)); -+ -+ switch (cmd) -+ { -+ case BLKGETSIZE: -+ { -+ ulong *size = arg; -+ *size = mydev->xhdi_blocks * (mydev->xhdi_blocksize / 512); -+ break; -+ } -+ case BLOCKSIZE: -+ { -+ ulong *block_size = arg; -+ *block_size = mydev->xhdi_blocksize; -+ break; -+ } -+ default: -+ __set_errno(EINVAL); -+ return -1; -+ } -+ -+ return 0; -+} -+ -+int -+fstat(int fd, struct stat *st) -+{ -+ struct device *mydev = get_device(fd); -+ -+ if (!mydev) -+ /* fall through */ -+ return __fstat(fd, st); -+ -+ bzero(st, sizeof(*st)); -+ -+ st->st_dev = mydev->xhdi_maj; -+ st->st_ino = mydev->drv; -+ st->st_mode = S_IFBLK | S_IRUSR | S_IWUSR; -+ st->st_nlink = 1; -+ st->st_uid = 0; -+ st->st_gid = 0; -+ st->st_rdev = mydev->xhdi_min; -+ st->st_atime = time (NULL); -+ st->st_mtime = time (NULL); -+ st->st_ctime = time (NULL); -+ st->st_size = (int64_t) mydev->xhdi_blocks * mydev->xhdi_blocksize; -+ st->st_blocks = (int64_t) mydev->xhdi_blocks * mydev->xhdi_blocksize / 512; -+ st->st_blksize = mydev->xhdi_blocksize; -+ st->st_flags = 0; -+ st->st_gen = 0; -+ -+ return 0; -+} -+ -+int -+stat(const char *filename, struct stat *st) -+{ -+ struct device *mydev; -+ int fd, res; -+ -+ fd = open(filename, O_RDONLY); -+ if (fd == -1) -+ return -1; -+ -+ mydev = get_device(fd); -+ if (!mydev) -+ { -+ close(fd); -+ -+ /* fall through */ -+ return __stat(filename, st); -+ } -+ -+ res = fstat(fd, st); -+ close(fd); -+ -+ return res; -+} -+ -+int -+fsync(int fd) -+{ -+ struct device *mydev = get_device(fd); -+ -+ if (!mydev) -+ /* fall through */ -+ return __fsync(fd); -+ -+ /* nothing todo */ -+ return 0; -+} -+ -+loff_t llseek(int fd, loff_t offset, int origin); -+ -+loff_t -+llseek(int fd, loff_t offset, int origin) -+{ -+ struct device *mydev = get_device(fd); -+ -+ if (!mydev) -+ /* fall through */ -+ return __lseek(fd, (off_t) offset, origin); -+ -+ -+ switch (origin) -+ { -+ case SEEK_SET: -+ break; -+ case SEEK_CUR: -+ offset += mydev->pos; -+ break; -+ case SEEK_END: -+ offset += (int64_t) mydev->xhdi_blocks * mydev->xhdi_blocksize; -+ break; -+ default: -+ return -1; -+ } -+ -+ if (offset > (loff_t) mydev->xhdi_blocks * mydev->xhdi_blocksize) -+ { -+ __set_errno(EINVAL); -+ return -1; -+ } -+ -+ mydev->pos = offset; -+ return mydev->pos; -+} -+ -+loff_t lseek64(int fd, loff_t offset, int origin); -+ -+loff_t -+lseek64(int fd, loff_t offset, int origin) -+{ -+ return llseek(fd, offset, origin); -+} -+ -+__off_t -+lseek(int fd, __off_t offset, int mode) -+{ -+ struct device *mydev = get_device(fd); -+ -+ if (!mydev) -+ /* fall through */ -+ return __lseek(fd, offset, mode); -+ -+{ -+ loff_t _offset = offset; -+ -+ switch (mode) -+ { -+ case SEEK_SET: -+ break; -+ case SEEK_CUR: -+ _offset += mydev->pos; -+ break; -+ case SEEK_END: -+ _offset += (loff_t) mydev->xhdi_blocks * mydev->xhdi_blocksize; -+ break; -+ default: -+ return -1; -+ } -+ -+ if (_offset > LONG_MAX) -+ { -+ __set_errno(EINVAL); -+ return -1; -+ } -+ -+ if (_offset > (loff_t) mydev->xhdi_blocks * mydev->xhdi_blocksize) -+ { -+ __set_errno(EINVAL); -+ return -1; -+ } -+ -+ mydev->pos = _offset; -+ return (off_t) mydev->pos; -+} -+} -+ -+int gettype(int fd); -+ -+int -+gettype(int fd) -+{ -+ struct device *mydev = get_device(fd); -+ char *xhdi_id; -+ -+ if (!mydev) -+ return -1; -+ -+ /* Get filesystem type by XHDI ID */ -+ xhdi_id = mydev->xhdi_id; -+ if ((xhdi_id[0] == '\0') && (xhdi_id[1] == 'D')) -+ return 0; /* DOS (\0D*) */ -+ else -+ return 1; /* Atari (GEM/GBM) */ -+} -+ -+# endif /* __MINT__ */ -diff -ur --new-file e2fsprogs-1.41.3/lib/ext2fs/mint_io.h e2fsprogs-1.41.3-mint/lib/ext2fs/mint_io.h ---- e2fsprogs-1.41.3/lib/ext2fs/mint_io.h 1970-01-01 00:00:00.000000000 +0000 -+++ e2fsprogs-1.41.3-mint/lib/ext2fs/mint_io.h 2009-01-23 10:49:53.000000000 +0000 -@@ -0,0 +1,22 @@ -+/* -+ * mint_io.h -+ * -+ * Copyright (C) 2000 Frank Naumann . -+ * -+ * %Begin-Header% -+ * This file may be redistributed under the terms of the GNU Public -+ * License. -+ * %End-Header% -+ */ -+ -+# ifdef __MINT__ -+ -+# ifndef _mint_io_h -+# define _mint_io_h -+ -+# define BLKGETSIZE (('b'<< 8) | 1) -+# define BLOCKSIZE (('b'<< 8) | 2) -+ -+# endif /* _mint_io_h */ -+ -+# endif /* __MINT__ */ -diff -ur --new-file e2fsprogs-1.41.3/lib/ext2fs/unix_io.c e2fsprogs-1.41.3-mint/lib/ext2fs/unix_io.c ---- e2fsprogs-1.41.3/lib/ext2fs/unix_io.c 2008-10-13 03:12:22.000000000 +0000 -+++ e2fsprogs-1.41.3-mint/lib/ext2fs/unix_io.c 2009-01-23 10:47:35.000000000 +0000 -@@ -51,9 +51,15 @@ - #define BLKROGET _IO(0x12, 94) /* Get read-only status (0 = read_write). */ - #endif - -+#ifdef __MINT__ -+#include -+#include "mint_io.h" -+#endif -+ - #include "ext2_fs.h" - #include "ext2fs.h" - -+ - /* - * For checking structure magic numbers... - */ -@@ -512,6 +518,16 @@ - } - } - #endif -+ -+#ifdef __MINT__ -+ { -+ unsigned long block_size; -+ retval = ioctl(data->dev, BLOCKSIZE, &block_size); -+ if (retval == 0) -+ io->block_size = block_size; -+ } -+#endif -+ - *channel = io; - return 0; - -diff -ur --new-file e2fsprogs-1.41.3/lib/ext2fs/xhdi.c e2fsprogs-1.41.3-mint/lib/ext2fs/xhdi.c ---- e2fsprogs-1.41.3/lib/ext2fs/xhdi.c 1970-01-01 00:00:00.000000000 +0000 -+++ e2fsprogs-1.41.3-mint/lib/ext2fs/xhdi.c 2009-01-23 10:49:55.000000000 +0000 -@@ -0,0 +1,577 @@ -+/* -+ * Copyright 2000 Frank Naumann -+ * All rights reserved. -+ * -+ * This program is free software; you can redistribute it and/or modify -+ * it under the terms of the GNU General Public License as published by -+ * the Free Software Foundation; either version 2, or (at your option) -+ * any later version. -+ * -+ * This file is distributed in the hope that it will be useful, -+ * but WITHOUT ANY WARRANTY; without even the implied warranty of -+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -+ * GNU General Public License for more details. -+ * -+ * You should have received a copy of the GNU General Public License -+ * along with this program; if not, write to the Free Software -+ * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. -+ * -+ * -+ * Started: 2000-05-02 -+ * -+ * Changes: -+ * -+ * 0.1: -+ * -+ * fix: Cookie handling stuff; use Getcookie from MiNT-Lib now -+ * requires an actual MiNT-Lib (>= PL49) -+ * -+ * 0.0: -+ * -+ * - inital version -+ * -+ */ -+ -+# include "xhdi.h" -+ -+# include -+# include -+# include -+# include -+# include -+ -+ -+/* -+ * internal usage -+ */ -+ -+/* dummy routine */ -+static long -+XHDIfail (void) -+{ -+ return -ENOSYS; -+} -+ -+/* XHDI handler function */ -+static long (*XHDI)() = XHDIfail; -+ -+ushort XHDI_installed = 0; -+ -+ -+# define C_XHDI 0x58484449L -+# define XHDIMAGIC 0x27011992L -+ -+/* initalize flag */ -+static ushort init = 1; -+ -+long -+init_XHDI (void) -+{ -+ long *val; -+ long r; -+ -+ init = 0; -+ -+ r = Getcookie (C_XHDI, (long *) &val); -+ if (r == C_FOUND) -+ { -+ long *magic_test = val; -+ -+ /* check magic */ -+ if (magic_test) -+ { -+ magic_test--; -+ if (*magic_test == XHDIMAGIC) -+ { -+ XHDI = val; -+ } -+ } -+ } -+ -+ r = XHGetVersion (); -+ if (r < 0) -+ { -+ perror ("XHGetVersion"); -+ -+ XHDI = XHDIfail; -+ return r; -+ } -+ -+ /* we need at least XHDI 1.10 */ -+ if (r >= 0x110) -+ { -+ XHDI_installed = r; -+ return 0; -+ } -+ -+ XHDI = XHDIfail; -+ return -1; -+} -+ -+ -+/* -+ * XHDI wrapper routines -+ */ -+ -+# define CALL \ -+ long oldstack = 0; \ -+ long r; \ -+ \ -+ if (init) init_XHDI (); \ -+ \ -+ if (!Super (1L)) \ -+ oldstack = Super (0L); \ -+ \ -+ r = XHDI (args); \ -+ if (r < 0) \ -+ { \ -+ __set_errno (-r); \ -+ r = -1; \ -+ } \ -+ \ -+ if (oldstack) \ -+ Super (oldstack); \ -+ \ -+ return r -+ -+long -+XHGetVersion (void) -+{ -+ struct args_XHGetVersion -+ { -+ ushort opcode; -+ } -+ args = -+ { -+ 0 -+ }; -+ -+ CALL; -+} -+ -+long -+XHInqTarget (ushort major, ushort minor, ulong *block_size, ulong *device_flags, char *product_name) -+{ -+ struct args_XHInqTarget -+ { -+ ushort opcode; -+ ushort major; -+ ushort minor; -+ ulong *block_size; -+ ulong *device_flags; -+ char *product_name; -+ } -+ args = -+ { -+ 1, -+ major, -+ minor, -+ block_size, -+ device_flags, -+ product_name -+ }; -+ -+ CALL; -+} -+ -+long -+XHReserve (ushort major, ushort minor, ushort do_reserve, ushort key) -+{ -+ struct args_XHReserve -+ { -+ ushort opcode; -+ ushort major; -+ ushort minor; -+ ushort do_reserve; -+ ushort key; -+ } -+ args = -+ { -+ 2, -+ major, -+ minor, -+ do_reserve, -+ key -+ }; -+ -+ CALL; -+} -+ -+long -+XHLock (ushort major, ushort minor, ushort do_lock, ushort key) -+{ -+ struct args_XHLock -+ { -+ ushort opcode; -+ ushort major; -+ ushort minor; -+ ushort do_lock; -+ ushort key; -+ } -+ args = -+ { -+ 3, -+ major, -+ minor, -+ do_lock, -+ key -+ }; -+ -+ CALL; -+} -+ -+long -+XHStop (ushort major, ushort minor, ushort do_stop, ushort key) -+{ -+ struct args_XHStop -+ { -+ ushort opcode; -+ ushort major; -+ ushort minor; -+ ushort do_stop; -+ ushort key; -+ } -+ args = -+ { -+ 4, -+ major, -+ minor, -+ do_stop, -+ key -+ }; -+ -+ CALL; -+} -+ -+long -+XHEject (ushort major, ushort minor, ushort do_eject, ushort key) -+{ -+ struct args_XHEject -+ { -+ ushort opcode; -+ ushort major; -+ ushort minor; -+ ushort do_eject; -+ ushort key; -+ } -+ args = -+ { -+ 5, -+ major, -+ minor, -+ do_eject, -+ key -+ }; -+ -+ CALL; -+} -+ -+long -+XHDrvMap (void) -+{ -+ struct args_XHDrvMap -+ { -+ ushort opcode; -+ } -+ args = -+ { -+ 6 -+ }; -+ -+ CALL; -+} -+ -+long -+XHInqDev (ushort bios, ushort *major, ushort *minor, ulong *start, __BPB *bpb) -+{ -+ struct args_XHInqDev -+ { -+ ushort opcode; -+ ushort bios; -+ ushort *major; -+ ushort *minor; -+ ulong *start; -+ __BPB *bpb; -+ } -+ args = -+ { -+ 7, -+ bios, -+ major, -+ minor, -+ start, -+ bpb -+ }; -+ -+ CALL; -+} -+ -+long -+XHInqDriver (ushort bios, char *name, char *version, char *company, ushort *ahdi_version, ushort *maxIPL) -+{ -+ struct args_XHInqDriver -+ { -+ ushort opcode; -+ ushort bios; -+ char *name; -+ char *version; -+ char *company; -+ ushort *ahdi_version; -+ ushort *maxIPL; -+ } -+ args = -+ { -+ 8, -+ bios, -+ name, -+ version, -+ company, -+ ahdi_version, -+ maxIPL -+ }; -+ -+ CALL; -+} -+ -+long -+XHNewCookie (void *newcookie) -+{ -+ struct args_XHNewCookie -+ { -+ ushort opcode; -+ void *newcookie; -+ } -+ args = -+ { -+ 9, -+ newcookie -+ }; -+ -+ CALL; -+} -+ -+long -+XHReadWrite (ushort major, ushort minor, ushort rwflag, ulong recno, ushort count, void *buf) -+{ -+ struct args_XHReadWrite -+ { -+ ushort opcode; -+ ushort major; -+ ushort minor; -+ ushort rwflag; -+ ulong recno; -+ ushort count; -+ void *buf; -+ } -+ args = -+ { -+ 10, -+ major, -+ minor, -+ rwflag, -+ recno, -+ count, -+ buf -+ }; -+ -+ CALL; -+} -+ -+long -+XHInqTarget2 (ushort major, ushort minor, ulong *block_size, ulong *device_flags, char *product_name, ushort stringlen) -+{ -+ struct args_XHInqTarget2 -+ { -+ ushort opcode; -+ ushort major; -+ ushort minor; -+ ulong *block_size; -+ ulong *device_flags; -+ char *product_name; -+ ushort stringlen; -+ } -+ args = -+ { -+ 11, -+ major, -+ minor, -+ block_size, -+ device_flags, -+ product_name, -+ stringlen -+ }; -+ -+ CALL; -+} -+ -+long -+XHInqDev2 (ushort bios, ushort *major, ushort *minor, ulong *start, __BPB *bpb, ulong *blocks, char *partid) -+{ -+ struct args_XHInqDev2 -+ { -+ ushort opcode; -+ ushort bios; -+ ushort *major; -+ ushort *minor; -+ ulong *start; -+ __BPB *bpb; -+ ulong *blocks; -+ char *partid; -+ } -+ args = -+ { -+ 12, -+ bios, -+ major, -+ minor, -+ start, -+ bpb, -+ blocks, -+ partid -+ }; -+ -+ CALL; -+} -+ -+long -+XHDriverSpecial (ulong key1, ulong key2, ushort subopcode, void *data) -+{ -+ struct args_XHDriverSpecial -+ { -+ ushort opcode; -+ ulong key1; -+ ulong key2; -+ ushort subopcode; -+ void *data; -+ } -+ args = -+ { -+ 13, -+ key1, -+ key2, -+ subopcode, -+ data -+ }; -+ -+ CALL; -+} -+ -+long -+XHGetCapacity (ushort major, ushort minor, ulong *blocks, ulong *bs) -+{ -+ struct args_XHGetCapacity -+ { -+ ushort opcode; -+ ushort major; -+ ushort minor; -+ ulong *blocks; -+ ulong *bs; -+ } -+ args = -+ { -+ 14, -+ major, -+ minor, -+ blocks, -+ bs -+ }; -+ -+ CALL; -+} -+ -+long -+XHMediumChanged (ushort major, ushort minor) -+{ -+ struct args_XHMediumChanged -+ { -+ ushort opcode; -+ ushort major; -+ ushort minor; -+ } -+ args = -+ { -+ 15, -+ major, -+ minor -+ }; -+ -+ CALL; -+} -+ -+long -+XHMiNTInfo (ushort op, void *data) -+{ -+ struct args_XHMiNTInfo -+ { -+ ushort opcode; -+ ushort op; -+ void *data; -+ } -+ args = -+ { -+ 16, -+ op, -+ data -+ }; -+ -+ CALL; -+} -+ -+long -+XHDOSLimits (ushort which, ulong limit) -+{ -+ struct args_XHDOSLimits -+ { -+ ushort opcode; -+ ushort which; -+ ulong limit; -+ } -+ args = -+ { -+ 17, -+ which, -+ limit -+ }; -+ -+ CALL; -+} -+ -+long -+XHLastAccess (ushort major, ushort minor, ulong *ms) -+{ -+ struct args_XHLastAccess -+ { -+ ushort opcode; -+ ushort major; -+ ushort minor; -+ ulong *ms; -+ } -+ args = -+ { -+ 18, -+ major, -+ minor, -+ ms -+ }; -+ -+ CALL; -+} -+ -+long -+XHReaccess (ushort major, ushort minor) -+{ -+ struct args_XHReaccess -+ { -+ ushort opcode; -+ ushort major; -+ ushort minor; -+ } -+ args = -+ { -+ 19, -+ major, -+ minor -+ }; -+ -+ CALL; -+} -diff -ur --new-file e2fsprogs-1.41.3/lib/ext2fs/xhdi.h e2fsprogs-1.41.3-mint/lib/ext2fs/xhdi.h ---- e2fsprogs-1.41.3/lib/ext2fs/xhdi.h 1970-01-01 00:00:00.000000000 +0000 -+++ e2fsprogs-1.41.3-mint/lib/ext2fs/xhdi.h 2009-01-23 10:49:56.000000000 +0000 -@@ -0,0 +1,144 @@ -+/* -+ * Copyright 2000 Frank Naumann -+ * All rights reserved. -+ * -+ * This program is free software; you can redistribute it and/or modify -+ * it under the terms of the GNU General Public License as published by -+ * the Free Software Foundation; either version 2, or (at your option) -+ * any later version. -+ * -+ * This file is distributed in the hope that it will be useful, -+ * but WITHOUT ANY WARRANTY; without even the implied warranty of -+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -+ * GNU General Public License for more details. -+ * -+ * You should have received a copy of the GNU General Public License -+ * along with this program; if not, write to the Free Software -+ * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. -+ * -+ */ -+ -+# ifndef _xhdi_h -+# define _xhdi_h -+ -+# include -+ -+typedef unsigned char uchar; -+ -+ -+/* -+ * BIOS parameter block (osbind.h is buggy) -+ */ -+ -+typedef struct -+{ -+ ushort recsiz; /* bytes per sector */ -+ short clsiz; /* sectors per cluster */ -+ ushort clsizb; /* bytes per cluster */ -+ short rdlen; /* root directory size */ -+ short fsiz; /* size of FAT */ -+ short fatrec; /* startsector of second FAT */ -+ short datrec; /* first data sector */ -+ ushort numcl; /* total number of clusters */ -+ short bflags; /* some flags */ -+ -+} __BPB; -+ -+ -+/* -+ * Extended BIOS Parameter Block (XHDI) -+ */ -+ -+typedef struct -+{ -+ ushort recsiz; /* bytes per sector */ -+ short clsiz; /* sectors per cluster */ -+ ushort clsizb; /* bytes per cluster */ -+ short rdlen; /* root directory size or 0 if FAT32 */ -+ short fsiz; /* size of FAT or 0 if FAT32 */ -+ short fatrec; /* startsector of second FAT or 0 if FAT32 */ -+ short datrec; /* first data sector or 0 if FAT32 */ -+ ushort numcl; /* total number of clusters or 0 if FAT32 */ -+ short bflags; /* bit 0: 0 = FAT12, 1 = FAT16 -+ * bit 1: 0 = 2 FATs, 1 = 1 FAT -+ * bit 2: 0 = BPB, 1 = EXTENDED_BPB -+ */ -+ -+ /* Ab hier undokumentiert, nur A: und B:! */ -+ short ntracks; /* Anzahl Spuren */ -+ short nsides; /* Anzahl Seiten */ -+ short spc; /* Sektoren pro Zylinder */ -+ short spt; /* Sektoren pro Spur */ -+ ushort nhid; /* Anzahl versteckte Sektoren */ -+ uchar ser[3]; /* Seriennummer */ -+ uchar serms[4]; /* ab TOS 2.06: MS-DOS-4.0-Seriennummer */ -+ char unused; -+ -+ /* if bit 2 of bflags are set */ -+ long l_recsiz; /* bytes per sector */ -+ long l_clsiz; /* sectors per cluster */ -+ long l_clsizb; /* bytes per cluster */ -+ long l_rdlen; /* root directory size */ -+ long l_fsiz; /* size of FAT */ -+ long l_fatrec; /* startsector of second FAT */ -+ long l_datrec; /* first data sector */ -+ long l_numcl; /* total number of clusters */ -+ long l_rdstcl; /* if FAT32: startcluster of root directory -+ * otherwise 0 -+ */ -+} __xhdi_BPB; -+ -+ -+# define XH_TARGET_STOPPABLE 0x00000001L -+# define XH_TARGET_REMOVABLE 0x00000002L -+# define XH_TARGET_LOCKABLE 0x00000004L -+# define XH_TARGET_EJECTABLE 0x00000008L -+# define XH_TARGET_LOCKED 0x20000000L -+# define XH_TARGET_STOPPED 0x40000000L -+# define XH_TARGET_RESERVED 0x80000000L -+ -+# define XH_MI_SETKERINFO 0 -+# define XH_MI_GETKERINFO 1 -+ -+# define XH_DL_SECSIZ 0 -+# define XH_DL_MINFAT 1 -+# define XH_DL_MAXFAT 2 -+# define XH_DL_MINSPC 3 -+# define XH_DL_MAXSPC 4 -+# define XH_DL_CLUSTS 5 -+# define XH_DL_MAXSEC 6 -+# define XH_DL_DRIVES 7 -+# define XH_DL_CLSIZB 8 -+# define XH_DL_RDLEN 9 -+# define XH_DL_CLUSTS12 12 -+# define XH_DL_CLUSTS32 13 -+# define XH_DL_BFLAGS 14 -+ -+ -+extern ushort XHDI_installed; -+ -+long init_XHDI (void); -+ -+long XHGetVersion (void); -+long XHInqTarget (ushort major, ushort minor, ulong *block_size, ulong *device_flags, char *product_name); -+long XHReserve (ushort major, ushort minor, ushort do_reserve, ushort key); -+long XHLock (ushort major, ushort minor, ushort do_lock, ushort key); -+long XHStop (ushort major, ushort minor, ushort do_stop, ushort key); -+long XHEject (ushort major, ushort minor, ushort do_eject, ushort key); -+long XHDrvMap (void); -+long XHInqDev (ushort bios, ushort *major, ushort *minor, ulong *start, __BPB *bpb); -+long XHInqDriver (ushort bios, char *name, char *version, char *company, ushort *ahdi_version, ushort *maxIPL); -+long XHNewCookie (void *newcookie); -+long XHReadWrite (ushort major, ushort minor, ushort rwflag, ulong recno, ushort count, void *buf); -+long XHInqTarget2 (ushort major, ushort minor, ulong *block_size, ulong *device_flags, char *product_name, ushort stringlen); -+long XHInqDev2 (ushort bios, ushort *major, ushort *minor, ulong *start, __BPB *bpb, ulong *blocks, char *partid); -+long XHDriverSpecial (ulong key1, ulong key2, ushort subopcode, void *data); -+long XHGetCapacity (ushort major, ushort minor, ulong *blocks, ulong *bs); -+long XHMediumChanged (ushort major, ushort minor); -+long XHMiNTInfo (ushort op, void *data); -+long XHDOSLimits (ushort which, ulong limit); -+long XHLastAccess (ushort major, ushort minor, ulong *ms); -+long XHReaccess (ushort major, ushort minor); -+ -+ -+# endif /* _xhdi_h */ -diff -ur --new-file e2fsprogs-1.41.3/misc/e2undo.c e2fsprogs-1.41.3-mint/misc/e2undo.c ---- e2fsprogs-1.41.3/misc/e2undo.c 2009-01-23 12:59:44.000000000 +0000 -+++ e2fsprogs-1.41.3-mint/misc/e2undo.c 2009-01-23 12:56:40.000000000 +0000 -@@ -19,6 +19,7 @@ - #if HAVE_ERRNO_H - #include - #endif -+#include - #include "ext2fs/tdb.h" - #include "ext2fs/ext2fs.h" - #include "nls-enable.h" -diff -ur --new-file e2fsprogs-1.41.3/misc/e2initrd_helper.c e2fsprogs-1.41.3-mint/misc/e2initrd_helper.c ---- e2fsprogs-1.41.3/misc/e2initrd_helper.c 2009-01-23 12:58:29.000000000 +0000 -+++ e2fsprogs-1.41.3-mint/misc/e2initrd_helper.c 2009-01-23 12:59:11.000000000 +0000 -@@ -50,7 +50,7 @@ - int ptr; - }; - --struct fs_info { -+struct _fs_info { - char *device; - char *mountpt; - char *type; -@@ -58,7 +58,7 @@ - int freq; - int passno; - int flags; -- struct fs_info *next; -+ struct _fs_info *next; - }; - - static void usage(void) -@@ -230,7 +230,7 @@ - *q = 0; - } - --static int parse_fstab_line(char *line, struct fs_info *fs) -+static int parse_fstab_line(char *line, struct _fs_info *fs) - { - char *dev, *device, *mntpnt, *type, *opts, *freq, *passno, *cp; - -@@ -280,7 +280,7 @@ - return 0; - } - --static void free_fstab_line(struct fs_info *fs) -+static void free_fstab_line(struct _fs_info *fs) - { - if (fs->device) - fs->device = 0; -@@ -290,7 +290,7 @@ - fs->type = 0; - if (fs->opts) - fs->opts = 0; -- memset(fs, 0, sizeof(struct fs_info)); -+ memset(fs, 0, sizeof(struct _fs_info)); - } - - -@@ -334,7 +334,7 @@ - errcode_t retval; - struct mem_file file; - char *buf; -- struct fs_info fs_info; -+ struct _fs_info _fs_info; - int ret; - - retval = get_file(fs, "/etc/fstab", &file); -@@ -344,14 +344,14 @@ - if (!buf) - continue; - -- ret = parse_fstab_line(buf, &fs_info); -+ ret = parse_fstab_line(buf, &_fs_info); - if (ret < 0) - goto next_line; - -- if (!strcmp(fs_info.mountpt, "/")) -- printf("%s\n", fs_info.type); -+ if (!strcmp(_fs_info.mountpt, "/")) -+ printf("%s\n", _fs_info.type); - -- free_fstab_line(&fs_info); -+ free_fstab_line(&_fs_info); - - next_line: - free(buf); -diff -ur --new-file e2fsprogs-1.41.3/misc/mke2fs.c e2fsprogs-1.41.3-mint/misc/mke2fs.c ---- e2fsprogs-1.41.3/misc/mke2fs.c 2008-10-07 14:22:39.000000000 +0000 -+++ e2fsprogs-1.41.3-mint/misc/mke2fs.c 2009-01-23 10:47:35.000000000 +0000 -@@ -1819,6 +1819,36 @@ - return retval; - } - -+#ifdef __MINT__ -+void -+warn (const char *drv) -+{ -+ char c; -+ int check; -+ -+ check = open (drv, O_RDONLY); -+ if (check == -1) -+ return; -+ -+ close (check); -+ -+ if (check < 1024) -+ return; -+ -+ fprintf (stderr, "\n"); -+ fprintf (stderr, "WARNING: THIS WILL TOTALLY DESTROY ANY DATA ON %s:\n", drv); -+ fprintf (stderr, "Are you ABSOLUTELY SURE you want to do this? (y/n) "); -+ scanf ("%c", &c); -+ fprintf (stderr, "\n"); -+ -+ if (c == 'y' || c == 'Y') -+ return; -+ -+ fprintf (stderr, "Aborted\n"); -+ exit (1); -+} -+#endif -+ - int main (int argc, char *argv[]) - { - errcode_t retval = 0; -@@ -1839,6 +1869,11 @@ - #endif - PRS(argc, argv); - -+#ifdef __MINT__ -+ if (!quiet) -+ warn (device_name); -+#endif -+ - #ifdef CONFIG_TESTIO_DEBUG - if (getenv("TEST_IO_FLAGS") || getenv("TEST_IO_BLOCK")) { - io_ptr = test_io_manager; diff --git a/sdk_container/src/third_party/portage-stable/sys-fs/e2fsprogs/files/e2fsprogs-1.41.12-darwin-makefile.patch b/sdk_container/src/third_party/portage-stable/sys-fs/e2fsprogs/files/e2fsprogs-1.41.12-darwin-makefile.patch deleted file mode 100644 index 84440671ae..0000000000 --- a/sdk_container/src/third_party/portage-stable/sys-fs/e2fsprogs/files/e2fsprogs-1.41.12-darwin-makefile.patch +++ /dev/null @@ -1,113 +0,0 @@ -On Darwin, create dylibs with a versioning scheme like Linux/ELF, not -like BSD/ELF. -This patch uses intentionally ELF_* vars to make it easier to diff -against the ELF Makefile. - -http://sourceforge.net/tracker/index.php?func=detail&aid=2555389&group_id=2406&atid=302406 - ---- lib/Makefile.darwin-lib -+++ lib/Makefile.darwin-lib -@@ -1,14 +1,15 @@ - # --# This is a Makefile stub which handles the creation of Darwin BSD shared --# libraries. -+# This is a Makefile stub which handles the creation of Darwin shared -+# libraries based on the ELF scheme. - # - # In order to use this stub, the following makefile variables must be defined. --# --# BSDLIB_VERSION = 1.0 --# BSDLIB_IMAGE = libce --# BSDLIB_MYDIR = et --# BSDLIB_INSTALL_DIR = $(SHLIBDIR) --# -+# -+# ELF_VERSION = 1.0 -+# ELF_SO_VERSION = 1 -+# ELF_IMAGE = libce -+# ELF_MYDIR = et -+# ELF_INSTALL_DIR = $(SHLIBDIR) -+# ELF_OTHER_LIBS = -lc - - all:: image - -@@ -16,36 +17,58 @@ - $(E) " MKDIR pic" - $(Q) mkdir -p pic - --BSD_LIB = $(BSDLIB_IMAGE).$(BSDLIB_VERSION).dylib --BSDLIB_PIC_FLAG = -fPIC -+ELF_LIB = $(ELF_IMAGE).$(ELF_VERSION).dylib -+ELF_SONAME = $(ELF_IMAGE).$(ELF_SO_VERSION).dylib - --image: $(BSD_LIB) -+image: $(ELF_LIB) - --$(BSD_LIB): $(OBJS) -- $(E) " GEN_BSD_SOLIB $(BSD_LIB)" -- $(Q) (cd pic; $(CC) -dynamiclib -compatibility_version 1.0 -current_version $(BSDLIB_VERSION) \ -- -flat_namespace -undefined warning -o $(BSD_LIB) $(OBJS)) -- $(Q) $(MV) pic/$(BSD_LIB) . -- $(Q) $(RM) -f ../$(BSD_LIB) -+$(ELF_LIB): $(OBJS) -+ $(E) " GEN_ELF_SOLIB $(ELF_LIB)" -+ $(Q) (cd pic; $(CC) -dynamiclib -o $(ELF_LIB) $(LDFLAGS) \ -+ -Wl,-install_name,$(libdir)/$(ELF_SONAME) $(OBJS) $(ELF_OTHER_LIBS)) -+ $(Q) $(MV) pic/$(ELF_LIB) . -+ $(Q) $(RM) -f ../$(ELF_LIB) ../$(ELF_IMAGE).dylib ../$(ELF_SONAME) - $(Q) (cd ..; $(LN) $(LINK_BUILD_FLAGS) \ -- `echo $(my_dir) | sed -e 's;lib/;;'`/$(BSD_LIB) $(BSD_LIB)) -- $(Q) (cd ..; $(LN) $(LINK_BUILD_FLAGS) $(BSD_LIB) $(BSDLIB_IMAGE).dylib) -- --install-shlibs install:: $(BSD_LIB) -- $(E) " INSTALL_PROGRAM $(BSDLIB_INSTALL_DIR)/$(BSD_LIB)" -- $(Q) $(INSTALL_PROGRAM) $(BSD_LIB) \ -- $(DESTDIR)$(BSDLIB_INSTALL_DIR)/$(BSD_LIB) -- -$(Q) $(LDCONFIG) -+ `echo $(my_dir) | sed -e 's;lib/;;'`/$(ELF_LIB) $(ELF_LIB)) -+ $(Q) (cd ..; $(LN) $(LINK_BUILD_FLAGS) $(ELF_LIB) $(ELF_IMAGE).dylib) -+ $(Q) (cd ..; $(LN) $(LINK_BUILD_FLAGS) $(ELF_LIB) $(ELF_SONAME)) -+ -+installdirs-elf-lib:: -+ $(E) " MKINSTALLDIRS $(ELF_INSTALL_DIR) $(libdir)" -+ $(Q) $(MKINSTALLDIRS) $(DESTDIR)$(ELF_INSTALL_DIR) \ -+ $(DESTDIR)$(libdir) -+ -+installdirs:: installdirs-elf-lib -+ -+install-shlibs install:: $(ELF_LIB) installdirs-elf-lib -+ $(E) " INSTALL-ELF-LIB $(ELF_INSTALL_DIR)/$(ELF_LIB)" -+ $(Q) $(INSTALL_PROGRAM) $(ELF_LIB) $(DESTDIR)$(ELF_INSTALL_DIR)/$(ELF_LIB) -+ $(E) " SYMLINK $(ELF_INSTALL_DIR)/$(ELF_SONAME)" -+ $(Q) $(LN_S) -f $(ELF_LIB) $(DESTDIR)$(ELF_INSTALL_DIR)/$(ELF_SONAME) -+ $(E) " SYMLINK $(libdir)/$(ELF_IMAGE).dylib" -+ $(Q) if test "$(ELF_INSTALL_DIR)" = "$(libdir)"; then \ -+ $(LN_S) -f $(ELF_SONAME) $(DESTDIR)$(libdir)/$(ELF_IMAGE).dylib ; \ -+ else \ -+ $(LN_S) -f $(ELF_INSTALL_DIR)/$(ELF_SONAME) \ -+ $(DESTDIR)$(libdir)/$(ELF_IMAGE).dylib; \ -+ fi - - install-strip: install -+ $(E) " STRIP-LIB $(ELF_INSTALL_DIR)/$(ELF_LIB)" -+ $(Q) $(STRIP) --strip-unneeded --remove-section=.comment \ -+ --remove-section=.note $(DESTDIR)$(ELF_INSTALL_DIR)/$(ELF_LIB) - - install-shlibs-strip: install-shlibs -+ $(E) " STRIP-LIB $(ELF_INSTALL_DIR)/$(ELF_LIB)" -+ $(Q) $(STRIP) --strip-unneeded --remove-section=.comment \ -+ --remove-section=.note $(DESTDIR)$(ELF_INSTALL_DIR)/$(ELF_LIB) - - uninstall-shlibs uninstall:: -- $(RM) -f $(DESTDIR)$(BSDLIB_INSTALL_DIR)/$(BSD_LIB) -+ $(RM) -f $(DESTDIR)$(ELF_INSTALL_DIR)/$(ELF_LIB) \ -+ $(DESTDIR)$(ELF_INSTALL_DIR)/$(ELF_SONAME) \ -+ $(DESTDIR)$(libdir)/$(ELF_IMAGE).dylib - - clean:: - $(RM) -rf pic -- $(RM) -f $(BSD_LIB) -- $(RM) -f ../$(BSD_LIB) -- $(RM) -f ../$(BSDLIB_IMAGE).dylib -+ $(RM) -f $(ELF_LIB) -+ $(RM) -f ../$(ELF_LIB) ../$(ELF_IMAGE).dylib ../$(ELF_SONAME) diff --git a/sdk_container/src/third_party/portage-stable/sys-fs/e2fsprogs/files/e2fsprogs-1.41.12-mint-blkid.patch b/sdk_container/src/third_party/portage-stable/sys-fs/e2fsprogs/files/e2fsprogs-1.41.12-mint-blkid.patch deleted file mode 100644 index 886ece5b71..0000000000 --- a/sdk_container/src/third_party/portage-stable/sys-fs/e2fsprogs/files/e2fsprogs-1.41.12-mint-blkid.patch +++ /dev/null @@ -1,43 +0,0 @@ -http://bugs.gentoo.org/276055 - -: -The configure test program links against libblkid to test. This works -fine on shared library systems as libblkid automatically depends on -libuuid. But on static systems it needs explicit linking. - - ---- configure.in -+++ configure.in -@@ -398,8 +398,8 @@ - fi - - AC_CHECK_LIB(blkid, blkid_get_cache, -- [LIBBLKID=`$PKG_CONFIG --libs blkid`; -- STATIC_LIBBLKID=`$PKG_CONFIG --static --libs blkid`], -+ [LIBBLKID=`$PKG_CONFIG --libs blkid --libs uuid`; -+ STATIC_LIBBLKID=`$PKG_CONFIG --static --libs blkid --libs uuid`], - [AC_MSG_ERROR([external blkid library not found])], - [$LIBBLKID]) - BLKID_CMT=# ---- configure.old 2011-01-01 14:20:07.000000000 +0000 -+++ configure 2011-01-01 14:22:01.000000000 +0000 -@@ -5228,7 +5228,7 @@ - $as_echo_n "(cached) " >&6 - else - ac_check_lib_save_LIBS=$LIBS --LIBS="-lblkid $LIBBLKID $LIBS" -+LIBS="-lblkid -luuid $LIBBLKID $LIBS" - cat confdefs.h - <<_ACEOF >conftest.$ac_ext - /* end confdefs.h. */ - -@@ -5259,8 +5259,8 @@ - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_blkid_blkid_get_cache" >&5 - $as_echo "$ac_cv_lib_blkid_blkid_get_cache" >&6; } - if test "x$ac_cv_lib_blkid_blkid_get_cache" = x""yes; then : -- LIBBLKID=`$PKG_CONFIG --libs blkid`; -- STATIC_LIBBLKID=`$PKG_CONFIG --static --libs blkid` -+ LIBBLKID=`$PKG_CONFIG --libs blkid --libs uuid`; -+ STATIC_LIBBLKID=`$PKG_CONFIG --static --libs blkid --libs uuid` - else - as_fn_error "external blkid library not found" "$LINENO" 5 - fi diff --git a/sdk_container/src/third_party/portage-stable/sys-fs/e2fsprogs/files/e2fsprogs-1.42.10-fix-build-cflags.patch b/sdk_container/src/third_party/portage-stable/sys-fs/e2fsprogs/files/e2fsprogs-1.42.10-fix-build-cflags.patch index ff68590521..69e6f358d9 100644 --- a/sdk_container/src/third_party/portage-stable/sys-fs/e2fsprogs/files/e2fsprogs-1.42.10-fix-build-cflags.patch +++ b/sdk_container/src/third_party/portage-stable/sys-fs/e2fsprogs/files/e2fsprogs-1.42.10-fix-build-cflags.patch @@ -1,5 +1,7 @@ ---- a/e2fsprogs-libs-1.42.10/configure.in 2014-05-15 13:04:08.000000000 -0400 -+++ b/e2fsprogs-libs-1.42.10/configure.in 2014-07-10 13:39:21.374156802 -0400 +https://bugs.gentoo.org/516854 + +--- a/e2fsprogs-libs-1.42.10/configure ++++ b/e2fsprogs-libs-1.42.10/configure @@ -1328,7 +1328,7 @@ BUILD_CFLAGS="$CFLAGS $CPPFLAGS $INCLUDES -DHAVE_CONFIG_H" BUILD_LDFLAGS="$LDFLAGS" @@ -8,4 +10,4 @@ + BUILD_CFLAGS="$INCLUDES" BUILD_LDFLAGS= fi - AC_SUBST(BUILD_CFLAGS) + diff --git a/sdk_container/src/third_party/portage-stable/sys-fs/e2fsprogs/files/e2fsprogs-1.42.11-prototypes.patch b/sdk_container/src/third_party/portage-stable/sys-fs/e2fsprogs/files/e2fsprogs-1.42.11-prototypes.patch deleted file mode 100644 index 45f10710fd..0000000000 --- a/sdk_container/src/third_party/portage-stable/sys-fs/e2fsprogs/files/e2fsprogs-1.42.11-prototypes.patch +++ /dev/null @@ -1,118 +0,0 @@ -From 8b90ab2b1cfa3974097b0466d8f7563323dda0c2 Mon Sep 17 00:00:00 2001 -From: Andreas Dilger -Date: Fri, 25 Jul 2014 21:43:08 -0400 -Subject: [PATCH] build: fix unused/uninitialized variable warnings - -Fix a few warnings about unused and uninitialized variables. - -Also fix util/subst.c to include to avoid using -undeclared functions gettimeofday() and futimes(). - -Signed-off-by: Andreas Dilger -Signed-off-by: Theodore Ts'o ---- - debugfs/debugfs.c | 3 --- - e2fsck/pass5.c | 3 --- - lib/ext2fs/blkmap64_rb.c | 2 +- - lib/quota/mkquota.c | 1 - - misc/mk_hugefiles.c | 2 +- - util/subst.c | 3 +++ - 6 files changed, 5 insertions(+), 9 deletions(-) - -diff --git a/debugfs/debugfs.c b/debugfs/debugfs.c -index b41626c..b6ba1da 100644 ---- a/debugfs/debugfs.c -+++ b/debugfs/debugfs.c -@@ -2347,7 +2347,6 @@ try_again: - - void do_dump_mmp(int argc EXT2FS_ATTR((unused)), char *argv[]) - { -- struct ext2_super_block *sb; - struct mmp_struct *mmp_s; - time_t t; - errcode_t retval = 0; -@@ -2355,8 +2354,6 @@ void do_dump_mmp(int argc EXT2FS_ATTR((unused)), char *argv[]) - if (check_fs_open(argv[0])) - return; - -- sb = current_fs->super; -- - if (current_fs->mmp_buf == NULL) { - retval = ext2fs_get_mem(current_fs->blocksize, - ¤t_fs->mmp_buf); -diff --git a/e2fsck/pass5.c b/e2fsck/pass5.c -index b31490f..d0b1ced 100644 ---- a/e2fsck/pass5.c -+++ b/e2fsck/pass5.c -@@ -206,7 +206,6 @@ static void check_block_bitmaps(e2fsck_t ctx) - problem_t problem, save_problem; - int fixit, had_problem; - errcode_t retval; -- int csum_flag; - int old_desc_blocks = 0; - int count = 0; - int cmp_block = 0; -@@ -253,8 +252,6 @@ static void check_block_bitmaps(e2fsck_t ctx) - goto errout; - } - -- csum_flag = EXT2_HAS_RO_COMPAT_FEATURE(fs->super, -- EXT4_FEATURE_RO_COMPAT_GDT_CSUM); - redo_counts: - had_problem = 0; - save_problem = 0; -diff --git a/lib/ext2fs/blkmap64_rb.c b/lib/ext2fs/blkmap64_rb.c -index 4dcb03f..a1dde6d 100644 ---- a/lib/ext2fs/blkmap64_rb.c -+++ b/lib/ext2fs/blkmap64_rb.c -@@ -83,7 +83,7 @@ static void print_tree(struct rb_root *root) - - static void check_tree(struct rb_root *root, const char *msg) - { -- struct rb_node *new_node, *node, *next; -+ struct rb_node *node; - struct bmap_rb_extent *ext, *old = NULL; - - for (node = ext2fs_rb_first(root); node; -diff --git a/lib/quota/mkquota.c b/lib/quota/mkquota.c -index 58803d0..0ece088 100644 ---- a/lib/quota/mkquota.c -+++ b/lib/quota/mkquota.c -@@ -580,7 +580,6 @@ out: - errcode_t quota_compare_and_update(quota_ctx_t qctx, int qtype, - int *usage_inconsistent) - { -- ext2_filsys fs = qctx->fs; - struct quota_handle qh; - struct scan_dquots_data scan_data; - struct dquot *dq; -diff --git a/misc/mk_hugefiles.c b/misc/mk_hugefiles.c -index 6bc25e6..7f1be2e 100644 ---- a/misc/mk_hugefiles.c -+++ b/misc/mk_hugefiles.c -@@ -468,7 +468,7 @@ errcode_t mk_hugefiles(ext2_filsys fs, const char *device_name) - unsigned long i; - ext2_ino_t dir; - errcode_t retval; -- blk64_t fs_blocks, part_offset; -+ blk64_t fs_blocks, part_offset = 0; - unsigned long align; - int d, dsize; - char *t; -diff --git a/util/subst.c b/util/subst.c -index 6244831..36eaa94 100644 ---- a/util/subst.c -+++ b/util/subst.c -@@ -14,6 +14,9 @@ - #include - #include - #include -+#ifdef HAVE_SYS_TIME_H -+#include -+#endif - #include - #include - #include --- -2.0.0 - diff --git a/sdk_container/src/third_party/portage-stable/sys-fs/e2fsprogs/files/e2fsprogs-1.42.13-fix-build-cflags.patch b/sdk_container/src/third_party/portage-stable/sys-fs/e2fsprogs/files/e2fsprogs-1.42.13-fix-build-cflags.patch new file mode 100644 index 0000000000..dcab9a34de --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/sys-fs/e2fsprogs/files/e2fsprogs-1.42.13-fix-build-cflags.patch @@ -0,0 +1,13 @@ +https://bugs.gentoo.org/516854 + +--- e2fsprogs-1.42.13/configure ++++ e2fsprogs-1.42.13/configure +@@ -1315,6 +1315,8 @@ + if test $cross_compiling = no; then + BUILD_CFLAGS="$CFLAGS $CPPFLAGS $INCLUDES -DHAVE_CONFIG_H" + BUILD_LDFLAGS="$LDFLAGS" ++else ++ BUILD_CFLAGS="$INCLUDES" + fi + + diff --git a/sdk_container/src/third_party/portage-stable/sys-fs/e2fsprogs/files/e2fsprogs-1.42.7-libext2fs-fix-return-value.patch b/sdk_container/src/third_party/portage-stable/sys-fs/e2fsprogs/files/e2fsprogs-1.42.7-libext2fs-fix-return-value.patch deleted file mode 100644 index 2d48fdf4c6..0000000000 --- a/sdk_container/src/third_party/portage-stable/sys-fs/e2fsprogs/files/e2fsprogs-1.42.7-libext2fs-fix-return-value.patch +++ /dev/null @@ -1,32 +0,0 @@ -From 266eb87990025e82a8884e30993ce93c00d19db3 Mon Sep 17 00:00:00 2001 -From: Mike Frysinger -Date: Sat, 4 May 2013 01:00:58 -0400 -Subject: [PATCH] libext2fs: fix return value - -The ext2fs_test_block_bitmap_range2 func is not a void, so make sure we -return a value. I picked EINVAL as it looks like what other things in -this func use. - -URL: http://bugs.gentoo.org/467986 -Reported-by: Vicente Olivert Riera -Signed-off-by: Mike Frysinger ---- - lib/ext2fs/gen_bitmap64.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/lib/ext2fs/gen_bitmap64.c b/lib/ext2fs/gen_bitmap64.c -index 42a97d4..44ac499 100644 ---- a/lib/ext2fs/gen_bitmap64.c -+++ b/lib/ext2fs/gen_bitmap64.c -@@ -658,7 +658,7 @@ int ext2fs_test_block_bitmap_range2(ext2fs_block_bitmap bmap, - if ((block < bmap->start) || (block+num-1 > bmap->end)) { - ext2fs_warn_bitmap(EXT2_ET_BAD_BLOCK_TEST, block, - bmap->description); -- return; -+ return EINVAL; - } - - return bmap->bitmap_ops->test_clear_bmap_extent(bmap, block, num); --- -1.8.2.1 - diff --git a/sdk_container/src/third_party/portage-stable/sys-fs/e2fsprogs/metadata.xml b/sdk_container/src/third_party/portage-stable/sys-fs/e2fsprogs/metadata.xml index 0abb95a428..14bdacde26 100644 --- a/sdk_container/src/third_party/portage-stable/sys-fs/e2fsprogs/metadata.xml +++ b/sdk_container/src/third_party/portage-stable/sys-fs/e2fsprogs/metadata.xml @@ -1,8 +1,9 @@ -base-system - - cpe:/a:ext2_filesystems_utilities:e2fsprogs - + base-system + + cpe:/a:ext2_filesystems_utilities:e2fsprogs + e2fsprogs +