[IPFire-SCM] [git.ipfire.org] IPFire 3.x development tree branch, master, updated. 00fd1cf386eda3d1e5573f5f3451912c59d9bde8 - IPFire-SCM

8 Apr 2010

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  00fd1cf386eda3d1e5573f5f3451912c59d9bde8 (commit)
       via  7d6d578884cac8188e1c2cfa5ca33a710f24957d (commit)
       via  e55b5393df0887df91e24310c435400e207c01cb (commit)
       via  60d2f6f0da9df5f4cc5187731cef675936612c32 (commit)
      from  50d91a124d7bba86a29109f565d4682d6b8a3f7f (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 00fd1cf386eda3d1e5573f5f3451912c59d9bde8
Merge: 7d6d578884cac8188e1c2cfa5ca33a710f24957d 50d91a124d7bba86a29109f565d4682d6b8a3f7f
Author: Michael Tremer michael.tremer@ipfire.org
Date:   Thu Apr 8 14:21:50 2010 +0200
Merge branch 'master' of ssh://git.ipfire.org/pub/git/ipfire-3.x
commit 7d6d578884cac8188e1c2cfa5ca33a710f24957d
Author: Michael Tremer michael.tremer@ipfire.org
Date:   Thu Apr 8 14:19:49 2010 +0200
QA: Make canary check only report a warning.
commit e55b5393df0887df91e24310c435400e207c01cb
Author: Michael Tremer michael.tremer@ipfire.org
Date:   Thu Apr 8 14:19:13 2010 +0200
libcap: Update to 2.19.
commit 60d2f6f0da9df5f4cc5187731cef675936612c32
Author: Michael Tremer michael.tremer@ipfire.org
Date:   Thu Apr 8 12:41:20 2010 +0200
libcap: Fix permissions of libary files.
-----------------------------------------------------------------------
Summary of changes:
 pkgs/core/libcap/libcap.nm                         |   18 +--
 .../patches/libcap-2.16-build-system-fixes.patch   |  154 ++++++++++++++++++++
 tools/quality-agent.d/050-canary                   |    5 +-
 tools/quality-agent.d/qa-include                   |    5 +
 4 files changed, 168 insertions(+), 14 deletions(-)
 create mode 100644 pkgs/core/libcap/patches/libcap-2.16-build-system-fixes.patch
Difference in files:

diff --git a/pkgs/core/libcap/libcap.nm b/pkgs/core/libcap/libcap.nm
index 334ccff..4f5008d 100644
--- a/pkgs/core/libcap/libcap.nm
+++ b/pkgs/core/libcap/libcap.nm
@@ -25,7 +25,7 @@
 include $(PKGROOT)/Include
PKG_NAME       = libcap
-PKG_VER        = 2.16
+PKG_VER        = 2.19
 PKG_REL        = 0
PKG_MAINTAINER =
@@ -43,20 +43,10 @@ endef
PKG_DEPS      += attr pam
-PKG_TARBALL    = $(THISAPP).tar.bz2
-
-###############################################################################
-# Installation Details
-###############################################################################
-
-define STAGE_PREPARE_CMDS
-	cd $(DIR_APP) && sed -e "s@<stdlib.h>@&\n#include <asm/types.h>@g" \
-		-i progs/capsh.c
-	cd $(DIR_APP) && sed 's/--static//' -i.orig progs/Makefile
-endef
+PKG_TARBALL    = $(THISAPP).tar.gz
define STAGE_BUILD
-	cd $(DIR_APP) && make $(PARALLELISMFLAGS) CC="gcc $(CFLAGS)"
+	cd $(DIR_APP) && make DYNAMIC=yes LIBATTR=yes
 endef
define STAGE_INSTALL
@@ -65,4 +55,6 @@ define STAGE_INSTALL
    rm -vf $(BUILDROOT)/lib/libcap.so
    -mkdir -pv $(BUILDROOT)/usr/lib
    ln -svf ../../lib/libcap.so.2 $(BUILDROOT)/usr/lib/libcap.so
+
+	chmod 755 $(BUILDROOT)/lib/libcap.so.$(PKG_VER)
 endef
diff --git a/pkgs/core/libcap/patches/libcap-2.16-build-system-fixes.patch b/pkgs/core/libcap/patches/libcap-2.16-build-system-fixes.patch
new file mode 100644
index 0000000..e82975b
--- /dev/null
+++ b/pkgs/core/libcap/patches/libcap-2.16-build-system-fixes.patch
@@ -0,0 +1,154 @@
+From 7ee197885e113878aedab58bdda80302e42aff4c Mon Sep 17 00:00:00 2001
+From: Mike Frysinger vapier@gentoo.org
+Date: Sun, 16 Nov 2008 09:10:31 -0500
+Subject: [PATCH] build system fixes
+
+This touches up the homebrewed build system to work much better "out of the
+box" for people.  Specifically:
+	- allow toolchain vars to be set via environment
+		- CC / BUILD_CC / AR / RANLIB
+		- CFLAGS / CPPFLAGS / LDFLAGS
+	- split CPPFLAGS out of CFLAGS
+	- break -fPIC out of global CFLAGS and only use where needed
+	- use LDLIBS for libraries, not LDFLAGS
+
+Signed-off-by: Mike Frysinger vapier@gentoo.org
+---
+ Make.Rules       |   28 ++++++++++++++--------------
+ libcap/Makefile  |   11 ++++++-----
+ pam_cap/Makefile |    6 +++---
+ progs/Makefile   |    2 +-
+ 4 files changed, 24 insertions(+), 23 deletions(-)
+
+diff --git a/Make.Rules b/Make.Rules
+index 6e63a5b..32cb5ea 100644
+--- a/Make.Rules
++++ b/Make.Rules
+@@ -42,27 +42,27 @@ MINOR=16
+ 
+ # Compilation specifics
+ 
+-KERNEL_HEADERS := $(topdir)/libcap/include
+-IPATH += -I$(topdir)/libcap/include -I$(KERNEL_HEADERS)
+-
+-CC := gcc
+-CFLAGS := -O2
+-BUILD_CC := $(CC)
+-BUILD_CFLAGS := $(CFLAGS) $(IPATH)
+-AR := ar
+-RANLIB := ranlib
+-DEBUG = -g #-DDEBUG
+-WARNINGS=-fPIC -Wall -Wwrite-strings \
++CC ?= gcc
++BUILD_CC ?= $(CC)
++AR ?= ar
++RANLIB ?= ranlib
++CFLAGS ?= -O2
++BUILD_CFLAGS ?= -O2 -pipe
++WARNINGS=-Wall -Wwrite-strings \
+         -Wpointer-arith -Wcast-qual -Wcast-align \
+         -Wstrict-prototypes -Wmissing-prototypes \
+         -Wnested-externs -Winline -Wshadow
+ LD=$(CC) -Wl,-x -shared
+-LDFLAGS := #-g
++LDFLAGS ?= #-g
+ 
+-SYSTEM_HEADERS = /usr/include
++KERNEL_HEADERS = $(topdir)/libcap/include
++LIBCAP_CPPFLAGS = -I$(topdir)/libcap/include -I$(KERNEL_HEADERS)
++CPPFLAGS += $(LIBCAP_CPPFLAGS)
++BUILD_CPPFLAGS += $(LIBCAP_CPPFLAGS)
+ INCS=$(topdir)/libcap/include/sys/capability.h
+ LDFLAGS += -L$(topdir)/libcap
+-CFLAGS += -Dlinux $(WARNINGS) $(DEBUG) $(IPATH)
++CPPFLAGS += -Dlinux
++CFLAGS += $(WARNINGS)
+ PAM_CAP := $(shell if [ -f /usr/include/security/pam_modules.h ]; then echo yes ; else echo no ; fi)
+ INDENT := $(shell if [ -n "$(which indent 2>/dev/null)" ]; then echo "| indent -kr" ; fi)
+ DYNAMIC := $(shell if [ ! -d "$(topdir)/.git" ]; then echo yes; fi)
+diff --git a/libcap/Makefile b/libcap/Makefile
+index 8a61752..cf99523 100644
+--- a/libcap/Makefile
++++ b/libcap/Makefile
+@@ -16,7 +16,7 @@ FILES=cap_alloc cap_proc cap_extint cap_flag cap_text
+ # no support).
+ ifeq ($(LIBATTR),yes)
+ FILES += cap_file
+-LDFLAGS += -lattr
++LDLIBS += -lattr
+ endif
+ 
+ INCLS=libcap.h cap_names.h $(INCS)
+@@ -24,6 +24,7 @@ OBJS=$(addsuffix .o, $(FILES))
+ MAJLIBNAME=$(LIBNAME).$(VERSION)
+ MINLIBNAME=$(MAJLIBNAME).$(MINOR)
+ GPERF_OUTPUT = _caps_output.gperf
++CFLAGS += -fPIC
+ 
+ all: $(MINLIBNAME) $(STALIBNAME)
+ 
+@@ -33,7 +34,7 @@ INCLUDE_GPERF_OUTPUT = -include $(GPERF_OUTPUT)
+ endif
+ 
+ _makenames: _makenames.c cap_names.list.h
+-	$(BUILD_CC) $(BUILD_CFLAGS) $< -o $@
++	$(BUILD_CC) $(BUILD_CFLAGS) $(BUILD_CPPFLAGS) $< -o $@
+ 
+ cap_names.h: _makenames
+ 	./_makenames > cap_names.h
+@@ -50,15 +51,15 @@ $(STALIBNAME): $(OBJS)
+ 	$(RANLIB) $@
+ 
+ $(MINLIBNAME): $(OBJS)
+-	$(LD) $(CFLAGS) $(LDFLAGS) -Wl,-soname,$(MAJLIBNAME) -o $@ $^
++	$(LD) $(CFLAGS) $(LDFLAGS) -Wl,-soname,$(MAJLIBNAME) -o $@ $^ $(LDLIBS)
+ 	ln -sf $(MINLIBNAME) $(MAJLIBNAME)
+ 	ln -sf $(MAJLIBNAME) $(LIBNAME)
+ 
+ %.o: %.c $(INCLS)
+-	$(CC) $(CFLAGS) -c $< -o $@
++	$(CC) $(CFLAGS) $(CPPFLAGS) -c $< -o $@
+ 
+ cap_text.o: cap_text.c $(USE_GPERF_OUTPUT) $(INCLS)
+-	$(CC) $(CFLAGS) $(INCLUDE_GPERF_OUTPUT) -c $< -o $@
++	$(CC) $(CFLAGS) $(CPPFLAGS) $(INCLUDE_GPERF_OUTPUT) -c $< -o $@
+ 
+ install: all
+ 	mkdir -p -m 0755 $(INCDIR)/sys
+diff --git a/pam_cap/Makefile b/pam_cap/Makefile
+index eae88ed..bef59d2 100644
+--- a/pam_cap/Makefile
++++ b/pam_cap/Makefile
+@@ -14,13 +14,13 @@ install: all
+ 	install -m 0755 pam_cap.so $(LIBDIR)/security
+ 
+ pam_cap.so: pam_cap.o
+-	$(LD) $(LDFLAGS) -o pam_cap.so $< $(LDLIBS)
++	$(LD) $(CFLAGS) $(LDFLAGS) -o pam_cap.so $< $(LDLIBS) -lpam
+ 
+ pam_cap.o: pam_cap.c
+-	$(CC) $(CFLAGS) -c $< -o $@
++	$(CC) $(CFLAGS) $(CPPFLAGS) -c $< -o $@
+ 
+ testcompile: test.c pam_cap.o
+-	$(CC) $(CFLAGS) $(LDFLAGS) -o $@ $+ -lpam -ldl $(LDLIBS)
++	$(CC) $(CFLAGS) $(CPPFLAGS) $(LDFLAGS) -o $@ $+ -lpam -ldl $(LDLIBS)
+ 
+ clean:
+ 	rm -f *.o *.so testcompile *~
+diff --git a/progs/Makefile b/progs/Makefile
+index a1542dc..612cf86 100644
+--- a/progs/Makefile
++++ b/progs/Makefile
+@@ -22,7 +22,7 @@ $(BUILD): %: %.o
+ 	$(CC) $(CFLAGS) $(LDFLAGS) -o $@ $< $(LDLIBS)
+ 
+ %.o: %.c $(INCS)
+-	$(CC) $(CFLAGS) -c $< -o $@
++	$(CC) $(CFLAGS) $(CPPFLAGS) -c $< -o $@
+ 
+ install: all
+ 	mkdir -p -m 0755 $(SBINDIR)
+-- 
+1.6.0.4
+
diff --git a/tools/quality-agent.d/050-canary b/tools/quality-agent.d/050-canary
index 9841d5a..57c7fad 100755
--- a/tools/quality-agent.d/050-canary
+++ b/tools/quality-agent.d/050-canary
@@ -10,11 +10,14 @@ function check() {
    local file
    for file in $(find_elf_files ${BINARY_PATHS}); do
    	if ! has_canary ${file}; then
-			log_error "  Has no canary: ${file}"
+			log_warning "  Has no canary: ${file}"
    		failed=1
    	fi
    done
+	# This is currently disabled and will only return a warning !
+	failed=0
+
    return ${failed}
 }
diff --git a/tools/quality-agent.d/qa-include b/tools/quality-agent.d/qa-include
index 1644a91..9c88798 100644
--- a/tools/quality-agent.d/qa-include
+++ b/tools/quality-agent.d/qa-include
@@ -26,6 +26,10 @@ function log_info() {
    log "INFO" "$@"
 }
+function log_warning() {
+	log "WARNING" "$@"
+}
+
 if [ -z "${BUILDROOT}" ]; then
    echo "${0##*/}: ERROR: BUILDROOT is not set." >&2
    exit 1
@@ -75,6 +79,7 @@ function run() {
    error_message=$(check)
    ret=$?
+	[ -z "${error_message}" ] && \
    [ "${ret}" = "0" ] && return 0
print_description
hooks/post-receive
--
IPFire 3.x development tree

    