diff options
| author |   Lars Wendler <polynomial-c@gentoo.org> | 2013-11-12 09:28:08 +0000 |
|---|---|---|
| committer | Lars Wendler <polynomial-c@gentoo.org> | 2013-11-12 09:28:08 +0000 |
| commit | 77b7076e310a55662784171de41c5e6e448689cd (patch) | |
| tree | 9c83f28dfcc74329c92c2dfdda0d532823bb9b29 /net-fs/samba/files | |
| parent | Version bump. (diff) | |
| download | gentoo-2-77b7076e310a55662784171de41c5e6e448689cd.tar.gz gentoo-2-77b7076e310a55662784171de41c5e6e448689cd.tar.bz2 gentoo-2-77b7076e310a55662784171de41c5e6e448689cd.zip | |
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)
Diffstat (limited to 'net-fs/samba/files')
| -rw-r--r-- | net-fs/samba/files/samba-4.1.0-remove-dmapi-automagic.patch | 60 |
1 files changed, 60 insertions, 0 deletions
diff --git a/net-fs/samba/files/samba-4.1.0-remove-dmapi-automagic.patch b/net-fs/samba/files/samba-4.1.0-remove-dmapi-automagic.patch new file mode 100644 index 000000000000..1881604989ea --- /dev/null +++ b/net-fs/samba/files/samba-4.1.0-remove-dmapi-automagic.patch @@ -0,0 +1,60 @@ +--- a/source3/wscript 2013-09-06 11:39:57.000000000 +0200 ++++ b/source3/wscript 2013-11-01 21:09:01.232151936 +0100 +@@ -193,28 +193,29 @@ + elif check_for_fam: + Logs.warn('no suitable FAM library found') + +- # check for DMAPI libs +- Logs.info("Checking for DMAPI library existence") + conf.env['dmapi_lib'] = '' + samba_dmapi_lib = '' +- if conf.CHECK_FUNCS_IN('dm_get_eventlist', 'dm'): +- samba_dmapi_lib = 'dm' +- else: +- if conf.CHECK_FUNCS_IN('dm_get_eventlist', 'jfsdm'): +- samba_dmapi_lib = 'jfsdm' ++ if Options.options.with_dmapi == True: ++ # check for DMAPI libs ++ Logs.info("Checking for DMAPI library existence") ++ if conf.CHECK_FUNCS_IN('dm_get_eventlist', 'dm'): ++ samba_dmapi_lib = 'dm' + else: +- if conf.CHECK_FUNCS_IN('dm_get_eventlist', 'dmapi'): +- samba_dmapi_lib = 'dmapi' ++ if conf.CHECK_FUNCS_IN('dm_get_eventlist', 'jfsdm'): ++ samba_dmapi_lib = 'jfsdm' + else: +- if conf.CHECK_FUNCS_IN('dm_get_eventlist', 'xdsm'): +- samba_dmapi_lib = 'xdsm' +- # only bother to test headers and compilation when a candidate +- # library has been found +- if Options.options.with_dmapi == True and samba_dmapi_lib == '': +- conf.fatal('DMAPI support requested, but no suitable DMAPI library found') +- else: +- conf.CHECK_HEADERS('sys/dmi.h xfs/dmapi.h sys/jfsdmapi.h sys/dmapi.h dmapi.h') +- conf.CHECK_CODE(''' ++ if conf.CHECK_FUNCS_IN('dm_get_eventlist', 'dmapi'): ++ samba_dmapi_lib = 'dmapi' ++ else: ++ if conf.CHECK_FUNCS_IN('dm_get_eventlist', 'xdsm'): ++ samba_dmapi_lib = 'xdsm' ++ # only bother to test headers and compilation when a candidate ++ # library has been found ++ if samba_dmapi_lib == '': ++ conf.fatal('DMAPI support requested, but no suitable DMAPI library found') ++ else: ++ conf.CHECK_HEADERS('sys/dmi.h xfs/dmapi.h sys/jfsdmapi.h sys/dmapi.h dmapi.h') ++ conf.CHECK_CODE(''' + #include <time.h> /* needed by Tru64 */ + #include <sys/types.h> /* needed by AIX */ + #ifdef HAVE_XFS_DMAPI_H +@@ -253,8 +254,7 @@ + if conf.CONFIG_SET('USE_DMAPI'): + conf.env['dmapi_lib'] = samba_dmapi_lib + else: +- if Options.options.with_dmapi == True: +- conf.fatal('DMAPI support requested but not found'); ++ conf.fatal('DMAPI support requested but not found'); + + # Check for various members of the stat structure + conf.CHECK_STRUCTURE_MEMBER('struct stat', 'st_blocks', define='HAVE_STAT_ST_BLOCKS', |