diff options
Diffstat (limited to 'package/keyutils')
| -rw-r--r-- | package/keyutils/Makefile | 7 | ||||
| -rw-r--r-- | package/keyutils/patches/patch-Makefile | 114 |
2 files changed, 71 insertions, 50 deletions
diff --git a/package/keyutils/Makefile b/package/keyutils/Makefile index e13e8ee27..e54bdc7c1 100644 --- a/package/keyutils/Makefile +++ b/package/keyutils/Makefile @@ -4,10 +4,10 @@ include $(TOPDIR)/rules.mk PKG_NAME:= keyutils -PKG_VERSION:= 1.5.3 +PKG_VERSION:= 1.5.9 PKG_RELEASE:= 1 -PKG_MD5SUM:= 4c89b350eab1c361af8cb5343961056a -PKG_DESCR:= set of utilities for managing the key retention facility in the kernel +PKG_MD5SUM:= 7f8ac985c45086b5fbcd12cecd23cf07 +PKG_DESCR:= utilities for managing the key retention facility PKG_SECTION:= libs PKG_SITES:= http://people.redhat.com/dhowells/keyutils/ PKG_OPTS:= dev @@ -19,7 +19,6 @@ include $(TOPDIR)/mk/package.mk $(eval $(call PKG_template,KEYUTILS,keyutils,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS})) CONFIG_STYLE:= manual -INSTALL_TARGET:= libinstall keyutils-install: $(INSTALL_DIR) $(IDIR_KEYUTILS)/usr/lib diff --git a/package/keyutils/patches/patch-Makefile b/package/keyutils/patches/patch-Makefile index 1b44e0730..5355e7f26 100644 --- a/package/keyutils/patches/patch-Makefile +++ b/package/keyutils/patches/patch-Makefile @@ -1,27 +1,32 @@ ---- keyutils-1.5.3.orig/Makefile 2011-08-11 15:24:09.000000000 +0200 -+++ keyutils-1.5.3/Makefile 2011-09-26 03:06:03.669381901 +0200 +--- keyutils-1.5.9.orig/Makefile 2014-02-21 16:18:24.000000000 +0100 ++++ keyutils-1.5.9/Makefile 2014-05-06 13:48:58.025306027 +0200 @@ -1,5 +1,5 @@ - CPPFLAGS := -I. --CFLAGS := $(CPPFLAGS) -g -Wall -Werror -+CFLAGS ?= $(CPPFLAGS) -g -Wall -Werror +-CPPFLAGS := -I. +-CFLAGS := -g -Wall -Werror ++CPPFLAGS ?= -I. ++CFLAGS ?= -g -Wall -Werror INSTALL := install DESTDIR := SPECFILE := keyutils.spec -@@ -49,24 +49,11 @@ LIBNAME := libkeyutils.so.$(APIVERSION) +@@ -54,29 +54,8 @@ LIBNAME := libkeyutils.so.$(APIVERSION) # Guess at the appropriate lib directory and word size # ############################################################################### +-ifeq ($(origin LIBDIR),undefined) -LIBDIR := $(shell ldd /usr/bin/make | grep '\(/libc\)' | sed -e 's!.*\(/.*\)/libc[.].*!\1!') -+LIBDIR := /usr/lib - USRLIBDIR := $(patsubst /lib/%,/usr/lib/%,$(LIBDIR)) +-endif +-ifeq ($(origin USRLIBDIR),undefined) +-USRLIBDIR := $(patsubst /lib/%,/usr/lib/%,$(LIBDIR)) +-endif -BUILDFOR := $(shell file /usr/bin/make | sed -e 's!.*ELF \(32\|64\)-bit.*!\1!')-bit - - LNS := ln -sf - +- +-LNS := ln -sf +- +-ifeq ($(origin CFLAGS),undefined) -ifeq ($(BUILDFOR),32-bit) -CFLAGS += -m32 -LIBDIR := /lib --USRLIBDIR := /usr/lib + USRLIBDIR := /usr/lib -else -ifeq ($(BUILDFOR),64-bit) -CFLAGS += -m64 @@ -29,11 +34,12 @@ -USRLIBDIR := /usr/lib64 -endif -endif -- +-endif ++LNS := ln -sf + ############################################################################### # - # This is necessary if glibc doesn't know about the key management error codes -@@ -84,7 +71,7 @@ endif +@@ -95,7 +74,7 @@ endif # Normal build rule # ############################################################################### @@ -42,43 +48,59 @@ ############################################################################### # -@@ -125,13 +112,13 @@ keyutils.os: keyutils.c keyutils.h Makef - %.o: %.c keyutils.h Makefile - $(CC) $(CPPFLAGS) $(CFLAGS) -o $@ -c $< - --keyctl: keyctl.o -lkeyutils -+keyctl: keyctl.o - $(CC) -L. $(CFLAGS) $(LDFLAGS) $(RPATH) -o $@ $< -lkeyutils - --request-key: request-key.o -lkeyutils -+request-key: request-key.o - $(CC) -L. $(CFLAGS) $(LDFLAGS) $(RPATH) -o $@ $< -lkeyutils - --key.dns_resolver: key.dns_resolver.o -lkeyutils -+key.dns_resolver: key.dns_resolver.o - $(CC) -L. $(CFLAGS) $(LDFLAGS) $(RPATH) -o $@ $< -lkeyutils -lresolv - - ############################################################################### -@@ -139,6 +126,13 @@ key.dns_resolver: key.dns_resolver.o -lk - # Install everything - # +@@ -156,38 +135,15 @@ key.dns_resolver: key.dns_resolver.o $(D ############################################################################### -+libinstall: -+ $(INSTALL) -d $(DESTDIR)$(LIBDIR) -+ $(INSTALL) $(LIBNAME) $(DESTDIR)$(LIBDIR)/$(LIBNAME) -+ $(LNS) $(LIBNAME) $(DESTDIR)$(LIBDIR)/$(SONAME) -+ $(INSTALL) -d $(DESTDIR)$(INCLUDEDIR) -+ $(INSTALL) -m 0644 keyutils.h $(DESTDIR)$(INCLUDEDIR)/keyutils.h -+ install: all ifeq ($(NO_ARLIB),0) - $(INSTALL) -D -m 0644 $(ARLIB) $(DESTDIR)$(USRLIBDIR)/$(ARLIB) -@@ -205,7 +199,7 @@ distclean: clean - TARBALL := keyutils-$(VERSION).tar.bz2 +- $(INSTALL) -D -m 0644 $(ARLIB) $(DESTDIR)$(USRLIBDIR)/$(ARLIB) ++ $(INSTALL) -d $(DESTDIR)$(USRLIBDIR) ++ $(INSTALL) -m 0644 $(ARLIB) $(DESTDIR)$(USRLIBDIR)/$(ARLIB) + endif +- $(INSTALL) -D $(LIBNAME) $(DESTDIR)$(LIBDIR)/$(LIBNAME) +- $(LNS) $(LIBNAME) $(DESTDIR)$(LIBDIR)/$(SONAME) +- mkdir -p $(DESTDIR)$(USRLIBDIR) +- $(LNS) $(LIBDIR)/$(SONAME) $(DESTDIR)$(USRLIBDIR)/$(DEVELLIB) +- $(INSTALL) -D keyctl $(DESTDIR)$(BINDIR)/keyctl +- $(INSTALL) -D request-key $(DESTDIR)$(SBINDIR)/request-key +- $(INSTALL) -D request-key-debug.sh $(DESTDIR)$(SHAREDIR)/request-key-debug.sh +- $(INSTALL) -D key.dns_resolver $(DESTDIR)$(SBINDIR)/key.dns_resolver +- $(INSTALL) -D -m 0644 request-key.conf $(DESTDIR)$(ETCDIR)/request-key.conf +- mkdir -p $(DESTDIR)$(ETCDIR)/request-key.d +- mkdir -p $(DESTDIR)$(MAN1) +- $(INSTALL) -m 0644 $(wildcard man/*.1) $(DESTDIR)$(MAN1) +- mkdir -p $(DESTDIR)$(MAN3) +- $(INSTALL) -m 0644 $(wildcard man/*.3) $(DESTDIR)$(MAN3) +- mkdir -p $(DESTDIR)$(MAN5) +- $(INSTALL) -m 0644 $(wildcard man/*.5) $(DESTDIR)$(MAN5) +- mkdir -p $(DESTDIR)$(MAN7) +- $(INSTALL) -m 0644 $(wildcard man/*.7) $(DESTDIR)$(MAN7) +- mkdir -p $(DESTDIR)$(MAN8) +- $(INSTALL) -m 0644 $(wildcard man/*.8) $(DESTDIR)$(MAN8) +- $(LNS) keyctl_describe.3 $(DESTDIR)$(MAN3)/keyctl_describe_alloc.3 +- $(LNS) keyctl_get_security.3 $(DESTDIR)$(MAN3)/keyctl_get_security_alloc.3 +- $(LNS) keyctl_instantiate.3 $(DESTDIR)$(MAN3)/keyctl_instantiate_iov.3 +- $(LNS) keyctl_instantiate.3 $(DESTDIR)$(MAN3)/keyctl_reject.3 +- $(LNS) keyctl_instantiate.3 $(DESTDIR)$(MAN3)/keyctl_negate.3 +- $(LNS) keyctl_instantiate.3 $(DESTDIR)$(MAN3)/keyctl_assume_authority.3 +- $(LNS) keyctl_link.3 $(DESTDIR)$(MAN3)/keyctl_unlink.3 +- $(LNS) keyctl_read.3 $(DESTDIR)$(MAN3)/keyctl_read_alloc.3 +- $(LNS) recursive_key_scan.3 $(DESTDIR)$(MAN3)/recursive_session_key_scan.3 +- $(INSTALL) -D -m 0644 keyutils.h $(DESTDIR)$(INCLUDEDIR)/keyutils.h ++ $(INSTALL) -d $(DESTDIR)$(USRLIBDIR) ++ $(INSTALL) $(LIBNAME) $(DESTDIR)$(USRLIBDIR)/$(LIBNAME) ++ $(LNS) $(LIBNAME) $(DESTDIR)$(USRLIBDIR)/$(SONAME) ++ $(LNS) $(USRLIBDIR)/$(SONAME) $(DESTDIR)$(USRLIBDIR)/$(DEVELLIB) ++ $(INSTALL) -d $(DESTDIR)$(INCLUDEDIR) ++ $(INSTALL) -m 0644 keyutils.h $(DESTDIR)$(INCLUDEDIR)/keyutils.h + + ############################################################################### + # +@@ -231,7 +187,7 @@ tarball: $(ZTARBALL) SRCBALL := rpmbuild/SOURCES/$(TARBALL) + BUILDID := .local -dist := $(word 2,$(shell grep "%dist" /etc/rpm/macros.dist)) +dist := OpenADK release := $(word 2,$(shell grep ^Release: $(SPECFILE))) release := $(subst %{?dist},$(dist),$(release)) - rpmver := $(VERSION)-$(release) + release := $(subst %{?buildid},$(BUILDID),$(release)) |