systemd: version bump 219 -> 220

Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>

8 files changed, 45 insertions, 252 deletions

diff --git a/patches/systemd-219/0005-HACK-missing.h-add-NDA_.patch b/patches/systemd-219/0005-HACK-missing.h-add-NDA_.patch
deleted file mode 100644
index 941f811fe..000000000
--- a/patches/systemd-219/0005-HACK-missing.h-add-NDA_.patch
+++ /dev/null
@@ -1,49 +0,0 @@
-From: Michael Olbrich <m.olbrich@pengutronix.de>
-Date: Mon, 9 Mar 2015 12:27:25 +0100
-Subject: [PATCH] HACK: missing.h: add NDA_*
-
-This is necessary to build with older kernel headers. NDA_VLAN was
-introduced in v3.9 and NDA_PORT, NDA_VNI and NDA_IFINDEX in v3.10
-
-This is a hacked version of an upstream commit that doesn't touch
-configure.ac.
-
-Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
----
- src/shared/missing.h | 16 ++++++++++++++++
- 1 file changed, 16 insertions(+)
-
-diff --git a/src/shared/missing.h b/src/shared/missing.h
-index 3f93d3226ee3..1ba53e810476 100644
---- a/src/shared/missing.h
-+++ b/src/shared/missing.h
-@@ -35,6 +35,7 @@
- #include <linux/loop.h>
- #include <linux/audit.h>
- #include <linux/capability.h>
-+#include <linux/neighbour.h>
- 
- #ifdef HAVE_AUDIT
- #include <libaudit.h>
-@@ -623,6 +624,21 @@ static inline int setns(int fd, int nstype) {
- #define CLOCK_BOOTTIME_ALARM 9
- #endif
- 
-+#if 1
-+#define NDA_UNSPEC 0
-+#define NDA_DST 1
-+#define NDA_LLADDR 2
-+#define NDA_CACHEINFO 3
-+#define NDA_PROBES 4
-+#define NDA_VLAN 5
-+#define NDA_PORT 6
-+#define NDA_VNI 7
-+#define NDA_IFINDEX 8
-+#define __NDA_MAX 9
-+
-+#define NDA_MAX (__NDA_MAX - 1)
-+#endif
-+
- #ifndef IPV6_UNICAST_IF
- #define IPV6_UNICAST_IF 76
- #endif
diff --git a/patches/systemd-219/0006-missing.h-add-more-btrfs-types-and-defines.patch b/patches/systemd-219/0006-missing.h-add-more-btrfs-types-and-defines.patch
deleted file mode 100644
index cd975dd90..000000000
--- a/patches/systemd-219/0006-missing.h-add-more-btrfs-types-and-defines.patch
+++ /dev/null
@@ -1,191 +0,0 @@
-From: Michael Olbrich <m.olbrich@pengutronix.de>
-Date: Wed, 18 Mar 2015 13:17:37 +0100
-Subject: [PATCH] missing.h: add more btrfs types and defines
-
-Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
----
- src/shared/missing.h | 151 +++++++++++++++++++++++++++++++++++++++++++++++++++
- 1 file changed, 151 insertions(+)
-
-diff --git a/src/shared/missing.h b/src/shared/missing.h
-index 1ba53e810476..0af01498a657 100644
---- a/src/shared/missing.h
-+++ b/src/shared/missing.h
-@@ -220,12 +220,59 @@ static inline int getrandom(void *buffer, size_t count, unsigned flags) {
- #define BTRFS_UUID_SIZE 16
- #endif
- 
-+#ifndef BTRFS_SUBVOL_RDONLY
-+#define BTRFS_SUBVOL_RDONLY (1ULL << 1)
-+#endif
-+
-+#ifndef BTRFS_SUBVOL_NAME_MAX
-+#define BTRFS_SUBVOL_NAME_MAX 4039
-+#endif
-+
-+#ifndef BTRFS_INO_LOOKUP_PATH_MAX
-+#define BTRFS_INO_LOOKUP_PATH_MAX 4080
-+#endif
-+
-+#ifndef BTRFS_SEARCH_ARGS_BUFSIZE
-+#define BTRFS_SEARCH_ARGS_BUFSIZE (4096 - sizeof(struct btrfs_ioctl_search_key))
-+#endif
-+
- #ifndef HAVE_LINUX_BTRFS_H
- struct btrfs_ioctl_vol_args {
-         int64_t fd;
-         char name[BTRFS_PATH_NAME_MAX + 1];
- };
- 
-+struct btrfs_qgroup_limit {
-+        __u64 flags;
-+        __u64 max_rfer;
-+        __u64 max_excl;
-+        __u64 rsv_rfer;
-+        __u64 rsv_excl;
-+};
-+
-+struct btrfs_qgroup_inherit {
-+        __u64 flags;
-+        __u64 num_qgroups;
-+        __u64 num_ref_copies;
-+        __u64 num_excl_copies;
-+        struct btrfs_qgroup_limit lim;
-+        __u64 qgroups[0];
-+};
-+
-+struct btrfs_ioctl_vol_args_v2 {
-+        __s64 fd;
-+        __u64 transid;
-+        __u64 flags;
-+        union {
-+                struct {
-+                        __u64 size;
-+                        struct btrfs_qgroup_inherit *qgroup_inherit;
-+                };
-+                __u64 unused[4];
-+        };
-+        char name[BTRFS_SUBVOL_NAME_MAX + 1];
-+};
-+
- struct btrfs_ioctl_dev_info_args {
-         uint64_t devid;                         /* in/out */
-         uint8_t uuid[BTRFS_UUID_SIZE];          /* in/out */
-@@ -241,6 +288,68 @@ struct btrfs_ioctl_fs_info_args {
-         uint8_t fsid[BTRFS_FSID_SIZE];          /* out */
-         uint64_t reserved[124];                 /* pad to 1k */
- };
-+
-+struct btrfs_ioctl_ino_lookup_args {
-+        __u64 treeid;
-+        __u64 objectid;
-+        char name[BTRFS_INO_LOOKUP_PATH_MAX];
-+};
-+
-+struct btrfs_ioctl_search_key {
-+        /* which root are we searching.  0 is the tree of tree roots */
-+        __u64 tree_id;
-+
-+        /* keys returned will be >= min and <= max */
-+        __u64 min_objectid;
-+        __u64 max_objectid;
-+
-+        /* keys returned will be >= min and <= max */
-+        __u64 min_offset;
-+        __u64 max_offset;
-+
-+        /* max and min transids to search for */
-+        __u64 min_transid;
-+        __u64 max_transid;
-+
-+        /* keys returned will be >= min and <= max */
-+        __u32 min_type;
-+        __u32 max_type;
-+
-+        /*
-+         * how many items did userland ask for, and how many are we
-+         * returning
-+         */
-+        __u32 nr_items;
-+
-+        /* align to 64 bits */
-+        __u32 unused;
-+
-+        /* some extra for later */
-+        __u64 unused1;
-+        __u64 unused2;
-+        __u64 unused3;
-+        __u64 unused4;
-+};
-+
-+struct btrfs_ioctl_search_header {
-+        __u64 transid;
-+        __u64 objectid;
-+        __u64 offset;
-+        __u32 type;
-+        __u32 len;
-+};
-+
-+
-+struct btrfs_ioctl_search_args {
-+        struct btrfs_ioctl_search_key key;
-+        char buf[BTRFS_SEARCH_ARGS_BUFSIZE];
-+};
-+
-+struct btrfs_ioctl_clone_range_args {
-+        __s64 src_fd;
-+        __u64 src_offset, src_length;
-+        __u64 dest_offset;
-+};
- #endif
- 
- #ifndef BTRFS_IOC_DEFRAG
-@@ -248,6 +357,48 @@ struct btrfs_ioctl_fs_info_args {
-                                  struct btrfs_ioctl_vol_args)
- #endif
- 
-+#ifndef BTRFS_IOC_CLONE
-+#define BTRFS_IOC_CLONE _IOW(BTRFS_IOCTL_MAGIC, 9, int)
-+#endif
-+
-+#ifndef BTRFS_IOC_CLONE_RANGE
-+#define BTRFS_IOC_CLONE_RANGE _IOW(BTRFS_IOCTL_MAGIC, 13, \
-+                                 struct btrfs_ioctl_clone_range_args)
-+#endif
-+
-+#ifndef BTRFS_IOC_SUBVOL_CREATE
-+#define BTRFS_IOC_SUBVOL_CREATE _IOW(BTRFS_IOCTL_MAGIC, 14, \
-+                                 struct btrfs_ioctl_vol_args)
-+#endif
-+
-+#ifndef BTRFS_IOC_SNAP_DESTROY
-+#define BTRFS_IOC_SNAP_DESTROY _IOW(BTRFS_IOCTL_MAGIC, 15, \
-+                                 struct btrfs_ioctl_vol_args)
-+#endif
-+
-+#ifndef BTRFS_IOC_TREE_SEARCH
-+#define BTRFS_IOC_TREE_SEARCH _IOWR(BTRFS_IOCTL_MAGIC, 17, \
-+                                 struct btrfs_ioctl_search_args)
-+#endif
-+
-+#ifndef BTRFS_IOC_INO_LOOKUP
-+#define BTRFS_IOC_INO_LOOKUP _IOWR(BTRFS_IOCTL_MAGIC, 18, \
-+                                 struct btrfs_ioctl_ino_lookup_args)
-+#endif
-+
-+#ifndef BTRFS_IOC_SNAP_CREATE_V2
-+#define BTRFS_IOC_SNAP_CREATE_V2 _IOW(BTRFS_IOCTL_MAGIC, 23, \
-+                                 struct btrfs_ioctl_vol_args_v2)
-+#endif
-+
-+#ifndef BTRFS_IOC_SUBVOL_GETFLAGS
-+#define BTRFS_IOC_SUBVOL_GETFLAGS _IOR(BTRFS_IOCTL_MAGIC, 25, __u64)
-+#endif
-+
-+#ifndef BTRFS_IOC_SUBVOL_SETFLAGS
-+#define BTRFS_IOC_SUBVOL_SETFLAGS _IOW(BTRFS_IOCTL_MAGIC, 26, __u64)
-+#endif
-+
- #ifndef BTRFS_IOC_DEV_INFO
- #define BTRFS_IOC_DEV_INFO _IOWR(BTRFS_IOCTL_MAGIC, 30, \
-                                  struct btrfs_ioctl_dev_info_args)
diff --git a/patches/systemd-219/0001-missing-defined-extra-clock-ids.patch b/patches/systemd-220/0001-missing-defined-extra-clock-ids.patch
index b898584da..f6acfae8c 100644
--- a/patches/systemd-219/0001-missing-defined-extra-clock-ids.patch
+++ b/patches/systemd-220/0001-missing-defined-extra-clock-ids.patch
@@ -12,11 +12,11 @@ Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
  1 file changed, 10 insertions(+)
 
 diff --git a/src/shared/missing.h b/src/shared/missing.h
