SF.net SVN: gar:[25164] csw/mgar/pkg/mod_nss/trunk

cgrzemba at users.sourceforge.net cgrzemba at users.sourceforge.net
Thu Jul 9 13:29:20 CEST 2015


Revision: 25164
          http://sourceforge.net/p/gar/code/25164
Author:   cgrzemba
Date:     2015-07-09 11:29:20 +0000 (Thu, 09 Jul 2015)
Log Message:
-----------
mod_nss/trunk: fight against an inline function in http_protocol.h

Modified Paths:
--------------
    csw/mgar/pkg/mod_nss/trunk/Makefile

Added Paths:
-----------
    csw/mgar/pkg/mod_nss/trunk/files/0001-fix-ap_log_error-parameter-missmatch.patch
    csw/mgar/pkg/mod_nss/trunk/files/0002-cleanup-includes.patch
    csw/mgar/pkg/mod_nss/trunk/files/0003-remove-incl-protocol.patch

Modified: csw/mgar/pkg/mod_nss/trunk/Makefile
===================================================================
--- csw/mgar/pkg/mod_nss/trunk/Makefile	2015-07-09 06:21:28 UTC (rev 25163)
+++ csw/mgar/pkg/mod_nss/trunk/Makefile	2015-07-09 11:29:20 UTC (rev 25164)
@@ -19,7 +19,11 @@
 DISTFILES += CSWap2modnss.postinstall
 DISTFILES += CSWap2modnss.preremove
 
-BUILD64_LIBS_ONLY = 1
+PATCHFILES += 0001-fix-ap_log_error-parameter-missmatch.patch
+PATCHFILES += 0002-cleanup-includes.patch
+PATCHFILES += 0003-remove-incl-protocol.patch
+
+BUILD64 = 1
 PACKAGING_PLATFORMS += solaris10-sparc
 PACKAGING_PLATFORMS += solaris10-i386
 

Added: csw/mgar/pkg/mod_nss/trunk/files/0001-fix-ap_log_error-parameter-missmatch.patch
===================================================================
--- csw/mgar/pkg/mod_nss/trunk/files/0001-fix-ap_log_error-parameter-missmatch.patch	                        (rev 0)
+++ csw/mgar/pkg/mod_nss/trunk/files/0001-fix-ap_log_error-parameter-missmatch.patch	2015-07-09 11:29:20 UTC (rev 25164)
@@ -0,0 +1,38 @@
+--- a/test_cipher.c
++++ b/test_cipher.c
+@@ -19,21 +19,22 @@
+ #include <sslproto.h>
+ 
+ /* Fake a few Apache and NSPR data types and definitions */
+-typedef char server_rec;
+ typedef int PRBool;
+ typedef int PRInt32;
+ 
+ #define PR_FALSE 0
+ #define PR_TRUE 1
+ 
+-#include <nss_engine_cipher.h>
++#include <apache2/http_core.h>
++#include <apache2/http_log.h>
+ 
++#include <nss_engine_cipher.h>
+ extern cipher_properties ciphers_def[];
+ 
+ /* An Apache-like error logger */
+-int ap_log_error_(const char *fn, int line, int module_index,
++void ap_log_error_(const char *fn, int line, int module_index,
+                  int level, int status,
+-                 const server_rec *s, char *fmt, ...)
++                 const server_rec *s, const char *fmt, ...)
+ {
+     char out[1024];
+     va_list args;
+@@ -42,8 +43,6 @@ int ap_log_error_(const char *fn, int line, int module_index,
+     vsprintf(out, fmt, args);
+     fprintf(stderr,"%s:%d, %s", fn, line, out);
+     va_end(args);
+-
+-    return 0;
+ }
+ 
+ #define ap_log_error_ ap_log_error

Added: csw/mgar/pkg/mod_nss/trunk/files/0002-cleanup-includes.patch
===================================================================
--- csw/mgar/pkg/mod_nss/trunk/files/0002-cleanup-includes.patch	                        (rev 0)
+++ csw/mgar/pkg/mod_nss/trunk/files/0002-cleanup-includes.patch	2015-07-09 11:29:20 UTC (rev 25164)
@@ -0,0 +1,10 @@
+--- a/mod_nss.h
++++ b/mod_nss.h
+@@ -18,7 +18,6 @@
+ 
+ /* Apache headers */
+ #include "httpd.h"
+-#include "http_config.h"
+ #include "http_core.h"
+ #include "http_log.h"
+ #include "http_main.h"

Added: csw/mgar/pkg/mod_nss/trunk/files/0003-remove-incl-protocol.patch
===================================================================
--- csw/mgar/pkg/mod_nss/trunk/files/0003-remove-incl-protocol.patch	                        (rev 0)
+++ csw/mgar/pkg/mod_nss/trunk/files/0003-remove-incl-protocol.patch	2015-07-09 11:29:20 UTC (rev 25164)
@@ -0,0 +1,12 @@
+--- a/mod_nss.h
++++ b/mod_nss.h
+@@ -24,7 +24,9 @@
+ #include "http_main.h"
+ #include "http_connection.h"
+ #include "http_request.h"
++/*
+ #include "http_protocol.h"
++*/
+ #include "mod_ssl.h"
+ #include "util_script.h"
+ #include "util_filter.h"

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.



More information about the devel mailing list