From 8372b84f0df2e586c9f0b27ab27b9c33d69315e5 Mon Sep 17 00:00:00 2001 From: Hannu Nyman Date: Sat, 10 Nov 2018 17:22:36 +0200 Subject: [PATCH] Revert "keyutils: Update to 1.5.11" This reverts commit 41f2036afe67bb7aecf9395d74b77b04c30064bf. Signed-off-by: Hannu Nyman --- libs/keyutils/Makefile | 5 ++--- libs/keyutils/patches/04-cflags.patch | 14 ++++++++------ 2 files changed, 10 insertions(+), 9 deletions(-) diff --git a/libs/keyutils/Makefile b/libs/keyutils/Makefile index d7d3e9835..91b5ca8c3 100644 --- a/libs/keyutils/Makefile +++ b/libs/keyutils/Makefile @@ -6,12 +6,12 @@ include $(TOPDIR)/rules.mk PKG_NAME:=keyutils -PKG_VERSION:=1.5.11 +PKG_VERSION:=1.5.10 PKG_RELEASE:=1 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 PKG_SOURCE_URL:=http://people.redhat.com/dhowells/keyutils/ -PKG_HASH:=11584488206edc30736263eb855bf7793f16e661987241d333d3cb5ea479b1b5 +PKG_HASH:=115c3deae7f181778fd0e0ffaa2dad1bf1fe2f5677cf2e0e348cdb7a1c93afb6 PKG_FIXUP:=libtool @@ -21,7 +21,6 @@ define Package/libkeyutils SECTION:=libs CATEGORY:=Libraries TITLE:=Key utilities library - DEPENDS:=+krb5 URL:=http://people.redhat.com/dhowells/keyutils/ endef diff --git a/libs/keyutils/patches/04-cflags.patch b/libs/keyutils/patches/04-cflags.patch index 67d31fc61..44f4baa76 100644 --- a/libs/keyutils/patches/04-cflags.patch +++ b/libs/keyutils/patches/04-cflags.patch @@ -1,10 +1,12 @@ -diff --git a/Makefile b/Makefile -index 5ce6746..c25c0c5 100644 ---- a/Makefile -+++ b/Makefile -@@ -66,12 +66,10 @@ BUILDFOR := $(shell file /usr/bin/make | sed -e 's!.*ELF \(32\|64\)-bit.*!\1!')- +Author: Nobuhiro Iwamatsu +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 ($(origin CFLAGS),undefined) ifeq ($(BUILDFOR),32-bit) -CFLAGS += -m32 LIBDIR := /lib