Daniel Golle
2025-07-04 18:56:34 +01:00
committed by Tianling Shen
parent ee2c220047
commit 9f52621180
2 changed files with 29 additions and 20 deletions

View File

@@ -8,12 +8,12 @@
include $(TOPDIR)/rules.mk include $(TOPDIR)/rules.mk
PKG_NAME:=libp11 PKG_NAME:=libp11
PKG_VERSION:=0.4.13 PKG_VERSION:=0.4.16
PKG_RELEASE:=1 PKG_RELEASE:=1
PKG_SOURCE_URL:=https://github.com/OpenSC/libp11/releases/download/$(PKG_NAME)-$(PKG_VERSION)/ PKG_SOURCE_URL:=https://github.com/OpenSC/libp11/releases/download/$(PKG_NAME)-$(PKG_VERSION)/
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
PKG_HASH:=d25dd9cff1b623e12d51b6d2c100e26063582d25c9a6f57c99d41f2da9567086 PKG_HASH:=97777640492fa9e5831497e5892e291dfbf39a7b119d9cb6abb3ec8c56d17553
PKG_MAINTAINER:=Daniel Golle <daniel@makrotopia.org> PKG_MAINTAINER:=Daniel Golle <daniel@makrotopia.org>
PKG_LICENSE:=LGPL-2.1-or-later PKG_LICENSE:=LGPL-2.1-or-later

View File

@@ -1,8 +1,8 @@
--- a/src/Makefile.am --- a/src/Makefile.am
+++ b/src/Makefile.am +++ b/src/Makefile.am
@@ -56,13 +56,6 @@ libpkcs11_la_SOURCES = $(pkcs11_la_SOURC @@ -66,16 +66,6 @@ libpkcs11_la_CFLAGS = $(pkcs11_la_CFLAGS
libpkcs11_la_CFLAGS = $(pkcs11_la_CFLAGS)
libpkcs11_la_LIBADD = $(pkcs11_la_LIBADD) libpkcs11_la_LIBADD = $(pkcs11_la_LIBADD)
endif
-# OpenSSL older than 1.1.0 expected libpkcs11.so instead of pkcs11.so -# OpenSSL older than 1.1.0 expected libpkcs11.so instead of pkcs11.so
-check-local: $(LTLIBRARIES) -check-local: $(LTLIBRARIES)
@@ -10,13 +10,16 @@
- -
-install-exec-hook: -install-exec-hook:
- cd '$(DESTDIR)$(enginesexecdir)' && $(LN_S) -f pkcs11$(SHARED_EXT) libpkcs11$(SHARED_EXT) - cd '$(DESTDIR)$(enginesexecdir)' && $(LN_S) -f pkcs11$(SHARED_EXT) libpkcs11$(SHARED_EXT)
-if LIBP11_OSSL_PROVIDER
- cd '$(DESTDIR)$(providersexecdir)' && $(LN_S) -f pkcs11prov$(SHARED_EXT) libpkcs11$(SHARED_EXT)
-endif
- -
if WIN32 if WIN32
# def file required for MS users to build library # def file required for MS users to build library
mylibdir=$(libdir) mylibdir=$(libdir)
--- a/src/Makefile.in --- a/src/Makefile.in
+++ b/src/Makefile.in +++ b/src/Makefile.in
@@ -965,7 +965,7 @@ distdir-am: $(DISTFILES) @@ -1057,7 +1057,7 @@ distdir-am: $(DISTFILES)
fi; \ fi; \
done done
check-am: all-am check-am: all-am
@@ -25,29 +28,35 @@
check: check-am check: check-am
all-am: Makefile $(LTLIBRARIES) $(DATA) $(HEADERS) config.h all-am: Makefile $(LTLIBRARIES) $(DATA) $(HEADERS) config.h
install-enginesexecLTLIBRARIES: install-libLTLIBRARIES install-enginesexecLTLIBRARIES: install-libLTLIBRARIES
@@ -1060,7 +1060,7 @@ install-dvi-am: @@ -1158,7 +1158,7 @@ install-dvi-am:
install-exec-am: install-enginesexecLTLIBRARIES install-libLTLIBRARIES \
install-exec-am: install-enginesexecLTLIBRARIES install-libLTLIBRARIES install-providersexecLTLIBRARIES
@$(NORMAL_INSTALL) @$(NORMAL_INSTALL)
- $(MAKE) $(AM_MAKEFLAGS) install-exec-hook - $(MAKE) $(AM_MAKEFLAGS) install-exec-hook
+ $(MAKE) $(AM_MAKEFLAGS) + $(MAKE) $(AM_MAKEFLAGS)
install-html: install-html-am install-html: install-html-am
install-html-am: install-html-am:
@@ -1127,14 +1127,14 @@ uninstall-am: uninstall-enginesexecLTLIB @@ -1228,7 +1228,7 @@ uninstall-am: uninstall-enginesexecLTLIB
.MAKE: all check-am install-am install-exec-am install-strip .MAKE: all check-am install-am install-exec-am install-strip
.PHONY: CTAGS GTAGS TAGS all all-am am--depfiles check check-am \ .PHONY: CTAGS GTAGS TAGS all all-am am--depfiles check check-am \
- check-local clean clean-enginesexecLTLIBRARIES clean-generic \ - check-local clean clean-enginesexecLTLIBRARIES clean-generic \
+ clean clean-enginesexecLTLIBRARIES clean-generic \ + clean clean-enginesexecLTLIBRARIES clean-generic \
clean-libLTLIBRARIES clean-libtool cscopelist-am ctags \ clean-libLTLIBRARIES clean-libtool \
ctags-am distclean distclean-compile distclean-generic \ clean-providersexecLTLIBRARIES cscopelist-am ctags ctags-am \
distclean-hdr distclean-libtool distclean-tags distdir dvi \ distclean distclean-compile distclean-generic distclean-hdr \
dvi-am html html-am info info-am install install-am \ @@ -1253,13 +1253,6 @@ uninstall-am: uninstall-enginesexecLTLIB
install-data install-data-am install-dvi install-dvi-am \
install-enginesexecLTLIBRARIES install-exec install-exec-am \ $(srcdir)/config.h.in $(srcdir)/config.h.in~
- install-exec-hook install-html install-html-am \
+ install-html install-html-am \ -# OpenSSL older than 1.1.0 expected libpkcs11.so instead of pkcs11.so
install-includeHEADERS install-info install-info-am \ -check-local: $(LTLIBRARIES)
install-libLTLIBRARIES install-man install-mylibDATA \ - cd .libs && $(LN_S) -f pkcs11$(SHARED_EXT) libpkcs11$(SHARED_EXT)
install-pdf install-pdf-am install-pkgconfigDATA install-ps \ -
-install-exec-hook:
- cd '$(DESTDIR)$(enginesexecdir)' && $(LN_S) -f pkcs11$(SHARED_EXT) libpkcs11$(SHARED_EXT)
-@LIBP11_OSSL_PROVIDER_TRUE@ cd '$(DESTDIR)$(providersexecdir)' && $(LN_S) -f pkcs11prov$(SHARED_EXT) libpkcs11$(SHARED_EXT)
@WIN32_TRUE@.libs/@WIN_LIBPREFIX@p11-@LIBP11_LT_OLDEST@.dll.def: libp11.la
.rc.lo:
$(LTRCCOMPILE) -i "$<" -o "$@"