Difuse/packages
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

keyutils: Update to 1.6

Browse source 
Add keyctl binary, which can be used to add fscrypt support to ext4 and
other filesystems that support it.

Signed-off-by: Rosen Penev <rosenp@gmail.com>
This commit is contained in:
Rosen Penev 2019-01-17 14:43:04 -08:00
parent c7426b1823
commit 16b2c67a9c
3 changed files with 19 additions and 39 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
libs/keyutils/Makefile
View file

@ -6,14 +6,12 @@
include $(TOPDIR)/rules.mk include $(TOPDIR)/rules.mk
PKG_NAME:=keyutils PKG_NAME:=keyutils
PKG_VERSION:=1.5.10 PKG_VERSION:=1.6
PKG_RELEASE:=1 PKG_RELEASE:=1
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
PKG_SOURCE_URL:=http://people.redhat.com/dhowells/keyutils/ PKG_SOURCE_URL:=https://people.redhat.com/dhowells/keyutils/
PKG_HASH:=115c3deae7f181778fd0e0ffaa2dad1bf1fe2f5677cf2e0e348cdb7a1c93afb6 PKG_HASH:=d3aef20cec0005c0fa6b4be40079885567473185b1a57b629b030e67942c7115
PKG_FIXUP:=libtool
include $(INCLUDE_DIR)/package.mk include $(INCLUDE_DIR)/package.mk
@ -21,11 +19,19 @@ define Package/libkeyutils
SECTION:=libs SECTION:=libs
CATEGORY:=Libraries CATEGORY:=Libraries
TITLE:=Key utilities library TITLE:=Key utilities library
URL:=http://people.redhat.com/dhowells/keyutils/ URL:=https://people.redhat.com/dhowells/keyutils/
endef
define Package/keyctl
SECTION:=utils
CATEGORY:=Utilities
SUBMENU:=Encryption
TITLE:=keyctl
DEPENDS:=+libkeyutils
endef endef
define Package/keyutils/description define Package/keyutils/description
Key utilities library Key utilities
endef endef
define Build/Install define Build/Install
@ -44,4 +50,10 @@ define Package/libkeyutils/install
$(CP) $(PKG_INSTALL_DIR)/usr/lib/libkeyutils.so* $(1)/usr/lib/ $(CP) $(PKG_INSTALL_DIR)/usr/lib/libkeyutils.so* $(1)/usr/lib/
endef endef
define Package/keyctl/install
$(INSTALL_DIR) $(1)/bin
$(INSTALL_BIN) $(PKG_INSTALL_DIR)/bin/keyctl $(1)/bin
endef
$(eval $(call BuildPackage,libkeyutils)) $(eval $(call BuildPackage,libkeyutils))
$(eval $(call BuildPackage,keyctl))

13
libs/keyutils/patches/03-cifs.patch
View file

@ -1,13 +0,0 @@
Author: Marcus Meissner <meissner@suse.de>
Description: Added 2 cifs helpers to request-key.conf (for CIFS DFS support)
diff -Naurp keyutils.orig/request-key.conf keyutils/request-key.conf
--- keyutils.orig/request-key.conf 2011-08-22 11:46:30.332025250 +0200
+++ keyutils/request-key.conf 2011-08-22 11:49:40.096967441 +0200
@@ -38,4 +38,6 @@ create user debug:* expired
create user debug:* revoked /bin/keyctl reject %k 30 %c %S
create user debug:loop:* * |/bin/cat
create user debug:* * /usr/share/keyutils/request-key-debug.sh %k %d %c %S
+create cifs.spnego * * /usr/sbin/cifs.upcall -c %k
+create dns_resolver * * /usr/sbin/cifs.upcall %k
negate * * * /bin/keyctl negate %k 30 %S

19
libs/keyutils/patches/04-cflags.patch
View file

@ -1,19 +0,0 @@
Author: Nobuhiro Iwamatsu <iwamatsu@debian.org>
Description: Avoid setting Intel Architecture specific CFLAGS (Closes: #638925).
diff -Naurp keyutils.orig/Makefile keyutils/Makefile
--- keyutils.orig/Makefile 2011-08-22 11:51:20.521464216 +0200
+++ keyutils/Makefile 2011-08-24 19:17:09.855361713 +0200
@@ -56,12 +56,10 @@ BUILDFOR := $(shell file /usr/bin/make |
LNS := ln -sf
ifeq ($(BUILDFOR),32-bit)
-CFLAGS += -m32
LIBDIR := /lib
USRLIBDIR := /usr/lib
else
ifeq ($(BUILDFOR),64-bit)
-CFLAGS += -m64
LIBDIR := /lib64
USRLIBDIR := /usr/lib64
endif