This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "IPFire 2.x development tree".
The branch, next has been updated via 5b58a16967a6d19e7d7e5c3477f28c542ca29789 (commit) via 0fee0acf86f2625b7fff886c338075dcef94195f (commit) via bf8abf549ea0169d189fd86d7bad050263ea3326 (commit) from 516d541c29bce32e1241b319fc72eb4d59ea3a58 (commit)
Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below.
- Log ----------------------------------------------------------------- commit 5b58a16967a6d19e7d7e5c3477f28c542ca29789 Author: Michael Tremer michael.tremer@ipfire.org Date: Wed Jul 10 14:29:36 2024 +0000
make.sh: Update contributors
Signed-off-by: Michael Tremer michael.tremer@ipfire.org
commit 0fee0acf86f2625b7fff886c338075dcef94195f Author: Michael Tremer michael.tremer@ipfire.org Date: Wed Jul 10 14:29:21 2024 +0000
make.sh: Run "make.sh lang"
Signed-off-by: Michael Tremer michael.tremer@ipfire.org
commit bf8abf549ea0169d189fd86d7bad050263ea3326 Author: Michael Tremer michael.tremer@ipfire.org Date: Wed Jul 10 14:28:48 2024 +0000
samba: Fix rootfiles
The CGI script, the misc-progs helper and the menu entry were removed.
Signed-off-by: Michael Tremer michael.tremer@ipfire.org
-----------------------------------------------------------------------
Summary of changes: config/rootfiles/packages/aarch64/samba | 3 +++ config/rootfiles/packages/riscv64/samba | 1 + config/rootfiles/packages/x86_64/samba | 3 +++ doc/language_issues.de | 2 +- doc/language_issues.en | 4 +++- doc/language_issues.es | 2 +- doc/language_issues.fr | 2 +- doc/language_issues.it | 4 ++-- doc/language_issues.nl | 4 +++- doc/language_issues.pl | 4 +++- doc/language_issues.ru | 4 +++- doc/language_issues.tr | 4 ++-- doc/language_missings | 8 ++++++++ html/cgi-bin/credits.cgi | 2 +- lfs/samba | 2 +- 15 files changed, 36 insertions(+), 13 deletions(-)
Difference in files: diff --git a/config/rootfiles/packages/aarch64/samba b/config/rootfiles/packages/aarch64/samba index 42269595a..82ad93a90 100644 --- a/config/rootfiles/packages/aarch64/samba +++ b/config/rootfiles/packages/aarch64/samba @@ -1017,3 +1017,6 @@ var/lib/samba/private var/lib/samba/winbindd_privileged var/log/samba var/spool/samba +srv/web/ipfire/cgi-bin/samba.cgi +var/ipfire/menu.d/EX-samba.menu +usr/local/bin/sambactrl diff --git a/config/rootfiles/packages/riscv64/samba b/config/rootfiles/packages/riscv64/samba index c90703ba7..93e39e0e7 100644 --- a/config/rootfiles/packages/riscv64/samba +++ b/config/rootfiles/packages/riscv64/samba @@ -518,6 +518,7 @@ usr/lib/python3.10/site-packages/samba/tdb_util.py #usr/lib/python3.10/site-packages/samba/tests/blackbox/http_chunk.py #usr/lib/python3.10/site-packages/samba/tests/blackbox/http_content.py #usr/lib/python3.10/site-packages/samba/tests/blackbox/mdsearch.py +#usr/lib/python3.10/site-packages/samba/tests/blackbox/misc_dfs_widelink.py #usr/lib/python3.10/site-packages/samba/tests/blackbox/ndrdump.py #usr/lib/python3.10/site-packages/samba/tests/blackbox/netads_dns.py #usr/lib/python3.10/site-packages/samba/tests/blackbox/netads_json.py diff --git a/config/rootfiles/packages/x86_64/samba b/config/rootfiles/packages/x86_64/samba index b8c517516..92862313d 100644 --- a/config/rootfiles/packages/x86_64/samba +++ b/config/rootfiles/packages/x86_64/samba @@ -1017,3 +1017,6 @@ var/lib/samba/private var/lib/samba/winbindd_privileged var/log/samba var/spool/samba +srv/web/ipfire/cgi-bin/samba.cgi +var/ipfire/menu.d/EX-samba.menu +usr/local/bin/sambactrl diff --git a/doc/language_issues.de b/doc/language_issues.de index 79b21fe24..757b566e6 100644 --- a/doc/language_issues.de +++ b/doc/language_issues.de @@ -517,7 +517,6 @@ WARNING: translation string unused: network time WARNING: translation string unused: network traffic graphs WARNING: translation string unused: network updated WARNING: translation string unused: networks settings -WARNING: translation string unused: never WARNING: translation string unused: new optionsfw must boot WARNING: translation string unused: no alcatelusb firmware WARNING: translation string unused: no cfg upload @@ -942,6 +941,7 @@ WARNING: untranslated string: netbios nameserver daemon = NetBIOS Nameserver Dae WARNING: untranslated string: no entries = No entries at the moment. WARNING: untranslated string: optional = Optional WARNING: untranslated string: pakfire invalid tree = Invalid repository selected +WARNING: untranslated string: reg_file_data_sampling = Register File Data Sampling (RFDS) WARNING: untranslated string: regenerate host certificate = Renew Host Certificate WARNING: untranslated string: reiserfs warning1 = Reiserfs is deprecated and scheduled to be removed from the kernel in 2025. WARNING: untranslated string: reiserfs warning2 = Ensure a fresh installation is made using either ext4 or xfs filesystems before that date. diff --git a/doc/language_issues.en b/doc/language_issues.en index 2541ccf88..4f2b8a03c 100644 --- a/doc/language_issues.en +++ b/doc/language_issues.en @@ -680,7 +680,7 @@ WARNING: untranslated string: drop action = Default behaviour of (forward) firew WARNING: untranslated string: drop action1 = Default behaviour of (outgoing) firewall in mode "Blocked" WARNING: untranslated string: drop action2 = Default behaviour of (input) firewall WARNING: untranslated string: drop forward = Log dropped forward packets -WARNING: untranslated string: drop hostile = Drop packets from and to hostile networks (listed at <a href="https://www.spamhaus.org/drop/" target="_blank">Spamhaus DROP</a>, etc.) +WARNING: untranslated string: drop hostile = Drop packets from and to hostile networks (listed at <a href="https://www.spamhaus.org/blocklists/do-not-route-or-peer/" target="_blank">Spamhaus DROP</a>, etc.) WARNING: untranslated string: drop input = Log dropped input packets WARNING: untranslated string: drop newnotsyn = Log dropped new not SYN packets WARNING: untranslated string: drop outgoing = Log dropped outgoing packets @@ -1382,6 +1382,7 @@ WARNING: untranslated string: network time from = Obtain time from a network tim WARNING: untranslated string: network traffic graphs external = Net-Traffic graphs (external) WARNING: untranslated string: network traffic graphs internal = Net-Traffic graphs (internal) WARNING: untranslated string: network traffic graphs others = Network (others) +WARNING: untranslated string: never = Never WARNING: untranslated string: new optionsfw later = Some options need a reboot to take effect WARNING: untranslated string: newer = Newer WARNING: untranslated string: next = next @@ -1584,6 +1585,7 @@ WARNING: untranslated string: red1 = RED WARNING: untranslated string: references = References WARNING: untranslated string: refresh = Refresh WARNING: untranslated string: refresh index page while connected = Refresh index.cgi page while connected +WARNING: untranslated string: reg_file_data_sampling = Register File Data Sampling (RFDS) WARNING: untranslated string: regenerate host certificate = Renew Host Certificate WARNING: untranslated string: reiserfs warning1 = Reiserfs is deprecated and scheduled to be removed from the kernel in 2025. WARNING: untranslated string: reiserfs warning2 = Ensure a fresh installation is made using either ext4 or xfs filesystems before that date. diff --git a/doc/language_issues.es b/doc/language_issues.es index 4949d9335..b124927aa 100644 --- a/doc/language_issues.es +++ b/doc/language_issues.es @@ -566,7 +566,6 @@ WARNING: translation string unused: network time WARNING: translation string unused: network traffic graphs WARNING: translation string unused: network updated WARNING: translation string unused: networks settings -WARNING: translation string unused: never WARNING: translation string unused: new optionsfw must boot WARNING: translation string unused: no alcatelusb firmware WARNING: translation string unused: no cfg upload @@ -1003,6 +1002,7 @@ WARNING: untranslated string: no data = unknown string WARNING: untranslated string: openvpn cert expires soon = Expires Soon WARNING: untranslated string: openvpn cert has expired = Expired WARNING: untranslated string: pakfire ago = ago. +WARNING: untranslated string: reg_file_data_sampling = Register File Data Sampling (RFDS) WARNING: untranslated string: regenerate host certificate = Renew Host Certificate WARNING: untranslated string: reiserfs warning1 = Reiserfs is deprecated and scheduled to be removed from the kernel in 2025. WARNING: untranslated string: reiserfs warning2 = Ensure a fresh installation is made using either ext4 or xfs filesystems before that date. diff --git a/doc/language_issues.fr b/doc/language_issues.fr index fb29de25c..9a290fb58 100644 --- a/doc/language_issues.fr +++ b/doc/language_issues.fr @@ -545,7 +545,6 @@ WARNING: translation string unused: network time WARNING: translation string unused: network traffic graphs WARNING: translation string unused: network updated WARNING: translation string unused: networks settings -WARNING: translation string unused: never WARNING: translation string unused: new optionsfw must boot WARNING: translation string unused: no alcatelusb firmware WARNING: translation string unused: no cfg upload @@ -947,6 +946,7 @@ WARNING: untranslated string: guardian service = unknown string WARNING: untranslated string: hostile networks total = Total Hostile Networks WARNING: untranslated string: ids provider eol = (EOL) WARNING: untranslated string: pakfire ago = ago. +WARNING: untranslated string: reg_file_data_sampling = Register File Data Sampling (RFDS) WARNING: untranslated string: routing config added = unknown string WARNING: untranslated string: routing config changed = unknown string WARNING: untranslated string: system time = System Time (as of last page load) diff --git a/doc/language_issues.it b/doc/language_issues.it index 680cc5f4e..b85041c74 100644 --- a/doc/language_issues.it +++ b/doc/language_issues.it @@ -504,7 +504,6 @@ WARNING: translation string unused: network time WARNING: translation string unused: network traffic graphs WARNING: translation string unused: network updated WARNING: translation string unused: networks settings -WARNING: translation string unused: never WARNING: translation string unused: new optionsfw must boot WARNING: translation string unused: no alcatelusb firmware WARNING: translation string unused: no cfg upload @@ -972,7 +971,7 @@ WARNING: untranslated string: dnsforward dnssec disabled = DNSSEC Validation is WARNING: untranslated string: dnsforward forward_servers = Nameservers WARNING: untranslated string: downfall gather data sampling = Downfall/Gather Data Sampling WARNING: untranslated string: download apple profile = Download Apple Configuration Profile -WARNING: untranslated string: drop hostile = Drop packets from and to hostile networks (listed at <a href="https://www.spamhaus.org/drop/" target="_blank">Spamhaus DROP</a>, etc.) +WARNING: untranslated string: drop hostile = Drop packets from and to hostile networks (listed at <a href="https://www.spamhaus.org/blocklists/do-not-route-or-peer/" target="_blank">Spamhaus DROP</a>, etc.) WARNING: untranslated string: drop spoofed martians = Log dropped spoofed packets and martians WARNING: untranslated string: duration = Duration WARNING: untranslated string: eight hours = 8 Hours @@ -1221,6 +1220,7 @@ WARNING: untranslated string: rdns = rDNS WARNING: untranslated string: reboot fsck = Reboot & run ‘fsck’ WARNING: untranslated string: rebooting ipfire fsck = Rebooting IPFire, forcing filesystem check WARNING: untranslated string: received = Received +WARNING: untranslated string: reg_file_data_sampling = Register File Data Sampling (RFDS) WARNING: untranslated string: regenerate host certificate = Renew Host Certificate WARNING: untranslated string: reiserfs warning1 = Reiserfs is deprecated and scheduled to be removed from the kernel in 2025. WARNING: untranslated string: reiserfs warning2 = Ensure a fresh installation is made using either ext4 or xfs filesystems before that date. diff --git a/doc/language_issues.nl b/doc/language_issues.nl index de9dc112a..adf28c036 100644 --- a/doc/language_issues.nl +++ b/doc/language_issues.nl @@ -976,7 +976,7 @@ WARNING: untranslated string: dnssec validating = DNSSEC Validating WARNING: untranslated string: downfall gather data sampling = Downfall/Gather Data Sampling WARNING: untranslated string: download apple profile = Download Apple Configuration Profile WARNING: untranslated string: download tls-auth key = Download tls-auth key -WARNING: untranslated string: drop hostile = Drop packets from and to hostile networks (listed at <a href="https://www.spamhaus.org/drop/" target="_blank">Spamhaus DROP</a>, etc.) +WARNING: untranslated string: drop hostile = Drop packets from and to hostile networks (listed at <a href="https://www.spamhaus.org/blocklists/do-not-route-or-peer/" target="_blank">Spamhaus DROP</a>, etc.) WARNING: untranslated string: drop outgoing = Log dropped outgoing packets WARNING: untranslated string: drop spoofed martians = Log dropped spoofed packets and martians WARNING: untranslated string: duration = Duration @@ -1201,6 +1201,7 @@ WARNING: untranslated string: monitor interface = Monitor Interface WARNING: untranslated string: mtu = MTU WARNING: untranslated string: nameserver = Nameserver WARNING: untranslated string: netbios nameserver daemon = NetBIOS Nameserver Daemon +WARNING: untranslated string: never = Never WARNING: untranslated string: no data = unknown string WARNING: untranslated string: no entries = No entries at the moment. WARNING: untranslated string: none = none @@ -1243,6 +1244,7 @@ WARNING: untranslated string: ptr = PTR WARNING: untranslated string: rdns = rDNS WARNING: untranslated string: rebooting ipfire fsck = Rebooting IPFire, forcing filesystem check WARNING: untranslated string: received = Received +WARNING: untranslated string: reg_file_data_sampling = Register File Data Sampling (RFDS) WARNING: untranslated string: regenerate host certificate = Renew Host Certificate WARNING: untranslated string: reiserfs warning1 = Reiserfs is deprecated and scheduled to be removed from the kernel in 2025. WARNING: untranslated string: reiserfs warning2 = Ensure a fresh installation is made using either ext4 or xfs filesystems before that date. diff --git a/doc/language_issues.pl b/doc/language_issues.pl index d52c29f6b..d15f00f91 100644 --- a/doc/language_issues.pl +++ b/doc/language_issues.pl @@ -963,7 +963,7 @@ WARNING: untranslated string: drop action = Default behaviour of (forward) firew WARNING: untranslated string: drop action1 = Default behaviour of (outgoing) firewall in mode "Blocked" WARNING: untranslated string: drop action2 = Default behaviour of (input) firewall WARNING: untranslated string: drop forward = Log dropped forward packets -WARNING: untranslated string: drop hostile = Drop packets from and to hostile networks (listed at <a href="https://www.spamhaus.org/drop/" target="_blank">Spamhaus DROP</a>, etc.) +WARNING: untranslated string: drop hostile = Drop packets from and to hostile networks (listed at <a href="https://www.spamhaus.org/blocklists/do-not-route-or-peer/" target="_blank">Spamhaus DROP</a>, etc.) WARNING: untranslated string: drop outgoing = Log dropped outgoing packets WARNING: untranslated string: drop spoofed martians = Log dropped spoofed packets and martians WARNING: untranslated string: duration = Duration @@ -1355,6 +1355,7 @@ WARNING: untranslated string: most preferred = most preferred WARNING: untranslated string: mtu = MTU WARNING: untranslated string: nameserver = Nameserver WARNING: untranslated string: netbios nameserver daemon = NetBIOS Nameserver Daemon +WARNING: untranslated string: never = Never WARNING: untranslated string: no data = unknown string WARNING: untranslated string: no entries = No entries at the moment. WARNING: untranslated string: none = none @@ -1424,6 +1425,7 @@ WARNING: untranslated string: reboot fsck = Reboot & run ‘fsck’ WARNING: untranslated string: rebooting ipfire fsck = Rebooting IPFire, forcing filesystem check WARNING: untranslated string: received = Received WARNING: untranslated string: red1 = RED +WARNING: untranslated string: reg_file_data_sampling = Register File Data Sampling (RFDS) WARNING: untranslated string: regenerate host certificate = Renew Host Certificate WARNING: untranslated string: reiserfs warning1 = Reiserfs is deprecated and scheduled to be removed from the kernel in 2025. WARNING: untranslated string: reiserfs warning2 = Ensure a fresh installation is made using either ext4 or xfs filesystems before that date. diff --git a/doc/language_issues.ru b/doc/language_issues.ru index 3436c4a6e..d052eefac 100644 --- a/doc/language_issues.ru +++ b/doc/language_issues.ru @@ -960,7 +960,7 @@ WARNING: untranslated string: drop action = Default behaviour of (forward) firew WARNING: untranslated string: drop action1 = Default behaviour of (outgoing) firewall in mode "Blocked" WARNING: untranslated string: drop action2 = Default behaviour of (input) firewall WARNING: untranslated string: drop forward = Log dropped forward packets -WARNING: untranslated string: drop hostile = Drop packets from and to hostile networks (listed at <a href="https://www.spamhaus.org/drop/" target="_blank">Spamhaus DROP</a>, etc.) +WARNING: untranslated string: drop hostile = Drop packets from and to hostile networks (listed at <a href="https://www.spamhaus.org/blocklists/do-not-route-or-peer/" target="_blank">Spamhaus DROP</a>, etc.) WARNING: untranslated string: drop outgoing = Log dropped outgoing packets WARNING: untranslated string: drop spoofed martians = Log dropped spoofed packets and martians WARNING: untranslated string: duration = Duration @@ -1353,6 +1353,7 @@ WARNING: untranslated string: most preferred = most preferred WARNING: untranslated string: mtu = MTU WARNING: untranslated string: nameserver = Nameserver WARNING: untranslated string: netbios nameserver daemon = NetBIOS Nameserver Daemon +WARNING: untranslated string: never = Never WARNING: untranslated string: no data = unknown string WARNING: untranslated string: no entries = No entries at the moment. WARNING: untranslated string: none = none @@ -1419,6 +1420,7 @@ WARNING: untranslated string: reboot fsck = Reboot & run ‘fsck’ WARNING: untranslated string: rebooting ipfire fsck = Rebooting IPFire, forcing filesystem check WARNING: untranslated string: received = Received WARNING: untranslated string: red1 = RED +WARNING: untranslated string: reg_file_data_sampling = Register File Data Sampling (RFDS) WARNING: untranslated string: regenerate host certificate = Renew Host Certificate WARNING: untranslated string: reiserfs warning1 = Reiserfs is deprecated and scheduled to be removed from the kernel in 2025. WARNING: untranslated string: reiserfs warning2 = Ensure a fresh installation is made using either ext4 or xfs filesystems before that date. diff --git a/doc/language_issues.tr b/doc/language_issues.tr index ca57075b1..6e077d586 100644 --- a/doc/language_issues.tr +++ b/doc/language_issues.tr @@ -533,7 +533,6 @@ WARNING: translation string unused: network time WARNING: translation string unused: network traffic graphs WARNING: translation string unused: network updated WARNING: translation string unused: networks settings -WARNING: translation string unused: never WARNING: translation string unused: new optionsfw must boot WARNING: translation string unused: no alcatelusb firmware WARNING: translation string unused: no cfg upload @@ -952,7 +951,7 @@ WARNING: untranslated string: dnsforward dnssec disabled = DNSSEC Validation is WARNING: untranslated string: dnsforward forward_servers = Nameservers WARNING: untranslated string: downfall gather data sampling = Downfall/Gather Data Sampling WARNING: untranslated string: download apple profile = Download Apple Configuration Profile -WARNING: untranslated string: drop hostile = Drop packets from and to hostile networks (listed at <a href="https://www.spamhaus.org/drop/" target="_blank">Spamhaus DROP</a>, etc.) +WARNING: untranslated string: drop hostile = Drop packets from and to hostile networks (listed at <a href="https://www.spamhaus.org/blocklists/do-not-route-or-peer/" target="_blank">Spamhaus DROP</a>, etc.) WARNING: untranslated string: drop spoofed martians = Log dropped spoofed packets and martians WARNING: untranslated string: duration = Duration WARNING: untranslated string: email recipient invalid = Invalid email recipient @@ -1131,6 +1130,7 @@ WARNING: untranslated string: ptr = PTR WARNING: untranslated string: reboot fsck = Reboot & run ‘fsck’ WARNING: untranslated string: rebooting ipfire fsck = Rebooting IPFire, forcing filesystem check WARNING: untranslated string: received = Received +WARNING: untranslated string: reg_file_data_sampling = Register File Data Sampling (RFDS) WARNING: untranslated string: regenerate host certificate = Renew Host Certificate WARNING: untranslated string: reiserfs warning1 = Reiserfs is deprecated and scheduled to be removed from the kernel in 2025. WARNING: untranslated string: reiserfs warning2 = Ensure a fresh installation is made using either ext4 or xfs filesystems before that date. diff --git a/doc/language_missings b/doc/language_missings index a214b8f9a..4c657f099 100644 --- a/doc/language_missings +++ b/doc/language_missings @@ -81,6 +81,7 @@ < quick control < random number generator daemon < regenerate host certificate +< reg_file_data_sampling < reiserfs warning1 < reiserfs warning2 < required @@ -134,6 +135,7 @@ < openvpn cert expires soon < openvpn cert has expired < regenerate host certificate +< reg_file_data_sampling < reiserfs warning1 < reiserfs warning2 < service boot setting unavailable @@ -156,6 +158,7 @@ < hostile networks total < ids provider eol < ids unsupported provider +< reg_file_data_sampling < system time < timeformat < upload fcdsl.o @@ -548,6 +551,7 @@ < rebooting ipfire fsck < received < regenerate host certificate +< reg_file_data_sampling < reiserfs warning1 < reiserfs warning2 < release @@ -1098,6 +1102,7 @@ < rebooting ipfire fsck < received < regenerate host certificate +< reg_file_data_sampling < reiserfs warning1 < reiserfs warning2 < required @@ -1988,6 +1993,7 @@ < received < red1 < regenerate host certificate +< reg_file_data_sampling < reiserfs warning1 < reiserfs warning2 < release @@ -2989,6 +2995,7 @@ < received < red1 < regenerate host certificate +< reg_file_data_sampling < reiserfs warning1 < reiserfs warning2 < release @@ -3470,6 +3477,7 @@ < rebooting ipfire fsck < received < regenerate host certificate +< reg_file_data_sampling < reiserfs warning1 < reiserfs warning2 < release diff --git a/html/cgi-bin/credits.cgi b/html/cgi-bin/credits.cgi index 7a6865311..09aa91a8a 100644 --- a/html/cgi-bin/credits.cgi +++ b/html/cgi-bin/credits.cgi @@ -62,8 +62,8 @@ print <<END <!-- CONTRIBUTORS --> Michael Tremer, Arne Fitzenreiter, -Peter Müller, Adolf Belka, +Peter Müller, Stefan Schantl, Matthias Fischer, Christian Schmidt, diff --git a/lfs/samba b/lfs/samba index b21629bf9..05b9725c8 100644 --- a/lfs/samba +++ b/lfs/samba @@ -33,7 +33,7 @@ DL_FROM = $(URL_IPFIRE) DIR_APP = $(DIR_SRC)/$(THISAPP) TARGET = $(DIR_INFO)/$(THISAPP) PROG = samba -PAK_VER = 102 +PAK_VER = 103
DEPS = avahi cups perl-Parse-Yapp perl-JSON wsdd
hooks/post-receive -- IPFire 2.x development tree