* update samba to 4.20.1-2
This commit is contained in:
parent
b8e05c751c
commit
c0247abda3
@ -10,8 +10,8 @@
|
||||
|
||||
pkgbase=samba
|
||||
pkgname=('libwbclient' 'smbclient' 'samba')
|
||||
pkgver=4.20.0
|
||||
pkgrel=3
|
||||
pkgver=4.20.1
|
||||
pkgrel=2
|
||||
arch=(x86_64 powerpc64le powerpc64 powerpc riscv64)
|
||||
url="https://www.samba.org"
|
||||
license=('GPL-3.0-or-later')
|
||||
@ -28,15 +28,28 @@ optdepends=(
|
||||
source=(https://us1.samba.org/samba/ftp/stable/${pkgbase}-${pkgver}.tar{.gz,.asc}
|
||||
samba.logrotate
|
||||
samba.pam
|
||||
samba.conf)
|
||||
samba.conf
|
||||
ldb-2.5.2-skip-wav-tevent-check.patch
|
||||
samba-4.18.4-pam.patch)
|
||||
validpgpkeys=('81F5E2832BD2545A1897B713AA99442FB680B620') #Samba Distribution Verification Key <samba-bugs@samba.org>
|
||||
sha512sums=('e820739706992ef3b4e3a7a771ad5d8efc6b87d5ccdcee7ebd41483d90fa3cc0420ba9680d059e71d7083c9c12b0d36deafcdce0224560f49bbfc3a277e7e77c'
|
||||
sha512sums=('bea2bacae5b3272045399057ddf88d8f38203dde04c718b0088fd45792cccd68047b413e66bca7418b19db8580879358b86531a8d6f2d76fbcd902c331050a84'
|
||||
'SKIP'
|
||||
'2ba0691ded467e4d6e40821f6de58c00f8962209efe2e60284c0c87756ab471c22c3d63b77d506e48c90ed0d852a2a24e41be1d499cf74a73cb99da0b503c858'
|
||||
'1e6183ab0eb812b3ef687ac2c26ce78f7cb30540f606d20023669ac00ba04075487fb72e4dc89cc05dab0269ff6aca98fc1167cc75669c225b88b592482fbf67'
|
||||
'e46ee848baabb261e7468ecee43aba4d001a24f86f5322ae522abdb75030fd0ebd9063b9df0be3576c4d1654d81331f5e389aee16ec2fa138259ae4728e94efc')
|
||||
'e46ee848baabb261e7468ecee43aba4d001a24f86f5322ae522abdb75030fd0ebd9063b9df0be3576c4d1654d81331f5e389aee16ec2fa138259ae4728e94efc'
|
||||
'19028447cbde09a425f1a07fe2d9a2a6f16cada1785e6e9684a8b573db5705b6694a29cd6f5480047360920562fcc654fc10faad39e73c565f7d475558cb57c8'
|
||||
'5cb997276a35ad6a188801deac7ccaad0e1b8c92f2070fcac62513ea371afc1d9d3414550d3c65726a4a813a4a619ada25063a6d7f145243873c1d9ed6d9690f')
|
||||
|
||||
options=(!lto)
|
||||
|
||||
### UNINSTALL dmapi package before building!!!
|
||||
|
||||
prepare() {
|
||||
cd samba-${pkgver}
|
||||
patch -Np1 -i ${srcdir}/ldb-2.5.2-skip-wav-tevent-check.patch
|
||||
patch -Np1 -i ${srcdir}/samba-4.18.4-pam.patch
|
||||
}
|
||||
|
||||
# Use samba-pkg as a staging directory for the split packages
|
||||
# (This is so RPATHS and symlinks are generated correctly via
|
||||
# make install, but the otherwise unsplit pieces can be split)
|
||||
|
12
samba/ldb-2.5.2-skip-wav-tevent-check.patch
Normal file
12
samba/ldb-2.5.2-skip-wav-tevent-check.patch
Normal file
@ -0,0 +1,12 @@
|
||||
--- ldb-1.3.6/lib/tevent/wscript
|
||||
+++ ldb-1.3.6/lib/tevent/wscript
|
||||
@@ -34,8 +34,7 @@
|
||||
if conf.CHECK_BUNDLED_SYSTEM_PKG('tevent', minversion=VERSION,
|
||||
onlyif='talloc', implied_deps='replace talloc'):
|
||||
conf.define('USING_SYSTEM_TEVENT', 1)
|
||||
- if not conf.env.disable_python and \
|
||||
- conf.CHECK_BUNDLED_SYSTEM_PYTHON('pytevent', 'tevent', minversion=VERSION):
|
||||
+ if not conf.env.disable_python:
|
||||
conf.define('USING_SYSTEM_PYTEVENT', 1)
|
||||
|
||||
if conf.CHECK_FUNCS('epoll_create', headers='sys/epoll.h'):
|
29
samba/samba-4.18.4-pam.patch
Normal file
29
samba/samba-4.18.4-pam.patch
Normal file
@ -0,0 +1,29 @@
|
||||
--- a/source3/wscript
|
||||
+++ b/source3/wscript
|
||||
@@ -863,7 +863,7 @@
|
||||
if conf.env.with_iconv:
|
||||
conf.DEFINE('HAVE_ICONV', 1)
|
||||
|
||||
- if Options.options.with_pam:
|
||||
+ if Options.options.with_pam != False:
|
||||
use_pam=True
|
||||
conf.CHECK_HEADERS('security/pam_appl.h pam/pam_appl.h')
|
||||
if not conf.CONFIG_SET('HAVE_SECURITY_PAM_APPL_H') and not conf.CONFIG_SET('HAVE_PAM_PAM_APPL_H'):
|
||||
@@ -940,6 +940,17 @@
|
||||
"or headers not found. Use --without-pam to disable "
|
||||
"PAM support.");
|
||||
|
||||
+ else:
|
||||
+ Logs.warn("PAM disabled")
|
||||
+ use_pam=False
|
||||
+ conf.undefine('WITH_PAM')
|
||||
+ conf.undefine('WITH_PAM_MODULES')
|
||||
+ conf.undefine('HAVE_SECURITY_PAM_APPL_H')
|
||||
+ conf.undefine('PAM_RHOST')
|
||||
+ conf.undefine('PAM_TTY')
|
||||
+ conf.undefine('HAVE_PAM_PAM_APPL_H')
|
||||
+
|
||||
+
|
||||
seteuid = False
|
||||
|
||||
#
|
10
samba/samba.install
Normal file
10
samba/samba.install
Normal file
@ -0,0 +1,10 @@
|
||||
#!/bin/sh
|
||||
|
||||
post_upgrade() {
|
||||
if [ "$(vercmp $2 4.0.4)" -lt 0 ]; then
|
||||
echo "Major upgrade from samba 3.x to 4.x,"
|
||||
echo "please read the Samba4 migration guide:"
|
||||
echo "http://wiki.samba.org/index.php/Samba4/samba3upgrade/HOWTO"
|
||||
fi
|
||||
}
|
||||
# vim:set ts=2 sw=2 et:
|
Loading…
x
Reference in New Issue
Block a user