-index b33a70cb2cc7..3b7196d3e832 100644
+index 8ca6f8edb62c..db6450a168ca 100644
 --- a/src/shared/missing.h
 +++ b/src/shared/missing.h
-@@ -613,6 +613,16 @@ static inline int setns(int fd, int nstype) {
- #define IFLA_BRPORT_MAX (__IFLA_BRPORT_MAX - 1)
+@@ -798,6 +798,16 @@ static inline int setns(int fd, int nstype) {
+ #define NDA_MAX (__NDA_MAX - 1)
  #endif
  
 +#ifndef CLOCK_BOOTTIME
diff --git a/patches/systemd-219/0002-missing-add-BPF_XOR.patch b/patches/systemd-220/0002-missing-add-BPF_XOR.patch
index 58e3cb07c..4b42a3b80 100644
--- a/patches/systemd-219/0002-missing-add-BPF_XOR.patch
+++ b/patches/systemd-220/0002-missing-add-BPF_XOR.patch
@@ -10,10 +10,10 @@ Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
  1 file changed, 4 insertions(+)
 
 diff --git a/src/shared/missing.h b/src/shared/missing.h
-index 3b7196d3e832..a6c12119ae88 100644
+index db6450a168ca..3568526a54cf 100644
 --- a/src/shared/missing.h
 +++ b/src/shared/missing.h
-@@ -675,6 +675,10 @@ static inline int setns(int fd, int nstype) {
+@@ -860,6 +860,10 @@ static inline int setns(int fd, int nstype) {
  #  define BPF_XOR 0xa0
  #endif
  
diff --git a/patches/systemd-219/0003-HACK-sd-pppoe-don-t-use-linux-ppp-ioctl.h.patch b/patches/systemd-220/0003-HACK-sd-pppoe-don-t-use-linux-ppp-ioctl.h.patch
index 468a1a4b6..6db65fac8 100644
--- a/patches/systemd-219/0003-HACK-sd-pppoe-don-t-use-linux-ppp-ioctl.h.patch
+++ b/patches/systemd-220/0003-HACK-sd-pppoe-don-t-use-linux-ppp-ioctl.h.patch
@@ -12,7 +12,7 @@ Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
  1 file changed, 2 insertions(+), 1 deletion(-)
 
 diff --git a/src/libsystemd-network/sd-pppoe.c b/src/libsystemd-network/sd-pppoe.c
-index 4f49b799ec3b..87a3c84a4f69 100644
+index 1de8a5e8bf1b..242fb0e42d98 100644
 --- a/src/libsystemd-network/sd-pppoe.c
 +++ b/src/libsystemd-network/sd-pppoe.c
 @@ -23,7 +23,6 @@
@@ -24,7 +24,7 @@ index 4f49b799ec3b..87a3c84a4f69 100644
  #include <netinet/in.h>
  #include <linux/if_pppox.h>
 @@ -39,6 +38,8 @@
- #include "unaligned.h"
+ #include "refcnt.h"
  #include "utf8.h"
  
 +#define PPPIOCGCHAN	_IOR('t', 55, int)	/* get ppp channel number */
diff --git a/patches/systemd-219/0004-missing-define-__NR_kcmp-if-necessary.patch b/patches/systemd-220/0004-missing-define-__NR_kcmp-if-necessary.patch
index 76469495c..bca25ccf2 100644
--- a/patches/systemd-219/0004-missing-define-__NR_kcmp-if-necessary.patch
+++ b/patches/systemd-220/0004-missing-define-__NR_kcmp-if-necessary.patch
@@ -12,10 +12,10 @@ Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
  1 file changed, 5 insertions(+)
 
 diff --git a/src/shared/missing.h b/src/shared/missing.h
-index a6c12119ae88..3f93d3226ee3 100644
+index 3568526a54cf..2346b2d46e23 100644
 --- a/src/shared/missing.h
 +++ b/src/shared/missing.h
-@@ -768,6 +768,11 @@ static inline int renameat2(int oldfd, const char *oldname, int newfd, const cha
+@@ -961,6 +961,11 @@ static inline int renameat2(int oldfd, const char *oldname, int newfd, const cha
  #define RENAME_NOREPLACE (1 << 0)
  #endif
  
diff --git a/patches/systemd-220/0005-HACK-missing-add-mor-IFLA_VXLAN_-defines.patch b/patches/systemd-220/0005-HACK-missing-add-mor-IFLA_VXLAN_-defines.patch
new file mode 100644
index 000000000..d898aeb4e
--- /dev/null
+++ b/patches/systemd-220/0005-HACK-missing-add-mor-IFLA_VXLAN_-defines.patch
@@ -0,0 +1,34 @@
+From: Michael Olbrich <m.olbrich@pengutronix.de>
+Date: Mon, 25 May 2015 21:15:49 +0200
+Subject: [PATCH] HACK: missing: add mor IFLA_VXLAN_* defines
+
+Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
+---
+ src/shared/missing.h | 7 +++++--
+ 1 file changed, 5 insertions(+), 2 deletions(-)
+
+diff --git a/src/shared/missing.h b/src/shared/missing.h
+index 2346b2d46e23..b7c001ffd8d3 100644
+--- a/src/shared/missing.h
++++ b/src/shared/missing.h
+@@ -713,7 +713,7 @@ static inline int setns(int fd, int nstype) {
+ #define IFLA_VLAN_MAX   (__IFLA_VLAN_MAX - 1)
+ #endif
+ 
+-#if !HAVE_DECL_IFLA_VXLAN_LOCAL6
++#if 1
+ #define IFLA_VXLAN_UNSPEC 0
+ #define IFLA_VXLAN_ID 1
+ #define IFLA_VXLAN_GROUP 2
+@@ -732,7 +732,10 @@ static inline int setns(int fd, int nstype) {
+ #define IFLA_VXLAN_PORT 15
+ #define IFLA_VXLAN_GROUP6 16
+ #define IFLA_VXLAN_LOCAL6 17
+-#define __IFLA_VXLAN_MAX 18
++#define IFLA_VXLAN_UDP_CSUM 18
++#define IFLA_VXLAN_UDP_ZERO_CSUM6_TX 19
++#define IFLA_VXLAN_UDP_ZERO_CSUM6_RX 20
++#define __IFLA_VXLAN_MAX 21
+ 
+ #define IFLA_VXLAN_MAX  (__IFLA_VXLAN_MAX - 1)
+ #endif
diff --git a/patches/systemd-219/series b/patches/systemd-220/series
index bc8ae479d..0db4f6ad0 100644
--- a/patches/systemd-219/series
+++ b/patches/systemd-220/series
@@ -4,6 +4,5 @@
 0002-missing-add-BPF_XOR.patch
 0003-HACK-sd-pppoe-don-t-use-linux-ppp-ioctl.h.patch
 0004-missing-define-__NR_kcmp-if-necessary.patch
-0005-HACK-missing.h-add-NDA_.patch
-0006-missing.h-add-more-btrfs-types-and-defines.patch
-# 915c3c6af6a1a32f140433f23b3a5e59  - git-ptx-patches magic
+0005-HACK-missing-add-mor-IFLA_VXLAN_-defines.patch
+# 5962e81539803e398eac36196071908d  - git-ptx-patches magic