Skip to content

Commit e3ff8ef

Browse files
committed
Merge Official Source
Signed-off-by: Tianling Shen <[email protected]>
2 parents 879ae16 + bb310d5 commit e3ff8ef

File tree

50 files changed

+243
-119
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

50 files changed

+243
-119
lines changed

devel/unifdef/Makefile

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,9 @@ HOST_BUILD_PARALLEL:=1
1717
include $(INCLUDE_DIR)/package.mk
1818
include $(INCLUDE_DIR)/host-build.mk
1919

20+
HOST_CFLAGS += -std=gnu17
21+
TARGET_CFLAGS += -std=gnu17
22+
2023
define Package/unifdef
2124
SECTION:=devel
2225
CATEGORY:=Development

lang/golang/golang/Makefile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
include $(TOPDIR)/rules.mk
99

1010
GO_VERSION_MAJOR_MINOR:=1.24
11-
GO_VERSION_PATCH:=4
11+
GO_VERSION_PATCH:=5
1212

1313
PKG_NAME:=golang
1414
PKG_VERSION:=$(GO_VERSION_MAJOR_MINOR)$(if $(GO_VERSION_PATCH),.$(GO_VERSION_PATCH))
@@ -21,7 +21,7 @@ GO_SOURCE_URLS:=https://dl.google.com/go/ \
2121

2222
PKG_SOURCE:=go$(PKG_VERSION).src.tar.gz
2323
PKG_SOURCE_URL:=$(GO_SOURCE_URLS)
24-
PKG_HASH:=5a86a83a31f9fa81490b8c5420ac384fd3d95a3e71fba665c7b3f95d1dfef2b4
24+
PKG_HASH:=74fdb09f2352e2b25b7943e56836c9b47363d28dec1c8b56c4a9570f30b8f59f
2525

2626
PKG_MAINTAINER:=Jeffery To <[email protected]>
2727
PKG_LICENSE:=BSD-3-Clause

libs/ell/Makefile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
include $(TOPDIR)/rules.mk
22

33
PKG_NAME:=ell
4-
PKG_VERSION:=0.76
4+
PKG_VERSION:=0.78
55
PKG_RELEASE:=1
66

77
PKG_SOURCE_PROTO:=git
88
PKG_SOURCE_URL:=https://git.kernel.org/pub/scm/libs/ell/ell.git
99
PKG_SOURCE_VERSION:=$(PKG_VERSION)
10-
PKG_MIRROR_HASH:=8ac8d7c368774bae174946f8783f28a762908c3ae919678bd3fe26101f69e1a3
10+
PKG_MIRROR_HASH:=f748e96575dc3eb6b98a3feb6334b8df011c304d7c9ee467d797121f5281d408
1111

1212
PKG_MAINTAINER:=Daniel Golle <[email protected]>
1313
PKG_LICENSE:=GPL-2.0-only

libs/hiredis/Makefile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,12 +8,12 @@
88
include $(TOPDIR)/rules.mk
99

1010
PKG_NAME:=hiredis
11-
PKG_VERSION:=1.2.0
11+
PKG_VERSION:=1.3.0
1212
PKG_RELEASE:=1
1313

1414
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
1515
PKG_SOURCE_URL:=https://codeload.github.com/redis/hiredis/tar.gz/v$(PKG_VERSION)?
16-
PKG_HASH:=82ad632d31ee05da13b537c124f819eb88e18851d9cb0c30ae0552084811588c
16+
PKG_HASH:=25cee4500f359cf5cad3b51ed62059aadfc0939b05150c1f19c7e2829123631c
1717

1818
PKG_LICENSE:=BSD-3-Clause
1919
PKG_LICENSE_FILES:=COPYING

libs/libdeflate/Makefile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
include $(TOPDIR)/rules.mk
22

33
PKG_NAME:=libdeflate
4-
PKG_VERSION:=1.22
4+
PKG_VERSION:=1.24
55
PKG_RELEASE:=1
66

77
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
88
PKG_SOURCE_URL:=https://github.com/ebiggers/libdeflate/releases/download/v$(PKG_VERSION)
9-
PKG_HASH:=7834d9adbc9a809e0fb0d7b486060a9ae5f7819eb7f55bb8c22b10d7b3bed8da
9+
PKG_HASH:=a0dda1c4b804742066db07b9510876edd09cc0ca06cdc32c5dfe1b2016a26463
1010

