[Pkg-fedora-ds-maintainers] libapache2-mod-nss: Changes to 'debian-unstable'
Timo Aaltonen
tjaalton-guest at alioth.debian.org
Tue Jul 9 13:23:06 UTC 2013
debian/changelog | 3
debian/control | 6 -
debian/libapache2-mod-nss.apache2 | 2
debian/libapache2-mod-nss.install | 2
debian/patches/mod_nss-httpd24.patch | 135 +++++++++++++++++++++++++++++++++++
debian/patches/series | 1
debian/rules | 1
7 files changed, 145 insertions(+), 5 deletions(-)
New commits:
commit 84f3f056134017630131458114021f743ba1c102
Author: Timo Aaltonen <tjaalton at ubuntu.com>
Date: Tue Jul 9 16:22:14 2013 +0300
really add mod_nss-httpd24.patch
diff --git a/debian/patches/mod_nss-httpd24.patch b/debian/patches/mod_nss-httpd24.patch
new file mode 100644
index 0000000..4863140
--- /dev/null
+++ b/debian/patches/mod_nss-httpd24.patch
@@ -0,0 +1,135 @@
+diff -ru mod_nss/mod_nss.c mod_nss-1.0.8/mod_nss.c
+--- mod_nss/mod_nss.c 2012-06-12 12:23:29.961000000 -0700
++++ mod_nss-1.0.8/mod_nss.c 2012-06-12 12:00:35.957002099 -0700
+@@ -349,7 +349,7 @@
+ ap_log_error(APLOG_MARK, APLOG_INFO, 0, c->base_server,
+ "Connection to child %ld established "
+ "(server %s, client %s)", c->id, sc->vhost_id,
+- c->remote_ip ? c->remote_ip : "unknown");
++ c->client_ip ? c->client_ip : "unknown");
+
+ mctx = sslconn->is_proxy ? sc->proxy : sc->server;
+
+diff -ru mod_nss/mod_nss.h mod_nss-1.0.8/mod_nss.h
+--- mod_nss/mod_nss.h 2012-06-12 12:23:29.962000000 -0700
++++ mod_nss-1.0.8/mod_nss.h 2012-06-12 12:00:35.955002240 -0700
+@@ -27,7 +27,6 @@
+ #include "http_protocol.h"
+ #include "util_script.h"
+ #include "util_filter.h"
+-#include "mpm.h"
+ #include "apr.h"
+ #include "apr_strings.h"
+ #define APR_WANT_STRFUNC
+@@ -490,7 +489,7 @@
+ SECStatus nss_Init_Tokens(server_rec *s);
+
+ /* Logging */
+-void nss_log_nss_error(const char *file, int line, int level, server_rec *s);
++void nss_log_nss_error(const char *file, int line, int module_index, int level, server_rec *s);
+ void nss_die(void);
+
+ /* NSS callback */
+diff -ru mod_nss/nss_engine_init.c mod_nss-1.0.8/nss_engine_init.c
+--- mod_nss/nss_engine_init.c 2012-06-12 12:23:29.962000000 -0700
++++ mod_nss-1.0.8/nss_engine_init.c 2012-06-12 12:00:35.955002240 -0700
+@@ -15,7 +15,7 @@
+
+ #include "mod_nss.h"
+ #include "apr_thread_proc.h"
+-#include "ap_mpm.h"
++#include "mpm_common.h"
+ #include "secmod.h"
+ #include "sslerr.h"
+ #include "pk11func.h"
+diff -ru mod_nss/nss_engine_io.c mod_nss-1.0.8/nss_engine_io.c
+--- mod_nss/nss_engine_io.c 2012-06-12 12:23:29.963000000 -0700
++++ mod_nss-1.0.8/nss_engine_io.c 2012-06-12 12:00:35.956002167 -0700
+@@ -621,13 +621,13 @@
+ PR_Close(ssl);
+
+ /* log the fact that we've closed the connection */
+- if (c->base_server->loglevel >= APLOG_INFO) {
++ if (c->base_server->log.level >= APLOG_INFO) {
+ ap_log_error(APLOG_MARK, APLOG_INFO, 0, c->base_server,
+ "Connection to child %ld closed "
+ "(server %s, client %s)",
+ c->id,
+ nss_util_vhostid(c->pool, c->base_server),
+- c->remote_ip ? c->remote_ip : "unknown");
++ c->client_ip ? c->client_ip : "unknown");
+ }
+
+ /* deallocate the SSL connection */
+@@ -1165,7 +1165,7 @@
+ filter_ctx = (nss_filter_ctx_t *)(fd->secret);
+ c = filter_ctx->c;
+
+- return PR_StringToNetAddr(c->remote_ip, addr);
++ return PR_StringToNetAddr(c->client_ip, addr);
+ }
+
+ /*
+diff -ru mod_nss/nss_engine_kernel.c mod_nss-1.0.8/nss_engine_kernel.c
+--- mod_nss/nss_engine_kernel.c 2012-06-12 12:23:29.963000000 -0700
++++ mod_nss-1.0.8/nss_engine_kernel.c 2012-06-12 12:00:35.954002314 -0700
+@@ -73,7 +73,7 @@
+ /*
+ * Log information about incoming HTTPS requests
+ */
+- if (r->server->loglevel >= APLOG_INFO && ap_is_initial_req(r)) {
++ if (r->server->log.level >= APLOG_INFO && ap_is_initial_req(r)) {
+ ap_log_error(APLOG_MARK, APLOG_INFO, 0, r->server,
+ "%s HTTPS request received for child %ld (server %s)",
+ (r->connection->keepalives <= 0 ?
+@@ -530,7 +530,7 @@
+ ap_log_error(APLOG_MARK, APLOG_INFO, 0, r->server,
+ "Access to %s denied for %s "
+ "(requirement expression not fulfilled)",
+- r->filename, r->connection->remote_ip);
++ r->filename, r->connection->client_ip);
+
+ ap_log_error(APLOG_MARK, APLOG_INFO, 0, r->server,
+ "Failed expression: %s", req->cpExpr);
+diff -ru mod_nss/nss_engine_log.c mod_nss-1.0.8/nss_engine_log.c
+--- mod_nss/nss_engine_log.c 2012-06-12 12:23:29.964000000 -0700
++++ mod_nss-1.0.8/nss_engine_log.c 2012-06-12 12:00:35.955002240 -0700
+@@ -321,7 +321,7 @@
+ exit(1);
+ }
+
+-void nss_log_nss_error(const char *file, int line, int level, server_rec *s)
++void nss_log_nss_error(const char *file, int line, int module_index, int level, server_rec *s)
+ {
+ const char *err;
+ PRInt32 error;
+@@ -340,7 +340,7 @@
+ err = "Unknown";
+ }
+
+- ap_log_error(file, line, level, 0, s,
++ ap_log_error(file, line, module_index, level, 0, s,
+ "SSL Library Error: %d %s",
+ error, err);
+ }
+diff -ru mod_nss/nss_engine_vars.c mod_nss-1.0.8/nss_engine_vars.c
+--- mod_nss/nss_engine_vars.c 2012-06-12 12:23:29.965000000 -0700
++++ mod_nss-1.0.8/nss_engine_vars.c 2012-06-12 12:00:35.948002812 -0700
+@@ -178,7 +178,7 @@
+ && sslconn && sslconn->ssl)
+ result = nss_var_lookup_ssl(p, c, var+4);
+ else if (strcEQ(var, "REMOTE_ADDR"))
+- result = c->remote_ip;
++ result = c->client_ip;
+ else if (strcEQ(var, "HTTPS")) {
+ if (sslconn && sslconn->ssl)
+ result = "on";
+@@ -194,7 +194,7 @@
+ if (strlen(var) > 12 && strcEQn(var, "SSL_VERSION_", 12))
+ result = nss_var_lookup_nss_version(p, var+12);
+ else if (strcEQ(var, "SERVER_SOFTWARE"))
+- result = (char *)ap_get_server_version();
++ result = (char *)ap_get_server_banner();
+ else if (strcEQ(var, "API_VERSION")) {
+ result = apr_psprintf(p, "%d", MODULE_MAGIC_NUMBER);
+ resdup = FALSE;
commit 2dcfec30ee7f54c32e1fe2b723339fe6900353fa
Author: Timo Aaltonen <tjaalton at ubuntu.com>
Date: Tue Jul 9 16:21:51 2013 +0300
control: Bump policy to 3.9.4, no changes.
diff --git a/debian/changelog b/debian/changelog
index c62eeac..d2749a5 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,6 +5,7 @@ libapache2-mod-nss (1.0.8-3) UNRELEASED; urgency=low
instead of memcpy. (LP: #1093974)
* mod_nss-httpd24.patch: Port to Apache 2.4. (Closes: #707064)
* control, rules, libapache2-mod-nss.apache2: Port to apache2-dev.
+ * control: Bump policy to 3.9.4, no changes.
-- Timo Aaltonen <tjaalton at ubuntu.com> Sat, 01 Dec 2012 13:54:48 +0200
diff --git a/debian/control b/debian/control
index 3b12a21..17f2a77 100644
--- a/debian/control
+++ b/debian/control
@@ -15,7 +15,7 @@ Build-Depends: debhelper (>= 5),
libtool,
pkg-config,
flex,
-Standards-Version: 3.9.3
+Standards-Version: 3.9.4
Homepage: http://directory.fedoraproject.org
Vcs-Git: git://git.debian.org/git/pkg-fedora-ds/libapache2-mod-nss.git
Vcs-Browser: http://anonscm.debian.org/gitweb/?p=pkg-fedora-ds/libapache2-mod-nss.git
commit 2e49071af8c47e522331f4f91dac05caa37d8fff
Author: Timo Aaltonen <tjaalton at ubuntu.com>
Date: Tue Jul 9 15:29:11 2013 +0300
control, rules, libapache2-mod-nss.apache2: Port to apache2-dev.
diff --git a/debian/changelog b/debian/changelog
index dfa1a37..c62eeac 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,7 @@ libapache2-mod-nss (1.0.8-3) UNRELEASED; urgency=low
* mod_nss-overlapping_memcpy.patch: Patch from Fedora to use memmove
instead of memcpy. (LP: #1093974)
* mod_nss-httpd24.patch: Port to Apache 2.4. (Closes: #707064)
+ * control, rules, libapache2-mod-nss.apache2: Port to apache2-dev.
-- Timo Aaltonen <tjaalton at ubuntu.com> Sat, 01 Dec 2012 13:54:48 +0200
diff --git a/debian/control b/debian/control
index 136fd46..3b12a21 100644
--- a/debian/control
+++ b/debian/control
@@ -4,7 +4,8 @@ Priority: extra
Maintainer: Debian 389ds Team <pkg-fedora-ds-maintainers at lists.alioth.debian.org>
Uploaders: Timo Aaltonen <tjaalton at ubuntu.com>
Build-Depends: debhelper (>= 5),
- apache2-threaded-dev (>= 2.2.3),
+ dh-apache2,
+ apache2-dev (>= 2.4),
libnss3-dev,
libapr1-dev,
quilt,
@@ -22,7 +23,6 @@ Vcs-Browser: http://anonscm.debian.org/gitweb/?p=pkg-fedora-ds/libapache2-mod-ns
Package: libapache2-mod-nss
Architecture: any
Depends: ${shlibs:Depends}, ${misc:Depends},
- apache2.2-common (>= 2.2.3-2),
libnss3-tools,
Description: NSS-based SSL module for Apache2
This Apache module provides strong cryptography for the Apache 2.0 webserver
diff --git a/debian/libapache2-mod-nss.apache2 b/debian/libapache2-mod-nss.apache2
new file mode 100644
index 0000000..16f5afe
--- /dev/null
+++ b/debian/libapache2-mod-nss.apache2
@@ -0,0 +1,2 @@
+mod .libs/mod_nss.so
+mod debian/nss.load
diff --git a/debian/libapache2-mod-nss.install b/debian/libapache2-mod-nss.install
index 3a9e69a..3f9dd66 100644
--- a/debian/libapache2-mod-nss.install
+++ b/debian/libapache2-mod-nss.install
@@ -1,5 +1,3 @@
-.libs/mod_nss.so usr/lib/apache2/modules
-debian/nss.load etc/apache2/mods-available
debian/nss.conf etc/apache2/mods-available
nss_pcache usr/sbin
gencert usr/share/libapache2-mod-nss
diff --git a/debian/rules b/debian/rules
index 4bfc642..881e03e 100755
--- a/debian/rules
+++ b/debian/rules
@@ -77,6 +77,7 @@ binary-arch: build install
dh_installchangelogs -a
dh_installdocs -a
dh_install
+ dh_apache2
dh_link -a
dh_strip
dh_compress -a
commit 199985c6b5a63d22799de28fdce8146b9fc20789
Author: Timo Aaltonen <tjaalton at ubuntu.com>
Date: Tue Jul 9 15:09:30 2013 +0300
mod_nss-httpd24.patch: Port to Apache 2.4. (Closes: #707064)
diff --git a/debian/changelog b/debian/changelog
index 4723152..dfa1a37 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,7 @@ libapache2-mod-nss (1.0.8-3) UNRELEASED; urgency=low
* watch: Add a comment about the upstream git tree.
* mod_nss-overlapping_memcpy.patch: Patch from Fedora to use memmove
instead of memcpy. (LP: #1093974)
+ * mod_nss-httpd24.patch: Port to Apache 2.4. (Closes: #707064)
-- Timo Aaltonen <tjaalton at ubuntu.com> Sat, 01 Dec 2012 13:54:48 +0200
diff --git a/debian/patches/series b/debian/patches/series
index 2207cc0..7910f9f 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -9,3 +9,4 @@ mod_nss-pcachesignal.patch
mod_nss-reseterror.patch
mod_nss-lockpcache.patch
mod_nss-overlapping_memcpy.patch
+mod_nss-httpd24.patch
More information about the Pkg-fedora-ds-maintainers
mailing list