subject:"\[gentoo\-commits\] repo\/gentoo\:master commit in\: app\-admin\/apache\-tools\/"

[gentoo-commits] repo/gentoo:master commit in: app-admin/apache-tools/

2024-05-11 Thread Arthur Zamarin

commit: 7b5420b85ce4fa1812bd8ee3b21b2c515985244e
Author: Arthur Zamarin  gentoo  org>
AuthorDate: Sat May 11 11:06:27 2024 +
Commit: Arthur Zamarin  gentoo  org>
CommitDate: Sat May 11 11:06:27 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7b5420b8

app-admin/apache-tools: Stabilize 2.4.59 sparc, #931704

Signed-off-by: Arthur Zamarin  gentoo.org>

 app-admin/apache-tools/apache-tools-2.4.59.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-admin/apache-tools/apache-tools-2.4.59.ebuild 
b/app-admin/apache-tools/apache-tools-2.4.59.ebuild
index 57fde636c521..f3af585656d2 100644
--- a/app-admin/apache-tools/apache-tools-2.4.59.ebuild
+++ b/app-admin/apache-tools/apache-tools-2.4.59.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://apache/httpd/httpd-${PV}.tar.bz2"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv 
~s390 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv 
~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
 IUSE="ssl"
 RESTRICT="test"

[gentoo-commits] repo/gentoo:master commit in: app-admin/apache-tools/

2024-05-11 Thread Arthur Zamarin

commit: 9c3583983f4d0af0e3a355a1dbcad401a440c114
Author: Arthur Zamarin  gentoo  org>
AuthorDate: Sat May 11 10:22:37 2024 +
Commit: Arthur Zamarin  gentoo  org>
CommitDate: Sat May 11 10:22:37 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9c358398

app-admin/apache-tools: Stabilize 2.4.59 amd64, #931704

Signed-off-by: Arthur Zamarin  gentoo.org>

 app-admin/apache-tools/apache-tools-2.4.59.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-admin/apache-tools/apache-tools-2.4.59.ebuild 
b/app-admin/apache-tools/apache-tools-2.4.59.ebuild
index 006383102ed1..57fde636c521 100644
--- a/app-admin/apache-tools/apache-tools-2.4.59.ebuild
+++ b/app-admin/apache-tools/apache-tools-2.4.59.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://apache/httpd/httpd-${PV}.tar.bz2"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv 
~s390 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv 
~s390 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
 IUSE="ssl"
 RESTRICT="test"

[gentoo-commits] repo/gentoo:master commit in: app-admin/apache-tools/

2024-05-11 Thread Arthur Zamarin

commit: 44b161e6591a6d8964b2c677974dc0b948fc0b64
Author: Arthur Zamarin  gentoo  org>
AuthorDate: Sat May 11 10:22:36 2024 +
Commit: Arthur Zamarin  gentoo  org>
CommitDate: Sat May 11 10:22:36 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=44b161e6

app-admin/apache-tools: Stabilize 2.4.59 ppc64, #931704

Signed-off-by: Arthur Zamarin  gentoo.org>

 app-admin/apache-tools/apache-tools-2.4.59.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-admin/apache-tools/apache-tools-2.4.59.ebuild 
b/app-admin/apache-tools/apache-tools-2.4.59.ebuild
index 9758ac5943b8..006383102ed1 100644
--- a/app-admin/apache-tools/apache-tools-2.4.59.ebuild
+++ b/app-admin/apache-tools/apache-tools-2.4.59.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://apache/httpd/httpd-${PV}.tar.bz2"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ~ppc64 ~riscv 
~s390 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha ~amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv 
~s390 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
 IUSE="ssl"
 RESTRICT="test"

[gentoo-commits] repo/gentoo:master commit in: app-admin/apache-tools/

2024-05-11 Thread Arthur Zamarin

commit: 5704180602ef1c810572d339bc8054d238b5f438
Author: Arthur Zamarin  gentoo  org>
AuthorDate: Sat May 11 09:48:50 2024 +
Commit: Arthur Zamarin  gentoo  org>
CommitDate: Sat May 11 09:48:50 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=57041806

app-admin/apache-tools: Stabilize 2.4.59 arm, #931704

Signed-off-by: Arthur Zamarin  gentoo.org>

 app-admin/apache-tools/apache-tools-2.4.59.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-admin/apache-tools/apache-tools-2.4.59.ebuild 
b/app-admin/apache-tools/apache-tools-2.4.59.ebuild
index 181ac25e44ca..867bc78e7cd9 100644
--- a/app-admin/apache-tools/apache-tools-2.4.59.ebuild
+++ b/app-admin/apache-tools/apache-tools-2.4.59.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://apache/httpd/httpd-${PV}.tar.bz2"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm arm64 ~hppa ~ia64 ~loong ~mips ppc ~ppc64 ~riscv 
~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha ~amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ~ppc64 ~riscv 
~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
 IUSE="ssl"
 RESTRICT="test"

[gentoo-commits] repo/gentoo:master commit in: app-admin/apache-tools/

2024-05-11 Thread Arthur Zamarin

commit: d4bf7cc7128e03713039d781a908d0f6a81e3330
Author: Arthur Zamarin  gentoo  org>
AuthorDate: Sat May 11 09:48:52 2024 +
Commit: Arthur Zamarin  gentoo  org>
CommitDate: Sat May 11 09:48:52 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d4bf7cc7

app-admin/apache-tools: Stabilize 2.4.59 x86, #931704

Signed-off-by: Arthur Zamarin  gentoo.org>

 app-admin/apache-tools/apache-tools-2.4.59.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-admin/apache-tools/apache-tools-2.4.59.ebuild 
b/app-admin/apache-tools/apache-tools-2.4.59.ebuild
index 867bc78e7cd9..9758ac5943b8 100644
--- a/app-admin/apache-tools/apache-tools-2.4.59.ebuild
+++ b/app-admin/apache-tools/apache-tools-2.4.59.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://apache/httpd/httpd-${PV}.tar.bz2"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ~ppc64 ~riscv 
~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha ~amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ~ppc64 ~riscv 
~s390 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
 IUSE="ssl"
 RESTRICT="test"

[gentoo-commits] repo/gentoo:master commit in: app-admin/apache-tools/

2024-05-11 Thread Arthur Zamarin

commit: ebdea73910461605e3c8ddb281b0acd69404f418
Author: Arthur Zamarin  gentoo  org>
AuthorDate: Sat May 11 07:45:01 2024 +
Commit: Arthur Zamarin  gentoo  org>
CommitDate: Sat May 11 07:45:01 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ebdea739

app-admin/apache-tools: Stabilize 2.4.59 ppc, #931704

Signed-off-by: Arthur Zamarin  gentoo.org>

 app-admin/apache-tools/apache-tools-2.4.59.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-admin/apache-tools/apache-tools-2.4.59.ebuild 
b/app-admin/apache-tools/apache-tools-2.4.59.ebuild
index 0e68e3aaf6db..181ac25e44ca 100644
--- a/app-admin/apache-tools/apache-tools-2.4.59.ebuild
+++ b/app-admin/apache-tools/apache-tools-2.4.59.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://apache/httpd/httpd-${PV}.tar.bz2"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv 
~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha ~amd64 ~arm arm64 ~hppa ~ia64 ~loong ~mips ppc ~ppc64 ~riscv 
~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
 IUSE="ssl"
 RESTRICT="test"

[gentoo-commits] repo/gentoo:master commit in: app-admin/apache-tools/

2024-05-11 Thread Arthur Zamarin

commit: 8b41bd1287c8b34f256b48e4f5078bf42a5dea0d
Author: Arthur Zamarin  gentoo  org>
AuthorDate: Sat May 11 07:16:10 2024 +
Commit: Arthur Zamarin  gentoo  org>
CommitDate: Sat May 11 07:16:10 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8b41bd12

app-admin/apache-tools: Stabilize 2.4.59 arm64, #931704

Signed-off-by: Arthur Zamarin  gentoo.org>

 app-admin/apache-tools/apache-tools-2.4.59.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-admin/apache-tools/apache-tools-2.4.59.ebuild 
b/app-admin/apache-tools/apache-tools-2.4.59.ebuild
index ff67bbf7dac4..0e68e3aaf6db 100644
--- a/app-admin/apache-tools/apache-tools-2.4.59.ebuild
+++ b/app-admin/apache-tools/apache-tools-2.4.59.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://apache/httpd/httpd-${PV}.tar.bz2"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 
~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos 
~x64-solaris"
+KEYWORDS="~alpha ~amd64 ~arm arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv 
~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
 IUSE="ssl"
 RESTRICT="test"

[gentoo-commits] repo/gentoo:master commit in: app-admin/apache-tools/

2024-04-05 Thread Hans de Graaff

commit: 20edb2241cda1745ce98ad4df5e6ce29cda615ce
Author: Hans de Graaff  gentoo  org>
AuthorDate: Fri Apr  5 07:00:13 2024 +
Commit: Hans de Graaff  gentoo  org>
CommitDate: Fri Apr  5 07:00:25 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=20edb224

app-admin/apache-tools: add 2.4.59

Signed-off-by: Hans de Graaff  gentoo.org>

 app-admin/apache-tools/Manifest   |   1 +
 app-admin/apache-tools/apache-tools-2.4.59.ebuild | 113 ++
 2 files changed, 114 insertions(+)

diff --git a/app-admin/apache-tools/Manifest b/app-admin/apache-tools/Manifest
index ec4f70d5c0c4..3c228281999e 100644
--- a/app-admin/apache-tools/Manifest
+++ b/app-admin/apache-tools/Manifest
@@ -1,2 +1,3 @@
 DIST httpd-2.4.57.tar.bz2 7457022 BLAKE2B 
b33b51a741acd308ef4d4bdd2444d43eca9db68676fa67ec907eeea7384554f3f9a5608fc43dcf5819498264bbe36f176f30be9809474307642b70720036b88c
 SHA512 
4d1e0a274ee90bdfb5f38d4a7d73a7367ed1c6388e26280e640014e49abc0df03683705b88dcfe2ec2da313dda4c7b4a3b86daffa1911f58e224eba89d82d155
 DIST httpd-2.4.58.tar.bz2 7485817 BLAKE2B 
2105b8fada99f1dda55201ed89ed5326f0edb078d352cbff44f02cde80d129b65b63e07366a9a744ba474be5687fa8d3d2d8ddc64ac914b47166607f3f4a9de2
 SHA512 
d6e73bf413a507ec16b621ff635e178206207a9e9810ce3944b3dc98d39cde8f225307110167fc9da5822175796c8cb66f98be5b9f0d8b76dcd83a401d39b2c1
+DIST httpd-2.4.59.tar.bz2 7503198 BLAKE2B 
836e3538a120d71c016149397a4efd61ae6acd8a8fb9d2ce117c7d86209c4b40c0be3c464007891f28c58182e9d40a8793abe9e94e642354492954af91d9878c
 SHA512 
209da0bbac5e2564d4590302515b35495be6402273ff4024aa93e85e44554c95e053201d606383936425a41e1b5b97e6b40055dcbb385eb691a5029a6f3158c2

