This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "IPFire 3.x development tree".
The branch, master has been updated via f31406a9de231da58fd530c364dece3a80a5fc36 (commit) via 31858f63aef7cb44f48582528401f16d0e1e116d (commit) via 88b140939e35acbbf48d69ecbe524ec37e4a9d48 (commit) via 911577415f5f4cdca4637826f25855e7d97457c8 (commit) via 93a297233ed0caf87cc717321d981f4a7f6831db (commit) via b5b20f869911894e3b6bff06bf8b9e065aab6bdd (commit) via 0c59ae7fd145344b68f36947f85101823c7f34a2 (commit) via 9ebad7b309406f0c7d84000b2e23a7de92769af5 (commit) from cef84a2302caaa68295accce3926187682408cdd (commit)
Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below.
- Log ----------------------------------------------------------------- commit f31406a9de231da58fd530c364dece3a80a5fc36 Author: Michael Tremer michael.tremer@ipfire.org Date: Sun Apr 11 00:33:46 2010 +0200
perl: Remove rpath whitelist.
commit 31858f63aef7cb44f48582528401f16d0e1e116d Author: Michael Tremer michael.tremer@ipfire.org Date: Sun Apr 11 00:19:44 2010 +0200
lua: Fix makefile.
Run autogen.sh and remove silly rpath.
commit 88b140939e35acbbf48d69ecbe524ec37e4a9d48 Author: Michael Tremer michael.tremer@ipfire.org Date: Sun Apr 11 00:11:48 2010 +0200
xz: Cleanup makefile.
This automatically adds the change to libtool which removes the rpath stuff.
commit 911577415f5f4cdca4637826f25855e7d97457c8 Author: Michael Tremer michael.tremer@ipfire.org Date: Sun Apr 11 00:11:29 2010 +0200
freeradius: Update rpath whitelist.
commit 93a297233ed0caf87cc717321d981f4a7f6831db Author: Michael Tremer michael.tremer@ipfire.org Date: Sun Apr 11 00:10:51 2010 +0200
elfutils: Update rpath whitelist.
commit b5b20f869911894e3b6bff06bf8b9e065aab6bdd Author: Michael Tremer michael.tremer@ipfire.org Date: Sun Apr 11 00:10:36 2010 +0200
ebtables: Update rpath whitelist.
commit 0c59ae7fd145344b68f36947f85101823c7f34a2 Author: Michael Tremer michael.tremer@ipfire.org Date: Sun Apr 11 00:09:18 2010 +0200
QA: Change behaviour of rpath check.
We now list the allowed value.
commit 9ebad7b309406f0c7d84000b2e23a7de92769af5 Author: Michael Tremer michael.tremer@ipfire.org Date: Sun Apr 11 00:08:19 2010 +0200
QA: Only return shared objects when searching for ELF files.
-----------------------------------------------------------------------
Summary of changes: pkgs/Constants | 3 ++- pkgs/core/ebtables/ebtables.nm | 3 +-- pkgs/core/elfutils/elfutils.nm | 2 +- pkgs/core/freeradius/freeradius.nm | 4 +--- pkgs/core/lua/lua.nm | 6 ++++-- pkgs/core/perl/perl.nm | 5 ----- pkgs/core/xz/xz.nm | 19 ------------------- tools/common-functions | 15 ++++++++++++++- tools/quality-agent.d/050-rpaths | 17 ++++------------- 9 files changed, 27 insertions(+), 47 deletions(-)
Difference in files: diff --git a/pkgs/Constants b/pkgs/Constants index eef32ba..a52d473 100644 --- a/pkgs/Constants +++ b/pkgs/Constants @@ -76,5 +76,6 @@ export PKG_DEPS PKG_BUILD_DEPS
export CONTROL_PREIN CONTROL_PREUN CONTROL_POSTIN CONTROL_POSTUN
-export QUALITY_AGENT_WHITELIST_EXECSTACK QUALITY_AGENT_WHITELIST_RPATH +export QUALITY_AGENT_WHITELIST_EXECSTACK +export QUALITY_AGENT_WHITELIST_RPATH export QUALITY_AGENT_WHITELIST_SONAME diff --git a/pkgs/core/ebtables/ebtables.nm b/pkgs/core/ebtables/ebtables.nm index b09783c..7be3632 100644 --- a/pkgs/core/ebtables/ebtables.nm +++ b/pkgs/core/ebtables/ebtables.nm @@ -45,8 +45,7 @@ PKG_TARBALL = $(THISAPP).tar.gz CFLAGS += -Wall
define QUALITY_AGENT_WHITELIST_RPATH - /sbin/ebtables-restore \ - /sbin/ebtables + /lib/ebtables endef
define STAGE_BUILD diff --git a/pkgs/core/elfutils/elfutils.nm b/pkgs/core/elfutils/elfutils.nm index e218905..a78ef36 100644 --- a/pkgs/core/elfutils/elfutils.nm +++ b/pkgs/core/elfutils/elfutils.nm @@ -50,7 +50,7 @@ CONFIGURE_OPTIONS += \ --program-prefix=eu-
define QUALITY_AGENT_WHITELIST_RPATH - /usr/lib/libdw-*.so* + /usr/lib/elfutils endef
# fails diff --git a/pkgs/core/freeradius/freeradius.nm b/pkgs/core/freeradius/freeradius.nm index 8e94125..95f9924 100644 --- a/pkgs/core/freeradius/freeradius.nm +++ b/pkgs/core/freeradius/freeradius.nm @@ -48,9 +48,7 @@ endef PKG_TARBALL = $(THISAPP).tar.bz2
define QUALITY_AGENT_WHITELIST_RPATH - /usr/bin/* - /usr/sbin/* - /usr/lib/freeradius/* + /usr/lib/freeradius endef
define STAGE_BUILD diff --git a/pkgs/core/lua/lua.nm b/pkgs/core/lua/lua.nm index 3d28e18..d8ac16d 100644 --- a/pkgs/core/lua/lua.nm +++ b/pkgs/core/lua/lua.nm @@ -34,6 +34,7 @@ PKG_URL = http://www.lua.org/ PKG_LICENSE = MIT PKG_SUMMARY = Powerful light-weight programming language.
+PKG_BUILD_DEPS+= autoconf automake libtool PKG_DEPS += ncurses readline
define PKG_DESCRIPTION @@ -52,6 +53,7 @@ PKG_TARBALL = $(THISAPP).tar.gz define STAGE_PREPARE_CMDS cd $(DIR_APP) && chmod u+x autogen.sh config.guess config.sub configure \ depcomp install-sh missing + cd $(DIR_APP) && sh autogen.sh endef
define STAGE_BUILD @@ -61,8 +63,8 @@ define STAGE_BUILD --mandir=/usr/share/man \ --with-readline
- cd $(DIR_APP) && sed -e 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' \ - -e 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' -i libtool + $(DO_FIX_LIBTOOL) + # hack so that only /usr/bin/lua gets linked with readline as it is the # only one which needs this and otherwise we get License troubles cd $(DIR_APP) && make $(PARALLELISMFLAGS) LIBS="-ldl" luac_LDADD="liblua.la -lm -ldl" diff --git a/pkgs/core/perl/perl.nm b/pkgs/core/perl/perl.nm index c5275f1..344e291 100644 --- a/pkgs/core/perl/perl.nm +++ b/pkgs/core/perl/perl.nm @@ -50,11 +50,6 @@ endef
PKG_TARBALL = $(THISAPP).tar.gz
-define QUALITY_AGENT_WHITELIST_RPATH - /usr/lib/perl*/auto/Time/HiRes/HiRes.so - /usr/lib/perl*/auto/Compress/Raw/Zlib/Zlib.so -endef - define STAGE_PREPARE_CMDS cd $(DIR_APP) && sed -i 's/command /command[ -]/' makedepend.SH endef diff --git a/pkgs/core/xz/xz.nm b/pkgs/core/xz/xz.nm index 1e4b8f4..437c727 100644 --- a/pkgs/core/xz/xz.nm +++ b/pkgs/core/xz/xz.nm @@ -45,22 +45,3 @@ define PKG_DESCRIPTION endef
PKG_TARBALL = $(THISAPP).tar.gz - -define QUALITY_AGENT_WHITELIST_RPATH - /usr/bin/xz \ - /usr/bin/lzmadec \ - /usr/bin/xzdec -endef - -############################################################################### -# Installation Details -############################################################################### - -define STAGE_BUILD - cd $(DIR_APP) && \ - ./configure \ - --prefix=/usr \ - --disable-static - - cd $(DIR_APP) && make $(PARALLELISMFLAGS) -endef diff --git a/tools/common-functions b/tools/common-functions index f85dd5f..312ac0b 100644 --- a/tools/common-functions +++ b/tools/common-functions @@ -130,7 +130,7 @@ find_elf_files() {
for dir in ${dirs}; do for file in $(find ${dir} -type f 2>/dev/null); do - if is_elf ${file} && ! is_static ${file}; then + if is_elf ${file} && is_shared_object ${file} && ! is_static ${file}; then files="${files} ${file}" fi done @@ -145,3 +145,16 @@ listsort() { echo "${item}" done | sort -u | tr "\n" " " } + +listmatch() { + local arg=${1} + shift + + local item + for item in $@; do + if [ "${arg}" = "${item}" ]; then + return 0 + fi + done + return 1 +} diff --git a/tools/quality-agent.d/050-rpaths b/tools/quality-agent.d/050-rpaths index a5da540..fd43b28 100755 --- a/tools/quality-agent.d/050-rpaths +++ b/tools/quality-agent.d/050-rpaths @@ -8,18 +8,6 @@ DESC="Searching for RPATHs. We don't want paths that point to the tree where \ finds null paths."
check() { - for i in $QUALITY_AGENT_WHITELIST_RPATH; do - if [ -n "$FILTER" ]; then - FILTER="$FILTER|$i" - else - FILTER="$i" - fi - done - - if [ -n "$FILTER" ]; then - log_debug " Filter: $FILTER" - fi - local failed=0
local file @@ -31,7 +19,10 @@ check() {
rpath=$(get_rpath ${file}) if [ -n "${rpath}" ]; then - log_error " File has rpath: ${file} - ${rpath}" + if listmatch ${rpath} ${QUALITY_AGENT_WHITELIST_RPATH}; then + continue + fi + log_error " File has unallowed rpath: ${file} - ${rpath}" failed=1 fi done
hooks/post-receive -- IPFire 3.x development tree