/[gentoo-x86]/net-fs/samba/files/samba-4.1.0-remove-dmapi-automagic.patch
Gentoo

Contents of /net-fs/samba/files/samba-4.1.0-remove-dmapi-automagic.patch

Parent Directory Parent Directory | Revision Log Revision Log


Revision 1.1 - (show annotations) (download)
Tue Nov 12 09:28:08 2013 UTC (5 months ago) by polynomial-c
Branch: MAIN
CVS Tags: HEAD
Security bumps for CVE-2013-4475 and CVE-2013-4476. Removed automagic dependency on dmapi (bug #474492). Removed old

(Portage version: 2.2.7/cvs/Linux x86_64, signed Manifest commit with key 0x981CA6FC)

1 --- a/source3/wscript 2013-09-06 11:39:57.000000000 +0200
2 +++ b/source3/wscript 2013-11-01 21:09:01.232151936 +0100
3 @@ -193,28 +193,29 @@
4 elif check_for_fam:
5 Logs.warn('no suitable FAM library found')
6
7 - # check for DMAPI libs
8 - Logs.info("Checking for DMAPI library existence")
9 conf.env['dmapi_lib'] = ''
10 samba_dmapi_lib = ''
11 - if conf.CHECK_FUNCS_IN('dm_get_eventlist', 'dm'):
12 - samba_dmapi_lib = 'dm'
13 - else:
14 - if conf.CHECK_FUNCS_IN('dm_get_eventlist', 'jfsdm'):
15 - samba_dmapi_lib = 'jfsdm'
16 + if Options.options.with_dmapi == True:
17 + # check for DMAPI libs
18 + Logs.info("Checking for DMAPI library existence")
19 + if conf.CHECK_FUNCS_IN('dm_get_eventlist', 'dm'):
20 + samba_dmapi_lib = 'dm'
21 else:
22 - if conf.CHECK_FUNCS_IN('dm_get_eventlist', 'dmapi'):
23 - samba_dmapi_lib = 'dmapi'
24 + if conf.CHECK_FUNCS_IN('dm_get_eventlist', 'jfsdm'):
25 + samba_dmapi_lib = 'jfsdm'
26 else:
27 - if conf.CHECK_FUNCS_IN('dm_get_eventlist', 'xdsm'):
28 - samba_dmapi_lib = 'xdsm'
29 - # only bother to test headers and compilation when a candidate
30 - # library has been found
31 - if Options.options.with_dmapi == True and samba_dmapi_lib == '':
32 - conf.fatal('DMAPI support requested, but no suitable DMAPI library found')
33 - else:
34 - conf.CHECK_HEADERS('sys/dmi.h xfs/dmapi.h sys/jfsdmapi.h sys/dmapi.h dmapi.h')
35 - conf.CHECK_CODE('''
36 + if conf.CHECK_FUNCS_IN('dm_get_eventlist', 'dmapi'):
37 + samba_dmapi_lib = 'dmapi'
38 + else:
39 + if conf.CHECK_FUNCS_IN('dm_get_eventlist', 'xdsm'):
40 + samba_dmapi_lib = 'xdsm'
41 + # only bother to test headers and compilation when a candidate
42 + # library has been found
43 + if samba_dmapi_lib == '':
44 + conf.fatal('DMAPI support requested, but no suitable DMAPI library found')
45 + else:
46 + conf.CHECK_HEADERS('sys/dmi.h xfs/dmapi.h sys/jfsdmapi.h sys/dmapi.h dmapi.h')
47 + conf.CHECK_CODE('''
48 #include <time.h> /* needed by Tru64 */
49 #include <sys/types.h> /* needed by AIX */
50 #ifdef HAVE_XFS_DMAPI_H
51 @@ -253,8 +254,7 @@
52 if conf.CONFIG_SET('USE_DMAPI'):
53 conf.env['dmapi_lib'] = samba_dmapi_lib
54 else:
55 - if Options.options.with_dmapi == True:
56 - conf.fatal('DMAPI support requested but not found');
57 + conf.fatal('DMAPI support requested but not found');
58
59 # Check for various members of the stat structure
60 conf.CHECK_STRUCTURE_MEMBER('struct stat', 'st_blocks', define='HAVE_STAT_ST_BLOCKS',

  ViewVC Help
Powered by ViewVC 1.1.20