/[smeserver]/rpms/samba/sme10/samba.spec.patch
ViewVC logotype

Diff of /rpms/samba/sme10/samba.spec.patch

Parent Directory Parent Directory | Revision Log Revision Log | View Revision Graph Revision Graph | View Patch Patch

Revision 1.5 by jpp, Tue May 8 17:48:03 2018 UTC Revision 1.6 by jpp, Tue May 8 18:00:56 2018 UTC
# Line 1  Line 1 
1  --- samba.spec.original 2016-10-02 16:23:04.356835288 -0700  --- samba.spec.jpp      2018-05-08 18:38:40.163337265 +0200
2  +++ samba.spec  2016-10-02 16:31:38.311833030 -0700  +++ samba.spec  2018-05-08 19:55:32.890704457 +0200
3  @@ -38,1 +38,1 @@  @@ -6,7 +6,7 @@
4     # ctdb is enabled by default, you can disable it with: --without clustering
5     %bcond_without clustering
6    
7    -%define main_release 12
8    +%define main_release 12.2
9    
10     %define samba_version 4.6.2
11     %define talloc_version 2.1.9
12    @@ -32,7 +32,7 @@
13     %global with_internal_talloc 0
14     %global with_internal_tevent 0
15     %global with_internal_tdb 0
16  -%global with_internal_ldb 0  -%global with_internal_ldb 0
17  +%global with_internal_ldb 1  +%global with_internal_ldb 1
18  @@ -59,8 +59,8 @@  
19     %global with_profiling 1
20    
21    @@ -56,8 +56,8 @@
22   %global libwbc_alternatives_suffix -64   %global libwbc_alternatives_suffix -64
23   %endif   %endif
24    
# Line 14  Line 29 
29    
30   %if %{with testsuite}   %if %{with testsuite}
31   # The testsuite only works with a full build right now.   # The testsuite only works with a full build right now.
32  @@ -399,2 +399,3 @@  @@ -212,7 +212,7 @@
33   Summary: Samba libraries   BuildRequires: libcephfs1-devel
34   Group: Applications/System   %endif
35     %if %{with_dc}
36    -BuildRequires: gnutls-devel >= 3.4.7
37    +BuildRequires: gnutls-devel
38     # Required by samba-tool to run tests
39     BuildRequires: python-crypto
40     %endif
41    @@ -395,6 +395,7 @@
42     %package vfs-cephfs
43     Summary: Samba VFS module for Ceph distributed storage system
44     Requires: libcephfs1
45  +Requires: libldb  +Requires: libldb
46  @@ -463,7 +464,7 @@   Requires: %{name} = %{samba_depver}
47     Requires: %{name}-libs = %{samba_depver}
48    
49    @@ -499,7 +500,7 @@
50   Requires: %{name}-libs = %{samba_depver}   Requires: %{name}-libs = %{samba_depver}
51   Requires: python-tevent   Requires: python-tevent
52   Requires: python-tdb   Requires: python-tdb
# Line 27  Line 55 
55   Requires: pytalloc   Requires: pytalloc
56    
57   Provides: samba4-python = %{samba_depver}   Provides: samba4-python = %{samba_depver}
58  @@ -864,8 +865,8 @@  @@ -868,8 +869,8 @@
59   %endif   %endif
60    
61   install -d -m 0755 %{buildroot}%{_unitdir}   install -d -m 0755 %{buildroot}%{_unitdir}
# Line 38  Line 66 
66       install -m 0644 tmp$i.service %{buildroot}%{_unitdir}/$i.service       install -m 0644 tmp$i.service %{buildroot}%{_unitdir}/$i.service
67   done   done
68   %if %with_clustering_support   %if %with_clustering_support
69  @@ -1481,1 +1481,2 @@  @@ -1483,6 +1484,7 @@
70   %{_mandir}/man8/samba-tool.8*   %{_libdir}/samba/ldb/password_hash.so
71     %{_libdir}/samba/ldb/ranged_results.so
72     %{_libdir}/samba/ldb/repl_meta_data.so
73  +%{_unitdir}/samba.service  +%{_unitdir}/samba.service
74   %else # with_dc   %{_libdir}/samba/ldb/resolve_oids.so
75  @@ -1738,6 +1743,7 @@   %{_libdir}/samba/ldb/rootdse.so
76   %{_libdir}/samba/libHDB-SAMBA4-samba4.so   %{_libdir}/samba/ldb/samba3sam.so
77   %{_libdir}/samba/libasn1-samba4.so.8  @@ -2654,6 +2656,10 @@
78   %{_libdir}/samba/libasn1-samba4.so.8.0.0   %endif # with_clustering_support
79  +#%{_libdir}/samba/libdfs_server_ad.so  
80   %{_libdir}/samba/libgssapi-samba4.so.2   %changelog
81   %{_libdir}/samba/libgssapi-samba4.so.2.0.0  +* Tue May 08 2018 Jean-Philipe Pialasse <tests@pialasse.com> - 4.6.2-12.2.sme
82   %{_libdir}/samba/libhcrypto-samba4.so.5  +- import 4.6.2-12 [SME: 10429]
83    +- import to SME the two last upstream releases [SME: 10326]
84    +
85     * Fri Nov 17 2017 Andreas Schneider <asn@redhat.com> - 4.6.2-12
86     - resolves: #1514314 - Fix CVE-2017-14746 and CVE-2017-15275
87    

Legend:
Removed lines/characters  
Changed lines/characters
  Added lines/characters
admin@koozali.org
 ViewVC Help
Powered by ViewVC 1.2.1 RSS 2.0 feed