Development March 2023

development@lists.ipfire.org

11 participants
72 discussions

[PATCH] automake: Update to version 1.16.5
by Adolf Belka 28 Mar '23

28 Mar '23

- Update from version 1.16.3 to 1.16.5 - Update of rootfile not required - Chyangelog New in 1.16.5: * Bugs fixed - PYTHON_PREFIX and PYTHON_EXEC_PREFIX are now set according to Python's sys.* values only if the new configure option --with-python-sys-prefix is specified. Otherwise, GNU default values are used, as in the past. (The change in 1.16.3 was too incompatible.) - consistently depend on install-libLTLIBRARIES. * Distribution - use const for yyerror declaration in bison/yacc tests. New in 1.16.4: * New features added - The PYTHON_PREFIX and PYTHON_EXEC_PREFIX variables are now set from Python's sys.prefix and sys.exec_prefix; use the new configure options --with-python_prefix and --with-python_exec_prefix to specify explicitly. - Common top-level files can be provided as .md; the non-md version is used if both are present: AUTHORS ChangeLog INSTALL NEWS README README-alpha THANKS - CTAGS, ETAGS, SCOPE variables can be set via configure. - Silent make output for custom link commands. - New option "no-dist-built-sources" skips generating $(BUILT_SOURCES) before building the tarball as part of "make dist", that is, omits the dependency of $(distdir): $(BUILT_SOURCES). * Bugs fixed - automake output more reproducible. - test-driver less likely to clash with tests writing to the same file. - DejaGnu tests always use the directory name, testsuite/, for compatibility with the newer dejagnu-1.6.3 and with prior versions. * Distribution - config.sub and config.guess updates include restoration of `...` for maximum portability. Signed-off-by: Adolf Belka <adolf.belka(a)ipfire.org> --- lfs/automake | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/lfs/automake b/lfs/automake index 425ac3915..595ecd917 100644 --- a/lfs/automake +++ b/lfs/automake @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007-2020 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 # @@ -24,7 +24,7 @@ include Config -VER = 1.16.3 +VER = 1.16.5 THISAPP = automake-$(VER) DL_FILE = $(THISAPP).tar.xz @@ -48,7 +48,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_BLAKE2 = ab6001a1b09e171ec83bac07155a77ab0fc29f5185116616aa3080b27e8bbf759472cd0dfb75630b26f7ad8d0741e668662d00b370ef79cf5ef6c62e945c94da +$(DL_FILE)_BLAKE2 = 87408abc57e1d4317a2b518fb3606d0f6d156522e7333016dd84747cd8922f27ef7fcc93220b11f794ce52bf8fd9a788d0166a4d1964d7c283905f269977ac7c install : $(TARGET) -- 2.40.0

1 4

[PATCH] systemd: Move some basic tools into own package
by Stefan Schantl 28 Mar '23

28 Mar '23

The systemd-sysusers and systemd-tmpfiles tools are used by various services and the build system in order to install / build packages. Moving this tools into an own package allows us to early access them without requiremet to install the whole systemd package. Anyway the systemd package requires those tools to proper get installed and handle their own sysusers files. Signed-off-by: Stefan Schantl <stefan.schantl(a)ipfire.org> --- systemd/systemd.nm | 38 +++++++++++++++++++++++++++++++++++++- 1 file changed, 37 insertions(+), 1 deletion(-) diff --git a/systemd/systemd.nm b/systemd/systemd.nm index a01063828..a898c6826 100644 --- a/systemd/systemd.nm +++ b/systemd/systemd.nm @@ -5,7 +5,7 @@ name = systemd version = 253 -release = 2 +release = 3 maintainer = Stefan Schantl <stefan.schantl(a)ipfire.org> groups = System/Base @@ -227,6 +227,7 @@ packages python3-cairo python3-dbus python3-gobject3 + %{name}-basetools = %{thisver} %{name}-libs = %{thisver} util-linux >= 2.19 end @@ -315,6 +316,38 @@ packages end end + package %{name}-basetools + summary = Basetools from the systemd package, like sysuses and tmpfiles. + description + This package contains some very basic tools from systemd like + systemd-sysusers and systemd-tmpfiles. + + They mostly are required in a very early stage and shipping them + in an own package allows us to handle this properly. + end + + provides + systemd-sysusers = %{thisver} + systemd-tmpfiles = %{thisver} + end + + requires + %{name}-libs = %{thisver} + end + + files + %{bindir}/%{name}-sysusers + %{bindir}/%{name}-tmpfiles + %{mandir}/man1/%{name}-sysusers* + %{mandir}/man1/%{name}-tmpfiles* + + # Only ship the sysusers.d folder without + # any config files. + /usr/lib/sysusers.d + !/usr/lib/sysusers.d/*.conf + end + end + package %{name}-libs template LIBS @@ -339,6 +372,9 @@ packages systemd < %{thisver} end + files += \ + %{libdir}/%{name} + # Add myhostname to the hosts line of /etc/nsswitch.conf script postin if [ -f "/etc/nsswitch.conf" ]; then -- 2.30.2

1 0

[PATCH] update-ipblocklists: Fix loading new blocklists after update
by Stefan Schantl 28 Mar '23

28 Mar '23

