1 |
swift 14/07/09 19:29:44 |
2 |
|
3 |
Modified: libselinux-2.2.2-r5.ebuild ChangeLog |
4 |
Log: |
5 |
Fix bug #516608 - Backport pcre version fix from libselinux-2.3 |
6 |
|
7 |
(Portage version: 2.2.8-r1/cvs/Linux x86_64, signed Manifest commit with key 0x2EDD52403B68AF47) |
8 |
|
9 |
Revision Changes Path |
10 |
1.3 sys-libs/libselinux/libselinux-2.2.2-r5.ebuild |
11 |
|
12 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-libs/libselinux/libselinux-2.2.2-r5.ebuild?rev=1.3&view=markup |
13 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-libs/libselinux/libselinux-2.2.2-r5.ebuild?rev=1.3&content-type=text/plain |
14 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-libs/libselinux/libselinux-2.2.2-r5.ebuild?r1=1.2&r2=1.3 |
15 |
|
16 |
Index: libselinux-2.2.2-r5.ebuild |
17 |
=================================================================== |
18 |
RCS file: /var/cvsroot/gentoo-x86/sys-libs/libselinux/libselinux-2.2.2-r5.ebuild,v |
19 |
retrieving revision 1.2 |
20 |
retrieving revision 1.3 |
21 |
diff -u -r1.2 -r1.3 |
22 |
--- libselinux-2.2.2-r5.ebuild 30 Apr 2014 17:11:30 -0000 1.2 |
23 |
+++ libselinux-2.2.2-r5.ebuild 9 Jul 2014 19:29:44 -0000 1.3 |
24 |
@@ -1,12 +1,10 @@ |
25 |
# Copyright 1999-2014 Gentoo Foundation |
26 |
# Distributed under the terms of the GNU General Public License v2 |
27 |
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/libselinux/libselinux-2.2.2-r5.ebuild,v 1.2 2014/04/30 17:11:30 swift Exp $ |
28 |
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/libselinux/libselinux-2.2.2-r5.ebuild,v 1.3 2014/07/09 19:29:44 swift Exp $ |
29 |
|
30 |
EAPI="5" |
31 |
PYTHON_COMPAT=( python2_7 python3_2 python3_3 ) |
32 |
-USE_RUBY="ruby18 ruby19 ruby20" |
33 |
|
34 |
-# No, I am not calling ruby-ng |
35 |
inherit multilib python-r1 toolchain-funcs eutils multilib-minimal |
36 |
|
37 |
SEPOL_VER="2.2" |
38 |
@@ -14,12 +12,12 @@ |
39 |
DESCRIPTION="SELinux userland library" |
40 |
HOMEPAGE="http://userspace.selinuxproject.org" |
41 |
SRC_URI="http://userspace.selinuxproject.org/releases/20131030/${P}.tar.gz |
42 |
- http://dev.gentoo.org/~swift/patches/${PN}/patchbundle-${P}-r4.tar.gz" |
43 |
+ http://dev.gentoo.org/~swift/patches/${PN}/patchbundle-${P}-r5.tar.gz" |
44 |
|
45 |
LICENSE="public-domain" |
46 |
SLOT="0" |
47 |
-KEYWORDS="amd64 x86" |
48 |
-IUSE="python ruby static-libs ruby_targets_ruby18 ruby_targets_ruby19 ruby_targets_ruby20" |
49 |
+KEYWORDS="~amd64 ~x86" |
50 |
+IUSE="python static-libs" |
51 |
|
52 |
RDEPEND=">=sys-libs/libsepol-${SEPOL_VER} |
53 |
>=dev-libs/libpcre-8.30-r2[static-libs?] |
54 |
@@ -67,25 +65,6 @@ |
55 |
} |
56 |
python_foreach_impl building |
57 |
fi |
58 |
- |
59 |
- if multilib_is_native_abi && use ruby; then |
60 |
- building() { |
61 |
- einfo "Calling rubywrap for ${1}" |
62 |
- # Clean up .lo file to force rebuild |
63 |
- test -f src/selinuxswig_ruby_wrap.lo && rm src/selinuxswig_ruby_wrap.lo |
64 |
- emake \ |
65 |
- CC="$(tc-getCC)" \ |
66 |
- RUBY=${1} \ |
67 |
- RUBYINSTALL=$(${1} -e 'print RbConfig::CONFIG["vendorarchdir"]') \ |
68 |
- LDFLAGS="-fPIC ${LDFLAGS} -lpthread" \ |
69 |
- rubywrap |
70 |
- } |
71 |
- for RUBYTARGET in ${USE_RUBY}; do |
72 |
- use ruby_targets_${RUBYTARGET} || continue |
73 |
- |
74 |
- building ${RUBYTARGET} |
75 |
- done |
76 |
- fi |
77 |
} |
78 |
|
79 |
multilib_src_install() { |
80 |
@@ -99,23 +78,6 @@ |
81 |
python_foreach_impl installation |
82 |
fi |
83 |
|
84 |
- if multilib_is_native_abi && use ruby; then |
85 |
- installation() { |
86 |
- einfo "Calling install-rubywrap for ${1}" |
87 |
- # Forcing (re)build here as otherwise the resulting SO file is used for all ruby versions |
88 |
- rm src/selinuxswig_ruby_wrap.lo |
89 |
- LIBDIR="\$(PREFIX)/$(get_libdir)" emake DESTDIR="${D}" \ |
90 |
- RUBY=${1} \ |
91 |
- RUBYINSTALL="${D}/$(${1} -e 'print RbConfig::CONFIG["vendorarchdir"]')" \ |
92 |
- install-rubywrap |
93 |
- } |
94 |
- for RUBYTARGET in ${USE_RUBY}; do |
95 |
- use ruby_targets_${RUBYTARGET} || continue |
96 |
- |
97 |
- installation ${RUBYTARGET} |
98 |
- done |
99 |
- fi |
100 |
- |
101 |
use static-libs || rm "${D}"/usr/lib*/*.a |
102 |
} |
103 |
|
104 |
@@ -125,5 +87,9 @@ |
105 |
do |
106 |
mkdir -p /etc/selinux/${POLTYPE}/contexts/files |
107 |
touch /etc/selinux/${POLTYPE}/contexts/files/file_contexts.local |
108 |
+ # Fix bug 516608 |
109 |
+ for EXPRFILE in file_contexts file_contexts.homedirs file_contexts.local ; do |
110 |
+ sefcontext_compile /etc/selinux/${POLTYPE}/contexts/files/${EXPRFILE}; |
111 |
+ done |
112 |
done |
113 |
} |
114 |
|
115 |
|
116 |
|
117 |
1.126 sys-libs/libselinux/ChangeLog |
118 |
|
119 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-libs/libselinux/ChangeLog?rev=1.126&view=markup |
120 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-libs/libselinux/ChangeLog?rev=1.126&content-type=text/plain |
121 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-libs/libselinux/ChangeLog?r1=1.125&r2=1.126 |
122 |
|
123 |
Index: ChangeLog |
124 |
=================================================================== |
125 |
RCS file: /var/cvsroot/gentoo-x86/sys-libs/libselinux/ChangeLog,v |
126 |
retrieving revision 1.125 |
127 |
retrieving revision 1.126 |
128 |
diff -u -r1.125 -r1.126 |
129 |
--- ChangeLog 9 Jul 2014 18:16:31 -0000 1.125 |
130 |
+++ ChangeLog 9 Jul 2014 19:29:44 -0000 1.126 |
131 |
@@ -1,6 +1,9 @@ |
132 |
# ChangeLog for sys-libs/libselinux |
133 |
# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 |
134 |
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/libselinux/ChangeLog,v 1.125 2014/07/09 18:16:31 swift Exp $ |
135 |
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/libselinux/ChangeLog,v 1.126 2014/07/09 19:29:44 swift Exp $ |
136 |
+ |
137 |
+ 09 Jul 2014; Sven Vermeulen <swift@g.o> libselinux-2.2.2-r5.ebuild: |
138 |
+ Fix bug #516608 - Backport pcre version fix from libselinux-2.3 |
139 |
|
140 |
*libselinux-2.3-r1 (09 Jul 2014) |