summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJaka Kranjc2016-01-09 10:35:44 +0100
committerJaka Kranjc2016-01-09 10:37:02 +0100
commit14f75ccb22480c65a23a97a0d6b193de37cf66a8 (patch)
tree4a7eb687ef321f979b0c82ab964a7262c09243ad
parentb3dbc3258fb75329c30eec55bd2fe96a6e204576 (diff)
alter, libcodex: fixed find's subtle semantic break as of 4.5.11test-1.15
-rwxr-xr-xChangeLog3
-rwxr-xr-xusr/sbin/alter4
-rwxr-xr-xvar/lib/sorcery/modules/libcodex2
3 files changed, 6 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index a16071e8..ee35b4c7 100755
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,6 @@
+2016-01-09 Jaka Kranjc <lynxlynxlynx@sourcemage.org>
+ * alter, libcodex: fixed find's subtle semantic break as of 4.5.11
+
2015-05-02 Jaka Kranjc <lynxlynxlynx@sourcemage.org>
* libressurect: avoid conflict corner case #665
diff --git a/usr/sbin/alter b/usr/sbin/alter
index 43aec5f4..c75bc238 100755
--- a/usr/sbin/alter
+++ b/usr/sbin/alter
@@ -229,7 +229,7 @@ function alter_gather_bins() {
if [ ! -f "/etc/prelink.conf" ]; then
message "${MESSAGE_COLOR}Gathering binary directories for altering (this could take a long while)...${DEFAULT_COLOR}"
- find / -perm +001 2> /dev/null |
+ find / -perm -001 2> /dev/null |
while read LINE; do
[ ! -h "$LINE" ] && file $LINE 2> /dev/null |
grep -q ELF && echo "$LINE"
@@ -284,7 +284,7 @@ function alter_strip_all_do() {
alter_gather_bins
alter_alter -n smgl-strip '
- find $(cat /etc/prelink.conf) -perm +001 2> /dev/null |
+ find $(cat /etc/prelink.conf) -perm -001 2> /dev/null |
while read LINE; do
[ ! -h "$LINE" ] && file $LINE 2> /dev/null |
grep -q ELF && echo "$LINE"
diff --git a/var/lib/sorcery/modules/libcodex b/var/lib/sorcery/modules/libcodex
index 176225a5..d3d016ac 100755
--- a/var/lib/sorcery/modules/libcodex
+++ b/var/lib/sorcery/modules/libcodex
@@ -919,7 +919,7 @@ function codex_create_in_memory_cache_all() {
##
#---------------------------------------------------------------------
function codex_find_in_grimoire () {
- find "$1" -follow -maxdepth 3 -mindepth 3 -perm +700 -name "$2"
+ find "$1" -follow -maxdepth 3 -mindepth 3 -perm /700 -name "$2"
}
#---------------------------------------------------------------------