| 1 |
commit: 23bd1a2c5cf2e448001e78b197ca9dae9e00988d |
| 2 |
Author: Anthony G. Basile <blueness <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Tue May 21 15:20:10 2013 +0000 |
| 4 |
Commit: Anthony G. Basile <blueness <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Tue May 21 15:20:10 2013 +0000 |
| 6 |
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/elfix.git;a=commit;h=23bd1a2c |
| 7 |
|
| 8 |
Rename scripts/pax-mark -> scripts/paxmark.sh to avoid name collision with the eclass |
| 9 |
|
| 10 |
--- |
| 11 |
ChangeLog | 4 ++-- |
| 12 |
scripts/Makefile.am | 2 +- |
| 13 |
scripts/{pax-mark => paxmark.sh} | 4 ++-- |
| 14 |
3 files changed, 5 insertions(+), 5 deletions(-) |
| 15 |
|
| 16 |
diff --git a/ChangeLog b/ChangeLog |
| 17 |
index 03ee71e..c6b049f 100644 |
| 18 |
--- a/ChangeLog |
| 19 |
+++ b/ChangeLog |
| 20 |
@@ -5,8 +5,8 @@ |
| 21 |
elfutils from libelf. The former will not build on uclibc, but the laster |
| 22 |
does not provide ELF_C_RDWR_MMAP. |
| 23 |
* Clean up the tests so they work for all combinations of --{en,dis}able-{pt,xt}pax |
| 24 |
- * Add a bash utility which does pax-marking like the eclass. This is for |
| 25 |
- build systems that do pax-marking during the build. |
| 26 |
+ * Add a bash utility, paxmark.sh, which does PaX marking like the eclass. This is for |
| 27 |
+ build systems that do PaX marking during the build. |
| 28 |
|
| 29 |
2012-12-28 |
| 30 |
|
| 31 |
|
| 32 |
diff --git a/scripts/Makefile.am b/scripts/Makefile.am |
| 33 |
index 5cef3e1..e5e5291 100644 |
| 34 |
--- a/scripts/Makefile.am |
| 35 |
+++ b/scripts/Makefile.am |
| 36 |
@@ -1,4 +1,4 @@ |
| 37 |
ACLOCAL_AMFLAGS = -I m4 |
| 38 |
|
| 39 |
-dist_sbin_SCRIPTS = migrate-pax pax-mark pypaxctl revdep-pax |
| 40 |
+dist_sbin_SCRIPTS = migrate-pax paxmark.sh pypaxctl revdep-pax |
| 41 |
EXTRA_DIST = paxmodule.c setup.py |
| 42 |
|
| 43 |
diff --git a/scripts/pax-mark b/scripts/paxmark.sh |
| 44 |
similarity index 99% |
| 45 |
rename from scripts/pax-mark |
| 46 |
rename to scripts/paxmark.sh |
| 47 |
index c8fc7ed..02f966e 100755 |
| 48 |
--- a/scripts/pax-mark |
| 49 |
+++ b/scripts/paxmark.sh |
| 50 |
@@ -5,7 +5,7 @@ has() { |
| 51 |
return 1 |
| 52 |
} |
| 53 |
|
| 54 |
-pax-mark() { |
| 55 |
+paxmarksh() { |
| 56 |
|
| 57 |
local f # loop over paxables |
| 58 |
local flags # pax flags |
| 59 |
@@ -108,4 +108,4 @@ pax-mark() { |
| 60 |
} |
| 61 |
|
| 62 |
PAX_MARKINGS=${PAX_MARKINGS:="PT XT"} |
| 63 |
-pax-mark "$@" |
| 64 |
+paxmarksh "$@" |
Archives