This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "IPFire 2.x development tree".

The branch, next has been updated via 875f43830e85e6d242e08ea0eedb5b3c2040e876 (commit) from 3c691bcc7cbc6c54b028cd6e0e0f9b841a164a04 (commit)

Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below.

- Log ----------------------------------------------------------------- commit 875f43830e85e6d242e08ea0eedb5b3c2040e876 Author: Adolf Belka adolf.belka@ipfire.org Date: Fri Aug 20 22:06:13 2021 +0200

freeradius: Update to 3.0.23 and disable python to allow running without python2

- Added --without-rlm_python to ./configure to allow running without python2 - Updated rootfile - Updated patch for preventing cert generation during buildtime to work with new version of source code - Update from 3.0.21 to 3.0.23

Signed-off-by: Adolf Belka adolf.belka@ipfire.org Acked-by: Michael Tremer michael.tremer@ipfire.org Signed-off-by: Arne Fitzenreiter arne_f@ipfire.org

-----------------------------------------------------------------------

Summary of changes: config/rootfiles/packages/freeradius | 156 +++++++++++++++++++-- lfs/freeradius | 7 +- src/patches/freeradius-no-buildtime-cert-gen.patch | 88 ++++-------- 3 files changed, 181 insertions(+), 70 deletions(-)

Difference in files: diff --git a/config/rootfiles/packages/freeradius b/config/rootfiles/packages/freeradius index bdaf7e135..dc91b9d62 100644 --- a/config/rootfiles/packages/freeradius +++ b/config/rootfiles/packages/freeradius @@ -3,7 +3,7 @@ etc/raddb #etc/raddb/README.rst #etc/raddb/certs #etc/raddb/certs/Makefile -#etc/raddb/certs/README +#etc/raddb/certs/README.md #etc/raddb/certs/bootstrap #etc/raddb/certs/ca.cnf #etc/raddb/certs/client.cnf @@ -29,6 +29,9 @@ etc/raddb #etc/raddb/mods-available/detail.example.com #etc/raddb/mods-available/detail.log #etc/raddb/mods-available/dhcp +#etc/raddb/mods-available/dhcp_files +#etc/raddb/mods-available/dhcp_passwd +#etc/raddb/mods-available/dhcp_sql #etc/raddb/mods-available/dhcp_sqlippool #etc/raddb/mods-available/digest #etc/raddb/mods-available/dynamic_clients @@ -71,9 +74,11 @@ etc/raddb #etc/raddb/mods-available/soh #etc/raddb/mods-available/sometimes #etc/raddb/mods-available/sql +#etc/raddb/mods-available/sql_map #etc/raddb/mods-available/sqlcounter #etc/raddb/mods-available/sqlippool #etc/raddb/mods-available/sradutmp +#etc/raddb/mods-available/totp #etc/raddb/mods-available/unix #etc/raddb/mods-available/unpack #etc/raddb/mods-available/utf8 @@ -85,20 +90,19 @@ etc/raddb #etc/raddb/mods-config/attr_filter/access_challenge #etc/raddb/mods-config/attr_filter/access_reject #etc/raddb/mods-config/attr_filter/accounting_response +#etc/raddb/mods-config/attr_filter/coa #etc/raddb/mods-config/attr_filter/post-proxy #etc/raddb/mods-config/attr_filter/pre-proxy #etc/raddb/mods-config/files #etc/raddb/mods-config/files/accounting #etc/raddb/mods-config/files/authorize +#etc/raddb/mods-config/files/dhcp #etc/raddb/mods-config/files/pre-proxy #etc/raddb/mods-config/perl #etc/raddb/mods-config/perl/example.pl #etc/raddb/mods-config/preprocess #etc/raddb/mods-config/preprocess/hints #etc/raddb/mods-config/preprocess/huntgroups -#etc/raddb/mods-config/python -#etc/raddb/mods-config/python/example.py -#etc/raddb/mods-config/python/radiusd.py #etc/raddb/mods-config/sql #etc/raddb/mods-config/sql/counter #etc/raddb/mods-config/sql/counter/mysql @@ -126,11 +130,39 @@ etc/raddb #etc/raddb/mods-config/sql/cui/sqlite #etc/raddb/mods-config/sql/cui/sqlite/queries.conf #etc/raddb/mods-config/sql/cui/sqlite/schema.sql +#etc/raddb/mods-config/sql/dhcp +#etc/raddb/mods-config/sql/dhcp/mssql +#etc/raddb/mods-config/sql/dhcp/mssql/queries.conf +#etc/raddb/mods-config/sql/dhcp/mssql/schema.sql +#etc/raddb/mods-config/sql/dhcp/mysql +#etc/raddb/mods-config/sql/dhcp/mysql/queries.conf +#etc/raddb/mods-config/sql/dhcp/mysql/schema.sql +#etc/raddb/mods-config/sql/dhcp/mysql/setup.sql +#etc/raddb/mods-config/sql/dhcp/oracle +#etc/raddb/mods-config/sql/dhcp/oracle/queries.conf +#etc/raddb/mods-config/sql/dhcp/oracle/schema.sql +#etc/raddb/mods-config/sql/dhcp/postgresql +#etc/raddb/mods-config/sql/dhcp/postgresql/queries.conf +#etc/raddb/mods-config/sql/dhcp/postgresql/schema.sql +#etc/raddb/mods-config/sql/dhcp/postgresql/setup.sql +#etc/raddb/mods-config/sql/dhcp/sqlite +#etc/raddb/mods-config/sql/dhcp/sqlite/queries.conf +#etc/raddb/mods-config/sql/dhcp/sqlite/schema.sql #etc/raddb/mods-config/sql/ippool #etc/raddb/mods-config/sql/ippool-dhcp +#etc/raddb/mods-config/sql/ippool-dhcp/mssql +#etc/raddb/mods-config/sql/ippool-dhcp/mssql/procedure.sql +#etc/raddb/mods-config/sql/ippool-dhcp/mssql/queries.conf +#etc/raddb/mods-config/sql/ippool-dhcp/mssql/schema.sql #etc/raddb/mods-config/sql/ippool-dhcp/mysql +#etc/raddb/mods-config/sql/ippool-dhcp/mysql/procedure-no-skip-locked.sql +#etc/raddb/mods-config/sql/ippool-dhcp/mysql/procedure.sql #etc/raddb/mods-config/sql/ippool-dhcp/mysql/queries.conf #etc/raddb/mods-config/sql/ippool-dhcp/mysql/schema.sql +#etc/raddb/mods-config/sql/ippool-dhcp/postgresql +#etc/raddb/mods-config/sql/ippool-dhcp/postgresql/procedure.sql +#etc/raddb/mods-config/sql/ippool-dhcp/postgresql/queries.conf +#etc/raddb/mods-config/sql/ippool-dhcp/postgresql/schema.sql #etc/raddb/mods-config/sql/ippool-dhcp/sqlite #etc/raddb/mods-config/sql/ippool-dhcp/sqlite/queries.conf #etc/raddb/mods-config/sql/ippool-dhcp/sqlite/schema.sql @@ -141,6 +173,7 @@ etc/raddb #etc/raddb/mods-config/sql/ippool/mssql/queries.conf #etc/raddb/mods-config/sql/ippool/mssql/schema.sql #etc/raddb/mods-config/sql/ippool/mysql +#etc/raddb/mods-config/sql/ippool/mysql/procedure-no-skip-locked.sql #etc/raddb/mods-config/sql/ippool/mysql/procedure.sql #etc/raddb/mods-config/sql/ippool/mysql/queries.conf #etc/raddb/mods-config/sql/ippool/mysql/schema.sql @@ -219,6 +252,7 @@ etc/raddb #etc/raddb/mods-enabled/replicate #etc/raddb/mods-enabled/soh #etc/raddb/mods-enabled/sradutmp +#etc/raddb/mods-enabled/totp #etc/raddb/mods-enabled/unix #etc/raddb/mods-enabled/unpack #etc/raddb/mods-enabled/utf8 @@ -256,10 +290,12 @@ etc/raddb #etc/raddb/sites-available/inner-tunnel #etc/raddb/sites-available/originate-coa #etc/raddb/sites-available/proxy-inner-tunnel +#etc/raddb/sites-available/resource-check #etc/raddb/sites-available/robust-proxy-accounting #etc/raddb/sites-available/soh #etc/raddb/sites-available/status #etc/raddb/sites-available/tls +#etc/raddb/sites-available/totp #etc/raddb/sites-available/virtual.example.com #etc/raddb/sites-available/vmps #etc/raddb/sites-enabled @@ -283,6 +319,7 @@ usr/bin/radtest usr/bin/radwho usr/bin/radzap usr/bin/rlm_ippool_tool +#usr/bin/rlm_sqlippool_tool usr/bin/smbencrypt #usr/include/freeradius #usr/include/freeradius/attributes.h @@ -419,9 +456,6 @@ usr/lib/freeradius/rlm_eap_fast.so #usr/lib/freeradius/rlm_eap_gtc.a #usr/lib/freeradius/rlm_eap_gtc.la usr/lib/freeradius/rlm_eap_gtc.so -#usr/lib/freeradius/rlm_eap_leap.a -#usr/lib/freeradius/rlm_eap_leap.la -usr/lib/freeradius/rlm_eap_leap.so #usr/lib/freeradius/rlm_eap_md5.a #usr/lib/freeradius/rlm_eap_md5.la usr/lib/freeradius/rlm_eap_md5.so @@ -491,9 +525,6 @@ usr/lib/freeradius/rlm_perl.so #usr/lib/freeradius/rlm_preprocess.a #usr/lib/freeradius/rlm_preprocess.la usr/lib/freeradius/rlm_preprocess.so -#usr/lib/freeradius/rlm_python.a -#usr/lib/freeradius/rlm_python.la -usr/lib/freeradius/rlm_python.so #usr/lib/freeradius/rlm_radutmp.a #usr/lib/freeradius/rlm_radutmp.la usr/lib/freeradius/rlm_radutmp.so @@ -515,6 +546,9 @@ usr/lib/freeradius/rlm_sometimes.so #usr/lib/freeradius/rlm_sql.a #usr/lib/freeradius/rlm_sql.la usr/lib/freeradius/rlm_sql.so +#usr/lib/freeradius/rlm_sql_map.a +#usr/lib/freeradius/rlm_sql_map.la +usr/lib/freeradius/rlm_sql_map.so #usr/lib/freeradius/rlm_sql_null.a #usr/lib/freeradius/rlm_sql_null.la usr/lib/freeradius/rlm_sql_null.so @@ -526,6 +560,9 @@ usr/lib/freeradius/rlm_sqlcounter.so usr/lib/freeradius/rlm_sqlippool.so #usr/lib/freeradius/rlm_test.a #usr/lib/freeradius/rlm_test.la +#usr/lib/freeradius/rlm_totp.a +#usr/lib/freeradius/rlm_totp.la +usr/lib/freeradius/rlm_totp.so #usr/lib/freeradius/rlm_unix.a #usr/lib/freeradius/rlm_unix.la usr/lib/freeradius/rlm_unix.so @@ -549,6 +586,101 @@ usr/sbin/radmin #usr/share/doc/freeradius/ChangeLog #usr/share/doc/freeradius/Makefile.sphinx #usr/share/doc/freeradius/README +#usr/share/doc/freeradius/antora +#usr/share/doc/freeradius/antora/antora.yml +#usr/share/doc/freeradius/antora/modules +#usr/share/doc/freeradius/antora/modules/ROOT +#usr/share/doc/freeradius/antora/modules/ROOT/assets +#usr/share/doc/freeradius/antora/modules/ROOT/assets/images +#usr/share/doc/freeradius/antora/modules/ROOT/assets/images/favicon.png +#usr/share/doc/freeradius/antora/modules/ROOT/assets/images/favicon.svg +#usr/share/doc/freeradius/antora/modules/ROOT/assets/images/networkradius.png +#usr/share/doc/freeradius/antora/modules/ROOT/nav.adoc +#usr/share/doc/freeradius/antora/modules/ROOT/pages +#usr/share/doc/freeradius/antora/modules/ROOT/pages/directories.adoc +#usr/share/doc/freeradius/antora/modules/ROOT/pages/index.adoc +#usr/share/doc/freeradius/antora/modules/howto +#usr/share/doc/freeradius/antora/modules/howto/nav.adoc +#usr/share/doc/freeradius/antora/modules/howto/pages +#usr/share/doc/freeradius/antora/modules/howto/pages/index.adoc +#usr/share/doc/freeradius/antora/modules/howto/pages/protocols +#usr/share/doc/freeradius/antora/modules/howto/pages/protocols/dhcp +#usr/share/doc/freeradius/antora/modules/howto/pages/protocols/dhcp/enable.adoc +#usr/share/doc/freeradius/antora/modules/howto/pages/protocols/dhcp/index.adoc +#usr/share/doc/freeradius/antora/modules/howto/pages/protocols/dhcp/policy.adoc +#usr/share/doc/freeradius/antora/modules/howto/pages/protocols/dhcp/policy_common_options.adoc +#usr/share/doc/freeradius/antora/modules/howto/pages/protocols/dhcp/policy_device_options.adoc +#usr/share/doc/freeradius/antora/modules/howto/pages/protocols/dhcp/policy_ippool_access.adoc +#usr/share/doc/freeradius/antora/modules/howto/pages/protocols/dhcp/policy_ippool_creation.adoc +#usr/share/doc/freeradius/antora/modules/howto/pages/protocols/dhcp/policy_network_options.adoc +#usr/share/doc/freeradius/antora/modules/howto/pages/protocols/dhcp/policy_subnet_options.adoc +#usr/share/doc/freeradius/antora/modules/howto/pages/protocols/dhcp/prepare.adoc +#usr/share/doc/freeradius/antora/modules/howto/pages/protocols/dhcp/test.adoc +#usr/share/doc/freeradius/antora/modules/installation +#usr/share/doc/freeradius/antora/modules/installation/nav.adoc +#usr/share/doc/freeradius/antora/modules/installation/pages +#usr/share/doc/freeradius/antora/modules/installation/pages/dependencies.adoc +#usr/share/doc/freeradius/antora/modules/installation/pages/index.adoc +#usr/share/doc/freeradius/antora/modules/installation/pages/packages.adoc +#usr/share/doc/freeradius/antora/modules/installation/pages/source.adoc +#usr/share/doc/freeradius/antora/modules/installation/pages/upgrade.adoc +#usr/share/doc/freeradius/antora/modules/unlang +#usr/share/doc/freeradius/antora/modules/unlang/nav.adoc +#usr/share/doc/freeradius/antora/modules/unlang/pages +#usr/share/doc/freeradius/antora/modules/unlang/pages/attr.adoc +#usr/share/doc/freeradius/antora/modules/unlang/pages/break.adoc +#usr/share/doc/freeradius/antora/modules/unlang/pages/case.adoc +#usr/share/doc/freeradius/antora/modules/unlang/pages/condition +#usr/share/doc/freeradius/antora/modules/unlang/pages/condition/and.adoc +#usr/share/doc/freeradius/antora/modules/unlang/pages/condition/cmp.adoc +#usr/share/doc/freeradius/antora/modules/unlang/pages/condition/eq.adoc +#usr/share/doc/freeradius/antora/modules/unlang/pages/condition/index.adoc +#usr/share/doc/freeradius/antora/modules/unlang/pages/condition/not.adoc +#usr/share/doc/freeradius/antora/modules/unlang/pages/condition/operands.adoc +#usr/share/doc/freeradius/antora/modules/unlang/pages/condition/or.adoc +#usr/share/doc/freeradius/antora/modules/unlang/pages/condition/para.adoc +#usr/share/doc/freeradius/antora/modules/unlang/pages/condition/regex.adoc +#usr/share/doc/freeradius/antora/modules/unlang/pages/condition/return_codes.adoc +#usr/share/doc/freeradius/antora/modules/unlang/pages/default.adoc +#usr/share/doc/freeradius/antora/modules/unlang/pages/else.adoc +#usr/share/doc/freeradius/antora/modules/unlang/pages/elsif.adoc +#usr/share/doc/freeradius/antora/modules/unlang/pages/foreach.adoc +#usr/share/doc/freeradius/antora/modules/unlang/pages/group.adoc +#usr/share/doc/freeradius/antora/modules/unlang/pages/if.adoc +#usr/share/doc/freeradius/antora/modules/unlang/pages/index.adoc +#usr/share/doc/freeradius/antora/modules/unlang/pages/keywords.adoc +#usr/share/doc/freeradius/antora/modules/unlang/pages/list.adoc +#usr/share/doc/freeradius/antora/modules/unlang/pages/load-balance.adoc +#usr/share/doc/freeradius/antora/modules/unlang/pages/module.adoc +#usr/share/doc/freeradius/antora/modules/unlang/pages/module_builtin.adoc +#usr/share/doc/freeradius/antora/modules/unlang/pages/module_method.adoc +#usr/share/doc/freeradius/antora/modules/unlang/pages/redundant-load-balance.adoc +#usr/share/doc/freeradius/antora/modules/unlang/pages/redundant.adoc +#usr/share/doc/freeradius/antora/modules/unlang/pages/return.adoc +#usr/share/doc/freeradius/antora/modules/unlang/pages/return_codes.adoc +#usr/share/doc/freeradius/antora/modules/unlang/pages/switch.adoc +#usr/share/doc/freeradius/antora/modules/unlang/pages/type +#usr/share/doc/freeradius/antora/modules/unlang/pages/type/all_types.adoc +#usr/share/doc/freeradius/antora/modules/unlang/pages/type/double.adoc +#usr/share/doc/freeradius/antora/modules/unlang/pages/type/index.adoc +#usr/share/doc/freeradius/antora/modules/unlang/pages/type/ip.adoc +#usr/share/doc/freeradius/antora/modules/unlang/pages/type/numb.adoc +#usr/share/doc/freeradius/antora/modules/unlang/pages/type/string +#usr/share/doc/freeradius/antora/modules/unlang/pages/type/string/backticks.adoc +#usr/share/doc/freeradius/antora/modules/unlang/pages/type/string/double.adoc +#usr/share/doc/freeradius/antora/modules/unlang/pages/type/string/escaping.adoc +#usr/share/doc/freeradius/antora/modules/unlang/pages/type/string/single.adoc +#usr/share/doc/freeradius/antora/modules/unlang/pages/type/string/unquoted.adoc +#usr/share/doc/freeradius/antora/modules/unlang/pages/update.adoc +#usr/share/doc/freeradius/antora/modules/unlang/pages/xlat +#usr/share/doc/freeradius/antora/modules/unlang/pages/xlat/alternation.adoc +#usr/share/doc/freeradius/antora/modules/unlang/pages/xlat/attribute.adoc +#usr/share/doc/freeradius/antora/modules/unlang/pages/xlat/builtin.adoc +#usr/share/doc/freeradius/antora/modules/unlang/pages/xlat/character.adoc +#usr/share/doc/freeradius/antora/modules/unlang/pages/xlat/index.adoc +#usr/share/doc/freeradius/antora/modules/unlang/pages/xlat/module.adoc +#usr/share/doc/freeradius/antora/modules/unlang/partials +#usr/share/doc/freeradius/antora/modules/unlang/partials/rcode_table.adoc #usr/share/doc/freeradius/bugs #usr/share/doc/freeradius/concepts #usr/share/doc/freeradius/concepts/aaa.rst @@ -557,6 +689,7 @@ usr/sbin/radmin #usr/share/doc/freeradius/configuration/acct_type.rst #usr/share/doc/freeradius/configuration/autz_type.rst #usr/share/doc/freeradius/configuration/configurable_failover.rst +#usr/share/doc/freeradius/configuration/dynamic_home_servers.md #usr/share/doc/freeradius/configuration/load_balance.rst #usr/share/doc/freeradius/configuration/post_auth_type #usr/share/doc/freeradius/configuration/session_type @@ -745,6 +878,7 @@ usr/share/freeradius #usr/share/freeradius/dictionary.cablelabs #usr/share/freeradius/dictionary.cabletron #usr/share/freeradius/dictionary.camiant +#usr/share/freeradius/dictionary.centec #usr/share/freeradius/dictionary.checkpoint #usr/share/freeradius/dictionary.chillispot #usr/share/freeradius/dictionary.cisco @@ -900,6 +1034,7 @@ usr/share/freeradius #usr/share/freeradius/dictionary.t_systems_nova #usr/share/freeradius/dictionary.telebit #usr/share/freeradius/dictionary.telkom +#usr/share/freeradius/dictionary.telrad #usr/share/freeradius/dictionary.terena #usr/share/freeradius/dictionary.trapeze #usr/share/freeradius/dictionary.travelping @@ -968,6 +1103,7 @@ usr/share/freeradius #usr/share/man/man8/radsniff.8 #usr/share/man/man8/radsqlrelay.8 #usr/share/man/man8/rlm_ippool_tool.8 +#usr/share/man/man8/rlm_sqlippool_tool.8 var/ipfire/backup/addons/includes/freeradius var/log/radius #var/log/radius/radacct diff --git a/lfs/freeradius b/lfs/freeradius index b1a139bb6..967a00483 100644 --- a/lfs/freeradius +++ b/lfs/freeradius @@ -24,7 +24,7 @@

