[git.ipfire.org] IPFire 2.x development tree branch, next, updated. 071d7754f7b955b28f7e3b5f3eb44fbaa93eb4e9
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 071d7754f7b955b28f7e3b5f3eb44fbaa93eb4e9 (commit) via 6580bdeb6b94eac07a77587d205435f61e6d3e2d (commit) via a0cc5faf715973a67129b1a8e0ae6e30af29a030 (commit) via 1282a2e1af49b8df3f245efdd640ab366efd7ae4 (commit) via 4a53156001dbd88f0f9f3f72594ad1cb7b62f262 (commit) from fa8b3ea7d3c45ab4577f8cb920944fbf63586caa (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 071d7754f7b955b28f7e3b5f3eb44fbaa93eb4e9 Author: Michael Tremer michael.tremer@ipfire.org Date: Sat Aug 10 03:48:49 2019 +0100
freeradius: Build without SSL
The version check is entirely broken.
Signed-off-by: Michael Tremer michael.tremer@ipfire.org
commit 6580bdeb6b94eac07a77587d205435f61e6d3e2d Author: Michael Tremer michael.tremer@ipfire.org Date: Sat Aug 10 03:11:45 2019 +0100
freeradius: Build package without generating certificates
Signed-off-by: Michael Tremer michael.tremer@ipfire.org
commit a0cc5faf715973a67129b1a8e0ae6e30af29a030 Author: Michael Tremer michael.tremer@ipfire.org Date: Thu Aug 8 18:52:05 2019 +0100
freeradius: Disable openssl version check
freeradius seems to care about which version it has been compiled with and refuses to start. This switch disables this behaviour.
Signed-off-by: Michael Tremer michael.tremer@ipfire.org
commit 1282a2e1af49b8df3f245efdd640ab366efd7ae4 Author: Michael Tremer michael.tremer@ipfire.org Date: Thu Aug 8 18:50:55 2019 +0100
keepalived: Enable auto-start
Signed-off-by: Michael Tremer michael.tremer@ipfire.org
commit 4a53156001dbd88f0f9f3f72594ad1cb7b62f262 Author: Michael Tremer michael.tremer@ipfire.org Date: Fri Aug 2 10:36:48 2019 +0100
keepalived: Backup the whole configuration directory
Signed-off-by: Michael Tremer michael.tremer@ipfire.org
-----------------------------------------------------------------------
Summary of changes: config/backup/includes/keepalived | 2 +- lfs/freeradius | 4 +- lfs/keepalived | 2 +- src/paks/{haproxy => keepalived}/install.sh | 6 +- src/paks/{default => keepalived}/uninstall.sh | 2 +- src/paks/{apcupsd => keepalived}/update.sh | 0 src/patches/freeradius-no-buildtime-cert-gen.patch | 104 +++++++++++++++++++++ 7 files changed, 113 insertions(+), 7 deletions(-) copy src/paks/{haproxy => keepalived}/install.sh (90%) copy src/paks/{default => keepalived}/uninstall.sh (97%) copy src/paks/{apcupsd => keepalived}/update.sh (100%) create mode 100644 src/patches/freeradius-no-buildtime-cert-gen.patch
Difference in files: diff --git a/config/backup/includes/keepalived b/config/backup/includes/keepalived index 4f4cd67ea..eab187a6f 100644 --- a/config/backup/includes/keepalived +++ b/config/backup/includes/keepalived @@ -1 +1 @@ -/etc/keepalived/keepalived.conf +/etc/keepalived/ diff --git a/lfs/freeradius b/lfs/freeradius index 604116f6c..21f6c0ad2 100644 --- a/lfs/freeradius +++ b/lfs/freeradius @@ -32,7 +32,7 @@ DL_FROM = $(URL_IPFIRE) DIR_APP = $(DIR_SRC)/$(THISAPP) TARGET = $(DIR_INFO)/$(THISAPP) PROG = freeradius -PAK_VER = 5 +PAK_VER = 7
DEPS = "samba"
@@ -81,6 +81,7 @@ $(subst %,%_MD5,$(objects)) : $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) @$(PREBUILD) @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar jxf $(DIR_DL)/$(DL_FILE) + cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/freeradius-no-buildtime-cert-gen.patch $(UPDATE_AUTOMAKE) cd $(DIR_APP) && \ ./configure \ @@ -91,6 +92,7 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) --with-system-libtool \ --with-threads \ --with-thread-pool \ + --without-openssl \ --disable-ltdl-install \ --without-rlm_eap_ikev2 \ --without-rlm_sql_iodbc \ diff --git a/lfs/keepalived b/lfs/keepalived index 8e01e979d..c18625f38 100644 --- a/lfs/keepalived +++ b/lfs/keepalived @@ -32,7 +32,7 @@ DL_FROM = $(URL_IPFIRE) DIR_APP = $(DIR_SRC)/$(THISAPP) TARGET = $(DIR_INFO)/$(THISAPP) PROG = keepalived -PAK_VER = 5 +PAK_VER = 7
DEPS = ""
diff --git a/src/paks/keepalived/install.sh b/src/paks/keepalived/install.sh new file mode 100644 index 000000000..bc082a55a --- /dev/null +++ b/src/paks/keepalived/install.sh @@ -0,0 +1,31 @@ +#!/bin/bash +############################################################################ +# # +# This file is part of the IPFire Firewall. # +# # +# IPFire is free software; you can redistribute it and/or modify # +# it under the terms of the GNU General Public License as published by # +# the Free Software Foundation; either version 2 of the License, or # +# (at your option) any later version. # +# # +# IPFire is distributed in the hope that it will be useful, # +# but WITHOUT ANY WARRANTY; without even the implied warranty of # +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # +# GNU General Public License for more details. # +# # +# You should have received a copy of the GNU General Public License # +# along with IPFire; if not, write to the Free Software # +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA # +# # +# Copyright (C) 2007 IPFire-Team info@ipfire.org. # +# # +############################################################################ +# +. /opt/pakfire/lib/functions.sh +extract_files +restore_backup ${NAME} + +# Enable autostart +ln -sf ../init.d/keepalived /etc/rc.d/rc0.d/K25keepalived +ln -sf ../init.d/keepalived /etc/rc.d/rc3.d/S35keepalived +ln -sf ../init.d/keepalived /etc/rc.d/rc6.d/K25keepalived diff --git a/src/paks/keepalived/uninstall.sh b/src/paks/keepalived/uninstall.sh new file mode 100644 index 000000000..37c2e557b --- /dev/null +++ b/src/paks/keepalived/uninstall.sh @@ -0,0 +1,27 @@ +#!/bin/bash +############################################################################ +# # +# This file is part of the IPFire Firewall. # +# # +# IPFire is free software; you can redistribute it and/or modify # +# it under the terms of the GNU General Public License as published by # +# the Free Software Foundation; either version 2 of the License, or # +# (at your option) any later version. # +# # +# IPFire is distributed in the hope that it will be useful, # +# but WITHOUT ANY WARRANTY; without even the implied warranty of # +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # +# GNU General Public License for more details. # +# # +# You should have received a copy of the GNU General Public License # +# along with IPFire; if not, write to the Free Software # +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA # +# # +# Copyright (C) 2007 IPFire-Team info@ipfire.org. # +# # +############################################################################ +# +. /opt/pakfire/lib/functions.sh +make_backup ${NAME} +remove_files +rm -rfv /etc/rc.d/rc*.d/*keepalived diff --git a/src/paks/keepalived/update.sh b/src/paks/keepalived/update.sh new file mode 100644 index 000000000..89c40d0d7 --- /dev/null +++ b/src/paks/keepalived/update.sh @@ -0,0 +1,26 @@ +#!/bin/bash +############################################################################ +# # +# This file is part of the IPFire Firewall. # +# # +# IPFire is free software; you can redistribute it and/or modify # +# it under the terms of the GNU General Public License as published by # +# the Free Software Foundation; either version 2 of the License, or # +# (at your option) any later version. # +# # +# IPFire is distributed in the hope that it will be useful, # +# but WITHOUT ANY WARRANTY; without even the implied warranty of # +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # +# GNU General Public License for more details. # +# # +# You should have received a copy of the GNU General Public License # +# along with IPFire; if not, write to the Free Software # +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA # +# # +# Copyright (C) 2007 IPFire-Team info@ipfire.org. # +# # +############################################################################ +# +. /opt/pakfire/lib/functions.sh +./uninstall.sh +./install.sh diff --git a/src/patches/freeradius-no-buildtime-cert-gen.patch b/src/patches/freeradius-no-buildtime-cert-gen.patch new file mode 100644 index 000000000..aa3be6648 --- /dev/null +++ b/src/patches/freeradius-no-buildtime-cert-gen.patch @@ -0,0 +1,104 @@ +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 + SNMPWALK + SNMPGET + PERL ++ENABLE_REPRODUCIBLE_BUILDS + openssl_version_check_config + WITH_DHCP + modconfdir +@@ -5586,6 +5587,7 @@ else + fi + + ++ENABLE_REPRODUCIBLE_BUILDS=yes + # 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 + ;; + *) + reproducible_builds=no ++ ENABLE_REPRODUCIBLE_BUILDS=no + 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]) + dnl # + dnl # extra argument: --enable-reproducible-builds + dnl # ++ENABLE_REPRODUCIBLE_BUILDS=yes + 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, + ;; + *) + reproducible_builds=no ++ ENABLE_REPRODUCIBLE_BUILDS=no + esac ] + ) ++AC_SUBST(ENABLE_REPRODUCIBLE_BUILDS) + + + 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 + ifneq "$(LOCAL_CERT_PRODUCTS)" "" + $(LOCAL_CERT_PRODUCTS): + @echo BOOTSTRAP raddb/certs/ ++ifeq "$(ENABLE_REPRODUCIBLE_BUILDS)" "yes" ++ @$(MAKE) -C $(R)$(raddbdir)/certs/ passwords.mk ++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
-
Michael Tremer