projects / gentoo.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 07644f6)
Backport fixes for paxmark.sh and revdep-pax.
authorAnthony G. Basile <blueness@gentoo.org>
Sun, 28 Dec 2014 18:27:03 +0000 (18:27 +0000)
committerAnthony G. Basile <blueness@gentoo.org>
Sun, 28 Dec 2014 18:27:03 +0000 (18:27 +0000)
Package-Manager: portage-2.2.14/cvs/Linux x86_64
Manifest-Sign-Key: 0xF52D4BBA

sys-apps/elfix/ChangeLog patch | blob | history
sys-apps/elfix/Manifest patch | blob | history
sys-apps/elfix/elfix-0.9.0-r1.ebuild [new file with mode: 0644] patch | blob
sys-apps/elfix/files/elfix-0.9.0-backport-fix-paxmark_sh.patch [new file with mode: 0644] patch | blob
sys-apps/elfix/files/elfix-0.9.0-backport-fix-revdep-pax.patch [new file with mode: 0644] patch | blob

diff --git a/sys-apps/elfix/ChangeLog b/sys-apps/elfix/ChangeLog
index 828f5137fb58dc05835e52b2cdba6bdb5804b918..d0b4fedde6c39d6587b27bea0c41d867b12227e4 100644 (file)
--- a/sys-apps/elfix/ChangeLog
+++ b/sys-apps/elfix/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for sys-apps/elfix
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/elfix/ChangeLog,v 1.91 2014/12/27 19:25:38 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/elfix/ChangeLog,v 1.92 2014/12/28 18:26:51 blueness Exp $
+
+*elfix-0.9.0-r1 (28 Dec 2014)
+
+  28 Dec 2014; Anthony G. Basile <blueness@gentoo.org> +elfix-0.9.0-r1.ebuild,
+  +files/elfix-0.9.0-backport-fix-paxmark_sh.patch,
+  +files/elfix-0.9.0-backport-fix-revdep-pax.patch:
+  Backport fixes for paxmark.sh and revdep-pax.
 
   27 Dec 2014; Agostino Sarubbo <ago@gentoo.org> elfix-0.9.0.ebuild:
   Stable for amd64, wrt bug #530570
diff --git a/sys-apps/elfix/Manifest b/sys-apps/elfix/Manifest
index c1ac01c22f3a259f5a679c4e5535dd8582de118d..d05e9968558eaa4d9f919f1134761f37e66d0cda 100644 (file)
--- a/sys-apps/elfix/Manifest
+++ b/sys-apps/elfix/Manifest
@@ -1,26 +1,29 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
+AUX elfix-0.9.0-backport-fix-paxmark_sh.patch 1596 SHA256 8f488a11e66db10bf6bcb3d6cda7691e53e62222e339251fe900f11deb4efb83 SHA512 1acc3a0e88135439c5a8ece077b54f6047006ff91afc68664a3d2bf0bb0b7f401f40b0f82c726938c050f48335c2dfc01d1cd884f5e07dadae89e196e84cb35f WHIRLPOOL 35de6ac455f66cda536b3aeb6ddcb871a80f6e13132e5b28c07f59b467c661c4cc86daf452420abe23137cc9fe37eec7374675660f43c7a12a6447c643f9d22f
+AUX elfix-0.9.0-backport-fix-revdep-pax.patch 820 SHA256 15d49661286083782ce3e8cccc6f54ce1075cb415fa2729d5af58eadbd0841e3 SHA512 7c1846d8d36d330bbbb659d7d2dcd0a81fd6510e7351889a9f7e79e1f43c4114e1d8de7e3581056eb8cc64bc5eeb5b6be702ca71943511dae791e124de799161 WHIRLPOOL 012fa48fce5932c872bd36b831a03c9214d6ed47f7fd4a6fb89f5a642fed640570103066e13f8b8a6f9cb9f1bb533929dee525dcd659a3c210b18d9602ce8bff
 DIST elfix-0.8.4.tar.gz 374742 SHA256 374be66da3dddef485bbb5e95bfcab6fd0c2db478255bddd10079730ada5260b SHA512 10aacc3fff33c934e2d4487d174a2b0cec10ffb7a35fc72b160c786f82f0355f3a2dea716bc7fb929d2919cc32a26844f37f9d73064b755098bdaa72e8075bda WHIRLPOOL b04e099f188c0b76d8c07abd76559c1313854aa83a03ad69afb72674d93cde6ce538ae10d0fea3be5495937e72a4b98fdd36efbb2e3aa8ff23c1d9f7f943c1ae
 DIST elfix-0.9.0.tar.gz 372014 SHA256 8b547d987edb2f7dc23ddf30f959d7d051a9ed49810f983b8fe6c489fe731cf0 SHA512 fd9bab90d745f77429c902acd2a14f615132731b3c38929dce764f1e5f7ee8f6478a6fef7ce0cb38e7ebd9181ba57965ff0c97da5e01d0fbf2cfb940ed691ebf WHIRLPOOL c09fa2193b990a506cae17f370ec10fa6302e17d2a165e42eceb88644f8a92e297c839ad788204e213d8205695b65557a7dcef5f6417177c434c8d0a34bd5eb7
 EBUILD elfix-0.8.4.ebuild 1039 SHA256 995ddc2f2387cae8cc597e5eb308c449c5710414dcdb806b8bb81364471dbaa9 SHA512 b07a517afa6a2b4e9146f5cf8747380ed7fd2bde4635e8cdb846f1cef3a509ef861465b88fac88adb604de770b31f9a295589a47df6046134c06713108f050cd WHIRLPOOL 57dcd51572ec2f399811e3716efb58f651a4199a7143879fc1abc90216113ddf56b489dd75ef690fee8b314ec1d96923c948cc30fdded84b80b2ed8bc76cc289
