cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

squid 3.2.5; minor update, it just rolls in the compat/xstrerror.h diff.

Browse Source
This commit is contained in:
sthen 2012-12-17 18:56:56 +00:00
parent ea703d1e08
commit 08607b4d02
4 changed files with 14 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
www/squid/Makefile
View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.137 2012/12/11 18:22:54 sthen Exp $
# $OpenBSD: Makefile,v 1.138 2012/12/17 18:56:56 sthen Exp $
MULTI_PACKAGES= -main -ntlm
@ -8,8 +8,7 @@ COMMENT-main= WWW and FTP proxy cache and accelerator
COMMENT-ldap= LDAP authentication/ACL support for Squid
COMMENT-ntlm= NTLM authentication/ACL support for Squid
V= 3.2.4
REVISION-main= 0
V= 3.2.5
DISTNAME= squid-$V
PKGNAME-main= squid-$V

4
www/squid/distinfo
View File

@ -1,2 +1,2 @@
SHA256 (squid-3.2.4.tar.gz) = WBeOoS2/Cw4YBk8BEFQEd0QXsbCynHDWAkgaOMhP9KY=
SIZE (squid-3.2.4.tar.gz) = 4107442
SHA256 (squid-3.2.5.tar.gz) = MxpQf+wRyJtcz6uvnu3WwgjqoKZLCrpMJHf2hEOzW2k=
SIZE (squid-3.2.5.tar.gz) = 4107649

17
www/squid/patches/patch-compat_xstrerror_h
View File

@ -1,17 +0,0 @@
$OpenBSD: patch-compat_xstrerror_h,v 1.1 2012/12/04 10:40:19 sthen Exp $
http://bazaar.launchpad.net/~squid/squid/3.2/revision/11738#compat/xstrerror.h
--- compat/xstrerror.h.orig Tue Dec 4 01:02:50 2012
+++ compat/xstrerror.h Tue Dec 4 01:03:04 2012
@@ -1,6 +1,10 @@
#ifndef _SQUID_COMPAT_XSTRERROR_H
#define _SQUID_COMPAT_XSTRERROR_H
+#if HAVE_ERRNO_H
+#include <errno.h>
+#endif
+
/** strerror() wrapper replacement.
*
* Provides the guarantee that a string is always returned.

20
www/squid/patches/patch-configure_ac
View File

@ -1,12 +1,10 @@
$OpenBSD: patch-configure_ac,v 1.3 2012/12/11 18:22:54 sthen Exp $
--- configure.ac.orig Sun Dec 2 09:24:01 2012
+++ configure.ac Mon Dec 10 21:10:46 2012
@@ -569,6 +569,16 @@ for module in $squid_disk_module_candidates none; do
if test "x$GCC" = "xyes" -a "x$PRESET_LDFLAGS" = "x" ; then
LDFLAGS="$LDFLAGS -pthread"
$OpenBSD: patch-configure_ac,v 1.4 2012/12/17 18:56:56 sthen Exp $
--- configure.ac.orig Mon Dec 10 09:54:50 2012
+++ configure.ac Mon Dec 17 18:56:23 2012
@@ -566,6 +566,16 @@ for module in $squid_disk_module_candidates none; do
fi
+ fi
+ ;;
fi
;;
+ openbsd)
+ if test `echo "$squid_host_os_version" | tr -d .` -lt 52 ; then
+ AC_MSG_NOTICE(pthread library requires OpenBSD 5.2 or later)
@ -15,6 +13,8 @@ $OpenBSD: patch-configure_ac,v 1.3 2012/12/11 18:22:54 sthen Exp $
+ SQUID_CFLAGS="$SQUID_CFLAGS -D_REENTRANT"
+ SQUID_CXXFLAGS="$SQUID_CXXFLAGS -D_REENTRANT"
+ LDFLAGS="$LDFLAGS -lpthread"
fi
;;
+ fi
+ ;;
solaris)
if test "x$GCC" = "xyes" ; then
SQUID_CFLAGS="$SQUID_CFLAGS -D_REENTRANT -pthreads"