diff options
Diffstat (limited to 'meta/recipes-extended/xinetd/xinetd_2.3.15.4.bb')
-rw-r--r-- | meta/recipes-extended/xinetd/xinetd_2.3.15.4.bb | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/meta/recipes-extended/xinetd/xinetd_2.3.15.4.bb b/meta/recipes-extended/xinetd/xinetd_2.3.15.4.bb index 72eb1ae067..2f727128a5 100644 --- a/meta/recipes-extended/xinetd/xinetd_2.3.15.4.bb +++ b/meta/recipes-extended/xinetd/xinetd_2.3.15.4.bb | |||
@@ -8,6 +8,7 @@ LIC_FILES_CHKSUM = "file://COPYRIGHT;md5=55c5fdf02cfcca3fc9621b6f2ceae10f" | |||
8 | UPSTREAM_CHECK_GITTAGREGEX = "(?P<pver>\d+(\.\d+)+)" | 8 | UPSTREAM_CHECK_GITTAGREGEX = "(?P<pver>\d+(\.\d+)+)" |
9 | 9 | ||
10 | SRC_URI = "git://github.com/openSUSE/xinetd.git;protocol=https;branch=master \ | 10 | SRC_URI = "git://github.com/openSUSE/xinetd.git;protocol=https;branch=master \ |
11 | file://0001-Use-monotonic-time.patch \ | ||
11 | file://xinetd.init \ | 12 | file://xinetd.init \ |
12 | file://xinetd.default \ | 13 | file://xinetd.default \ |
13 | file://xinetd.service \ | 14 | file://xinetd.service \ |
@@ -15,8 +16,6 @@ SRC_URI = "git://github.com/openSUSE/xinetd.git;protocol=https;branch=master \ | |||
15 | 16 | ||
16 | SRCREV = "6a4af7786630ce48747d9687e2f18f45ea6684c4" | 17 | SRCREV = "6a4af7786630ce48747d9687e2f18f45ea6684c4" |
17 | 18 | ||
18 | S = "${WORKDIR}/git" | ||
19 | |||
20 | # https://github.com/xinetd-org/xinetd/pull/10 is merged into this git tree revision | 19 | # https://github.com/xinetd-org/xinetd/pull/10 is merged into this git tree revision |
21 | CVE_STATUS[CVE-2013-4342] = "fixed-version: Fixed directly in git tree revision" | 20 | CVE_STATUS[CVE-2013-4342] = "fixed-version: Fixed directly in git tree revision" |
22 | 21 | ||
@@ -30,19 +29,19 @@ INITSCRIPT_PARAMS = "defaults" | |||
30 | PACKAGECONFIG ??= "tcp-wrappers" | 29 | PACKAGECONFIG ??= "tcp-wrappers" |
31 | PACKAGECONFIG[tcp-wrappers] = "--with-libwrap,,tcp-wrappers" | 30 | PACKAGECONFIG[tcp-wrappers] = "--with-libwrap,,tcp-wrappers" |
32 | 31 | ||
33 | CFLAGS += "-D_GNU_SOURCE" | 32 | CFLAGS += "-D_GNU_SOURCE -std=gnu17" |
34 | 33 | ||
35 | CONFFILES:${PN} = "${sysconfdir}/xinetd.conf" | 34 | CONFFILES:${PN} = "${sysconfdir}/xinetd.conf" |
36 | 35 | ||
37 | do_install:append() { | 36 | do_install:append() { |
38 | install -d "${D}${sysconfdir}/init.d" | 37 | install -d "${D}${sysconfdir}/init.d" |
39 | install -d "${D}${sysconfdir}/default" | 38 | install -d "${D}${sysconfdir}/default" |
40 | install -m 755 "${WORKDIR}/xinetd.init" "${D}${sysconfdir}/init.d/xinetd" | 39 | install -m 755 "${UNPACKDIR}/xinetd.init" "${D}${sysconfdir}/init.d/xinetd" |
41 | install -m 644 "${WORKDIR}/xinetd.default" "${D}${sysconfdir}/default/xinetd" | 40 | install -m 644 "${UNPACKDIR}/xinetd.default" "${D}${sysconfdir}/default/xinetd" |
42 | 41 | ||
43 | # Install systemd unit files | 42 | # Install systemd unit files |
44 | install -d ${D}${systemd_system_unitdir} | 43 | install -d ${D}${systemd_system_unitdir} |
45 | install -m 0644 ${WORKDIR}/xinetd.service ${D}${systemd_system_unitdir} | 44 | install -m 0644 ${UNPACKDIR}/xinetd.service ${D}${systemd_system_unitdir} |
46 | sed -i -e 's,@BASE_BINDIR@,${base_bindir},g' \ | 45 | sed -i -e 's,@BASE_BINDIR@,${base_bindir},g' \ |
47 | -e 's,@SBINDIR@,${sbindir},g' \ | 46 | -e 's,@SBINDIR@,${sbindir},g' \ |
48 | ${D}${systemd_system_unitdir}/xinetd.service | 47 | ${D}${systemd_system_unitdir}/xinetd.service |