Attachment #191643 for bug #226788

View | Details | Raw Unified | Return to bug 226788
Collapse All | Expand All

Lines 2-8 Link Here

(-)Makefile (-1 / +1 lines)
2	# $FreeBSD$	2	# $FreeBSD$
3		3
4	PORTNAME= mod_md	4	PORTNAME= mod_md
5	PORTVERSION= 1.1.8	5	PORTVERSION= 1.1.10
6	DISTVERSIONPREFIX= v	6	DISTVERSIONPREFIX= v
7	CATEGORIES= www	7	CATEGORIES= www
8	PKGNAMEPREFIX= ${APACHE_PKGNAMEPREFIX}	8	PKGNAMEPREFIX= ${APACHE_PKGNAMEPREFIX}

Lines 1-3 Link Here

(-)distinfo (-3 / +3 lines)
1	TIMESTAMP = 1515348002	1	TIMESTAMP = 1521455071
2	SHA256 (icing-mod_md-v1.1.8_GH0.tar.gz) = 0100bcda81c04c8d3f0399c9805f5ded0fae43487637e269c95febf13d4c0252	2	SHA256 (icing-mod_md-v1.1.10_GH0.tar.gz) = 16b2e2635ab7afddd0d3ba62a09d9323aaeb09538d8f0b09808d8285e15a66a8
3	SIZE (icing-mod_md-v1.1.8_GH0.tar.gz) = 200327	3	SIZE (icing-mod_md-v1.1.10_GH0.tar.gz) = 200528




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

Return to bug 226788

Lines 1-44 Link Here

(-)files/patch-boulder (-44 lines)
1	diff --git a/ChangeLog b/ChangeLog
2	index 6de5fc4..2f70ce4 100644
3	--- ChangeLog.orig
4	+++ ChangeLog
5	@@ -1,3 +1,8 @@
6	+v1.1.9-DEV
7	+----------------------------------------------------------------------------------------------------
8	+ * Removed bould check from configure. Not everone building the module needs it installed.
9	+ Fixes #76.
10	+
11	v1.1.8
12	----------------------------------------------------------------------------------------------------
13	* new configuration directive "MDBaseServer on\|off" to allow/inhibit management of the base
14	diff --git a/configure.ac b/configure.ac
15	index 0e1a44a..7b54209 100644
16	--- configure.ac.orig
17	+++ configure.ac
18	@@ -177,10 +177,8 @@ AC_SUBST(BOULDER_TOS)
19	# the path where boulder is installed
20	if test "x$request_boulder_dir" = "xdef"; then
21	BOULDER_DIR="$GOPATH/src/github.com/letsencrypt/boulder"
22	- 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. ])
23	else
24	BOULDER_DIR="$request_boulder_dir"
25	- test -d "$BOULDER_DIR" \|\| AC_MSG_ERROR([boulder installation not found as specified in $BOULDER_DIR.])
26	fi
27
28	AC_SUBST(BOULDER_DIR)
29	diff --git a/test/Makefile.am b/test/Makefile.am
30	index bca8fc6..e30eb6d 100644
31	--- test/Makefile.am.orig
32	+++ test/Makefile.am
33	@@ -89,7 +89,11 @@ test-configs: $(SERVER_DIR)/.test-setup
34	# The certificates we need to verify the cert chain we retrieved from ACME
35	# For now, we need these two, although a fix is underway that only one becomes
36	# necessary. See: https://github.com/letsencrypt/boulder/issues/3307
37	+@BOULDER_DIR@:
38	+ @test -d $(BOULDER_DIR) \|\| echo "boulder installation not found. Please configure using --with-boulder-dir to specify the correct location."; exit 1
39	+
40	$(GEN)/ca.pem: \
41	+ $(BOULDER_DIR) \
42	$(BOULDER_DIR)/test/test-ca.pem \
43	$(BOULDER_DIR)/test/test-ca2.pem
44	@cat $(BOULDER_DIR)/test/test-root.pem $(BOULDER_DIR)/test/test-ca2.pem > $(GEN)/ca.pem