new file mode 100644

@@ -0,0 +1,65 @@

+%{!?python3_sitelib: %define python3_sitelib %(python3 -c "from distutils.sysconfig import get_python_lib;print(get_python_lib())")}

+

+Name:           meson

+Summary:        Extremely fast and user friendly build system

+Version:        0.44.0

+Release:        1%{?dist}

+License:        ASL 2.0

+URL:            https://mesonbuild.com/

+Vendor:         VMware, Inc.

+Distribution:   Photon

+Source0:        https://github.com/mesonbuild/meson/archive/%{version}/%{name}-%{version}.tar.gz

+%define sha1    meson=4a5aa56f81fc1350a5c501ef6046eef8a13467c7

+BuildArch:      noarch

+BuildRequires:  gcc

+BuildRequires:  python3-devel

+BuildRequires:  python3-libs

+BuildRequires:  python3-setuptools

+BuildRequires:  ninja-build

+BuildRequires:  gtest-devel

+BuildRequires:  gmock-devel

+BuildRequires:  gettext

+

+Requires:       ninja-build

+Requires:       python3

+

+%description

+Meson is an open source build system meant to be both extremely fast, 

+and, even more importantly, as user friendly as possible.

+The main design point of Meson is that every moment a developer spends 

+writing or debugging build definitions is a second wasted. 

+So is every second spent waiting for the build system to actually start compiling code.

+

+%prep

+%setup 

+

+%build

+

+%install

+python3 setup.py install --root=%{buildroot}/

+install -Dpm0644 data/macros.%{name} %{buildroot}%{_libdir}/rpm/macros.d/macros.%{name}

+

+%check

+export MESON_PRINT_TEST_OUTPUT=1

+python3 ./run_tests.py

+

+%files

+%license COPYING

+%{_bindir}/%{name}

+%{_bindir}/%{name}conf

+%{_bindir}/%{name}introspect

+%{_bindir}/%{name}test

+%{_bindir}/wraptool

+%{python3_sitelib}/mesonbuild

+%{python3_sitelib}/%{name}-*.egg-info

+%{_mandir}/man1/%{name}.1*

+%{_mandir}/man1/%{name}conf.1*

+%{_mandir}/man1/%{name}introspect.1*

+%{_mandir}/man1/%{name}test.1*

+%{_mandir}/man1/wraptool.1*

+%{_libdir}/rpm/macros.d/macros.%{name}

+

+%changelog

+*   Wed Dec 27 2017 Anish Swaminathan <anishs@vmware.com> 0.44.0-1

+-   Initial packaging

+

new file mode 100644

@@ -0,0 +1,8 @@

+%__ninja %{_bindir}/ninja

+%__ninja_common_opts -v %{?_smp_mflags}

+%ninja_build \

+    %{__ninja} %{__ninja_common_opts}

+%ninja_install \

+    DESTDIR=%{buildroot} %{__ninja} install %{__ninja_common_opts}

+%ninja_test \

+    %{__ninja} test %{__ninja_common_opts}

new file mode 100644

@@ -0,0 +1,48 @@

+Name:           ninja-build

+Summary:        Small build system with focus on speed

+Version:        1.8.2

+Release:        1%{?dist}

+License:        ASL 2.0

+URL:            https://ninja-build.org

+Vendor:         VMware, Inc.

+Distribution:   Photon

+Source0:        https://github.com/ninja-build/ninja/archive/%{name}-%{version}.tar.gz

+%define sha1    ninja-build=17219deb34dd816363e37470f77ff7231509143a

+Source1:        macros.ninja

+BuildRequires:  gcc

+BuildRequires:  python3-devel

+BuildRequires:  gtest-devel

+

+%description

+Ninja is a small build system with a focus on speed. 

+It differs from other build systems in two major respects: 

+it is designed to have its input files generated by a higher-level build system, 

+and it is designed to run builds as fast as possible.

+

+%prep

+%setup -n ninja-%{version}

+

+%build

+python3 configure.py --bootstrap --verbose

+./ninja -v all

+

+%install

+install -Dpm0755 ninja -t %{buildroot}%{_bindir}/

+install -Dpm0644 misc/bash-completion %{buildroot}%{_datadir}/bash-completion/completions/ninja

+ln -s ninja %{buildroot}%{_bindir}/ninja-build

+install -Dpm0644 %{SOURCE1} %{buildroot}%{_libdir}/rpm/macros.d/macros.ninja

+

+%check

+./ninja_test --gtest_filter=-SubprocessTest.SetWithLots

+

+%files

+%license COPYING

+%doc HACKING.md README

+%{_bindir}/ninja

+%{_bindir}/ninja-build

+%{_datadir}/bash-completion/completions/ninja

+%{_libdir}/rpm/macros.d/macros.ninja

+

+%changelog

+*   Wed Dec 27 2017 Anish Swaminathan <anishs@vmware.com> 1.8.2-1

+-   Initial packaging

@@ -1,28 +1,18 @@

-diff -Naur a/Makefile.am b/Makefile.am

-+++ b/Makefile.am	2016-08-29 13:42:31.472636829 -0700

-@@ -309,7 +309,7 @@

- 	set -- $(USER_UNIT_ALIASES) && \

- 		dir=$(userunitdir) && $(install-relative-aliases)

