diff --git a/Ports/SDL2/package.sh b/Ports/SDL2/package.sh index e90e459449..116c3acf5e 100755 --- a/Ports/SDL2/package.sh +++ b/Ports/SDL2/package.sh @@ -3,7 +3,6 @@ port=SDL2 version=serenity-git workdir=SDL-master-serenity useconfigure=true -curlopts="-L" files="https://github.com/SerenityOS/SDL/archive/master-serenity.tar.gz SDL2-git.tar.gz" configopts="-DCMAKE_TOOLCHAIN_FILE=$SERENITY_ROOT/Toolchain/CMakeToolchain.txt -DPULSEAUDIO=OFF" diff --git a/Ports/bash/package.sh b/Ports/bash/package.sh index 56daeb313f..019c34a5d7 100755 --- a/Ports/bash/package.sh +++ b/Ports/bash/package.sh @@ -3,7 +3,11 @@ port=bash version=5.0 useconfigure=true configopts="--disable-nls --without-bash-malloc" -files="https://ftp.gnu.org/gnu/bash/bash-5.0.tar.gz bash-5.0.tar.gz" +files="https://ftp.gnu.org/gnu/bash/bash-${version}.tar.gz bash-${version}.tar.gz +https://ftp.gnu.org/gnu/bash/bash-${version}.tar.gz.sig bash-${version}.tar.gz.sig +https://ftp.gnu.org/gnu/gnu-keyring.gpg gnu-keyring.gpg" +auth_type="sig" +auth_opts="--keyring ./gnu-keyring.gpg bash-${version}.tar.gz.sig" build() { run_replace_in_file "s/define GETCWD_BROKEN 1/undef GETCWD_BROKEN/" config.h diff --git a/Ports/bc/package.sh b/Ports/bc/package.sh index 9e6f07962f..f467b0b3ba 100755 --- a/Ports/bc/package.sh +++ b/Ports/bc/package.sh @@ -1,10 +1,13 @@ #!/bin/bash ../.port_include.sh port=bc version=2.5.1 -curlopts="-L" -files="https://github.com/gavinhoward/bc/releases/download/2.5.1/bc-2.5.1.tar.xz bc-2.5.1.tar.xz" +files="https://github.com/gavinhoward/bc/releases/download/${version}/bc-${version}.tar.xz bc-${version}.tar.xz +https://github.com/gavinhoward/bc/releases/download/${version}/bc-${version}.tar.xz.sig bc-${version}.tar.xz.sig" useconfigure=true configscript=configure.sh +auth_type="sig" +auth_import_key="E2A30324A4465A4D5882692EC08038BDF280D33E" +auth_opts="bc-${version}.tar.xz.sig" configure() { run env HOSTCC=gcc ./"$configscript" diff --git a/Ports/binutils/package.sh b/Ports/binutils/package.sh index 7bd21d6dd8..27d443198e 100755 --- a/Ports/binutils/package.sh +++ b/Ports/binutils/package.sh @@ -3,4 +3,8 @@ port=binutils version=2.32 useconfigure=true configopts="--target=i686-pc-serenity --with-sysroot=/ --with-build-sysroot=$SERENITY_ROOT/Root --disable-werror --disable-gdb --disable-nls" -files="https://ftp.gnu.org/gnu/binutils/binutils-2.32.tar.xz binutils-2.32.tar.xz" +files="https://ftp.gnu.org/gnu/binutils/binutils-${version}.tar.xz binutils-${version}.tar.xz +https://ftp.gnu.org/gnu/binutils/binutils-${version}.tar.xz.sig binutils-${version}.tar.xz.sig +https://ftp.gnu.org/gnu/gnu-keyring.gpg gnu-keyring.gpg" +auth_type="sig" +auth_opts="--keyring ./gnu-keyring.gpg binutils-${version}.tar.xz.sig" diff --git a/Ports/byacc/package.sh b/Ports/byacc/package.sh index 86cedfa383..859f0de561 100755 --- a/Ports/byacc/package.sh +++ b/Ports/byacc/package.sh @@ -1,5 +1,9 @@ #!/bin/bash ../.port_include.sh port=byacc version=20191125 -files="https://invisible-mirror.net/archives/byacc/byacc-20191125.tgz byacc-20191125.tgz" +files="https://invisible-mirror.net/archives/byacc/byacc-${version}.tgz byacc-${version}.tgz +https://invisible-mirror.net/archives/byacc/byacc-${version}.tgz.asc byacc-${version}.tgz.asc" useconfigure=true +auth_type="sig" +auth_import_key="C52048C0C0748FEE227D47A2702353E0F7E48EDB" +auth_opts="byacc-${version}.tgz.asc byacc-${version}.tgz" diff --git a/Ports/c-ray/package.sh b/Ports/c-ray/package.sh index 27148b357b..b66a668464 100755 --- a/Ports/c-ray/package.sh +++ b/Ports/c-ray/package.sh @@ -3,7 +3,6 @@ port=c-ray version=git workdir=c-ray-master useconfigure=true -curlopts="-L" files="https://github.com/vkoskiv/c-ray/archive/master.tar.gz c-ray-git.tar.gz" configopts="-DCMAKE_TOOLCHAIN_FILE=$SERENITY_ROOT/Toolchain/CMakeToolchain.txt -DNO_SDL2=True" diff --git a/Ports/curl/package.sh b/Ports/curl/package.sh index 0928376f71..125987d50e 100755 --- a/Ports/curl/package.sh +++ b/Ports/curl/package.sh @@ -3,5 +3,10 @@ port=curl version=7.65.3 useconfigure=true configopts="--disable-threaded-resolver" -files="https://curl.haxx.se/download/curl-7.65.3.tar.bz2 curl-7.65.3.tar.bz2" +files="https://curl.haxx.se/download/curl-${version}.tar.bz2 curl-${version}.tar.bz2 +https://curl.haxx.se/download/curl-${version}.tar.bz2.asc curl-${version}.tar.bz2.asc" + depends=zlib +auth_type="sig" +auth_import_key="27EDEAF22F3ABCEB50DB9A125CC908FDB71E12C2" +auth_opts="curl-${version}.tar.bz2.asc curl-${version}.tar.bz2" diff --git a/Ports/diffutils/package.sh b/Ports/diffutils/package.sh index cce5eee5af..fb3c3a96ed 100755 --- a/Ports/diffutils/package.sh +++ b/Ports/diffutils/package.sh @@ -1,5 +1,9 @@ #!/bin/bash ../.port_include.sh port=diffutils version=3.5 -files="https://ftp.gnu.org/gnu/diffutils/diffutils-3.5.tar.xz diffutils-3.5.tar.xz" +files="https://ftp.gnu.org/gnu/diffutils/diffutils-${version}.tar.xz diffutils-${version}.tar.xz +https://ftp.gnu.org/gnu/diffutils/diffutils-${version}.tar.xz.sig diffutils-${version}.tar.xz.sig +https://ftp.gnu.org/gnu/gnu-keyring.gpg gnu-keyring.gpg" useconfigure=true +auth_type="sig" +auth_opts="--keyring ./gnu-keyring.gpg diffutils-${version}.tar.xz.sig" diff --git a/Ports/doom/package.sh b/Ports/doom/package.sh index a58e8778c2..49c982ea12 100755 --- a/Ports/doom/package.sh +++ b/Ports/doom/package.sh @@ -2,7 +2,6 @@ port=doom workdir=SerenityDOOM-master version=serenity-git -curlopts="-L" files="https://github.com/SerenityOS/SerenityDOOM/archive/master.tar.gz doom-git.tar.gz" makeopts="-C doomgeneric/" installopts="-C doomgeneric/" diff --git a/Ports/figlet/package.sh b/Ports/figlet/package.sh index a971e02142..8b40ef9319 100755 --- a/Ports/figlet/package.sh +++ b/Ports/figlet/package.sh @@ -1,5 +1,5 @@ #!/bin/bash ../.port_include.sh port=figlet version=2.2.5 -files="http://ftp.figlet.org/pub/figlet/program/unix/figlet-2.2.5.tar.gz figlet-2.2.5.tar.gz" +files="http://ftp.figlet.org/pub/figlet/program/unix/figlet-2.2.5.tar.gz figlet-2.2.5.tar.gz d88cb33a14f1469fff975d021ae2858e" makeopts="CC=i686-pc-serenity-gcc LD=i686-pc-serenity-gcc" diff --git a/Ports/flex/package.sh b/Ports/flex/package.sh index 912aec5a63..34f28bd084 100755 --- a/Ports/flex/package.sh +++ b/Ports/flex/package.sh @@ -1,8 +1,11 @@ #!/bin/bash ../.port_include.sh port=flex version=2.6.4 -curlopts="-L" -files="https://github.com/westes/flex/releases/download/v2.6.4/flex-2.6.4.tar.gz flex-2.6.4.tar.gz" +files="https://github.com/westes/flex/releases/download/v${version}/flex-${version}.tar.gz flex-${version}.tar.gz +https://github.com/westes/flex/releases/download/v${version}/flex-${version}.tar.gz.sig flex-${version}.tar.gz.sig" useconfigure=true configopts=--disable-bootstrap depends="m4 pcre2" +auth_type="sig" +auth_import_key="E4B29C8D64885307" +auth_opts="flex-${version}.tar.gz.sig" diff --git a/Ports/gcc/package.sh b/Ports/gcc/package.sh index 96779e24d6..5ac8c82716 100755 --- a/Ports/gcc/package.sh +++ b/Ports/gcc/package.sh @@ -3,23 +3,16 @@ port=gcc version=9.2.0 useconfigure=true configopts="--target=i686-pc-serenity --with-sysroot=/ --with-build-sysroot=$SERENITY_ROOT/Root --with-newlib --enable-languages=c,c++ --disable-lto --disable-nls" -files="https://ftp.gnu.org/gnu/gcc/gcc-9.2.0/gcc-9.2.0.tar.xz gcc-9.2.0.tar.xz" +files="https://ftp.gnu.org/gnu/gcc/gcc-${version}/gcc-${version}.tar.xz gcc-${version}.tar.xz +https://ftp.gnu.org/gnu/gcc/gcc-${version}/gcc-${version}.tar.xz.sig gcc-${version}.tar.xz.sig +https://ftp.gnu.org/gnu/gnu-keyring.gpg gnu-keyring.gpg" makeopts="all-gcc all-target-libgcc all-target-libstdc++-v3 -j $(nproc)" installopts="DESTDIR=$SERENITY_ROOT/Root install-gcc install-target-libgcc install-target-libstdc++-v3" depends="binutils" - -fetch() { - read url filename <<< $(echo "$files") - if [ -f "$filename" ]; then - echo "$filename already exists" - else - run_nocd curl -O "$url" -o "$filename" - fi - run_nocd tar xf "$filename" +auth_type="sig" +auth_opts="--keyring ./gnu-keyring.gpg gcc-${version}.tar.xz.sig" +post_fetch() { run contrib/download_prerequisites - for f in patches/*; do - run patch -p1 < "$f" - done } build() { run make $makeopts diff --git a/Ports/grep/package.sh b/Ports/grep/package.sh index ae4ae1209d..aab2342bc2 100755 --- a/Ports/grep/package.sh +++ b/Ports/grep/package.sh @@ -1,6 +1,11 @@ #!/bin/bash ../.port_include.sh port=grep version=2.5.4 -files="https://ftp.gnu.org/gnu/grep/grep-2.5.4.tar.gz grep-2.5.4.tar.gz" +files="https://ftp.gnu.org/gnu/grep/grep-${version}.tar.gz grep-${version}.tar.gz +https://ftp.gnu.org/gnu/grep/grep-${version}.tar.gz.sig grep-${version}.tar.gz.sig +https://ftp.gnu.org/gnu/gnu-keyring.gpg gnu-keyring.gpg" + useconfigure=true configopts=--disable-perl-regexp +auth_type="sig" +auth_opts="--keyring ./gnu-keyring.gpg grep-${version}.tar.gz.sig" \ No newline at end of file diff --git a/Ports/klong/patches/klong.patch b/Ports/klong/patches/klong.patch index 4d8be18b94..e1bd99cd9a 100644 --- a/Ports/klong/patches/klong.patch +++ b/Ports/klong/patches/klong.patch @@ -6,21 +6,21 @@ +CC= i686-pc-serenity-gcc $(CFLAGS) V= 20190330 R= 20190926 - + # Modules to load into image file OPTIONS=-l nstat -l nplot -l time - + -all: kg klong.image +all: kg - + klong.image: kg ./kg -n $(OPTIONS) -o klong.image @@ -48,3 +48,8 @@ - + mksums: clean find . -type f | grep -v _csums | grep -v klong2015 | csum >_csums + +install: + install kg ${DESTDIR}/usr/local/bin -+ mkdir ${DESTDIR}/usr/local/lib/klong ++ mkdir -p ${DESTDIR}/usr/local/lib/klong + install -m 644 lib/* ${DESTDIR}/usr/local/lib/klong diff --git a/Ports/less/package.sh b/Ports/less/package.sh index 2cb55c6142..7a19471f7f 100755 --- a/Ports/less/package.sh +++ b/Ports/less/package.sh @@ -2,5 +2,10 @@ port=less version=530 useconfigure="true" -files="http://ftp.gnu.org/gnu/less/less-530.tar.gz less-530.tar.gz" +files="http://ftp.gnu.org/gnu/less/less-${version}.tar.gz less-${version}.tar.gz +http://ftp.gnu.org/gnu/less/less-${version}.tar.gz.sig less-${version}.tar.gz.sig +https://ftp.gnu.org/gnu/gnu-keyring.gpg gnu-keyring.gpg" + depends="ncurses" +auth_type="sig" +auth_opts="--keyring ./gnu-keyring.gpg less-${version}.tar.gz.sig" \ No newline at end of file diff --git a/Ports/libarchive/package.sh b/Ports/libarchive/package.sh index 0e3922504b..8773f44cd2 100755 --- a/Ports/libarchive/package.sh +++ b/Ports/libarchive/package.sh @@ -3,5 +3,9 @@ port=libarchive version=3.4.0 useconfigure=true configopts="--without-xml2" -files="https://libarchive.org/downloads/libarchive-3.4.0.tar.gz libarchive-3.4.0.tar.gz" +files="https://libarchive.org/downloads/libarchive-${version}.tar.gz libarchive-${version}.tar.gz +https://libarchive.org/downloads/libarchive-${version}.tar.gz.asc libarchive-${version}.tar.gz.asc" depends=zlib +auth_type="sig" +auth_import_key="CB55788360B992FA0885C878F040F7196BA99AF4" +auth_opts="libarchive-${version}.tar.gz.asc libarchive-${version}.tar.gz" diff --git a/Ports/libexpat/package.sh b/Ports/libexpat/package.sh index 68c9d14695..1b3f4e6161 100755 --- a/Ports/libexpat/package.sh +++ b/Ports/libexpat/package.sh @@ -2,11 +2,9 @@ port=libexpat version=2.2.9 useconfigure=true -files="https://codeload.github.com/libexpat/libexpat/tar.gz/R_2_2_9 expat-2.2.9.tar.gz" -workdir=libexpat-R_2_2_9/expat/ - -configure() { - run ./buildconf.sh - run patch -p 0 < fix-autoconf.patch - run ./"$configscript" --host=i686-pc-serenity $configopts -} +files="https://github.com/libexpat/libexpat/releases/download/R_2_2_9/expat-${version}.tar.xz expat-${version}.tar.xz +https://github.com/libexpat/libexpat/releases/download/R_2_2_9/expat-${version}.tar.xz.asc expat-${version}.tar.xz.asc" +workdir=expat-${version} +auth_type="sig" +auth_import_key="CB8DE70A90CFBF6C3BF5CC5696262ACFFBD3AEC6" +auth_opts="expat-${version}.tar.xz.asc expat-${version}.tar.xz" \ No newline at end of file diff --git a/Ports/libexpat/fix-autoconf.patch b/Ports/libexpat/patches/fix-autoconf.patch similarity index 79% rename from Ports/libexpat/fix-autoconf.patch rename to Ports/libexpat/patches/fix-autoconf.patch index 8d5d03d2a3..5f29db8e0f 100644 --- a/Ports/libexpat/fix-autoconf.patch +++ b/Ports/libexpat/patches/fix-autoconf.patch @@ -1,15 +1,15 @@ ---- conftools/config.sub.orig 2019-10-03 23:14:02.281000072 +0100 -+++ conftools/config.sub 2019-10-03 23:14:36.896816822 +0100 +--- a/conftools/config.sub ++++ b/conftools/config.sub @@ -2,7 +2,7 @@ # Configuration validation subroutine script. # Copyright 1992-2018 Free Software Foundation, Inc. - --timestamp='2018-02-22' + +-timestamp='2018-01-01' +timestamp='2019-10-03' - + # This file is free software; you can redistribute it and/or modify it # under the terms of the GNU General Public License as published by -@@ -1364,6 +1364,7 @@ +@@ -1409,6 +1409,7 @@ case $os in # Each alternative MUST end in a * to match a version number. # -sysv* is not here because it comes later, after sysvr4. -gnu* | -bsd* | -mach* | -minix* | -genix* | -ultrix* | -irix* \ @@ -17,3 +17,6 @@ | -*vms* | -sco* | -esix* | -isc* | -aix* | -cnk* | -sunos | -sunos[34]*\ | -hpux* | -unos* | -osf* | -luna* | -dgux* | -auroraux* | -solaris* \ | -sym* | -kopensolaris* | -plan9* \ +-- +2.17.1 + diff --git a/Ports/libiconv/package.sh b/Ports/libiconv/package.sh index d4a5c58b27..05d79ddbca 100755 --- a/Ports/libiconv/package.sh +++ b/Ports/libiconv/package.sh @@ -2,5 +2,9 @@ port=libiconv version=1.16 useconfigure=true -files="https://ftp.gnu.org/pub/gnu/libiconv/libiconv-1.16.tar.gz libiconv-1.16.tar.gz" -patchlevel=1 +files="https://ftp.gnu.org/pub/gnu/libiconv/libiconv-${version}.tar.gz libiconv-${version}.tar.gz +http://ftp.gnu.org/gnu/libiconv/libiconv-${version}.tar.gz.sig libiconv-${version}.tar.gz.sig +https://ftp.gnu.org/gnu/gnu-keyring.gpg gnu-keyring.gpg" + +auth_type="sig" +auth_opts="--keyring ./gnu-keyring.gpg libiconv-${version}.tar.gz.sig" \ No newline at end of file diff --git a/Ports/links/package.sh b/Ports/links/package.sh index 8fa6af3d40..b841230ff9 100755 --- a/Ports/links/package.sh +++ b/Ports/links/package.sh @@ -2,4 +2,4 @@ port=links version=2.19 useconfigure=true -files="http://links.twibright.com/download/links-2.19.tar.bz2 links-2.19.tar.bz2" +files="http://links.twibright.com/download/links-2.19.tar.bz2 links-2.19.tar.bz2 fa6df86919640e490187ee9d85a4f598" diff --git a/Ports/lua/package.sh b/Ports/lua/package.sh index 897cec6fcf..54fbf57a3a 100755 --- a/Ports/lua/package.sh +++ b/Ports/lua/package.sh @@ -1,6 +1,6 @@ #!/bin/bash ../.port_include.sh port=lua version=5.3.5 -files="http://www.lua.org/ftp/lua-5.3.5.tar.gz lua-5.3.5.tar.gz" +files="http://www.lua.org/ftp/lua-5.3.5.tar.gz lua-5.3.5.tar.gz 4f4b4f323fd3514a68e0ab3da8ce3455" makeopts="-j$(nproc) generic" installopts="INSTALL_TOP=$SERENITY_ROOT/Root/" diff --git a/Ports/m4/package.sh b/Ports/m4/package.sh index 3dd20f05d7..6e66a0e09e 100755 --- a/Ports/m4/package.sh +++ b/Ports/m4/package.sh @@ -2,4 +2,8 @@ port=m4 version=1.4.9 useconfigure=true -files="http://ftp.gnu.org/gnu/m4/m4-1.4.9.tar.gz m4-1.4.9.tar.gz" +files="http://ftp.gnu.org/gnu/m4/m4-${version}.tar.gz m4-${version}.tar.gz +http://ftp.gnu.org/gnu/m4/m4-${version}.tar.gz.sig m4-${version}.tar.gz.sig +https://ftp.gnu.org/gnu/gnu-keyring.gpg gnu-keyring.gpg" +auth_type="sig" +auth_opts="--keyring ./gnu-keyring.gpg m4-${version}.tar.gz.sig" \ No newline at end of file diff --git a/Ports/make/package.sh b/Ports/make/package.sh index 57c22af21b..ecf9a26290 100755 --- a/Ports/make/package.sh +++ b/Ports/make/package.sh @@ -2,5 +2,9 @@ port=make version=4.2.1 useconfigure=true -files="https://ftp.gnu.org/gnu/make/make-4.2.1.tar.bz2 make-4.2.1.tar.bz2" +files="https://ftp.gnu.org/gnu/make/make-${version}.tar.bz2 make-${version}.tar.bz2 +http://ftp.gnu.org/gnu/make/make-${version}.tar.bz2.sig make-${version}.tar.bz2.sig +https://ftp.gnu.org/gnu/gnu-keyring.gpg gnu-keyring.gpg" +auth_type="sig" +auth_opts="--keyring ./gnu-keyring.gpg make-${version}.tar.bz2.sig" configopts="--target=i686-pc-serenity --with-sysroot=/ --without-guile" diff --git a/Ports/mandoc/package.sh b/Ports/mandoc/package.sh index bd43405d93..0f33590a69 100755 --- a/Ports/mandoc/package.sh +++ b/Ports/mandoc/package.sh @@ -2,5 +2,6 @@ port=mandoc version=1.14.5 useconfigure=true -files="https://mandoc.bsd.lv/snapshots/mandoc-1.14.5.tar.gz mandoc-1.14.5.tar.gz" +files="https://mandoc.bsd.lv/snapshots/mandoc-${version}.tar.gz mandoc-${version}.tar.gz 8219b42cb56fc07b2aa660574e6211ac38eefdbf21f41b698d3348793ba5d8f7" depends="less pcre2 zlib" +auth_type="sha256" \ No newline at end of file diff --git a/Ports/mawk/package.sh b/Ports/mawk/package.sh index f3c8001f44..174187b620 100755 --- a/Ports/mawk/package.sh +++ b/Ports/mawk/package.sh @@ -1,5 +1,9 @@ #!/bin/bash ../.port_include.sh port=mawk version=1.3.4-20200120 -files="https://invisible-mirror.net/archives/mawk/mawk-1.3.4-20200120.tgz mawk-1.3.4-20200120.tgz" +files="https://invisible-mirror.net/archives/mawk/mawk-${version}.tgz mawk-${version}.tgz +https://invisible-mirror.net/archives/mawk/mawk-${version}.tgz.asc mawk-${version}.tgz.asc" useconfigure=true +auth_type="sig" +auth_import_key="C52048C0C0748FEE227D47A2702353E0F7E48EDB" +auth_opts="mawk-${version}.tgz.asc mawk-${version}.tgz" diff --git a/Ports/mbedtls/package.sh b/Ports/mbedtls/package.sh index ab8b74081e..a5d77fdbcf 100755 --- a/Ports/mbedtls/package.sh +++ b/Ports/mbedtls/package.sh @@ -1,5 +1,6 @@ #!/bin/bash ../.port_include.sh port=mbedtls version=2.16.2 -files="https://tls.mbed.org/download/mbedtls-2.16.2-apache.tgz mbedtls-2.16.2-apache.tgz" +files="https://tls.mbed.org/download/mbedtls-${version}-apache.tgz mbedtls-${version}-apache.tgz ba809acfd4b41b86895b92e98d936695b5b62b73" makeopts="CFLAGS=-DPLATFORM_UTIL_USE_GMTIME" +auth_type="sha1" \ No newline at end of file diff --git a/Ports/nano/package.sh b/Ports/nano/package.sh index 394a00e2e0..9584953e8e 100755 --- a/Ports/nano/package.sh +++ b/Ports/nano/package.sh @@ -1,11 +1,14 @@ #!/bin/bash ../.port_include.sh port=nano version=4.5 -workdir=nano-4.5 useconfigure="true" -curlopts="-L" -files="https://www.nano-editor.org/dist/v4/nano-4.5.tar.xz nano-4.5.tar.xz" +files="https://www.nano-editor.org/dist/v4/nano-${version}.tar.xz nano-${version}.tar.xz +https://www.nano-editor.org/dist/v4/nano-${version}.tar.xz.asc nano-${version}.tar.xz.asc" configopts="--target=i686-pc-serenity --disable-browser --disable-utf8" depends="ncurses" +auth_type="sig" +auth_import_key="BFD009061E535052AD0DF2150D28D4D2A0ACE884" +auth_opts="nano-${version}.tar.xz.asc nano-${version}.tar.xz" export CPPFLAGS=-I${SERENITY_ROOT}/Root/usr/local/include/ncurses +export PKG_CONFIG_PATH=${SERENITY_ROOT}/Root/usr/local/lib/pkgconfig diff --git a/Ports/ncurses/package.sh b/Ports/ncurses/package.sh index 719d45b3fb..4b005c3ae0 100755 --- a/Ports/ncurses/package.sh +++ b/Ports/ncurses/package.sh @@ -2,5 +2,9 @@ port=ncurses version=6.1 useconfigure=true -configopts="--with-termlib" -files="ftp://ftp.gnu.org/gnu/ncurses/ncurses-6.1.tar.gz ncurses-6.1.tar.gz" +configopts="--with-termlib --enable-pc-files --with-pkg-config=/usr/local/lib/pkgconfig --with-pkg-config-libdir=/usr/local/lib/pkgconfig" +files="ftp://ftp.gnu.org/gnu/ncurses/ncurses-${version}.tar.gz ncurses-${version}.tar.gz +http://ftp.gnu.org/gnu/ncurses/ncurses-${version}.tar.gz.sig ncurses-${version}.tar.gz.sig +https://ftp.gnu.org/gnu/gnu-keyring.gpg gnu-keyring.gpg" +auth_type="sig" +auth_opts="--keyring ./gnu-keyring.gpg ncurses-${version}.tar.gz.sig" \ No newline at end of file diff --git a/Ports/nesalizer/package.sh b/Ports/nesalizer/package.sh index 9967ab488d..c0a30095e6 100755 --- a/Ports/nesalizer/package.sh +++ b/Ports/nesalizer/package.sh @@ -1,7 +1,6 @@ #!/bin/bash ../.port_include.sh port=nesalizer version=master -curlopts="-L" makeopts="CONF=release" files="https://github.com/SerenityOS/nesalizer/archive/master.zip nesalizer-master.zip" depends=SDL2 diff --git a/Ports/nyancat/package.sh b/Ports/nyancat/package.sh index fea6a59ea9..7478416931 100755 --- a/Ports/nyancat/package.sh +++ b/Ports/nyancat/package.sh @@ -2,5 +2,4 @@ port=nyancat version=git workdir=nyancat-master -curlopts="-L" files="https://github.com/klange/nyancat/archive/master.tar.gz nyancat-git.tar.gz" diff --git a/Ports/openssl/package.sh b/Ports/openssl/package.sh index f3e640068c..9e535eef77 100755 --- a/Ports/openssl/package.sh +++ b/Ports/openssl/package.sh @@ -3,7 +3,12 @@ port=openssl version=1.0.2t useconfigure=true configscript=Configure -files="https://www.openssl.org/source/openssl-1.0.2t.tar.gz openssl-1.0.2t.tar.gz " +files="https://www.openssl.org/source/openssl-${version}.tar.gz openssl-${version}.tar.gz +https://www.openssl.org/source/openssl-${version}.tar.gz.asc openssl-${version}.tar.gz.asc" +auth_type="sig" +auth_import_key="8657ABB260F056B1E5190839D9C4D26D0E604491" +auth_opts="openssl-${version}.tar.gz.asc openssl-${version}.tar.gz" + depends="zlib" usr_local=$SERENITY_ROOT/Root/usr/local/ configopts="--prefix=$usr_local --openssldir=$usr_local/ssl BSD-x86 zlib no-tests no-threads no-asm no-sock" diff --git a/Ports/pcre2/package.sh b/Ports/pcre2/package.sh index bc1b40ec62..9fe2a35234 100755 --- a/Ports/pcre2/package.sh +++ b/Ports/pcre2/package.sh @@ -2,4 +2,9 @@ port=pcre2 version=10.34 useconfigure=true -files="https://ftp.pcre.org/pub/pcre/pcre2-10.34.tar.gz pcre2-10.34.tar.gz" +files="https://ftp.pcre.org/pub/pcre/pcre2-${version}.tar.gz pcre2-${version}.tar.gz +https://ftp.pcre.org/pub/pcre/pcre2-${version}.tar.gz.sig pcre2-${version}.tar.gz.sig" + +auth_type="sig" +auth_import_key="45F68D54BBE23FB3039B46E59766E084FB0F43D8" +auth_opts="pcre2-${version}.tar.gz.sig" diff --git a/Ports/python-3.6/package.sh b/Ports/python-3.6/package.sh index 2ef11740c1..d09bb42ae0 100755 --- a/Ports/python-3.6/package.sh +++ b/Ports/python-3.6/package.sh @@ -6,7 +6,7 @@ port=python-3.6 version=3.6 workdir=Python-3.6.0 useconfigure=true -configopts="--build=i686 --without-threads --enable-optimizations" +configopts="--build=i686 --without-threads --enable-optimizations --without-ensurepip" makeopts="-j$(nproc) build_all" installopts="-j$(nproc) build_all" files="${PYTHON_URL} ${PYTHON_ARCHIVE}" diff --git a/Ports/quake/package.sh b/Ports/quake/package.sh index 91326e430e..e0774d4286 100755 --- a/Ports/quake/package.sh +++ b/Ports/quake/package.sh @@ -3,7 +3,8 @@ port=quake version=0.65 workdir=SerenityQuake-master useconfigure=false -curlopts="-L" files="https://github.com/SerenityOS/SerenityQuake/archive/master.tar.gz quake.tar.gz" -makeopts="V=1 SYMBOLS_ON=Y" +makeopts="V=1 SYMBOLS_ON=Y " depends=SDL2 + +export PATH=${SERENITY_ROOT}/Root/usr/bin:$PATH \ No newline at end of file diff --git a/Ports/sed/package.sh b/Ports/sed/package.sh index 19fbebbbf9..ab89987f8c 100755 --- a/Ports/sed/package.sh +++ b/Ports/sed/package.sh @@ -2,4 +2,9 @@ port=sed version=4.2.1 useconfigure="true" -files="https://ftp.gnu.org/gnu/sed/sed-4.2.1.tar.bz2 sed-4.2.1.tar.bz2" +files="https://ftp.gnu.org/gnu/sed/sed-${version}.tar.bz2 sed-${version}.tar.bz2 +http://ftp.gnu.org/gnu/sed/sed-${version}.tar.bz2.sig sed-${version}.tar.bz2.sig +https://ftp.gnu.org/gnu/gnu-keyring.gpg gnu-keyring.gpg" + +auth_type="sig" +auth_opts="--keyring ./gnu-keyring.gpg sed-${version}.tar.bz2.sig" \ No newline at end of file diff --git a/Ports/termcap/package.sh b/Ports/termcap/package.sh index 2441049aac..fe27a3d80e 100755 --- a/Ports/termcap/package.sh +++ b/Ports/termcap/package.sh @@ -3,4 +3,4 @@ port=termcap version=1.3.1 useconfigure=true configopts="--prefix=$SERENITY_ROOT/Root/usr" -files="https://ftp.gnu.org/gnu/termcap/termcap-1.3.1.tar.gz termcap-1.3.1.tar.gz" +files="https://ftp.gnu.org/gnu/termcap/termcap-${version}.tar.gz termcap-${version}.tar.gz" diff --git a/Ports/tinycc/package.sh b/Ports/tinycc/package.sh index 7722431730..5d1ef76cc8 100755 --- a/Ports/tinycc/package.sh +++ b/Ports/tinycc/package.sh @@ -2,7 +2,6 @@ port=tinycc workdir=tinycc-dev version=dev -curlopts="-L" files="https://github.com/TinyCC/tinycc/archive/dev.tar.gz tinycc-dev.tar.gz" useconfigure=true makeopts=tcc diff --git a/Ports/vim/package.sh b/Ports/vim/package.sh index 45b9c2d8d0..d12190ac93 100755 --- a/Ports/vim/package.sh +++ b/Ports/vim/package.sh @@ -3,7 +3,6 @@ port=vim version=git workdir=vim-master useconfigure="true" -curlopts="-L" files="https://github.com/vim/vim/archive/master.tar.gz vim-git.tar.gz" configopts="--with-tlib=ncurses --with-features=normal" depends="ncurses" diff --git a/Ports/zlib/package.sh b/Ports/zlib/package.sh index 35e70e06a7..0c1d1c8a96 100755 --- a/Ports/zlib/package.sh +++ b/Ports/zlib/package.sh @@ -2,7 +2,12 @@ port=zlib version=1.2.11 useconfigure=true -files="https://www.zlib.net/zlib-1.2.11.tar.gz zlib-1.2.11.tar.gz" +files="https://www.zlib.net/zlib-${version}.tar.gz zlib-${version}.tar.gz +https://www.zlib.net/zlib-${version}.tar.gz.asc zlib-${version}.tar.gz.asc" + +auth_type="sig" +auth_import_key="783FCD8E58BCAFBA" +auth_opts="zlib-${version}.tar.gz.asc" configure() { run ./configure --static