git.iko.soy/typeable/nixpkgs
on master help sign in
Merge pull request #133499 from aanderse/apacheHttpdPackages.mod_auth_mellon

apacheHttpdPackages.mod_auth_mellon: 0.17.0 -> 0.18.0

commitedee3f8e3bb4591c800b3f1e7dc881b937b4842b authorSandro <sandro.jaeckel@gmail.com> dateWed 11 Aug 2021, 15:30 (5 years ago) parent911b8a53f46921
2 files changed+3−41
compare with master
unifiedsplit
pkgs/servers/http/apache-modules/mod_auth_mellon/default.nix+3−7 pkgs/servers/http/apache-modules/mod_auth_mellon/fixdeps.patch−34
pkgs/servers/http/apache-modules/mod_auth_mellon/default.nix+3−7
@@ -3,19 +3,15 @@
33stdenv.mkDerivation rec {
44
55 pname = "mod_auth_mellon";
6− version = "0.17.0";
6+ version = "0.18.0";
77
88 src = fetchFromGitHub {
99 owner = "latchset";
1010 repo = "mod_auth_mellon";
1111 rev = "v${version}";
12− sha256 = "03bkvqkmqq72ff1a8cpvpcxngnlz1p6433y2fkkynpjfr19cna2s";
12+ sha256 = "0alfa8hz09jdg29bi1mvhwyr2nl0nvss2a2kybrcjvdw1fx6vijn";
1313 };
1414
15− patches = [
16− ./fixdeps.patch
17− ];
18−
1915 nativeBuildInputs = [ autoreconfHook pkg-config ];
2016 buildInputs = [ apacheHttpd autoconf automake curl glib lasso libtool libxml2 libxslt openssl xmlsec ];
2117
@@ -29,7 +25,7 @@ stdenv.mkDerivation rec {
2925 '';
3026
3127 meta = with lib; {
32− homepage = "https://github.com/UNINETT/mod_auth_mellon";
28+ homepage = "https://github.com/latchset/mod_auth_mellon";
3329 description = "An Apache module with a simple SAML 2.0 service provider";
3430 license = licenses.gpl2Plus;
3531 platforms = platforms.linux;
pkgs/servers/http/apache-modules/mod_auth_mellon/fixdeps.patchdeleted−34
@@ -1,34 +0,0 @@
1−diff --git a/Makefile.in b/Makefile.in
2−index 1388c91..ab28982 100644
3−--- a/Makefile.in
4−+++ b/Makefile.in
5−@@ -42,7 +42,7 @@ DISTFILES=$(SRC) \
6− all: mod_auth_mellon.la
7−
8− mod_auth_mellon.la: $(SRC) auth_mellon.h auth_mellon_compat.h
9−- @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)
10−+ @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)
11−
12−
13− # Building configure (for distribution)
14−diff --git a/configure.ac b/configure.ac
15−index 421b952..e62768e 100644
16−--- a/configure.ac
17−+++ b/configure.ac
18−@@ -91,6 +91,16 @@ AC_SUBST(GLIB_LIBS)
19−
20− AC_SUBST(MELLON_CFLAGS)
21−
22−+#include <libxml/uri.h>
23−+PKG_CHECK_MODULES(LIBXML2, libxml-2.0)
24−+AC_SUBST(LIBXML2_CFLAGS)
25−+AC_SUBST(LIBXML2_LIBS)
26−+
27−+#include <xmlsec/xmlenc.h>
28−+PKG_CHECK_MODULES(XMLSEC, xmlsec1-openssl)
29−+AC_SUBST(XMLSEC_CFLAGS)
30−+AC_SUBST(XMLSEC_LIBS)
31−+
32− # Test to see if we can include lasso/utils.h
33− # AC_CHECK_HEADER won't work correctly unless we specifiy the include directories
34− # found in the LASSO_CFLAGS. Save and restore CFLAGS and CPPFLAGS.