diff --git a/recipes/autoconf/recipe.sh b/recipes/autoconf/recipe.sh index 7a4c251cbc9bef625ed111f23b6d41877c35da71..750349aa4d5eaa23fc8c302fc78268203d46c455 100644 --- a/recipes/autoconf/recipe.sh +++ b/recipes/autoconf/recipe.sh @@ -1,5 +1,5 @@ -VERSION=2.69 -TAR=http://ftp.gnu.org/gnu/autoconf/autoconf-$VERSION.tar.xz +VERSION=2.71 +TAR=https://ftp.gnu.org/gnu/autoconf/autoconf-$VERSION.tar.xz function recipe_version { echo "$VERSION" diff --git a/recipes/automake/recipe.sh b/recipes/automake/recipe.sh index e93706dc873bcb101199909b0102034a9690dd3f..22776f81a884e6ca43a64ae8b2dd58c5146bc08f 100644 --- a/recipes/automake/recipe.sh +++ b/recipes/automake/recipe.sh @@ -1,5 +1,5 @@ -VERSION=1.15 -TAR=http://ftp.gnu.org/gnu/automake/automake-$VERSION.tar.xz +VERSION=1.16.5 +TAR=https://ftp.gnu.org/gnu/automake/automake-$VERSION.tar.xz function recipe_version { echo "$VERSION" diff --git a/recipes/bash/recipe.toml b/recipes/bash/recipe.toml index e06cc7fadef18077e01fe03a044e6c3c7a329bfc..198bff9dbdfb7f962db5b6d71cc82a74072d3f46 100644 --- a/recipes/bash/recipe.toml +++ b/recipes/bash/recipe.toml @@ -1,5 +1,8 @@ [source] +#git = "https://git.savannah.gnu.org/git/bash.git" +#rev = "a0c0a00fc419b7bc08202a79134fcd5bc0427071" tar = "http://ftp.gnu.org/gnu/bash/bash-4.4.tar.gz" +blake3 = "926927c370142cffa37dfc0a310ec386493b8b558ff3cc062376898154bc7ccb" patches = [ "redox.patch" ] diff --git a/recipes/dosbox/recipe.sh b/recipes/dosbox/recipe.sh index 3cbeabf53b5260657d2c869bd4ff6a6a93451499..8aa594ea1e976a1b679a0742ec214d448f1e8bf3 100644 --- a/recipes/dosbox/recipe.sh +++ b/recipes/dosbox/recipe.sh @@ -1,4 +1,4 @@ -VERSION=0.74 +VERSION=0.74-3 TAR=https://sourceforge.net/projects/dosbox/files/dosbox/$VERSION/dosbox-$VERSION.tar.gz/download BUILD_DEPENDS=(sdl liborbital) diff --git a/recipes/duktape/recipe.sh b/recipes/duktape/recipe.sh index 7333170758b3764b654b92d34880bb7f0893912f..30beb77637456f081f94d2017e8443f3301b9fe1 100644 --- a/recipes/duktape/recipe.sh +++ b/recipes/duktape/recipe.sh @@ -1,5 +1,5 @@ -VERSION=2.2.0 -TAR=http://duktape.org/duktape-$VERSION.tar.xz +VERSION=2.7.0 +TAR=https://duktape.org/duktape-$VERSION.tar.xz function recipe_version { echo "$VERSION" diff --git a/recipes/expat/recipe.toml b/recipes/expat/recipe.toml index 7f5cd3aef22bc04fac3314057d97b51738eec17d..718d1376657207b78a85871e4afb9f7f4a8f8fdf 100644 --- a/recipes/expat/recipe.toml +++ b/recipes/expat/recipe.toml @@ -1,6 +1,8 @@ [source] -tar = "https://github.com/libexpat/libexpat/releases/download/R_2_2_6/expat-2.2.6.tar.bz2" - +#git = "https://github.com/libexpat/libexpat" +#rev = "654d2de0da85662fcc7644a7acd7c2dd2cfb21f0" +tar = "https://github.com/libexpat/libexpat/releases/download/R_2_5_0/expat-2.5.0.tar.xz" +blake3 = "ea89dd9a5a2e48d5e44fed38554b36a8f2e365a5091a99d08e30bfb1c15dda5e" [build] template = "custom" script = """ diff --git a/recipes/ffmpeg/recipe.toml b/recipes/ffmpeg/recipe.toml index 49a6e873a4ab71843b7e0694b941d9e46e3a3b27..e7ee861e609845817406d61b1f60ca8de1134268 100644 --- a/recipes/ffmpeg/recipe.toml +++ b/recipes/ffmpeg/recipe.toml @@ -1,5 +1,8 @@ [source] +#git = "https://git.ffmpeg.org/ffmpeg.git" +#rev = "eacfcbae690f914a4b1b4ad06999f138540cc3d8" tar = "https://ffmpeg.org/releases/ffmpeg-5.1.2.tar.xz" +blake3 = "69fddb793c6b4fb6fd1093e54c8228c3c498614be3e48c311bb3f609a12daf5f" patches = [ "ffmpeg.patch" ] diff --git a/recipes/fontconfig/recipe.toml b/recipes/fontconfig/recipe.toml index 055e18f8c924147ed4639605a81043704678da78..b230274b728a75dec299403fc044a9b73980e7cd 100755 --- a/recipes/fontconfig/recipe.toml +++ b/recipes/fontconfig/recipe.toml @@ -1,5 +1,8 @@ [source] -tar = "https://www.freedesktop.org/software/fontconfig/release/fontconfig-2.13.91.tar.xz" +#git = "https://gitlab.freedesktop.org/fontconfig/fontconfig" +#rev = "a919700fbde28c29ccdb1d2a8bceba80ade19e73" +tar = "https://www.freedesktop.org/software/fontconfig/release/fontconfig-2.14.2.tar.xz" +blake3 = "dc342745b8e19ecda458464a9df7cf1266d0af759b230d07f43964b34ca86581" patches = [ "redox.patch" ] diff --git a/recipes/freetype/recipe.toml b/recipes/freetype/recipe.toml index ce535b7cc4b9e9fc77b2d3c7ac1671eacf192d56..8b027d1575f0d5a0856ca90b0e31aa0e045452a1 100644 --- a/recipes/freetype/recipe.toml +++ b/recipes/freetype/recipe.toml @@ -1,6 +1,8 @@ [source] -tar = "https://download.savannah.gnu.org/releases/freetype/freetype-2.9.1.tar.gz" - +#git = "https://gitlab.freedesktop.org/freetype/freetype" +#rev = "de8b92dd7ec634e9e2b25ef534c54a3537555c11" +tar = "https://download.savannah.gnu.org/releases/freetype/freetype-2.13.0.tar.gz" +blake3 = "8bf2db46b2a406d63da15d65b12ff986c6ac9a62cc10d429b03b4db58ea78f35" [build] template = "configure" dependencies = [ diff --git a/recipes/fribidi/recipe.sh b/recipes/fribidi/recipe.sh index 33e5eaecc1e6d5e651de476773e641bb96221d6a..3cf595220d0e1458c2089141fc0e4c689515edd9 100755 --- a/recipes/fribidi/recipe.sh +++ b/recipes/fribidi/recipe.sh @@ -1,5 +1,5 @@ -VERSION="1.0.5" -TAR="https://github.com/fribidi/fribidi/releases/download/v${VERSION}/fribidi-${VERSION}.tar.bz2" +VERSION="1.0.13" +TAR="https://github.com/fribidi/fribidi/releases/download/v${VERSION}/fribidi-${VERSION}.tar.xz" BUILD_DEPENDS=() function recipe_version { diff --git a/recipes/gettext/recipe.toml b/recipes/gettext/recipe.toml index 3c653274ae016162d829c9e6dc33c47cfc3d2009..d22a53213f452622b72e09c475750e1504425640 100644 --- a/recipes/gettext/recipe.toml +++ b/recipes/gettext/recipe.toml @@ -1,5 +1,8 @@ [source] -tar = "http://ftp.gnu.org/pub/gnu/gettext/gettext-0.19.8.1.tar.xz" +#git = "https://git.savannah.gnu.org/git/gettext.git" +#rev = "c737bf843616ca984c9416048a2da845e9ad3f50" +tar = "https://ftp.gnu.org/pub/gnu/gettext/gettext-0.21.1.tar.gz" +blake3 = "0d0af5a79978fbeac4641ee64480943650af99f70467353e7c3068ffd5523acd" patches = [ "redox.patch" ] diff --git a/recipes/harfbuzz/recipe.toml b/recipes/harfbuzz/recipe.toml index f0e35352d37f36cfed07b55112fa536ebd9e2aa2..f84afeaf9edddd847d69296985ea3a6c6af6481b 100644 --- a/recipes/harfbuzz/recipe.toml +++ b/recipes/harfbuzz/recipe.toml @@ -1,6 +1,8 @@ [source] -tar = "https://www.freedesktop.org/software/harfbuzz/release/harfbuzz-2.3.0.tar.bz2" - +#git = "https://github.com/harfbuzz/harfbuzz" +#rev = "4941e95f10fe0fe658752134a42b58896fb19c42" +tar = "https://github.com/harfbuzz/harfbuzz/releases/download/7.3.0/harfbuzz-7.3.0.tar.xz" +blake3 = "6572676ffef55bd37bacdd33052bedfb07333b659371495a2a26b9825ce685c0" [build] template = "custom" dependencies = [ diff --git a/recipes/libffi/recipe.toml b/recipes/libffi/recipe.toml index cebe71c4a7add45736cfa3f3b0e7762a675d6d58..57436905a35c0411472ae909c806de80d27fd73e 100644 --- a/recipes/libffi/recipe.toml +++ b/recipes/libffi/recipe.toml @@ -1,5 +1,8 @@ [source] +#git = "https://github.com/libffi/libffi" +#rev = "20562ac0427c3578250d04c6e34fb0127d4551cf" tar = "https://sourceware.org/pub/libffi/libffi-3.2.1.tar.gz" +blake3 = "a00597a8bd26304977d7c180135e91969a175a5108bd0024a03eb0636e6cb0bf" patches = [ "redox.patch" ] diff --git a/recipes/libgmp/recipe.toml b/recipes/libgmp/recipe.toml index ce91a89a8a798c43dccb4bfa5bb8b6a6b1122149..e464785cda2cafe32c843f911f27fdd82da375aa 100644 --- a/recipes/libgmp/recipe.toml +++ b/recipes/libgmp/recipe.toml @@ -1,5 +1,5 @@ [source] tar = "https://gmplib.org/download/gmp/gmp-6.2.1.tar.xz" - +blake3 = "52cecfbbe286820d1f8bc118769008acb6451bd074fe6dea9e868d54b2ada855" [build] template = "configure" diff --git a/recipes/libiconv/recipe.toml b/recipes/libiconv/recipe.toml index 5ab4337a1a3b4345e1d32d63b9461abd4f516d9c..b7663624609e15a21c83c635b4ecd687365b02b7 100644 --- a/recipes/libiconv/recipe.toml +++ b/recipes/libiconv/recipe.toml @@ -1,5 +1,8 @@ [source] +#git = "https://git.savannah.gnu.org/git/libiconv.git" +#rev = "941f63afe17adcb01e150e29ddb50c6fd40f1291" tar = "https://ftp.gnu.org/pub/gnu/libiconv/libiconv-1.15.tar.gz" +blake3 = "b736af4e8245ae9f1618ef226a3bf2a998334b745520565cf413c0a7d54b6924" patches = [ "01_redox.patch" ] diff --git a/recipes/libjpeg/recipe.toml b/recipes/libjpeg/recipe.toml index 47859e1d2f24de04c2f527dfd2871bba557fb4e7..cfd3a69d4619b37c37d3508dd1f3f7844ab4e654 100644 --- a/recipes/libjpeg/recipe.toml +++ b/recipes/libjpeg/recipe.toml @@ -1,5 +1,5 @@ [source] -tar = "http://ijg.org/files/jpegsrc.v9c.tar.gz" - +tar = "http://ijg.org/files/jpegsrc.v9e.tar.gz" +blake3 = "f0d6072e15de609397cbd8428758d7054dd921dc448018111e3822b17bcbcc5d" [build] template = "configure" diff --git a/recipes/libogg/recipe.toml b/recipes/libogg/recipe.toml index 593947f58285e376c576676cad20ebfddb53ba41..7e61376e6eda091a57e5fafa65d78f2e418ee316 100644 --- a/recipes/libogg/recipe.toml +++ b/recipes/libogg/recipe.toml @@ -1,4 +1,6 @@ [source] +#git = "https://gitlab.xiph.org/xiph/ogg" +#rev = "4380566a44b8d5e85ad511c9c17eb04197863ec5" tar = "http://downloads.xiph.org/releases/ogg/libogg-1.3.3.tar.xz" blake3 = "8220c0e4082fa26c07b10bfe31f641d2e33ebe1d1bb0b20221b7016bc8b78a3a" patches = [ diff --git a/recipes/libpng/recipe.toml b/recipes/libpng/recipe.toml index 0c6f6942a3fec88e9f126013b7d420a2096aece7..450902edc386a1febe62048a38200896d41c0873 100644 --- a/recipes/libpng/recipe.toml +++ b/recipes/libpng/recipe.toml @@ -1,5 +1,8 @@ [source] -tar = "https://github.com/glennrp/libpng/archive/v1.6.36.tar.gz" +#git = "https://github.com/glennrp/libpng" +#rev = "eddf9023206dc40974c26f589ee2ad63a4227a1e" +tar = "https://github.com/glennrp/libpng/archive/v1.6.39.tar.gz" +blake3 = "02513cc5d15ac79c4c402f2ae623425f4f80bdbbf15ebc95430fb8ccfc987996" script = """ chmod +w config.sub wget -O config.sub "https://gitlab.redox-os.org/redox-os/gnu-config/-/raw/master/config.sub?inline=false" diff --git a/recipes/libvorbis/recipe.toml b/recipes/libvorbis/recipe.toml index 47facfd6693f7d529866e8e3a405d4b414903ea4..8b2541f9350bf94224e7073fe61f66124cd504c0 100644 --- a/recipes/libvorbis/recipe.toml +++ b/recipes/libvorbis/recipe.toml @@ -1,7 +1,8 @@ [source] -tar = "http://downloads.xiph.org/releases/vorbis/libvorbis-1.3.6.tar.xz" -sha256 = "af00bb5a784e7c9e69f56823de4637c350643deedaf333d0fa86ecdba6fcb415" - +#git = "https://gitlab.xiph.org/xiph/vorbis" +#rev = "0657aee69dec8508a0011f47f3b69d7538e9d262" +tar = "https://downloads.xiph.org/releases/vorbis/libvorbis-1.3.7.tar.gz" +blake3 = "a8e88482b8d70321c8435616b0cec1a931b11445f003649774fd6940e593a254" [build] template = "configure" dependencies = [ diff --git a/recipes/mednafen/recipe.toml b/recipes/mednafen/recipe.toml index c4cf7850ce08fdf4de1d55bb1300e5a1b67033fd..829674b8c3d0dd672e1f52de80a0344ba17ba021 100644 --- a/recipes/mednafen/recipe.toml +++ b/recipes/mednafen/recipe.toml @@ -1,5 +1,6 @@ [source] tar = "https://mednafen.github.io/releases/files/mednafen-1.29.0.tar.xz" +blake3 = "c75c1044cdc9328b2349915a67972d6135c77eb53eb0d995788f22b7daacf79b" patches = [ "redox.patch", ] diff --git a/recipes/ncurses/recipe.sh b/recipes/ncurses/recipe.sh index 590cbfedb9d4d927b58822576cf74d67d08c0c0d..f20be355c241682eddab36ea556de7c85b26c05f 100644 --- a/recipes/ncurses/recipe.sh +++ b/recipes/ncurses/recipe.sh @@ -1,5 +1,5 @@ -VERSION=6.1 -TAR=http://ftp.gnu.org/gnu/ncurses/ncurses-$VERSION.tar.gz +VERSION=6.4 +TAR=https://ftp.gnu.org/gnu/ncurses/ncurses-$VERSION.tar.gz DEPENDS="terminfo" function recipe_version { diff --git a/recipes/nghttp2/recipe.toml b/recipes/nghttp2/recipe.toml index ec652b1d79b6e56ba3739a097aad47532731cf65..0688c1ebb65069ff1a155cd38f3bdbcb8cff50bf 100644 --- a/recipes/nghttp2/recipe.toml +++ b/recipes/nghttp2/recipe.toml @@ -1,7 +1,8 @@ [source] -tar = "https://github.com/nghttp2/nghttp2/releases/download/v1.50.0/nghttp2-1.50.0.tar.xz" -blake3 = "ac40e313ebb5fb341f82cec8daa4795673b27ff02061dfbf980ca1dbe8dc4115" - +#git = "https://github.com/nghttp2/nghttp2" +#rev = "be0491294a63d891bd12b6b1b7e372a45a5d0ffe" +tar = "https://github.com/nghttp2/nghttp2/releases/download/v1.53.0/nghttp2-1.53.0.tar.xz" +blake3 = "bad5f220a66b7e6f3df20f69f4fc7e7beca46e6c143fc63b95a2656a2e897caf" [build] template = "custom" script = """ diff --git a/recipes/noto-color-emoji/recipe.toml b/recipes/noto-color-emoji/recipe.toml index d04d1fdc106a5fde2ff4820dbc747d559e98ce2d..7076bb1d49deefc8ad2457388c67815dbceffde5 100644 --- a/recipes/noto-color-emoji/recipe.toml +++ b/recipes/noto-color-emoji/recipe.toml @@ -1,7 +1,6 @@ [source] -tar = "https://github.com/googlefonts/noto-emoji/archive/refs/tags/v2.038.tar.gz" -blake3 = "68967033281403aaeb0de59a95343a3cc4a76cbc9c3384cec93f2d46ac71037f" - +git = "https://github.com/googlefonts/noto-emoji" +rev = "e8073ab740292f8d5f19b5de144087ac58044d06" [build] template = "custom" script = """ diff --git a/recipes/patch/recipe.sh b/recipes/patch/recipe.sh index 831d1a57038df6f8ebd3276c3fb68d4f8b4b36a4..bcf14cce9db48a087fe8912c38429736317a1ab5 100644 --- a/recipes/patch/recipe.sh +++ b/recipes/patch/recipe.sh @@ -1,5 +1,5 @@ -VERSION=2.7.5 -TAR=http://ftp.gnu.org/gnu/patch/patch-$VERSION.tar.xz +VERSION=2.7.6 +TAR=https://ftp.gnu.org/gnu/patch/patch-$VERSION.tar.xz function recipe_version { echo "$VERSION" diff --git a/recipes/pcre/recipe.toml b/recipes/pcre/recipe.toml index 68c4f718feb26543ff8e50099e16039bc7b50e51..fc2c92fe7b4fe98629ffb28f8c634cb9d11d4b6d 100644 --- a/recipes/pcre/recipe.toml +++ b/recipes/pcre/recipe.toml @@ -1,5 +1,6 @@ [source] tar = "https://mirrors.gigenet.com/OSDN//sfnet/p/pc/pcre/pcre/8.42/pcre-8.42.tar.gz" +blake3 = "12d515ba12a816994def6b1e7196b5783fd2cfe495733a9167fa4d71dbe10248" patches = [ "redox.patch" ] diff --git a/recipes/perg/recipe.toml b/recipes/perg/recipe.toml index f5390a215dac5dc3fa2de6f734f9c14877359612..e073545daa8c0651132ae6b1ed4112c8a93c0753 100644 --- a/recipes/perg/recipe.toml +++ b/recipes/perg/recipe.toml @@ -1,5 +1,5 @@ [source] git = "https://github.com/guerinoni/perg.git" - +rev = "e206fab6bbd9c363c686fa7503d318304e48ddbe" [build] template = "cargo" diff --git a/recipes/pixman/recipe.sh b/recipes/pixman/recipe.sh index c6a90c9de4a85cbb81c69b760c00e2088104f57f..6db72d0688ecc8f8399fc0e79fc39d82a3f7e89a 100755 --- a/recipes/pixman/recipe.sh +++ b/recipes/pixman/recipe.sh @@ -1,4 +1,4 @@ -VERSION="0.36.0" +VERSION="0.42.2" TAR=https://www.cairographics.org/releases/pixman-$VERSION.tar.gz function recipe_version { diff --git a/recipes/pkg-config/recipe.toml b/recipes/pkg-config/recipe.toml index a94241461a1b82c1b56cbf297789a27d70659e3d..6a26f9ecee0249a5eee8de02b5c567df2f61c533 100755 --- a/recipes/pkg-config/recipe.toml +++ b/recipes/pkg-config/recipe.toml @@ -1,5 +1,8 @@ [source] +#git = "https://gitlab.freedesktop.org/pkg-config/pkg-config" +#rev = "edf8e6f0ea77ede073f07bff0d2ae1fc7a38103b" tar = "https://pkg-config.freedesktop.org/releases/pkg-config-0.29.2.tar.gz" +blake3 = "713372b09a1fafeec130dc9bf812a3880f2a90496af5d2194e508d91ccf667d0" script = """ wget -O config.sub "https://gitlab.redox-os.org/redox-os/gnu-config/-/raw/master/config.sub?inline=false" """ diff --git a/recipes/readline/recipe.toml b/recipes/readline/recipe.toml index b863fdc27e9a30ce7cc54f636ddd7edb3962ea19..0a5664c3dffe7963794613a90441bddb457fb104 100644 --- a/recipes/readline/recipe.toml +++ b/recipes/readline/recipe.toml @@ -1,5 +1,8 @@ [source] +#git = "https://git.savannah.gnu.org/git/readline.git" +#rev = "d49a9082c0e15bba8cd3d8cc0a994409cf823cac" tar = "http://ftp.gnu.org/gnu/readline/readline-7.0.tar.gz" +blake3 = "962483e201f36f05a5ccb507bb7330b4d4e4989fd52f41eb15ba65582ad02703" patches = [ "redox.patch" ] diff --git a/recipes/xz/01-no-poll.patch b/recipes/xz/01-no-poll.patch deleted file mode 100644 index 3c36484fec4a58f46555a09484d8088eb55d1638..0000000000000000000000000000000000000000 --- a/recipes/xz/01-no-poll.patch +++ /dev/null @@ -1,55 +0,0 @@ -diff -ru source/src/xz/file_io.c source-new/src/xz/file_io.c ---- source/src/xz/file_io.c 2016-12-30 03:13:57.000000000 -0800 -+++ source-new/src/xz/file_io.c 2017-08-08 12:34:08.453700076 -0700 -@@ -17,7 +17,7 @@ - #ifdef TUKLIB_DOSLIKE - # include <io.h> - #else --# include <poll.h> -+//# include <poll.h> - static bool warn_fchown; - #endif - -@@ -222,7 +222,7 @@ - #endif // ENABLE_SANDBOX - - --#ifndef TUKLIB_DOSLIKE -+#if 0 - /// \brief Waits for input or output to become available or for a signal - /// - /// This uses the self-pipe trick to avoid a race condition that can occur -@@ -704,6 +704,7 @@ - // If it is something else than a regular file, wait until - // there is input available. This way reading from FIFOs - // will work when open() is used with O_NONBLOCK. -+#if 0 - if (!S_ISREG(pair->src_st.st_mode)) { - signals_unblock(); - const io_wait_ret ret = io_wait(pair, -1, true); -@@ -713,6 +714,7 @@ - goto error; - } - #endif -+#endif - - #ifdef HAVE_POSIX_FADVISE - // It will fail with some special files like FIFOs but that is fine. -@@ -1127,7 +1129,7 @@ - continue; - } - --#ifndef TUKLIB_DOSLIKE -+#if 0 - if (IS_EAGAIN_OR_EWOULDBLOCK(errno)) { - const io_wait_ret ret = io_wait(pair, - mytime_get_flush_timeout(), -@@ -1215,7 +1217,7 @@ - continue; - } - --#ifndef TUKLIB_DOSLIKE -+#if 0 - if (IS_EAGAIN_OR_EWOULDBLOCK(errno)) { - if (io_wait(pair, -1, false) == IO_WAIT_MORE) - continue; diff --git a/recipes/xz/02-o_noctty.patch b/recipes/xz/02-o_noctty.patch deleted file mode 100644 index 2ad56398fde29b6c775466b17dc529b57d3958ec..0000000000000000000000000000000000000000 --- a/recipes/xz/02-o_noctty.patch +++ /dev/null @@ -1,14 +0,0 @@ -diff -ru source/src/common/tuklib_open_stdxxx.c source-new/src/common/tuklib_open_stdxxx.c ---- source/src/common/tuklib_open_stdxxx.c 2016-12-30 03:08:20.000000000 -0800 -+++ source-new/src/common/tuklib_open_stdxxx.c 2017-08-08 12:38:10.703829409 -0700 -@@ -35,8 +35,8 @@ - // writing to stdin would fail. However, /dev/full - // is Linux specific, and if the program tries to - // write to stdin, there's already a problem anyway. -- const int fd = open("/dev/null", O_NOCTTY -- | (i == 0 ? O_WRONLY : O_RDONLY)); -+ const int fd = open("/dev/null", -+ (i == 0 ? O_WRONLY : O_RDONLY)); - - if (fd != i) { - if (fd != -1) diff --git a/recipes/xz/03-no-signals.patch b/recipes/xz/03-no-signals.patch deleted file mode 100644 index 5fce80eaa49edc5d38e51a9eafaeb6f329c0200c..0000000000000000000000000000000000000000 --- a/recipes/xz/03-no-signals.patch +++ /dev/null @@ -1,47 +0,0 @@ -diff -ru source/src/xz/message.c source-new/src/xz/message.c ---- source/src/xz/message.c 2016-12-30 03:08:20.000000000 -0800 -+++ source-new/src/xz/message.c 2017-08-08 12:44:30.584447139 -0700 -@@ -135,7 +135,7 @@ - } - */ - --#ifdef SIGALRM -+#if 0 - // Establish the signal handlers which set a flag to tell us that - // progress info should be updated. - struct sigaction sa; -diff -ru source/src/xz/signals.c source-new/src/xz/signals.c ---- source/src/xz/signals.c 2016-12-30 03:08:20.000000000 -0800 -+++ source-new/src/xz/signals.c 2017-08-08 12:41:59.624111395 -0700 -@@ -53,6 +53,7 @@ - extern void - signals_init(void) - { -+#if 0 - // List of signals for which we establish the signal handler. - static const int sigs[] = { - SIGINT, -@@ -112,6 +113,7 @@ - signals_are_initialized = true; - - return; -+#endif - } - - -@@ -152,6 +154,7 @@ - extern void - signals_exit(void) - { -+#if 0 - const int sig = exit_signal; - - if (sig != 0) { -@@ -171,6 +174,7 @@ - } - - return; -+#endif - } - - #else diff --git a/recipes/xz/recipe.toml b/recipes/xz/recipe.toml index 31958a6719fd445880653d1dada45e461fd31838..abf0f42844b5ebab8e9da5a8cc86c4aa92fcccd1 100644 --- a/recipes/xz/recipe.toml +++ b/recipes/xz/recipe.toml @@ -1,5 +1,8 @@ [source] -tar = "https://codeload.github.com/xz-mirror/xz/tar.gz/v5.2.5" +#git = "https://github.com/tukaani-project/xz" +#rev = "2327a461e1afce862c22269b80d3517801103c1b" +tar = "https://tukaani.org/xz/xz-5.4.3.tar.xz" +blake3 = "4b1b814bcf3794973fe9076d549a0edfbee01d2fd57821fe3280537ef6c7deae" script = """ ./autogen.sh """ diff --git a/recipes/zlib/recipe.toml b/recipes/zlib/recipe.toml index 6bb6c7fe5966fc876cf9fe19dccf0c57f1f0b7a5..122a1d1d2967bc36a1e56f5579d1a6fefb688700 100644 --- a/recipes/zlib/recipe.toml +++ b/recipes/zlib/recipe.toml @@ -1,7 +1,8 @@ [source] -tar = "http://zlib.net/fossils/zlib-1.2.12.tar.gz" -blake3 = "b7ad5638d87c69665afaae138bab40cc9a53a7ae7da9d168303e3df6b051d2b5" - +#git = "https://github.com/madler/zlib" +#rev = "04f42ceca40f73e2978b50e93806c2a18c1281fc" +tar = "https://zlib.net/zlib-1.2.13.tar.xz" +blake3 = "cc042bf8507e02f5799cf6fdb49278402a7b748defe3ade425e35e14a7c00186" [build] template = "custom" script = """