diff options
| -rw-r--r-- | sys-apps/util-linux/ChangeLog | 9 | ||||
| -rw-r--r-- | sys-apps/util-linux/Manifest | 17 | ||||
| -rw-r--r-- | sys-apps/util-linux/files/digest-util-linux-2.12r-r2 | 4 | ||||
| -rw-r--r-- | sys-apps/util-linux/files/util-linux-2.12r-cal-dumb-terminal.patch | 37 | ||||
| -rw-r--r-- | sys-apps/util-linux/util-linux-2.12r-r2.ebuild | 181 |
5 files changed, 244 insertions, 4 deletions
diff --git a/sys-apps/util-linux/ChangeLog b/sys-apps/util-linux/ChangeLog index 43b0c706da17..02c742dab828 100644 --- a/sys-apps/util-linux/ChangeLog +++ b/sys-apps/util-linux/ChangeLog @@ -1,6 +1,13 @@ # 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.129 2005/12/11 20:37:50 hansmi Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-apps/util-linux/ChangeLog,v 1.130 2005/12/13 03:03:32 vapier Exp $ + +*util-linux-2.12r-r2 (13 Dec 2005) + + 13 Dec 2005; Mike Frysinger <vapier@gentoo.org> + +files/util-linux-2.12r-cal-dumb-terminal.patch, + +util-linux-2.12r-r2.ebuild: + Fix cal display with dumb terminals #112406 by Chris Smith. 11 Dec 2005; Michael Hanselmann <hansmi@gentoo.org> util-linux-2.12r-r1.ebuild: diff --git a/sys-apps/util-linux/Manifest b/sys-apps/util-linux/Manifest index f1d56c3e235a..72793929caff 100644 --- a/sys-apps/util-linux/Manifest +++ b/sys-apps/util-linux/Manifest @@ -1,11 +1,14 @@ -MD5 c9853858f12bc58dbc16aa62d01efeea ChangeLog 21544 +-----BEGIN PGP SIGNED MESSAGE----- +Hash: SHA1 + +MD5 a614177ca2cdf7807b37ca0fd8d9da7e ChangeLog 21775 MD5 0b95e856fd2f375270cf2ec4eaa69c8a files/crypto-loop.confd 505 MD5 d20405e12353610b3ef8fbc2e1d57f2a files/crypto-loop.initd 1625 MD5 cfa3960fd97ca16c85b0d1b87e6ba226 files/digest-util-linux-2.12i-r1 156 -MD5 e2d566b683bb1b9b1c3e127b2bbd258b files/digest-util-linux-2.12q 294 MD5 a33ff00c09f558d4273360a581880c23 files/digest-util-linux-2.12q-r3 292 MD5 3f20c16ba5d68bfe7518f72d771170ce files/digest-util-linux-2.12r 292 MD5 a1e7cbf002a6dd8bb39f2f533a3807a4 files/digest-util-linux-2.12r-r1 292 +MD5 a1e7cbf002a6dd8bb39f2f533a3807a4 files/digest-util-linux-2.12r-r2 292 MD5 6aa1c240dd789327ea92e36309052950 files/no-symlink-resolve.patch 316 MD5 0be8df03dae23c81a0e929e58a4114e0 files/util-linux-2.11z-01-nfsv4.dif 13442 MD5 7d35ae646b52391076f7a329af8265bc files/util-linux-2.11z-agetty-domainname-option.patch 1810 @@ -32,12 +35,20 @@ MD5 8a13c61b447c1533df4b919cf2646fea files/util-linux-2.12q-umount-dont-write-mt MD5 3708f6eda344a2aa0a4d85d49f69dcee files/util-linux-2.12q-update-mtab-when-moving.patch 1036 MD5 f182d2c3c90cdc74c816a4656a8f3bbf files/util-linux-2.12q-update_mtab-fixes.patch 2636 MD5 202b78b99074c7c91faea44d1de6e1bd files/util-linux-2.12q-use-update_mtab-for-fake.patch 546 +MD5 1fcb9c258e5e86d3d4920ab3a5fe37da files/util-linux-2.12r-cal-dumb-terminal.patch 824 MD5 339dcfab2660510d0c7c75aaa4018196 files/util-linux-2.12r-cracklib-words.patch 684 MD5 badd26600f4c31ecb524385ea1b7030c files/util-linux-2.12r-fdisk-frame-pointers.patch 355 MD5 65f42fbf981464410f7d5d84a429e920 files/util-linux-no-kill.patch 642 MD5 9a09f8d531c582e78977dbfd96edc1f2 metadata.xml 164 MD5 5497e9050dc8cde95a0e015edcd59c81 util-linux-2.12i-r1.ebuild 3960 MD5 5caff498045d46b5ee7afbb9aad0a357 util-linux-2.12q-r3.ebuild 5853 -MD5 40353e338343ed2b6a8f23259c881e49 util-linux-2.12q.ebuild 4785 MD5 24f4cd5e5cdb90c18ab97ac836bfb513 util-linux-2.12r-r1.ebuild 5805 +MD5 7c96ee7a88242d884d5efa95adc8d091 util-linux-2.12r-r2.ebuild 5933 MD5 0fa072288048ab73c7da495402392575 util-linux-2.12r.ebuild 5546 +-----BEGIN PGP SIGNATURE----- +Version: GnuPG v1.4.2 (GNU/Linux) + +iD8DBQFDnjoZgIKl8Uu19MoRAgmhAJ0dW+BqFJ86nPqlIE255CyLSOfYeACfWstf +0u1dXm9D+N/koxXFQ/HrJo0= +=AbQC +-----END PGP SIGNATURE----- diff --git a/sys-apps/util-linux/files/digest-util-linux-2.12r-r2 b/sys-apps/util-linux/files/digest-util-linux-2.12r-r2 new file mode 100644 index 000000000000..0cc9d98a8dd3 --- /dev/null +++ b/sys-apps/util-linux/files/digest-util-linux-2.12r-r2 @@ -0,0 +1,4 @@ +MD5 ab453b8d81bd36d5e56e391ee36ec5d6 loop-AES-v3.1b.tar.bz2 167804 +MD5 dee120b17425e1edf0a0c64f0e249c20 util-linux-2.12i-cryptoapi-losetup.patch.bz2 4800 +MD5 6e0deccf97db98d2ae751577d019efa4 util-linux-2.12i.tar.gz 1975468 +MD5 c261230b27fc0fbcc287c76884caf2d3 util-linux-2.12r.tar.gz 1992725 diff --git a/sys-apps/util-linux/files/util-linux-2.12r-cal-dumb-terminal.patch b/sys-apps/util-linux/files/util-linux-2.12r-cal-dumb-terminal.patch new file mode 100644 index 000000000000..073506ec7e87 --- /dev/null +++ b/sys-apps/util-linux/files/util-linux-2.12r-cal-dumb-terminal.patch @@ -0,0 +1,37 @@ +If you try to use cal on a terminal which doesnt support highlighting, +Senter and Sexit will be set to NULL instead of "" which will cause the +resulting output to be off: + +$ env TERM=dumb cal + December 2005 +Su Mo Tu We Th Fr Sa + 1 2 3 + 4 5 6 7 8 9 10 +111 13 14 15 16 17 +18 19 20 21 22 23 24 +25 26 27 28 29 30 31 + +http://bugs.gentoo.org/112406 + +--- util-linux/misc-utils/cal.c ++++ util-linux/misc-utils/cal.c +@@ -89,7 +89,8 @@ + + static char * + my_tgetstr(char *s, char *ss) { +- return tigetstr(ss); ++ char *ret = tigetstr(ss); ++ return (ret == NULL ? "" : ret); + } + + #elif defined(HAVE_termcap) +@@ -112,7 +113,8 @@ + + static char * + my_tgetstr(char *s, char *ss) { +- return tgetstr(s, &strbuf); ++ char *ret = tgetstr(s, &strbuf); ++ return (ret == NULL ? "" : ret); + } + + #endif diff --git a/sys-apps/util-linux/util-linux-2.12r-r2.ebuild b/sys-apps/util-linux/util-linux-2.12r-r2.ebuild new file mode 100644 index 000000000000..c4e47af204c7 --- /dev/null +++ b/sys-apps/util-linux/util-linux-2.12r-r2.ebuild @@ -0,0 +1,181 @@ +# 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.12r-r2.ebuild,v 1.1 2005/12/13 03:03:32 vapier Exp $ + +inherit eutils flag-o-matic toolchain-funcs + +OLD_CRYPT_VER=2.12i +LOOP_AES_VER=3.1b +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 ~m68k ~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}" + 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 <genone@genone.de>, 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 + + # 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 / + newbin mount mount-old-crypt || die + newbin losetup losetup-old-crypt || die + fperms 4711 /bin/{mount,losetup}-old-crypt + 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 +} |