+EBUILD elfix-0.9.0-r1.ebuild 1201 SHA256 50ef4674c282f513d4c7a398d7719d857e5a9eb8d83d84951ac9e176f058c747 SHA512 ffef3d9b18af56d7a92a90fe6a5369035ca14398b2a61099db328234d4316fa3d0aa3f4f7e9fae6dc9eb6d2d4269f471cc4c11da1c48f1bde8300aacf0e15017 WHIRLPOOL a65fb2d3e6ed44524d651642a31112dedb1d640cd95ac4638de57fc5107acce371fed9f5ac13fc6a8359123b01ea2ec3af974bd3d64c3eda445e1e449cd4927e
 EBUILD elfix-0.9.0.ebuild 1039 SHA256 4b0b0dc117a2bf124c3d22b80697691bd15d98637050c44ab1bf4c00cacfd505 SHA512 27fa73460afcad799157e173a4bb903be98851d58f0b3ad58b35b9731fbccf699b92a4059a5a1e3281d30457f426928edeeedce96f76ec3ef401aa2630e0cc42 WHIRLPOOL a09116c85ff280d73cf9e155b414009928af721582fa908139823fee1b7dd334720657dc71427cd3cc90f7b6423a2986e4544fa3899e10512b966697c2bee939
-MISC ChangeLog 11838 SHA256 aad10a3377803a11d0960e0358e9712ab7e7e23125cf192182f0d1bb62ff88cd SHA512 7eae8cfba5fdaf13f20b2c86e67617045b8c7097bff1394fb53b082231f1bd0a67c9cd77f935b207c3ecd321a9855ce89ad4dc2cfea5996b62a81ae617916ad4 WHIRLPOOL f79a1a2f80610fff8081e264c46a6310e14830717feb6a4db25ff6cdc21c0dd4a1715fd51efe08af347adf290a5036cab0c2d91b2518ce353302182149849416
+MISC ChangeLog 12106 SHA256 b36b73456a8cde357baff7331ee5ca86aafcc9d5786d69e677d84f81a2744172 SHA512 43c0d37126f6948dbbb02dcc880daff244c2b208911acf25f9d865916118fb70bce3954ac32ba6fd6fa0856d1589aa617ecf3000fcbdfab5e97bb06c3ba59a23 WHIRLPOOL 1e9135666cab9a2b13a2c22f6f0ea1e45f506da0b677a3479ba0a2537d820e87d531bb56ed5ba72cf802429cb31e02fd2a2cdebbfddcd215e094adc81691d511
 MISC metadata.xml 393 SHA256 81a4b48fc98f0eaa825c15e5aab31a9c2eb0557d7c47d7453963d5f1d247a7ef SHA512 970b25df4289226f1a5e22a98f97f413f14c00c2454100b0e56d96d8f6ba4cc592aef36af569549bf884d49278cbe3de91799d4fdf1d38c318aae414610a075f WHIRLPOOL aa59e113a09a9b16fb579800b695c11c6d63626362db57098544eafff52cb34b3470256ce7ff392f10226e1546f2f60a9737f0ea32ed3875000f0566c82eb270
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iQIcBAEBCAAGBQJUnwezAAoJELp701BxlEWf1FoP/2rwL3mn5laHgNiLRcKRNMg1
-qNxaVobteV1ENh19KGXLY7LjIfppVDtMlJH28iixi35Ao+ASkniaaMGNvMsjz/Rz
-RcFXQk6BimRXDtHqn7CpAeZrAkBNUTaQkfluxHwO8HIOUerZ7wMVrKfJY5Sx/D59
-17uKwM7uSqhPhQ+Cg1X+h79xa4/sAyNOmiWdzKqc3pOa5CZuqRTcFHcfBAh+qDQP
-0fBdB37rLj8tOXRscD1ZLn43dkx7zMtjaNcPaTcojn4Top6DUMNKuoK3/spuAOC2
-+ODGpzlBI1ge8b9khmRG0W/DrWmSTK3E2tj6F3usKWbC2+SNAyTE2Uw5d6G/0wZH
-s7RkxtWPQvlfhspLNU/E7KCTi2TqsspXdborlLFWkhLMiTkCPnsrvnuxOvnfC+Ic
-5rDpKphgD9so5pJWJ1vKyi9bVyK1MLaibW56hyTnPIvT+SVkG+roI2vJWJi0Jg4Y
-A1kswaWLru/Fu7mx9mO5AO1zL5q0rEKOT5zrf4BPlmSuDm8GavVUS5D1oHFRpUxY
-OiZ9BN4971Qebzd67td662Cm+WBY0yO4vBjPKAlOBLqAiU+j/h0rAhSxpGx5Wb5j
-NX+cpdL9Vq3RRd1bL828eXdJAs43W8rCv1WtMlpI0tfpoSqu3YtNH1w7t5bzD5qc
-7qDNeuGEg7IocsJMuAan
-=GTw7
+iQIcBAEBCAAGBQJUoEugAAoJEJOE+m71LUu648IP/iNVXoYB9iz8edkx7kvVSTcq
+NPT+N75BnyOCWF+hPUJswnyZkTMkw1hvf0IHv7MKKQhtmpkqx5lpp/io3+ub91lN
+X5m54f6YhgIOnX7KugYxjFhNDqXNzqVECx1/2T4tq5rdLtmW2v927DM73kqtg3z6
+4z1Q2eLlJ09UqdKIHQ05lWUKc3dpluFeOnHEaNRMB1DRaV1Xx14IKMeOesEj9F6j
+10h5H0Ta8ny4nqo+gzDuC4542QztCnM4ovR0DNC9E/1Lcvx4QLuW2HiMCO1A+p8l
+qzWJjo1rBAohYMVGvlCRD6I0WELLjfyIjk5hDljovMjWOI2T0YiLrWqlAewSbsd0
+irKDyj7UdRjvi7/oblvDg3lNASUNj7I9fi9vNbMrcZjTIaOST5re+/MK4nakcj5M
+ckw1DW3IcMSk95NpTklZfJwQwzMRHrW+0zC4ApQaAaafzmg5xsSPRSuI7l6CaAFH
+fG+XVEZgZZerOnedU7kmqfF66QgJZw6qZ+E1DnCvaytjvUcd/1LZCFi+KgTGmuhB
+ma1xeNqZuglFBT/ZSq2T7Nw59TTtY9GuSpXweExAzoqr4k+GFvLv4xh77j/p6Z69
+FlQLupFSKqa/Lism+E1E2RL6uk5n/f9ea4fIXPR7HBlWoSABS36vRyktzSOkCai0
+nfQ8DbKS8VY2iwQA1o+p
+=W9C7
 -----END PGP SIGNATURE-----
