mirror/freebsd-ports
1
0
Fork 0
mirror of https://git.FreeBSD.org/ports.git synced 2024-10-22 20:41:26 +00:00
Code Issues Releases Activity

Integrate two vendor patches being published on

Browse Source 
<http://www.squid-cache.org/Versions/v2/2.5/bugs/>:

- Fix wbinfo_group.pl to correctly work with the wbinfo command
  from samba-3.0.21 (squid bug #1472)

- Fix a crash when accessing async IO function counters via the
  cachemgr CGI in cases where squid was compiled for aufs support
  but not actually using it (squid bug #1464)

While at it, remove an unneeded patch from the ICAP core patchset.

PR:		ports/91831
Submitted by:	maintainer
This commit is contained in:
Sergey Matveychuk 2006-01-15 15:44:36 +00:00
parent 9669e20176
commit 7f1969a357
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=153570
18 changed files with 60 additions and 234 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
www/squid/Makefile
View File

@ -73,7 +73,7 @@
PORTNAME= squid
PORTVERSION= 2.5.12
PORTREVISION= 3
PORTREVISION= 4
CATEGORIES= www
MASTER_SITES= \
ftp://ftp.squid-cache.org/pub/%SUBDIR%/ \
@ -86,7 +86,9 @@ DISTNAME= squid-2.5.STABLE12
DIST_SUBDIR= squid2.5
PATCH_SITES= http://www.squid-cache.org/Versions/v2/2.5/bugs/
PATCHFILES= squid-2.5.STABLE12-SMB_BadFetch.patch
PATCHFILES= squid-2.5.STABLE12-SMB_BadFetch.patch \
squid-2.5.STABLE12-wbinfo_group.patch \
squid-2.5.STABLE12-asyncio_counters.patch
PATCH_DIST_STRIP= -p1
MAINTAINER= tmseck@netcologne.de

6
www/squid/distinfo
View File

@ -4,3 +4,9 @@ SIZE (squid2.5/squid-2.5.STABLE12.tar.bz2) = 1075111
MD5 (squid2.5/squid-2.5.STABLE12-SMB_BadFetch.patch) = 8e83b776c0d015bd4137cc1ca08f6d38
SHA256 (squid2.5/squid-2.5.STABLE12-SMB_BadFetch.patch) = 9ca8427c2eb9e5cbdb5a49fb5cb94fc00853ad965f87666f8fc35236e98bc0ae
SIZE (squid2.5/squid-2.5.STABLE12-SMB_BadFetch.patch) = 826
MD5 (squid2.5/squid-2.5.STABLE12-wbinfo_group.patch) = fe0ab5839d282fda67ffd8eb17f2588d
SHA256 (squid2.5/squid-2.5.STABLE12-wbinfo_group.patch) = 9aa671be4022f1126071cf83ca800795f609b731aac74237bc70e11d8f069046
SIZE (squid2.5/squid-2.5.STABLE12-wbinfo_group.patch) = 1615
MD5 (squid2.5/squid-2.5.STABLE12-asyncio_counters.patch) = 70485fac2c02d836f7027122e65d5767
SHA256 (squid2.5/squid-2.5.STABLE12-asyncio_counters.patch) = 39bf2ca95a3c1fc90a40c437253dbbf6d71f37763369ada287039340a68b873f
SIZE (squid2.5/squid-2.5.STABLE12-asyncio_counters.patch) = 497

37
www/squid/files/icap-2.5-core.patch
View File

@ -1147,43 +1147,6 @@ diff -p -u -b -r1.10 -r1.10.30.2
+#endif
+
#endif /* SQUID_UTIL_H */
Index: lib/Makefile.am
===================================================================
RCS file: /cvsroot/squid/squid/lib/Makefile.am,v
retrieving revision 1.4
retrieving revision 1.4.26.2
diff -p -u -b -r1.4 -r1.4.26.2
--- lib/Makefile.am 21 Nov 2001 23:48:57 -0000 1.4
+++ lib/Makefile.am 6 Apr 2004 13:04:38 -0000 1.4.26.2
@@ -8,6 +8,19 @@ SNPRINTFSOURCE=snprintf.c
else
SNPRINTFSOURCE=
endif
+
+if NEED_OWN_STRNSTR
+STRNSTRSOURCE=strnstr.c
+else
+STRNSTRSOURCE=
+endif
+
+if NEED_OWN_STRCASESTR
+STRCASESTRSOURCE=strcasestr.c
+else
+STRCASESTRSOURCE=
+endif
+
if NEED_OWN_MD5
MD5SOURCE=md5.c
else
@@ -43,6 +56,8 @@ libmiscutil_a_SOURCES = \
$(SNPRINTFSOURCE) \
splay.c \
Stack.c \
+ $(STRNSTRSOURCE) \
+ $(STRCASESTRSOURCE) \
stub_memaccount.c \
util.c \
uudecode.c
Index: lib/strcasestr.c
===================================================================
RCS file: lib/strcasestr.c

6
www/squid25/Makefile
View File

@ -73,7 +73,7 @@
PORTNAME= squid
PORTVERSION= 2.5.12
PORTREVISION= 3
PORTREVISION= 4
CATEGORIES= www
MASTER_SITES= \
ftp://ftp.squid-cache.org/pub/%SUBDIR%/ \
@ -86,7 +86,9 @@ DISTNAME= squid-2.5.STABLE12
DIST_SUBDIR= squid2.5
PATCH_SITES= http://www.squid-cache.org/Versions/v2/2.5/bugs/
PATCHFILES= squid-2.5.STABLE12-SMB_BadFetch.patch
PATCHFILES= squid-2.5.STABLE12-SMB_BadFetch.patch \
squid-2.5.STABLE12-wbinfo_group.patch \
squid-2.5.STABLE12-asyncio_counters.patch
PATCH_DIST_STRIP= -p1
MAINTAINER= tmseck@netcologne.de

6
www/squid25/distinfo
View File

@ -4,3 +4,9 @@ SIZE (squid2.5/squid-2.5.STABLE12.tar.bz2) = 1075111
MD5 (squid2.5/squid-2.5.STABLE12-SMB_BadFetch.patch) = 8e83b776c0d015bd4137cc1ca08f6d38
SHA256 (squid2.5/squid-2.5.STABLE12-SMB_BadFetch.patch) = 9ca8427c2eb9e5cbdb5a49fb5cb94fc00853ad965f87666f8fc35236e98bc0ae
SIZE (squid2.5/squid-2.5.STABLE12-SMB_BadFetch.patch) = 826
MD5 (squid2.5/squid-2.5.STABLE12-wbinfo_group.patch) = fe0ab5839d282fda67ffd8eb17f2588d
SHA256 (squid2.5/squid-2.5.STABLE12-wbinfo_group.patch) = 9aa671be4022f1126071cf83ca800795f609b731aac74237bc70e11d8f069046
SIZE (squid2.5/squid-2.5.STABLE12-wbinfo_group.patch) = 1615
MD5 (squid2.5/squid-2.5.STABLE12-asyncio_counters.patch) = 70485fac2c02d836f7027122e65d5767
SHA256 (squid2.5/squid-2.5.STABLE12-asyncio_counters.patch) = 39bf2ca95a3c1fc90a40c437253dbbf6d71f37763369ada287039340a68b873f
SIZE (squid2.5/squid-2.5.STABLE12-asyncio_counters.patch) = 497

37
www/squid25/files/icap-2.5-core.patch
View File

@ -1147,43 +1147,6 @@ diff -p -u -b -r1.10 -r1.10.30.2
+#endif
+
#endif /* SQUID_UTIL_H */
Index: lib/Makefile.am
===================================================================
RCS file: /cvsroot/squid/squid/lib/Makefile.am,v
retrieving revision 1.4
retrieving revision 1.4.26.2
diff -p -u -b -r1.4 -r1.4.26.2
--- lib/Makefile.am 21 Nov 2001 23:48:57 -0000 1.4
+++ lib/Makefile.am 6 Apr 2004 13:04:38 -0000 1.4.26.2
@@ -8,6 +8,19 @@ SNPRINTFSOURCE=snprintf.c
else
SNPRINTFSOURCE=
endif
+
+if NEED_OWN_STRNSTR
+STRNSTRSOURCE=strnstr.c
+else
+STRNSTRSOURCE=
+endif
+
+if NEED_OWN_STRCASESTR
+STRCASESTRSOURCE=strcasestr.c
+else
+STRCASESTRSOURCE=
+endif
+
if NEED_OWN_MD5
MD5SOURCE=md5.c
else
@@ -43,6 +56,8 @@ libmiscutil_a_SOURCES = \
$(SNPRINTFSOURCE) \
splay.c \
Stack.c \
+ $(STRNSTRSOURCE) \
+ $(STRCASESTRSOURCE) \
stub_memaccount.c \
util.c \
uudecode.c
Index: lib/strcasestr.c
===================================================================
RCS file: lib/strcasestr.c

6
www/squid26/Makefile
View File

@ -73,7 +73,7 @@
PORTNAME= squid
PORTVERSION= 2.5.12
PORTREVISION= 3
PORTREVISION= 4
CATEGORIES= www
MASTER_SITES= \
ftp://ftp.squid-cache.org/pub/%SUBDIR%/ \
@ -86,7 +86,9 @@ DISTNAME= squid-2.5.STABLE12
DIST_SUBDIR= squid2.5
PATCH_SITES= http://www.squid-cache.org/Versions/v2/2.5/bugs/
PATCHFILES= squid-2.5.STABLE12-SMB_BadFetch.patch
PATCHFILES= squid-2.5.STABLE12-SMB_BadFetch.patch \
squid-2.5.STABLE12-wbinfo_group.patch \
squid-2.5.STABLE12-asyncio_counters.patch
PATCH_DIST_STRIP= -p1
MAINTAINER= tmseck@netcologne.de

6
www/squid26/distinfo
View File

@ -4,3 +4,9 @@ SIZE (squid2.5/squid-2.5.STABLE12.tar.bz2) = 1075111
MD5 (squid2.5/squid-2.5.STABLE12-SMB_BadFetch.patch) = 8e83b776c0d015bd4137cc1ca08f6d38
SHA256 (squid2.5/squid-2.5.STABLE12-SMB_BadFetch.patch) = 9ca8427c2eb9e5cbdb5a49fb5cb94fc00853ad965f87666f8fc35236e98bc0ae
SIZE (squid2.5/squid-2.5.STABLE12-SMB_BadFetch.patch) = 826
MD5 (squid2.5/squid-2.5.STABLE12-wbinfo_group.patch) = fe0ab5839d282fda67ffd8eb17f2588d
SHA256 (squid2.5/squid-2.5.STABLE12-wbinfo_group.patch) = 9aa671be4022f1126071cf83ca800795f609b731aac74237bc70e11d8f069046
SIZE (squid2.5/squid-2.5.STABLE12-wbinfo_group.patch) = 1615
MD5 (squid2.5/squid-2.5.STABLE12-asyncio_counters.patch) = 70485fac2c02d836f7027122e65d5767
SHA256 (squid2.5/squid-2.5.STABLE12-asyncio_counters.patch) = 39bf2ca95a3c1fc90a40c437253dbbf6d71f37763369ada287039340a68b873f
SIZE (squid2.5/squid-2.5.STABLE12-asyncio_counters.patch) = 497

37
www/squid26/files/icap-2.5-core.patch
View File

@ -1147,43 +1147,6 @@ diff -p -u -b -r1.10 -r1.10.30.2
+#endif
+
#endif /* SQUID_UTIL_H */
Index: lib/Makefile.am
===================================================================
RCS file: /cvsroot/squid/squid/lib/Makefile.am,v
retrieving revision 1.4
retrieving revision 1.4.26.2
diff -p -u -b -r1.4 -r1.4.26.2
--- lib/Makefile.am 21 Nov 2001 23:48:57 -0000 1.4
+++ lib/Makefile.am 6 Apr 2004 13:04:38 -0000 1.4.26.2
@@ -8,6 +8,19 @@ SNPRINTFSOURCE=snprintf.c
else
SNPRINTFSOURCE=
endif
+
+if NEED_OWN_STRNSTR
+STRNSTRSOURCE=strnstr.c
+else
+STRNSTRSOURCE=
+endif
+
+if NEED_OWN_STRCASESTR
+STRCASESTRSOURCE=strcasestr.c
+else
+STRCASESTRSOURCE=
+endif
+
if NEED_OWN_MD5
MD5SOURCE=md5.c
else
@@ -43,6 +56,8 @@ libmiscutil_a_SOURCES = \
$(SNPRINTFSOURCE) \
splay.c \
Stack.c \
+ $(STRNSTRSOURCE) \
+ $(STRCASESTRSOURCE) \
stub_memaccount.c \
util.c \
uudecode.c
Index: lib/strcasestr.c
===================================================================
RCS file: lib/strcasestr.c

6
www/squid27/Makefile
View File

@ -73,7 +73,7 @@
PORTNAME= squid
PORTVERSION= 2.5.12
PORTREVISION= 3
PORTREVISION= 4
CATEGORIES= www
MASTER_SITES= \
ftp://ftp.squid-cache.org/pub/%SUBDIR%/ \
@ -86,7 +86,9 @@ DISTNAME= squid-2.5.STABLE12
DIST_SUBDIR= squid2.5
PATCH_SITES= http://www.squid-cache.org/Versions/v2/2.5/bugs/
PATCHFILES= squid-2.5.STABLE12-SMB_BadFetch.patch
PATCHFILES= squid-2.5.STABLE12-SMB_BadFetch.patch \
squid-2.5.STABLE12-wbinfo_group.patch \
squid-2.5.STABLE12-asyncio_counters.patch
PATCH_DIST_STRIP= -p1
MAINTAINER= tmseck@netcologne.de

6
www/squid27/distinfo
View File

@ -4,3 +4,9 @@ SIZE (squid2.5/squid-2.5.STABLE12.tar.bz2) = 1075111
MD5 (squid2.5/squid-2.5.STABLE12-SMB_BadFetch.patch) = 8e83b776c0d015bd4137cc1ca08f6d38
SHA256 (squid2.5/squid-2.5.STABLE12-SMB_BadFetch.patch) = 9ca8427c2eb9e5cbdb5a49fb5cb94fc00853ad965f87666f8fc35236e98bc0ae
SIZE (squid2.5/squid-2.5.STABLE12-SMB_BadFetch.patch) = 826
MD5 (squid2.5/squid-2.5.STABLE12-wbinfo_group.patch) = fe0ab5839d282fda67ffd8eb17f2588d
SHA256 (squid2.5/squid-2.5.STABLE12-wbinfo_group.patch) = 9aa671be4022f1126071cf83ca800795f609b731aac74237bc70e11d8f069046
SIZE (squid2.5/squid-2.5.STABLE12-wbinfo_group.patch) = 1615
MD5 (squid2.5/squid-2.5.STABLE12-asyncio_counters.patch) = 70485fac2c02d836f7027122e65d5767
SHA256 (squid2.5/squid-2.5.STABLE12-asyncio_counters.patch) = 39bf2ca95a3c1fc90a40c437253dbbf6d71f37763369ada287039340a68b873f
SIZE (squid2.5/squid-2.5.STABLE12-asyncio_counters.patch) = 497

37
www/squid27/files/icap-2.5-core.patch
View File

@ -1147,43 +1147,6 @@ diff -p -u -b -r1.10 -r1.10.30.2
+#endif
+
#endif /* SQUID_UTIL_H */
Index: lib/Makefile.am
===================================================================
RCS file: /cvsroot/squid/squid/lib/Makefile.am,v
retrieving revision 1.4
retrieving revision 1.4.26.2
diff -p -u -b -r1.4 -r1.4.26.2
--- lib/Makefile.am 21 Nov 2001 23:48:57 -0000 1.4
+++ lib/Makefile.am 6 Apr 2004 13:04:38 -0000 1.4.26.2
@@ -8,6 +8,19 @@ SNPRINTFSOURCE=snprintf.c
else
SNPRINTFSOURCE=
endif
+
+if NEED_OWN_STRNSTR
+STRNSTRSOURCE=strnstr.c
+else
+STRNSTRSOURCE=
+endif
+
+if NEED_OWN_STRCASESTR
+STRCASESTRSOURCE=strcasestr.c
+else
+STRCASESTRSOURCE=
+endif
+
if NEED_OWN_MD5
MD5SOURCE=md5.c
else
@@ -43,6 +56,8 @@ libmiscutil_a_SOURCES = \
$(SNPRINTFSOURCE) \
splay.c \
Stack.c \
+ $(STRNSTRSOURCE) \
+ $(STRCASESTRSOURCE) \
stub_memaccount.c \
util.c \
uudecode.c
Index: lib/strcasestr.c
===================================================================
RCS file: lib/strcasestr.c

6
www/squid30/Makefile
View File

@ -73,7 +73,7 @@
PORTNAME= squid
PORTVERSION= 2.5.12
PORTREVISION= 3
PORTREVISION= 4
CATEGORIES= www
MASTER_SITES= \
ftp://ftp.squid-cache.org/pub/%SUBDIR%/ \
@ -86,7 +86,9 @@ DISTNAME= squid-2.5.STABLE12
DIST_SUBDIR= squid2.5
PATCH_SITES= http://www.squid-cache.org/Versions/v2/2.5/bugs/
PATCHFILES= squid-2.5.STABLE12-SMB_BadFetch.patch
PATCHFILES= squid-2.5.STABLE12-SMB_BadFetch.patch \
squid-2.5.STABLE12-wbinfo_group.patch \
squid-2.5.STABLE12-asyncio_counters.patch
PATCH_DIST_STRIP= -p1
MAINTAINER= tmseck@netcologne.de

6
www/squid30/distinfo
View File

@ -4,3 +4,9 @@ SIZE (squid2.5/squid-2.5.STABLE12.tar.bz2) = 1075111
MD5 (squid2.5/squid-2.5.STABLE12-SMB_BadFetch.patch) = 8e83b776c0d015bd4137cc1ca08f6d38
SHA256 (squid2.5/squid-2.5.STABLE12-SMB_BadFetch.patch) = 9ca8427c2eb9e5cbdb5a49fb5cb94fc00853ad965f87666f8fc35236e98bc0ae
SIZE (squid2.5/squid-2.5.STABLE12-SMB_BadFetch.patch) = 826
MD5 (squid2.5/squid-2.5.STABLE12-wbinfo_group.patch) = fe0ab5839d282fda67ffd8eb17f2588d
SHA256 (squid2.5/squid-2.5.STABLE12-wbinfo_group.patch) = 9aa671be4022f1126071cf83ca800795f609b731aac74237bc70e11d8f069046
SIZE (squid2.5/squid-2.5.STABLE12-wbinfo_group.patch) = 1615
MD5 (squid2.5/squid-2.5.STABLE12-asyncio_counters.patch) = 70485fac2c02d836f7027122e65d5767
SHA256 (squid2.5/squid-2.5.STABLE12-asyncio_counters.patch) = 39bf2ca95a3c1fc90a40c437253dbbf6d71f37763369ada287039340a68b873f
SIZE (squid2.5/squid-2.5.STABLE12-asyncio_counters.patch) = 497

37
www/squid30/files/icap-2.5-core.patch
View File

@ -1147,43 +1147,6 @@ diff -p -u -b -r1.10 -r1.10.30.2
+#endif
+
#endif /* SQUID_UTIL_H */
Index: lib/Makefile.am
===================================================================
RCS file: /cvsroot/squid/squid/lib/Makefile.am,v
retrieving revision 1.4
retrieving revision 1.4.26.2
diff -p -u -b -r1.4 -r1.4.26.2
--- lib/Makefile.am 21 Nov 2001 23:48:57 -0000 1.4
+++ lib/Makefile.am 6 Apr 2004 13:04:38 -0000 1.4.26.2
@@ -8,6 +8,19 @@ SNPRINTFSOURCE=snprintf.c
else
SNPRINTFSOURCE=
endif
+
+if NEED_OWN_STRNSTR
+STRNSTRSOURCE=strnstr.c
+else
+STRNSTRSOURCE=
+endif
+
+if NEED_OWN_STRCASESTR
+STRCASESTRSOURCE=strcasestr.c
+else
+STRCASESTRSOURCE=
+endif
+
if NEED_OWN_MD5
MD5SOURCE=md5.c
else
@@ -43,6 +56,8 @@ libmiscutil_a_SOURCES = \
$(SNPRINTFSOURCE) \
splay.c \
Stack.c \
+ $(STRNSTRSOURCE) \
+ $(STRCASESTRSOURCE) \
stub_memaccount.c \
util.c \
uudecode.c
Index: lib/strcasestr.c
===================================================================
RCS file: lib/strcasestr.c

6
www/squid31/Makefile
View File

@ -73,7 +73,7 @@
PORTNAME= squid
PORTVERSION= 2.5.12
PORTREVISION= 3
PORTREVISION= 4
CATEGORIES= www
MASTER_SITES= \
ftp://ftp.squid-cache.org/pub/%SUBDIR%/ \
@ -86,7 +86,9 @@ DISTNAME= squid-2.5.STABLE12
DIST_SUBDIR= squid2.5
PATCH_SITES= http://www.squid-cache.org/Versions/v2/2.5/bugs/
PATCHFILES= squid-2.5.STABLE12-SMB_BadFetch.patch
PATCHFILES= squid-2.5.STABLE12-SMB_BadFetch.patch \
squid-2.5.STABLE12-wbinfo_group.patch \
squid-2.5.STABLE12-asyncio_counters.patch
PATCH_DIST_STRIP= -p1
MAINTAINER= tmseck@netcologne.de

6
www/squid31/distinfo
View File

@ -4,3 +4,9 @@ SIZE (squid2.5/squid-2.5.STABLE12.tar.bz2) = 1075111
MD5 (squid2.5/squid-2.5.STABLE12-SMB_BadFetch.patch) = 8e83b776c0d015bd4137cc1ca08f6d38
SHA256 (squid2.5/squid-2.5.STABLE12-SMB_BadFetch.patch) = 9ca8427c2eb9e5cbdb5a49fb5cb94fc00853ad965f87666f8fc35236e98bc0ae
SIZE (squid2.5/squid-2.5.STABLE12-SMB_BadFetch.patch) = 826
MD5 (squid2.5/squid-2.5.STABLE12-wbinfo_group.patch) = fe0ab5839d282fda67ffd8eb17f2588d
SHA256 (squid2.5/squid-2.5.STABLE12-wbinfo_group.patch) = 9aa671be4022f1126071cf83ca800795f609b731aac74237bc70e11d8f069046
SIZE (squid2.5/squid-2.5.STABLE12-wbinfo_group.patch) = 1615
MD5 (squid2.5/squid-2.5.STABLE12-asyncio_counters.patch) = 70485fac2c02d836f7027122e65d5767
SHA256 (squid2.5/squid-2.5.STABLE12-asyncio_counters.patch) = 39bf2ca95a3c1fc90a40c437253dbbf6d71f37763369ada287039340a68b873f
SIZE (squid2.5/squid-2.5.STABLE12-asyncio_counters.patch) = 497

37
www/squid31/files/icap-2.5-core.patch
View File

@ -1147,43 +1147,6 @@ diff -p -u -b -r1.10 -r1.10.30.2
+#endif
+
#endif /* SQUID_UTIL_H */
Index: lib/Makefile.am
===================================================================
RCS file: /cvsroot/squid/squid/lib/Makefile.am,v
retrieving revision 1.4
retrieving revision 1.4.26.2
diff -p -u -b -r1.4 -r1.4.26.2
--- lib/Makefile.am 21 Nov 2001 23:48:57 -0000 1.4
+++ lib/Makefile.am 6 Apr 2004 13:04:38 -0000 1.4.26.2
@@ -8,6 +8,19 @@ SNPRINTFSOURCE=snprintf.c
else
SNPRINTFSOURCE=
endif
+
+if NEED_OWN_STRNSTR
+STRNSTRSOURCE=strnstr.c
+else
+STRNSTRSOURCE=
+endif
+
+if NEED_OWN_STRCASESTR
+STRCASESTRSOURCE=strcasestr.c
+else
+STRCASESTRSOURCE=
+endif
+
if NEED_OWN_MD5
MD5SOURCE=md5.c
else
@@ -43,6 +56,8 @@ libmiscutil_a_SOURCES = \
$(SNPRINTFSOURCE) \
splay.c \
Stack.c \
+ $(STRNSTRSOURCE) \
+ $(STRCASESTRSOURCE) \
stub_memaccount.c \
util.c \
uudecode.c
Index: lib/strcasestr.c
===================================================================
RCS file: lib/strcasestr.c