From 5d794de2b8d9aa36a7aa462ca67abf92f81259d0 Mon Sep 17 00:00:00 2001 From: Fredrik Fornwall Date: Sun, 5 May 2024 23:42:14 +0200 Subject: [PATCH 1/2] bump(main/apt): 2.9.2 --- packages/apt/0000-cmake-fix.patch | 43 +++++++++++++++---------------- packages/apt/build.sh | 4 +-- 2 files changed, 23 insertions(+), 24 deletions(-) diff --git a/packages/apt/0000-cmake-fix.patch b/packages/apt/0000-cmake-fix.patch index bf4e8a156b73a4..a45879861f373d 100644 --- a/packages/apt/0000-cmake-fix.patch +++ b/packages/apt/0000-cmake-fix.patch @@ -1,7 +1,7 @@ -diff -uNr apt-2.1.13/apt-pkg/CMakeLists.txt apt-2.1.13.mod/apt-pkg/CMakeLists.txt ---- apt-2.1.13/apt-pkg/CMakeLists.txt 2020-12-10 16:40:27.000000000 +0200 -+++ apt-2.1.13.mod/apt-pkg/CMakeLists.txt 2020-12-11 18:10:24.236801758 +0200 -@@ -52,7 +52,7 @@ +diff -u -r apt-2.9.2/apt-pkg/CMakeLists.txt src/apt-pkg/CMakeLists.txt +--- apt-2.9.2/apt-pkg/CMakeLists.txt 2024-04-22 17:36:30.000000000 +0000 ++++ src/apt-pkg/CMakeLists.txt 2024-05-05 21:30:19.498701160 +0000 +@@ -57,7 +57,7 @@ ) target_link_libraries(apt-pkg @@ -10,10 +10,10 @@ diff -uNr apt-2.1.13/apt-pkg/CMakeLists.txt apt-2.1.13.mod/apt-pkg/CMakeLists.tx ${CMAKE_THREAD_LIBS_INIT} ${ZLIB_LIBRARIES} ${BZIP2_LIBRARIES} -diff -uNr apt-2.2.0/CMakeLists.txt apt-2.2.0.mod/CMakeLists.txt ---- apt-2.2.0/CMakeLists.txt 2020-12-10 16:40:27.000000000 +0200 -+++ apt-2.2.0.mod/CMakeLists.txt 2020-12-11 18:10:24.236801758 +0200 -@@ -189,14 +189,6 @@ +diff -u -r apt-2.9.2/CMakeLists.txt src/CMakeLists.txt +--- apt-2.9.2/CMakeLists.txt 2024-04-22 17:36:30.000000000 +0000 ++++ src/CMakeLists.txt 2024-05-05 21:30:19.498701160 +0000 +@@ -195,14 +195,6 @@ endif() endif() @@ -28,7 +28,7 @@ diff -uNr apt-2.2.0/CMakeLists.txt apt-2.2.0.mod/CMakeLists.txt # Configure some variables like package, version and architecture. set(PACKAGE ${PROJECT_NAME}) set(PACKAGE_MAIL "APT Development Team ") -@@ -209,10 +201,6 @@ +@@ -215,10 +207,6 @@ message(STATUS "Found dpkg data dir: ${DPKG_DATADIR_CMD}") set(DPKG_DATADIR "${DPKG_DATADIR_CMD}" CACHE PATH "dpkg data directory") endif() @@ -39,7 +39,7 @@ diff -uNr apt-2.2.0/CMakeLists.txt apt-2.2.0.mod/CMakeLists.txt if (NOT DEFINED ROOT_GROUP) execute_process(COMMAND id -gn root OUTPUT_VARIABLE ROOT_GROUP OUTPUT_STRIP_TRAILING_WHITESPACE) -@@ -243,7 +231,6 @@ +@@ -251,7 +239,6 @@ add_subdirectory(dselect) add_subdirectory(ftparchive) add_subdirectory(methods) @@ -47,9 +47,9 @@ diff -uNr apt-2.2.0/CMakeLists.txt apt-2.2.0.mod/CMakeLists.txt if (USE_NLS) add_subdirectory(po) -diff -uNr apt-2.1.13/methods/CMakeLists.txt apt-2.1.13.mod/methods/CMakeLists.txt ---- apt-2.1.13/methods/CMakeLists.txt 2020-12-10 16:40:27.000000000 +0200 -+++ apt-2.1.13.mod/methods/CMakeLists.txt 2020-12-11 18:11:00.833144879 +0200 +diff -u -r apt-2.9.2/methods/CMakeLists.txt src/methods/CMakeLists.txt +--- apt-2.9.2/methods/CMakeLists.txt 2024-04-22 17:36:30.000000000 +0000 ++++ src/methods/CMakeLists.txt 2024-05-05 21:31:42.650799537 +0000 @@ -11,7 +11,6 @@ add_executable(cdrom cdrom.cc) add_executable(http http.cc basehttp.cc $) @@ -58,11 +58,11 @@ diff -uNr apt-2.1.13/methods/CMakeLists.txt apt-2.1.13.mod/methods/CMakeLists.tx add_executable(rred rred.cc) add_executable(rsh rsh.cc) -@@ -21,12 +20,11 @@ +@@ -23,12 +22,11 @@ # Additional libraries to link against for networked stuff - target_link_libraries(http ${GNUTLS_LIBRARIES} $<$:${SYSTEMD_LIBRARIES}>) --target_link_libraries(ftp ${GNUTLS_LIBRARIES}) + target_link_libraries(http $<$:${GNUTLS_LIBRARIES}> $<$:${SYSTEMD_LIBRARIES}>) +-target_link_libraries(ftp $<$:${GNUTLS_LIBRARIES}>) target_link_libraries(rred apt-private) @@ -72,12 +72,11 @@ diff -uNr apt-2.1.13/methods/CMakeLists.txt apt-2.1.13.mod/methods/CMakeLists.tx RUNTIME DESTINATION ${CMAKE_INSTALL_LIBEXECDIR}/apt/methods) add_links(${CMAKE_INSTALL_LIBEXECDIR}/apt/methods mirror mirror+ftp mirror+http mirror+https mirror+file mirror+copy) -diff --git a/doc/CMakeLists.txt b/doc/CMakeLists.txt -index 3060949..3ce03b6 100644 ---- a/doc/CMakeLists.txt -+++ b/doc/CMakeLists.txt -@@ -1,15 +1,6 @@ - include(Documentation) +diff -u -r apt-2.9.2/doc/CMakeLists.txt src/doc/CMakeLists.txt +--- apt-2.9.2/doc/CMakeLists.txt 2024-04-22 17:36:30.000000000 +0000 ++++ src/doc/CMakeLists.txt 2024-05-05 21:30:19.499701137 +0000 +@@ -3,15 +3,6 @@ + endif() set(LINGUAS - de diff --git a/packages/apt/build.sh b/packages/apt/build.sh index eb6e48fe09a919..a41b92e7acfef4 100644 --- a/packages/apt/build.sh +++ b/packages/apt/build.sh @@ -2,9 +2,9 @@ TERMUX_PKG_HOMEPAGE=https://packages.debian.org/apt TERMUX_PKG_DESCRIPTION="Front-end for the dpkg package manager" TERMUX_PKG_LICENSE="GPL-2.0" TERMUX_PKG_MAINTAINER="@termux" -TERMUX_PKG_VERSION="2.7.12" +TERMUX_PKG_VERSION="2.9.2" TERMUX_PKG_SRCURL=https://deb.debian.org/debian/pool/main/a/apt/apt_${TERMUX_PKG_VERSION}.tar.xz -TERMUX_PKG_SHA256=e46d166b5fc887c2d9bca7add7e0ccda547b962b762e1272a08c0426baa99caf +TERMUX_PKG_SHA256=80aa74466b132e50ed8d0159f10e64a448b6a6c64723d62c42b83a5199ca03a7 # apt-key requires utilities from coreutils, findutils, gpgv, grep, sed. TERMUX_PKG_DEPENDS="coreutils, dpkg, findutils, gpgv, grep, libandroid-glob, libbz2, libc++, libcurl, libgnutls, liblz4, liblzma, sed, termux-keyring, termux-licenses, xxhash, zlib, zstd" TERMUX_PKG_BUILD_DEPENDS="docbook-xsl" From 15d86d02cd56919dc9085d62f8f16e946097d789 Mon Sep 17 00:00:00 2001 From: Fredrik Fornwall Date: Wed, 15 May 2024 01:00:48 +0200 Subject: [PATCH 2/2] bump(main/apt): 2.9.3 --- packages/apt/0000-cmake-fix.patch | 70 ++++++++++++++++--------------- packages/apt/build.sh | 4 +- 2 files changed, 39 insertions(+), 35 deletions(-) diff --git a/packages/apt/0000-cmake-fix.patch b/packages/apt/0000-cmake-fix.patch index a45879861f373d..9e399cd3a219ee 100644 --- a/packages/apt/0000-cmake-fix.patch +++ b/packages/apt/0000-cmake-fix.patch @@ -1,7 +1,7 @@ -diff -u -r apt-2.9.2/apt-pkg/CMakeLists.txt src/apt-pkg/CMakeLists.txt ---- apt-2.9.2/apt-pkg/CMakeLists.txt 2024-04-22 17:36:30.000000000 +0000 -+++ src/apt-pkg/CMakeLists.txt 2024-05-05 21:30:19.498701160 +0000 -@@ -57,7 +57,7 @@ +diff -u -r ../apt-2.9.3/apt-pkg/CMakeLists.txt ./apt-pkg/CMakeLists.txt +--- ../apt-2.9.3/apt-pkg/CMakeLists.txt 2024-05-14 11:01:31.000000000 +0000 ++++ ./apt-pkg/CMakeLists.txt 2024-05-14 18:33:35.039473088 +0000 +@@ -61,7 +61,7 @@ ) target_link_libraries(apt-pkg @@ -10,9 +10,10 @@ diff -u -r apt-2.9.2/apt-pkg/CMakeLists.txt src/apt-pkg/CMakeLists.txt ${CMAKE_THREAD_LIBS_INIT} ${ZLIB_LIBRARIES} ${BZIP2_LIBRARIES} -diff -u -r apt-2.9.2/CMakeLists.txt src/CMakeLists.txt ---- apt-2.9.2/CMakeLists.txt 2024-04-22 17:36:30.000000000 +0000 -+++ src/CMakeLists.txt 2024-05-05 21:30:19.498701160 +0000 +Only in ./apt-pkg: CMakeLists.txt.orig +diff -u -r ../apt-2.9.3/CMakeLists.txt ./CMakeLists.txt +--- ../apt-2.9.3/CMakeLists.txt 2024-05-14 11:01:31.000000000 +0000 ++++ ./CMakeLists.txt 2024-05-14 18:38:48.263646165 +0000 @@ -195,14 +195,6 @@ endif() endif() @@ -28,18 +29,19 @@ diff -u -r apt-2.9.2/CMakeLists.txt src/CMakeLists.txt # Configure some variables like package, version and architecture. set(PACKAGE ${PROJECT_NAME}) set(PACKAGE_MAIL "APT Development Team ") -@@ -215,10 +207,6 @@ +@@ -216,11 +208,6 @@ message(STATUS "Found dpkg data dir: ${DPKG_DATADIR_CMD}") set(DPKG_DATADIR "${DPKG_DATADIR_CMD}" CACHE PATH "dpkg data directory") endif() -if (NOT DEFINED COMMON_ARCH) - execute_process(COMMAND dpkg-architecture -qDEB_HOST_ARCH -- OUTPUT_VARIABLE COMMON_ARCH OUTPUT_STRIP_TRAILING_WHITESPACE) +- OUTPUT_VARIABLE COMMON_ARCH OUTPUT_STRIP_TRAILING_WHITESPACE +- COMMAND_ERROR_IS_FATAL ANY) -endif() if (NOT DEFINED ROOT_GROUP) execute_process(COMMAND id -gn root - OUTPUT_VARIABLE ROOT_GROUP OUTPUT_STRIP_TRAILING_WHITESPACE) -@@ -251,7 +239,6 @@ + OUTPUT_VARIABLE ROOT_GROUP OUTPUT_STRIP_TRAILING_WHITESPACE +@@ -254,7 +241,6 @@ add_subdirectory(dselect) add_subdirectory(ftparchive) add_subdirectory(methods) @@ -47,9 +49,30 @@ diff -u -r apt-2.9.2/CMakeLists.txt src/CMakeLists.txt if (USE_NLS) add_subdirectory(po) -diff -u -r apt-2.9.2/methods/CMakeLists.txt src/methods/CMakeLists.txt ---- apt-2.9.2/methods/CMakeLists.txt 2024-04-22 17:36:30.000000000 +0000 -+++ src/methods/CMakeLists.txt 2024-05-05 21:31:42.650799537 +0000 +Only in .: CMakeLists.txt.orig +Only in .: CMakeLists.txt.rej +diff -u -r ../apt-2.9.3/doc/CMakeLists.txt ./doc/CMakeLists.txt +--- ../apt-2.9.3/doc/CMakeLists.txt 2024-05-14 11:01:31.000000000 +0000 ++++ ./doc/CMakeLists.txt 2024-05-14 18:33:35.040473072 +0000 +@@ -3,15 +3,6 @@ + endif() + + set(LINGUAS +- de +- es +- fr +- it +- ja +- nl +- pl +- pt_BR +- pt + ) + + set(TRANSLATED_ENTITIES +diff -u -r ../apt-2.9.3/methods/CMakeLists.txt ./methods/CMakeLists.txt +--- ../apt-2.9.3/methods/CMakeLists.txt 2024-05-14 11:01:31.000000000 +0000 ++++ ./methods/CMakeLists.txt 2024-05-14 18:33:35.040473072 +0000 @@ -11,7 +11,6 @@ add_executable(cdrom cdrom.cc) add_executable(http http.cc basehttp.cc $) @@ -72,22 +95,3 @@ diff -u -r apt-2.9.2/methods/CMakeLists.txt src/methods/CMakeLists.txt RUNTIME DESTINATION ${CMAKE_INSTALL_LIBEXECDIR}/apt/methods) add_links(${CMAKE_INSTALL_LIBEXECDIR}/apt/methods mirror mirror+ftp mirror+http mirror+https mirror+file mirror+copy) -diff -u -r apt-2.9.2/doc/CMakeLists.txt src/doc/CMakeLists.txt ---- apt-2.9.2/doc/CMakeLists.txt 2024-04-22 17:36:30.000000000 +0000 -+++ src/doc/CMakeLists.txt 2024-05-05 21:30:19.499701137 +0000 -@@ -3,15 +3,6 @@ - endif() - - set(LINGUAS -- de -- es -- fr -- it -- ja -- nl -- pl -- pt_BR -- pt - ) - - set(TRANSLATED_ENTITIES diff --git a/packages/apt/build.sh b/packages/apt/build.sh index a41b92e7acfef4..1e0c3b25645821 100644 --- a/packages/apt/build.sh +++ b/packages/apt/build.sh @@ -2,9 +2,9 @@ TERMUX_PKG_HOMEPAGE=https://packages.debian.org/apt TERMUX_PKG_DESCRIPTION="Front-end for the dpkg package manager" TERMUX_PKG_LICENSE="GPL-2.0" TERMUX_PKG_MAINTAINER="@termux" -TERMUX_PKG_VERSION="2.9.2" +TERMUX_PKG_VERSION="2.9.3" TERMUX_PKG_SRCURL=https://deb.debian.org/debian/pool/main/a/apt/apt_${TERMUX_PKG_VERSION}.tar.xz -TERMUX_PKG_SHA256=80aa74466b132e50ed8d0159f10e64a448b6a6c64723d62c42b83a5199ca03a7 +TERMUX_PKG_SHA256=ed1d0195ca6e8d78dbba5389ec46fcfe0422badefbbdc7b51a46c909f6ba2d71 # apt-key requires utilities from coreutils, findutils, gpgv, grep, sed. TERMUX_PKG_DEPENDS="coreutils, dpkg, findutils, gpgv, grep, libandroid-glob, libbz2, libc++, libcurl, libgnutls, liblz4, liblzma, sed, termux-keyring, termux-licenses, xxhash, zlib, zstd" TERMUX_PKG_BUILD_DEPENDS="docbook-xsl"