keyutils: fix deprecated function usage

Signed-off-by: Rosen Penev <rosenp@gmail.com>

diff --git a/libs/keyutils/Makefile b/libs/keyutils/Makefile
index 7c8390e0e206868daaa94dd54118db4658f3b98d..f7186e989bd969b7bdb09002c4c19b8791ced183 100644 (file)
--- 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 (file)
index 0000000..11cf6c0
--- /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);
+