diff --git a/app-admin/apache-tools/apache-tools-2.4.59.ebuild 
b/app-admin/apache-tools/apache-tools-2.4.59.ebuild
new file mode 100644
index ..ff67bbf7dac4
--- /dev/null
+++ b/app-admin/apache-tools/apache-tools-2.4.59.ebuild
@@ -0,0 +1,113 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools toolchain-funcs
+
+DESCRIPTION="Useful Apache tools - htdigest, htpasswd, ab, htdbm"
+HOMEPAGE="https://httpd.apache.org/;
+SRC_URI="mirror://apache/httpd/httpd-${PV}.tar.bz2"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 
~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos 
~x64-solaris"
+IUSE="ssl"
+RESTRICT="test"
+
+RDEPEND=">=dev-libs/apr-1.5.0:1=
+   dev-libs/apr-util:1=
+   dev-libs/expat
+   dev-libs/libpcre2
+   virtual/libcrypt:=
+   kernel_linux? ( sys-apps/util-linux )
+   ssl? ( dev-libs/openssl:0= )"
+DEPEND="${RDEPEND}
+   dev-build/libtool"
+BDEPEND="
+   virtual/pkgconfig
+"
+
+S="${WORKDIR}/httpd-${PV}"
+
+PATCHES=(
+   "${FILESDIR}/${PN}-2.4.54-Makefile.patch" #459446
+   "${FILESDIR}/${PN}-2.4.54-no-which.patch" #844868
+   "${FILESDIR}/${PN}-2.4.54-libtool.patch" #858833
+)
+
+src_prepare() {
+   default
+
+   # This package really should upgrade to using pcre's .pc file.
+   cat <<-\EOF > "${T}"/pcre2-config
+   #!/usr/bin/env bash
+   flags=()
+   for flag; do
+   if [[ ${flag} == "--version" ]]; then
+   flags+=( --modversion )
+   else
+   flags+=( "${flag}" )
+   fi
+   done
+   exec ${PKG_CONFIG} libpcre2-8 "${flags[@]}"
+   EOF
+   chmod a+x "${T}"/pcre2-config || die
+
+   # Only here for libtool and which patches
+   eautoreconf
+}
+
+src_configure() {
+   # Silly check.
+   tc-is-cross-compiler && export ap_cv_void_ptr_lt_long="no"
+
+   tc-export PKG_CONFIG
+   export ac_cv_path_PKGCONFIG="${PKG_CONFIG}"
+   export ac_cv_prog_ac_ct_PCRE_CONFIG="${T}"/pcre2-config
+
+   local myeconfargs=(
+   --libexecdir="${EPREFIX}"/usr/$(get_libdir)/apache2/modules
+   --sbindir="${EPREFIX}"/usr/sbin
+   --with-z="${EPREFIX}"/usr
+   --with-apr="${ESYSROOT}"/usr
+   --with-apr-util="${ESYSROOT}"/usr
+   --without-pcre
+   --with-pcre2="${T}"/pcre2-config
+   $(use_enable ssl)
+   $(usex ssl '--with-ssl="${EPREFIX}"/usr' '')
+   )
+
+   # econf overwrites the stuff from config.layout.
+   econf "${myeconfargs[@]}"
+
+   sed -i \
+   -e '/^LTFLAGS/s:--silent::' \
+   build/rules.mk build/config_vars.mk || die
+}
+
+src_compile() {
+   emake -C support
+}
+
+src_install() {
+   emake -C support DESTDIR="${D}" install
+   dodoc CHANGES
+   doman docs/man/{dbmmanage,htdigest,htpasswd,htdbm,ab,logresolve}.1 \
+   docs/man/{htcacheclean,rotatelogs}.8
+
+   # Providing compatiblity symlinks for #177697 (which we'll stop to 
install
+   # at some point).
+   pushd "${ED}"/usr/sbin >/dev/null

[gentoo-commits] repo/gentoo:master commit in: app-admin/apache-tools/

2024-01-04 Thread Sam James

commit: 9bcfdfe488e1cd936780f555394fa56ba96e5cdb
Author: Sam James  gentoo  org>
AuthorDate: Fri Jan  5 05:23:58 2024 +
Commit: Sam James  gentoo  org>
CommitDate: Fri Jan  5 05:24:07 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9bcfdfe4

app-admin/apache-tools: Stabilize 2.4.58 x86, #916744

Signed-off-by: Sam James  gentoo.org>

 app-admin/apache-tools/apache-tools-2.4.58.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-admin/apache-tools/apache-tools-2.4.58.ebuild 
b/app-admin/apache-tools/apache-tools-2.4.58.ebuild
index 3602db613b8c..9fa88235ae11 100644
--- a/app-admin/apache-tools/apache-tools-2.4.58.ebuild
+++ b/app-admin/apache-tools/apache-tools-2.4.58.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://apache/httpd/httpd-${PV}.tar.bz2"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv 
~s390 sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv 
~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
 IUSE="ssl"
 RESTRICT="test"

[gentoo-commits] repo/gentoo:master commit in: app-admin/apache-tools/

2024-01-04 Thread Sam James

commit: 75765d113ccc98295f783bf2d53cd30b93610cdb
Author: Sam James  gentoo  org>
AuthorDate: Fri Jan  5 05:23:50 2024 +
Commit: Sam James  gentoo  org>
CommitDate: Fri Jan  5 05:24:06 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=75765d11

app-admin/apache-tools: Stabilize 2.4.58 amd64, #916744

Signed-off-by: Sam James  gentoo.org>

 app-admin/apache-tools/apache-tools-2.4.58.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app-admin/apache-tools/apache-tools-2.4.58.ebuild 
b/app-admin/apache-tools/apache-tools-2.4.58.ebuild
index e13f64f926cf..3602db613b8c 100644
--- a/app-admin/apache-tools/apache-tools-2.4.58.ebuild
+++ b/app-admin/apache-tools/apache-tools-2.4.58.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -11,7 +11,7 @@ SRC_URI="mirror://apache/httpd/httpd-${PV}.tar.bz2"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv 
~s390 sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv 
~s390 sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
 IUSE="ssl"
 RESTRICT="test"

[gentoo-commits] repo/gentoo:master commit in: app-admin/apache-tools/

2023-11-25 Thread Arthur Zamarin

commit: 1bc6c6f40c08a682a2467489eed670afbcf355b6
Author: Arthur Zamarin  gentoo  org>
AuthorDate: Sat Nov 25 16:51:47 2023 +
Commit: Arthur Zamarin  gentoo  org>
CommitDate: Sat Nov 25 16:51:47 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1bc6c6f4

app-admin/apache-tools: Stabilize 2.4.58 arm, #916744

Signed-off-by: Arthur Zamarin  gentoo.org>

 app-admin/apache-tools/apache-tools-2.4.58.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-admin/apache-tools/apache-tools-2.4.58.ebuild 
b/app-admin/apache-tools/apache-tools-2.4.58.ebuild
index 467975481c45..3c930fcb15ac 100644
--- a/app-admin/apache-tools/apache-tools-2.4.58.ebuild
+++ b/app-admin/apache-tools/apache-tools-2.4.58.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://apache/httpd/httpd-${PV}.tar.bz2"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 
~riscv ~s390 sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos 
~x64-solaris"
+KEYWORDS="~alpha ~amd64 arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv 
~s390 sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
 IUSE="ssl"
 RESTRICT="test"

[gentoo-commits] repo/gentoo:master commit in: app-admin/apache-tools/

2023-11-13 Thread Sam James

commit: 12bf207875e6287fc6d210e70f4ad3c5e8c9d817
Author: Rolf Eike Beer  sf-mail  de>
AuthorDate: Mon Nov 13 16:40:56 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Mon Nov 13 19:51:03 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=12bf2078

app-admin/apache-tools: stable 2.4.58 for sparc, bug #916744

Signed-off-by: Rolf Eike Beer  sf-mail.de>
Signed-off-by: Sam James  gentoo.org>

 app-admin/apache-tools/apache-tools-2.4.58.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-admin/apache-tools/apache-tools-2.4.58.ebuild 
b/app-admin/apache-tools/apache-tools-2.4.58.ebuild
index b4f5b385c813..467975481c45 100644
--- a/app-admin/apache-tools/apache-tools-2.4.58.ebuild
+++ b/app-admin/apache-tools/apache-tools-2.4.58.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://apache/httpd/httpd-${PV}.tar.bz2"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 
~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos 
~x64-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 
~riscv ~s390 sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos 
~x64-solaris"
 IUSE="ssl"
 RESTRICT="test"

[gentoo-commits] repo/gentoo:master commit in: app-admin/apache-tools/

2023-10-19 Thread Hans de Graaff

commit: 0f417ddf81e49c8ed2c86be0d67da8a272ccf600
Author: Hans de Graaff  gentoo  org>
AuthorDate: Thu Oct 19 12:19:49 2023 +
Commit: Hans de Graaff  gentoo  org>
CommitDate: Thu Oct 19 12:21:04 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0f417ddf

app-admin/apache-tools: add 2.4.58

Signed-off-by: Hans de Graaff  gentoo.org>

 app-admin/apache-tools/Manifest   |   1 +
 app-admin/apache-tools/apache-tools-2.4.58.ebuild | 113 ++
 2 files changed, 114 insertions(+)

diff --git a/app-admin/apache-tools/Manifest b/app-admin/apache-tools/Manifest
index 251451f156ac..ec4f70d5c0c4 100644
--- a/app-admin/apache-tools/Manifest
+++ b/app-admin/apache-tools/Manifest
@@ -1 +1,2 @@
 DIST httpd-2.4.57.tar.bz2 7457022 BLAKE2B 
b33b51a741acd308ef4d4bdd2444d43eca9db68676fa67ec907eeea7384554f3f9a5608fc43dcf5819498264bbe36f176f30be9809474307642b70720036b88c
 SHA512 
4d1e0a274ee90bdfb5f38d4a7d73a7367ed1c6388e26280e640014e49abc0df03683705b88dcfe2ec2da313dda4c7b4a3b86daffa1911f58e224eba89d82d155
+DIST httpd-2.4.58.tar.bz2 7485817 BLAKE2B 
2105b8fada99f1dda55201ed89ed5326f0edb078d352cbff44f02cde80d129b65b63e07366a9a744ba474be5687fa8d3d2d8ddc64ac914b47166607f3f4a9de2
 SHA512 
d6e73bf413a507ec16b621ff635e178206207a9e9810ce3944b3dc98d39cde8f225307110167fc9da5822175796c8cb66f98be5b9f0d8b76dcd83a401d39b2c1

diff --git a/app-admin/apache-tools/apache-tools-2.4.58.ebuild 
b/app-admin/apache-tools/apache-tools-2.4.58.ebuild
new file mode 100644
index ..b4f5b385c813
--- /dev/null
+++ b/app-admin/apache-tools/apache-tools-2.4.58.ebuild
@@ -0,0 +1,113 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools toolchain-funcs
+
+DESCRIPTION="Useful Apache tools - htdigest, htpasswd, ab, htdbm"
+HOMEPAGE="https://httpd.apache.org/;
+SRC_URI="mirror://apache/httpd/httpd-${PV}.tar.bz2"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 
~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos 
~x64-solaris"
+IUSE="ssl"
+RESTRICT="test"
+
+RDEPEND=">=dev-libs/apr-1.5.0:1=
+   dev-libs/apr-util:1=
+   dev-libs/expat
+   dev-libs/libpcre2
+   virtual/libcrypt:=
+   kernel_linux? ( sys-apps/util-linux )
+   ssl? ( dev-libs/openssl:0= )"
+DEPEND="${RDEPEND}
+   sys-devel/libtool"
+BDEPEND="
+   virtual/pkgconfig
+"
+
+S="${WORKDIR}/httpd-${PV}"
+
+PATCHES=(
+   "${FILESDIR}/${PN}-2.4.54-Makefile.patch" #459446
+   "${FILESDIR}/${PN}-2.4.54-no-which.patch" #844868
+   "${FILESDIR}/${PN}-2.4.54-libtool.patch" #858833
+)
+
+src_prepare() {
+   default
+
+   # This package really should upgrade to using pcre's .pc file.
+   cat <<-\EOF > "${T}"/pcre2-config
+   #!/usr/bin/env bash
+   flags=()
+   for flag; do
+   if [[ ${flag} == "--version" ]]; then
+   flags+=( --modversion )
+   else
+   flags+=( "${flag}" )
+   fi
+   done
+   exec ${PKG_CONFIG} libpcre2-8 "${flags[@]}"
+   EOF
+   chmod a+x "${T}"/pcre2-config || die
+
+   # Only here for libtool and which patches
+   eautoreconf
+}
+
+src_configure() {
+   # Silly check.
+   tc-is-cross-compiler && export ap_cv_void_ptr_lt_long="no"
+
+   tc-export PKG_CONFIG
+   export ac_cv_path_PKGCONFIG="${PKG_CONFIG}"
+   export ac_cv_prog_ac_ct_PCRE_CONFIG="${T}"/pcre2-config
+
+   local myeconfargs=(
+   --libexecdir="${EPREFIX}"/usr/$(get_libdir)/apache2/modules
+   --sbindir="${EPREFIX}"/usr/sbin
+   --with-z="${EPREFIX}"/usr
+   --with-apr="${ESYSROOT}"/usr
+   --with-apr-util="${ESYSROOT}"/usr
+   --without-pcre
+   --with-pcre2="${T}"/pcre2-config
+   $(use_enable ssl)
+   $(usex ssl '--with-ssl="${EPREFIX}"/usr' '')
+   )
+
+   # econf overwrites the stuff from config.layout.
+   econf "${myeconfargs[@]}"
+
+   sed -i \
+   -e '/^LTFLAGS/s:--silent::' \
+   build/rules.mk build/config_vars.mk || die
+}
+
+src_compile() {
+   emake -C support
+}
+
+src_install() {
+   emake -C support DESTDIR="${D}" install
+   dodoc CHANGES
+   doman docs/man/{dbmmanage,htdigest,htpasswd,htdbm,ab,logresolve}.1 \
+   docs/man/{htcacheclean,rotatelogs}.8
+
+   # Providing compatiblity symlinks for #177697 (which we'll stop to 
install
+   # at some point).
+   pushd "${ED}"/usr/sbin >/dev/null || die
+   local i
+   for i in *; do
+   dosym ${i} /usr/sbin/${i}2
+   done
+   popd >/dev/null || die
+
+   # Provide a symlink for ab-ssl
+   if use ssl ; then
+   dosym ab /usr/bin/ab-ssl
+   dosym ab /usr/bin/ab2-ssl
+   fi
+}

[gentoo-commits] repo/gentoo:master commit in: app-admin/apache-tools/

2023-06-16 Thread Hans de Graaff

commit: e47872d5da650cf073524d6cd19a79d4c5196b27
Author: Hans de Graaff  gentoo  org>
AuthorDate: Fri Jun 16 06:18:28 2023 +
Commit: Hans de Graaff  gentoo  org>
CommitDate: Fri Jun 16 06:19:04 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e47872d5

app-admin/apache-tools: drop 2.4.54-r3, 2.4.55, 2.4.56

Signed-off-by: Hans de Graaff  gentoo.org>

 app-admin/apache-tools/Manifest|   3 -
 .../apache-tools/apache-tools-2.4.54-r3.ebuild | 113 -
 app-admin/apache-tools/apache-tools-2.4.55.ebuild  | 113 -
 app-admin/apache-tools/apache-tools-2.4.56.ebuild  | 113 -
 4 files changed, 342 deletions(-)

diff --git a/app-admin/apache-tools/Manifest b/app-admin/apache-tools/Manifest
index 14899b71d06f..251451f156ac 100644
--- a/app-admin/apache-tools/Manifest
+++ b/app-admin/apache-tools/Manifest
@@ -1,4 +1 @@
-DIST httpd-2.4.54.tar.bz2 7434530 BLAKE2B 
be2ba2d33368f9dd619e36e63dd3635fbcf55773a539ac2840251bda04311f3eb535c08a37ab58d8b184c71e75b90b92e2bdc4e59c722cfb146de516f6e1ed04
 SHA512 
228493b2ff32c4142c6e484d304f2ea12e467498605fe12adce2b61388d8efe7b2e96ae2fd0abd1dc88a5f12d625e007d8da0ae5628cff2a5272806754f41e18
-DIST httpd-2.4.55.tar.bz2 7456187 BLAKE2B 
98e9ec41aa3ccbbe533672ba6de8421e1f0cb5a4b4a06d0cf26c676945bcd5ebe66a1fd21d941ad8ff2c9183565ce542a5643730bbee5972934008652924945b
 SHA512 
94982f7a1fedac8961fc17b5a22cf763ac28cb27ee6facab2e6a15b249b927773667493fd3f7354fb13fcb34a6f1afc1bdd5cf4b7be030cba1dfb523e40d43fb
-DIST httpd-2.4.56.tar.bz2 7456418 BLAKE2B 
f9aaf5038543aeec79d5b8615b1b2120fe321966280574c685070f2356f8f1dba1d55a9a25f46cb5ecdd6e3f03785fe7a4e1b965506896cb889720728aa18101
 SHA512 
5f12cd9878d822384b1bb163fea4d8edee5e7a0dd8b23892643879712681456a5a27ddf0436c5f1f631acc5fdc4874da2a47911483e421ca40bf783e0e12
 DIST httpd-2.4.57.tar.bz2 7457022 BLAKE2B 
b33b51a741acd308ef4d4bdd2444d43eca9db68676fa67ec907eeea7384554f3f9a5608fc43dcf5819498264bbe36f176f30be9809474307642b70720036b88c
 SHA512 
4d1e0a274ee90bdfb5f38d4a7d73a7367ed1c6388e26280e640014e49abc0df03683705b88dcfe2ec2da313dda4c7b4a3b86daffa1911f58e224eba89d82d155

diff --git a/app-admin/apache-tools/apache-tools-2.4.54-r3.ebuild 
b/app-admin/apache-tools/apache-tools-2.4.54-r3.ebuild
deleted file mode 100644
index 9db71d1c9ca8..
--- a/app-admin/apache-tools/apache-tools-2.4.54-r3.ebuild
+++ /dev/null
@@ -1,113 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit autotools toolchain-funcs
-
-DESCRIPTION="Useful Apache tools - htdigest, htpasswd, ab, htdbm"
-HOMEPAGE="https://httpd.apache.org/;
-SRC_URI="mirror://apache/httpd/httpd-${PV}.tar.bz2"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv 
~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
-IUSE="ssl"
-RESTRICT="test"
-
-RDEPEND=">=dev-libs/apr-1.5.0:1=
-   dev-libs/apr-util:1=
-   dev-libs/expat
-   dev-libs/libpcre2
-   virtual/libcrypt:=
-   kernel_linux? ( sys-apps/util-linux )
-   ssl? ( dev-libs/openssl:0= )"
-DEPEND="${RDEPEND}
-   sys-devel/libtool"
-BDEPEND="
-   virtual/pkgconfig
-"
-
-S="${WORKDIR}/httpd-${PV}"
-
-PATCHES=(
-   "${FILESDIR}/${PN}-2.4.54-Makefile.patch" #459446
-   "${FILESDIR}/${PN}-2.4.54-no-which.patch" #844868
-   "${FILESDIR}/${PN}-2.4.54-libtool.patch" #858833
-)
-
-src_prepare() {
-   default
-
-   # This package really should upgrade to using pcre's .pc file.
-   cat <<-\EOF > "${T}"/pcre2-config
-   #!/usr/bin/env bash
-   flags=()
-   for flag; do
-   if [[ ${flag} == "--version" ]]; then
-   flags+=( --modversion )
-   else
-   flags+=( "${flag}" )
-   fi
-   done
-   exec ${PKG_CONFIG} libpcre2-8 "${flags[@]}"
-   EOF
-   chmod a+x "${T}"/pcre2-config || die
-
-   # Only here for libtool and which patches
-   eautoreconf
-}
-
-src_configure() {
-   # Silly check.
-   tc-is-cross-compiler && export ap_cv_void_ptr_lt_long="no"
-
-   tc-export PKG_CONFIG
-   export ac_cv_path_PKGCONFIG="${PKG_CONFIG}"
-   export ac_cv_prog_ac_ct_PCRE_CONFIG="${T}"/pcre2-config
-
-   local myeconfargs=(
-   --libexecdir="${EPREFIX}"/usr/$(get_libdir)/apache2/modules
-   --sbindir="${EPREFIX}"/usr/sbin
-   --with-z="${EPREFIX}"/usr
-   --with-apr="${ESYSROOT}"/usr
-   --with-apr-util="${ESYSROOT}"/usr
-   --without-pcre
-   --with-pcre2="${T}"/pcre2-config
-   $(use_enable ssl)
-   $(usex ssl '--with-ssl="${EPREFIX}"/usr' '')
-   )
-
-   # econf overwrites the stuff from config.layout.
-   econf "${myeconfargs[@]}"
-
-   sed -i \
-   -e

[gentoo-commits] repo/gentoo:master commit in: app-admin/apache-tools/

2023-06-04 Thread Arthur Zamarin

commit: ad420635ee4c82672147e0524b0ae1839815e515
Author: Arthur Zamarin  gentoo  org>
AuthorDate: Sun Jun  4 16:04:43 2023 +
Commit: Arthur Zamarin  gentoo  org>
CommitDate: Sun Jun  4 16:04:43 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ad420635

app-admin/apache-tools: Stabilize 2.4.57 amd64, #907737

Signed-off-by: Arthur Zamarin  gentoo.org>

 app-admin/apache-tools/apache-tools-2.4.57.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-admin/apache-tools/apache-tools-2.4.57.ebuild 
b/app-admin/apache-tools/apache-tools-2.4.57.ebuild
index b0e023f764b0..ef2ca5d89fd4 100644
--- a/app-admin/apache-tools/apache-tools-2.4.57.ebuild
+++ b/app-admin/apache-tools/apache-tools-2.4.57.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://apache/httpd/httpd-${PV}.tar.bz2"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv 
~s390 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv 
~s390 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
 IUSE="ssl"
 RESTRICT="test"

[gentoo-commits] repo/gentoo:master commit in: app-admin/apache-tools/

2023-06-04 Thread Arthur Zamarin

commit: 6435baa6a44128f99e26a3c009be9a02160da732
Author: Arthur Zamarin  gentoo  org>
AuthorDate: Sun Jun  4 16:04:53 2023 +
Commit: Arthur Zamarin  gentoo  org>
CommitDate: Sun Jun  4 16:04:53 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6435baa6

app-admin/apache-tools: Stabilize 2.4.57 ppc, #907737

Signed-off-by: Arthur Zamarin  gentoo.org>

 app-admin/apache-tools/apache-tools-2.4.57.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-admin/apache-tools/apache-tools-2.4.57.ebuild 
b/app-admin/apache-tools/apache-tools-2.4.57.ebuild
index bda5704abca2..6155ed6c55f4 100644
--- a/app-admin/apache-tools/apache-tools-2.4.57.ebuild
+++ b/app-admin/apache-tools/apache-tools-2.4.57.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://apache/httpd/httpd-${PV}.tar.bz2"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~loong ~mips ~ppc ppc64 ~riscv 
~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv 
~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
 IUSE="ssl"
 RESTRICT="test"

[gentoo-commits] repo/gentoo:master commit in: app-admin/apache-tools/

2023-06-04 Thread Arthur Zamarin

commit: d763537b39d7674afc8288ac8df21ac0eeed5f77
Author: Arthur Zamarin  gentoo  org>
AuthorDate: Sun Jun  4 16:04:50 2023 +
Commit: Arthur Zamarin  gentoo  org>
CommitDate: Sun Jun  4 16:04:50 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d763537b

app-admin/apache-tools: Stabilize 2.4.57 ppc64, #907737

Signed-off-by: Arthur Zamarin  gentoo.org>

 app-admin/apache-tools/apache-tools-2.4.57.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-admin/apache-tools/apache-tools-2.4.57.ebuild 
b/app-admin/apache-tools/apache-tools-2.4.57.ebuild
index 4c6fcd275986..bda5704abca2 100644
--- a/app-admin/apache-tools/apache-tools-2.4.57.ebuild
+++ b/app-admin/apache-tools/apache-tools-2.4.57.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://apache/httpd/httpd-${PV}.tar.bz2"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv 
~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~loong ~mips ~ppc ppc64 ~riscv 
~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
 IUSE="ssl"
 RESTRICT="test"

[gentoo-commits] repo/gentoo:master commit in: app-admin/apache-tools/

2023-06-04 Thread Arthur Zamarin

commit: 5f02ac4a293ddbef63f6aeb48da152f6629e4000
Author: Arthur Zamarin  gentoo  org>
AuthorDate: Sun Jun  4 16:04:56 2023 +
Commit: Arthur Zamarin  gentoo  org>
CommitDate: Sun Jun  4 16:04:56 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5f02ac4a

app-admin/apache-tools: Stabilize 2.4.57 arm, #907737

Signed-off-by: Arthur Zamarin  gentoo.org>

 app-admin/apache-tools/apache-tools-2.4.57.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-admin/apache-tools/apache-tools-2.4.57.ebuild 
b/app-admin/apache-tools/apache-tools-2.4.57.ebuild
index 6155ed6c55f4..9db71d1c9ca8 100644
--- a/app-admin/apache-tools/apache-tools-2.4.57.ebuild
+++ b/app-admin/apache-tools/apache-tools-2.4.57.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://apache/httpd/httpd-${PV}.tar.bz2"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv 
~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv 
~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
 IUSE="ssl"
 RESTRICT="test"

[gentoo-commits] repo/gentoo:master commit in: app-admin/apache-tools/

2023-06-04 Thread Arthur Zamarin

commit: 246ccb763dc1c4ab83f4c61d2bb72cd1fe2e45ca
Author: Arthur Zamarin  gentoo  org>
AuthorDate: Sun Jun  4 16:04:40 2023 +
Commit: Arthur Zamarin  gentoo  org>
CommitDate: Sun Jun  4 16:04:40 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=246ccb76

app-admin/apache-tools: Stabilize 2.4.57 x86, #907737

Signed-off-by: Arthur Zamarin  gentoo.org>

 app-admin/apache-tools/apache-tools-2.4.57.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-admin/apache-tools/apache-tools-2.4.57.ebuild 
b/app-admin/apache-tools/apache-tools-2.4.57.ebuild
index 38316f95a01b..b0e023f764b0 100644
--- a/app-admin/apache-tools/apache-tools-2.4.57.ebuild
+++ b/app-admin/apache-tools/apache-tools-2.4.57.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://apache/httpd/httpd-${PV}.tar.bz2"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv 
~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha ~amd64 ~arm arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv 
~s390 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
 IUSE="ssl"
 RESTRICT="test"

[gentoo-commits] repo/gentoo:master commit in: app-admin/apache-tools/

2023-06-04 Thread Arthur Zamarin

commit: 3b2cc1ce4c26c0bdb987ad34dbecf6fa2bc6b3e9
Author: Arthur Zamarin  gentoo  org>
AuthorDate: Sun Jun  4 16:04:47 2023 +
Commit: Arthur Zamarin  gentoo  org>
CommitDate: Sun Jun  4 16:04:47 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3b2cc1ce

app-admin/apache-tools: Stabilize 2.4.57 sparc, #907737

Signed-off-by: Arthur Zamarin  gentoo.org>

 app-admin/apache-tools/apache-tools-2.4.57.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-admin/apache-tools/apache-tools-2.4.57.ebuild 
b/app-admin/apache-tools/apache-tools-2.4.57.ebuild
index ef2ca5d89fd4..4c6fcd275986 100644
--- a/app-admin/apache-tools/apache-tools-2.4.57.ebuild
+++ b/app-admin/apache-tools/apache-tools-2.4.57.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://apache/httpd/httpd-${PV}.tar.bz2"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv 
~s390 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv 
~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
 IUSE="ssl"
 RESTRICT="test"

[gentoo-commits] repo/gentoo:master commit in: app-admin/apache-tools/

2023-06-03 Thread Sam James

commit: 4de8b4a0c33d25247deeddfe6e2aa74c5fec9ad1
Author: Sam James  gentoo  org>
AuthorDate: Sat Jun  3 17:25:23 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Sat Jun  3 17:25:23 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4de8b4a0

app-admin/apache-tools: Stabilize 2.4.57 arm64, #907737

Signed-off-by: Sam James  gentoo.org>

 app-admin/apache-tools/apache-tools-2.4.57.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-admin/apache-tools/apache-tools-2.4.57.ebuild 
b/app-admin/apache-tools/apache-tools-2.4.57.ebuild
index b4f5b385c813..38316f95a01b 100644
--- a/app-admin/apache-tools/apache-tools-2.4.57.ebuild
+++ b/app-admin/apache-tools/apache-tools-2.4.57.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://apache/httpd/httpd-${PV}.tar.bz2"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 
~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos 
~x64-solaris"
+KEYWORDS="~alpha ~amd64 ~arm arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv 
~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
 IUSE="ssl"
 RESTRICT="test"

[gentoo-commits] repo/gentoo:master commit in: app-admin/apache-tools/

2023-06-02 Thread Sam James

commit: 78b9dd9a29866dc6b7a20debf2ba3a3f9d372ef0
Author: Sam James  gentoo  org>
AuthorDate: Sat Jun  3 05:43:56 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Sat Jun  3 05:43:56 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=78b9dd9a

app-admin/apache-tools: Stabilize 2.4.56 arm64, #903493

Signed-off-by: Sam James  gentoo.org>

 app-admin/apache-tools/apache-tools-2.4.56.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-admin/apache-tools/apache-tools-2.4.56.ebuild 
b/app-admin/apache-tools/apache-tools-2.4.56.ebuild
index 5a8076aacfb9..9db71d1c9ca8 100644
--- a/app-admin/apache-tools/apache-tools-2.4.56.ebuild
+++ b/app-admin/apache-tools/apache-tools-2.4.56.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://apache/httpd/httpd-${PV}.tar.bz2"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv 
~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv 
~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
 IUSE="ssl"
 RESTRICT="test"

[gentoo-commits] repo/gentoo:master commit in: app-admin/apache-tools/

2023-06-02 Thread Sam James

commit: b2821893673f3e4d04b936ffe337072a07e86ee4
Author: Sam James  gentoo  org>
AuthorDate: Sat Jun  3 05:43:52 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Sat Jun  3 05:43:52 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b2821893

app-admin/apache-tools: Stabilize 2.4.56 ppc64, #903493

Signed-off-by: Sam James  gentoo.org>

 app-admin/apache-tools/apache-tools-2.4.56.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-admin/apache-tools/apache-tools-2.4.56.ebuild 
b/app-admin/apache-tools/apache-tools-2.4.56.ebuild
index 43b6a09d1277..5a8076aacfb9 100644
--- a/app-admin/apache-tools/apache-tools-2.4.56.ebuild
+++ b/app-admin/apache-tools/apache-tools-2.4.56.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://apache/httpd/httpd-${PV}.tar.bz2"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~loong ~mips ppc ~ppc64 ~riscv 
~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv 
~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
 IUSE="ssl"
 RESTRICT="test"

[gentoo-commits] repo/gentoo:master commit in: app-admin/apache-tools/

2023-06-02 Thread Sam James

commit: 367d07c0c55474c826670a97758a9c9e400ea395
Author: Sam James  gentoo  org>
AuthorDate: Sat Jun  3 05:43:43 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Sat Jun  3 05:43:43 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=367d07c0

app-admin/apache-tools: Stabilize 2.4.56 x86, #903493

Signed-off-by: Sam James  gentoo.org>

 app-admin/apache-tools/apache-tools-2.4.56.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-admin/apache-tools/apache-tools-2.4.56.ebuild 
b/app-admin/apache-tools/apache-tools-2.4.56.ebuild
index b335247bd578..7740c4757d23 100644
--- a/app-admin/apache-tools/apache-tools-2.4.56.ebuild
+++ b/app-admin/apache-tools/apache-tools-2.4.56.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://apache/httpd/httpd-${PV}.tar.bz2"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv 
~s390 sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv 
~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
 IUSE="ssl"
 RESTRICT="test"

[gentoo-commits] repo/gentoo:master commit in: app-admin/apache-tools/

2023-06-02 Thread Sam James

commit: 5a648a427188b5d302c4bcc656648afd30ecf541
Author: Sam James  gentoo  org>
AuthorDate: Sat Jun  3 05:43:48 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Sat Jun  3 05:43:48 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5a648a42

app-admin/apache-tools: Stabilize 2.4.56 ppc, #903493

Signed-off-by: Sam James  gentoo.org>

 app-admin/apache-tools/apache-tools-2.4.56.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-admin/apache-tools/apache-tools-2.4.56.ebuild 
b/app-admin/apache-tools/apache-tools-2.4.56.ebuild
index 7740c4757d23..43b6a09d1277 100644
--- a/app-admin/apache-tools/apache-tools-2.4.56.ebuild
+++ b/app-admin/apache-tools/apache-tools-2.4.56.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://apache/httpd/httpd-${PV}.tar.bz2"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv 
~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~loong ~mips ppc ~ppc64 ~riscv 
~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
 IUSE="ssl"
 RESTRICT="test"

[gentoo-commits] repo/gentoo:master commit in: app-admin/apache-tools/

2023-06-02 Thread Sam James

commit: b154cbe02836ef92450fdb3e57ace62cd9a6e068
Author: Sam James  gentoo  org>
AuthorDate: Sat Jun  3 05:43:39 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Sat Jun  3 05:43:39 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b154cbe0

app-admin/apache-tools: Stabilize 2.4.56 amd64, #903493

Signed-off-by: Sam James  gentoo.org>

 app-admin/apache-tools/apache-tools-2.4.56.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-admin/apache-tools/apache-tools-2.4.56.ebuild 
b/app-admin/apache-tools/apache-tools-2.4.56.ebuild
index 3c930fcb15ac..b335247bd578 100644
--- a/app-admin/apache-tools/apache-tools-2.4.56.ebuild
+++ b/app-admin/apache-tools/apache-tools-2.4.56.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://apache/httpd/httpd-${PV}.tar.bz2"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv 
~s390 sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv 
~s390 sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
 IUSE="ssl"
 RESTRICT="test"

[gentoo-commits] repo/gentoo:master commit in: app-admin/apache-tools/

2023-04-13 Thread Sam James

commit: a843f633f7cd8e6bc4b25de752d76d810e2fa891
Author: Tomáš Mózes  gmail  com>
AuthorDate: Wed Apr 12 10:31:28 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Fri Apr 14 01:05:11 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a843f633

app-admin/apache-tools: add 2.4.57

Signed-off-by: Tomáš Mózes  gmail.com>
Signed-off-by: Sam James  gentoo.org>

 app-admin/apache-tools/Manifest   |   1 +
 app-admin/apache-tools/apache-tools-2.4.57.ebuild | 113 ++
 2 files changed, 114 insertions(+)

diff --git a/app-admin/apache-tools/Manifest b/app-admin/apache-tools/Manifest
index f20dba62d411..14899b71d06f 100644
--- a/app-admin/apache-tools/Manifest
+++ b/app-admin/apache-tools/Manifest
@@ -1,3 +1,4 @@
 DIST httpd-2.4.54.tar.bz2 7434530 BLAKE2B 
be2ba2d33368f9dd619e36e63dd3635fbcf55773a539ac2840251bda04311f3eb535c08a37ab58d8b184c71e75b90b92e2bdc4e59c722cfb146de516f6e1ed04
 SHA512 
228493b2ff32c4142c6e484d304f2ea12e467498605fe12adce2b61388d8efe7b2e96ae2fd0abd1dc88a5f12d625e007d8da0ae5628cff2a5272806754f41e18
 DIST httpd-2.4.55.tar.bz2 7456187 BLAKE2B 
98e9ec41aa3ccbbe533672ba6de8421e1f0cb5a4b4a06d0cf26c676945bcd5ebe66a1fd21d941ad8ff2c9183565ce542a5643730bbee5972934008652924945b
 SHA512 
94982f7a1fedac8961fc17b5a22cf763ac28cb27ee6facab2e6a15b249b927773667493fd3f7354fb13fcb34a6f1afc1bdd5cf4b7be030cba1dfb523e40d43fb
 DIST httpd-2.4.56.tar.bz2 7456418 BLAKE2B 
f9aaf5038543aeec79d5b8615b1b2120fe321966280574c685070f2356f8f1dba1d55a9a25f46cb5ecdd6e3f03785fe7a4e1b965506896cb889720728aa18101
 SHA512 
5f12cd9878d822384b1bb163fea4d8edee5e7a0dd8b23892643879712681456a5a27ddf0436c5f1f631acc5fdc4874da2a47911483e421ca40bf783e0e12
+DIST httpd-2.4.57.tar.bz2 7457022 BLAKE2B 
b33b51a741acd308ef4d4bdd2444d43eca9db68676fa67ec907eeea7384554f3f9a5608fc43dcf5819498264bbe36f176f30be9809474307642b70720036b88c
 SHA512 
4d1e0a274ee90bdfb5f38d4a7d73a7367ed1c6388e26280e640014e49abc0df03683705b88dcfe2ec2da313dda4c7b4a3b86daffa1911f58e224eba89d82d155

diff --git a/app-admin/apache-tools/apache-tools-2.4.57.ebuild 
b/app-admin/apache-tools/apache-tools-2.4.57.ebuild
new file mode 100644
index ..78acadb3488b
--- /dev/null
+++ b/app-admin/apache-tools/apache-tools-2.4.57.ebuild
@@ -0,0 +1,113 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools toolchain-funcs
+
+DESCRIPTION="Useful Apache tools - htdigest, htpasswd, ab, htdbm"
+HOMEPAGE="https://httpd.apache.org/;
+SRC_URI="mirror://apache/httpd/httpd-${PV}.tar.bz2"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 
~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos 
~sparc64-solaris ~x64-solaris"
+IUSE="ssl"
+RESTRICT="test"
+
+RDEPEND=">=dev-libs/apr-1.5.0:1=
+   dev-libs/apr-util:1=
+   dev-libs/expat
+   dev-libs/libpcre2
+   virtual/libcrypt:=
+   kernel_linux? ( sys-apps/util-linux )
+   ssl? ( dev-libs/openssl:0= )"
+DEPEND="${RDEPEND}
+   sys-devel/libtool"
+BDEPEND="
+   virtual/pkgconfig
+"
+
+S="${WORKDIR}/httpd-${PV}"
+
+PATCHES=(
+   "${FILESDIR}/${PN}-2.4.54-Makefile.patch" #459446
+   "${FILESDIR}/${PN}-2.4.54-no-which.patch" #844868
+   "${FILESDIR}/${PN}-2.4.54-libtool.patch" #858833
+)
+
+src_prepare() {
+   default
+
+   # This package really should upgrade to using pcre's .pc file.
+   cat <<-\EOF > "${T}"/pcre2-config
+   #!/usr/bin/env bash
+   flags=()
+   for flag; do
+   if [[ ${flag} == "--version" ]]; then
+   flags+=( --modversion )
+   else
+   flags+=( "${flag}" )
+   fi
+   done
+   exec ${PKG_CONFIG} libpcre2-8 "${flags[@]}"
+   EOF
+   chmod a+x "${T}"/pcre2-config || die
+
+   # Only here for libtool and which patches
+   eautoreconf
+}
+
+src_configure() {
+   # Silly check.
+   tc-is-cross-compiler && export ap_cv_void_ptr_lt_long="no"
+
+   tc-export PKG_CONFIG
+   export ac_cv_path_PKGCONFIG="${PKG_CONFIG}"
+   export ac_cv_prog_ac_ct_PCRE_CONFIG="${T}"/pcre2-config
+
+   local myeconfargs=(
+   --libexecdir="${EPREFIX}"/usr/$(get_libdir)/apache2/modules
+   --sbindir="${EPREFIX}"/usr/sbin
+   --with-z="${EPREFIX}"/usr
+   --with-apr="${ESYSROOT}"/usr
+   --with-apr-util="${ESYSROOT}"/usr
+   --without-pcre
+   --with-pcre2="${T}"/pcre2-config
+   $(use_enable ssl)
+   $(usex ssl '--with-ssl="${EPREFIX}"/usr' '')
+   )
+
+   # econf overwrites the stuff from config.layout.
+   econf "${myeconfargs[@]}"
+
+   sed -i \
+   -e '/^LTFLAGS/s:--silent::' \
+   build/rules.mk build/config_vars.mk || die
+}
+
+src_compile() {
+   emake -C support
+}
+
+src_install() {
+

[gentoo-commits] repo/gentoo:master commit in: app-admin/apache-tools/

2023-04-04 Thread Sam James

commit: 56d507fe683b3a99fc279dc491cd250d28b7ac73
Author: Rolf Eike Beer  sf-mail  de>
AuthorDate: Tue Apr  4 20:58:26 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Tue Apr  4 22:23:35 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=56d507fe

app-admin/apache-tools: stable 2.4.56 for sparc, bug #903493

Signed-off-by: Rolf Eike Beer  sf-mail.de>
Signed-off-by: Sam James  gentoo.org>

 app-admin/apache-tools/apache-tools-2.4.56.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-admin/apache-tools/apache-tools-2.4.56.ebuild 
b/app-admin/apache-tools/apache-tools-2.4.56.ebuild
index d0fff58545c7..61f52831dbe3 100644
--- a/app-admin/apache-tools/apache-tools-2.4.56.ebuild
+++ b/app-admin/apache-tools/apache-tools-2.4.56.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://apache/httpd/httpd-${PV}.tar.bz2"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv 
~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos 
~sparc64-solaris ~x64-solaris"
+KEYWORDS="~alpha ~amd64 arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv 
~s390 sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc64-solaris 
~x64-solaris"
 IUSE="ssl"
 RESTRICT="test"

[gentoo-commits] repo/gentoo:master commit in: app-admin/apache-tools/

2023-03-30 Thread Arthur Zamarin

commit: c00fbbbdb1401c987c2b23e282fa7d88052e9400
Author: Arthur Zamarin  gentoo  org>
AuthorDate: Thu Mar 30 18:34:14 2023 +
Commit: Arthur Zamarin  gentoo  org>
CommitDate: Thu Mar 30 18:34:14 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c00fbbbd

app-admin/apache-tools: Stabilize 2.4.56 arm, #903493

Signed-off-by: Arthur Zamarin  gentoo.org>

 app-admin/apache-tools/apache-tools-2.4.56.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-admin/apache-tools/apache-tools-2.4.56.ebuild 
b/app-admin/apache-tools/apache-tools-2.4.56.ebuild
index 78acadb3488b..d0fff58545c7 100644
--- a/app-admin/apache-tools/apache-tools-2.4.56.ebuild
+++ b/app-admin/apache-tools/apache-tools-2.4.56.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://apache/httpd/httpd-${PV}.tar.bz2"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 
~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos 
~sparc64-solaris ~x64-solaris"
+KEYWORDS="~alpha ~amd64 arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv 
~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos 
~sparc64-solaris ~x64-solaris"
 IUSE="ssl"
 RESTRICT="test"

[gentoo-commits] repo/gentoo:master commit in: app-admin/apache-tools/

2023-03-28 Thread Sam James

commit: c018babbff353e2259a55f4eb5de7493ad6f0053
Author: Sam James  gentoo  org>
AuthorDate: Tue Mar 28 21:47:44 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Tue Mar 28 21:47:44 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c018babb

app-admin/apache-tools: Stabilize 2.4.55 sparc, #894146

Signed-off-by: Sam James  gentoo.org>

 app-admin/apache-tools/apache-tools-2.4.55.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-admin/apache-tools/apache-tools-2.4.55.ebuild 
b/app-admin/apache-tools/apache-tools-2.4.55.ebuild
index 5ef7249cb8c2..b104b44b2d30 100644
--- a/app-admin/apache-tools/apache-tools-2.4.55.ebuild
+++ b/app-admin/apache-tools/apache-tools-2.4.55.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://apache/httpd/httpd-${PV}.tar.bz2"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv 
~s390 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc64-solaris 
~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv 
~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc64-solaris 
~x64-solaris"
 IUSE="ssl"
 RESTRICT="test"

[gentoo-commits] repo/gentoo:master commit in: app-admin/apache-tools/

2023-03-28 Thread Sam James

commit: e89f94d7546b10840db442f1c52b8bb729f2f821
Author: Sam James  gentoo  org>
AuthorDate: Tue Mar 28 21:47:37 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Tue Mar 28 21:47:37 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e89f94d7

app-admin/apache-tools: Stabilize 2.4.55 arm, #894146

Signed-off-by: Sam James  gentoo.org>

 app-admin/apache-tools/apache-tools-2.4.55.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-admin/apache-tools/apache-tools-2.4.55.ebuild 
b/app-admin/apache-tools/apache-tools-2.4.55.ebuild
index f00c44d65fff..a9db31be4eb9 100644
--- a/app-admin/apache-tools/apache-tools-2.4.55.ebuild
+++ b/app-admin/apache-tools/apache-tools-2.4.55.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://apache/httpd/httpd-${PV}.tar.bz2"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv 
~s390 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc64-solaris 
~x64-solaris"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv 
~s390 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc64-solaris 
~x64-solaris"
 IUSE="ssl"
 RESTRICT="test"

[gentoo-commits] repo/gentoo:master commit in: app-admin/apache-tools/

2023-03-28 Thread Sam James

commit: df2164acb96ae90b59f9a3bc1de0c8a522fa0612
Author: Sam James  gentoo  org>
AuthorDate: Tue Mar 28 21:47:40 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Tue Mar 28 21:47:40 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=df2164ac

app-admin/apache-tools: Stabilize 2.4.55 arm64, #894146

Signed-off-by: Sam James  gentoo.org>

 app-admin/apache-tools/apache-tools-2.4.55.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-admin/apache-tools/apache-tools-2.4.55.ebuild 
b/app-admin/apache-tools/apache-tools-2.4.55.ebuild
index a9db31be4eb9..5ef7249cb8c2 100644
--- a/app-admin/apache-tools/apache-tools-2.4.55.ebuild
+++ b/app-admin/apache-tools/apache-tools-2.4.55.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://apache/httpd/httpd-${PV}.tar.bz2"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv 
~s390 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc64-solaris 
~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv 
~s390 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc64-solaris 
~x64-solaris"
 IUSE="ssl"
 RESTRICT="test"

[gentoo-commits] repo/gentoo:master commit in: app-admin/apache-tools/

2023-03-15 Thread Arthur Zamarin

commit: 55035f890d9fea664e97eaadca25baec72bbed43
Author: Arthur Zamarin  gentoo  org>
AuthorDate: Wed Mar 15 14:05:44 2023 +
Commit: Arthur Zamarin  gentoo  org>
CommitDate: Wed Mar 15 14:05:44 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=55035f89

app-admin/apache-tools: Stabilize 2.4.55 x86, #894146

Signed-off-by: Arthur Zamarin  gentoo.org>

 app-admin/apache-tools/apache-tools-2.4.55.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-admin/apache-tools/apache-tools-2.4.55.ebuild 
b/app-admin/apache-tools/apache-tools-2.4.55.ebuild
index 967acf5fda4f..f00c44d65fff 100644
--- a/app-admin/apache-tools/apache-tools-2.4.55.ebuild
+++ b/app-admin/apache-tools/apache-tools-2.4.55.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://apache/httpd/httpd-${PV}.tar.bz2"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv 
~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos 
~sparc64-solaris ~x64-solaris"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv 
~s390 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc64-solaris 
~x64-solaris"
 IUSE="ssl"
 RESTRICT="test"

[gentoo-commits] repo/gentoo:master commit in: app-admin/apache-tools/

2023-03-15 Thread Arthur Zamarin

commit: 51e6543893381535f562fdccefe698c485f8cded
Author: Arthur Zamarin  gentoo  org>
AuthorDate: Wed Mar 15 14:05:21 2023 +
Commit: Arthur Zamarin  gentoo  org>
CommitDate: Wed Mar 15 14:05:21 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=51e65438

app-admin/apache-tools: Stabilize 2.4.55 ppc64, #894146

Signed-off-by: Arthur Zamarin  gentoo.org>

 app-admin/apache-tools/apache-tools-2.4.55.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-admin/apache-tools/apache-tools-2.4.55.ebuild 
b/app-admin/apache-tools/apache-tools-2.4.55.ebuild
index 28cc7a3c023a..967acf5fda4f 100644
--- a/app-admin/apache-tools/apache-tools-2.4.55.ebuild
+++ b/app-admin/apache-tools/apache-tools-2.4.55.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://apache/httpd/httpd-${PV}.tar.bz2"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ppc ~ppc64 ~riscv 
~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos 
~sparc64-solaris ~x64-solaris"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv 
~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos 
~sparc64-solaris ~x64-solaris"
 IUSE="ssl"
 RESTRICT="test"

[gentoo-commits] repo/gentoo:master commit in: app-admin/apache-tools/

2023-03-11 Thread Hans de Graaff

commit: a8cafcd28633860226fd5f34119fef004103fda3
Author: Hans de Graaff  gentoo  org>
AuthorDate: Sat Mar 11 08:53:00 2023 +
Commit: Hans de Graaff  gentoo  org>
CommitDate: Sat Mar 11 11:17:46 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a8cafcd2

app-admin/apache-tools: add 2.4.56

Signed-off-by: Hans de Graaff  gentoo.org>

 app-admin/apache-tools/Manifest   |   1 +
 app-admin/apache-tools/apache-tools-2.4.56.ebuild | 113 ++
 2 files changed, 114 insertions(+)

diff --git a/app-admin/apache-tools/Manifest b/app-admin/apache-tools/Manifest
index 850b59931000..f20dba62d411 100644
--- a/app-admin/apache-tools/Manifest
+++ b/app-admin/apache-tools/Manifest
@@ -1,2 +1,3 @@
 DIST httpd-2.4.54.tar.bz2 7434530 BLAKE2B 
be2ba2d33368f9dd619e36e63dd3635fbcf55773a539ac2840251bda04311f3eb535c08a37ab58d8b184c71e75b90b92e2bdc4e59c722cfb146de516f6e1ed04
 SHA512 
228493b2ff32c4142c6e484d304f2ea12e467498605fe12adce2b61388d8efe7b2e96ae2fd0abd1dc88a5f12d625e007d8da0ae5628cff2a5272806754f41e18
 DIST httpd-2.4.55.tar.bz2 7456187 BLAKE2B 
98e9ec41aa3ccbbe533672ba6de8421e1f0cb5a4b4a06d0cf26c676945bcd5ebe66a1fd21d941ad8ff2c9183565ce542a5643730bbee5972934008652924945b
 SHA512 
94982f7a1fedac8961fc17b5a22cf763ac28cb27ee6facab2e6a15b249b927773667493fd3f7354fb13fcb34a6f1afc1bdd5cf4b7be030cba1dfb523e40d43fb
+DIST httpd-2.4.56.tar.bz2 7456418 BLAKE2B 
f9aaf5038543aeec79d5b8615b1b2120fe321966280574c685070f2356f8f1dba1d55a9a25f46cb5ecdd6e3f03785fe7a4e1b965506896cb889720728aa18101
 SHA512 
5f12cd9878d822384b1bb163fea4d8edee5e7a0dd8b23892643879712681456a5a27ddf0436c5f1f631acc5fdc4874da2a47911483e421ca40bf783e0e12

diff --git a/app-admin/apache-tools/apache-tools-2.4.56.ebuild 
b/app-admin/apache-tools/apache-tools-2.4.56.ebuild
new file mode 100644
index ..78acadb3488b
--- /dev/null
+++ b/app-admin/apache-tools/apache-tools-2.4.56.ebuild
@@ -0,0 +1,113 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools toolchain-funcs
+
+DESCRIPTION="Useful Apache tools - htdigest, htpasswd, ab, htdbm"
+HOMEPAGE="https://httpd.apache.org/;
+SRC_URI="mirror://apache/httpd/httpd-${PV}.tar.bz2"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 
~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos 
~sparc64-solaris ~x64-solaris"
+IUSE="ssl"
+RESTRICT="test"
+
+RDEPEND=">=dev-libs/apr-1.5.0:1=
+   dev-libs/apr-util:1=
+   dev-libs/expat
+   dev-libs/libpcre2
+   virtual/libcrypt:=
+   kernel_linux? ( sys-apps/util-linux )
+   ssl? ( dev-libs/openssl:0= )"
+DEPEND="${RDEPEND}
+   sys-devel/libtool"
+BDEPEND="
+   virtual/pkgconfig
+"
+
+S="${WORKDIR}/httpd-${PV}"
+
+PATCHES=(
+   "${FILESDIR}/${PN}-2.4.54-Makefile.patch" #459446
+   "${FILESDIR}/${PN}-2.4.54-no-which.patch" #844868
+   "${FILESDIR}/${PN}-2.4.54-libtool.patch" #858833
+)
+
+src_prepare() {
+   default
+
+   # This package really should upgrade to using pcre's .pc file.
+   cat <<-\EOF > "${T}"/pcre2-config
+   #!/usr/bin/env bash
+   flags=()
+   for flag; do
+   if [[ ${flag} == "--version" ]]; then
+   flags+=( --modversion )
+   else
+   flags+=( "${flag}" )
+   fi
+   done
+   exec ${PKG_CONFIG} libpcre2-8 "${flags[@]}"
+   EOF
+   chmod a+x "${T}"/pcre2-config || die
+
+   # Only here for libtool and which patches
+   eautoreconf
+}
+
+src_configure() {
+   # Silly check.
+   tc-is-cross-compiler && export ap_cv_void_ptr_lt_long="no"
+
+   tc-export PKG_CONFIG
+   export ac_cv_path_PKGCONFIG="${PKG_CONFIG}"
+   export ac_cv_prog_ac_ct_PCRE_CONFIG="${T}"/pcre2-config
+
+   local myeconfargs=(
+   --libexecdir="${EPREFIX}"/usr/$(get_libdir)/apache2/modules
+   --sbindir="${EPREFIX}"/usr/sbin
+   --with-z="${EPREFIX}"/usr
+   --with-apr="${ESYSROOT}"/usr
+   --with-apr-util="${ESYSROOT}"/usr
+   --without-pcre
+   --with-pcre2="${T}"/pcre2-config
+   $(use_enable ssl)
+   $(usex ssl '--with-ssl="${EPREFIX}"/usr' '')
+   )
+
+   # econf overwrites the stuff from config.layout.
+   econf "${myeconfargs[@]}"
+
+   sed -i \
+   -e '/^LTFLAGS/s:--silent::' \
+   build/rules.mk build/config_vars.mk || die
+}
+
+src_compile() {
+   emake -C support
+}
+
+src_install() {
+   emake -C support DESTDIR="${D}" install
+   dodoc CHANGES
+   doman docs/man/{dbmmanage,htdigest,htpasswd,htdbm,ab,logresolve}.1 \
+   docs/man/{htcacheclean,rotatelogs}.8
+
+   # Providing compatiblity symlinks for #177697 (which we'll stop to 
install
+   # at some point).
+   pushd

[gentoo-commits] repo/gentoo:master commit in: app-admin/apache-tools/

2023-02-13 Thread Sam James

commit: feae3c1bcd030536b8cf812d85d6b83d5438f28c
Author: Sam James  gentoo  org>
AuthorDate: Tue Feb 14 07:04:59 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Tue Feb 14 07:04:59 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=feae3c1b

app-admin/apache-tools: Stabilize 2.4.55 amd64, #894146

Signed-off-by: Sam James  gentoo.org>

 app-admin/apache-tools/apache-tools-2.4.55.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-admin/apache-tools/apache-tools-2.4.55.ebuild 
b/app-admin/apache-tools/apache-tools-2.4.55.ebuild
index 5cfe66a9d4b8..28cc7a3c023a 100644
--- a/app-admin/apache-tools/apache-tools-2.4.55.ebuild
+++ b/app-admin/apache-tools/apache-tools-2.4.55.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://apache/httpd/httpd-${PV}.tar.bz2"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ppc ~ppc64 ~riscv 
~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos 
~sparc64-solaris ~x64-solaris"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ppc ~ppc64 ~riscv 
~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos 
~sparc64-solaris ~x64-solaris"
 IUSE="ssl"
 RESTRICT="test"

[gentoo-commits] repo/gentoo:master commit in: app-admin/apache-tools/

2023-02-13 Thread Sam James

commit: f25eab07039b026632b3c55afef57763b37d8967
Author: Sam James  gentoo  org>
AuthorDate: Mon Feb 13 22:45:45 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Mon Feb 13 22:45:45 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f25eab07

app-admin/apache-tools: Stabilize 2.4.55 ppc, #894146

Signed-off-by: Sam James  gentoo.org>

 app-admin/apache-tools/apache-tools-2.4.55.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-admin/apache-tools/apache-tools-2.4.55.ebuild 
b/app-admin/apache-tools/apache-tools-2.4.55.ebuild
index 78acadb3488b..5cfe66a9d4b8 100644
--- a/app-admin/apache-tools/apache-tools-2.4.55.ebuild
+++ b/app-admin/apache-tools/apache-tools-2.4.55.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://apache/httpd/httpd-${PV}.tar.bz2"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 
~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos 
~sparc64-solaris ~x64-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ppc ~ppc64 ~riscv 
~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos 
~sparc64-solaris ~x64-solaris"
 IUSE="ssl"
 RESTRICT="test"

[gentoo-commits] repo/gentoo:master commit in: app-admin/apache-tools/files/

2023-01-31 Thread Conrad Kostecki

commit: 7fd31f24b627a3d9d67b078ade3fdcda63c335a3
Author: Michael Mair-Keimberger  levelnine  at>
AuthorDate: Mon Jan 30 19:07:58 2023 +
Commit: Conrad Kostecki  gentoo  org>
CommitDate: Wed Feb  1 01:13:15 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7fd31f24

app-admin/apache-tools: remove unused patch

Signed-off-by: Michael Mair-Keimberger  levelnine.at>
Closes: https://github.com/gentoo/gentoo/pull/29344
Signed-off-by: Conrad Kostecki  gentoo.org>

 .../files/apache-tools-2.4.7-Makefile.patch| 47 --
 1 file changed, 47 deletions(-)

diff --git a/app-admin/apache-tools/files/apache-tools-2.4.7-Makefile.patch 
b/app-admin/apache-tools/files/apache-tools-2.4.7-Makefile.patch
deleted file mode 100644
index b7d3c274ea48..
--- a/app-admin/apache-tools/files/apache-tools-2.4.7-Makefile.patch
+++ /dev/null
@@ -1,47 +0,0 @@
-https://bugs.gentoo.org/459446
-
-https://raw.github.com/archlinuxcn/repo/master/apache-tools/apache-tools-Makefile.patch
-
 a/support/Makefile.in
-+++ b/support/Makefile.in
-@@ -1,9 +1,9 @@
- DISTCLEAN_TARGETS = apxs apachectl dbmmanage log_server_status \
--  logresolve.pl phf_abuse_log.cgi split-logfile envvars-std
-+  logresolve.pl phf_abuse_log.cgi split-logfile
- 
- CLEAN_TARGETS = suexec
- 
--bin_PROGRAMS = htpasswd htdigest htdbm ab logresolve httxt2dbm
-+bin_PROGRAMS = htpasswd htdigest htdbm ab logresolve httxt2dbm dbmmanage
- sbin_PROGRAMS = htcacheclean rotatelogs $(NONPORTABLE_SUPPORT)
- TARGETS  = $(bin_PROGRAMS) $(sbin_PROGRAMS)
- 
-@@ -15,26 +15,18 @@
- install:
-   @test -d $(DESTDIR)$(bindir) || $(MKINSTALLDIRS) $(DESTDIR)$(bindir)
-   @test -d $(DESTDIR)$(sbindir) || $(MKINSTALLDIRS) $(DESTDIR)$(sbindir)
--  @test -d $(DESTDIR)$(libexecdir) || $(MKINSTALLDIRS) 
$(DESTDIR)$(libexecdir)
--  @cp -p $(top_builddir)/server/httpd.exp $(DESTDIR)$(libexecdir)
--  @for i in apxs dbmmanage; do \
-+  @for i in $(bin_PROGRAMS); do \
-   if test -f "$(builddir)/$$i"; then \
-   cp -p $$i $(DESTDIR)$(bindir); \
-   chmod 755 $(DESTDIR)$(bindir)/$$i; \
-   fi ; \
-   done
--  @for i in apachectl; do \
-+  @for i in $(sbin_PROGRAMS); do \
-   if test -f "$(builddir)/$$i"; then \
-   cp -p $$i $(DESTDIR)$(sbindir); \
-   chmod 755 $(DESTDIR)$(sbindir)/$$i; \
-   fi ; \
-   done
--  @if test -f "$(builddir)/envvars-std"; then \
--  cp -p envvars-std $(DESTDIR)$(sbindir); \
--  if test ! -f $(DESTDIR)$(sbindir)/envvars; then \
--  cp -p envvars-std $(DESTDIR)$(sbindir)/envvars ; \
--  fi ; \
--  fi
- 
- htpasswd.lo: passwd_common.h
- passwd_common.lo: passwd_common.h

[gentoo-commits] repo/gentoo:master commit in: app-admin/apache-tools/

2023-01-25 Thread Sam James

commit: 39c838bea849646f815142ac4e8c4af88103e9de
Author: Sam James  gentoo  org>
AuthorDate: Thu Jan 26 05:18:17 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Thu Jan 26 05:18:17 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=39c838be

app-admin/apache-tools: drop 2.4.54, 2.4.54-r2

Signed-off-by: Sam James  gentoo.org>

 .../apache-tools/apache-tools-2.4.54-r2.ebuild | 109 -
 app-admin/apache-tools/apache-tools-2.4.54.ebuild  | 104 
 2 files changed, 213 deletions(-)

diff --git a/app-admin/apache-tools/apache-tools-2.4.54-r2.ebuild 
b/app-admin/apache-tools/apache-tools-2.4.54-r2.ebuild
deleted file mode 100644
index 82fccd8b06f3..
--- a/app-admin/apache-tools/apache-tools-2.4.54-r2.ebuild
+++ /dev/null
@@ -1,109 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit autotools toolchain-funcs
-
-DESCRIPTION="Useful Apache tools - htdigest, htpasswd, ab, htdbm"
-HOMEPAGE="https://httpd.apache.org/;
-SRC_URI="mirror://apache/httpd/httpd-${PV}.tar.bz2"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv 
~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc64-solaris 
~x64-solaris"
-IUSE="ssl"
-RESTRICT="test"
-
-RDEPEND=">=dev-libs/apr-1.5.0:1=
-   dev-libs/apr-util:1=
-   dev-libs/expat
-   dev-libs/libpcre
-   virtual/libcrypt:=
-   kernel_linux? ( sys-apps/util-linux )
-   ssl? ( dev-libs/openssl:0= )"
-DEPEND="${RDEPEND}
-   sys-devel/libtool"
-BDEPEND="
-   virtual/pkgconfig
-"
-
-S="${WORKDIR}/httpd-${PV}"
-
-PATCHES=(
-   "${FILESDIR}/${PN}-2.4.54-Makefile.patch" #459446
-   "${FILESDIR}/${PN}-2.4.54-no-which.patch" #844868
-   "${FILESDIR}/${PN}-2.4.54-libtool.patch" #858833
-)
-
-src_prepare() {
-   default
-
-   # This package really should upgrade to using pcre's .pc file.
-   cat <<-\EOF >"${T}"/pcre-config
-   #!/bin/bash
-   flags=()
-   for flag; do
-   if [[ ${flag} == "--version" ]]; then
-   flags+=( --modversion )
-   else
-   flags+=( "${flag}" )
-   fi
-   done
-   exec ${PKG_CONFIG} libpcre "${flags[@]}"
-   EOF
-   chmod a+x "${T}"/pcre-config || die
-
-   # Only here for libtool and which patches
-   eautoreconf
-}
-
-src_configure() {
-   # Brain dead check.
-   tc-is-cross-compiler && export ap_cv_void_ptr_lt_long="no"
-
-   tc-export PKG_CONFIG
-
-   local myeconfargs=(
-   --libexecdir="${EPREFIX}"/usr/$(get_libdir)/apache2/modules
-   --sbindir="${EPREFIX}"/usr/sbin
-   --with-z="${EPREFIX}"/usr
-   --with-apr="${ESYSROOT}"/usr
-   --with-apr-util="${ESYSROOT}"/usr
-   --with-pcre="${T}"/pcre-config
-   $(use_enable ssl)
-   $(usex ssl '--with-ssl="${EPREFIX}"/usr' '')
-   )
-   # econf overwrites the stuff from config.layout.
-   ac_cv_path_PKGCONFIG="${PKG_CONFIG}" \
-   econf "${myeconfargs[@]}"
-   sed -i \
-   -e '/^LTFLAGS/s:--silent::' \
-   build/rules.mk build/config_vars.mk || die
-}
-
-src_compile() {
-   emake -C support
-}
-
-src_install() {
-   emake -C support DESTDIR="${D}" install
-   dodoc CHANGES
-   doman docs/man/{dbmmanage,htdigest,htpasswd,htdbm,ab,logresolve}.1 \
-   docs/man/{htcacheclean,rotatelogs}.8
-
-   # Providing compatiblity symlinks for #177697 (which we'll stop to 
install
-   # at some point).
-   pushd "${ED}"/usr/sbin >/dev/null || die
-   local i
-   for i in *; do
-   dosym ${i} /usr/sbin/${i}2
-   done
-   popd >/dev/null || die
-
-   # Provide a symlink for ab-ssl
-   if use ssl ; then
-   dosym ab /usr/bin/ab-ssl
-   dosym ab /usr/bin/ab2-ssl
-   fi
-}

diff --git a/app-admin/apache-tools/apache-tools-2.4.54.ebuild 
b/app-admin/apache-tools/apache-tools-2.4.54.ebuild
deleted file mode 100644
index bf1562cee74c..
--- a/app-admin/apache-tools/apache-tools-2.4.54.ebuild
+++ /dev/null
@@ -1,104 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-inherit toolchain-funcs
-
-DESCRIPTION="Useful Apache tools - htdigest, htpasswd, ab, htdbm"
-HOMEPAGE="https://httpd.apache.org/;
-SRC_URI="mirror://apache/httpd/httpd-${PV}.tar.bz2"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 
sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc64-solaris 
~x64-solaris"
-IUSE="ssl"
-RESTRICT="test"
-
-RDEPEND=">=dev-libs/apr-1.5.0:1=
-   dev-libs/apr-util:1=
-   dev-libs/expat
-   dev-libs/libpcre
-

[gentoo-commits] repo/gentoo:master commit in: app-admin/apache-tools/

2023-01-25 Thread Sam James

commit: c976c998101d2bf884f2c4cb2725da2174b62f81
Author: Sam James  gentoo  org>
AuthorDate: Thu Jan 26 05:15:43 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Thu Jan 26 05:15:43 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c976c998

app-admin/apache-tools: Stabilize 2.4.54-r3 ppc64, #890274

Signed-off-by: Sam James  gentoo.org>

 app-admin/apache-tools/apache-tools-2.4.54-r3.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-admin/apache-tools/apache-tools-2.4.54-r3.ebuild 
b/app-admin/apache-tools/apache-tools-2.4.54-r3.ebuild
index 52f1d90085af..5ef7249cb8c2 100644
--- a/app-admin/apache-tools/apache-tools-2.4.54-r3.ebuild
+++ b/app-admin/apache-tools/apache-tools-2.4.54-r3.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://apache/httpd/httpd-${PV}.tar.bz2"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ~ppc64 ~riscv 
~s390 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc64-solaris 
~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv 
~s390 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc64-solaris 
~x64-solaris"
 IUSE="ssl"
 RESTRICT="test"

[gentoo-commits] repo/gentoo:master commit in: app-admin/apache-tools/

2023-01-25 Thread Sam James

commit: 7bf71cd965423339ba4ba32abbe8fd97547633f2
Author: Sam James  gentoo  org>
AuthorDate: Thu Jan 26 05:15:47 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Thu Jan 26 05:15:47 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7bf71cd9

app-admin/apache-tools: Stabilize 2.4.54-r3 sparc, #890274

Signed-off-by: Sam James  gentoo.org>

 app-admin/apache-tools/apache-tools-2.4.54-r3.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-admin/apache-tools/apache-tools-2.4.54-r3.ebuild 
b/app-admin/apache-tools/apache-tools-2.4.54-r3.ebuild
index 5ef7249cb8c2..b104b44b2d30 100644
--- a/app-admin/apache-tools/apache-tools-2.4.54-r3.ebuild
+++ b/app-admin/apache-tools/apache-tools-2.4.54-r3.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://apache/httpd/httpd-${PV}.tar.bz2"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv 
~s390 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc64-solaris 
~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv 
~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc64-solaris 
~x64-solaris"
 IUSE="ssl"
 RESTRICT="test"

[gentoo-commits] repo/gentoo:master commit in: app-admin/apache-tools/

2023-01-25 Thread Sam James

commit: a4220b54d70271d5390aeac601efdd74562398a9
Author: Sam James  gentoo  org>
AuthorDate: Thu Jan 26 05:15:38 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Thu Jan 26 05:15:38 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a4220b54

app-admin/apache-tools: Stabilize 2.4.54-r3 ppc, #890274

Signed-off-by: Sam James  gentoo.org>

 app-admin/apache-tools/apache-tools-2.4.54-r3.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-admin/apache-tools/apache-tools-2.4.54-r3.ebuild 
b/app-admin/apache-tools/apache-tools-2.4.54-r3.ebuild
index 985ffa69df71..52f1d90085af 100644
--- a/app-admin/apache-tools/apache-tools-2.4.54-r3.ebuild
+++ b/app-admin/apache-tools/apache-tools-2.4.54-r3.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://apache/httpd/httpd-${PV}.tar.bz2"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv 
~s390 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc64-solaris 
~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ~ppc64 ~riscv 
~s390 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc64-solaris 
~x64-solaris"
 IUSE="ssl"
 RESTRICT="test"

[gentoo-commits] repo/gentoo:master commit in: app-admin/apache-tools/

2023-01-25 Thread Sam James

commit: f7102dc14050d3c3cc1588839866267ff5cd4200
Author: Sam James  gentoo  org>
AuthorDate: Thu Jan 26 05:15:26 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Thu Jan 26 05:15:26 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f7102dc1

app-admin/apache-tools: Stabilize 2.4.54-r3 x86, #890274

Signed-off-by: Sam James  gentoo.org>

 app-admin/apache-tools/apache-tools-2.4.54-r3.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-admin/apache-tools/apache-tools-2.4.54-r3.ebuild 
b/app-admin/apache-tools/apache-tools-2.4.54-r3.ebuild
index 4a6e2b8a9adc..3c3858255d8b 100644
--- a/app-admin/apache-tools/apache-tools-2.4.54-r3.ebuild
+++ b/app-admin/apache-tools/apache-tools-2.4.54-r3.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://apache/httpd/httpd-${PV}.tar.bz2"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv 
~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos 
~sparc64-solaris ~x64-solaris"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv 
~s390 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc64-solaris 
~x64-solaris"
 IUSE="ssl"
 RESTRICT="test"

[gentoo-commits] repo/gentoo:master commit in: app-admin/apache-tools/

2023-01-25 Thread Sam James

commit: c7f6fec904f4f183295f1c134564a640c728c3d9
Author: Sam James  gentoo  org>
AuthorDate: Thu Jan 26 05:15:30 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Thu Jan 26 05:15:30 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c7f6fec9

app-admin/apache-tools: Stabilize 2.4.54-r3 arm, #890274

Signed-off-by: Sam James  gentoo.org>

 app-admin/apache-tools/apache-tools-2.4.54-r3.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-admin/apache-tools/apache-tools-2.4.54-r3.ebuild 
b/app-admin/apache-tools/apache-tools-2.4.54-r3.ebuild
index 3c3858255d8b..1b1742a4e1ef 100644
--- a/app-admin/apache-tools/apache-tools-2.4.54-r3.ebuild
+++ b/app-admin/apache-tools/apache-tools-2.4.54-r3.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://apache/httpd/httpd-${PV}.tar.bz2"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv 
~s390 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc64-solaris 
~x64-solaris"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv 
~s390 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc64-solaris 
~x64-solaris"
 IUSE="ssl"
 RESTRICT="test"

[gentoo-commits] repo/gentoo:master commit in: app-admin/apache-tools/

2023-01-25 Thread Sam James

commit: 41d4816c9e1c9755bfeb4de9b9d1ceb08fc3df00
Author: Sam James  gentoo  org>
AuthorDate: Thu Jan 26 05:15:34 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Thu Jan 26 05:15:34 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=41d4816c

app-admin/apache-tools: Stabilize 2.4.54-r3 arm64, #890274

Signed-off-by: Sam James  gentoo.org>

 app-admin/apache-tools/apache-tools-2.4.54-r3.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-admin/apache-tools/apache-tools-2.4.54-r3.ebuild 
b/app-admin/apache-tools/apache-tools-2.4.54-r3.ebuild
index 1b1742a4e1ef..985ffa69df71 100644
--- a/app-admin/apache-tools/apache-tools-2.4.54-r3.ebuild
+++ b/app-admin/apache-tools/apache-tools-2.4.54-r3.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://apache/httpd/httpd-${PV}.tar.bz2"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv 
~s390 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc64-solaris 
~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv 
~s390 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc64-solaris 
~x64-solaris"
 IUSE="ssl"
 RESTRICT="test"

[gentoo-commits] repo/gentoo:master commit in: app-admin/apache-tools/

2023-01-25 Thread Sam James

commit: e31a298c0f2ad8006bab20ae3a45d41eb3ca36c7
Author: Tomáš Mózes  gmail  com>
AuthorDate: Wed Jan 25 14:22:54 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Thu Jan 26 05:06:13 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e31a298c

app-admin/apache-tools: add 2.4.55

Signed-off-by: Tomáš Mózes  gmail.com>
Signed-off-by: Sam James  gentoo.org>

 app-admin/apache-tools/Manifest   |   1 +
 app-admin/apache-tools/apache-tools-2.4.55.ebuild | 113 ++
 2 files changed, 114 insertions(+)

diff --git a/app-admin/apache-tools/Manifest b/app-admin/apache-tools/Manifest
index acf6fa127c09..850b59931000 100644
--- a/app-admin/apache-tools/Manifest
+++ b/app-admin/apache-tools/Manifest
@@ -1 +1,2 @@
 DIST httpd-2.4.54.tar.bz2 7434530 BLAKE2B 
be2ba2d33368f9dd619e36e63dd3635fbcf55773a539ac2840251bda04311f3eb535c08a37ab58d8b184c71e75b90b92e2bdc4e59c722cfb146de516f6e1ed04
 SHA512 
228493b2ff32c4142c6e484d304f2ea12e467498605fe12adce2b61388d8efe7b2e96ae2fd0abd1dc88a5f12d625e007d8da0ae5628cff2a5272806754f41e18
+DIST httpd-2.4.55.tar.bz2 7456187 BLAKE2B 
98e9ec41aa3ccbbe533672ba6de8421e1f0cb5a4b4a06d0cf26c676945bcd5ebe66a1fd21d941ad8ff2c9183565ce542a5643730bbee5972934008652924945b
 SHA512 
94982f7a1fedac8961fc17b5a22cf763ac28cb27ee6facab2e6a15b249b927773667493fd3f7354fb13fcb34a6f1afc1bdd5cf4b7be030cba1dfb523e40d43fb

diff --git a/app-admin/apache-tools/apache-tools-2.4.55.ebuild 
b/app-admin/apache-tools/apache-tools-2.4.55.ebuild
new file mode 100644
index ..78acadb3488b
--- /dev/null
+++ b/app-admin/apache-tools/apache-tools-2.4.55.ebuild
@@ -0,0 +1,113 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools toolchain-funcs
+
+DESCRIPTION="Useful Apache tools - htdigest, htpasswd, ab, htdbm"
+HOMEPAGE="https://httpd.apache.org/;
+SRC_URI="mirror://apache/httpd/httpd-${PV}.tar.bz2"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 
~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos 
~sparc64-solaris ~x64-solaris"
+IUSE="ssl"
+RESTRICT="test"
+
+RDEPEND=">=dev-libs/apr-1.5.0:1=
+   dev-libs/apr-util:1=
+   dev-libs/expat
+   dev-libs/libpcre2
+   virtual/libcrypt:=
+   kernel_linux? ( sys-apps/util-linux )
+   ssl? ( dev-libs/openssl:0= )"
+DEPEND="${RDEPEND}
+   sys-devel/libtool"
+BDEPEND="
+   virtual/pkgconfig
+"
+
+S="${WORKDIR}/httpd-${PV}"
+
+PATCHES=(
+   "${FILESDIR}/${PN}-2.4.54-Makefile.patch" #459446
+   "${FILESDIR}/${PN}-2.4.54-no-which.patch" #844868
+   "${FILESDIR}/${PN}-2.4.54-libtool.patch" #858833
+)
+
+src_prepare() {
+   default
+
+   # This package really should upgrade to using pcre's .pc file.
+   cat <<-\EOF > "${T}"/pcre2-config
+   #!/usr/bin/env bash
+   flags=()
+   for flag; do
+   if [[ ${flag} == "--version" ]]; then
+   flags+=( --modversion )
+   else
+   flags+=( "${flag}" )
+   fi
+   done
+   exec ${PKG_CONFIG} libpcre2-8 "${flags[@]}"
+   EOF
+   chmod a+x "${T}"/pcre2-config || die
+
+   # Only here for libtool and which patches
+   eautoreconf
+}
+
+src_configure() {
+   # Silly check.
+   tc-is-cross-compiler && export ap_cv_void_ptr_lt_long="no"
+
+   tc-export PKG_CONFIG
+   export ac_cv_path_PKGCONFIG="${PKG_CONFIG}"
+   export ac_cv_prog_ac_ct_PCRE_CONFIG="${T}"/pcre2-config
+
+   local myeconfargs=(
+   --libexecdir="${EPREFIX}"/usr/$(get_libdir)/apache2/modules
+   --sbindir="${EPREFIX}"/usr/sbin
+   --with-z="${EPREFIX}"/usr
+   --with-apr="${ESYSROOT}"/usr
+   --with-apr-util="${ESYSROOT}"/usr
+   --without-pcre
+   --with-pcre2="${T}"/pcre2-config
+   $(use_enable ssl)
+   $(usex ssl '--with-ssl="${EPREFIX}"/usr' '')
+   )
+
+   # econf overwrites the stuff from config.layout.
+   econf "${myeconfargs[@]}"
+
+   sed -i \
+   -e '/^LTFLAGS/s:--silent::' \
+   build/rules.mk build/config_vars.mk || die
+}
+
+src_compile() {
+   emake -C support
+}
+
+src_install() {
+   emake -C support DESTDIR="${D}" install
+   dodoc CHANGES
+   doman docs/man/{dbmmanage,htdigest,htpasswd,htdbm,ab,logresolve}.1 \
+   docs/man/{htcacheclean,rotatelogs}.8
+
+   # Providing compatiblity symlinks for #177697 (which we'll stop to 
install
+   # at some point).
+   pushd "${ED}"/usr/sbin >/dev/null || die
+   local i
+   for i in *; do
+   dosym ${i} /usr/sbin/${i}2
+   done
+   popd >/dev/null || die
+
+   # Provide a symlink for ab-ssl
+   if use ssl ; then
+   dosym ab /usr/bin/ab-ssl
+   dosym ab

[gentoo-commits] repo/gentoo:master commit in: app-admin/apache-tools/

2023-01-17 Thread Sam James

commit: cf3e376d92d31c1fb641b536790f44e75fb2bd9b
Author: Sam James  gentoo  org>
AuthorDate: Tue Jan 17 20:05:31 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Tue Jan 17 20:05:31 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cf3e376d

app-admin/apache-tools: Stabilize 2.4.54-r3 amd64, #890274

Signed-off-by: Sam James  gentoo.org>

 app-admin/apache-tools/apache-tools-2.4.54-r3.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app-admin/apache-tools/apache-tools-2.4.54-r3.ebuild 
b/app-admin/apache-tools/apache-tools-2.4.54-r3.ebuild
index 6f81b8aa7f99..4a6e2b8a9adc 100644
--- a/app-admin/apache-tools/apache-tools-2.4.54-r3.ebuild
+++ b/app-admin/apache-tools/apache-tools-2.4.54-r3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -11,7 +11,7 @@ SRC_URI="mirror://apache/httpd/httpd-${PV}.tar.bz2"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 
~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos 
~sparc64-solaris ~x64-solaris"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv 
~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos 
~sparc64-solaris ~x64-solaris"
 IUSE="ssl"
 RESTRICT="test"

[gentoo-commits] repo/gentoo:master commit in: app-admin/apache-tools/

2022-12-17 Thread Arthur Zamarin

commit: ff684a3863a22720b4ff08fd051376b241bd7951
Author: Arthur Zamarin  gentoo  org>
AuthorDate: Sat Dec 17 19:33:41 2022 +
Commit: Arthur Zamarin  gentoo  org>
CommitDate: Sat Dec 17 19:33:41 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ff684a38

app-admin/apache-tools: Stabilize 2.4.54-r2 ppc, #880701

Signed-off-by: Arthur Zamarin  gentoo.org>

 app-admin/apache-tools/apache-tools-2.4.54-r2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-admin/apache-tools/apache-tools-2.4.54-r2.ebuild 
b/app-admin/apache-tools/apache-tools-2.4.54-r2.ebuild
index 54c5ce8f759c..eb373f5f9146 100644
--- a/app-admin/apache-tools/apache-tools-2.4.54-r2.ebuild
+++ b/app-admin/apache-tools/apache-tools-2.4.54-r2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://apache/httpd/httpd-${PV}.tar.bz2"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv 
~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc64-solaris 
~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ~ppc64 ~riscv 
~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc64-solaris 
~x64-solaris"
 IUSE="ssl"
 RESTRICT="test"

[gentoo-commits] repo/gentoo:master commit in: app-admin/apache-tools/

2022-12-17 Thread Arthur Zamarin

commit: 3e0e6b5db939f8bf20ddd0363f2561b47b7d3008
Author: Arthur Zamarin  gentoo  org>
AuthorDate: Sat Dec 17 19:33:45 2022 +
Commit: Arthur Zamarin  gentoo  org>
CommitDate: Sat Dec 17 19:33:45 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3e0e6b5d

app-admin/apache-tools: Stabilize 2.4.54-r2 ppc64, #880701

Signed-off-by: Arthur Zamarin  gentoo.org>

 app-admin/apache-tools/apache-tools-2.4.54-r2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-admin/apache-tools/apache-tools-2.4.54-r2.ebuild 
b/app-admin/apache-tools/apache-tools-2.4.54-r2.ebuild
index eb373f5f9146..82fccd8b06f3 100644
--- a/app-admin/apache-tools/apache-tools-2.4.54-r2.ebuild
+++ b/app-admin/apache-tools/apache-tools-2.4.54-r2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://apache/httpd/httpd-${PV}.tar.bz2"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ~ppc64 ~riscv 
~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc64-solaris 
~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv 
~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc64-solaris 
~x64-solaris"
 IUSE="ssl"
 RESTRICT="test"

[gentoo-commits] repo/gentoo:master commit in: app-admin/apache-tools/

2022-12-14 Thread Sam James

commit: 572d5f09dcbce6db7dce0f9e3191b1e4f4a34445
Author: Sam James  gentoo  org>
AuthorDate: Wed Dec 14 11:45:23 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Wed Dec 14 11:45:28 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=572d5f09

app-admin/apache-tools: restore 2.4.52-r2

Fixes: 5e0cb606997d6b1857974ca7b6e6042fdfc3ed07
Signed-off-by: Sam James  gentoo.org>

 .../apache-tools/apache-tools-2.4.54-r2.ebuild | 109 +
 1 file changed, 109 insertions(+)

diff --git a/app-admin/apache-tools/apache-tools-2.4.54-r2.ebuild 
b/app-admin/apache-tools/apache-tools-2.4.54-r2.ebuild
new file mode 100644
index ..54c5ce8f759c
--- /dev/null
+++ b/app-admin/apache-tools/apache-tools-2.4.54-r2.ebuild
@@ -0,0 +1,109 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools toolchain-funcs
+
+DESCRIPTION="Useful Apache tools - htdigest, htpasswd, ab, htdbm"
+HOMEPAGE="https://httpd.apache.org/;
+SRC_URI="mirror://apache/httpd/httpd-${PV}.tar.bz2"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv 
~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc64-solaris 
~x64-solaris"
+IUSE="ssl"
+RESTRICT="test"
+
+RDEPEND=">=dev-libs/apr-1.5.0:1=
+   dev-libs/apr-util:1=
+   dev-libs/expat
+   dev-libs/libpcre
+   virtual/libcrypt:=
+   kernel_linux? ( sys-apps/util-linux )
+   ssl? ( dev-libs/openssl:0= )"
+DEPEND="${RDEPEND}
+   sys-devel/libtool"
+BDEPEND="
+   virtual/pkgconfig
+"
+
+S="${WORKDIR}/httpd-${PV}"
+
+PATCHES=(
+   "${FILESDIR}/${PN}-2.4.54-Makefile.patch" #459446
+   "${FILESDIR}/${PN}-2.4.54-no-which.patch" #844868
+   "${FILESDIR}/${PN}-2.4.54-libtool.patch" #858833
+)
+
+src_prepare() {
+   default
+
+   # This package really should upgrade to using pcre's .pc file.
+   cat <<-\EOF >"${T}"/pcre-config
+   #!/bin/bash
+   flags=()
+   for flag; do
+   if [[ ${flag} == "--version" ]]; then
+   flags+=( --modversion )
+   else
+   flags+=( "${flag}" )
+   fi
+   done
+   exec ${PKG_CONFIG} libpcre "${flags[@]}"
+   EOF
+   chmod a+x "${T}"/pcre-config || die
+
+   # Only here for libtool and which patches
+   eautoreconf
+}
+
+src_configure() {
+   # Brain dead check.
+   tc-is-cross-compiler && export ap_cv_void_ptr_lt_long="no"
+
+   tc-export PKG_CONFIG
+
+   local myeconfargs=(
+   --libexecdir="${EPREFIX}"/usr/$(get_libdir)/apache2/modules
+   --sbindir="${EPREFIX}"/usr/sbin
+   --with-z="${EPREFIX}"/usr
+   --with-apr="${ESYSROOT}"/usr
+   --with-apr-util="${ESYSROOT}"/usr
+   --with-pcre="${T}"/pcre-config
+   $(use_enable ssl)
+   $(usex ssl '--with-ssl="${EPREFIX}"/usr' '')
+   )
+   # econf overwrites the stuff from config.layout.
+   ac_cv_path_PKGCONFIG="${PKG_CONFIG}" \
+   econf "${myeconfargs[@]}"
+   sed -i \
+   -e '/^LTFLAGS/s:--silent::' \
+   build/rules.mk build/config_vars.mk || die
+}
+
+src_compile() {
+   emake -C support
+}
+
+src_install() {
+   emake -C support DESTDIR="${D}" install
+   dodoc CHANGES
+   doman docs/man/{dbmmanage,htdigest,htpasswd,htdbm,ab,logresolve}.1 \
+   docs/man/{htcacheclean,rotatelogs}.8
+
+   # Providing compatiblity symlinks for #177697 (which we'll stop to 
install
+   # at some point).
+   pushd "${ED}"/usr/sbin >/dev/null || die
+   local i
+   for i in *; do
+   dosym ${i} /usr/sbin/${i}2
+   done
+   popd >/dev/null || die
+
+   # Provide a symlink for ab-ssl
+   if use ssl ; then
+   dosym ab /usr/bin/ab-ssl
+   dosym ab /usr/bin/ab2-ssl
+   fi
+}

[gentoo-commits] repo/gentoo:master commit in: app-admin/apache-tools/

2022-12-14 Thread Sam James

commit: 5e0cb606997d6b1857974ca7b6e6042fdfc3ed07
Author: Sam James  gentoo  org>
AuthorDate: Wed Dec 14 11:43:30 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Wed Dec 14 11:43:30 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5e0cb606

app-admin/apache-tools: drop 2.4.53-r1, 2.4.54-r1, 2.4.54-r2

Signed-off-by: Sam James  gentoo.org>

 app-admin/apache-tools/Manifest|   1 -
 .../apache-tools/apache-tools-2.4.53-r1.ebuild | 104 
 .../apache-tools/apache-tools-2.4.54-r1.ebuild | 108 
 .../apache-tools/apache-tools-2.4.54-r2.ebuild | 109 -
 4 files changed, 322 deletions(-)

diff --git a/app-admin/apache-tools/Manifest b/app-admin/apache-tools/Manifest
index d2e907722b28..acf6fa127c09 100644
--- a/app-admin/apache-tools/Manifest
+++ b/app-admin/apache-tools/Manifest
@@ -1,2 +1 @@
-DIST httpd-2.4.53.tar.bz2 7431942 BLAKE2B 
44acd51a2c18ae66878d64922947f2f24f0ddf8a5fa70718f788572032e18dafd06888fed3cf559e63e2a9e69d9b0a8dcc79e11fc9d8f216b5b073f769494727
 SHA512 
07ef59594251a30a864cc9cc9a58ab788c2d006cef85b728f29533243927c63cb063e0867f2a306f37324c3adb9cf7dcb2402f3516b05c2c6f32469d475dd756
 DIST httpd-2.4.54.tar.bz2 7434530 BLAKE2B 
be2ba2d33368f9dd619e36e63dd3635fbcf55773a539ac2840251bda04311f3eb535c08a37ab58d8b184c71e75b90b92e2bdc4e59c722cfb146de516f6e1ed04
 SHA512 
228493b2ff32c4142c6e484d304f2ea12e467498605fe12adce2b61388d8efe7b2e96ae2fd0abd1dc88a5f12d625e007d8da0ae5628cff2a5272806754f41e18

diff --git a/app-admin/apache-tools/apache-tools-2.4.53-r1.ebuild 
b/app-admin/apache-tools/apache-tools-2.4.53-r1.ebuild
deleted file mode 100644
index bf1562cee74c..
--- a/app-admin/apache-tools/apache-tools-2.4.53-r1.ebuild
+++ /dev/null
@@ -1,104 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-inherit toolchain-funcs
-
-DESCRIPTION="Useful Apache tools - htdigest, htpasswd, ab, htdbm"
-HOMEPAGE="https://httpd.apache.org/;
-SRC_URI="mirror://apache/httpd/httpd-${PV}.tar.bz2"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 
sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc64-solaris 
~x64-solaris"
-IUSE="ssl"
-RESTRICT="test"
-
-RDEPEND=">=dev-libs/apr-1.5.0:1=
-   dev-libs/apr-util:1=
-   dev-libs/expat
-   dev-libs/libpcre
-   virtual/libcrypt:=
-   kernel_linux? ( sys-apps/util-linux )
-   ssl? ( dev-libs/openssl:0= )"
-DEPEND="${RDEPEND}
-   sys-devel/libtool"
-BDEPEND="
-   sys-apps/which
-   virtual/pkgconfig
-"
-
-S="${WORKDIR}/httpd-${PV}"
-
-PATCHES=(
-   "${FILESDIR}/${PN}-2.4.7-Makefile.patch" #459446
-)
-
-src_prepare() {
-   default
-
-   # This package really should upgrade to using pcre's .pc file.
-   cat <<-\EOF >"${T}"/pcre-config
-   #!/bin/bash
-   flags=()
-   for flag; do
-   if [[ ${flag} == "--version" ]]; then
-   flags+=( --modversion )
-   else
-   flags+=( "${flag}" )
-   fi
-   done
-   exec ${PKG_CONFIG} libpcre "${flags[@]}"
-   EOF
-   chmod a+x "${T}"/pcre-config || die
-}
-
-src_configure() {
-   # Brain dead check.
-   tc-is-cross-compiler && export ap_cv_void_ptr_lt_long="no"
-
-   tc-export PKG_CONFIG
-
-   local myeconfargs=(
-   --libexecdir="${EPREFIX}"/usr/$(get_libdir)/apache2/modules
-   --sbindir="${EPREFIX}"/usr/sbin
-   --with-z="${EPREFIX}"/usr
-   --with-apr="${ESYSROOT}"/usr
-   --with-apr-util="${ESYSROOT}"/usr
-   --with-pcre="${T}"/pcre-config
-   $(use_enable ssl)
-   $(usex ssl '--with-ssl="${EPREFIX}"/usr' '')
-   )
-   # econf overwrites the stuff from config.layout.
-   ac_cv_path_PKGCONFIG="${PKG_CONFIG}" \
-   econf "${myeconfargs[@]}"
-   sed -i \
-   -e '/^LTFLAGS/s:--silent::' \
-   build/rules.mk build/config_vars.mk || die
-}
-
-src_compile() {
-   emake -C support
-}
-
-src_install() {
-   emake -C support DESTDIR="${D}" install
-   dodoc CHANGES
-   doman docs/man/{dbmmanage,htdigest,htpasswd,htdbm,ab,logresolve}.1 \
-   docs/man/{htcacheclean,rotatelogs}.8
-
-   # Providing compatiblity symlinks for #177697 (which we'll stop to 
install
-   # at some point).
-   pushd "${ED}"/usr/sbin >/dev/null || die
-   local i
-   for i in *; do
-   dosym ${i} /usr/sbin/${i}2
-   done
-   popd >/dev/null || die
-
-   # Provide a symlink for ab-ssl
-   if use ssl ; then
-   dosym ab /usr/bin/ab-ssl
-   dosym ab /usr/bin/ab2-ssl
-   fi
-}

diff --git a/app-admin/apache-tools/apache-tools-2.4.54-r1.ebuild 
b/app-admin/apache-tools/apache-tools-2.4.54-r1.ebuild

[gentoo-commits] repo/gentoo:master commit in: app-admin/apache-tools/

2022-12-14 Thread Sam James

commit: b8b25e7793653137f231e511807765283ca225b3
Author: Sam James  gentoo  org>
AuthorDate: Wed Dec 14 11:39:21 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Wed Dec 14 11:39:21 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b8b25e77

app-admin/apache-tools: switch to pcre2

Closes: https://bugs.gentoo.org/835151
Signed-off-by: Sam James  gentoo.org>

 .../apache-tools/apache-tools-2.4.54-r3.ebuild | 113 +
 1 file changed, 113 insertions(+)

diff --git a/app-admin/apache-tools/apache-tools-2.4.54-r3.ebuild 
b/app-admin/apache-tools/apache-tools-2.4.54-r3.ebuild
new file mode 100644
index ..6f81b8aa7f99
--- /dev/null
+++ b/app-admin/apache-tools/apache-tools-2.4.54-r3.ebuild
@@ -0,0 +1,113 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools toolchain-funcs
+
+DESCRIPTION="Useful Apache tools - htdigest, htpasswd, ab, htdbm"
+HOMEPAGE="https://httpd.apache.org/;
+SRC_URI="mirror://apache/httpd/httpd-${PV}.tar.bz2"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 
~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos 
~sparc64-solaris ~x64-solaris"
+IUSE="ssl"
+RESTRICT="test"
+
+RDEPEND=">=dev-libs/apr-1.5.0:1=
+   dev-libs/apr-util:1=
+   dev-libs/expat
+   dev-libs/libpcre2
+   virtual/libcrypt:=
+   kernel_linux? ( sys-apps/util-linux )
+   ssl? ( dev-libs/openssl:0= )"
+DEPEND="${RDEPEND}
+   sys-devel/libtool"
+BDEPEND="
+   virtual/pkgconfig
+"
+
+S="${WORKDIR}/httpd-${PV}"
+
+PATCHES=(
+   "${FILESDIR}/${PN}-2.4.54-Makefile.patch" #459446
+   "${FILESDIR}/${PN}-2.4.54-no-which.patch" #844868
+   "${FILESDIR}/${PN}-2.4.54-libtool.patch" #858833
+)
+
+src_prepare() {
+   default
+
+   # This package really should upgrade to using pcre's .pc file.
+   cat <<-\EOF > "${T}"/pcre2-config
+   #!/usr/bin/env bash
+   flags=()
+   for flag; do
+   if [[ ${flag} == "--version" ]]; then
+   flags+=( --modversion )
+   else
+   flags+=( "${flag}" )
+   fi
+   done
+   exec ${PKG_CONFIG} libpcre2-8 "${flags[@]}"
+   EOF
+   chmod a+x "${T}"/pcre2-config || die
+
+   # Only here for libtool and which patches
+   eautoreconf
+}
+
+src_configure() {
+   # Silly check.
+   tc-is-cross-compiler && export ap_cv_void_ptr_lt_long="no"
+
+   tc-export PKG_CONFIG
+   export ac_cv_path_PKGCONFIG="${PKG_CONFIG}"
+   export ac_cv_prog_ac_ct_PCRE_CONFIG="${T}"/pcre2-config
+
+   local myeconfargs=(
+   --libexecdir="${EPREFIX}"/usr/$(get_libdir)/apache2/modules
+   --sbindir="${EPREFIX}"/usr/sbin
+   --with-z="${EPREFIX}"/usr
+   --with-apr="${ESYSROOT}"/usr
+   --with-apr-util="${ESYSROOT}"/usr
+   --without-pcre
+   --with-pcre2="${T}"/pcre2-config
+   $(use_enable ssl)
+   $(usex ssl '--with-ssl="${EPREFIX}"/usr' '')
+   )
+
+   # econf overwrites the stuff from config.layout.
+   econf "${myeconfargs[@]}"
+
+   sed -i \
+   -e '/^LTFLAGS/s:--silent::' \
+   build/rules.mk build/config_vars.mk || die
+}
+
+src_compile() {
+   emake -C support
+}
+
+src_install() {
+   emake -C support DESTDIR="${D}" install
+   dodoc CHANGES
+   doman docs/man/{dbmmanage,htdigest,htpasswd,htdbm,ab,logresolve}.1 \
+   docs/man/{htcacheclean,rotatelogs}.8
+
+   # Providing compatiblity symlinks for #177697 (which we'll stop to 
install
+   # at some point).
+   pushd "${ED}"/usr/sbin >/dev/null || die
+   local i
+   for i in *; do
+   dosym ${i} /usr/sbin/${i}2
+   done
+   popd >/dev/null || die
+
+   # Provide a symlink for ab-ssl
+   if use ssl ; then
+   dosym ab /usr/bin/ab-ssl
+   dosym ab /usr/bin/ab2-ssl
+   fi
+}

[gentoo-commits] repo/gentoo:master commit in: app-admin/apache-tools/

2022-12-10 Thread Sam James

commit: 33bf2723096b384ec9557e6fb68530712806eb61
Author: Sam James  gentoo  org>
AuthorDate: Sun Dec 11 00:26:09 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Sun Dec 11 00:26:09 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=33bf2723

app-admin/apache-tools: Stabilize 2.4.54-r2 amd64, #880701

Signed-off-by: Sam James  gentoo.org>

 app-admin/apache-tools/apache-tools-2.4.54-r2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-admin/apache-tools/apache-tools-2.4.54-r2.ebuild 
b/app-admin/apache-tools/apache-tools-2.4.54-r2.ebuild
index b10f8a8bbb67..54c5ce8f759c 100644
--- a/app-admin/apache-tools/apache-tools-2.4.54-r2.ebuild
+++ b/app-admin/apache-tools/apache-tools-2.4.54-r2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://apache/httpd/httpd-${PV}.tar.bz2"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv 
~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc64-solaris 
~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv 
~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc64-solaris 
~x64-solaris"
 IUSE="ssl"
 RESTRICT="test"

[gentoo-commits] repo/gentoo:master commit in: app-admin/apache-tools/

2022-11-26 Thread Arthur Zamarin

commit: 37fcd9302faebd4ddcea27c7cfddfeed305ee059
Author: Arthur Zamarin  gentoo  org>
AuthorDate: Sat Nov 26 17:11:58 2022 +
Commit: Arthur Zamarin  gentoo  org>
CommitDate: Sat Nov 26 17:11:58 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=37fcd930

app-admin/apache-tools: Stabilize 2.4.54-r2 arm, #880701

Signed-off-by: Arthur Zamarin  gentoo.org>

 app-admin/apache-tools/apache-tools-2.4.54-r2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-admin/apache-tools/apache-tools-2.4.54-r2.ebuild 
b/app-admin/apache-tools/apache-tools-2.4.54-r2.ebuild
index 0f11de8e9b73..b10f8a8bbb67 100644
--- a/app-admin/apache-tools/apache-tools-2.4.54-r2.ebuild
+++ b/app-admin/apache-tools/apache-tools-2.4.54-r2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://apache/httpd/httpd-${PV}.tar.bz2"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv 
~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc64-solaris 
~x64-solaris"
+KEYWORDS="~alpha ~amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv 
~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc64-solaris 
~x64-solaris"
 IUSE="ssl"
 RESTRICT="test"

[gentoo-commits] repo/gentoo:master commit in: app-admin/apache-tools/

2022-11-25 Thread Arthur Zamarin

commit: 26a8c99ea4a1105d9eabdb94e6acd9683ceb08bb
Author: Arthur Zamarin  gentoo  org>
AuthorDate: Fri Nov 25 14:34:18 2022 +
Commit: Arthur Zamarin  gentoo  org>
CommitDate: Fri Nov 25 14:34:18 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=26a8c99e

app-admin/apache-tools: Stabilize 2.4.54-r2 arm64, #880701

Signed-off-by: Arthur Zamarin  gentoo.org>

 app-admin/apache-tools/apache-tools-2.4.54-r2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-admin/apache-tools/apache-tools-2.4.54-r2.ebuild 
b/app-admin/apache-tools/apache-tools-2.4.54-r2.ebuild
index e5e7bdf8e4e9..0f11de8e9b73 100644
--- a/app-admin/apache-tools/apache-tools-2.4.54-r2.ebuild
+++ b/app-admin/apache-tools/apache-tools-2.4.54-r2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://apache/httpd/httpd-${PV}.tar.bz2"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 
~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos 
~sparc64-solaris ~x64-solaris"
+KEYWORDS="~alpha ~amd64 ~arm arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv 
~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc64-solaris 
~x64-solaris"
 IUSE="ssl"
 RESTRICT="test"

[gentoo-commits] repo/gentoo:master commit in: app-admin/apache-tools/

2022-11-17 Thread Jakov Smolić

commit: 04b8100a1f01caaba7c00f24f356148ec6a6c4dc
Author: Jakov Smolić  gentoo  org>
AuthorDate: Fri Nov 18 07:07:18 2022 +
Commit: Jakov Smolić  gentoo  org>
CommitDate: Fri Nov 18 07:07:18 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=04b8100a

app-admin/apache-tools: Stabilize 2.4.54-r2 x86, #880701

Signed-off-by: Jakov Smolić  gentoo.org>

 app-admin/apache-tools/apache-tools-2.4.54-r2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-admin/apache-tools/apache-tools-2.4.54-r2.ebuild 
b/app-admin/apache-tools/apache-tools-2.4.54-r2.ebuild
index 3b277099fedd..e5e7bdf8e4e9 100644
--- a/app-admin/apache-tools/apache-tools-2.4.54-r2.ebuild
+++ b/app-admin/apache-tools/apache-tools-2.4.54-r2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://apache/httpd/httpd-${PV}.tar.bz2"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 
~riscv ~s390 sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos 
~sparc64-solaris ~x64-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 
~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos 
~sparc64-solaris ~x64-solaris"
 IUSE="ssl"
 RESTRICT="test"

[gentoo-commits] repo/gentoo:master commit in: app-admin/apache-tools/

2022-11-15 Thread Arthur Zamarin

commit: 8a68ffb1e476c95d3233b810d3533ff0f9bb8184
Author: Arthur Zamarin  gentoo  org>
AuthorDate: Wed Nov 16 07:04:53 2022 +
Commit: Arthur Zamarin  gentoo  org>
CommitDate: Wed Nov 16 07:04:53 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8a68ffb1

app-admin/apache-tools: Stabilize 2.4.54-r2 sparc, #880701

Signed-off-by: Arthur Zamarin  gentoo.org>

 app-admin/apache-tools/apache-tools-2.4.54-r2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-admin/apache-tools/apache-tools-2.4.54-r2.ebuild 
b/app-admin/apache-tools/apache-tools-2.4.54-r2.ebuild
index cf6170f696e6..3b277099fedd 100644
--- a/app-admin/apache-tools/apache-tools-2.4.54-r2.ebuild
+++ b/app-admin/apache-tools/apache-tools-2.4.54-r2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://apache/httpd/httpd-${PV}.tar.bz2"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 
~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos 
~sparc64-solaris ~x64-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 
~riscv ~s390 sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos 
~sparc64-solaris ~x64-solaris"
 IUSE="ssl"
 RESTRICT="test"

[gentoo-commits] repo/gentoo:master commit in: app-admin/apache-tools/

2022-10-30 Thread WANG Xuerui

commit: 8202c79d28fa10e997332e5f593a0422c3240b35
Author: WANG Xuerui  gentoo  org>
AuthorDate: Sat Oct 29 02:22:25 2022 +
Commit: WANG Xuerui  gentoo  org>
CommitDate: Mon Oct 31 01:25:33 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8202c79d

app-admin/apache-tools: keyword 2.4.54-r2 for ~loong

Signed-off-by: WANG Xuerui  gentoo.org>

 app-admin/apache-tools/apache-tools-2.4.54-r2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-admin/apache-tools/apache-tools-2.4.54-r2.ebuild 
b/app-admin/apache-tools/apache-tools-2.4.54-r2.ebuild
index e12bf1fadeae..cf6170f696e6 100644
--- a/app-admin/apache-tools/apache-tools-2.4.54-r2.ebuild
+++ b/app-admin/apache-tools/apache-tools-2.4.54-r2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://apache/httpd/httpd-${PV}.tar.bz2"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 
~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc64-solaris 
~x64-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 
~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos 
~sparc64-solaris ~x64-solaris"
 IUSE="ssl"
 RESTRICT="test"

[gentoo-commits] repo/gentoo:master commit in: app-admin/apache-tools/

2022-07-28 Thread Sam James

commit: 54a1951064d374da12d1d9fada4ccf87e3f6d32c
Author: Sam James  gentoo  org>
AuthorDate: Thu Jul 28 13:25:42 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Thu Jul 28 13:31:36 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=54a19510

app-admin/apache-tools: add github upstream metadata

Signed-off-by: Sam James  gentoo.org>

 app-admin/apache-tools/metadata.xml | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/app-admin/apache-tools/metadata.xml 
b/app-admin/apache-tools/metadata.xml
index 3c641b5088d1..05357eac4473 100644
--- a/app-admin/apache-tools/metadata.xml
+++ b/app-admin/apache-tools/metadata.xml
@@ -10,4 +10,7 @@
having apache itself installed (like htdigest/htpasswd, but 
also ab -
the apache benchmark).

+   
+   apache/httpd
+

[gentoo-commits] repo/gentoo:master commit in: app-admin/apache-tools/, app-admin/apache-tools/files/

2022-07-22 Thread Hans de Graaff

commit: 794e3dca81a22db884eaeb45c2b7e413d6dbaf2e
Author: orbea  riseup  net>
AuthorDate: Tue Jul 19 15:01:43 2022 +
Commit: Hans de Graaff  gentoo  org>
CommitDate: Fri Jul 22 07:51:12 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=794e3dca

app-admin/apache-tools: Fix the build with rlibtool

The apache-tools-2.4.7-Makefile.patch is reimplemented since the
existing patch is wrong. The binaries are already installed in
build/rules.mk and with the patch they were being installed twice
where the second instance overwrites the binaries with the slibtool
wrapper scripts.

Bug: https://bugs.gentoo.org/858833
Signed-off-by: orbea  riseup.net>
Signed-off-by: Hans de Graaff  gentoo.org>

 .../apache-tools/apache-tools-2.4.54-r2.ebuild | 109 +
 .../files/apache-tools-2.4.54-Makefile.patch   |  37 +++
 .../files/apache-tools-2.4.54-libtool.patch|  21 
 3 files changed, 167 insertions(+)

diff --git a/app-admin/apache-tools/apache-tools-2.4.54-r2.ebuild 
b/app-admin/apache-tools/apache-tools-2.4.54-r2.ebuild
new file mode 100644
index ..e12bf1fadeae
--- /dev/null
+++ b/app-admin/apache-tools/apache-tools-2.4.54-r2.ebuild
@@ -0,0 +1,109 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools toolchain-funcs
+
+DESCRIPTION="Useful Apache tools - htdigest, htpasswd, ab, htdbm"
+HOMEPAGE="https://httpd.apache.org/;
+SRC_URI="mirror://apache/httpd/httpd-${PV}.tar.bz2"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 
~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc64-solaris 
~x64-solaris"
+IUSE="ssl"
+RESTRICT="test"
+
+RDEPEND=">=dev-libs/apr-1.5.0:1=
+   dev-libs/apr-util:1=
+   dev-libs/expat
+   dev-libs/libpcre
+   virtual/libcrypt:=
+   kernel_linux? ( sys-apps/util-linux )
+   ssl? ( dev-libs/openssl:0= )"
+DEPEND="${RDEPEND}
+   sys-devel/libtool"
+BDEPEND="
+   virtual/pkgconfig
+"
+
+S="${WORKDIR}/httpd-${PV}"
+
+PATCHES=(
+   "${FILESDIR}/${PN}-2.4.54-Makefile.patch" #459446
+   "${FILESDIR}/${PN}-2.4.54-no-which.patch" #844868
+   "${FILESDIR}/${PN}-2.4.54-libtool.patch" #858833
+)
+
+src_prepare() {
+   default
+
+   # This package really should upgrade to using pcre's .pc file.
+   cat <<-\EOF >"${T}"/pcre-config
+   #!/bin/bash
+   flags=()
+   for flag; do
+   if [[ ${flag} == "--version" ]]; then
+   flags+=( --modversion )
+   else
+   flags+=( "${flag}" )
+   fi
+   done
+   exec ${PKG_CONFIG} libpcre "${flags[@]}"
+   EOF
+   chmod a+x "${T}"/pcre-config || die
+
+   # Only here for libtool and which patches
+   eautoreconf
+}
+
+src_configure() {
+   # Brain dead check.
+   tc-is-cross-compiler && export ap_cv_void_ptr_lt_long="no"
+
+   tc-export PKG_CONFIG
+
+   local myeconfargs=(
+   --libexecdir="${EPREFIX}"/usr/$(get_libdir)/apache2/modules
+   --sbindir="${EPREFIX}"/usr/sbin
+   --with-z="${EPREFIX}"/usr
+   --with-apr="${ESYSROOT}"/usr
+   --with-apr-util="${ESYSROOT}"/usr
+   --with-pcre="${T}"/pcre-config
+   $(use_enable ssl)
+   $(usex ssl '--with-ssl="${EPREFIX}"/usr' '')
+   )
+   # econf overwrites the stuff from config.layout.
+   ac_cv_path_PKGCONFIG="${PKG_CONFIG}" \
+   econf "${myeconfargs[@]}"
+   sed -i \
+   -e '/^LTFLAGS/s:--silent::' \
+   build/rules.mk build/config_vars.mk || die
+}
+
+src_compile() {
+   emake -C support
+}
+
+src_install() {
+   emake -C support DESTDIR="${D}" install
+   dodoc CHANGES
+   doman docs/man/{dbmmanage,htdigest,htpasswd,htdbm,ab,logresolve}.1 \
+   docs/man/{htcacheclean,rotatelogs}.8
+
+   # Providing compatiblity symlinks for #177697 (which we'll stop to 
install
+   # at some point).
+   pushd "${ED}"/usr/sbin >/dev/null || die
+   local i
+   for i in *; do
+   dosym ${i} /usr/sbin/${i}2
+   done
+   popd >/dev/null || die
+
+   # Provide a symlink for ab-ssl
+   if use ssl ; then
+   dosym ab /usr/bin/ab-ssl
+   dosym ab /usr/bin/ab2-ssl
+   fi
+}

diff --git a/app-admin/apache-tools/files/apache-tools-2.4.54-Makefile.patch 
b/app-admin/apache-tools/files/apache-tools-2.4.54-Makefile.patch
new file mode 100644
index ..882e97a1c26e
--- /dev/null
+++ b/app-admin/apache-tools/files/apache-tools-2.4.54-Makefile.patch
@@ -0,0 +1,37 @@
+Bug: https://bugs.gentoo.org/459446
+
+From: orbea 
+Date: Tue, 19 Jul 2022 10:42:26 -0700
+Subject: [PATCH] support: Install fewer programs
+
+--- a/support/Makefile.in
 b/support/Makefile.in
+@@ -14,27 +14,12 @@

[gentoo-commits] repo/gentoo:master commit in: app-admin/apache-tools/files/, app-admin/apache-tools/

2022-06-29 Thread Sam James

commit: a988da45ce12d8bf2e47c47dfd775ef4dee49620
Author: Sam James  gentoo  org>
AuthorDate: Mon Jun 20 00:22:37 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Wed Jun 29 08:39:44 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a988da45

app-admin/apache-tools: drop which dependency

Closes: https://bugs.gentoo.org/844868
Signed-off-by: Sam James  gentoo.org>

 .../apache-tools/apache-tools-2.4.54-r1.ebuild | 108 +
 .../files/apache-tools-2.4.54-no-which.patch   |  54 +++
 2 files changed, 162 insertions(+)

diff --git a/app-admin/apache-tools/apache-tools-2.4.54-r1.ebuild 
b/app-admin/apache-tools/apache-tools-2.4.54-r1.ebuild
new file mode 100644
index ..8b3560d27cf2
--- /dev/null
+++ b/app-admin/apache-tools/apache-tools-2.4.54-r1.ebuild
@@ -0,0 +1,108 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools toolchain-funcs
+
+DESCRIPTION="Useful Apache tools - htdigest, htpasswd, ab, htdbm"
+HOMEPAGE="https://httpd.apache.org/;
+SRC_URI="mirror://apache/httpd/httpd-${PV}.tar.bz2"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 
~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc64-solaris 
~x64-solaris"
+IUSE="ssl"
+RESTRICT="test"
+
+RDEPEND=">=dev-libs/apr-1.5.0:1=
+   dev-libs/apr-util:1=
+   dev-libs/expat
+   dev-libs/libpcre
+   virtual/libcrypt:=
+   kernel_linux? ( sys-apps/util-linux )
+   ssl? ( dev-libs/openssl:0= )"
+DEPEND="${RDEPEND}
+   sys-devel/libtool"
+BDEPEND="
+   virtual/pkgconfig
+"
+
+S="${WORKDIR}/httpd-${PV}"
+
+PATCHES=(
+   "${FILESDIR}/${PN}-2.4.7-Makefile.patch" #459446
+   "${FILESDIR}/${PN}-2.4.54-no-which.patch" #844868
+)
+
+src_prepare() {
+   default
+
+   # This package really should upgrade to using pcre's .pc file.
+   cat <<-\EOF >"${T}"/pcre-config
+   #!/bin/bash
+   flags=()
+   for flag; do
+   if [[ ${flag} == "--version" ]]; then
+   flags+=( --modversion )
+   else
+   flags+=( "${flag}" )
+   fi
+   done
+   exec ${PKG_CONFIG} libpcre "${flags[@]}"
+   EOF
+   chmod a+x "${T}"/pcre-config || die
+
+   # Only here for which patch
+   eautoreconf
+}
+
+src_configure() {
+   # Brain dead check.
+   tc-is-cross-compiler && export ap_cv_void_ptr_lt_long="no"
+
+   tc-export PKG_CONFIG
+
+   local myeconfargs=(
+   --libexecdir="${EPREFIX}"/usr/$(get_libdir)/apache2/modules
+   --sbindir="${EPREFIX}"/usr/sbin
+   --with-z="${EPREFIX}"/usr
+   --with-apr="${ESYSROOT}"/usr
+   --with-apr-util="${ESYSROOT}"/usr
+   --with-pcre="${T}"/pcre-config
+   $(use_enable ssl)
+   $(usex ssl '--with-ssl="${EPREFIX}"/usr' '')
+   )
+   # econf overwrites the stuff from config.layout.
+   ac_cv_path_PKGCONFIG="${PKG_CONFIG}" \
+   econf "${myeconfargs[@]}"
+   sed -i \
+   -e '/^LTFLAGS/s:--silent::' \
+   build/rules.mk build/config_vars.mk || die
+}
+
+src_compile() {
+   emake -C support
+}
+
+src_install() {
+   emake -C support DESTDIR="${D}" install
+   dodoc CHANGES
+   doman docs/man/{dbmmanage,htdigest,htpasswd,htdbm,ab,logresolve}.1 \
+   docs/man/{htcacheclean,rotatelogs}.8
+
+   # Providing compatiblity symlinks for #177697 (which we'll stop to 
install
+   # at some point).
+   pushd "${ED}"/usr/sbin >/dev/null || die
+   local i
+   for i in *; do
+   dosym ${i} /usr/sbin/${i}2
+   done
+   popd >/dev/null || die
+
+   # Provide a symlink for ab-ssl
+   if use ssl ; then
+   dosym ab /usr/bin/ab-ssl
+   dosym ab /usr/bin/ab2-ssl
+   fi
+}

diff --git a/app-admin/apache-tools/files/apache-tools-2.4.54-no-which.patch 
b/app-admin/apache-tools/files/apache-tools-2.4.54-no-which.patch
new file mode 100644
index ..65764dfe022a
--- /dev/null
+++ b/app-admin/apache-tools/files/apache-tools-2.4.54-no-which.patch
@@ -0,0 +1,54 @@
+https://bugs.gentoo.org/844868
+https://bz.apache.org/bugzilla/show_bug.cgi?id=66130
+--- a/build/aix/buildaix.ksh
 b/build/aix/buildaix.ksh
+@@ -26,14 +26,14 @@ export CFLAGS='-O2 -qlanglvl=extc99'
+ lslpp -L bos.adt.insttools >/dev/null
+  [[ $? -ne 0 ]] && echo "must have bos.adt.insttools installed" && exit -1
+ 
+-apr_config=`which apr-1-config`
+-apu_config=`which apu-1-config`
++apr_config=`command -v apr-1-config 2>/dev/null`
++apu_config=`command -v apu-1-config 2>/dev/null`
+ 
+ if [[ -z ${apr_config} && -z ${apu_config} ]]
+ then
+   export PATH=/opt/bin:${PATH}
+-  apr_config=`which apr-1-config`
+-  apu_config=`which apu-1-config`
++

[gentoo-commits] repo/gentoo:master commit in: app-admin/apache-tools/

2022-06-24 Thread Agostino Sarubbo

commit: 8535b75306fcb9fe1eae85eb9c878eeff84df121
Author: Agostino Sarubbo  gentoo  org>
AuthorDate: Fri Jun 24 14:06:53 2022 +
Commit: Agostino Sarubbo  gentoo  org>
CommitDate: Fri Jun 24 14:06:53 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8535b753

app-admin/apache-tools: x86 stable wrt bug #852251

Package-Manager: Portage-3.0.30, Repoman-3.0.3
RepoMan-Options: --include-arches="x86"
Signed-off-by: Agostino Sarubbo  gentoo.org>

 app-admin/apache-tools/apache-tools-2.4.54.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-admin/apache-tools/apache-tools-2.4.54.ebuild 
b/app-admin/apache-tools/apache-tools-2.4.54.ebuild
index 198fee8856c7..bf1562cee74c 100644
--- a/app-admin/apache-tools/apache-tools-2.4.54.ebuild
+++ b/app-admin/apache-tools/apache-tools-2.4.54.ebuild
@@ -10,7 +10,7 @@ SRC_URI="mirror://apache/httpd/httpd-${PV}.tar.bz2"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 
sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc64-solaris 
~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 
sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc64-solaris 
~x64-solaris"
 IUSE="ssl"
 RESTRICT="test"

[gentoo-commits] repo/gentoo:master commit in: app-admin/apache-tools/

2022-06-24 Thread Agostino Sarubbo

commit: cbe46c88d9431f6576e63fc74939a6c26a2b36b0
Author: Agostino Sarubbo  gentoo  org>
AuthorDate: Fri Jun 24 08:23:05 2022 +
Commit: Agostino Sarubbo  gentoo  org>
CommitDate: Fri Jun 24 08:23:05 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cbe46c88

app-admin/apache-tools: amd64 stable wrt bug #852251

Package-Manager: Portage-3.0.30, Repoman-3.0.3
RepoMan-Options: --include-arches="amd64"
Signed-off-by: Agostino Sarubbo  gentoo.org>

 app-admin/apache-tools/apache-tools-2.4.54.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-admin/apache-tools/apache-tools-2.4.54.ebuild 
b/app-admin/apache-tools/apache-tools-2.4.54.ebuild
index 7d8ee8924316..198fee8856c7 100644
--- a/app-admin/apache-tools/apache-tools-2.4.54.ebuild
+++ b/app-admin/apache-tools/apache-tools-2.4.54.ebuild
@@ -10,7 +10,7 @@ SRC_URI="mirror://apache/httpd/httpd-${PV}.tar.bz2"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 
sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc64-solaris 
~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 
sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc64-solaris 
~x64-solaris"
 IUSE="ssl"
 RESTRICT="test"

[gentoo-commits] repo/gentoo:master commit in: app-admin/apache-tools/

2022-06-24 Thread Agostino Sarubbo

commit: bb3ba72016325bf1070925232683e313e78b1d3d
Author: Agostino Sarubbo  gentoo  org>
AuthorDate: Fri Jun 24 07:10:40 2022 +
Commit: Agostino Sarubbo  gentoo  org>
CommitDate: Fri Jun 24 07:10:40 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bb3ba720

app-admin/apache-tools: sparc stable wrt bug #852251

Package-Manager: Portage-3.0.30, Repoman-3.0.3
RepoMan-Options: --include-arches="sparc"
Signed-off-by: Agostino Sarubbo  gentoo.org>

 app-admin/apache-tools/apache-tools-2.4.54.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-admin/apache-tools/apache-tools-2.4.54.ebuild 
b/app-admin/apache-tools/apache-tools-2.4.54.ebuild
index 9ba3c51e7f54..7d8ee8924316 100644
--- a/app-admin/apache-tools/apache-tools-2.4.54.ebuild
+++ b/app-admin/apache-tools/apache-tools-2.4.54.ebuild
@@ -10,7 +10,7 @@ SRC_URI="mirror://apache/httpd/httpd-${PV}.tar.bz2"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 
~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc64-solaris 
~x64-solaris"
+KEYWORDS="~alpha ~amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 
sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc64-solaris 
~x64-solaris"
 IUSE="ssl"
 RESTRICT="test"

[gentoo-commits] repo/gentoo:master commit in: app-admin/apache-tools/

2022-06-24 Thread Agostino Sarubbo

commit: f94be456d35c155e34606ff33c462b080de6e982
Author: Agostino Sarubbo  gentoo  org>
AuthorDate: Fri Jun 24 07:08:56 2022 +
Commit: Agostino Sarubbo  gentoo  org>
CommitDate: Fri Jun 24 07:08:56 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f94be456

app-admin/apache-tools: ppc64 stable wrt bug #852251

Package-Manager: Portage-3.0.30, Repoman-3.0.3
RepoMan-Options: --include-arches="ppc64"
Signed-off-by: Agostino Sarubbo  gentoo.org>

 app-admin/apache-tools/apache-tools-2.4.54.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-admin/apache-tools/apache-tools-2.4.54.ebuild 
b/app-admin/apache-tools/apache-tools-2.4.54.ebuild
index 0793293e058a..9ba3c51e7f54 100644
--- a/app-admin/apache-tools/apache-tools-2.4.54.ebuild
+++ b/app-admin/apache-tools/apache-tools-2.4.54.ebuild
@@ -10,7 +10,7 @@ SRC_URI="mirror://apache/httpd/httpd-${PV}.tar.bz2"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 arm arm64 ~hppa ~ia64 ~mips ppc ~ppc64 ~riscv ~s390 
~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc64-solaris 
~x64-solaris"
+KEYWORDS="~alpha ~amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 
~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc64-solaris 
~x64-solaris"
 IUSE="ssl"
 RESTRICT="test"

[gentoo-commits] repo/gentoo:master commit in: app-admin/apache-tools/

2022-06-24 Thread Agostino Sarubbo

commit: 335b9a4429c557e8573d73248fec8eaeb332dfe1
Author: Agostino Sarubbo  gentoo  org>
AuthorDate: Fri Jun 24 07:08:11 2022 +
Commit: Agostino Sarubbo  gentoo  org>
CommitDate: Fri Jun 24 07:08:11 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=335b9a44

app-admin/apache-tools: ppc stable wrt bug #852251

Package-Manager: Portage-3.0.30, Repoman-3.0.3
RepoMan-Options: --include-arches="ppc"
Signed-off-by: Agostino Sarubbo  gentoo.org>

 app-admin/apache-tools/apache-tools-2.4.54.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-admin/apache-tools/apache-tools-2.4.54.ebuild 
b/app-admin/apache-tools/apache-tools-2.4.54.ebuild
index 9dcdcab43b4f..0793293e058a 100644
--- a/app-admin/apache-tools/apache-tools-2.4.54.ebuild
+++ b/app-admin/apache-tools/apache-tools-2.4.54.ebuild
@@ -10,7 +10,7 @@ SRC_URI="mirror://apache/httpd/httpd-${PV}.tar.bz2"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 
~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc64-solaris 
~x64-solaris"
+KEYWORDS="~alpha ~amd64 arm arm64 ~hppa ~ia64 ~mips ppc ~ppc64 ~riscv ~s390 
~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc64-solaris 
~x64-solaris"
 IUSE="ssl"
 RESTRICT="test"

[gentoo-commits] repo/gentoo:master commit in: app-admin/apache-tools/

2022-06-24 Thread Agostino Sarubbo

commit: 554c02843eb72b830797b6428d70a125e41c1d19
Author: Agostino Sarubbo  gentoo  org>
AuthorDate: Fri Jun 24 07:07:42 2022 +
Commit: Agostino Sarubbo  gentoo  org>
CommitDate: Fri Jun 24 07:07:42 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=554c0284

app-admin/apache-tools: arm64 stable wrt bug #852251

Package-Manager: Portage-3.0.30, Repoman-3.0.3
RepoMan-Options: --include-arches="arm64"
Signed-off-by: Agostino Sarubbo  gentoo.org>

 app-admin/apache-tools/apache-tools-2.4.54.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-admin/apache-tools/apache-tools-2.4.54.ebuild 
b/app-admin/apache-tools/apache-tools-2.4.54.ebuild
index ad3b23d48bb7..9dcdcab43b4f 100644
--- a/app-admin/apache-tools/apache-tools-2.4.54.ebuild
+++ b/app-admin/apache-tools/apache-tools-2.4.54.ebuild
@@ -10,7 +10,7 @@ SRC_URI="mirror://apache/httpd/httpd-${PV}.tar.bz2"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 
~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc64-solaris 
~x64-solaris"
+KEYWORDS="~alpha ~amd64 arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 
~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc64-solaris 
~x64-solaris"
 IUSE="ssl"
 RESTRICT="test"

[gentoo-commits] repo/gentoo:master commit in: app-admin/apache-tools/

2022-06-24 Thread Agostino Sarubbo

commit: 932c3437eaf33b2b712882afe4601c34c778abc8
Author: Agostino Sarubbo  gentoo  org>
AuthorDate: Fri Jun 24 07:07:19 2022 +
Commit: Agostino Sarubbo  gentoo  org>
CommitDate: Fri Jun 24 07:07:19 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=932c3437

app-admin/apache-tools: arm stable wrt bug #852251

Package-Manager: Portage-3.0.30, Repoman-3.0.3
RepoMan-Options: --include-arches="arm"
Signed-off-by: Agostino Sarubbo  gentoo.org>

 app-admin/apache-tools/apache-tools-2.4.54.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-admin/apache-tools/apache-tools-2.4.54.ebuild 
b/app-admin/apache-tools/apache-tools-2.4.54.ebuild
index 7acb2c3546d3..ad3b23d48bb7 100644
--- a/app-admin/apache-tools/apache-tools-2.4.54.ebuild
+++ b/app-admin/apache-tools/apache-tools-2.4.54.ebuild
@@ -10,7 +10,7 @@ SRC_URI="mirror://apache/httpd/httpd-${PV}.tar.bz2"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 
~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc64-solaris 
~x64-solaris"
+KEYWORDS="~alpha ~amd64 arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 
~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc64-solaris 
~x64-solaris"
 IUSE="ssl"
 RESTRICT="test"

[gentoo-commits] repo/gentoo:master commit in: app-admin/apache-tools/

2022-06-08 Thread Lars Wendler

commit: a833f845bbe679ce08b37c8af11c724da13c5966
Author: Lars Wendler  gentoo  org>
AuthorDate: Wed Jun  8 13:21:41 2022 +
Commit: Lars Wendler  gentoo  org>
CommitDate: Wed Jun  8 13:28:58 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a833f845

app-admin/apache-tools: Bump to version 2.4.54

Signed-off-by: Lars Wendler  gentoo.org>

 app-admin/apache-tools/Manifest   |   1 +
 app-admin/apache-tools/apache-tools-2.4.54.ebuild | 104 ++
 2 files changed, 105 insertions(+)

diff --git a/app-admin/apache-tools/Manifest b/app-admin/apache-tools/Manifest
index 32676fef7e41..d2e907722b28 100644
--- a/app-admin/apache-tools/Manifest
+++ b/app-admin/apache-tools/Manifest
@@ -1 +1,2 @@
 DIST httpd-2.4.53.tar.bz2 7431942 BLAKE2B 
44acd51a2c18ae66878d64922947f2f24f0ddf8a5fa70718f788572032e18dafd06888fed3cf559e63e2a9e69d9b0a8dcc79e11fc9d8f216b5b073f769494727
 SHA512 
07ef59594251a30a864cc9cc9a58ab788c2d006cef85b728f29533243927c63cb063e0867f2a306f37324c3adb9cf7dcb2402f3516b05c2c6f32469d475dd756
+DIST httpd-2.4.54.tar.bz2 7434530 BLAKE2B 
be2ba2d33368f9dd619e36e63dd3635fbcf55773a539ac2840251bda04311f3eb535c08a37ab58d8b184c71e75b90b92e2bdc4e59c722cfb146de516f6e1ed04
 SHA512 
228493b2ff32c4142c6e484d304f2ea12e467498605fe12adce2b61388d8efe7b2e96ae2fd0abd1dc88a5f12d625e007d8da0ae5628cff2a5272806754f41e18

diff --git a/app-admin/apache-tools/apache-tools-2.4.54.ebuild 
b/app-admin/apache-tools/apache-tools-2.4.54.ebuild
new file mode 100644
index ..7acb2c3546d3
--- /dev/null
+++ b/app-admin/apache-tools/apache-tools-2.4.54.ebuild
@@ -0,0 +1,104 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+inherit toolchain-funcs
+
+DESCRIPTION="Useful Apache tools - htdigest, htpasswd, ab, htdbm"
+HOMEPAGE="https://httpd.apache.org/;
+SRC_URI="mirror://apache/httpd/httpd-${PV}.tar.bz2"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 
~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc64-solaris 
~x64-solaris"
+IUSE="ssl"
+RESTRICT="test"
+
+RDEPEND=">=dev-libs/apr-1.5.0:1=
+   dev-libs/apr-util:1=
+   dev-libs/expat
+   dev-libs/libpcre
+   virtual/libcrypt:=
+   kernel_linux? ( sys-apps/util-linux )
+   ssl? ( dev-libs/openssl:0= )"
+DEPEND="${RDEPEND}
+   sys-devel/libtool"
+BDEPEND="
+   sys-apps/which
+   virtual/pkgconfig
+"
+
+S="${WORKDIR}/httpd-${PV}"
+
+PATCHES=(
+   "${FILESDIR}/${PN}-2.4.7-Makefile.patch" #459446
+)
+
+src_prepare() {
+   default
+
+   # This package really should upgrade to using pcre's .pc file.
+   cat <<-\EOF >"${T}"/pcre-config
+   #!/bin/bash
+   flags=()
+   for flag; do
+   if [[ ${flag} == "--version" ]]; then
+   flags+=( --modversion )
+   else
+   flags+=( "${flag}" )
+   fi
+   done
+   exec ${PKG_CONFIG} libpcre "${flags[@]}"
+   EOF
+   chmod a+x "${T}"/pcre-config || die
+}
+
+src_configure() {
+   # Brain dead check.
+   tc-is-cross-compiler && export ap_cv_void_ptr_lt_long="no"
+
+   tc-export PKG_CONFIG
+
+   local myeconfargs=(
+   --libexecdir="${EPREFIX}"/usr/$(get_libdir)/apache2/modules
+   --sbindir="${EPREFIX}"/usr/sbin
+   --with-z="${EPREFIX}"/usr
+   --with-apr="${ESYSROOT}"/usr
+   --with-apr-util="${ESYSROOT}"/usr
+   --with-pcre="${T}"/pcre-config
+   $(use_enable ssl)
+   $(usex ssl '--with-ssl="${EPREFIX}"/usr' '')
+   )
+   # econf overwrites the stuff from config.layout.
+   ac_cv_path_PKGCONFIG="${PKG_CONFIG}" \
+   econf "${myeconfargs[@]}"
+   sed -i \
+   -e '/^LTFLAGS/s:--silent::' \
+   build/rules.mk build/config_vars.mk || die
+}
+
+src_compile() {
+   emake -C support
+}
+
+src_install() {
+   emake -C support DESTDIR="${D}" install
+   dodoc CHANGES
+   doman docs/man/{dbmmanage,htdigest,htpasswd,htdbm,ab,logresolve}.1 \
+   docs/man/{htcacheclean,rotatelogs}.8
+
+   # Providing compatiblity symlinks for #177697 (which we'll stop to 
install
+   # at some point).
+   pushd "${ED}"/usr/sbin >/dev/null || die
+   local i
+   for i in *; do
+   dosym ${i} /usr/sbin/${i}2
+   done
+   popd >/dev/null || die
+
+   # Provide a symlink for ab-ssl
+   if use ssl ; then
+   dosym ab /usr/bin/ab-ssl
+   dosym ab /usr/bin/ab2-ssl
+   fi
+}

[gentoo-commits] repo/gentoo:master commit in: app-admin/apache-tools/

2022-05-16 Thread Lars Wendler

commit: d83dd74b77a83107df519c6c9b0ebe948947e443
Author: Lars Wendler  gentoo  org>
AuthorDate: Mon May 16 12:26:00 2022 +
Commit: Lars Wendler  gentoo  org>
CommitDate: Mon May 16 12:26:15 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d83dd74b

app-admin/apache-tools: Rebvump to add sys-apps/which to BDEPEND

Closes: https://bugs.gentoo.org/844868
Signed-off-by: Lars Wendler  gentoo.org>

 .../{apache-tools-2.4.53.ebuild => apache-tools-2.4.53-r1.ebuild}| 5 -
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/app-admin/apache-tools/apache-tools-2.4.53.ebuild 
b/app-admin/apache-tools/apache-tools-2.4.53-r1.ebuild
similarity index 98%
rename from app-admin/apache-tools/apache-tools-2.4.53.ebuild
rename to app-admin/apache-tools/apache-tools-2.4.53-r1.ebuild
index ba78ee03975f..bf1562cee74c 100644
--- a/app-admin/apache-tools/apache-tools-2.4.53.ebuild
+++ b/app-admin/apache-tools/apache-tools-2.4.53-r1.ebuild
@@ -23,7 +23,10 @@ RDEPEND=">=dev-libs/apr-1.5.0:1=
ssl? ( dev-libs/openssl:0= )"
 DEPEND="${RDEPEND}
sys-devel/libtool"
-BDEPEND="virtual/pkgconfig"
+BDEPEND="
+   sys-apps/which
+   virtual/pkgconfig
+"
 
 S="${WORKDIR}/httpd-${PV}"

[gentoo-commits] repo/gentoo:master commit in: app-admin/apache-tools/

2022-05-13 Thread Sam James

commit: a06f5bd6f535915d532e8b7c7c8c99e4bcaf57a0
Author: Sam James  gentoo  org>
AuthorDate: Tue Apr 19 15:28:00 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Sat May 14 00:45:32 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a06f5bd6

app-admin/apache-tools: [QA] inline ESYSROOT

ESYSROOT is SYSROOT/EPREFIX in >= EAPI 7

Signed-off-by: Sam James  gentoo.org>

 app-admin/apache-tools/apache-tools-2.4.53.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app-admin/apache-tools/apache-tools-2.4.53.ebuild 
b/app-admin/apache-tools/apache-tools-2.4.53.ebuild
index 5cf22201f1c9..ba78ee03975f 100644
--- a/app-admin/apache-tools/apache-tools-2.4.53.ebuild
+++ b/app-admin/apache-tools/apache-tools-2.4.53.ebuild
@@ -60,8 +60,8 @@ src_configure() {
--libexecdir="${EPREFIX}"/usr/$(get_libdir)/apache2/modules
--sbindir="${EPREFIX}"/usr/sbin
--with-z="${EPREFIX}"/usr
-   --with-apr="${SYSROOT}${EPREFIX}"/usr
-   --with-apr-util="${SYSROOT}${EPREFIX}"/usr
+   --with-apr="${ESYSROOT}"/usr
+   --with-apr-util="${ESYSROOT}"/usr
--with-pcre="${T}"/pcre-config
$(use_enable ssl)
$(usex ssl '--with-ssl="${EPREFIX}"/usr' '')

[gentoo-commits] repo/gentoo:master commit in: app-admin/apache-tools/

2022-04-12 Thread Lars Wendler

commit: 5b532ae308f3bdae30b0e514e6abcc27d4fffd1e
Author: Lars Wendler  gentoo  org>
AuthorDate: Tue Apr 12 07:45:32 2022 +
Commit: Lars Wendler  gentoo  org>
CommitDate: Tue Apr 12 07:45:32 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5b532ae3

app-admin/apache-tools: Removed old

Signed-off-by: Lars Wendler  gentoo.org>

 app-admin/apache-tools/Manifest   |   1 -
 app-admin/apache-tools/apache-tools-2.4.52.ebuild | 101 --
 2 files changed, 102 deletions(-)

diff --git a/app-admin/apache-tools/Manifest b/app-admin/apache-tools/Manifest
index 5661593decba..32676fef7e41 100644
--- a/app-admin/apache-tools/Manifest
+++ b/app-admin/apache-tools/Manifest
@@ -1,2 +1 @@
-DIST httpd-2.4.52.tar.bz2 7439184 BLAKE2B 
caa3f96226eeaf2f7ab625a73e820e7c6c5661a80983fa1cd2f4ab5366fcad03e1f47ad02ab060662ceb941fc777b1fb8a269ec5f0d9c6f7a3d93756e995d713
 SHA512 
97c021c576022a9d32f4a390f62e07b5f550973aef2f299fd52defce1a9fa5d27bd4a676e7bf214373ba46063d34aecce42de62fdd93678a4e925cfcbb2afdf6
 DIST httpd-2.4.53.tar.bz2 7431942 BLAKE2B 
44acd51a2c18ae66878d64922947f2f24f0ddf8a5fa70718f788572032e18dafd06888fed3cf559e63e2a9e69d9b0a8dcc79e11fc9d8f216b5b073f769494727
 SHA512 
07ef59594251a30a864cc9cc9a58ab788c2d006cef85b728f29533243927c63cb063e0867f2a306f37324c3adb9cf7dcb2402f3516b05c2c6f32469d475dd756

diff --git a/app-admin/apache-tools/apache-tools-2.4.52.ebuild 
b/app-admin/apache-tools/apache-tools-2.4.52.ebuild
deleted file mode 100644
index 5cf22201f1c9..
--- a/app-admin/apache-tools/apache-tools-2.4.52.ebuild
+++ /dev/null
@@ -1,101 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-inherit toolchain-funcs
-
-DESCRIPTION="Useful Apache tools - htdigest, htpasswd, ab, htdbm"
-HOMEPAGE="https://httpd.apache.org/;
-SRC_URI="mirror://apache/httpd/httpd-${PV}.tar.bz2"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 
sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc64-solaris 
~x64-solaris"
-IUSE="ssl"
-RESTRICT="test"
-
-RDEPEND=">=dev-libs/apr-1.5.0:1=
-   dev-libs/apr-util:1=
-   dev-libs/expat
-   dev-libs/libpcre
-   virtual/libcrypt:=
-   kernel_linux? ( sys-apps/util-linux )
-   ssl? ( dev-libs/openssl:0= )"
-DEPEND="${RDEPEND}
-   sys-devel/libtool"
-BDEPEND="virtual/pkgconfig"
-
-S="${WORKDIR}/httpd-${PV}"
-
-PATCHES=(
-   "${FILESDIR}/${PN}-2.4.7-Makefile.patch" #459446
-)
-
-src_prepare() {
-   default
-
-   # This package really should upgrade to using pcre's .pc file.
-   cat <<-\EOF >"${T}"/pcre-config
-   #!/bin/bash
-   flags=()
-   for flag; do
-   if [[ ${flag} == "--version" ]]; then
-   flags+=( --modversion )
-   else
-   flags+=( "${flag}" )
-   fi
-   done
-   exec ${PKG_CONFIG} libpcre "${flags[@]}"
-   EOF
-   chmod a+x "${T}"/pcre-config || die
-}
-
-src_configure() {
-   # Brain dead check.
-   tc-is-cross-compiler && export ap_cv_void_ptr_lt_long="no"
-
-   tc-export PKG_CONFIG
-
-   local myeconfargs=(
-   --libexecdir="${EPREFIX}"/usr/$(get_libdir)/apache2/modules
-   --sbindir="${EPREFIX}"/usr/sbin
-   --with-z="${EPREFIX}"/usr
-   --with-apr="${SYSROOT}${EPREFIX}"/usr
-   --with-apr-util="${SYSROOT}${EPREFIX}"/usr
-   --with-pcre="${T}"/pcre-config
-   $(use_enable ssl)
-   $(usex ssl '--with-ssl="${EPREFIX}"/usr' '')
-   )
-   # econf overwrites the stuff from config.layout.
-   ac_cv_path_PKGCONFIG="${PKG_CONFIG}" \
-   econf "${myeconfargs[@]}"
-   sed -i \
-   -e '/^LTFLAGS/s:--silent::' \
-   build/rules.mk build/config_vars.mk || die
-}
-
-src_compile() {
-   emake -C support
-}
-
-src_install() {
-   emake -C support DESTDIR="${D}" install
-   dodoc CHANGES
-   doman docs/man/{dbmmanage,htdigest,htpasswd,htdbm,ab,logresolve}.1 \
-   docs/man/{htcacheclean,rotatelogs}.8
-
-   # Providing compatiblity symlinks for #177697 (which we'll stop to 
install
-   # at some point).
-   pushd "${ED}"/usr/sbin >/dev/null || die
-   local i
-   for i in *; do
-   dosym ${i} /usr/sbin/${i}2
-   done
-   popd >/dev/null || die
-
-   # Provide a symlink for ab-ssl
-   if use ssl ; then
-   dosym ab /usr/bin/ab-ssl
-   dosym ab /usr/bin/ab2-ssl
-   fi
-}

[gentoo-commits] repo/gentoo:master commit in: app-admin/apache-tools/

2022-03-18 Thread Sam James

commit: 729f0847a121263b559a5fb23baa60d93d022fe7
Author: Sam James  gentoo  org>
AuthorDate: Fri Mar 18 07:08:19 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Fri Mar 18 07:08:19 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=729f0847

app-admin/apache-tools: Stabilize 2.4.53 amd64, #835150

Signed-off-by: Sam James  gentoo.org>

 app-admin/apache-tools/apache-tools-2.4.53.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-admin/apache-tools/apache-tools-2.4.53.ebuild 
b/app-admin/apache-tools/apache-tools-2.4.53.ebuild
index 412c8eda4a1e..5cf22201f1c9 100644
--- a/app-admin/apache-tools/apache-tools-2.4.53.ebuild
+++ b/app-admin/apache-tools/apache-tools-2.4.53.ebuild
@@ -10,7 +10,7 @@ SRC_URI="mirror://apache/httpd/httpd-${PV}.tar.bz2"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 
sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc64-solaris 
~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 
sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc64-solaris 
~x64-solaris"
 IUSE="ssl"
 RESTRICT="test"

[gentoo-commits] repo/gentoo:master commit in: app-admin/apache-tools/

2022-03-18 Thread Hans de Graaff

commit: 1919b0bc5d5a2dde1aa1286043ddd299a1e67ae1
Author: Hans de Graaff  gentoo  org>
AuthorDate: Fri Mar 18 07:04:03 2022 +
Commit: Hans de Graaff  gentoo  org>
CommitDate: Fri Mar 18 07:04:03 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1919b0bc

app-admin/apache-tools: cleanup

Package-Manager: Portage-3.0.30, Repoman-3.0.3
Signed-off-by: Hans de Graaff  gentoo.org>

 app-admin/apache-tools/Manifest|   1 -
 .../apache-tools/apache-tools-2.4.51-r1.ebuild | 101 
 app-admin/apache-tools/apache-tools-2.4.51.ebuild  | 103 -
 3 files changed, 205 deletions(-)

diff --git a/app-admin/apache-tools/Manifest b/app-admin/apache-tools/Manifest
index 3cb708c26560..5661593decba 100644
--- a/app-admin/apache-tools/Manifest
+++ b/app-admin/apache-tools/Manifest
@@ -1,3 +1,2 @@
-DIST httpd-2.4.51.tar.bz2 7653609 BLAKE2B 
a0743327f0411f5cb8b7d0426bf78db0f370e3d587f3a4c4bb7de0e4499effa3f44f5998e19e9ca3ed7b6fc9a8c0867cbe62134b5af7e6ed6c3bc29770b797df
 SHA512 
9fb07c4b176f5c0485a143e2b1bb1085345ca9120b959974f68c37a8911a57894d2cb488b1b42fdf3102860b99e890204f5e9fa7ae3828b481119c563812cc66
 DIST httpd-2.4.52.tar.bz2 7439184 BLAKE2B 
caa3f96226eeaf2f7ab625a73e820e7c6c5661a80983fa1cd2f4ab5366fcad03e1f47ad02ab060662ceb941fc777b1fb8a269ec5f0d9c6f7a3d93756e995d713
 SHA512 
97c021c576022a9d32f4a390f62e07b5f550973aef2f299fd52defce1a9fa5d27bd4a676e7bf214373ba46063d34aecce42de62fdd93678a4e925cfcbb2afdf6
 DIST httpd-2.4.53.tar.bz2 7431942 BLAKE2B 
44acd51a2c18ae66878d64922947f2f24f0ddf8a5fa70718f788572032e18dafd06888fed3cf559e63e2a9e69d9b0a8dcc79e11fc9d8f216b5b073f769494727
 SHA512 
07ef59594251a30a864cc9cc9a58ab788c2d006cef85b728f29533243927c63cb063e0867f2a306f37324c3adb9cf7dcb2402f3516b05c2c6f32469d475dd756

diff --git a/app-admin/apache-tools/apache-tools-2.4.51-r1.ebuild 
b/app-admin/apache-tools/apache-tools-2.4.51-r1.ebuild
deleted file mode 100644
index 1f89503c59ee..
--- a/app-admin/apache-tools/apache-tools-2.4.51-r1.ebuild
+++ /dev/null
@@ -1,101 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-inherit toolchain-funcs
-
-DESCRIPTION="Useful Apache tools - htdigest, htpasswd, ab, htdbm"
-HOMEPAGE="https://httpd.apache.org/;
-SRC_URI="mirror://apache/httpd/httpd-${PV}.tar.bz2"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 
~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc64-solaris 
~x64-solaris"
-IUSE="ssl"
-RESTRICT="test"
-
-RDEPEND=">=dev-libs/apr-1.5.0:1=
-   dev-libs/apr-util:1=
-   dev-libs/expat
-   dev-libs/libpcre
-   virtual/libcrypt:=
-   kernel_linux? ( sys-apps/util-linux )
-   ssl? ( dev-libs/openssl:0= )"
-DEPEND="${RDEPEND}
-   sys-devel/libtool"
-BDEPEND="virtual/pkgconfig"
-
-S="${WORKDIR}/httpd-${PV}"
-
-PATCHES=(
-   "${FILESDIR}/${PN}-2.4.7-Makefile.patch" #459446
-)
-
-src_prepare() {
-   default
-
-   # This package really should upgrade to using pcre's .pc file.
-   cat <<-\EOF >"${T}"/pcre-config
-   #!/bin/bash
-   flags=()
-   for flag; do
-   if [[ ${flag} == "--version" ]]; then
-   flags+=( --modversion )
-   else
-   flags+=( "${flag}" )
-   fi
-   done
-   exec ${PKG_CONFIG} libpcre "${flags[@]}"
-   EOF
-   chmod a+x "${T}"/pcre-config || die
-}
-
-src_configure() {
-   # Brain dead check.
-   tc-is-cross-compiler && export ap_cv_void_ptr_lt_long="no"
-
-   tc-export PKG_CONFIG
-
-   local myeconfargs=(
-   --libexecdir="${EPREFIX}"/usr/$(get_libdir)/apache2/modules
-   --sbindir="${EPREFIX}"/usr/sbin
-   --with-z="${EPREFIX}"/usr
-   --with-apr="${SYSROOT}${EPREFIX}"/usr
-   --with-apr-util="${SYSROOT}${EPREFIX}"/usr
-   --with-pcre="${T}"/pcre-config
-   $(use_enable ssl)
-   $(usex ssl '--with-ssl="${EPREFIX}"/usr' '')
-   )
-   # econf overwrites the stuff from config.layout.
-   ac_cv_path_PKGCONFIG="${PKG_CONFIG}" \
-   econf "${myeconfargs[@]}"
-   sed -i \
-   -e '/^LTFLAGS/s:--silent::' \
-   build/rules.mk build/config_vars.mk || die
-}
-
-src_compile() {
-   emake -C support
-}
-
-src_install() {
-   emake -C support DESTDIR="${D}" install
-   dodoc CHANGES
-   doman docs/man/{dbmmanage,htdigest,htpasswd,htdbm,ab,logresolve}.1 \
-   docs/man/{htcacheclean,rotatelogs}.8
-
-   # Providing compatiblity symlinks for #177697 (which we'll stop to 
install
-   # at some point).
-   pushd "${ED}"/usr/sbin >/dev/null || die
-   local i
-   for i in *; do
-   dosym ${i} /usr/sbin/${i}2
-   done
-   popd >/dev/null || die
-
-   # Provide a symlink

[gentoo-commits] repo/gentoo:master commit in: app-admin/apache-tools/

2022-03-17 Thread Agostino Sarubbo

commit: 761d1e0e298ef46a87e1d7fa8dd8ec29b849b51d
Author: Agostino Sarubbo  gentoo  org>
AuthorDate: Thu Mar 17 07:43:26 2022 +
Commit: Agostino Sarubbo  gentoo  org>
CommitDate: Thu Mar 17 07:43:26 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=761d1e0e

app-admin/apache-tools: sparc stable wrt bug #835150

Package-Manager: Portage-3.0.30, Repoman-3.0.3
RepoMan-Options: --include-arches="sparc"
Signed-off-by: Agostino Sarubbo  gentoo.org>

 app-admin/apache-tools/apache-tools-2.4.53.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-admin/apache-tools/apache-tools-2.4.53.ebuild 
b/app-admin/apache-tools/apache-tools-2.4.53.ebuild
index bde1cdb45732..412c8eda4a1e 100644
--- a/app-admin/apache-tools/apache-tools-2.4.53.ebuild
+++ b/app-admin/apache-tools/apache-tools-2.4.53.ebuild
@@ -10,7 +10,7 @@ SRC_URI="mirror://apache/httpd/httpd-${PV}.tar.bz2"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 
~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc64-solaris 
~x64-solaris"
+KEYWORDS="~alpha ~amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 
sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc64-solaris 
~x64-solaris"
 IUSE="ssl"
 RESTRICT="test"

[gentoo-commits] repo/gentoo:master commit in: app-admin/apache-tools/

2022-03-17 Thread Agostino Sarubbo

commit: d57d85a2e6b01c3e7316d555f8b786bc40fe621b
Author: Agostino Sarubbo  gentoo  org>
AuthorDate: Thu Mar 17 07:41:58 2022 +
Commit: Agostino Sarubbo  gentoo  org>
CommitDate: Thu Mar 17 07:41:58 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d57d85a2

app-admin/apache-tools: ppc stable wrt bug #835150

Package-Manager: Portage-3.0.30, Repoman-3.0.3
RepoMan-Options: --include-arches="ppc"
Signed-off-by: Agostino Sarubbo  gentoo.org>

 app-admin/apache-tools/apache-tools-2.4.53.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-admin/apache-tools/apache-tools-2.4.53.ebuild 
b/app-admin/apache-tools/apache-tools-2.4.53.ebuild
index 8306fafbb99a..bde1cdb45732 100644
--- a/app-admin/apache-tools/apache-tools-2.4.53.ebuild
+++ b/app-admin/apache-tools/apache-tools-2.4.53.ebuild
@@ -10,7 +10,7 @@ SRC_URI="mirror://apache/httpd/httpd-${PV}.tar.bz2"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 arm arm64 ~hppa ~ia64 ~mips ~ppc ppc64 ~riscv ~s390 
~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc64-solaris 
~x64-solaris"
+KEYWORDS="~alpha ~amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 
~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc64-solaris 
~x64-solaris"
 IUSE="ssl"
 RESTRICT="test"

[gentoo-commits] repo/gentoo:master commit in: app-admin/apache-tools/

2022-03-16 Thread Sam James

commit: 0f6874eaedd3d5ada34dc49a0c1a969af911b8b2
Author: Sam James  gentoo  org>
AuthorDate: Thu Mar 17 02:10:38 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Thu Mar 17 02:10:38 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0f6874ea

app-admin/apache-tools: Stabilize 2.4.53 ppc64, #835150

Signed-off-by: Sam James  gentoo.org>

 app-admin/apache-tools/apache-tools-2.4.53.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-admin/apache-tools/apache-tools-2.4.53.ebuild 
b/app-admin/apache-tools/apache-tools-2.4.53.ebuild
index 333933a590fc..8306fafbb99a 100644
--- a/app-admin/apache-tools/apache-tools-2.4.53.ebuild
+++ b/app-admin/apache-tools/apache-tools-2.4.53.ebuild
@@ -10,7 +10,7 @@ SRC_URI="mirror://apache/httpd/httpd-${PV}.tar.bz2"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 
~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc64-solaris 
~x64-solaris"
+KEYWORDS="~alpha ~amd64 arm arm64 ~hppa ~ia64 ~mips ~ppc ppc64 ~riscv ~s390 
~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc64-solaris 
~x64-solaris"
 IUSE="ssl"
 RESTRICT="test"

[gentoo-commits] repo/gentoo:master commit in: app-admin/apache-tools/

2022-03-16 Thread Sam James

commit: 3105879b9096357e13dd0faedbaa22eaef690779
Author: Sam James  gentoo  org>
AuthorDate: Thu Mar 17 01:33:49 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Thu Mar 17 01:33:49 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3105879b

app-admin/apache-tools: Stabilize 2.4.52 ppc64, #829787

Signed-off-by: Sam James  gentoo.org>

 app-admin/apache-tools/apache-tools-2.4.52.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-admin/apache-tools/apache-tools-2.4.52.ebuild 
b/app-admin/apache-tools/apache-tools-2.4.52.ebuild
index 133c2be86c3c..5cf22201f1c9 100644
--- a/app-admin/apache-tools/apache-tools-2.4.52.ebuild
+++ b/app-admin/apache-tools/apache-tools-2.4.52.ebuild
@@ -10,7 +10,7 @@ SRC_URI="mirror://apache/httpd/httpd-${PV}.tar.bz2"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ~ppc64 ~riscv ~s390 
sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc64-solaris 
~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 
sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc64-solaris 
~x64-solaris"
 IUSE="ssl"
 RESTRICT="test"

[gentoo-commits] repo/gentoo:master commit in: app-admin/apache-tools/

2022-03-16 Thread Sam James

commit: dfa04393952bb2fa04b1016be97a48d5a0b142f0
Author: Sam James  gentoo  org>
AuthorDate: Thu Mar 17 00:34:15 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Thu Mar 17 00:34:15 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=dfa04393

app-admin/apache-tools: Stabilize 2.4.52 arm, #829787

Signed-off-by: Sam James  gentoo.org>

 app-admin/apache-tools/apache-tools-2.4.52.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-admin/apache-tools/apache-tools-2.4.52.ebuild 
b/app-admin/apache-tools/apache-tools-2.4.52.ebuild
index 279b838490b3..133c2be86c3c 100644
--- a/app-admin/apache-tools/apache-tools-2.4.52.ebuild
+++ b/app-admin/apache-tools/apache-tools-2.4.52.ebuild
@@ -10,7 +10,7 @@ SRC_URI="mirror://apache/httpd/httpd-${PV}.tar.bz2"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~mips ppc ~ppc64 ~riscv ~s390 
sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc64-solaris 
~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ~ppc64 ~riscv ~s390 
sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc64-solaris 
~x64-solaris"
 IUSE="ssl"
 RESTRICT="test"

[gentoo-commits] repo/gentoo:master commit in: app-admin/apache-tools/

2022-03-16 Thread Sam James

commit: b315dcc7af2ec7a7a30a411dc9789ea8d1638c64
Author: Sam James  gentoo  org>
AuthorDate: Thu Mar 17 00:30:08 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Thu Mar 17 00:30:08 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b315dcc7

app-admin/apache-tools: Stabilize 2.4.53 arm, #835150

Signed-off-by: Sam James  gentoo.org>

 app-admin/apache-tools/apache-tools-2.4.53.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-admin/apache-tools/apache-tools-2.4.53.ebuild 
b/app-admin/apache-tools/apache-tools-2.4.53.ebuild
index 907c35eb98c9..333933a590fc 100644
--- a/app-admin/apache-tools/apache-tools-2.4.53.ebuild
+++ b/app-admin/apache-tools/apache-tools-2.4.53.ebuild
@@ -10,7 +10,7 @@ SRC_URI="mirror://apache/httpd/httpd-${PV}.tar.bz2"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 
~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc64-solaris 
~x64-solaris"
+KEYWORDS="~alpha ~amd64 arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 
~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc64-solaris 
~x64-solaris"
 IUSE="ssl"
 RESTRICT="test"

[gentoo-commits] repo/gentoo:master commit in: app-admin/apache-tools/

2022-03-16 Thread Jakov Smolić

commit: adc2dc6f6abb51b025cde020b9434e92608241c9
Author: Jakov Smolić  gentoo  org>
AuthorDate: Wed Mar 16 16:09:44 2022 +
Commit: Jakov Smolić  gentoo  org>
CommitDate: Wed Mar 16 16:09:44 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=adc2dc6f

app-admin/apache-tools: Stabilize 2.4.53 arm64, #835150

Signed-off-by: Jakov Smolić  gentoo.org>

 app-admin/apache-tools/apache-tools-2.4.53.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-admin/apache-tools/apache-tools-2.4.53.ebuild 
b/app-admin/apache-tools/apache-tools-2.4.53.ebuild
index c7d8f0dea335..907c35eb98c9 100644
--- a/app-admin/apache-tools/apache-tools-2.4.53.ebuild
+++ b/app-admin/apache-tools/apache-tools-2.4.53.ebuild
@@ -10,7 +10,7 @@ SRC_URI="mirror://apache/httpd/httpd-${PV}.tar.bz2"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 
~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc64-solaris 
~x64-solaris"
+KEYWORDS="~alpha ~amd64 ~arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 
~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc64-solaris 
~x64-solaris"
 IUSE="ssl"
 RESTRICT="test"

[gentoo-commits] repo/gentoo:master commit in: app-admin/apache-tools/

2022-03-15 Thread Jakov Smolić

commit: 3e7a30a8beae3f639789c1b4f83a81c3e59e8b11
Author: Jakov Smolić  gentoo  org>
AuthorDate: Tue Mar 15 19:43:49 2022 +
Commit: Jakov Smolić  gentoo  org>
CommitDate: Tue Mar 15 19:43:49 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3e7a30a8

app-admin/apache-tools: Stabilize 2.4.53 x86, #835150

Signed-off-by: Jakov Smolić  gentoo.org>

 app-admin/apache-tools/apache-tools-2.4.53.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-admin/apache-tools/apache-tools-2.4.53.ebuild 
b/app-admin/apache-tools/apache-tools-2.4.53.ebuild
index eb952bed7e94..c7d8f0dea335 100644
--- a/app-admin/apache-tools/apache-tools-2.4.53.ebuild
+++ b/app-admin/apache-tools/apache-tools-2.4.53.ebuild
@@ -10,7 +10,7 @@ SRC_URI="mirror://apache/httpd/httpd-${PV}.tar.bz2"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 
~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc64-solaris 
~x64-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 
~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc64-solaris 
~x64-solaris"
 IUSE="ssl"
 RESTRICT="test"

[gentoo-commits] repo/gentoo:master commit in: app-admin/apache-tools/

2022-03-14 Thread Hans de Graaff

commit: ff26a57b5b6660da92f8de2d8eb1d75f2507ed3c
Author: Hans de Graaff  gentoo  org>
AuthorDate: Mon Mar 14 16:24:19 2022 +
Commit: Hans de Graaff  gentoo  org>
CommitDate: Mon Mar 14 16:24:19 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ff26a57b

app-admin/apache-tools: add 2.4.53

Package-Manager: Portage-3.0.30, Repoman-3.0.3
Signed-off-by: Hans de Graaff  gentoo.org>

 app-admin/apache-tools/Manifest   |   1 +
 app-admin/apache-tools/apache-tools-2.4.53.ebuild | 101 ++
 2 files changed, 102 insertions(+)

diff --git a/app-admin/apache-tools/Manifest b/app-admin/apache-tools/Manifest
index 47a7da201bc1..3cb708c26560 100644
--- a/app-admin/apache-tools/Manifest
+++ b/app-admin/apache-tools/Manifest
@@ -1,2 +1,3 @@
 DIST httpd-2.4.51.tar.bz2 7653609 BLAKE2B 
a0743327f0411f5cb8b7d0426bf78db0f370e3d587f3a4c4bb7de0e4499effa3f44f5998e19e9ca3ed7b6fc9a8c0867cbe62134b5af7e6ed6c3bc29770b797df
 SHA512 
9fb07c4b176f5c0485a143e2b1bb1085345ca9120b959974f68c37a8911a57894d2cb488b1b42fdf3102860b99e890204f5e9fa7ae3828b481119c563812cc66
 DIST httpd-2.4.52.tar.bz2 7439184 BLAKE2B 
caa3f96226eeaf2f7ab625a73e820e7c6c5661a80983fa1cd2f4ab5366fcad03e1f47ad02ab060662ceb941fc777b1fb8a269ec5f0d9c6f7a3d93756e995d713
 SHA512 
97c021c576022a9d32f4a390f62e07b5f550973aef2f299fd52defce1a9fa5d27bd4a676e7bf214373ba46063d34aecce42de62fdd93678a4e925cfcbb2afdf6
+DIST httpd-2.4.53.tar.bz2 7431942 BLAKE2B 
44acd51a2c18ae66878d64922947f2f24f0ddf8a5fa70718f788572032e18dafd06888fed3cf559e63e2a9e69d9b0a8dcc79e11fc9d8f216b5b073f769494727
 SHA512 
07ef59594251a30a864cc9cc9a58ab788c2d006cef85b728f29533243927c63cb063e0867f2a306f37324c3adb9cf7dcb2402f3516b05c2c6f32469d475dd756

diff --git a/app-admin/apache-tools/apache-tools-2.4.53.ebuild 
b/app-admin/apache-tools/apache-tools-2.4.53.ebuild
new file mode 100644
index ..eb952bed7e94
--- /dev/null
+++ b/app-admin/apache-tools/apache-tools-2.4.53.ebuild
@@ -0,0 +1,101 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+inherit toolchain-funcs
+
+DESCRIPTION="Useful Apache tools - htdigest, htpasswd, ab, htdbm"
+HOMEPAGE="https://httpd.apache.org/;
+SRC_URI="mirror://apache/httpd/httpd-${PV}.tar.bz2"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 
~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc64-solaris 
~x64-solaris"
+IUSE="ssl"
+RESTRICT="test"
+
+RDEPEND=">=dev-libs/apr-1.5.0:1=
+   dev-libs/apr-util:1=
+   dev-libs/expat
+   dev-libs/libpcre
+   virtual/libcrypt:=
+   kernel_linux? ( sys-apps/util-linux )
+   ssl? ( dev-libs/openssl:0= )"
+DEPEND="${RDEPEND}
+   sys-devel/libtool"
+BDEPEND="virtual/pkgconfig"
+
+S="${WORKDIR}/httpd-${PV}"
+
+PATCHES=(
+   "${FILESDIR}/${PN}-2.4.7-Makefile.patch" #459446
+)
+
+src_prepare() {
+   default
+
+   # This package really should upgrade to using pcre's .pc file.
+   cat <<-\EOF >"${T}"/pcre-config
+   #!/bin/bash
+   flags=()
+   for flag; do
+   if [[ ${flag} == "--version" ]]; then
+   flags+=( --modversion )
+   else
+   flags+=( "${flag}" )
+   fi
+   done
+   exec ${PKG_CONFIG} libpcre "${flags[@]}"
+   EOF
+   chmod a+x "${T}"/pcre-config || die
+}
+
+src_configure() {
+   # Brain dead check.
+   tc-is-cross-compiler && export ap_cv_void_ptr_lt_long="no"
+
+   tc-export PKG_CONFIG
+
+   local myeconfargs=(
+   --libexecdir="${EPREFIX}"/usr/$(get_libdir)/apache2/modules
+   --sbindir="${EPREFIX}"/usr/sbin
+   --with-z="${EPREFIX}"/usr
+   --with-apr="${SYSROOT}${EPREFIX}"/usr
+   --with-apr-util="${SYSROOT}${EPREFIX}"/usr
+   --with-pcre="${T}"/pcre-config
+   $(use_enable ssl)
+   $(usex ssl '--with-ssl="${EPREFIX}"/usr' '')
+   )
+   # econf overwrites the stuff from config.layout.
+   ac_cv_path_PKGCONFIG="${PKG_CONFIG}" \
+   econf "${myeconfargs[@]}"
+   sed -i \
+   -e '/^LTFLAGS/s:--silent::' \
+   build/rules.mk build/config_vars.mk || die
+}
+
+src_compile() {
+   emake -C support
+}
+
+src_install() {
+   emake -C support DESTDIR="${D}" install
+   dodoc CHANGES
+   doman docs/man/{dbmmanage,htdigest,htpasswd,htdbm,ab,logresolve}.1 \
+   docs/man/{htcacheclean,rotatelogs}.8
+
+   # Providing compatiblity symlinks for #177697 (which we'll stop to 
install
+   # at some point).
+   pushd "${ED}"/usr/sbin >/dev/null || die
+   local i
+   for i in *; do
+   dosym ${i} /usr/sbin/${i}2
+   done
+   popd >/dev/null || die
+
+   # Provide a symlink for ab-ssl
+   if use ssl ; then
+   dosym ab /usr/bin/ab-ssl
+

[gentoo-commits] repo/gentoo:master commit in: app-admin/apache-tools/

2022-01-23 Thread Sam James

commit: eac4dc71d63f194bce9698b979f580a4d45ec991
Author: Sam James  gentoo  org>
AuthorDate: Mon Jan 24 03:41:44 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Mon Jan 24 03:41:44 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=eac4dc71

app-admin/apache-tools: Stabilize 2.4.52 ppc, #829787

Signed-off-by: Sam James  gentoo.org>

 app-admin/apache-tools/apache-tools-2.4.52.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app-admin/apache-tools/apache-tools-2.4.52.ebuild 
b/app-admin/apache-tools/apache-tools-2.4.52.ebuild
index 5d75cc03bd9d..279b838490b3 100644
--- a/app-admin/apache-tools/apache-tools-2.4.52.ebuild
+++ b/app-admin/apache-tools/apache-tools-2.4.52.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -10,7 +10,7 @@ SRC_URI="mirror://apache/httpd/httpd-${PV}.tar.bz2"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 
sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc64-solaris 
~x64-solaris"
+KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~mips ppc ~ppc64 ~riscv ~s390 
sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc64-solaris 
~x64-solaris"
 IUSE="ssl"
 RESTRICT="test"

[gentoo-commits] repo/gentoo:master commit in: app-admin/apache-tools/

2021-12-30 Thread Arthur Zamarin

commit: 7f8cd6d6d70cc9b0104c0db1cd7bcde061855c9f
Author: Arthur Zamarin  gentoo  org>
AuthorDate: Thu Dec 30 18:44:35 2021 +
Commit: Arthur Zamarin  gentoo  org>
CommitDate: Thu Dec 30 18:44:35 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7f8cd6d6

app-admin/apache-tools: Stabilize 2.4.52 arm64, #829787

Signed-off-by: Arthur Zamarin  gentoo.org>

 app-admin/apache-tools/apache-tools-2.4.52.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-admin/apache-tools/apache-tools-2.4.52.ebuild 
b/app-admin/apache-tools/apache-tools-2.4.52.ebuild
index 88539ab5d4ad..5d75cc03bd9d 100644
--- a/app-admin/apache-tools/apache-tools-2.4.52.ebuild
+++ b/app-admin/apache-tools/apache-tools-2.4.52.ebuild
@@ -10,7 +10,7 @@ SRC_URI="mirror://apache/httpd/httpd-${PV}.tar.bz2"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 
sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc64-solaris 
~x64-solaris"
+KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 
sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc64-solaris 
~x64-solaris"
 IUSE="ssl"
 RESTRICT="test"

[gentoo-commits] repo/gentoo:master commit in: app-admin/apache-tools/

2021-12-24 Thread Sam James

commit: f990ffe8fb4dcaf850a7782014fd3e478a0f5d89
Author: Rolf Eike Beer  sf-mail  de>
AuthorDate: Fri Dec 24 16:26:31 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Fri Dec 24 21:10:30 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f990ffe8

app-admin/apache-tools: stable 2.4.52 for sparc, bug #829787

Package-Manager: Portage-3.0.28, Repoman-3.0.3
RepoMan-Options: --include-arches="sparc"
Signed-off-by: Rolf Eike Beer  sf-mail.de>
Signed-off-by: Sam James  gentoo.org>

 app-admin/apache-tools/apache-tools-2.4.52.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-admin/apache-tools/apache-tools-2.4.52.ebuild 
b/app-admin/apache-tools/apache-tools-2.4.52.ebuild
index af2be85aa129..88539ab5d4ad 100644
--- a/app-admin/apache-tools/apache-tools-2.4.52.ebuild
+++ b/app-admin/apache-tools/apache-tools-2.4.52.ebuild
@@ -10,7 +10,7 @@ SRC_URI="mirror://apache/httpd/httpd-${PV}.tar.bz2"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 
~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc64-solaris 
~x64-solaris"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 
sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc64-solaris 
~x64-solaris"
 IUSE="ssl"
 RESTRICT="test"

[gentoo-commits] repo/gentoo:master commit in: app-admin/apache-tools/

2021-12-23 Thread Agostino Sarubbo

commit: 109916541809c0e53f68883230155d69059b4a8c
Author: Agostino Sarubbo  gentoo  org>
AuthorDate: Fri Dec 24 07:23:06 2021 +
Commit: Agostino Sarubbo  gentoo  org>
CommitDate: Fri Dec 24 07:23:06 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=10991654

app-admin/apache-tools: x86 stable wrt bug #829787

Package-Manager: Portage-3.0.28, Repoman-3.0.3
RepoMan-Options: --include-arches="x86"
Signed-off-by: Agostino Sarubbo  gentoo.org>

 app-admin/apache-tools/apache-tools-2.4.52.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-admin/apache-tools/apache-tools-2.4.52.ebuild 
b/app-admin/apache-tools/apache-tools-2.4.52.ebuild
index 17d40dca52d5..af2be85aa129 100644
--- a/app-admin/apache-tools/apache-tools-2.4.52.ebuild
+++ b/app-admin/apache-tools/apache-tools-2.4.52.ebuild
@@ -10,7 +10,7 @@ SRC_URI="mirror://apache/httpd/httpd-${PV}.tar.bz2"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 
~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc64-solaris 
~x64-solaris"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 
~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc64-solaris 
~x64-solaris"
 IUSE="ssl"
 RESTRICT="test"

[gentoo-commits] repo/gentoo:master commit in: app-admin/apache-tools/

2021-12-23 Thread Agostino Sarubbo

commit: a8ce5d992b71488392abd438f85bea5a36757b59
Author: Agostino Sarubbo  gentoo  org>
AuthorDate: Fri Dec 24 07:06:39 2021 +
Commit: Agostino Sarubbo  gentoo  org>
CommitDate: Fri Dec 24 07:06:39 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a8ce5d99

app-admin/apache-tools: amd64 stable wrt bug #829787

Package-Manager: Portage-3.0.28, Repoman-3.0.3
RepoMan-Options: --include-arches="amd64"
Signed-off-by: Agostino Sarubbo  gentoo.org>

 app-admin/apache-tools/apache-tools-2.4.52.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-admin/apache-tools/apache-tools-2.4.52.ebuild 
b/app-admin/apache-tools/apache-tools-2.4.52.ebuild
index 1f89503c59ee..17d40dca52d5 100644
--- a/app-admin/apache-tools/apache-tools-2.4.52.ebuild
+++ b/app-admin/apache-tools/apache-tools-2.4.52.ebuild
@@ -10,7 +10,7 @@ SRC_URI="mirror://apache/httpd/httpd-${PV}.tar.bz2"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 
~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc64-solaris 
~x64-solaris"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 
~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc64-solaris 
~x64-solaris"
 IUSE="ssl"
 RESTRICT="test"

[gentoo-commits] repo/gentoo:master commit in: app-admin/apache-tools/

2021-12-21 Thread Lars Wendler

commit: e552b498c45cdc084643a4ead21571fa1e7733a2
Author: Lars Wendler  gentoo  org>
AuthorDate: Tue Dec 21 11:01:40 2021 +
Commit: Lars Wendler  gentoo  org>
CommitDate: Tue Dec 21 11:02:00 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e552b498

app-admin/apache-tools: Security bump to version 2.4.52

Bug: https://bugs.gentoo.org/829722
Signed-off-by: Lars Wendler  gentoo.org>

 app-admin/apache-tools/Manifest   |   1 +
 app-admin/apache-tools/apache-tools-2.4.52.ebuild | 101 ++
 2 files changed, 102 insertions(+)

diff --git a/app-admin/apache-tools/Manifest b/app-admin/apache-tools/Manifest
index ff7308ed88f3..47a7da201bc1 100644
--- a/app-admin/apache-tools/Manifest
+++ b/app-admin/apache-tools/Manifest
@@ -1 +1,2 @@
 DIST httpd-2.4.51.tar.bz2 7653609 BLAKE2B 
a0743327f0411f5cb8b7d0426bf78db0f370e3d587f3a4c4bb7de0e4499effa3f44f5998e19e9ca3ed7b6fc9a8c0867cbe62134b5af7e6ed6c3bc29770b797df
 SHA512 
9fb07c4b176f5c0485a143e2b1bb1085345ca9120b959974f68c37a8911a57894d2cb488b1b42fdf3102860b99e890204f5e9fa7ae3828b481119c563812cc66
+DIST httpd-2.4.52.tar.bz2 7439184 BLAKE2B 
caa3f96226eeaf2f7ab625a73e820e7c6c5661a80983fa1cd2f4ab5366fcad03e1f47ad02ab060662ceb941fc777b1fb8a269ec5f0d9c6f7a3d93756e995d713
 SHA512 
97c021c576022a9d32f4a390f62e07b5f550973aef2f299fd52defce1a9fa5d27bd4a676e7bf214373ba46063d34aecce42de62fdd93678a4e925cfcbb2afdf6

diff --git a/app-admin/apache-tools/apache-tools-2.4.52.ebuild 
b/app-admin/apache-tools/apache-tools-2.4.52.ebuild
new file mode 100644
index ..1f89503c59ee
--- /dev/null
+++ b/app-admin/apache-tools/apache-tools-2.4.52.ebuild
@@ -0,0 +1,101 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+inherit toolchain-funcs
+
+DESCRIPTION="Useful Apache tools - htdigest, htpasswd, ab, htdbm"
+HOMEPAGE="https://httpd.apache.org/;
+SRC_URI="mirror://apache/httpd/httpd-${PV}.tar.bz2"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 
~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc64-solaris 
~x64-solaris"
+IUSE="ssl"
+RESTRICT="test"
+
+RDEPEND=">=dev-libs/apr-1.5.0:1=
+   dev-libs/apr-util:1=
+   dev-libs/expat
+   dev-libs/libpcre
+   virtual/libcrypt:=
+   kernel_linux? ( sys-apps/util-linux )
+   ssl? ( dev-libs/openssl:0= )"
+DEPEND="${RDEPEND}
+   sys-devel/libtool"
+BDEPEND="virtual/pkgconfig"
+
+S="${WORKDIR}/httpd-${PV}"
+
+PATCHES=(
+   "${FILESDIR}/${PN}-2.4.7-Makefile.patch" #459446
+)
+
+src_prepare() {
+   default
+
+   # This package really should upgrade to using pcre's .pc file.
+   cat <<-\EOF >"${T}"/pcre-config
+   #!/bin/bash
+   flags=()
+   for flag; do
+   if [[ ${flag} == "--version" ]]; then
+   flags+=( --modversion )
+   else
+   flags+=( "${flag}" )
+   fi
+   done
+   exec ${PKG_CONFIG} libpcre "${flags[@]}"
+   EOF
+   chmod a+x "${T}"/pcre-config || die
+}
+
+src_configure() {
+   # Brain dead check.
+   tc-is-cross-compiler && export ap_cv_void_ptr_lt_long="no"
+
+   tc-export PKG_CONFIG
+
+   local myeconfargs=(
+   --libexecdir="${EPREFIX}"/usr/$(get_libdir)/apache2/modules
+   --sbindir="${EPREFIX}"/usr/sbin
+   --with-z="${EPREFIX}"/usr
+   --with-apr="${SYSROOT}${EPREFIX}"/usr
+   --with-apr-util="${SYSROOT}${EPREFIX}"/usr
+   --with-pcre="${T}"/pcre-config
+   $(use_enable ssl)
+   $(usex ssl '--with-ssl="${EPREFIX}"/usr' '')
+   )
+   # econf overwrites the stuff from config.layout.
+   ac_cv_path_PKGCONFIG="${PKG_CONFIG}" \
+   econf "${myeconfargs[@]}"
+   sed -i \
+   -e '/^LTFLAGS/s:--silent::' \
+   build/rules.mk build/config_vars.mk || die
+}
+
+src_compile() {
+   emake -C support
+}
+
+src_install() {
+   emake -C support DESTDIR="${D}" install
+   dodoc CHANGES
+   doman docs/man/{dbmmanage,htdigest,htpasswd,htdbm,ab,logresolve}.1 \
+   docs/man/{htcacheclean,rotatelogs}.8
+
+   # Providing compatiblity symlinks for #177697 (which we'll stop to 
install
+   # at some point).
+   pushd "${ED}"/usr/sbin >/dev/null || die
+   local i
+   for i in *; do
+   dosym ${i} /usr/sbin/${i}2
+   done
+   popd >/dev/null || die
+
+   # Provide a symlink for ab-ssl
+   if use ssl ; then
+   dosym ab /usr/bin/ab-ssl
+   dosym ab /usr/bin/ab2-ssl
+   fi
+}

[gentoo-commits] repo/gentoo:master commit in: app-admin/apache-tools/

2021-12-11 Thread Hans de Graaff

commit: e46e6188a38c87872c3738675df922dfa6936ab5
Author: Hans de Graaff  gentoo  org>
AuthorDate: Sat Dec 11 08:12:49 2021 +
Commit: Hans de Graaff  gentoo  org>
CommitDate: Sat Dec 11 08:13:18 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e46e6188

app-admin/apache-tools: remove obsolete configure options

--with-perl was removed in ca 2000 in favor of looking it up with the
PrintPath utility script.

--with-expat was removed in ca 2001 and seems to have been a mechanism
to enable a compatibity shim at the time.

Closes: https://bugs.gentoo.org/828665
Package-Manager: Portage-3.0.28, Repoman-3.0.3
Signed-off-by: Hans de Graaff  gentoo.org>

 .../apache-tools/apache-tools-2.4.51-r1.ebuild | 101 +
 1 file changed, 101 insertions(+)

diff --git a/app-admin/apache-tools/apache-tools-2.4.51-r1.ebuild 
b/app-admin/apache-tools/apache-tools-2.4.51-r1.ebuild
new file mode 100644
index ..1f89503c59ee
--- /dev/null
+++ b/app-admin/apache-tools/apache-tools-2.4.51-r1.ebuild
@@ -0,0 +1,101 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+inherit toolchain-funcs
+
+DESCRIPTION="Useful Apache tools - htdigest, htpasswd, ab, htdbm"
+HOMEPAGE="https://httpd.apache.org/;
+SRC_URI="mirror://apache/httpd/httpd-${PV}.tar.bz2"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 
~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc64-solaris 
~x64-solaris"
+IUSE="ssl"
+RESTRICT="test"
+
+RDEPEND=">=dev-libs/apr-1.5.0:1=
+   dev-libs/apr-util:1=
+   dev-libs/expat
+   dev-libs/libpcre
+   virtual/libcrypt:=
+   kernel_linux? ( sys-apps/util-linux )
+   ssl? ( dev-libs/openssl:0= )"
+DEPEND="${RDEPEND}
+   sys-devel/libtool"
+BDEPEND="virtual/pkgconfig"
+
+S="${WORKDIR}/httpd-${PV}"
+
+PATCHES=(
+   "${FILESDIR}/${PN}-2.4.7-Makefile.patch" #459446
+)
+
+src_prepare() {
+   default
+
+   # This package really should upgrade to using pcre's .pc file.
+   cat <<-\EOF >"${T}"/pcre-config
+   #!/bin/bash
+   flags=()
+   for flag; do
+   if [[ ${flag} == "--version" ]]; then
+   flags+=( --modversion )
+   else
+   flags+=( "${flag}" )
+   fi
+   done
+   exec ${PKG_CONFIG} libpcre "${flags[@]}"
+   EOF
+   chmod a+x "${T}"/pcre-config || die
+}
+
+src_configure() {
+   # Brain dead check.
+   tc-is-cross-compiler && export ap_cv_void_ptr_lt_long="no"
+
+   tc-export PKG_CONFIG
+
+   local myeconfargs=(
+   --libexecdir="${EPREFIX}"/usr/$(get_libdir)/apache2/modules
+   --sbindir="${EPREFIX}"/usr/sbin
+   --with-z="${EPREFIX}"/usr
+   --with-apr="${SYSROOT}${EPREFIX}"/usr
+   --with-apr-util="${SYSROOT}${EPREFIX}"/usr
+   --with-pcre="${T}"/pcre-config
+   $(use_enable ssl)
+   $(usex ssl '--with-ssl="${EPREFIX}"/usr' '')
+   )
+   # econf overwrites the stuff from config.layout.
+   ac_cv_path_PKGCONFIG="${PKG_CONFIG}" \
+   econf "${myeconfargs[@]}"
+   sed -i \
+   -e '/^LTFLAGS/s:--silent::' \
+   build/rules.mk build/config_vars.mk || die
+}
+
+src_compile() {
+   emake -C support
+}
+
+src_install() {
+   emake -C support DESTDIR="${D}" install
+   dodoc CHANGES
+   doman docs/man/{dbmmanage,htdigest,htpasswd,htdbm,ab,logresolve}.1 \
+   docs/man/{htcacheclean,rotatelogs}.8
+
+   # Providing compatiblity symlinks for #177697 (which we'll stop to 
install
+   # at some point).
+   pushd "${ED}"/usr/sbin >/dev/null || die
+   local i
+   for i in *; do
+   dosym ${i} /usr/sbin/${i}2
+   done
+   popd >/dev/null || die
+
+   # Provide a symlink for ab-ssl
+   if use ssl ; then
+   dosym ab /usr/bin/ab-ssl
+   dosym ab /usr/bin/ab2-ssl
+   fi
+}

[gentoo-commits] repo/gentoo:master commit in: app-admin/apache-tools/

2021-10-08 Thread Lars Wendler

commit: 6fc4a67bce4f01ef844dd2cd720a348527f42197
Author: Lars Wendler  gentoo  org>
AuthorDate: Fri Oct  8 06:48:04 2021 +
Commit: Lars Wendler  gentoo  org>
CommitDate: Fri Oct  8 06:48:04 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6fc4a67b

app-admin/apache-tools: Security cleanup

Bug: https://bugs.gentoo.org/816864
Signed-off-by: Lars Wendler  gentoo.org>

 app-admin/apache-tools/Manifest   |   1 -
 app-admin/apache-tools/apache-tools-2.4.50.ebuild | 103 --
 2 files changed, 104 deletions(-)

diff --git a/app-admin/apache-tools/Manifest b/app-admin/apache-tools/Manifest
index de1f99d463a..ff7308ed88f 100644
--- a/app-admin/apache-tools/Manifest
+++ b/app-admin/apache-tools/Manifest
@@ -1,2 +1 @@
-DIST httpd-2.4.50.tar.bz2 7653174 BLAKE2B 
6bdb26bc03347b9643e973d22726ef283b8d92b675f81e85f4e0470bedf8510bac60cd043fe966bc786d5ae47827ac1bb31da88a0e510f4bb6c665e2075c3beb
 SHA512 
b1afbaf44e503b822ff2b443881dcb44a93aa55d496f88ae399a2e7def05f78590f266a16da1f2c0aac88e463b76fba20843b1e20a102e76c8269de6fae3e158
 DIST httpd-2.4.51.tar.bz2 7653609 BLAKE2B 
a0743327f0411f5cb8b7d0426bf78db0f370e3d587f3a4c4bb7de0e4499effa3f44f5998e19e9ca3ed7b6fc9a8c0867cbe62134b5af7e6ed6c3bc29770b797df
 SHA512 
9fb07c4b176f5c0485a143e2b1bb1085345ca9120b959974f68c37a8911a57894d2cb488b1b42fdf3102860b99e890204f5e9fa7ae3828b481119c563812cc66

diff --git a/app-admin/apache-tools/apache-tools-2.4.50.ebuild 
b/app-admin/apache-tools/apache-tools-2.4.50.ebuild
deleted file mode 100644
index 2cb5bdfff76..000
--- a/app-admin/apache-tools/apache-tools-2.4.50.ebuild
+++ /dev/null
@@ -1,103 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-inherit toolchain-funcs
-
-DESCRIPTION="Useful Apache tools - htdigest, htpasswd, ab, htdbm"
-HOMEPAGE="https://httpd.apache.org/;
-SRC_URI="mirror://apache/httpd/httpd-${PV}.tar.bz2"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 
sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc64-solaris 
~x64-solaris"
-IUSE="ssl"
-RESTRICT="test"
-
-RDEPEND=">=dev-libs/apr-1.5.0:1=
-   dev-libs/apr-util:1=
-   dev-libs/expat
-   dev-libs/libpcre
-   virtual/libcrypt:=
-   kernel_linux? ( sys-apps/util-linux )
-   ssl? ( dev-libs/openssl:0= )"
-DEPEND="${RDEPEND}
-   sys-devel/libtool"
-BDEPEND="virtual/pkgconfig"
-
-S="${WORKDIR}/httpd-${PV}"
-
-PATCHES=(
-   "${FILESDIR}/${PN}-2.4.7-Makefile.patch" #459446
-)
-
-src_prepare() {
-   default
-
-   # This package really should upgrade to using pcre's .pc file.
-   cat <<-\EOF >"${T}"/pcre-config
-   #!/bin/bash
-   flags=()
-   for flag; do
-   if [[ ${flag} == "--version" ]]; then
-   flags+=( --modversion )
-   else
-   flags+=( "${flag}" )
-   fi
-   done
-   exec ${PKG_CONFIG} libpcre "${flags[@]}"
-   EOF
-   chmod a+x "${T}"/pcre-config || die
-}
-
-src_configure() {
-   # Brain dead check.
-   tc-is-cross-compiler && export ap_cv_void_ptr_lt_long="no"
-
-   tc-export PKG_CONFIG
-
-   local myeconfargs=(
-   --libexecdir="${EPREFIX}"/usr/$(get_libdir)/apache2/modules
-   --sbindir="${EPREFIX}"/usr/sbin
-   --with-perl="${EPREFIX}"/usr/bin/perl
-   --with-expat="${EPREFIX}"/usr
-   --with-z="${EPREFIX}"/usr
-   --with-apr="${SYSROOT}${EPREFIX}"/usr
-   --with-apr-util="${SYSROOT}${EPREFIX}"/usr
-   --with-pcre="${T}"/pcre-config
-   $(use_enable ssl)
-   $(usex ssl '--with-ssl="${EPREFIX}"/usr' '')
-   )
-   # econf overwrites the stuff from config.layout.
-   ac_cv_path_PKGCONFIG="${PKG_CONFIG}" \
-   econf "${myeconfargs[@]}"
-   sed -i \
-   -e '/^LTFLAGS/s:--silent::' \
-   build/rules.mk build/config_vars.mk || die
-}
-
-src_compile() {
-   emake -C support
-}
-
-src_install() {
-   emake -C support DESTDIR="${D}" install
-   dodoc CHANGES
-   doman docs/man/{dbmmanage,htdigest,htpasswd,htdbm,ab,logresolve}.1 \
-   docs/man/{htcacheclean,rotatelogs}.8
-
-   # Providing compatiblity symlinks for #177697 (which we'll stop to 
install
-   # at some point).
-   pushd "${ED}"/usr/sbin >/dev/null || die
-   local i
-   for i in *; do
-   dosym ${i} /usr/sbin/${i}2
-   done
-   popd >/dev/null || die
-
-   # Provide a symlink for ab-ssl
-   if use ssl ; then
-   dosym ab /usr/bin/ab-ssl
-   dosym ab /usr/bin/ab2-ssl
-   fi
-}

[gentoo-commits] repo/gentoo:master commit in: app-admin/apache-tools/

2021-10-07 Thread Sam James

commit: 5918340c83ed6fd8fe83973d298085f510ee1a98
Author: Sam James  gentoo  org>
AuthorDate: Thu Oct  7 20:11:13 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Thu Oct  7 20:11:13 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5918340c

app-admin/apache-tools: Stabilize 2.4.51 sparc, #816870

Signed-off-by: Sam James  gentoo.org>

 app-admin/apache-tools/apache-tools-2.4.51.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-admin/apache-tools/apache-tools-2.4.51.ebuild 
b/app-admin/apache-tools/apache-tools-2.4.51.ebuild
index 381504dc12b..db9838a6f20 100644
--- a/app-admin/apache-tools/apache-tools-2.4.51.ebuild
+++ b/app-admin/apache-tools/apache-tools-2.4.51.ebuild
@@ -10,7 +10,7 @@ SRC_URI="mirror://apache/httpd/httpd-${PV}.tar.bz2"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 
~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc64-solaris 
~x64-solaris"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 
sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc64-solaris 
~x64-solaris"
 IUSE="ssl"
 RESTRICT="test"

[gentoo-commits] repo/gentoo:master commit in: app-admin/apache-tools/

2021-10-07 Thread Sam James

commit: 51c9ab79945e0f6edc14a96ada09c81c7d2c4b1c
Author: Sam James  gentoo  org>
AuthorDate: Thu Oct  7 20:11:22 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Thu Oct  7 20:11:22 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=51c9ab79

app-admin/apache-tools: Stabilize 2.4.51 arm64, #816870

Signed-off-by: Sam James  gentoo.org>

 app-admin/apache-tools/apache-tools-2.4.51.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-admin/apache-tools/apache-tools-2.4.51.ebuild 
b/app-admin/apache-tools/apache-tools-2.4.51.ebuild
index 33f8087414c..2cb5bdfff76 100644
--- a/app-admin/apache-tools/apache-tools-2.4.51.ebuild
+++ b/app-admin/apache-tools/apache-tools-2.4.51.ebuild
@@ -10,7 +10,7 @@ SRC_URI="mirror://apache/httpd/httpd-${PV}.tar.bz2"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 
sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc64-solaris 
~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 
sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc64-solaris 
~x64-solaris"
 IUSE="ssl"
 RESTRICT="test"

[gentoo-commits] repo/gentoo:master commit in: app-admin/apache-tools/

2021-10-07 Thread Sam James

commit: e77b51fb7840719e3d7719ce7fa32a2e28c9b08c
Author: Sam James  gentoo  org>
AuthorDate: Thu Oct  7 20:11:08 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Thu Oct  7 20:11:08 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e77b51fb

app-admin/apache-tools: Stabilize 2.4.51 ppc64, #816870

Signed-off-by: Sam James  gentoo.org>

 app-admin/apache-tools/apache-tools-2.4.51.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-admin/apache-tools/apache-tools-2.4.51.ebuild 
b/app-admin/apache-tools/apache-tools-2.4.51.ebuild
index b00d4918027..381504dc12b 100644
--- a/app-admin/apache-tools/apache-tools-2.4.51.ebuild
+++ b/app-admin/apache-tools/apache-tools-2.4.51.ebuild
@@ -10,7 +10,7 @@ SRC_URI="mirror://apache/httpd/httpd-${PV}.tar.bz2"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ppc ~ppc64 ~riscv ~s390 
~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc64-solaris 
~x64-solaris"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 
~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc64-solaris 
~x64-solaris"
 IUSE="ssl"
 RESTRICT="test"

[gentoo-commits] repo/gentoo:master commit in: app-admin/apache-tools/

2021-10-07 Thread Sam James

commit: b0ae9419b4ae7bd8e0bf0d7eaa8f068c868abeb8
Author: Sam James  gentoo  org>
AuthorDate: Thu Oct  7 20:11:18 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Thu Oct  7 20:11:18 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b0ae9419

app-admin/apache-tools: Stabilize 2.4.51 arm, #816870

Signed-off-by: Sam James  gentoo.org>

 app-admin/apache-tools/apache-tools-2.4.51.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-admin/apache-tools/apache-tools-2.4.51.ebuild 
b/app-admin/apache-tools/apache-tools-2.4.51.ebuild
index db9838a6f20..33f8087414c 100644
--- a/app-admin/apache-tools/apache-tools-2.4.51.ebuild
+++ b/app-admin/apache-tools/apache-tools-2.4.51.ebuild
@@ -10,7 +10,7 @@ SRC_URI="mirror://apache/httpd/httpd-${PV}.tar.bz2"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 
sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc64-solaris 
~x64-solaris"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 
sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc64-solaris 
~x64-solaris"
 IUSE="ssl"
 RESTRICT="test"

[gentoo-commits] repo/gentoo:master commit in: app-admin/apache-tools/

2021-10-07 Thread Sam James

commit: 9be1e6cb4f1bcf16ff23a1b65b32043aa0725296
Author: Sam James  gentoo  org>
AuthorDate: Thu Oct  7 20:11:00 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Thu Oct  7 20:11:00 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9be1e6cb

app-admin/apache-tools: Stabilize 2.4.51 ppc, #816870

Signed-off-by: Sam James  gentoo.org>

 app-admin/apache-tools/apache-tools-2.4.51.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-admin/apache-tools/apache-tools-2.4.51.ebuild 
b/app-admin/apache-tools/apache-tools-2.4.51.ebuild
index bb1362e7001..b00d4918027 100644
--- a/app-admin/apache-tools/apache-tools-2.4.51.ebuild
+++ b/app-admin/apache-tools/apache-tools-2.4.51.ebuild
@@ -10,7 +10,7 @@ SRC_URI="mirror://apache/httpd/httpd-${PV}.tar.bz2"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 
~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc64-solaris 
~x64-solaris"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ppc ~ppc64 ~riscv ~s390 
~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc64-solaris 
~x64-solaris"
 IUSE="ssl"
 RESTRICT="test"

[gentoo-commits] repo/gentoo:master commit in: app-admin/apache-tools/

2021-10-07 Thread Sam James

commit: a250b7557b0a8db1895e4b6a07ddc3d9108a7ca4
Author: Sam James  gentoo  org>
AuthorDate: Thu Oct  7 19:28:23 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Thu Oct  7 19:28:23 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a250b755

app-admin/apache-tools: Stabilize 2.4.51 amd64, #816870

Signed-off-by: Sam James  gentoo.org>

 app-admin/apache-tools/apache-tools-2.4.51.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-admin/apache-tools/apache-tools-2.4.51.ebuild 
b/app-admin/apache-tools/apache-tools-2.4.51.ebuild
index cbda9d9f14f..9c80d5f08ad 100644
--- a/app-admin/apache-tools/apache-tools-2.4.51.ebuild
+++ b/app-admin/apache-tools/apache-tools-2.4.51.ebuild
@@ -10,7 +10,7 @@ SRC_URI="mirror://apache/httpd/httpd-${PV}.tar.bz2"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 
~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc64-solaris 
~x64-solaris"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 
~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc64-solaris 
~x64-solaris"
 IUSE="ssl"
 RESTRICT="test"

[gentoo-commits] repo/gentoo:master commit in: app-admin/apache-tools/

2021-10-07 Thread Sam James

commit: 4a50d1a9667e02e6b3cf5139df76d91c0c7ad274
Author: Sam James  gentoo  org>
AuthorDate: Thu Oct  7 19:28:30 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Thu Oct  7 19:28:30 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4a50d1a9

app-admin/apache-tools: Stabilize 2.4.51 x86, #816870

Signed-off-by: Sam James  gentoo.org>

 app-admin/apache-tools/apache-tools-2.4.51.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-admin/apache-tools/apache-tools-2.4.51.ebuild 
b/app-admin/apache-tools/apache-tools-2.4.51.ebuild
index 9c80d5f08ad..bb1362e7001 100644
--- a/app-admin/apache-tools/apache-tools-2.4.51.ebuild
+++ b/app-admin/apache-tools/apache-tools-2.4.51.ebuild
@@ -10,7 +10,7 @@ SRC_URI="mirror://apache/httpd/httpd-${PV}.tar.bz2"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 
~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc64-solaris 
~x64-solaris"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 
~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc64-solaris 
~x64-solaris"
 IUSE="ssl"
 RESTRICT="test"

[gentoo-commits] repo/gentoo:master commit in: app-admin/apache-tools/

2021-10-07 Thread Thomas Deutschmann

commit: dcd14f44af55042b4127cbfd344b7545e6151b95
Author: Thomas Deutschmann  gentoo  org>
AuthorDate: Thu Oct  7 16:05:41 2021 +
Commit: Thomas Deutschmann  gentoo  org>
CommitDate: Thu Oct  7 16:08:21 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=dcd14f44

app-admin/apache-tools: bump to v2.4.51

Package-Manager: Portage-3.0.28, Repoman-3.0.3
Signed-off-by: Thomas Deutschmann  gentoo.org>

 app-admin/apache-tools/Manifest   |   1 +
 app-admin/apache-tools/apache-tools-2.4.51.ebuild | 103 ++
 2 files changed, 104 insertions(+)

diff --git a/app-admin/apache-tools/Manifest b/app-admin/apache-tools/Manifest
index e3ec9929a06..de1f99d463a 100644
--- a/app-admin/apache-tools/Manifest
+++ b/app-admin/apache-tools/Manifest
@@ -1 +1,2 @@
 DIST httpd-2.4.50.tar.bz2 7653174 BLAKE2B 
6bdb26bc03347b9643e973d22726ef283b8d92b675f81e85f4e0470bedf8510bac60cd043fe966bc786d5ae47827ac1bb31da88a0e510f4bb6c665e2075c3beb
 SHA512 
b1afbaf44e503b822ff2b443881dcb44a93aa55d496f88ae399a2e7def05f78590f266a16da1f2c0aac88e463b76fba20843b1e20a102e76c8269de6fae3e158
+DIST httpd-2.4.51.tar.bz2 7653609 BLAKE2B 
a0743327f0411f5cb8b7d0426bf78db0f370e3d587f3a4c4bb7de0e4499effa3f44f5998e19e9ca3ed7b6fc9a8c0867cbe62134b5af7e6ed6c3bc29770b797df
 SHA512 
9fb07c4b176f5c0485a143e2b1bb1085345ca9120b959974f68c37a8911a57894d2cb488b1b42fdf3102860b99e890204f5e9fa7ae3828b481119c563812cc66

diff --git a/app-admin/apache-tools/apache-tools-2.4.51.ebuild 
b/app-admin/apache-tools/apache-tools-2.4.51.ebuild
new file mode 100644
index 000..cbda9d9f14f
--- /dev/null
+++ b/app-admin/apache-tools/apache-tools-2.4.51.ebuild
@@ -0,0 +1,103 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+inherit toolchain-funcs
+
+DESCRIPTION="Useful Apache tools - htdigest, htpasswd, ab, htdbm"
+HOMEPAGE="https://httpd.apache.org/;
+SRC_URI="mirror://apache/httpd/httpd-${PV}.tar.bz2"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 
~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc64-solaris 
~x64-solaris"
+IUSE="ssl"
+RESTRICT="test"
+
+RDEPEND=">=dev-libs/apr-1.5.0:1=
+   dev-libs/apr-util:1=
+   dev-libs/expat
+   dev-libs/libpcre
+   virtual/libcrypt:=
+   kernel_linux? ( sys-apps/util-linux )
+   ssl? ( dev-libs/openssl:0= )"
+DEPEND="${RDEPEND}
+   sys-devel/libtool"
+BDEPEND="virtual/pkgconfig"
+
+S="${WORKDIR}/httpd-${PV}"
+
+PATCHES=(
+   "${FILESDIR}/${PN}-2.4.7-Makefile.patch" #459446
+)
+
+src_prepare() {
+   default
+
+   # This package really should upgrade to using pcre's .pc file.
+   cat <<-\EOF >"${T}"/pcre-config
+   #!/bin/bash
+   flags=()
+   for flag; do
+   if [[ ${flag} == "--version" ]]; then
+   flags+=( --modversion )
+   else
+   flags+=( "${flag}" )
+   fi
+   done
+   exec ${PKG_CONFIG} libpcre "${flags[@]}"
+   EOF
+   chmod a+x "${T}"/pcre-config || die
+}
+
+src_configure() {
+   # Brain dead check.
+   tc-is-cross-compiler && export ap_cv_void_ptr_lt_long="no"
+
+   tc-export PKG_CONFIG
+
+   local myeconfargs=(
+   --libexecdir="${EPREFIX}"/usr/$(get_libdir)/apache2/modules
+   --sbindir="${EPREFIX}"/usr/sbin
+   --with-perl="${EPREFIX}"/usr/bin/perl
+   --with-expat="${EPREFIX}"/usr
+   --with-z="${EPREFIX}"/usr
+   --with-apr="${SYSROOT}${EPREFIX}"/usr
+   --with-apr-util="${SYSROOT}${EPREFIX}"/usr
+   --with-pcre="${T}"/pcre-config
+   $(use_enable ssl)
+   $(usex ssl '--with-ssl="${EPREFIX}"/usr' '')
+   )
+   # econf overwrites the stuff from config.layout.
+   ac_cv_path_PKGCONFIG="${PKG_CONFIG}" \
+   econf "${myeconfargs[@]}"
+   sed -i \
+   -e '/^LTFLAGS/s:--silent::' \
+   build/rules.mk build/config_vars.mk || die
+}
+
+src_compile() {
+   emake -C support
+}
+
+src_install() {
+   emake -C support DESTDIR="${D}" install
+   dodoc CHANGES
+   doman docs/man/{dbmmanage,htdigest,htpasswd,htdbm,ab,logresolve}.1 \
+   docs/man/{htcacheclean,rotatelogs}.8
+
+   # Providing compatiblity symlinks for #177697 (which we'll stop to 
install
+   # at some point).
+   pushd "${ED}"/usr/sbin >/dev/null || die
+   local i
+   for i in *; do
+   dosym ${i} /usr/sbin/${i}2
+   done
+   popd >/dev/null || die
+
+   # Provide a symlink for ab-ssl
+   if use ssl ; then
+   dosym ab /usr/bin/ab-ssl
+   dosym ab /usr/bin/ab2-ssl
+   fi
+}

[gentoo-commits] repo/gentoo:master commit in: app-admin/apache-tools/

2021-10-05 Thread Lars Wendler

commit: 633edec58613e0d0890ea9aeaf9438ffc2b948b0
Author: Lars Wendler  gentoo  org>
AuthorDate: Tue Oct  5 20:42:52 2021 +
Commit: Lars Wendler  gentoo  org>
CommitDate: Tue Oct  5 20:42:52 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=633edec5

app-admin/apache-tools: Security cleanup

Bug: https://bugs.gentoo.org/816399
Bug: https://bugs.gentoo.org/813429
Signed-off-by: Lars Wendler  gentoo.org>

 app-admin/apache-tools/Manifest|   2 -
 .../apache-tools/apache-tools-2.4.48-r1.ebuild | 103 -
 app-admin/apache-tools/apache-tools-2.4.49.ebuild  | 103 -
 3 files changed, 208 deletions(-)

diff --git a/app-admin/apache-tools/Manifest b/app-admin/apache-tools/Manifest
index 974327ca71e..e3ec9929a06 100644
--- a/app-admin/apache-tools/Manifest
+++ b/app-admin/apache-tools/Manifest
@@ -1,3 +1 @@
-DIST httpd-2.4.48.tar.bz2 7194385 BLAKE2B 
5006535dc15b703b4388d90d57559bd882f16210c2f38f4d773312ed8322803629deee18709ca4446000c20c94ff8b0037acbe4dddab9cdbe45417079f708039
 SHA512 
6c250626f1e7d10428a92d984fd48ff841effcc8705f7816ab71b681bbd51d0012ad158dcd13763fe7d630311f2de258b27574603140d648be42796ab8326724
-DIST httpd-2.4.49.tar.bz2 7199599 BLAKE2B 
78614647335a2351ce3ffb67f79bffd4aa0f42080a46de1f8d8a75c2ccae24998f5d505e60e9d4a710ff763e6a8cb3abee3da34ff6a7f2e18b68029a8abe80b7
 SHA512 
418e277232cf30a81d02b8554e31aaae6433bbea842bdb81e47a609469395cc4891183fb6ee02bd669edb2392c2007869b19da29f5998b8fd5c7d3142db310dd
 DIST httpd-2.4.50.tar.bz2 7653174 BLAKE2B 
6bdb26bc03347b9643e973d22726ef283b8d92b675f81e85f4e0470bedf8510bac60cd043fe966bc786d5ae47827ac1bb31da88a0e510f4bb6c665e2075c3beb
 SHA512 
b1afbaf44e503b822ff2b443881dcb44a93aa55d496f88ae399a2e7def05f78590f266a16da1f2c0aac88e463b76fba20843b1e20a102e76c8269de6fae3e158

diff --git a/app-admin/apache-tools/apache-tools-2.4.48-r1.ebuild 
b/app-admin/apache-tools/apache-tools-2.4.48-r1.ebuild
deleted file mode 100644
index 4a1b3fe09d0..000
--- a/app-admin/apache-tools/apache-tools-2.4.48-r1.ebuild
+++ /dev/null
@@ -1,103 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit toolchain-funcs
-
-DESCRIPTION="Useful Apache tools - htdigest, htpasswd, ab, htdbm"
-HOMEPAGE="https://httpd.apache.org/;
-SRC_URI="mirror://apache/httpd/httpd-${PV}.tar.bz2"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 
sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc64-solaris 
~x64-solaris"
-IUSE="ssl"
-RESTRICT="test"
-
-RDEPEND=">=dev-libs/apr-1.5.0:1=
-   dev-libs/apr-util:1=
-   dev-libs/expat
-   dev-libs/libpcre
-   virtual/libcrypt:=
-   kernel_linux? ( sys-apps/util-linux )
-   ssl? ( dev-libs/openssl:0= )"
-DEPEND="${RDEPEND}
-   sys-devel/libtool"
-BDEPEND="virtual/pkgconfig"
-
-S="${WORKDIR}/httpd-${PV}"
-
-PATCHES=(
-   "${FILESDIR}/${PN}-2.4.7-Makefile.patch" #459446
-)
-
-src_prepare() {
-   default
-
-   # This package really should upgrade to using pcre's .pc file.
-   cat <<-\EOF >"${T}"/pcre-config
-   #!/bin/bash
-   flags=()
-   for flag; do
-   if [[ ${flag} == "--version" ]]; then
-   flags+=( --modversion )
-   else
-   flags+=( "${flag}" )
-   fi
-   done
-   exec ${PKG_CONFIG} libpcre "${flags[@]}"
-   EOF
-   chmod a+x "${T}"/pcre-config || die
-}
-
-src_configure() {
-   # Brain dead check.
-   tc-is-cross-compiler && export ap_cv_void_ptr_lt_long="no"
-
-   tc-export PKG_CONFIG
-
-   local myeconfargs=(
-   --libexecdir="${EPREFIX}"/usr/$(get_libdir)/apache2/modules
-   --sbindir="${EPREFIX}"/usr/sbin
-   --with-perl="${EPREFIX}"/usr/bin/perl
-   --with-expat="${EPREFIX}"/usr
-   --with-z="${EPREFIX}"/usr
-   --with-apr="${SYSROOT}${EPREFIX}"/usr
-   --with-apr-util="${SYSROOT}${EPREFIX}"/usr
-   --with-pcre="${T}"/pcre-config
-   $(use_enable ssl)
-   $(usex ssl '--with-ssl="${EPREFIX}"/usr' '')
-   )
-   # econf overwrites the stuff from config.layout.
-   ac_cv_path_PKGCONFIG="${PKG_CONFIG}" \
-   econf "${myeconfargs[@]}"
-   sed -i \
-   -e '/^LTFLAGS/s:--silent::' \
-   build/rules.mk build/config_vars.mk || die
-}
-
-src_compile() {
-   emake -C support
-}
-
-src_install() {
-   emake -C support DESTDIR="${D}" install
-   dodoc CHANGES
-   doman docs/man/{dbmmanage,htdigest,htpasswd,htdbm,ab,logresolve}.1 \
-   docs/man/{htcacheclean,rotatelogs}.8
-
-   # Providing compatiblity symlinks for #177697 (which we'll stop to 
install
-   # at some point).
-   pushd "${ED}"/usr/sbin >/dev/null || die
-   local i
-   for i in *; do
-

1 2 3 >

1 - 100 of 292 matches

Mail list logo