* [PATCH 1/2] rng-tools: Move from core package to addon - fixes bug 12900
@ 2023-02-05 18:06 Adolf Belka
2023-02-05 18:06 ` [PATCH 2/2] initscripts: Remove rngd from the core package initscripts Adolf Belka
` (3 more replies)
0 siblings, 4 replies; 8+ messages in thread
From: Adolf Belka @ 2023-02-05 18:06 UTC (permalink / raw)
To: development
[-- Attachment #1: Type: text/plain, Size: 10624 bytes --]
- This patch is to move the rng-tools package from a core package to an addon. With the
kernel changes from 5.6 rngd is no longer needed to create the required kernel entropy.
- The results from HRNG's via rngd are used with an XOR after the entropy is
collected by the kernel. So the HWRNG output is used to dilute the kernel random number
data, which is already merged from several sources.
- Based on the above and @Paul's request in the bug report to have rng-tools kept as an
addon this patch set is submitted for consideration to keep rng-tools but as an addon.
- move rng-tools rootfile from common to packages
- Modify rng-tools lfs from core package to addon package
- Create rng-tools pak to install and uninstall - creating rc.d links for start & stop.
- Move rngd initscript from system to packages directory.
- Installed into my vm testbed and confirmed that it works. No rngd daemon installed
from iso install. After addon install rngd is present and running. Added various files
to be able to test the services wui page. rngd shows up and can be turned off and on
Fixes: Bug#12900
Tested-by: Adolf Belka <adolf.belka(a)ipfire.org>
Signed-off-by: Adolf Belka <adolf.belka(a)ipfire.org>
---
.../rootfiles/{common => packages}/rng-tools | 2 ++
lfs/rng-tools | 14 ++++++++-
src/initscripts/{system => packages}/rngd | 0
src/paks/rng-tools/install.sh | 30 +++++++++++++++++++
src/paks/rng-tools/uninstall.sh | 28 +++++++++++++++++
src/paks/rng-tools/update.sh | 26 ++++++++++++++++
6 files changed, 99 insertions(+), 1 deletion(-)
rename config/rootfiles/{common => packages}/rng-tools (69%)
rename src/initscripts/{system => packages}/rngd (100%)
create mode 100644 src/paks/rng-tools/install.sh
create mode 100644 src/paks/rng-tools/uninstall.sh
create mode 100644 src/paks/rng-tools/update.sh
diff --git a/config/rootfiles/common/rng-tools b/config/rootfiles/packages/rng-tools
similarity index 69%
rename from config/rootfiles/common/rng-tools
rename to config/rootfiles/packages/rng-tools
index 596a911c1..fbeda7800 100644
--- a/config/rootfiles/common/rng-tools
+++ b/config/rootfiles/packages/rng-tools
@@ -1,4 +1,6 @@
+usr/bin/randstat
usr/bin/rngtest
usr/sbin/rngd
#usr/share/man/man1/rngtest.1
#usr/share/man/man8/rngd.8
+etc/rc.d/init.d/rngd
diff --git a/lfs/rng-tools b/lfs/rng-tools
index cafb1bcda..6a85a8482 100644
--- a/lfs/rng-tools
+++ b/lfs/rng-tools
@@ -1,7 +1,7 @@
###############################################################################
# #
# IPFire.org - A linux based firewall #
-# Copyright (C) 2007-2021 IPFire Team <info(a)ipfire.org> #
+# Copyright (C) 2007-2023 IPFire Team <info(a)ipfire.org> #
# #
# This program is free software: you can redistribute it and/or modify #
# it under the terms of the GNU General Public License as published by #
@@ -25,12 +25,19 @@
include Config
VER = 6.14
+SUMMARY = This is a random number generator daemon
THISAPP = rng-tools-$(VER)
DL_FILE = $(THISAPP).tar.gz
DL_FROM = $(URL_IPFIRE)
DIR_APP = $(DIR_SRC)/$(THISAPP)
TARGET = $(DIR_INFO)/$(THISAPP)
+PROG = rng-tools
+PAK_VER = 1
+
+DEPS =
+
+SERVICES = rngd
###############################################################################
# Top-level Rules
@@ -50,6 +57,9 @@ download :$(patsubst %,$(DIR_DL)/%,$(objects))
b2 : $(subst %,%_BLAKE2,$(objects))
+dist:
+ @$(PAK)
+
###############################################################################
# Downloading, checking, b2sum
###############################################################################
@@ -77,5 +87,7 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
--without-rtlsdr
cd $(DIR_APP) && make $(MAKETUNING) $(EXTRA_MAKE)
cd $(DIR_APP) && make $(EXTRA_INSTALL) install
+ #install initscript
+ $(call INSTALL_INITSCRIPTS,$(SERVICES))
@rm -rf $(DIR_APP)
@$(POSTBUILD)
diff --git a/src/initscripts/system/rngd b/src/initscripts/packages/rngd
similarity index 100%
rename from src/initscripts/system/rngd
rename to src/initscripts/packages/rngd
diff --git a/src/paks/rng-tools/install.sh b/src/paks/rng-tools/install.sh
new file mode 100644
index 000000000..a53ccc43c
--- /dev/null
+++ b/src/paks/rng-tools/install.sh
@@ -0,0 +1,30 @@
+#!/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-2023 IPFire-Team <info(a)ipfire.org>. #
+# #
+############################################################################
+#
+. /opt/pakfire/lib/functions.sh
+extract_files
+# create startlinks
+ln -sf ../init.d/rngd /etc/rc.d/rc0.d/K35rngd
+ln -sf ../init.d/rngd /etc/rc.d/rc3.d/S65rngd
+ln -sf ../init.d/rngd /etc/rc.d/rc6.d/K35rngd
+start_service --background rngd
diff --git a/src/paks/rng-tools/uninstall.sh b/src/paks/rng-tools/uninstall.sh
new file mode 100644
index 000000000..cc9fbb355
--- /dev/null
+++ b/src/paks/rng-tools/uninstall.sh
@@ -0,0 +1,28 @@
+#!/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-2023 IPFire-Team <info(a)ipfire.org>. #
+# #
+############################################################################
+#
+. /opt/pakfire/lib/functions.sh
+stop_service rngd
+remove_files
+# Remove all start links.
+rm -rf /etc/rc.d/rc*.d/*rngd
diff --git a/src/paks/rng-tools/update.sh b/src/paks/rng-tools/update.sh
new file mode 100644
index 000000000..83bd0ad98
--- /dev/null
+++ b/src/paks/rng-tools/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-2023 IPFire-Team <info(a)ipfire.org>. #
+# #
+############################################################################
+#
+. /opt/pakfire/lib/functions.sh
+./uninstall.sh
+./install.sh
--
2.39.1
^ permalink raw reply [flat|nested] 8+ messages in thread
* [PATCH 2/2] initscripts: Remove rngd from the core package initscripts
2023-02-05 18:06 [PATCH 1/2] rng-tools: Move from core package to addon - fixes bug 12900 Adolf Belka
@ 2023-02-05 18:06 ` Adolf Belka
2023-02-05 18:27 ` Bernhard Bitsch
2023-02-05 18:26 ` [PATCH 1/2] rng-tools: Move from core package to addon - fixes bug 12900 Bernhard Bitsch
` (2 subsequent siblings)
3 siblings, 1 reply; 8+ messages in thread
From: Adolf Belka @ 2023-02-05 18:06 UTC (permalink / raw)
To: development
[-- Attachment #1: Type: text/plain, Size: 3359 bytes --]
- rngd removed from initscripts lfs and rootfiles due to change of rng-tools to addon
Fixes: Bug#12900
Tested-by: Adolf Belka <adolf.belka(a)ipfire.org>
Signed-off-by: Adolf Belka <adolf.belka(a)ipfire.org>
---
config/rootfiles/common/aarch64/initscripts | 2 --
config/rootfiles/common/armv6l/initscripts | 2 --
config/rootfiles/common/x86_64/initscripts | 2 --
lfs/initscripts | 1 -
4 files changed, 7 deletions(-)
diff --git a/config/rootfiles/common/aarch64/initscripts b/config/rootfiles/common/aarch64/initscripts
index d0c01c006..dc6c0fd24 100644
--- a/config/rootfiles/common/aarch64/initscripts
+++ b/config/rootfiles/common/aarch64/initscripts
@@ -73,7 +73,6 @@ etc/rc.d/init.d/pakfire
etc/rc.d/init.d/partresize
etc/rc.d/init.d/rc
etc/rc.d/init.d/reboot
-etc/rc.d/init.d/rngd
etc/rc.d/init.d/sendsignals
etc/rc.d/init.d/setclock
etc/rc.d/init.d/smartenabler
@@ -185,7 +184,6 @@ etc/rc.d/rcsysinit.d/S44smt
etc/rc.d/rcsysinit.d/S45udev_retry
etc/rc.d/rcsysinit.d/S50cleanfs
etc/rc.d/rcsysinit.d/S60setclock
-etc/rc.d/rcsysinit.d/S65rngd
etc/rc.d/rcsysinit.d/S70console
etc/rc.d/rcsysinit.d/S71pakfire
etc/rc.d/rcsysinit.d/S73swconfig
diff --git a/config/rootfiles/common/armv6l/initscripts b/config/rootfiles/common/armv6l/initscripts
index d0c01c006..dc6c0fd24 100644
--- a/config/rootfiles/common/armv6l/initscripts
+++ b/config/rootfiles/common/armv6l/initscripts
@@ -73,7 +73,6 @@ etc/rc.d/init.d/pakfire
etc/rc.d/init.d/partresize
etc/rc.d/init.d/rc
etc/rc.d/init.d/reboot
-etc/rc.d/init.d/rngd
etc/rc.d/init.d/sendsignals
etc/rc.d/init.d/setclock
etc/rc.d/init.d/smartenabler
@@ -185,7 +184,6 @@ etc/rc.d/rcsysinit.d/S44smt
etc/rc.d/rcsysinit.d/S45udev_retry
etc/rc.d/rcsysinit.d/S50cleanfs
etc/rc.d/rcsysinit.d/S60setclock
-etc/rc.d/rcsysinit.d/S65rngd
etc/rc.d/rcsysinit.d/S70console
etc/rc.d/rcsysinit.d/S71pakfire
etc/rc.d/rcsysinit.d/S73swconfig
diff --git a/config/rootfiles/common/x86_64/initscripts b/config/rootfiles/common/x86_64/initscripts
index 628b59969..1848f8ebc 100644
--- a/config/rootfiles/common/x86_64/initscripts
+++ b/config/rootfiles/common/x86_64/initscripts
@@ -73,7 +73,6 @@ etc/rc.d/init.d/pakfire
etc/rc.d/init.d/partresize
etc/rc.d/init.d/rc
etc/rc.d/init.d/reboot
-etc/rc.d/init.d/rngd
etc/rc.d/init.d/sendsignals
etc/rc.d/init.d/setclock
etc/rc.d/init.d/smartenabler
@@ -184,7 +183,6 @@ etc/rc.d/rcsysinit.d/S44smt
etc/rc.d/rcsysinit.d/S45udev_retry
etc/rc.d/rcsysinit.d/S50cleanfs
etc/rc.d/rcsysinit.d/S60setclock
-etc/rc.d/rcsysinit.d/S65rngd
etc/rc.d/rcsysinit.d/S70console
etc/rc.d/rcsysinit.d/S71pakfire
etc/rc.d/rcsysinit.d/S74cloud-init
diff --git a/lfs/initscripts b/lfs/initscripts
index c6a5f3835..55f0066e5 100644
--- a/lfs/initscripts
+++ b/lfs/initscripts
@@ -170,7 +170,6 @@ $(TARGET) :
ln -sf ../init.d/setclock /etc/rc.d/rcsysinit.d/S60setclock
ln -sf ../init.d/setclock /etc/rc.d/rc0.d/K47setclock
ln -sf ../init.d/setclock /etc/rc.d/rc6.d/K47setclock
- ln -sf ../init.d/rngd /etc/rc.d/rcsysinit.d/S65rngd
ln -sf ../init.d/console /etc/rc.d/rcsysinit.d/S70console
ln -sf ../init.d/pakfire /etc/rc.d/rcsysinit.d/S71pakfire
ln -sf ../init.d/cloud-init /etc/rc.d/rcsysinit.d/S74cloud-init
--
2.39.1
^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [PATCH 1/2] rng-tools: Move from core package to addon - fixes bug 12900
2023-02-05 18:06 [PATCH 1/2] rng-tools: Move from core package to addon - fixes bug 12900 Adolf Belka
2023-02-05 18:06 ` [PATCH 2/2] initscripts: Remove rngd from the core package initscripts Adolf Belka
@ 2023-02-05 18:26 ` Bernhard Bitsch
2023-02-05 18:53 ` Michael Tremer
2023-02-05 22:55 ` Paul Simmons
3 siblings, 0 replies; 8+ messages in thread
From: Bernhard Bitsch @ 2023-02-05 18:26 UTC (permalink / raw)
To: development
[-- Attachment #1: Type: text/plain, Size: 11166 bytes --]
Reviewed-by: Bernhard Bitsch <bbitsch(a)ipfire.org>
Am 05.02.2023 um 19:06 schrieb Adolf Belka:
> - This patch is to move the rng-tools package from a core package to an addon. With the
> kernel changes from 5.6 rngd is no longer needed to create the required kernel entropy.
> - The results from HRNG's via rngd are used with an XOR after the entropy is
> collected by the kernel. So the HWRNG output is used to dilute the kernel random number
> data, which is already merged from several sources.
> - Based on the above and @Paul's request in the bug report to have rng-tools kept as an
> addon this patch set is submitted for consideration to keep rng-tools but as an addon.
> - move rng-tools rootfile from common to packages
> - Modify rng-tools lfs from core package to addon package
> - Create rng-tools pak to install and uninstall - creating rc.d links for start & stop.
> - Move rngd initscript from system to packages directory.
> - Installed into my vm testbed and confirmed that it works. No rngd daemon installed
> from iso install. After addon install rngd is present and running. Added various files
> to be able to test the services wui page. rngd shows up and can be turned off and on
>
> Fixes: Bug#12900
> Tested-by: Adolf Belka <adolf.belka(a)ipfire.org>
> Signed-off-by: Adolf Belka <adolf.belka(a)ipfire.org>
> ---
> .../rootfiles/{common => packages}/rng-tools | 2 ++
> lfs/rng-tools | 14 ++++++++-
> src/initscripts/{system => packages}/rngd | 0
> src/paks/rng-tools/install.sh | 30 +++++++++++++++++++
> src/paks/rng-tools/uninstall.sh | 28 +++++++++++++++++
> src/paks/rng-tools/update.sh | 26 ++++++++++++++++
> 6 files changed, 99 insertions(+), 1 deletion(-)
> rename config/rootfiles/{common => packages}/rng-tools (69%)
> rename src/initscripts/{system => packages}/rngd (100%)
> create mode 100644 src/paks/rng-tools/install.sh
> create mode 100644 src/paks/rng-tools/uninstall.sh
> create mode 100644 src/paks/rng-tools/update.sh
>
> diff --git a/config/rootfiles/common/rng-tools b/config/rootfiles/packages/rng-tools
> similarity index 69%
> rename from config/rootfiles/common/rng-tools
> rename to config/rootfiles/packages/rng-tools
> index 596a911c1..fbeda7800 100644
> --- a/config/rootfiles/common/rng-tools
> +++ b/config/rootfiles/packages/rng-tools
> @@ -1,4 +1,6 @@
> +usr/bin/randstat
> usr/bin/rngtest
> usr/sbin/rngd
> #usr/share/man/man1/rngtest.1
> #usr/share/man/man8/rngd.8
> +etc/rc.d/init.d/rngd
> diff --git a/lfs/rng-tools b/lfs/rng-tools
> index cafb1bcda..6a85a8482 100644
> --- a/lfs/rng-tools
> +++ b/lfs/rng-tools
> @@ -1,7 +1,7 @@
> ###############################################################################
> # #
> # IPFire.org - A linux based firewall #
> -# Copyright (C) 2007-2021 IPFire Team <info(a)ipfire.org> #
> +# Copyright (C) 2007-2023 IPFire Team <info(a)ipfire.org> #
> # #
> # This program is free software: you can redistribute it and/or modify #
> # it under the terms of the GNU General Public License as published by #
> @@ -25,12 +25,19 @@
> include Config
>
> VER = 6.14
> +SUMMARY = This is a random number generator daemon
>
> THISAPP = rng-tools-$(VER)
> DL_FILE = $(THISAPP).tar.gz
> DL_FROM = $(URL_IPFIRE)
> DIR_APP = $(DIR_SRC)/$(THISAPP)
> TARGET = $(DIR_INFO)/$(THISAPP)
> +PROG = rng-tools
> +PAK_VER = 1
> +
> +DEPS =
> +
> +SERVICES = rngd
>
> ###############################################################################
> # Top-level Rules
> @@ -50,6 +57,9 @@ download :$(patsubst %,$(DIR_DL)/%,$(objects))
>
> b2 : $(subst %,%_BLAKE2,$(objects))
>
> +dist:
> + @$(PAK)
> +
> ###############################################################################
> # Downloading, checking, b2sum
> ###############################################################################
> @@ -77,5 +87,7 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
> --without-rtlsdr
> cd $(DIR_APP) && make $(MAKETUNING) $(EXTRA_MAKE)
> cd $(DIR_APP) && make $(EXTRA_INSTALL) install
> + #install initscript
> + $(call INSTALL_INITSCRIPTS,$(SERVICES))
> @rm -rf $(DIR_APP)
> @$(POSTBUILD)
> diff --git a/src/initscripts/system/rngd b/src/initscripts/packages/rngd
> similarity index 100%
> rename from src/initscripts/system/rngd
> rename to src/initscripts/packages/rngd
> diff --git a/src/paks/rng-tools/install.sh b/src/paks/rng-tools/install.sh
> new file mode 100644
> index 000000000..a53ccc43c
> --- /dev/null
> +++ b/src/paks/rng-tools/install.sh
> @@ -0,0 +1,30 @@
> +#!/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-2023 IPFire-Team <info(a)ipfire.org>. #
> +# #
> +############################################################################
> +#
> +. /opt/pakfire/lib/functions.sh
> +extract_files
> +# create startlinks
> +ln -sf ../init.d/rngd /etc/rc.d/rc0.d/K35rngd
> +ln -sf ../init.d/rngd /etc/rc.d/rc3.d/S65rngd
> +ln -sf ../init.d/rngd /etc/rc.d/rc6.d/K35rngd
> +start_service --background rngd
> diff --git a/src/paks/rng-tools/uninstall.sh b/src/paks/rng-tools/uninstall.sh
> new file mode 100644
> index 000000000..cc9fbb355
> --- /dev/null
> +++ b/src/paks/rng-tools/uninstall.sh
> @@ -0,0 +1,28 @@
> +#!/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-2023 IPFire-Team <info(a)ipfire.org>. #
> +# #
> +############################################################################
> +#
> +. /opt/pakfire/lib/functions.sh
> +stop_service rngd
> +remove_files
> +# Remove all start links.
> +rm -rf /etc/rc.d/rc*.d/*rngd
> diff --git a/src/paks/rng-tools/update.sh b/src/paks/rng-tools/update.sh
> new file mode 100644
> index 000000000..83bd0ad98
> --- /dev/null
> +++ b/src/paks/rng-tools/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-2023 IPFire-Team <info(a)ipfire.org>. #
> +# #
> +############################################################################
> +#
> +. /opt/pakfire/lib/functions.sh
> +./uninstall.sh
> +./install.sh
^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [PATCH 2/2] initscripts: Remove rngd from the core package initscripts
2023-02-05 18:06 ` [PATCH 2/2] initscripts: Remove rngd from the core package initscripts Adolf Belka
@ 2023-02-05 18:27 ` Bernhard Bitsch
0 siblings, 0 replies; 8+ messages in thread
From: Bernhard Bitsch @ 2023-02-05 18:27 UTC (permalink / raw)
To: development
[-- Attachment #1: Type: text/plain, Size: 3659 bytes --]
Reviewed-by: Bernhard Bitsch <bbitsch(a)ipfire.org>
Am 05.02.2023 um 19:06 schrieb Adolf Belka:
> - rngd removed from initscripts lfs and rootfiles due to change of rng-tools to addon
>
> Fixes: Bug#12900
> Tested-by: Adolf Belka <adolf.belka(a)ipfire.org>
> Signed-off-by: Adolf Belka <adolf.belka(a)ipfire.org>
> ---
> config/rootfiles/common/aarch64/initscripts | 2 --
> config/rootfiles/common/armv6l/initscripts | 2 --
> config/rootfiles/common/x86_64/initscripts | 2 --
> lfs/initscripts | 1 -
> 4 files changed, 7 deletions(-)
>
> diff --git a/config/rootfiles/common/aarch64/initscripts b/config/rootfiles/common/aarch64/initscripts
> index d0c01c006..dc6c0fd24 100644
> --- a/config/rootfiles/common/aarch64/initscripts
> +++ b/config/rootfiles/common/aarch64/initscripts
> @@ -73,7 +73,6 @@ etc/rc.d/init.d/pakfire
> etc/rc.d/init.d/partresize
> etc/rc.d/init.d/rc
> etc/rc.d/init.d/reboot
> -etc/rc.d/init.d/rngd
> etc/rc.d/init.d/sendsignals
> etc/rc.d/init.d/setclock
> etc/rc.d/init.d/smartenabler
> @@ -185,7 +184,6 @@ etc/rc.d/rcsysinit.d/S44smt
> etc/rc.d/rcsysinit.d/S45udev_retry
> etc/rc.d/rcsysinit.d/S50cleanfs
> etc/rc.d/rcsysinit.d/S60setclock
> -etc/rc.d/rcsysinit.d/S65rngd
> etc/rc.d/rcsysinit.d/S70console
> etc/rc.d/rcsysinit.d/S71pakfire
> etc/rc.d/rcsysinit.d/S73swconfig
> diff --git a/config/rootfiles/common/armv6l/initscripts b/config/rootfiles/common/armv6l/initscripts
> index d0c01c006..dc6c0fd24 100644
> --- a/config/rootfiles/common/armv6l/initscripts
> +++ b/config/rootfiles/common/armv6l/initscripts
> @@ -73,7 +73,6 @@ etc/rc.d/init.d/pakfire
> etc/rc.d/init.d/partresize
> etc/rc.d/init.d/rc
> etc/rc.d/init.d/reboot
> -etc/rc.d/init.d/rngd
> etc/rc.d/init.d/sendsignals
> etc/rc.d/init.d/setclock
> etc/rc.d/init.d/smartenabler
> @@ -185,7 +184,6 @@ etc/rc.d/rcsysinit.d/S44smt
> etc/rc.d/rcsysinit.d/S45udev_retry
> etc/rc.d/rcsysinit.d/S50cleanfs
> etc/rc.d/rcsysinit.d/S60setclock
> -etc/rc.d/rcsysinit.d/S65rngd
> etc/rc.d/rcsysinit.d/S70console
> etc/rc.d/rcsysinit.d/S71pakfire
> etc/rc.d/rcsysinit.d/S73swconfig
> diff --git a/config/rootfiles/common/x86_64/initscripts b/config/rootfiles/common/x86_64/initscripts
> index 628b59969..1848f8ebc 100644
> --- a/config/rootfiles/common/x86_64/initscripts
> +++ b/config/rootfiles/common/x86_64/initscripts
> @@ -73,7 +73,6 @@ etc/rc.d/init.d/pakfire
> etc/rc.d/init.d/partresize
> etc/rc.d/init.d/rc
> etc/rc.d/init.d/reboot
> -etc/rc.d/init.d/rngd
> etc/rc.d/init.d/sendsignals
> etc/rc.d/init.d/setclock
> etc/rc.d/init.d/smartenabler
> @@ -184,7 +183,6 @@ etc/rc.d/rcsysinit.d/S44smt
> etc/rc.d/rcsysinit.d/S45udev_retry
> etc/rc.d/rcsysinit.d/S50cleanfs
> etc/rc.d/rcsysinit.d/S60setclock
> -etc/rc.d/rcsysinit.d/S65rngd
> etc/rc.d/rcsysinit.d/S70console
> etc/rc.d/rcsysinit.d/S71pakfire
> etc/rc.d/rcsysinit.d/S74cloud-init
> diff --git a/lfs/initscripts b/lfs/initscripts
> index c6a5f3835..55f0066e5 100644
> --- a/lfs/initscripts
> +++ b/lfs/initscripts
> @@ -170,7 +170,6 @@ $(TARGET) :
> ln -sf ../init.d/setclock /etc/rc.d/rcsysinit.d/S60setclock
> ln -sf ../init.d/setclock /etc/rc.d/rc0.d/K47setclock
> ln -sf ../init.d/setclock /etc/rc.d/rc6.d/K47setclock
> - ln -sf ../init.d/rngd /etc/rc.d/rcsysinit.d/S65rngd
> ln -sf ../init.d/console /etc/rc.d/rcsysinit.d/S70console
> ln -sf ../init.d/pakfire /etc/rc.d/rcsysinit.d/S71pakfire
> ln -sf ../init.d/cloud-init /etc/rc.d/rcsysinit.d/S74cloud-init
^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [PATCH 1/2] rng-tools: Move from core package to addon - fixes bug 12900
2023-02-05 18:06 [PATCH 1/2] rng-tools: Move from core package to addon - fixes bug 12900 Adolf Belka
2023-02-05 18:06 ` [PATCH 2/2] initscripts: Remove rngd from the core package initscripts Adolf Belka
2023-02-05 18:26 ` [PATCH 1/2] rng-tools: Move from core package to addon - fixes bug 12900 Bernhard Bitsch
@ 2023-02-05 18:53 ` Michael Tremer
2023-02-05 19:51 ` Adolf Belka
2023-02-05 22:55 ` Paul Simmons
3 siblings, 1 reply; 8+ messages in thread
From: Michael Tremer @ 2023-02-05 18:53 UTC (permalink / raw)
To: development
[-- Attachment #1: Type: text/plain, Size: 11182 bytes --]
Hello Adolf,
Thank you for the patch, but didn’t we agree to drop this package in last month’s call?
-Michael
> On 5 Feb 2023, at 19:06, Adolf Belka <adolf.belka(a)ipfire.org> wrote:
>
> - This patch is to move the rng-tools package from a core package to an addon. With the
> kernel changes from 5.6 rngd is no longer needed to create the required kernel entropy.
> - The results from HRNG's via rngd are used with an XOR after the entropy is
> collected by the kernel. So the HWRNG output is used to dilute the kernel random number
> data, which is already merged from several sources.
> - Based on the above and @Paul's request in the bug report to have rng-tools kept as an
> addon this patch set is submitted for consideration to keep rng-tools but as an addon.
> - move rng-tools rootfile from common to packages
> - Modify rng-tools lfs from core package to addon package
> - Create rng-tools pak to install and uninstall - creating rc.d links for start & stop.
> - Move rngd initscript from system to packages directory.
> - Installed into my vm testbed and confirmed that it works. No rngd daemon installed
> from iso install. After addon install rngd is present and running. Added various files
> to be able to test the services wui page. rngd shows up and can be turned off and on
>
> Fixes: Bug#12900
> Tested-by: Adolf Belka <adolf.belka(a)ipfire.org>
> Signed-off-by: Adolf Belka <adolf.belka(a)ipfire.org>
> ---
> .../rootfiles/{common => packages}/rng-tools | 2 ++
> lfs/rng-tools | 14 ++++++++-
> src/initscripts/{system => packages}/rngd | 0
> src/paks/rng-tools/install.sh | 30 +++++++++++++++++++
> src/paks/rng-tools/uninstall.sh | 28 +++++++++++++++++
> src/paks/rng-tools/update.sh | 26 ++++++++++++++++
> 6 files changed, 99 insertions(+), 1 deletion(-)
> rename config/rootfiles/{common => packages}/rng-tools (69%)
> rename src/initscripts/{system => packages}/rngd (100%)
> create mode 100644 src/paks/rng-tools/install.sh
> create mode 100644 src/paks/rng-tools/uninstall.sh
> create mode 100644 src/paks/rng-tools/update.sh
>
> diff --git a/config/rootfiles/common/rng-tools b/config/rootfiles/packages/rng-tools
> similarity index 69%
> rename from config/rootfiles/common/rng-tools
> rename to config/rootfiles/packages/rng-tools
> index 596a911c1..fbeda7800 100644
> --- a/config/rootfiles/common/rng-tools
> +++ b/config/rootfiles/packages/rng-tools
> @@ -1,4 +1,6 @@
> +usr/bin/randstat
> usr/bin/rngtest
> usr/sbin/rngd
> #usr/share/man/man1/rngtest.1
> #usr/share/man/man8/rngd.8
> +etc/rc.d/init.d/rngd
> diff --git a/lfs/rng-tools b/lfs/rng-tools
> index cafb1bcda..6a85a8482 100644
> --- a/lfs/rng-tools
> +++ b/lfs/rng-tools
> @@ -1,7 +1,7 @@
> ###############################################################################
> # #
> # IPFire.org - A linux based firewall #
> -# Copyright (C) 2007-2021 IPFire Team <info(a)ipfire.org> #
> +# Copyright (C) 2007-2023 IPFire Team <info(a)ipfire.org> #
> # #
> # This program is free software: you can redistribute it and/or modify #
> # it under the terms of the GNU General Public License as published by #
> @@ -25,12 +25,19 @@
> include Config
>
> VER = 6.14
> +SUMMARY = This is a random number generator daemon
>
> THISAPP = rng-tools-$(VER)
> DL_FILE = $(THISAPP).tar.gz
> DL_FROM = $(URL_IPFIRE)
> DIR_APP = $(DIR_SRC)/$(THISAPP)
> TARGET = $(DIR_INFO)/$(THISAPP)
> +PROG = rng-tools
> +PAK_VER = 1
> +
> +DEPS =
> +
> +SERVICES = rngd
>
> ###############################################################################
> # Top-level Rules
> @@ -50,6 +57,9 @@ download :$(patsubst %,$(DIR_DL)/%,$(objects))
>
> b2 : $(subst %,%_BLAKE2,$(objects))
>
> +dist:
> + @$(PAK)
> +
> ###############################################################################
> # Downloading, checking, b2sum
> ###############################################################################
> @@ -77,5 +87,7 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
> --without-rtlsdr
> cd $(DIR_APP) && make $(MAKETUNING) $(EXTRA_MAKE)
> cd $(DIR_APP) && make $(EXTRA_INSTALL) install
> + #install initscript
> + $(call INSTALL_INITSCRIPTS,$(SERVICES))
> @rm -rf $(DIR_APP)
> @$(POSTBUILD)
> diff --git a/src/initscripts/system/rngd b/src/initscripts/packages/rngd
> similarity index 100%
> rename from src/initscripts/system/rngd
> rename to src/initscripts/packages/rngd
> diff --git a/src/paks/rng-tools/install.sh b/src/paks/rng-tools/install.sh
> new file mode 100644
> index 000000000..a53ccc43c
> --- /dev/null
> +++ b/src/paks/rng-tools/install.sh
> @@ -0,0 +1,30 @@
> +#!/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-2023 IPFire-Team <info(a)ipfire.org>. #
> +# #
> +############################################################################
> +#
> +. /opt/pakfire/lib/functions.sh
> +extract_files
> +# create startlinks
> +ln -sf ../init.d/rngd /etc/rc.d/rc0.d/K35rngd
> +ln -sf ../init.d/rngd /etc/rc.d/rc3.d/S65rngd
> +ln -sf ../init.d/rngd /etc/rc.d/rc6.d/K35rngd
> +start_service --background rngd
> diff --git a/src/paks/rng-tools/uninstall.sh b/src/paks/rng-tools/uninstall.sh
> new file mode 100644
> index 000000000..cc9fbb355
> --- /dev/null
> +++ b/src/paks/rng-tools/uninstall.sh
> @@ -0,0 +1,28 @@
> +#!/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-2023 IPFire-Team <info(a)ipfire.org>. #
> +# #
> +############################################################################
> +#
> +. /opt/pakfire/lib/functions.sh
> +stop_service rngd
> +remove_files
> +# Remove all start links.
> +rm -rf /etc/rc.d/rc*.d/*rngd
> diff --git a/src/paks/rng-tools/update.sh b/src/paks/rng-tools/update.sh
> new file mode 100644
> index 000000000..83bd0ad98
> --- /dev/null
> +++ b/src/paks/rng-tools/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-2023 IPFire-Team <info(a)ipfire.org>. #
> +# #
> +############################################################################
> +#
> +. /opt/pakfire/lib/functions.sh
> +./uninstall.sh
> +./install.sh
> --
> 2.39.1
>
^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [PATCH 1/2] rng-tools: Move from core package to addon - fixes bug 12900
2023-02-05 18:53 ` Michael Tremer
@ 2023-02-05 19:51 ` Adolf Belka
2023-02-05 19:54 ` Michael Tremer
0 siblings, 1 reply; 8+ messages in thread
From: Adolf Belka @ 2023-02-05 19:51 UTC (permalink / raw)
To: development
[-- Attachment #1: Type: text/plain, Size: 12087 bytes --]
Hi Michael,
On 05/02/2023 19:53, Michael Tremer wrote:
> Hello Adolf,
>
> Thank you for the patch, but didn’t we agree to drop this package in last month’s call?
Yes but no further communication occurred on this and @Paul followed up
in the bug comments with a further entreaty to keep rng-tools as an addon.
I had also found that rng-tools is still used by the kernel, but only
after it has achieved its required entropy level by doing an XOR
inclusion of the entropy data post achieving its entropy level. So
rng-tools can still be used but only as a dilution of the entropy
sources for the kernel.
So I raised the patch to enable a conclusion on rng-tools.
If this was an incorrect approach to have taken I apologise.
Regards,
Adolf.
>
> -Michael
>
>> On 5 Feb 2023, at 19:06, Adolf Belka <adolf.belka(a)ipfire.org> wrote:
>>
>> - This patch is to move the rng-tools package from a core package to an addon. With the
>> kernel changes from 5.6 rngd is no longer needed to create the required kernel entropy.
>> - The results from HRNG's via rngd are used with an XOR after the entropy is
>> collected by the kernel. So the HWRNG output is used to dilute the kernel random number
>> data, which is already merged from several sources.
>> - Based on the above and @Paul's request in the bug report to have rng-tools kept as an
>> addon this patch set is submitted for consideration to keep rng-tools but as an addon.
>> - move rng-tools rootfile from common to packages
>> - Modify rng-tools lfs from core package to addon package
>> - Create rng-tools pak to install and uninstall - creating rc.d links for start & stop.
>> - Move rngd initscript from system to packages directory.
>> - Installed into my vm testbed and confirmed that it works. No rngd daemon installed
>> from iso install. After addon install rngd is present and running. Added various files
>> to be able to test the services wui page. rngd shows up and can be turned off and on
>>
>> Fixes: Bug#12900
>> Tested-by: Adolf Belka <adolf.belka(a)ipfire.org>
>> Signed-off-by: Adolf Belka <adolf.belka(a)ipfire.org>
>> ---
>> .../rootfiles/{common => packages}/rng-tools | 2 ++
>> lfs/rng-tools | 14 ++++++++-
>> src/initscripts/{system => packages}/rngd | 0
>> src/paks/rng-tools/install.sh | 30 +++++++++++++++++++
>> src/paks/rng-tools/uninstall.sh | 28 +++++++++++++++++
>> src/paks/rng-tools/update.sh | 26 ++++++++++++++++
>> 6 files changed, 99 insertions(+), 1 deletion(-)
>> rename config/rootfiles/{common => packages}/rng-tools (69%)
>> rename src/initscripts/{system => packages}/rngd (100%)
>> create mode 100644 src/paks/rng-tools/install.sh
>> create mode 100644 src/paks/rng-tools/uninstall.sh
>> create mode 100644 src/paks/rng-tools/update.sh
>>
>> diff --git a/config/rootfiles/common/rng-tools b/config/rootfiles/packages/rng-tools
>> similarity index 69%
>> rename from config/rootfiles/common/rng-tools
>> rename to config/rootfiles/packages/rng-tools
>> index 596a911c1..fbeda7800 100644
>> --- a/config/rootfiles/common/rng-tools
>> +++ b/config/rootfiles/packages/rng-tools
>> @@ -1,4 +1,6 @@
>> +usr/bin/randstat
>> usr/bin/rngtest
>> usr/sbin/rngd
>> #usr/share/man/man1/rngtest.1
>> #usr/share/man/man8/rngd.8
>> +etc/rc.d/init.d/rngd
>> diff --git a/lfs/rng-tools b/lfs/rng-tools
>> index cafb1bcda..6a85a8482 100644
>> --- a/lfs/rng-tools
>> +++ b/lfs/rng-tools
>> @@ -1,7 +1,7 @@
>> ###############################################################################
>> # #
>> # IPFire.org - A linux based firewall #
>> -# Copyright (C) 2007-2021 IPFire Team <info(a)ipfire.org> #
>> +# Copyright (C) 2007-2023 IPFire Team <info(a)ipfire.org> #
>> # #
>> # This program is free software: you can redistribute it and/or modify #
>> # it under the terms of the GNU General Public License as published by #
>> @@ -25,12 +25,19 @@
>> include Config
>>
>> VER = 6.14
>> +SUMMARY = This is a random number generator daemon
>>
>> THISAPP = rng-tools-$(VER)
>> DL_FILE = $(THISAPP).tar.gz
>> DL_FROM = $(URL_IPFIRE)
>> DIR_APP = $(DIR_SRC)/$(THISAPP)
>> TARGET = $(DIR_INFO)/$(THISAPP)
>> +PROG = rng-tools
>> +PAK_VER = 1
>> +
>> +DEPS =
>> +
>> +SERVICES = rngd
>>
>> ###############################################################################
>> # Top-level Rules
>> @@ -50,6 +57,9 @@ download :$(patsubst %,$(DIR_DL)/%,$(objects))
>>
>> b2 : $(subst %,%_BLAKE2,$(objects))
>>
>> +dist:
>> + @$(PAK)
>> +
>> ###############################################################################
>> # Downloading, checking, b2sum
>> ###############################################################################
>> @@ -77,5 +87,7 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
>> --without-rtlsdr
>> cd $(DIR_APP) && make $(MAKETUNING) $(EXTRA_MAKE)
>> cd $(DIR_APP) && make $(EXTRA_INSTALL) install
>> + #install initscript
>> + $(call INSTALL_INITSCRIPTS,$(SERVICES))
>> @rm -rf $(DIR_APP)
>> @$(POSTBUILD)
>> diff --git a/src/initscripts/system/rngd b/src/initscripts/packages/rngd
>> similarity index 100%
>> rename from src/initscripts/system/rngd
>> rename to src/initscripts/packages/rngd
>> diff --git a/src/paks/rng-tools/install.sh b/src/paks/rng-tools/install.sh
>> new file mode 100644
>> index 000000000..a53ccc43c
>> --- /dev/null
>> +++ b/src/paks/rng-tools/install.sh
>> @@ -0,0 +1,30 @@
>> +#!/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-2023 IPFire-Team <info(a)ipfire.org>. #
>> +# #
>> +############################################################################
>> +#
>> +. /opt/pakfire/lib/functions.sh
>> +extract_files
>> +# create startlinks
>> +ln -sf ../init.d/rngd /etc/rc.d/rc0.d/K35rngd
>> +ln -sf ../init.d/rngd /etc/rc.d/rc3.d/S65rngd
>> +ln -sf ../init.d/rngd /etc/rc.d/rc6.d/K35rngd
>> +start_service --background rngd
>> diff --git a/src/paks/rng-tools/uninstall.sh b/src/paks/rng-tools/uninstall.sh
>> new file mode 100644
>> index 000000000..cc9fbb355
>> --- /dev/null
>> +++ b/src/paks/rng-tools/uninstall.sh
>> @@ -0,0 +1,28 @@
>> +#!/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-2023 IPFire-Team <info(a)ipfire.org>. #
>> +# #
>> +############################################################################
>> +#
>> +. /opt/pakfire/lib/functions.sh
>> +stop_service rngd
>> +remove_files
>> +# Remove all start links.
>> +rm -rf /etc/rc.d/rc*.d/*rngd
>> diff --git a/src/paks/rng-tools/update.sh b/src/paks/rng-tools/update.sh
>> new file mode 100644
>> index 000000000..83bd0ad98
>> --- /dev/null
>> +++ b/src/paks/rng-tools/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-2023 IPFire-Team <info(a)ipfire.org>. #
>> +# #
>> +############################################################################
>> +#
>> +. /opt/pakfire/lib/functions.sh
>> +./uninstall.sh
>> +./install.sh
>> --
>> 2.39.1
>>
>
--
Sent from my laptop
^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [PATCH 1/2] rng-tools: Move from core package to addon - fixes bug 12900
2023-02-05 19:51 ` Adolf Belka
@ 2023-02-05 19:54 ` Michael Tremer
0 siblings, 0 replies; 8+ messages in thread
From: Michael Tremer @ 2023-02-05 19:54 UTC (permalink / raw)
To: development
[-- Attachment #1: Type: text/plain, Size: 12599 bytes --]
Hello Adolf,
> On 5 Feb 2023, at 20:51, Adolf Belka <adolf.belka(a)ipfire.org> wrote:
>
> Hi Michael,
>
> On 05/02/2023 19:53, Michael Tremer wrote:
>> Hello Adolf,
>> Thank you for the patch, but didn’t we agree to drop this package in last month’s call?
> Yes but no further communication occurred on this and @Paul followed up in the bug comments with a further entreaty to keep rng-tools as an addon.
> I had also found that rng-tools is still used by the kernel, but only after it has achieved its required entropy level by doing an XOR inclusion of the entropy data post achieving its entropy level. So rng-tools can still be used but only as a dilution of the entropy sources for the kernel.
I am not sure this is correct, but something will happen...
> So I raised the patch to enable a conclusion on rng-tools.
>
> If this was an incorrect approach to have taken I apologise.
No need to apologise. I just expected the patch to do something different :)
But I am happy to go with this, too.
-Michael
>
> Regards,
> Adolf.
>
>> -Michael
>>> On 5 Feb 2023, at 19:06, Adolf Belka <adolf.belka(a)ipfire.org> wrote:
>>>
>>> - This patch is to move the rng-tools package from a core package to an addon. With the
>>> kernel changes from 5.6 rngd is no longer needed to create the required kernel entropy.
>>> - The results from HRNG's via rngd are used with an XOR after the entropy is
>>> collected by the kernel. So the HWRNG output is used to dilute the kernel random number
>>> data, which is already merged from several sources.
>>> - Based on the above and @Paul's request in the bug report to have rng-tools kept as an
>>> addon this patch set is submitted for consideration to keep rng-tools but as an addon.
>>> - move rng-tools rootfile from common to packages
>>> - Modify rng-tools lfs from core package to addon package
>>> - Create rng-tools pak to install and uninstall - creating rc.d links for start & stop.
>>> - Move rngd initscript from system to packages directory.
>>> - Installed into my vm testbed and confirmed that it works. No rngd daemon installed
>>> from iso install. After addon install rngd is present and running. Added various files
>>> to be able to test the services wui page. rngd shows up and can be turned off and on
>>>
>>> Fixes: Bug#12900
>>> Tested-by: Adolf Belka <adolf.belka(a)ipfire.org>
>>> Signed-off-by: Adolf Belka <adolf.belka(a)ipfire.org>
>>> ---
>>> .../rootfiles/{common => packages}/rng-tools | 2 ++
>>> lfs/rng-tools | 14 ++++++++-
>>> src/initscripts/{system => packages}/rngd | 0
>>> src/paks/rng-tools/install.sh | 30 +++++++++++++++++++
>>> src/paks/rng-tools/uninstall.sh | 28 +++++++++++++++++
>>> src/paks/rng-tools/update.sh | 26 ++++++++++++++++
>>> 6 files changed, 99 insertions(+), 1 deletion(-)
>>> rename config/rootfiles/{common => packages}/rng-tools (69%)
>>> rename src/initscripts/{system => packages}/rngd (100%)
>>> create mode 100644 src/paks/rng-tools/install.sh
>>> create mode 100644 src/paks/rng-tools/uninstall.sh
>>> create mode 100644 src/paks/rng-tools/update.sh
>>>
>>> diff --git a/config/rootfiles/common/rng-tools b/config/rootfiles/packages/rng-tools
>>> similarity index 69%
>>> rename from config/rootfiles/common/rng-tools
>>> rename to config/rootfiles/packages/rng-tools
>>> index 596a911c1..fbeda7800 100644
>>> --- a/config/rootfiles/common/rng-tools
>>> +++ b/config/rootfiles/packages/rng-tools
>>> @@ -1,4 +1,6 @@
>>> +usr/bin/randstat
>>> usr/bin/rngtest
>>> usr/sbin/rngd
>>> #usr/share/man/man1/rngtest.1
>>> #usr/share/man/man8/rngd.8
>>> +etc/rc.d/init.d/rngd
>>> diff --git a/lfs/rng-tools b/lfs/rng-tools
>>> index cafb1bcda..6a85a8482 100644
>>> --- a/lfs/rng-tools
>>> +++ b/lfs/rng-tools
>>> @@ -1,7 +1,7 @@
>>> ###############################################################################
>>> # #
>>> # IPFire.org - A linux based firewall #
>>> -# Copyright (C) 2007-2021 IPFire Team <info(a)ipfire.org> #
>>> +# Copyright (C) 2007-2023 IPFire Team <info(a)ipfire.org> #
>>> # #
>>> # This program is free software: you can redistribute it and/or modify #
>>> # it under the terms of the GNU General Public License as published by #
>>> @@ -25,12 +25,19 @@
>>> include Config
>>>
>>> VER = 6.14
>>> +SUMMARY = This is a random number generator daemon
>>>
>>> THISAPP = rng-tools-$(VER)
>>> DL_FILE = $(THISAPP).tar.gz
>>> DL_FROM = $(URL_IPFIRE)
>>> DIR_APP = $(DIR_SRC)/$(THISAPP)
>>> TARGET = $(DIR_INFO)/$(THISAPP)
>>> +PROG = rng-tools
>>> +PAK_VER = 1
>>> +
>>> +DEPS =
>>> +
>>> +SERVICES = rngd
>>>
>>> ###############################################################################
>>> # Top-level Rules
>>> @@ -50,6 +57,9 @@ download :$(patsubst %,$(DIR_DL)/%,$(objects))
>>>
>>> b2 : $(subst %,%_BLAKE2,$(objects))
>>>
>>> +dist:
>>> + @$(PAK)
>>> +
>>> ###############################################################################
>>> # Downloading, checking, b2sum
>>> ###############################################################################
>>> @@ -77,5 +87,7 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
>>> --without-rtlsdr
>>> cd $(DIR_APP) && make $(MAKETUNING) $(EXTRA_MAKE)
>>> cd $(DIR_APP) && make $(EXTRA_INSTALL) install
>>> + #install initscript
>>> + $(call INSTALL_INITSCRIPTS,$(SERVICES))
>>> @rm -rf $(DIR_APP)
>>> @$(POSTBUILD)
>>> diff --git a/src/initscripts/system/rngd b/src/initscripts/packages/rngd
>>> similarity index 100%
>>> rename from src/initscripts/system/rngd
>>> rename to src/initscripts/packages/rngd
>>> diff --git a/src/paks/rng-tools/install.sh b/src/paks/rng-tools/install.sh
>>> new file mode 100644
>>> index 000000000..a53ccc43c
>>> --- /dev/null
>>> +++ b/src/paks/rng-tools/install.sh
>>> @@ -0,0 +1,30 @@
>>> +#!/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-2023 IPFire-Team <info(a)ipfire.org>. #
>>> +# #
>>> +############################################################################
>>> +#
>>> +. /opt/pakfire/lib/functions.sh
>>> +extract_files
>>> +# create startlinks
>>> +ln -sf ../init.d/rngd /etc/rc.d/rc0.d/K35rngd
>>> +ln -sf ../init.d/rngd /etc/rc.d/rc3.d/S65rngd
>>> +ln -sf ../init.d/rngd /etc/rc.d/rc6.d/K35rngd
>>> +start_service --background rngd
>>> diff --git a/src/paks/rng-tools/uninstall.sh b/src/paks/rng-tools/uninstall.sh
>>> new file mode 100644
>>> index 000000000..cc9fbb355
>>> --- /dev/null
>>> +++ b/src/paks/rng-tools/uninstall.sh
>>> @@ -0,0 +1,28 @@
>>> +#!/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-2023 IPFire-Team <info(a)ipfire.org>. #
>>> +# #
>>> +############################################################################
>>> +#
>>> +. /opt/pakfire/lib/functions.sh
>>> +stop_service rngd
>>> +remove_files
>>> +# Remove all start links.
>>> +rm -rf /etc/rc.d/rc*.d/*rngd
>>> diff --git a/src/paks/rng-tools/update.sh b/src/paks/rng-tools/update.sh
>>> new file mode 100644
>>> index 000000000..83bd0ad98
>>> --- /dev/null
>>> +++ b/src/paks/rng-tools/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-2023 IPFire-Team <info(a)ipfire.org>. #
>>> +# #
>>> +############################################################################
>>> +#
>>> +. /opt/pakfire/lib/functions.sh
>>> +./uninstall.sh
>>> +./install.sh
>>> --
>>> 2.39.1
>>>
>
> --
> Sent from my laptop
^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [PATCH 1/2] rng-tools: Move from core package to addon - fixes bug 12900
2023-02-05 18:06 [PATCH 1/2] rng-tools: Move from core package to addon - fixes bug 12900 Adolf Belka
` (2 preceding siblings ...)
2023-02-05 18:53 ` Michael Tremer
@ 2023-02-05 22:55 ` Paul Simmons
3 siblings, 0 replies; 8+ messages in thread
From: Paul Simmons @ 2023-02-05 22:55 UTC (permalink / raw)
To: development
[-- Attachment #1: Type: text/plain, Size: 11168 bytes --]
On 2/5/23 12:06, Adolf Belka wrote:
> - This patch is to move the rng-tools package from a core package to an addon. With the
> kernel changes from 5.6 rngd is no longer needed to create the required kernel entropy.
> - The results from HRNG's via rngd are used with an XOR after the entropy is
> collected by the kernel. So the HWRNG output is used to dilute the kernel random number
> data, which is already merged from several sources.
> - Based on the above and @Paul's request in the bug report to have rng-tools kept as an
> addon this patch set is submitted for consideration to keep rng-tools but as an addon.
> - move rng-tools rootfile from common to packages
> - Modify rng-tools lfs from core package to addon package
> - Create rng-tools pak to install and uninstall - creating rc.d links for start & stop.
> - Move rngd initscript from system to packages directory.
> - Installed into my vm testbed and confirmed that it works. No rngd daemon installed
> from iso install. After addon install rngd is present and running. Added various files
> to be able to test the services wui page. rngd shows up and can be turned off and on
>
> Fixes: Bug#12900
> Tested-by: Adolf Belka <adolf.belka(a)ipfire.org>
> Signed-off-by: Adolf Belka <adolf.belka(a)ipfire.org>
> ---
> .../rootfiles/{common => packages}/rng-tools | 2 ++
> lfs/rng-tools | 14 ++++++++-
> src/initscripts/{system => packages}/rngd | 0
> src/paks/rng-tools/install.sh | 30 +++++++++++++++++++
> src/paks/rng-tools/uninstall.sh | 28 +++++++++++++++++
> src/paks/rng-tools/update.sh | 26 ++++++++++++++++
> 6 files changed, 99 insertions(+), 1 deletion(-)
> rename config/rootfiles/{common => packages}/rng-tools (69%)
> rename src/initscripts/{system => packages}/rngd (100%)
> create mode 100644 src/paks/rng-tools/install.sh
> create mode 100644 src/paks/rng-tools/uninstall.sh
> create mode 100644 src/paks/rng-tools/update.sh
>
> diff --git a/config/rootfiles/common/rng-tools b/config/rootfiles/packages/rng-tools
> similarity index 69%
> rename from config/rootfiles/common/rng-tools
> rename to config/rootfiles/packages/rng-tools
> index 596a911c1..fbeda7800 100644
> --- a/config/rootfiles/common/rng-tools
> +++ b/config/rootfiles/packages/rng-tools
> @@ -1,4 +1,6 @@
> +usr/bin/randstat
> usr/bin/rngtest
> usr/sbin/rngd
> #usr/share/man/man1/rngtest.1
> #usr/share/man/man8/rngd.8
> +etc/rc.d/init.d/rngd
> diff --git a/lfs/rng-tools b/lfs/rng-tools
> index cafb1bcda..6a85a8482 100644
> --- a/lfs/rng-tools
> +++ b/lfs/rng-tools
> @@ -1,7 +1,7 @@
> ###############################################################################
> # #
> # IPFire.org - A linux based firewall #
> -# Copyright (C) 2007-2021 IPFire Team <info(a)ipfire.org> #
> +# Copyright (C) 2007-2023 IPFire Team <info(a)ipfire.org> #
> # #
> # This program is free software: you can redistribute it and/or modify #
> # it under the terms of the GNU General Public License as published by #
> @@ -25,12 +25,19 @@
> include Config
>
> VER = 6.14
> +SUMMARY = This is a random number generator daemon
>
> THISAPP = rng-tools-$(VER)
> DL_FILE = $(THISAPP).tar.gz
> DL_FROM = $(URL_IPFIRE)
> DIR_APP = $(DIR_SRC)/$(THISAPP)
> TARGET = $(DIR_INFO)/$(THISAPP)
> +PROG = rng-tools
> +PAK_VER = 1
> +
> +DEPS =
> +
> +SERVICES = rngd
>
> ###############################################################################
> # Top-level Rules
> @@ -50,6 +57,9 @@ download :$(patsubst %,$(DIR_DL)/%,$(objects))
>
> b2 : $(subst %,%_BLAKE2,$(objects))
>
> +dist:
> + @$(PAK)
> +
> ###############################################################################
> # Downloading, checking, b2sum
> ###############################################################################
> @@ -77,5 +87,7 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
> --without-rtlsdr
> cd $(DIR_APP) && make $(MAKETUNING) $(EXTRA_MAKE)
> cd $(DIR_APP) && make $(EXTRA_INSTALL) install
> + #install initscript
> + $(call INSTALL_INITSCRIPTS,$(SERVICES))
> @rm -rf $(DIR_APP)
> @$(POSTBUILD)
> diff --git a/src/initscripts/system/rngd b/src/initscripts/packages/rngd
> similarity index 100%
> rename from src/initscripts/system/rngd
> rename to src/initscripts/packages/rngd
> diff --git a/src/paks/rng-tools/install.sh b/src/paks/rng-tools/install.sh
> new file mode 100644
> index 000000000..a53ccc43c
> --- /dev/null
> +++ b/src/paks/rng-tools/install.sh
> @@ -0,0 +1,30 @@
> +#!/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-2023 IPFire-Team <info(a)ipfire.org>. #
> +# #
> +############################################################################
> +#
> +. /opt/pakfire/lib/functions.sh
> +extract_files
> +# create startlinks
> +ln -sf ../init.d/rngd /etc/rc.d/rc0.d/K35rngd
> +ln -sf ../init.d/rngd /etc/rc.d/rc3.d/S65rngd
> +ln -sf ../init.d/rngd /etc/rc.d/rc6.d/K35rngd
> +start_service --background rngd
> diff --git a/src/paks/rng-tools/uninstall.sh b/src/paks/rng-tools/uninstall.sh
> new file mode 100644
> index 000000000..cc9fbb355
> --- /dev/null
> +++ b/src/paks/rng-tools/uninstall.sh
> @@ -0,0 +1,28 @@
> +#!/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-2023 IPFire-Team <info(a)ipfire.org>. #
> +# #
> +############################################################################
> +#
> +. /opt/pakfire/lib/functions.sh
> +stop_service rngd
> +remove_files
> +# Remove all start links.
> +rm -rf /etc/rc.d/rc*.d/*rngd
> diff --git a/src/paks/rng-tools/update.sh b/src/paks/rng-tools/update.sh
> new file mode 100644
> index 000000000..83bd0ad98
> --- /dev/null
> +++ b/src/paks/rng-tools/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-2023 IPFire-Team <info(a)ipfire.org>. #
> +# #
> +############################################################################
> +#
> +. /opt/pakfire/lib/functions.sh
> +./uninstall.sh
> +./install.sh
I'm happy to see this patch series land! Thank you!
Paul
^ permalink raw reply [flat|nested] 8+ messages in thread
end of thread, other threads:[~2023-02-05 22:55 UTC | newest]
Thread overview: 8+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2023-02-05 18:06 [PATCH 1/2] rng-tools: Move from core package to addon - fixes bug 12900 Adolf Belka
2023-02-05 18:06 ` [PATCH 2/2] initscripts: Remove rngd from the core package initscripts Adolf Belka
2023-02-05 18:27 ` Bernhard Bitsch
2023-02-05 18:26 ` [PATCH 1/2] rng-tools: Move from core package to addon - fixes bug 12900 Bernhard Bitsch
2023-02-05 18:53 ` Michael Tremer
2023-02-05 19:51 ` Adolf Belka
2023-02-05 19:54 ` Michael Tremer
2023-02-05 22:55 ` Paul Simmons
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox