[gentoo-commits] proj/elfix:elfix-0.9.x commit in: /, scripts/

[gentoo-commits] proj/elfix:elfix-0.9.x commit in: /, scripts/

[Anthony G. Basile]

commit:     5dbbd6d8cb343e90f0811c64db5f4d0014f9f00e
Author:     Anthony G. Basile <blueness <AT> gentoo <DOT> org>
AuthorDate: Sun Dec 21 15:37:00 2014 +0000
Commit:     Anthony G. Basile <blueness <AT> gentoo <DOT> org>
CommitDate: Thu Sep  3 23:08:33 2015 +0000
URL:        https://gitweb.gentoo.org/proj/elfix.git/commit/?id=5dbbd6d8

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 "$@"

[gentoo-commits] proj/elfix:elfix-0.9.x commit in: /, scripts/

[Anthony G. Basile]

commit:     ef7d42ed9ce535774571cc39e2c8f914e28def7c
Author:     Anthony G. Basile <blueness <AT> gentoo <DOT> org>
AuthorDate: Thu Sep  3 22:53:19 2015 +0000
Commit:     Anthony G. Basile <blueness <AT> gentoo <DOT> org>
CommitDate: Thu Sep  3 23:11:47 2015 +0000
URL:        https://gitweb.gentoo.org/proj/elfix.git/commit/?id=ef7d42ed

scripts/paxmark.sh: default to both PT and XT.

 ChangeLog          | 3 +++
 scripts/paxmark.sh | 2 +-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/ChangeLog b/ChangeLog
index f602585..6890a34 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,9 @@
 2015-09-03
 
 	* scripts/paxmark.sh: make.conf can be a directory
+	* scripts/paxmark.sh: default to both PT and XT if
+	no PAX_MARKINGS are set in make.conf.
+	Reported by James Le Cuirot <chewi@gentoo.org>
 
 2014-12-22
 

diff --git a/scripts/paxmark.sh b/scripts/paxmark.sh
index 9d151f0..71631b7 100755
--- a/scripts/paxmark.sh
+++ b/scripts/paxmark.sh
@@ -96,5 +96,5 @@ elif [[ -e $MAKE_CONF ]]; then
 	source $MAKE_CONF
 fi
 
-PAX_MARKINGS=${PAX_MARKINGS:="PT"}
+PAX_MARKINGS=${PAX_MARKINGS:="PT XT"}
 paxmarksh "$@"