Gentoo Archives: gentoo-commits

From: "Yixun Lan (dlan)" <dlan@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in app-misc/jail: metadata.xml ChangeLog jail-2.0.ebuild
Date: Thu, 10 Jul 2014 21:38:39
Message-Id: 20140710213835.CCB652004E@flycatcher.gentoo.org
1 dlan 14/07/10 21:38:35
2
3 Modified: metadata.xml ChangeLog
4 Added: jail-2.0.ebuild
5 Log:
6 bug 514892, version bump, switch to new upstream, fix security issue, thanks Sergey Redin
7
8 (Portage version: 2.2.8/cvs/Linux x86_64, signed Manifest commit with key 0xAABEFD55)
9
10 Revision Changes Path
11 1.4 app-misc/jail/metadata.xml
12
13 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-misc/jail/metadata.xml?rev=1.4&view=markup
14 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-misc/jail/metadata.xml?rev=1.4&content-type=text/plain
15 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-misc/jail/metadata.xml?r1=1.3&r2=1.4
16
17 Index: metadata.xml
18 ===================================================================
19 RCS file: /var/cvsroot/gentoo-x86/app-misc/jail/metadata.xml,v
20 retrieving revision 1.3
21 retrieving revision 1.4
22 diff -u -r1.3 -r1.4
23 --- metadata.xml 23 Sep 2011 21:49:41 -0000 1.3
24 +++ metadata.xml 10 Jul 2014 21:38:35 -0000 1.4
25 @@ -1,10 +1,16 @@
26 <?xml version="1.0" encoding="UTF-8"?>
27 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
28 <pkgmetadata>
29 + <herd>proxy-maintainers</herd>
30 <maintainer>
31 - <email>maintainer-needed@g.o</email>
32 - <description>This package lacks a primary herd or maintainer.</description>
33 + <email>spiculator@×××××.com</email>
34 + <name>Sergey Redin</name>
35 + <description>Maintainer, Assign bugs</description>
36 </maintainer>
37 + <upstream>
38 + <remote-id type="github">spiculator/jail</remote-id>
39 + <bugs-to>https://github.com/spiculator/jail/issues</bugs-to>
40 + </upstream>
41 <longdescription>
42 Jail Chroot Project is an attempt of write a tool that builds a chrooted environment.
43 The main goal of Jail is to be as simple as possible, and highly portable. The most
44
45
46
47 1.32 app-misc/jail/ChangeLog
48
49 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-misc/jail/ChangeLog?rev=1.32&view=markup
50 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-misc/jail/ChangeLog?rev=1.32&content-type=text/plain
51 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-misc/jail/ChangeLog?r1=1.31&r2=1.32
52
53 Index: ChangeLog
54 ===================================================================
55 RCS file: /var/cvsroot/gentoo-x86/app-misc/jail/ChangeLog,v
56 retrieving revision 1.31
57 retrieving revision 1.32
58 diff -u -r1.31 -r1.32
59 --- ChangeLog 17 Aug 2012 17:29:47 -0000 1.31
60 +++ ChangeLog 10 Jul 2014 21:38:35 -0000 1.32
61 @@ -1,6 +1,12 @@
62 # ChangeLog for app-misc/jail
63 -# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
64 -# $Header: /var/cvsroot/gentoo-x86/app-misc/jail/ChangeLog,v 1.31 2012/08/17 17:29:47 kensington Exp $
65 +# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
66 +# $Header: /var/cvsroot/gentoo-x86/app-misc/jail/ChangeLog,v 1.32 2014/07/10 21:38:35 dlan Exp $
67 +
68 +*jail-2.0 (10 Jul 2014)
69 +
70 + 10 Jul 2014; Yixun Lan <dlan@g.o> +jail-2.0.ebuild, metadata.xml:
71 + bug 514892, version bump, switch to new upstream, fix security issue, thanks
72 + Sergey Redin
73
74 17 Aug 2012; Michael Palimaka <kensington@g.o> -jail-1.9-r2.ebuild:
75 Remove old.
76
77
78
79 1.1 app-misc/jail/jail-2.0.ebuild
80
81 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-misc/jail/jail-2.0.ebuild?rev=1.1&view=markup
82 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-misc/jail/jail-2.0.ebuild?rev=1.1&content-type=text/plain
83
84 Index: jail-2.0.ebuild
85 ===================================================================
86 # Copyright 1999-2014 Gentoo Foundation
87 # Distributed under the terms of the GNU General Public License v2
88 # $Header: /var/cvsroot/gentoo-x86/app-misc/jail/jail-2.0.ebuild,v 1.1 2014/07/10 21:38:35 dlan Exp $
89
90 EAPI="5"
91
92 inherit eutils flag-o-matic
93
94 DESCRIPTION="a tool that builds a chroot and configures all the required files, directories and libraries"
95 HOMEPAGE="https://github.com/spiculator/jail"
96 SRC_URI="https://github.com/spiculator/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
97
98 LICENSE="GPL-2"
99 SLOT="0"
100 KEYWORDS="~amd64 ~ppc ~x86"
101 IUSE=""
102
103 DEPEND=">=sys-apps/sed-4"
104 RDEPEND="dev-lang/perl
105 dev-util/strace"
106
107 src_prepare() {
108 epatch \
109 "${FILESDIR}"/${PN}-1.9-gentoo.patch \
110 "${FILESDIR}"/${PN}-1.9-wrongshell.patch \
111 "${FILESDIR}"/${PN}-1.9-multiuser-rsa.patch \
112 "${FILESDIR}"/${PN}-1.9-ldflags.patch
113 }
114
115 src_compile() {
116 # configuration files should be installed in /etc not /usr/etc
117 sed -i "s:\$4/etc:\${D}/etc:g" install.sh || die
118
119 # the destination directory should be /usr not /usr/local
120 sed -i -e "s:usr/local:${D}/usr:g" \
121 -e "s:^COPT =.*:COPT = -Wl,-z,no:g" src/Makefile || die
122
123 # Below didn't work. Don't know why
124 #append-ldflags -Wl,-z,now
125 emake -C src CC="$(tc-getCC)" CFLAGS="${CFLAGS}"
126 }
127
128 src_install() {
129 emake -C src install
130
131 # remove //var/tmp/portage/${P}/image//usr from files
132 FILES=( "${D}/usr/bin/mkjailenv"
133 "${D}/usr/bin/addjailsw"
134 "${D}/usr/bin/addjailuser"
135 "${D}/etc/jail.conf"
136 "${D}/usr/lib/libjail.pm"
137 "${D}/usr/lib/arch/generic/definitions"
138 "${D}/usr/lib/arch/generic/functions"
139 "${D}/usr/lib/arch/linux/definitions"
140 "${D}/usr/lib/arch/linux/functions"
141 "${D}/usr/lib/arch/freebsd/definitions"
142 "${D}/usr/lib/arch/freebsd/functions"
143 "${D}/usr/lib/arch/irix/definitions"
144 "${D}/usr/lib/arch/irix/functions"
145 "${D}/usr/lib/arch/solaris/definitions"
146 "${D}/usr/lib/arch/solaris/functions" )
147
148 for f in "${FILES[@]}"; do
149 sed -i "s:/${D}/usr:/usr:g" ${f} || die
150 done
151
152 sed -i "s:/usr/etc:/etc:" "${D}"/usr/lib/libjail.pm || die
153
154 dodoc doc/{CHANGELOG,INSTALL,README,SECURITY,VERSION}
155 }