diff options
| -rw-r--r-- | sys-apps/rename/Manifest | 4 | ||||
| -rw-r--r-- | sys-apps/util-linux/ChangeLog | 8 | ||||
| -rw-r--r-- | sys-apps/util-linux/Manifest | 4 | ||||
| -rw-r--r-- | sys-apps/util-linux/files/digest-util-linux-2.12q-r1 | 4 | ||||
| -rw-r--r-- | sys-apps/util-linux/util-linux-2.12q-r1.ebuild | 157 |
5 files changed, 173 insertions, 4 deletions
diff --git a/sys-apps/rename/Manifest b/sys-apps/rename/Manifest index 845ea1038893..10c003b8fc51 100644 --- a/sys-apps/rename/Manifest +++ b/sys-apps/rename/Manifest @@ -1,4 +1,4 @@ -MD5 b635d88f0ec6005bcf3301869f14f490 rename-1.3.ebuild 817 -MD5 faa03a6802e758fbc9aafc4904165373 ChangeLog 1046 +MD5 a331a843f05630b2039cf4e1c300e87f rename-1.3.ebuild 816 +MD5 e204f7eaca906548be6281b53cdeaaf3 ChangeLog 1134 MD5 9a09f8d531c582e78977dbfd96edc1f2 metadata.xml 164 MD5 422775298804a7adef3bc0ad71ef0d77 files/digest-rename-1.3 61 diff --git a/sys-apps/util-linux/ChangeLog b/sys-apps/util-linux/ChangeLog index c7d056d68c55..dac94caf4e60 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-2005 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sys-apps/util-linux/ChangeLog,v 1.103 2005/04/30 06:50:44 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-apps/util-linux/ChangeLog,v 1.104 2005/06/13 23:23:17 vapier Exp $ + +*util-linux-2.12q-r1 (13 Jun 2005) + + 13 Jun 2005; Mike Frysinger <vapier@gentoo.org> + +util-linux-2.12q-r1.ebuild: + Update loop-aes patch #95939 by Alon Bar-Lev. 30 Apr 2005; Mike Frysinger <vapier@gentoo.org> +files/util-linux-2.12q-i18n-update.patch, util-linux-2.12q.ebuild: diff --git a/sys-apps/util-linux/Manifest b/sys-apps/util-linux/Manifest index a8acd9ffdd93..1260323c5d7d 100644 --- a/sys-apps/util-linux/Manifest +++ b/sys-apps/util-linux/Manifest @@ -1,8 +1,9 @@ -MD5 d38728e06e8316c6dc9f8695e8382426 ChangeLog 17623 +MD5 612c360bed155592aadebf39410bfe9d ChangeLog 17789 MD5 9a09f8d531c582e78977dbfd96edc1f2 metadata.xml 164 MD5 756af6a79fdf6371ee07ccbc9ca0153b util-linux-2.12i-r1.ebuild 3821 MD5 ff9ff35124110104cec062d7b263baed util-linux-2.12q.ebuild 4807 MD5 3ce3a57f1a507ce364c232d5d7b6ff02 util-linux-2.12p-r1.ebuild 4418 +MD5 ec205b8566d21aca0295046fb27292e8 util-linux-2.12q-r1.ebuild 4853 MD5 e3697bc8fd6a344e8cba1c7d32e34790 files/util-linux-2.11z-parallel-make.patch 369 MD5 6aa1c240dd789327ea92e36309052950 files/no-symlink-resolve.patch 316 MD5 a43d2b8c70c5f40a195721dc536abace files/util-linux-2.12-swapon-unistd.patch 289 @@ -27,4 +28,5 @@ MD5 519d6757067c4ee7c634c8b60f9abeb3 files/util-linux-2.12p-swapon-check-symlink MD5 33ddd96078cf91030b80f73eb70f5371 files/util-linux-2.12i-swapon-check-symlinks.patch 875 MD5 28b1a8ed38823851eafadacef8ce11ec files/util-linux-2.12q-no-m68k-fdisk.patch 239 MD5 bc90959c4718e7dc5d53dcddac1172f5 files/util-linux-2.12q-debian-10cfdisk.patch 1888 +MD5 4b00906276e8aae2c222622471d6a366 files/digest-util-linux-2.12q-r1 292 MD5 cfa3960fd97ca16c85b0d1b87e6ba226 files/digest-util-linux-2.12i-r1 156 diff --git a/sys-apps/util-linux/files/digest-util-linux-2.12q-r1 b/sys-apps/util-linux/files/digest-util-linux-2.12q-r1 new file mode 100644 index 000000000000..5317808172a0 --- /dev/null +++ b/sys-apps/util-linux/files/digest-util-linux-2.12q-r1 @@ -0,0 +1,4 @@ +MD5 004b971441ef89e0b93076c21806cc7d util-linux-2.12q.tar.gz 1992810 +MD5 6e0deccf97db98d2ae751577d019efa4 util-linux-2.12i.tar.gz 1975468 +MD5 dee120b17425e1edf0a0c64f0e249c20 util-linux-2.12i-cryptoapi-losetup.patch.bz2 4800 +MD5 3ba40e971da6a18df3e82fbbd3795ac8 loop-AES-v3.0c.tar.bz2 164067 diff --git a/sys-apps/util-linux/util-linux-2.12q-r1.ebuild b/sys-apps/util-linux/util-linux-2.12q-r1.ebuild new file mode 100644 index 000000000000..15463fdf99d8 --- /dev/null +++ b/sys-apps/util-linux/util-linux-2.12q-r1.ebuild @@ -0,0 +1,157 @@ +# Copyright 1999-2005 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.12q-r1.ebuild,v 1.1 2005/06/13 23:23:17 vapier Exp $ + +inherit eutils flag-o-matic toolchain-funcs + +OLD_CRYPT_VER=2.12i +LOOP_AES_VER=3.0c +DESCRIPTION="Various useful Linux utilities" +HOMEPAGE="http://www.kernel.org/pub/linux/utils/util-linux/" +SRC_URI="mirror://kernel/linux/utils/${PN}/${P}.tar.gz + 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 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86" +IUSE="crypt old-crypt nls static pam selinux perl" + +RDEPEND=">=sys-libs/ncurses-5.2-r2 + >=sys-fs/e2fsprogs-1.34 + selinux? ( sys-libs/libselinux ) + pam? ( sys-apps/pam-login ) + 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} + epatch ${WORKDIR}/util-linux-${OLD_CRYPT_VER}-cryptoapi-losetup.patch + fi + + cd "${S}" + + # crypto support + ! use old-crypt && \ + use crypt && epatch "${WORKDIR}"/loop-AES-v${LOOP_AES_VER}/${P}.diff + + # Fix rare failures with -j4 or higher + epatch ${FILESDIR}/${PN}-2.11z-parallel-make.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 <genone@genone.de>, bug #22275. + # + # NOTE: Removing this will break future baselayout, so PLEASE + # consult with me before doing so. + # + # <azarah@gentoo.org> (17 Jul 2003) + epatch ${FILESDIR}/${PN}-2.11z-agetty-domainname-option.patch + + # Fix french translation typo #75693 + epatch ${FILESDIR}/${P}-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 + + # Allow util-linux to be built with -fPIC + epatch ${FILESDIR}/${PN}-2.12i-pic.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 + + # Enable random features + local mconfigs="MCONFIG" + use old-crypt && mconfigs="${mconfigs} ${OLD_CRYPT_P}/MCONFIG" + sed -i \ + -e "/^HAVE_PAM=/s:no:$(yesno pam):" \ + -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 -Wl,-z,now + 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' && append-flags -include linux/compiler.h + emake CFLAGS="${CFLAGS}" || die "make partx failed" + + if use old-crypt ; then + cd ${OLD_CRYPT_P} + econf || die "old configure failed" + emake -C lib || die "old lib failed" + emake -C mount losetup mount || die "old make failed" + fi +} + +src_install() { + make install DESTDIR="${D}" || die "install failed" + dosym ../man8/agetty.8 /usr/share/man/man1/getty.1 + dosbin partx/{addpart,delpart,partx} || die "dosbin" + use perl || rm -f "${D}"/usr/bin/chkdupexe + + newinitd "${FILESDIR}"/crypto-loop.initd crypto-loop + newconfd "${FILESDIR}"/crypto-loop.confd crypto-loop + + # man-pages installs renice(1p) but util-linux does renice(8) + dosym ../man8/renice.8 /usr/share/man/man1/renice.1 + + dodoc HISTORY MAINTAINER README VERSION + docinto examples + dodoc example.files/* + + if use old-crypt ; then + cd ${OLD_CRYPT_P}/mount + into / + newsbin mount mount-old-crypt || die + newsbin losetup losetup-old-crypt || die + fi +} + +pkg_postinst() { + if ! use old-crypt ; then + ewarn "This version of util-linux includes crypto support" + ewarn "for loop-aes instead of the old cryptoapi." + ewarn "If you need the older support, please re-emerge" + ewarn "util-linux with USE=old-crypt. This will create" + ewarn "/sbin/mount-old-crypt and /sbin/losetup-old-crypt." + fi +} |