[Pkg-samba-maint] [Git][samba-team/samba][master] 5 commits: Revert "d/rules: as of 4.17, no need to explicitly build intermediate targets anymore"

Michael Tokarev (@mjt) gitlab at salsa.debian.org
Thu Nov 28 19:28:51 GMT 2024



Michael Tokarev pushed to branch master at Debian Samba Team / samba


Commits:
75b51511 by Michael Tokarev at 2024-11-27T17:48:35+03:00
Revert "d/rules: as of 4.17, no need to explicitly build intermediate targets anymore"

This reverts commit b9ce9feebb03f1e4eaa7340201c9f433274c89d6.

It is still a dependency problem in 4.21, and apparently
has always been so far, it were just hidden within varied
concurrency (make -jN) and speed factors.

Update the comment to reflect current version.

- - - - -
fae219ed by Michael Tokarev at 2024-11-28T08:31:32+03:00
ldb-no-replace.diff: avoid private rpath for libldb.so

- - - - -
ab8a1a18 by Michael Tokarev at 2024-11-28T08:33:07+03:00
heimdal-spelling.patch: remove (forgotten, applied upstream)

- - - - -
fcab32ab by Michael Tokarev at 2024-11-28T12:05:49+03:00
d/patches/* update dep3 metadata

Update DEP3 metadata in some patches, especially for
https://gitlab.com/samba-team/samba/-/merge_requests/3872

- - - - -
6543f6f1 by Michael Tokarev at 2024-11-28T12:06:13+03:00
add-missing-libs-deps.diff: update to include more missing deps (as submitted upstream)

- - - - -


12 changed files:

- debian/patches/add-missing-libs-deps.diff
- debian/patches/ctdb-config-enable-syslog-by-default.patch
- debian/patches/ctdb-use-run-instead-of-var-run.patch
- debian/patches/ctdb_etcd_lock-path.patch
- debian/patches/disable-setuid-confchecks.patch
- debian/patches/fruit-disable-useless-size_t-overflow-check.patch
- − debian/patches/heimdal-spelling.patch
- + debian/patches/ldb-no-replace.diff
- debian/patches/libsmbclient-ensure-lfs-221618.patch
- debian/patches/lower-dns-lookup-mismatch-messages.patch
- debian/patches/series
- debian/rules


Changes:

=====================================
debian/patches/add-missing-libs-deps.diff
=====================================
@@ -1,7 +1,8 @@
 From: Michael Tokarev <mjt at tls.msk.ru>
 Date: Thu, 19 May 2022 20:37:21 +0300
-Subject: add missing libs deps
-Bug-Debian: https://bugs.debian.org/1010922
+Updated: Thu, 28 Nov 2024 11:59:58 +0300
+Subject: specify some deps on private libs actually used directly
+Forwarded: https://gitlab.com/samba-team/samba/-/merge_requests/3872
 
 Lots of samba libraries has incomplete dependencies listed
 in wscript files.  This usually is not a problem since the
@@ -15,35 +16,87 @@ listed as direct dependency, private library directory is
 not put into RUNPATH of the resulting binary, so the binary
 can not find its own dependencies.
 
-Fix a few such places, including one library which is a part
-of public abi (libsmbldap).
+Fix a few such places, including some libraries which are
+a part of public abi (libsmbldap, libndr).
 
+Signed-off-by: Michael Tokarev <mjt at tls.msk.ru>
+---
+ lib/param/wscript_build                             | 2 +-
+ lib/util/wscript_build                              | 4 ++--
+ librpc/wscript_build                                | 1 +
+ source3/wscript_build                               | 4 ++--
+ source4/dsdb/samdb/ldb_modules/wscript_build_server | 4 ++--
+ source4/param/wscript_build                         | 2 +-
+ 6 files changed, 9 insertions(+), 8 deletions(-)
+
+diff --git a/lib/param/wscript_build b/lib/param/wscript_build
+index 864975a5884..0ea874b9f6e 100644
+--- a/lib/param/wscript_build
++++ b/lib/param/wscript_build
+@@ -34,3 +34,3 @@ bld.SAMBA_LIBRARY('server-role',
+                   source='loadparm_server_role.c',
+-                  deps='samba-util samba-debug',
++                  deps='samba-util time-basic samba-debug',
+                   private_library=True)
 diff --git a/lib/util/wscript_build b/lib/util/wscript_build
-index 2f31e8fa5b1..08a77b8940c 100644
+index b4fcfeaba07..38614702930 100644
 --- a/lib/util/wscript_build
 +++ b/lib/util/wscript_build
-@@ -218,5 +218,5 @@ else:
-     bld.SAMBA_LIBRARY('samba-modules',
+@@ -245,3 +245,3 @@ else:
                        source='modules.c',
 -                      deps='samba-errors samba-util',
 +                      deps='samba-errors samba-util samba-debug',
                        local_include=False,
-                       private_library=True)
+@@ -279,3 +279,3 @@ else:
+                       local_include=False,
+-                      public_deps='tevent samba-errors',
++                      public_deps='tevent time-basic samba-errors',
+                       public_headers='tevent_ntstatus.h tevent_unix.h tevent_werror.h',
+diff --git a/librpc/wscript_build b/librpc/wscript_build
+index 6cb4e1cff2b..e8e36118adb 100644
+--- a/librpc/wscript_build
++++ b/librpc/wscript_build
+@@ -674,2 +674,3 @@ bld.SAMBA_LIBRARY('ndr',
+     public_deps='samba-errors talloc samba-util util_str_hex',
++    deps='genrand',
+     public_headers='gen_ndr/misc.h gen_ndr/ndr_misc.h ndr/libndr.h:ndr.h',
 diff --git a/source3/wscript_build b/source3/wscript_build
-index acfc0c56f03..e919f38d9cb 100644
+index 0c9f6ad3143..3ed3b550960 100644
 --- a/source3/wscript_build
 +++ b/source3/wscript_build
-@@ -189,5 +189,5 @@ bld.SAMBA3_LIBRARY('smbldaphelper',
-                           passdb/pdb_ldap_util.c
+@@ -194,3 +194,3 @@ bld.SAMBA3_LIBRARY('smbldaphelper',
                            ''',
 -                   deps='smbldap secrets3',
-+                   deps='smbldap secrets3 replace',
++                   deps='smbldap secrets3 samba-security samba3-util',
                     allow_undefined_symbols=True,
-                    enabled=bld.CONFIG_SET('HAVE_LDAP'),
-@@ -483,5 +483,5 @@ bld.SAMBA3_LIBRARY('secrets3',
- bld.SAMBA3_LIBRARY('smbldap',
+@@ -502,3 +502,3 @@ bld.SAMBA3_LIBRARY('smbldap',
                      source='lib/smbldap.c',
 -                    deps='ldap lber samba-util smbconf',
-+                    deps='ldap lber samba-util smbconf replace samba-debug samba-security',
++                    deps='ldap lber samba-util smbconf samba-security genrand smbd_shim',
                      enabled=bld.CONFIG_SET("HAVE_LDAP"),
-                     private_library=False,
+diff --git a/source4/dsdb/samdb/ldb_modules/wscript_build_server b/source4/dsdb/samdb/ldb_modules/wscript_build_server
+index 9c1eb12a7c2..1f70641283a 100644
+--- a/source4/dsdb/samdb/ldb_modules/wscript_build_server
++++ b/source4/dsdb/samdb/ldb_modules/wscript_build_server
+@@ -347,3 +347,3 @@ bld.SAMBA_MODULE('ldb_anr',
+ 	internal_module=False,
+-	deps='talloc samba-util samdb'
++	deps='talloc samba-util samdb ldbsamba'
+ 	)
+@@ -387,3 +387,3 @@ bld.SAMBA_MODULE('ldb_resolve_oids',
+ 	internal_module=False,
+-	deps='samdb talloc ndr'
++	deps='samdb talloc ndr ldbsamba'
+ 	)
+diff --git a/source4/param/wscript_build b/source4/param/wscript_build
+index d1b852c0c73..80341369337 100644
+--- a/source4/param/wscript_build
++++ b/source4/param/wscript_build
+@@ -41,3 +41,3 @@ bld.SAMBA_PYTHON('pyparam',
+ 	         source='pyparam.c',
+-	         deps='samba-hostconfig %s' % pytalloc_util,
++	         deps='samba-hostconfig server-role samba-util samba-debug %s' % pytalloc_util,
+ 	         realname='samba/param.so'
+-- 
+2.39.5
+


=====================================
debian/patches/ctdb-config-enable-syslog-by-default.patch
=====================================
@@ -1,4 +1,9 @@
-ctdb-config: enable syslog by default
+Author: Rafael David Tinoco <rafaeldtinoco at ubuntu.com>
+Bug-Debian: https://bugs.debian.org/929931
+Bug-Ubuntu: https://bugs.launchpad.net/bugs/722201
+Last-Update: 2022-03-24
+Subject: ctdb-config: enable syslog by default
+Forwarded: not-needed
 
 CTDB uses /var/log/ctdb/ directory for the default log files. With
 syslog disabled, systemd journal is not able to correctly inform
@@ -18,11 +23,6 @@ or to follow ctdb logs by executing:
   journalctl -f -u ctdb
 
 Signed-off-by: Rafael David Tinoco <rafaeldtinoco at ubuntu.com>
--
-Author: Rafael David Tinoco <rafaeldtinoco at ubuntu.com>
-Bug-Debian: https://bugs.debian.org/929931
-Bug-Ubuntu: https://bugs.launchpad.net/bugs/722201
-Last-Update: 2022-03-24
 ---
  ctdb/config/ctdb.conf | 4 ++--
  1 file changed, 2 insertions(+), 2 deletions(-)


=====================================
debian/patches/ctdb-use-run-instead-of-var-run.patch
=====================================
@@ -1,7 +1,7 @@
-From a4f5852f55439bcc1aaaa6762d230a28599298d2 Mon Sep 17 00:00:00 2001
 From: Michael Tokarev <mjt at tls.msk.ru>
 Date: Fri, 2 Dec 2022 11:45:01 +0300
 Subject: ctdb: use /run/ctdb instead of /var/run/ctdb
+Forwarded: not-needed
 
 Whole upstream path assignment needs a review.
 ---


=====================================
debian/patches/ctdb_etcd_lock-path.patch
=====================================
@@ -1,9 +1,13 @@
 Subject: fix pathname for ctdb_etcd_lock
 From: Michael Tokarev <mjt at tls.msk.ru>
 Date: Sat, 02 Apr 2022 17:49:38 +0300
+Forwarded: not-needed
 
 Specify the actual installation path for this helper script.
 
+This is a quick hack, this issue should be addressed
+upstream in a more generic way.
+
 diff --git a/ctdb/doc/ctdb-etcd.7.xml b/ctdb/doc/ctdb-etcd.7.xml
 index f84989f854f..fcb3d0c3b5f 100644
 --- a/ctdb/doc/ctdb-etcd.7.xml


=====================================
debian/patches/disable-setuid-confchecks.patch
=====================================
@@ -1,6 +1,7 @@
 From: Michael Tokarev <mjt at tls.msk.ru>
 Date: Fri, 08 Apr 2022 11:50:21 +0300
 Subject: disable setuid configure checks
+Forwarded: not-needed
 
 For some strange reason, when running reprotest test on salsa-ci,
 which apparently is running as root, - on the *second* build only
@@ -12,6 +13,9 @@ root, salsa-ci test environment details are quite deep down the line,
 and we know the syscall actually works, just disable the probe,
 pretending we are not root.
 
+For upstream, this probably should be done by removing a *lot* of
+configure-time checks which are useless these days.
+
 diff --git a/source3/lib/util_sec.c b/source3/lib/util_sec.c
 index 30a29f535b1..451ad396965 100644
 --- a/source3/lib/util_sec.c


=====================================
debian/patches/fruit-disable-useless-size_t-overflow-check.patch
=====================================
@@ -1,8 +1,8 @@
-From e4bf63c976b0e3253f980360b2fe6244092b777c Mon Sep 17 00:00:00 2001
 From: Michael Tokarev <mjt at tls.msk.ru>
 Date: Thu, 17 Nov 2022 23:51:03 +0300
-Subject: [PATCH] fruit: disable useless size_t overflow check
+Subject: fruit: disable useless size_t overflow check
 Bug-Debian: http://bugs.debian.org/974868
+Forwarded: https://gitlab.com/samba-team/samba/-/merge_requests/3872
 
 As has been said several times in
 https://bugzilla.samba.org/show_bug.cgi?id=13622 ,


=====================================
debian/patches/heimdal-spelling.patch deleted
=====================================
@@ -1,139 +0,0 @@
-From: Michael Tokarev <mjt at tls.msk.ru>
-Subject: Heimdal: spelling fixes (underun prefered relase encyption confunder)
-
-diff --git a/third_party/heimdal/lib/asn1/asn1_err.et b/third_party/heimdal/lib/asn1/asn1_err.et
-index ac7a9ebaa52..dc08a86cf30 100644
---- a/third_party/heimdal/lib/asn1/asn1_err.et
-+++ b/third_party/heimdal/lib/asn1/asn1_err.et
-@@ -25,3 +25,3 @@ error_code EXACT_CONSTRAINT,	"ASN.1 wrong number of elements"
- error_code INDEF_OVERRUN,   	"ASN.1 BER indefinte encoding overrun"
--error_code INDEF_UNDERRUN,   	"ASN.1 BER indefinte encoding underun"
-+error_code INDEF_UNDERRUN,   	"ASN.1 BER indefinte encoding underrun"
- error_code GOT_BER,		"ASN.1 got BER encoded when expected DER"
-diff --git a/third_party/heimdal/lib/asn1/asn1_print.c b/third_party/heimdal/lib/asn1/asn1_print.c
-index 40c37fbbb94..d65116d4379 100644
---- a/third_party/heimdal/lib/asn1/asn1_print.c
-+++ b/third_party/heimdal/lib/asn1/asn1_print.c
-@@ -568,3 +568,3 @@ dotype(unsigned char *buf, size_t len, char **argv, size_t *size)
-             errx(1, "Could not decode and print data as type %s: "
--                 "BER indefinte encoding underun", typename);
-+                 "BER indefinte encoding underrun", typename);
-         case ASN1_GOT_BER:
-diff --git a/third_party/heimdal/lib/base/heimbase.c b/third_party/heimdal/lib/base/heimbase.c
-index 1e6805a25e7..b5f325f9c8d 100644
---- a/third_party/heimdal/lib/base/heimbase.c
-+++ b/third_party/heimdal/lib/base/heimbase.c
-@@ -691,3 +691,3 @@ heim_auto_release(heim_object_t ptr)
-     if (tls == NULL || (ar = tls->current) == NULL)
--	heim_abort("no auto relase pool in place, would leak");
-+	heim_abort("no auto release pool in place, would leak");
- 
-diff --git a/third_party/heimdal/lib/gssapi/spnego/accept_sec_context.c b/third_party/heimdal/lib/gssapi/spnego/accept_sec_context.c
-index c4ac7455cf6..7a211900fd3 100644
---- a/third_party/heimdal/lib/gssapi/spnego/accept_sec_context.c
-+++ b/third_party/heimdal/lib/gssapi/spnego/accept_sec_context.c
-@@ -749,3 +749,3 @@ acceptor_start
- 				       *minor_status,
--				       "SPNEGO acceptor didn't find a prefered mechanism");
-+				       "SPNEGO acceptor didn't find a preferred mechanism");
-     }
-diff --git a/third_party/heimdal/lib/hx509/cert.c b/third_party/heimdal/lib/hx509/cert.c
-index 3dda886edc5..b27282de8c5 100644
---- a/third_party/heimdal/lib/hx509/cert.c
-+++ b/third_party/heimdal/lib/hx509/cert.c
-@@ -1449,3 +1449,3 @@ _hx509_calculate_path(hx509_context context,
- 	    hx509_set_error_string(context, 0, HX509_PATH_TOO_LONG,
--				   "Path too long while bulding "
-+				   "Path too long while building "
- 				   "certificate chain");
-diff --git a/third_party/heimdal/lib/hx509/hx509_err.et b/third_party/heimdal/lib/hx509/hx509_err.et
-index db81f5d294b..1eca18e043e 100644
---- a/third_party/heimdal/lib/hx509/hx509_err.et
-+++ b/third_party/heimdal/lib/hx509/hx509_err.et
-@@ -64,4 +64,4 @@ error_code NO_PROMPTER, "No prompter function defined"
- error_code SIGNATURE_WITHOUT_SIGNER, "Signature requires signer, but none available"
--error_code RSA_PUBLIC_ENCRYPT, "RSA public encyption failed"
--error_code RSA_PRIVATE_ENCRYPT, "RSA private encyption failed"
-+error_code RSA_PUBLIC_ENCRYPT, "RSA public encryption failed"
-+error_code RSA_PRIVATE_ENCRYPT, "RSA private encryption failed"
- error_code RSA_PUBLIC_DECRYPT, "RSA public decryption failed"
-diff --git a/third_party/heimdal/lib/krb5/crypto.c b/third_party/heimdal/lib/krb5/crypto.c
-index 2fb4f0620f7..0da3071361a 100644
---- a/third_party/heimdal/lib/krb5/crypto.c
-+++ b/third_party/heimdal/lib/krb5/crypto.c
-@@ -1228,3 +1228,3 @@ decrypt_internal_derived(krb5_context context,
- 			       N_("Encrypted data shorter then "
--				  "checksum + confunder", ""));
-+				  "checksum + confounder", ""));
- 	return KRB5_BAD_MSIZE;
-@@ -1307,3 +1307,3 @@ decrypt_internal_enc_then_cksum(krb5_context context,
- 			       N_("Encrypted data shorter then "
--				  "checksum + confunder", ""));
-+				  "checksum + confounder", ""));
- 	return KRB5_BAD_MSIZE;
-@@ -1393,3 +1393,3 @@ decrypt_internal(krb5_context context,
- 			       N_("Encrypted data shorter then "
--				  "checksum + confunder", ""));
-+				  "checksum + confounder", ""));
- 	return KRB5_BAD_MSIZE;
-@@ -1459,3 +1459,3 @@ decrypt_internal_special(krb5_context context,
- 			       N_("Encrypted data shorter then "
--				  "checksum + confunder", ""));
-+				  "checksum + confounder", ""));
- 	return KRB5_BAD_MSIZE;
-diff --git a/third_party/heimdal/lib/sqlite/sqlite3.c b/third_party/heimdal/lib/sqlite/sqlite3.c
-index de55858cb0f..7aaed45e977 100644
---- a/third_party/heimdal/lib/sqlite/sqlite3.c
-+++ b/third_party/heimdal/lib/sqlite/sqlite3.c
-@@ -95908,3 +95908,3 @@ static int vdbeSorterFlushPMA(VdbeSorter *pSorter){
-   ** fall back to using the final sub-task. The first (pSorter->nTask-1)
--  ** sub-tasks are prefered as they use background threads - the final
-+  ** sub-tasks are preferred as they use background threads - the final
-   ** sub-task uses the main thread. */
-diff --git a/third_party/heimdal/po/heim_com_err569856/de.po b/third_party/heimdal/po/heim_com_err569856/de.po
-index 5e6ace5d766..ba2dbf6e93d 100644
---- a/third_party/heimdal/po/heim_com_err569856/de.po
-+++ b/third_party/heimdal/po/heim_com_err569856/de.po
-@@ -275,3 +275,3 @@ msgstr "Signatur erfordert Unterzeichner, aber keiner verfügbar"
- #: ../lib/hx509/hx509_err.c:84 ../lib/hx509/hx509_err.c:85
--msgid "RSA public encyption failed"
-+msgid "RSA public encryption failed"
- msgstr "RSA-Verschlüsselung mit öffentlichem Schlüssel fehlgeschlagen"
-diff --git a/third_party/heimdal/po/heim_com_err569856/heim_com_err569856.pot b/third_party/heimdal/po/heim_com_err569856/heim_com_err569856.pot
-index 2913f6bcb9c..2305f21a962 100644
---- a/third_party/heimdal/po/heim_com_err569856/heim_com_err569856.pot
-+++ b/third_party/heimdal/po/heim_com_err569856/heim_com_err569856.pot
-@@ -269,3 +269,3 @@ msgstr ""
- #: ../lib/hx509/hx509_err.c:84 ../lib/hx509/hx509_err.c:85
--msgid "RSA public encyption failed"
-+msgid "RSA public encryption failed"
- msgstr ""
-diff --git a/third_party/heimdal/po/heimdal_krb5/de.po b/third_party/heimdal/po/heimdal_krb5/de.po
-index e7e8a1deaed..a846e4b7ece 100644
---- a/third_party/heimdal/po/heimdal_krb5/de.po
-+++ b/third_party/heimdal/po/heimdal_krb5/de.po
-@@ -327,5 +327,4 @@ msgstr "Prüfsummentyp %s ist deaktiviert."
- 
--# FIXME: s/confunder/confounder/
- #: lib/krb5/crypto.c:2958
--msgid "Encrypted data shorter then checksum + confunder"
-+msgid "Encrypted data shorter then checksum + confounder"
- msgstr "verschlüsselte Daten kürzer als Prüfsumme + Störfaktor"
-diff --git a/third_party/heimdal/po/heimdal_krb5/heimdal_krb5.pot b/third_party/heimdal/po/heimdal_krb5/heimdal_krb5.pot
-index 3edacd2c246..25e1919c063 100644
---- a/third_party/heimdal/po/heimdal_krb5/heimdal_krb5.pot
-+++ b/third_party/heimdal/po/heimdal_krb5/heimdal_krb5.pot
-@@ -551,3 +551,3 @@ msgstr ""
- #: lib/krb5/crypto.c:2958
--msgid "Encrypted data shorter then checksum + confunder"
-+msgid "Encrypted data shorter then checksum + confounder"
- msgstr ""
-diff --git a/third_party/heimdal/po/heimdal_krb5/sv_SE.po b/third_party/heimdal/po/heimdal_krb5/sv_SE.po
-index f9721845a0b..79d094172bf 100644
---- a/third_party/heimdal/po/heimdal_krb5/sv_SE.po
-+++ b/third_party/heimdal/po/heimdal_krb5/sv_SE.po
-@@ -542,3 +542,3 @@ msgstr ""
- #: lib/krb5/crypto.c:2979
--msgid "Encrypted data shorter then checksum + confunder"
-+msgid "Encrypted data shorter then checksum + confounder"
- msgstr ""


