================================ libcap:source=2.16-0.0.1 (previous: 1.10-9) cvc rdiff libcap -1 /conary.rpath.com@rpl:devel//2-devel//weasel.rpath.org@wgl:3-devel/2.16-0.0.1 ================================ 2.16-0.0.1 Filip Brcic (brcha@xxxxxxx) Tue Jul 28 17:56:21 2009 Automatic commit by rbuild libcap.recipe: changed Index: libcap.recipe ==================================================================== contents(size sha1) inode(mtime owner group) libcap-2.16.tar.bz2: new libcap-2.16-build_fix-1.patch: new --- /dev/null +++ libcap-2.16-build_fix-1.patch @@ -0,0 +133 @@ +Submitted By: Jim Gifford (jim at cross-lfs dot org) +Date: 04-27-2009 +Initial Package Version: 2.16 +Origin: Gentoo +Upstream Status: Unknown +Description: Removes uneeded libraries. + Also disables tests that prevent DESTDIR working. + +diff -Naur libcap-2.16.orig/libcap/Makefile libcap-2.16/libcap/Makefile +--- libcap-2.16.orig/libcap/Makefile 2008-12-03 23:03:12.000000000 -0800 ++++ libcap-2.16/libcap/Makefile 2009-04-27 14:13:16.000000000 -0700 +@@ -16,7 +16,7 @@ + # no support). + ifeq ($(LIBATTR),yes) + FILES += cap_file +-LDFLAGS += -lattr ++LDLIBS += -lattr + endif + + INCLS=libcap.h cap_names.h $(INCS) +@@ -24,6 +24,7 @@ + MAJLIBNAME=$(LIBNAME).$(VERSION) + MINLIBNAME=$(MAJLIBNAME).$(MINOR) + GPERF_OUTPUT = _caps_output.gperf ++CFLAGS += -fPIC + + all: $(MINLIBNAME) $(STALIBNAME) + +@@ -33,7 +34,7 @@ + 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 @@ + $(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 -Naur libcap-2.16.orig/Make.Rules libcap-2.16/Make.Rules +--- libcap-2.16.orig/Make.Rules 2008-12-03 23:03:30.000000000 -0800 ++++ libcap-2.16/Make.Rules 2009-04-27 14:13:16.000000000 -0700 +@@ -42,27 +42,27 @@ + + # 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 ?= $(CFLAGS) ++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 -Naur libcap-2.16.orig/pam_cap/Makefile libcap-2.16/pam_cap/Makefile +--- libcap-2.16.orig/pam_cap/Makefile 2008-10-16 21:31:01.000000000 -0700 ++++ libcap-2.16/pam_cap/Makefile 2009-04-27 14:13:16.000000000 -0700 +@@ -14,13 +14,13 @@ + 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) + + 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 -Naur libcap-2.16.orig/progs/Makefile libcap-2.16/progs/Makefile +--- libcap-2.16.orig/progs/Makefile 2008-11-23 21:33:33.000000000 -0800 ++++ libcap-2.16/progs/Makefile 2009-04-27 14:13:16.000000000 -0700 +@@ -22,7 +22,7 @@ + $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $< $(LDLIBS) + + %.o: %.c $(INCS) +- $(CC) $(CFLAGS) -c $< -o $@ ++ $(CC) $(CFLAGS) $(CPPFLAGS) -c $< -o $@ + + install: all + mkdir -p -m 0755 $(SBINDIR) libcap-1.10-25.src.rpm: removed Committed by: brcha