[LON-CAPA-cvs] cvs: modules /msu/sentinel install_mod_sentinel mod_sentinel_patch
albertel
lon-capa-cvs@mail.lon-capa.org
Thu, 21 Sep 2006 15:25:53 -0000
albertel Thu Sep 21 11:25:53 2006 EDT
Modified files:
/modules/msu/sentinel install_mod_sentinel mod_sentinel_patch
Log:
- updatd to support mod_sentinel 2.3
Index: modules/msu/sentinel/install_mod_sentinel
diff -u modules/msu/sentinel/install_mod_sentinel:1.2 modules/msu/sentinel/install_mod_sentinel:1.3
--- modules/msu/sentinel/install_mod_sentinel:1.2 Wed Aug 30 12:55:48 2006
+++ modules/msu/sentinel/install_mod_sentinel Thu Sep 21 11:25:50 2006
@@ -13,10 +13,11 @@
# get, build and install mod_sentinel
cd /usr/src
-wget http://install.loncapa.org/msu/mod_sentinel-2.2a.tgz
-tar xzvf mod_sentinel-2.2a.tgz
+wget http://install.loncapa.org/msu/mod_sentinel-2.3.tgz
+tar xzvf mod_sentinel-2.3.tgz
wget http://install.loncapa.org/msu/mod_sentinel_patch
patch -p0 < mod_sentinel_patch
+cd mod_sentinel-2.3
make
# configure apache/lon-capa to use sentinel
Index: modules/msu/sentinel/mod_sentinel_patch
diff -u modules/msu/sentinel/mod_sentinel_patch:1.1 modules/msu/sentinel/mod_sentinel_patch:1.2
--- modules/msu/sentinel/mod_sentinel_patch:1.1 Tue Aug 29 14:57:29 2006
+++ modules/msu/sentinel/mod_sentinel_patch Thu Sep 21 11:25:50 2006
@@ -1,146 +1,29 @@
-diff -ur mod_sentinel-2.2.orig/Makefile.inc mod_sentinel-2.2/Makefile.inc
---- mod_sentinel-2.2.orig/Makefile.inc 2005-12-22 11:19:51.000000000 -0500
-+++ mod_sentinel-2.2/Makefile.inc 2006-08-29 10:58:14.000000000 -0400
-@@ -1,9 +1,9 @@
+diff -ur mod_sentinel-2.3.orig/Makefile.inc mod_sentinel-2.3/Makefile.inc
+--- mod_sentinel-2.3.orig/Makefile.inc 2005-12-22 11:19:51.000000000 -0500
++++ mod_sentinel-2.3/Makefile.inc 2006-08-29 10:58:14.000000000 -0400
+@@ -1,10 +1,9 @@
#
# configurable options
#
-GSOAP_PATH=/usr/local/opt/gsoap-2.7.4
-GSOAP_SRC=/usr/local/src/gsoap-2.7.4
--HTTPD_PATH=/usr/local/opt/httpd-2.0.54
+-# HTTPD_PATH=/usr/local/opt/httpd-2.0.54
+-HTTPD_PATH=/usr/local/opt/httpd-2.2.3
+GSOAP_PATH=/usr/local
+GSOAP_SRC=/usr/src/gsoap-2.7
+HTTPD_PATH=/usr/src/httpd-2.2.2
# for the production WSDL service definition
WSDL_URL=https://sentinelws.msu.edu/sentinel/service?wsdl
-diff -ur mod_sentinel-2.2.orig/module_src/apache_includes.sh mod_sentinel-2.2/module_src/apache_includes.sh
---- mod_sentinel-2.2.orig/module_src/apache_includes.sh 2005-12-22 11:19:51.000000000 -0500
-+++ mod_sentinel-2.2/module_src/apache_includes.sh 2006-08-29 11:23:25.000000000 -0400
-@@ -22,7 +22,7 @@
- then
- for IncludeFile in $HTTPD_INCLUDES
- do
-- ln -s $HTTPD_PATH/include/$IncludeFile ./$IncludeFile
-+ ln -sf $HTTPD_PATH/include/$IncludeFile ./$IncludeFile
- done
- fi
-
-diff -ur mod_sentinel-2.2.orig/module_src/Makefile mod_sentinel-2.2/module_src/Makefile
---- mod_sentinel-2.2.orig/module_src/Makefile 2005-12-22 11:19:51.000000000 -0500
-+++ mod_sentinel-2.2/module_src/Makefile 2006-08-29 11:38:46.000000000 -0400
-@@ -5,8 +5,8 @@
-
+diff -ur mod_sentinel-2.3.orig/module_src/Makefile mod_sentinel-2.3/module_src/Makefile
+--- mod_sentinel-2.3.orig/module_src/Makefile 2005-12-22 11:19:51.000000000 -0500
++++ mod_sentinel-2.3/module_src/Makefile 2006-08-29 11:38:46.000000000 -0400
+@@ -6,7 +6,7 @@
mod_sentinel:
@echo "Need to fix this up for mod_src"
-- ./apache_includes.sh link
-- ${HTTPD_PATH}/bin/apxs -DWITH_OPENSSL -L${SOAPLIBDIR} -L${HTTPD_PATH}/lib -lssl -lcrypto -lpthread -lapr-0 -i -n mod_sentinel -c mod_sentinel.so mod_sentinel.c ../soap_src/soapClientLib.c ../soap_src/soapC.c ../soap_src/stdsoap2.c
-+ #./apache_includes.sh link
+ #./apache_includes.sh link
+- ${HTTPD_PATH}/bin/apxs -DWITH_OPENSSL -L${SOAPLIBDIR} -L${HTTPD_PATH}/lib -lssl -lcrypto -lpthread -i -n mod_sentinel -c mod_sentinel.so mod_sentinel.c ../soap_src/soapClientLib.c ../soap_src/soapC.c ../soap_src/stdsoap2.c
+ apxs -DWITH_OPENSSL -L${SOAPLIBDIR} -L${HTTPD_PATH}/lib -lssl -lcrypto -lpthread -i -n mod_sentinel -c mod_sentinel.so mod_sentinel.c ../soap_src/soapClientLib.c ../soap_src/soapC.c ../soap_src/stdsoap2.c
clean:
- ./apache_includes.sh del
-diff -ur mod_sentinel-2.2.orig/module_src/mod_sentinel.c mod_sentinel-2.2/module_src/mod_sentinel.c
---- mod_sentinel-2.2.orig/module_src/mod_sentinel.c 2006-01-25 13:18:24.000000000 -0500
-+++ mod_sentinel-2.2/module_src/mod_sentinel.c 2006-08-29 11:55:32.000000000 -0400
-@@ -16,8 +16,10 @@
- #include "http_log.h"
- #include "http_main.h"
- #include "http_protocol.h"
-+#include "http_request.h"
- #include "util_script.h"
- #include "apr_strings.h"
-+#include "apr_version.h"
- #include "http_connection.h"
- #include "ap_config.h"
-
-@@ -687,7 +689,6 @@
- char *TempCharPtr = NULL;
- char *URLMark;
- char *MatchAuth = NULL;
--FILE *fplog;
- int validate_status = 0;
-
- struct type__Credential *Credential;
-@@ -705,7 +706,7 @@
-
- /* We only have something to do if "Sentinel" || "Basic" is the AuthType. */
- if ( SentinelUsesBasicAuth )
-- MatchAuth = "Basic";
-+ MatchAuth = "LONCAPA";
- else
- MatchAuth = "Sentinel";
-
-@@ -814,10 +815,8 @@
- strcat(temp, SentinelAppID );
- strcat(temp, "&service=");
-
--fplog = fopen ( "/tmp/sentinel.log", "a" );
- if ( SentinelUseProxy )
- {
--fprintf ( fplog, "Using Proxy\n\n\n" );
-
- URLMark = strstr ( &service [ 7 ], "http" );
-
-@@ -825,8 +824,6 @@
- strcpy ( temp, service );
- else
- {
--fprintf ( fplog, "Found URLMark!\n\n" );
--
- strcat ( temp, URLMark );
- }
- }
-@@ -842,8 +839,6 @@
- // apr_table_set (r->headers_out, "Cache-Control", "no-store, no-cache, must-revalidate");
- // apr_table_set (r->headers_out, "Pragma", "no-cache");
-
--fprintf ( fplog, "%s\n\n%s\n\n", service, temp );
--fclose ( fplog );
- log_status ( SentinelAuthMSULogFile, temp );
- log_status ( SentinelAuthMSULogFile, "\n" );
- log_status ( SentinelAuthMSULogFile, "redirecting to login server" );
-@@ -932,7 +927,7 @@
- /* Someone else has to pick up the torch if "Sentinel" isn't our AuthType. */
-
- if ( SentinelUsesBasicAuth )
-- MatchAuth = "Basic";
-+ MatchAuth = "LONCAPA";
- else
- MatchAuth = "Sentinel";
-
-@@ -1726,7 +1721,11 @@
- }
- if (!(u = getpwnam(user)))
- return 0;
-+#if APR_MAJOR_VERSION > 0
-+ if (apr_gid_name_get(&gn, u->pw_gid, p) != APR_SUCCESS)
-+#else
- if (apr_group_name_get(&gn, u->pw_gid, p) != APR_SUCCESS)
-+#endif
- return 0;
- if (!strcmp(gn, group))
- return 1;
-@@ -2058,7 +2057,7 @@
- SOAP_SSL_NO_AUTHENTICATION,
- NULL, /* keyfile: required only when client must authenticate to server */
- NULL, /* password to read the key file */
-- "/usr/local/opt/gsoap/etc/ca-cert.pem", /* optional cacert file to store trusted certificates (needed to verify server) */
-+ "/usr/local/etc/ca-cert.pem", /* optional cacert file to store trusted certificates (needed to verify server) */
- NULL, /* optional capath to direcoty with trusted certificates */
- NULL /* if randfile!=NULL: use a file with random data to seed randomness */
- );
-diff -ur mod_sentinel-2.2.orig/soap_src/Makefile mod_sentinel-2.2/soap_src/Makefile
---- mod_sentinel-2.2.orig/soap_src/Makefile 2005-12-22 11:19:52.000000000 -0500
-+++ mod_sentinel-2.2/soap_src/Makefile 2006-08-29 10:58:46.000000000 -0400
-@@ -4,8 +4,8 @@
- all: soaplib
-
- soaplib:
-- ln -s ${GSOAP_PATH}/include/stdsoap2.h
-- ln -s ${GSOAP_SRC}/soapcpp2/gsoap-palm/stdsoap2.c
-+ ln -sf ${GSOAP_PATH}/include/stdsoap2.h
-+ ln -sf ${GSOAP_SRC}/soapcpp2/gsoap-palm/stdsoap2.c
- cp ../wsdl/typemap.dat .
- cp ../wsdl/${PACKAGE}.wsdl .
- wsdl2h -c -s -o ${PACKAGE}.h ${PACKAGE}.wsdl
+ #./apache_includes.sh del