- fix build with new ssl and sasl

Changed files:
    squid-newssl.patch -> 1.1
    squid-sasl.patch -> 1.1

diff --git a/squid-newssl.patch b/squid-newssl.patch
new file mode 100644 (file)
index 0000000..f3f078b
--- /dev/null
+++ b/squid-newssl.patch
@@ -0,0 +1,12 @@
+diff -urN squid-2.5.STABLE1.org/src/ssl_support.c squid-2.5.STABLE1/src/ssl_support.c
+--- squid-2.5.STABLE1.org/src/ssl_support.c    Thu Mar 13 19:11:32 2003
++++ squid-2.5.STABLE1/src/ssl_support.c        Thu Mar 13 19:12:12 2003
+@@ -137,7 +137,7 @@
+       "NETSCAPE_CA_DN_BUG", SSL_OP_NETSCAPE_CA_DN_BUG
+     },
+     {
+-      "NON_EXPORT_FIRST", SSL_OP_NON_EXPORT_FIRST
++      "NON_EXPORT_FIRST", SSL_OP_CIPHER_SERVER_PREFERENCE
+     },
+     {
+       "NETSCAPE_DEMO_CIPHER_CHANGE_BUG", SSL_OP_NETSCAPE_DEMO_CIPHER_CHANGE_BUG

diff --git a/squid-sasl.patch b/squid-sasl.patch
new file mode 100644 (file)
index 0000000..5669c40
--- /dev/null
+++ b/squid-sasl.patch
@@ -0,0 +1,30 @@
+diff -urN squid-2.5.STABLE1.org/helpers/basic_auth/SASL/sasl_auth.c squid-2.5.STABLE1/helpers/basic_auth/SASL/sasl_auth.c
+--- squid-2.5.STABLE1.org/helpers/basic_auth/SASL/sasl_auth.c  Mon Aug 12 18:58:31 2002
++++ squid-2.5.STABLE1/helpers/basic_auth/SASL/sasl_auth.c      Sun Mar 16 21:45:24 2003
+@@ -25,7 +25,7 @@
+  * Compile this program with: gcc -Wall -o sasl_auth sasl_auth.c -lsasl
+  *
+  */
+-#include <sasl.h>
++#include <sasl/sasl.h>
+ #include <stdio.h>
+ #include <errno.h>
+ #include <stdlib.h>
+@@ -56,7 +56,7 @@
+               return 1;
+       }
+ 
+-      rc = sasl_server_new( APP_NAME_SASL, NULL, NULL, NULL, 0, &conn );
++      rc = sasl_server_new( APP_NAME_SASL, NULL, NULL, NULL, NULL, NULL, 0, &conn );
+ 
+       if ( rc != SASL_OK ) {
+               fprintf( stderr, "error %d %s\n", rc, sasl_errstring(rc, NULL, NULL ));
+@@ -84,7 +84,7 @@
+               rfc1738_unescape(username);
+               rfc1738_unescape(password);
+ 
+-              rc = sasl_checkpass(conn, username, strlen(username), password, strlen(password), &errstr);
++              rc = sasl_checkpass(conn, username, strlen(username), password, strlen(password));
+ 
+               if ( rc != SASL_OK ) {
+                       if ( errstr ) {