From dbc6c2657358b9c5c950ec789fe1ad50f62fe6e7 Mon Sep 17 00:00:00 2001 From: Leonid Plyushch Date: Sun, 11 Aug 2019 19:37:34 +0300 Subject: [PATCH] undo "Unsplit essential packages" Seems it is not possible to unsplit these packages currently. %ci:reset-backlog --- packages/abuild/build.sh | 4 ++-- packages/build-essential/build.sh | 4 ++-- packages/dpkg/build.sh | 4 ++-- packages/libbz2/build.sh | 7 +++---- packages/libbz2/bzip2.subpackage.sh | 3 +++ packages/libcurl/build.sh | 13 +++++++++---- packages/libcurl/curl.subpackage.sh | 3 +++ packages/liblzma/build.sh | 7 +++---- packages/liblzma/xz-utils.subpackage.sh | 3 +++ packages/luarocks/build.sh | 4 ++-- packages/ncdc/build.sh | 4 ++-- packages/termux-tools/build.sh | 4 ++-- packages/texlive-tlmgr/build.sh | 4 ++-- 13 files changed, 38 insertions(+), 26 deletions(-) create mode 100644 packages/libbz2/bzip2.subpackage.sh create mode 100644 packages/libcurl/curl.subpackage.sh create mode 100644 packages/liblzma/xz-utils.subpackage.sh diff --git a/packages/abuild/build.sh b/packages/abuild/build.sh index a5ad5ab1c..c0e31ec95 100644 --- a/packages/abuild/build.sh +++ b/packages/abuild/build.sh @@ -4,10 +4,10 @@ TERMUX_PKG_HOMEPAGE=https://github.com/alpinelinux/abuild TERMUX_PKG_DESCRIPTION="Build script to build Alpine packages" TERMUX_PKG_LICENSE="GPL-2.0" TERMUX_PKG_VERSION=3.4.0 -TERMUX_PKG_REVISION=1 +TERMUX_PKG_REVISION=2 TERMUX_PKG_SRCURL=https://github.com/alpinelinux/abuild/archive/v$TERMUX_PKG_VERSION.tar.gz TERMUX_PKG_SHA256=f6f704e34f9d388a0228b645050dc7db7bf92f15a088835ae2c9b244420b9b61 -TERMUX_PKG_DEPENDS="apk-tools, autoconf, automake, bash, clang, libcurl, libtool, make, openssl-tool, pkg-config, tar, zlib" +TERMUX_PKG_DEPENDS="apk-tools, autoconf, automake, bash, clang, curl, libtool, make, openssl-tool, pkg-config, tar, zlib" TERMUX_PKG_BUILD_IN_SRC=yes TERMUX_PKG_EXTRA_MAKE_ARGS="sysconfdir=$TERMUX_PREFIX/etc" TERMUX_PKG_CONFFILES="etc/abuild.conf" diff --git a/packages/build-essential/build.sh b/packages/build-essential/build.sh index 6d1538013..5f0fd1215 100644 --- a/packages/build-essential/build.sh +++ b/packages/build-essential/build.sh @@ -3,7 +3,7 @@ TERMUX_PKG_DESCRIPTION="A metapackage that installs essential development tools" TERMUX_PKG_LICENSE="Public Domain" TERMUX_PKG_MAINTAINER="Leonid Plyushch " TERMUX_PKG_VERSION=3.1 -TERMUX_PKG_REVISION=2 +TERMUX_PKG_REVISION=3 TERMUX_PKG_METAPACKAGE=yes TERMUX_PKG_PLATFORM_INDEPENDENT=yes @@ -17,7 +17,7 @@ TERMUX_PKG_PLATFORM_INDEPENDENT=yes # bc, bzip2, coreutils, diffutils, ed, findutils, gawk, grep, gzip, lzip, lzop, patch, procps, psmisc, sed, tar, xz-utils # -TERMUX_PKG_DEPENDS="autoconf, automake, bison, clang, cmake, flex, gperf, libtool, m4, make, ninja, pkg-config, bc, coreutils, diffutils, ed, findutils, gawk, grep, gzip, lzip, lzop, patch, procps, psmisc, sed, tar, util-linux" +TERMUX_PKG_DEPENDS="autoconf, automake, bison, clang, cmake, flex, gperf, libtool, m4, make, ninja, pkg-config, bc, bzip2, coreutils, diffutils, ed, findutils, gawk, grep, gzip, lzip, lzop, patch, procps, psmisc, sed, tar, util-linux, xz-utils" # Other packages that may be interesting. TERMUX_PKG_SUGGESTS="git, golang, nodejs, patchelf, proot, python, python2, ruby, rust, subversion" diff --git a/packages/dpkg/build.sh b/packages/dpkg/build.sh index 437f6b4c7..a4a6cdda1 100644 --- a/packages/dpkg/build.sh +++ b/packages/dpkg/build.sh @@ -2,11 +2,11 @@ TERMUX_PKG_HOMEPAGE=https://packages.debian.org/dpkg TERMUX_PKG_DESCRIPTION="Debian package management system" TERMUX_PKG_LICENSE="GPL-2.0" TERMUX_PKG_VERSION=1.19.7 -TERMUX_PKG_REVISION=8 +TERMUX_PKG_REVISION=9 TERMUX_PKG_SRCURL=https://mirrors.kernel.org/debian/pool/main/d/dpkg/dpkg_${TERMUX_PKG_VERSION}.tar.xz TERMUX_PKG_SHA256=4c27fededf620c0aa522fff1a48577ba08144445341257502e7730f2b1a296e8 # with the extract.c.patch we remove the -p and --warning=no-timestamp tar options so we can use busybox tar -TERMUX_PKG_DEPENDS="coreutils, diffutils, gzip, less, libbz2, liblzma, tar, zlib" +TERMUX_PKG_DEPENDS="bzip2, coreutils, diffutils, gzip, less, libbz2, liblzma, tar, xz-utils, zlib" TERMUX_PKG_BREAKS="dpkg-dev" TERMUX_PKG_REPLACES="dpkg-dev" TERMUX_PKG_ESSENTIAL=yes diff --git a/packages/libbz2/build.sh b/packages/libbz2/build.sh index b167fea6c..3f42c1f94 100644 --- a/packages/libbz2/build.sh +++ b/packages/libbz2/build.sh @@ -2,12 +2,11 @@ TERMUX_PKG_HOMEPAGE=http://www.bzip.org/ TERMUX_PKG_DESCRIPTION="BZ2 format compression library" TERMUX_PKG_LICENSE="BSD" TERMUX_PKG_VERSION=1.0.8 -TERMUX_PKG_REVISION=4 +TERMUX_PKG_REVISION=5 TERMUX_PKG_SRCURL=https://fossies.org/linux/misc/bzip2-${TERMUX_PKG_VERSION}.tar.xz TERMUX_PKG_SHA256=47fd74b2ff83effad0ddf62074e6fad1f6b4a77a96e121ab421c20a216371a1f -TERMUX_PKG_CONFLICTS="bzip2, libbz2-dev" -TERMUX_PKG_REPLACES="bzip2, libbz2-dev" -TERMUX_PKG_PROVIDES="bzip2" +TERMUX_PKG_BREAKS="libbz2-dev" +TERMUX_PKG_REPLACES="libbz2-dev" TERMUX_PKG_ESSENTIAL=yes TERMUX_PKG_EXTRA_MAKE_ARGS="PREFIX=$TERMUX_PREFIX" TERMUX_PKG_BUILD_IN_SRC=yes diff --git a/packages/libbz2/bzip2.subpackage.sh b/packages/libbz2/bzip2.subpackage.sh new file mode 100644 index 000000000..02e2ae46e --- /dev/null +++ b/packages/libbz2/bzip2.subpackage.sh @@ -0,0 +1,3 @@ +TERMUX_SUBPKG_INCLUDE="bin/ share/man/man1/" +TERMUX_SUBPKG_DESCRIPTION="Tools for working with bzip2 compression" +TERMUX_SUBPKG_ESSENTIAL=yes diff --git a/packages/libcurl/build.sh b/packages/libcurl/build.sh index a9ada3243..75848cde8 100644 --- a/packages/libcurl/build.sh +++ b/packages/libcurl/build.sh @@ -2,13 +2,12 @@ TERMUX_PKG_HOMEPAGE=https://curl.haxx.se/ TERMUX_PKG_DESCRIPTION="Easy-to-use client-side URL transfer library" TERMUX_PKG_LICENSE="MIT" TERMUX_PKG_VERSION=7.65.3 -TERMUX_PKG_REVISION=5 +TERMUX_PKG_REVISION=6 TERMUX_PKG_SRCURL=https://curl.haxx.se/download/curl-${TERMUX_PKG_VERSION}.tar.bz2 TERMUX_PKG_SHA256=0a855e83be482d7bc9ea00e05bdb1551a44966076762f9650959179c89fce509 TERMUX_PKG_DEPENDS="libnghttp2, openssl (>= 1.1.1), zlib" -TERMUX_PKG_CONFLICTS="apt (<< 1.4.8-8), curl, libcurl-dev" -TERMUX_PKG_REPLACES="curl, libcurl-dev" -TERMUX_PKG_PROVIDES="curl" +TERMUX_PKG_BREAKS="libcurl-dev" +TERMUX_PKG_REPLACES="libcurl-dev" TERMUX_PKG_ESSENTIAL=yes TERMUX_PKG_EXTRA_CONFIGURE_ARGS=" @@ -21,3 +20,9 @@ TERMUX_PKG_EXTRA_CONFIGURE_ARGS=" --without-brotli --with-ssl " + + +# Starting with version 7.62 curl started enabling http/2 by default. +# Support for http/2 as added in version 1.4.8-8 of the apt package, so we +# conflict with previous versions to avoid broken installations. +TERMUX_PKG_CONFLICTS="apt (<< 1.4.8-8)" diff --git a/packages/libcurl/curl.subpackage.sh b/packages/libcurl/curl.subpackage.sh new file mode 100644 index 000000000..2b79845c3 --- /dev/null +++ b/packages/libcurl/curl.subpackage.sh @@ -0,0 +1,3 @@ +TERMUX_SUBPKG_INCLUDE="bin/curl share/man/man1/curl.1.gz" +TERMUX_SUBPKG_DESCRIPTION="Command line tool for transferring data with URL syntax" +TERMUX_SUBPKG_ESSENTIAL=yes diff --git a/packages/liblzma/build.sh b/packages/liblzma/build.sh index 4c9c48fda..e70e259e1 100644 --- a/packages/liblzma/build.sh +++ b/packages/liblzma/build.sh @@ -2,10 +2,9 @@ TERMUX_PKG_HOMEPAGE=https://tukaani.org/xz/ TERMUX_PKG_DESCRIPTION="XZ-format compression library" TERMUX_PKG_LICENSE="GPL-2.0" TERMUX_PKG_VERSION=5.2.4 -TERMUX_PKG_REVISION=6 +TERMUX_PKG_REVISION=7 TERMUX_PKG_SRCURL=https://fossies.org/linux/misc/xz-${TERMUX_PKG_VERSION}.tar.xz TERMUX_PKG_SHA256=9717ae363760dedf573dad241420c5fea86256b65bc21d2cf71b2b12f0544f4b -TERMUX_PKG_CONFLICTS="liblzma-dev, xz-utils" -TERMUX_PKG_REPLACES="liblzma-dev, xz-utils" -TERMUX_PKG_PROVIDES="xz-utils" +TERMUX_PKG_BREAKS="liblzma-dev" +TERMUX_PKG_REPLACES="liblzma-dev" TERMUX_PKG_ESSENTIAL=yes diff --git a/packages/liblzma/xz-utils.subpackage.sh b/packages/liblzma/xz-utils.subpackage.sh new file mode 100644 index 000000000..69edcbd17 --- /dev/null +++ b/packages/liblzma/xz-utils.subpackage.sh @@ -0,0 +1,3 @@ +TERMUX_SUBPKG_INCLUDE="bin/ share/man/man1/" +TERMUX_SUBPKG_DESCRIPTION="XZ-format compression tools" +TERMUX_SUBPKG_ESSENTIAL=yes diff --git a/packages/luarocks/build.sh b/packages/luarocks/build.sh index 12eb0270c..129f15534 100644 --- a/packages/luarocks/build.sh +++ b/packages/luarocks/build.sh @@ -2,10 +2,10 @@ TERMUX_PKG_HOMEPAGE=https://luarocks.org/ TERMUX_PKG_DESCRIPTION="Deployment and management system for Lua modules" TERMUX_PKG_LICENSE="BSD" TERMUX_PKG_VERSION=3.1.3 -TERMUX_PKG_REVISION=2 +TERMUX_PKG_REVISION=3 TERMUX_PKG_SRCURL=https://luarocks.org/releases/luarocks-${TERMUX_PKG_VERSION}.tar.gz TERMUX_PKG_SHA256=c573435f495aac159e34eaa0a3847172a2298eb6295fcdc35d565f9f9b990513 -TERMUX_PKG_DEPENDS="libcurl, lua" +TERMUX_PKG_DEPENDS="curl, lua" TERMUX_PKG_BUILD_DEPENDS="liblua" TERMUX_PKG_BUILD_IN_SRC=yes TERMUX_PKG_PLATFORM_INDEPENDENT=yes diff --git a/packages/ncdc/build.sh b/packages/ncdc/build.sh index 0fd8bfc12..9470057d8 100644 --- a/packages/ncdc/build.sh +++ b/packages/ncdc/build.sh @@ -2,10 +2,10 @@ TERMUX_PKG_HOMEPAGE=https://dev.yorhel.nl/ncdc TERMUX_PKG_DESCRIPTION="Modern and lightweight direct connect client with a friendly ncurses interface" TERMUX_PKG_LICENSE="MIT" TERMUX_PKG_VERSION=1.22.1 -TERMUX_PKG_REVISION=1 +TERMUX_PKG_REVISION=2 TERMUX_PKG_SRCURL=https://dev.yorhel.nl/download/ncdc-${TERMUX_PKG_VERSION}.tar.gz TERMUX_PKG_SHA256=d15fd378aa345f423e59a38691c668f69b516cd4b8afbbcdc446007740c3afad -TERMUX_PKG_DEPENDS="libandroid-support, libbz2, libiconv, libgnutls, libsqlite, glib, ncurses, zlib" +TERMUX_PKG_DEPENDS="libandroid-support, libiconv, libgnutls, libsqlite, bzip2, glib, ncurses, zlib" TERMUX_PKG_BUILD_IN_SRC="yes" termux_step_post_configure() { diff --git a/packages/termux-tools/build.sh b/packages/termux-tools/build.sh index ee0193842..9fc0b5e94 100644 --- a/packages/termux-tools/build.sh +++ b/packages/termux-tools/build.sh @@ -2,7 +2,7 @@ TERMUX_PKG_HOMEPAGE=https://termux.com/ TERMUX_PKG_DESCRIPTION="Basic system tools for Termux" TERMUX_PKG_LICENSE="GPL-3.0" TERMUX_PKG_VERSION=0.69 -TERMUX_PKG_REVISION=1 +TERMUX_PKG_REVISION=2 TERMUX_PKG_PLATFORM_INDEPENDENT=yes TERMUX_PKG_ESSENTIAL=yes TERMUX_PKG_CONFFILES="etc/motd" @@ -11,7 +11,7 @@ TERMUX_PKG_CONFLICTS="procps (<< 3.3.15-2)" # Some of these packages are not dependencies and used only to ensure # that core packages are installed after upgrading (we removed busybox # from essentials). -TERMUX_PKG_DEPENDS="coreutils, dash, diffutils, findutils, gawk, grep, gzip, less, procps, psmisc, sed, tar, termux-am, termux-exec" +TERMUX_PKG_DEPENDS="bzip2, coreutils, curl, dash, diffutils, findutils, gawk, grep, gzip, less, procps, psmisc, sed, tar, termux-am, termux-exec, xz-utils" # Optional packages that are distributed as part of bootstrap archives. TERMUX_PKG_RECOMMENDS="ed, dos2unix, inetutils, net-tools, patch, unzip, util-linux" diff --git a/packages/texlive-tlmgr/build.sh b/packages/texlive-tlmgr/build.sh index dbe0ea6e4..0e332c3eb 100644 --- a/packages/texlive-tlmgr/build.sh +++ b/packages/texlive-tlmgr/build.sh @@ -3,10 +3,10 @@ TERMUX_PKG_DESCRIPTION="TeX Lives package manager" TERMUX_PKG_LICENSE="GPL-2.0" TERMUX_PKG_MAINTAINER="Henrik Grimler @Grimler91" TERMUX_PKG_VERSION=20190410 -TERMUX_PKG_REVISION=1 +TERMUX_PKG_REVISION=2 TERMUX_PKG_SRCURL=ftp://ftp.tug.org/texlive/historic/${TERMUX_PKG_VERSION:0:4}/install-tl-unx.tar.gz TERMUX_PKG_SHA256=44aa41b5783e345b7021387f19ac9637ff1ce5406a59754230c666642dfe7750 -TERMUX_PKG_DEPENDS="liblzma, perl, wget, gnupg (>= 2.2.9-1), texlive (>= 20190410)" +TERMUX_PKG_DEPENDS="perl, wget, gnupg (>= 2.2.9-1), xz-utils, texlive (>= 20190410)" TERMUX_PKG_CONFFILES="share/texlive/tlpkg/texlive.tlpdb" TERMUX_PKG_CONFLICTS="texlive (<< 20180414-1)" TERMUX_PKG_PLATFORM_INDEPENDENT=yes