From cc07aecb1076e6fb9a8c976cd9cead67bdee4f90 Mon Sep 17 00:00:00 2001
From: Aaron Andersen <aaron@fosslib.net>
Date: Wed, 11 Aug 2021 08:43:00 -0400
Subject: [PATCH 1/2] apacheHttpdPackages.mod_auth_mellon: 0.17.0 -> 0.18.0

(cherry picked from commit 3f4692120b6b6285f147c6adb431ea39b9020dad)
---
 .../mod_auth_mellon/default.nix               | 10 ++----
 .../mod_auth_mellon/fixdeps.patch             | 34 -------------------
 2 files changed, 3 insertions(+), 41 deletions(-)
 delete mode 100644 pkgs/servers/http/apache-modules/mod_auth_mellon/fixdeps.patch

diff --git a/pkgs/servers/http/apache-modules/mod_auth_mellon/default.nix b/pkgs/servers/http/apache-modules/mod_auth_mellon/default.nix
index c8cb13022e2..8763591d05e 100644
--- a/pkgs/servers/http/apache-modules/mod_auth_mellon/default.nix
+++ b/pkgs/servers/http/apache-modules/mod_auth_mellon/default.nix
@@ -3,19 +3,15 @@
 stdenv.mkDerivation rec {
 
   pname = "mod_auth_mellon";
-  version = "0.17.0";
+  version = "0.18.0";
 
   src = fetchFromGitHub {
     owner = "latchset";
     repo = "mod_auth_mellon";
     rev = "v${version}";
-    sha256 = "03bkvqkmqq72ff1a8cpvpcxngnlz1p6433y2fkkynpjfr19cna2s";
+    sha256 = "0alfa8hz09jdg29bi1mvhwyr2nl0nvss2a2kybrcjvdw1fx6vijn";
   };
 
-  patches = [
-    ./fixdeps.patch
-  ];
-
   nativeBuildInputs = [ autoreconfHook pkg-config ];
   buildInputs = [ apacheHttpd autoconf automake curl glib lasso libtool libxml2 libxslt openssl xmlsec ];
 
@@ -29,7 +25,7 @@ stdenv.mkDerivation rec {
   '';
 
   meta = with lib; {
-    homepage = "https://github.com/UNINETT/mod_auth_mellon";
+    homepage = "https://github.com/latchset/mod_auth_mellon";
     description = "An Apache module with a simple SAML 2.0 service provider";
     license = licenses.gpl2Plus;
     platforms = platforms.linux;
diff --git a/pkgs/servers/http/apache-modules/mod_auth_mellon/fixdeps.patch b/pkgs/servers/http/apache-modules/mod_auth_mellon/fixdeps.patch
deleted file mode 100644
index 4f814ad6036..00000000000
--- a/pkgs/servers/http/apache-modules/mod_auth_mellon/fixdeps.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-diff --git a/Makefile.in b/Makefile.in
-index 1388c91..ab28982 100644
---- a/Makefile.in
-+++ b/Makefile.in
-@@ -42,7 +42,7 @@ DISTFILES=$(SRC) \
- all:	mod_auth_mellon.la
- 
- mod_auth_mellon.la: $(SRC) auth_mellon.h auth_mellon_compat.h
--	@APXS2@ -Wc,"-std=c99 @MELLON_CFLAGS@ @OPENSSL_CFLAGS@ @LASSO_CFLAGS@ @CURL_CFLAGS@ @GLIB_CFLAGS@ @CFLAGS@" -Wl,"@OPENSSL_LIBS@ @LASSO_LIBS@ @CURL_LIBS@ @GLIB_LIBS@" -Wc,-Wall -Wc,-g -c $(SRC)
-+	@APXS2@ -Wc,"-std=c99 @MELLON_CFLAGS@ @OPENSSL_CFLAGS@ @LASSO_CFLAGS@ @CURL_CFLAGS@ @GLIB_CFLAGS@ @CFLAGS@ @LIBXML2_CFLAGS@ @XMLSEC_CFLAGS@ @CFLAGS@" -Wl,"@OPENSSL_LIBS@ @LASSO_LIBS@ @CURL_LIBS@ @GLIB_LIBS@ @LIBXML2_LIBS@ @XMLSEC_LIBS@" -Wc,-Wall -Wc,-g -c $(SRC)
- 
- 
- # Building configure (for distribution)
-diff --git a/configure.ac b/configure.ac
-index 421b952..e62768e 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -91,6 +91,16 @@ AC_SUBST(GLIB_LIBS)
- 
- AC_SUBST(MELLON_CFLAGS)
- 
-+#include <libxml/uri.h>
-+PKG_CHECK_MODULES(LIBXML2, libxml-2.0)
-+AC_SUBST(LIBXML2_CFLAGS)
-+AC_SUBST(LIBXML2_LIBS)
-+
-+#include <xmlsec/xmlenc.h>
-+PKG_CHECK_MODULES(XMLSEC, xmlsec1-openssl)
-+AC_SUBST(XMLSEC_CFLAGS)
-+AC_SUBST(XMLSEC_LIBS)
-+
- # Test to see if we can include lasso/utils.h
- # AC_CHECK_HEADER won't work correctly unless we specifiy the include directories
- # found in the LASSO_CFLAGS. Save and restore CFLAGS and CPPFLAGS.

From 27d72aa5fa656440722b0247358e9522c9d13e04 Mon Sep 17 00:00:00 2001
From: Angus Trau <me@angus.ws>
Date: Tue, 6 Jul 2021 10:31:36 +1000
Subject: [PATCH 2/2] maintainers: add angustrau

---
 maintainers/maintainer-list.nix | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index 08a24a4f348..4d946c00d79 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -658,6 +658,12 @@
     githubId = 11699655;
     name = "Stanislas Lange";
   };
+  angustrau = {
+    name = "Angus Trau";
+    email = "nix@angus.ws";
+    github = "angustrau";
+    githubId = 13267947;
+  };
   anhdle14 = {
     name = "Le Anh Duc";
     email = "anhdle14@icloud.com";