Re: pkg/47787: www/squid3's LDAP helpers don't build on a system with non-native LDAP

["OBATA Akio" <obache%netbsd.org@localhost>]

The following reply was made to PR pkg/47787; it has been noted by GNATS.

From: "OBATA Akio" <obache%netbsd.org@localhost>
To: gnats-bugs%netbsd.org@localhost
Cc: 
Subject: Re: pkg/47787: www/squid3's LDAP helpers don't build on a system with
 non-native LDAP
Date: Wed, 15 May 2013 22:31:15 +0900

 On Tue, 30 Apr 2013 02:10:01 +0900, <ef%math.uni-bonn.de@localhost> wrote:
 
 >> Fix:
 >      Probably just patch an "exit 0" into those scripts?
 >      Or is the correct method to generate config.test scripts based on the
 >      (potentially several) members of BUILDLINK_INCDIRS.openldap-client= ?
 
 Please try to apply following change.
 (for pkgsrc-HEAD, manual adjustments are probably required for pkgsrc-2013Q1)
 
 Index: www/squid3/Makefile
 ===================================================================
 RCS file: /cvsroot/pkgsrc/www/squid3/Makefile,v
 retrieving revision 1.7
 diff -u -r1.7 Makefile
 --- www/squid3/Makefile 27 Apr 2013 17:51:24 -0000      1.7
 +++ www/squid3/Makefile 15 May 2013 13:26:31 -0000
 @@ -1,6 +1,7 @@
   # $NetBSD: Makefile,v 1.7 2013/04/27 17:51:24 tron Exp $
 
   DISTNAME=      squid-3.3.4
 +PKGREVISION=   1
   CATEGORIES=    www
   MASTER_SITES=  http://www.squid-cache.org/Versions/v3/${PKGVERSION_NOREV:R}/ 
\
                  ${SQUID_MASTER_SITES}
 Index: www/squid3/PLIST
 ===================================================================
 RCS file: /cvsroot/pkgsrc/www/squid3/PLIST,v
 retrieving revision 1.4
 diff -u -r1.4 PLIST
 --- www/squid3/PLIST    4 May 2013 06:08:44 -0000       1.4
 +++ www/squid3/PLIST    15 May 2013 13:26:31 -0000
 @@ -8,6 +8,7 @@
   ${PLIST.ba_NIS}libexec/basic_nis_auth
   ${PLIST.ba_PAM}libexec/basic_pam_auth
   libexec/cachemgr.cgi
 +${PLIST.da_file}libexec/digest_file_auth
   ${PLIST.da_LDAP}libexec/digest_ldap_auth
   ${PLIST.diskd}libexec/diskd
   ${PLIST.eacl_file_userip}libexec/ext_file_userip_acl
 @@ -29,6 +30,7 @@
   ${PLIST.ba_LDAP}man/man8/basic_ldap_auth.8
   ${PLIST.ba_NCSA}man/man8/basic_ncsa_auth.8
   ${PLIST.ba_PAM}man/man8/basic_pam_auth.8
 +${PLIST.da_file}man/man8/digest_file_auth.8
   ${PLIST.eacl_file_userip}man/man8/ext_file_userip_acl.8
   ${PLIST.eacl_LDAP_group}man/man8/ext_ldap_group_acl.8
   ${PLIST.eacl_unix_group}man/man8/ext_unix_group_acl.8
 Index: www/squid3/options.mk
 ===================================================================
 RCS file: /cvsroot/pkgsrc/www/squid3/options.mk,v
 retrieving revision 1.6
 diff -u -r1.6 options.mk
 --- www/squid3/options.mk       4 May 2013 06:08:44 -0000       1.6
 +++ www/squid3/options.mk       15 May 2013 13:26:31 -0000
 @@ -12,7 +12,7 @@
 
   PLIST_VARS+=   diskd snmp unlinkd
   PLIST_VARS+=   ba_LDAP ba_MSNT ba_NCSA ba_NIS ba_PAM ba_getpwnam
 -PLIST_VARS+=   da_LDAP
 +PLIST_VARS+=   da_file da_LDAP
   PLIST_VARS+=   na_SMB
   PLIST_VARS+=   ta_kerberos
   PLIST_VARS+=   eacl_file_userip eacl_LDAP_group eacl_unix_group
 @@ -58,7 +58,7 @@
 
   SQUID_BACKENDS?=               ufs
   SQUID_BASIC_AUTH_HELPERS?=     MSNT NCSA NIS getpwnam
 -SQUID_DIGEST_AUTH_HELPERS?=    password
 +SQUID_DIGEST_AUTH_HELPERS?=    file
   SQUID_NTLM_AUTH_HELPERS?=      SMB
   SQUID_EXTERNAL_ACL_HELPERS?=   file_userip unix_group
 
 @@ -144,6 +144,12 @@
   .  for i in ${SQUID_BASIC_AUTH_HELPERS}
   PLIST.ba_${i}=         yes
   .  endfor
 +.PHONY: squid-enable-helper-basic_auth
 +pre-configure: squid-enable-helper-basic_auth
 +squid-enable-helper-basic_auth:
 +.  for i in ${SQUID_BASIC_AUTH_HELPERS}
 +       ${ECHO} "exit 0" > ${WRKSRC}/helpers/basic_auth/${i}/config.test
 +.  endfor
   .endif
 
   .if empty(SQUID_DIGEST_AUTH_HELPERS)
 @@ -153,6 +159,10 @@
   .  for i in ${SQUID_DIGEST_AUTH_HELPERS}
   PLIST.da_${i}=         yes
   .  endfor
 +pre-configure:
 +.  for i in ${SQUID_DIGEST_AUTH_HELPERS}
 +       ${ECHO} "exit 0" > ${WRKSRC}/helpers/digest_auth/${i}/config.test
 +.  endfor
   .endif
 
   .if empty(SQUID_NEGOTIATE_AUTH_HELPERS)
 @@ -162,6 +172,12 @@
   .  for i in ${SQUID_NEGOTIATE_AUTH_HELPERS}
   PLIST.ta_${i}=         yes
   .  endfor
 +.PHONY: squid-enable-helper-negotiate_auth
 +pre-configure: squid-enable-helper-negotiate_auth
 +squid-enable-helper-negotiate_auth:
 +.  for i in ${SQUID_NEGOTIATE_AUTH_HELPERS}
 +       ${ECHO} "exit 0" > ${WRKSRC}/helpers/negotiate_auth/${i}/config.test
 +.  endfor
   .endif
 
   .if empty(SQUID_NTLM_AUTH_HELPERS)
 @@ -180,4 +196,10 @@
   .  for i in ${SQUID_EXTERNAL_ACL_HELPERS}
   PLIST.eacl_${i}=       yes
   .  endfor
 +.PHONY: squid-enable-helper-external_auth
 +pre-configure: squid-enable-helper-external_auth
 +squid-enable-helper-external_auth:
 +.  for i in ${SQUID_EXTERNAL_AUTH_HELPERS}
 +       ${ECHO} "exit 0" > ${WRKSRC}/helpers/external_auth/${i}/config.test
 +.  endfor
   .endif
 
 
 -- 
 OBATA Akio / obache%NetBSD.org@localhost