···

       
20
       
20
       
 
       
in

     

       
21
       
21
       
 
       
stdenv.mkDerivation rec {

     

       
22
       
22
       
 
       
  name    = "musl-${version}";

     

       
23
       
23
       
-
       
  version = "1.1.18";

     

       
23
       
23
       
+
       
  version = "1.1.19";

     

       
24
       
24
       
 
       


     

       
25
       
25
       
 
       
  src = fetchurl {

     

       
26
       
26
       
 
       
    url    = "http://www.musl-libc.org/releases/musl-${version}.tar.gz";

     

       
27
       
27
       
-
       
    sha256 = "0651lnj5spckqjf83nz116s8qhhydgqdy3rkl4icbh5f05fyw5yh";

     

       
27
       
27
       
+
       
    sha256 = "1nf1wh44bhm8gdcfr75ayib29b99vpq62zmjymrq7f96h9bshnfv";

     

       
28
       
28
       
 
       
  };

     

       
29
       
29
       
 
       


     

       
30
       
30
       
 
       
  enableParallelBuilding = true;

     
···

       
46
       
46
       
 
       
  ];

     

       
47
       
47
       
 
       


     

       
48
       
48
       
 
       
  outputs = [ "out" "dev" ];

     

       
49
       
49
       
-
       


     

       
50
       
50
       
-
       
  patches = [ ./few-more-uapi-fixes.patch ];

     

       
51
       
49
       
 
       


     

       
52
       
50
       
 
       
  dontDisableStatic = true;

     

       
53
       
51
       
 
       
  dontStrip = true;

     

···

       
1
       
1
       
-
       
http://www.openwall.com/lists/musl/2018/01/06/3

     

       
2
       
2
       
-
       


     

       
3
       
3
       
-
       
Date: Sat,  6 Jan 2018 23:32:52 +0100

     

       
4
       
4
       
-
       
From: Hauke Mehrtens <hauke@...ke-m.de>

     

       
5
       
5
       
-
       
To: musl@...ts.openwall.com

     

       
6
       
6
       
-
       
Cc: felix.janda@...teo.de,

     

       
7
       
7
       
-
       
	Hauke Mehrtens <hauke@...ke-m.de>

     

       
8
       
8
       
-
       
Subject: [PATCH v2] Add additional uapi guards for Linux kernel header files

     

       
9
       
9
       
-
       


     

       
10
       
10
       
-
       
With Linux kernel 4.16 it will be possible to guard more parts of the

     

       
11
       
11
       
-
       
Linux header files from a libc. Make use of this in musl to guard all

     

       
12
       
12
       
-
       
the structures and other definitions from the Linux header files which

     

       
13
       
13
       
-
       
are also defined by the header files provided by musl. This will make

     

       
14
       
14
       
-
       
musl compile with the unmodified Linux kernel user space headers.

     

       
15
       
15
       
-
       


     

       
16
       
16
       
-
       
This extends the definitions done in commit 04983f227238 ("make

     

       
17
       
17
       
-
       
netinet/in.h suppress clashing definitions from kernel headers")

     

       
18
       
18
       
-
       


     

       
19
       
19
       
-
       
The needed patches were recently accepted into the netdev tree and will be integrated in Linux 4.16:

     

       
20
       
20
       
-
       
https://patchwork.ozlabs.org/patch/854342/

     

       
21
       
21
       
-
       
https://patchwork.ozlabs.org/patch/855293/

     

       
22
       
22
       
-
       
---

     

       
23
       
23
       
-
       
 include/net/if.h           | 7 +++++++

     

       
24
       
24
       
-
       
 include/netinet/if_ether.h | 1 +

     

       
25
       
25
       
-
       
 include/sys/xattr.h        | 2 ++

     

       
26
       
26
       
-
       
 3 files changed, 10 insertions(+)

     

       
27
       
27
       
-
       


     

       
28
       
28
       
-
       
diff --git a/include/net/if.h b/include/net/if.h

     

       
29
       
29
       
-
       
index 2f2fcc10..0ee48cd7 100644

     

       
30
       
30
       
-
       
--- a/include/net/if.h

     

       
31
       
31
       
-
       
+++ b/include/net/if.h

     

       
32
       
32
       
-
       
@@ -125,6 +125,13 @@ struct ifconf {

     

       
33
       
33
       
-
       
 #define ifc_req		ifc_ifcu.ifcu_req

     

       
34
       
34
       
-
       
 #define _IOT_ifconf _IOT(_IOTS(struct ifconf),1,0,0,0,0)

     

       
35
       
35
       
-
       
 

     

       
36
       
36
       
-
       
+#define __UAPI_DEF_IF_IFCONF					0

     

       
37
       
37
       
-
       
+#define __UAPI_DEF_IF_IFMAP					0

     

       
38
       
38
       
-
       
+#define __UAPI_DEF_IF_IFNAMSIZ					0

     

       
39
       
39
       
-
       
+#define __UAPI_DEF_IF_IFREQ					0

     

       
40
       
40
       
-
       
+#define __UAPI_DEF_IF_NET_DEVICE_FLAGS				0

     

       
41
       
41
       
-
       
+#define __UAPI_DEF_IF_NET_DEVICE_FLAGS_LOWER_UP_DORMANT_ECHO	0

     

       
42
       
42
       
-
       
+

     

       
43
       
43
       
-
       
 #endif

     

       
44
       
44
       
-
       
 

     

       
45
       
45
       
-
       
 #ifdef __cplusplus

     

       
46
       
46
       
-
       
diff --git a/include/netinet/if_ether.h b/include/netinet/if_ether.h

     

       
47
       
47
       
-
       
index d9a131aa..c2c6e944 100644

     

       
48
       
48
       
-
       
--- a/include/netinet/if_ether.h

     

       
49
       
49
       
-
       
+++ b/include/netinet/if_ether.h

     

       
50
       
50
       
-
       
@@ -133,5 +133,6 @@ do { \

     

       
51
       
51
       
-
       
 	(enaddr)[5] = ((uint8_t *)ipaddr)[3]; \

     

       
52
       
52
       
-
       
 } while(0)

     

       
53
       
53
       
-
       
 

     

       
54
       
54
       
-
       
+#define __UAPI_DEF_ETHHDR	0

     

       
55
       
55
       
-
       
 

     

       
56
       
56
       
-
       
 #endif

     

       
57
       
57
       
-
       
diff --git a/include/sys/xattr.h b/include/sys/xattr.h

     

       
58
       
58
       
-
       
index 6479fcc6..52e3dd89 100644

     

       
59
       
59
       
-
       
--- a/include/sys/xattr.h

     

       
60
       
60
       
-
       
+++ b/include/sys/xattr.h

     

       
61
       
61
       
-
       
@@ -24,6 +24,8 @@ int removexattr(const char *, const char *);

     

       
62
       
62
       
-
       
 int lremovexattr(const char *, const char *);

     

       
63
       
63
       
-
       
 int fremovexattr(int, const char *);

     

       
64
       
64
       
-
       
 

     

       
65
       
65
       
-
       
+#define __UAPI_DEF_XATTR	0

     

       
66
       
66
       
-
       
+

     

       
67
       
67
       
-
       
 #ifdef __cplusplus

     

       
68
       
68
       
-
       
 }

     

       
69
       
69
       
-
       
 #endif

     

       
70
       
70
       
-
       
-- 

     

       
71
       
71
       
-
       
2.11.0