samba-4.1.3-1

git-svn-id: http://trac.vinelinux.org/repos/projects/specs@8035 ec354946-7b23-47d6-9f5a-488ba84defc7

s/samba/samba-vl.spec

@@ -1,4 +1,4 @@
-%define samba_version 4.0.10
+%define samba_version 4.1.3
 %define doc_version 4.0.7
 %define api_version 4.0
 %define build_compat32 %{?_with_compat32:1}%{!?_with_compat32:0}
@@ -9,7 +9,7 @@
 %global with_talloc       0
 %global with_tevent       0
 %global with_tdb          0
-%global with_ntdb         0
+%global with_ntdb         1
 %global with_ldb          0
 %global with_usrmove      0
 %global with_mitkrb5      0
@@ -203,6 +203,7 @@ Requires: pam
 Requires(pre): /usr/sbin/groupadd
 Requires(post): /sbin/chkconfig, /sbin/service, coreutils, acl
 Requires(preun): /sbin/chkconfig, /sbin/service
+Obsoletes: samba-swat < 4.1.0
 
 %description common
 Samba-common provides files necessary for both the server and client
@@ -262,24 +263,6 @@ Provides: samba-winbind-clients = %{samba_version}
 The %{name}-winbind-clients package provides the NSS library and a PAM
 module necessary to communicate to the Winbind Daemon
 
-## --------------------------------------------------------------------
-%package swat
-Summary: The Samba SMB server Web configuration program
-Summary(ja): Web ベースの Samba サーバ設定ツール
-Group: Applications/System
-Conflicts: samba-swat < %{samba_version}
-Provides: samba-swat = %{samba_version}
-Requires: %{name} = %{samba_version}-%{release}, xinetd
-
-%description swat
-The samba-swat package includes the new SWAT (Samba Web Administration
-Tool), for remotely managing Samba's smb.conf file using your favorite
-Web browser.
-
-%description swat -l ja
-SWAT (Samba Web Administration Tool) を使うと、Samba の管理をお好きな Web
-ブラウザで行うことができるようになります。
-
 ## --------------------------------------------------------------------
 %package -n libsmbclient
 Summary: The SMB client library
@@ -405,7 +388,6 @@ make distclean
   --with-gettext=/usr \
   --with-shared-modules=idmap_rid,idmap_ad,idmap_tdb2,idmap_hash \
   --with-winbind \
-  --with-swat \
   --with-ads \
   --with-ldap \
   --with-pam \
@@ -456,7 +438,6 @@ find examples docs-xml -type f | xargs -r chmod -x
 rm -rf %{buildroot}
 
 # Create the target build directory hierarchy
-mkdir -p %{buildroot}%{_datadir}/swat/{help,include,using_samba/{figs,gifsa}}
 mkdir -p %{buildroot}%{samba_includedir}
 mkdir -p %{buildroot}%{_initrddir}
 mkdir -p %{buildroot}{%{_libdir},%{samba_includedir}}
@@ -497,7 +478,6 @@ install -m 0755 bin/shared/winbind_krb5_locator.so \
 
 # Install the miscellany
 echo 127.0.0.1 localhost > %{buildroot}%{_sysconfdir}/samba/lmhosts
-install -m644 packaging/RHEL/setup/swat %{buildroot}%{_sysconfdir}/xinetd.d/swat
 install -m 0644 packaging/systemd/samba.sysconfig %{buildroot}%{_sysconfdir}/sysconfig/samba
 #install -m755 setup/smb.init %{buildroot}%{_initrddir}/smb
 install -m755 packaging/RHEL/setup/winbind.init %{buildroot}%{_initrddir}/winbind
@@ -587,32 +567,14 @@ fi
 ## ====================================================================
 %post
 if [ $1 -eq 1 ]; then   # Install
-  # modify named.conf.dlz for DLZ configuration if version 9.9.0 or later
-  if [ -f /usr/sbin/named ]; then
-    bind_minor_ver=$(named -v | sed -e "s|^BIND \([.0-9]*\)|\1|" | cut -d "." -f 2)
-    if [ $bind_minor_ver -gt 8 ]; then
-      cat %{_datadir}/samba/setup/named.conf.dlz \
-        | sed -e "s|\(database.*dlz_bind9.so\)|# \1|" > %{_datadir}/samba/setup/named.conf.dlz9
-      cat %{_datadir}/samba/setup/named.conf.dlz9 > %{_datadir}/samba/setup/named.conf.dlz
-      rm %{_datadir}/samba/setup/named.conf.dlz9
-    fi
-  fi
-
   # chkconfig
   /sbin/chkconfig --add smb
   /sbin/chkconfig --add nmb