* The script needs to run with root permissions in order to do the ipset operations. So remove code to drop the permissions on startup. * Adjust execute calls to use the proper functions from general functions. * Add some code to set the correct ownership (nobody:nobody) for changed files during script runtime. Fixes #13072. Signed-off-by: Stefan Schantl <stefan.schantl(a)ipfire.org> --- config/cfgroot/ipblocklist-functions.pl | 27 ++++++++++++++++++++++++ src/scripts/update-ipblocklists | 28 +++++++++++-------------- 2 files changed, 39 insertions(+), 16 deletions(-) diff --git a/config/cfgroot/ipblocklist-functions.pl b/config/cfgroot/ipblocklist-functions.pl index ecabf42e8..bd026a01d 100644 --- a/config/cfgroot/ipblocklist-functions.pl +++ b/config/cfgroot/ipblocklist-functions.pl @@ -383,4 +383,31 @@ sub get_holdoff_rate($) { return $value; } +# +## sub set_ownership(file) +## +## Function to set the correct ownership (nobody:nobody) to a given file. +## +# +sub set_ownership($) { + my ($file) = @_; + + # User and group of the WUI. + my $uname = "nobody"; + my $grname = "nobody"; + + # The chown function implemented in perl requies the user and group as nummeric id's. + my $uid = getpwnam($uname); + my $gid = getgrnam($grname); + + # Check if the given file exists. + unless ($file) { + # Stop the script and print error message. + die "The given $file does not exist. Cannot change the ownership!\n"; + } + + # Change ownership of the file. + chown($uid, $gid, "$file"); +} + 1; diff --git a/src/scripts/update-ipblocklists b/src/scripts/update-ipblocklists index 9918cac41..a17b47999 100644 --- a/src/scripts/update-ipblocklists +++ b/src/scripts/update-ipblocklists @@ -32,19 +32,6 @@ require "${General::swroot}/lang.pl"; # Hash to store the settings. my %settings = (); -# The user and group name as which this script should be run. -my $run_as = 'nobody'; - -# Get user and group id of the user. -my ( $uid, $gid ) = ( getpwnam $run_as )[ 2, 3 ]; - -# Check if the script currently runs as root. -if ( $> == 0 ) { - # Drop privileges and switch to the specified user and group. - POSIX::setgid( $gid ); - POSIX::setuid( $uid ); -} - # Establish the connection to the syslog service. openlog('ipblocklist', 'cons', 'user'); @@ -122,6 +109,12 @@ foreach my $blocklist (@blocklists) { &_log_to_syslog("<ERROR> Could not update $blocklist blocklist - Unexpected error\!"); } } else { + # Get the filename of the blocklist. + my $ipset_db_file = &IPblocklist::get_ipset_db_file($blocklist); + + # Set the correct ownership. + &IPblocklist::set_ownership($ipset_db_file); + # Log successfull update. &_log_to_syslog("<INFO> Successfully updated $blocklist blocklist."); @@ -132,22 +125,25 @@ foreach my $blocklist (@blocklists) { # Check if a blocklist has been updated and therefore needs to be reloaded. if (@updated_blocklists) { + # Set correct ownership to the modified file. + &IPblocklist::set_ownership($IPblocklist::modified_file); + # Loop through the array. foreach my $updated_blocklist (@updated_blocklists) { # Get the blocklist file. my $ipset_db_file = &IPblocklist::get_ipset_db_file($updated_blocklist); # Call safe system function to reload/update the blocklist. - &General::system("ipset", "restore", "-f", "$ipset_db_file"); + &General::safe_system("ipset", "restore", "-f", "$ipset_db_file"); # The set name contains a "v4" as suffix. my $set_name = "$updated_blocklist" . "v4"; # Swap the sets to use the new one. - &General::system("ipset", "swap", "$set_name", "$updated_blocklist"); + &General::safe_system("ipset", "swap", "$set_name", "$updated_blocklist"); # Destroy the old blocklist. - &General::system("ipset", "destroy", "$set_name"); + &General::safe_system("ipset", "destroy", "$set_name"); } } -- 2.30.2

1 0

[PATCH] 7zip: Update to version 17.05
by Adolf Belka 28 Mar '23

28 Mar '23

