[samba/f20] Update to Samba 4.1.2.

asn asn at fedoraproject.org
Mon Nov 25 14:14:51 UTC 2013


commit 9ac5bed1847714c8a55c8a16f2e0f143a61a801c
Author: Andreas Schneider <asn at redhat.com>
Date:   Mon Nov 25 15:06:21 2013 +0100

    Update to Samba 4.1.2.

 .gitignore                            |    1 +
 samba-4.1.1-Fix-memset-in-ntdb.patch  |   38 -----------
 samba-4.1.2-fix_strict_aliasing.patch |  109 ---------------------------------
 samba.spec                            |   20 +++---
 sources                               |    2 +-
 5 files changed, 12 insertions(+), 158 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 4c98d2d..3de4065 100644
--- a/.gitignore
+++ b/.gitignore
@@ -32,3 +32,4 @@ samba-3.6.0pre1.tar.gz
 /samba-4.1.0rc4.tar.xz
 /samba-4.1.0.tar.xz
 /samba-4.1.1.tar.xz
+/samba-4.1.2.tar.xz
diff --git a/samba.spec b/samba.spec
index 58da8fd..a1c6e1a 100644
--- a/samba.spec
+++ b/samba.spec
@@ -1,9 +1,9 @@
 # Set --with testsuite or %bcond_without to run the Samba torture testsuite.
 %bcond_with testsuite
 
-%define main_release 3
+%define main_release 1
 
-%define samba_version 4.1.1
+%define samba_version 4.1.2
 %define talloc_version 2.0.8
 %define ntdb_version 0.9
 %define tdb_version 1.2.12
@@ -85,10 +85,8 @@ Source6: samba.pamd
 Source200: README.dc
 Source201: README.downgrade
 
-Patch0: samba-4.1.1-Fix-memset-in-ntdb.patch
-Patch1: samba-4.1.0-upn.patch
-Patch2: samba-4.1.2-fix_strict_aliasing.patch
-Patch3: samba-4.1.2-doc.patch
+Patch0: samba-4.1.0-upn.patch
+Patch1: samba-4.1.2-doc.patch
 
 BuildRoot:      %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 
@@ -491,10 +489,8 @@ module necessary to communicate to the Winbind Daemon
 %prep
 %setup -q -n samba-%{version}%{pre_release}
 
-%patch0 -p1 -b .samba-4.1.1-Fix-memset-in-ntdb.patch
-%patch1 -p1 -b .samba-4.1.0-upn.patch
-%patch2 -p1 -b .samba-4.1.2-fix_strict_aliasing.patch
-%patch3 -p1 -b .samba-4.1.2-doc.patch
+%patch0 -p1 -b .samba-4.1.0-upn.patch
+%patch1 -p1 -b .samba-4.1.2-doc.patch
 
 %build
 %global _talloc_lib ,talloc,pytalloc,pytalloc-util
@@ -553,6 +549,7 @@ LDFLAGS="-Wl,-z,relro,-z,now" \
         --with-shared-modules=%{_samba4_modules} \
         --bundled-libraries=%{_samba4_libraries} \
         --with-pam \
+        --without-fam \
 %if (! %with_libsmbclient) || (! %with_libwbclient)
         --private-libraries=%{_samba4_private_libraries} \
 %endif
@@ -1546,6 +1543,9 @@ rm -rf %{buildroot}
 %{_mandir}/man8/pam_winbind.8*
 
 %changelog
+* Mon Nov 25 2013 - Andreas Schneider <asn at redhat.com>
+- Update to Samba 4.1.2.
+
 * Mon Nov 18 2013 - Guenther Deschner <gdeschner at redhat.com> - 4.1.1-3
 - resolves: #948509 - Fix manpage correctness.
 
diff --git a/sources b/sources
index 8072ea5..a285a94 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-4c1882b6cc2070d129b8b97b5ab1a36d  samba-4.1.1.tar.xz
+c9ccd989d9bde0fff1a79311f6680004  samba-4.1.2.tar.xz


More information about the scm-commits mailing list