Development March 2024

development@lists.ipfire.org

11 participants
55 discussions

[PATCH] installer: Pass choosen filesystem to hw_make_destination
by Stefan Schantl 25 Mar '24

25 Mar '24

This is required to proper choose if a seperate boot partition should be created or must not created (BTRFS) Signed-off-by: Stefan Schantl <stefan.schantl(a)ipfire.org> --- src/installer/hw.c | 9 ++++--- src/installer/hw.h | 2 +- src/installer/main.c | 58 +++++++++++++++++++++++--------------------- 3 files changed, 36 insertions(+), 33 deletions(-) diff --git a/src/installer/hw.c b/src/installer/hw.c index 77789e35e..46330ce43 100644 --- a/src/installer/hw.c +++ b/src/installer/hw.c @@ -631,9 +631,13 @@ static int hw_calculate_partition_table(struct hw* hw, struct hw_destination* de return 0; } -struct hw_destination* hw_make_destination(struct hw* hw, int part_type, struct hw_disk** disks, int disable_swap) { +struct hw_destination* hw_make_destination(struct hw* hw, int part_type, struct hw_disk** disks, + int disable_swap, int filesystem) { struct hw_destination* dest = malloc(sizeof(*dest)); + // Assign filesystem + dest->filesystem = filesystem; + if (part_type == HW_PART_TYPE_NORMAL) { dest->disk1 = *disks; dest->disk2 = NULL; @@ -655,9 +659,6 @@ struct hw_destination* hw_make_destination(struct hw* hw, int part_type, struct if (r) return NULL; - // Set default filesystem - dest->filesystem = HW_FS_DEFAULT; - return dest; } diff --git a/src/installer/hw.h b/src/installer/hw.h index 7fbea86de..bba06da95 100644 --- a/src/installer/hw.h +++ b/src/installer/hw.h @@ -141,7 +141,7 @@ struct hw_disk** hw_select_disks(struct hw_disk** disks, int* selection); struct hw_disk** hw_select_first_disk(const struct hw_disk** disks); struct hw_destination* hw_make_destination(struct hw* hw, int part_type, struct hw_disk** disks, - int disable_swap); + int disable_swap, int filesystem); unsigned long long hw_memory(); diff --git a/src/installer/main.c b/src/installer/main.c index 30f02d8cb..c31c032c2 100644 --- a/src/installer/main.c +++ b/src/installer/main.c @@ -685,34 +685,9 @@ int main(int argc, char *argv[]) { hw_free_disks(disks); - struct hw_destination* destination = hw_make_destination(hw, part_type, - selected_disks, config.disable_swap); - - if (!destination) { - errorbox(_("Your harddisk is too small.")); - goto EXIT; - } - - fprintf(flog, "Destination drive: %s\n", destination->path); - fprintf(flog, " bootldr: %s (%lluMB)\n", destination->part_bootldr, BYTES2MB(destination->size_bootldr)); - fprintf(flog, " boot : %s (%lluMB)\n", destination->part_boot, BYTES2MB(destination->size_boot)); - fprintf(flog, " ESP : %s (%lluMB)\n", destination->part_boot_efi, BYTES2MB(destination->size_boot_efi)); - fprintf(flog, " swap : %s (%lluMB)\n", destination->part_swap, BYTES2MB(destination->size_swap)); - fprintf(flog, " root : %s (%lluMB)\n", destination->part_root, BYTES2MB(destination->size_root)); - fprintf(flog, "Memory : %lluMB\n", BYTES2MB(hw_memory())); - - // Warn the user if there is not enough space to create a swap partition - if (!config.unattended) { - if (!config.disable_swap && !*destination->part_swap) { - rc = newtWinChoice(title, _("OK"), _("Cancel"), - _("Your harddisk is very small, but you can continue without a swap partition.")); - - if (rc != 1) - goto EXIT; - } - } - // Filesystem selection + int filesystem = HW_FS_DEFAULT; + if (!config.unattended) { struct filesystems { int fstype; @@ -741,7 +716,34 @@ int main(int argc, char *argv[]) { if (rc == 2) goto EXIT; - destination->filesystem = filesystems[fs_choice].fstype; + filesystem = filesystems[fs_choice].fstype; + } + + struct hw_destination* destination = hw_make_destination(hw, part_type, + selected_disks, config.disable_swap, filesystem); + + if (!destination) { + errorbox(_("Your harddisk is too small.")); + goto EXIT; + } + + fprintf(flog, "Destination drive: %s\n", destination->path); + fprintf(flog, " bootldr: %s (%lluMB)\n", destination->part_bootldr, BYTES2MB(destination->size_bootldr)); + fprintf(flog, " boot : %s (%lluMB)\n", destination->part_boot, BYTES2MB(destination->size_boot)); + fprintf(flog, " ESP : %s (%lluMB)\n", destination->part_boot_efi, BYTES2MB(destination->size_boot_efi)); + fprintf(flog, " swap : %s (%lluMB)\n", destination->part_swap, BYTES2MB(destination->size_swap)); + fprintf(flog, " root : %s (%lluMB)\n", destination->part_root, BYTES2MB(destination->size_root)); + fprintf(flog, "Memory : %lluMB\n", BYTES2MB(hw_memory())); + + // Warn the user if there is not enough space to create a swap partition + if (!config.unattended) { + if (!config.disable_swap && !*destination->part_swap) { + rc = newtWinChoice(title, _("OK"), _("Cancel"), + _("Your harddisk is very small, but you can continue without a swap partition.")); + + if (rc != 1) + goto EXIT; + } } // Setting up RAID if needed. -- 2.39.2

2 1

[PATCH] bind: Update to 9.16.49
by Matthias Fischer 23 Mar '24

23 Mar '24

For details see: https://downloads.isc.org/isc/bind9/9.16.49/doc/arm/html/notes.html#notes-f… "Bug Fixes A regression in cache-cleaning code enabled memory use to grow significantly more quickly than before, until the configured max-cache-size limit was reached. This has been fixed. [GL #4596] Using rndc flush inadvertently caused cache cleaning to become less effective. This could ultimately lead to the configured max-cache-size limit being exceeded and has now been fixed. [GL #4621] The logic for cleaning up expired cached DNS records was tweaked to be more aggressive. This change helps with enforcing max-cache-ttl and max-ncache-ttl in a timely manner. [GL #4591] It was possible to trigger a use-after-free assertion when the overmem cache cleaning was initiated. This has been fixed. [GL #4595]" Signed-off-by: Matthias Fischer <matthias.fischer(a)ipfire.org> --- config/rootfiles/common/bind | 14 +++++++------- lfs/bind | 4 ++-- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/config/rootfiles/common/bind b/config/rootfiles/common/bind index 96859c8db..de2dc717b 100644 --- a/config/rootfiles/common/bind +++ b/config/rootfiles/common/bind @@ -271,24 +271,24 @@ usr/bin/nsupdate #usr/include/pk11/site.h #usr/include/pkcs11 #usr/include/pkcs11/pkcs11.h -usr/lib/libbind9-9.16.48.so +usr/lib/libbind9-9.16.49.so #usr/lib/libbind9.la #usr/lib/libbind9.so -usr/lib/libdns-9.16.48.so +usr/lib/libdns-9.16.49.so #usr/lib/libdns.la #usr/lib/libdns.so -usr/lib/libirs-9.16.48.so +usr/lib/libirs-9.16.49.so #usr/lib/libirs.la #usr/lib/libirs.so -usr/lib/libisc-9.16.48.so +usr/lib/libisc-9.16.49.so #usr/lib/libisc.la #usr/lib/libisc.so -usr/lib/libisccc-9.16.48.so +usr/lib/libisccc-9.16.49.so #usr/lib/libisccc.la #usr/lib/libisccc.so -usr/lib/libisccfg-9.16.48.so +usr/lib/libisccfg-9.16.49.so #usr/lib/libisccfg.la #usr/lib/libisccfg.so -usr/lib/libns-9.16.48.so +usr/lib/libns-9.16.49.so #usr/lib/libns.la #usr/lib/libns.so diff --git a/lfs/bind b/lfs/bind index 271f8ab53..dda8db73f 100644 --- a/lfs/bind +++ b/lfs/bind @@ -25,7 +25,7 @@ include Config -VER = 9.16.48 +VER = 9.16.49 THISAPP = bind-$(VER) DL_FILE = $(THISAPP).tar.xz @@ -43,7 +43,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_BLAKE2 = 4a503b45df412c435cb0f75b54ee1270140cccce7ecc159cdf3e0e3cbd3c0a0866b7472782f20aacf130f57df12d20a102ac6979498138ce00a2655806d003e7 +$(DL_FILE)_BLAKE2 = a088e2ab29bbf2889a279f1553fbc8fc694bded1f360e4a922a24f9d0e0224dd96181691e08efed4270cfcd0ce726944f8afa41032b81433e3a1311fd1b2dd74 install : $(TARGET) -- 2.34.1

1 0

[PATCHv2 01/12] btrfs-progs: New package
by Stefan Schantl 23 Mar '24

23 Mar '24

Signed-off-by: Stefan Schantl <stefan.schantl(a)ipfire.org> --- config/rootfiles/common/btrfs-progs | 33 +++++++++++ lfs/btrfs-progs | 85 +++++++++++++++++++++++++++++ make.sh | 1 + 3 files changed, 119 insertions(+) create mode 100644 config/rootfiles/common/btrfs-progs create mode 100644 lfs/btrfs-progs diff --git a/config/rootfiles/common/btrfs-progs b/config/rootfiles/common/btrfs-progs new file mode 100644 index 000000000..04af32d3f --- /dev/null +++ b/config/rootfiles/common/btrfs-progs @@ -0,0 +1,33 @@ +lib/udev/rules.d/64-btrfs-dm.rules +lib/udev/rules.d/64-btrfs-zoned.rules +usr/bin/btrfs +usr/bin/btrfs-convert +usr/bin/btrfs-find-root +usr/bin/btrfs-image +usr/bin/btrfs-map-logical +usr/bin/btrfs-select-super +usr/bin/btrfsck +usr/bin/btrfstune +usr/bin/fsck.btrfs +usr/bin/mkfs.btrfs +#usr/include/btrfs +#usr/include/btrfs/ctree.h +#usr/include/btrfs/ioctl.h +#usr/include/btrfs/kerncompat.h +#usr/include/btrfs/list.h +#usr/include/btrfs/rbtree.h +#usr/include/btrfs/rbtree_types.h +#usr/include/btrfs/send-stream.h +#usr/include/btrfs/send-utils.h +#usr/include/btrfs/send.h +#usr/include/btrfs/version.h +#usr/include/btrfsutil.h +#usr/lib/libbtrfs.a +#usr/lib/libbtrfs.so +usr/lib/libbtrfs.so.0 +usr/lib/libbtrfs.so.0.1 +#usr/lib/libbtrfsutil.a +#usr/lib/libbtrfsutil.so +usr/lib/libbtrfsutil.so.1 +usr/lib/libbtrfsutil.so.1.2.0 +#usr/lib/pkgconfig/libbtrfsutil.pc diff --git a/lfs/btrfs-progs b/lfs/btrfs-progs new file mode 100644 index 000000000..caf8f0b96 --- /dev/null +++ b/lfs/btrfs-progs @@ -0,0 +1,85 @@ +############################################################################### +# # +# IPFire.org - A linux based firewall # +# 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 # +# 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 = 6.7.1 + +THISAPP = btrfs-progs-v$(VER) +DL_FILE = $(THISAPP).tar.xz +DL_FROM = $(URL_IPFIRE) +DIR_APP = $(DIR_SRC)/$(THISAPP) +TARGET = $(DIR_INFO)/$(THISAPP) + +############################################################################### +# Top-level Rules +############################################################################### + +objects = $(DL_FILE) + +$(DL_FILE) = $(DL_FROM)/$(DL_FILE) + +$(DL_FILE)_BLAKE2 = 4e05e9dd80e5531425490970318389aef280f61cc636a80aa2bbc630399afd4f1f3ce649d194822ff93ff4b1774d65a504e3bed6f1426ff60830e4c0d0ac87b0 + +install : $(TARGET) + +check : $(patsubst %,$(DIR_CHK)/%,$(objects)) + +download :$(patsubst %,$(DIR_DL)/%,$(objects)) + +b2 : $(subst %,%_BLAKE2,$(objects)) + +dist: + @$(PAK) + +############################################################################### +# Downloading, checking, b2sum +############################################################################### + +$(patsubst %,$(DIR_CHK)/%,$(objects)) : + @$(CHECK) + +$(patsubst %,$(DIR_DL)/%,$(objects)) : + @$(LOAD) + +$(subst %,%_BLAKE2,$(objects)) : + @$(B2SUM) + +############################################################################### +# Installation Details +############################################################################### + +$(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) + @$(PREBUILD) + @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar axf $(DIR_DL)/$(DL_FILE) + $(UPDATE_AUTOMAKE) + cd $(DIR_APP) && ./autogen.sh + cd $(DIR_APP) && ./configure \ + --prefix=/usr \ + --disable-documentation \ + --disable-python + cd $(DIR_APP) && make $(MAKETUNING) + cd $(DIR_APP) && make install + @rm -rf $(DIR_APP) + @$(POSTBUILD) diff --git a/make.sh b/make.sh index 64dbef5c4..3c0b9ef27 100755 --- a/make.sh +++ b/make.sh @@ -1712,6 +1712,7 @@ buildipfire() { lfsmake2 rsnapshot lfsmake2 mympd lfsmake2 wsdd + lfsmake2 btrfs-progs # Kernelbuild ... current we have no platform that need # multi kernel builds so KCFG is empty -- 2.39.2

1 11

[PATCH] ids.cgi: Improve add provider logic
by Stefan Schantl 22 Mar '24

22 Mar '24

Do not longer add unsupported/removed providers as an option when adding a new/first ruleset provider. Signed-off-by: Stefan Schantl <stefan.schantl(a)ipfire.org> --- html/cgi-bin/ids.cgi | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/html/cgi-bin/ids.cgi b/html/cgi-bin/ids.cgi index 2d4ac6fc3..edab97195 100644 --- a/html/cgi-bin/ids.cgi +++ b/html/cgi-bin/ids.cgi @@ -1711,6 +1711,12 @@ END # Grab the provider handle. my $provider = $tmphash{$provider_name}; + # Check if we are not in edit mode. + if ($cgiparams{'PROVIDERS'} ne "$Lang::tr{'edit'}") { + # Skip unsupported ruleset provider. + next unless(exists($IDS::Ruleset::Providers{$provider}{"dl_url"})); + } + # Pre-select the provider if one is given. if (($used_providers{$cgiparams{'ID'}}[0] eq "$provider") || ($cgiparams{'PROVIDER'} eq "$provider")) { $selected{$provider} = "selected='selected'"; -- 2.39.2

1 0

[PATCH 1/5] ids-functions.pl: Improve logic to get the cached rulesfile of a provider
by Stefan Schantl 21 Mar '24

21 Mar '24

Signed-off-by: Stefan Schantl <stefan.schantl(a)ipfire.org> --- config/cfgroot/ids-functions.pl | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/config/cfgroot/ids-functions.pl b/config/cfgroot/ids-functions.pl index d97431b4a..c29a5151f 100644 --- a/config/cfgroot/ids-functions.pl +++ b/config/cfgroot/ids-functions.pl @@ -1027,11 +1027,14 @@ sub _store_error_message ($) { sub _get_dl_rulesfile($) { my ($provider) = @_; - # Check if the requested provider is known. - if ($IDS::Ruleset::Providers{$provider}) { - # Gather the download type for the given provider. - my $dl_type = $IDS::Ruleset::Providers{$provider}{'dl_type'}; + # Abort if the requested provider is not known. + return unless($IDS::Ruleset::Providers{$provider}); + # Try to gather the download type for the given provider. + my $dl_type = $IDS::Ruleset::Providers{$provider}{'dl_type'}; + + # Check if a download type could be grabbed. + if ($dl_type) { # Obtain the file suffix for the download file type. my $suffix = $dl_type_to_suffix{$dl_type}; -- 2.39.2

1 4

[PATCH 1/4] OpenVPN: Update to version 2.6.9 .
by Erik Kapfer 21 Mar '24

21 Mar '24

This update enters the 2.6.x series and needs configuration changes since NCP is now a requirement. Signed-off-by: Erik Kapfer <erik.kapfer(a)ipfire.org> --- config/rootfiles/common/openvpn | 1 - lfs/openvpn | 9 +++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/config/rootfiles/common/openvpn b/config/rootfiles/common/openvpn index d9848a579..91c702bd5 100644 --- a/config/rootfiles/common/openvpn +++ b/config/rootfiles/common/openvpn @@ -15,7 +15,6 @@ usr/sbin/openvpn-authenticator #usr/share/doc/openvpn/COPYRIGHT.GPL #usr/share/doc/openvpn/Changes.rst #usr/share/doc/openvpn/README -#usr/share/doc/openvpn/README.IPv6 #usr/share/doc/openvpn/README.auth-pam #usr/share/doc/openvpn/README.down-root #usr/share/doc/openvpn/README.mbedtls diff --git a/lfs/openvpn b/lfs/openvpn index b71b4ccc9..7899894be 100644 --- a/lfs/openvpn +++ b/lfs/openvpn @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007-2023 IPFire Team <info(a)ipfire.org> # +# Copyright (C) 2007-2024 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 = 2.5.9 +VER = 2.6.9 THISAPP = openvpn-$(VER) DL_FILE = $(THISAPP).tar.gz @@ -40,7 +40,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_BLAKE2 = e5110ebb9149121c11de45f085f66d30a89fb674ad96c5792d83b16dc29c95215a91e682adb3c800b91ed4d88d6d24b5bcae0799cdb855a284832f0668ffcb82 +$(DL_FILE)_BLAKE2 = 22289b32f2b9afc2aed59f6fc66dc25b3043b8c82858b7857e4f904a25c6cf0f21a41551ed4f8d8869c0e7248e4e060779f760dd606e99cdc02203fbff886536 install : $(TARGET) @@ -76,7 +76,8 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) --enable-iproute2 \ --enable-plugins \ --enable-plugin-auth-pam \ - --enable-plugin-down-root + --enable-plugin-down-root \ + --disable-dco cd $(DIR_APP) && make $(MAKETUNING) cd $(DIR_APP) && make install -- 2.43.0

3 6

OpenVPN cipher negotiation patch set
by Adolf Belka 21 Mar '24

21 Mar '24

Hi Michael, I am afraid I don't have a patch set. It is just a single diff change. I took Erik's original patch set and applied it to the latest ovpnmain.cgi version at that time and then removed some of the items that I decided could wait till later or were not needed. This created a single diff file, which I was able to apply and test out to confirm it did what I expected it to do, which it seemed to do. The next step I then had intended to do was to break that single diff into multiple patches but I found this very difficult to do as I could not easily figure out which bits needed to go together in different patches. Trying to understand all the changes and what each were related to I struggled to make sense of. My next step was therefore going to be to go back to an unmodified ovpnmain.cgi file and make the changes a step at a time, to match what I had previously done and therefore end up with a patch set of small self consistent changes. However to do this I had to go back to the start and figure out which of Erik's changes to apply and what parts of those changes and every time I did something else in IPFire for a week or so I was having to go back to square one in trying to remember what I had been going to do next. The diff patch file I created is at https://git.ipfire.org/?p=people/bonnietwin/ipfire-2.x.git;a=commit;h=4fbf1… Hopefully you can use this as a basis to extract just the bits needed for the cipher negotiation. I will also go back and start again to work on it but focus on it without diverting to anything else, after I have dealt with the wsdd patch modification. Regards, Adolf.

4 18

[PATCH] CU185-update.sh: Add drop hostile in & out logging entries if not already present
by Adolf Belka 20 Mar '24

20 Mar '24

- This patch ensures that those people who updated to CU184 before the CU184-update.sh patch fix to add the logging entries was added will get their optionsfw settings file correctly updated with CU185 - This only adds the LOGDROPHOSTILEIN & LOGDROPHOSTILEOUT entries if they do noit already exist in the optionsfw settings file. Tested-by: Adolf Belka <adolf.belka(a)ipfire.org> Signed-off-by: Adolf Belka <adolf.belka(a)ipfire.org> --- config/rootfiles/core/185/update.sh | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/config/rootfiles/core/185/update.sh b/config/rootfiles/core/185/update.sh index 2c95c4102..ec4d8ab82 100644 --- a/config/rootfiles/core/185/update.sh +++ b/config/rootfiles/core/185/update.sh @@ -115,6 +115,15 @@ mv /var/ipfire/ovpn/ovpnconfig.new /var/ipfire/ovpn/ovpnconfig # Set correct ownership chown nobody:nobody /var/ipfire/ovpn/ovpnconfig +# Check if the drop hostile in and out logging options need to be added +# into the optionsfw settings file and apply to firewall +if ! [ $(grep "LOGDROPHOSTILEIN=on" /var/ipfire/optionsfw/settings) ] && \ + ! [ $(grep "LOGDROPHOSTILEOUT=on" /var/ipfire/optionsfw/settings) ]; then + sed -i '$ a\LOGDROPHOSTILEIN=on' /var/ipfire/optionsfw/settings + sed -i '$ a\LOGDROPHOSTILEOUT=on' /var/ipfire/optionsfw/settings + /usr/local/bin/firewallctrl +fi + # Rebuild initial ramdisks dracut --regenerate-all --force KVER="xxxKVERxxx" -- 2.44.0

1 0

[PATCH 1/4] samba: Integrate wsdd initscript into samba initscript - bug#13445
by Adolf Belka 19 Mar '24

19 Mar '24

- This integrates the wsdd initscript functions into the samba initscript. When samba is started or stopped or the status requested then wsdd is part of that process. - Tested in my vm testbed and confirmed to work for start, stop and status. Confirmed pid's shown with status command are in the appropriate pid files. Fixes: bug#13445 Tested-by: Adolf Belka <adolf.belka(a)ipfire.org> Signed-off-by: Adolf Belka <adolf.belka(a)ipfire.org> --- src/initscripts/packages/samba | 40 +++++++++++++++++++++++++++++++++- 1 file changed, 39 insertions(+), 1 deletion(-) diff --git a/src/initscripts/packages/samba b/src/initscripts/packages/samba index 93f14cd29..3945f4384 100644 --- a/src/initscripts/packages/samba +++ b/src/initscripts/packages/samba @@ -2,7 +2,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007-2022 IPFire Team <info(a)ipfire.org> # +# Copyright (C) 2007-2024 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 # @@ -30,6 +30,8 @@ function fix_permissions() { mkdir -p /var/run/samba/{nmbd,ncalrpc,winbindd} } +eval $(/usr/local/bin/readhash /var/ipfire/ethernet/settings) + case "$1" in start) fix_permissions @@ -42,6 +44,35 @@ case "$1" in boot_mesg "Starting winbind..." loadproc /usr/sbin/winbindd + + # Arguments for wsdd command + ARGS=( + # Launch as non-privileged user + "--user" "wsdd:wsdd" + + # Launch in chroot + "--chroot" "/var/run/wsdd" + + # Only use IPv4 + "--ipv4only" + + # Configure the workgroup + "--workgroup" "$(testparm -s --parameter-name workgroup 2>/dev/null)" + ) + + # Conditionally add the GREEN/BLUE interface + for intf in GREEN_DEV BLUE_DEV; do + if [ -n "${!intf}" ]; then + ARGS+=( "--interface" "${!intf}" ) + fi + done + + # Create chroot directory for wsdd + mkdir -p /var/run/wsdd + + PIDFILE="/var/run/wsdd.pid" + boot_mesg "Starting Web Service Discovery Host Daemon..." + loadproc -b -p "${PIDFILE}" /usr/bin/wsdd "${ARGS[@]}" ;; stop) @@ -53,6 +84,10 @@ case "$1" in boot_mesg "Stopping winbind..." killproc /usr/sbin/winbindd + + PIDFILE="/var/run/wsdd.pid" + boot_mesg "Stopping Web Service Discovery Host Daemon..." + killproc -p "${PIDFILE}" /usr/bin/wsdd ;; reload) @@ -76,6 +111,9 @@ case "$1" in statusproc /usr/sbin/nmbd statusproc /usr/sbin/smbd statusproc /usr/sbin/winbindd + + PIDFILE="/var/run/wsdd.pid" + statusproc /usr/bin/wsdd ;; *) -- 2.44.0

2 5

Fwd: [IPFire Wiki] Page Changed: Developer account
by jon 18 Mar '24

18 Mar '24

Michael, > Check out the current version at https://www.ipfire.org/docs/infrastructure/developer_accounts. I can no longer access this Wiki Page. I can access other wiki pages just fine. Open a bugzilla? Jon > Begin forwarded message: > > From: IPFire Project <no-reply(a)ipfire.org> > Subject: [IPFire Wiki] Page Changed: Developer account > Date: March 15, 2024 at 11:15:59 AM CDT > To: Jon <jon.murphy(a)ipfire.org> > > Hey, > > the wiki page has been changed by Michael Tremer. > Check out the current version at https://www.ipfire.org/docs/infrastructure/developer_accounts. > > Update hostname to people.ipfire.org > > You can see what has changed here: > > https://www.ipfire.org/docs/infrastructure/developer_accounts?action=diff&a… > > --- > > +++ > > @@ -8,12 +8,12 @@ > > > The first step should be the changing of this password to a strong one of your choice, this can be made over the Console via ssh. > > -The server address is: **git.ipfire.org** > +The server address is: **people.ipfire.org** > > To change your password, login to your account over the Console with a: > > ```text > -ssh nickname(a)git.ipfire.org > +ssh nickname(a)people.ipfire.org > ``` > > and change your password after entering: > @@ -43,5 +43,5 @@ > > A handy way to exchange your data is the usage of a sftp client. The server listening on port 22 and is reachable over: > > ```text > -sftp://git.ipfire.org > +sftp://people.ipfire.org > ```

2 3

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

Development March 2024