summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--www/squid31/Makefile2
-rw-r--r--www/squid31/distinfo4
-rw-r--r--www/squid31/files/patch-configure23
3 files changed, 3 insertions, 26 deletions
diff --git a/www/squid31/Makefile b/www/squid31/Makefile
index c0867a27c1e6..d7b1477665fb 100644
--- a/www/squid31/Makefile
+++ b/www/squid31/Makefile
@@ -90,7 +90,7 @@ LICENSE_FILE= ${WRKSRC}/COPYING
LATEST_LINK= squid31
-SQUID_STABLE_VER= 20
+SQUID_STABLE_VER= 21
CONFLICTS_INSTALL= squid-2.[0-9].* squid-3.[^1].* cacheboy-[0-9]* lusca-head-[0-9]*
GNU_CONFIGURE= yes
diff --git a/www/squid31/distinfo b/www/squid31/distinfo
index bb0b636ddb26..377b3bd52a15 100644
--- a/www/squid31/distinfo
+++ b/www/squid31/distinfo
@@ -1,2 +1,2 @@
-SHA256 (squid3.1/squid-3.1.20.tar.bz2) = 33cc4d73a1ce523d341a339e2c2df896a51225d7dbd3488d0945a113c908d84c
-SIZE (squid3.1/squid-3.1.20.tar.bz2) = 2559610
+SHA256 (squid3.1/squid-3.1.21.tar.bz2) = eb9e26ebc2f7d992d135a1212540d46ebced9ceb4a74972ee0065477c1dc2e25
+SIZE (squid3.1/squid-3.1.21.tar.bz2) = 2559469
diff --git a/www/squid31/files/patch-configure b/www/squid31/files/patch-configure
deleted file mode 100644
index 2452bff4e81c..000000000000
--- a/www/squid31/files/patch-configure
+++ /dev/null
@@ -1,23 +0,0 @@
-Correct two configure tests that fail whenn g++ is used instead of gcc.
---- configure.orig 2010-05-30 16:00:03.000000000 +0200
-+++ configure 2010-05-30 16:00:33.000000000 +0200
-@@ -48547,7 +48547,10 @@
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h. */
-
-+#include <sys/types.h> /* for setresuid(2) on FreeBSD */
-+#include <stdio.h> /* for perror(3) on FreeBSD */
- #include <stdlib.h>
-+#include <unistd.h> /* for setresuid(2) on FreeBSD */
- int main(int argc, char **argv) {
- if(setresuid(-1,-1,-1)) {
- perror("setresuid:");
-@@ -48632,7 +48635,7 @@
- int main(int argc, char **argv)
- {
- int size = 20;
-- char *str = malloc(size);
-+ char *str = (char *)malloc(size);
- memset(str, 'x', size);
- strnstr(str, "fubar", size);
- return 0;