From 47cc5a71fd042978c32a47eac63941d6de8d7f7b Mon Sep 17 00:00:00 2001 From: Mike Frysinger Date: Sat, 3 Mar 2007 06:21:29 +0000 Subject: [PATCH] Update loop-aes version #168174 by Alon Bar-Lev. Package-Manager: portage-2.1.2-r13 --- sys-apps/util-linux/ChangeLog | 8 +- sys-apps/util-linux/Manifest | 44 ++-- .../files/digest-util-linux-2.12r-r6 | 12 ++ .../files/digest-util-linux-2.13_pre7 | 6 +- .../util-linux/util-linux-2.12r-r6.ebuild | 193 ++++++++++++++++++ .../util-linux/util-linux-2.13_pre7.ebuild | 6 +- 6 files changed, 240 insertions(+), 29 deletions(-) create mode 100644 sys-apps/util-linux/files/digest-util-linux-2.12r-r6 create mode 100644 sys-apps/util-linux/util-linux-2.12r-r6.ebuild diff --git a/sys-apps/util-linux/ChangeLog b/sys-apps/util-linux/ChangeLog index 7db64ccc43f1..2f74519b1d7e 100644 --- a/sys-apps/util-linux/ChangeLog +++ b/sys-apps/util-linux/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for sys-apps/util-linux # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sys-apps/util-linux/ChangeLog,v 1.179 2007/03/03 06:13:04 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-apps/util-linux/ChangeLog,v 1.180 2007/03/03 06:21:29 vapier Exp $ + +*util-linux-2.12r-r6 (03 Mar 2007) + + 03 Mar 2007; Mike Frysinger + +util-linux-2.12r-r6.ebuild, util-linux-2.13_pre7.ebuild: + Update loop-aes version #168174 by Alon Bar-Lev. 03 Mar 2007; Mike Frysinger +files/util-linux-2.12r-HAVE_asm_page_h.patch, util-linux-2.12r-r5.ebuild: diff --git a/sys-apps/util-linux/Manifest b/sys-apps/util-linux/Manifest index 7a9da776c268..ffff75eea7bc 100644 --- a/sys-apps/util-linux/Manifest +++ b/sys-apps/util-linux/Manifest @@ -149,45 +149,45 @@ AUX util-linux-no-kill.patch 642 RMD160 cb9bef851804fbcd9a0910cb39123f65f72bbdc5 MD5 65f42fbf981464410f7d5d84a429e920 files/util-linux-no-kill.patch 642 RMD160 cb9bef851804fbcd9a0910cb39123f65f72bbdc5 files/util-linux-no-kill.patch 642 SHA256 c72803b0918589dbd409e22368853330bc84d875c91936fc5e899686c1642aaf files/util-linux-no-kill.patch 642 -DIST loop-AES-v3.1d.tar.bz2 169228 RMD160 36707f6ed2f57dabd7278c9d6386a25c2c012d59 SHA1 0be0d2e4e70c79a53b2ac6462659c1e36d2e69e6 SHA256 05826b3238d5d9f134426cb8575496508205ef607e0a9075b50510c8e0e8a23c DIST loop-AES-v3.1e.tar.bz2 169664 RMD160 78a54330a343103900cc479d58645ec77563ded0 SHA1 10535c8279e55555686af9e39945ccff2434e44f SHA256 6b1d671a9e3cadeef7a8f391cda4b5b883d0d1bf91d08d2746af8e4780fdff9d +DIST loop-AES-v3.1f.tar.bz2 173423 RMD160 7490e3d90727621fde3052fd1747af338518b158 SHA1 abcc9c29c16596923a0c50a9190025a08b069ef4 SHA256 f744f3dd74b554d1a2e3788752c4a63049647bfd2bae71d9fff2427c0e175ca7 DIST util-linux-2.12i-cryptoapi-losetup.patch.bz2 4800 RMD160 82e54aedd691aa93b67de9dfb9049a3f012a29f7 SHA1 69b757c28b6401abe454f060c2a24da49e2d129a SHA256 565a0cc6c3c148a66969276ae9d34dc34f19fbd45df2740343793ee067b3700f DIST util-linux-2.12i.tar.gz 1975468 RMD160 f055a94ad247dc59293f7b933c12bdda135159fc SHA1 deb940cb61d9ae0b481b6469ea496f762a2581a8 SHA256 28e2fc70d7507e158d8861c958461aef1c4bbf4157a8ebbc237943944e5a8c4a DIST util-linux-2.12r.tar.bz2 1370907 RMD160 51950aafd5cbcb574e69fbd6b28d15a106147e64 SHA1 740b7eb5ae1148b2200b2cd34a0a6c4b0db577e4 SHA256 b8e499b338ce9fbd1fb315194b26540ec823c0afc46c9e145ac7a3e38ad57e6b DIST util-linux-2.13-pre7.tar.bz2 2534328 RMD160 ce25337cf43f6c818d01206453a38b0188c92f17 SHA1 13c17068a056eb017a81eaf527ddf34581e70a3f SHA256 9e1142742dcfac977be57fd589a40f1e7b2f9dbaa4847e063d3f700b35b3bfb7 -EBUILD util-linux-2.12r-r4.ebuild 6183 RMD160 101947bd6a5d3d1ff0165c455f09b460a4f53c75 SHA1 1690998a603ca23eaa465e9a5d97a7781b7bf432 SHA256 b38f53ff05b6313f2de702bed477d0f08039e089588a84f0ee081e143ebb0e16 -MD5 1007944e07bafbd4a7b3148d18908ae1 util-linux-2.12r-r4.ebuild 6183 -RMD160 101947bd6a5d3d1ff0165c455f09b460a4f53c75 util-linux-2.12r-r4.ebuild 6183 -SHA256 b38f53ff05b6313f2de702bed477d0f08039e089588a84f0ee081e143ebb0e16 util-linux-2.12r-r4.ebuild 6183 EBUILD util-linux-2.12r-r5.ebuild 6308 RMD160 2dedc968f35dfc93ac43a93432c7ebf3ac506c99 SHA1 766be704ac8a9420115ef3ce2795eb3ae56e9cfd SHA256 7b9d9aadcafad3686ae13d4eecbb054d0ddea2058efa7876be044069c666ac85 MD5 29269b9593f23aeff06ba5c8140cd97c util-linux-2.12r-r5.ebuild 6308 RMD160 2dedc968f35dfc93ac43a93432c7ebf3ac506c99 util-linux-2.12r-r5.ebuild 6308 SHA256 7b9d9aadcafad3686ae13d4eecbb054d0ddea2058efa7876be044069c666ac85 util-linux-2.12r-r5.ebuild 6308 -EBUILD util-linux-2.13_pre7.ebuild 3966 RMD160 f908f9199799b1c65a73fbf7c29ec0b6a522be83 SHA1 50e95795a6fe13317d3e1c2b7d54dfe6c057bd30 SHA256 236b7e91f981ab7bf84b7d59ea4fe7054cebf180765c658e1fa0f92986cdaf8e -MD5 46e4a318d6d4ec1f9f7b1143e0f99a06 util-linux-2.13_pre7.ebuild 3966 -RMD160 f908f9199799b1c65a73fbf7c29ec0b6a522be83 util-linux-2.13_pre7.ebuild 3966 -SHA256 236b7e91f981ab7bf84b7d59ea4fe7054cebf180765c658e1fa0f92986cdaf8e util-linux-2.13_pre7.ebuild 3966 -MISC ChangeLog 28168 RMD160 cb7f73066a4875939783b23447156804265c77b0 SHA1 80c029fc326665cc79f14423b5296637cb27b0ee SHA256 fa04e164b4e19d4e70920030f09ef92acdbc33fc509456d8c93076a396f1aac6 -MD5 274b105877b888cf1105c6c9bab72e6f ChangeLog 28168 -RMD160 cb7f73066a4875939783b23447156804265c77b0 ChangeLog 28168 -SHA256 fa04e164b4e19d4e70920030f09ef92acdbc33fc509456d8c93076a396f1aac6 ChangeLog 28168 +EBUILD util-linux-2.12r-r6.ebuild 6320 RMD160 662ff98d4e1bdfd071d3b1012f1757bc425d4c4e SHA1 4a12b25ad2434750653169c5f5234eb3db23decd SHA256 6fc8cf0c0cd08b1f86564d6177a9ef2f068b4e6a65c33b8b97ee66d99069849d +MD5 a2b80a4a7070db572586369adfb675af util-linux-2.12r-r6.ebuild 6320 +RMD160 662ff98d4e1bdfd071d3b1012f1757bc425d4c4e util-linux-2.12r-r6.ebuild 6320 +SHA256 6fc8cf0c0cd08b1f86564d6177a9ef2f068b4e6a65c33b8b97ee66d99069849d util-linux-2.12r-r6.ebuild 6320 +EBUILD util-linux-2.13_pre7.ebuild 3966 RMD160 477c6d511454716d6a940ee17434889b09478039 SHA1 96cef99d7724393ee8facd1bc02b329030be4010 SHA256 812ae088a465b12e7302d92ced8365972511b74f495a1ccafe5209638e8025c6 +MD5 8b5b3fe1ea733988e8918ca1562b0669 util-linux-2.13_pre7.ebuild 3966 +RMD160 477c6d511454716d6a940ee17434889b09478039 util-linux-2.13_pre7.ebuild 3966 +SHA256 812ae088a465b12e7302d92ced8365972511b74f495a1ccafe5209638e8025c6 util-linux-2.13_pre7.ebuild 3966 +MISC ChangeLog 28366 RMD160 312fe14ae64201eb02b48ae9c1def622ace8713a SHA1 9da42aa9ad9d738386bee8e521f4525676c46260 SHA256 bf87df36d194fe1fe40166362a40b134155518cdf657f0f092c938f8f0753d73 +MD5 abf8d57f5c8574c37c8fdddbbcbaf4eb ChangeLog 28366 +RMD160 312fe14ae64201eb02b48ae9c1def622ace8713a ChangeLog 28366 +SHA256 bf87df36d194fe1fe40166362a40b134155518cdf657f0f092c938f8f0753d73 ChangeLog 28366 MISC metadata.xml 164 RMD160 f43cbec30b7074319087c9acffdb9354b17b0db3 SHA1 9c213f5803676c56439df3716be07d6692588856 SHA256 f5f2891f2a4791cd31350bb2bb572131ad7235cd0eeb124c9912c187ac10ce92 MD5 9a09f8d531c582e78977dbfd96edc1f2 metadata.xml 164 RMD160 f43cbec30b7074319087c9acffdb9354b17b0db3 metadata.xml 164 SHA256 f5f2891f2a4791cd31350bb2bb572131ad7235cd0eeb124c9912c187ac10ce92 metadata.xml 164 -MD5 6421fe13202c10b9686a8cb3b30df52e files/digest-util-linux-2.12r-r4 1063 -RMD160 2c750eac9e3132bebea49c80403d9e9b5aed664a files/digest-util-linux-2.12r-r4 1063 -SHA256 2651b1de75726f533fa1f6436a0d7e38698913c3f10d9a892f42729d13a5a8c0 files/digest-util-linux-2.12r-r4 1063 MD5 64b04043386f51246640c4a87aa9d2e2 files/digest-util-linux-2.12r-r5 1063 RMD160 6c7b420256fcaf458b90c860481835747c3eea38 files/digest-util-linux-2.12r-r5 1063 SHA256 60efe4ca6a920b4545e7d25e13ac9a54b9513c95c57af7c125855166beec0e8b files/digest-util-linux-2.12r-r5 1063 -MD5 a037be4e6f33cbd71a764cbcb1e8db7e files/digest-util-linux-2.13_pre7 515 -RMD160 cf656aa56dd77972b95d027a442b12972ef2e891 files/digest-util-linux-2.13_pre7 515 -SHA256 2b463c8ec2a6734ee0dbe32781c512bc5d4dd6e465101838d07ae00f0881058f files/digest-util-linux-2.13_pre7 515 +MD5 6f4a7e9af9c890fde37c16cd670219e2 files/digest-util-linux-2.12r-r6 1063 +RMD160 9d0bdb33b8b41435aaaa241e7077f1170db24d16 files/digest-util-linux-2.12r-r6 1063 +SHA256 28d8b5a13df815eb0448175cabb264a92602133401563b47a0a71b6956e2d0fd files/digest-util-linux-2.12r-r6 1063 +MD5 039a5afb5e7054e7dd4a0c18b18a5bdf files/digest-util-linux-2.13_pre7 515 +RMD160 06925aee3fb82fc63eca96acbe9308f31b52a18b files/digest-util-linux-2.13_pre7 515 +SHA256 49b2f3787cdb29a392a658d239821ece467e41d6f4dcc8ffe6502115aa0de290 files/digest-util-linux-2.13_pre7 515 -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.2 (GNU/Linux) -iD8DBQFF6RH58bi6rjpTunYRAsn/AJ4mmVPhjaNk9NtW05R4KIG240RZ2QCghKl9 -xEGHUetPY2QPP8gLBAoUmrw= -=ZNsv +iD8DBQFF6RPy8bi6rjpTunYRAqKNAKCHwhgnQQpxyD/5z91u3xTl3iyASwCgwWkh +NmjRJ3J3X36ML5hGll8PkQg= +=7/mc -----END PGP SIGNATURE----- diff --git a/sys-apps/util-linux/files/digest-util-linux-2.12r-r6 b/sys-apps/util-linux/files/digest-util-linux-2.12r-r6 new file mode 100644 index 000000000000..91a63b37ea77 --- /dev/null +++ b/sys-apps/util-linux/files/digest-util-linux-2.12r-r6 @@ -0,0 +1,12 @@ +MD5 1020b93d723f1d573bacfe4a3362fc25 loop-AES-v3.1f.tar.bz2 173423 +RMD160 7490e3d90727621fde3052fd1747af338518b158 loop-AES-v3.1f.tar.bz2 173423 +SHA256 f744f3dd74b554d1a2e3788752c4a63049647bfd2bae71d9fff2427c0e175ca7 loop-AES-v3.1f.tar.bz2 173423 +MD5 dee120b17425e1edf0a0c64f0e249c20 util-linux-2.12i-cryptoapi-losetup.patch.bz2 4800 +RMD160 82e54aedd691aa93b67de9dfb9049a3f012a29f7 util-linux-2.12i-cryptoapi-losetup.patch.bz2 4800 +SHA256 565a0cc6c3c148a66969276ae9d34dc34f19fbd45df2740343793ee067b3700f util-linux-2.12i-cryptoapi-losetup.patch.bz2 4800 +MD5 6e0deccf97db98d2ae751577d019efa4 util-linux-2.12i.tar.gz 1975468 +RMD160 f055a94ad247dc59293f7b933c12bdda135159fc util-linux-2.12i.tar.gz 1975468 +SHA256 28e2fc70d7507e158d8861c958461aef1c4bbf4157a8ebbc237943944e5a8c4a util-linux-2.12i.tar.gz 1975468 +MD5 af9d9e03038481fbf79ea3ac33f116f9 util-linux-2.12r.tar.bz2 1370907 +RMD160 51950aafd5cbcb574e69fbd6b28d15a106147e64 util-linux-2.12r.tar.bz2 1370907 +SHA256 b8e499b338ce9fbd1fb315194b26540ec823c0afc46c9e145ac7a3e38ad57e6b util-linux-2.12r.tar.bz2 1370907 diff --git a/sys-apps/util-linux/files/digest-util-linux-2.13_pre7 b/sys-apps/util-linux/files/digest-util-linux-2.13_pre7 index 8466eed24e2e..d8948ebbd6eb 100644 --- a/sys-apps/util-linux/files/digest-util-linux-2.13_pre7 +++ b/sys-apps/util-linux/files/digest-util-linux-2.13_pre7 @@ -1,6 +1,6 @@ -MD5 021d6a83e05a13ad84cd601d5e5ecefb loop-AES-v3.1e.tar.bz2 169664 -RMD160 78a54330a343103900cc479d58645ec77563ded0 loop-AES-v3.1e.tar.bz2 169664 -SHA256 6b1d671a9e3cadeef7a8f391cda4b5b883d0d1bf91d08d2746af8e4780fdff9d loop-AES-v3.1e.tar.bz2 169664 +MD5 1020b93d723f1d573bacfe4a3362fc25 loop-AES-v3.1f.tar.bz2 173423 +RMD160 7490e3d90727621fde3052fd1747af338518b158 loop-AES-v3.1f.tar.bz2 173423 +SHA256 f744f3dd74b554d1a2e3788752c4a63049647bfd2bae71d9fff2427c0e175ca7 loop-AES-v3.1f.tar.bz2 173423 MD5 13cdf4b76533e8421dc49de188f85291 util-linux-2.13-pre7.tar.bz2 2534328 RMD160 ce25337cf43f6c818d01206453a38b0188c92f17 util-linux-2.13-pre7.tar.bz2 2534328 SHA256 9e1142742dcfac977be57fd589a40f1e7b2f9dbaa4847e063d3f700b35b3bfb7 util-linux-2.13-pre7.tar.bz2 2534328 diff --git a/sys-apps/util-linux/util-linux-2.12r-r6.ebuild b/sys-apps/util-linux/util-linux-2.12r-r6.ebuild new file mode 100644 index 000000000000..8f953be387da --- /dev/null +++ b/sys-apps/util-linux/util-linux-2.12r-r6.ebuild @@ -0,0 +1,193 @@ +# Copyright 1999-2007 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/sys-apps/util-linux/util-linux-2.12r-r6.ebuild,v 1.1 2007/03/03 06:21:29 vapier Exp $ + +inherit eutils flag-o-matic toolchain-funcs + +OLD_CRYPT_VER=2.12i +LOOP_AES_VER=3.1f +DESCRIPTION="Various useful Linux utilities" +HOMEPAGE="http://www.kernel.org/pub/linux/utils/util-linux/" +SRC_URI="mirror://kernel/linux/utils/${PN}/${P}.tar.bz2 + old-crypt? ( + mirror://kernel/linux/utils/${PN}/${PN}-${OLD_CRYPT_VER}.tar.gz + mirror://gentoo/util-linux-${OLD_CRYPT_VER}-cryptoapi-losetup.patch.bz2 + ) + crypt? ( http://loop-aes.sourceforge.net/loop-AES/loop-AES-v${LOOP_AES_VER}.tar.bz2 )" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86" +IUSE="crypt old-crypt nls static selinux perl" + +RDEPEND=">=sys-libs/ncurses-5.2-r2 + >=sys-fs/e2fsprogs-1.34 + selinux? ( sys-libs/libselinux ) + crypt? ( app-crypt/hashalot ) + perl? ( dev-lang/perl )" +DEPEND="${RDEPEND} + nls? ( sys-devel/gettext ) + virtual/os-headers" + +OLD_CRYPT_P=${WORKDIR}/${PN}-${OLD_CRYPT_VER} + +yesno() { useq $1 && echo yes || echo no; } + +src_unpack() { + unpack ${A} + + # Old crypt support + if use old-crypt ; then + cd "${OLD_CRYPT_P}" + ewarn "You should update your system as USE=old-crypt" + ewarn "support will be dropped in future versions." + epatch "${WORKDIR}"/util-linux-${OLD_CRYPT_VER}-cryptoapi-losetup.patch + fi + + cd "${S}" + + # crypto support + use crypt && epatch "${WORKDIR}"/loop-AES-v${LOOP_AES_VER}/${P}.diff + + # Fall back to cracklib if default words file doesnt exist #114416 + epatch "${FILESDIR}"/${PN}-2.12r-cracklib-words.patch + + # Fix rare failures with -j4 or higher + epatch "${FILESDIR}"/${PN}-2.11z-parallel-make.patch + + # Fix -f usage with -a and in general + epatch "${FILESDIR}"/${PN}-2.12q-more-fake-checks-v2.patch + + # Fix mtab updates with `mount --move /foo /bar` #104697 + epatch "${FILESDIR}"/${PN}-2.12q-update-mtab-when-moving.patch + + # Respect -n with -r and umount #98675 + epatch "${FILESDIR}"/${PN}-2.12q-umount-dont-write-mtab-with-remount.patch + + # A few fixes to beat update_mtab() into submission. + epatch "${FILESDIR}"/${PN}-2.12q-update_mtab-fixes.patch + + # Use update_mtab() to avoid dups in mtab for 'mount -f' + epatch "${FILESDIR}"/${PN}-2.12q-use-update_mtab-for-fake.patch + + # Fix unreadable df output when using devfs ... this check is kind of + # a hack, but whatever, the output isnt critical at all :P + [[ -e /dev/.devfsd ]] && epatch "${FILESDIR}"/no-symlink-resolve.patch + + # Add the O option to agetty to display DNS domainname in the issue + # file, thanks to Marius Mauch , bug #22275. + # + # NOTE: Removing this will break future baselayout, so PLEASE + # consult with me before doing so. + epatch "${FILESDIR}"/${PN}-2.11z-agetty-domainname-option.patch + + # Fix french translation typo #75693 + epatch "${FILESDIR}"/${PN}-2.12q-i18n-update.patch + + # Add NFS4 support (kernel 2.5/2.6) + epatch "${FILESDIR}"/${PN}-2.12i-nfsv4.patch + + # ignore managed/kudzu options #70873 + epatch "${FILESDIR}"/${PN}-2.12i-ignore-managed.patch + + # swapon gets confused by symlinks in /dev #69162 + epatch "${FILESDIR}"/${PN}-2.12p-swapon-check-symlinks.patch + + # fix simple buffer overflow (from Debian) + epatch "${FILESDIR}"/${PN}-2.12q-debian-10cfdisk.patch + + # don't build fdisk on m68k + epatch "${FILESDIR}"/${PN}-2.12q-no-m68k-fdisk.patch + + # don't force umask to 022 #93671 + epatch "${FILESDIR}"/${PN}-2.12q-dont-umask.patch + + # fix cal display when using featureless terminals #112406 + epatch "${FILESDIR}"/${PN}-2.12r-cal-dumb-terminal.patch + + # Bug #108988 unable to always seek when omiting frame pointers + epatch "${FILESDIR}"/${PN}-2.12r-fdisk-frame-pointers.patch + + # don't treat sparc/arm specially + epatch "${FILESDIR}"/${PN}-2.12r-umount-no-special.patch + + # Patches from Fedora + epatch "${FILESDIR}"/${PN}-2.12r-umount-nosysfs.patch + + # fix mips n32 (no llseek syscall) + epatch "${FILESDIR}"/${PN}-2.12-mips-lseek.patch + + epatch "${FILESDIR}"/${PN}-2.12r-no-_syscall.patch #150852 + epatch "${FILESDIR}"/${PN}-2.12r-HAVE_asm_page_h.patch #168278 + + # Enable random features + local mconfigs="MCONFIG" + use old-crypt && mconfigs="${mconfigs} ${OLD_CRYPT_P}/MCONFIG" + sed -i \ + -e "/^HAVE_SELINUX=/s:no:$(yesno selinux):" \ + -e "/^DISABLE_NLS=/s:no:$(yesno !nls):" \ + -e "/^HAVE_KILL=/s:no:yes:" \ + -e "/^HAVE_SLN=/s:no:yes:" \ + -e "/^HAVE_TSORT/s:no:yes:" \ + -e "s:-pipe -O2 \$(CPUOPT) -fomit-frame-pointer:${CFLAGS}:" \ + -e "s:CPU=.*:CPU=${CHOST%%-*}:" \ + -e "s:SUIDMODE=.*4755:SUIDMODE=4711:" \ + ${mconfigs} || die "MCONFIG sed" +} + +src_compile() { + append-ldflags $(bindnow-flags) + use static && append-ldflags -static + export CC="$(tc-getCC)" + + econf || die "configure failed" + emake || die "emake failed" + + cd partx + has_version '>=sys-kernel/linux-headers-2.6' && \ + has_version '