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

- integrate another patch from squid-cache.org, see

Browse Source 
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
This commit is contained in:
Ying-Chieh Liao 2004-01-19 03:03:11 +00:00
parent e99ec56b9a
commit 8cbabeb774
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=98516
18 changed files with 348 additions and 66 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
www/squid/Makefile
View File

@ -28,7 +28,7 @@
PORTNAME= squid
PORTVERSION= 2.5.4
PORTREVISION= 6
PORTREVISION= 7
CATEGORIES= www
MASTER_SITES= \
ftp://ftp.squid-cache.org/pub/%SUBDIR%/ \
@ -75,7 +75,8 @@ PATCHFILES= squid-2.5.STABLE4-reconfigure_message.patch \
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-http_workarounds.patch \
squid-2.5.STABLE4-empty_proxy_auth.patch
PATCH_DIST_STRIP= -p1
MAINTAINER= tmseck@netcologne.de
@ -122,7 +123,7 @@ CONFIGURE_ARGS+= --enable-auth="basic ntlm digest" \
--enable-basic-auth-helpers="${basic_auth}" \
--enable-digest-auth-helpers="password" \
--enable-external-acl-helpers="${external_acl}" \
--enable-ntlm-auth-helpers="winbind"
--enable-ntlm-auth-helpers="SMB winbind"
# Languages:
#
@ -239,21 +240,18 @@ post-install:
.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 \
@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 \
@cd ${PREFIX} && ${FIND} etc/squid/errors/${d} -type f | sort \
>>${WRKDIR}/plist.dynamic
@${ECHO_CMD} "@dirrm etc/squid/errors/${d}" >>${WRKDIR}/plist.dynamic
.endfor
@${ECHO_CMD} "r ${TMPPLIST}" >${WRKDIR}/ex.script
@${ECHO_CMD} "/Start of dynamically generated plist" >>${WRKDIR}/ex.script
@${ECHO_CMD} "r ${WRKDIR}/plist.dynamic" >>${WRKDIR}/ex.script
@${ECHO_CMD} "x!" >>${WRKDIR}/ex.script
@${CP} -p ${TMPPLIST} ${TMPPLIST}.orig
@cd ${WRKDIR} && ex <ex.script >/dev/null
@${REINPLACE_CMD} -e \
'/@comment Start of dynamically generated plist/r${WRKDIR}/plist.dynamic' \
${TMPPLIST}
.include <bsd.port.mk>

1
www/squid/distinfo
View File

@ -34,3 +34,4 @@ MD5 (squid2.5/squid-2.5.STABLE4-partial_reload.patch) = 6d8fa663f46ffc2272b7d18a
MD5 (squid2.5/squid-2.5.STABLE4-ldap_tls.patch) = dcd6b4ec46e252833a54c4bfd155c284
MD5 (squid2.5/squid-2.5.STABLE4-ldap_group_bufsize.patch) = e42207a45232ca739a64f2ac3901263c
MD5 (squid2.5/squid-2.5.STABLE4-http_workarounds.patch) = 69d958d5120116de3e5efd2b9e30c3ac
MD5 (squid2.5/squid-2.5.STABLE4-empty_proxy_auth.patch) = ff55a2c7a718868ad245fd6de07018c9

48
www/squid/files/patch-helpers_ntlm_auth_SMB_smbval Normal file
View File

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

20
www/squid25/Makefile
View File

@ -28,7 +28,7 @@
PORTNAME= squid
PORTVERSION= 2.5.4
PORTREVISION= 6
PORTREVISION= 7
CATEGORIES= www
MASTER_SITES= \
ftp://ftp.squid-cache.org/pub/%SUBDIR%/ \
@ -75,7 +75,8 @@ PATCHFILES= squid-2.5.STABLE4-reconfigure_message.patch \
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-http_workarounds.patch \
squid-2.5.STABLE4-empty_proxy_auth.patch
PATCH_DIST_STRIP= -p1
MAINTAINER= tmseck@netcologne.de
@ -122,7 +123,7 @@ CONFIGURE_ARGS+= --enable-auth="basic ntlm digest" \
--enable-basic-auth-helpers="${basic_auth}" \
--enable-digest-auth-helpers="password" \
--enable-external-acl-helpers="${external_acl}" \
--enable-ntlm-auth-helpers="winbind"
--enable-ntlm-auth-helpers="SMB winbind"
# Languages:
#
@ -239,21 +240,18 @@ post-install:
.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 \
@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 \
@cd ${PREFIX} && ${FIND} etc/squid/errors/${d} -type f | sort \
>>${WRKDIR}/plist.dynamic
@${ECHO_CMD} "@dirrm etc/squid/errors/${d}" >>${WRKDIR}/plist.dynamic
.endfor
@${ECHO_CMD} "r ${TMPPLIST}" >${WRKDIR}/ex.script
@${ECHO_CMD} "/Start of dynamically generated plist" >>${WRKDIR}/ex.script
@${ECHO_CMD} "r ${WRKDIR}/plist.dynamic" >>${WRKDIR}/ex.script
@${ECHO_CMD} "x!" >>${WRKDIR}/ex.script
@${CP} -p ${TMPPLIST} ${TMPPLIST}.orig
@cd ${WRKDIR} && ex <ex.script >/dev/null
@${REINPLACE_CMD} -e \
'/@comment Start of dynamically generated plist/r${WRKDIR}/plist.dynamic' \
${TMPPLIST}
.include <bsd.port.mk>

