1 |
commit: 563a8cf4eef8e71e9a8e9cbbaaf72406d04c224d |
2 |
Author: stefson <herrtimson <AT> yahoo <DOT> de> |
3 |
AuthorDate: Wed Jan 3 17:38:02 2018 +0000 |
4 |
Commit: Aric Belsito <lluixhi <AT> gmail <DOT> com> |
5 |
CommitDate: Wed Jan 3 17:38:02 2018 +0000 |
6 |
URL: https://gitweb.gentoo.org/proj/musl.git/commit/?id=563a8cf4 |
7 |
|
8 |
app-misc/pax-utils: sync with tree |
9 |
|
10 |
.../files/pax-utils-1.2.2-linux-2.6.32.patch | 65 ++++++++++++++++++++++ |
11 |
app-misc/pax-utils/pax-utils-1.2.2-r1.ebuild | 61 -------------------- |
12 |
app-misc/pax-utils/pax-utils-1.2.2-r2.ebuild | 1 + |
13 |
app-misc/pax-utils/pax-utils-1.2.2.ebuild | 60 -------------------- |
14 |
4 files changed, 66 insertions(+), 121 deletions(-) |
15 |
|
16 |
diff --git a/app-misc/pax-utils/files/pax-utils-1.2.2-linux-2.6.32.patch b/app-misc/pax-utils/files/pax-utils-1.2.2-linux-2.6.32.patch |
17 |
new file mode 100644 |
18 |
index 0000000..8139310 |
19 |
--- /dev/null |
20 |
+++ b/app-misc/pax-utils/files/pax-utils-1.2.2-linux-2.6.32.patch |
21 |
@@ -0,0 +1,65 @@ |
22 |
+This is the diff for generated sources after applying: |
23 |
+https://github.com/gentoo/pax-utils/pull/2 |
24 |
+ |
25 |
+diff -ru pax-utils-HEAD.orig/config.h.in pax-utils-HEAD/config.h.in |
26 |
+--- pax-utils-HEAD.orig/config.h.in 2017-04-18 16:26:42.000000000 +0200 |
27 |
++++ pax-utils-HEAD/config.h.in 2017-04-18 16:28:05.000000000 +0200 |
28 |
+@@ -526,6 +526,9 @@ |
29 |
+ /* Define to 1 if you have the `link' function. */ |
30 |
+ #undef HAVE_LINK |
31 |
+ |
32 |
++/* Define to 1 if you have the <linux/securebits.h> header file. */ |
33 |
++#undef HAVE_LINUX_SECUREBITS_H |
34 |
++ |
35 |
+ /* Define to 1 if the system has the type 'long long int'. */ |
36 |
+ #undef HAVE_LONG_LONG_INT |
37 |
+ |
38 |
+diff -ru pax-utils-HEAD.orig/configure pax-utils-HEAD/configure |
39 |
+--- pax-utils-HEAD.orig/configure 2017-04-18 16:26:41.000000000 +0200 |
40 |
++++ pax-utils-HEAD/configure 2017-04-18 16:28:03.000000000 +0200 |
41 |
+@@ -34537,6 +34537,19 @@ |
42 |
+ |
43 |
+ |
44 |
+ |
45 |
++for ac_header in linux/securebits.h |
46 |
++do : |
47 |
++ ac_fn_c_check_header_mongrel "$LINENO" "linux/securebits.h" "ac_cv_header_linux_securebits_h" "$ac_includes_default" |
48 |
++if test "x$ac_cv_header_linux_securebits_h" = xyes; then : |
49 |
++ cat >>confdefs.h <<_ACEOF |
50 |
++#define HAVE_LINUX_SECUREBITS_H 1 |
51 |
++_ACEOF |
52 |
++ |
53 |
++fi |
54 |
++ |
55 |
++done |
56 |
++ |
57 |
++ |
58 |
+ ac_config_files="$ac_config_files Makefile autotools/gnulib/Makefile" |
59 |
+ |
60 |
+ cat >confcache <<\_ACEOF |
61 |
+diff -ru pax-utils-HEAD.orig/configure.ac pax-utils-HEAD/configure.ac |
62 |
+--- pax-utils-HEAD.orig/configure.ac 2017-04-18 16:25:48.000000000 +0200 |
63 |
++++ pax-utils-HEAD/configure.ac 2017-04-18 16:27:11.000000000 +0200 |
64 |
+#@@ -62,6 +62,8 @@ |
65 |
+ AX_CHECK_COMPILE_FLAG(flag, AS_VAR_APPEND([CFLAGS], " flag")) |
66 |
+ ]) |
67 |
+ |
68 |
++AC_CHECK_HEADERS([linux/securebits.h]) |
69 |
++ |
70 |
+ AC_CONFIG_FILES([ |
71 |
+ Makefile |
72 |
+ autotools/gnulib/Makefile |
73 |
+diff -ru pax-utils-HEAD.orig/porting.h pax-utils-HEAD/porting.h |
74 |
+--- pax-utils-HEAD.orig/porting.h 2017-03-03 21:07:15.000000000 +0100 |
75 |
++++ pax-utils-HEAD/porting.h 2017-04-18 16:18:22.000000000 +0200 |
76 |
+@@ -46,7 +46,9 @@ |
77 |
+ #endif |
78 |
+ #if defined(__linux__) |
79 |
+ # include <sys/prctl.h> |
80 |
+-# include <linux/securebits.h> |
81 |
++# if !defined(HAVE_CONFIG_H) || defined(HAVE_LINUX_SECUREBITS_H) |
82 |
++# include <linux/securebits.h> |
83 |
++# endif |
84 |
+ #endif |
85 |
+ #if defined(__GLIBC__) || defined(__UCLIBC__) || defined(__ANDROID__) |
86 |
+ # include <byteswap.h> |
87 |
|
88 |
diff --git a/app-misc/pax-utils/pax-utils-1.2.2-r1.ebuild b/app-misc/pax-utils/pax-utils-1.2.2-r1.ebuild |
89 |
deleted file mode 100644 |
90 |
index 42bba27..0000000 |
91 |
--- a/app-misc/pax-utils/pax-utils-1.2.2-r1.ebuild |
92 |
+++ /dev/null |
93 |
@@ -1,61 +0,0 @@ |
94 |
-# Copyright 1999-2017 Gentoo Foundation |
95 |
-# Distributed under the terms of the GNU General Public License v2 |
96 |
- |
97 |
-EAPI=6 |
98 |
- |
99 |
-inherit eutils toolchain-funcs unpacker |
100 |
- |
101 |
-DESCRIPTION="ELF utils that can check files for security relevant properties" |
102 |
-HOMEPAGE="https://wiki.gentoo.org/index.php?title=Project:Hardened/PaX_Utilities" |
103 |
-SRC_URI="mirror://gentoo/${P}.tar.xz |
104 |
- https://dev.gentoo.org/~vapier/dist/${P}.tar.xz" |
105 |
- |
106 |
-LICENSE="GPL-2" |
107 |
-SLOT="0" |
108 |
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" |
109 |
-IUSE="caps debug python seccomp" |
110 |
- |
111 |
-RDEPEND="caps? ( >=sys-libs/libcap-2.24 ) |
112 |
- python? ( dev-python/pyelftools ) |
113 |
- seccomp? ( sys-libs/libseccomp )" |
114 |
-DEPEND="${RDEPEND} |
115 |
- caps? ( virtual/pkgconfig ) |
116 |
- seccomp? ( virtual/pkgconfig ) |
117 |
- app-arch/xz-utils" |
118 |
- |
119 |
-PATCHES=( |
120 |
- "${FILESDIR}"/${P}-scanelf-fix-out-of-bounds-access-in-ia64.patch |
121 |
- "${FILESDIR}/${PN}-1.1.7-musl.patch" |
122 |
-) |
123 |
- |
124 |
-_emake() { |
125 |
- emake \ |
126 |
- USE_CAP=$(usex caps) \ |
127 |
- USE_DEBUG=$(usex debug) \ |
128 |
- USE_PYTHON=$(usex python) \ |
129 |
- USE_SECCOMP=$(usex seccomp) \ |
130 |
- "$@" |
131 |
-} |
132 |
- |
133 |
-src_configure() { |
134 |
- # Avoid slow configure+gnulib+make if on an up-to-date Linux system |
135 |
- if use prefix || ! use kernel_linux || \ |
136 |
- has_version '<sys-libs/glibc-2.10' |
137 |
- then |
138 |
- econf $(use_with caps) $(use_with debug) $(use_with python) $(use_with seccomp) |
139 |
- else |
140 |
- tc-export CC PKG_CONFIG |
141 |
- fi |
142 |
-} |
143 |
- |
144 |
-src_compile() { |
145 |
- _emake |
146 |
-} |
147 |
- |
148 |
-src_test() { |
149 |
- _emake check |
150 |
-} |
151 |
- |
152 |
-src_install() { |
153 |
- _emake DESTDIR="${D}" PKGDOCDIR='$(DOCDIR)'/${PF} install |
154 |
-} |
155 |
|
156 |
diff --git a/app-misc/pax-utils/pax-utils-1.2.2-r2.ebuild b/app-misc/pax-utils/pax-utils-1.2.2-r2.ebuild |
157 |
index 31400b7..3904be7 100644 |
158 |
--- a/app-misc/pax-utils/pax-utils-1.2.2-r2.ebuild |
159 |
+++ b/app-misc/pax-utils/pax-utils-1.2.2-r2.ebuild |
160 |
@@ -26,6 +26,7 @@ DEPEND="${RDEPEND} |
161 |
PATCHES=( |
162 |
"${FILESDIR}"/${P}-scanelf-fix-out-of-bounds-access-in-ia64.patch |
163 |
"${FILESDIR}"/${P}-solaris.patch |
164 |
+ "${FILESDIR}"/${P}-linux-2.6.32.patch |
165 |
"${FILESDIR}/${PN}-1.1.7-musl.patch" |
166 |
) |
167 |
|
168 |
|
169 |
diff --git a/app-misc/pax-utils/pax-utils-1.2.2.ebuild b/app-misc/pax-utils/pax-utils-1.2.2.ebuild |
170 |
deleted file mode 100644 |
171 |
index 1c32f97..0000000 |
172 |
--- a/app-misc/pax-utils/pax-utils-1.2.2.ebuild |
173 |
+++ /dev/null |
174 |
@@ -1,60 +0,0 @@ |
175 |
-# Copyright 1999-2017 Gentoo Foundation |
176 |
-# Distributed under the terms of the GNU General Public License v2 |
177 |
- |
178 |
-EAPI="5" |
179 |
- |
180 |
-inherit eutils toolchain-funcs unpacker |
181 |
- |
182 |
-DESCRIPTION="ELF utils that can check files for security relevant properties" |
183 |
-HOMEPAGE="https://wiki.gentoo.org/index.php?title=Project:Hardened/PaX_Utilities" |
184 |
-SRC_URI="mirror://gentoo/${P}.tar.xz |
185 |
- https://dev.gentoo.org/~vapier/dist/${P}.tar.xz" |
186 |
- |
187 |
-LICENSE="GPL-2" |
188 |
-SLOT="0" |
189 |
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" |
190 |
-IUSE="caps debug python seccomp" |
191 |
- |
192 |
-RDEPEND="caps? ( >=sys-libs/libcap-2.24 ) |
193 |
- python? ( dev-python/pyelftools ) |
194 |
- seccomp? ( sys-libs/libseccomp )" |
195 |
-DEPEND="${RDEPEND} |
196 |
- caps? ( virtual/pkgconfig ) |
197 |
- seccomp? ( virtual/pkgconfig ) |
198 |
- app-arch/xz-utils" |
199 |
- |
200 |
-_emake() { |
201 |
- emake \ |
202 |
- USE_CAP=$(usex caps) \ |
203 |
- USE_DEBUG=$(usex debug) \ |
204 |
- USE_PYTHON=$(usex python) \ |
205 |
- USE_SECCOMP=$(usex seccomp) \ |
206 |
- "$@" |
207 |
-} |
208 |
- |
209 |
-src_prepare() { |
210 |
- epatch "${FILESDIR}/${PN}-1.1.7-musl.patch" |
211 |
-} |
212 |
- |
213 |
-src_configure() { |
214 |
- # Avoid slow configure+gnulib+make if on an up-to-date Linux system |
215 |
- if use prefix || ! use kernel_linux || \ |
216 |
- has_version '<sys-libs/glibc-2.10' |
217 |
- then |
218 |
- econf $(use_with caps) $(use_with debug) $(use_with python) $(use_with seccomp) |
219 |
- else |
220 |
- tc-export CC PKG_CONFIG |
221 |
- fi |
222 |
-} |
223 |
- |
224 |
-src_compile() { |
225 |
- _emake |
226 |
-} |
227 |
- |
228 |
-src_test() { |
229 |
- _emake check |
230 |
-} |
231 |
- |
232 |
-src_install() { |
233 |
- _emake DESTDIR="${D}" PKGDOCDIR='$(DOCDIR)'/${PF} install |
234 |
-} |