diff options
| author | Natanael Copa <ncopa@alpinelinux.org> | 2019-12-04 14:04:30 +0000 |
|---|---|---|
| committer | Natanael Copa <ncopa@alpinelinux.org> | 2019-12-04 14:05:28 +0000 |
| commit | d25d2773c71e9751d0b3dc9bf20cafb8af32f868 (patch) | |
| tree | 55da040773fa1ca38b6df1028815eac814e18582 | |
| parent | 3992270d4df7bbfa00624abcaba125bc84198c53 (diff) | |
| download | aports-d25d2773c71e9751d0b3dc9bf20cafb8af32f868.tar.bz2 aports-d25d2773c71e9751d0b3dc9bf20cafb8af32f868.tar.xz | |
main/samba: fix depends for samba-dc
fixes #10989
| -rw-r--r-- | main/samba/APKBUILD | 7 | ||||
| -rw-r--r-- | main/samba/qsort-compar.patch | 22 |
2 files changed, 27 insertions, 2 deletions
diff --git a/main/samba/APKBUILD b/main/samba/APKBUILD index 02714f1c47..42d1c89deb 100644 --- a/main/samba/APKBUILD +++ b/main/samba/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=samba pkgver=4.11.2 -pkgrel=0 +pkgrel=1 pkgdesc="Tools to access a server's filespace and printers via SMB" url="https://www.samba.org/" arch="all" @@ -42,6 +42,7 @@ depends=" $pkgname-common-tools=$pkgver-r$pkgrel " +_dc_deps="py3-dnspython tdb" # note that heimdal is required (over mit krb5) for AD DC functionality makedepends=" acl-dev @@ -70,6 +71,7 @@ makedepends=" talloc-dev tdb-dev tevent-dev + $_dc_deps " source=" https://us1.samba.org/samba/ftp/stable/$pkgname-$pkgver.tar.gz @@ -396,7 +398,8 @@ dc() { depends="$pkgname-common=$pkgver-r$pkgrel $pkgname-server=$pkgver-r$pkgrel $pkgname-winbind=$pkgver-r$pkgrel - py3-$pkgname=$pkgver-r$pkgrel tdb" + py3-$pkgname=$pkgver-r$pkgrel + $_dc_deps" cd "$pkgdir" _mv_files \ usr/bin/samba-tool \ diff --git a/main/samba/qsort-compar.patch b/main/samba/qsort-compar.patch new file mode 100644 index 0000000000..3b2e11a15b --- /dev/null +++ b/main/samba/qsort-compar.patch @@ -0,0 +1,22 @@ +diff --git a/source4/dsdb/samdb/ldb_modules/count_attrs.c b/source4/dsdb/samdb/ldb_modules/count_attrs.c +index b0d1b22..29f1b94 100644 +--- a/source4/dsdb/samdb/ldb_modules/count_attrs.c ++++ b/source4/dsdb/samdb/ldb_modules/count_attrs.c +@@ -222,7 +222,7 @@ static const char **get_sorted_attrs(TALLOC_CTX *mem_ctx, + attrs[i] = a; + } + +- qsort(attrs, n_attrs, sizeof(char *), (__compar_fn_t)strcasecmp_ptr); ++ qsort(attrs, n_attrs, sizeof(char *), (int (*)(const void *, const void *))strcasecmp_ptr); + return attrs; + } + +@@ -313,7 +313,7 @@ static int count_attrs_search_callback(struct ldb_request *req, + } + + qsort(found_attrs, msg->num_elements, sizeof(char *), +- (__compar_fn_t)strcasecmp_ptr); ++ (int (*)(const void *, const void *))strcasecmp_ptr); + + + /* find and report duplicates */ |