Browse Source

Merge pull request #7242 from neheb/key

keyutils: Update to 1.5.11
lilik-openwrt-22.03
Hannu Nyman 6 years ago
committed by GitHub
parent
commit
5571751282
No known key found for this signature in database GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 9 additions and 10 deletions
  1. +3
    -2
      libs/keyutils/Makefile
  2. +6
    -8
      libs/keyutils/patches/04-cflags.patch

+ 3
- 2
libs/keyutils/Makefile View File

@ -6,12 +6,12 @@
include $(TOPDIR)/rules.mk include $(TOPDIR)/rules.mk
PKG_NAME:=keyutils PKG_NAME:=keyutils
PKG_VERSION:=1.5.10
PKG_VERSION:=1.5.11
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:=http://people.redhat.com/dhowells/keyutils/
PKG_HASH:=115c3deae7f181778fd0e0ffaa2dad1bf1fe2f5677cf2e0e348cdb7a1c93afb6
PKG_HASH:=11584488206edc30736263eb855bf7793f16e661987241d333d3cb5ea479b1b5
PKG_FIXUP:=libtool PKG_FIXUP:=libtool
@ -21,6 +21,7 @@ define Package/libkeyutils
SECTION:=libs SECTION:=libs
CATEGORY:=Libraries CATEGORY:=Libraries
TITLE:=Key utilities library TITLE:=Key utilities library
DEPENDS:=+krb5
URL:=http://people.redhat.com/dhowells/keyutils/ URL:=http://people.redhat.com/dhowells/keyutils/
endef endef


+ 6
- 8
libs/keyutils/patches/04-cflags.patch View File

@ -1,12 +1,10 @@
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
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!')-
ifeq ($(origin CFLAGS),undefined)
ifeq ($(BUILDFOR),32-bit) ifeq ($(BUILDFOR),32-bit)
-CFLAGS += -m32 -CFLAGS += -m32
LIBDIR := /lib LIBDIR := /lib


Loading…
Cancel
Save