[IPFire-SCM] [git.ipfire.org] IPFire 3.x development tree branch, master, updated. 428521817004bf3d54e12a8964d4bd18222d1f4c
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 428521817004bf3d54e12a8964d4bd18222d1f4c (commit) via b67b38c0b3c8535b9280554ce579d590af0f63e2 (commit) via 6f37f0acbbae24cf7695e59a31af36549037ebfd (commit) via 8a236dba67111f52c1ce836fa8835a901a500b27 (commit) via c5f9beee4fe2c7cea584273eeec930c588bf5564 (commit) via a44d05574e723e24a7bca0989a5137154cefbe7c (commit) via 90b1cf55ce6f79bd6a1e6b041dfa6801d0c60964 (commit) via c1d3da0f2e6ed6980e02a8c9dbbeed78b1e37c79 (commit) via 10ea9d90e678deac729ac49513a03d80c346d963 (commit) via 7699e7e2909edc17787928c75cf10bc6585e7b20 (commit) via 320b7b5537a052efd6ad074e6596ef55c717837f (commit) from 58d8a73ebc165b39a5a75e520fbd5a12c74f70a3 (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 428521817004bf3d54e12a8964d4bd18222d1f4c Author: Michael Tremer michael.tremer@ipfire.org Date: Thu Apr 8 14:40:43 2010 +0200
QA: Fix root-links-to-usr check.
commit b67b38c0b3c8535b9280554ce579d590af0f63e2 Merge: 6f37f0acbbae24cf7695e59a31af36549037ebfd 58d8a73ebc165b39a5a75e520fbd5a12c74f70a3 Author: Michael Tremer michael.tremer@ipfire.org Date: Thu Apr 8 14:35:21 2010 +0200
Merge branch 'master' of ssh://git.ipfire.org/pub/git/ipfire-3.x
commit 6f37f0acbbae24cf7695e59a31af36549037ebfd Merge: 8a236dba67111f52c1ce836fa8835a901a500b27 00fd1cf386eda3d1e5573f5f3451912c59d9bde8 Author: Michael Tremer michael.tremer@ipfire.org Date: Thu Apr 8 14:29:18 2010 +0200
Merge branch 'master' of ssh://git.ipfire.org/pub/git/ipfire-3.x
commit 8a236dba67111f52c1ce836fa8835a901a500b27 Author: Michael Tremer michael.tremer@ipfire.org Date: Thu Apr 8 14:29:04 2010 +0200
ghostscript: Disable parallel build.
commit c5f9beee4fe2c7cea584273eeec930c588bf5564 Author: Michael Tremer michael.tremer@ipfire.org Date: Thu Apr 8 14:28:37 2010 +0200
QA: Skip startfiles in relro check.
commit a44d05574e723e24a7bca0989a5137154cefbe7c Author: Michael Tremer michael.tremer@ipfire.org Date: Thu Apr 8 14:28:16 2010 +0200
QA: Skip startfiles in canary check.
commit 90b1cf55ce6f79bd6a1e6b041dfa6801d0c60964 Author: Michael Tremer michael.tremer@ipfire.org Date: Thu Apr 8 14:25:39 2010 +0200
naoki: Improve function that finds the elf files in buildroot.
Skip statically linked files.
commit c1d3da0f2e6ed6980e02a8c9dbbeed78b1e37c79 Merge: 10ea9d90e678deac729ac49513a03d80c346d963 50d91a124d7bba86a29109f565d4682d6b8a3f7f Author: Michael Tremer michael.tremer@ipfire.org Date: Thu Apr 8 11:40:00 2010 +0200
Merge branch 'master' of ssh://git.ipfire.org/pub/git/ipfire-3.x
commit 10ea9d90e678deac729ac49513a03d80c346d963 Merge: 7699e7e2909edc17787928c75cf10bc6585e7b20 036170af5332fb9530706ac9062e38d0fd8ae32f Author: Schantl Stefan Stevee@ipfire.org Date: Mon Apr 5 20:50:23 2010 +0200
Merge branch 'master' of ssh://git.ipfire.org/pub/git/ipfire-3.x into replace-openlldp-with-lldpd
Conflicts: pkgs/toolchain/binutils-static/patches
commit 7699e7e2909edc17787928c75cf10bc6585e7b20 Author: Schantl Stefan Stevee@ipfire.org Date: Sun Apr 4 22:02:27 2010 +0200
openlldp: Remove package.
commit 320b7b5537a052efd6ad074e6596ef55c717837f Author: Schantl Stefan Stevee@ipfire.org Date: Sun Apr 4 22:01:49 2010 +0200
lldpd: New package.
-----------------------------------------------------------------------
Summary of changes: pkgs/core/ghostscript/ghostscript.nm | 2 + .../{openlldp/openlldp.init => lldpd/lldpd.init} | 2 +- pkgs/core/{openlldp/openlldp.nm => lldpd/lldpd.nm} | 10 +++++--- tools/common-functions | 22 ++++++++++++++++++- tools/quality-agent.d/050-canary | 4 +++ tools/quality-agent.d/050-relro | 4 +++ tools/quality-agent.d/050-root-links-to-usr | 2 +- 7 files changed, 38 insertions(+), 8 deletions(-) rename pkgs/core/{openlldp/openlldp.init => lldpd/lldpd.init} (71%) rename pkgs/core/{openlldp/openlldp.nm => lldpd/lldpd.nm} (91%)
Difference in files: diff --git a/pkgs/core/ghostscript/ghostscript.nm b/pkgs/core/ghostscript/ghostscript.nm index 9721ec8..90ad764 100644 --- a/pkgs/core/ghostscript/ghostscript.nm +++ b/pkgs/core/ghostscript/ghostscript.nm @@ -56,6 +56,8 @@ PKG_TARBALL = $(THISAPP).tar.bz2 CONFIGURE_OPTIONS += \ --without-omni
+PARALLELISMFLAGS = # Disable this + define STAGE_INSTALL_CMDS chown -v root:root $(BUILDROOT)/usr/share/ghostscript/8.70/Resource/Font/* endef diff --git a/pkgs/core/lldpd/lldpd.init b/pkgs/core/lldpd/lldpd.init new file mode 100644 index 0000000..dcb92b1 --- /dev/null +++ b/pkgs/core/lldpd/lldpd.init @@ -0,0 +1,8 @@ +description "Starts the LLDP Daemon" +author "IPFire Team" + +start on started network +stop on stopping network + +exec /usr/sbin/lldpd +respawn diff --git a/pkgs/core/lldpd/lldpd.nm b/pkgs/core/lldpd/lldpd.nm new file mode 100644 index 0000000..2117fcb --- /dev/null +++ b/pkgs/core/lldpd/lldpd.nm @@ -0,0 +1,44 @@ +############################################################################### +# # +# IPFire.org - A linux based firewall # +# Copyright (C) 2007, 2008 Michael Tremer & Christian Schmidt # +# # +# This program is free software: you can redistribute it and/or modify # +# it under the terms of the GNU General Public License as published by # +# the Free Software Foundation, either version 3 of the License, or # +# (at your option) any later version. # +# # +# This program is distributed in the hope that it will be useful, # +# but WITHOUT ANY WARRANTY; without even the implied warranty of # +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # +# GNU General Public License for more details. # +# # +# You should have received a copy of the GNU General Public License # +# along with this program. If not, see http://www.gnu.org/licenses/. # +# # +############################################################################### + +############################################################################### +# Definitions +############################################################################### + +include $(PKGROOT)/Include + +PKG_NAME = lldpd +PKG_VER = 0.5.0 +PKG_REL = 0 + +PKG_MAINTAINER = +PKG_GROUP = Networking/Tools +PKG_URL = https://trac.luffy.cx/lldpd/ +PKG_LICENSE = GPL +PKG_SUMMARY = Utilities for the Link Layer Discovery Protocol. + +PKG_DEPS += net-snmp + +define PKG_DESCRIPTION + The LLDPD project aims to provide a comprehensive implementation of \ + the IEEE standard 802.1AB Link Layer Discovery Protocol. +endef + +PKG_TARBALL = $(THISAPP).tar.gz diff --git a/pkgs/core/openlldp/openlldp.init b/pkgs/core/openlldp/openlldp.init deleted file mode 100644 index 3e3114f..0000000 --- a/pkgs/core/openlldp/openlldp.init +++ /dev/null @@ -1,8 +0,0 @@ -description "Starts the OpenLLDP Daemon" -author "IPFire Team" - -start on started network -stop on stopping network - -exec /usr/sbin/lldpd -respawn diff --git a/pkgs/core/openlldp/openlldp.nm b/pkgs/core/openlldp/openlldp.nm deleted file mode 100644 index ff43180..0000000 --- a/pkgs/core/openlldp/openlldp.nm +++ /dev/null @@ -1,42 +0,0 @@ -############################################################################### -# # -# IPFire.org - A linux based firewall # -# Copyright (C) 2007, 2008 Michael Tremer & Christian Schmidt # -# # -# This program is free software: you can redistribute it and/or modify # -# it under the terms of the GNU General Public License as published by # -# the Free Software Foundation, either version 3 of the License, or # -# (at your option) any later version. # -# # -# This program is distributed in the hope that it will be useful, # -# but WITHOUT ANY WARRANTY; without even the implied warranty of # -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # -# GNU General Public License for more details. # -# # -# You should have received a copy of the GNU General Public License # -# along with this program. If not, see http://www.gnu.org/licenses/. # -# # -############################################################################### - -############################################################################### -# Definitions -############################################################################### - -include $(PKGROOT)/Include - -PKG_NAME = openlldp -PKG_VER = 0.3alpha -PKG_REL = 0 - -PKG_MAINTAINER = -PKG_GROUP = Networking/Tools -PKG_URL = http://openlldp.sourceforge.net/ -PKG_LICENSE = GPL -PKG_SUMMARY = Utilities for the Link Layer Discovery Protocol. - -define PKG_DESCRIPTION - The OpenLLDP project aims to provide a comprehensive implementation of \ - the IEEE standard 802.1AB Link Layer Discovery Protocol. -endef - -PKG_TARBALL = $(THISAPP).tar.gz diff --git a/tools/common-functions b/tools/common-functions index e3c8928..f85dd5f 100644 --- a/tools/common-functions +++ b/tools/common-functions @@ -29,6 +29,12 @@ has_nx() { [ $? != 0 ] }
+is_elf() { + local file=${1} + + file ${file} | grep -q "ELF" +} + is_relro_partly() { local file=${1}
@@ -51,6 +57,12 @@ is_shared_object() { file ${file} | grep -q "shared object" }
+is_static() { + local file=${1} + + file ${file} | grep -q "statically linked" +} + get_interpreter() { local file=${1}
@@ -79,6 +91,12 @@ get_soname() { tr -d "[]" | awk '{ print $NF }' }
+filter_startfiles() { + local file=${1} + + grep -qE "crt[1in].o$" <<<${file} +} + find_requires() { local output local file @@ -111,8 +129,8 @@ find_elf_files() { local files
for dir in ${dirs}; do - for file in $(find ${dir} -maxdepth 1 -type f 2>/dev/null); do - if file ${file} | grep -q "ELF"; then + for file in $(find ${dir} -type f 2>/dev/null); do + if is_elf ${file} && ! is_static ${file}; then files="${files} ${file}" fi done diff --git a/tools/quality-agent.d/050-canary b/tools/quality-agent.d/050-canary index 57c7fad..7fde31c 100755 --- a/tools/quality-agent.d/050-canary +++ b/tools/quality-agent.d/050-canary @@ -9,6 +9,10 @@ function check() {
local file for file in $(find_elf_files ${BINARY_PATHS}); do + if filter_startfiles ${file}; then + continue + fi + if ! has_canary ${file}; then log_warning " Has no canary: ${file}" failed=1 diff --git a/tools/quality-agent.d/050-relro b/tools/quality-agent.d/050-relro index f11c07e..061a001 100755 --- a/tools/quality-agent.d/050-relro +++ b/tools/quality-agent.d/050-relro @@ -12,6 +12,10 @@ function check() {
local file for file in $(find_elf_files ${BINARY_PATHS}); do + if filter_startfiles ${file}; then + continue + fi + if ! is_relro_full ${file}; then log_error " Is not full relro: ${file}" failed=1 diff --git a/tools/quality-agent.d/050-root-links-to-usr b/tools/quality-agent.d/050-root-links-to-usr index 0027ff3..fb7877f 100755 --- a/tools/quality-agent.d/050-root-links-to-usr +++ b/tools/quality-agent.d/050-root-links-to-usr @@ -9,7 +9,7 @@ for file in ${BUILDROOT}/{bin,lib,sbin}/*; do log " ${file}"
interpreter=$(get_interpreter ${file}) - if [ ! -e "${BUILDROOT}${interpreter}" ]; then + if [ ! -e "${interpreter}" ]; then log " SKIPPED because interpreter is not available" continue fi
hooks/post-receive -- IPFire 3.x development tree
-
git＠ipfire.org