Skip to content

Commit 5996826

Browse files
stikonasstikonas
authored
Merge pull request #511 from fosslinux/curl-update
Curl update
2 parents ec017e9 + 4612fbc commit 5996826

12 files changed

Lines changed: 140 additions & 188 deletions

File tree

‎steps/SHA256SUMS.pkgs‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -31,12 +31,12 @@ f7437edc081071cc3ecd3384abf4c63f33183858b8cae6b4ac3105c66f88b3b6 bison-3.4.1_1.
3131
8064a96c8ccfbab1245554ac30e68fcc73da24a3dd02f8450658fdb106c7f405 bison-3.4.1_2.tar.bz2
3232
f4df527ee598ebc64d5c93639307a8d325b93dad510001cccd2df02692a26cdf bison-3.4.2_0.tar.bz2
3333
e8271c1213b6cc7c9ae2ddb018cd093cbbd5f6e842548c0747ce95b13b6b9447 bzip2-1.0.8_0.tar.bz2
34-
96b6b91e1d3c5f48da471f10dd22415fa05baacaafe964cc86285493d0ca27ce ca-certificates-3.99_0.tar.bz2
34+
fd65c11422588984bc3a440b1fd9d022307a200de182cfedfe3387a09cbece98 ca-certificates-3.99_0.tar.bz2
3535
982a3496ce3277c562acc896ba796939fe55a37432b2c76ab16b76e051a045a2 coreutils-5.0_0.tar.bz2
3636
27f283c42e2728d0d0682d56ada44b11ff11d07843e595c133a43f4c6aef53d0 coreutils-6.10_0.tar.bz2
3737
22d4dcf97bc9caf36f2abc4fbfc2f40d13a0be2db2efce913b09a00461db7a06 coreutils-9.4_0.tar.bz2
38-
aef1f09e2abd39cca760f186569a0e71bc11a20a79f06ee5802f788dd6a3ff58 curl-8.5.0_0.tar.bz2
39-
6e0d69e6bfbaf9520036b9ee362764ab791a0526df7a6639d9cc9de32d0becea curl-8.5.0_1.tar.bz2
38+
c0ab68a12ff82cb2b65b9c480281b70441ee14ef9bfe93605d1d5852379dbbaf curl-8.12.1_0.tar.bz2
39+
ea841c92382860d3618368b86510514ed7d717c64625740e70baba2508e182c4 curl-8.12.1_1.tar.bz2
4040
fedf6ffbd37b14e9a0c94cd3063c6ac5d38f13be8a3399093ec112f9cd9d0816 dhcpcd-10.0.1_0.tar.bz2
4141
0462b6a04899a98d60c33f9d16fa00e2e6b7c21cc80ccebc8358fc08105467a2 diffutils-2.7_0.tar.bz2
4242
fc850c6f141717ccece106592f6a8edc0cae0d5e9f0968f111455d00072541b6 diffutils-3.10_0.tar.bz2

steps/curl-8.5.0/files/sinus.pl renamed to steps/curl-8.12.1/files/sinus.pl

File renamed without changes.

‎steps/curl-8.12.1/pass1.sh‎

