[arch-commits] Commit in samba/trunk (PKGBUILD bug13335.patch)

2018-05-28 Thread Tobias Powalowski via arch-commits 
Date: Monday, May 28, 2018 @ 07:43:55
  Author: tpowa
Revision: 325068

upgpkg: samba 4.8.2-1

bump to latest version

Modified:
  samba/trunk/PKGBUILD
Deleted:
  samba/trunk/bug13335.patch

+
 PKGBUILD   |   15 
 bug13335.patch | 2039 ---
 2 files changed, 4 insertions(+), 2050 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2018-05-28 07:28:16 UTC (rev 325067)
+++ PKGBUILD2018-05-28 07:43:55 UTC (rev 325068)
@@ -10,7 +10,7 @@
 
 pkgbase=samba
 pkgname=('libwbclient' 'smbclient' 'samba')
-pkgver=4.8.1
+pkgver=4.8.2
 pkgrel=1
 arch=(x86_64)
 url="http://www.samba.org;
@@ -23,16 +23,10 @@
 http://us1.samba.org/samba/ftp/stable/${pkgbase}-${pkgver}.tar.asc
 samba.logrotate
 samba.pam
-samba.conf
-bug13335.patch)
+   samba.conf)
 validpgpkeys=('52FBC0B86D954B0843324CDC6F33915B6568B7EA') #Samba Distribution 
Verification Key 
 ### UNINSTALL dmapi package before building!!!
 
-prepare() {
-  cd samba-${pkgver}
-  patch -p1 -i ../bug13335.patch
-}
-
 build() {
   # Use samba-pkg as a staging directory for the split packages
   # (This is so RPATHS and symlinks are generated correctly via
@@ -234,9 +228,8 @@
   # copy ldap example
   install -D -m644 ${srcdir}/samba-${pkgver}/examples/LDAP/samba.schema 
${pkgdir}/usr/share/doc/samba/examples/LDAP/samba.schema
 }
-md5sums=('3cdb976a892bc036bfb61eeb97f68450'
+md5sums=('417c065455f8948d1de2be4edd074390'
  'SKIP'
  '995621522c6ec9b68c1b858ceed627ed'
  '96f82c38f3f540b53f3e5144900acf17'
- '49abd7b719e3713a3f75a8a50958e381'
- '86db2a3247a79d195341759da4c27454')
+ '49abd7b719e3713a3f75a8a50958e381')

Deleted: bug13335.patch
===
--- bug13335.patch  2018-05-28 07:28:16 UTC (rev 325067)
+++ bug13335.patch  2018-05-28 07:43:55 UTC (rev 325068)
@@ -1,2039 +0,0 @@
-From b26d21cebda58547818e24927131a3c62955bd9c Mon Sep 17 00:00:00 2001
-From: Gary Lockyer 
-Date: Wed, 21 Feb 2018 15:12:40 +1300
-Subject: [PATCH 1/5] ldb_tdb: Add tests for truncated index keys
-
-Tests for the index truncation code as well as the GUID index
-format in general.
-
-Covers truncation of both the DN and equality search keys.
-
-Signed-off-by: Gary Lockyer 
-Reviewed-by: Douglas Bagnall 
-Reviewed-by: Andrew Bartlett 
-
-Autobuild-User(master): Andrew Bartlett 
-Autobuild-Date(master): Sat Mar  3 09:58:40 CET 2018 on sn-devel-144
-
-BUG: https://bugzilla.samba.org/show_bug.cgi?id=13335
-
-(cherry picked into 4.8 and cut down to operate without truncated
-index values from master commit 4c0c888b571d4c21ab267024178353925a8c087c
-by Andrew Bartlett)

- lib/ldb/tests/python/index.py | 1007 +
- lib/ldb/wscript   |2 +-
- 2 files changed, 1008 insertions(+), 1 deletion(-)
- create mode 100755 lib/ldb/tests/python/index.py
-
-diff --git a/lib/ldb/tests/python/index.py b/lib/ldb/tests/python/index.py
-new file mode 100755
-index 000..cd3735b5625
 /dev/null
-+++ b/lib/ldb/tests/python/index.py
-@@ -0,0 +1,1007 @@
-+#!/usr/bin/env python
-+#
-+# Tests for truncated index keys
-+#
-+#   Copyright (C) Andrew Bartlett  2018
-+#
-+# This program is free software; you can redistribute it and/or modify
-+# it under the terms of the GNU General Public License as published by
-+# the Free Software Foundation; either version 3 of the License, or
-+# (at your option) any later version.
-+#
-+# This program is distributed in the hope that it will be useful,
-+# but WITHOUT ANY WARRANTY; without even the implied warranty of
-+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+# GNU General Public License for more details.
-+#
-+# You should have received a copy of the GNU General Public License
-+# along with this program.  If not, see .
-+#
-+"""Tests for index keys
-+
-+This is a modified version of the test from master for databases such
-+as lmdb have a maximum key length, instead just checking that the
-+GUID index code still operates correctly.
-+
-+Many of the test names are therefore incorrect, but are retained
-+to keep the code easy to backport into if more tested are added in
-+master.
-+
-+"""
-+
-+import os
-+from unittest import TestCase
-+import sys
-+import ldb
-+import shutil
-+
-+PY3 = sys.version_info > (3, 0)
-+
-+
-+def tempdir():
-+import tempfile
-+try:
-+dir_prefix = os.path.join(os.environ["SELFTEST_PREFIX"], "tmp")
-+except KeyError:
-+dir_prefix = None
-+return tempfile.mkdtemp(dir=dir_prefix)
-+
-+
-+def contains(result, dn):
-+if result is None:
-+return False
-+
-+