diff --git a/sys-apps/elfix/elfix-0.9.0-r1.ebuild b/sys-apps/elfix/elfix-0.9.0-r1.ebuild
new file mode 100644 (file)
index 0000000..bedb4bd
--- /dev/null
+++ b/sys-apps/elfix/elfix-0.9.0-r1.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/elfix/elfix-0.9.0-r1.ebuild,v 1.1 2014/12/28 18:26:51 blueness Exp $
+
+EAPI="5"
+
+inherit eutils
+
+DESCRIPTION="A suite of tools to work with ELF objects on Hardened Gentoo"
+HOMEPAGE="http://www.gentoo.org/proj/en/hardened/pax-quickstart.xml
+       http://dev.gentoo.org/~blueness/elfix/"
+SRC_URI="http://dev.gentoo.org/~blueness/elfix/${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+IUSE="+ptpax +xtpax"
+
+REQUIRED_USE="|| ( ptpax xtpax )"
+
+# These only work with a properly configured PaX kernel
+RESTRICT="test"
+
+DEPEND="~dev-python/pypax-${PV}[ptpax=,xtpax=]
+       ptpax? ( dev-libs/elfutils )
+       xtpax? ( sys-apps/attr )"
+
+RDEPEND="${DEPEND}"
+
+src_prepare() {
+       epatch "${FILESDIR}"/${P}-backport-fix-paxmark_sh.patch
+       epatch "${FILESDIR}"/${P}-backport-fix-revdep-pax.patch
+}
+
+src_configure() {
+       rm -f "${S}/scripts/setup.py"
+       econf --disable-tests \
+               $(use_enable ptpax) \
+               $(use_enable xtpax)
+}
+
+src_install() {
+       emake DESTDIR="${D}" install
+       dodoc AUTHORS ChangeLog INSTALL README THANKS TODO
+}
diff --git a/sys-apps/elfix/files/elfix-0.9.0-backport-fix-paxmark_sh.patch b/sys-apps/elfix/files/elfix-0.9.0-backport-fix-paxmark_sh.patch
new file mode 100644 (file)
index 0000000..86be00e
--- /dev/null
+++ b/sys-apps/elfix/files/elfix-0.9.0-backport-fix-paxmark_sh.patch
@@ -0,0 +1,57 @@
+From 84ca11706f804d6c808d932700a90cc8eaab2f15 Mon Sep 17 00:00:00 2001
+From: "Anthony G. Basile" <blueness@gentoo.org>
+Date: Sun, 21 Dec 2014 10:37:00 -0500
+Subject: [PATCH 1/2] scripts/paxmark.sh: source make.conf and properly set
+ PAX_MARKINGS
+
+---
+ ChangeLog          | 6 ++++++
+ scripts/paxmark.sh | 6 +++---
+ 2 files changed, 9 insertions(+), 3 deletions(-)
+
+diff --git a/ChangeLog b/ChangeLog
+index f64e57a..d9993b1 100644
+--- a/ChangeLog
++++ b/ChangeLog
+@@ -1,3 +1,9 @@
++2014-12-22
++
++      * scripts/paxmark.sh: remove erroneous elog functions
++      * scripts/paxmark.sh: source /etc/portage/make.conf for PAX_MARKINGS
++      and correct logic to default to PT only if no PAX_MARKINGS are set.
++      Reported by Karl-Johan Karlsson <creideiki+gentoo-hardened@ferretporn.se>
+ 
+ 2014-10-03
+ 
+diff --git a/scripts/paxmark.sh b/scripts/paxmark.sh
+index 9ec077a..408e6aa 100755
+--- a/scripts/paxmark.sh
++++ b/scripts/paxmark.sh
+@@ -53,7 +53,6 @@ paxmarksh() {
+                               scanelf -Xxz ${flags} "$f" >/dev/null 2>&1
+                       #We failed to set PT_PAX flags
+                       elif [[ ${PAX_MARKINGS} != "none" ]]; then
+-                              elog "Failed to set PT_PAX markings -${flags} ${f}."
+                               ret=1
+                       fi
+               done
+@@ -79,7 +78,6 @@ paxmarksh() {
+ 
+                       #We failed to set XATTR_PAX flags
+                       if [[ ${PAX_MARKINGS} != "none" ]]; then
+-                              elog "Failed to set XATTR_PAX markings -${flags} ${f}."
+                               ret=1
+                       fi
+               done
+@@ -88,5 +86,7 @@ paxmarksh() {
+       return ${ret}
+ }
+ 
+-PAX_MARKINGS=${PAX_MARKINGS:="PT XT"}
++MAKE_CONF="/etc/portage/make.conf"
++[[ -e $MAKE_CONF ]] && source $MAKE_CONF
++PAX_MARKINGS=${PAX_MARKINGS:="PT"}
+ paxmarksh "$@"
+-- 
+2.0.5
+
diff --git a/sys-apps/elfix/files/elfix-0.9.0-backport-fix-revdep-pax.patch b/sys-apps/elfix/files/elfix-0.9.0-backport-fix-revdep-pax.patch
new file mode 100644 (file)
index 0000000..e92769e
--- /dev/null
+++ b/sys-apps/elfix/files/elfix-0.9.0-backport-fix-revdep-pax.patch
@@ -0,0 +1,25 @@
+From 581b53b3c1ca3166dc394d1f4b08260bd088c346 Mon Sep 17 00:00:00 2001
+From: "Anthony G. Basile" <blueness@gentoo.org>
+Date: Mon, 22 Dec 2014 12:30:12 -0500
+Subject: [PATCH 2/2] scripts/revdep-pax: change .get_maps() to .get_graph()
+
+---
+ scripts/revdep-pax | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/scripts/revdep-pax b/scripts/revdep-pax
+index a718fd6..7c1cf85 100755
+--- a/scripts/revdep-pax
++++ b/scripts/revdep-pax
+@@ -465,7 +465,7 @@ def run_soname(name, verbose, use_soname, mark, allyes, executable_only):
+     shell_path = os.getenv('PATH').split(':')
+ 
+     (object_linkings, object_reverse_linkings,
+-     library2soname, soname2library) = LinkGraph().get_maps()
++     library2soname, soname2library) = LinkGraph().get_graph()
+ 
+     if use_soname:
+         soname = name
+-- 
+2.0.5
+
Unnamed repository; edit this file 'description' to name the repository.