Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 8 additions & 8 deletions ci/linux-install-rust.sh
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ install_rust() {
# Windows is the only cross-compilation target, and only on MinGW build
# hosts, so the caller passes "x86_64-pc-windows-gnu" as an argument there.
baseurl="https://static.rust-lang.org/dist"
version=1.96.0
version=1.96.1
prefix=/opt/rust
extra_targets="$@"

Expand All @@ -28,24 +28,24 @@ install_rust() {
if uname -m | grep aarch64; then
host=aarch64-unknown-linux-gnu
# checksum from $baseurl/rustc-${version}-aarch64-unknown-linux-gnu.tar.gz.sha256
rustc_sha=ba3c19a8e3a54efce3bd8d6c8ceb21173c8c64a100dd84e62fdfd8313c1ea7ed
rustc_sha=4694256eccc212e8339f31d58c287b6ec89fcddf2ab9920c9e07091f5dc79cfe
# checksum from $baseurl/cargo-${version}-aarch64-unknown-linux-gnu.tar.gz.sha256
cargo_sha=aff68544337c835a58ff303c47fc1ddb0a1a0bd9df332e37c8d466d8f78eaa32
cargo_sha=70bd8065b3964f921d3afaafff4284e182ba8ee668c05bb69bd056e700be66b5
else
host=x86_64-unknown-linux-gnu
# checksum from $baseurl/rustc-${version}-x86_64-unknown-linux-gnu.tar.gz.sha256
rustc_sha=71143d6075582b7e65233992c77e375aadbec4dfda6df2675160bf05b89410f9
rustc_sha=4979b9ce46281de67d02ea0383400b00f9b83ec7d505b26b3c3646e12d98fee4
# checksum from $baseurl/cargo-${version}-x86_64-unknown-linux-gnu.tar.gz.sha256
cargo_sha=b691a9e31b1e5498017be91155a1e7501eccf6437e7dc9ff1896e38aa1584dbf
cargo_sha=c656b46ffd1beec8c5396fa6bc275e552ebf22ccf12f1a14e6eefe2688ec977c
fi

# rust-std checksums per target. These are host-architecture independent.
# checksum from $baseurl/rust-std-${version}-x86_64-unknown-linux-gnu.tar.gz.sha256
std_x86_64_linux_sha=36e577b66f7b2f8fc6493f97f81329e5f6e1514360d0c6c31d5d8463184e6773
std_x86_64_linux_sha=aca04b57a389c215c21a8a71b6a44d8d083f8707888103682769d16155692ec4
# checksum from $baseurl/rust-std-${version}-aarch64-unknown-linux-gnu.tar.gz.sha256
std_aarch64_linux_sha=66ad5d73e79dd44b93c260ee61752abce3ce5ccb5031832beaccd1c248b88586
std_aarch64_linux_sha=4483cf06490373192bbc3fb9b483e14b6dc1bcdf99badae18b45931325284e1a
# checksum from $baseurl/rust-std-${version}-x86_64-pc-windows-gnu.tar.gz.sha256
std_x86_64_windows_sha=6951de999a0926aa8e35046017473a1912274cc34e800887eb3bfba4ddae12c9
std_x86_64_windows_sha=9909d975fc28754bc6dd4493b095287ffc9fd496a09af91f8b19fe36bc5802b5

# Download, verify, extract and install a single component tarball, then
# remove both the tarball and its extracted tree before moving on.
Expand Down
2 changes: 1 addition & 1 deletion deps-packaging/git/cfbuild-git.spec
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
%define git_version 2.54.0
%define git_version 2.55.0

Summary: CFEngine Build Automation -- git
Name: cfbuild-git
Expand Down
2 changes: 1 addition & 1 deletion deps-packaging/git/distfiles
Original file line number Diff line number Diff line change
@@ -1 +1 @@
45e8107643a44e3ce46f5665beb35af3932fb0d70017687905ab5d4e3aafa8eb git-2.54.0.tar.gz
0842dc384a23ac33ba3e570c4f3a8ded85963ee4713b1cd21153c3db41813d1e git-2.55.0.tar.gz
2 changes: 1 addition & 1 deletion deps-packaging/leech2/cfbuild-leech2.spec
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
%define leech2_version 5.2.0
%define leech2_version 5.3.0

Summary: CFEngine Build Automation -- leech2
Name: cfbuild-leech2
Expand Down
2 changes: 1 addition & 1 deletion deps-packaging/leech2/distfiles
Original file line number Diff line number Diff line change
@@ -1 +1 @@
b33711aeadf592c3b56dceda683191d83d23d9b0dbb2ef9b690004bcc5ed908d leech2-5.2.0.tar.gz
570d7c002fa05fe1dbccfdcbf8592823b303341844763d898a0d7ed3183c971f leech2-5.3.0.tar.gz
2 changes: 1 addition & 1 deletion deps-packaging/leech2/source
Original file line number Diff line number Diff line change
@@ -1 +1 @@
https://github.com/larsewi/leech2/releases/download/v5.2.0/
https://github.com/larsewi/leech2/releases/download/v5.3.0/
2 changes: 1 addition & 1 deletion deps-packaging/libacl/cfbuild-libacl.spec
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
%define acl_version 2.3.2
%define acl_version 2.4.0

Summary: CFEngine Build Automation -- libacl
Name: cfbuild-libacl
Expand Down
2 changes: 1 addition & 1 deletion deps-packaging/libacl/distfiles
Original file line number Diff line number Diff line change
@@ -1 +1 @@
5f2bdbad629707aa7d85c623f994aa8a1d2dec55a73de5205bac0bf6058a2f7c acl-2.3.2.tar.gz
73c853c3d44e1f693e5a96a986f1bd19d3d0dac2c7d453e796177774bc4e5f6a acl-2.4.0.tar.gz
2 changes: 1 addition & 1 deletion deps-packaging/libattr/cfbuild-libattr.spec
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
%define attr_version 2.5.2
%define attr_version 2.6.0

Summary: CFEngine Build Automation -- libattr
Name: cfbuild-libattr
Expand Down
2 changes: 1 addition & 1 deletion deps-packaging/libattr/distfiles
Original file line number Diff line number Diff line change
@@ -1 +1 @@
39bf67452fa41d0948c2197601053f48b3d78a029389734332a6309a680c6c87 attr-2.5.2.tar.gz
d42fa374513180bb48cb11a46696f488240e5124ff1e6ad88b0abff706985612 attr-2.6.0.tar.gz
2 changes: 1 addition & 1 deletion deps-packaging/libcurl-hub/cfbuild-libcurl-hub.spec
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
%define curl_version 8.20.0
%define curl_version 8.21.0

Summary: CFEngine Build Automation -- libcurl
Name: cfbuild-libcurl-hub
Expand Down
2 changes: 1 addition & 1 deletion deps-packaging/libcurl-hub/distfiles
Original file line number Diff line number Diff line change
@@ -1 +1 @@
fc5819cad3f9f5482669adcdc49a782c15f36d2a0715b395b06d9173593d2dc0 curl-8.20.0.tar.gz
d9b327997999045a24cda50f3983e69e51c516bd8be6ef9842fc7f99135e33bb curl-8.21.0.tar.gz
2 changes: 1 addition & 1 deletion deps-packaging/libcurl/cfbuild-libcurl.spec
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
%define curl_version 8.20.0
%define curl_version 8.21.0

Summary: CFEngine Build Automation -- libcurl
Name: cfbuild-libcurl
Expand Down
2 changes: 1 addition & 1 deletion deps-packaging/libcurl/distfiles
Original file line number Diff line number Diff line change
@@ -1 +1 @@
fc5819cad3f9f5482669adcdc49a782c15f36d2a0715b395b06d9173593d2dc0 curl-8.20.0.tar.gz
d9b327997999045a24cda50f3983e69e51c516bd8be6ef9842fc7f99135e33bb curl-8.21.0.tar.gz
2 changes: 1 addition & 1 deletion deps-packaging/libexpat/cfbuild-libexpat.spec
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
%define expat_version 2.8.1
%define expat_version 2.8.2

Summary: CFEngine Build Automation -- libexpat
Name: cfbuild-libexpat
Expand Down
2 changes: 1 addition & 1 deletion deps-packaging/libexpat/distfiles
Original file line number Diff line number Diff line change
@@ -1 +1 @@
10b195ee78160a908388180a8fe3603d4e9a12f4755fbf5f3816b23a9d750da0 expat-2.8.1.tar.xz
3ad89b8588e6644bd4e49981480d48b21289eebbcd4f0a1a4afb1c29f99b6ab4 expat-2.8.2.tar.xz
2 changes: 1 addition & 1 deletion deps-packaging/libexpat/source
Original file line number Diff line number Diff line change
@@ -1 +1 @@
https://github.com/libexpat/libexpat/releases/download/R_2_8_1/
https://github.com/libexpat/libexpat/releases/download/R_2_8_2/
92 changes: 76 additions & 16 deletions deps-packaging/lmdb/0003-Autoconf-files.patch
Original file line number Diff line number Diff line change
Expand Up @@ -15,10 +15,10 @@ Subject: [PATCH 03/10] Autoconf files.

diff --git a/libraries/liblmdb/Makefile b/libraries/liblmdb/Makefile
deleted file mode 100644
index f254511..0000000
--- a/libraries/liblmdb/Makefile
index 9fd819b..0000000
--- a/Makefile
+++ /dev/null
@@ -1,118 +0,0 @@
@@ -1,177 +0,0 @@
-# Makefile for liblmdb (Lightning memory-mapped database library).
-
-########################################################################
Expand All @@ -29,7 +29,7 @@ index f254511..0000000
-# platforms; you should not need to change any of these.
-# Read their descriptions in mdb.c if you do:
-#
-# - MDB_USE_POSIX_SEM
-# - MDB_USE_POSIX_MUTEX, MDB_USE_POSIX_SEM, MDB_USE_SYSV_SEM
-# - MDB_DSYNC
-# - MDB_FDATASYNC
-# - MDB_FDATASYNC_WORKS
Expand All @@ -45,9 +45,18 @@ index f254511..0000000
-THREADS = -pthread
-OPT = -O2 -g
-CFLAGS = $(THREADS) $(OPT) $(W) $(XCFLAGS)
-LDLIBS =
-SOLIBS =
-LDFLAGS = $(THREADS)
-LDLIBS =
-SOLIBS =
-SOEXT = .so
-LDL = -ldl
-
-LIBVER = 1
-ABIVER = 0
-VEREXT = $(LIBVER).$(ABIVER)
-LMDB_VERSION = 1.0.0
-SOFULL = $(SOEXT).$(VEREXT)
-
-prefix = /usr/local
-exec_prefix = $(prefix)
-bindir = $(exec_prefix)/bin
Expand All @@ -59,11 +68,20 @@ index f254511..0000000
-########################################################################
-
-IHDRS = lmdb.h
-ILIBS = liblmdb.a liblmdb$(SOEXT)
-IPROGS = mdb_stat mdb_copy mdb_dump mdb_load
-IDOCS = mdb_stat.1 mdb_copy.1 mdb_dump.1 mdb_load.1
-ILIBS = liblmdb.a
-ILIBS2 = liblmdb$(SOFULL)
-IPROGS = mdb_stat mdb_copy mdb_dump mdb_load mdb_drop
-IDOCS = mdb_stat.1 mdb_copy.1 mdb_dump.1 mdb_load.1 mdb_drop.1
-PROGS = $(IPROGS) mtest mtest2 mtest3 mtest4 mtest5
-all: $(ILIBS) $(PROGS)
-RPROGS = mtest_remap mtest_enc mtest_enc2
-SOVER = liblmdb$(SOEXT).$(LIBVER)
-VERSION_OPT = -Wl,-soname,$(SOVER)
-# For MacOSX:
-#VERSION_OPT = -Wl,-current_version,$(VEREXT)
-
-all: $(ILIBS) $(ILIBS2) $(PROGS) lmdb.pc
-# Requires CPPFLAGS=-DMDB_VL32 and/or -DMDB_RPAGE_CACHE
-rall: all $(RPROGS)
-
-install: $(ILIBS) $(IPROGS) $(IHDRS)
- mkdir -p $(DESTDIR)$(bindir)
Expand All @@ -72,35 +90,60 @@ index f254511..0000000
- mkdir -p $(DESTDIR)$(mandir)/man1
- for f in $(IPROGS); do cp $$f $(DESTDIR)$(bindir); done
- for f in $(ILIBS); do cp $$f $(DESTDIR)$(libdir); done
- for f in $(ILIBS2); do cp $$f $(DESTDIR)$(libdir); \
- i=`basename -s .$(ABIVER) $$f`; rm -f $(DESTDIR)$(libdir)/$$i; \
- ln -s $$f $(DESTDIR)$(libdir)/$$i; \
- i=`basename -s .$(LIBVER) $$i`; rm -f $(DESTDIR)$(libdir)/$$i; \
- ln -s $$f $(DESTDIR)$(libdir)/$$i; done
- for f in $(IHDRS); do cp $$f $(DESTDIR)$(includedir); done
- for f in $(IDOCS); do cp $$f $(DESTDIR)$(mandir)/man1; done
-
-clean:
- rm -rf $(PROGS) *.[ao] *.[ls]o *~ testdb
- rm -rf $(PROGS) $(RPROGS) *.[ao] *.[ls]o *.so.* *~ testdb
-
-test: all
- rm -rf testdb && mkdir testdb
- ./mtest && ./mdb_stat testdb
-
-liblmdb.a: mdb.o midl.o
- $(AR) rs $@ mdb.o midl.o
-liblmdb.a: mdb.o midl.o module.o
- $(AR) rs $@ mdb.o midl.o module.o
-
-liblmdb$(SOEXT): mdb.lo midl.lo
-liblmdb$(SOFULL): mdb.lo midl.lo module.lo
-# $(CC) $(LDFLAGS) -pthread -shared -Wl,-Bsymbolic -o $@ mdb.o midl.o $(SOLIBS)
- $(CC) $(LDFLAGS) -pthread -shared -o $@ mdb.lo midl.lo $(SOLIBS)
- $(CC) $(LDFLAGS) -shared $(VERSION_OPT) -o $@ mdb.lo midl.lo module.lo $(SOLIBS) $(LDL)
- rm -f liblmdb$(SOEXT); ln -s $@ liblmdb$(SOEXT)
- rm -f $(SOVER); ln -s $@ $(SOVER)
-
-mdb_stat: mdb_stat.o liblmdb.a
- $(CC) $(LDFLAGS) -o $@ $^ $(LDL)
-mdb_copy: mdb_copy.o liblmdb.a
- $(CC) $(LDFLAGS) -o $@ $^ $(LDL)
-mdb_dump: mdb_dump.o liblmdb.a
- $(CC) $(LDFLAGS) -o $@ $^ $(LDL)
-mdb_load: mdb_load.o liblmdb.a
- $(CC) $(LDFLAGS) -o $@ $^ $(LDL)
-mdb_drop: mdb_drop.o liblmdb.a
- $(CC) $(LDFLAGS) -o $@ $^ $(LDL)
-mtest: mtest.o liblmdb.a
-mtest2: mtest2.o liblmdb.a
-mtest3: mtest3.o liblmdb.a
-mtest4: mtest4.o liblmdb.a
-mtest5: mtest5.o liblmdb.a
-mtest6: mtest6.o liblmdb.a
-mtest_remap: mtest_remap.o liblmdb.a
-mtest_enc: mtest_enc.o chacha8.o liblmdb.a
-mtest_enc2: mtest_enc2.o liblmdb.a crypto.lm
- $(CC) $(LDFLAGS) -pthread -o $@ $@.o liblmdb.a $(LDL)
-mtest_enc3: mtest_enc3.o liblmdb.a crypto.lm
- $(CC) $(LDFLAGS) -pthread -o $@ $@.o liblmdb.a $(LDL)
-mtest_enc4: mtest_enc4.o liblmdb.a crypto.lm
- $(CC) $(LDFLAGS) -pthread -o $@ $@.o liblmdb.a $(LDL)
-
-mplay: mplay.o liblmdb.a
-
-crypto.lm: crypto.c
- $(CC) -shared $(CFLAGS) -o $@ $^ -lsodium
-
-mdb.o: mdb.c lmdb.h midl.h
- $(CC) $(CFLAGS) $(CPPFLAGS) -c mdb.c
-
Expand All @@ -113,12 +156,28 @@ index f254511..0000000
-midl.lo: midl.c midl.h
- $(CC) $(CFLAGS) -fPIC $(CPPFLAGS) -c midl.c -o $@
-
-module.lo: module.c lmdb.h
- $(CC) $(CFLAGS) -fPIC $(CPPFLAGS) -c module.c -o $@
-
-%: %.o
- $(CC) $(CFLAGS) $(LDFLAGS) $^ $(LDLIBS) -o $@
-
-%.o: %.c lmdb.h
- $(CC) $(CFLAGS) $(CPPFLAGS) -c $<
-
-lmdb.pc: Makefile
- @echo "prefix=$(prefix)" > $@
- @echo "exec_prefix=$(exec_prefix)" >>$@
- @echo "includedir=$(includedir)" >>$@
- @echo "libdir=$(libdir)" >>$@
- @echo >>$@
- @echo "Name: lmdb (OpenLDAP)" >>$@
- @echo "Description: OpenLDAP Lightning Memory Mapped Database library" >>$@
- @echo "URL: https://www.openldap.org" >>$@
- @echo "Version: $(LMDB_VERSION)" >>$@
- @echo "Cflags: $(THREADS) $(XCFLAGS)" >>$@
- @echo "Libs: -llmdb $(LDL) $(THREADS)" >>$@
-
-COV_FLAGS=-fprofile-arcs -ftest-coverage
-COV_OBJS=xmdb.o xmidl.o
-
Expand Down Expand Up @@ -146,9 +205,10 @@ index 0000000..e331a15
+AM_CPPFLAGS = -D_POSIX_PTHREAD_SEMANTICS
+
+lib_LTLIBRARIES = liblmdb.la
+liblmdb_la_SOURCES = mdb.c midl.c
+liblmdb_la_SOURCES = mdb.c midl.c module.c
+liblmdb_la_LDFLAGS=-no-undefined -avoid-version
+
+LDFLAGS = -ldl
+bin_PROGRAMS = mdb_stat mdb_copy lmdump lmmgr
+mdb_stat_LDADD = liblmdb.la
+mdb_copy_LDADD = liblmdb.la
Expand Down
2 changes: 1 addition & 1 deletion deps-packaging/lmdb/cfbuild-lmdb.spec
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
%define lmdb_version 0.9.35
%define lmdb_version 1.0.0

Summary: CFEngine Build Automation -- lmdb
Name: cfbuild-lmdb
Expand Down
2 changes: 1 addition & 1 deletion deps-packaging/lmdb/distfiles
Original file line number Diff line number Diff line change
@@ -1 +1 @@
0d090c6a7c85a4f31a2ab0d734554c21097f24752393a190b0e51996b08f48c4 openldap-LMDB_0.9.35.tar.gz
a61ded12bd9c670038b77483dda13b50684a93a111e53421dfb979624ae9f72e openldap-LMDB_1.0.0.tar.gz
2 changes: 1 addition & 1 deletion deps-packaging/lmdb/source
Original file line number Diff line number Diff line change
@@ -1 +1 @@
https://git.openldap.org/openldap/openldap/-/archive/LMDB_0.9.35/
https://git.openldap.org/openldap/openldap/-/archive/LMDB_1.0.0/
2 changes: 1 addition & 1 deletion deps-packaging/php/cfbuild-php.spec
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
%define php_version 8.5.7
%define php_version 8.5.8

Summary: CFEngine Build Automation -- php
Name: cfbuild-php
Expand Down
2 changes: 1 addition & 1 deletion deps-packaging/php/distfiles
Original file line number Diff line number Diff line change
@@ -1 +1 @@
e5eba93fd6dd3241d0e61e932eb99a3783b40568553fb0e511b660ecd863a049 php-8.5.7.tar.gz
6ebc55e52af4396385e689f7af0f28944fbbf966843433b573e9dc1dc03df539 php-8.5.8.tar.gz
Loading