include Config

-VER = 3.0.21 +VER = 3.0.23

THISAPP = freeradius-server-$(VER) DL_FILE = $(THISAPP).tar.bz2 @@ -32,7 +32,7 @@ DL_FROM = $(URL_IPFIRE) DIR_APP = $(DIR_SRC)/$(THISAPP) TARGET = $(DIR_INFO)/$(THISAPP) PROG = freeradius -PAK_VER = 13 +PAK_VER = 14

DEPS = libtalloc samba

@@ -44,7 +44,7 @@ objects = $(DL_FILE)

$(DL_FILE) = $(DL_FROM)/$(DL_FILE)

-$(DL_FILE)_MD5 = 8b7f794f2ac0d686d9aecfa083a63614 +$(DL_FILE)_MD5 = 7e462b0c069ce04f2cbc60da78627182

install : $(TARGET)

@@ -97,6 +97,7 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) --without-rlm_sql_oracle \ --without-rlm_sql_sqlite \ --without-rlm_sql_mysql \ + --without-rlm_python \ LDFLAGS="$(LDFLAGS)"

cd $(DIR_APP) && make $(MAKETUNING) diff --git a/src/patches/freeradius-no-buildtime-cert-gen.patch b/src/patches/freeradius-no-buildtime-cert-gen.patch index aa3be6648..c65f72897 100644 --- a/src/patches/freeradius-no-buildtime-cert-gen.patch +++ b/src/patches/freeradius-no-buildtime-cert-gen.patch @@ -1,42 +1,15 @@ -From e6f7c9d4c2af1cda7760ca8155166bb5d4d541d0 Mon Sep 17 00:00:00 2001 -From: Alexander Scheel ascheel@redhat.com -Date: Wed, 8 May 2019 12:58:02 -0400 -Subject: [PATCH] Don't generate certificates in reproducible builds - -Signed-off-by: Alexander Scheel ascheel@redhat.com ---- - Make.inc.in | 5 +++++ - configure | 4 ++++ - configure.ac | 3 +++ - raddb/all.mk | 4 ++++ - 4 files changed, 16 insertions(+) - -diff --git a/Make.inc.in b/Make.inc.in -index 0b2cd74de8..8c623cf95c 100644 ---- a/Make.inc.in -+++ b/Make.inc.in -@@ -173,3 +173,8 @@ else - TESTBINDIR = ./$(BUILD_DIR)/bin - TESTBIN = ./$(BUILD_DIR)/bin - endif -+ -+# -+# With reproducible builds, do not generate certificates during installation -+# -+ENABLE_REPRODUCIBLE_BUILDS = @ENABLE_REPRODUCIBLE_BUILDS@ -diff --git a/configure b/configure -index c2c599c92b..3d4403a844 100755 ---- a/configure -+++ b/configure -@@ -655,6 +655,7 @@ RUSERS +diff -Naur a/configure b/configure +--- a/configure 2021-06-10 16:49:17.000000000 +0200 ++++ b/configure 2021-08-19 11:14:56.964232407 +0200 +@@ -654,6 +654,7 @@ + RUSERS SNMPWALK SNMPGET - PERL +ENABLE_REPRODUCIBLE_BUILDS openssl_version_check_config WITH_DHCP modconfdir -@@ -5586,6 +5587,7 @@ else +@@ -5986,6 +5987,7 @@ fi

