Diff below updates samba to 4.25.1. Changes:
https://www.samba.org/samba/history/samba-4.25.1.html.
Run tested on amd64.
OK for committing this to -current and -stable?
diff --git Makefile Makefile
index 3f44577efcc..c9a5b3c17dc 100644
--- Makefile
+++ Makefile
@@ -1,4 +1,4 @@
-VERSION = 4.25.0
+VERSION = 4.25.1
DISTNAME = samba-${VERSION}
EPOCH = 0
diff --git distinfo distinfo
index 6a9d15ef89f..3a2a012dd89 100644
--- distinfo
+++ distinfo
@@ -1,2 +1,2 @@
-SHA256 (samba-4.25.0.tar.gz) = Liy3KWgzs1uPen+3YEXgxXrcDCzQMmSzffXVjkDyhDc=
-SIZE (samba-4.25.0.tar.gz) = 43571277
+SHA256 (samba-4.25.1.tar.gz) = fzZ1Rbymmqlol2KPgvDwTUtms7yzbLl4ubuVLEtMQo0=
+SIZE (samba-4.25.1.tar.gz) = 43590836
diff --git patches/patch-lib_util_statvfs_c patches/patch-lib_util_statvfs_c
deleted file mode 100644
index 80690c8f900..00000000000
--- patches/patch-lib_util_statvfs_c
+++ /dev/null
@@ -1,15 +0,0 @@
-Fix a type mismatch by passing OpenBSD's native struct statfs—which contains
-non-standard fields like f_iosize and f_flags—instead of POSIX struct statvfs.
-
-Index: lib/util/statvfs.c
---- lib/util/statvfs.c.orig
-+++ lib/util/statvfs.c
-@@ -79,7 +79,7 @@ static int darwin_fs_capabilities(const char * path)
-
- #if defined(BSD_STYLE_STATVFS)
-
--static void bsd_init_statvfs(const struct statvfs *src,
-+static void bsd_init_statvfs(const struct statfs *src,
- struct vfs_statvfs_struct *dst)
- {
- dst->OptimalTransferSize = src->f_iosize;