- 	set -- $(GENERAL_ALIASES) && \

--		dir= && $(install-relative-aliases)

-+		dir= && $(install-general-aliases)

+diff -rup systemd-236/units/meson-add-wants.sh systemd-236-new/units/meson-add-wants.sh

+--- systemd-236/units/meson-add-wants.sh	2017-12-14 14:09:57.000000000 -0800

+@@ -13,8 +13,6 @@ case "$target" in

+                 ;;

+ esac

- define install-aliases

- 	while [ -n "$$1" ]; do \

-@@ -328,6 +328,15 @@

- 		shift 2 || exit $$?; \

- 	done

- endef

-+

-+define install-general-aliases

-+	while [ -n "$$1" ]; do \

-+		$(MKDIR_P) `dirname $(DESTDIR)$$dir/$$2` && \

-+		rm -f $(DESTDIR)$$dir/$$2 && \

-+		$(LN_S) /usr$$1 $(DESTDIR)$$dir/$$2 && \

-+		shift 2 || exit $$?; \

-+	done

-+endef

+-unitpath="${DESTDIR:-}${unitdir}/${unit}"

+-

+ case "$target" in

+         */)

+                 mkdir -p -m 0755 "$dir"

+@@ -24,4 +22,4 @@ case "$target" in

+                 ;;

+ esac

- install-touch-usr-hook:

- 	touch -c $(DESTDIR)/$(prefix)

+-ln -vfs --relative "$unitpath" "$dir"

++ln -vfs "${unitdir}/${unit}" "$dir"

deleted file mode 100644

@@ -1,36 +0,0 @@

-From 9f939335a07085aa9a9663efd1dca06ef6405d62 Mon Sep 17 00:00:00 2001

-From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= <zbyszek@in.waw.pl>

-Date: Wed, 25 Oct 2017 11:19:19 +0200

-Subject: [PATCH] resolved: fix loop on packets with pseudo dns types

-

-Reported by Karim Hossen & Thomas Imbert from Sogeti ESEC R&D.

-

-https://bugs.launchpad.net/ubuntu/+source/systemd/+bug/1725351

- src/resolve/resolved-dns-packet.c | 6 +-----

- 1 file changed, 1 insertion(+), 5 deletions(-)

-

-diff --git a/src/resolve/resolved-dns-packet.c b/src/resolve/resolved-dns-packet.c

-index e2f227bfc6..35f4d0689b 100644

-+++ b/src/resolve/resolved-dns-packet.c

