kpriv/freebsd-ports
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

- Squid 3.1 uses g++ to compile the configuration test programs. This

Browse source 
causes two tests (for setresuid(2) and strnstr(3)) to fail due to
g++ complaining about programming errors within the tests itself.
These tests do work on earlier versions of Squid where gcc is used
to compile them.
- Add a patch to correct these issues
- BUMP PORTREVISION

PR:		ports/147219
Submitted by:	Thomas-Martin Seck <tmseck@web.de> (maintainer)
This commit is contained in:
Sylvio Cesar Teixeira 2010-05-31 00:00:14 +00:00
parent 7e2cb15ad6
commit 428a0bf85e
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=255364
2 changed files with 25 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
www/squid31/Makefile
View file

@ -53,6 +53,7 @@
PORTNAME= squid
PORTVERSION= 3.1.${SQUID_STABLE_VER}
PORTREVISION= 1
CATEGORIES= www ipv6
MASTER_SITES= ftp://ftp.squid-cache.org/pub/%SUBDIR%/ \
http://mirrors.ccs.neu.edu/Squid/ \
@ -74,6 +75,7 @@ MASTER_SITE_SUBDIR= squid
DISTNAME= squid-3.1.${SQUID_STABLE_VER}
DIST_SUBDIR= squid3.1
PATCHFILES=
PATCH_SITES= http://www.squid-cache.org/%SUBDIR%/ \
http://www2.us.squid-cache.org/%SUBDIR%/ \
http://www1.at.squid-cache.org/%SUBDIR%/ \
@ -83,7 +85,6 @@ PATCH_SITES= http://www.squid-cache.org/%SUBDIR%/ \
http://www1.jp.squid-cache.org/%SUBDIR%/ \
http://www2.tw.squid-cache.org/%SUBDIR%/
PATCH_SITE_SUBDIR= Versions/v3/3.1/changesets
PATCHFILES=
MAINTAINER= tmseck@web.de
COMMENT= HTTP Caching Proxy

23
www/squid31/files/patch-configure Normal file
View file

@ -0,0 +1,23 @@
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;