Date: Thursday, August 4, 2022 @ 10:29:27 Author: eworm Revision: 452052
fix typo in patch Added: dhcp/trunk/0001-99-replace-hostname-with-uname-n.patch Modified: dhcp/trunk/PKGBUILD Deleted: dhcp/trunk/0001-99-replace-hostname-with-uname-n-o.patch -----------------------------------------------+ 0001-99-replace-hostname-with-uname-n-o.patch | 27 ------------------------ 0001-99-replace-hostname-with-uname-n.patch | 24 +++++++++++++++++++++ PKGBUILD | 6 ++--- 3 files changed, 27 insertions(+), 30 deletions(-) Deleted: 0001-99-replace-hostname-with-uname-n-o.patch =================================================================== --- 0001-99-replace-hostname-with-uname-n-o.patch 2022-08-04 10:26:09 UTC (rev 452051) +++ 0001-99-replace-hostname-with-uname-n-o.patch 2022-08-04 10:29:27 UTC (rev 452052) @@ -1,27 +0,0 @@ -From 4c859eba57288eb17eb4603d67ef415b87503879 Mon Sep 17 00:00:00 2001 -From: Christian Hesse <m...@eworm.de> -Date: Thu, 4 Aug 2022 12:15:46 +0200 -Subject: [PATCH 1/1] [!99] replace `hostname` with `uname -n`o - -The former belongs to package `inetutils`, which has some security -implications, so let's use the latter. ---- - client/scripts/linux | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/client/scripts/linux b/client/scripts/linux -index c4e51f6d..49eff40a 100755 ---- a/client/scripts/linux -+++ b/client/scripts/linux -@@ -113,7 +113,7 @@ set_hostname() { - local current_hostname - - if [ -n "$new_host_name" ]; then -- current_hostname=$(hostname) -+ current_hostname=$(uname -n) - - # current host name is empty, '(none)' or 'localhost' or differs from new one from DHCP - if [ -z "$current_hostname" ] || --- -2.37.1 - Added: 0001-99-replace-hostname-with-uname-n.patch =================================================================== --- 0001-99-replace-hostname-with-uname-n.patch (rev 0) +++ 0001-99-replace-hostname-with-uname-n.patch 2022-08-04 10:29:27 UTC (rev 452052) @@ -0,0 +1,24 @@ +From c8587c717eedd4841c002b3751463a070c896f87 Mon Sep 17 00:00:00 2001 +From: Christian Hesse <m...@eworm.de> +Date: Thu, 4 Aug 2022 12:15:46 +0200 +Subject: [PATCH 1/1] [!99] replace `hostname` with `uname -n` + +The former belongs to package `inetutils`, which has some security +implications, so let's use the latter. +--- + client/scripts/linux | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/client/scripts/linux b/client/scripts/linux +index c4e51f6d..49eff40a 100755 +--- a/client/scripts/linux ++++ b/client/scripts/linux +@@ -113,7 +113,7 @@ set_hostname() { + local current_hostname + + if [ -n "$new_host_name" ]; then +- current_hostname=$(hostname) ++ current_hostname=$(uname -n) + + # current host name is empty, '(none)' or 'localhost' or differs from new one from DHCP + if [ -z "$current_hostname" ] || Modified: PKGBUILD =================================================================== --- PKGBUILD 2022-08-04 10:26:09 UTC (rev 452051) +++ PKGBUILD 2022-08-04 10:29:27 UTC (rev 452052) @@ -15,7 +15,7 @@ options=('!lto') validpgpkeys=('7E1C91AC8030A5A59D1EFAB9750F3C87723E4012') # Internet Systems Consortium, Inc. (Signing key, 2021-2022) <codes...@isc.org> source=("https://downloads.isc.org/isc/${pkgbase}/${_realver}/${pkgbase}-${_realver}.tar.gz"{,.asc} - '0001-99-replace-hostname-with-uname-n-o.patch' + '0001-99-replace-hostname-with-uname-n.patch' 'dhcp-sysusers.conf' 'dhcp-tmpfiles.conf' 'dhcpd4.service' @@ -23,7 +23,7 @@ 'dhclient@.service') sha256sums=('0e3ec6b4c2a05ec0148874bcd999a66d05518378d77421f607fb0bc9d0135818' 'SKIP' - '7a3349faac1a2209912b4911ca173f975e3dabf409739250285a25c447b1ca9f' + 'f3dd5fe585eae18a982bfdbe163f3e3749057cb595ee59a154348094109351c2' 'b16083e6bb572ffacaa7cd97e7fde5fcfa1b6dbeb166f162e2ec6e8ec4b928d6' 'abcd30e9e8428e34d22ab4d3074ef4bd84c2b11f5868597111b47d6f56d204da' '03fce30efab819b2d928085b0bab962a33ce56fc376acae98ad9b30aa278c9c8' @@ -33,7 +33,7 @@ prepare() { cd "${srcdir}/${pkgbase}-${_realver}" - patch -Np1 < ../0001-99-replace-hostname-with-uname-n-o.patch + patch -Np1 < ../0001-99-replace-hostname-with-uname-n.patch } build() {