diff options
Diffstat (limited to 'app-admin/apache-tools')
| -rw-r--r-- | app-admin/apache-tools/Manifest | 5 | ||||
| -rw-r--r-- | app-admin/apache-tools/apache-tools-2.4.57.ebuild (renamed from app-admin/apache-tools/apache-tools-2.4.54-r1.ebuild) | 31 | ||||
| -rw-r--r-- | app-admin/apache-tools/apache-tools-2.4.58.ebuild (renamed from app-admin/apache-tools/apache-tools-2.4.53-r1.ebuild) | 37 | ||||
| -rw-r--r-- | app-admin/apache-tools/apache-tools-2.4.59.ebuild (renamed from app-admin/apache-tools/apache-tools-2.4.54.ebuild) | 37 | ||||
| -rw-r--r-- | app-admin/apache-tools/files/apache-tools-2.4.54-Makefile.patch | 37 | ||||
| -rw-r--r-- | app-admin/apache-tools/files/apache-tools-2.4.54-libtool.patch | 21 | ||||
| -rw-r--r-- | app-admin/apache-tools/files/apache-tools-2.4.7-Makefile.patch | 47 | ||||
| -rw-r--r-- | app-admin/apache-tools/metadata.xml | 5 |
8 files changed, 129 insertions, 91 deletions
diff --git a/app-admin/apache-tools/Manifest b/app-admin/apache-tools/Manifest index d2e907722b28..3c228281999e 100644 --- a/app-admin/apache-tools/Manifest +++ b/app-admin/apache-tools/Manifest @@ -1,2 +1,3 @@ -DIST httpd-2.4.53.tar.bz2 7431942 BLAKE2B 44acd51a2c18ae66878d64922947f2f24f0ddf8a5fa70718f788572032e18dafd06888fed3cf559e63e2a9e69d9b0a8dcc79e11fc9d8f216b5b073f769494727 SHA512 07ef59594251a30a864cc9cc9a58ab788c2d006cef85b728f29533243927c63cb063e0867f2a306f37324c3adb9cf7dcb2402f3516b05c2c6f32469d475dd756 -DIST httpd-2.4.54.tar.bz2 7434530 BLAKE2B be2ba2d33368f9dd619e36e63dd3635fbcf55773a539ac2840251bda04311f3eb535c08a37ab58d8b184c71e75b90b92e2bdc4e59c722cfb146de516f6e1ed04 SHA512 228493b2ff32c4142c6e484d304f2ea12e467498605fe12adce2b61388d8efe7b2e96ae2fd0abd1dc88a5f12d625e007d8da0ae5628cff2a5272806754f41e18 +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.54-r1.ebuild b/app-admin/apache-tools/apache-tools-2.4.57.ebuild index 8b3560d27cf2..f3af585656d2 100644 --- a/app-admin/apache-tools/apache-tools-2.4.54-r1.ebuild +++ b/app-admin/apache-tools/apache-tools-2.4.57.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -11,19 +11,19 @@ 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 ~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 + dev-libs/libpcre2 virtual/libcrypt:= kernel_linux? ( sys-apps/util-linux ) ssl? ( dev-libs/openssl:0= )" DEPEND="${RDEPEND} - sys-devel/libtool" + dev-build/libtool" BDEPEND=" virtual/pkgconfig " @@ -31,16 +31,17 @@ BDEPEND=" S="${WORKDIR}/httpd-${PV}" PATCHES=( - "${FILESDIR}/${PN}-2.4.7-Makefile.patch" #459446 + "${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 + cat <<-\EOF > "${T}"/pcre2-config + #!/usr/bin/env bash flags=() for flag; do if [[ ${flag} == "--version" ]]; then @@ -49,19 +50,21 @@ src_prepare() { flags+=( "${flag}" ) fi done - exec ${PKG_CONFIG} libpcre "${flags[@]}" + exec ${PKG_CONFIG} libpcre2-8 "${flags[@]}" EOF - chmod a+x "${T}"/pcre-config || die + chmod a+x "${T}"/pcre2-config || die - # Only here for which patch + # Only here for libtool and which patches eautoreconf } src_configure() { - # Brain dead check. + # 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 @@ -69,13 +72,15 @@ src_configure() { --with-z="${EPREFIX}"/usr --with-apr="${ESYSROOT}"/usr --with-apr-util="${ESYSROOT}"/usr - --with-pcre="${T}"/pcre-config + --without-pcre + --with-pcre2="${T}"/pcre2-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 diff --git a/app-admin/apache-tools/apache-tools-2.4.53-r1.ebuild b/app-admin/apache-tools/apache-tools-2.4.58.ebuild index bf1562cee74c..f3af585656d2 100644 --- a/app-admin/apache-tools/apache-tools-2.4.53-r1.ebuild +++ b/app-admin/apache-tools/apache-tools-2.4.58.ebuild @@ -1,8 +1,9 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 -inherit toolchain-funcs + +inherit autotools toolchain-funcs DESCRIPTION="Useful Apache tools - htdigest, htpasswd, ab, htdbm" HOMEPAGE="https://httpd.apache.org/" @@ -10,36 +11,37 @@ 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 ~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 + dev-libs/libpcre2 virtual/libcrypt:= kernel_linux? ( sys-apps/util-linux ) ssl? ( dev-libs/openssl:0= )" DEPEND="${RDEPEND} - sys-devel/libtool" + dev-build/libtool" BDEPEND=" - sys-apps/which virtual/pkgconfig " S="${WORKDIR}/httpd-${PV}" PATCHES=( - "${FILESDIR}/${PN}-2.4.7-Makefile.patch" #459446 + "${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 + cat <<-\EOF > "${T}"/pcre2-config + #!/usr/bin/env bash flags=() for flag; do if [[ ${flag} == "--version" ]]; then @@ -48,16 +50,21 @@ src_prepare() { flags+=( "${flag}" ) fi done - exec ${PKG_CONFIG} libpcre "${flags[@]}" + exec ${PKG_CONFIG} libpcre2-8 "${flags[@]}" EOF - chmod a+x "${T}"/pcre-config || die + chmod a+x "${T}"/pcre2-config || die + + # Only here for libtool and which patches + eautoreconf } src_configure() { - # Brain dead check. + # 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 @@ -65,13 +72,15 @@ src_configure() { --with-z="${EPREFIX}"/usr --with-apr="${ESYSROOT}"/usr --with-apr-util="${ESYSROOT}"/usr - --with-pcre="${T}"/pcre-config + --without-pcre + --with-pcre2="${T}"/pcre2-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 diff --git a/app-admin/apache-tools/apache-tools-2.4.54.ebuild b/app-admin/apache-tools/apache-tools-2.4.59.ebuild index bf1562cee74c..f3af585656d2 100644 --- a/app-admin/apache-tools/apache-tools-2.4.54.ebuild +++ b/app-admin/apache-tools/apache-tools-2.4.59.ebuild @@ -1,8 +1,9 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 -inherit toolchain-funcs + +inherit autotools toolchain-funcs DESCRIPTION="Useful Apache tools - htdigest, htpasswd, ab, htdbm" HOMEPAGE="https://httpd.apache.org/" @@ -10,36 +11,37 @@ 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 ~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 + dev-libs/libpcre2 virtual/libcrypt:= kernel_linux? ( sys-apps/util-linux ) ssl? ( dev-libs/openssl:0= )" DEPEND="${RDEPEND} - sys-devel/libtool" + dev-build/libtool" BDEPEND=" - sys-apps/which virtual/pkgconfig " S="${WORKDIR}/httpd-${PV}" PATCHES=( - "${FILESDIR}/${PN}-2.4.7-Makefile.patch" #459446 + "${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 + cat <<-\EOF > "${T}"/pcre2-config + #!/usr/bin/env bash flags=() for flag; do if [[ ${flag} == "--version" ]]; then @@ -48,16 +50,21 @@ src_prepare() { flags+=( "${flag}" ) fi done - exec ${PKG_CONFIG} libpcre "${flags[@]}" + exec ${PKG_CONFIG} libpcre2-8 "${flags[@]}" EOF - chmod a+x "${T}"/pcre-config || die + chmod a+x "${T}"/pcre2-config || die + + # Only here for libtool and which patches + eautoreconf } src_configure() { - # Brain dead check. + # 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 @@ -65,13 +72,15 @@ src_configure() { --with-z="${EPREFIX}"/usr --with-apr="${ESYSROOT}"/usr --with-apr-util="${ESYSROOT}"/usr - --with-pcre="${T}"/pcre-config + --without-pcre + --with-pcre2="${T}"/pcre2-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 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 000000000000..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 <orbea@riseup.net> +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 @@ include $(top_builddir)/build/rules.mk + + 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 dbmmanage; do \ + if test -f "$(builddir)/$$i"; then \ + cp -p $$i $(DESTDIR)$(bindir); \ + chmod 755 $(DESTDIR)$(bindir)/$$i; \ + fi ; \ + done +- @for i in apachectl; 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 diff --git a/app-admin/apache-tools/files/apache-tools-2.4.54-libtool.patch b/app-admin/apache-tools/files/apache-tools-2.4.54-libtool.patch new file mode 100644 index 000000000000..9cd957c21499 --- /dev/null +++ b/app-admin/apache-tools/files/apache-tools-2.4.54-libtool.patch @@ -0,0 +1,21 @@ +Bug: https://bugs.gentoo.org/858833 + +From: orbea <orbea@riseup.net> +Date: Tue, 19 Jul 2022 07:46:36 -0700 +Subject: [PATCH] build: Fix the build with slibtool + +Adding LT_INIT to configure.in generates the libtool script in the build +directory which is required by rlibtool to determine if the build is +shared or static. + +--- a/configure.in ++++ b/configure.in +@@ -398,7 +398,7 @@ AC_PATH_PROG(RSYNC, rsync) + AC_PATH_PROG(SVN, svn) + AC_PROG_AWK + AC_PROG_LN_S +-AC_CHECK_TOOL(RANLIB, ranlib, true) ++LT_INIT + dnl AC_PATH_PROG(PERL_PATH, perl) + AC_CHECK_PROGS(LYNX_PATH,[lynx links elinks], [lynx]) + 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..000000000000 --- 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 diff --git a/app-admin/apache-tools/metadata.xml b/app-admin/apache-tools/metadata.xml index 3c641b5088d1..bf598110dda4 100644 --- a/app-admin/apache-tools/metadata.xml +++ b/app-admin/apache-tools/metadata.xml @@ -6,8 +6,11 @@ <name>Apache project</name> </maintainer> <longdescription lang="en"> - app-admin/apache-tools contains tools that might be useful without + <pkg>app-admin/apache-tools</pkg> contains tools that might be useful without having apache itself installed (like htdigest/htpasswd, but also ab - the apache benchmark). </longdescription> + <upstream> + <remote-id type="github">apache/httpd</remote-id> + </upstream> </pkgmetadata> |