Attachment #38973 for bug #61543

View | Details | Raw Unified | Return to bug 61543
Collapse All | Expand All





PORTNAME=	squid
PORTVERSION=	2.5.4
PORTREVISION=	7
CATEGORIES=	www
MASTER_SITES=	\
		ftp://ftp.squid-cache.org/pub/%SUBDIR%/ \

		squid-2.5.STABLE4-partial_reload.patch \
		squid-2.5.STABLE4-ldap_tls.patch \
		squid-2.5.STABLE4-ldap_group_bufsize.patch \
		squid-2.5.STABLE4-http_workarounds.patch \
		squid-2.5.STABLE4-empty_proxy_auth.patch
PATCH_DIST_STRIP=	-p1

MAINTAINER=	tmseck@netcologne.de

			--enable-basic-auth-helpers="${basic_auth}" \
			--enable-digest-auth-helpers="password" \
			--enable-external-acl-helpers="${external_acl}" \
			--enable-ntlm-auth-helpers="SMB winbind"

# Languages:
#

.endif
	@${SETENV} PKG_PREFIX=${PREFIX} ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL
# Generate parts of pkg-plist on the fly:
	@cd ${PREFIX} && ${FIND} libexec/squid -type f -o -type l | sort \
	    >${WRKDIR}/plist.dynamic
	@${ECHO_CMD} "@dirrm libexec/squid" >>${WRKDIR}/plist.dynamic
# Only register what we should have installed, there may be local additions
# present:
.for d in ${SQUID_LANGUAGES}
	@cd ${PREFIX} && ${FIND} etc/squid/errors/${d} -type f | sort \
	    >>${WRKDIR}/plist.dynamic
	@${ECHO_CMD} "@dirrm etc/squid/errors/${d}" >>${WRKDIR}/plist.dynamic
.endfor
	@${REINPLACE_CMD} -e \
	    '/@comment Start of dynamically generated plist/r${WRKDIR}/plist.dynamic' \
	    ${TMPPLIST}
	@${ECHO_CMD} "x!" >>${WRKDIR}/ex.script
	@${CP} -p ${TMPPLIST} ${TMPPLIST}.orig
	@cd ${WRKDIR} && ex <ex.script >/dev/null

.include <bsd.port.mk>

Lines 34-36 Link Here

(-)projekte/FreeBSD/ports/www/squid/distinfo (+1 lines)
34	MD5 (squid2.5/squid-2.5.STABLE4-ldap_tls.patch) = dcd6b4ec46e252833a54c4bfd155c284	34	MD5 (squid2.5/squid-2.5.STABLE4-ldap_tls.patch) = dcd6b4ec46e252833a54c4bfd155c284
35	MD5 (squid2.5/squid-2.5.STABLE4-ldap_group_bufsize.patch) = e42207a45232ca739a64f2ac3901263c	35	MD5 (squid2.5/squid-2.5.STABLE4-ldap_group_bufsize.patch) = e42207a45232ca739a64f2ac3901263c
36	MD5 (squid2.5/squid-2.5.STABLE4-http_workarounds.patch) = 69d958d5120116de3e5efd2b9e30c3ac	36	MD5 (squid2.5/squid-2.5.STABLE4-http_workarounds.patch) = 69d958d5120116de3e5efd2b9e30c3ac
		37	MD5 (squid2.5/squid-2.5.STABLE4-empty_proxy_auth.patch) = ff55a2c7a718868ad245fd6de07018c9




--- 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>


Return to bug 61543

Lines 28-34 Link Here

(-)projekte/FreeBSD/ports/www/squid/Makefile (-11 / +9 lines)
28		28
29	PORTNAME= squid	29	PORTNAME= squid
30	PORTVERSION= 2.5.4	30	PORTVERSION= 2.5.4
31	PORTREVISION= 6	31	PORTREVISION= 7
32	CATEGORIES= www	32	CATEGORIES= www
33	MASTER_SITES= \	33	MASTER_SITES= \
34	ftp://ftp.squid-cache.org/pub/%SUBDIR%/ \	34	ftp://ftp.squid-cache.org/pub/%SUBDIR%/ \
Lines 75-81 Link Here
75	squid-2.5.STABLE4-partial_reload.patch \	75	squid-2.5.STABLE4-partial_reload.patch \
76	squid-2.5.STABLE4-ldap_tls.patch \	76	squid-2.5.STABLE4-ldap_tls.patch \
77	squid-2.5.STABLE4-ldap_group_bufsize.patch \	77	squid-2.5.STABLE4-ldap_group_bufsize.patch \
78	squid-2.5.STABLE4-http_workarounds.patch	78	squid-2.5.STABLE4-http_workarounds.patch \
		79	squid-2.5.STABLE4-empty_proxy_auth.patch
