From 2a8d2f71d1d9963368e0ef3d641d75979a689d12 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Thu, 4 Jul 2024 08:06:08 +0100 Subject: gentoo auto-resync : 04:07:2024 - 08:06:07 --- app-admin/apache-tools/Manifest | 4 +- app-admin/apache-tools/apache-tools-2.4.60.ebuild | 113 ---------------------- app-admin/apache-tools/apache-tools-2.4.61.ebuild | 113 ++++++++++++++++++++++ 3 files changed, 115 insertions(+), 115 deletions(-) delete mode 100644 app-admin/apache-tools/apache-tools-2.4.60.ebuild create mode 100644 app-admin/apache-tools/apache-tools-2.4.61.ebuild (limited to 'app-admin/apache-tools') diff --git a/app-admin/apache-tools/Manifest b/app-admin/apache-tools/Manifest index eda4f905660d..4eabc9173b6c 100644 --- a/app-admin/apache-tools/Manifest +++ b/app-admin/apache-tools/Manifest @@ -4,9 +4,9 @@ AUX apache-tools-2.4.54-no-which.patch 1807 BLAKE2B 27fbe5079f3844645c1e3fe237f4 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 -DIST httpd-2.4.60.tar.bz2 7508704 BLAKE2B d1b4d2e05edfe8b88f541e6fa8b5db73f37cc349a4037b493e57ae2f2e0bb84f92aad3ad3bc0bdbc454d2677091bbca283ebe752a9335fae6931ec65cc687326 SHA512 c1591389f76699beaa5d32b019729e25f1ed5b828311c82b52f1a4edd5d28b73e697958df384d7628b314521a831dbb0af418bc37cdf031cfe133e53c195d8ad +DIST httpd-2.4.61.tar.bz2 7512908 BLAKE2B 9299ef5843888829143732b3a60d1713aff688ed2f6c2b7f154be16bc075ec747a5b116716f188491ebc9947ff2dfe09dfc71f5245d98a4be3ba27ada28ec8a5 SHA512 00656220ecc2b80788f539536553f0a3a57602fb981be22e63af87d0f98ffe5da3056e722ce52ae8cf9c2111ad1922b3aaea1fd7d69d0ed76795199203d593ff EBUILD apache-tools-2.4.57.ebuild 2660 BLAKE2B e610383768eb40949e65f762eb68ce449aa777aa3fdd39d9c58cee42525422baa74d57b6200d194c4371123a22d9f7469b6340cf28c2ac73acd19b342409f3f9 SHA512 3a234b734543c19ebbf6f6f0616e01ce9dee328493d95a8be7cda9ccc43da4205de6b7979e3c5eddc904717a2309cafef77f50b8ee08803d23d42dc394fccc5b EBUILD apache-tools-2.4.58.ebuild 2660 BLAKE2B e610383768eb40949e65f762eb68ce449aa777aa3fdd39d9c58cee42525422baa74d57b6200d194c4371123a22d9f7469b6340cf28c2ac73acd19b342409f3f9 SHA512 3a234b734543c19ebbf6f6f0616e01ce9dee328493d95a8be7cda9ccc43da4205de6b7979e3c5eddc904717a2309cafef77f50b8ee08803d23d42dc394fccc5b EBUILD apache-tools-2.4.59.ebuild 2660 BLAKE2B e610383768eb40949e65f762eb68ce449aa777aa3fdd39d9c58cee42525422baa74d57b6200d194c4371123a22d9f7469b6340cf28c2ac73acd19b342409f3f9 SHA512 3a234b734543c19ebbf6f6f0616e01ce9dee328493d95a8be7cda9ccc43da4205de6b7979e3c5eddc904717a2309cafef77f50b8ee08803d23d42dc394fccc5b -EBUILD apache-tools-2.4.60.ebuild 2667 BLAKE2B 787d5cdfd21d93569358a3ff1c83df593f295946699a859d792b0c4eba384ccacda91f53ded8f8b4bf2fa88d02a245a93bc56e5e3f4f8aebb2405ff686df4d72 SHA512 26c44c4fdf9590fbb5a2672d8634674e91b1e7b2869c626351411112d067990e5d1bed06ae68d9c91331dc40c40f6b3a91afb2eba4b54c4e6306bbe824cefeb1 +EBUILD apache-tools-2.4.61.ebuild 2667 BLAKE2B 8becbcf721c217ebbed456d632443d7801d9def997a5495ab5d112a0549296b8bfef7471880a31b52c8f2760bce05e520359b9d47a3188564170499153d03ba8 SHA512 85fcdc522a88628bb8c6f82dc0d8350e98016c755a8d227f71fac4a9ce72140c1db59f9af4922d46481af04a1cddb21fd8d22df0c79eddf04d29ff3ebdb561f6 MISC metadata.xml 557 BLAKE2B 2453755857cf2e46c2df17a307b095ad2b7edaa4e87363964a0bb5e3dedc9284e09c41256f24037f8d680fd3b87e906f18ffd0f8358025fb0828ea0871229731 SHA512 d7f046261c3bb8529bbfaa7e8e47a304341c397dea4d0c276696a5c32b2fa12f0af0f73ed7ad435c3548a2a167230f3abece216e3cff7440fe0cf1498b7c8819 diff --git a/app-admin/apache-tools/apache-tools-2.4.60.ebuild b/app-admin/apache-tools/apache-tools-2.4.60.ebuild deleted file mode 100644 index ff67bbf7dac4..000000000000 --- a/app-admin/apache-tools/apache-tools-2.4.60.ebuild +++ /dev/null @@ -1,113 +0,0 @@ -# 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 || 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.61.ebuild b/app-admin/apache-tools/apache-tools-2.4.61.ebuild new file mode 100644 index 000000000000..f25e9b88cde5 --- /dev/null +++ b/app-admin/apache-tools/apache-tools-2.4.61.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" +S="${WORKDIR}/httpd-${PV}" + +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" + +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 +" + +RESTRICT="test" + +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 +} -- cgit v1.2.3