Hi, builds and tests fine. OK.
Ian McWilliam > On 19 Apr 2025, at 2:34 pm, Bjorn Ketelaars <b...@openbsd.org> wrote: > > Diff below updates samba to 4.22.1. Changes are detailed in [0]. This > update enables us to remove a patch, as the issue at hand has been > resolved by upstream [1]. > > Run tested on amd64. > > Comments/ ok? > > > [0] https://www.samba.org/samba/history/samba-4.22.1.html > [1] > https://github.com/samba-team/samba/commit/93bc238aa91ec8041648d17e11bf235132974eda > > > diff --git Makefile Makefile > index 82b6285302f..700fd735cc2 100644 > --- Makefile > +++ Makefile > @@ -1,4 +1,4 @@ > -VERSION = 4.22.0 > +VERSION = 4.22.1 > DISTNAME = samba-${VERSION} > EPOCH = 0 > > diff --git distinfo distinfo > index 5331cc85999..55a590fc189 100644 > --- distinfo > +++ distinfo > @@ -1,2 +1,2 @@ > -SHA256 (samba-4.22.0.tar.gz) = s5JC4awfVGnmNMlLLkcgReUGCXXC3WxM3N/ODFWGzXY= > -SIZE (samba-4.22.0.tar.gz) = 42860320 > +SHA256 (samba-4.22.1.tar.gz) = ah+J8aslkW4lXxwsOkqII1qFSvLspAu52bunVFtoSgo= > +SIZE (samba-4.22.1.tar.gz) = 42866082 > diff --git patches/patch-source3_modules_vfs_acl_tdb_c > patches/patch-source3_modules_vfs_acl_tdb_c > deleted file mode 100644 > index 30a0133d19f..00000000000 > --- patches/patch-source3_modules_vfs_acl_tdb_c > +++ /dev/null > @@ -1,14 +0,0 @@ > -Workaround/fix for https://bugzilla.samba.org/show_bug.cgi?id=11761 > - > -Index: source3/modules/vfs_acl_tdb.c > ---- source3/modules/vfs_acl_tdb.c.orig > -+++ source3/modules/vfs_acl_tdb.c > -@@ -58,7 +58,7 @@ static bool acl_tdb_init(void) > - > - become_root(); > - acl_db = db_open(NULL, dbname, 0, TDB_DEFAULT, O_RDWR|O_CREAT, 0600, > -- DBWRAP_LOCK_ORDER_1, DBWRAP_FLAG_NONE); > -+ DBWRAP_LOCK_ORDER_2, DBWRAP_FLAG_NONE); > - unbecome_root(); > - > - if (acl_db == NULL) { > diff --git patches/patch-source3_wscript patches/patch-source3_wscript > index c0e0551ac29..fc463bf587d 100644 > --- patches/patch-source3_wscript > +++ patches/patch-source3_wscript > @@ -21,7 +21,7 @@ Index: source3/wscript > conf.ADD_LDFLAGS("-Wl,--export-dynamic", testflags=True) > > # We crash without vfs_default > -@@ -1745,7 +1746,7 @@ int main(void) { > +@@ -1749,7 +1750,7 @@ int main(void) { > else: > conf.fatal('AFS headers not available, but --with-fake-kaserver > was specified') >
