diff options
| author | Oleksandr Kravchuk <open.source@oleksandr-kravchuk.com> | 2019-05-23 20:58:40 +0200 |
|---|---|---|
| committer | Khem Raj <raj.khem@gmail.com> | 2019-05-24 10:11:28 -0700 |
| commit | a78c3ba083989c6015e4d57488d4c32b521e8d7c (patch) | |
| tree | ee4296a50798b9255886ca701c687e3a8ec3a1a2 | |
| parent | 9d63ad02b3d8e3a1931f7224f4cdb619e687c8bd (diff) | |
| download | meta-openembedded-a78c3ba083989c6015e4d57488d4c32b521e8d7c.tar.gz | |
lldpd: update to 1.0.3
Removed patch is not appropriate anymore.
Signed-off-by: Oleksandr Kravchuk <open.source@oleksandr-kravchuk.com>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
| -rw-r--r-- | meta-networking/recipes-daemons/lldpd/files/0001-priv-include-limits.h-for-PATH_MAX.patch | 27 | ||||
| -rw-r--r-- | meta-networking/recipes-daemons/lldpd/files/src-daemon-lldpd.service.in-Use-fixed-path-for-mkdir.patch | 32 | ||||
| -rw-r--r-- | meta-networking/recipes-daemons/lldpd/lldpd_1.0.3.bb (renamed from meta-networking/recipes-daemons/lldpd/lldpd_0.9.8.bb) | 6 |
3 files changed, 30 insertions, 35 deletions
diff --git a/meta-networking/recipes-daemons/lldpd/files/0001-priv-include-limits.h-for-PATH_MAX.patch b/meta-networking/recipes-daemons/lldpd/files/0001-priv-include-limits.h-for-PATH_MAX.patch new file mode 100644 index 0000000000..9ea4a9ffb5 --- /dev/null +++ b/meta-networking/recipes-daemons/lldpd/files/0001-priv-include-limits.h-for-PATH_MAX.patch | |||
| @@ -0,0 +1,27 @@ | |||
| 1 | From c6a283bfcbfefe9c89113e81b0f792c12c4eefb8 Mon Sep 17 00:00:00 2001 | ||
| 2 | From: =?UTF-8?q?S=C3=B6ren=20Tempel?= <soeren+git@soeren-tempel.net> | ||
| 3 | Date: Mon, 25 Mar 2019 18:43:03 +0100 | ||
| 4 | Subject: [PATCH] priv: include limits.h for PATH_MAX | ||
| 5 | |||
| 6 | Upstream-Status: Backport | ||
| 7 | |||
| 8 | Signed-off-by: Oleksandr Kravchuk <open.source@oleksandr-kravchuk.com> | ||
| 9 | --- | ||
| 10 | src/daemon/priv.c | 1 + | ||
| 11 | 1 file changed, 1 insertion(+) | ||
| 12 | |||
| 13 | diff --git a/src/daemon/priv.c b/src/daemon/priv.c | ||
| 14 | index f4d6bdf..ba5ae58 100644 | ||
| 15 | --- a/src/daemon/priv.c | ||
| 16 | +++ b/src/daemon/priv.c | ||
| 17 | @@ -27,6 +27,7 @@ | ||
| 18 | #include <unistd.h> | ||
| 19 | #include <signal.h> | ||
| 20 | #include <errno.h> | ||
| 21 | +#include <limits.h> | ||
| 22 | #include <sys/wait.h> | ||
| 23 | #include <sys/stat.h> | ||
| 24 | #include <sys/socket.h> | ||
| 25 | -- | ||
| 26 | 2.17.1 | ||
| 27 | |||
diff --git a/meta-networking/recipes-daemons/lldpd/files/src-daemon-lldpd.service.in-Use-fixed-path-for-mkdir.patch b/meta-networking/recipes-daemons/lldpd/files/src-daemon-lldpd.service.in-Use-fixed-path-for-mkdir.patch deleted file mode 100644 index 4876e17945..0000000000 --- a/meta-networking/recipes-daemons/lldpd/files/src-daemon-lldpd.service.in-Use-fixed-path-for-mkdir.patch +++ /dev/null | |||
| @@ -1,32 +0,0 @@ | |||
| 1 | From f9f3e4dd31588cce5f655730da7b5c3f56a9bdc1 Mon Sep 17 00:00:00 2001 | ||
| 2 | From: Fabio Berton <fabio.berton@ossystems.com.br> | ||
| 3 | Date: Tue, 26 Sep 2017 09:19:51 -0300 | ||
| 4 | Subject: [PATCH] src/daemon/lldpd.service.in: Use fixed path for mkdir command | ||
| 5 | Organization: O.S. Systems Software LTDA. | ||
| 6 | |||
| 7 | @mkdir_p@ is expanded to host tools path ../build/tmp/hosttools/mkdir that | ||
| 8 | doesn't exist on target. Remove @mkdir_p@ and use /bin/mkdir -p to | ||
| 9 | create /var/run/lldpd directory. | ||
| 10 | |||
| 11 | Upstream-Status: Inappropriate [configuration] | ||
| 12 | |||
| 13 | Signed-off-by: Fabio Berton <fabio.berton@ossystems.com.br> | ||
| 14 | --- | ||
| 15 | src/daemon/lldpd.service.in | 2 +- | ||
| 16 | 1 file changed, 1 insertion(+), 1 deletion(-) | ||
| 17 | |||
| 18 | diff --git a/src/daemon/lldpd.service.in b/src/daemon/lldpd.service.in | ||
| 19 | index fdb7338..4291830 100644 | ||
| 20 | --- a/src/daemon/lldpd.service.in | ||
| 21 | +++ b/src/daemon/lldpd.service.in | ||
| 22 | @@ -9,7 +9,7 @@ Type=notify | ||
| 23 | NotifyAccess=main | ||
| 24 | EnvironmentFile=-/etc/default/lldpd | ||
| 25 | EnvironmentFile=-/etc/sysconfig/lldpd | ||
| 26 | -ExecStartPre=@mkdir_p@ @PRIVSEP_CHROOT@ | ||
| 27 | +ExecStartPre=/bin/mkdir -p @PRIVSEP_CHROOT@ | ||
| 28 | ExecStart=@sbindir@/lldpd $DAEMON_ARGS $LLDPD_OPTIONS | ||
| 29 | Restart=on-failure | ||
| 30 | PrivateTmp=yes | ||
| 31 | -- | ||
| 32 | 2.14.2 | ||
diff --git a/meta-networking/recipes-daemons/lldpd/lldpd_0.9.8.bb b/meta-networking/recipes-daemons/lldpd/lldpd_1.0.3.bb index dbd84cf673..e650b57955 100644 --- a/meta-networking/recipes-daemons/lldpd/lldpd_0.9.8.bb +++ b/meta-networking/recipes-daemons/lldpd/lldpd_1.0.3.bb | |||
| @@ -9,11 +9,11 @@ SRC_URI = "\ | |||
| 9 | http://media.luffy.cx/files/${BPN}/${BPN}-${PV}.tar.gz \ | 9 | http://media.luffy.cx/files/${BPN}/${BPN}-${PV}.tar.gz \ |
| 10 | file://lldpd.init.d \ | 10 | file://lldpd.init.d \ |
| 11 | file://lldpd.default \ | 11 | file://lldpd.default \ |
| 12 | file://src-daemon-lldpd.service.in-Use-fixed-path-for-mkdir.patch \ | 12 | file://0001-priv-include-limits.h-for-PATH_MAX.patch \ |
| 13 | " | 13 | " |
| 14 | 14 | ||
| 15 | SRC_URI[md5sum] = "8809600492f6b73149eb19158e819c1f" | 15 | SRC_URI[md5sum] = "04844328f053ee343344d892efb8a00c" |
| 16 | SRC_URI[sha256sum] = "9ee494e91bc33938575b2c09b26188c486ef8eac6e2155d250c189cc4e988c4f" | 16 | SRC_URI[sha256sum] = "39fced395168015416bfe78b95414facf066f841f349024433aa20ab54e4c360" |
| 17 | 17 | ||
| 18 | inherit autotools update-rc.d useradd systemd pkgconfig bash-completion | 18 | inherit autotools update-rc.d useradd systemd pkgconfig bash-completion |
| 19 | 19 | ||