=====================================
debian/patches/ldb-no-replace.diff
=====================================
@@ -0,0 +1,20 @@
+From: Michael Tokarev <mjt at tls.msk.ru>
+Subject: drop "replace" dependency from libldb
+Date: Wed, 27 Nov 2024 21:51:50 +0300
+Forwarded: not-needed
+
+When building as a sub-library within samba, where
+libreplace is a private library, libldb.so will
+have rpath pointing to the private samba dir.  Since
+ldb actually does not use anything from libreplace,
+just remove the dependency.
+
+diff --git a/lib/ldb/wscript b/lib/ldb/wscript
+index ab33f7784a6..41675c7ebe9 100644
+--- a/lib/ldb/wscript
++++ b/lib/ldb/wscript
+@@ -139,3 +139,3 @@ def build(bld):
+                       COMMON_SRC + ' ' + LDB_MAP_SRC,
+-                      deps='tevent LIBLDB_MAIN replace',
++                      deps='tevent LIBLDB_MAIN', # replace',
+                       includes='include',


=====================================
debian/patches/libsmbclient-ensure-lfs-221618.patch
=====================================
@@ -2,6 +2,7 @@ Subject: ensure libsmbclient.h is being used with LFS enabled
 From: Michael Tokarev <mjt at tls.msk.ru>
 Date: Sat, 02 Apr 2022 19:01:55 +0300
 Bug-Debian: https://bugs.debian.org/221618
