8b40a2586d
- Remove upstreamed patch (IPv6 + PF crash) - Add --enable-zph-qos option to default set http://wiki.squid-cache.org/Features/QualityOfService - Mark broken if ssl set to openssl-devel, it doesn't build - Switch IPV6 option to options helpers PR: 215418 Submitted by: Pavel Timofeev <timp87@gmail.com> (maintainer) Security: CVE-2016-10002 Security: CVE-2016-10003 Security: https://vuxml.FreeBSD.org/freebsd/41f8af15-c8b9-11e6-ae1b-002590263bf5.html MFH: 2016Q4
20 lines
791 B
C
20 lines
791 B
C
--- compat/compat.h.orig 2016-12-16 10:06:20 UTC
|
|
+++ compat/compat.h
|
|
@@ -29,17 +29,6 @@
|
|
/******************************************************/
|
|
#include "compat/osdetect.h"
|
|
|
|
-/* Solaris 10 has a broken definition for minor_t in IPFilter compat.
|
|
- * We must pre-define before doing anything with OS headers so the OS
|
|
- * do not. Then un-define it before using the IPFilter *_compat.h headers.
|
|
- */
|
|
-#if IPF_TRANSPARENT && USE_SOLARIS_IPFILTER_MINOR_T_HACK
|
|
-/* But we only need do this nasty thing for src/ip/Intercept.cc */
|
|
-#if BUILDING_SQUID_IP_INTERCEPT_CC
|
|
-#define minor_t solaris_minor_t_fubar
|
|
-#endif
|
|
-#endif
|
|
-
|
|
/*****************************************************/
|
|
/* FDSETSIZE is messy and needs to be done before */
|
|
/* sys/types.h are defined. */
|