Codebase list gridsite / 29082fc
Port to apache 2.4 Mattias Ellert 10 years ago
11 changed file(s) with 128 addition(s) and 38 deletion(s). Raw diff Collapse all Expand all
+7
-0
debian/changelog less more
0 gridsite (1.7.21-2) unstable; urgency=low
1
2 * Port to apache 2.4 (Closes: #666832, #669855)
3 * Correct package description (Closes: #698519)
4
5 -- Mattias Ellert <mattias.ellert@fysast.uu.se> Fri, 31 May 2013 13:59:38 +0200
6
07 gridsite (1.7.21-1) unstable; urgency=low
18
29 * Latest upstream release
+5
-6
debian/control less more
11 Section: net
22 Priority: optional
33 Maintainer: Mattias Ellert <mattias.ellert@fysast.uu.se>
4 Build-Depends: debhelper, apache2-threaded-dev, libxml2-dev, libcurl4-openssl-dev, libssl-dev, doxygen, sharutils
5 Standards-Version: 3.9.3
4 Build-Depends: debhelper, apache2-dev (>= 2.4), libxml2-dev, libcurl4-openssl-dev, libssl-dev, doxygen, sharutils, dh-apache2
5 Standards-Version: 3.9.4
66 Homepage: http://www.gridsite.org/
77 Vcs-Svn: http://svn.nordugrid.org/repos/packaging/debian/gridsite
88 Vcs-Browser: http://svn.nordugrid.org/trac/packaging/browser/debian/gridsite
9 DM-Upload-Allowed: yes
109
1110 Package: gridsite
1211 Architecture: any
13 Depends: libgridsite1.7 (= ${binary:Version}), apache2.2-bin, ${shlibs:Depends}, ${misc:Depends}
14 Recommends: apache2 | httpd
12 Depends: libgridsite1.7 (= ${binary:Version}), apache2-bin (>= 2.4), ${shlibs:Depends}, ${misc:Depends}
13 Recommends: ${misc:Recommends}
1514 Description: Grid Security for the Web, Web platforms for Grids
1615 GridSite was originally a web application developed for managing and
1716 formatting the content of the http://www.gridpp.ac.uk/ website. Over
6059 web server and a toolkit for Grid credentials, GACL access control
6160 lists and HTTP(S) protocol operations.
6261 .
63 This package, gridsite-setuid, contains the setuid gsexec program.
62 This package, gridsite-gsexec, contains the setuid gsexec program.
6463
6564 Package: libgridsite-dev
6665 Architecture: any
+4
-0
debian/gridsite.apache2 less more
0 mod src/mod_gridsite.so
1 mod debian/gridsite.load
2 conf debian/gridsite.conf
3 site debian/gridsite.site
+0
-4
debian/gridsite.install less more
0 debian/tmp/usr/lib/apache2/modules/mod_gridsite.so
10 debian/tmp/usr/lib/gridsite/cgi-bin/gridsite-copy.cgi
21 debian/tmp/usr/lib/gridsite/cgi-bin/gridsite-storage.cgi
32 debian/tmp/usr/lib/gridsite/cgi-bin/real-gridsite-admin.cgi
54 debian/tmp/etc/grid-security/dn-lists
65 debian/tmp/var/cache/mod_gridsite
76 debian/tmp/usr/share/man/man8/mod_gridsite.8*
8 debian/tmp/etc/apache2/mods-available/zgridsite.conf
9 debian/tmp/etc/apache2/mods-available/zgridsite.load
10 debian/tmp/etc/apache2/sites-available/gridsite
117 debian/tmp/var/lib/gridsite
+7
-0
debian/gridsite.lintian-overrides less more
22 gridsite: non-etc-file-marked-as-conffile *var/lib/gridsite/.gacl
33 gridsite: non-etc-file-marked-as-conffile *var/lib/gridsite/gridsitefoot.txt
44 gridsite: non-etc-file-marked-as-conffile *var/lib/gridsite/gridsitehead.txt
5
6 # This module depends on the ssl module which is in apache2-bin
7 gridsite: apache2-module-depends-on-real-apache2-package apache2-bin
8 gridsite: web-application-depends-on-apache2-data-package apache2-bin
9
10 # This package contains both the module and the application
11 gridsite: non-standard-apache2-module-package-name gridsite != libapache2-mod-gridsite
+1
-0
debian/gridsite.load less more
0 # Depends: ssl
01 LoadModule gridsite_module /usr/lib/apache2/modules/mod_gridsite.so
+0
-16
debian/gridsite.prerm less more
0 #!/bin/bash
1
2 set -e
3
4 #DEBHELPER#
5
6 if [ "$1" != "remove" -a "$1" != "purge" ]; then
7 exit 0
8 fi
9
10 if [ -e /etc/apache2/apache2.conf ]; then
11 a2dissite gridsite || true
12 a2dismod zgridsite || true
13 fi
14
15 exit 0
+24
-0
debian/patches/gridsite-cred-segfault.patch less more
0 diff -rupN org.gridsite.core.ORIG/src/mod_gridsite.c org.gridsite.core/src/mod_gridsite.c
1 --- org.gridsite.core.ORIG/src/mod_gridsite.c 2012-09-13 18:21:12.000000000 +0200
2 +++ org.gridsite.core/src/mod_gridsite.c 2012-09-13 18:21:24.000000000 +0200
3 @@ -3237,12 +3237,14 @@ static int mod_gridsite_perm_handler(req
4
5 apr_table_setn(r->notes, "GRST_PERM", apr_psprintf(r->pool, "%d", perm));
6
7 - cred = user->firstcred;
8 - if ((cred != NULL) && (strncmp(cred->auri, "dn:", 3) == 0))
9 - {
10 - apr_table_setn(r->notes, "GRST_CRED_AURI_0",
11 - apr_psprintf(r->pool, "%s", cred->auri));
12 - }
13 + if (user != NULL) {
14 + cred = user->firstcred;
15 + if ((cred != NULL) && (strncmp(cred->auri, "dn:", 3) == 0))
16 + {
17 + apr_table_setn(r->notes, "GRST_CRED_AURI_0",
18 + apr_psprintf(r->pool, "%s", cred->auri));
19 + }
20 + }
21
22
23 if (((mod_gridsite_dir_cfg *) cfg)->envs)
+75
-0
debian/patches/gridsite-httpd24.patch less more
0 diff -ur org.gridsite.core.orig/src/mod_gridsite.c org.gridsite.core/src/mod_gridsite.c
1 --- org.gridsite.core.orig/src/mod_gridsite.c 2012-03-22 11:04:05.000000000 +0100
2 +++ org.gridsite.core/src/mod_gridsite.c 2013-05-31 14:43:17.410053306 +0200
3 @@ -2075,7 +2075,7 @@
4
5 if (strcasecmp(a->cmd->name, "GridSiteUserGroup") == 0)
6 {
7 - if (!(unixd_config.suexec_enabled))
8 + if (!(ap_unixd_config.suexec_enabled))
9 return "Using GridSiteUserGroup will "
10 "require rebuilding Apache with suexec support!";
11
12 @@ -3054,7 +3054,7 @@
13 r->per_dir_config, REMOTE_DOUBLE_REV, NULL);
14 if ((remotehost != NULL) && (*remotehost != '\0'))
15 {
16 - cred = GRSTgaclCredCreate("ip:", r->connection->remote_ip);
17 + cred = GRSTgaclCredCreate("ip:", r->connection->client_ip);
18 GRSTgaclCredSetNotAfter(cred, GRST_MAX_TIME_T);
19
20 if (user == NULL) user = GRSTgaclUserNew(cred);
21 @@ -3576,7 +3576,7 @@
22 * Log information about CRL
23 * (A little bit complicated because of ASN.1 and BIOs...)
24 */
25 - if (s->loglevel >= APLOG_DEBUG) {
26 + if (s->log.level >= APLOG_DEBUG) {
27 char buff[512]; /* should be plenty */
28 BIO *bio = BIO_new(BIO_s_mem());
29
30 @@ -3673,7 +3673,7 @@
31 ASN1_INTEGER *sn = revoked->serialNumber;
32
33 if (!ASN1_INTEGER_cmp(sn, X509_get_serialNumber(cert))) {
34 - if (s->loglevel >= APLOG_DEBUG) {
35 + if (s->log.level >= APLOG_DEBUG) {
36 char *cp = X509_NAME_oneline(issuer, NULL, 0);
37 char *serial = i2s_ASN1_INTEGER(NULL,sn);
38
39 @@ -3724,7 +3724,7 @@
40 /*
41 * Log verification information
42 */
43 - if (s->loglevel >= APLOG_DEBUG)
44 + if (s->log.level >= APLOG_DEBUG)
45 {
46 X509 *cert = X509_STORE_CTX_get_current_cert(ctx);
47 char *sname = X509_NAME_oneline(X509_get_subject_name(cert), NULL, 0);
48 @@ -4407,7 +4407,7 @@
49 SSL_CTX_set_verify(ctx, ctx->verify_mode,
50 GRST_callback_SSLVerify_wrapper);
51
52 - if (main_server->loglevel >= APLOG_DEBUG)
53 + if (main_server->log.level >= APLOG_DEBUG)
54 ap_log_error(APLOG_MARK, APLOG_DEBUG, 0, main_server,
55 "Set mod_ssl verify callbacks to GridSite wrappers");
56 }
57 @@ -4417,7 +4417,7 @@
58
59 path = ap_server_root_relative(pPool, sessionsdir);
60 apr_dir_make_recursive(path, APR_UREAD | APR_UWRITE | APR_UEXECUTE, pPool);
61 - chown(path, unixd_config.user_id, unixd_config.group_id);
62 + chown(path, ap_unixd_config.user_id, ap_unixd_config.group_id);
63
64 return OK;
65 }
66 @@ -4433,7 +4433,7 @@
67 vasprintf(&mesg, fmt, ap);
68 va_end(ap);
69
70 - ap_log_error(file, line, level,
71 + ap_log_error(file, line, 0, level,
72 0, mod_gridsite_log_func_server, "%s", mesg);
73
74 free(mesg);
+2
-0
debian/patches/series less more
00 cgi-bin-location.patch
11 gridsite-ldflags.patch
2 gridsite-httpd24.patch
3 gridsite-cred-segfault.patch
+3
-12
debian/rules less more
6969 cd src && \
7070 $(MAKE) install prefix=$(INSTALLDIR)$(_prefix)
7171
72 mv $(INSTALLDIR)$(_libdir)/httpd $(INSTALLDIR)$(_libdir)/apache2
72 # Let dh_apache2 handle module installation
73 rm -rf mv $(INSTALLDIR)$(_libdir)/httpd
7374
7475 # Let debhelper do the compression
7576 gunzip $(INSTALLDIR)$(_mandir)/man*/*
9293
9394 mkdir -p $(INSTALLDIR)$(_sysconfdir)/grid-security/dn-lists
9495 mkdir -p $(INSTALLDIR)$(_localstatedir)/cache/mod_gridsite
95
96 # Copy in apache configuration, we must name it zgridsite.conf
97 # so it is loaded after mod_ssl in ssl.conf
98 mkdir -p $(INSTALLDIR)$(_sysconfdir)/apache2/mods-available
99 install -m 0644 debian/gridsite.conf \
100 $(INSTALLDIR)$(_sysconfdir)/apache2/mods-available/zgridsite.conf
101 install -m 0644 debian/gridsite.load \
102 $(INSTALLDIR)$(_sysconfdir)/apache2/mods-available/zgridsite.load
103 mkdir -p $(INSTALLDIR)$(_sysconfdir)/apache2/sites-available
104 install -m 0644 debian/gridsite.site \
105 $(INSTALLDIR)$(_sysconfdir)/apache2/sites-available/gridsite
10696
10797 mkdir -p $(INSTALLDIR)$(_datadir)/apache2/icons
10898 uudecode -o $(INSTALLDIR)$(_datadir)/apache2/icons/gridsitelogo.png \
138128 dh_installdocs -a
139129 dh_installchangelogs -a
140130 dh_install -a --fail-missing
131 dh_apache2 -a
141132 dh_installman -a
142133 dh_lintian -a
143134 dh_link -a