From owner-svn-ports-all@freebsd.org Sun Mar 11 20:00:48 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 4E1F3F4AB64; Sun, 11 Mar 2018 20:00:48 +0000 (UTC) (envelope-from brnrd@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 E10707C31E; Sun, 11 Mar 2018 20:00:47 +0000 (UTC) (envelope-from brnrd@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 C1E5A21CA8; Sun, 11 Mar 2018 20:00:47 +0000 (UTC) (envelope-from brnrd@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w2BK0lnw058679; Sun, 11 Mar 2018 20:00:47 GMT (envelope-from brnrd@FreeBSD.org) Received: (from brnrd@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w2BK0lOi058678; Sun, 11 Mar 2018 20:00:47 GMT (envelope-from brnrd@FreeBSD.org) Message-Id: <201803112000.w2BK0lOi058678@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: brnrd set sender to brnrd@FreeBSD.org using -f From: Bernard Spil Date: Sun, 11 Mar 2018 20:00:47 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r464201 - head/www/mod_md-devel/files X-SVN-Group: ports-head X-SVN-Commit-Author: brnrd X-SVN-Commit-Paths: head/www/mod_md-devel/files X-SVN-Commit-Revision: 464201 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.25 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: Sun, 11 Mar 2018 20:00:48 -0000 Author: brnrd Date: Sun Mar 11 20:00:47 2018 New Revision: 464201 URL: https://svnweb.freebsd.org/changeset/ports/464201 Log: www/mod_md-devel: Don't require full boulder install See: https://github.com/icing/mod_md/issues/80 Added: head/www/mod_md-devel/files/patch-boulder (contents, props changed) Added: head/www/mod_md-devel/files/patch-boulder ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/www/mod_md-devel/files/patch-boulder Sun Mar 11 20:00:47 2018 (r464201) @@ -0,0 +1,44 @@ +diff --git a/ChangeLog b/ChangeLog +index 6de5fc4..2f70ce4 100644 +--- ChangeLog.orig ++++ ChangeLog +@@ -1,3 +1,8 @@ ++v1.1.9-DEV ++---------------------------------------------------------------------------------------------------- ++ * Removed bould check from configure. Not everone building the module needs it installed. ++ Fixes #76. ++ + v1.1.8 + ---------------------------------------------------------------------------------------------------- + * new configuration directive "MDBaseServer on|off" to allow/inhibit management of the base +diff --git a/configure.ac b/configure.ac +index 0e1a44a..7b54209 100644 +--- configure.ac.orig ++++ configure.ac +@@ -177,10 +177,8 @@ AC_SUBST(BOULDER_TOS) + # the path where boulder is installed + if test "x$request_boulder_dir" = "xdef"; then + BOULDER_DIR="$GOPATH/src/github.com/letsencrypt/boulder" +- test -d "$BOULDER_DIR" || AC_MSG_ERROR([boulder installation not found in default location $BOULDER_DIR. Please use --with-boulder-dir to specify the correct location. ]) + else + BOULDER_DIR="$request_boulder_dir" +- test -d "$BOULDER_DIR" || AC_MSG_ERROR([boulder installation not found as specified in $BOULDER_DIR.]) + fi + + AC_SUBST(BOULDER_DIR) +diff --git a/test/Makefile.am b/test/Makefile.am +index bca8fc6..e30eb6d 100644 +--- test/Makefile.am.orig ++++ test/Makefile.am +@@ -89,7 +89,11 @@ test-configs: $(SERVER_DIR)/.test-setup + # The certificates we need to verify the cert chain we retrieved from ACME + # For now, we need these two, although a fix is underway that only one becomes + # necessary. See: https://github.com/letsencrypt/boulder/issues/3307 ++@BOULDER_DIR@: ++ @test -d $(BOULDER_DIR) || echo "boulder installation not found. Please configure using --with-boulder-dir to specify the correct location."; exit 1 ++ + $(GEN)/ca.pem: \ ++ $(BOULDER_DIR) \ + $(BOULDER_DIR)/test/test-ca.pem \ + $(BOULDER_DIR)/test/test-ca2.pem + @cat $(BOULDER_DIR)/test/test-root.pem $(BOULDER_DIR)/test/test-ca2.pem > $(GEN)/ca.pem