1 |
robbat2 14/01/04 23:30:45 |
2 |
|
3 |
Modified: keyutils-1.5.5.ebuild ChangeLog |
4 |
Added: keyutils-1.5.8.ebuild |
5 |
Log: |
6 |
Version bump, also fix bug #484452 (AR) and bug #421531 (checking kernel config). |
7 |
|
8 |
(Portage version: 2.2.7/cvs/Linux x86_64, unsigned Manifest commit) |
9 |
|
10 |
Revision Changes Path |
11 |
1.10 sys-apps/keyutils/keyutils-1.5.5.ebuild |
12 |
|
13 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/keyutils/keyutils-1.5.5.ebuild?rev=1.10&view=markup |
14 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/keyutils/keyutils-1.5.5.ebuild?rev=1.10&content-type=text/plain |
15 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/keyutils/keyutils-1.5.5.ebuild?r1=1.9&r2=1.10 |
16 |
|
17 |
Index: keyutils-1.5.5.ebuild |
18 |
=================================================================== |
19 |
RCS file: /var/cvsroot/gentoo-x86/sys-apps/keyutils/keyutils-1.5.5.ebuild,v |
20 |
retrieving revision 1.9 |
21 |
retrieving revision 1.10 |
22 |
diff -p -w -b -B -u -u -r1.9 -r1.10 |
23 |
--- keyutils-1.5.5.ebuild 1 Jul 2012 18:21:34 -0000 1.9 |
24 |
+++ keyutils-1.5.5.ebuild 4 Jan 2014 23:30:45 -0000 1.10 |
25 |
@@ -1,10 +1,10 @@ |
26 |
-# Copyright 1999-2012 Gentoo Foundation |
27 |
+# Copyright 1999-2014 Gentoo Foundation |
28 |
# Distributed under the terms of the GNU General Public License v2 |
29 |
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/keyutils/keyutils-1.5.5.ebuild,v 1.9 2012/07/01 18:21:34 armin76 Exp $ |
30 |
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/keyutils/keyutils-1.5.5.ebuild,v 1.10 2014/01/04 23:30:45 robbat2 Exp $ |
31 |
|
32 |
EAPI="3" |
33 |
|
34 |
-inherit multilib eutils toolchain-funcs |
35 |
+inherit multilib eutils toolchain-funcs linux-info |
36 |
|
37 |
DESCRIPTION="Linux Key Management Utilities" |
38 |
HOMEPAGE="http://people.redhat.com/dhowells/keyutils/" |
39 |
@@ -13,10 +13,18 @@ SRC_URI="http://people.redhat.com/dhowel |
40 |
LICENSE="GPL-2 LGPL-2.1" |
41 |
SLOT="0" |
42 |
KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux" |
43 |
-IUSE="" |
44 |
+IUSE="test" |
45 |
|
46 |
DEPEND="!prefix? ( >=sys-kernel/linux-headers-2.6.11 )" |
47 |
|
48 |
+pkg_setup() { |
49 |
+ CONFIG_CHECK="~KEYS" |
50 |
+ use test && CONFIG_CHECK="${CONFIG_CHECK} ~KEYS_DEBUG_PROC_KEYS" |
51 |
+ ERROR_KEYS="You must have CONFIG_KEYS to use this package!" |
52 |
+ ERROR_KEYS_DEBUG_PROC_KEYS="You must have CONFIG_KEYS_DEBUG_PROC_KEYS to run the package testsuite!" |
53 |
+ linux-info_pkg_setup |
54 |
+} |
55 |
+ |
56 |
src_prepare() { |
57 |
epatch "${FILESDIR}"/${PN}-1.5.5-makefile-fixup.patch |
58 |
sed -i \ |
59 |
@@ -43,6 +51,7 @@ src_prepare() { |
60 |
|
61 |
src_configure() { |
62 |
tc-export CC |
63 |
+ tc-export AR |
64 |
} |
65 |
|
66 |
src_test() { |
67 |
|
68 |
|
69 |
|
70 |
1.36 sys-apps/keyutils/ChangeLog |
71 |
|
72 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/keyutils/ChangeLog?rev=1.36&view=markup |
73 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/keyutils/ChangeLog?rev=1.36&content-type=text/plain |
74 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/keyutils/ChangeLog?r1=1.35&r2=1.36 |
75 |
|
76 |
Index: ChangeLog |
77 |
=================================================================== |
78 |
RCS file: /var/cvsroot/gentoo-x86/sys-apps/keyutils/ChangeLog,v |
79 |
retrieving revision 1.35 |
80 |
retrieving revision 1.36 |
81 |
diff -p -w -b -B -u -u -r1.35 -r1.36 |
82 |
--- ChangeLog 1 Jul 2012 18:21:34 -0000 1.35 |
83 |
+++ ChangeLog 4 Jan 2014 23:30:45 -0000 1.36 |
84 |
@@ -1,6 +1,13 @@ |
85 |
# ChangeLog for sys-apps/keyutils |
86 |
-# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 |
87 |
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/keyutils/ChangeLog,v 1.35 2012/07/01 18:21:34 armin76 Exp $ |
88 |
+# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 |
89 |
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/keyutils/ChangeLog,v 1.36 2014/01/04 23:30:45 robbat2 Exp $ |
90 |
+ |
91 |
+*keyutils-1.5.8 (04 Jan 2014) |
92 |
+ |
93 |
+ 04 Jan 2014; Robin H. Johnson <robbat2@g.o> +keyutils-1.5.8.ebuild, |
94 |
+ keyutils-1.5.5.ebuild: |
95 |
+ Version bump, also fix bug #484452 (AR) and bug #421531 (checking kernel |
96 |
+ config). |
97 |
|
98 |
01 Jul 2012; Raúl Porcel <armin76@g.o> keyutils-1.5.5.ebuild: |
99 |
alpha/ia64/m68k/s390/sh/sparc stable wrt #417445 |
100 |
|
101 |
|
102 |
|
103 |
1.1 sys-apps/keyutils/keyutils-1.5.8.ebuild |
104 |
|
105 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/keyutils/keyutils-1.5.8.ebuild?rev=1.1&view=markup |
106 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/keyutils/keyutils-1.5.8.ebuild?rev=1.1&content-type=text/plain |
107 |
|
108 |
Index: keyutils-1.5.8.ebuild |
109 |
=================================================================== |
110 |
# Copyright 1999-2014 Gentoo Foundation |
111 |
# Distributed under the terms of the GNU General Public License v2 |
112 |
# $Header: /var/cvsroot/gentoo-x86/sys-apps/keyutils/keyutils-1.5.8.ebuild,v 1.1 2014/01/04 23:30:45 robbat2 Exp $ |
113 |
|
114 |
EAPI="5" |
115 |
|
116 |
inherit multilib eutils toolchain-funcs linux-info |
117 |
|
118 |
DESCRIPTION="Linux Key Management Utilities" |
119 |
HOMEPAGE="http://people.redhat.com/dhowells/keyutils/" |
120 |
SRC_URI="http://people.redhat.com/dhowells/${PN}/${P}.tar.bz2" |
121 |
|
122 |
LICENSE="GPL-2 LGPL-2.1" |
123 |
SLOT="0" |
124 |
KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux" |
125 |
IUSE="test" |
126 |
|
127 |
DEPEND="!prefix? ( >=sys-kernel/linux-headers-2.6.11 )" |
128 |
|
129 |
pkg_setup() { |
130 |
CONFIG_CHECK="~KEYS" |
131 |
use test && CONFIG_CHECK="${CONFIG_CHECK} ~KEYS_DEBUG_PROC_KEYS" |
132 |
ERROR_KEYS="You must have CONFIG_KEYS to use this package!" |
133 |
ERROR_KEYS_DEBUG_PROC_KEYS="You must have CONFIG_KEYS_DEBUG_PROC_KEYS to run the package testsuite!" |
134 |
linux-info_pkg_setup |
135 |
} |
136 |
|
137 |
src_prepare() { |
138 |
epatch "${FILESDIR}"/${PN}-1.5.5-makefile-fixup.patch |
139 |
sed -i \ |
140 |
-e '1iRPATH=' \ |
141 |
-e '/^C.*FLAGS/s|:=|+=|' \ |
142 |
-e 's:-Werror::' \ |
143 |
-e '/^BUILDFOR/s:=.*:=:' \ |
144 |
-e "/^LIBDIR/s:=.*:=/usr/$(get_libdir):" \ |
145 |
-e '/^USRLIBDIR/s:=.*:=$(LIBDIR):' \ |
146 |
Makefile || die |
147 |
|
148 |
# The lsb check is useless, so avoid spurious command not found messages. |
149 |
sed -i -e 's,lsb_release,:,' tests/prepare.inc.sh || die |
150 |
# All the test files are bash, but try to execute via `sh`. |
151 |
sed -i -r \ |
152 |
-e 's:([[:space:]])sh([[:space:]]):\1bash\2:' \ |
153 |
tests/{Makefile*,*.sh} || die |
154 |
find tests/ -name '*.sh' -exec sed -i '1s:/sh$:/bash:' {} + |
155 |
# Some tests call the kernel which calls userspace, but that will |
156 |
# run the install keyutils rather than the locally compiled one, |
157 |
# so disable round trip tests. |
158 |
rm -rf tests/keyctl/requesting/{bad-args,piped,valid} |
159 |
} |
160 |
|
161 |
src_configure() { |
162 |
tc-export CC |
163 |
tc-export AR |
164 |
} |
165 |
|
166 |
src_test() { |
167 |
# Execute the locally compiled code rather than the |
168 |
# older versions already installed in the system. |
169 |
LD_LIBRARY_PATH=${S} \ |
170 |
PATH="${S}:${PATH}" \ |
171 |
emake test || die |
172 |
} |
173 |
|
174 |
src_install() { |
175 |
emake DESTDIR="${ED}" install || die |
176 |
dodoc README |
177 |
gen_usr_ldscript -a keyutils |
178 |
} |