Browse Source

Merge pull request #6973 from neheb/p11

libp11: Update to 0.4.9
lilik-openwrt-22.03
Hannu Nyman 6 years ago
committed by GitHub
parent
commit
2c65634748
No known key found for this signature in database GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 11 additions and 10 deletions
  1. +6
    -5
      libs/libp11/Makefile
  2. +5
    -5
      libs/libp11/patches/001-fix-install.patch

+ 6
- 5
libs/libp11/Makefile View File

@ -8,17 +8,18 @@
include $(TOPDIR)/rules.mk include $(TOPDIR)/rules.mk
PKG_NAME:=libp11 PKG_NAME:=libp11
PKG_VERSION:=0.4.7
PKG_VERSION:=0.4.9
PKG_RELEASE:=1 PKG_RELEASE:=1
PKG_HASH:=32e486d4279e09174b63eb263bc840016ebfa80b0b154390c0539b211aec0452
PKG_SOURCE_URL:=https://github.com/OpenSC/libp11/releases/download/$(PKG_NAME)-$(PKG_VERSION)/
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
PKG_HASH:=9d1c76d74c21ca224f96204982097ebc6b956f645b2b0b5f9c502a20e9ffcfd8
PKG_MAINTAINER:=Daniel Golle <daniel@makrotopia.org> PKG_MAINTAINER:=Daniel Golle <daniel@makrotopia.org>
PKG_LICENSE:=LGPL-2.1+ PKG_LICENSE:=LGPL-2.1+
PKG_LICENSE_FILES:=COPYING PKG_LICENSE_FILES:=COPYING
PKG_SOURCE_URL:=https://github.com/OpenSC/libp11/releases/download/$(PKG_NAME)-$(PKG_VERSION)/
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
PKG_BUILD_PARALLEL:=1
PKG_FIXUP:=libtool PKG_FIXUP:=libtool
PKG_INSTALL:=1 PKG_INSTALL:=1


+ 5
- 5
libs/libp11/patches/001-fix-install.patch View File

@ -1,6 +1,6 @@
--- a/src/Makefile.am --- a/src/Makefile.am
+++ b/src/Makefile.am +++ b/src/Makefile.am
@@ -47,13 +47,6 @@ pkcs11_la_LIBADD = $(libp11_la_OBJECTS)
@@ -49,13 +49,6 @@ pkcs11_la_LIBADD = $(libp11_la_OBJECTS) $(OPENSSL_LIBS)
pkcs11_la_LDFLAGS = $(AM_LDFLAGS) -module -shared -shrext $(SHARED_EXT) \ pkcs11_la_LDFLAGS = $(AM_LDFLAGS) -module -shared -shrext $(SHARED_EXT) \
-avoid-version -export-symbols "$(srcdir)/pkcs11.exports" -avoid-version -export-symbols "$(srcdir)/pkcs11.exports"
@ -16,7 +16,7 @@
mylibdir=$(libdir) mylibdir=$(libdir)
--- a/src/Makefile.in --- a/src/Makefile.in
+++ b/src/Makefile.in +++ b/src/Makefile.in
@@ -844,7 +844,7 @@ distdir: $(DISTFILES)
@@ -872,7 +872,7 @@ distdir: $(DISTFILES)
fi; \ fi; \
done done
check-am: all-am check-am: all-am
@ -25,7 +25,7 @@
check: check-am check: check-am
all-am: Makefile $(LTLIBRARIES) $(DATA) $(HEADERS) config.h all-am: Makefile $(LTLIBRARIES) $(DATA) $(HEADERS) config.h
installdirs: installdirs:
@@ -915,7 +915,7 @@ install-dvi-am:
@@ -944,7 +944,7 @@ install-dvi-am:
install-exec-am: install-enginesexecLTLIBRARIES install-libLTLIBRARIES install-exec-am: install-enginesexecLTLIBRARIES install-libLTLIBRARIES
@$(NORMAL_INSTALL) @$(NORMAL_INSTALL)
@ -34,7 +34,7 @@
install-html: install-html-am install-html: install-html-am
install-html-am: install-html-am:
@@ -960,7 +960,7 @@ uninstall-am: uninstall-enginesexecLTLIB
@@ -989,7 +989,7 @@ uninstall-am: uninstall-enginesexecLTLIBRARIES \
.MAKE: all check-am install-am install-exec-am install-strip .MAKE: all check-am install-am install-exec-am install-strip
@ -43,7 +43,7 @@
clean-enginesexecLTLIBRARIES clean-generic \ clean-enginesexecLTLIBRARIES clean-generic \
clean-libLTLIBRARIES clean-libtool cscopelist-am ctags \ clean-libLTLIBRARIES clean-libtool cscopelist-am ctags \
ctags-am distclean distclean-compile distclean-generic \ ctags-am distclean distclean-compile distclean-generic \
@@ -968,7 +968,7 @@ uninstall-am: uninstall-enginesexecLTLIB
@@ -997,7 +997,7 @@ uninstall-am: uninstall-enginesexecLTLIBRARIES \
dvi-am html html-am info info-am install install-am \ dvi-am html html-am info info-am install install-am \
install-data install-data-am install-dvi install-dvi-am \ install-data install-data-am install-dvi install-dvi-am \
install-enginesexecLTLIBRARIES install-exec install-exec-am \ install-enginesexecLTLIBRARIES install-exec install-exec-am \


Loading…
Cancel
Save