diff options
| author | Taner Tas <taner76@gmail.com> | 2018-09-07 06:54:46 +0300 |
|---|---|---|
| committer | Natanael Copa <ncopa@alpinelinux.org> | 2018-09-07 13:51:57 +0000 |
| commit | 3bafd8182a19a09c7fab82642eaf6e9b636356fe (patch) | |
| tree | f1aede741f02617f3a8097304dbf942d466fb485 | |
| parent | 4381853e68d88c8f5e33960b6dbe48a7a22092fa (diff) | |
| download | aports-3bafd8182a19a09c7fab82642eaf6e9b636356fe.tar.bz2 aports-3bafd8182a19a09c7fab82642eaf6e9b636356fe.tar.xz | |
main/samba: Upgrade to 4.8.5
* Corrected samba.confd
* Adjust winbind_krb5_locator.so file new path
* Re-arrange depends,makedepends,source
| -rw-r--r-- | main/samba/APKBUILD | 55 | ||||
| -rw-r--r-- | main/samba/samba.confd | 5 |
2 files changed, 43 insertions, 17 deletions
diff --git a/main/samba/APKBUILD b/main/samba/APKBUILD index ff3ee70b30..0b8baff68f 100644 --- a/main/samba/APKBUILD +++ b/main/samba/APKBUILD @@ -1,12 +1,13 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=samba -pkgver=4.8.4 -pkgrel=1 +pkgver=4.8.5 +pkgrel=0 pkgdesc="Tools to access a server's filespace and printers via SMB" url="http://www.samba.org" arch="all" license="GPL-3.0-or-later LGPL-3.0-or-later" -subpackages="$pkgname-dev $pkgname-doc +subpackages=" + $pkgname-dev $pkgname-doc $pkgname-common::noarch $pkgname-initscript::noarch $pkgname-common-tools:_common_tools @@ -33,25 +34,49 @@ subpackages="$pkgname-dev $pkgname-doc py-$pkgname:_py $pkgname-test:_test $pkgname-libs-py:_libs_py - $pkgname-libs" + $pkgname-libs + " -depends="$pkgname-server=$pkgver-r$pkgrel +depends=" + $pkgname-server=$pkgver-r$pkgrel $pkgname-client=$pkgver-r$pkgrel - $pkgname-common-tools=$pkgver-r$pkgrel" + $pkgname-common-tools=$pkgver-r$pkgrel + " # note that heimdal is required (over mit krb5) for AD DC functionality -makedepends="popt-dev ncurses-dev openldap-dev e2fsprogs-dev - talloc-dev tdb-dev py2-tdb ldb-dev>=1.2.2 cups-dev python2-dev libcap-dev - tevent-dev py2-tevent iniparser-dev perl subunit-dev docbook-xsl - libarchive-dev acl-dev fuse-dev libtirpc-dev rpcgen linux-pam-dev" -source="https://us1.samba.org/samba/ftp/stable/$pkgname-$pkgver.tar.gz +makedepends=" + acl-dev + cups-dev + docbook-xsl + e2fsprogs-dev + fuse-dev + iniparser-dev + ldb-dev + libarchive-dev + libcap-dev + libtirpc-dev + linux-pam-dev + ncurses-dev + openldap-dev + perl + popt-dev + py2-tdb + py2-tevent + python2-dev + rpcgen + subunit-dev + talloc-dev + tdb-dev + tevent-dev + " +source=" + https://us1.samba.org/samba/ftp/stable/$pkgname-$pkgver.tar.gz domain.patch getpwent_r.patch musl_uintptr.patch netdb-defines.patch netapp.patch bind-9.12.patch - $pkgname.initd $pkgname.confd $pkgname.logrotate @@ -334,7 +359,7 @@ _winbind_krb5_locator() { depends= cd "$pkgdir" _mv_files \ - usr/lib/winbind_krb5_locator.so + usr/lib/samba/krb5 } _pam_winbind() { @@ -524,7 +549,7 @@ libs() { "$pkgdir"/usr } -sha512sums="a3ad651717df5a441064693412965a66bb3d7927baa4ca5625b0948d7253af74eaf05c7e75e6c07853186513df38a925019616cd6439a96e9828b04cd8c5350d samba-4.8.4.tar.gz +sha512sums="23a88c48214c3bf4cbc135cb84873bb8d12f32187ccbda47b02495fa4a12458f103de5e968e8f9a5958c116f618332cfffbf54d084e4f1e363fbf079b897e3a0 samba-4.8.5.tar.gz 62d373dbaee75121a1d73f2c09cdca7239705808ff807b171d1d5a28fd4ffc66bdb52494b62786d7aaba8aeece5c08433b532ca96a28d712452fe9daac8d8d2e domain.patch 0d4fd9862191554dc9c724cec0b94fd19afbfd0c4ed619e4c620c075e849cb3f3d44db1e5f119d890da23a3dd0068d9873703f3d86c47b91310521f37356208b getpwent_r.patch a99e771f28d787dc22e832b97aa48a1c5e13ddc0c030c501a3c12819ff6e62800ef084b62930abe88c6767d785d5c37e2e9f18a4f9a24f2ee1f5d9650320c556 musl_uintptr.patch @@ -532,5 +557,5 @@ a99e771f28d787dc22e832b97aa48a1c5e13ddc0c030c501a3c12819ff6e62800ef084b62930abe8 202667cb0383414d9289cd67574f5e1140c9a0ff63bb82a746a59b2397a00db15654bfb30cb5ec1cd68a097899be0f849d9aab4c0d210152386c9e66c640f0c0 netapp.patch 27f12c8395be25d9806d232cc30334f2f7c7d175971d2d1944dd886d699e0381a6f222c17e3d7bc087cf7a29bfb3e98cf25ba98f414c4afe0297b9d134a28bd8 bind-9.12.patch 96070e2461370437f48571e7de550c13a332fef869480cfe92e7cac73a998f6c2ee85d2580df58211953bebd0e577691aa710c8edddf3ea0f30e9d47d0a2fd44 samba.initd -9cf71d667509d94ea8d5c3329178f51d0c9aa1191ad0b940eddf5e9e77464fea137f15afbf82618976ffd8b1f5561944ade3223d157bc86c8f50e3708dcf5704 samba.confd +e2b49cb394e758447ca97de155a61b4276499983a0a5c00b44ae621c5559b759a766f8d1c8d3ee98ad5560f4064a847a7a20cfa2e14f85c061bec8b80fd649eb samba.confd 3458a4e1f8a8b44c966afb339b2dca51615be049f594c14911fc4d8203623deee416b6fe881436e246fc7d49c97a2b3bf9c5f33ba774302b24190a1103d6b67d samba.logrotate" diff --git a/main/samba/samba.confd b/main/samba/samba.confd index c30cb0a2cc..902cb1ad10 100644 --- a/main/samba/samba.confd +++ b/main/samba/samba.confd @@ -1,6 +1,7 @@ -# add "winbindd" to daemon_list if you want start winbind from here as well -# leave empty or unset for role based samba services (eg: dc) +# Add "winbindd" to daemon_list if you want start winbind from here as well daemon_list="smbd nmbd" +# Use "samba" alone for role based samba4 services (eg: ad-dc). +#daemon_list="samba" smbd_options="-D" nmbd_options="-D" |