summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJakov Smolic <jakov.smolic@sartura.hr>2021-02-13 11:27:16 +0100
committerDavid Seifert <soap@gentoo.org>2021-02-13 11:27:16 +0100
commit2005eb90003eb96281cbbec121fb6cf6ff0955cf (patch)
treeb409f2808d343b2fac7eff7756d0b0a202293f18 /www-apache
parentsys-block/fio: Remove old (diff)
downloadgentoo-2005eb90003eb96281cbbec121fb6cf6ff0955cf.tar.gz
gentoo-2005eb90003eb96281cbbec121fb6cf6ff0955cf.tar.bz2
gentoo-2005eb90003eb96281cbbec121fb6cf6ff0955cf.zip
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@sartura.hr> Signed-off-by: David Seifert <soap@gentoo.org>
Diffstat (limited to 'www-apache')
-rw-r--r--www-apache/mod_auth_xradius/files/mod_auth_xradius-0.4.6-apache24-api-changes.patch (renamed from www-apache/mod_auth_xradius/files/0.4.6-apache24-api-changes.diff)4
-rw-r--r--www-apache/mod_auth_xradius/files/mod_auth_xradius-0.4.6-fallback-support.patch (renamed from www-apache/mod_auth_xradius/files/0.4.6-fallback-support.diff)5
-rw-r--r--www-apache/mod_auth_xradius/files/mod_auth_xradius-0.4.6-fno-common.patch22
-rw-r--r--www-apache/mod_auth_xradius/files/mod_auth_xradius-0.4.6-obsolete-autotools-syntax.patch (renamed from www-apache/mod_auth_xradius/files/0.4.6-obsolete-autotools-syntax.diff)4
-rw-r--r--www-apache/mod_auth_xradius/metadata.xml8
-rw-r--r--www-apache/mod_auth_xradius/mod_auth_xradius-0.4.6-r1.ebuild23
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
index a760bd6ce79e..349822a5733a 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
index da43dc4b2776..f1beffe35d99 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 000000000000..d4c25fad0935
--- /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
index affb3181485a..97f3023b97c2 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 5087760546f6..1a06e96ebdc7 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>chainsaw@gentoo.org</email>
- <name>Tony Vroon</name>
- </maintainer>
+ <maintainer type="person">
+ <email>chainsaw@gentoo.org</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 b6d651e94748..1837678a1a09 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
}