Lines changed: 58 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,58 @@
1+
# SPDX-FileCopyrightText: 2022,2025 fosslinux <fosslinux@aussies.space>
2+
#
3+
# SPDX-License-Identifier: GPL-3.0-or-later
4+
5+
src_prepare() {
6+
default
7+
8+
# Regnerate src/tool_cb_prg.c
9+
sed '/sinus/q' src/tool_cb_prg.c > src/tool_cb_prg.c.new
10+
perl sinus.pl | sed "s/, $//" >> src/tool_cb_prg.c.new
11+
sed '1,/^[0-9, ]*[0-9]$/d' src/tool_cb_prg.c >> src/tool_cb_prg.c.new
12+
mv src/tool_cb_prg.c.new src/tool_cb_prg.c
13+
14+
# pregenerated files
15+
rm src/tool_listhelp.c src/tool_hugehelp.c lib/easyoptions.c
16+
rm docs/libcurl/libcurl-symbols.md
17+
rm tests/certs/*.der
18+
19+
# Make scripts work with our perl
20+
sed -i "s/:crlf//" scripts/managen scripts/cd2nroff
21+
# sed rewrites permissions?!
22+
chmod 755 scripts/managen scripts/cd2nroff
23+
24+
# This one doesn't compile properly
25+
touch docs/libcurl/libcurl-symbols.md docs/libcurl/libcurl-symbols.3
26+
27+
AUTOMAKE=automake-1.15 ACLOCAL=aclocal-1.15 autoreconf-2.69 -fi
28+
}
29+
30+
src_configure() {
31+
LDFLAGS="-static" ./configure \
32+
--prefix="${PREFIX}" \
33+
--libdir="${LIBDIR}" \
34+
--build=i386-unknown-linux-gnu \
35+
--enable-ipv6 \
36+
--without-ssl \
37+
--without-libpsl \
38+
--disable-hsts
39+
}
40+
41+
src_compile() {
42+
# Recreate tool_help.h
43+
sed '/bitmask output/{n; n; n; n; q}' src/tool_help.h > src/tool_help.h.new
44+
make -s -C docs/cmdline-opts listcats >> src/tool_help.h.new
45+
sed '1,/CURLHELP_VERBOSE/d' src/tool_help.h >> src/tool_help.h.new
46+
mv src/tool_help.h.new src/tool_help.h
47+
48+
# tool_listhelp.c & easyoptions.c
49+
make -C src listhelp
50+
make -C lib optiontable
51+
52+
default
53+
}
54+
55+
src_install() {
56+
default
57+
install -m 755 scripts/mk-ca-bundle.pl "${DESTDIR}/usr/bin/mk-ca-bundle"
58+
}

‎steps/curl-8.12.1/pass2.sh‎

Lines changed: 45 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,45 @@
1+
# SPDX-FileCopyrightText: 2022 fosslinux <fosslinux@aussies.space>
2+
#
3+
# SPDX-License-Identifier: GPL-3.0-or-later
4+
5+
src_prepare() {
6+
default
7+
8+
# Regnerate src/tool_cb_prg.c
9+
sed '/sinus/q' src/tool_cb_prg.c > src/tool_cb_prg.c.new
10+
perl sinus.pl | sed "s/, $//" >> src/tool_cb_prg.c.new
11+
sed '1,/^[0-9, ]*[0-9]$/d' src/tool_cb_prg.c >> src/tool_cb_prg.c.new
12+
mv src/tool_cb_prg.c.new src/tool_cb_prg.c
13+
14+
# pregenerated files
15+
rm src/tool_listhelp.c src/tool_hugehelp.c lib/easyoptions.c
16+
rm docs/libcurl/libcurl-symbols.md
17+
rm tests/certs/*.der
18+
19+
AUTOMAKE=automake-1.15 ACLOCAL=aclocal-1.15 autoreconf-2.69 -fi
20+
}
21+
22+
src_configure() {
23+
LDFLAGS="-static" ./configure \
24+
--prefix="${PREFIX}" \
25+
--libdir="${LIBDIR}" \
26+
--build=i386-unknown-linux-musl \
27+
--enable-ipv6 \
28+
--with-openssl \
29+
--without-libpsl \
30+
--with-ca-bundle=/etc/ssl/certs.pem
31+
}
32+
33+
src_compile() {
34+
# Recreate tool_help.h
35+
sed '/bitmask output/{n; n; n; n; q}' src/tool_help.h > src/tool_help.h.new
36+
make -s -C docs/cmdline-opts listcats >> src/tool_help.h.new
37+
sed '1,/CURLHELP_VERBOSE/d' src/tool_help.h >> src/tool_help.h.new
38+
mv src/tool_help.h.new src/tool_help.h
39+
40+
# tool_listhelp.c and easyoptions.c
41+
make -C src listhelp
42+
make -C lib optiontable
43+
44+
default
45+
}

‎steps/curl-8.12.1/patches/timeless-mk-ca-bundle.patch‎

Lines changed: 31 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,31 @@
1+
# SPDX-FileCopyrightText: 2023 Eduardo Sánchez Muñoz <eduardosm-dev@e64.io>
2+
#
3+
# SPDX-License-Identifier: curl
4+
5+
Disables checking current date in mk-ca-bundle script, so it produces
6+
reproducible bundles.
7+
8+
diff -ru scripts/mk-ca-bundle.pl scripts/mk-ca-bundle.pl
9+
--- curl-8.12.1/scripts/mk-ca-bundle.pl
10+
+++ curl-8.12.1/scripts/mk-ca-bundle.pl
11+
@@ -499,19 +499,7 @@
12+
if($main_block) {
13+
push @precert, $_ if not /^#$/;
14+
if(/^# Not Valid After : (.*)/) {
15+
- my $stamp = $1;
16+
- use Time::Piece;
17+
- # Not Valid After : Thu Sep 30 14:01:15 2021
18+
- my $t = Time::Piece->strptime($stamp, "%a %b %d %H:%M:%S %Y");
19+
- my $delta = ($t->epoch - time()); # negative means no longer valid
20+
- if($delta < 0) {
21+
- $skipnum++;
22+
- report "Skipping: $main_block_name is not valid anymore" if ($opt_v);
23+
- $valid = 0;
24+
- }
25+
- else {
26+
- $valid = 1;
27+
- }
28+
+ $valid = 1;
29+
}
30+
}
31+
next;

‎steps/curl-8.12.1/sources‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
https://curl.se/download/curl-8.12.1.tar.xz 0341f1ed97a26c811abaebd37d62b833956792b7607ea3f15d001613c76de202

‎steps/curl-8.5.0/pass1.sh‎

Lines changed: 0 additions & 34 deletions
This file was deleted.

‎steps/curl-8.5.0/pass2.sh‎

Lines changed: 0 additions & 29 deletions
This file was deleted.

‎steps/curl-8.5.0/patches/help.patch‎

Lines changed: 0 additions & 63 deletions
This file was deleted.

‎steps/curl-8.5.0/patches/timeless-mk-ca-bundle.patch‎

Lines changed: 0 additions & 56 deletions
This file was deleted.

0 commit comments

Comments
 (0)