- Update from version 17.04 to 17.05 - Update of rootfile - Changelog Version 17.05 - add UTF-8 support for Client7z - fix issue 130 Signed-off-by: Adolf Belka <adolf.belka(a)ipfire.org> --- config/rootfiles/packages/7zip | 198 ++++++++++++++++----------------- lfs/7zip | 8 +- 2 files changed, 103 insertions(+), 103 deletions(-) diff --git a/config/rootfiles/packages/7zip b/config/rootfiles/packages/7zip index d050e02bb..25ed4254b 100644 --- a/config/rootfiles/packages/7zip +++ b/config/rootfiles/packages/7zip @@ -9,105 +9,105 @@ usr/lib/p7zip/7za usr/lib/p7zip/7zr usr/lib/p7zip/Codecs usr/lib/p7zip/Codecs/Rar.so -#usr/share/doc/p7zip-17.04 -#usr/share/doc/p7zip-17.04/ChangeLog -#usr/share/doc/p7zip-17.04/DOC -#usr/share/doc/p7zip-17.04/DOC/7zC.txt -#usr/share/doc/p7zip-17.04/DOC/7zFormat.txt -#usr/share/doc/p7zip-17.04/DOC/License.txt -#usr/share/doc/p7zip-17.04/DOC/MANUAL -#usr/share/doc/p7zip-17.04/DOC/MANUAL/7-zip.chm -#usr/share/doc/p7zip-17.04/DOC/MANUAL/cmdline -#usr/share/doc/p7zip-17.04/DOC/MANUAL/cmdline/commands -#usr/share/doc/p7zip-17.04/DOC/MANUAL/cmdline/commands/add.htm -#usr/share/doc/p7zip-17.04/DOC/MANUAL/cmdline/commands/bench.htm -#usr/share/doc/p7zip-17.04/DOC/MANUAL/cmdline/commands/delete.htm -#usr/share/doc/p7zip-17.04/DOC/MANUAL/cmdline/commands/extract.htm -#usr/share/doc/p7zip-17.04/DOC/MANUAL/cmdline/commands/extract_full.htm -#usr/share/doc/p7zip-17.04/DOC/MANUAL/cmdline/commands/hash.htm -#usr/share/doc/p7zip-17.04/DOC/MANUAL/cmdline/commands/index.htm -#usr/share/doc/p7zip-17.04/DOC/MANUAL/cmdline/commands/list.htm -#usr/share/doc/p7zip-17.04/DOC/MANUAL/cmdline/commands/rename.htm -#usr/share/doc/p7zip-17.04/DOC/MANUAL/cmdline/commands/style.css -#usr/share/doc/p7zip-17.04/DOC/MANUAL/cmdline/commands/test.htm -#usr/share/doc/p7zip-17.04/DOC/MANUAL/cmdline/commands/update.htm -#usr/share/doc/p7zip-17.04/DOC/MANUAL/cmdline/exit_codes.htm -#usr/share/doc/p7zip-17.04/DOC/MANUAL/cmdline/index.htm -#usr/share/doc/p7zip-17.04/DOC/MANUAL/cmdline/style.css -#usr/share/doc/p7zip-17.04/DOC/MANUAL/cmdline/switches -#usr/share/doc/p7zip-17.04/DOC/MANUAL/cmdline/switches/ar_exclude.htm -#usr/share/doc/p7zip-17.04/DOC/MANUAL/cmdline/switches/ar_include.htm -#usr/share/doc/p7zip-17.04/DOC/MANUAL/cmdline/switches/ar_no.htm -#usr/share/doc/p7zip-17.04/DOC/MANUAL/cmdline/switches/bb.htm -#usr/share/doc/p7zip-17.04/DOC/MANUAL/cmdline/switches/bs.htm -#usr/share/doc/p7zip-17.04/DOC/MANUAL/cmdline/switches/charset.htm -#usr/share/doc/p7zip-17.04/DOC/MANUAL/cmdline/switches/exclude.htm -#usr/share/doc/p7zip-17.04/DOC/MANUAL/cmdline/switches/include.htm -#usr/share/doc/p7zip-17.04/DOC/MANUAL/cmdline/switches/index.htm -#usr/share/doc/p7zip-17.04/DOC/MANUAL/cmdline/switches/large_pages.htm -#usr/share/doc/p7zip-17.04/DOC/MANUAL/cmdline/switches/list_tech.htm -#usr/share/doc/p7zip-17.04/DOC/MANUAL/cmdline/switches/method.htm -#usr/share/doc/p7zip-17.04/DOC/MANUAL/cmdline/switches/output_dir.htm -#usr/share/doc/p7zip-17.04/DOC/MANUAL/cmdline/switches/overwrite.htm -#usr/share/doc/p7zip-17.04/DOC/MANUAL/cmdline/switches/password.htm -#usr/share/doc/p7zip-17.04/DOC/MANUAL/cmdline/switches/recurse.htm -#usr/share/doc/p7zip-17.04/DOC/MANUAL/cmdline/switches/sa.htm -#usr/share/doc/p7zip-17.04/DOC/MANUAL/cmdline/switches/scc.htm -#usr/share/doc/p7zip-17.04/DOC/MANUAL/cmdline/switches/scrc.htm -#usr/share/doc/p7zip-17.04/DOC/MANUAL/cmdline/switches/sdel.htm -#usr/share/doc/p7zip-17.04/DOC/MANUAL/cmdline/switches/sfx.htm -#usr/share/doc/p7zip-17.04/DOC/MANUAL/cmdline/switches/shared.htm -#usr/share/doc/p7zip-17.04/DOC/MANUAL/cmdline/switches/sni.htm -#usr/share/doc/p7zip-17.04/DOC/MANUAL/cmdline/switches/sns.htm -#usr/share/doc/p7zip-17.04/DOC/MANUAL/cmdline/switches/spf.htm -#usr/share/doc/p7zip-17.04/DOC/MANUAL/cmdline/switches/ssc.htm -#usr/share/doc/p7zip-17.04/DOC/MANUAL/cmdline/switches/stdin.htm -#usr/share/doc/p7zip-17.04/DOC/MANUAL/cmdline/switches/stdout.htm -#usr/share/doc/p7zip-17.04/DOC/MANUAL/cmdline/switches/stl.htm -#usr/share/doc/p7zip-17.04/DOC/MANUAL/cmdline/switches/stop_switch.htm -#usr/share/doc/p7zip-17.04/DOC/MANUAL/cmdline/switches/stx.htm -#usr/share/doc/p7zip-17.04/DOC/MANUAL/cmdline/switches/style.css -#usr/share/doc/p7zip-17.04/DOC/MANUAL/cmdline/switches/type.htm -#usr/share/doc/p7zip-17.04/DOC/MANUAL/cmdline/switches/update.htm -#usr/share/doc/p7zip-17.04/DOC/MANUAL/cmdline/switches/volume.htm -#usr/share/doc/p7zip-17.04/DOC/MANUAL/cmdline/switches/working_dir.htm -#usr/share/doc/p7zip-17.04/DOC/MANUAL/cmdline/switches/yes.htm -#usr/share/doc/p7zip-17.04/DOC/MANUAL/cmdline/syntax.htm -#usr/share/doc/p7zip-17.04/DOC/MANUAL/fm -#usr/share/doc/p7zip-17.04/DOC/MANUAL/fm/about.htm -#usr/share/doc/p7zip-17.04/DOC/MANUAL/fm/benchmark.htm -#usr/share/doc/p7zip-17.04/DOC/MANUAL/fm/index.htm -#usr/share/doc/p7zip-17.04/DOC/MANUAL/fm/menu.htm -#usr/share/doc/p7zip-17.04/DOC/MANUAL/fm/options.htm -#usr/share/doc/p7zip-17.04/DOC/MANUAL/fm/plugins -#usr/share/doc/p7zip-17.04/DOC/MANUAL/fm/plugins/7-zip -#usr/share/doc/p7zip-17.04/DOC/MANUAL/fm/plugins/7-zip/add.htm -#usr/share/doc/p7zip-17.04/DOC/MANUAL/fm/plugins/7-zip/extract.htm -#usr/share/doc/p7zip-17.04/DOC/MANUAL/fm/plugins/7-zip/index.htm -#usr/share/doc/p7zip-17.04/DOC/MANUAL/fm/plugins/7-zip/style.css -#usr/share/doc/p7zip-17.04/DOC/MANUAL/fm/plugins/index.htm -#usr/share/doc/p7zip-17.04/DOC/MANUAL/fm/plugins/style.css -#usr/share/doc/p7zip-17.04/DOC/MANUAL/fm/style.css -#usr/share/doc/p7zip-17.04/DOC/MANUAL/general -#usr/share/doc/p7zip-17.04/DOC/MANUAL/general/7z.htm -#usr/share/doc/p7zip-17.04/DOC/MANUAL/general/faq.htm -#usr/share/doc/p7zip-17.04/DOC/MANUAL/general/formats.htm -#usr/share/doc/p7zip-17.04/DOC/MANUAL/general/index.htm -#usr/share/doc/p7zip-17.04/DOC/MANUAL/general/license.htm -#usr/share/doc/p7zip-17.04/DOC/MANUAL/general/performance.htm -#usr/share/doc/p7zip-17.04/DOC/MANUAL/general/style.css -#usr/share/doc/p7zip-17.04/DOC/MANUAL/general/thanks.htm -#usr/share/doc/p7zip-17.04/DOC/MANUAL/start.htm -#usr/share/doc/p7zip-17.04/DOC/MANUAL/style.css -#usr/share/doc/p7zip-17.04/DOC/Methods.txt -#usr/share/doc/p7zip-17.04/DOC/Struct.EAP -#usr/share/doc/p7zip-17.04/DOC/Struct.ldb -#usr/share/doc/p7zip-17.04/DOC/copying.txt -#usr/share/doc/p7zip-17.04/DOC/lzma.txt -#usr/share/doc/p7zip-17.04/DOC/readme.txt -#usr/share/doc/p7zip-17.04/DOC/src-history.txt -#usr/share/doc/p7zip-17.04/DOC/unRarLicense.txt -#usr/share/doc/p7zip-17.04/README +#usr/share/doc/p7zip-17.05 +#usr/share/doc/p7zip-17.05/ChangeLog +#usr/share/doc/p7zip-17.05/DOC +#usr/share/doc/p7zip-17.05/DOC/7zC.txt +#usr/share/doc/p7zip-17.05/DOC/7zFormat.txt +#usr/share/doc/p7zip-17.05/DOC/License.txt +#usr/share/doc/p7zip-17.05/DOC/MANUAL +#usr/share/doc/p7zip-17.05/DOC/MANUAL/7-zip.chm +#usr/share/doc/p7zip-17.05/DOC/MANUAL/cmdline +#usr/share/doc/p7zip-17.05/DOC/MANUAL/cmdline/commands +#usr/share/doc/p7zip-17.05/DOC/MANUAL/cmdline/commands/add.htm +#usr/share/doc/p7zip-17.05/DOC/MANUAL/cmdline/commands/bench.htm +#usr/share/doc/p7zip-17.05/DOC/MANUAL/cmdline/commands/delete.htm +#usr/share/doc/p7zip-17.05/DOC/MANUAL/cmdline/commands/extract.htm +#usr/share/doc/p7zip-17.05/DOC/MANUAL/cmdline/commands/extract_full.htm +#usr/share/doc/p7zip-17.05/DOC/MANUAL/cmdline/commands/hash.htm +#usr/share/doc/p7zip-17.05/DOC/MANUAL/cmdline/commands/index.htm +#usr/share/doc/p7zip-17.05/DOC/MANUAL/cmdline/commands/list.htm +#usr/share/doc/p7zip-17.05/DOC/MANUAL/cmdline/commands/rename.htm +#usr/share/doc/p7zip-17.05/DOC/MANUAL/cmdline/commands/style.css +#usr/share/doc/p7zip-17.05/DOC/MANUAL/cmdline/commands/test.htm +#usr/share/doc/p7zip-17.05/DOC/MANUAL/cmdline/commands/update.htm +#usr/share/doc/p7zip-17.05/DOC/MANUAL/cmdline/exit_codes.htm +#usr/share/doc/p7zip-17.05/DOC/MANUAL/cmdline/index.htm +#usr/share/doc/p7zip-17.05/DOC/MANUAL/cmdline/style.css +#usr/share/doc/p7zip-17.05/DOC/MANUAL/cmdline/switches +#usr/share/doc/p7zip-17.05/DOC/MANUAL/cmdline/switches/ar_exclude.htm +#usr/share/doc/p7zip-17.05/DOC/MANUAL/cmdline/switches/ar_include.htm +#usr/share/doc/p7zip-17.05/DOC/MANUAL/cmdline/switches/ar_no.htm +#usr/share/doc/p7zip-17.05/DOC/MANUAL/cmdline/switches/bb.htm +#usr/share/doc/p7zip-17.05/DOC/MANUAL/cmdline/switches/bs.htm +#usr/share/doc/p7zip-17.05/DOC/MANUAL/cmdline/switches/charset.htm +#usr/share/doc/p7zip-17.05/DOC/MANUAL/cmdline/switches/exclude.htm +#usr/share/doc/p7zip-17.05/DOC/MANUAL/cmdline/switches/include.htm +#usr/share/doc/p7zip-17.05/DOC/MANUAL/cmdline/switches/index.htm +#usr/share/doc/p7zip-17.05/DOC/MANUAL/cmdline/switches/large_pages.htm +#usr/share/doc/p7zip-17.05/DOC/MANUAL/cmdline/switches/list_tech.htm +#usr/share/doc/p7zip-17.05/DOC/MANUAL/cmdline/switches/method.htm +#usr/share/doc/p7zip-17.05/DOC/MANUAL/cmdline/switches/output_dir.htm +#usr/share/doc/p7zip-17.05/DOC/MANUAL/cmdline/switches/overwrite.htm +#usr/share/doc/p7zip-17.05/DOC/MANUAL/cmdline/switches/password.htm +#usr/share/doc/p7zip-17.05/DOC/MANUAL/cmdline/switches/recurse.htm +#usr/share/doc/p7zip-17.05/DOC/MANUAL/cmdline/switches/sa.htm +#usr/share/doc/p7zip-17.05/DOC/MANUAL/cmdline/switches/scc.htm +#usr/share/doc/p7zip-17.05/DOC/MANUAL/cmdline/switches/scrc.htm +#usr/share/doc/p7zip-17.05/DOC/MANUAL/cmdline/switches/sdel.htm +#usr/share/doc/p7zip-17.05/DOC/MANUAL/cmdline/switches/sfx.htm +#usr/share/doc/p7zip-17.05/DOC/MANUAL/cmdline/switches/shared.htm +#usr/share/doc/p7zip-17.05/DOC/MANUAL/cmdline/switches/sni.htm +#usr/share/doc/p7zip-17.05/DOC/MANUAL/cmdline/switches/sns.htm +#usr/share/doc/p7zip-17.05/DOC/MANUAL/cmdline/switches/spf.htm +#usr/share/doc/p7zip-17.05/DOC/MANUAL/cmdline/switches/ssc.htm +#usr/share/doc/p7zip-17.05/DOC/MANUAL/cmdline/switches/stdin.htm +#usr/share/doc/p7zip-17.05/DOC/MANUAL/cmdline/switches/stdout.htm +#usr/share/doc/p7zip-17.05/DOC/MANUAL/cmdline/switches/stl.htm +#usr/share/doc/p7zip-17.05/DOC/MANUAL/cmdline/switches/stop_switch.htm +#usr/share/doc/p7zip-17.05/DOC/MANUAL/cmdline/switches/stx.htm +#usr/share/doc/p7zip-17.05/DOC/MANUAL/cmdline/switches/style.css +#usr/share/doc/p7zip-17.05/DOC/MANUAL/cmdline/switches/type.htm +#usr/share/doc/p7zip-17.05/DOC/MANUAL/cmdline/switches/update.htm +#usr/share/doc/p7zip-17.05/DOC/MANUAL/cmdline/switches/volume.htm +#usr/share/doc/p7zip-17.05/DOC/MANUAL/cmdline/switches/working_dir.htm +#usr/share/doc/p7zip-17.05/DOC/MANUAL/cmdline/switches/yes.htm +#usr/share/doc/p7zip-17.05/DOC/MANUAL/cmdline/syntax.htm +#usr/share/doc/p7zip-17.05/DOC/MANUAL/fm +#usr/share/doc/p7zip-17.05/DOC/MANUAL/fm/about.htm +#usr/share/doc/p7zip-17.05/DOC/MANUAL/fm/benchmark.htm +#usr/share/doc/p7zip-17.05/DOC/MANUAL/fm/index.htm +#usr/share/doc/p7zip-17.05/DOC/MANUAL/fm/menu.htm +#usr/share/doc/p7zip-17.05/DOC/MANUAL/fm/options.htm +#usr/share/doc/p7zip-17.05/DOC/MANUAL/fm/plugins +#usr/share/doc/p7zip-17.05/DOC/MANUAL/fm/plugins/7-zip +#usr/share/doc/p7zip-17.05/DOC/MANUAL/fm/plugins/7-zip/add.htm +#usr/share/doc/p7zip-17.05/DOC/MANUAL/fm/plugins/7-zip/extract.htm +#usr/share/doc/p7zip-17.05/DOC/MANUAL/fm/plugins/7-zip/index.htm +#usr/share/doc/p7zip-17.05/DOC/MANUAL/fm/plugins/7-zip/style.css +#usr/share/doc/p7zip-17.05/DOC/MANUAL/fm/plugins/index.htm +#usr/share/doc/p7zip-17.05/DOC/MANUAL/fm/plugins/style.css +#usr/share/doc/p7zip-17.05/DOC/MANUAL/fm/style.css +#usr/share/doc/p7zip-17.05/DOC/MANUAL/general +#usr/share/doc/p7zip-17.05/DOC/MANUAL/general/7z.htm +#usr/share/doc/p7zip-17.05/DOC/MANUAL/general/faq.htm +#usr/share/doc/p7zip-17.05/DOC/MANUAL/general/formats.htm +#usr/share/doc/p7zip-17.05/DOC/MANUAL/general/index.htm +#usr/share/doc/p7zip-17.05/DOC/MANUAL/general/license.htm +#usr/share/doc/p7zip-17.05/DOC/MANUAL/general/performance.htm +#usr/share/doc/p7zip-17.05/DOC/MANUAL/general/style.css +#usr/share/doc/p7zip-17.05/DOC/MANUAL/general/thanks.htm +#usr/share/doc/p7zip-17.05/DOC/MANUAL/start.htm +#usr/share/doc/p7zip-17.05/DOC/MANUAL/style.css +#usr/share/doc/p7zip-17.05/DOC/Methods.txt +#usr/share/doc/p7zip-17.05/DOC/Struct.EAP +#usr/share/doc/p7zip-17.05/DOC/Struct.ldb +#usr/share/doc/p7zip-17.05/DOC/copying.txt +#usr/share/doc/p7zip-17.05/DOC/lzma.txt +#usr/share/doc/p7zip-17.05/DOC/readme.txt +#usr/share/doc/p7zip-17.05/DOC/src-history.txt +#usr/share/doc/p7zip-17.05/DOC/unRarLicense.txt +#usr/share/doc/p7zip-17.05/README #usr/share/man/man1/7z.1.gz #usr/share/man/man1/7za.1.gz #usr/share/man/man1/7zr.1.gz diff --git a/lfs/7zip b/lfs/7zip index 57ce27605..5f0fe335d 100644 --- a/lfs/7zip +++ b/lfs/7zip @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007-2018 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 # @@ -26,7 +26,7 @@ include Config SUMMARY = 7-zip file compression program -VER = 17.04 +VER = 17.05 THISAPP = p7zip-$(VER) DL_FILE = $(THISAPP).tar.gz @@ -34,7 +34,7 @@ DL_FROM = $(URL_IPFIRE) DIR_APP = $(DIR_SRC)/$(THISAPP) TARGET = $(DIR_INFO)/$(THISAPP) PROG = 7zip -PAK_VER = 9 +PAK_VER = 10 DEPS = @@ -50,7 +50,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_BLAKE2 = c3a0438d9db66f8199eaf15d4cff613bdbd06ceb1c5461b2041e84f1cbc388c2e943197a38ddd97a92a3f1f7ea22951e4972aeb5ce82534899a846430d1ee49d +$(DL_FILE)_BLAKE2 = 0bcba638d3acaf2aa270e02693ad4295dfcc6b388037bdb446e25f3f4e1cb34f1b05bbc9a845364ca770625c32b2d7f55f63f504ad8e0863fff4bf940ae1fddd install : $(TARGET) -- 2.40.0

