[gridsite] - Upstream to 1.7.9 - Update gridsite-include.patch for 1.7.9 https://savannah.cern.ch/bugs/index.

[stevetraylen]

commit c7667812bdd5a6b63be24962f85b9941e50e343f
Author: Steve Traylen <steve.traylen at cern.ch>
Date:   Thu Dec 16 21:30:21 2010 +0100

    - Upstream to 1.7.9
    - Update gridsite-include.patch for 1.7.9
      https://savannah.cern.ch/bugs/index.php?69632

 .gitignore                   |    1 +
 gridsite-include-1.7.9.patch |   62 ++++++++++++++++++++++++++++++++++++++++++
 gridsite-include.patch       |   60 ----------------------------------------
 gridsite.spec                |   14 +++++++--
 sources                      |    2 +-
 5 files changed, 75 insertions(+), 64 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 8b71c97..d75e294 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
 gridsite-1.5.18.src.tar.gz
 /gridsite-1.5.19.src.tar.gz
+/gridsite-1.7.9.src.tar.gz
diff --git a/gridsite-include-1.7.9.patch b/gridsite-include-1.7.9.patch
new file mode 100644
index 0000000..dd567ce
--- /dev/null
+++ b/gridsite-include-1.7.9.patch
@@ -0,0 +1,62 @@
+diff -uNr org.gridsite.core.ORIG/interface/gridsite-gacl.h org.gridsite.core/interface/gridsite-gacl.h
+--- org.gridsite.core.ORIG/interface/gridsite-gacl.h	2010-12-16 21:14:49.586109571 +0100
++++ org.gridsite.core/interface/gridsite-gacl.h	2010-12-16 21:15:54.301538979 +0100
+@@ -35,6 +35,9 @@
+ 
+ #ifndef HEADER_GACL_H
+ #define HEADER_GACL_H
++
++#ifdef __cplusplus
++extern "C" {
+ #endif
+ 
+ #ifndef GACL_LIB_VERSION
+@@ -186,3 +189,10 @@
+ 
+ GACLentry *GRSTgaclEntryParse(xmlNodePtr cur);
+ /*  special function for legacy EDG LB service */
++
++#ifdef __cplusplus
++} // extern "C"
++#endif
++
++#endif // HEADER_GACL_H
++
+diff -uNr org.gridsite.core.ORIG/interface/gridsite.h org.gridsite.core/interface/gridsite.h
+--- org.gridsite.core.ORIG/interface/gridsite.h	2010-12-16 21:14:49.586109571 +0100
++++ org.gridsite.core/interface/gridsite.h	2010-12-16 21:17:13.936757509 +0100
+@@ -35,6 +35,9 @@
+ 
+ #ifndef GRST_VERSION
+ #define GRST_VERSION 010500
++
++#ifdef __cplusplus
++extern "C" {
+ #endif
+ 
+ #ifndef GRST_NO_OPENSSL
+@@ -450,3 +453,9 @@
+ #define GRST_PASSCODE_JS "<script type=\"text/javascript\" language=\"Javascript\"><!--\nfunction changeValue(formName){        if( document.forms[formName].passcode.value==\"\" ) document.forms[formName].passcode.value=getCookie(\"GRIDHTTP_PASSCODE\");       return true;   } \nfunction getCookie(c_name){ if (document.cookie.length>0)  {  c_start=document.cookie.indexOf(c_name + \"=\");  if (c_start!=-1)    {    c_start=c_start + c_name.length+1;    c_end=document.cookie.indexOf(\";\",c_start);    if (c_end==-1) c_end=document.cookie.length;    return unescape(document.cookie.substring(c_start,c_end)); }} return \"\"; } \n -->\n</script>"
+ #endif
+ 
++#ifdef __cplusplus
++} // extern "C"
++#endif
++
++#endif // GRST_VERSION
++
+diff -uNr org.gridsite.core.ORIG/src/Makefile org.gridsite.core/src/Makefile
+--- org.gridsite.core.ORIG/src/Makefile	2010-12-16 21:14:49.598110208 +0100
++++ org.gridsite.core/src/Makefile	2010-12-16 21:18:04.541437317 +0100
+@@ -394,8 +394,9 @@
+                  $(prefix)/$(libdir)/httpd/modules \
+                  $(prefix)/share/doc/gridsite-$(MINOR_VERSION) \
+                  $(prefix)/libexec/gridsite/cgi-bin
+-	echo '#define' GRST_VERSION $(DEFVERSION) > $(prefix)/include/gridsite.h
+-	cat ../interface/gridsite.h >>$(prefix)/include/gridsite.h
++	sed 's/^\(#define GRST_VERSION\).*$$/\1 $(DEFVERSION)/' \
++	../interface/gridsite.h > $(prefix)/include/gridsite.h
++
+ 	cp -f ../interface/gridsite-gacl.h $(prefix)/include
+ 	cp -f urlencode $(prefix)/bin
+ 	cp -f findproxyfile $(prefix)/bin
diff --git a/gridsite.spec b/gridsite.spec
index a01d9dc..0e80d5c 100644
--- a/gridsite.spec
+++ b/gridsite.spec
@@ -5,9 +5,9 @@
 %endif
 
 Name:           gridsite
-Version:        1.5.19
+Version:        1.7.9
 
-Release:        2%{?dist}
+Release:        1%{?dist}
 Summary:        Grid Security for the Web, Web platforms for Grids
 
 Group:          System Environment/Daemons
@@ -30,7 +30,7 @@ Patch1:         cgi-bin-location.patch
 # Includes are wrong.
 #https://bugzilla.redhat.com/show_bug.cgi?id=612109
 #https://savannah.cern.ch/bugs/index.php?69632
-Patch2:         gridsite-include.patch
+Patch2:         gridsite-include-1.7.9.patch
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -172,6 +172,9 @@ install -p -m 0644 gridsite-httpd.conf $RPM_BUILD_ROOT%{_sysconfdir}/httpd/conf.
 mkdir -p $RPM_BUILD_ROOT%{_var}/www/icons
 install -p -m 0644 gridsitelogo.png $RPM_BUILD_ROOT%{_var}/www/icons
 
+# These were work arounds for an old bug in some other
+# software never ever in Fedora anyway.
+rm -f %{buildroot}%{_libdir}/libgridsite_nossl*
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -250,6 +253,11 @@ rm -rf $RPM_BUILD_ROOT
 %doc src/doxygen
 
 %changelog
+* Thu Dec 16 2010 Steve Traylen <steve.traylen at cern.ch>  - 1.7.9-1
+- Upstream to 1.7.9
+- Update gridsite-include.patch for 1.7.9
+  https://savannah.cern.ch/bugs/index.php?69632
+
 * Wed Sep 29 2010 jkeating - 1.5.19-2
 - Rebuilt for gcc bug 634757
 
diff --git a/sources b/sources
index 96733ca..3aa2737 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-b229e7583fafef4c28dc8587ac741056  gridsite-1.5.19.src.tar.gz
+29be13f59f1250d915cd96e9ae74d418  gridsite-1.7.9.src.tar.gz