[packages/samba] - partial update to 4.2.0 (heimdal problem and patch2 problem)
arekm
arekm at pld-linux.org
Fri Mar 6 00:12:43 CET 2015
commit baa92be68e291811b617603d72ddd9275848c21b
Author: Arkadiusz Miśkiewicz <arekm at maven.pl>
Date: Fri Mar 6 00:12:36 2015 +0100
- partial update to 4.2.0 (heimdal problem and patch2 problem)
link.patch | 12 ------------
samba-bug-9816.patch | 7 ++++---
samba.spec | 17 ++++++++++-------
3 files changed, 14 insertions(+), 22 deletions(-)
---
diff --git a/samba.spec b/samba.spec
index 67bf777..fd54178 100644
--- a/samba.spec
+++ b/samba.spec
@@ -10,8 +10,8 @@
%if %{with system_libs}
%define talloc_ver 2.0.8
%define tdb_ver 2:1.2.12
-%define ldb_ver 1.1.17
-%define tevent_ver 0.9.18
+%define ldb_ver 1.1.20
+%define tevent_ver 0.9.24
%define ntdb_ver 0.9
%endif
@@ -22,13 +22,13 @@
Summary: Samba Active Directory and SMB server
Summary(pl.UTF-8): Serwer Samba Active Directory i SMB
Name: samba
-Version: 4.1.17
-Release: 2
+Version: 4.2.0
+Release: 0.1
Epoch: 1
License: GPL v3
Group: Networking/Daemons
Source0: http://www.samba.org/ftp/samba/samba-%{version}.tar.gz
-# Source0-md5: 8fed0f23a672e6a8d0716d96aca88671
+# Source0-md5: 5ef28ee4cda243d07a0066f038b7d6e0
Source1: smb.init
Source2: samba.pamd
Source4: samba.sysconfig
@@ -44,7 +44,7 @@ Patch1: %{name}-c++-nofail.patch
Patch2: %{name}-lprng-no-dot-printers.patch
Patch3: systemd-pid-dir.patch
Patch4: unicodePwd-nthash-values-over-LDAP.patch
-Patch5: link.patch
+
Patch6: server-role.patch
Patch7: %{name}-bug-9816.patch
URL: http://www.samba.org/
@@ -73,6 +73,7 @@ BuildRequires: libnscd-devel
BuildRequires: make >= 3.81
BuildRequires: ncurses-devel >= 5.2
BuildRequires: ncurses-ext-devel >= 5.2
+BuildRequires: nss_wrapper
%{?with_ldap:BuildRequires: openldap-devel >= 2.3.0}
BuildRequires: pam-devel >= 0.99.8.1
BuildRequires: perl-ExtUtils-MakeMaker
@@ -89,6 +90,7 @@ BuildRequires: rpm-perlprov
BuildRequires: rpm-pythonprov
BuildRequires: rpmbuild(macros) >= 1.647
BuildRequires: sed >= 4.0
+BuildRequires: socket_wrapper >= 1.1.2
%{?with_systemd:BuildRequires: systemd-devel}
BuildRequires: xfsprogs-devel
BuildRequires: zlib-devel >= 1.2.3
@@ -103,6 +105,7 @@ BuildRequires: talloc-devel >= %{talloc_ver}
BuildRequires: tdb-devel >= %{tdb_ver}
BuildRequires: tevent-devel >= %{tevent_ver}
%endif
+BuildRequires: uid_wrapper >= 1.1.0
BuildConflicts: libbsd-devel
Requires(post,preun): /sbin/chkconfig
Requires: %{name}-common = %{epoch}:%{version}-%{release}
@@ -501,7 +504,7 @@ Ten pakiet zawiera schemat Samby (samba.schema) dla OpenLDAP-a.
%patch2 -p1
%patch3 -p1
%patch4 -p1
-%patch5 -p1
+
%patch6 -p1
%patch7 -p1
diff --git a/link.patch b/link.patch
deleted file mode 100644
index 8ce3895..0000000
--- a/link.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- samba-4.1.8/lib/util/wscript_build.orig 2014-06-04 19:40:22.052755047 +0200
-+++ samba-4.1.8/lib/util/wscript_build 2014-06-04 19:41:57.692753054 +0200
-@@ -9,7 +9,7 @@ bld.SAMBA_LIBRARY('samba-util',
- util_str.c util_str_common.c substitute.c ms_fnmatch.c
- server_id.c dprintf.c parmlist.c bitmap.c pidfile.c
- tevent_debug.c util_process.c memcache.c''',
-- deps='DYNCONFIG',
-+ deps='DYNCONFIG ccan-hash',
- public_deps='talloc tevent execinfo uid_wrapper pthread LIBCRYPTO charset util_setid systemd-daemon',
- public_headers='debug.h attr.h byteorder.h data_blob.h memory.h safe_string.h time.h talloc_stack.h xfile.h dlinklist.h samba_util.h string_wrappers.h',
- header_path= [ ('dlinklist.h samba_util.h', '.'), ('*', 'util') ],
-
diff --git a/samba-bug-9816.patch b/samba-bug-9816.patch
index 5f674e0..2c547db 100644
--- a/samba-bug-9816.patch
+++ b/samba-bug-9816.patch
@@ -53,13 +53,14 @@ index 37edb31..00abad8 100644
--- a/lib/replace/wscript~ 2014-09-08 11:26:14.000000000 +0200
+++ b/lib/replace/wscript 2014-10-28 22:05:54.003836383 +0100
-@@ -284,8 +284,7 @@ struct foo bar = { .y = 'X', .x = 1 };
+@@ -251,8 +251,7 @@ def configure(conf):
checklibc=True)
if not conf.CHECK_FUNCS('getpeereid'):
conf.CHECK_FUNCS_IN('getpeereid', 'bsd', headers='sys/types.h bsd/unistd.h')
-- if not conf.CHECK_FUNCS_IN('setproctitle', 'bsd', headers='sys/types.h bsd/unistd.h'):
-- conf.CHECK_FUNCS_IN('setproctitle', 'setproctitle', headers='setproctitle.h')
+- if not conf.CHECK_FUNCS_IN('setproctitle', 'setproctitle', headers='setproctitle.h'):
+- conf.CHECK_FUNCS_IN('setproctitle', 'bsd', headers='sys/types.h bsd/unistd.h')
+ conf.CHECK_FUNCS_IN('setproctitle', 'bsd', headers='sys/types.h bsd/unistd.h')
conf.CHECK_CODE('''
struct ucred cred;
+
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/samba.git/commitdiff/baa92be68e291811b617603d72ddd9275848c21b
More information about the pld-cvs-commit
mailing list