1 5

[PATCH] elfutiles: Update to version 0.189
by Adolf Belka 27 Mar '23

27 Mar '23

- Update from version 0.187 to 0.189 - Update of rootfile - Changelog Version 0.189 "Don't deflate!" configure: eu-nm, eu-addr2line and eu-stack can provide demangled symbols when linked with libstdc++. Use --disable-demangler to disable. A new option --enable-sanitize-memory has been added for msan sanitizer support. libelf: elf_compress now supports ELFCOMPRESS_ZSTD when build against libzstd libdwfl: dwfl_module_return_value_location now returns 0 (no return type) for DIEs that point to a DW_TAG_unspecified_type. elfcompress: -t, --type= now support zstd if libelf has been build with ELFCOMPRESS_ZSTD support. backends: Add support for LoongArch and Synopsys ARCv2 processors. Version 0.188 "no section left behind" readelf: Add -D, --use-dynamic option. debuginfod-client: Add $DEBUGINFOD_HEADERS_FILE setting to supply outgoing HTTP headers. Add new function debuginfod_find_section. debuginfod: Add --disable-source-scan option. libdwfl: Add new function dwfl_get_debuginfod_client. Add new function dwfl_frame_reg. Add new function dwfl_report_offline_memory. Signed-off-by: Adolf Belka <adolf.belka(a)ipfire.org> --- config/rootfiles/packages/elfutils | 6 +++--- lfs/elfutils | 8 ++++---- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/config/rootfiles/packages/elfutils b/config/rootfiles/packages/elfutils index fe2c8f301..85a6f25f4 100644 --- a/config/rootfiles/packages/elfutils +++ b/config/rootfiles/packages/elfutils @@ -27,15 +27,15 @@ usr/bin/eu-unstrip #usr/include/gelf.h #usr/include/libelf.h #usr/include/nlist.h -usr/lib/libasm-0.187.so +usr/lib/libasm-0.189.so #usr/lib/libasm.a #usr/lib/libasm.so usr/lib/libasm.so.1 -usr/lib/libdw-0.187.so +usr/lib/libdw-0.189.so #usr/lib/libdw.a #usr/lib/libdw.so usr/lib/libdw.so.1 -usr/lib/libelf-0.187.so +usr/lib/libelf-0.189.so #usr/lib/libelf.a #usr/lib/libelf.so usr/lib/libelf.so.1 diff --git a/lfs/elfutils b/lfs/elfutils index 523980f17..c262c45f4 100644 --- a/lfs/elfutils +++ b/lfs/elfutils @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007-2018 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 # @@ -26,7 +26,7 @@ include Config SUMMARY = Higher-level library to access ELF files -VER = 0.187 +VER = 0.189 THISAPP = elfutils-$(VER) DL_FILE = $(THISAPP).tar.bz2 @@ -34,7 +34,7 @@ DL_FROM = $(URL_IPFIRE) DIR_APP = $(DIR_SRC)/$(THISAPP) TARGET = $(DIR_INFO)/$(THISAPP) PROG = elfutils -PAK_VER = 8 +PAK_VER = 9 DEPS = @@ -48,7 +48,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_BLAKE2 = 00ba3efa689d137808f5f53ecda93fd006be0c18d690ce76616ed1dba442281098579fa4b9a9e91b8ba865a3de15968f0ae06703a7b50b15c48a4beb5c970a46 +$(DL_FILE)_BLAKE2 = 30596271e14cf3408326abc38a9775b849b8cb0ee119a5455df9434a7d3b9a57afb15e0236a179a26c7bd400d303749964c9d6350c419f747784fd99d12517e0 install : $(TARGET) -- 2.40.0

