refresh patches and update to STABLE14 of squid

git-svn-id: svn://svn.openwrt.org/openwrt/packages@8164 3c298f89-4303-0410-b956-a3cf2f4a3e73
This commit is contained in:
pavlov
2007-07-25 21:06:20 +00:00
parent 8095d71152
commit 97d678b9ed
6 changed files with 60 additions and 51 deletions

View File

@ -1,6 +1,8 @@
--- squid-2.6.STABLE12/configure 2007-03-20 16:35:44.000000000 -0500
+++ squid-2.6.STABLE12.NEW/configure 2007-04-08 11:49:42.000000000 -0500
@@ -4297,10 +4297,6 @@
Index: squid-2.6.STABLE14/configure
===================================================================
--- squid-2.6.STABLE14.orig/configure 2007-07-25 16:04:15.000000000 -0500
+++ squid-2.6.STABLE14/configure 2007-07-25 16:04:16.000000000 -0500
@@ -4298,10 +4298,6 @@
if test -z "$SSLLIB"; then
SSLLIB="-lcrypto" # for MD5 routines
fi
@ -11,7 +13,7 @@
CPPFLAGS="${SSLFLAGS} $CPPFLAGS"
fi
@@ -8760,7 +8756,7 @@
@@ -8780,7 +8776,7 @@
See \`config.log' for more details." >&5
echo "$as_me: error: cannot run test program while cross compiling
See \`config.log' for more details." >&2;}
@ -20,7 +22,7 @@
else
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
@@ -9174,7 +9170,7 @@
@@ -9194,7 +9190,7 @@
See \`config.log' for more details." >&5
echo "$as_me: error: cannot run test program while cross compiling
See \`config.log' for more details." >&2;}
@ -29,7 +31,7 @@
else
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
@@ -9588,7 +9584,7 @@
@@ -9608,7 +9604,7 @@
See \`config.log' for more details." >&5
echo "$as_me: error: cannot run test program while cross compiling
See \`config.log' for more details." >&2;}
@ -38,7 +40,7 @@
else
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
@@ -10002,7 +9998,7 @@
@@ -10022,7 +10018,7 @@
See \`config.log' for more details." >&5
echo "$as_me: error: cannot run test program while cross compiling
See \`config.log' for more details." >&2;}
@ -47,7 +49,7 @@
else
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
@@ -10416,7 +10412,7 @@
@@ -10436,7 +10432,7 @@
See \`config.log' for more details." >&5
echo "$as_me: error: cannot run test program while cross compiling
See \`config.log' for more details." >&2;}
@ -56,7 +58,7 @@
else
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
@@ -10830,7 +10826,7 @@
@@ -10850,7 +10846,7 @@
See \`config.log' for more details." >&5
echo "$as_me: error: cannot run test program while cross compiling
See \`config.log' for more details." >&2;}
@ -65,7 +67,7 @@
else
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
@@ -10919,7 +10915,7 @@
@@ -11361,7 +11357,7 @@
See \`config.log' for more details." >&5
echo "$as_me: error: cannot run test program while cross compiling
See \`config.log' for more details." >&2;}
@ -74,7 +76,7 @@
else
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
@@ -10992,7 +10988,7 @@
@@ -11889,7 +11885,7 @@
See \`config.log' for more details." >&5
echo "$as_me: error: cannot run test program while cross compiling
See \`config.log' for more details." >&2;}
@ -83,7 +85,7 @@
else
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
@@ -11065,7 +11061,7 @@
@@ -12417,7 +12413,7 @@
See \`config.log' for more details." >&5
echo "$as_me: error: cannot run test program while cross compiling
See \`config.log' for more details." >&2;}
@ -92,7 +94,7 @@
else
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
@@ -11138,7 +11134,7 @@
@@ -12945,7 +12941,7 @@
See \`config.log' for more details." >&5
echo "$as_me: error: cannot run test program while cross compiling
See \`config.log' for more details." >&2;}
@ -101,7 +103,7 @@
else
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
@@ -11211,7 +11207,7 @@
@@ -13473,7 +13469,7 @@
See \`config.log' for more details." >&5
echo "$as_me: error: cannot run test program while cross compiling
See \`config.log' for more details." >&2;}
@ -110,7 +112,7 @@
else
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
@@ -11284,7 +11280,7 @@
@@ -14001,7 +13997,7 @@
See \`config.log' for more details." >&5
echo "$as_me: error: cannot run test program while cross compiling
See \`config.log' for more details." >&2;}
@ -119,7 +121,7 @@
else
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
@@ -11357,7 +11353,7 @@
@@ -14529,7 +14525,7 @@
See \`config.log' for more details." >&5
echo "$as_me: error: cannot run test program while cross compiling
See \`config.log' for more details." >&2;}
@ -128,7 +130,7 @@
else
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
@@ -11430,7 +11426,7 @@
@@ -15057,7 +15053,7 @@
See \`config.log' for more details." >&5
echo "$as_me: error: cannot run test program while cross compiling
See \`config.log' for more details." >&2;}
@ -137,7 +139,7 @@
else
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
@@ -11503,7 +11499,7 @@
@@ -15585,7 +15581,7 @@
See \`config.log' for more details." >&5
echo "$as_me: error: cannot run test program while cross compiling
See \`config.log' for more details." >&2;}
@ -146,7 +148,7 @@
else
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
@@ -11576,7 +11572,7 @@
@@ -16113,7 +16109,7 @@
See \`config.log' for more details." >&5
echo "$as_me: error: cannot run test program while cross compiling
See \`config.log' for more details." >&2;}
@ -155,7 +157,7 @@
else
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
@@ -11649,7 +11645,7 @@
@@ -16641,7 +16637,7 @@
See \`config.log' for more details." >&5
echo "$as_me: error: cannot run test program while cross compiling
See \`config.log' for more details." >&2;}
@ -164,7 +166,7 @@
else
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
@@ -11722,7 +11718,7 @@
@@ -17169,7 +17165,7 @@
See \`config.log' for more details." >&5
echo "$as_me: error: cannot run test program while cross compiling
See \`config.log' for more details." >&2;}
@ -173,7 +175,7 @@
else
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
@@ -11795,7 +11791,7 @@
@@ -17697,7 +17693,7 @@
See \`config.log' for more details." >&5
echo "$as_me: error: cannot run test program while cross compiling
See \`config.log' for more details." >&2;}
@ -182,7 +184,7 @@
else
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
@@ -16302,7 +16298,7 @@
@@ -22106,7 +22102,7 @@
See \`config.log' for more details." >&5
echo "$as_me: error: cannot run test program while cross compiling
See \`config.log' for more details." >&2;}
@ -191,7 +193,7 @@
else
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
@@ -16455,7 +16451,7 @@
@@ -24523,7 +24519,7 @@
See \`config.log' for more details." >&5
echo "$as_me: error: cannot run test program while cross compiling
See \`config.log' for more details." >&2;}
@ -200,7 +202,7 @@
else
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
@@ -16577,7 +16573,7 @@
@@ -24687,7 +24683,7 @@
See \`config.log' for more details." >&5
echo "$as_me: error: cannot run test program while cross compiling
See \`config.log' for more details." >&2;}
@ -209,7 +211,7 @@
else
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
@@ -16686,7 +16682,7 @@
@@ -24809,7 +24805,7 @@
See \`config.log' for more details." >&5
echo "$as_me: error: cannot run test program while cross compiling
See \`config.log' for more details." >&2;}
@ -218,7 +220,7 @@
else
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
@@ -16754,7 +16750,7 @@
@@ -24918,7 +24914,7 @@
See \`config.log' for more details." >&5
echo "$as_me: error: cannot run test program while cross compiling
See \`config.log' for more details." >&2;}