[gridsite] Upstream to 1.7.20, Add gridsite-httpd24.patch

[stevetraylen]

commit 2f3de4a6d687170ffda04bdfbac36a2cc299f17b
Author: Steve Traylen <steve.traylen at cern.ch>
Date:   Tue Apr 17 19:07:50 2012 +0200

    Upstream to 1.7.20, Add gridsite-httpd24.patch

 .gitignore             |    1 +
 gridsite-httpd24.patch |   66 ++++++++++++++++++++++++++++++++++++++++++++++++
 gridsite.spec          |   15 ++++++++++-
 sources                |    2 +-
 4 files changed, 82 insertions(+), 2 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 2dde965..a970aa2 100644
--- a/.gitignore
+++ b/.gitignore
@@ -6,3 +6,4 @@ gridsite-1.5.18.src.tar.gz
 /gridsite-1.7.15.src.tar.gz
 /gridsite-1.7.16.src.tar.gz
 /gridsite-1.7.19.src.tar.gz
+/gridsite-1.7.20.src.tar.gz
diff --git a/gridsite-httpd24.patch b/gridsite-httpd24.patch
new file mode 100644
index 0000000..805ce16
--- /dev/null
+++ b/gridsite-httpd24.patch
@@ -0,0 +1,66 @@
+diff -uNr org.gridsite.core.ORIG/src/mod_gridsite.c org.gridsite.core/src/mod_gridsite.c
+--- org.gridsite.core.ORIG/src/mod_gridsite.c	2012-04-17 18:06:26.188000022 +0200
++++ org.gridsite.core/src/mod_gridsite.c	2012-04-17 18:29:36.084000022 +0200
+@@ -2075,7 +2075,7 @@
+     
+     if (strcasecmp(a->cmd->name, "GridSiteUserGroup") == 0)
+     {
+-      if (!(unixd_config.suexec_enabled))
++      if (!(ap_unixd_config.suexec_enabled))
+           return "Using GridSiteUserGroup will "
+                  "require rebuilding Apache with suexec support!";
+     
+@@ -3054,7 +3054,7 @@
+                                   r->per_dir_config, REMOTE_DOUBLE_REV, NULL);
+     if ((remotehost != NULL) && (*remotehost != '\0'))
+       {
+-        cred = GRSTgaclCredCreate("ip:", r->connection->remote_ip);
++        cred = GRSTgaclCredCreate("ip:", r->connection->client_ip);
+         GRSTgaclCredSetNotAfter(cred, GRST_MAX_TIME_T);
+ 
+         if (user == NULL) user = GRSTgaclUserNew(cred);
+@@ -3576,7 +3576,7 @@
+          * Log information about CRL
+          * (A little bit complicated because of ASN.1 and BIOs...)
+          */
+-        if (s->loglevel >= APLOG_DEBUG) {
++        if (s->log.level >= APLOG_DEBUG) {
+             char buff[512]; /* should be plenty */
+             BIO *bio = BIO_new(BIO_s_mem());
+ 
+@@ -3673,7 +3673,7 @@
+             ASN1_INTEGER *sn = revoked->serialNumber;
+ 
+             if (!ASN1_INTEGER_cmp(sn, X509_get_serialNumber(cert))) {
+-                if (s->loglevel >= APLOG_DEBUG) {
++                if (s->log.level >= APLOG_DEBUG) {
+                     char *cp = X509_NAME_oneline(issuer, NULL, 0);
+                     char *serial = i2s_ASN1_INTEGER(NULL,sn);
+ 
+@@ -3724,7 +3724,7 @@
+     /*
+      * Log verification information
+      */
+-    if (s->loglevel >= APLOG_DEBUG) 
++    if (s->log.level >= APLOG_DEBUG) 
+       {
+         X509 *cert  = X509_STORE_CTX_get_current_cert(ctx);
+         char *sname = X509_NAME_oneline(X509_get_subject_name(cert), NULL, 0);
+@@ -4407,7 +4407,7 @@
+             SSL_CTX_set_verify(ctx, ctx->verify_mode, 
+                                GRST_callback_SSLVerify_wrapper);
+ 
+-            if (main_server->loglevel >= APLOG_DEBUG)
++            if (main_server->log.level >= APLOG_DEBUG)
+                  ap_log_error(APLOG_MARK, APLOG_DEBUG, 0, main_server,
+                       "Set mod_ssl verify callbacks to GridSite wrappers");
+           }
+@@ -4417,7 +4417,7 @@
+ 
+    path = ap_server_root_relative(pPool, sessionsdir);
+    apr_dir_make_recursive(path, APR_UREAD | APR_UWRITE | APR_UEXECUTE, pPool);
+-   chown(path, unixd_config.user_id, unixd_config.group_id);
++   chown(path, ap_unixd_config.user_id, ap_unixd_config.group_id);
+ 
+    return OK;
+ }
diff --git a/gridsite.spec b/gridsite.spec
index c96c23f..16063e5 100644
--- a/gridsite.spec
+++ b/gridsite.spec
@@ -2,7 +2,7 @@
 %{!?_httpd_mmn: %{expand: %%global _httpd_mmn %%(cat %{_includedir}/httpd/.mmn || echo missing-httpd-devel)}}
 
 Name:           gridsite
-Version:        1.7.19
+Version:        1.7.20
 
 Release:        1%{?dist}
 Summary:        Grid Security for the Web, Web platforms for Grids
@@ -32,6 +32,11 @@ Patch2:         cgi-bin-location-1.5.20.patch
 #https://savannah.cern.ch/bugs/index.php?69632
 Patch3:         gridsite-include-1.5.20.patch
 
+
+# httpd 2.4 support.
+# https://www.jiscmail.ac.uk/cgi-bin/webadmin?A2=ind1204&L=GRIDSITE-DISCUSS&F=&S=&P=59
+Patch4:         gridsite-httpd24.patch
+
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 %if %{?fedora}%{!?fedora:0} >= 10 || %{?rhel}%{!?rhel:0} >= 6
@@ -135,6 +140,11 @@ cp -p %{SOURCE5} .
 ## Change installed path of cgi-bins.
 %patch1 -p1
 
+## Changes for httpd 2.4 only.
+%if 0%{?rhel} >= 7 || 0%{?fedora}  >= 18
+%patch4 -p1
+%endif
+
 %build
 (cd src && MYCFLAGS="%{optflags} -DLINUX=2 -D_REENTRANT -D_LARGEFILE64_SOURCE -I../interface -I%{_includedir}/httpd -I%{_includedir}/apr-%{aprversion} -fPIC " make )
 
@@ -256,6 +266,9 @@ rm -rf $RPM_BUILD_ROOT
 %doc src/doxygen LICENSE
 
 %changelog
+* Mon Apr 16 2012 steve.traylen at cern.ch - 1.7.20-1
+- Upstream to 1.7.20, Add gridsite-httpd24.patch
+
 * Sun Mar 18 2012 Steve Traylen <steve.traylen at cern.ch>  - 1.7.19-1
 - Upstream 1.7.19
 - Drop EPEL4 support since EOL.
diff --git a/sources b/sources
index 2615dad..a8475b6 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-e2bf6ee579d66b71a11d2c41742b3b67  gridsite-1.7.19.src.tar.gz
+ff7e9ec757bcaf644bd09a54ed773512  gridsite-1.7.20.src.tar.gz