From owner-svn-ports-all@freebsd.org Thu Oct 11 09:58:03 2018 Return-Path: Delivered-To: svn-ports-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 73F0710B474B; Thu, 11 Oct 2018 09:58:03 +0000 (UTC) (envelope-from tobik@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 26777912FF; Thu, 11 Oct 2018 09:58:03 +0000 (UTC) (envelope-from tobik@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 2117C6E1F; Thu, 11 Oct 2018 09:58:03 +0000 (UTC) (envelope-from tobik@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w9B9w3FW077021; Thu, 11 Oct 2018 09:58:03 GMT (envelope-from tobik@FreeBSD.org) Received: (from tobik@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w9B9w2j8077020; Thu, 11 Oct 2018 09:58:02 GMT (envelope-from tobik@FreeBSD.org) Message-Id: <201810110958.w9B9w2j8077020@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: tobik set sender to tobik@FreeBSD.org using -f From: Tobias Kortkamp Date: Thu, 11 Oct 2018 09:58:02 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r481806 - in branches/2018Q4/mail/qmailadmin: . files X-SVN-Group: ports-branches X-SVN-Commit-Author: tobik X-SVN-Commit-Paths: in branches/2018Q4/mail/qmailadmin: . files X-SVN-Commit-Revision: 481806 X-SVN-Commit-Repository: ports 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.27 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: Thu, 11 Oct 2018 09:58:03 -0000 Author: tobik Date: Thu Oct 11 09:58:02 2018 New Revision: 481806 URL: https://svnweb.freebsd.org/changeset/ports/481806 Log: MFH: r481799 mail/qmailadmin: Chase cracklib dictionary rename from r408137 PR: 213157 Submitted by: Florian Riehm Approved by: 2 year bug anniversary Approved by: ports-secteam runtime fix blanket Modified: branches/2018Q4/mail/qmailadmin/Makefile branches/2018Q4/mail/qmailadmin/files/cracklib.patch Directory Properties: branches/2018Q4/ (props changed) Modified: branches/2018Q4/mail/qmailadmin/Makefile ============================================================================== --- branches/2018Q4/mail/qmailadmin/Makefile Thu Oct 11 09:56:41 2018 (r481805) +++ branches/2018Q4/mail/qmailadmin/Makefile Thu Oct 11 09:58:02 2018 (r481806) @@ -3,7 +3,7 @@ PORTNAME= qmailadmin PORTVERSION= 1.2.15 -PORTREVISION= 7 +PORTREVISION= 8 PORTEPOCH= 2 CATEGORIES= mail www MASTER_SITES= SF/${PORTNAME}/${PORTNAME}-stable/${PORTVERSION} \ @@ -86,7 +86,7 @@ CONFIGURE_ARGS+= --enable-spam-command="${SPAM_COMMAND .if ${PORT_OPTIONS:MCRACKLIB} EXTRA_PATCHES+= ${FILESDIR}/cracklib.patch BUILD_DEPENDS+= ${LOCALBASE}/include/crack.h:security/cracklib -CONFIGURE_ARGS+= --enable-cracklib=${LOCALBASE}/libdata/cracklib/pw_dict +CONFIGURE_ARGS+= --enable-cracklib=${LOCALBASE}/libdata/cracklib/cracklib-words CFLAGS+= -I${LOCALBASE}/include LIBS+= -L${LOCALBASE}/lib -lcrack .endif Modified: branches/2018Q4/mail/qmailadmin/files/cracklib.patch ============================================================================== --- branches/2018Q4/mail/qmailadmin/files/cracklib.patch Thu Oct 11 09:56:41 2018 (r481805) +++ branches/2018Q4/mail/qmailadmin/files/cracklib.patch Thu Oct 11 09:58:02 2018 (r481806) @@ -24,7 +24,7 @@ + +if test "$cracklib" = "yes" +then -+ cracklib="/usr/local/libdata/cracklib/pw_dict" ++ cracklib="/usr/local/libdata/cracklib/cracklib-words" +fi + +case $cracklib in