diff options
| author | Daniel Golle <daniel@makrotopia.org> | 2020-12-14 16:34:08 +0000 |
|---|---|---|
| committer | Daniel Golle <dangowrt@users.noreply.github.com> | 2020-12-14 22:15:05 +0000 |
| commit | 84be677313f527d154f1190c0c0f91c0b8857530 (patch) | |
| tree | f22877557e891da96f28458934a160aac0bc7479 | |
| parent | f520c5058586be4e66af987e430f2d66cadbacff (diff) | |
keyutils: update to 1.6.3 and improve packaging
* switch to kernel.org upstream (most recent versions seem to be
available only there)
* package request-key, key.dns_resolver and their config file into
new package 'keyutils'
* refresh patches
Signed-off-by: Daniel Golle <daniel@makrotopia.org>
| -rw-r--r-- | libs/keyutils/Makefile | 28 | ||||
| -rw-r--r-- | libs/keyutils/patches/010-reproducible-build.patch | 2 | ||||
| -rw-r--r-- | libs/keyutils/patches/020-rindex.patch | 2 |
3 files changed, 25 insertions, 7 deletions
diff --git a/libs/keyutils/Makefile b/libs/keyutils/Makefile index f7186e989..dee1755ab 100644 --- a/libs/keyutils/Makefile +++ b/libs/keyutils/Makefile @@ -6,12 +6,12 @@ include $(TOPDIR)/rules.mk PKG_NAME:=keyutils -PKG_VERSION:=1.6.1 -PKG_RELEASE:=2 +PKG_VERSION:=1.6.3 +PKG_RELEASE:=1 -PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 -PKG_SOURCE_URL:=https://people.redhat.com/dhowells/keyutils/ -PKG_HASH:=c8b15722ae51d95b9ad76cc6d49a4c2cc19b0c60f72f61fb9bf43eea7cbd64ce +PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz +PKG_SOURCE_URL:=https://git.kernel.org/pub/scm/linux/kernel/git/dhowells/keyutils.git/snapshot/ +PKG_HASH:=a61d5706136ae4c05bd48f86186bcfdbd88dd8bd5107e3e195c924cfc1b39bb4 PKG_INSTALL:=1 PKG_BUILD_PARALLEL:=1 @@ -38,6 +38,16 @@ define Package/keyctl LICENSE_FILES:=LICENSE.GPL endef +define Package/keyutils + SECTION:=utils + CATEGORY:=Utilities + SUBMENU:=Encryption + TITLE:=keyutils (request-key and key.dns_resolver) + DEPENDS:=+libkeyutils + LICENSE:=GPL-2.0-or-later + LICENSE_FILES:=LICENSE.GPL +endef + define Package/keyutils/description Key utilities endef @@ -61,10 +71,18 @@ define Package/libkeyutils/install $(CP) $(PKG_INSTALL_DIR)/usr/lib/libkeyutils.so.$(ABI_VERSION)* $(1)/usr/lib/ endef +define Package/keyutils/install + $(INSTALL_DIR) $(1)/usr/sbin $(1)/etc/keyutils $(1)/etc/request-key.d + $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/request-key $(1)/usr/sbin/ + $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/key.dns_resolver $(1)/usr/sbin/ + $(INSTALL_CONF) $(PKG_INSTALL_DIR)/etc/request-key.conf $(1)/etc/ +endef + define Package/keyctl/install $(INSTALL_DIR) $(1)/usr/bin $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/keyctl $(1)/usr/bin endef $(eval $(call BuildPackage,libkeyutils)) +$(eval $(call BuildPackage,keyutils)) $(eval $(call BuildPackage,keyctl)) diff --git a/libs/keyutils/patches/010-reproducible-build.patch b/libs/keyutils/patches/010-reproducible-build.patch index 3cf9b544c..0507f9127 100644 --- a/libs/keyutils/patches/010-reproducible-build.patch +++ b/libs/keyutils/patches/010-reproducible-build.patch @@ -1,6 +1,6 @@ --- a/Makefile +++ b/Makefile -@@ -108,7 +108,7 @@ all: keyctl request-key key.dns_resolver +@@ -109,7 +109,7 @@ all: keyctl request-key key.dns_resolver ############################################################################### #RPATH = -Wl,-rpath,$(LIBDIR) diff --git a/libs/keyutils/patches/020-rindex.patch b/libs/keyutils/patches/020-rindex.patch index 11cf6c09c..513751839 100644 --- a/libs/keyutils/patches/020-rindex.patch +++ b/libs/keyutils/patches/020-rindex.patch @@ -1,6 +1,6 @@ --- a/key.dns_resolver.c +++ b/key.dns_resolver.c -@@ -529,12 +529,12 @@ int main(int argc, char *argv[]) +@@ -717,12 +717,12 @@ int main(int argc, char *argv[]) keyend = buf + ktlen + 1; /* the actual key description follows the last semicolon */ |