aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKevin Daudt <kdaudt@alpinelinux.org>2021-10-17 10:33:45 +0000
committerKevin Daudt <kdaudt@alpinelinux.org>2021-10-17 14:40:19 +0000
commita785a8c994f9bec1bedeb39b899e7fc6cb20ac1d (patch)
treee12b14dab566baf85c0e33179e22a8f385976cb7
parentdd1fa9c4171ee9978397d9255af7c0fb1f72d780 (diff)
downloadaports-a785a8c994f9bec1bedeb39b899e7fc6cb20ac1d.tar.gz
aports-a785a8c994f9bec1bedeb39b899e7fc6cb20ac1d.tar.bz2
aports-a785a8c994f9bec1bedeb39b899e7fc6cb20ac1d.tar.xz
main/samba: upgrade to 4.15.0
samba 4.14 requires pyldb <2.4, which we no longer have in the repositories.
-rw-r--r--main/samba/APKBUILD22
-rw-r--r--main/samba/samba-bgqd-include-signal-h.patch13
-rw-r--r--main/samba/vfs_btrfs_14790.patch45
3 files changed, 23 insertions, 57 deletions
diff --git a/main/samba/APKBUILD b/main/samba/APKBUILD
index 572052ce1a..16612a7ac8 100644
--- a/main/samba/APKBUILD
+++ b/main/samba/APKBUILD
@@ -1,7 +1,7 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=samba
-pkgver=4.14.6
-pkgrel=1
+pkgver=4.15.0
+pkgrel=0
pkgdesc="Tools to access a server's filespace and printers via SMB"
url="https://www.samba.org/"
arch="all"
@@ -90,7 +90,7 @@ source="
musl_rm_unistd_incl.patch
add_missing___compar_fn_t.patch
pidl.patch
- vfs_btrfs_14790.patch
+ samba-bgqd-include-signal-h.patch
$pkgname.initd
$pkgname.confd
$pkgname.logrotate
@@ -284,13 +284,11 @@ _client_libs() {
_mv_files \
usr/lib/$pkgname/libcli-ldap-samba4.so \
usr/lib/$pkgname/libcmdline-contexts-samba4.so \
- usr/lib/$pkgname/libcmdline-credentials-samba4.so \
usr/lib/$pkgname/libdsdb-garbage-collect-tombstones-samba4.so \
usr/lib/$pkgname/libgpo-samba4.so \
usr/lib/$pkgname/libhttp-samba4.so \
usr/lib/$pkgname/libmscat-samba4.so \
usr/lib/$pkgname/libnetif-samba4.so \
- usr/lib/$pkgname/libpopt-samba3-cmdline-samba4.so \
usr/lib/$pkgname/libprinter-driver-samba4.so \
usr/lib/$pkgname/libregistry-samba4.so \
usr/lib/$pkgname/libsmbclient-raw-samba4.so \
@@ -304,9 +302,8 @@ client() {
_mv_files \
usr/bin/cifsdd \
usr/bin/dumpmscat \
- usr/bin/findsmb \
usr/bin/dbwrap_tool \
- usr/bin/mdfind \
+ usr/bin/mdsearch \
usr/bin/mvxattr \
usr/bin/nmblookup \
usr/bin/oLschema2ldif \
@@ -474,7 +471,8 @@ server() {
\
usr/lib/$pkgname/auth \
usr/lib/$pkgname/libxattr-tdb-samba4.so \
- usr/lib/$pkgname/vfs
+ usr/lib/$pkgname/vfs \
+ usr/lib/$pkgname/samba-bgqd
}
@@ -541,9 +539,11 @@ libs() {
usr/lib/$pkgname/libcli-spoolss-samba4.so \
usr/lib/$pkgname/libcliauth-samba4.so \
usr/lib/$pkgname/libclidns-samba4.so \
+ usr/lib/$pkgname/libcmdline-samba4.so \
usr/lib/$pkgname/libcmocka-samba4.so \
usr/lib/$pkgname/libcommon-auth-samba4.so \
usr/lib/$pkgname/libdbwrap-samba4.so \
+ usr/lib/$pkgname/libdcerpc-pkt-auth-samba4.so \
usr/lib/$pkgname/libdcerpc-samba-samba4.so \
usr/lib/$pkgname/libevents-samba4.so \
usr/lib/$pkgname/libflag-mapping-samba4.so \
@@ -561,7 +561,6 @@ libs() {
usr/lib/$pkgname/libmsrpc3-samba4.so \
usr/lib/$pkgname/libndr-samba-samba4.so \
usr/lib/$pkgname/libndr-samba4.so \
- usr/lib/$pkgname/libpopt-samba3-samba4.so \
usr/lib/$pkgname/libsamba-cluster-support-samba4.so \
usr/lib/$pkgname/libsamba-modules-samba4.so \
usr/lib/$pkgname/libsamba-security-samba4.so \
@@ -577,7 +576,6 @@ libs() {
usr/lib/$pkgname/libtalloc-report-samba4.so \
usr/lib/$pkgname/libtdb-wrap-samba4.so \
usr/lib/$pkgname/libtrusts-util-samba4.so \
- usr/lib/$pkgname/libutil-cmdline-samba4.so \
usr/lib/$pkgname/libutil-reg-samba4.so \
usr/lib/$pkgname/libutil-setid-samba4.so \
usr/lib/$pkgname/libutil-tdb-samba4.so \
@@ -605,7 +603,7 @@ libs() {
}
sha512sums="
-0ce3f46b2693daa27656fe9a04925cbe7dd398342cab352f0422a350eb9f91d1ea6d64fb18d04010b93fb3c0b9fe6434b23deb1f26018bd1f9bdc1b0f97beca2 samba-4.14.6.tar.gz
+5fcd8797f0ac2821f1bb213c9a39c0928847905f701003618f9f160eaa98f3fea25e3d8d4047658b0bd164f3e6a2a63fd7b0133317e536997c764acf7803950d samba-4.15.0.tar.gz
58de5e79fdfd06e828d478e112d581d333a8bee88d2602b92204d780f0d707b27dd84f8e2e6b00fca40da81c8fe99aa5bcec70d8b393d3a0a83199c72a4aa48b getpwent_r.patch
b7906d66fe55a980a54161ee3f311b51bcbce76b8d4c8cc1ba6d0c5bdf98232cb192b9d2c1aa7b3e2742f5b9848c6cf429347940eefe66c3e0eda1d5aac1bf93 musl_uintptr.patch
1854577d0e4457e27da367a6c7ec0fb5cfd63cefea0a39181c9d6e78cf8d3eb50878cdddeea3daeec955d00263151c2f86ea754ff4276ef98bc52c0276d9ffe8 netdb-defines.patch
@@ -614,7 +612,7 @@ c0afe8b1dfddc5290c9aa611163d20adc3a546f54bba0081f739cda4255829f1a72bae422b6cb049
9bf4bbc8b03d9ea17d2f8ffeaf3a83541b171936a90bb8d75b08cc5afbdbaaec545c1b3782c90ae2ffc4568ab4e6f15fb21899d80c654a796301e16429c93b65 musl_rm_unistd_incl.patch
bc2df70e327fea5dfbd923600225f1448815d842c37d6937dd74eab7f7699d7f52cd7a8e28a61233974649cf86661a0107dce5019d33b71205e4b41bac73f4e2 add_missing___compar_fn_t.patch
c0bbe1186b150a9bb2a0b741a8cfbd7a5109e5fed1eaa07aaa38cf026ebe054d38cc01e2496f0cab7b40f743e1b7ecfbf8a4d5820810226c4152021df65f36dc pidl.patch
-2dc8bd253a9387c509a39ae87250c8062dd2835836dd77097f0b6b1a6b65ea32a70f396c76342f9a24a52e4a4000eb8b748ad5dee271c4390f64709d8ef82a65 vfs_btrfs_14790.patch
+3912396af213a11a6c5ec06da5c7a6385470e0b0983cdd8c368748ee6265ee047ed34ca75f324aab0a83895250a2202793d90927ba3a710e57151e64aa536bdc samba-bgqd-include-signal-h.patch
96070e2461370437f48571e7de550c13a332fef869480cfe92e7cac73a998f6c2ee85d2580df58211953bebd0e577691aa710c8edddf3ea0f30e9d47d0a2fd44 samba.initd
e2b49cb394e758447ca97de155a61b4276499983a0a5c00b44ae621c5559b759a766f8d1c8d3ee98ad5560f4064a847a7a20cfa2e14f85c061bec8b80fd649eb samba.confd
3458a4e1f8a8b44c966afb339b2dca51615be049f594c14911fc4d8203623deee416b6fe881436e246fc7d49c97a2b3bf9c5f33ba774302b24190a1103d6b67d samba.logrotate
diff --git a/main/samba/samba-bgqd-include-signal-h.patch b/main/samba/samba-bgqd-include-signal-h.patch
new file mode 100644
index 0000000000..37a40604e3
--- /dev/null
+++ b/main/samba/samba-bgqd-include-signal-h.patch
@@ -0,0 +1,13 @@
+SIGTERM and SIGPIPE are used but undefined.
+diff --git a/source3/printing/samba-bgqd.c b/source3/printing/samba-bgqd.c
+index 8ac6ec5..09a5d12 100644
+--- a/source3/printing/samba-bgqd.c
++++ b/source3/printing/samba-bgqd.c
+@@ -40,6 +40,7 @@
+ #include "source3/lib/util_procid.h"
+ #include "source3/auth/proto.h"
+ #include "source3/printing/queue_process.h"
++#include <signal.h>
+
+ static void watch_handler(struct tevent_req *req)
+ {
diff --git a/main/samba/vfs_btrfs_14790.patch b/main/samba/vfs_btrfs_14790.patch
deleted file mode 100644
index 5364a7a2af..0000000000
--- a/main/samba/vfs_btrfs_14790.patch
+++ /dev/null
@@ -1,45 +0,0 @@
-From 8074cd96b492fd6a47d31744a08f5177b6e7823f Mon Sep 17 00:00:00 2001
-From: Ralph Boehme <slow@samba.org>
-Date: Mon, 9 Aug 2021 19:30:21 +0200
-Subject: [PATCH] vfs_btrfs: fix btrfs_fget_compression()
-
-BUG: https://bugzilla.samba.org/show_bug.cgi?id=14790
-
-Reported-by: noel.kuntze@thermi.consulting
-Signed-off-by: Ralph Boehme <slow@samba.org>
----
- source3/modules/vfs_btrfs.c | 7 +++----
- 1 file changed, 3 insertions(+), 4 deletions(-)
-
-diff --git a/source3/modules/vfs_btrfs.c b/source3/modules/vfs_btrfs.c
-index 789bc6d6e8a..a31b232af4d 100644
---- a/source3/modules/vfs_btrfs.c
-+++ b/source3/modules/vfs_btrfs.c
-@@ -460,11 +460,12 @@ static NTSTATUS btrfs_fget_compression(struct vfs_handle_struct *handle,
- const char *p = NULL;
- int ret;
- long flags = 0;
-+ int fsp_fd = fsp_get_pathref_fd(fsp);
- int fd = -1;
- NTSTATUS status;
-
- if (!fsp->fsp_flags.is_pathref) {
-- ret = ioctl(fd, FS_IOC_GETFLAGS, &flags);
-+ ret = ioctl(fsp_fd, FS_IOC_GETFLAGS, &flags);
- if (ret < 0) {
- DBG_WARNING("FS_IOC_GETFLAGS failed: %s, fd %lld\n",
- strerror(errno), (long long)fd);
-@@ -482,9 +483,7 @@ static NTSTATUS btrfs_fget_compression(struct vfs_handle_struct *handle,
- return NT_STATUS_NOT_IMPLEMENTED;
- }
-
-- fd = fsp_get_pathref_fd(fsp);
--
-- p = sys_proc_fd_path(fd, buf, sizeof(buf));
-+ p = sys_proc_fd_path(fsp_fd, buf, sizeof(buf));
- if (p == NULL) {
- return NT_STATUS_NO_MEMORY;
- }
---
-2.31.1
-