From: | "William Hubbs (williamh)" <williamh@g.o> |
---|---|
To: | gentoo-commits@l.g.o |
Subject: | [gentoo-commits] gentoo-x86 commit in sys-apps/sysvinit: ChangeLog sysvinit-2.87-r3.ebuild |
Date: | Fri, 08 Jan 2010 18:41:08 |
Message-Id: | E1NTJlf-0007ZI-Vb@stork.gentoo.org |
1 | williamh 10/01/08 18:41:03 |
2 | |
3 | Modified: ChangeLog |
4 | Added: sysvinit-2.87-r3.ebuild |
5 | Log: |
6 | Added patch from Chris PeBenito for selinux support. |
7 | This is for bug #295559. |
8 | (Portage version: 2.2_rc61/cvs/Linux i686) |
9 | |
10 | Revision Changes Path |
11 | 1.67 sys-apps/sysvinit/ChangeLog |
12 | |
13 | file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-apps/sysvinit/ChangeLog?rev=1.67&view=markup |
14 | plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-apps/sysvinit/ChangeLog?rev=1.67&content-type=text/plain |
15 | diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-apps/sysvinit/ChangeLog?r1=1.66&r2=1.67 |
16 | |
17 | Index: ChangeLog |
18 | =================================================================== |
19 | RCS file: /var/cvsroot/gentoo-x86/sys-apps/sysvinit/ChangeLog,v |
20 | retrieving revision 1.66 |
21 | retrieving revision 1.67 |
22 | diff -u -r1.66 -r1.67 |
23 | --- ChangeLog 8 Jan 2010 16:55:06 -0000 1.66 |
24 | +++ ChangeLog 8 Jan 2010 18:41:03 -0000 1.67 |
25 | @@ -1,6 +1,12 @@ |
26 | # ChangeLog for sys-apps/sysvinit |
27 | # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 |
28 | -# $Header: /var/cvsroot/gentoo-x86/sys-apps/sysvinit/ChangeLog,v 1.66 2010/01/08 16:55:06 williamh Exp $ |
29 | +# $Header: /var/cvsroot/gentoo-x86/sys-apps/sysvinit/ChangeLog,v 1.67 2010/01/08 18:41:03 williamh Exp $ |
30 | + |
31 | +*sysvinit-2.87-r3 (08 Jan 2010) |
32 | + |
33 | + 08 Jan 2010; William Hubbs <williamh@g.o> +sysvinit-2.87-r3.ebuild: |
34 | + Added patch from Chris PeBenito for selinux support. |
35 | + This is for bug #295559. |
36 | |
37 | *sysvinit-2.87-r2 (08 Jan 2010) |
38 | |
39 | |
40 | |
41 | |
42 | 1.1 sys-apps/sysvinit/sysvinit-2.87-r3.ebuild |
43 | |
44 | file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-apps/sysvinit/sysvinit-2.87-r3.ebuild?rev=1.1&view=markup |
45 | plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-apps/sysvinit/sysvinit-2.87-r3.ebuild?rev=1.1&content-type=text/plain |
46 | |
47 | Index: sysvinit-2.87-r3.ebuild |
48 | =================================================================== |
49 | # Copyright 1999-2010 Gentoo Foundation |
50 | # Distributed under the terms of the GNU General Public License v2 |
51 | # $Header: /var/cvsroot/gentoo-x86/sys-apps/sysvinit/sysvinit-2.87-r3.ebuild,v 1.1 2010/01/08 18:41:03 williamh Exp $ |
52 | |
53 | inherit eutils toolchain-funcs flag-o-matic |
54 | |
55 | PATCH_VER="2" |
56 | DESCRIPTION="/sbin/init - parent of all processes" |
57 | HOMEPAGE="http://freshmeat.net/projects/sysvinit/" |
58 | SRC_URI="mirror://debian/pool/main/s/sysvinit/${PN}_${PV}dsf.orig.tar.gz |
59 | mirror://gentoo/${P}-patches-${PATCH_VER}.tar.bz2" |
60 | F="ftp://ftp.cistron.nl/pub/people/miquels/software/${P}.tar.gz |
61 | ftp://sunsite.unc.edu/pub/Linux/system/daemons/init/${P}.tar.gz |
62 | http://www.gc-linux.org/down/isobel/kexec/sysvinit/sysvinit-2.86-kexec.patch" |
63 | |
64 | LICENSE="GPL-2" |
65 | SLOT="0" |
66 | KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86" |
67 | IUSE="selinux ibm static kernel_FreeBSD" |
68 | |
69 | RDEPEND="selinux? ( >=sys-libs/libselinux-1.28 )" |
70 | DEPEND="${RDEPEND} |
71 | virtual/os-headers" |
72 | |
73 | S=${WORKDIR}/${P}dsf |
74 | |
75 | src_unpack() { |
76 | unpack ${A} |
77 | cd "${S}" |
78 | EPATCH_FORCE="yes" EPATCH_SUFFIX="patch" epatch "${WORKDIR}"/patches |
79 | sed -i '/^STRIP/s|=.*|=:|' src/Makefile |
80 | |
81 | # Mung inittab for specific architectures |
82 | cd "${WORKDIR}" |
83 | cp "${FILESDIR}"/inittab-${PV} inittab || die "cp inittab" |
84 | local insert="" |
85 | use ppc && insert='#psc0:12345:respawn:/sbin/agetty 115200 ttyPSC0 linux' |
86 | use arm && insert='#f0:12345:respawn:/sbin/agetty 9600 ttyFB0 vt100' |
87 | use hppa && insert='b0:12345:respawn:/sbin/agetty 9600 ttyB0 vt100' |
88 | use s390 && insert='s0:12345:respawn:/sbin/agetty 38400 console' |
89 | if use ibm ; then |
90 | insert="${insert}#hvc0:2345:respawn:/sbin/agetty -L 9600 hvc0"$'\n' |
91 | insert="${insert}#hvsi:2345:respawn:/sbin/agetty -L 19200 hvsi0" |
92 | fi |
93 | (use arm || use mips || use sh || use sparc) && sed -i '/ttyS0/s:#::' inittab |
94 | if use kernel_FreeBSD ; then |
95 | sed -i \ |
96 | -e 's/linux/cons25/g' \ |
97 | -e 's/ttyS0/cuaa0/g' \ |
98 | -e 's/ttyS1/cuaa1/g' \ |
99 | inittab #121786 |
100 | fi |
101 | [[ -n ${insert} ]] && echo "# Architecture specific features"$'\n'"${insert}" >> inittab |
102 | } |
103 | |
104 | src_compile() { |
105 | local myconf |
106 | |
107 | tc-export CC |
108 | use static && append-ldflags -static |
109 | use selinux && myconf=WITH_SELINUX=yes |
110 | emake -C src ${myconf} || die |
111 | } |
112 | |
113 | src_install() { |
114 | emake -C src \ |
115 | install \ |
116 | ROOT="${D}" \ |
117 | || die "make install" |
118 | dodoc README doc/* |
119 | |
120 | insinto /etc |
121 | doins "${WORKDIR}"/inittab || die "inittab" |
122 | |
123 | doinitd "${FILESDIR}"/{reboot,shutdown}.sh || die |
124 | } |
125 | |
126 | pkg_postinst() { |
127 | # Reload init to fix unmounting problems of / on next reboot. |
128 | # This is really needed, as without the new version of init cause init |
129 | # not to quit properly on reboot, and causes a fsck of / on next reboot. |
130 | if [[ ${ROOT} == / ]] ; then |
131 | # Do not return an error if this fails |
132 | /sbin/telinit U &>/dev/null |
133 | fi |
134 | } |