From: Jan Rękorajski <baggins@pld-linux.org>
Date: Wed, 16 Oct 2013 12:27:05 +0000 (+0200)
Subject: - removed obsolete nscd patch
X-Git-Tag: auto/th/samba4-4.1.1-1~5
X-Git-Url: http://git.pld-linux.org/gitweb.cgi?a=commitdiff_plain;h=fc631a508a0aaa324505ad38aa5ceecdc55d1d9f;p=packages%2Fsamba4.git

- removed obsolete nscd patch
- fixed internal linking deps
- builds/installs, files needs updating
- added TODO
---

diff --git a/link.patch b/link.patch
new file mode 100644
index 0000000..82da307
--- /dev/null
+++ b/link.patch
@@ -0,0 +1,11 @@
+--- samba-4.1.0/lib/util/wscript_build~	2013-06-13 11:21:02.000000000 +0200
++++ samba-4.1.0/lib/util/wscript_build	2013-10-16 14:07:02.360316706 +0200
+@@ -9,7 +9,7 @@
+                     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''',
+-                  deps='DYNCONFIG',
++                  deps='DYNCONFIG ccan-hash',
+                   public_deps='talloc tevent execinfo uid_wrapper pthread LIBCRYPTO charset util_setid',
+                   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-nscd.patch b/samba-nscd.patch
deleted file mode 100644
index 8dc912f..0000000
--- a/samba-nscd.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff -urN samba-3.2.1.org/source3/Makefile.in samba-3.2.1/source3/Makefile.in
---- samba-3.2.1.org/source3/Makefile.in	2008-08-05 08:22:33.000000000 +0200
-+++ samba-3.2.1/source3/Makefile.in	2008-08-17 23:24:32.085914644 +0200
-@@ -1430,7 +1430,7 @@
- 	@$(CC) -o $@ $(LDFLAGS) $(RPCCLIENT_OBJ) \
- 		$(DYNEXP) $(TERMLDFLAGS) $(TERMLIBS) $(LIBS) $(POPT_LIBS) \
- 		$(KRB5LIBS) $(LDAP_LIBS) $(LIBTALLOC_LIBS) $(LIBTEVENT_LIBS) $(LIBTDB_LIBS) \
--		$(LIBWBCLIENT_LIBS) $(ZLIB_LIBS) $(PASSDB_LIBS)
-+		$(LIBWBCLIENT_LIBS) $(ZLIB_LIBS) $(PASSDB_LIBS) $(NSCD_LIBS)
- 
- bin/smbclient: $(BINARY_PREREQS) $(CLIENT_OBJ) @BUILD_POPT@ $(LIBTALLOC) $(LIBTEVENT) $(LIBTDB) $(LIBWBCLIENT)
- 	@echo Linking $@
-
diff --git a/samba4.spec b/samba4.spec
index 445a602..1f587b3 100644
--- a/samba4.spec
+++ b/samba4.spec
@@ -1,7 +1,8 @@
 #%package -n samba3-swat
 #Obsoletes:	swat
 #Obsoletes:	samba-swat < 1:4.0.0-1
-
+# TODO:
+#	- unbundle ntdb (no external release as of 16.Oct.2013)
 #
 # Conditional build:
 %bcond_without	ads		# without ActiveDirectory support
@@ -15,6 +16,7 @@
 %define		tdb_ver		2:1.2.11
 %define		ldb_ver		1.1.16
 %define		tevent_ver	0.9.18
+%define		ntdb_ver	0.9
 %endif
 
 %define		virusfilter_version 0.1.3
@@ -41,10 +43,10 @@ Source10:	https://github.com/downloads/fumiyas/samba-virusfilter/samba-virusfilt
 Source11:	samba3.logrotate
 Patch0:		system-heimdal.patch
 Patch1:		samba-c++-nofail.patch
-Patch3:		samba-nscd.patch
 Patch4:		samba-lprng-no-dot-printers.patch
 Patch5:		systemd-pid-dir.patch
 Patch6:		unicodePwd-nthash-values-over-LDAP.patch
+Patch7:		link.patch
 URL:		http://www.samba.org/
 BuildRequires:	acl-devel
 BuildRequires:	autoconf
@@ -85,6 +87,7 @@ BuildRequires:	rpm-pythonprov
 BuildRequires:	sed >= 4.0
 %if %{with system_libs}
 BuildRequires:	ldb-devel >= %{ldb_ver}
+#BuildRequires:	ntdb-devel >= %{ntdb_ver}
 BuildRequires:	python-ldb-devel >= %{ldb_ver}
 BuildRequires:	python-talloc-devel >= %{talloc_ver}
 BuildRequires:	python-tevent >= %{tevent_ver}
@@ -167,6 +170,7 @@ Summary(pl.UTF-8):	Pliki używane przez serwer i klientów Samba
 Group:		Networking/Daemons
 %if %{with system_libs}
 Requires:	ldb >= %{ldb_ver}
+#Requires:	ntdb >= %{ntdb_ver}
 Requires:	talloc >= %{talloc_ver}
 Requires:	tdb >= %{tdb_ver}
 Requires:	tevent >= %{tevent_ver}
@@ -253,6 +257,7 @@ Requires:	python-dns
 Requires:	python-modules
 %if %{with system_libs}
 Requires:	python-ldb >= %{ldb_ver}
+#Requires:	python-ntdb >= %{ntdb_ver}
 Requires:	python-talloc >= %{talloc_ver}
 Requires:	python-tevent >= %{tevent_ver}
 %endif
@@ -709,10 +714,10 @@ Ten pakiet zawiera schemat samby dla openldap-a.
 %setup -q -n samba-%{version}
 %patch0 -p1
 %patch1 -p1
-#%patch3 -p1
 %patch4 -p1
 %patch5 -p1
 %patch6 -p1
+%patch7 -p1
 
 sed -i -e 's|#!/usr/bin/env python|#!/usr/bin/python|' source4/scripting/bin/samba*
 sed -i -e 's|#!/usr/bin/env perl|#!/usr/bin/perl|' pidl/pidl
@@ -748,7 +753,7 @@ CPPFLAGS="${CPPFLAGS:-%rpmcppflags}" \
 	--with-privatedir=%{_sysconfdir}/samba \
 	--disable-rpath-install \
 	--builtin-libraries=replace,ccan \
-	--bundled-libraries=NONE,subunit,iniparser,%{!?with_system_libs:talloc,tdb,ldb,tevent,pytalloc,pytalloc-util,pytdb,pytevent,pyldb,pyldb-util} \
+	--bundled-libraries=NONE,subunit,iniparser,ntdb,%{!?with_system_libs:talloc,tdb,ldb,tevent,pytalloc,pytalloc-util,pytdb,pytevent,pyldb,pyldb-util} \
 	--private-libraries=smbclient,smbsharemodes,wbclient \
 	--with-shared-modules=idmap_ad,idmap_rid,idmap_adex,idmap_hash,idmap_tdb2,pdb_tdbsam,pdb_ldap,pdb_ads,pdb_smbpasswd,pdb_wbc_sam,pdb_samba4,auth_unix,auth_wbc,auth_server,auth_netlogond,auth_script,auth_samba4 \
 	--with-acl-support \