From 5c60cc78dcd1df2df961ac275d4e1f5ce6da555e Mon Sep 17 00:00:00 2001 From: Rosen Penev Date: Wed, 12 Aug 2020 13:00:52 -0700 Subject: [PATCH] keyutils: fix deprecated function usage Signed-off-by: Rosen Penev --- libs/keyutils/Makefile | 2 +- libs/keyutils/patches/020-rindex.patch | 17 +++++++++++++++++ 2 files changed, 18 insertions(+), 1 deletion(-) create mode 100644 libs/keyutils/patches/020-rindex.patch diff --git a/libs/keyutils/Makefile b/libs/keyutils/Makefile index 7c8390e0e2..f7186e989b 100644 --- a/libs/keyutils/Makefile +++ b/libs/keyutils/Makefile @@ -7,7 +7,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=keyutils PKG_VERSION:=1.6.1 -PKG_RELEASE:=1 +PKG_RELEASE:=2 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 PKG_SOURCE_URL:=https://people.redhat.com/dhowells/keyutils/ diff --git a/libs/keyutils/patches/020-rindex.patch b/libs/keyutils/patches/020-rindex.patch new file mode 100644 index 0000000000..11cf6c09c7 --- /dev/null +++ b/libs/keyutils/patches/020-rindex.patch @@ -0,0 +1,17 @@ +--- a/key.dns_resolver.c ++++ b/key.dns_resolver.c +@@ -529,12 +529,12 @@ int main(int argc, char *argv[]) + keyend = buf + ktlen + 1; + + /* the actual key description follows the last semicolon */ +- keyend = rindex(keyend, ';'); ++ keyend = strrchr(keyend, ';'); + if (!keyend) + error("Invalid key description: %s", buf); + keyend++; + +- name = index(keyend, ':'); ++ name = strchr(keyend, ':'); + if (!name) + dns_query_a_or_aaaa(keyend, callout_info); + -- 2.30.2