@@ -44,7 +17,7 @@ index c2c599c92b..3d4403a844 100755 # Check whether --enable-reproducible-builds was given. if test "${enable_reproducible_builds+set}" = set; then : enableval=$enable_reproducible_builds; case "$enableval" in -@@ -5597,6 +5599,7 @@ $as_echo "#define ENABLE_REPRODUCIBLE_BUILDS 1" >>confdefs.h +@@ -5997,6 +5999,7 @@ ;; *) reproducible_builds=no @@ -52,19 +25,10 @@ index c2c599c92b..3d4403a844 100755 esac

fi -@@ -5604,6 +5607,7 @@ fi - - - -+ - CHECKRAD=checkrad - # Extract the first word of "perl", so it can be a program name with args. - set dummy perl; ac_word=$2 -diff --git a/configure.ac b/configure.ac -index a7abf0025a..35b013f4af 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -619,6 +619,7 @@ AC_SUBST([openssl_version_check_config]) +diff -Naur a/configure.ac b/configure.ac +--- a/configure.ac 2021-06-10 16:49:17.000000000 +0200 ++++ b/configure.ac 2021-08-19 11:17:10.786259778 +0200 +@@ -690,6 +690,7 @@ dnl # dnl # extra argument: --enable-reproducible-builds dnl # @@ -72,7 +36,7 @@ index a7abf0025a..35b013f4af 100644 AC_ARG_ENABLE(reproducible-builds, [AS_HELP_STRING([--enable-reproducible-builds], [ensure the build does not change each time])], -@@ -630,8 +631,10 @@ AC_ARG_ENABLE(reproducible-builds, +@@ -701,8 +702,10 @@ ;; *) reproducible_builds=no @@ -83,22 +47,32 @@ index a7abf0025a..35b013f4af 100644