1 2

[PATCH] sdl2: Update to version 2.26.4
by Adolf Belka 27 Mar '23

27 Mar '23

- Update from version 2.26.2 to 2.26.4 - Update of rootfile - Changelog 2.26.4 Latest Fixed relative mouse motion over remote desktop on Windows Fixed using older game controller mappings on Linux 2.26.3 Fixed infinite loop shutting down WGI controllers Fixed centering the D-pad on some Xbox controllers Signed-off-by: Adolf Belka <adolf.belka(a)ipfire.org> --- config/rootfiles/packages/sdl2 | 2 +- lfs/sdl2 | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/config/rootfiles/packages/sdl2 b/config/rootfiles/packages/sdl2 index c712b47f9..b54783ef8 100644 --- a/config/rootfiles/packages/sdl2 +++ b/config/rootfiles/packages/sdl2 @@ -82,7 +82,7 @@ #usr/lib/cmake/SDL2/sdl2-config-version.cmake #usr/lib/cmake/SDL2/sdl2-config.cmake usr/lib/libSDL2-2.0.so.0 -usr/lib/libSDL2-2.0.so.0.2600.2 +usr/lib/libSDL2-2.0.so.0.2600.4 #usr/lib/libSDL2.la usr/lib/libSDL2.so #usr/lib/libSDL2_test.a diff --git a/lfs/sdl2 b/lfs/sdl2 index 5387952e5..829f959e9 100644 --- a/lfs/sdl2 +++ b/lfs/sdl2 @@ -24,7 +24,7 @@ include Config -VER = 2.26.2 +VER = 2.26.4 SUMMARY = Simple DirectMedia Layer Library THISAPP = SDL2-$(VER) @@ -33,7 +33,7 @@ DL_FROM = $(URL_IPFIRE) DIR_APP = $(DIR_SRC)/$(THISAPP) TARGET = $(DIR_INFO)/$(THISAPP) PROG = sdl2 -PAK_VER = 9 +PAK_VER = 10 DEPS = alsa @@ -47,7 +47,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_BLAKE2 = 84a972c634a084350173fcc5da69cc9b402f83b969e6611aa47cc81dc01520508ba813e5910299702c7139a0426462e607e97524510f61afe91d46a7cc9da8dc +$(DL_FILE)_BLAKE2 = 9843df277d1cd5f4e7ebb89cde6d069e8b635b6d8f10c2104badcc2089fcdd3ca4e620c322a687c1a0346817c17978a7c99729b55a48dc57937bb9df6435b4ff install : $(TARGET) -- 2.40.0

