Skip to content

Commit 02ed0da

Browse files
committed
curl: update to 8.12.1
1 parent c00fa39 commit 02ed0da

File tree

12 files changed

+134
-187
lines changed

12 files changed

+134
-187
lines changed

steps/SHA256SUMS.pkgs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,8 +35,8 @@ e8271c1213b6cc7c9ae2ddb018cd093cbbd5f6e842548c0747ce95b13b6b9447 bzip2-1.0.8_0.
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+
455ed6ce610873241cb3ebe827d1965d2a4a6319424604ce6390205d16abdf48 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.12.1/pass1.sh

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

steps/curl-8.12.1/pass2.sh

Lines changed: 44 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,44 @@
1+
# SPDX-FileCopyrightText: 2022 fosslinux <[email protected]>
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+
rm src/tool_listhelp.c src/tool_hugehelp.c
15+
16+
# This one doesn't compile properly
17+
touch docs/libcurl/libcurl-symbols.md docs/libcurl/libcurl-symbols.md
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
41+
make -C src listhelp
42+
43+
default
44+
}
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 <[email protected]>
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)