1 From e6f7c9d4c2af1cda7760ca8155166bb5d4d541d0 Mon Sep 17 00:00:00 2001
2 From: Alexander Scheel <ascheel@redhat.com>
3 Date: Wed, 8 May 2019 12:58:02 -0400
4 Subject: [PATCH] Don't generate certificates in reproducible builds
6 Signed-off-by: Alexander Scheel <ascheel@redhat.com>
12 4 files changed, 16 insertions(+)
14 diff --git a/Make.inc.in b/Make.inc.in
15 index 0b2cd74de8..8c623cf95c 100644
18 @@ -173,3 +173,8 @@ else
19 TESTBINDIR = ./$(BUILD_DIR)/bin
20 TESTBIN = ./$(BUILD_DIR)/bin
24 +# With reproducible builds, do not generate certificates during installation
26 +ENABLE_REPRODUCIBLE_BUILDS = @ENABLE_REPRODUCIBLE_BUILDS@
27 diff --git a/configure b/configure
28 index c2c599c92b..3d4403a844 100755
31 @@ -655,6 +655,7 @@ RUSERS
35 +ENABLE_REPRODUCIBLE_BUILDS
36 openssl_version_check_config
39 @@ -5586,6 +5587,7 @@ else
43 +ENABLE_REPRODUCIBLE_BUILDS=yes
44 # Check whether --enable-reproducible-builds was given.
45 if test "${enable_reproducible_builds+set}" = set; then :
46 enableval=$enable_reproducible_builds; case "$enableval" in
47 @@ -5597,6 +5599,7 @@ $as_echo "#define ENABLE_REPRODUCIBLE_BUILDS 1" >>confdefs.h
50 reproducible_builds=no
51 + ENABLE_REPRODUCIBLE_BUILDS=no
55 @@ -5604,6 +5607,7 @@ fi
61 # Extract the first word of "perl", so it can be a program name with args.
62 set dummy perl; ac_word=$2
63 diff --git a/configure.ac b/configure.ac
64 index a7abf0025a..35b013f4af 100644
67 @@ -619,6 +619,7 @@ AC_SUBST([openssl_version_check_config])
69 dnl # extra argument: --enable-reproducible-builds
71 +ENABLE_REPRODUCIBLE_BUILDS=yes
72 AC_ARG_ENABLE(reproducible-builds,
73 [AS_HELP_STRING([--enable-reproducible-builds],
74 [ensure the build does not change each time])],
75 @@ -630,8 +631,10 @@ AC_ARG_ENABLE(reproducible-builds,
78 reproducible_builds=no
79 + ENABLE_REPRODUCIBLE_BUILDS=no
82 +AC_SUBST(ENABLE_REPRODUCIBLE_BUILDS)
85 dnl #############################################################
86 diff --git a/raddb/all.mk b/raddb/all.mk
87 index c966edd657..c8e976a499 100644
90 @@ -124,7 +124,11 @@ $(R)$(raddbdir)/users: $(R)$(modconfdir)/files/authorize
91 ifneq "$(LOCAL_CERT_PRODUCTS)" ""
92 $(LOCAL_CERT_PRODUCTS):
93 @echo BOOTSTRAP raddb/certs/
94 +ifeq "$(ENABLE_REPRODUCIBLE_BUILDS)" "yes"
95 + @$(MAKE) -C $(R)$(raddbdir)/certs/ passwords.mk
97 @$(MAKE) -C $(R)$(raddbdir)/certs/
100 # Bootstrap is special
101 $(R)$(raddbdir)/certs/bootstrap: | raddb/certs/bootstrap $(LOCAL_CERT_PRODUCTS)