SPECS: samba.spec - updated to 3.0.23a NOTE: mysql and pgsql hav...

Tue Jul 25 10:43:54 CEST 2006

Author: glen                         Date: Tue Jul 25 08:43:54 2006 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- updated to 3.0.23a
  NOTE: mysql and pgsql have been removed from sources. See samba-pdbsql.spec

---- Files affected:
SPECS:
   samba.spec (1.325 -> 1.326) 

---- Diffs:

================================================================
Index: SPECS/samba.spec
diff -u SPECS/samba.spec:1.325 SPECS/samba.spec:1.326

--- SPECS/samba.spec:1.325	Mon Jul 17 15:52:34 2006
+++ SPECS/samba.spec	Tue Jul 25 10:43:49 2006
@@ -1,15 +1,13 @@
 # $Revision$, $Date$
-#
 # TODO:
 # - look into other distro specs for valid %descriptions for samba 3
+# - check where's pdb-xml
 #
 # Conditional build:
 %bcond_without	ads		# without ActiveDirectory support
 %bcond_without	cups		# without CUPS support
 %bcond_without	krb5		# without Kerberos5/Heimdal support
 %bcond_without	ldap		# without LDAP support
-%bcond_without	mysql		# without MySQL support
-%bcond_without	pgsql		# without PostgreSQL support
 %bcond_without	python		# without python libs/utils
 %bcond_with	ldapsam		# with LDAP SAM (samba) 2.2 based auth (instead of newer bcond ldap)
 
@@ -35,13 +33,13 @@
 Summary(uk):	SMB ËĚŚ¤ÎÔ ÔÁ ÓĹŇ×ĹŇ
 Summary(zh_CN):	Samba żÍť§śËşÍˇţÎńĆ÷
 Name:		samba
-Version:	3.0.22
-Release:	2
+Version:	3.0.23a
+Release:	0.2
 Epoch:		1
 License:	GPL v2
 Group:		Networking/Daemons
 Source0:	http://us1.samba.org/samba/ftp/%{name}-%{version}.tar.gz
-# Source0-md5:	5c39505af17cf5caf3d6ed8bab135036
+# Source0-md5:	e48f196fa51c22ff67463680ce95a58d
 Source1:	smb.init
 Source2:	%{name}.pamd
 Source3:	swat.inetd
@@ -52,12 +50,11 @@
 # Source7-md5:	900502ba36b80620229b94e5129bc856
 Source8:	winbind.init
 Source9:	winbind.sysconfig
-Patch0:		%{name}-statfs-workaround.patch
+#Patch0:		%{name}-statfs-workaround.patch
 Patch1:		%{name}-lib64.patch
 Patch2:		%{name}-FHS.patch
 Patch3:		%{name}-c++-nofail.patch
 Patch4:		%{name}-pthread.patch
-Patch5:		%{name}-3.0-CAN-2006-3403.patch
 URL:		http://www.samba.org/
 BuildRequires:	acl-devel
 BuildRequires:	autoconf
@@ -68,10 +65,6 @@
 BuildRequires:	libmagic-devel
 BuildRequires:	libtool >= 2:1.4d
 BuildRequires:	libxml2-devel
-%if %{with mysql}
-BuildRequires:	mysql-devel
-BuildRequires:	mysql-extras
-%endif
 BuildRequires:	ncurses-devel >= 5.2
 %{?with_ldap:BuildRequires:	openldap-devel >= 2.3.0}
 BuildRequires:	openssl-devel >= 0.9.7d
@@ -101,6 +94,9 @@
 %endif
 %define		schemadir	/usr/share/openldap/schema
 
+# CFLAGS modified (the second ./configure)
+%undefine	configure_cache
+
 %description
 Samba provides an SMB server which can be used to provide network
 services to SMB (sometimes called "Lan Manager") clients, including
@@ -290,30 +286,6 @@
 ÄĚŃ ÄÉÓÔÁÎĂŚĘÎĎÇĎ ÁÄÍŚÎŚÓÔŇŐ×ÁÎÎŃ ĆÁĘĚŐ smb.conf ÚÁ ÄĎĐĎÍĎÇĎŔ ×ÁŰĎÇĎ
 ŐĚŔÂĚĹÎĎÇĎ Web-ÂŇÁŐÚĹŇŐ.
 
