r1139 - in trunk/web/patches: . gentoo-only
Author: rmh
Date: 2006-02-06 07:06:48 +0000 (Mon, 06 Feb 2006)
New Revision: 1139
Added:
trunk/web/patches/gentoo-only/
trunk/web/patches/gentoo-only/baselayout.diff
trunk/web/patches/gentoo-only/portage.diff
trunk/web/patches/gentoo-only/shadow.diff
trunk/web/patches/gentoo-only/sysvinit.diff
trunk/web/patches/gentoo-only/toolchain-binutils.diff
trunk/web/patches/gentoo-only/zile.diff
Log:
Add a few gentoo-only patches.
Added: trunk/web/patches/gentoo-only/baselayout.diff
===================================================================
--- trunk/web/patches/gentoo-only/baselayout.diff 2006-02-06 06:28:06 UTC (rev 1138)
+++ trunk/web/patches/gentoo-only/baselayout.diff 2006-02-06 07:06:48 UTC (rev 1139)
@@ -0,0 +1,91 @@
+
+Author: rmh
+Status: in BTS
+
+diff -ur baselayout-1.12.0_pre15.old/sbin/functions.sh baselayout-1.12.0_pre15/sbin/functions.sh
+--- baselayout-1.12.0_pre15.old/sbin/functions.sh 2006-01-13 09:29:00 +0000
++++ baselayout-1.12.0_pre15/sbin/functions.sh 2006-02-06 07:49:57 +0000
+@@ -452,6 +452,26 @@
+ return 1
+ }
+
++# char *get_SN()
++#
++# Return the system name.
++#
++_RC_GET_SN_CACHE=""
++get_SN() {
++ [[ -z ${_RC_GET_SN_CACHE} ]] \
++ && _RC_GET_SN_CACHE=$(uname -s)
++
++ echo "${_RC_GET_SN_CACHE}"
++
++ return $?
++}
++
++case $(get_SN) in
++ Linux) procfs=proc ;;
++ GNU/kFreeBSD) procfs=linprocfs ;;
++ *) procfs=procfs
++esac
++
+ # int get_KV()
+ #
+ # Return the kernel version (major, minor and micro concated) as an integer.
+diff -ur baselayout-1.12.0_pre15.old/sbin/rc baselayout-1.12.0_pre15/sbin/rc
+--- baselayout-1.12.0_pre15.old/sbin/rc 2006-01-20 09:36:06 +0000
++++ baselayout-1.12.0_pre15/sbin/rc 2006-02-06 07:49:45 +0000
+@@ -188,7 +188,7 @@
+ [ -c /dev/console ] && dev_console=1 || dev_console=0
+
+ echo
+- echo -e "${GOOD}Gentoo Linux${GENTOO_VERS}; ${BRACKET}http://www.gentoo.org/${NORMAL}";
++ echo -e "${GOOD}Gentoo $(get_SN)${GENTOO_VERS}; ${BRACKET}http://www.gentoo.org/${NORMAL}";
+ echo -e " Copyright 1999-2006 Gentoo Foundation; Distributed under the GPLv2"
+ echo
+ if [[ ${RC_INTERACTIVE} == "yes" ]] ; then
+@@ -197,13 +197,13 @@
+ fi
+ check_statedir /proc
+
+- ebegin "Mounting proc at /proc"
++ ebegin "Mounting ${procfs} at /proc"
+ if [[ ${RC_USE_FSTAB} = "yes" ]] ; then
+ mntcmd=$(get_mount_fstab /proc)
+ else
+ unset mntcmd
+ fi
+- try mount -n ${mntcmd:--t proc proc /proc}
++ try mount -n ${mntcmd:--t ${procfs} proc /proc}
+ eend $?
+
+ # Read off the kernel commandline to see if there's any special settings
+@@ -211,7 +211,7 @@
+ # Note: /proc MUST be mounted
+ [ -f /sbin/livecd-functions.sh ] && livecd_read_commandline
+
+- if [ "$(get_KV)" -ge "$(KV_to_int '2.6.0')" ] ; then
++ if [ "$(get_SN)" = "Linux" ] && [ "$(get_KV)" -ge "$(KV_to_int '2.6.0')" ] ; then
+ if [[ -d /sys ]] ; then
+ ebegin "Mounting sysfs at /sys"
+ if [[ ${RC_USE_FSTAB} = "yes" ]] ; then
+@@ -250,6 +250,10 @@
+ then
+ ebegin "Using existing device nodes in /dev"
+ eend 0
++ elif [ "$(get_SN)" = "GNU/kFreeBSD" ]
++ then
++ ebegin "Using kFreeBSD devfs"
++ eend 0
+ else
+ fellback_to_devfs="no"
+ case "${RC_DEVICES}" in
+@@ -320,7 +324,7 @@
+ fi
+
+ # From linux-2.5.68 we need to mount /dev/pts again ...
+- if [ "$(get_KV)" -ge "$(KV_to_int '2.5.68')" ]
++ if [ "$(get_SN)" = "Linux" ] && [ "$(get_KV)" -ge "$(KV_to_int '2.5.68')" ]
+ then
+ have_devpts="$(awk '($2 == "devpts") { print "yes"; exit 0 }' /proc/filesystems)"
+
Added: trunk/web/patches/gentoo-only/portage.diff
===================================================================
--- trunk/web/patches/gentoo-only/portage.diff 2006-02-06 06:28:06 UTC (rev 1138)
+++ trunk/web/patches/gentoo-only/portage.diff 2006-02-06 07:06:48 UTC (rev 1139)
@@ -0,0 +1,15 @@
+
+Author: rmh
+Status: in BTS
+
+--- /usr/lib/portage/pym/portage_data.py.old 2006-02-04 21:37:42 +0000
++++ /usr/lib/portage/pym/portage_data.py 2006-02-04 21:37:52 +0000
+@@ -11,7 +11,7 @@
+ ostype=os.uname()[0]
+
+ lchown = None
+-if ostype=="Linux" or ostype.lower().endswith("gnu"):
++if ostype=="Linux" or ostype.lower().startswith("gnu"):
+ userland="GNU"
+ os.environ["XARGS"]="xargs -r"
+ elif ostype == "Darwin":
Added: trunk/web/patches/gentoo-only/shadow.diff
===================================================================
--- trunk/web/patches/gentoo-only/shadow.diff 2006-02-06 06:28:06 UTC (rev 1138)
+++ trunk/web/patches/gentoo-only/shadow.diff 2006-02-06 07:06:48 UTC (rev 1139)
@@ -0,0 +1,51 @@
+
+Author: rmh
+Status: in BTS
+
+diff -Nur shadow.old/securetty.kfreebsd shadow/securetty.kfreebsd
+--- shadow.old/securetty.kfreebsd 1970-01-01 01:00:00.000000000 +0100
++++ shadow/securetty.kfreebsd 2006-02-06 07:57:43.000000000 +0100
+@@ -0,0 +1,18 @@
++# /etc/securetty: list of terminals on which root is allowed to login.
++# See securetty(5) and login(1).
++ttyv0
++ttyv1
++ttyv2
++ttyv3
++ttyv4
++ttyv5
++ttyv6
++ttyv7
++ttyva
++ttyvb
++ttyvc
++ttyvd
++ttyve
++ttyvf
++
++cuaa0
+--- shadow-4.0.14-r1.ebuild.old 2006-02-06 07:09:29 +0000
++++ shadow-4.0.14-r1.ebuild 2006-02-06 07:39:14 +0000
+@@ -72,6 +72,13 @@
+
+ elibtoolize
+ epunt_cxx
++
++ case ${CHOST} in
++ *-*-linux*) suffix="linux" ;;
++ *-*-kfreebsd*) suffix="kfreebsd" ;;
++ esac
++ cd "${WORKDIR}"
++ cp "${FILESDIR}"/securetty.${suffix} securetty || die "cp securetty"
+ }
+
+ src_compile() {
+@@ -122,7 +129,7 @@
+ insinto /etc
+ # Using a securetty with devfs device names added
+ # (compat names kept for non-devfs compatibility)
+- insopts -m0600 ; doins "${FILESDIR}"/securetty
++ insopts -m0600 ; doins "${WORKDIR}"/securetty
+ use pam || { insopts -m0600 ; doins etc/login.access ; }
+ use pam || { insopts -m0600 ; doins etc/limits ; }
+ # Output arch-specific cruft
Added: trunk/web/patches/gentoo-only/sysvinit.diff
===================================================================
--- trunk/web/patches/gentoo-only/sysvinit.diff 2006-02-06 06:28:06 UTC (rev 1138)
+++ trunk/web/patches/gentoo-only/sysvinit.diff 2006-02-06 07:06:48 UTC (rev 1139)
@@ -0,0 +1,75 @@
+
+Author: rmh
+Status: in BTS
+
+diff -Nur files/inittab.kfreebsd files/inittab.kfreebsd
+--- files/inittab.kfreebsd 1970-01-01 01:00:00.000000000 +0100
++++ files/inittab.kfreebsd 2006-02-06 07:57:43.000000000 +0100
+@@ -0,0 +1,51 @@
++#
++# /etc/inittab: This file describes how the INIT process should set up
++# the system in a certain run-level.
++#
++# Author: Miquel van Smoorenburg, <miquels@cistron.nl>
++# Modified by: Patrick J. Volkerding, <volkerdi@ftp.cdrom.com>
++# Modified by: Daniel Robbins, <drobbins@gentoo.org>
++# Modified by: Martin Schlemmer, <azarah@gentoo.org>
++#
++# $Header: /var/cvsroot/gentoo-x86/sys-apps/sysvinit/files/inittab,v 1.5 2005/12/22 02:03:23 vapier Exp $
++
++# Default runlevel.
++id:3:initdefault:
++
++# System initialization, mount local filesystems, etc.
++si::sysinit:/sbin/rc sysinit
++
++# Further system initialization, brings up the boot runlevel.
++rc::bootwait:/sbin/rc boot
++
++l0:0:wait:/sbin/rc shutdown
++l1:S1:wait:/sbin/rc single
++l2:2:wait:/sbin/rc nonetwork
++l3:3:wait:/sbin/rc default
++l4:4:wait:/sbin/rc default
++l5:5:wait:/sbin/rc default
++l6:6:wait:/sbin/rc reboot
++#z6:6:respawn:/sbin/sulogin
++
++# TERMINALS
++c1:12345:respawn:/sbin/agetty 38400 ttyv0 cons25
++c2:2345:respawn:/sbin/agetty 38400 ttyv1 cons25
++c3:2345:respawn:/sbin/agetty 38400 ttyv2 cons25
++c4:2345:respawn:/sbin/agetty 38400 ttyv3 cons25
++c5:2345:respawn:/sbin/agetty 38400 ttyv4 cons25
++c6:2345:respawn:/sbin/agetty 38400 ttyv5 cons25
++
++# SERIAL CONSOLES
++#s0:12345:respawn:/sbin/agetty 9600 cuaa0 vt100
++#s1:12345:respawn:/sbin/agetty 9600 cuaa1 vt100
++
++# What to do at the "Three Finger Salute".
++ca:12345:ctrlaltdel:/sbin/shutdown -r now
++
++# Used by /etc/init.d/xdm to control DM startup.
++# Read the comments in /etc/init.d/xdm for more
++# info. Do NOT remove, as this will start nothing
++# extra at boot if /etc/init.d/xdm is not added
++# to the "default" runlevel.
++x:a:once:/etc/X11/startDM.sh
++
+--- sysvinit-2.86-r3.ebuild.old 2006-02-06 07:34:16 +0000
++++ sysvinit-2.86-r3.ebuild 2006-02-06 07:42:06 +0000
+@@ -34,8 +34,12 @@
+ use selinux && epatch "${FILESDIR}"/${PV}-selinux.patch
+
+ # Mung inittab for specific architectures
++ case ${CHOST} in
++ *-*-linux*) suffix="linux" ;;
++ *-*-kfreebsd*) suffix="kfreebsd" ;;
++ esac
+ cd "${WORKDIR}"
+- cp "${FILESDIR}"/inittab . || die "cp inittab"
++ cp "${FILESDIR}"/inittab.${suffix} inittab || die "cp inittab"
+ local insert=""
+ if use ibm ; then
+ insert="#hvc0:2345:respawn:/sbin/agetty -L 9600 hvc0"$'\n'
Added: trunk/web/patches/gentoo-only/toolchain-binutils.diff
===================================================================
--- trunk/web/patches/gentoo-only/toolchain-binutils.diff 2006-02-06 06:28:06 UTC (rev 1138)
+++ trunk/web/patches/gentoo-only/toolchain-binutils.diff 2006-02-06 07:06:48 UTC (rev 1139)
@@ -0,0 +1,15 @@
+
+Author: rmh
+Status: in BTS
+
+--- /usr/portage/eclass/toolchain-binutils.eclass.old 2006-02-05 09:17:59 +0000
++++ /usr/portage/eclass/toolchain-binutils.eclass 2006-02-05 09:22:41 +0000
+@@ -183,7 +183,7 @@
+ find . -name '*.1' -a -size 0 | xargs rm -f
+
+ # elf2flt only works on some arches / targets
+- if [[ -n ${ELF2FLT_VER} ]] && [[ ${CTARGET} == *linux* || ${CTARGET} == *-elf* ]] ; then
++ if [[ -n ${ELF2FLT_VER} ]] && [[ ${CTARGET} == *linux* || ${CTARGET} == *-elf* || ${CTARGET} == *-gnu* ]] ; then
+ cd "${WORKDIR}"/elf2flt-${ELF2FLT_VER}
+
+ local x supported_arches=$(sed -n '/defined(TARGET_/{s:^.*TARGET_::;s:)::;p}' elf2flt.c | sort -u)
Added: trunk/web/patches/gentoo-only/zile.diff
===================================================================
--- trunk/web/patches/gentoo-only/zile.diff 2006-02-06 06:28:06 UTC (rev 1138)
+++ trunk/web/patches/gentoo-only/zile.diff 2006-02-06 07:06:48 UTC (rev 1139)
@@ -0,0 +1,15 @@
+
+Author: rmh
+Status: in BTS
+
+--- zile-2.0.7.ebuild.old 2006-02-05 11:09:28 +0000
++++ zile-2.0.7.ebuild 2006-02-05 11:09:39 +0000
+@@ -14,7 +14,7 @@
+ KEYWORDS="~x86 ~alpha ~ppc ~amd64"
+ IUSE=""
+
+-RDEPEND="sys-libs/libtermcap-compat"
++RDEPEND="sys-libs/ncurses"
+ DEPEND="${RDEPEND}
+ >=dev-util/gperf-2.7.2
+ >=sys-apps/texinfo-4.3"
Reply to: