head	1.2;
access;
symbols;
locks; strict;
comment	@# @;


1.2
date	2004.02.23.16.41.51;	author eik;	state dead;
branches;
next	1.1;

1.1
date	2004.01.19.03.03.11;	author ijliao;	state Exp;
branches;
next	;


desc
@@


1.2
log
@- Integrate a new set of vendor patches, see
  http://www.squid-cache.org/Versions/v2/2.5/bugs/ for details
- Remove two local patches in favour of the respective vendor patches
- Bump PORTREVISION

PR:		63030
Submitted by:	Thomas-Martin Seck <tmseck@@netcologne.de>
Obtained from:	http://www.squid-cache.org/Versions/v2/2.5/bugs/
@
text
@--- helpers/ntlm_auth/SMB/smbval/session.c.orig	Fri Jan 16 00:24:31 2004
+++ helpers/ntlm_auth/SMB/smbval/session.c	Fri Jan 16 00:25:57 2004
@@@@ -23,7 +23,9 @@@@
  * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
 
+#if !defined(__FreeBSD__)
 #include <malloc.h>
+#endif
 #include <string.h>
 #include <stdlib.h>
 
--- helpers/ntlm_auth/SMB/smbval/rfcnb-util.c.orig	Fri Jan 16 00:24:31 2004
+++ helpers/ntlm_auth/SMB/smbval/rfcnb-util.c	Fri Jan 16 00:26:17 2004
@@@@ -24,7 +24,9 @@@@
  */
 
 #include <string.h>
+#if !defined(__FreeBSD__)
 #include <malloc.h>
+#endif
 
 #include "std-includes.h"
 #include "rfcnb-priv.h"
--- helpers/ntlm_auth/SMB/smbval/smblib-util.c.orig	Fri Jan 16 00:24:31 2004
+++ helpers/ntlm_auth/SMB/smbval/smblib-util.c	Fri Jan 16 00:26:39 2004
@@@@ -24,7 +24,9 @@@@
  */
 
 #include "smblib-priv.h"
+#if !defined(__FreeBSD__)
 #include <malloc.h>
+#endif
 #include <string.h>
 
 #include "rfcnb.h"
--- helpers/ntlm_auth/SMB/smbval/smblib.c.orig	Fri Jan 16 00:24:31 2004
+++ helpers/ntlm_auth/SMB/smbval/smblib.c	Fri Jan 16 00:26:57 2004
@@@@ -25,7 +25,9 @@@@
  */
 
 #include "config.h"
+#if !defined(__FreeBSD__)
 #include <malloc.h>
+#endif
 #include <ctype.h>
 #include <string.h>
 
@


1.1
log
@- integrate another patch from squid-cache.org, see
  http://www.squid-cache.org/Versions/v2/2.5/bugs/ for details
- cleanup dynamic plist generation:
  sort files, replace needlessly complex ex-scripting with a ${REINPLACE_CMD}
  one-liner
- integrate a patch to make the SMB-NTLM helper compile on 5.x and hook this
  helper up to the build (thanks to Stefano Tagliaferri for reporting the bug
  and testing the patch)
- bump PORTREVISION

PR:		61543
Submitted by:	maintainer
@
text
@@