-  /sbin/chkconfig --add samba
-
-  # remove original smb.conf for provisioning
-  rm -f %{_sysconfdir}/samba/smb.conf
 fi
 
 if [ $1 -ge 2 ]; then   # Upgrade
   /sbin/service smb condrestart >/dev/null 2>&1 || :
   /sbin/service nmb condrestart >/dev/null 2>&1 || :
-  if [ -f /var/run/samba/samba.pid ]; then
-    /sbin/service samba restart >/dev/null 2>&1 || :
-  fi
 fi
 exit 0
 
@@ -629,15 +591,6 @@ if [ $1 = 0 ] ; then
 fi
 exit 0
 
-## --------------------------------------------------------------------
-%post swat
-# Add swat entry to /etc/services if not already there.
-if [ ! "`grep ^\s**swat /etc/services`" ]; then
-        echo 'swat        901/tcp     # Add swat service used via inetd' \
-          >> /etc/services
-fi
-exit 0
-
 ## --------------------------------------------------------------------
 %pre winbind
 /usr/sbin/groupadd -g 88 wbpriv >/dev/null 2>&1 || :
@@ -653,8 +606,39 @@ fi
 ## --------------------------------------------------------------------
 %post dc
 
+if [ $1 -eq 1 ]; then   # Install
+  # modify named.conf.dlz for DLZ configuration if version 9.9.0 or later
+  if [ -f /usr/sbin/named ]; then
+    bind_minor_ver=$(named -v | sed -e "s|^BIND \([.0-9]*\)|\1|" | cut -d "." -f 2)
+    if [ $bind_minor_ver -gt 8 ]; then
+      cat %{_datadir}/samba/setup/named.conf.dlz \
+        | sed -e "s|\(database.*dlz_bind9.so\)|# \1|" > %{_datadir}/samba/setup/named.conf.dlz9
+      cat %{_datadir}/samba/setup/named.conf.dlz9 > %{_datadir}/samba/setup/named.conf.dlz
+      rm %{_datadir}/samba/setup/named.conf.dlz9
+    fi
+  fi
+
+  /sbin/chkconfig --add samba
+
+  # rename original smb.conf for provisioning
+  mv -f %{_sysconfdir}/samba/smb.conf %{_sysconfdir}/samba/smb.conf.old
+fi
+
 setfacl -m u:named:rwx /var/lib/samba/private >/dev/null 2>/dev/null || :
 
+if [ -d /var/lib/samba/private/tls ]; then
+  chmod 0700 /var/lib/samba/private/tls
+fi
+if [ -f /var/lib/samba/private/tls/key.pem ]; then
+  chmod 0600 /var/lib/samba/private/tls/key.pem
+fi
+
+if [ $1 -ge 2 ]; then   # Upgrade
+  if [ -f /var/run/samba/samba.pid ]; then
+    /sbin/service samba restart >/dev/null 2>&1 || :
+  fi
+fi
+
 ## --------------------------------------------------------------------
 %post common
 /sbin/ldconfig
@@ -727,6 +711,7 @@ exit 0
 %{_mandir}/man8/vfs_aio_linux.8.gz
 %{_mandir}/man8/vfs_aio_pthread.8.gz
 %{_mandir}/man8/vfs_audit.8.gz
+%{_mandir}/man8/vfs_btrfs.8.gz
 %{_mandir}/man8/vfs_cacheprime.8.gz
 %{_mandir}/man8/vfs_cap.8.gz
 %{_mandir}/man8/vfs_catia.8.gz
@@ -739,6 +724,7 @@ exit 0
 %{_mandir}/man8/vfs_fileid.8.gz
 %{_mandir}/man8/vfs_full_audit.8.gz
 %{_mandir}/man8/vfs_gpfs.8.gz
+%{_mandir}/man8/vfs_linux_xfs_sgid.8.gz
 %{_mandir}/man8/vfs_media_harmony.8.gz
 %{_mandir}/man8/vfs_netatalk.8.gz
 %{_mandir}/man8/vfs_notify_fam.8.gz
@@ -753,6 +739,7 @@ exit 0
 %{_mandir}/man8/vfs_smb_traffic_analyzer.8.gz
 %{_mandir}/man8/vfs_streams_depot.8.gz
 %{_mandir}/man8/vfs_streams_xattr.8.gz