1
www/squid25/distinfo
View File

@ -34,3 +34,4 @@ MD5 (squid2.5/squid-2.5.STABLE4-partial_reload.patch) = 6d8fa663f46ffc2272b7d18a
MD5 (squid2.5/squid-2.5.STABLE4-ldap_tls.patch) = dcd6b4ec46e252833a54c4bfd155c284
MD5 (squid2.5/squid-2.5.STABLE4-ldap_group_bufsize.patch) = e42207a45232ca739a64f2ac3901263c
MD5 (squid2.5/squid-2.5.STABLE4-http_workarounds.patch) = 69d958d5120116de3e5efd2b9e30c3ac
MD5 (squid2.5/squid-2.5.STABLE4-empty_proxy_auth.patch) = ff55a2c7a718868ad245fd6de07018c9

48
www/squid25/files/patch-helpers_ntlm_auth_SMB_smbval Normal file
View File

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

20
www/squid26/Makefile
View File

@ -28,7 +28,7 @@
PORTNAME= squid
PORTVERSION= 2.5.4
PORTREVISION= 6
PORTREVISION= 7
CATEGORIES= www
MASTER_SITES= \
ftp://ftp.squid-cache.org/pub/%SUBDIR%/ \
@ -75,7 +75,8 @@ PATCHFILES= squid-2.5.STABLE4-reconfigure_message.patch \
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-http_workarounds.patch \
squid-2.5.STABLE4-empty_proxy_auth.patch
PATCH_DIST_STRIP= -p1
MAINTAINER= tmseck@netcologne.de
@ -122,7 +123,7 @@ CONFIGURE_ARGS+= --enable-auth="basic ntlm digest" \
--enable-basic-auth-helpers="${basic_auth}" \
--enable-digest-auth-helpers="password" \
--enable-external-acl-helpers="${external_acl}" \
--enable-ntlm-auth-helpers="winbind"
--enable-ntlm-auth-helpers="SMB winbind"
# Languages:
#
@ -239,21 +240,18 @@ post-install:
.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 \
@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 \
@cd ${PREFIX} && ${FIND} etc/squid/errors/${d} -type f | sort \
>>${WRKDIR}/plist.dynamic
@${ECHO_CMD} "@dirrm etc/squid/errors/${d}" >>${WRKDIR}/plist.dynamic
.endfor
@${ECHO_CMD} "r ${TMPPLIST}" >${WRKDIR}/ex.script
@${ECHO_CMD} "/Start of dynamically generated plist" >>${WRKDIR}/ex.script
@${ECHO_CMD} "r ${WRKDIR}/plist.dynamic" >>${WRKDIR}/ex.script
@${ECHO_CMD} "x!" >>${WRKDIR}/ex.script
@${CP} -p ${TMPPLIST} ${TMPPLIST}.orig
@cd ${WRKDIR} && ex <ex.script >/dev/null
@${REINPLACE_CMD} -e \
'/@comment Start of dynamically generated plist/r${WRKDIR}/plist.dynamic' \
${TMPPLIST}
.include <bsd.port.mk>

1
www/squid26/distinfo
View File

@ -34,3 +34,4 @@ MD5 (squid2.5/squid-2.5.STABLE4-partial_reload.patch) = 6d8fa663f46ffc2272b7d18a
MD5 (squid2.5/squid-2.5.STABLE4-ldap_tls.patch) = dcd6b4ec46e252833a54c4bfd155c284
MD5 (squid2.5/squid-2.5.STABLE4-ldap_group_bufsize.patch) = e42207a45232ca739a64f2ac3901263c
MD5 (squid2.5/squid-2.5.STABLE4-http_workarounds.patch) = 69d958d5120116de3e5efd2b9e30c3ac
MD5 (squid2.5/squid-2.5.STABLE4-empty_proxy_auth.patch) = ff55a2c7a718868ad245fd6de07018c9