dnl ############################################################# -diff --git a/raddb/all.mk b/raddb/all.mk -index c966edd657..c8e976a499 100644 ---- a/raddb/all.mk -+++ b/raddb/all.mk -@@ -124,7 +124,11 @@ $(R)$(raddbdir)/users: $(R)$(modconfdir)/files/authorize +diff -Naur a/Make.inc.in b/Make.inc.in +--- a/Make.inc.in 2021-06-10 16:49:17.000000000 +0200 ++++ b/Make.inc.in 2021-08-19 10:56:52.236404050 +0200 +@@ -174,6 +174,10 @@ + TESTBIN = ./$(BUILD_DIR)/bin + endif + ++# ++# With reproducible builds, do not generate certificates during installation ++# ++ENABLE_REPRODUCIBLE_BUILDS = @ENABLE_REPRODUCIBLE_BUILDS@ + + # + # For creating documentation via doc/all.mk +diff -Naur a/raddb/all.mk b/raddb/all.mk +--- a/raddb/all.mk 2021-06-10 16:49:17.000000000 +0200 ++++ b/raddb/all.mk 2021-08-19 11:18:58.640674802 +0200 +@@ -124,7 +124,11 @@ ifneq "$(LOCAL_CERT_PRODUCTS)" "" $(LOCAL_CERT_PRODUCTS): @echo BOOTSTRAP raddb/certs/ +ifeq "$(ENABLE_REPRODUCIBLE_BUILDS)" "yes" + @$(MAKE) -C $(R)$(raddbdir)/certs/ passwords.mk -+else ++else @$(MAKE) -C $(R)$(raddbdir)/certs/ +endif

# Bootstrap is special $(R)$(raddbdir)/certs/bootstrap: | raddb/certs/bootstrap $(LOCAL_CERT_PRODUCTS) --- -2.21.0 -

hooks/post-receive -- IPFire 2.x development tree