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 ff8ce0d7627e783429099a63f1cb8dbb01ff6ffb (commit) via 922cd4d519e4d16aa1f8e7d96e036f10e9745db2 (commit) via f74552d5b8aab38169dee6ce0f5852f983285713 (commit) via 532797ed27dda14c07b2b964892ae6271f8967fd (commit) via d4c30a95e7ced6be67d573f3c9938400eef49c2c (commit) via 357984289d5fc37303d683b046f70b1d2e9f52c5 (commit) via ee60ae9b0e217935b8d736ed0db41bd465e9b96c (commit) via cee7ddb66c22bfdd7a0dce18617f64b34d7794e7 (commit) via e9c5d591e59cb07f4cc983c4423f14ed4f0d4178 (commit) via 17ee2c11f2207c7ddf5e946822b28042052a1623 (commit) via b9626030fe340b9f4086b79d378c8d9322af6735 (commit) from 50771922cb4ed29804e19a8080ebcec15593ea83 (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 ff8ce0d7627e783429099a63f1cb8dbb01ff6ffb Author: Matthias Fischer matthias.fischer@ipfire.org Date: Sun Aug 6 18:31:21 2023 +0200
Added '/var/lib/monit/id' to '/config/backup/includes/monit' to fix Bug #13089
Signed-off-by: Matthias Fischer matthias.fischer@ipfire.org Signed-off-by: Michael Tremer michael.tremer@ipfire.org
commit 922cd4d519e4d16aa1f8e7d96e036f10e9745db2 Author: Matthias Fischer matthias.fischer@ipfire.org Date: Sun Aug 6 20:53:21 2023 +0200
haproxy 2.8.1: Bumped PAK_VER to 27 due to removing the old OpenSSL files
Signed-off-by: Matthias Fischer matthias.fischer@ipfire.org Signed-off-by: Michael Tremer michael.tremer@ipfire.org
commit f74552d5b8aab38169dee6ce0f5852f983285713 Author: Matthias Fischer matthias.fischer@ipfire.org Date: Sun Aug 6 18:18:14 2023 +0200
monit 5.33: Bumped PAK_VER to 22 due to removing the old OpenSSL files
Signed-off-by: Matthias Fischer matthias.fischer@ipfire.org Signed-off-by: Michael Tremer michael.tremer@ipfire.org
commit 532797ed27dda14c07b2b964892ae6271f8967fd Author: Michael Tremer michael.tremer@ipfire.org Date: Mon Aug 7 09:25:02 2023 +0000
core178: Ship fwhosts.cgi
Signed-off-by: Michael Tremer michael.tremer@ipfire.org
commit d4c30a95e7ced6be67d573f3c9938400eef49c2c Author: Adolf Belka adolf.belka@ipfire.org Date: Wed Aug 2 22:09:55 2023 +0200
fwhosts.cgi: Fixes bug#13206 - no validation of location group name
- Added validation code for the location group name. This is only validated when edited and not when created. - The code was copied from the section for creating the Services Group Name or the Network/Host Group Name.
Fixes: Bug#13206 Tested-by: Adolf Belka adolf.belka@ipfire.org Signed-off-by: Adolf Belka adolf.belka@ipfire.org Reviewed-by: Stefan Schantl stefan.schantl@ipfire.org Signed-off-by: Michael Tremer michael.tremer@ipfire.org
commit 357984289d5fc37303d683b046f70b1d2e9f52c5 Author: Michael Tremer michael.tremer@ipfire.org Date: Mon Jul 31 13:13:17 2023 +0000
langs: Add translation for fixed lease in dynamic range warning
Reported-by: Peer Dietzmann dietzmann@brecht-schule.hamburg Signed-off-by: Michael Tremer michael.tremer@ipfire.org Reviewed-by: Bernhard Bitsch bbitsch@ipfire.org
commit ee60ae9b0e217935b8d736ed0db41bd465e9b96c Author: Michael Tremer michael.tremer@ipfire.org Date: Mon Aug 7 09:22:13 2023 +0000
samba: Bump package release
Signed-off-by: Michael Tremer michael.tremer@ipfire.org
commit cee7ddb66c22bfdd7a0dce18617f64b34d7794e7 Author: Adolf Belka adolf.belka@ipfire.org Date: Wed Jul 26 23:03:59 2023 +0200
samba.cgi: Fixes bug#13193 - disables smb1 unix extensions in smb.conf
- Around three years ago the samba wui page was simplified and several parts were removed including the ability to set either wide links or unix extensions to be enabled - When the above was done wide links = yes was defined in the samba.cgi code - unix extenstions was not defined and therefore took the default value which was/is yes - unix extensions is now called smb1 unix extensions and has the same default value of yes - With both wide links = yes and smb1 unix extensions = yes means that when there is a wide symlink (one that goes outside the share directory tree) then wide links is disabled because smb1 unix extensions is enabled. This is even though the smb1 protocol is disabled by default. - This patch sets smb1 unix extensions = no in the configuration. - This has been tested in my vm testbed and confirmed that the error message is no longer shown and that any wide links are able to be accessed from the share mounted on a client
Fixes: Bug#13193 Tested-by: Adolf Belka adolf.belka@ipfire.org Signed-off-by: Adolf Belka adolf.belka@ipfire.org Signed-off-by: Michael Tremer michael.tremer@ipfire.org
commit e9c5d591e59cb07f4cc983c4423f14ed4f0d4178 Author: Adolf Belka adolf.belka@ipfire.org Date: Mon Jul 24 18:15:45 2023 +0200
openldap: Update to version 2.6.5
- Update from version 2.6.1 to 2.6.5 - Update of rootfile not required - Update of patch script from LFS - Changelog 2.6.5 Release (2023/07/10) Fixed libldap handling of TCP KEEPALIVE options (ITS#10015) Fixed libldap with async connections (ITS#10023) Fixed libldap openssl TLSv1.3 cipher suite handling (ITS#10035) Fixed slapd callback handling with overlays that do extended operations (ITS#9990) Fixed slapd conversion of pcache configurations (ITS#10031) Fixed slapd cn=config modification handling with abandon (ITS#10045) Fixed slapd-mdb online indexer termination and cleanup (ITS#9993) Fixed slapd-mdb online indexer when interrupted (ITS#10047) Fixed slapd-monitor connection cleanup (ITS#10042) Fixed slapo-constraint handling of push replication (ITS#9953) Fixed slapo-dynlist filter evaluation efficiency (ITS#10041) Fixed slapo-pcache handling of invalid schema (ITS#10032) Fixed slapo-ppolicy handling of push replication (ITS#9953) Fixed slapo-ppolicy handling of pwdMinDelay (ITS#10028) Fixed slapo-syncprov abandon handling (ITS#10016) Fixed slapo-translucent handling of invalid schema (ITS#10032) Fixed slapo-unique handling of push replication (ITS#9953) Fixed slapo-variant to improve regex handling (ITS#10048) Build Environment Fixed compatibility with stricter C99 compilers (ITS#10011) Keep .pc files during make clean (ITS#9989) Contrib Fixed slapo-variant handling of push replication (ITS#9953) Minor Cleanup ITS#9855 ITS#9995 ITS#9996 ITS#9997 ITS#9998 ITS#9999 ITS#10000 ITS#10003 ITS#10004 ITS#10033 ITS#10037 ITS#10039 ITS#10046 ITS#10063 2.6.4 Release (2023/02/08) Fixed client tools to remove 'h' and 'p' options (ITS#9917,ITS#8618) Fixed ldapsearch memory leak with paged results (ITS#9860) Fixed libldap ldif_open_urlto check for failure (ITS#9904) Fixed libldap ldap_url_parsehosts check for failure (ITS#9904) Fixed liblunicode UTF8bvnormalize buffer size (ITS#9955) Fixed lloadd memory leaks (ITS#9907) Fixed lloadd shutdown code to protect memory correctly (ITS#9913) Fixed lloadd race in epoch.c (ITS#9947) Fixed lloadd potential deadlock with cn=monitor (ITS#9951) Fixed lloadd to keep listener base around when not active (ITS#9984) Fixed lloadd object reclamation sequencing (ITS#9983) Fixed slapd memory leak with olcAuthIDRewrite (ITS#6035) Fixed slapd free of redundant cmdline option (ITS#9912) Fixed slapd transactions extended operations cleanup after write (ITS#9892) Fixed slapd deadlock with replicated cn=config (ITS#9930,ITS#8102) Fixed slapd connection close logic (ITS#9991) Fixed slapd bconfig locking of cn=config entries (ITS#9045) Fixed slapd-mdb max number of index databases to 256 (ITS#9895) Fixed slapd-mdb to always release entries from ADD operations (ITS#9942) Fixed slapd-mdb to fully init empty DN in tool_entry_get (ITS#9940) Fixed slapd-monitor memory leaks with lloadd (ITS#9906) Fixed slapd-monitor to free remembered cookies (ITS#9339) Fixed slapo-accesslog reqStart ordering matching rule (ITS#9880) Fixed slapo-deref memory leak (ITS#9924) Fixed slapo-dynlist to ignore irrelevant objectClasses (ITS#9897) Fixed slapo-dynlist to avoid unnecessary searches (ITS#9929) Fixed slapo-dynlist to mark internal searches as such (ITS#9960) Fixed slapo-pcache crash in consistency_check (ITS#9966) Fixed slapo-remoteauth memory leaks (ITS#9438) Fixed slapo-rwm memory leaks (ITS#9817) Build Environment Fixed ancient DOS related ifdef checks (ITS#9925) Fixed build process to not use gmake specific features (ITS#9894) Fixed source tree to remove symlinks (ITS#9926) Fixed slapo-otp testdir creation (ITS#9437) Fixed slapd-tester memory leak (ITS#9908) Fixed usage of non-standard C syntax (ITS#9898, ITS#9899, ITS#9901) Fixed usage of bashism (ITS#9900) Fixed test suite portability (ITS#9931) Documentation Fixed ldap_bind(3) to document ber_bvfree in ldap_sasl_bind (ITS#9976) Fixed slapo-asyncmeta(5) to clarify scheduling for target connections (ITS#9941) Fixed slapo-dynlist(5) to clarify configuration settings (ITS#9957) Fixed slapo-unique(5) to clarify when quoting should be used (ITS#9915) Minor cleanup ITS#9935 ITS#9336 ITS#9337 ITS#9985 2.6.3 Release (2022/07/14) Fixed libldap to check for NULL ld (ITS#9157) Fixed libldap memory leaks (ITS#9876) Fixed lloadd to correctly tag Notice of Disconnection (ITS#9856) Fixed slapd kqueue support (ITS#9847) Fixed slapd delta-sync DN leak on ADD ops (ITS#9866) Fixed slapd replication with back-glue (ITS#9868) Fixed slapd lastbind replication with chaining (ITS#9863) Fixed slapd-ldap to correctly set authzid (ITS#9863) Fixed slapd-mdb to check for stale readers on MDB_READERS_FULL (ITS#7165) Fixed slapd-mdb indexer task with replicated config (ITS#9858) Fixed slapo-accesslog onetime memory leak (ITS#9864) Fixed slapo-ppolicy interaction with slapo-rwm (ITS#9871) Fixed slapo-rwm to handle escaping special characters (ITS#9817) Fixed slapo-syncprov memory leaks (ITS#9867) Fixed slapo-syncprov fallback in delta-sync mode (ITS#9823) Fixed slapo-unique to not release NULL entry (ITS#8245) Build Environment Added slapd-watcher -c contextDN option (ITS#9865) Fixed librewrite declaration of calloc (ITS#9841) Fixed parallel builds (ITS#9840) Fixed test020 to skip back-wt (ITS#9859) Fixed slapd-watcher SID handling with single URI (ITS#9850) Fixed test043 with workaround for ITS#9878 Contrib Added slapo-emptyds contrib module (ITS#8882) Added slapo-ciboolean contrib module (ITS#9855) Fixed slapo-autogroup backwards compat (ITS#9020) Update ppm module to the 2.2 release (ITS#9846) Documentation Fixed ldap_get_option(3) to clarify ldap_get/set_option restrictions (ITS#9824) Fixed slapd-ldap(5),slapd-meta(5) missing bold tag on authz parameter (ITS#9872) 2.6.2 Release (2022/05/04) Added libldap support for OpenSSL 3.0 (ITS#9436) Added slapd support for OpenSSL 3.0 (ITS#9436) Fixed ldapdelete to prune LDAP subentries (ITS#9737) Fixed libldap to drop connection when non-LDAP data is received (ITS#9803) Fixed libldap to allow newlines at end of included file (ITS#9811) Fixed slapd slaptest conversion of olcLastBind (ITS#9808) Fixed slapd to correctly init global_host earlier (ITS#9787) Fixed slapd bconfig locking for cn=config replication (ITS#9584) Fixed slapd usage of thread local counters (ITS#9789) Fixed slapd to clear runqueue task correctly (ITS#9785) Fixed slapd idletimeout handling (ITS#9820) Fixed slapd syncrepl handling of new sessions (ITS#9584) Fixed slapd to clear connections on bind (ITS#9799) Fixed slapd to correctly advance connections index (ITS#9831) Fixed slapd syncrepl ODSEE replication of unknown attr (ITS#9801) Fixed slapd-asyncmeta memory leak in keepalive setting (ITS#9802) Fixed slapd-ldap memory leak in keepalive setting (ITS#9802) Fixed slapd-meta SEGV on config rewrite (ITS#9802) Fixed slapd-meta ordering on config rewrite (ITS#9802) Fixed slapd-meta memory leak in keepalive setting (ITS#9802) Fixed slapd-monitor SEGV on shutdown (ITS#9809) Fixed slapd-monitor crash when hitting sizelimit (ITS#9832) Fixed slapd-sql to properly escape filter value (ITS#9815) Added slapo-autoca support for OpenSSL 3.0 (ITS#9436) Added slapo-otp support for OpenSSL 3.0 (ITS#9436) Fixed slapo-dynlist dynamic group regression (ITS#9825) Fixed slapo-pcache SEGV on shutdown (ITS#9809) Fixed slapo-ppolicy operation handling to be consistent (ITS#9794) Fixed slapo-translucent to correctly duplicate substring filters (ITS#9818) Build Environment Add ability to override default compile time paths (ITS#9675) Fix compilation with certain versions of gcc (ITS#9790) Fix compilation with openssl exclusions (ITS#9791) Fix warnings from make jobserver (ITS#9788) Contrib Update ppm module to the 2.1 release (ITS#9814) Documentation admin26 Document new lloadd features (ITS#9780) Fixed slapd.conf(5)/slapd-config(5) syncrepl sizelimit/timelimit documentation (ITS#9804) Fixed slapd-sock(5) to clarify "sockresps result" behavior (ITS#8255)
Signed-off-by: Adolf Belka adolf.belka@ipfire.org Signed-off-by: Michael Tremer michael.tremer@ipfire.org
commit 17ee2c11f2207c7ddf5e946822b28042052a1623 Author: Michael Tremer michael.tremer@ipfire.org Date: Mon Aug 7 09:18:00 2023 +0000
core178: Ship tar
Signed-off-by: Michael Tremer michael.tremer@ipfire.org
commit b9626030fe340b9f4086b79d378c8d9322af6735 Author: Adolf Belka adolf.belka@ipfire.org Date: Sat Jul 29 18:16:18 2023 +0200
tar: Update to version 1.35
- Update from version 1.34 to 1.35 - Update of rootfile not required - Changelog 1.35 - Sergey Poznyakoff, 2023-07-18 * Fail when building GNU tar, if the platform supports 64-bit time_t but the build uses only 32-bit time_t. * Leave the devmajor and devminor fields empty (rather than zero) for non-special files, as this is more compatible with traditional tar. * Bug fixes ** Fix interaction of --update with --wildcards. ** When extracting archives into an empty directory, do not create hard links to files outside that directory. ** Handle partial reads from regular files. ** Warn "file changed as we read it" less often. Formerly, tar warned if the file's size or ctime changed. However, this generated a false positive if tar read a file while another process hard-linked to it, changing its ctime. Now, tar warns if the file's size, mtime, user ID, group ID, or mode changes. Although neither heuristic is perfect, the new one should work better in practice. ** Fix --ignore-failed-read to ignore file-changed read errors as far as exit status is concerned. You can now suppress file-changed issues entirely with --ignore-failed-read --warning=no-file-changed. ** Fix --remove-files to not remove a file that changed while we read it. ** Fix --atime-preserve=replace to not fail if there was no need to replace, either because we did not read the file, or the atime did not change. ** Fix race when creating a parent directory while another process is also doing so. ** Fix handling of prefix keywords not followed by "." in pax headers. ** Fix handling of out-of-range sparse entries in pax headers. ** Fix handling of --transform='s/s/@/2'. ** Fix treatment of options ending in / in files-from list. ** Fix crash on 'tar --checkpoint-action exec="'. ** Fix low-memory crash when reading incremental dumps. ** Fix --exclude-vcs-ignores memory allocation misuse.
Signed-off-by: Adolf Belka adolf.belka@ipfire.org Signed-off-by: Michael Tremer michael.tremer@ipfire.org
-----------------------------------------------------------------------
Summary of changes: config/backup/includes/monit | 1 + config/rootfiles/core/178/filelists/files | 1 + .../{oldcore/121 => core/178}/filelists/tar | 0 doc/language_issues.de | 1 - doc/language_missings | 1 - html/cgi-bin/fwhosts.cgi | 3 + html/cgi-bin/samba.cgi | 3 + langs/de/cgi-bin/de.pl | 1 + lfs/haproxy | 2 +- lfs/monit | 4 +- lfs/openldap | 8 +- lfs/samba | 2 +- lfs/tar | 6 +- ...2.patch => openldap-2.6.5-consolidated-1.patch} | 149 +++++++-------------- 14 files changed, 70 insertions(+), 112 deletions(-) copy config/rootfiles/{oldcore/121 => core/178}/filelists/tar (100%) rename src/patches/{openldap-2.6.1-consolidated-2.patch => openldap-2.6.5-consolidated-1.patch} (96%)
Difference in files: diff --git a/config/backup/includes/monit b/config/backup/includes/monit index c25b94110..627e9742a 100644 --- a/config/backup/includes/monit +++ b/config/backup/includes/monit @@ -1,2 +1,3 @@ /etc/monitrc /etc/monit.d +/var/lib/monit/id diff --git a/config/rootfiles/core/178/filelists/files b/config/rootfiles/core/178/filelists/files index 3744bd7a0..7d07c77c6 100644 --- a/config/rootfiles/core/178/filelists/files +++ b/config/rootfiles/core/178/filelists/files @@ -1,3 +1,4 @@ srv/web/ipfire/cgi-bin/extrahd.cgi +srv/web/ipfire/cgi-bin/fwhosts.cgi srv/web/ipfire/cgi-bin/ovpnmain.cgi var/ipfire/extrahd/bin/extrahd.pl diff --git a/config/rootfiles/core/178/filelists/tar b/config/rootfiles/core/178/filelists/tar new file mode 120000 index 000000000..3e585d2eb --- /dev/null +++ b/config/rootfiles/core/178/filelists/tar @@ -0,0 +1 @@ +../../../common/tar \ No newline at end of file diff --git a/doc/language_issues.de b/doc/language_issues.de index 99ce559ce..b4ab6033a 100644 --- a/doc/language_issues.de +++ b/doc/language_issues.de @@ -884,7 +884,6 @@ WARNING: untranslated string: cake profile pppoe-ptm 27 = PPPoE PTM (27 bytes) WARNING: untranslated string: cake profile pppoe-vcmux 32 = PPPoE VC-MUX (32 bytes) WARNING: untranslated string: cake profile raw 0 = Raw (no overhead compensation) WARNING: untranslated string: desired = Desired -WARNING: untranslated string: dhcp fixed ip address in dynamic range = Fixed IP Address in dynamic range WARNING: untranslated string: disable = Disable WARNING: untranslated string: download apple profile = Download Apple Configuration Profile WARNING: untranslated string: enable = Enable diff --git a/doc/language_missings b/doc/language_missings index ab751bbe9..9a4de23be 100644 --- a/doc/language_missings +++ b/doc/language_missings @@ -47,7 +47,6 @@ < could not connect to www ipfire org < cryptographic settings < desired -< dhcp fixed ip address in dynamic range < dhcp server disabled on blue interface < dhcp server enabled on blue interface < disable diff --git a/html/cgi-bin/fwhosts.cgi b/html/cgi-bin/fwhosts.cgi index baf745a0a..d6be6c40e 100644 --- a/html/cgi-bin/fwhosts.cgi +++ b/html/cgi-bin/fwhosts.cgi @@ -693,6 +693,9 @@ if ($fwhostsettings{'ACTION'} eq 'savelocationgrp') &General::readhasharray("$fwconfiginp", %fwinp); &General::readhasharray("$fwconfigout", %fwout);
+ # Check name + if (!&validhostname($grp)){$errormessage.=$Lang::tr{'fwhost err name'};} + # Check for existing group name. if (!&checkgroup($grp) && $fwhostsettings{'update'} ne 'on'){ $errormessage = $Lang::tr{'fwhost err grpexist'}; diff --git a/html/cgi-bin/samba.cgi b/html/cgi-bin/samba.cgi index 0a3cd8c04..c60dca1d4 100644 --- a/html/cgi-bin/samba.cgi +++ b/html/cgi-bin/samba.cgi @@ -810,6 +810,9 @@ vfs objects = catia fruit streams_xattr recycle # Enable following symlinks wide links = yes
+# Disable smb1 unix extensions +smb1 unix extensions = no + END
# Server Role diff --git a/langs/de/cgi-bin/de.pl b/langs/de/cgi-bin/de.pl index 37b17b431..89382e3b4 100644 --- a/langs/de/cgi-bin/de.pl +++ b/langs/de/cgi-bin/de.pl @@ -788,6 +788,7 @@ 'dhcp dns update' => 'DNS-Update', 'dhcp dns update algo' => 'Algorithmus', 'dhcp dns update secret' => 'Schlüssel', +'dhcp fixed ip address in dynamic range' => 'Die feste Zuordnung befindet sich im dynamischen Bereich', 'dhcp fixed lease err1' => 'Für eine feste Zuordnung müssen entweder die Hardware Adresse (MAC-Adresse) oder der Hostname oder beide eingetragen werden.', 'dhcp fixed lease help1' => 'IP Adressen können als FQDN angegeben werden.', 'dhcp make fixed lease' => 'Feste Zuordnung erzeugen', diff --git a/lfs/haproxy b/lfs/haproxy index b825a342f..7646c9691 100644 --- a/lfs/haproxy +++ b/lfs/haproxy @@ -36,7 +36,7 @@ DL_FROM = $(URL_IPFIRE) DIR_APP = $(DIR_SRC)/$(THISAPP) TARGET = $(DIR_INFO)/$(THISAPP) PROG = haproxy -PAK_VER = 26 +PAK_VER = 27
DEPS =
diff --git a/lfs/monit b/lfs/monit index d243be460..ed59a3ef0 100644 --- a/lfs/monit +++ b/lfs/monit @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007-2022 IPFire Team info@ipfire.org # +# Copyright (C) 2007-2023 IPFire Team info@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 # @@ -33,7 +33,7 @@ DL_FROM = $(URL_IPFIRE) DIR_APP = $(DIR_SRC)/$(THISAPP) TARGET = $(DIR_INFO)/$(THISAPP) PROG = monit -PAK_VER = 21 +PAK_VER = 22
DEPS =
diff --git a/lfs/openldap b/lfs/openldap index 195aa4af2..c2c3e3f87 100644 --- a/lfs/openldap +++ b/lfs/openldap @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007-2018 IPFire Team info@ipfire.org # +# Copyright (C) 2007-2023 IPFire Team info@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.6.1 +VER = 2.6.5
THISAPP = openldap-$(VER) DL_FILE = $(THISAPP).tgz @@ -42,7 +42,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_BLAKE2 = 08bb7ec0354d689b65673d6c4c05a3299ba4f1655cbcccb710b6c9ca66fd636d6b2d89faa8d32278d253a1647deae8b1e86e8e275b890208bfac4ca663a40523 +$(DL_FILE)_BLAKE2 = 20370fc620ed0c4ef96d68d306dc42b0d87d1716579904cc362f9d368a76b0c39919e248b32453526f5ba1612b74de6056df1cef406e94b01d0a70277692d2d8
install : $(TARGET)
@@ -72,7 +72,7 @@ $(subst %,%_BLAKE2,$(objects)) : $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) @$(PREBUILD) @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE) - cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/openldap-2.6.1-consolidated-2.patch + cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/openldap-2.6.5-consolidated-1.patch cd $(DIR_APP) && autoconf cd $(DIR_APP) && ./configure \ --prefix=/usr \ diff --git a/lfs/samba b/lfs/samba index 99f211a3c..7757ae168 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 = 95 +PAK_VER = 96
DEPS = avahi cups perl-Parse-Yapp perl-JSON
diff --git a/lfs/tar b/lfs/tar index 2c798a4dd..745b658e7 100644 --- a/lfs/tar +++ b/lfs/tar @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007-2021 IPFire Team info@ipfire.org # +# Copyright (C) 2007-2023 IPFire Team info@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.34 +VER = 1.35
THISAPP = tar-$(VER) DL_FILE = $(THISAPP).tar.xz @@ -50,7 +50,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_BLAKE2 = 741a662457509a6775338ffe5d2d84872fcf38b93ace70c8b748a81055b9b62f65a48c4e541955d08ae99e6f528509e89eacd7c799a65bcc3d017a259110c115 +$(DL_FILE)_BLAKE2 = e1a200d21f433cd7d917dd979db16919a9167056ae62cf7d038a6118e56b2fe419cd4a396eee66f1f4dc13a8dc380e23f6ffd7ee0ca84e5dd9ad9411f60e002c
install : $(TARGET)
diff --git a/src/patches/openldap-2.6.1-consolidated-2.patch b/src/patches/openldap-2.6.5-consolidated-1.patch similarity index 96% rename from src/patches/openldap-2.6.1-consolidated-2.patch rename to src/patches/openldap-2.6.5-consolidated-1.patch index eb7396ad6..d8a2d4b4c 100644 --- a/src/patches/openldap-2.6.1-consolidated-2.patch +++ b/src/patches/openldap-2.6.5-consolidated-1.patch @@ -1,32 +1,7 @@ -Submitted by: Bruce Dubbs <bdubbs at linuxfromscratch.org> -Date: 2012-03-26 -Initial Package Version: 2.4.40 -Upstream Status: BLFS Specific -Origin: Armin K. <krejzi at email dot com> and Debian -Comment: Rediffed by Fernando de Oliveira <famobr at yahoo dot - com dot br> for version 2.4.44 - 2016.02.06 - Rediffed by Pierre Labastie <pierre dot labastie at - neuf dot fr> to add mdb backend and slapd.ldif. See - ticket #7394 - 2016.02.24 - Rediffed by Douglas R. Reno <renodr at linuxfromscratch - dot org> to function on 2.4.51. - 2020-08-13 - Fixed the rediff to use a .c file instead of a .s, fixing - the test by Douglas R. Reno - 2020-08-13 - Rediffed by Tim Tassonis <stuff at decentral.ch> to - remove now integrated symbol versioning stuff and - remove changes to now non-existent slapd-bdb.5 file - 2021-05-03 - Rediffed by Douglas R. Reno - 2022-02-13 - updated man - pages for lloadd.8 and slapd.8 to use the proper path. -Description: Consolidate earlier patches to: - 1. Update various installation options, such as ldap database path, - configuration file options, slapd install location, etc. - 2. Remove reference to bdb module - - -diff -Naurp openldap-2.6.1.orig/doc/man/man5/slapd.conf.5 openldap-2.6.1/doc/man/man5/slapd.conf.5 ---- openldap-2.6.1.orig/doc/man/man5/slapd.conf.5 2022-01-19 12:32:34.000000000 -0600 -+++ openldap-2.6.1/doc/man/man5/slapd.conf.5 2022-02-13 15:54:13.654979570 -0600 -@@ -2123,7 +2123,7 @@ suffix "dc=our-domain,dc=com" +diff -Naurp openldap-2.6.2.orig/doc/man/man5/slapd.conf.5 openldap-2.6.2/doc/man/man5/slapd.conf.5 +--- openldap-2.6.2.orig/doc/man/man5/slapd.conf.5 2022-05-04 16:55:23.000000000 +0200 ++++ openldap-2.6.2/doc/man/man5/slapd.conf.5 2022-05-05 12:05:53.309727745 +0200 +@@ -2122,7 +2122,7 @@ suffix "dc=our-domain,dc=com" # The database directory MUST exist prior to # running slapd AND should only be accessible # by the slapd/tools. Mode 0700 recommended. @@ -35,10 +10,10 @@ diff -Naurp openldap-2.6.1.orig/doc/man/man5/slapd.conf.5 openldap-2.6.1/doc/man # Indices to maintain index objectClass eq index cn,sn,mail pres,eq,approx,sub -diff -Naurp openldap-2.6.1.orig/doc/man/man5/slapd.conf.5.orig openldap-2.6.1/doc/man/man5/slapd.conf.5.orig ---- openldap-2.6.1.orig/doc/man/man5/slapd.conf.5.orig 1969-12-31 18:00:00.000000000 -0600 -+++ openldap-2.6.1/doc/man/man5/slapd.conf.5.orig 2022-01-19 12:32:34.000000000 -0600 -@@ -0,0 +1,2168 @@ +diff -Naurp openldap-2.6.2.orig/doc/man/man5/slapd.conf.5.orig openldap-2.6.2/doc/man/man5/slapd.conf.5.orig +--- openldap-2.6.2.orig/doc/man/man5/slapd.conf.5.orig 1970-01-01 01:00:00.000000000 +0100 ++++ openldap-2.6.2/doc/man/man5/slapd.conf.5.orig 2022-05-04 16:55:23.000000000 +0200 +@@ -0,0 +1,2167 @@ +.TH SLAPD.CONF 5 "RELEASEDATE" "OpenLDAP LDVERSION" +." Copyright 1998-2022 The OpenLDAP Foundation All Rights Reserved. +." Copying restrictions apply. See COPYRIGHT/LICENSE. @@ -1945,9 +1920,8 @@ diff -Naurp openldap-2.6.1.orig/doc/man/man5/slapd.conf.5.orig openldap-2.6.1/do +accept "unlimited" and positive integers, and both default to "unlimited". +The \fBsizelimit\fP and \fBtimelimit\fP parameters define +a consumer requested limitation on the number of entries that can be returned -+by the LDAP Content Synchronization operation; as such, it is intended -+to implement partial replication based on the size of the replicated database -+and on the time required by the synchronization. ++by the LDAP Content Synchronization operation; these should be left unchanged ++from the default otherwise replication may never succeed. +Note, however, that any provider-side limits for the replication identity +will be enforced by the provider regardless of the limits requested +by the LDAP Content Synchronization operation, much like for any other @@ -2207,10 +2181,10 @@ diff -Naurp openldap-2.6.1.orig/doc/man/man5/slapd.conf.5.orig openldap-2.6.1/do +"OpenLDAP Administrator's Guide" (http://www.OpenLDAP.org/doc/admin/) +.SH ACKNOWLEDGEMENTS +.so ../Project -diff -Naurp openldap-2.6.1.orig/doc/man/man5/slapd-config.5 openldap-2.6.1/doc/man/man5/slapd-config.5 ---- openldap-2.6.1.orig/doc/man/man5/slapd-config.5 2022-01-19 12:32:34.000000000 -0600 -+++ openldap-2.6.1/doc/man/man5/slapd-config.5 2022-02-13 15:54:13.654979570 -0600 -@@ -2234,7 +2234,7 @@ olcSuffix: "dc=our-domain,dc=com" +diff -Naurp openldap-2.6.2.orig/doc/man/man5/slapd-config.5 openldap-2.6.2/doc/man/man5/slapd-config.5 +--- openldap-2.6.2.orig/doc/man/man5/slapd-config.5 2022-05-04 16:55:23.000000000 +0200 ++++ openldap-2.6.2/doc/man/man5/slapd-config.5 2022-05-05 12:05:53.312727754 +0200 +@@ -2233,7 +2233,7 @@ olcSuffix: "dc=our-domain,dc=com" # The database directory MUST exist prior to # running slapd AND should only be accessible # by the slapd/tools. Mode 0700 recommended. @@ -2219,10 +2193,10 @@ diff -Naurp openldap-2.6.1.orig/doc/man/man5/slapd-config.5 openldap-2.6.1/doc/m # Indices to maintain olcDbIndex: objectClass eq olcDbIndex: cn,sn,mail pres,eq,approx,sub -diff -Naurp openldap-2.6.1.orig/doc/man/man5/slapd-config.5.orig openldap-2.6.1/doc/man/man5/slapd-config.5.orig ---- openldap-2.6.1.orig/doc/man/man5/slapd-config.5.orig 1969-12-31 18:00:00.000000000 -0600 -+++ openldap-2.6.1/doc/man/man5/slapd-config.5.orig 2022-01-19 12:32:34.000000000 -0600 -@@ -0,0 +1,2303 @@ +diff -Naurp openldap-2.6.2.orig/doc/man/man5/slapd-config.5.orig openldap-2.6.2/doc/man/man5/slapd-config.5.orig +--- openldap-2.6.2.orig/doc/man/man5/slapd-config.5.orig 1970-01-01 01:00:00.000000000 +0100 ++++ openldap-2.6.2/doc/man/man5/slapd-config.5.orig 2022-05-04 16:55:23.000000000 +0200 +@@ -0,0 +1,2302 @@ +.TH SLAPD-CONFIG 5 "RELEASEDATE" "OpenLDAP LDVERSION" +." Copyright 1998-2022 The OpenLDAP Foundation All Rights Reserved. +." Copying restrictions apply. See COPYRIGHT/LICENSE. @@ -4198,9 +4172,8 @@ diff -Naurp openldap-2.6.1.orig/doc/man/man5/slapd-config.5.orig openldap-2.6.1/ +accept "unlimited" and positive integers, and both default to "unlimited". +The \fBsizelimit\fP and \fBtimelimit\fP parameters define +a consumer requested limitation on the number of entries that can be returned -+by the LDAP Content Synchronization operation; as such, it is intended -+to implement partial replication based on the size of the replicated database -+and on the time required by the synchronization. ++by the LDAP Content Synchronization operation; these should be left unchanged ++from the default otherwise replication may never succeed. +Note, however, that any provider-side limits for the replication identity +will be enforced by the provider regardless of the limits requested +by the LDAP Content Synchronization operation, much like for any other @@ -4526,54 +4499,32 @@ diff -Naurp openldap-2.6.1.orig/doc/man/man5/slapd-config.5.orig openldap-2.6.1/ +"OpenLDAP Administrator's Guide" (http://www.OpenLDAP.org/doc/admin/) +.SH ACKNOWLEDGEMENTS +.so ../Project -diff -Naurp openldap-2.6.1.orig/doc/man/man8/lloadd.8 openldap-2.6.1/doc/man/man8/lloadd.8 ---- openldap-2.6.1.orig/doc/man/man8/lloadd.8 2022-01-19 12:32:34.000000000 -0600 -+++ openldap-2.6.1/doc/man/man8/lloadd.8 2022-02-13 15:55:12.222721830 -0600 -@@ -5,7 +5,7 @@ - .SH NAME - lloadd - LDAP Load Balancer Daemon - .SH SYNOPSIS --.B LIBEXECDIR/lloadd -+.B SBINDIR/lloadd - [\c - .BR -4 | -6 ] - [\c -diff -Naurp openldap-2.6.1.orig/doc/man/man8/slapd.8 openldap-2.6.1/doc/man/man8/slapd.8 ---- openldap-2.6.1.orig/doc/man/man8/slapd.8 2022-01-19 12:32:34.000000000 -0600 -+++ openldap-2.6.1/doc/man/man8/slapd.8 2022-02-13 15:55:00.466773546 -0600 -@@ -5,7 +5,7 @@ - .SH NAME - slapd - Stand-alone LDAP Daemon - .SH SYNOPSIS --.B LIBEXECDIR/slapd -+.B SBINDIR/slapd - [\c - .BR -V [ V [ V ]] - [\c -diff -Naurp openldap-2.6.1.orig/include/ldap_defaults.h openldap-2.6.1/include/ldap_defaults.h ---- openldap-2.6.1.orig/include/ldap_defaults.h 2022-01-19 12:32:34.000000000 -0600 -+++ openldap-2.6.1/include/ldap_defaults.h 2022-02-13 15:54:13.654979570 -0600 -@@ -39,7 +39,7 @@ - #define LDAP_ENV_PREFIX "LDAP" +diff -Naurp openldap-2.6.2.orig/include/ldap_defaults.h openldap-2.6.2/include/ldap_defaults.h +--- openldap-2.6.2.orig/include/ldap_defaults.h 2022-05-04 16:55:23.000000000 +0200 ++++ openldap-2.6.2/include/ldap_defaults.h 2022-05-05 12:07:08.783961875 +0200 +@@ -40,7 +40,8 @@
/* default ldapi:// socket */ + #ifndef LDAPI_SOCK -#define LDAPI_SOCK LDAP_RUNDIR LDAP_DIRSEP "run" LDAP_DIRSEP "ldapi" +#define LDAPI_SOCK LDAP_RUNDIR LDAP_DIRSEP "run" LDAP_DIRSEP "openldap" LDAP_DIRSEP "ldapi" ++ + #endif
/* - * SLAPD DEFINITIONS -@@ -47,7 +47,7 @@ - /* location of the default slapd config file */ - #define SLAPD_DEFAULT_CONFIGFILE LDAP_SYSCONFDIR LDAP_DIRSEP "slapd.conf" +@@ -54,7 +55,8 @@ #define SLAPD_DEFAULT_CONFIGDIR LDAP_SYSCONFDIR LDAP_DIRSEP "slapd.d" + #endif + #ifndef SLAPD_DEFAULT_DB_DIR -#define SLAPD_DEFAULT_DB_DIR LDAP_RUNDIR LDAP_DIRSEP "openldap-data" +#define SLAPD_DEFAULT_DB_DIR LDAP_RUNDIR LDAP_DIRSEP "lib" LDAP_DIRSEP "openldap" ++ + #endif #define SLAPD_DEFAULT_DB_MODE 0600 - #define SLAPD_DEFAULT_UCDATA LDAP_DATADIR LDAP_DIRSEP "ucdata" /* default max deref depth for aliases */ -diff -Naurp openldap-2.6.1.orig/libraries/liblber/Makefile.in openldap-2.6.1/libraries/liblber/Makefile.in ---- openldap-2.6.1.orig/libraries/liblber/Makefile.in 2022-01-19 12:32:34.000000000 -0600 -+++ openldap-2.6.1/libraries/liblber/Makefile.in 2022-02-13 15:54:13.654979570 -0600 +diff -Naurp openldap-2.6.2.orig/libraries/liblber/Makefile.in openldap-2.6.2/libraries/liblber/Makefile.in +--- openldap-2.6.2.orig/libraries/liblber/Makefile.in 2022-05-04 16:55:23.000000000 +0200 ++++ openldap-2.6.2/libraries/liblber/Makefile.in 2022-05-05 12:05:53.313727757 +0200 @@ -51,6 +51,6 @@ idtest: $(XLIBS) idtest.o
install-local: FORCE @@ -4582,9 +4533,9 @@ diff -Naurp openldap-2.6.1.orig/libraries/liblber/Makefile.in openldap-2.6.1/lib + $(LTINSTALL) $(INSTALLFLAGS) -m 755 $(LIBRARY) $(DESTDIR)$(libdir) $(LTFINISH) $(DESTDIR)$(libdir)
-diff -Naurp openldap-2.6.1.orig/libraries/libldap/Makefile.in openldap-2.6.1/libraries/libldap/Makefile.in ---- openldap-2.6.1.orig/libraries/libldap/Makefile.in 2022-01-19 12:32:34.000000000 -0600 -+++ openldap-2.6.1/libraries/libldap/Makefile.in 2022-02-13 15:54:13.654979570 -0600 +diff -Naurp openldap-2.6.2.orig/libraries/libldap/Makefile.in openldap-2.6.2/libraries/libldap/Makefile.in +--- openldap-2.6.2.orig/libraries/libldap/Makefile.in 2022-05-04 16:55:23.000000000 +0200 ++++ openldap-2.6.2/libraries/libldap/Makefile.in 2022-05-05 12:05:53.327727801 +0200 @@ -82,7 +82,7 @@ CFFILES=ldap.conf
install-local: $(CFFILES) FORCE @@ -4594,9 +4545,9 @@ diff -Naurp openldap-2.6.1.orig/libraries/libldap/Makefile.in openldap-2.6.1/lib $(LTFINISH) $(DESTDIR)$(libdir) -$(MKDIR) $(DESTDIR)$(sysconfdir) @for i in $(CFFILES); do \ -diff -Naurp openldap-2.6.1.orig/servers/slapd/Makefile.in openldap-2.6.1/servers/slapd/Makefile.in ---- openldap-2.6.1.orig/servers/slapd/Makefile.in 2022-01-19 12:32:34.000000000 -0600 -+++ openldap-2.6.1/servers/slapd/Makefile.in 2022-02-13 15:54:13.655979565 -0600 +diff -Naurp openldap-2.6.2.orig/servers/slapd/Makefile.in openldap-2.6.2/servers/slapd/Makefile.in +--- openldap-2.6.2.orig/servers/slapd/Makefile.in 2022-05-04 16:55:23.000000000 +0200 ++++ openldap-2.6.2/servers/slapd/Makefile.in 2022-05-05 12:05:53.329727807 +0200 @@ -374,9 +374,10 @@ install-local-srv: install-slapd install
install-slapd: FORCE @@ -4629,9 +4580,9 @@ diff -Naurp openldap-2.6.1.orig/servers/slapd/Makefile.in openldap-2.6.1/servers + $(LN_S) -f $(DESTDIR)$(sbindir)/slapd$(EXEEXT) $(DESTDIR)$(sbindir)/$$i$(EXEEXT); \ done
-diff -Naurp openldap-2.6.1.orig/servers/slapd/slapd.conf openldap-2.6.1/servers/slapd/slapd.conf ---- openldap-2.6.1.orig/servers/slapd/slapd.conf 2022-01-19 12:32:34.000000000 -0600 -+++ openldap-2.6.1/servers/slapd/slapd.conf 2022-02-13 15:54:13.655979565 -0600 +diff -Naurp openldap-2.6.2.orig/servers/slapd/slapd.conf openldap-2.6.2/servers/slapd/slapd.conf +--- openldap-2.6.2.orig/servers/slapd/slapd.conf 2022-05-04 16:55:23.000000000 +0200 ++++ openldap-2.6.2/servers/slapd/slapd.conf 2022-05-05 12:05:53.331727813 +0200 @@ -10,8 +10,9 @@ include %SYSCONFDIR%/schema/core.schema # service AND an understanding of referrals. #referral ldap://root.openldap.org @@ -4653,9 +4604,9 @@ diff -Naurp openldap-2.6.1.orig/servers/slapd/slapd.conf openldap-2.6.1/servers/ # Indices to maintain index objectClass eq
-diff -Naurp openldap-2.6.1.orig/servers/slapd/slapd.ldif openldap-2.6.1/servers/slapd/slapd.ldif ---- openldap-2.6.1.orig/servers/slapd/slapd.ldif 2022-01-19 12:32:34.000000000 -0600 -+++ openldap-2.6.1/servers/slapd/slapd.ldif 2022-02-13 15:54:13.655979565 -0600 +diff -Naurp openldap-2.6.2.orig/servers/slapd/slapd.ldif openldap-2.6.2/servers/slapd/slapd.ldif +--- openldap-2.6.2.orig/servers/slapd/slapd.ldif 2022-05-04 16:55:23.000000000 +0200 ++++ openldap-2.6.2/servers/slapd/slapd.ldif 2022-05-05 12:05:53.332727816 +0200 @@ -9,8 +9,8 @@ cn: config # # Define global ACLs to disable default read access. @@ -4676,9 +4627,9 @@ diff -Naurp openldap-2.6.1.orig/servers/slapd/slapd.ldif openldap-2.6.1/servers/ # Indices to maintain olcDbIndex: objectClass eq
-diff -Naurp openldap-2.6.1.orig/servers/slapd/slapi/Makefile.in openldap-2.6.1/servers/slapd/slapi/Makefile.in ---- openldap-2.6.1.orig/servers/slapd/slapi/Makefile.in 2022-01-19 12:32:34.000000000 -0600 -+++ openldap-2.6.1/servers/slapd/slapi/Makefile.in 2022-02-13 15:54:13.655979565 -0600 +diff -Naurp openldap-2.6.2.orig/servers/slapd/slapi/Makefile.in openldap-2.6.2/servers/slapd/slapi/Makefile.in +--- openldap-2.6.2.orig/servers/slapd/slapi/Makefile.in 2022-05-04 16:55:23.000000000 +0200 ++++ openldap-2.6.2/servers/slapd/slapi/Makefile.in 2022-05-05 12:05:53.333727819 +0200 @@ -46,6 +46,6 @@ BUILD_MOD = @BUILD_SLAPI@ install-local: FORCE if test "$(BUILD_MOD)" = "yes"; then \
hooks/post-receive -- IPFire 2.x development tree