From 7bba0fb505e8f896a7f1cff091d87b41fad2c1f2 Mon Sep 17 00:00:00 2001 From: František Dvořák Date: Jul 21 2014 09:39:02 +0000 Subject: Upstream to 2.2.5, contains several bugfixes. --- diff --git a/.gitignore b/.gitignore index 9d8ecb3..a3105a9 100644 --- a/.gitignore +++ b/.gitignore @@ -11,3 +11,4 @@ gridsite-1.5.18.src.tar.gz /gridsite-1.7.25.src.tar.gz /gridsite-core_R_2_2_0.tar.gz /gridsite-core_R_2_2_1.tar.gz +/gridsite-core_R_2_2_5.tar.gz diff --git a/gridsite-httpd24_v3.patch b/gridsite-httpd24_v3.patch deleted file mode 100644 index a8d7162..0000000 --- a/gridsite-httpd24_v3.patch +++ /dev/null @@ -1,111 +0,0 @@ -diff -uNr org.gridsite.core.ORIG/src/canl_mod_gridsite.c org.gridsite.core/src/canl_mod_gridsite.c ---- org.gridsite.core.ORIG/src/canl_mod_gridsite.c 2013-09-19 12:39:50.422000000 +0000 -+++ org.gridsite.core/src/canl_mod_gridsite.c 2013-09-19 13:34:34.669000000 +0000 -@@ -2071,7 +2071,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!"; - -@@ -3044,9 +3044,9 @@ - - /* finally add IP credential */ - -- if (r->connection->remote_ip) -+ if (r->connection->client_ip) - { -- 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); -@@ -3933,7 +3933,7 @@ - canl_ssl_ctx_set_clb(c_ctx, 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: %s", - canl_get_error_message(c_ctx)); -@@ -3944,7 +3944,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); - - canl_free_ctx(c_ctx); - return OK; -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 2013-09-19 12:39:50.425000000 +0000 -+++ org.gridsite.core/src/mod_gridsite.c 2013-09-19 13:34:09.398000000 +0000 -@@ -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!"; - -@@ -3050,9 +3050,9 @@ - - /* finally add IP credential */ - -- if (r->connection->remote_ip) -+ if (r->connection->client_ip) - { -- 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); - -@@ -3847,7 +3847,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); -@@ -4552,7 +4552,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"); - } -@@ -4562,7 +4562,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 b938da6..2c499cf 100644 --- a/gridsite.spec +++ b/gridsite.spec @@ -1,10 +1,10 @@ %define aprversion 1 -%define underversion 2_2_1 +%define underversion 2_2_5 %{!?_httpd_mmn: %{expand: %%global _httpd_mmn %%(cat %{_includedir}/httpd/.mmn || echo 0-0)}} Name: gridsite -Version: 2.2.1 -Release: 2%{?dist} +Version: 2.2.5 +Release: 1%{?dist} Summary: Grid Security for the Web, Web platforms for Grids Group: System Environment/Daemons @@ -261,13 +261,14 @@ mkdir -p %{buildroot}%{_sysconfdir}/grid-security/vomsdir %changelog -* Mon Jul 21 2014 František Dvořák - 2.2.1-2 +* Mon Jul 21 2014 František Dvořák - 2.2.5-1 +- Gridsite 2.2.5 Release, several bugfixes +- Patch to build with newer curl 7.37.1 - Removed cgi-bin-location.patch, move files in %%install instead - Replace MYFLAGS by CFLAGS, removed gridsite internal build flags - Owning icons dir - Only major version needed in library wildcard now (libgridsite.so.2.*) - Cleanups (EL5, noarch doc subpackage, buildroot macro, formatting) -- Patch to build with newer curl 7.37.1 * Sat Jun 07 2014 Fedora Release Engineering - 2.2.1-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild diff --git a/sources b/sources index d79a246..9e13f0e 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -4f8af110a53884d50b23e6da4310bd0c gridsite-core_R_2_2_1.tar.gz +d92595269c1618b9357d0b1cb114e215 gridsite-core_R_2_2_5.tar.gz