Date: Tue, 22 May 2012 17:14:34 -0400 From: Wesley Shields <wxs@FreeBSD.org> To: Robert Simmons <rsimmons0@gmail.com> Cc: eadler@FreeBSD.org, freebsd-ports@freebsd.org Subject: Re: Heimdal 1.5.2 problem Message-ID: <20120522211434.GA5483@atarininja.org> In-Reply-To: <CA%2BQLa9CBOw4HywRELLB8%2BCE%2Bc7t572bXdJhPi40smQxzT1LC4Q@mail.gmail.com> References: <CA%2BQLa9ArX15Cgtyq%2B7PhhXtGGOj1dtVM4pisGfkFzVDJE7cs8A@mail.gmail.com> <4FAD492C.3060807@gmx.de> <CA%2BQLa9CyVUmvy=NzHiP73iTTRKVqU9Eza=PPMmLZrogoUn_gAg@mail.gmail.com> <CA%2BQLa9AC_mDrBiPaYOJ_M3F%2Bq07aUV1TATJcFgxSKCr2gPOFWw@mail.gmail.com> <9880B4F2567E41A582B6B9DA178AECFD@black> <CA%2BQLa9Bs1VSBoMW0cHvSSeET=9X7F--33iv=860FzKv%2BHYuqNg@mail.gmail.com> <CA%2BQLa9CeMN9=FF_BuKNeADuVkK5Hs74_MxsB97_zKRkT9hkDug@mail.gmail.com> <20120522125710.GB18115@atarininja.org> <CA%2BQLa9CBOw4HywRELLB8%2BCE%2Bc7t572bXdJhPi40smQxzT1LC4Q@mail.gmail.com>
next in thread | previous in thread | raw e-mail | index | archive | help
--NzB8fVQJ5HfG6fxh Content-Type: text/plain; charset=us-ascii Content-Disposition: inline On Tue, May 22, 2012 at 03:08:31PM -0400, Robert Simmons wrote: > On Tue, May 22, 2012 at 8:57 AM, Wesley Shields <wxs@freebsd.org> wrote: > > As the person who committed this update I will take responsibility for > > seeing this through. Would you mind opening a PR with this patch and CC > > both myself and the maintainer so it can be properly tracked. I will > > work with both of you to make sure it is addressed. > > I got some good feedback about the patch. I was missing a "\". Also, > it was noted that I shouldn't make changes to the default settings in > this patch since it is meant to correct a problem. I removed the > change to default. I'm not opposed to removing the change to the default, but it does cause another problem. See below. > Perhaps the different default is not the best solution. Maybe there > should be a message that at least one backend is needed for the port > to function, but none have been selected by default? If a backend is required the port should refuse to build if no backend is selected. This is pretty easy to do, just check for at least one of the backends. I have no idea if multiple backends can be supported so you may or may not want to also check for that. If it does require a backend then the port should default to one of them. If we don't pick one as a default then we get no package with the changes you are suggesting above (the IGNORE line I put in place will always happen on the package cluster). I'm attaching an updated version of your patch to this email that flips BDB on by default and does the check to make sure at least one backend is selected. If you feel it's sufficent we can get it in the PR so it is properly tracked. > I have attached the updated patch, and I've opened a PR here: > http://www.freebsd.org/cgi/query-pr.cgi?pr=ports/168214 Thank you for opening a PR. All too often things can fall through the mailing list cracks, and if it's in a PR we can at least have a record of it. I see eadler@ has grabbed your PR. As I said earlier, I'm willing to step up and commit this (pending maintainer approval or timeout). -- WXS --NzB8fVQJ5HfG6fxh Content-Type: text/x-diff; charset=us-ascii Content-Disposition: attachment; filename="heimdal.diff" Index: Makefile =================================================================== RCS file: /home/ncvs/ports/security/heimdal/Makefile,v retrieving revision 1.94 diff -u -r1.94 Makefile --- Makefile 20 May 2012 00:08:19 -0000 1.94 +++ Makefile 22 May 2012 20:45:56 -0000 @@ -7,13 +7,12 @@ PORTNAME= heimdal PORTVERSION= 1.5.2 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= security ipv6 MASTER_SITES= http://www.h5l.org/dist/src/ \ http://ftp.pdc.kth.se/pub/heimdal/src/ \ ftp://ftp.pdc.kth.se/pub/heimdal/src/ \ - ftp://ftp.sunet.se/pub/unix/admin/mirror-pdc/heimdal/src/ \ - ftp://ftp.ayamura.org/pub/heimdal/ + ftp://ftp.sunet.se/pub/unix/admin/mirror-pdc/heimdal/src/ MAINTAINER= Joerg.Pulz@frm2.tum.de COMMENT= A popular BSD-licensed implementation of Kerberos 5 @@ -22,7 +21,7 @@ OPTIONS= IPV6 "Enable IPV6 support" on \ KCM "Enable Kerberos Credentials Manager" on \ - BDB "Enable BerkeleyDB KDC backend support" off \ + BDB "Enable BerkeleyDB KDC backend support" on \ SQLITE "Enable SQLite KDC backend support" off \ LDAP "Enable OpenLDAP KDC backend support" off \ PKINIT "Enable PK-INIT support" on \ @@ -48,6 +47,10 @@ .include <bsd.port.pre.mk> +.if !defined(WITH_BDB) && !defined(WITH_SQLITE) && !defined(WITH_LDAP) +IGNORE= Need a backend. +.endif + .if ${ARCH} == "amd64" CFLAGS+= -fPIC .endif @@ -77,10 +80,10 @@ CFLAGS+= -I${BDB_INCLUDE_DIR} CPPFLAGS+= -I${BDB_INCLUDE_DIR} LDFLAGS+= -L${BDB_LIB_DIR} -CONFIGURE_ARGS+= --with-berkeley-db=${LOCALBASE} -# --with-berkeley-db-include=${BDB_INCLUDE_DIR} +CONFIGURE_ARGS+= --with-berkeley-db=${LOCALBASE} \ + --with-berkeley-db-include=${BDB_INCLUDE_DIR} .else -CONFIGURE_ARGS+= --without-berkeley-db +CONFIGURE_ARGS+= --with-berkeley-db=no .endif .if defined(WITH_SQLITE) --NzB8fVQJ5HfG6fxh--
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20120522211434.GA5483>