-%package pdb-mysql
-Summary:	Samba MySQL password database plugin
-Summary(pl):	Wtyczka Samby do przechowywania haseł w bazie MySQL
-Group:		Networking/Daemons
-Requires:	%{name} = %{epoch}:%{version}-%{release}
-
-%description pdb-mysql
-Samba MySQL password database plugin.
-
-%description pdb-mysql -l pl
-Wtyczka Samby do przechowywania haseł w bazie MySQL.
-
-%package pdb-pgsql
-Summary:	Samba PostgreSQL password database plugin
-Summary(pl):	Wtyczka Samby do przechowywania haseł w bazie PostgreSQL
-Group:		Networking/Daemons
-Requires:	%{name} = %{epoch}:%{version}-%{release}
-
-%description pdb-pgsql
-Samba PostgreSQL password database plugin.
-
-%description pdb-pgsql -l pl
-Wtyczka Samby do przechowywania haseł w bazie PostgreSQL.
-
 %package pdb-xml
 Summary:	Samba XML password database plugin
 Summary(pl):	Wtyczka Samby do przechowywania haseł w bazie XML
@@ -959,17 +931,17 @@
 
 %prep
 %setup -q
-%patch0 -p1
+#%patch0 -p1 OBSOLETE?
 %if "%{_lib}" == "lib64"
 %patch1 -p1
 %endif
 %patch2 -p1
 %patch3 -p1
 %patch4 -p1
-%patch5 -p0
 
 cd examples/VFS
 tar xjf %{SOURCE7}
+mv README{,.vfs}
 
 %build
 cd source
@@ -984,8 +956,12 @@
 #	--with-vfs \
 #	--with-tdbsam \
 #	%{?with_ipv6:--with-ipv6} \
+#	--with-expsam=xml%{?with_mysql:,mysql}%{?with_pgsql:,pgsql} \
+#	%{?with_ldapsam:--with-ldapsam} \
 
 %configure \
+	--with-rootsbindir=/sbin \
+	--with-pammodulesdir=/%{_lib}/security \
 	--with-acl-support \
 	--with-automount \
 	--with-libsmbclient \
@@ -1003,25 +979,22 @@
 	--with-utmp \
 	--with-fhs \
 	%{?with_python:--with-python} \
-	--with-expsam=xml,%{?with_mysql:mysql}%{?with_pgsql:,pgsql} \
-	%{?with_ldapsam:--with-ldapsam} \
 	--with%{!?with_ldap:out}-ldap \
 	--with%{!?with_krb5:out}-krb5
 
 %{__make} proto
-%{__make} everything pam_smbpass bin/smbget client/mount.cifs bin/vfstest
+%{__make} everything pam_smbpass bin/smbget bin/mount.cifs bin/vfstest
 
 cd ../examples/VFS
 %{__autoconf}
 %configure \
 	CFLAGS="%{rpmcflags} -fPIC"
 %{__make}
-mv README{,.vfs}
 
 cd samba-vscan-%{vscan_version}
 cp -f /usr/share/automake/config.sub .
 %configure
-%{__make} -j1 all
+%{__make} all
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -1048,13 +1021,10 @@
 install %{SOURCE8} $RPM_BUILD_ROOT/etc/rc.d/init.d/winbind
 install %{SOURCE9} $RPM_BUILD_ROOT/etc/sysconfig/winbind
 
-install source/client/mount.cifs	$RPM_BUILD_ROOT/sbin/mount.cifs
 install source/nsswitch/libnss_winbind.so $RPM_BUILD_ROOT/%{_lib}/libnss_winbind.so.2
 ln -s libnss_winbind.so.2		$RPM_BUILD_ROOT/%{_lib}/libnss_winbind.so
 install source/nsswitch/libnss_wins.so	$RPM_BUILD_ROOT/%{_lib}/libnss_wins.so.2
 ln -s libnss_wins.so.2			$RPM_BUILD_ROOT/%{_lib}/libnss_wins.so
-install source/nsswitch/pam_winbind.so	$RPM_BUILD_ROOT/%{_lib}/security
-install source/bin/pam_smbpass.so	$RPM_BUILD_ROOT/%{_lib}/security
 install source/bin/wbinfo		$RPM_BUILD_ROOT%{_bindir}
 install source/bin/smbget		$RPM_BUILD_ROOT%{_bindir}
 install source/bin/vfstest		$RPM_BUILD_ROOT%{_bindir}
@@ -1074,7 +1044,7 @@
 
 touch $RPM_BUILD_ROOT/var/lib/samba/{wins.dat,browse.dat}
 
-echo 127.0.0.1 localhost > $RPM_BUILD_ROOT%{_sysconfdir}/samba/lmhosts
+echo '127.0.0.1 localhost' > $RPM_BUILD_ROOT%{_sysconfdir}/samba/lmhosts
 
 %if %{with cups}
 install -d $RPM_BUILD_ROOT%{cups_serverbin}/backend
@@ -1199,21 +1169,9 @@
 %doc examples/LDAP
 %endif
 