+%{_mandir}/man8/vfs_syncops.8.gz
 %{_mandir}/man8/vfs_time_audit.8.gz
 %{_mandir}/man8/vfs_tsmsm.8.gz
 %{_mandir}/man8/vfs_xattr_tdb.8.gz
@@ -868,6 +855,7 @@ exit 0
 %{_libdir}/samba/libndr-samba4.so
 %{_libdir}/samba/libnet_keytab.so
 %{_libdir}/samba/libnetif.so
+%{_libdir}/samba/libnon_posix_acls.so
 %{_libdir}/samba/libnpa_tstream.so
 #%{_libdir}/samba/libpopt.so
 %{_libdir}/samba/libposix_eadb.so
@@ -926,8 +914,7 @@ exit 0
 %{_libdir}/samba/libwind-samba4.so.0.0.0
 
 %if %{with_ntdb}
-%{_libdir}/samba/libntdb.so.0
-%{_libdir}/samba/libntdb.so.%{ntdb_version}
+%{_libdir}/samba/libntdb.so.*
 %endif
 
 %if ! %with_libsmbclient
@@ -1091,6 +1078,7 @@ exit 0
 %{_bindir}/regshell
 %{_bindir}/regtree
 %{_bindir}/rpcclient
+%{_bindir}/samba-regedit
 %{_bindir}/sharesec
 %{_bindir}/smbcacls
 %{_bindir}/smbclient
@@ -1128,10 +1116,12 @@ exit 0
 %{_mandir}/man1/smbtree.1.gz
 %{_mandir}/man5/smbgetrc.5.gz
 %{_mandir}/man5/smbpasswd.5.gz
+%{_mandir}/man8/samba-regedit.8.gz
 %{_mandir}/man8/smbpasswd.8.gz
 %{_mandir}/man8/smbspool.8.gz
 %{_mandir}/man8/smbta-util.8.gz
 #ja manuals
+%{_mandir}/ja/man1/dbwrap_tool.1.gz
 %{_mandir}/ja/man1/findsmb.1.gz
 %{_mandir}/ja/man1/log2pcap.1.gz
 %{_mandir}/ja/man1/nmblookup.1.gz
@@ -1154,7 +1144,13 @@ exit 0
 %{_bindir}/ntdbdump
 %{_bindir}/ntdbrestore
 %{_bindir}/ntdbtool
-%endif
+
+%{_mandir}/man3/ntdb.3.gz
+%{_mandir}/man8/ntdbbackup.8.gz
+%{_mandir}/man8/ntdbdump.8.gz
+%{_mandir}/man8/ntdbrestore.8.gz
+%{_mandir}/man8/ntdbtool.8.gz
+%%endif
 
 ## --------------------------------------------------------------------
 %files test
@@ -1264,6 +1260,7 @@ exit 0
 %{_includedir}/samba-4.0/smb2.h
 %{_includedir}/samba-4.0/smb2_constants.h
 %{_includedir}/samba-4.0/smb2_create_blob.h
+%{_includedir}/samba-4.0/smb2_lease.h
 %{_includedir}/samba-4.0/smb2_signing.h
 %{_includedir}/samba-4.0/smb_cli.h
 %{_includedir}/samba-4.0/smb_cliraw.h
@@ -1381,17 +1378,6 @@ exit 0
 %{_mandir}/man3/Parse::Pidl::Util.3pm.gz
 %attr(755,root,root) %{_bindir}/pidl
 
-## --------------------------------------------------------------------
-%files swat
-%defattr(-,root,root)
-%config(noreplace) %{_sysconfdir}/xinetd.d/swat
-%{_datadir}/samba/swat
-%{_sbindir}/swat
-%{_mandir}/man8/swat.8.gz
-#%attr(755,root,root) %{_libdir}/samba/*.msg
-# ja manual
-%{_mandir}/ja/man8/swat.8.gz
-
 ## --------------------------------------------------------------------
 %if %with_libsmbclient
 %files -n libsmbclient
@@ -1445,6 +1431,14 @@ exit 0
 %endif
 
 %changelog
+* Mon Dec 09 2013 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 4.1.3-1
+- new upstream release.
+
+* Thu Nov 28 2013 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 4.1.2-1
+- new upstream release.
+- removed a sub package "samba-swat" (removed in upstream).
+- %%post was made to fix the permission of TLS key (CVE-2013-4476).
+
 * Wed Oct 09 2013 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 4.0.10-1
 - new upstream release.