79	PATCH_DIST_STRIP= -p1	80	PATCH_DIST_STRIP= -p1
80		81
81	MAINTAINER= tmseck@netcologne.de	82	MAINTAINER= tmseck@netcologne.de
Lines 122-128 Link Here
122	--enable-basic-auth-helpers="${basic_auth}" \	126	--enable-basic-auth-helpers="${basic_auth}" \
123	--enable-digest-auth-helpers="password" \	127	--enable-digest-auth-helpers="password" \
124	--enable-external-acl-helpers="${external_acl}" \	128	--enable-external-acl-helpers="${external_acl}" \
125	--enable-ntlm-auth-helpers="winbind"	129	--enable-ntlm-auth-helpers="SMB winbind"
126		130
127	# Languages:	131	# Languages:
128	#	132	#
Lines 239-259 Link Here
239	.endif	243	.endif
240	@${SETENV} PKG_PREFIX=${PREFIX} ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL	244	@${SETENV} PKG_PREFIX=${PREFIX} ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL
241	# Generate parts of pkg-plist on the fly:	245	# Generate parts of pkg-plist on the fly:
242	@cd ${PREFIX} && ${FIND} libexec/squid -type f -o -type l \	246	@cd ${PREFIX} && ${FIND} libexec/squid -type f -o -type l \| sort \
243	>${WRKDIR}/plist.dynamic	247	>${WRKDIR}/plist.dynamic
244	@${ECHO_CMD} "@dirrm libexec/squid" >>${WRKDIR}/plist.dynamic	248	@${ECHO_CMD} "@dirrm libexec/squid" >>${WRKDIR}/plist.dynamic
245	# Only register what we should have installed, there may be local additions	249	# Only register what we should have installed, there may be local additions
246	# present:	250	# present:
247	.for d in ${SQUID_LANGUAGES}	251	.for d in ${SQUID_LANGUAGES}
248	@cd ${PREFIX} && ${FIND} etc/squid/errors/${d} -type f \	252	@cd ${PREFIX} && ${FIND} etc/squid/errors/${d} -type f \| sort \
249	>>${WRKDIR}/plist.dynamic	253	>>${WRKDIR}/plist.dynamic
250	@${ECHO_CMD} "@dirrm etc/squid/errors/${d}" >>${WRKDIR}/plist.dynamic	254	@${ECHO_CMD} "@dirrm etc/squid/errors/${d}" >>${WRKDIR}/plist.dynamic
251	.endfor	255	.endfor
252	@${ECHO_CMD} "r ${TMPPLIST}" >${WRKDIR}/ex.script	256	@${REINPLACE_CMD} -e \
253	@${ECHO_CMD} "/Start of dynamically generated plist" >>${WRKDIR}/ex.script	257	'/@comment Start of dynamically generated plist/r${WRKDIR}/plist.dynamic' \
254	@${ECHO_CMD} "r ${WRKDIR}/plist.dynamic" >>${WRKDIR}/ex.script	258	${TMPPLIST}
255	@${ECHO_CMD} "x!" >>${WRKDIR}/ex.script
256	@${CP} -p ${TMPPLIST} ${TMPPLIST}.orig
257	@cd ${WRKDIR} && ex <ex.script >/dev/null
258		259
259	.include <bsd.port.mk>	260	.include <bsd.port.mk>

Added Link Here

(-)projekte/FreeBSD/ports/www/squid/files/patch-helpers_ntlm_auth_SMB_smbval (+48 lines)
1	--- helpers/ntlm_auth/SMB/smbval/session.c.orig Fri Jan 16 00:24:31 2004
2	+++ helpers/ntlm_auth/SMB/smbval/session.c Fri Jan 16 00:25:57 2004
3	@@ -23,7 +23,9 @@
4	* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
5	*/
6
7	+#if !defined(__FreeBSD__)
8	#include <malloc.h>
9	+#endif
10	#include <string.h>
11	#include <stdlib.h>
12
13	--- helpers/ntlm_auth/SMB/smbval/rfcnb-util.c.orig Fri Jan 16 00:24:31 2004
14	+++ helpers/ntlm_auth/SMB/smbval/rfcnb-util.c Fri Jan 16 00:26:17 2004
15	@@ -24,7 +24,9 @@
16	*/
17
18	#include <string.h>
19	+#if !defined(__FreeBSD__)
20	#include <malloc.h>
21	+#endif
22
23	#include "std-includes.h"
24	#include "rfcnb-priv.h"
25	--- helpers/ntlm_auth/SMB/smbval/smblib-util.c.orig Fri Jan 16 00:24:31 2004
26	+++ helpers/ntlm_auth/SMB/smbval/smblib-util.c Fri Jan 16 00:26:39 2004
27	@@ -24,7 +24,9 @@
28	*/
29
30	#include "smblib-priv.h"
31	+#if !defined(__FreeBSD__)
32	#include <malloc.h>
33	+#endif
34	#include <string.h>
35
36	#include "rfcnb.h"
37	--- helpers/ntlm_auth/SMB/smbval/smblib.c.orig Fri Jan 16 00:24:31 2004
38	+++ helpers/ntlm_auth/SMB/smbval/smblib.c Fri Jan 16 00:26:57 2004
39	@@ -25,7 +25,9 @@
40	*/
41
42	#include "config.h"
43	+#if !defined(__FreeBSD__)
44	#include <malloc.h>
45	+#endif
46	#include <ctype.h>
47	#include <string.h>
48