2 3

[PATCH] proxy: Skip VPNs that route everything for proxy.pac
by Michael Tremer 24 Mar '23

24 Mar '23

The function tries to figure out which networks are connected locally, but VPN tunnels that use 0.0.0.0 and GRE/VTI interfaces will be considered local and the proxy is being disabled for everyone. Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> --- html/cgi-bin/proxy.cgi | 3 +++ 1 file changed, 3 insertions(+) diff --git a/html/cgi-bin/proxy.cgi b/html/cgi-bin/proxy.cgi index a718d5771..71be315f6 100644 --- a/html/cgi-bin/proxy.cgi +++ b/html/cgi-bin/proxy.cgi @@ -2986,6 +2986,7 @@ END foreach my $network (@networks) { my ($vpnip, $vpnsub) = split("/", $network); $vpnsub = &Network::convert_prefix2netmask($vpnsub) || $vpnsub; + next if ($vpnip eq "0.0.0.0" || $vpnsub eq "0.0.0.0"); print FILE " (isInNet(host, \"$vpnip\", \"$vpnsub\")) ||\n"; } } @@ -2996,6 +2997,8 @@ END my @networks = split(/\|/, $ovpnconfig{$key}[11]); foreach my $network (@networks) { my ($vpnip, $vpnsub) = split("/", $network); + $vpnsub = &Network::convert_prefix2netmask($vpnsub) || $vpnsub; + next if ($vpnip eq "0.0.0.0" || $vpnsub eq "0.0.0.0"); print FILE " (isInNet(host, \"$vpnip\", \"$vpnsub\")) ||\n"; } } -- 2.30.2

