diff options
| author | zhangcheng-aa | 2014-08-16 01:36:34 +0800 |
|---|---|---|
| committer | Jack Nagel | 2014-08-29 11:43:44 -0500 |
| commit | 3f4cf69843893f2de2173b026511dca6ce462a82 (patch) | |
| tree | 88b56fe4eed0b706581d4b45d0bae31fa5ae3eb2 /Library/Formula | |
| parent | b42beaa662dda91dffb278896a9c1106b03dc9d1 (diff) | |
| download | homebrew-3f4cf69843893f2de2173b026511dca6ce462a82.tar.bz2 | |
squid 3.4.6, use pf instead of ipfw
Closes #31620.
Signed-off-by: Jack Nagel <jacknagel@gmail.com>
Diffstat (limited to 'Library/Formula')
| -rw-r--r-- | Library/Formula/squid.rb | 49 |
1 files changed, 6 insertions, 43 deletions
diff --git a/Library/Formula/squid.rb b/Library/Formula/squid.rb index d652d4e76..538a2e363 100644 --- a/Library/Formula/squid.rb +++ b/Library/Formula/squid.rb @@ -15,16 +15,15 @@ end class Squid < Formula homepage 'http://www.squid-cache.org/' - url 'http://www.squid-cache.org/Versions/v3/3.3/squid-3.3.11.tar.gz' - sha1 'e89812a51d4e88abac15c301d571d83549f2d81e' + url 'http://www.squid-cache.org/Versions/v3/3.4/squid-3.4.6.tar.bz2' + sha1 '0b8850a0bf73d85797e441e589324da8309cd738' depends_on NoBdb5 - # fix building on mavericks - # http://bugs.squid-cache.org/show_bug.cgi?id=3954 - patch :DATA if MacOS.version >= :mavericks - def install + # http://stackoverflow.com/questions/20910109/building-squid-cache-on-os-x-mavericks + ENV.append "LDFLAGS", "-lresolv" + # For --disable-eui, see: # http://squid-web-proxy-cache.1019090.n4.nabble.com/ERROR-ARP-MAC-EUI-operations-not-supported-on-this-operating-system-td4659335.html args = %W[ @@ -35,7 +34,7 @@ class Squid < Formula --enable-ssl --enable-ssl-crtd --disable-eui - --enable-ipfw-transparent + --enable-pf-transparent ] system "./configure", *args @@ -66,39 +65,3 @@ class Squid < Formula EOS end end - -__END__ -diff --git a/compat/unsafe.h b/compat/unsafe.h -index d58f546..6c9f7ab 100644 ---- a/compat/unsafe.h -+++ b/compat/unsafe.h -@@ -5,7 +5,7 @@ - * Trap unintentional use of functions unsafe for use within squid. - */ - --#if !SQUID_NO_STRING_BUFFER_PROTECT -+#if !SQUID_NO_STRING_BUFFER_PROTECT && 0 - #ifndef sprintf - #define sprintf ERROR_sprintf_UNSAFE_IN_SQUID - #endif -diff --git a/include/Array.h b/include/Array.h -index 8cee5fa..8f43522 100644 ---- a/include/Array.h -+++ b/include/Array.h -@@ -35,6 +35,7 @@ - \todo CLEANUP: this file should be called Vector.h at least, and probably be replaced by STL Vector<C> - */ - -+#include <iterator> - #include "fatal.h" - #include "util.h" - -@@ -44,7 +45,7 @@ - /* iterator support */ - - template <class C> --class VectorIteratorBase -+class VectorIteratorBase : public std::iterator <std::forward_iterator_tag, typename C::value_type> - { - - public: |