[arch-commits] Commit in samba/trunk (PKGBUILD bug13335.patch)

2018-04-26 Thread Bartłomiej Piotrowski via arch-commits 
Date: Thursday, April 26, 2018 @ 11:11:27
  Author: bpiotrowski
Revision: 323030

4.8.1-1: backport fix for FS#57966

Added:
  samba/trunk/bug13335.patch
Modified:
  samba/trunk/PKGBUILD

+
 PKGBUILD   |   13 
 bug13335.patch | 2039 +++
 2 files changed, 2047 insertions(+), 5 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2018-04-26 11:08:57 UTC (rev 323029)
+++ PKGBUILD2018-04-26 11:11:27 UTC (rev 323030)
@@ -10,8 +10,8 @@
 
 pkgbase=samba
 pkgname=('libwbclient' 'smbclient' 'samba')
-pkgver=4.8.0
-pkgrel=2
+pkgver=4.8.1
+pkgrel=1
 arch=(x86_64)
 url="http://www.samba.org;
 license=('GPL3')
@@ -23,12 +23,14 @@
 http://us1.samba.org/samba/ftp/stable/${pkgbase}-${pkgver}.tar.asc
 samba.logrotate
 samba.pam
-samba.conf)
+samba.conf
+bug13335.patch)
 validpgpkeys=('52FBC0B86D954B0843324CDC6F33915B6568B7EA') #Samba Distribution 
Verification Key 
 ### UNINSTALL dmapi package before building!!!
 
 prepare() {
   cd samba-${pkgver}
+  patch -p1 -i ../bug13335.patch
 }
 
 build() {
@@ -232,8 +234,9 @@
   # copy ldap example
   install -D -m644 ${srcdir}/samba-${pkgver}/examples/LDAP/samba.schema 
${pkgdir}/usr/share/doc/samba/examples/LDAP/samba.schema
 }
-md5sums=('3724c1d3d1befe12ecf7bb86ed7e3463'
+md5sums=('3cdb976a892bc036bfb61eeb97f68450'
  'SKIP'
  '995621522c6ec9b68c1b858ceed627ed'
  '96f82c38f3f540b53f3e5144900acf17'
- '49abd7b719e3713a3f75a8a50958e381')
+ '49abd7b719e3713a3f75a8a50958e381'
+ '86db2a3247a79d195341759da4c27454')

Added: bug13335.patch
===
--- bug13335.patch  (rev 0)
+++ bug13335.patch  2018-04-26 11:11:27 UTC (rev 323030)
@@ -0,0 +1,2039 @@
+From b26d21cebda58547818e24927131a3c62955bd9c Mon Sep 17 00:00:00 2001
+From: Gary Lockyer 
+Date: Wed, 21 Feb 2018 15:12:40 +1300
+Subject: [PATCH 1/5] ldb_tdb: Add tests for truncated index keys
+
+Tests for the index truncation code as well as the GUID index
+format in general.
+
+Covers truncation of both the DN and equality search keys.
+
+Signed-off-by: Gary Lockyer 
+Reviewed-by: Douglas Bagnall 
+Reviewed-by: Andrew Bartlett 
+
+Autobuild-User(master): Andrew Bartlett 
+Autobuild-Date(master): Sat Mar  3 09:58:40 CET 2018 on sn-devel-144
+
+BUG: https://bugzilla.samba.org/show_bug.cgi?id=13335
+
+(cherry picked into 4.8 and cut down to operate without truncated
+index values from master commit 4c0c888b571d4c21ab267024178353925a8c087c
+by Andrew Bartlett)
+---
+ lib/ldb/tests/python/index.py | 1007 +
+ lib/ldb/wscript   |2 +-
+ 2 files changed, 1008 insertions(+), 1 deletion(-)
+ create mode 100755 lib/ldb/tests/python/index.py
+
+diff --git a/lib/ldb/tests/python/index.py b/lib/ldb/tests/python/index.py
+new file mode 100755
+index 000..cd3735b5625
+--- /dev/null
 b/lib/ldb/tests/python/index.py
+@@ -0,0 +1,1007 @@
++#!/usr/bin/env python
++#
++# Tests for truncated index keys
++#
++#   Copyright (C) Andrew Bartlett  2018
++#
++# This program is free software; you can redistribute it and/or modify
++# it under the terms of the GNU General Public License as published by
++# the Free Software Foundation; either version 3 of the License, or
++# (at your option) any later version.
++#
++# This program is distributed in the hope that it will be useful,
++# but WITHOUT ANY WARRANTY; without even the implied warranty of
++# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++# GNU General Public License for more details.
++#
++# You should have received a copy of the GNU General Public License
++# along with this program.  If not, see .
++#
++"""Tests for index keys
++
++This is a modified version of the test from master for databases such
++as lmdb have a maximum key length, instead just checking that the
++GUID index code still operates correctly.
++
++Many of the test names are therefore incorrect, but are retained
++to keep the code easy to backport into if more tested are added in
++master.
++
++"""
++
++import os
++from unittest import TestCase
++import sys
++import ldb
++import shutil
++
++PY3 = sys.version_info > (3, 0)
++
++
++def tempdir():
++import tempfile
++try:
++dir_prefix = os.path.join(os.environ["SELFTEST_PREFIX"], "tmp")
++except KeyError:
++dir_prefix = None
++return tempfile.mkdtemp(dir=dir_prefix)
++
++
++def contains(result, dn):
++if result is None:
++return False
++
++for r in result:
++if str(r["dn"]) == dn:
++return True
++return False
++
++
++class