-%if %{with mysql}
-%files pdb-mysql
-%defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/%{name}/pdb/mysql.so
-%endif
-
-%if %{with pgsql}
-%files pdb-pgsql
-%defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/%{name}/pdb/pgsql.so
-%endif
-
 %files pdb-xml
 %defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/%{name}/pdb/xml.so
+#%attr(755,root,root) %{_libdir}/%{name}/pdb/xml.so
 
 %files winbind
 %defattr(644,root,root,755)
@@ -1235,6 +1193,7 @@
 %defattr(644,root,root,755)
 %attr(755,root,root) /sbin/mount.smbfs
 %attr(755,root,root) /sbin/mount.cifs
+%attr(755,root,root) /sbin/umount.cifs
 %attr(755,root,root) %{_bindir}/net
 %attr(755,root,root) %{_bindir}/smbmnt
 %attr(755,root,root) %{_bindir}/smbmount
@@ -1301,6 +1260,7 @@
 %{_datadir}/swat/help
 %{_datadir}/swat/images
 %{_datadir}/swat/include
+%{_datadir}/swat/using_samba
 %dir %{_datadir}/swat/lang
 %lang(ja) %{_datadir}/swat/lang/ja
 %lang(tr) %{_datadir}/swat/lang/tr
@@ -1487,6 +1447,10 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.326  2006/07/25 08:43:49  glen
+- updated to 3.0.23a
+  NOTE: mysql and pgsql have been removed from sources. See samba-pdbsql.spec
+
 Revision 1.325  2006/07/17 13:52:34  havner
 - CAN-2006-3403
 - rel 2
@@ -2222,7 +2186,7 @@
 - added bcond --without ldap and --without krb5.
 
 Revision 1.154.2.15  2003/10/28 20:38:12  inglod
-vfs-vscan-mks Required: mksd
+- vfs-vscan-mks Required: mksd
 
 Revision 1.154.2.14  2003/10/20 16:44:57  djrzulf
 - fixed, thanks for short circuit :@,
@@ -2333,16 +2297,16 @@
 - added _without_cups bcond
 
 Revision 1.135  2003/03/15 18:19:38  misi3k
-- %%install fix
+- %install fix
 - rel 2
 
 Revision 1.134  2003/03/15 17:48:47  misi3k
 - secuirty update to 2.2.8
-Bug: A buffer overrun condition exists in the SMB/CIFS packet fragment
-re-assembly code in smbd which would allow an attacker to cause smbd
-to overwrite arbitrary areas of memory in its own process address
-space. This could allow a skilled attacker to inject binary specific
-exploit code into smbd.
+  Bug: A buffer overrun condition exists in the SMB/CIFS packet fragment
+  re-assembly code in smbd which would allow an attacker to cause smbd to
+  overwrite arbitrary areas of memory in its own process address space. This
+  could allow a skilled attacker to inject binary specific exploit code into
+  smbd.
 
 Revision 1.133  2003/02/28 10:08:54  trojan
 - massive attack: perl -pi -e "s/^#+\%\{/#\%\%\{/"
@@ -2407,7 +2371,7 @@
 - activated acl's - not tested, my mashine is suffering from heat...
 
 Revision 1.116  2002/07/18 15:17:02  marcus
--i fixed libmbclient, rel.6.
+- i fixed libmbclient, rel.6.
 
 Revision 1.115  2002/07/18 08:56:14  kloczek
 - bump release to 5.
@@ -2432,7 +2396,7 @@
 Revision 1.109  2002/06/07 09:35:39  blues
 - few more docs
 - updated DESTDIR-fix patch - forgetten commit
-STBR now..
+  STBR now..
 
 Revision 1.108  2002/06/05 12:29:49  kloczek
 - merge translations drom KSI, Conectiva, Kondtra and adapterize spec file.
@@ -2449,15 +2413,15 @@
 Revision 1.104  2002/06/03 20:56:55  blues
 - release 1 - it works for me, why not use it?
 - fixed libsmbclient descriptions
-STBR, I think
+  STBR, I think
 
 Revision 1.103  2002/05/25 17:13:49  misiek
 - fix libsmbclient requires
 
 Revision 1.102  2002/05/21 23:14:40  kloczek
-perl -pi -e "s/^automake -a -c -f --foreing/\%\{__automake\}/; \
+- perl -pi -e "s/^automake -a -c -f --foreing/\%\{__automake\}/; \
              s/^automake -a -c -f/\%\{__automake\}/; \
-	     s/^autoconf/\%\{__autoconf\}/"
+     s/^autoconf/\%\{__autoconf\}/"
 
 Revision 1.101  2002/05/21 11:32:59  kloczek
 - release 0.4,
