From: heliocat <heliocat@users.noreply.github.com>
To: ml@inbox.vuxu.org
Subject: Re: [PR PATCH] [Updated] dhcp: add basic logging functionality
Date: Thu, 13 May 2021 18:34:09 +0200 [thread overview]
Message-ID: <20210513163409.GAB2jUpe6h63PLN3ttnDd80jpSEr_VX6PQDjjw3vLoo@z> (raw)
In-Reply-To: <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-28576@inbox.vuxu.org>
[-- Attachment #1: Type: text/plain, Size: 1617 bytes --]
There is an updated pull request by heliocat against master on the void-packages repository
https://github.com/heliocat/void-packages dhcp
https://github.com/void-linux/void-packages/pull/28576
dhcp: add basic logging functionality
Fixes #25558
<!-- Mark items with [x] where applicable -->
#### General
- [ ] This is a new package and it conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements)
#### Have the results of the proposed changes been tested?
- [ ] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [X] I generally don't use the affected packages but briefly tested this PR
<!--
If GitHub CI cannot be used to validate the build result (for example, if the
build is likely to take several hours), make sure to
[skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration).
When skipping CI, uncomment and fill out the following section.
Note: for builds that are likely to complete in less than 2 hours, it is not
acceptable to skip CI.
-->
<!--
#### Does it build and run successfully?
(Please choose at least one native build and, if supported, at least one cross build. More are better.)
- [ ] I built this PR locally for my native architecture, (ARCH-LIBC)
- [ ] I built this PR locally for these architectures (if supported. mark crossbuilds):
- [ ] aarch64-musl
- [ ] armv7l
- [ ] armv6l-musl
-->
A patch file from https://github.com/void-linux/void-packages/pull/28576.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-dhcp-28576.patch --]
[-- Type: text/x-diff, Size: 2783 bytes --]
From 544ccb1f38d8a82c1e49f64a42bb573d6f358422 Mon Sep 17 00:00:00 2001
From: Colin Booth <colin@heliocat.net>
Date: Sun, 7 Feb 2021 13:08:10 -0800
Subject: [PATCH] dhcp: add basic logging functionality
Fixes #25558
---
srcpkgs/dhcp/files/dhclient/log/run | 2 ++
srcpkgs/dhcp/files/dhclient/run | 1 +
srcpkgs/dhcp/files/dhcpd4/log/run | 2 ++
srcpkgs/dhcp/files/dhcpd4/run | 1 +
srcpkgs/dhcp/files/dhcpd6/log/run | 2 ++
srcpkgs/dhcp/files/dhcpd6/run | 1 +
srcpkgs/dhcp/template | 2 +-
7 files changed, 10 insertions(+), 1 deletion(-)
create mode 100644 srcpkgs/dhcp/files/dhclient/log/run
create mode 100644 srcpkgs/dhcp/files/dhcpd4/log/run
create mode 100644 srcpkgs/dhcp/files/dhcpd6/log/run
diff --git a/srcpkgs/dhcp/files/dhclient/log/run b/srcpkgs/dhcp/files/dhclient/log/run
new file mode 100644
index 000000000000..39fd511f560e
--- /dev/null
+++ b/srcpkgs/dhcp/files/dhclient/log/run
@@ -0,0 +1,2 @@
+#!/bin/sh
+exec vlogger -t dhclient
diff --git a/srcpkgs/dhcp/files/dhclient/run b/srcpkgs/dhcp/files/dhclient/run
index 5cb45f19cf5a..19b924ab3c29 100644
--- a/srcpkgs/dhcp/files/dhclient/run
+++ b/srcpkgs/dhcp/files/dhclient/run
@@ -1,3 +1,4 @@
#!/bin/sh
+exec 2>&1
[ -r conf ] && . ./conf
exec dhclient ${OPTS:=-d}
diff --git a/srcpkgs/dhcp/files/dhcpd4/log/run b/srcpkgs/dhcp/files/dhcpd4/log/run
new file mode 100644
index 000000000000..e57255cfa359
--- /dev/null
+++ b/srcpkgs/dhcp/files/dhcpd4/log/run
@@ -0,0 +1,2 @@
+#!/bin/sh
+exec vlogger -t dhcpd4
diff --git a/srcpkgs/dhcp/files/dhcpd4/run b/srcpkgs/dhcp/files/dhcpd4/run
index 05d9f9b726ed..423d87cc70dd 100644
--- a/srcpkgs/dhcp/files/dhcpd4/run
+++ b/srcpkgs/dhcp/files/dhcpd4/run
@@ -1,4 +1,5 @@
#!/bin/sh
+exec 2>&1
[ -r conf ] && . ./conf
touch /var/lib/dhcp/dhcpd.leases
exec dhcpd -f ${OPTS:=-4 -q -pf /run/dhcpd4.pid}
diff --git a/srcpkgs/dhcp/files/dhcpd6/log/run b/srcpkgs/dhcp/files/dhcpd6/log/run
new file mode 100644
index 000000000000..79d390c638ac
--- /dev/null
+++ b/srcpkgs/dhcp/files/dhcpd6/log/run
@@ -0,0 +1,2 @@
+#!/bin/sh
+exec vlogger -t dhcpd6
diff --git a/srcpkgs/dhcp/files/dhcpd6/run b/srcpkgs/dhcp/files/dhcpd6/run
index 2dc26f332212..57b86926acb7 100644
--- a/srcpkgs/dhcp/files/dhcpd6/run
+++ b/srcpkgs/dhcp/files/dhcpd6/run
@@ -1,4 +1,5 @@
#!/bin/sh
+exec 2>&1
[ -r conf ] && . ./conf
touch /var/lib/dhcp/dhcpd.leases
exec dhcpd -f ${OPTS:=-6 -q -pf /run/dhcpd6.pid}
diff --git a/srcpkgs/dhcp/template b/srcpkgs/dhcp/template
index 47fa43fb02ec..62819c4f81e5 100644
--- a/srcpkgs/dhcp/template
+++ b/srcpkgs/dhcp/template
@@ -1,7 +1,7 @@
# Template file for 'dhcp'
pkgname=dhcp
version=4.4.2
-revision=2
+revision=3
wrksrc="dhcp-${version/P/-P}"
build_style=gnu-configure
hostmakedepends="perl tar automake libtool"
next prev parent reply other threads:[~2021-05-13 16:34 UTC|newest]
Thread overview: 21+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-02-08 2:26 [PR PATCH] " heliocat
2021-02-08 4:15 ` heliocat
2021-02-09 15:55 ` leahneukirchen
2021-02-09 16:17 ` heliocat
2021-02-09 16:23 ` heliocat
2021-02-09 18:30 ` [PR PATCH] [Updated] " Hoshpak
2021-02-09 18:46 ` Duncaen
2021-02-09 18:48 ` Duncaen
2021-02-10 17:11 ` heliocat
2021-05-13 16:34 ` heliocat [this message]
2021-06-08 5:30 ` [PR PATCH] [Updated] " heliocat
2021-06-08 5:31 ` heliocat
2021-06-08 5:33 ` heliocat
2021-06-08 13:18 ` ericonr
2021-06-11 22:53 ` [PR PATCH] [Updated] " heliocat
2021-06-11 22:54 ` heliocat
2021-06-12 18:12 ` ericonr
2021-06-12 22:13 ` heliocat
2021-06-12 22:14 ` [PR PATCH] [Updated] " heliocat
2021-06-12 22:15 ` heliocat
2021-06-13 17:11 ` [PR PATCH] [Merged]: " ericonr
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20210513163409.GAB2jUpe6h63PLN3ttnDd80jpSEr_VX6PQDjjw3vLoo@z \
--to=heliocat@users.noreply.github.com \
--cc=ml@inbox.vuxu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).