|
 |
71fb5d |
From e6f7c9d4c2af1cda7760ca8155166bb5d4d541d0 Mon Sep 17 00:00:00 2001
|
|
|
71fb5d |
From: Alexander Scheel <ascheel@redhat.com>
|
|
|
71fb5d |
Date: Wed, 8 May 2019 12:58:02 -0400
|
|
|
71fb5d |
Subject: [PATCH] Don't generate certificates in reproducible builds
|
|
|
71fb5d |
|
|
|
71fb5d |
Signed-off-by: Alexander Scheel <ascheel@redhat.com>
|
|
|
71fb5d |
---
|
|
|
71fb5d |
Make.inc.in | 5 +++++
|
|
|
71fb5d |
configure | 4 ++++
|
|
|
71fb5d |
configure.ac | 3 +++
|
|
|
71fb5d |
raddb/all.mk | 4 ++++
|
|
|
71fb5d |
4 files changed, 16 insertions(+)
|
|
|
71fb5d |
|
|
|
71fb5d |
diff --git a/Make.inc.in b/Make.inc.in
|
|
|
71fb5d |
index 0b2cd74de8..8c623cf95c 100644
|
|
|
71fb5d |
--- a/Make.inc.in
|
|
|
71fb5d |
+++ b/Make.inc.in
|
|
|
71fb5d |
@@ -173,3 +173,8 @@ else
|
|
|
71fb5d |
TESTBINDIR = ./$(BUILD_DIR)/bin
|
|
|
71fb5d |
TESTBIN = ./$(BUILD_DIR)/bin
|
|
|
71fb5d |
endif
|
|
|
71fb5d |
+
|
|
|
71fb5d |
+#
|
|
|
71fb5d |
+# With reproducible builds, do not generate certificates during installation
|
|
|
71fb5d |
+#
|
|
|
71fb5d |
+ENABLE_REPRODUCIBLE_BUILDS = @ENABLE_REPRODUCIBLE_BUILDS@
|
|
|
71fb5d |
diff --git a/configure b/configure
|
|
|
71fb5d |
index c2c599c92b..3d4403a844 100755
|
|
|
71fb5d |
--- a/configure
|
|
|
71fb5d |
+++ b/configure
|
|
|
71fb5d |
@@ -655,6 +655,7 @@ RUSERS
|
|
|
71fb5d |
SNMPWALK
|
|
|
71fb5d |
SNMPGET
|
|
|
71fb5d |
PERL
|
|
|
71fb5d |
+ENABLE_REPRODUCIBLE_BUILDS
|
|
|
71fb5d |
openssl_version_check_config
|
|
|
71fb5d |
WITH_DHCP
|
|
|
71fb5d |
modconfdir
|
|
|
71fb5d |
@@ -5586,6 +5587,7 @@ else
|
|
|
71fb5d |
fi
|
|
|
71fb5d |
|
|
|
71fb5d |
|
|
|
71fb5d |
+ENABLE_REPRODUCIBLE_BUILDS=yes
|
|
|
71fb5d |
# Check whether --enable-reproducible-builds was given.
|
|
|
71fb5d |
if test "${enable_reproducible_builds+set}" = set; then :
|
|
|
71fb5d |
enableval=$enable_reproducible_builds; case "$enableval" in
|
|
|
71fb5d |
@@ -5597,6 +5599,7 @@ $as_echo "#define ENABLE_REPRODUCIBLE_BUILDS 1" >>confdefs.h
|
|
|
71fb5d |
;;
|
|
|
71fb5d |
*)
|
|
|
71fb5d |
reproducible_builds=no
|
|
|
71fb5d |
+ ENABLE_REPRODUCIBLE_BUILDS=no
|
|
|
71fb5d |
esac
|
|
|
71fb5d |
|
|
|
71fb5d |
fi
|
|
|
71fb5d |
@@ -5604,6 +5607,7 @@ fi
|
|
|
71fb5d |
|
|
|
71fb5d |
|
|
|
71fb5d |
|
|
|
71fb5d |
+
|
|
|
71fb5d |
CHECKRAD=checkrad
|
|
|
71fb5d |
# Extract the first word of "perl", so it can be a program name with args.
|
|
|
71fb5d |
set dummy perl; ac_word=$2
|
|
|
71fb5d |
diff --git a/configure.ac b/configure.ac
|
|
|
71fb5d |
index a7abf0025a..35b013f4af 100644
|
|
|
71fb5d |
--- a/configure.ac
|
|
|
71fb5d |
+++ b/configure.ac
|
|
|
71fb5d |
@@ -619,6 +619,7 @@ AC_SUBST([openssl_version_check_config])
|
|
|
71fb5d |
dnl #
|
|
|
71fb5d |
dnl # extra argument: --enable-reproducible-builds
|
|
|
71fb5d |
dnl #
|
|
|
71fb5d |
+ENABLE_REPRODUCIBLE_BUILDS=yes
|
|
|
71fb5d |
AC_ARG_ENABLE(reproducible-builds,
|
|
|
71fb5d |
[AS_HELP_STRING([--enable-reproducible-builds],
|
|
|
71fb5d |
[ensure the build does not change each time])],
|
|
|
71fb5d |
@@ -630,8 +631,10 @@ AC_ARG_ENABLE(reproducible-builds,
|
|
|
71fb5d |
;;
|
|
|
71fb5d |
*)
|
|
|
71fb5d |
reproducible_builds=no
|
|
|
71fb5d |
+ ENABLE_REPRODUCIBLE_BUILDS=no
|
|
|
71fb5d |
esac ]
|
|
|
71fb5d |
)
|
|
|
71fb5d |
+AC_SUBST(ENABLE_REPRODUCIBLE_BUILDS)
|
|
|
71fb5d |
|
|
|
71fb5d |
|
|
|
71fb5d |
dnl #############################################################
|
|
|
71fb5d |
diff --git a/raddb/all.mk b/raddb/all.mk
|
|
|
71fb5d |
index c966edd657..c8e976a499 100644
|
|
|
71fb5d |
--- a/raddb/all.mk
|
|
|
71fb5d |
+++ b/raddb/all.mk
|
|
|
71fb5d |
@@ -124,7 +124,11 @@ $(R)$(raddbdir)/users: $(R)$(modconfdir)/files/authorize
|
|
|
71fb5d |
ifneq "$(LOCAL_CERT_PRODUCTS)" ""
|
|
|
71fb5d |
$(LOCAL_CERT_PRODUCTS):
|
|
|
71fb5d |
@echo BOOTSTRAP raddb/certs/
|
|
|
71fb5d |
+ifeq "$(ENABLE_REPRODUCIBLE_BUILDS)" "yes"
|
|
|
71fb5d |
+ @$(MAKE) -C $(R)$(raddbdir)/certs/ passwords.mk
|
|
|
71fb5d |
+else
|
|
|
71fb5d |
@$(MAKE) -C $(R)$(raddbdir)/certs/
|
|
|
71fb5d |
+endif
|
|
|
71fb5d |
|
|
|
71fb5d |
# Bootstrap is special
|
|
|
71fb5d |
$(R)$(raddbdir)/certs/bootstrap: | raddb/certs/bootstrap $(LOCAL_CERT_PRODUCTS)
|
|
|
71fb5d |
--
|
|
|
71fb5d |
2.21.0
|
|
|
71fb5d |
|