From 90d5e2bf1b29e1a76e609ff8e2cd91a05efae499 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jan=20Christian=20Gr=C3=BCnhage?= Date: Mon, 17 Oct 2022 13:52:03 +0200 Subject: [PATCH 1/2] ansible-core: update to 2.13.5. --- ...mmand-v-instead-of-which-in-Makefile.patch | 32 ------------------- srcpkgs/ansible-core/template | 6 ++-- 2 files changed, 3 insertions(+), 35 deletions(-) delete mode 100644 srcpkgs/ansible-core/patches/0001-use-command-v-instead-of-which-in-Makefile.patch diff --git a/srcpkgs/ansible-core/patches/0001-use-command-v-instead-of-which-in-Makefile.patch b/srcpkgs/ansible-core/patches/0001-use-command-v-instead-of-which-in-Makefile.patch deleted file mode 100644 index 6bf0d9d98255..000000000000 --- a/srcpkgs/ansible-core/patches/0001-use-command-v-instead-of-which-in-Makefile.patch +++ /dev/null @@ -1,32 +0,0 @@ -From 7e4b82ed9506e189c9060e3987e68c40e60bfaed Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Jan=20Christian=20Gr=C3=BCnhage?= - -Date: Thu, 30 Jun 2022 15:33:46 +0200 -Subject: [PATCH] use 'command -v' instead of 'which' in Makefile - -'which' is not standardized and can even be considered problematic [1] - -[1] https://lwn.net/Articles/874049/ ---- - Makefile | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/Makefile b/Makefile -index 7641344968..45421e88e0 100644 ---- a/Makefile -+++ b/Makefile -@@ -18,9 +18,9 @@ SDIST_DIR ?= 'dist' - # This doesn't evaluate until it's called. The -D argument is the - # directory of the target file ($@), kinda like `dirname`. - MANPAGES ?= $(patsubst %.rst.in,%,$(wildcard ./docs/man/man1/ansible*.1.rst.in)) --ifneq ($(shell which rst2man 2>/dev/null),) -+ifneq ($(shell command -v rst2man 2>/dev/null),) - ASCII2MAN = rst2man $< $@ --else ifneq ($(shell which rst2man.py 2>/dev/null),) -+else ifneq ($(shell command -v rst2man.py 2>/dev/null),) - ASCII2MAN = rst2man.py $< $@ - else - ASCII2MAN = @echo "ERROR: rst2man from docutils command is not installed but is required to build $(MANPAGES)" && exit 1 --- -2.37.1 - diff --git a/srcpkgs/ansible-core/template b/srcpkgs/ansible-core/template index b0f6f3a6d8c5..5bd7677a0ff4 100644 --- a/srcpkgs/ansible-core/template +++ b/srcpkgs/ansible-core/template @@ -1,7 +1,7 @@ # Template file for 'ansible-core' pkgname=ansible-core -version=2.13.4 -revision=2 +version=2.14.0 +revision=1 hostmakedepends="python3-setuptools python3-wheel python3-packaging python3-straight.plugin python3-docutils python3-Jinja2 python3-yaml" depends="python3-cryptography python3-Jinja2 python3-paramiko python3-yaml @@ -14,7 +14,7 @@ license="GPL-3.0-or-later" homepage="https://www.ansible.com/" changelog="https://raw.githubusercontent.com/ansible/ansible/stable-${version%.*}/changelogs/CHANGELOG-v${version%.*}.rst" distfiles="${PYPI_SITE}/a/ansible-core/ansible-core-${version}.tar.gz" -checksum=78f45c2c472af60b9b4b8cbdaba5a3911079087891a9f6c6ed726327b8f21c6a +checksum=fa48b481cb623bf79bb903f223097681a0c13e1b4ec7e78e7dd7d858d36a34b2 conflicts="ansible<2.10.1_1" replaces="ansible-base<2.11.0_1" From 4e44347113b541818ba8271b0c5a8d1b4252cb5e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jan=20Christian=20Gr=C3=BCnhage?= Date: Mon, 17 Oct 2022 13:52:12 +0200 Subject: [PATCH 2/2] ansible: update to 6.6.0. --- srcpkgs/ansible/template | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/srcpkgs/ansible/template b/srcpkgs/ansible/template index 926ca06283e3..44ddcab26778 100644 --- a/srcpkgs/ansible/template +++ b/srcpkgs/ansible/template @@ -1,7 +1,7 @@ # Template file for 'ansible' pkgname=ansible -version=6.4.0 -revision=2 +version=6.6.0 +revision=1 build_style="python3-pep517" hostmakedepends="python3-setuptools python3-wheel" depends="ansible-core" @@ -10,6 +10,6 @@ maintainer="Jan Christian Grünhage " license="GPL-3.0-or-later" homepage="https://www.ansible.com/" distfiles="${PYPI_SITE}/a/ansible/ansible-${version}.tar.gz" -checksum=80b422f73e2feeddc456581bf7de22e14ccd3e7fdb0d5060176e21c350ed8320 +checksum=e1b940a8d4f412123ede3c14b25cb99c3c8a4d535fd040aabf8e4fb7b0e4f092 # Relevant tests happen in ansible-core make_check=no