-@@ -1514,7 +1514,7 @@ static int dns_packet_read_type_window(DnsPacket *p, Bitmap **types, size_t *sta

- 

-                 found = true;

- 

--                while (bitmask) {

-+                for (; bitmask; bit++, bitmask >>= 1)

-                         if (bitmap[i] & bitmask) {

-                                 uint16_t n;

- 

-@@ -1528,10 +1528,6 @@ static int dns_packet_read_type_window(DnsPacket *p, Bitmap **types, size_t *sta

-                                 if (r < 0)

-                                         return r;

-                         }

--

--                        bit++;

--                        bitmask >>= 1;

--                }

-         }

- 

-         if (!found)

deleted file mode 100644

@@ -1,305 +0,0 @@

-diff --git a/src/core/load-fragment.c b/src/core/load-fragment.c

-index 6a6dadda2b..49a5c53f96 100644

-+++ b/src/core/load-fragment.c

-@@ -636,26 +636,36 @@ int config_parse_exec(

- 

-                 r = unit_full_printf(u, f, &path);

-                 if (r < 0) {

--                        log_syntax(unit, LOG_ERR, filename, line, r, "Failed to resolve unit specifiers on %s, ignoring: %m", f);

--                        return 0;

-+                        log_syntax(unit, LOG_ERR, filename, line, r,

-+                                   "Failed to resolve unit specifiers on %s%s: %m",

-+                                   f, ignore ? ", ignoring" : "");

-+                        return ignore ? 0 : -ENOEXEC;

-                 }

- 

-                 if (isempty(path)) {

-                         /* First word is either "-" or "@" with no command. */

--                        log_syntax(unit, LOG_ERR, filename, line, 0, "Empty path in command line, ignoring: \"%s\"", rvalue);

--                        return 0;

-+                        log_syntax(unit, LOG_ERR, filename, line, 0,

-+                                   "Empty path in command line%s: \"%s\"",

-+                                   ignore ? ", ignoring" : "", rvalue);

-+                        return ignore ? 0 : -ENOEXEC;

-                 }

-                 if (!string_is_safe(path)) {

--                        log_syntax(unit, LOG_ERR, filename, line, 0, "Executable path contains special characters, ignoring: %s", rvalue);

--                        return 0;

-+                        log_syntax(unit, LOG_ERR, filename, line, 0,

-+                                   "Executable path contains special characters%s: %s",

-+                                   ignore ? ", ignoring" : "", rvalue);

-+                        return ignore ? 0 : -ENOEXEC;

-                 }

-                 if (!path_is_absolute(path)) {

--                        log_syntax(unit, LOG_ERR, filename, line, 0, "Executable path is not absolute, ignoring: %s", rvalue);

--                        return 0;

-+                        log_syntax(unit, LOG_ERR, filename, line, 0,

-+                                   "Executable path is not absolute%s: %s",

-+                                   ignore ? ", ignoring" : "", rvalue);

-+                        return ignore ? 0 : -ENOEXEC;

-                 }

-                 if (endswith(path, "/")) {

--                        log_syntax(unit, LOG_ERR, filename, line, 0, "Executable path specifies a directory, ignoring: %s", rvalue);

--                        return 0;

-+                        log_syntax(unit, LOG_ERR, filename, line, 0,

-+                                   "Executable path specifies a directory%s: %s",

-+                                   ignore ? ", ignoring" : "", rvalue);

-+                        return ignore ? 0 : -ENOEXEC;

-                 }

- 

-                 if (!separate_argv0) {

-@@ -708,12 +718,14 @@ int config_parse_exec(

-                         if (r == 0)

-                                 break;

-                         if (r < 0)

--                                return 0;

-+                                return ignore ? 0 : -ENOEXEC;

- 

-                         r = unit_full_printf(u, word, &resolved);

-                         if (r < 0) {

--                                log_syntax(unit, LOG_ERR, filename, line, 0, "Failed to resolve unit specifiers on %s, ignoring: %m", word);

--                                return 0;

-+                                log_syntax(unit, LOG_ERR, filename, line, r,

-+                                           "Failed to resolve unit specifiers on %s%s: %m",

-+                                           word, ignore ? ", ignoring" : "");

-+                                return ignore ? 0 : -ENOEXEC;

-                         }

- 

-                         if (!GREEDY_REALLOC(n, nbufsize, nlen + 2))

-@@ -724,8 +736,10 @@ int config_parse_exec(

-                 }

- 

-                 if (!n || !n[0]) {

--                        log_syntax(unit, LOG_ERR, filename, line, 0, "Empty executable name or zeroeth argument, ignoring: %s", rvalue);

--                        return 0;

-+                        log_syntax(unit, LOG_ERR, filename, line, 0,

-+                                   "Empty executable name or zeroeth argument%s: %s",

-+                                   ignore ? ", ignoring" : "", rvalue);

-+                        return ignore ? 0 : -ENOEXEC;

-                 }

- 

-                 nce = new0(ExecCommand, 1);

-@@ -1332,8 +1346,10 @@ int config_parse_exec_selinux_context(

- 

-         r = unit_full_printf(u, rvalue, &k);

-         if (r < 0) {

--                log_syntax(unit, LOG_ERR, filename, line, r, "Failed to resolve specifiers, ignoring: %m");

--                return 0;

-+                log_syntax(unit, LOG_ERR, filename, line, r,

-+                           "Failed to resolve specifiers%s: %m",

-+                           ignore ? ", ignoring" : "");

-+                return ignore ? 0 : -ENOEXEC;

-         }

- 

-         free(c->selinux_context);

-@@ -1380,8 +1396,10 @@ int config_parse_exec_apparmor_profile(

- 

-         r = unit_full_printf(u, rvalue, &k);

-         if (r < 0) {

--                log_syntax(unit, LOG_ERR, filename, line, r, "Failed to resolve specifiers, ignoring: %m");

--                return 0;

-+                log_syntax(unit, LOG_ERR, filename, line, r,

-+                           "Failed to resolve specifiers%s: %m",

-+                           ignore ? ", ignoring" : "");

-+                return ignore ? 0 : -ENOEXEC;

-         }

- 

-         free(c->apparmor_profile);

-@@ -1428,8 +1446,10 @@ int config_parse_exec_smack_process_label(

- 

-         r = unit_full_printf(u, rvalue, &k);

-         if (r < 0) {

--                log_syntax(unit, LOG_ERR, filename, line, r, "Failed to resolve specifiers, ignoring: %m");

--                return 0;

-+                log_syntax(unit, LOG_ERR, filename, line, r,

-+                           "Failed to resolve specifiers%s: %m",

-+                           ignore ? ", ignoring" : "");

-+                return ignore ? 0 : -ENOEXEC;

-         }

- 

-         free(c->smack_process_label);

-@@ -1647,19 +1667,19 @@ int config_parse_socket_service(

- 

-         r = unit_name_printf(UNIT(s), rvalue, &p);

-         if (r < 0) {

--                log_syntax(unit, LOG_ERR, filename, line, r, "Failed to resolve specifiers, ignoring: %s", rvalue);

--                return 0;

-+                log_syntax(unit, LOG_ERR, filename, line, r, "Failed to resolve specifiers: %s", rvalue);

-+                return -ENOEXEC;

-         }

- 

-         if (!endswith(p, ".service")) {

--                log_syntax(unit, LOG_ERR, filename, line, 0, "Unit must be of type service, ignoring: %s", rvalue);

--                return 0;

-+                log_syntax(unit, LOG_ERR, filename, line, 0, "Unit must be of type service: %s", rvalue);

-+                return -ENOEXEC;

-         }

- 

-         r = manager_load_unit(UNIT(s)->manager, p, NULL, &error, &x);

-         if (r < 0) {

--                log_syntax(unit, LOG_ERR, filename, line, r, "Failed to load unit %s, ignoring: %s", rvalue, bus_error_message(&error, r));

--                return 0;

-+                log_syntax(unit, LOG_ERR, filename, line, r, "Failed to load unit %s: %s", rvalue, bus_error_message(&error, r));

-+                return -ENOEXEC;

-         }

- 

-         unit_ref_set(&s->service, x);

-@@ -1907,13 +1927,13 @@ int config_parse_user_group(

- 

-                 r = unit_full_printf(u, rvalue, &k);

-                 if (r < 0) {

--                        log_syntax(unit, LOG_ERR, filename, line, r, "Failed to resolve unit specifiers in %s, ignoring: %m", rvalue);

--                        return 0;

-+                        log_syntax(unit, LOG_ERR, filename, line, r, "Failed to resolve unit specifiers in %s: %m", rvalue);

-+                        return -ENOEXEC;

-                 }

- 

-                 if (!valid_user_group_name_or_id(k)) {

--                        log_syntax(unit, LOG_ERR, filename, line, 0, "Invalid user/group name or numeric ID, ignoring: %s", k);

--                        return 0;

-+                        log_syntax(unit, LOG_ERR, filename, line, 0, "Invalid user/group name or numeric ID: %s", k);

-+                        return -ENOEXEC;

-                 }

- 

-                 n = k;

-@@ -1971,19 +1991,19 @@ int config_parse_user_group_strv(

-                 if (r == -ENOMEM)

-                         return log_oom();

-                 if (r < 0) {

--                        log_syntax(unit, LOG_ERR, filename, line, r, "Invalid syntax, ignoring: %s", rvalue);

--                        break;

-+                        log_syntax(unit, LOG_ERR, filename, line, r, "Invalid syntax: %s", rvalue);

-+                        return -ENOEXEC;

-                 }

- 

-                 r = unit_full_printf(u, word, &k);

-                 if (r < 0) {

--                        log_syntax(unit, LOG_ERR, filename, line, r, "Failed to resolve unit specifiers in %s, ignoring: %m", word);

--                        continue;

-+                        log_syntax(unit, LOG_ERR, filename, line, r, "Failed to resolve unit specifiers in %s: %m", word);

-+                        return -ENOEXEC;

-                 }

- 

-                 if (!valid_user_group_name_or_id(k)) {

--                        log_syntax(unit, LOG_ERR, filename, line, 0, "Invalid user/group name or numeric ID, ignoring: %s", k);

--                        continue;

-+                        log_syntax(unit, LOG_ERR, filename, line, 0, "Invalid user/group name or numeric ID: %s", k);

-+                        return -ENOEXEC;

-                 }

- 

-                 r = strv_push(users, k);

-@@ -2142,25 +2162,28 @@ int config_parse_working_directory(

- 

-                 r = unit_full_printf(u, rvalue, &k);

-                 if (r < 0) {

--                        log_syntax(unit, LOG_ERR, filename, line, r, "Failed to resolve unit specifiers in working directory path '%s', ignoring: %m", rvalue);

--                        return 0;

-+                        log_syntax(unit, LOG_ERR, filename, line, r,

-+                                   "Failed to resolve unit specifiers in working directory path '%s'%s: %m",

-+                                   rvalue, missing_ok ? ", ignoring" : "");

-+                        return missing_ok ? 0 : -ENOEXEC;

-                 }

- 

-                 path_kill_slashes(k);

- 

-                 if (!utf8_is_valid(k)) {

-                         log_syntax_invalid_utf8(unit, LOG_ERR, filename, line, rvalue);

--                        return 0;

-+                        return missing_ok ? 0 : -ENOEXEC;

-                 }

- 

-                 if (!path_is_absolute(k)) {

--                        log_syntax(unit, LOG_ERR, filename, line, 0, "Working directory path '%s' is not absolute, ignoring.", rvalue);

--                        return 0;

-+                        log_syntax(unit, LOG_ERR, filename, line, 0,

-+                                   "Working directory path '%s' is not absolute%s.",

-+                                   rvalue, missing_ok ? ", ignoring" : "");

-+                        return missing_ok ? 0 : -ENOEXEC;

-                 }

- 

--                free_and_replace(c->working_directory, k);

--

-                 c->working_directory_home = false;

-+                free_and_replace(c->working_directory, k);

-         }

- 

-         c->working_directory_missing_ok = missing_ok;

-@@ -4456,8 +4479,11 @@ int unit_load_fragment(Unit *u) {

-                         return r;

- 

-                 r = load_from_path(u, k);

--                if (r < 0)

-+                if (r < 0) {

-+                        if (r == -ENOEXEC)

-+                                log_unit_notice(u, "Unit configuration has fatal error, unit will not be started.");

-                         return r;

-+                }

- 

-                 if (u->load_state == UNIT_STUB) {

-                         SET_FOREACH(t, u->names, i) {

-diff --git a/src/test/test-unit-file.c b/src/test/test-unit-file.c

-index 12f48bf435..fd797b587e 100644

-+++ b/src/test/test-unit-file.c

-@@ -146,7 +146,7 @@ static void test_config_parse_exec(void) {

-         r = config_parse_exec(NULL, "fake", 4, "section", 1,

-                               "LValue", 0, "/RValue/ argv0 r1",

-                               &c, u);

--        assert_se(r == 0);

-+        assert_se(r == -ENOEXEC);

-         assert_se(c1->command_next == NULL);

- 

-         log_info("/* honour_argv0 */");

-@@ -161,7 +161,7 @@ static void test_config_parse_exec(void) {

-         r = config_parse_exec(NULL, "fake", 3, "section", 1,

-                               "LValue", 0, "@/RValue",

-                               &c, u);

--        assert_se(r == 0);

-+        assert_se(r == -ENOEXEC);

-         assert_se(c1->command_next == NULL);

- 

-         log_info("/* no command, whitespace only, reset */");

-@@ -220,7 +220,7 @@ static void test_config_parse_exec(void) {

-                               "-@/RValue argv0 r1 ; ; "

-                               "/goo/goo boo",

-                               &c, u);

--        assert_se(r >= 0);

-+        assert_se(r == -ENOEXEC);

-         c1 = c1->command_next;

-         check_execcommand(c1, "/RValue", "argv0", "r1", NULL, true);

- 

-@@ -374,7 +374,7 @@ static void test_config_parse_exec(void) {

-                 r = config_parse_exec(NULL, "fake", 4, "section", 1,

-                                       "LValue", 0, path,

-                                       &c, u);

--                assert_se(r == 0);

-+                assert_se(r == -ENOEXEC);

-                 assert_se(c1->command_next == NULL);

-         }

- 

-@@ -401,21 +401,21 @@ static void test_config_parse_exec(void) {

-         r = config_parse_exec(NULL, "fake", 4, "section", 1,

-                               "LValue", 0, "/path\\",

-                               &c, u);

--        assert_se(r == 0);

-+        assert_se(r == -ENOEXEC);

-         assert_se(c1->command_next == NULL);

- 

-         log_info("/* missing ending ' */");

-         r = config_parse_exec(NULL, "fake", 4, "section", 1,

-                               "LValue", 0, "/path 'foo",

-                               &c, u);

--        assert_se(r == 0);

-+        assert_se(r == -ENOEXEC);

-         assert_se(c1->command_next == NULL);

- 

-         log_info("/* missing ending ' with trailing backslash */");

-         r = config_parse_exec(NULL, "fake", 4, "section", 1,

-                               "LValue", 0, "/path 'foo\\",

-                               &c, u);

--        assert_se(r == 0);

-+        assert_se(r == -ENOEXEC);

-         assert_se(c1->command_next == NULL);

- 

-         log_info("/* invalid space between modifiers */");

deleted file mode 100644

@@ -1,100 +0,0 @@

-diff --git a/src/core/load-fragment-gperf.gperf.m4 b/src/core/load-fragment-gperf.gperf.m4

-index c43b7885be..5b5a86250e 100644

-+++ b/src/core/load-fragment-gperf.gperf.m4

-@@ -18,8 +18,8 @@ struct ConfigPerfItem;

- m4_dnl Define the context options only once

- m4_define(`EXEC_CONTEXT_CONFIG_ITEMS',

- `$1.WorkingDirectory,            config_parse_working_directory,     0,                             offsetof($1, exec_context)

--$1.RootDirectory,                config_parse_unit_path_printf,      0,                             offsetof($1, exec_context.root_directory)

--$1.RootImage,                    config_parse_unit_path_printf,      0,                             offsetof($1, exec_context.root_image)

-+$1.RootDirectory,                config_parse_unit_path_printf,      true,                          offsetof($1, exec_context.root_directory)

-+$1.RootImage,                    config_parse_unit_path_printf,      true,                          offsetof($1, exec_context.root_image)

- $1.User,                         config_parse_user_group,            0,                             offsetof($1, exec_context.user)

- $1.Group,                        config_parse_user_group,            0,                             offsetof($1, exec_context.group)

- $1.SupplementaryGroups,          config_parse_user_group_strv,       0,                             offsetof($1, exec_context.supplementary_groups)

-@@ -35,7 +35,7 @@ $1.UMask,                        config_parse_mode,                  0,

- $1.Environment,                  config_parse_environ,               0,                             offsetof($1, exec_context.environment)

- $1.EnvironmentFile,              config_parse_unit_env_file,         0,                             offsetof($1, exec_context.environment_files)

- $1.PassEnvironment,              config_parse_pass_environ,          0,                             offsetof($1, exec_context.pass_environment)

--$1.DynamicUser,                  config_parse_bool,                  0,                             offsetof($1, exec_context.dynamic_user)

-+$1.DynamicUser,                  config_parse_bool,                  true,                          offsetof($1, exec_context.dynamic_user)

- $1.StandardInput,                config_parse_exec_input,            0,                             offsetof($1, exec_context)

- $1.StandardOutput,               config_parse_exec_output,           0,                             offsetof($1, exec_context)

- $1.StandardError,                config_parse_exec_output,           0,                             offsetof($1, exec_context)

-diff --git a/src/core/load-fragment.c b/src/core/load-fragment.c

-index 49a5c53f96..9d5c39b3dd 100644

-+++ b/src/core/load-fragment.c

-@@ -242,6 +242,7 @@ int config_parse_unit_path_printf(

-         _cleanup_free_ char *k = NULL;

-         Unit *u = userdata;

-         int r;

-+        bool fatal = ltype;

- 

-         assert(filename);

-         assert(lvalue);

-@@ -250,8 +251,10 @@ int config_parse_unit_path_printf(

- 

-         r = unit_full_printf(u, rvalue, &k);

-         if (r < 0) {

--                log_syntax(unit, LOG_ERR, filename, line, r, "Failed to resolve unit specifiers on %s, ignoring: %m", rvalue);

--                return 0;

-+                log_syntax(unit, LOG_ERR, filename, line, r,

-+                           "Failed to resolve unit specifiers on %s%s: %m",

-+                           fatal ? "" : ", ignoring", rvalue);

-+                return fatal ? -ENOEXEC : 0;

-         }

- 

-         return config_parse_path(unit, filename, line, section, section_line, lvalue, ltype, k, data, userdata);

-diff --git a/src/shared/conf-parser.c b/src/shared/conf-parser.c

-index 44df7493e2..e08402e3d2 100644

-+++ b/src/shared/conf-parser.c

-@@ -615,6 +615,7 @@ int config_parse_bool(const char* unit,

- 

-         int k;

-         bool *b = data;

-+        bool fatal = ltype;

- 

-         assert(filename);

-         assert(lvalue);

-@@ -623,8 +624,10 @@ int config_parse_bool(const char* unit,

- 

-         k = parse_boolean(rvalue);

-         if (k < 0) {

--                log_syntax(unit, LOG_ERR, filename, line, k, "Failed to parse boolean value, ignoring: %s", rvalue);

--                return 0;

-+                log_syntax(unit, LOG_ERR, filename, line, k,

-+                           "Failed to parse boolean value%s: %s",

-+                           fatal ? "" : ", ignoring", rvalue);

-+                return fatal ? -ENOEXEC : 0;

-         }

- 

-         *b = !!k;

-@@ -715,6 +718,7 @@ int config_parse_path(

-                 void *userdata) {

- 

-         char **s = data, *n;

-+        bool fatal = ltype;

- 

-         assert(filename);

-         assert(lvalue);

-@@ -723,12 +727,14 @@ int config_parse_path(

- 

-         if (!utf8_is_valid(rvalue)) {

-                 log_syntax_invalid_utf8(unit, LOG_ERR, filename, line, rvalue);

--                return 0;

-+                return fatal ? -ENOEXEC : 0;

-         }

- 

-         if (!path_is_absolute(rvalue)) {

--                log_syntax(unit, LOG_ERR, filename, line, 0, "Not an absolute path, ignoring: %s", rvalue);

--                return 0;

-+                log_syntax(unit, LOG_ERR, filename, line, 0,

-+                           "Not an absolute path%s: %s",

-+                           fatal ? "" : ", ignoring", rvalue);

-+                return fatal ? -ENOEXEC : 0;

-         }

- 

-         n = strdup(rvalue);

deleted file mode 100644

@@ -1,25 +0,0 @@

-From a924f43f30f9c4acaf70618dd2a055f8b0f166be Mon Sep 17 00:00:00 2001

-From: Evgeny Vereshchagin <evvers@ya.ru>

-Date: Wed, 24 May 2017 08:56:48 +0300

-Subject: [PATCH] resolved: bugfix of null pointer p->question dereferencing

- (#6020)

-

-See https://bugs.launchpad.net/ubuntu/+source/systemd/+bug/1621396

- src/resolve/resolved-dns-packet.c | 3 +++

- 1 file changed, 3 insertions(+)

-

-diff --git a/src/resolve/resolved-dns-packet.c b/src/resolve/resolved-dns-packet.c

-index 652970284e..240ee448f4 100644

-+++ b/src/resolve/resolved-dns-packet.c

-@@ -2269,6 +2269,9 @@ int dns_packet_is_reply_for(DnsPacket *p, const DnsResourceKey *key) {

-         if (r < 0)

-                 return r;

- 

-+        if (!p->question)

-+                return 0;

-+

-         if (p->question->n_keys != 1)

-                 return 0;

- 

deleted file mode 100644

@@ -1,48 +0,0 @@

-From 8587c3351003b1613ad2e439cebbb20fbae07e70 Mon Sep 17 00:00:00 2001

-From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= <zbyszek () in waw pl>

-Date: Sun, 18 Jun 2017 16:07:57 -0400

-Subject: [PATCH 2/2] resolved: simplify alloc size calculation

-

-The allocation size was calculated in a complicated way, and for values

-close to the page size we would actually allocate less than requested.

-

-Reported by Chris Coulson <chris.coulson () canonical com>.

- src/resolve/resolved-dns-packet.c | 8 +-------

- src/resolve/resolved-dns-packet.h | 2 --

- 2 files changed, 1 insertion(+), 9 deletions(-)

-

-diff --git a/src/resolve/resolved-dns-packet.c b/src/resolve/resolved-dns-packet.c

-index 240ee448f4..821b66e266 100644

-+++ b/src/resolve/resolved-dns-packet.c

-@@ -47,13 +47,7 @@ int dns_packet_new(DnsPacket **ret, DnsProtocol protocol, size_t mtu) {

- 

-         assert(ret);

- 

--        if (mtu <= UDP_PACKET_HEADER_SIZE)

--                a = DNS_PACKET_SIZE_START;

--        else

--                a = mtu - UDP_PACKET_HEADER_SIZE;

--

--        if (a < DNS_PACKET_HEADER_SIZE)

--                a = DNS_PACKET_HEADER_SIZE;

-+        a = MAX(mtu, DNS_PACKET_HEADER_SIZE);

- 

-         /* round up to next page size */

-         a = PAGE_ALIGN(ALIGN(sizeof(DnsPacket)) + a) - ALIGN(sizeof(DnsPacket));

-diff --git a/src/resolve/resolved-dns-packet.h b/src/resolve/resolved-dns-packet.h

-index 2c92392e4d..3abcaf8cf3 100644

-+++ b/src/resolve/resolved-dns-packet.h

-@@ -66,8 +66,6 @@ struct DnsPacketHeader {

- /* With EDNS0 we can use larger packets, default to 4096, which is what is commonly used */

- #define DNS_PACKET_UNICAST_SIZE_LARGE_MAX 4096

- 

--#define DNS_PACKET_SIZE_START 512

--

- struct DnsPacket {

-         int n_ref;

-         DnsProtocol protocol;

-2.13.0

deleted file mode 100644

@@ -1,23 +0,0 @@

-diff -uNr systemd-233/src/resolve/resolved-conf.c systemd-233-new/src/resolve/resolved-conf.c

-+++ systemd-233-new/src/resolve/resolved-conf.c	2017-07-07 03:29:00.130502439 +0000

-@@ -229,6 +229,7 @@

- 

- int manager_parse_config_file(Manager *m) {

-         int r;

-+        char *default_dns_servers;

- 

-         assert(m);

- 

-@@ -241,7 +242,10 @@

-                 return r;

- 

-         if (m->need_builtin_fallbacks) {

--                r = manager_parse_dns_server_string_and_warn(m, DNS_SERVER_FALLBACK, DNS_SERVERS);

-+                default_dns_servers = secure_getenv("DEFAULT_DNS_SERVERS");

-+                if (default_dns_servers == NULL)

-+                        default_dns_servers = DNS_SERVERS;

-+                r = manager_parse_dns_server_string_and_warn(m, DNS_SERVER_FALLBACK, default_dns_servers);

-                 if (r < 0)

-                         return r;

-         }

deleted file mode 100644

@@ -1,39 +0,0 @@

-diff -rup systemd-232/src/network/networkd-link.c systemd-232-new/src/network/networkd-link.c

-+++ systemd-232-new/src/network/networkd-link.c	2016-11-18 11:19:04.687209642 -0800

-@@ -199,6 +199,26 @@ static bool link_proxy_arp_enabled(Link

-         return true;

- }

- 

-+static bool link_ipv6_disabled(Link *link) {

-+        const char *p = NULL;

-+        int r;

-+        if (link->flags & IFF_LOOPBACK)

-+                return true;

-+        /* Make this a NOP if IPv6 is not available */

-+        if (!socket_ipv6_is_supported())

-+                return true;

-+

-+        p = strjoina("/proc/sys/net/ipv6/conf/", link->ifname, "/disable_ipv6");

-+        _cleanup_free_ char *val = NULL;

-+        r = read_one_line_file(p, &val);

-+        if (r < 0)

-+                log_link_warning_errno(link, r, "Cannot read ipv6 state for interface: %m");

-+	if (streq(val, "0"))

-+                return false;

-+        

-+        return true;

-+}

-+

- static bool link_ipv6_accept_ra_enabled(Link *link) {

-         assert(link);

- 

-@@ -720,7 +740,7 @@ void link_check_ready(Link *link) {

-                     !link->ipv4ll_route)

-                         return;

- 

--        if (link_ipv6ll_enabled(link))

-+        if (!link_ipv6_disabled(link) && link_ipv6ll_enabled(link))

-                 if (in_addr_is_null(AF_INET6, (const union in_addr_union*) &link->ipv6ll_address) > 0)

-                         return;

- 

deleted file mode 100644

@@ -1,15 +0,0 @@

-diff -uNr systemd-233/src/network/networkd-link.c systemd-233-new/src/network/networkd-link.c

-+++ systemd-233-new/src/network/networkd-link.c	2017-11-07 21:02:26.532914705 +0000

-@@ -213,8 +213,10 @@

-         p = strjoina("/proc/sys/net/ipv6/conf/", link->ifname, "/disable_ipv6");

-         _cleanup_free_ char *val = NULL;

-         r = read_one_line_file(p, &val);

--        if (r < 0)

-+        if (r < 0) {

-                 log_link_warning_errno(link, r, "Cannot read ipv6 state for interface: %m");

-+                return false;

-+        }

- 	if (streq(val, "0"))

-                 return false;

-         

deleted file mode 100644

@@ -1,1452 +0,0 @@

-Backports the following commits from systemd 234:

-

-ce905cb44620e979862e63743133d354c90d28df icmp6-util: Bind Router Advertisement socket

-9dab3e066bb5dfeefa28854ab7f95648eaf0d75d sd-radv: Receive Router Solicitations

-d0d6045f658ac3e043235aee68a540650e0f98e0 sd-radv: Send Router Advertisments

-dd39628ac19c691917aeeb01babaef411f146039 sd-radv: Implement Router Advertisement timeout handling

-938c9ff7d374086b996d6a9a484f88ebd94731a3 sd-radv: Add Router Advertisement functionality

-b076a89bb331b91a7cafcd77fb3c13484805b24f sd-radv: Add Router Advertisement prefix handling

-1e4a54de3a79a0ba764e482122e381398eaf3e25 icmp6-util: Move multicast address definitions

-42a7accc3dec5350f0e88ffa145a55293b6fd0e9 sd-ndisc.c: Move Router Solicitation sending after timer computaion

-7b72b034e7c406209dfc55643b79ec0cb2636e4f sd-ndisc: Implement Router Solicitation backoff method

-33261358b2a16d895d7beb5b34ebdacadb56cb56 sd-ndisc: Reset counter for sent Router Solicitations (#5874)

-b40e6a51d55531314666e866d7f9813fce385023 networkd: RFC compliant autonomous prefix handling (#5636)

-

- Makefile.am                             |   3 +

- src/libsystemd-network/icmp6-util.c     | 117 ++++++++++-

- src/libsystemd-network/icmp6-util.h     |  13 ++

- src/libsystemd-network/ndisc-internal.h |   7 +-

- src/libsystemd-network/radv-internal.h  |  88 +++++++++

- src/libsystemd-network/sd-ndisc.c       | 184 ++++++++---------

- src/libsystemd-network/sd-radv.c        | 653 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

- src/libsystemd-network/test-ndisc-rs.c  |  15 ++

- src/network/networkd-ndisc.c            |  30 ++-

- src/systemd/sd-radv.h                   |  81 ++++++++

- 10 files changed, 1086 insertions(+), 105 deletions(-)

- create mode 100644 src/libsystemd-network/radv-internal.h

- create mode 100644 src/libsystemd-network/sd-radv.c

- create mode 100644 src/systemd/sd-radv.h

-

-diff -rupN systemd-base/Makefile.am systemd/Makefile.am

-+++ systemd/Makefile.am	2017-09-18 14:58:25.561666434 -0700

-@@ -3629,6 +3629,7 @@ libsystemd_network_la_SOURCES = \

- 	src/systemd/sd-ipv4ll.h \

- 	src/systemd/sd-ipv4acd.h \

- 	src/systemd/sd-ndisc.h \

-+	src/systemd/sd-radv.h \

- 	src/systemd/sd-dhcp6-client.h \

- 	src/systemd/sd-dhcp6-lease.h \

- 	src/systemd/sd-lldp.h \

-@@ -3652,6 +3653,8 @@ libsystemd_network_la_SOURCES = \

- 	src/libsystemd-network/ndisc-internal.h \

- 	src/libsystemd-network/ndisc-router.h \

- 	src/libsystemd-network/ndisc-router.c \

-+	src/libsystemd-network/sd-radv.c \

-+	src/libsystemd-network/radv-internal.h \

- 	src/libsystemd-network/icmp6-util.h \

- 	src/libsystemd-network/icmp6-util.c \

- 	src/libsystemd-network/sd-dhcp6-client.c \

-diff -rupN systemd-base/src/libsystemd-network/icmp6-util.c systemd/src/libsystemd-network/icmp6-util.c

-+++ systemd/src/libsystemd-network/icmp6-util.c	2017-09-18 15:06:31.020575497 -0700

-@@ -32,6 +32,7 @@

- #include "fd-util.h"

- #include "icmp6-util.h"

- #include "socket-util.h"

-+#include "in-addr-util.h"

- 

- #define IN6ADDR_ALL_ROUTERS_MULTICAST_INIT \

-         { { { 0xff, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, \

-@@ -41,12 +42,9 @@

-         { { { 0xff, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, \

-               0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01 } } }

- 

--int icmp6_bind_router_solicitation(int index) {

--        struct icmp6_filter filter = { };

--        struct ipv6_mreq mreq = {

--                .ipv6mr_multiaddr = IN6ADDR_ALL_NODES_MULTICAST_INIT,

--                .ipv6mr_interface = index,

--        };

-+static int icmp6_bind_router_message(const struct icmp6_filter *filter,

-+                                     const struct ipv6_mreq *mreq) {

-+        int index = mreq->ipv6mr_interface;

-         _cleanup_close_ int s = -1;

-         char ifname[IF_NAMESIZE] = "";

-         static const int zero = 0, one = 1, hops = 255;

-@@ -56,9 +54,11 @@ int icmp6_bind_router_solicitation(int i

-         if (s < 0)

-                 return -errno;

- 

--        ICMP6_FILTER_SETBLOCKALL(&filter);

--        ICMP6_FILTER_SETPASS(ND_ROUTER_ADVERT, &filter);

--        r = setsockopt(s, IPPROTO_ICMPV6, ICMP6_FILTER, &filter, sizeof(filter));

-+        r = setsockopt(s, IPPROTO_ICMPV6, ICMP6_FILTER, filter, sizeof(*filter));

-+        if (r < 0)

-+                return -errno;

-+

-+        r = setsockopt(s, IPPROTO_IPV6, IPV6_ADD_MEMBERSHIP, mreq, sizeof(*mreq));

-         if (r < 0)

-                 return -errno;

- 

-@@ -78,7 +78,7 @@ int icmp6_bind_router_solicitation(int i

-         if (r < 0)

-                 return -errno;

- 

--        r = setsockopt(s, IPPROTO_IPV6, IPV6_ADD_MEMBERSHIP, &mreq, sizeof(mreq));

-+        r = setsockopt(s, IPPROTO_IPV6, IPV6_UNICAST_HOPS, &hops, sizeof(hops));

-         if (r < 0)

-                 return -errno;

- 

-@@ -102,6 +102,32 @@ int icmp6_bind_router_solicitation(int i