diff options
author | Aaron Andersen <aaron@fosslib.net> | 2021-08-11 08:43:00 -0400 |
---|---|---|
committer | Aaron Andersen <aaron@fosslib.net> | 2021-08-11 08:43:00 -0400 |
commit | 3f4692120b6b6285f147c6adb431ea39b9020dad (patch) | |
tree | ce4dd3944a7f1e0793ba96ddac1b004a07cfe344 /pkgs/servers/http/apache-modules | |
parent | 911b8a569cd44d3e3f2e8c39f5e1162506e7941c (diff) | |
download | nixpkgs-3f4692120b6b6285f147c6adb431ea39b9020dad.tar nixpkgs-3f4692120b6b6285f147c6adb431ea39b9020dad.tar.gz nixpkgs-3f4692120b6b6285f147c6adb431ea39b9020dad.tar.bz2 nixpkgs-3f4692120b6b6285f147c6adb431ea39b9020dad.tar.lz nixpkgs-3f4692120b6b6285f147c6adb431ea39b9020dad.tar.xz nixpkgs-3f4692120b6b6285f147c6adb431ea39b9020dad.tar.zst nixpkgs-3f4692120b6b6285f147c6adb431ea39b9020dad.zip |
apacheHttpdPackages.mod_auth_mellon: 0.17.0 -> 0.18.0
Diffstat (limited to 'pkgs/servers/http/apache-modules')
-rw-r--r-- | pkgs/servers/http/apache-modules/mod_auth_mellon/default.nix | 10 | ||||
-rw-r--r-- | pkgs/servers/http/apache-modules/mod_auth_mellon/fixdeps.patch | 34 |
2 files changed, 3 insertions, 41 deletions
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. |