+Forwarded: not-needed
 
 We build samba with LFS (Large File Support) even on 32bits.
 This means some types like off_t are 64-bit wide, again,


=====================================
debian/patches/lower-dns-lookup-mismatch-messages.patch
=====================================
@@ -1,6 +1,7 @@
 From: Michael Tokarev <mjt at tls.msk.ru>
 Date: Fri, 01 Mar 2024 16:16:20 +0300
 Subject: lower dns lookup mismatch messages
+Forwarded: https://gitlab.com/samba-team/samba/-/merge_requests/3872
 
 There's just too much useless noise in the logs,
 especially when the PTR record just doesn't exist.


=====================================
debian/patches/series
=====================================
@@ -5,6 +5,7 @@ smbclient-pager.patch
 usershare.patch
 heimdal-rfc3454.txt
 add-so-version-to-private-libraries
+ldb-no-replace.diff
 fix-nfs-service-name-to-nfs-kernel-server.patch
 ctdb-config-enable-syslog-by-default.patch
 use-bzero-instead-of-memset_s.diff
@@ -15,7 +16,6 @@ disable-setuid-confchecks.patch
 move-msg.sock-from-var-lib-samba-to-run-samba.patch
 testparm-do-not-fail-if-pid-dir-does-not-exist.patch
 add-missing-libs-deps.diff
