Diff below updates samba to the first release of the 4.24 branch.
Changes are listed in [0]. Please note that this release of samba
depends on updates of databases/tdb to 1.4.15 and devel/libtalloc to
2.4.4, which are part of the diff below.
Bumped several shared libraries based on output of check_sym.
Run tested on amd64.
Comments/OK?
[0] https://www.samba.org/samba/history/samba-4.24.0.html
diff --git databases/tdb/Makefile databases/tdb/Makefile
index 43659b7f166..ed08d935250 100644
--- databases/tdb/Makefile
+++ databases/tdb/Makefile
@@ -2,7 +2,7 @@ COMMENT-main= trivial database library
COMMENT-python= Python ${MODPY_VERSION} bindings for tdb
# Keep in sync with the version bundled in net/samba
-V= 1.4.14
+V= 1.4.15
DISTNAME= tdb-$V
PKGNAME-python= py3-${DISTNAME}
diff --git databases/tdb/distinfo databases/tdb/distinfo
index ab39feb7fb6..da12e955702 100644
--- databases/tdb/distinfo
+++ databases/tdb/distinfo
@@ -1,2 +1,2 @@
-SHA256 (tdb-1.4.14.tar.gz) = FE9AfULteg7BRwpA7xetQRM/6RC86GXdn+CE1JyQdSY=
-SIZE (tdb-1.4.14.tar.gz) = 755817
+SHA256 (tdb-1.4.15.tar.gz) = +6CdjfHxuQcq6ujniyvUPFr+8gsvbe76YzqhSjd6jdI=
+SIZE (tdb-1.4.15.tar.gz) = 753485
diff --git devel/libtalloc/Makefile devel/libtalloc/Makefile
index f22c24d24ea..f0431b26763 100644
--- devel/libtalloc/Makefile
+++ devel/libtalloc/Makefile
@@ -2,8 +2,7 @@ COMMENT-main= hierarchical memory pool system with destructors
COMMENT-python= Python ${MODPY_VERSION} bindings for talloc
# Keep in sync with the version bundled in net/samba
-V= 2.4.3
-REVISION= 0
+V= 2.4.4
DISTNAME= talloc-$V
PKGNAME-main= lib${DISTNAME}
@@ -11,7 +10,7 @@ PKGNAME-python= py3-${DISTNAME}
MULTI_PACKAGES= -main -python
-SHARED_LIBS+= talloc 1.2
+SHARED_LIBS+= talloc 1.3
SHARED_LIBS+= ${PYTALLOC_UTIL_LIBNAME} 0.0
PYTALLOC_UTIL_LIBNAME = pytalloc-util.cpython-${MODPY_MAJORMINOR}
diff --git devel/libtalloc/distinfo devel/libtalloc/distinfo
index e36eef91099..4e54cd1b0dc 100644
--- devel/libtalloc/distinfo
+++ devel/libtalloc/distinfo
@@ -1,2 +1,2 @@
-SHA256 (talloc-2.4.3.tar.gz) = 3EbEC59GuzTdl/5B9Uiw6LJHt3qRhXZzPFKOg6vYVN0=
-SIZE (talloc-2.4.3.tar.gz) = 684092
+SHA256 (talloc-2.4.4.tar.gz) = VeR5lAGME3Q0hVROcgZ4D/uzyElecEqZY2UD5ud6v1k=
+SIZE (talloc-2.4.4.tar.gz) = 684541
diff --git net/samba/Makefile net/samba/Makefile
index 5a1f99b0273..b079eb14a25 100644
--- net/samba/Makefile
+++ net/samba/Makefile
@@ -1,4 +1,4 @@
-VERSION = 4.23.6
+VERSION = 4.24.0
DISTNAME = samba-${VERSION}
EPOCH = 0
@@ -22,13 +22,13 @@ SHARED_LIBS = dcerpc 3.0 \
netapi 3.4 \
samba-credentials 3.1 \
samba-errors 2.1 \
- samba-hostconfig 17.0 \
+ samba-hostconfig 18.0 \
samba-passdb 3.2 \
samba-policy 0.0 \
- samba-util 12.0 \
- samdb 5.0 \
+ samba-util 13.0 \
+ samdb 6.0 \
smbclient 6.3 \
- smbconf 18.0 \
+ smbconf 19.0 \
smbldap 1.0 \
tevent 2.4 \
tevent-util 2.0 \
@@ -78,10 +78,10 @@ RUN_DEPENDS-docs =
LIB_DEPENDS-main = archivers/libarchive \
converters/libiconv \
databases/openldap \
- databases/tdb>=1.4.14 \
+ databases/tdb>=1.4.15 \
devel/jansson \
devel/libinotify \
- devel/libtalloc>=2.4.3 \
+ devel/libtalloc>=2.4.4 \
devel/libtalloc,-python \
devel/popt \
net/avahi,-libs \
diff --git net/samba/distinfo net/samba/distinfo
index 4f592b78138..15fd423c539 100644
--- net/samba/distinfo
+++ net/samba/distinfo
@@ -1,2 +1,2 @@
-SHA256 (samba-4.23.6.tar.gz) = 49q9i15C3Jdmn6D67wMlEKlOSWtY9wZwguUDbYjw5wI=
-SIZE (samba-4.23.6.tar.gz) = 43306831
+SHA256 (samba-4.24.0.tar.gz) = Gx5Ff9ZRphLNCCJsxu/QTl0B422RjItMTkcOdOhogeo=
+SIZE (samba-4.24.0.tar.gz) = 43386689
diff --git net/samba/patches/patch-lib_util_util_crypt_c net/samba/patches/patch-lib_util_util_crypt_c
deleted file mode 100644
index b1c348297cf..00000000000
--- net/samba/patches/patch-lib_util_util_crypt_c
+++ /dev/null
@@ -1,15 +0,0 @@
-Index: lib/util/util_crypt.c
---- lib/util/util_crypt.c.orig
-+++ lib/util/util_crypt.c
-@@ -2,7 +2,11 @@
- #include "data_blob.h"
- #include "discard.h"
- #include <talloc.h>
-+#ifdef __OpenBSD__
-+#include <unistd.h>
-+#else
- #include <crypt.h>
-+
No comments:
Post a Comment