1 |
commit: 0040f873d46367c8d16c8effc6ebd14474d9c829 |
2 |
Author: Jonathan Davies <jpds <AT> protonmail <DOT> com> |
3 |
AuthorDate: Tue Sep 1 19:44:57 2020 +0000 |
4 |
Commit: Jason Zaman <perfinion <AT> gentoo <DOT> org> |
5 |
CommitDate: Tue Sep 15 03:40:15 2020 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0040f873 |
7 |
|
8 |
sys-libs/libsemanage: Version bump to 3.1. |
9 |
|
10 |
Signed-off-by: Jonathan Davies <jpds <AT> protonmail.com> |
11 |
Signed-off-by: Jason Zaman <perfinion <AT> gentoo.org> |
12 |
|
13 |
sys-libs/libsemanage/Manifest | 1 + |
14 |
...semanage-9999.ebuild => libsemanage-3.1.ebuild} | 33 +++++++++------------- |
15 |
sys-libs/libsemanage/libsemanage-9999.ebuild | 33 +++++++++------------- |
16 |
3 files changed, 29 insertions(+), 38 deletions(-) |
17 |
|
18 |
diff --git a/sys-libs/libsemanage/Manifest b/sys-libs/libsemanage/Manifest |
19 |
index 6c9813422e3..1231fb64b80 100644 |
20 |
--- a/sys-libs/libsemanage/Manifest |
21 |
+++ b/sys-libs/libsemanage/Manifest |
22 |
@@ -1,2 +1,3 @@ |
23 |
DIST libsemanage-2.9.tar.gz 157690 BLAKE2B 98a7800a4f4a5b6eeaad8be9870a49bc697cec6cd053cb44bcd618d22146ed1adc32b432667f8fd245ac073a458e048894cbaf68903b79577bc8596b1c255f56 SHA512 ea2924e8ce97d376519d40d499145b3db413cf9cc1eb995ed338b95c131e043d8c43b87b2012cee2bb6354a6e3161ebf5ce4a1200278d3ecd4294b43d177a5c2 |
24 |
DIST libsemanage-3.0.tar.gz 180745 BLAKE2B a7e7f0c98e365fcc132e2e66de736db29b46599be2da227dbf1384110a607120f141975b859e55073f734e3ff533bdf90b7bbefd79f7bc5857bbb0722a75ad4e SHA512 f960e1bd6815d3c9f000efa7ae717bc7937e742af5a7fea4aa865cf1aee49486e34897d83dbdb9cf77975a09a5ad77e5512d47690a74512a468a89432b72a42c |
25 |
+DIST libsemanage-3.1.tar.gz 179601 BLAKE2B 69450a4eda1f3728d339f65db1eec9940995fcea5208d17dca531ebc998aefbfec48fe91beffa3490e1502953aa550405fb696635d01b0eb8050c8f00f11106a SHA512 8609ca7d13b5c603677740f2b14558fea3922624af182d20d618237ba11fcf2559fab82fc68d1efa6ff118f064d426f005138521652c761de92cd66150102197 |
26 |
|
27 |
diff --git a/sys-libs/libsemanage/libsemanage-9999.ebuild b/sys-libs/libsemanage/libsemanage-3.1.ebuild |
28 |
similarity index 86% |
29 |
copy from sys-libs/libsemanage/libsemanage-9999.ebuild |
30 |
copy to sys-libs/libsemanage/libsemanage-3.1.ebuild |
31 |
index 767ab9d45e1..f41d7dffde0 100644 |
32 |
--- a/sys-libs/libsemanage/libsemanage-9999.ebuild |
33 |
+++ b/sys-libs/libsemanage/libsemanage-3.1.ebuild |
34 |
@@ -1,13 +1,13 @@ |
35 |
# Copyright 1999-2020 Gentoo Authors |
36 |
# Distributed under the terms of the GNU General Public License v2 |
37 |
|
38 |
-EAPI="6" |
39 |
+EAPI="7" |
40 |
PYTHON_COMPAT=( python{3_6,3_7,3_8} ) |
41 |
|
42 |
inherit multilib python-r1 toolchain-funcs multilib-minimal |
43 |
|
44 |
MY_P="${P//_/-}" |
45 |
-MY_RELEASEDATE="20191204" |
46 |
+MY_RELEASEDATE="20200710" |
47 |
|
48 |
SEPOL_VER="${PV}" |
49 |
SELNX_VER="${PV}" |
50 |
@@ -27,21 +27,19 @@ fi |
51 |
|
52 |
LICENSE="GPL-2" |
53 |
SLOT="0" |
54 |
-IUSE="python" |
55 |
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" |
56 |
+IUSE="" |
57 |
+REQUIRED_USE="${PYTHON_REQUIRED_USE}" |
58 |
|
59 |
RDEPEND=">=sys-libs/libsepol-${SEPOL_VER}[${MULTILIB_USEDEP}] |
60 |
>=sys-libs/libselinux-${SELNX_VER}[${MULTILIB_USEDEP}] |
61 |
>=sys-process/audit-2.2.2[${MULTILIB_USEDEP}] |
62 |
>=dev-libs/ustr-1.0.4-r2[${MULTILIB_USEDEP}] |
63 |
- python? ( ${PYTHON_DEPS} )" |
64 |
+ ${PYTHON_DEPS}" |
65 |
DEPEND="${RDEPEND} |
66 |
+ >=dev-lang/swig-2.0.4-r1 |
67 |
sys-devel/bison |
68 |
sys-devel/flex |
69 |
- python? ( |
70 |
- >=dev-lang/swig-2.0.4-r1 |
71 |
- virtual/pkgconfig |
72 |
- )" |
73 |
+ virtual/pkgconfig" |
74 |
|
75 |
# tests are not meant to be run outside of the |
76 |
# full SELinux userland repo |
77 |
@@ -84,7 +82,7 @@ multilib_src_compile() { |
78 |
LIBDIR="${EPREFIX}/usr/$(get_libdir)" \ |
79 |
all |
80 |
|
81 |
- if multilib_is_native_abi && use python; then |
82 |
+ if multilib_is_native_abi; then |
83 |
building_py() { |
84 |
emake \ |
85 |
AR="$(tc-getAR)" \ |
86 |
@@ -102,7 +100,7 @@ multilib_src_install() { |
87 |
LIBDIR="${EPREFIX}/usr/$(get_libdir)" \ |
88 |
DESTDIR="${ED}" install |
89 |
|
90 |
- if multilib_is_native_abi && use python; then |
91 |
+ if multilib_is_native_abi; then |
92 |
installation_py() { |
93 |
emake DESTDIR="${ED}" \ |
94 |
LIBDIR="${EPREFIX}/usr/$(get_libdir)" \ |
95 |
@@ -113,6 +111,11 @@ multilib_src_install() { |
96 |
fi |
97 |
} |
98 |
|
99 |
+multiib_src_install_all() { |
100 |
+ python_setup |
101 |
+ python_fix_shebang "${ED}"/usr/libexec/selinux/semanage_migrate_store |
102 |
+} |
103 |
+ |
104 |
pkg_postinst() { |
105 |
# Migrate the SELinux semanage configuration store if not done already |
106 |
local selinuxtype=$(awk -F'=' '/SELINUXTYPE=/ {print $2}' "${EROOT}"/etc/selinux/config 2>/dev/null) |
107 |
@@ -124,12 +127,4 @@ pkg_postinst() { |
108 |
ewarn "For more information, please see" |
109 |
ewarn "- https://github.com/SELinuxProject/selinux/wiki/Policy-Store-Migration" |
110 |
fi |
111 |
- |
112 |
- # Run the store migration without rebuilds |
113 |
- for POLICY_TYPE in ${POLICY_TYPES} ; do |
114 |
- if [ ! -d "${EROOT}/var/lib/selinux/${POLICY_TYPE}/active" ] ; then |
115 |
- einfo "Migrating store ${POLICY_TYPE} (without policy rebuild)." |
116 |
- "${EROOT}/usr/libexec/selinux/semanage_migrate_store" -n -s "${POLICY_TYPE}" || die "Failed to migrate store ${POLICY_TYPE}" |
117 |
- fi |
118 |
- done |
119 |
} |
120 |
|
121 |
diff --git a/sys-libs/libsemanage/libsemanage-9999.ebuild b/sys-libs/libsemanage/libsemanage-9999.ebuild |
122 |
index 767ab9d45e1..f41d7dffde0 100644 |
123 |
--- a/sys-libs/libsemanage/libsemanage-9999.ebuild |
124 |
+++ b/sys-libs/libsemanage/libsemanage-9999.ebuild |
125 |
@@ -1,13 +1,13 @@ |
126 |
# Copyright 1999-2020 Gentoo Authors |
127 |
# Distributed under the terms of the GNU General Public License v2 |
128 |
|
129 |
-EAPI="6" |
130 |
+EAPI="7" |
131 |
PYTHON_COMPAT=( python{3_6,3_7,3_8} ) |
132 |
|
133 |
inherit multilib python-r1 toolchain-funcs multilib-minimal |
134 |
|
135 |
MY_P="${P//_/-}" |
136 |
-MY_RELEASEDATE="20191204" |
137 |
+MY_RELEASEDATE="20200710" |
138 |
|
139 |
SEPOL_VER="${PV}" |
140 |
SELNX_VER="${PV}" |
141 |
@@ -27,21 +27,19 @@ fi |
142 |
|
143 |
LICENSE="GPL-2" |
144 |
SLOT="0" |
145 |
-IUSE="python" |
146 |
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" |
147 |
+IUSE="" |
148 |
+REQUIRED_USE="${PYTHON_REQUIRED_USE}" |
149 |
|
150 |
RDEPEND=">=sys-libs/libsepol-${SEPOL_VER}[${MULTILIB_USEDEP}] |
151 |
>=sys-libs/libselinux-${SELNX_VER}[${MULTILIB_USEDEP}] |
152 |
>=sys-process/audit-2.2.2[${MULTILIB_USEDEP}] |
153 |
>=dev-libs/ustr-1.0.4-r2[${MULTILIB_USEDEP}] |
154 |
- python? ( ${PYTHON_DEPS} )" |
155 |
+ ${PYTHON_DEPS}" |
156 |
DEPEND="${RDEPEND} |
157 |
+ >=dev-lang/swig-2.0.4-r1 |
158 |
sys-devel/bison |
159 |
sys-devel/flex |
160 |
- python? ( |
161 |
- >=dev-lang/swig-2.0.4-r1 |
162 |
- virtual/pkgconfig |
163 |
- )" |
164 |
+ virtual/pkgconfig" |
165 |
|
166 |
# tests are not meant to be run outside of the |
167 |
# full SELinux userland repo |
168 |
@@ -84,7 +82,7 @@ multilib_src_compile() { |
169 |
LIBDIR="${EPREFIX}/usr/$(get_libdir)" \ |
170 |
all |
171 |
|
172 |
- if multilib_is_native_abi && use python; then |
173 |
+ if multilib_is_native_abi; then |
174 |
building_py() { |
175 |
emake \ |
176 |
AR="$(tc-getAR)" \ |
177 |
@@ -102,7 +100,7 @@ multilib_src_install() { |
178 |
LIBDIR="${EPREFIX}/usr/$(get_libdir)" \ |
179 |
DESTDIR="${ED}" install |
180 |
|
181 |
- if multilib_is_native_abi && use python; then |
182 |
+ if multilib_is_native_abi; then |
183 |
installation_py() { |
184 |
emake DESTDIR="${ED}" \ |
185 |
LIBDIR="${EPREFIX}/usr/$(get_libdir)" \ |
186 |
@@ -113,6 +111,11 @@ multilib_src_install() { |
187 |
fi |
188 |
} |
189 |
|
190 |
+multiib_src_install_all() { |
191 |
+ python_setup |
192 |
+ python_fix_shebang "${ED}"/usr/libexec/selinux/semanage_migrate_store |
193 |
+} |
194 |
+ |
195 |
pkg_postinst() { |
196 |
# Migrate the SELinux semanage configuration store if not done already |
197 |
local selinuxtype=$(awk -F'=' '/SELINUXTYPE=/ {print $2}' "${EROOT}"/etc/selinux/config 2>/dev/null) |
198 |
@@ -124,12 +127,4 @@ pkg_postinst() { |
199 |
ewarn "For more information, please see" |
200 |
ewarn "- https://github.com/SELinuxProject/selinux/wiki/Policy-Store-Migration" |
201 |
fi |
202 |
- |
203 |
- # Run the store migration without rebuilds |
204 |
- for POLICY_TYPE in ${POLICY_TYPES} ; do |
205 |
- if [ ! -d "${EROOT}/var/lib/selinux/${POLICY_TYPE}/active" ] ; then |
206 |
- einfo "Migrating store ${POLICY_TYPE} (without policy rebuild)." |
207 |
- "${EROOT}/usr/libexec/selinux/semanage_migrate_store" -n -s "${POLICY_TYPE}" || die "Failed to migrate store ${POLICY_TYPE}" |
208 |
- fi |
209 |
- done |
210 |
} |