From 060f44e5a52022124fb84c30591f0492cf51fbed Mon Sep 17 00:00:00 2001 From: fosslinux Date: Sun, 8 May 2022 07:59:59 +1000 Subject: [PATCH] Add curl 7.83.0 --- sysa.py | 3 ++ sysa/SHA256SUMS.sources | 1 + sysa/curl-7.83.0/curl-7.83.0.sh | 31 ++++++++++++++++ sysa/curl-7.83.0/files/sinus.pl | 4 +++ sysa/curl-7.83.0/patches/help.patch | 55 +++++++++++++++++++++++++++++ sysa/run.sh | 2 ++ sysc/curl-7.83.0/curl-7.83.0.sh | 29 +++++++++++++++ 7 files changed, 125 insertions(+) create mode 100755 sysa/curl-7.83.0/curl-7.83.0.sh create mode 100644 sysa/curl-7.83.0/files/sinus.pl create mode 100644 sysa/curl-7.83.0/patches/help.patch create mode 100755 sysc/curl-7.83.0/curl-7.83.0.sh diff --git a/sysa.py b/sysa.py index d354d01..8859b4a 100755 --- a/sysa.py +++ b/sysa.py @@ -270,6 +270,9 @@ class SysA(SysGeneral): # make 3.82 self.get_file("https://mirrors.kernel.org/gnu/make/make-3.82.tar.gz") + # curl 7.83.0 + self.get_file("https://curl.se/download/curl-7.83.0.tar.bz2") + # linux kernel 2.6.16.62 self.get_file(["https://cdn.kernel.org/pub/linux/kernel/v4.x/linux-4.9.10.tar.gz", "https://linux-libre.fsfla.org/pub/linux-libre/releases/old/gen6/4.9.10-gnu/deblob-4.9"]) diff --git a/sysa/SHA256SUMS.sources b/sysa/SHA256SUMS.sources index d34d6e4..2ab79bb 100644 --- a/sysa/SHA256SUMS.sources +++ b/sysa/SHA256SUMS.sources @@ -21,6 +21,7 @@ e20bdd49a0fb317959b410c1fe81269a620ec21207045d8a37cadea621be4b59 binutils-2.14. 7007fc89c216fbfaff5525359b02a7e5b612694df5168c74673f67055f015095 bison-3.4.1.tar.gz ab5a03176ee106d3f0fa90e381da478ddae405918153cca248e682cd0c4a2269 bzip2-1.0.8.tar.gz c25b36b8af6e0ad2a875daf4d6196bd0df28a62be7dd252e5f99a4d5d7288d95 coreutils-5.0.tar.bz2 +247c7ec7521c4258e65634e529270d214fe32969971cccb72845e7aa46831f96 curl-7.83.0.tar.bz2 1d013547889f20576460249c4210632d5314531c8477378a2e046b13a8ebeb7e coreutils-6.10.tar.gz af4214b851928a53ef470ed8729122b9db910a6c0769d5d46a5de0b3e96f74f3 deblob-4.9 d5f2489c4056a31528e3ada4adacc23d498532b0af1a980f2f76158162b139d6 diffutils-2.7.tar.gz diff --git a/sysa/curl-7.83.0/curl-7.83.0.sh b/sysa/curl-7.83.0/curl-7.83.0.sh new file mode 100755 index 0000000..4df9b11 --- /dev/null +++ b/sysa/curl-7.83.0/curl-7.83.0.sh @@ -0,0 +1,31 @@ +# SPDX-FileCopyrightText: 2022 fosslinux +# +# SPDX-License-Identifier: GPL-3.0-or-later + +src_prepare() { + default + + # Regnerate src/tool_cb_prg.c + sed -i "53,74d" src/tool_cb_prg.c + sed -i "53 s/^/$(perl sinus.pl | sed "s/, $//")\n/" src/tool_cb_prg.c + + rm src/tool_help.c src/tool_help.h src/tool_listhelp.c src/tool_hugehelp.c + + # Rebuild libtool files + rm config.guess config.sub ltmain.sh + libtoolize + + autoreconf -fi +} + +src_configure() { + LDFLAGS="-static" ./configure \ + --prefix="${PREFIX}" \ + --without-ssl \ + --disable-hsts +} + +src_install() { + default + install -m 755 scripts/mk-ca-bundle.pl "${DESTDIR}/usr/bin/mk-ca-bundle" +} diff --git a/sysa/curl-7.83.0/files/sinus.pl b/sysa/curl-7.83.0/files/sinus.pl new file mode 100644 index 0000000..d497811 --- /dev/null +++ b/sysa/curl-7.83.0/files/sinus.pl @@ -0,0 +1,4 @@ +my $pi = 3.1415; +foreach my $i (1 .. 200) { + printf "%d, ", sin($i/200 * 2 * $pi) * 500000 + 500000; +} diff --git a/sysa/curl-7.83.0/patches/help.patch b/sysa/curl-7.83.0/patches/help.patch new file mode 100644 index 0000000..d06ca19 --- /dev/null +++ b/sysa/curl-7.83.0/patches/help.patch @@ -0,0 +1,55 @@ +diff --color -ru src/Makefile.inc src/Makefile.inc +--- src/Makefile.inc 2022-05-09 16:48:37.195346967 +1000 ++++ src/Makefile.inc 2022-05-09 16:49:46.503187644 +1000 +@@ -69,11 +69,9 @@ + tool_formparse.c \ + tool_getparam.c \ + tool_getpass.c \ +- tool_help.c \ + tool_helpers.c \ + tool_hugehelp.c \ + tool_libinfo.c \ +- tool_listhelp.c \ + tool_main.c \ + tool_msgs.c \ + tool_operate.c \ +@@ -111,7 +109,6 @@ + tool_formparse.h \ + tool_getparam.h \ + tool_getpass.h \ +- tool_help.h \ + tool_helpers.h \ + tool_hugehelp.h \ + tool_libinfo.h \ +diff --color -ru src/tool_operate.c src/tool_operate.c +--- src/tool_operate.c 2022-05-09 16:48:37.196347022 +1000 ++++ src/tool_operate.c 2022-05-09 16:54:00.696271863 +1000 +@@ -78,7 +78,6 @@ + #include "tool_writeout.h" + #include "tool_xattr.h" + #include "tool_vms.h" +-#include "tool_help.h" + #include "tool_hugehelp.h" + #include "tool_progress.h" + #include "dynbuf.h" +@@ -2607,19 +2606,7 @@ + if(res) { + result = CURLE_OK; + +- /* Check if we were asked for the help */ +- if(res == PARAM_HELP_REQUESTED) +- tool_help(global->help_category); +- /* Check if we were asked for the manual */ +- else if(res == PARAM_MANUAL_REQUESTED) +- hugehelp(); +- /* Check if we were asked for the version information */ +- else if(res == PARAM_VERSION_INFO_REQUESTED) +- tool_version_info(); +- /* Check if we were asked to list the SSL engines */ +- else if(res == PARAM_ENGINES_REQUESTED) +- tool_list_engines(); +- else if(res == PARAM_LIBCURL_UNSUPPORTED_PROTOCOL) ++ if(res == PARAM_LIBCURL_UNSUPPORTED_PROTOCOL) + result = CURLE_UNSUPPORTED_PROTOCOL; + else if(res == PARAM_READ_ERROR) + result = CURLE_READ_ERROR; diff --git a/sysa/run.sh b/sysa/run.sh index 192ec61..3a18b72 100755 --- a/sysa/run.sh +++ b/sysa/run.sh @@ -232,6 +232,8 @@ build kbd-1.15 build make-3.82 +build curl-7.83.0 + # Clear up some RAM space grep '^pkg=' /after.kaem | sed 's/pkg="//' | sed 's/"$//' | while read -r p ; do rm -rf "${SOURCES:?}/${p:?}" diff --git a/sysc/curl-7.83.0/curl-7.83.0.sh b/sysc/curl-7.83.0/curl-7.83.0.sh new file mode 100755 index 0000000..aaa4a84 --- /dev/null +++ b/sysc/curl-7.83.0/curl-7.83.0.sh @@ -0,0 +1,29 @@ +# SPDX-FileCopyrightText: 2022 fosslinux +# +# SPDX-License-Identifier: GPL-3.0-or-later + +urls="http://master.dl.sourceforge.net/project/curl.mirror/curl-7_83_0/curl-7.83.0.tar.xz?viasf=1" + +src_prepare() { + default + + # Regnerate src/tool_cb_prg.c + sed -i "53,74d" src/tool_cb_prg.c + sed -i "53 s/^/$(perl sinus.pl | sed "s/, $//")\n/" src/tool_cb_prg.c + + rm src/tool_help.c src/tool_help.h src/tool_listhelp.c src/tool_hugehelp.c + + # Rebuild libtool files + rm config.guess config.sub ltmain.sh + libtoolize + + autoreconf -fi +} + +src_configure() { + LDFLAGS="-static" ./configure \ + --prefix="${PREFIX}" \ + --build=i386-unknown-linux-gnu \ + --with-openssl \ + --with-ca-bundle=/etc/ssl/certs.pem +}