commit: 2005eb90003eb96281cbbec121fb6cf6ff0955cf Author: Jakov Smolic <jakov.smolic <AT> sartura <DOT> hr> AuthorDate: Sat Feb 13 10:27:16 2021 +0000 Commit: David Seifert <soap <AT> gentoo <DOT> org> CommitDate: Sat Feb 13 10:27:16 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2005eb90
www-apache/mod_auth_xradius: Port to EAPI 7 * Fix build with gcc-10 Closes: https://bugs.gentoo.org/707610 Signed-off-by: Jakov Smolic <jakov.smolic <AT> sartura.hr> Signed-off-by: David Seifert <soap <AT> gentoo.org> ..._auth_xradius-0.4.6-apache24-api-changes.patch} | 4 ++-- ... mod_auth_xradius-0.4.6-fallback-support.patch} | 5 ++--- .../files/mod_auth_xradius-0.4.6-fno-common.patch | 22 +++++++++++++++++++++ ..._xradius-0.4.6-obsolete-autotools-syntax.patch} | 4 ++-- www-apache/mod_auth_xradius/metadata.xml | 8 ++++---- .../mod_auth_xradius-0.4.6-r1.ebuild | 23 +++++++++++----------- 6 files changed, 44 insertions(+), 22 deletions(-) diff --git a/www-apache/mod_auth_xradius/files/0.4.6-apache24-api-changes.diff b/www-apache/mod_auth_xradius/files/mod_auth_xradius-0.4.6-apache24-api-changes.patch similarity index 76% rename from www-apache/mod_auth_xradius/files/0.4.6-apache24-api-changes.diff rename to www-apache/mod_auth_xradius/files/mod_auth_xradius-0.4.6-apache24-api-changes.patch index a760bd6ce79..349822a5733 100644 --- a/www-apache/mod_auth_xradius/files/0.4.6-apache24-api-changes.diff +++ b/www-apache/mod_auth_xradius/files/mod_auth_xradius-0.4.6-apache24-api-changes.patch @@ -1,5 +1,5 @@ ---- src/xradius_cache.c.orig 2013-06-10 10:02:53.263071428 +0100 -+++ src/xradius_cache.c 2013-06-10 10:03:45.789072216 +0100 +--- a/src/xradius_cache.c ++++ b/src/xradius_cache.c @@ -143,9 +143,9 @@ /* Running as Root */ if (geteuid() == 0) { diff --git a/www-apache/mod_auth_xradius/files/0.4.6-fallback-support.diff b/www-apache/mod_auth_xradius/files/mod_auth_xradius-0.4.6-fallback-support.patch similarity index 82% rename from www-apache/mod_auth_xradius/files/0.4.6-fallback-support.diff rename to www-apache/mod_auth_xradius/files/mod_auth_xradius-0.4.6-fallback-support.patch index da43dc4b277..f1beffe35d9 100644 --- a/www-apache/mod_auth_xradius/files/0.4.6-fallback-support.diff +++ b/www-apache/mod_auth_xradius/files/mod_auth_xradius-0.4.6-fallback-support.patch @@ -1,6 +1,5 @@ -diff -uNr mod_auth_xradius-0.4.6.ORIG/src/mod_auth_xradius.c mod_auth_xradius-0.4.6/src/mod_auth_xradius.c ---- mod_auth_xradius-0.4.6.ORIG/src/mod_auth_xradius.c 2014-09-24 13:41:22.990073508 +0100 -+++ mod_auth_xradius-0.4.6/src/mod_auth_xradius.c 2014-09-24 13:50:17.204100114 +0100 +--- a/src/mod_auth_xradius.c ++++ b/src/mod_auth_xradius.c @@ -125,15 +125,15 @@ rctx = xrad_auth_open(); diff --git a/www-apache/mod_auth_xradius/files/mod_auth_xradius-0.4.6-fno-common.patch b/www-apache/mod_auth_xradius/files/mod_auth_xradius-0.4.6-fno-common.patch new file mode 100644 index 00000000000..d4c25fad093 --- /dev/null +++ b/www-apache/mod_auth_xradius/files/mod_auth_xradius-0.4.6-fno-common.patch @@ -0,0 +1,22 @@ +https://bugs.gentoo.org/707610 +--- a/include/mod_auth_xradius.h.in ++++ b/include/mod_auth_xradius.h.in +@@ -41,7 +41,7 @@ + */ + #define HAVE_APR_MEMCACHE @have_apr_memcache@ + +-module AP_MODULE_DECLARE_DATA auth_xradius_module; ++extern module AP_MODULE_DECLARE_DATA auth_xradius_module; + + #define MOD_AUTH_XRADIUS_VERSION "@MOD_AUTH_XRADIUS_VERSION@" + +--- a/src/mod_auth_xradius.c ++++ b/src/mod_auth_xradius.c +@@ -47,6 +47,7 @@ if (rvx != 0) { \ + goto run_cleanup; \ + } + ++module AP_MODULE_DECLARE_DATA auth_xradius_module; + apr_proc_mutex_t *gmutex; + static int use_mutex; + diff --git a/www-apache/mod_auth_xradius/files/0.4.6-obsolete-autotools-syntax.diff b/www-apache/mod_auth_xradius/files/mod_auth_xradius-0.4.6-obsolete-autotools-syntax.patch similarity index 74% rename from www-apache/mod_auth_xradius/files/0.4.6-obsolete-autotools-syntax.diff rename to www-apache/mod_auth_xradius/files/mod_auth_xradius-0.4.6-obsolete-autotools-syntax.patch index affb3181485..97f3023b97c 100644 --- a/www-apache/mod_auth_xradius/files/0.4.6-obsolete-autotools-syntax.diff +++ b/www-apache/mod_auth_xradius/files/mod_auth_xradius-0.4.6-obsolete-autotools-syntax.patch @@ -1,5 +1,5 @@ ---- configure.ac.orig 2013-06-10 09:56:06.905065330 +0100 -+++ configure.ac 2013-06-10 09:56:45.968065916 +0100 +--- a/configure.ac ++++ b/configure.ac @@ -4,6 +4,7 @@ AC_PREREQ(2.53) AC_CONFIG_SRCDIR([src/mod_auth_xradius.c]) diff --git a/www-apache/mod_auth_xradius/metadata.xml b/www-apache/mod_auth_xradius/metadata.xml index 5087760546f..1a06e96ebdc 100644 --- a/www-apache/mod_auth_xradius/metadata.xml +++ b/www-apache/mod_auth_xradius/metadata.xml @@ -1,8 +1,8 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd";> <pkgmetadata> - <maintainer type="person"> - <email>[email protected]</email> - <name>Tony Vroon</name> - </maintainer> + <maintainer type="person"> + <email>[email protected]</email> + <name>Tony Vroon</name> + </maintainer> </pkgmetadata> diff --git a/www-apache/mod_auth_xradius/mod_auth_xradius-0.4.6-r1.ebuild b/www-apache/mod_auth_xradius/mod_auth_xradius-0.4.6-r1.ebuild index b6d651e9474..1837678a1a0 100644 --- a/www-apache/mod_auth_xradius/mod_auth_xradius-0.4.6-r1.ebuild +++ b/www-apache/mod_auth_xradius/mod_auth_xradius-0.4.6-r1.ebuild @@ -1,27 +1,28 @@ -# Copyright 1999-2014 Gentoo Foundation +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI="5" +EAPI=7 -inherit autotools eutils +inherit autotools DESCRIPTION="Radius authentication for Apache" HOMEPAGE="http://www.outoforder.cc/projects/apache/mod_auth_xradius/"; SRC_URI="http://www.outoforder.cc/downloads/${PN}/${P}.tar.bz2"; LICENSE="Apache-2.0" -KEYWORDS="~amd64" SLOT="0" -IUSE="" +KEYWORDS="~amd64" DEPEND="www-servers/apache" -DOCFILES="README" + +PATCHES=( + "${FILESDIR}"/${P}-obsolete-autotools-syntax.patch + "${FILESDIR}"/${P}-fallback-support.patch + "${FILESDIR}"/${P}-apache24-api-changes.patch + "${FILESDIR}"/${P}-fno-common.patch +) src_prepare() { - epatch "${FILESDIR}/${PV}-obsolete-autotools-syntax.diff" - epatch "${FILESDIR}/${PV}-fallback-support.diff" - if has_version ">=www-servers/apache-2.4"; then - epatch "${FILESDIR}/${PV}-apache24-api-changes.diff" - fi + default AT_M4DIR="m4" eautoreconf }
