commit b0592a3e2e722c306d39f8a5611713695a2648ab · pyrox.dev/nixpkgs

+4 -1

pkgs/development/interpreters/guile/1.8.nix

···

       37
       37
        
           libtool

     

       38
       38
        
         ];

     

       39
       39
        
       

     

       40
       40
       -
         patches = [ ./cpp-4.5.patch ];

     

       40
       40
       +
         patches = [

     

       41
       41
       +
           ./cpp-4.5.patch

     

       42
       42
       +
           ./CVE-2016-8605.patch

     

       43
       43
       +
         ];

     

       41
       44
        
       

     

       42
       45
        
         preBuild = ''

     

       43
       46
        
           sed -e '/lt_dlinit/a  lt_dladdsearchdir("'$out/lib'");' -i libguile/dynl.c

+59

pkgs/development/interpreters/guile/CVE-2016-8605.patch

···

       1
       1
       +
       commit d514e3fc42eb14a1bc5846b27ef89f50ba3a5d48

     

       2
       2
       +
       Author: Ludovic Courtès <ludo@gnu.org>

     

       3
       3
       +
       Date:   Tue Oct 11 10:14:26 2016 +0200

     

       4
       4
       +
       

     

       5
       5
       +
           Remove 'umask' calls from 'mkdir'.

     

       6
       6
       +
           

     

       7
       7
       +
           Fixes <http://bugs.gnu.org/24659>.

     

       8
       8
       +
           

     

       9
       9
       +
           * libguile/filesys.c (SCM_DEFINE): Remove calls to 'umask' when MODE is

     

       10
       10
       +
           unbound; instead, use 0777 as the mode.  Update docstring to clarify

     

       11
       11
       +
           this.

     

       12
       12
       +
       

     

       13
       13
       +
       diff --git a/libguile/filesys.c b/libguile/filesys.c

     

       14
       14
       +
       index c8acb13ef..921f765f1 100644

     

       15
       15
       +
       --- a/libguile/filesys.c

     

       16
       16
       +
       +++ b/libguile/filesys.c

     

       17
       17
       +
       @@ -1,4 +1,5 @@

     

       18
       18
       +
       -/* Copyright (C) 1996,1997,1998,1999,2000,2001, 2002, 2004, 2006, 2008 Free Software Foundation, Inc.

     

       19
       19
       +
       +/* Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2004, 2006,

     

       20
       20
       +
       + *   2009, 2010, 2011, 2012, 2013, 2014, 2016 Free Software Foundation, Inc.

     

       21
       21
       +
         * 

     

       22
       22
       +
         * This library is free software; you can redistribute it and/or

     

       23
       23
       +
         * modify it under the terms of the GNU Lesser General Public

     

       24
       24
       +
       @@ -791,26 +792,21 @@ SCM_DEFINE (scm_delete_file, "delete-file", 1, 0, 0,

     

       25
       25
       +
        SCM_DEFINE (scm_mkdir, "mkdir", 1, 1, 0,

     

       26
       26
       +
                    (SCM path, SCM mode),

     

       27
       27
       +
        	    "Create a new directory named by @var{path}.  If @var{mode} is omitted\n"

     

       28
       28
       +
       -	    "then the permissions of the directory file are set using the current\n"

     

       29
       29
       +
       -	    "umask.  Otherwise they are set to the decimal value specified with\n"

     

       30
       30
       +
       -	    "@var{mode}.  The return value is unspecified.")

     

       31
       31
       +
       +	    "then the permissions of the directory are set to @code{#o777}\n"

     

       32
       32
       +
       +	    "masked with the current umask (@pxref{Processes, @code{umask}}).\n"

     

       33
       33
       +
       +	    "Otherwise they are set to the value specified with @var{mode}.\n"

     

       34
       34
       +
       +	    "The return value is unspecified.")

     

       35
       35
       +
        #define FUNC_NAME s_scm_mkdir

     

       36
       36
       +
        {

     

       37
       37
       +
          int rv;

     

       38
       38
       +
       -  mode_t mask;

     

       39
       39
       +
       +  mode_t c_mode;

     

       40
       40
       +
        

     

       41
       41
       +
       -  if (SCM_UNBNDP (mode))

     

       42
       42
       +
       -    {

     

       43
       43
       +
       -      mask = umask (0);

     

       44
       44
       +
       -      umask (mask);

     

       45
       45
       +
       -      STRING_SYSCALL (path, c_path, rv = mkdir (c_path, 0777 ^ mask));

     

       46
       46
       +
       -    }

     

       47
       47
       +
       -  else

     

       48
       48
       +
       -    {

     

       49
       49
       +
       -      STRING_SYSCALL (path, c_path, rv = mkdir (c_path, scm_to_uint (mode)));

     

       50
       50
       +
       -    }

     

       51
       51
       +
       +  c_mode = SCM_UNBNDP (mode) ? 0777 : scm_to_uint (mode);

     

       52
       52
       +
       +

     

       53
       53
       +
       +  STRING_SYSCALL (path, c_path, rv = mkdir (c_path, c_mode));

     

       54
       54
       +
          if (rv != 0)

     

       55
       55
       +
            SCM_SYSERROR;

     

       56
       56
       +
       +

     

       57
       57
       +
          return SCM_UNSPECIFIED;

     

       58
       58
       +
        }

     

       59
       59
       +
        #undef FUNC_NAME