Skip to content

Commit

Permalink
Update openssl and curl (#5324)
Browse files Browse the repository at this point in the history
* update openssl to v1.1.1p
* update curl to v7.83.1
* update zstd to v1.5.2
* update gmp to v6.2.1
- udpate gmp and remove build of doc, tests and demos
* minor makefile cleanup
  • Loading branch information
hgy59 authored Jun 25, 2022
1 parent a66740d commit 6753f27
Show file tree
Hide file tree
Showing 16 changed files with 40 additions and 26 deletions.
2 changes: 1 addition & 1 deletion cross/curl/Makefile
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
PKG_NAME = curl
PKG_VERS = 7.82.0
PKG_VERS = 7.83.1
PKG_EXT = tar.xz
PKG_DIST_NAME = $(PKG_NAME)-$(PKG_VERS).$(PKG_EXT)
PKG_DIST_SITE = https://curl.se/download
Expand Down
2 changes: 1 addition & 1 deletion cross/curl/PLIST
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
bin:bin/curl
lnk:lib/libcurl.so
lnk:lib/libcurl.so.4
lib:lib/libcurl.so.4.7.0
lib:lib/libcurl.so.4.8.0
6 changes: 3 additions & 3 deletions cross/curl/digests
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
curl-7.82.0.tar.xz SHA1 1da2b0a398a40b1b7e950940de21bc5e6dd8d622
curl-7.82.0.tar.xz SHA256 0aaa12d7bd04b0966254f2703ce80dd5c38dbbd76af0297d3d690cdce58a583c
curl-7.82.0.tar.xz MD5 ce05eb61ef7c398feb7dbe23122d0bd9
curl-7.83.1.tar.xz SHA1 4adc266ba0901a3f244b54260cf1ee391fea479a
curl-7.83.1.tar.xz SHA256 2cb9c2356e7263a1272fd1435ef7cdebf2cd21400ec287b068396deb705c22c4
curl-7.83.1.tar.xz MD5 08c6d9c25d9cf8d17be28363753e42ca
2 changes: 1 addition & 1 deletion cross/fdupes/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ PKG_NAME = fdupes
PKG_VERS = 2.1.2
PKG_EXT = tar.gz
PKG_DIST_NAME = $(PKG_NAME)-$(PKG_VERS).$(PKG_EXT)
PKG_DIST_SITE = https://github.com/adrianlopezroche/$(PKG_NAME)/releases/download/v$(PKG_VERS)
PKG_DIST_SITE = https://github.com/adrianlopezroche/fdupes/releases/download/v$(PKG_VERS)
PKG_DIR = $(PKG_NAME)-$(PKG_VERS)

DEPENDS = cross/ncursesw cross/pcre2
Expand Down
5 changes: 3 additions & 2 deletions cross/gmp/Makefile
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
PKG_NAME = gmp
PKG_VERS = 6.2.0
PKG_VERS = 6.2.1
PKG_EXT = tar.xz
PKG_DIST_NAME = $(PKG_NAME)-$(PKG_VERS).$(PKG_EXT)
PKG_DIST_SITE = https://ftp.gnu.org/gnu/$(PKG_NAME)
PKG_DIST_SITE = https://ftp.gnu.org/gnu/gmp
PKG_DIR = $(PKG_NAME)-$(PKG_VERS)

DEPENDS =
Expand All @@ -13,6 +13,7 @@ LICENSE = LGPLv3 or GPLv2

GNU_CONFIGURE = 1

CONFIGURE_ARGS = --disable-static

# create c++ library of gmp. This is required by cross/rnm
CONFIGURE_ARGS += --enable-cxx
Expand Down
4 changes: 2 additions & 2 deletions cross/gmp/PLIST
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
lnk:lib/libgmp.so
lnk:lib/libgmp.so.10
lib:lib/libgmp.so.10.4.0
lib:lib/libgmp.so.10.4.1
lnk:lib/libgmpxx.so
lnk:lib/libgmpxx.so.4
lib:lib/libgmpxx.so.4.6.0
lib:lib/libgmpxx.so.4.6.1
6 changes: 3 additions & 3 deletions cross/gmp/digests
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
gmp-6.2.0.tar.xz SHA1 052a5411dc74054240eec58132d2cf41211d0ff6
gmp-6.2.0.tar.xz SHA256 258e6cd51b3fbdfc185c716d55f82c08aff57df0c6fbd143cf6ed561267a1526
gmp-6.2.0.tar.xz MD5 a325e3f09e6d91e62101e59f9bda3ec1
gmp-6.2.1.tar.xz SHA1 0578d48607ec0e272177d175fd1807c30b00fdf2
gmp-6.2.1.tar.xz SHA256 fd4829912cddd12f84181c3451cc752be224643e87fac497b69edddadc49b4f2
gmp-6.2.1.tar.xz MD5 0b82665c4a92fd2ade7440c13fcaa42b
13 changes: 13 additions & 0 deletions cross/gmp/patches/001-remove-obsolete-subfolders-from-build.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
# avoid build of doc, demos and tests
#
--- Makefile.in.orig 2020-11-14 18:45:16.000000000 +0000
+++ Makefile.in 2022-06-25 14:06:26.284881269 +0000
@@ -572,7 +572,7 @@
LIBGMPXX_LT_CURRENT = 10
LIBGMPXX_LT_REVISION = 1
LIBGMPXX_LT_AGE = 6
-SUBDIRS = tests mpn mpz mpq mpf printf scanf rand cxx demos tune doc
+SUBDIRS = mpn mpz mpq mpf printf scanf rand cxx tune

# Put asl.h here for now.

2 changes: 1 addition & 1 deletion cross/jpcre2/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ PKG_NAME = jpcre2
PKG_VERS = 10.32.01
PKG_EXT = tar.gz
PKG_DIST_NAME = $(PKG_VERS).$(PKG_EXT)
PKG_DIST_SITE = https://github.com/jpcre2/jpcre2/archive/refs/tags
PKG_DIST_SITE = https://github.com/jpcre2/jpcre2/archive
PKG_DIST_FILE=$(PKG_NAME)-$(PKG_VERS).$(PKG_EXT)
PKG_DIR = $(PKG_NAME)-$(PKG_VERS)

Expand Down
2 changes: 1 addition & 1 deletion cross/openssl/Makefile
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
PKG_NAME = openssl
PKG_VERS = 1.1.1o
PKG_VERS = 1.1.1p
PKG_EXT = tar.gz
PKG_DIST_NAME = $(PKG_NAME)-$(PKG_VERS).$(PKG_EXT)
PKG_DIST_SITE = https://www.openssl.org/source
Expand Down
6 changes: 3 additions & 3 deletions cross/openssl/digests
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
openssl-1.1.1o.tar.gz SHA1 860fa10381ff0a121833583ccaa011bf266bcc63
openssl-1.1.1o.tar.gz SHA256 9384a2b0570dd80358841464677115df785edb941c71211f75076d72fe6b438f
openssl-1.1.1o.tar.gz MD5 d05e96e200d2ff0aef20c114cb5f17bf
openssl-1.1.1p.tar.gz SHA1 707daabab923ef2d9f05fdb8e0664944be7f5eba
openssl-1.1.1p.tar.gz SHA256 bf61b62aaa66c7c7639942a94de4c9ae8280c08f17d4eac2e44644d9fc8ace6f
openssl-1.1.1p.tar.gz MD5 3d610fed4f44ce4d4b42849a368d2071
2 changes: 1 addition & 1 deletion cross/rnm/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ PKG_NAME = rnm
PKG_VERS = 4.0.9
PKG_EXT = tar.gz
PKG_DIST_NAME = $(PKG_VERS).$(PKG_EXT)
PKG_DIST_SITE = https://github.com/neurobin/rnm/archive/refs/tags
PKG_DIST_SITE = https://github.com/neurobin/rnm/archive
PKG_DIST_FILE=$(PKG_NAME)-$(PKG_VERS).$(PKG_EXT)
PKG_DIR = $(PKG_NAME)-$(PKG_VERS)

Expand Down
4 changes: 2 additions & 2 deletions cross/xz/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -2,13 +2,13 @@ PKG_NAME = xz
PKG_VERS = 5.2.5
PKG_EXT = tar.xz
PKG_DIST_NAME = $(PKG_NAME)-$(PKG_VERS).$(PKG_EXT)
PKG_DIST_SITE = https://tukaani.org/$(PKG_NAME)
PKG_DIST_SITE = https://tukaani.org/xz
PKG_DIR = $(PKG_NAME)-$(PKG_VERS)

DEPENDS =

HOMEPAGE = https://tukaani.org
COMMENT = Free general-purpose data compression software with high compression ratio
COMMENT = Free general-purpose data compression software with high compression ratio.
LICENSE = various

GNU_CONFIGURE = 1
Expand Down
2 changes: 1 addition & 1 deletion cross/zstd/Makefile
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
PKG_NAME = zstd
PKG_VERS = 1.5.1
PKG_VERS = 1.5.2
PKG_EXT = tar.gz
PKG_DIST_NAME = $(PKG_NAME)-$(PKG_VERS).$(PKG_EXT)
PKG_DIST_SITE = https://github.com/facebook/zstd/releases/download/v${PKG_VERS}
Expand Down
2 changes: 1 addition & 1 deletion cross/zstd/PLIST
Original file line number Diff line number Diff line change
Expand Up @@ -7,4 +7,4 @@ rsc:bin/zstdless
lnk:bin/zstdmt
lnk:lib/libzstd.so
lnk:lib/libzstd.so.1
lib:lib/libzstd.so.1.5.1
lib:lib/libzstd.so.1.5.2
6 changes: 3 additions & 3 deletions cross/zstd/digests
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
zstd-1.5.1.tar.gz SHA1 e6a51ef3f7d5be5b74ac74d88bf3850057e00adb
zstd-1.5.1.tar.gz SHA256 e28b2f2ed5710ea0d3a1ecac3f6a947a016b972b9dd30242369010e5f53d7002
zstd-1.5.1.tar.gz MD5 b97d53547220355907dedec7de9a4f29
zstd-1.5.2.tar.gz SHA1 c56c8e6d703d14029464b2a1a66164dc5cf80855
zstd-1.5.2.tar.gz SHA256 7c42d56fac126929a6a85dbc73ff1db2411d04f104fae9bdea51305663a83fd0
zstd-1.5.2.tar.gz MD5 072b10f71f5820c24761a65f31f43e73

0 comments on commit 6753f27

Please sign in to comment.