From owner-svn-ports-all@FreeBSD.ORG Sat Aug 23 12:36:02 2014 Return-Path: Delivered-To: svn-ports-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 31A2EDBF; Sat, 23 Aug 2014 12:36:02 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 1D7FF3040; Sat, 23 Aug 2014 12:36:02 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id s7NCa1YI095515; Sat, 23 Aug 2014 12:36:01 GMT (envelope-from marino@FreeBSD.org) Received: (from marino@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id s7NCa1Gb095514; Sat, 23 Aug 2014 12:36:01 GMT (envelope-from marino@FreeBSD.org) Message-Id: <201408231236.s7NCa1Gb095514@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: marino set sender to marino@FreeBSD.org using -f From: John Marino Date: Sat, 23 Aug 2014 12:36:01 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r365726 - head/www/squid33 X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 23 Aug 2014 12:36:02 -0000 Author: marino Date: Sat Aug 23 12:36:01 2014 New Revision: 365726 URL: http://svnweb.freebsd.org/changeset/ports/365726 QAT: https://qat.redports.org/buildarchive/r365726/ Log: www/squid33: Support Kerberos on DragonFly DragonFly does not have Kerberos in the base system as this port assumes. In order to build squid33, DF has a dependency on krb5 packages. Morever, the configure check assumes Kerberos is in the base system, so it fails to configure. Disable the check completely as it's guaranteed to pass on FreeBSD and the sought headers are installed with krb5. Modified: head/www/squid33/Makefile Modified: head/www/squid33/Makefile ============================================================================== --- head/www/squid33/Makefile Sat Aug 23 12:31:36 2014 (r365725) +++ head/www/squid33/Makefile Sat Aug 23 12:36:01 2014 (r365726) @@ -207,6 +207,9 @@ basic_auth+= NIS # POLA: allow the old global make.conf(5) (pre src.conf(5)) defines, too: .if ${PORT_OPTIONS:MAUTH_KERB} && !defined(NO_KERBEROS) && !defined(WITHOUT_KERBEROS) negotiate_auth= kerberos wrapper +. if ${OPSYS} == DragonFly +LIB_DEPENDS+= libkrb5.so:${PORTSDIR}/security/krb5 +. endif # the kerberos_ldap_group external helper depends on LDAP and SASL: .if ${PORT_OPTIONS:MAUTH_LDAP} && ${PORT_OPTIONS:MAUTH_SASL} external_acl+= kerberos_ldap_group @@ -311,6 +314,12 @@ post-patch: -e'/tcp_outgoing_address 2001:db8::1/d'\ ${WRKSRC}/src/cf.data.pre .endif +# The kerberos auth helper check is harded for /usr/gssapi/gssapi.h, but +# kerberos authorization happily uses gssapi located at $LOCALBASE. Make +# the config test always pass because it's guaranteed to pass on FreeBSD +# and DragonFly installs it with the krb5 package. + @${REINPLACE_CMD} -e 's|exit 1|exit 0|' \ + ${WRKSRC}/helpers/negotiate_auth/kerberos/config.test post-install: .if ${PORT_OPTIONS:MEXAMPLES}