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

Merge pull request #115135 from aanderse/mod_auth_mellon

Browse Source 
apacheHttpdPackages.mod_auth_mellon: 0.13.1 -> 0.17.0
This commit is contained in:
Aaron Andersen 2021-03-05 19:53:32 -05:00 committed by GitHub
commit bf8e471eb9
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 21 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -3,13 +3,13 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "mod_auth_mellon"; pname = "mod_auth_mellon";
version = "0.13.1"; version = "0.17.0";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "UNINETT"; owner = "latchset";
repo = "mod_auth_mellon"; repo = "mod_auth_mellon";
rev = "v${version}"; rev = "v${version}";
sha256 = "16b43y5a5p8g1287x04rv923230cy8dfs2j18cx6208n4bv4dvnk"; sha256 = "03bkvqkmqq72ff1a8cpvpcxngnlz1p6433y2fkkynpjfr19cna2s";
}; };
patches = [ patches = [

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

@ -1,8 +1,23 @@
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 --- a/configure.ac
+++ b/configure.ac +++ b/configure.ac
@@ -74,6 +74,16 @@ PKG_CHECK_MODULES([GLIB], [glib-2.0 >= 2.12]) @@ -91,6 +91,16 @@ AC_SUBST(GLIB_LIBS)
AC_SUBST(GLIB_CFLAGS)
AC_SUBST(GLIB_LIBS) AC_SUBST(MELLON_CFLAGS)
+#include <libxml/uri.h> +#include <libxml/uri.h>
+PKG_CHECK_MODULES(LIBXML2, libxml-2.0) +PKG_CHECK_MODULES(LIBXML2, libxml-2.0)
@ -17,14 +32,3 @@
# Test to see if we can include lasso/utils.h # Test to see if we can include lasso/utils.h
# AC_CHECK_HEADER won't work correctly unless we specifiy the include directories # AC_CHECK_HEADER won't work correctly unless we specifiy the include directories
# found in the LASSO_CFLAGS. Save and restore CFLAGS and CPPFLAGS. # found in the LASSO_CFLAGS. Save and restore CFLAGS and CPPFLAGS.
--- a/Makefile.in
+++ b/Makefile.in
@@ -25,7 +25,7 @@
all: mod_auth_mellon.la
mod_auth_mellon.la: $(SRC) auth_mellon.h auth_mellon_compat.h
- @APXS2@ -Wc,"-std=c99 @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 @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)