-#heimdal-spelling.patch
 fruit-disable-useless-size_t-overflow-check.patch
 meaningful-error-if-no-samba-ad-provision.patch
 meaningful-error-if-no-python3-markdown.patch


=====================================
debian/rules
=====================================
@@ -183,10 +183,13 @@ bin/built.stamp: bin/configured.stamp
 # recompilation/relinking is done again, to adopt to the actual install
 # paths. There's no need (for now) to build samba to be run from the build
 # directory, so we use `waf install' here instead of `waf build'.
+# However, as of 4.16 and still 4.21, `waf install' without the build step fails,
+# since it tries to run two executables which are not built.
 # Build these two executables first, and build the install stage.
 # This will pefrorm unnecessary/extra install step (into d/tmp), which
 # we'll repeat during actual install stage, but this is definitely
 # better/faster than building whole thing for _not_ running from the build dir.
+	${WAF} $(if $V,-v) --targets=compile_et,asn1_compile
 	${WAF} $(if $V,-v) install --destdir="${DESTDIR}"
 	touch $@
 build-indep:



View it on GitLab: https://salsa.debian.org/samba-team/samba/-/compare/21bc852b61798d99a9f8028e2de20cdb0afda8f9...6543f6f106283d4c61450ea248bf901ee16e318f

-- 
View it on GitLab: https://salsa.debian.org/samba-team/samba/-/compare/21bc852b61798d99a9f8028e2de20cdb0afda8f9...6543f6f106283d4c61450ea248bf901ee16e318f
You're receiving this email because of your account on salsa.debian.org.


-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/pkg-samba-maint/attachments/20241128/1a6fd6f2/attachment-0001.htm>


More information about the Pkg-samba-maint mailing list