From ca839269a039d2dc97c151ac94960b31ee7e8087 Mon Sep 17 00:00:00 2001
From: aredridel <aredridel@pld-linux.org>
Date: Mon, 22 Feb 2010 01:46:55 +0000
Subject: [PATCH] - added

Changed files:
    apache-mod_nss-conf.patch -> 1.1
    apache-mod_nss-gencert.patch -> 1.1
    apache-mod_nss-wouldblock.patch -> 1.1
---
 apache-mod_nss-conf.patch       | 70 +++++++++++++++++++++++++++++++++
 apache-mod_nss-gencert.patch    | 26 ++++++++++++
 apache-mod_nss-wouldblock.patch | 12 ++++++
 3 files changed, 108 insertions(+)
 create mode 100644 apache-mod_nss-conf.patch
 create mode 100644 apache-mod_nss-gencert.patch
 create mode 100644 apache-mod_nss-wouldblock.patch

diff --git a/apache-mod_nss-conf.patch b/apache-mod_nss-conf.patch
new file mode 100644
index 0000000..1a3e5fa
--- /dev/null
+++ b/apache-mod_nss-conf.patch
@@ -0,0 +1,70 @@
+--- mod_nss-1.0.6/nss.conf.in.orig	2006-10-20 11:08:42.000000000 -0400
++++ mod_nss-1.0.6/nss.conf.in	2006-10-23 15:27:22.000000000 -0400
+@@ -8,14 +8,16 @@
+ # consult the online docs. You have been warned.  
+ #
+ 
++LoadModule nss_module modules/libmodnss.so
++
+ #
+ # When we also provide SSL we have to listen to the 
+ # standard HTTP port (see above) and to the HTTPS port
+ #
+ # Note: Configurations that use IPv6 but not IPv4-mapped addresses need two
+-#       Listen directives: "Listen [::]:443" and "Listen 0.0.0.0:443"
++#       Listen directives: "Listen [::]:8443" and "Listen 0.0.0.0:443"
+ #
+-Listen 443
++Listen 8443
+ 
+ ##
+ ##  SSL Global Context
+@@ -40,7 +42,7 @@
+ #   Pass Phrase Helper:
+ #   This helper program stores the token password pins between
+ #   restarts of Apache.
+-NSSPassPhraseHelper @apache_bin@/nss_pcache
++NSSPassPhraseHelper /usr/sbin/nss_pcache
+ 
+ #   Configure the SSL Session Cache. 
+ #   NSSSessionCacheSize is the number of entries in the cache.
+@@ -68,17 +70,17 @@
+ ## SSL Virtual Host Context
+ ##
+ 
+-<VirtualHost _default_:443>
++<VirtualHost _default_:8443>
+ 
+ #   General setup for the virtual host
+ #DocumentRoot "@apache_prefix@/htdocs"
+-#ServerName www.example.com:443
++#ServerName www.example.com:8443
+ #ServerAdmin you@example.com
+ 
+ # mod_nss can log to separate log files, you can choose to do that if you'd like
+ # LogLevel is not inherited from httpd.conf.
+-#ErrorLog @apache_prefix@/logs/error_log
+-#TransferLog @apache_prefix@/logs/access_log
++ErrorLog @apache_prefix@/logs/error_log
++TransferLog @apache_prefix@/logs/access_log
+ LogLevel warn
+ 
+ #   SSL Engine Switch:
+@@ -113,7 +115,7 @@
+ #   The NSS security database directory that holds the certificates and
+ #   keys. The database consists of 3 files: cert8.db, key3.db and secmod.db.
+ #   Provide the directory that these files exist.
+-NSSCertificateDatabase @apache_conf@
++NSSCertificateDatabase /etc/httpd/alias
+ 
+ #   Database Prefix:
+ #   In order to be able to store multiple NSS databases in one directory
+@@ -189,7 +191,7 @@
+ <Files ~ "\.(cgi|shtml|phtml|php3?)$">
+     NSSOptions +StdEnvVars
+ </Files>
+-<Directory "@apache_prefix@/cgi-bin">
++<Directory "/var/www/cgi-bin">
+     NSSOptions +StdEnvVars
+ </Directory>
+ 
diff --git a/apache-mod_nss-gencert.patch b/apache-mod_nss-gencert.patch
new file mode 100644
index 0000000..b328032
--- /dev/null
+++ b/apache-mod_nss-gencert.patch
@@ -0,0 +1,26 @@
+---  mod_nss-1.0/gencert.in	2006-06-20 22:43:33.000000000 -0400
++++  mod_nss-1.0/gencert.in.orig	2006-06-20 22:57:08.000000000 -0400
+@@ -82,12 +82,11 @@
+ 
+ DEST=$1
+ 
+-echo "httptest" > $DEST/pw.txt
++echo -e "\n" > $DEST/pw.txt
+ 
+ echo ""
+ echo "#####################################################################"
+-echo "Generating new server certificate and key database. The password"
+-echo "is httptest"
++echo "Generating new server certificate and key database."
+ echo "#####################################################################"
+ $CERTUTIL -N -d $DEST -f $DEST/pw.txt
+ 
+@@ -183,8 +182,4 @@
+ rm $DEST/pw.txt
+ rm $DEST/noise
+ 
+-echo ""
+-echo "The database password is httptest"
+-echo ""
+-
+ exit 0
diff --git a/apache-mod_nss-wouldblock.patch b/apache-mod_nss-wouldblock.patch
new file mode 100644
index 0000000..405b67a
--- /dev/null
+++ b/apache-mod_nss-wouldblock.patch
@@ -0,0 +1,12 @@
+--- mod_nss-1.0.3.orig/nss_engine_io.c	2006-04-07 16:17:12.000000000 -0400
++++ mod_nss-1.0.3/nss_engine_io.c	2009-02-17 22:51:44.000000000 -0500
+@@ -259,7 +259,8 @@
+          */
+         if (APR_STATUS_IS_EAGAIN(inctx->rc) || APR_STATUS_IS_EINTR(inctx->rc)
+                || (inctx->rc == APR_SUCCESS && APR_BRIGADE_EMPTY(inctx->bb))) {
+-            return 0;
++            PR_SetError(PR_WOULD_BLOCK_ERROR, 0);
++            return -1;
+         }
+ 
+         if (inctx->rc != APR_SUCCESS) {
-- 
2.43.0