48
www/squid26/files/patch-helpers_ntlm_auth_SMB_smbval Normal file
View File

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

20
www/squid27/Makefile
View File

@ -28,7 +28,7 @@
PORTNAME= squid
PORTVERSION= 2.5.4
PORTREVISION= 6
PORTREVISION= 7
CATEGORIES= www
MASTER_SITES= \
ftp://ftp.squid-cache.org/pub/%SUBDIR%/ \
@ -75,7 +75,8 @@ PATCHFILES= squid-2.5.STABLE4-reconfigure_message.patch \
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-http_workarounds.patch \
squid-2.5.STABLE4-empty_proxy_auth.patch
PATCH_DIST_STRIP= -p1
MAINTAINER= tmseck@netcologne.de
@ -122,7 +123,7 @@ CONFIGURE_ARGS+= --enable-auth="basic ntlm digest" \
--enable-basic-auth-helpers="${basic_auth}" \
--enable-digest-auth-helpers="password" \
--enable-external-acl-helpers="${external_acl}" \
--enable-ntlm-auth-helpers="winbind"
--enable-ntlm-auth-helpers="SMB winbind"
# Languages:
#
@ -239,21 +240,18 @@ post-install:
.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 \
@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 \
@cd ${PREFIX} && ${FIND} etc/squid/errors/${d} -type f | sort \
>>${WRKDIR}/plist.dynamic
@${ECHO_CMD} "@dirrm etc/squid/errors/${d}" >>${WRKDIR}/plist.dynamic
.endfor
@${ECHO_CMD} "r ${TMPPLIST}" >${WRKDIR}/ex.script
@${ECHO_CMD} "/Start of dynamically generated plist" >>${WRKDIR}/ex.script
@${ECHO_CMD} "r ${WRKDIR}/plist.dynamic" >>${WRKDIR}/ex.script
@${ECHO_CMD} "x!" >>${WRKDIR}/ex.script
@${CP} -p ${TMPPLIST} ${TMPPLIST}.orig
@cd ${WRKDIR} && ex <ex.script >/dev/null
@${REINPLACE_CMD} -e \
'/@comment Start of dynamically generated plist/r${WRKDIR}/plist.dynamic' \
${TMPPLIST}
.include <bsd.port.mk>

1
www/squid27/distinfo
View File

@ -34,3 +34,4 @@ MD5 (squid2.5/squid-2.5.STABLE4-partial_reload.patch) = 6d8fa663f46ffc2272b7d18a
MD5 (squid2.5/squid-2.5.STABLE4-ldap_tls.patch) = dcd6b4ec46e252833a54c4bfd155c284
MD5 (squid2.5/squid-2.5.STABLE4-ldap_group_bufsize.patch) = e42207a45232ca739a64f2ac3901263c
MD5 (squid2.5/squid-2.5.STABLE4-http_workarounds.patch) = 69d958d5120116de3e5efd2b9e30c3ac
MD5 (squid2.5/squid-2.5.STABLE4-empty_proxy_auth.patch) = ff55a2c7a718868ad245fd6de07018c9

48
www/squid27/files/patch-helpers_ntlm_auth_SMB_smbval Normal file
View File

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

20
www/squid30/Makefile
View File

@ -28,7 +28,7 @@
PORTNAME= squid
PORTVERSION= 2.5.4
PORTREVISION= 6
PORTREVISION= 7
CATEGORIES= www
MASTER_SITES= \
ftp://ftp.squid-cache.org/pub/%SUBDIR%/ \
@ -75,7 +75,8 @@ PATCHFILES= squid-2.5.STABLE4-reconfigure_message.patch \
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-http_workarounds.patch \
squid-2.5.STABLE4-empty_proxy_auth.patch
PATCH_DIST_STRIP= -p1
MAINTAINER= tmseck@netcologne.de
@ -122,7 +123,7 @@ CONFIGURE_ARGS+= --enable-auth="basic ntlm digest" \
--enable-basic-auth-helpers="${basic_auth}" \
--enable-digest-auth-helpers="password" \
--enable-external-acl-helpers="${external_acl}" \
--enable-ntlm-auth-helpers="winbind"
--enable-ntlm-auth-helpers="SMB winbind"
# Languages:
#
@ -239,21 +240,18 @@ post-install:
.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 \
@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 \
@cd ${PREFIX} && ${FIND} etc/squid/errors/${d} -type f | sort \
>>${WRKDIR}/plist.dynamic
@${ECHO_CMD} "@dirrm etc/squid/errors/${d}" >>${WRKDIR}/plist.dynamic
.endfor
@${ECHO_CMD} "r ${TMPPLIST}" >${WRKDIR}/ex.script
@${ECHO_CMD} "/Start of dynamically generated plist" >>${WRKDIR}/ex.script
@${ECHO_CMD} "r ${WRKDIR}/plist.dynamic" >>${WRKDIR}/ex.script
@${ECHO_CMD} "x!" >>${WRKDIR}/ex.script
@${CP} -p ${TMPPLIST} ${TMPPLIST}.orig
@cd ${WRKDIR} && ex <ex.script >/dev/null
@${REINPLACE_CMD} -e \
'/@comment Start of dynamically generated plist/r${WRKDIR}/plist.dynamic' \
${TMPPLIST}
.include <bsd.port.mk>

