diff --git a/packages/pacman/build.sh b/packages/pacman/build.sh index eb493e95b6..2851f4aa21 100644 --- a/packages/pacman/build.sh +++ b/packages/pacman/build.sh @@ -2,14 +2,13 @@ TERMUX_PKG_HOMEPAGE=https://archlinux.org/pacman/ TERMUX_PKG_DESCRIPTION="A library-based package manager with dependency support" TERMUX_PKG_LICENSE="GPL-2.0" TERMUX_PKG_MAINTAINER="@Maxython " -TERMUX_PKG_VERSION=7.0.0 -TERMUX_PKG_REVISION=4 +TERMUX_PKG_VERSION=7.1.0 TERMUX_PKG_SRCURL=https://gitlab.archlinux.org/pacman/pacman/-/releases/v${TERMUX_PKG_VERSION}/downloads/pacman-${TERMUX_PKG_VERSION}.tar.xz -TERMUX_PKG_SHA256=61cbd445d1381b4b184bc7c4e2791f07a79f0f2807b7c600399d0d08e8cd28cf +TERMUX_PKG_SHA256=530e50d7edbb2a22581c6d6707d2113240276c1bec4ee39a99488e1243c32171 TERMUX_PKG_DEPENDS="bash, curl, gpgme, libandroid-glob, libarchive, libcurl, openssl, termux-licenses, termux-keyring" TERMUX_PKG_BUILD_DEPENDS="doxygen, asciidoc, nettle" TERMUX_PKG_GROUPS="base-devel" -TERMUX_PKG_CONFFILES="etc/pacman.conf, etc/pacman.d/serverlist, etc/makepkg.conf, var/log/pacman.log" +TERMUX_PKG_CONFFILES="etc/pacman.conf, etc/pacman.d/mirrorlist, etc/makepkg.conf, var/log/pacman.log" TERMUX_PKG_EXTRA_CONFIGURE_ARGS=" --prefix=${TERMUX_PREFIX} --sysconfdir=${TERMUX_PREFIX}/etc @@ -33,7 +32,7 @@ termux_step_post_configure() { termux_step_post_make_install() { mkdir -p $TERMUX_PREFIX/etc/pacman.d - install -m644 $TERMUX_PKG_BUILDER_DIR/serverlist $TERMUX_PREFIX/etc/pacman.d/serverlist + install -m644 $TERMUX_PKG_BUILDER_DIR/mirrorlist $TERMUX_PREFIX/etc/pacman.d/mirrorlist } termux_step_create_debscripts() { diff --git a/packages/pacman/dload.c.patch b/packages/pacman/dload.c.patch deleted file mode 100644 index d785296f74..0000000000 --- a/packages/pacman/dload.c.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- pacman-7.0.0/lib/libalpm/dload.c 2024-07-14 12:11:18.000000000 +0300 -+++ pacman-7.0.0/lib/libalpm/dload.c.patch 2024-09-15 14:13:39.008174435 +0300 -@@ -82,7 +82,7 @@ - unlink(filename); - return 1; - } -- ASSERT(chown(filename, 0, 0) != -1, return -1); -+ ASSERT(chown(filename, getuid(), getgid()) != -1, return -1); - ASSERT(chmod(filename, ~(_getumask()) & 0666) != -1, return -1); - return 0; - } diff --git a/packages/pacman/git.sh.in.patch b/packages/pacman/git.sh.in.patch deleted file mode 100644 index 25f6a6adb6..0000000000 --- a/packages/pacman/git.sh.in.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- pacman-7.0.0/scripts/libmakepkg/source/git.sh.in 2024-07-14 12:11:18.000000000 +0300 -+++ pacman-7.0.0/scripts/libmakepkg/source/git.sh.in.patch 2025-01-25 16:31:49.781499938 +0300 -@@ -49,7 +49,7 @@ - - if [[ ! -d "$dir" ]] || dir_is_empty "$dir" ; then - msg2 "$(gettext "Cloning %s %s repo...")" "${repo}" "git" -- if ! git clone --origin=origin ---mirror "$url" "$dir"; then -+ if ! git clone --origin=origin --mirror "$url" "$dir"; then - error "$(gettext "Failure while downloading %s %s repo")" "${repo}" "git" - plainerr "$(gettext "Aborting...")" - exit 1 diff --git a/packages/pacman/mirrorlist b/packages/pacman/mirrorlist new file mode 100644 index 0000000000..ad9ab7177c --- /dev/null +++ b/packages/pacman/mirrorlist @@ -0,0 +1,14 @@ +## Official mirrors Termux-Pacman +# Pacman can't automatically select the "fastest" mirrors for users, +# it just uses the first mirror according to the mirrorlist. If you +# want to use a specific mirror, you must make it the first one in +# the mirrorlist. + +## United States (US) +Server = https://service.termux-pacman.dev/$repo/$arch + +## Vietnam (VN) +Server = https://mirror.meowsmp.net/termux-pacman/$repo/$arch + +## Germany (DE) +Server = https://ftp.agdsn.de/termux-pacman/$repo/$arch diff --git a/packages/pacman/pacman.conf.in.patch b/packages/pacman/pacman.conf.in.patch index c881ab501e..4e472fb02c 100644 --- a/packages/pacman/pacman.conf.in.patch +++ b/packages/pacman/pacman.conf.in.patch @@ -61,22 +61,22 @@ -#SigLevel = Optional TrustAll -#Server = file:///home/packages +[main] -+Include = @TERMUX_PREFIX@/etc/pacman.d/serverlist ++Include = @TERMUX_PREFIX@/etc/pacman.d/mirrorlist + +[x11] -+Include = @TERMUX_PREFIX@/etc/pacman.d/serverlist ++Include = @TERMUX_PREFIX@/etc/pacman.d/mirrorlist + +[root] -+Include = @TERMUX_PREFIX@/etc/pacman.d/serverlist ++Include = @TERMUX_PREFIX@/etc/pacman.d/mirrorlist + +[tur] -+Include = @TERMUX_PREFIX@/etc/pacman.d/serverlist ++Include = @TERMUX_PREFIX@/etc/pacman.d/mirrorlist + +[tur-continuous] -+Include = @TERMUX_PREFIX@/etc/pacman.d/serverlist ++Include = @TERMUX_PREFIX@/etc/pacman.d/mirrorlist + +[tur-multilib] -+Include = @TERMUX_PREFIX@/etc/pacman.d/serverlist ++Include = @TERMUX_PREFIX@/etc/pacman.d/mirrorlist + +[gpkg] -+Include = @TERMUX_PREFIX@/etc/pacman.d/serverlist ++Include = @TERMUX_PREFIX@/etc/pacman.d/mirrorlist diff --git a/packages/pacman/serverlist b/packages/pacman/serverlist deleted file mode 100644 index 8f3110e11e..0000000000 --- a/packages/pacman/serverlist +++ /dev/null @@ -1,14 +0,0 @@ -## Services and official mirrors Termux-Pacman -# Pacman can't automatically select the "fastest" servers for users, -# it just uses the first server according to the serverlist. If you -# want to use a specific server, you must make it the first one in -# the serverlist. - -## United States (US) -Server = https://service.termux-pacman.dev/$repo/$arch - -## Vietnam (VN) -Server = https://mirror.meowsmp.net/termux-pacman/$repo/$arch - -## Germany (DE) -Server = https://ftp.agdsn.de/termux-pacman/$repo/$arch