1 0

[PATCH] pakfire_format_time(): Fix typo
by Stefan Schantl 22 Mar '23

22 Mar '23

Fix a small typo when displaying the build time which is longer than 1 hour. In such a case the following message got displayed: Build successfully completed in 01m07m02s Which should be 01h07m02s Signed-off-by: Stefan Schantl <stefan.schantl(a)ipfire.org> --- src/libpakfire/string.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/libpakfire/string.c b/src/libpakfire/string.c index 8eaf8d91..931ba701 100644 --- a/src/libpakfire/string.c +++ b/src/libpakfire/string.c @@ -394,7 +394,7 @@ int __pakfire_format_time(char* buffer, const size_t length, const time_t t) { if (t >= 86400) format = "%dd%Hh%Mm"; else if (t >= 3600) - format = "%Hm%Mm%Ss"; + format = "%Hh%Mm%Ss"; else if (t >= 60) format = "%Mm%Ss"; else -- 2.30.2

2 1

[PATCH] addon chrony
by Gerd Hoerst 22 Mar '23

22 Mar '23

Signed-off-by: Gerd Hoerst <gerd(a)hoerst.net> --- config/chrony/etc/chrony/chrony.conf | 32 +++++++++ config/chrony/etc/chrony/chrony.keys | 10 +++ config/chrony/etc/rc.d/init.d/chrony | 56 +++++++++++++++ config/rootfiles/packages/chrony | 12 ++++ lfs/chrony | 102 +++++++++++++++++++++++++++ make.sh | 1 + src/paks/chrony/install.sh | 33 +++++++++ src/paks/chrony/uninstall.sh | 31 ++++++++ src/paks/chrony/update.sh | 26 +++++++ 9 files changed, 303 insertions(+) create mode 100644 config/chrony/etc/chrony/chrony.conf create mode 100644 config/chrony/etc/chrony/chrony.keys create mode 100755 config/chrony/etc/rc.d/init.d/chrony create mode 100644 config/rootfiles/packages/chrony create mode 100644 lfs/chrony create mode 100644 src/paks/chrony/install.sh create mode 100644 src/paks/chrony/uninstall.sh create mode 100644 src/paks/chrony/update.sh diff --git a/config/chrony/etc/chrony/chrony.conf b/config/chrony/etc/chrony/chrony.conf new file mode 100644 index 000000000..6c65f5c22 --- /dev/null +++ b/config/chrony/etc/chrony/chrony.conf @@ -0,0 +1,32 @@ +# Welcome to the chrony configuration file. See chrony.conf(5) for more +# information about usuable directives. + +pool 0.ipfire.pool.ntp.org + +# refclock SOCK /var/run/chrony.ttyAMA0.sock delay 0.0 refid SOCK +# refclock PPS /dev/pps0 refid PPS + +# This directive specify the location of the file containing ID/key pairs for +# NTP authentication. +keyfile /etc/chrony/chrony.keys + +# This directive specify the file into which chronyd will store the rate +# information. +driftfile /var/lib/chrony/chrony.drift + +# Uncomment the following line to turn logging on. +#log tracking measurements statistics + +# Log files location. +logdir /var/log/chrony + +# Stop bad estimates upsetting machine clock. +maxupdateskew 100.0 + +# This directive enables kernel synchronisation (every 11 minutes) of the +# real-time clock. Note that it can’t be used along with the 'rtcfile' directive. +rtcsync + +# Step the system clock instead of slewing it if the adjustment is larger than +# one second, but only in the first three clock updates. +makestep 1 3 diff --git a/config/chrony/etc/chrony/chrony.keys b/config/chrony/etc/chrony/chrony.keys new file mode 100644 index 000000000..cee70b392 --- /dev/null +++ b/config/chrony/etc/chrony/chrony.keys @@ -0,0 +1,10 @@ +# This file is solely used for NTP authentication with symmetric keys +# as defined by RFC 1305 and RFC 5905. +# +# It can contain ID/key pairs which can be generated using the “keygen” option +# from “chronyc”; for example: +# chronyc keygen 1 SHA256 256 >> /etc/chrony/chrony.keys +# would generate a 256-bit SHA-256 key using ID 1. +# +# A list of supported hash functions and output encoding can be found in +# the "keyfile" section from the "/usr/share/doc/chrony/chrony.txt.gz" file. diff --git a/config/chrony/etc/rc.d/init.d/chrony b/config/chrony/etc/rc.d/init.d/chrony new file mode 100755 index 000000000..0a2a0ee8e --- /dev/null +++ b/config/chrony/etc/rc.d/init.d/chrony @@ -0,0 +1,56 @@ +#!/bin/sh +######################################################################## +# Begin $rc_base/init.d/ +# +# Description : chrony initscript 4 ipfire 2.1x +# +# Authors : goerdi +# +# Version : 01.00 +# +# Notes : GPLv3 +# +######################################################################## + +. /etc/sysconfig/rc +. $rc_functions + +SERVER="Chrony Time Server" +BINARY=chronyd +DAEMON=/usr/sbin/$BINARY +CONFIG=/etc/chrony/chrony.conf +PIDFILE=/run/chronyd.pid +START="$DAEMON -f $CONFIG" + +#test -f $DAEMON || exit 0 +[ -x $DAEMON ] || exit 0 +[ -f $CONFIG ] || exit 0 + + + + +case "$1" in + start) + boot_mesg "Starting $SERVER" + loadproc $START + ;; + stop) + boot_mesg "Stopping $SERVER" + killproc -p $PIDFILE $DAEMON + ;; + restart) + boot_mesg "Restarting $CAMSERVER" + killproc -p $PIDFILE $DAEMON + sleep 3 + loadproc $START + ;; + status) + statusproc $DAEMON + ;; + *) + echo "Usage: /etc/init.d/chrony {start|stop|restart|status}" + exit 1 + ;; +esac + +exit 0 diff --git a/config/rootfiles/packages/chrony b/config/rootfiles/packages/chrony new file mode 100644 index 000000000..8386502d4 --- /dev/null +++ b/config/rootfiles/packages/chrony @@ -0,0 +1,12 @@ +#etc/chrony +etc/chrony/chrony.keys +etc/chrony/chrony.conf +etc/rc.d/init.d/chrony +usr/bin/chronyc +#usr/lib/chrony +usr/lib/chrony/chrony-helper +usr/sbin/chronyd +#usr/share/man/man1/chronyc.1 +#usr/share/man/man5/chrony.conf.5 +#usr/share/man/man8/chronyd.8 +#var/lib/chrony diff --git a/lfs/chrony b/lfs/chrony new file mode 100644 index 000000000..8e471ef77 --- /dev/null +++ b/lfs/chrony @@ -0,0 +1,102 @@ +############################################################################### +# # +# IPFire.org - A linux based firewall # +# Copyright (C) 2007-2020 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 # +# the Free Software Foundation, either version 3 of the License, or # +# (at your option) any later version. # +# # +# This program 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 this program. If not, see <http://www.gnu.org/licenses/>. # +# # +############################################################################### + +############################################################################### +# Definitions +############################################################################### + +include Config + +VER = 4.3 + +THISAPP = chrony-$(VER) +DL_FILE = $(THISAPP).tar.gz +DL_FROM = https://download.tuxfamily.org/chrony +DIR_APP = $(DIR_SRC)/$(THISAPP) +TARGET = $(DIR_INFO)/$(THISAPP) +PROG = chrony +PAK_VER = 1 +DEPS = "" +############################################################################### +# Top-level Rules +############################################################################### + +objects = $(DL_FILE) + +$(DL_FILE) = $(DL_FROM)/$(DL_FILE) + +$(DL_FILE)_BLAKE2 = 51ba6d19312fd52cd6d6d8ab9437c886a3779877170674db6dc37d657e849101e2669fd6c8723d24e43c895cd1924c3d8d2ff442baeef9abe8a6c313929edf5f + + +install : $(TARGET) + +check : $(patsubst %,$(DIR_CHK)/%,$(objects)) + +download :$(patsubst %,$(DIR_DL)/%,$(objects)) +b2 : $(subst %,%_BLAKE2,$(objects)) + +dist: + @$(PAK) +############################################################################### +# Downloading, checking, md5sum +############################################################################### + +$(patsubst %,$(DIR_CHK)/%,$(objects)) : + @$(CHECK) + +$(patsubst %,$(DIR_DL)/%,$(objects)) : + @$(LOAD) + +$(subst %,%_MD5,$(objects)) : + @$(MD5) + +############################################################################### +# Installation Details +############################################################################### + +$(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) + @$(PREBUILD) + @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE) + cd $(DIR_APP) && \ + ./configure \ + --prefix=/usr \ + --mandir=/usr/share/man \ + --sysconfdir=/etc/chrony \ + --without-readline \ + --enable-scfilter \ + --chronyrundir=/run/chrony \ + --with-ntp-era=$(shell date -d '1970-01-01 00:00:00+00:00' +'%s') \ + --enable-ntp-signd \ + --with-hwclockfile=/etc/adjtime \ + --with-pidfile=/run/chronyd.pid \ + --host-system=Linux + + + cd $(DIR_APP) && make $(MAKETUNING) + cd $(DIR_APP) && make install + + mkdir -p /etc/chrony + cp -avf $(DIR_CONF)/chrony/etc/chrony/* /etc/chrony + cp -vrf $(DIR_CONF)/chrony/etc/rc.d/init.d/chrony /etc/rc.d/init.d + mkdir -p /usr/lib/chrony + cp -avf $(DIR_CONF)/chrony/usr/lib/chrony/* /usr/lib/chrony + + @rm -rf $(DIR_APP) + @$(POSTBUILD) diff --git a/make.sh b/make.sh index 3b7f9850c..ab995c20e 100755 --- a/make.sh +++ b/make.sh @@ -1397,6 +1397,7 @@ buildipfire() { lfsmake2 python3-docutils lfsmake2 python3-daemon lfsmake2 ntp + lfsmake2 chrony lfsmake2 openssh lfsmake2 fontconfig lfsmake2 dejavu-fonts-ttf diff --git a/src/paks/chrony/install.sh b/src/paks/chrony/install.sh new file mode 100644 index 000000000..b0b053bd6 --- /dev/null +++ b/src/paks/chrony/install.sh @@ -0,0 +1,33 @@ +#!/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(a)ipfire.org>. # +# # +############################################################################ +# +. /opt/pakfire/lib/functions.sh + +extract_files +restore_backup ${NAME} +chmod ugo+x /etc/rc.d/init.d/chrony +ln -svf ../init.d/chrony /etc/rc.d/rc0.d/K46chrony +ln -svf ../init.d/chrony /etc/rc.d/rc3.d/S26chrony +ln -svf ../init.d/chrony /etc/rc.d/rc6.d/K46chrony + +start_service --background ${NAME} diff --git a/src/paks/chrony/uninstall.sh b/src/paks/chrony/uninstall.sh new file mode 100644 index 000000000..9472553d3 --- /dev/null +++ b/src/paks/chrony/uninstall.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(a)ipfire.org>. # +# # +############################################################################ +# +. /opt/pakfire/lib/functions.sh +stop_service ${NAME} +# wait2 terminate +sleep 3 +make_backup ${NAME} +remove_files +rm -rf /etc/rc.d/rc*.d/*chrony +rm /etc/rc.d/rc3.d/off/*chrony diff --git a/src/paks/chrony/update.sh b/src/paks/chrony/update.sh new file mode 100644 index 000000000..89c40d0d7 --- /dev/null +++ b/src/paks/chrony/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(a)ipfire.org>. # +# # +############################################################################ +# +. /opt/pakfire/lib/functions.sh +./uninstall.sh +./install.sh -- 2.25.1

2 1

Current branch of OpenSSL 3
by Adolf Belka 22 Mar '23

22 Mar '23

Hi Peter, You were going to provide me with your current branch of OpenSSL 3 so I can build it and test out OpenVPN with it to see if it causes anything to break on my configuration. Regards, Adolf. -- Sent from my laptop

2 1

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

Development March 2023