1111
PKG_LICENSE:=COPYING
1212
PKG_LICENSE_FILES:=MIT

libs/libevdev/Makefile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,12 +5,12 @@
55
include $(TOPDIR)/rules.mk
66

77
PKG_NAME:=libevdev
8-
PKG_VERSION:=1.13.1
8+
PKG_VERSION:=1.13.4
99
PKG_RELEASE:=1
1010

1111
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz
1212
PKG_SOURCE_URL:=https://www.freedesktop.org/software/libevdev/
13-
PKG_HASH:=06a77bf2ac5c993305882bc1641017f5bec1592d6d1b64787bad492ab34f2f36
13+
PKG_HASH:=f00ab8d42ad8b905296fab67e13b871f1a424839331516642100f82ad88127cd
1414

1515
PKG_MAINTAINER:=Daniel Golle <[email protected]>
1616
PKG_LICENSE:=MIT

libs/libp11/Makefile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,12 +8,12 @@
88
include $(TOPDIR)/rules.mk
99

1010
PKG_NAME:=libp11
11-
PKG_VERSION:=0.4.13
11+
PKG_VERSION:=0.4.16
1212
PKG_RELEASE:=1
1313

1414
PKG_SOURCE_URL:=https://github.com/OpenSC/libp11/releases/download/$(PKG_NAME)-$(PKG_VERSION)/
1515
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
16-
PKG_HASH:=d25dd9cff1b623e12d51b6d2c100e26063582d25c9a6f57c99d41f2da9567086
16+
PKG_HASH:=97777640492fa9e5831497e5892e291dfbf39a7b119d9cb6abb3ec8c56d17553
1717

