From 220317eb99d11e6c68af921f2855409bc506461a Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Thu, 26 Jan 2023 07:55:33 +0000 Subject: gentoo auto-resync : 26:01:2023 - 07:55:33 --- app-admin/Manifest.gz | Bin 32360 -> 32362 bytes app-admin/apache-tools/Manifest | 6 +- .../apache-tools/apache-tools-2.4.54-r2.ebuild | 109 -------------------- .../apache-tools/apache-tools-2.4.54-r3.ebuild | 2 +- app-admin/apache-tools/apache-tools-2.4.54.ebuild | 104 ------------------- app-admin/apache-tools/apache-tools-2.4.55.ebuild | 113 +++++++++++++++++++++ 6 files changed, 117 insertions(+), 217 deletions(-) delete mode 100644 app-admin/apache-tools/apache-tools-2.4.54-r2.ebuild delete mode 100644 app-admin/apache-tools/apache-tools-2.4.54.ebuild create mode 100644 app-admin/apache-tools/apache-tools-2.4.55.ebuild (limited to 'app-admin') diff --git a/app-admin/Manifest.gz b/app-admin/Manifest.gz index 8ce2fc4fdc36..7a87e49d30b4 100644 Binary files a/app-admin/Manifest.gz and b/app-admin/Manifest.gz differ diff --git a/app-admin/apache-tools/Manifest b/app-admin/apache-tools/Manifest index 14ccc483b1d3..f12b6c57b4e5 100644 --- a/app-admin/apache-tools/Manifest +++ b/app-admin/apache-tools/Manifest @@ -3,7 +3,7 @@ AUX apache-tools-2.4.54-libtool.patch 594 BLAKE2B c1b11ad580369a42fde6cbaec8d419 AUX apache-tools-2.4.54-no-which.patch 1807 BLAKE2B 27fbe5079f3844645c1e3fe237f47f5524ccb1c9a5532b8529091176ea0fc561c0888b74997acb98f4c86cacf8f138f065f248295c2a79779eb84f706173849a SHA512 830125dd90479972715a6b09bc0cef7bfe2c8ce7d198e52765e4284555cd60e400820a622530eb2bffa9b7aec9fd6bdb3f633b948075c68e9fd96a49a7eb41fd AUX apache-tools-2.4.7-Makefile.patch 1695 BLAKE2B 8fac145613ac9f587e49bc6932c5712b7d7cad0d91422e11701edd24152e1d33907cbf31e3bef709555253759cea72199d4537df5d20d3ce9ca5dc898ba26779 SHA512 f597ce5503e590ed5b2621c04dcf0a571a73b70f144df7fe4e5fb7329a4f1558a5eb16913fe3d7c58ac1030f46cd2b1882e08d0f62106fbf8d40a8677c6b9448 DIST httpd-2.4.54.tar.bz2 7434530 BLAKE2B be2ba2d33368f9dd619e36e63dd3635fbcf55773a539ac2840251bda04311f3eb535c08a37ab58d8b184c71e75b90b92e2bdc4e59c722cfb146de516f6e1ed04 SHA512 228493b2ff32c4142c6e484d304f2ea12e467498605fe12adce2b61388d8efe7b2e96ae2fd0abd1dc88a5f12d625e007d8da0ae5628cff2a5272806754f41e18 -EBUILD apache-tools-2.4.54-r2.ebuild 2584 BLAKE2B 806ba26d6e454af5832192ff08c1d26ce119fca55f82f8bd9b4375fa07932c3abbd1b33637cb0c598f6f9959c699099be86b73a164eef6bd061fe3dcf6090764 SHA512 66abde43de1807b264eb412048ad2f613e8454f2bb6dcc4853dc2d14cdd8e81770d3bc3e1e7786b1b4a553883dbe36720739824cd3fc5859d5e27953f82a4697 -EBUILD apache-tools-2.4.54-r3.ebuild 2683 BLAKE2B bcbed908720c3edac3d4ac4d546837d88e367afb803f3f4e02d7fefac24ee296abc738df3f9567084fb087669296d0fa3b3b3629708210c1c04385e62712e988 SHA512 b5472a44904dcb91bab17b6f9d5f1c05207c71cb509c7df430f124315c001fd28a49d520f08b6859f364cd67c702baf1a50ac6eb43f4e3088a75892cf952c957 -EBUILD apache-tools-2.4.54.ebuild 2423 BLAKE2B 5d4e00341e2809571e9ee0e76f09641487a68a82b93cf7b8dc23af359f62068207d7dbaf0748245c03869d989b0f9782e6a56c0c23a6b7e564f6785c365af6d1 SHA512 6d9787f2df850f1264c64fd8f4df19f8b85b83f9282e80d472296d9354b281bf5ab13e0449a0b562c0c333074a2e1714a8f53e8e47f30b5d0b6ce831bad6b41e +DIST httpd-2.4.55.tar.bz2 7456187 BLAKE2B 98e9ec41aa3ccbbe533672ba6de8421e1f0cb5a4b4a06d0cf26c676945bcd5ebe66a1fd21d941ad8ff2c9183565ce542a5643730bbee5972934008652924945b SHA512 94982f7a1fedac8961fc17b5a22cf763ac28cb27ee6facab2e6a15b249b927773667493fd3f7354fb13fcb34a6f1afc1bdd5cf4b7be030cba1dfb523e40d43fb +EBUILD apache-tools-2.4.54-r3.ebuild 2677 BLAKE2B af27235ab1c8ae302c0684136208c3b598434f2fb27fe0bf908e04078052b61bbee6e1742f079ec4c226f2c66cf181a9c50f53db197f356204d8ceb8db44438c SHA512 bfd73d3bcaa27450b84bb950958c944bbaafde7e2b492147d41d5bfbd21560bef47183353a62c933012e7724afb687093e5b53e718352a6fbcc6b9b4482458a4 +EBUILD apache-tools-2.4.55.ebuild 2684 BLAKE2B fd57a865b90bf6d88526e9e15e50e06c4500ac704b2c4b55232776c458cc10caa925f9c4204b4d89983617049619c9f9052d64a46ad2baa59c7290c6ddad6f88 SHA512 d14a40b38e10270c20571cf05a47f463ac8f11d4d12e34bbed477403480fa2cd0c88b101a162e7baa1b04135e23dd71d79eb93d369548f3bbd30f213f0b7808b MISC metadata.xml 557 BLAKE2B 2453755857cf2e46c2df17a307b095ad2b7edaa4e87363964a0bb5e3dedc9284e09c41256f24037f8d680fd3b87e906f18ffd0f8358025fb0828ea0871229731 SHA512 d7f046261c3bb8529bbfaa7e8e47a304341c397dea4d0c276696a5c32b2fa12f0af0f73ed7ad435c3548a2a167230f3abece216e3cff7440fe0cf1498b7c8819 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..000000000000 --- 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-r3.ebuild b/app-admin/apache-tools/apache-tools-2.4.54-r3.ebuild index 4a6e2b8a9adc..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" 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..000000000000 --- 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 - 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.55.ebuild b/app-admin/apache-tools/apache-tools-2.4.55.ebuild new file mode 100644 index 000000000000..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 /usr/bin/ab2-ssl + fi +} -- cgit v1.2.3