keyutils: Bump version to 1.5.9, fix patches and static build
PATCH 1/1 keyutils: Bump version to 1.5.9, fix patches and static build
- Bump version to 1.5.9
- Remove patches already included in this version
- Use make parameters instead of environment variables
- Add an upstream patch to fix building statically
- Adapt old patches to the new version
Fixes:
http://autobuild.buildroot.net/results/ced/ced596bd1c73286f7044f5a8e11b6588fc973f11/
---
...ng-of-the-shared-library-to-be-suppressed.patch | 104 ++++++++++++++++++++
.../keyutils-01-memleak-from-realloc.patch | 51 ----------
package/keyutils/keyutils-02-another-memleak.patch | 32 ------
...le.patch => keyutils-02-fix-install-rule.patch} | 13 ++-
.../keyutils-04-Makefile-for-buildroot.patch | 64 ++----------
package/keyutils/keyutils.mk | 24 +++--
6 files changed, 135 insertions(+), 153 deletions(-)
create mode 100644 package/keyutils/keyutils-01-allow-building-of-the-shared-library-to-be-suppressed.patch
delete mode 100644 package/keyutils/keyutils-01-memleak-from-realloc.patch
delete mode 100644 package/keyutils/keyutils-02-another-memleak.patch
rename package/keyutils/{keyutils-05-fix-install-rule.patch => keyutils-02-fix-install-rule.patch} (57%)package/keyutils/keyutils-01-allow-building-of-the-shared-library-to-be-suppressed.patch new file +104 -0
@@ -0,0 +1,104 @@ +keyutils: Allow building of the shared library to be suppressed + +Upstream patch: + https://kernel.googlesource.com/pub/scm/linux/kernel/git/dhowells/keyutils/+/a4deb71ddc05e951c8be8d46615beed9d408a5c8 + +Signed-off-by: Vicente Olivert Riera <[email protected]> + +LIB: Allow building of the shared library to be suppressed + +Allow building of the shared library to be suppressed by passing NO_SOLIB=1 to +the Makefile. + +Reported-and-tested-by: Vicente Olivert Riera <[email protected]> +Signed-off-by: David Howells <[email protected]> +diff --git a/Makefile b/Makefile +index c904eaf..5dd2113 100644 +--- a/Makefile ++++ b/Makefile +@@ -5,6 +5,7 @@ + SPECFILE := keyutils.spec + NO_GLIBC_KEYERR := 0 + NO_ARLIB := 0 ++NO_SOLIB := 0 + ETCDIR := /etc + BINDIR := /bin + SBINDIR := /sbin +@@ -95,7 +96,7 @@ + # Normal build rule + # + ############################################################################### +-all: $(DEVELLIB) keyctl request-key key.dns_resolver ++all: keyctl request-key key.dns_resolver + + ############################################################################### + # +@@ -104,20 +105,23 @@ + ############################################################################### + #RPATH = -Wl,-rpath,$(LIBDIR) + +-ifeq ($(NO_ARLIB),0) +-all: $(ARLIB) +-$(ARLIB): keyutils.o +- $(AR) rcs $@ $< +-endif +- + VCPPFLAGS := -DPKGBUILD="\"$(shell date -u +%F)\"" + VCPPFLAGS += -DPKGVERSION="\"keyutils-$(VERSION)\"" + VCPPFLAGS += -DAPIVERSION="\"libkeyutils-$(APIVERSION)\"" + ++ifeq ($(NO_ARLIB),0) ++all: $(ARLIB) ++$(ARLIB): keyutils.o ++ $(AR) rcs $@ $< ++ + keyutils.o: keyutils.c keyutils.h Makefile + $(CC) $(CPPFLAGS) $(VCPPFLAGS) $(CFLAGS) -UNO_GLIBC_KEYERR -o $@ -c $< ++LIB_DEPENDENCY := libkeyutils.a ++endif + + ++ifeq ($(NO_SOLIB),0) ++all: $(DEVELLIB) + $(DEVELLIB): $(SONAME) + ln -sf $< $@ + +@@ -131,6 +135,8 @@ + + keyutils.os: keyutils.c keyutils.h Makefile + $(CC) $(CPPFLAGS) $(VCPPFLAGS) $(CFLAGS) -fPIC -o $@ -c $< ++LIB_DEPENDENCY := $(DEVELLIB) ++endif + + ############################################################################### + # +@@ -140,13 +146,13 @@ + %.o: %.c keyutils.h Makefile + $(CC) $(CPPFLAGS) $(CFLAGS) -o $@ -c $< + +-keyctl: keyctl.o $(DEVELLIB) ++keyctl: keyctl.o $(LIB_DEPENDENCY) + $(CC) -L. $(CFLAGS) $(LDFLAGS) $(RPATH) -o $@ $< -lkeyutils + +-request-key: request-key.o $(DEVELLIB) ++request-key: request-key.o $(LIB_DEPENDENCY) + $(CC) -L. $(CFLAGS) $(LDFLAGS) $(RPATH) -o $@ $< -lkeyutils + +-key.dns_resolver: key.dns_resolver.o $(DEVELLIB) ++key.dns_resolver: key.dns_resolver.o $(LIB_DEPENDENCY) + $(CC) -L. $(CFLAGS) $(LDFLAGS) $(RPATH) -o $@ $< -lkeyutils -lresolv + + ############################################################################### +@@ -158,10 +164,12 @@ + ifeq ($(NO_ARLIB),0) + $(INSTALL) -D -m 0644 $(ARLIB) $(DESTDIR)$(USRLIBDIR)/$(ARLIB) + endif ++ifeq ($(NO_SOLIB),0) + $(INSTALL) -D $(LIBNAME) $(DESTDIR)$(LIBDIR)/$(LIBNAME) + $(LNS) $(LIBNAME) $(DESTDIR)$(LIBDIR)/$(SONAME) + mkdir -p $(DESTDIR)$(USRLIBDIR) + $(LNS) $(LIBDIR)/$(SONAME) $(DESTDIR)$(USRLIBDIR)/$(DEVELLIB) ++endif + $(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
package/keyutils/keyutils-01-memleak-from-realloc.patch deleted +0 -51
51 lines not on this page · raw message
package/keyutils/keyutils-02-another-memleak.patch deleted +0 -32
@@ -1,32 +0,0 @@ -Patch vampirised from Debian's packaging of keyutils-1.4 - -Author: Michael Gebetsroither <[email protected]> -Description: Fixed another memleak (Closes: #496466). - -diff -Naurp keyutils.orig/keyutils.c keyutils/keyutils.c ---- keyutils.orig/keyutils.c 2008-08-09 21:46:52.000000000 +0200 -+++ keyutils/keyutils.c 2008-08-25 13:38:25.000000000 +0200 -@@ -187,8 +187,10 @@ int keyctl_describe_alloc(key_serial_t i - - for (;;) { - ret = keyctl_describe(id, buf, buflen); -- if (ret < 0) -+ if (ret < 0) { -+ free(buf); - return -1; -+ } - - if (buflen >= ret) - break; -@@ -226,8 +228,10 @@ int keyctl_read_alloc(key_serial_t id, v - - for (;;) { - ret = keyctl_read(id, buf, buflen); -- if (ret < 0) -+ if (ret < 0) { -+ free(buf); - return -1; -+ } - - if (buflen >= ret) - break;
package/keyutils/keyutils-02-fix-install-rule.patch renamed from package/keyutils/keyutils-05-fix-install-rule.patch +7 -6
@@ -3,17 +3,18 @@ Makefile: fix install rule Do not link the .so with an absolute path, otherwise it may point to the host library. -Signed-off-by: "Yann E. MORIN" <[email protected]> +Based on the former patch by Yann E. MORIN. -diff -durN keyutils-1.5.5.orig/Makefile keyutils-1.5.5/Makefile ---- keyutils-1.5.5.orig/Makefile 2012-10-22 20:11:57.188548033 +0200 -+++ keyutils-1.5.5/Makefile 2012-10-22 20:14:40.868236838 +0200 -@@ -127,7 +127,7 @@ +Signed-off-by: Vicente Olivert Riera <[email protected]> + +--- keyutils-1.5.9/Makefile.orig 2014-09-22 16:13:41.593562765 +0100 ++++ keyutils-1.5.9/Makefile 2014-09-22 16:14:05.377963952 +0100 +@@ -168,7 +168,7 @@ ifeq ($(NO_SOLIB),0) $(INSTALL) -D $(LIBNAME) $(DESTDIR)$(LIBDIR)/$(LIBNAME) $(LNS) $(LIBNAME) $(DESTDIR)$(LIBDIR)/$(SONAME) mkdir -p $(DESTDIR)$(USRLIBDIR) - $(LNS) $(LIBDIR)/$(SONAME) $(DESTDIR)$(USRLIBDIR)/$(DEVELLIB) + $(LNS) $(SONAME) $(DESTDIR)$(USRLIBDIR)/$(DEVELLIB) + endif $(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
package/keyutils/keyutils-04-Makefile-for-buildroot.patch +9 -55
67 lines not on this page · raw message
package/keyutils/keyutils.mk +15 -9
@@ -4,29 +4,35 @@ # ################################################################################ -KEYUTILS_VERSION = 1.5.5 +KEYUTILS_VERSION = 1.5.9 KEYUTILS_SOURCE = keyutils-$(KEYUTILS_VERSION).tar.bz2 KEYUTILS_SITE = http://people.redhat.com/~dhowells/keyutils KEYUTILS_LICENSE = GPLv2+ LGPLv2.1+ KEYUTILS_LICENSE_FILES = LICENCE.GPL LICENCE.LGPL KEYUTILS_INSTALL_STAGING = YES -KEYUTILS_MAKE_ENV = \ - INSTALL=$(INSTALL) \ - LIBDIR=/usr/lib \ - USRLIBDIR=/usr/lib \ - LN=$(HOSTLN) \ +KEYUTILS_MAKE_PARAMS = \ + INSTALL=$(INSTALL) \ + LIBDIR=/usr/lib \ + USRLIBDIR=/usr/lib \ + CFLAGS="$(TARGET_CFLAGS)" \ + CPPFLAGS="$(TARGET_CPPFLAGS)" \ + LNS="$(HOSTLN) -sf" + +ifeq ($(BR2_PREFER_STATIC_LIB),y) +KEYUTILS_MAKE_PARAMS += NO_SOLIB=1 +endif define KEYUTILS_BUILD_CMDS - $(KEYUTILS_MAKE_ENV) $(TARGET_CONFIGURE_OPTS) $(MAKE) -C $(@D) + $(TARGET_CONFIGURE_OPTS) $(MAKE) $(KEYUTILS_MAKE_PARAMS) -C $(@D) endef define KEYUTILS_INSTALL_STAGING_CMDS - $(KEYUTILS_MAKE_ENV) $(MAKE) -C $(@D) DESTDIR=$(STAGING_DIR) install + $(MAKE) $(KEYUTILS_MAKE_PARAMS) -C $(@D) DESTDIR=$(STAGING_DIR) install endef define KEYUTILS_INSTALL_TARGET_CMDS - $(KEYUTILS_MAKE_ENV) $(MAKE) -C $(@D) DESTDIR=$(TARGET_DIR) install + $(MAKE) $(KEYUTILS_MAKE_PARAMS) -C $(@D) DESTDIR=$(TARGET_DIR) install endef $(eval $(generic-package))
Signature · 1 line
1.7.1
PATCH 1/1 keyutils: Bump version to 1.5.9, fix patches and static build
Dear Vicente Olivert Riera,
Quoted 10 lines · Vicente Olivert Riera
- Bump version to 1.5.9
- Remove patches already included in this version
- Use make parameters instead of environment variables
- Add an upstream patch to fix building statically
- Adapt old patches to the new versionFixes:
http://autobuild.buildroot.net/results/ced/ced596bd1c73286f7044f5a8e11b6588fc973f11/Signed-off-by Vicente Olivert Riera <[email protected]>
Quoted 12 lines
---
...ng-of-the-shared-library-to-be-suppressed.patch | 104 ++++++++++++++++++++
.../keyutils-01-memleak-from-realloc.patch | 51 ----------
package/keyutils/keyutils-02-another-memleak.patch | 32 ------
...le.patch => keyutils-02-fix-install-rule.patch} | 13 ++-
.../keyutils-04-Makefile-for-buildroot.patch | 64 ++----------
package/keyutils/keyutils.mk | 24 +++--
6 files changed, 135 insertions(+), 153 deletions(-)
create mode 100644 package/keyutils/keyutils-01-allow-building-of-the-shared-library-to-be-suppressed.patch
delete mode 100644 package/keyutils/keyutils-01-memleak-from-realloc.patch
delete mode 100644 package/keyutils/keyutils-02-another-memleak.patch
rename package/keyutils/{keyutils-05-fix-install-rule.patch => keyutils-02-fix-install-rule.patch} (57%)This fails to build with:
/home/thomas/projets/buildroot/output/host/usr/bin/arm-linux-gcc -L. -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -pipe -Os -o keyctl keyctl.o -lkeyutils /home/thomas/projets/buildroot/output/host/usr/bin/arm-linux-gcc -L. -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -pipe -Os -o request-key request-key.o -lkeyutils
key.dns_resolver.c:55:22: fatal error: keyutils.h: No such file or directory
#include <keyutils.h>
While it builds fine before your patch.
Thanks,
Thomas
Signature · 3 lines
Thomas Petazzoni, CTO, Free Electrons Embedded Linux, Kernel and Android engineering http://free-electrons.com
PATCH 1/1 keyutils: Bump version to 1.5.9, fix patches and static build
Quoted 6 lines · Thomas Petazzoni
This fails to build with:
/home/thomas/projets/buildroot/output/host/usr/bin/arm-linux-gcc -L. -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -pipe -Os -o keyctl keyctl.o -lkeyutils /home/thomas/projets/buildroot/output/host/usr/bin/arm-linux-gcc -L. -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -pipe -Os -o request-key request-key.o -lkeyutilskey.dns_resolver.c:55:22: fatal error:
keyutils.h: No such file or directory
#include <keyutils.h>
Thanks Thomas,
patch v2 sent with this problem fixed and also including a hash file.
Regards,
Signature · 1 line
Vincent