@@ -2505,10 +2469,10 @@
 - updated to 2.2.3a + fixed quotas on 2.4.x
 
 Revision 1.89  2002/04/17 21:08:11  hunter
--- patch for vfs external modules.
+- patch for vfs external modules.
 
 Revision 1.88  2002/04/16 19:19:33  marcus
-- changed %%make to everything
+- changed %make to everything
 
 Revision 1.87  2002/04/15 16:45:20  misiek
 - updated to 2.2.3a but requires testing
@@ -2545,7 +2509,7 @@
 - s/Administacyjne/Administracyjne/
 
 Revision 1.77  2002/01/18 02:14:51  kloczek
-perl -pi -e "s/pld-list\@pld.org.pl/feedback\@pld.org.pl/"
+- perl -pi -e "s/pld-list\@pld.org.pl/feedback\@pld.org.pl/"
 
 Revision 1.76  2002/01/05 23:01:27  serek
 - now :-) builds.
@@ -2554,7 +2518,7 @@
 - now builds.
 
 Revision 1.74  2001/12/07 21:12:45  mkochano
-- /etc/pam.d/* marked with %%config(noreplace).
+- /etc/pam.d/* marked with %config(noreplace).
 - Release++ (I'm too lazy to write here new release number for each
   spec. Sorry).
 
@@ -2566,7 +2530,7 @@
 - missing pl summary, BuildRequires: autoconf
 
 Revision 1.71  2001/10/08 08:50:31  marcus
-- reverted and fixed gzipping %%doc (thanks to qboosh)
+- reverted and fixed gzipping %doc (thanks to qboosh)
 
 Revision 1.70  2001/10/07 20:04:34  marcus
 - removed gzipping %doc (using rpm automation)
@@ -2595,7 +2559,7 @@
 - updated to 2.2.1a.
 
 Revision 1.61  2001/07/11 22:09:14  lukasz
--fixed doc section
+- fixed doc section
 
 Revision 1.60  2001/07/11 18:47:40  lukasz
 - updated to 2.2.1
@@ -2608,10 +2572,10 @@
 - release 2
 
 Revision 1.57  2001/04/18 01:03:11  misiek
-typo
+- typo
 
 Revision 1.56  2001/04/18 00:36:42  misiek
-2.2.0 (testing package release)
+- 2.2.0 (testing package release)
 
 Revision 1.55  2001/04/13 00:53:54  kloczek
 - release 29: rebuild against readline 4.2.
@@ -2621,7 +2585,7 @@
 - Rebuilt with corrected logrotate script (/usr/bin/killall -> /bin/killall).
 
 Revision 1.53  2001/04/07 10:34:53  misiek
-adapterized; added defattr; moved doc to common subpackage; stb
+- adapterized; added defattr; moved doc to common subpackage; stb
 
 Revision 1.52  2001/04/07 01:34:35  martii
 - release 27
@@ -2649,7 +2613,7 @@
 - rc-inetd restart/stop changed into rc-inetd reload
 
 Revision 1.46  2000/10/20 23:24:49  misiek
-updated
+- updated
 
 Revision 1.45  2000/10/14 21:30:08  mkochano
 - Release 13.
@@ -2663,7 +2627,7 @@
 - Fixed bug in 'post' section.
 
 Revision 1.42  2000/06/09 07:23:59  kloczek
-- added using %%{__make} macro.
+- added using %{__make} macro.
 
 Revision 1.41  2000/05/05 15:06:00  mis
 - Group: synced with PLD groups
@@ -2721,14 +2685,14 @@
 
 Revision 1.29  1999/11/26 13:52:19  kloczek
 - added DESTDIR style %install (DESTDIR patch),
-- cuted %%changelog,
+- cuted %changelog,
 - added noreplace for sysconfig file for samba,
 - fiew files separated into Source# files.
 
 Revision 1.28  1999/11/25 13:45:04  pius
 - added swat.inetd
 - added 'Requires: rc-inted, inetdaemon' to swat subpackage
-- added %%post{un} scripts for swat subpackage
+- added %post{un} scripts for swat subpackage
 
 Revision 1.27  1999/11/25 05:27:45  kloczek
 - more doc (added sample config files),
@@ -2756,7 +2720,7 @@
 - added translations from Mandrake
 
 Revision 1.22  1999/08/05 21:58:23  waszi
-upgraded to 2.0.5a
+- upgraded to 2.0.5a
 
 Revision 1.21  1999/07/28 13:31:10  baggins
 - stripping binaries
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/samba.spec?r1=1.325&r2=1.326&f=u

