[gridsite] Redhat #61209, includes.

[stevetraylen]

commit 5a238c99f54a2694b4f9d7337208369c72151baa
Author: Steve Traylen <steve.traylen at cern.ch>
Date:   Wed Sep 22 01:12:07 2010 +0200

    Redhat #61209, includes.

 gridsite-include.patch |   60 ++++++++++++++++++++++++++++++++++++++++++++++++
 gridsite.spec          |   19 +++++++++++++-
 2 files changed, 77 insertions(+), 2 deletions(-)
---
diff --git a/gridsite-include.patch b/gridsite-include.patch
new file mode 100644
index 0000000..1c7cc98
--- /dev/null
+++ b/gridsite-include.patch
@@ -0,0 +1,60 @@
+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-09-22 01:00:09.976742554 +0200
++++ org.gridsite.core/interface/gridsite-gacl.h	2010-09-22 01:01:04.304742031 +0200
+@@ -35,6 +35,9 @@
+ 
+ #ifndef HEADER_GACL_H
+ #define HEADER_GACL_H
++
++#ifdef __cplusplus
++extern "C" {
+ #endif
+ 
+ #ifndef GACL_LIB_VERSION
+@@ -186,3 +189,9 @@
+ 
+ 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-09-22 01:00:09.976742554 +0200
++++ org.gridsite.core/interface/gridsite.h	2010-09-22 01:01:04.331492564 +0200
+@@ -35,6 +35,9 @@
+ 
+ #ifndef GRST_VERSION
+ #define GRST_VERSION 010500
++
++#ifdef __cplusplus
++extern "C" {
+ #endif
+ 
+ #ifndef HEADER_SSL_H
+@@ -419,3 +422,9 @@
+ int    GRSThtcpTSTrequestMake(char **, int *, unsigned int, char *, char *, char *);
+ int    GRSThtcpTSTresponseMake(char **, int *, unsigned int, char *, char *, char *);
+ int    GRSThtcpMessageParse(GRSThtcpMessage *, char *, int);
++
++#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-09-22 01:00:09.988740935 +0200
++++ org.gridsite.core/src/Makefile	2010-09-22 01:04:20.963490070 +0200
+@@ -350,8 +350,8 @@
+                  $(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 0320ffa..58af1bf 100644
--- a/gridsite.spec
+++ b/gridsite.spec
@@ -5,9 +5,9 @@
 %endif
 
 Name:           gridsite
-Version:        1.5.18
+Version:        1.5.19
 
-Release:        4%{?dist}
+Release:        1%{?dist}
 Summary:        Grid Security for the Web, Web platforms for Grids
 
 Group:          System Environment/Daemons
@@ -25,7 +25,12 @@ Source2:        gridsitehead.txt
 Source3:        gridsitefoot.txt
 Source4:        root-level.gacl
 Source5:        gridsitelogo.png
+
 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
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -129,6 +134,10 @@ cp -p %{SOURCE5} .
 
 ## Change installed path of cgi-bins.
 %patch1 -p1
+# Includes are wrong.
+#https://bugzilla.redhat.com/show_bug.cgi?id=612109
+#https://savannah.cern.ch/bugs/index.php?69632
+%patch2 -p1
 
 %build
 (cd src && MYCFLAGS="%{optflags} -DLINUX=2 -D_REENTRANT -D_LARGEFILE64_SOURCE -I../interface -I%{_includedir}/httpd -I%{_includedir}/apr-%{aprversion} -fPIC " make )
@@ -241,6 +250,12 @@ rm -rf $RPM_BUILD_ROOT
 %doc src/doxygen
 
 %changelog
+* Tue Sep 21 2010 Steve Traylen <steve.traylen at cern.ch> - 1.5.19-1
+- Upstream to 1.5.19.
+- Add gridsite-include.patch 
+  https://savannah.cern.ch/bugs/index.php?69632 
+  https://bugzilla.redhat.com/show_bug.cgi?id=612109
+
 * Thu May 20 2010 Steve Traylen <steve.traylen at cern.ch> - 1.5.18-4
 - For .el4 use /usr/include/apr-0 rather than apr-1