1
www/squid30/distinfo
View File

@ -34,3 +34,4 @@ MD5 (squid2.5/squid-2.5.STABLE4-partial_reload.patch) = 6d8fa663f46ffc2272b7d18a
MD5 (squid2.5/squid-2.5.STABLE4-ldap_tls.patch) = dcd6b4ec46e252833a54c4bfd155c284
MD5 (squid2.5/squid-2.5.STABLE4-ldap_group_bufsize.patch) = e42207a45232ca739a64f2ac3901263c
MD5 (squid2.5/squid-2.5.STABLE4-http_workarounds.patch) = 69d958d5120116de3e5efd2b9e30c3ac
MD5 (squid2.5/squid-2.5.STABLE4-empty_proxy_auth.patch) = ff55a2c7a718868ad245fd6de07018c9

48
www/squid30/files/patch-helpers_ntlm_auth_SMB_smbval Normal file
View File

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

20
www/squid31/Makefile
View File

@ -28,7 +28,7 @@
PORTNAME= squid
PORTVERSION= 2.5.4
PORTREVISION= 6
PORTREVISION= 7
CATEGORIES= www
MASTER_SITES= \
ftp://ftp.squid-cache.org/pub/%SUBDIR%/ \
@ -75,7 +75,8 @@ PATCHFILES= squid-2.5.STABLE4-reconfigure_message.patch \
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-http_workarounds.patch \
squid-2.5.STABLE4-empty_proxy_auth.patch
PATCH_DIST_STRIP= -p1
MAINTAINER= tmseck@netcologne.de
@ -122,7 +123,7 @@ CONFIGURE_ARGS+= --enable-auth="basic ntlm digest" \
--enable-basic-auth-helpers="${basic_auth}" \
--enable-digest-auth-helpers="password" \
--enable-external-acl-helpers="${external_acl}" \
--enable-ntlm-auth-helpers="winbind"
--enable-ntlm-auth-helpers="SMB winbind"
# Languages:
#
@ -239,21 +240,18 @@ post-install:
.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 \
@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 \
@cd ${PREFIX} && ${FIND} etc/squid/errors/${d} -type f | sort \
>>${WRKDIR}/plist.dynamic
@${ECHO_CMD} "@dirrm etc/squid/errors/${d}" >>${WRKDIR}/plist.dynamic
.endfor
@${ECHO_CMD} "r ${TMPPLIST}" >${WRKDIR}/ex.script
@${ECHO_CMD} "/Start of dynamically generated plist" >>${WRKDIR}/ex.script
@${ECHO_CMD} "r ${WRKDIR}/plist.dynamic" >>${WRKDIR}/ex.script
@${ECHO_CMD} "x!" >>${WRKDIR}/ex.script
@${CP} -p ${TMPPLIST} ${TMPPLIST}.orig
@cd ${WRKDIR} && ex <ex.script >/dev/null
@${REINPLACE_CMD} -e \
'/@comment Start of dynamically generated plist/r${WRKDIR}/plist.dynamic' \
${TMPPLIST}
.include <bsd.port.mk>

1
www/squid31/distinfo
View File

@ -34,3 +34,4 @@ MD5 (squid2.5/squid-2.5.STABLE4-partial_reload.patch) = 6d8fa663f46ffc2272b7d18a
MD5 (squid2.5/squid-2.5.STABLE4-ldap_tls.patch) = dcd6b4ec46e252833a54c4bfd155c284
MD5 (squid2.5/squid-2.5.STABLE4-ldap_group_bufsize.patch) = e42207a45232ca739a64f2ac3901263c
MD5 (squid2.5/squid-2.5.STABLE4-http_workarounds.patch) = 69d958d5120116de3e5efd2b9e30c3ac
MD5 (squid2.5/squid-2.5.STABLE4-empty_proxy_auth.patch) = ff55a2c7a718868ad245fd6de07018c9

48
www/squid31/files/patch-helpers_ntlm_auth_SMB_smbval Normal file
View File

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