1818
PKG_MAINTAINER:=Daniel Golle <[email protected]>
1919
PKG_LICENSE:=LGPL-2.1-or-later
Lines changed: 27 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,25 @@
11
--- a/src/Makefile.am
22
+++ b/src/Makefile.am
3-
@@ -56,13 +56,6 @@ libpkcs11_la_SOURCES = $(pkcs11_la_SOURC
4-
libpkcs11_la_CFLAGS = $(pkcs11_la_CFLAGS)
3+
@@ -66,16 +66,6 @@ libpkcs11_la_CFLAGS = $(pkcs11_la_CFLAGS
54
libpkcs11_la_LIBADD = $(pkcs11_la_LIBADD)
5+
endif
66

77
-# OpenSSL older than 1.1.0 expected libpkcs11.so instead of pkcs11.so
88
-check-local: $(LTLIBRARIES)
99
- cd .libs && $(LN_S) -f pkcs11$(SHARED_EXT) libpkcs11$(SHARED_EXT)
1010
-
1111
-install-exec-hook:
1212
- cd '$(DESTDIR)$(enginesexecdir)' && $(LN_S) -f pkcs11$(SHARED_EXT) libpkcs11$(SHARED_EXT)
13+
-if LIBP11_OSSL_PROVIDER
14+
- cd '$(DESTDIR)$(providersexecdir)' && $(LN_S) -f pkcs11prov$(SHARED_EXT) libpkcs11$(SHARED_EXT)
15+
-endif
1316
-
1417
if WIN32
1518
# def file required for MS users to build library
1619
mylibdir=$(libdir)
1720
--- a/src/Makefile.in
1821
+++ b/src/Makefile.in
19-
@@ -965,7 +965,7 @@ distdir-am: $(DISTFILES)
22+
@@ -1057,7 +1057,7 @@ distdir-am: $(DISTFILES)
2023
fi; \
2124
done
2225
check-am: all-am
@@ -25,29 +28,35 @@
2528
check: check-am
2629
all-am: Makefile $(LTLIBRARIES) $(DATA) $(HEADERS) config.h
2730
install-enginesexecLTLIBRARIES: install-libLTLIBRARIES
28-
@@ -1060,7 +1060,7 @@ install-dvi-am:
29-
30-
install-exec-am: install-enginesexecLTLIBRARIES install-libLTLIBRARIES
31+
@@ -1158,7 +1158,7 @@ install-dvi-am:
32+
install-exec-am: install-enginesexecLTLIBRARIES install-libLTLIBRARIES \
33+
install-providersexecLTLIBRARIES
3134
@$(NORMAL_INSTALL)
3235
- $(MAKE) $(AM_MAKEFLAGS) install-exec-hook
3336
+ $(MAKE) $(AM_MAKEFLAGS)
3437
install-html: install-html-am
3538

3639
install-html-am:
37-
@@ -1127,14 +1127,14 @@ uninstall-am: uninstall-enginesexecLTLIB
40+
@@ -1228,7 +1228,7 @@ uninstall-am: uninstall-enginesexecLTLIB
3841
.MAKE: all check-am install-am install-exec-am install-strip
3942

4043
.PHONY: CTAGS GTAGS TAGS all all-am am--depfiles check check-am \
4144
- check-local clean clean-enginesexecLTLIBRARIES clean-generic \
4245
+ clean clean-enginesexecLTLIBRARIES clean-generic \
43-
clean-libLTLIBRARIES clean-libtool cscopelist-am ctags \
44-
ctags-am distclean distclean-compile distclean-generic \
45-
distclean-hdr distclean-libtool distclean-tags distdir dvi \
46-
dvi-am html html-am info info-am install install-am \
47-
install-data install-data-am install-dvi install-dvi-am \
48-
install-enginesexecLTLIBRARIES install-exec install-exec-am \
49-
- install-exec-hook install-html install-html-am \
50-
+ install-html install-html-am \
51-
install-includeHEADERS install-info install-info-am \
52-
install-libLTLIBRARIES install-man install-mylibDATA \
53-
install-pdf install-pdf-am install-pkgconfigDATA install-ps \
46+
clean-libLTLIBRARIES clean-libtool \
47+
clean-providersexecLTLIBRARIES cscopelist-am ctags ctags-am \
48+
distclean distclean-compile distclean-generic distclean-hdr \
49+
@@ -1253,13 +1253,6 @@ uninstall-am: uninstall-enginesexecLTLIB
50+
51+
$(srcdir)/config.h.in $(srcdir)/config.h.in~
52+
53+
-# OpenSSL older than 1.1.0 expected libpkcs11.so instead of pkcs11.so
54+
-check-local: $(LTLIBRARIES)
55+
- cd .libs && $(LN_S) -f pkcs11$(SHARED_EXT) libpkcs11$(SHARED_EXT)
56+
-
57+
-install-exec-hook:
58+
- cd '$(DESTDIR)$(enginesexecdir)' && $(LN_S) -f pkcs11$(SHARED_EXT) libpkcs11$(SHARED_EXT)
59+
-@LIBP11_OSSL_PROVIDER_TRUE@ cd '$(DESTDIR)$(providersexecdir)' && $(LN_S) -f pkcs11prov$(SHARED_EXT) libpkcs11$(SHARED_EXT)
60+
@[email protected]/@WIN_LIBPREFIX@p11-@[email protected]: libp11.la
61+
.rc.lo:
62+
$(LTRCCOMPILE) -i "$<" -o "$@"

libs/libpbc/Makefile

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
include $(TOPDIR)/rules.mk
22

33
PKG_NAME:=libpbc
4-
PKG_VERSION:=0.5.14
5-
PKG_RELEASE:=2
4+
PKG_VERSION:=1.0.0
5+
PKG_RELEASE:=1
66

77
PKG_SOURCE:=pbc-$(PKG_VERSION).tar.gz
88
PKG_SOURCE_URL:=https://crypto.stanford.edu/pbc/files/
9-
PKG_HASH:=772527404117587560080241cedaf441e5cac3269009cdde4c588a1dce4c23d2
9+
PKG_HASH:=18275a367283077bafe35f443200499e3b19c4a3754953da2a1b2f0d6b5922dc
1010
PKG_BUILD_DIR:=$(BUILD_DIR)/pbc-$(PKG_VERSION)
1111

1212
PKG_MAINTAINER:=Daniel Golle <[email protected]>

libs/libpbc/patches/010-pass-cflags.patch

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
--- a/configure.ac
22
+++ b/configure.ac
3-
@@ -10,7 +10,6 @@ AC_CONFIG_SRCDIR([./])
4-
LT_INIT
5-
#AC_CANONICAL_HOST
3+
@@ -9,7 +9,6 @@ AC_CONFIG_MACRO_DIR([m4])
4+
AC_CONFIG_SRCDIR([./])
5+
LT_INIT(win32-dll)
66

77
-CFLAGS=
88
default_fink_path=/sw

0 commit comments

Comments
 (0)