public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge staging-next-21.05 into staging-21.05

Browse Source
This commit is contained in:
github-actions[bot] 2021-08-12 00:03:19 +00:00 committed by GitHub
commit fd0652d86a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 9 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
maintainers/maintainer-list.nix
View File

@ -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";

10
pkgs/servers/http/apache-modules/mod_auth_mellon/default.nix
View File

@ -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;

34
pkgs/servers/http/apache-modules/mod_auth_mellon/fixdeps.patch
View File

@ -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.