From patchwork Mon Jan 4 00:24:03 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Rosen Penev X-Patchwork-Id: 1421980 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.openwrt.org (client-ip=2001:8b0:10b:1231::1; helo=merlin.infradead.org; envelope-from=openwrt-devel-bounces+incoming=patchwork.ozlabs.org@lists.openwrt.org; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; secure) header.d=lists.infradead.org header.i=@lists.infradead.org header.a=rsa-sha256 header.s=merlin.20170209 header.b=Yk3jcJ7a; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20161025 header.b=Pitw218e; dkim-atps=neutral Received: from merlin.infradead.org (merlin.infradead.org [IPv6:2001:8b0:10b:1231::1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4D8H8m6h13z9sSC for ; Mon, 4 Jan 2021 11:50:00 +1100 (AEDT) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=merlin.20170209; h=Sender:Content-Transfer-Encoding: Content-Type:List-Subscribe:List-Help:List-Post:List-Archive:List-Unsubscribe :List-Id:MIME-Version:Message-Id:Date:Subject:To:From:Reply-To:Cc:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:In-Reply-To:References:List-Owner; bh=0e/M/4/tuqPEZUzDw+Hm+psGtC+NEvYqUWpzUnBp/jg=; b=Yk3jcJ7aUkW0ftLjWgLhZhNPgS MHtf1fdv35RGraeoPzjYZKlWEfSqYwZQDj90m6/1K8/S9su5nOFxEIFH43fnMEX5gFxhAGFRyvo75 GqSAZ33JMRcNxzouEK81VkWLqo+XG/8d8qsq4k/E3dnB7jmPWeLyEgEll9vccNS0lpOO2OVagh7wl q9/xZj+XP30NhAE+mxvMrq/XPYjboPGSEXGwvBTDlykxlT1YSjlLqLF1bkcorI4MdjI81W1osul+P GWIPDIEEHI5ypQbHW5dZi1jnMs+wbB2N0PV1kK5xaQMFSYVHAzt9wcsI9Uy/8OoUPvpPdXj8aWQWr QhLgubgA==; Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1kwDfc-0006K3-86; Mon, 04 Jan 2021 00:24:24 +0000 Received: from mail-pj1-x102d.google.com ([2607:f8b0:4864:20::102d]) by merlin.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1kwDfS-0006I5-Tf for openwrt-devel@lists.openwrt.org; Mon, 04 Jan 2021 00:24:16 +0000 Received: by mail-pj1-x102d.google.com with SMTP id v1so8750663pjr.2 for ; Sun, 03 Jan 2021 16:24:09 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:subject:date:message-id:mime-version :content-transfer-encoding; bh=IKqViccyF5OoN5wql+KXZpn87373HMy4FbpFVKT3SUc=; b=Pitw218egZRzLMhTFj9SoCQQqAXrxMRt2w/trsqEN+5WITc1MV2F4MnrawyO+pd3Y0 mE7DPK3IsqM9fo45o1urcV0pqW9fEiUsO/IfTI4q4I4Js2fYfj/RtfSiLqEfC+x8G6uR ElFFBJKIEP3jUjy3B9vRQoEz5kvMlvPAug9b+2aZdMCZWswSrLNOFes60KELXECrNnWC weS/HSrZjHO/ttx2r+K8bb+v/dduT4b0l97VwDVl395AAtUPMPKpUAmNEpWThTo+WLH0 4a06eL7eMUif+0O0/UdGVqpeW9bAO3qaLR5srU7e7CGlijRUMIGPjGD+OJDrKA9CcWK9 9QtA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:mime-version :content-transfer-encoding; bh=IKqViccyF5OoN5wql+KXZpn87373HMy4FbpFVKT3SUc=; b=BPhmuaaJ19uqG23QeIQoa4dvhCFXj3eUeIrt3nShMeqRqCQz6jtK1mmxyuK6MAvPRM LsVFUx9AT2j00TVHjUVfqWFjun159r2erESTgSjTxVOTDIItnLAZ3iWKK3p7RlqUBtTu fK9ChvDPRtbU/9J4asvZDehd0tsPe1NvDnU6h2IB0lf0UMcb0ysqDcCYr+feTwNeP4rg ISzXnzHZdpeylAaZ7H6yxqyfnGQ7wqzToxcbr3ZPV4snCWn9WXdcFNGNlimsQqtbBX+9 GjAYFWZijOvSjRGGgUvRmmsuWoWW+GczEqYUK7e2mlJRW62eTryFu2bfMnIdouB9cwFG HG0A== X-Gm-Message-State: AOAM531U6YYA1M5WxoYjlPGDrZqJ76P0JsY9P4wQZu0eTlEo2EumprM7 fXkJ2MZ/32+7WA7tH6y5f/rJIvzghh2x9Q== X-Google-Smtp-Source: ABdhPJwxijsCXCvYhn4t6wxPfO6GG3WbQ0IYC9sciReCOmMj5pN58i1Ywo9lXCs2ku7vrBmLPZwt1Q== X-Received: by 2002:a17:902:8f8d:b029:dc:8ac6:98a7 with SMTP id z13-20020a1709028f8db02900dc8ac698a7mr9758843plo.13.1609719847394; Sun, 03 Jan 2021 16:24:07 -0800 (PST) Received: from mangix-trapnet.lan ([2001:470:1f05:79e::a89]) by smtp.gmail.com with ESMTPSA id d124sm56936111pgc.68.2021.01.03.16.24.06 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 03 Jan 2021 16:24:06 -0800 (PST) From: Rosen Penev To: openwrt-devel@lists.openwrt.org Subject: [PATCH 1/3] busybox: update to 1.33 Date: Sun, 3 Jan 2021 16:24:03 -0800 Message-Id: <20210104002405.758959-1-rosenp@gmail.com> X-Mailer: git-send-email 2.29.2 MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20210103_192415_077233_D760587E X-CRM114-Status: GOOD ( 22.67 ) X-Spam-Score: -0.2 (/) X-Spam-Report: SpamAssassin version 3.4.4 on merlin.infradead.org summary: Content analysis details: (-0.2 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 RCVD_IN_DNSWL_NONE RBL: Sender listed at https://www.dnswl.org/, no trust [2607:f8b0:4864:20:0:0:0:102d listed in] [list.dnswl.org] 0.0 FREEMAIL_FROM Sender email is commonly abused enduser mail provider [rosenp[at]gmail.com] -0.0 SPF_PASS SPF: sender matches SPF record 0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record 0.1 DKIM_SIGNED Message has a DKIM or DK signature, not necessarily valid -0.1 DKIM_VALID Message has at least one valid DKIM or DK signature -0.1 DKIM_VALID_AU Message has a valid DKIM or DK signature from author's domain -0.1 DKIM_VALID_EF Message has a valid DKIM or DK signature from envelope-from domain 0.0 LOTS_OF_MONEY Huge... sums of money X-BeenThere: openwrt-devel@lists.openwrt.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: OpenWrt Development List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "openwrt-devel" Errors-To: openwrt-devel-bounces+incoming=patchwork.ozlabs.org@lists.openwrt.org Remove stime backport. Remove static libgcc patch as upstream fixed it in a different way. Remove date -k patch as it no longer applies. It's also pointless as busybox' hwclock utility can do the same thing. That will be changed in a future commit. Remove ntpd patch as that seems to have been applied upstream. Refresh patches. Signed-off-by: Rosen Penev --- package/utils/busybox/Makefile | 6 +- .../001-remove-stime-function-calls.patch | 84 ----------------- .../patches/110-no_static_libgcc.patch | 11 --- .../busybox/patches/120-lto-jobserver.patch | 6 +- .../patches/200-udhcpc_reduce_msgs.patch | 4 +- .../patches/201-udhcpc_changed_ifindex.patch | 2 +- .../203-udhcpc_renew_no_deconfig.patch | 2 +- .../patches/230-add_nslookup_lede.patch | 6 +- .../busybox/patches/250-date-k-flag.patch | 92 ------------------- .../500-move-traceroute-applets-to-bin.patch | 2 +- ...520-loginutils-handle-crypt-failures.patch | 6 +- .../patches/600-allow-ntpd-non-root.patch | 12 --- 12 files changed, 17 insertions(+), 216 deletions(-) delete mode 100644 package/utils/busybox/patches/001-remove-stime-function-calls.patch delete mode 100644 package/utils/busybox/patches/110-no_static_libgcc.patch delete mode 100644 package/utils/busybox/patches/250-date-k-flag.patch delete mode 100644 package/utils/busybox/patches/600-allow-ntpd-non-root.patch diff --git a/package/utils/busybox/Makefile b/package/utils/busybox/Makefile index e62cef0713..ac921b69ec 100644 --- a/package/utils/busybox/Makefile +++ b/package/utils/busybox/Makefile @@ -8,14 +8,14 @@ include $(TOPDIR)/rules.mk PKG_NAME:=busybox -PKG_VERSION:=1.31.1 -PKG_RELEASE:=8 +PKG_VERSION:=1.33.0 +PKG_RELEASE:=1 PKG_FLAGS:=essential PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 PKG_SOURCE_URL:=https://www.busybox.net/downloads \ http://sources.buildroot.net -PKG_HASH:=d0f940a72f648943c1f2211e0e3117387c31d765137d92bd8284a3fb9752a998 +PKG_HASH:=d568681c91a85edc6710770cebc1e80e042ad74d305b5c2e6d57a5f3de3b8fbd PKG_BUILD_DEPENDS:=BUSYBOX_CONFIG_PAM:libpam PKG_BUILD_PARALLEL:=1 diff --git a/package/utils/busybox/patches/001-remove-stime-function-calls.patch b/package/utils/busybox/patches/001-remove-stime-function-calls.patch deleted file mode 100644 index ccf9bef356..0000000000 --- a/package/utils/busybox/patches/001-remove-stime-function-calls.patch +++ /dev/null @@ -1,84 +0,0 @@ -From d3539be8f27b8cbfdfee460fe08299158f08bcd9 Mon Sep 17 00:00:00 2001 -From: Alistair Francis -Date: Tue, 19 Nov 2019 13:06:40 +0100 -Subject: Remove stime() function calls - -stime() has been deprecated in glibc 2.31 and replaced with -clock_settime(). Let's replace the stime() function calls with -clock_settime() in preperation. - -function old new delta -rdate_main 197 224 +27 -clock_settime - 27 +27 -date_main 926 941 +15 -stime 37 - -37 ------------------------------------------------------------------------------- -(add/remove: 2/2 grow/shrink: 2/0 up/down: 69/-37) Total: 32 bytes - -Signed-off-by: Alistair Francis -Signed-off-by: Denys Vlasenko ---- - coreutils/date.c | 6 +++++- - libbb/missing_syscalls.c | 8 -------- - util-linux/rdate.c | 8 ++++++-- - 3 files changed, 11 insertions(+), 11 deletions(-) - ---- a/coreutils/date.c -+++ b/coreutils/date.c -@@ -279,6 +279,9 @@ int date_main(int argc UNUSED_PARAM, cha - time(&ts.tv_sec); - #endif - } -+#if !ENABLE_FEATURE_DATE_NANO -+ ts.tv_nsec = 0; -+#endif - localtime_r(&ts.tv_sec, &tm_time); - - /* If date string is given, update tm_time, and maybe set date */ -@@ -301,9 +304,10 @@ int date_main(int argc UNUSED_PARAM, cha - if (date_str[0] != '@') - tm_time.tm_isdst = -1; - ts.tv_sec = validate_tm_time(date_str, &tm_time); -+ ts.tv_nsec = 0; - - /* if setting time, set it */ -- if ((opt & OPT_SET) && stime(&ts.tv_sec) < 0) { -+ if ((opt & OPT_SET) && clock_settime(CLOCK_REALTIME, &ts) < 0) { - bb_perror_msg("can't set date"); - } - } ---- a/libbb/missing_syscalls.c -+++ b/libbb/missing_syscalls.c -@@ -15,14 +15,6 @@ pid_t getsid(pid_t pid) - return syscall(__NR_getsid, pid); - } - --int stime(const time_t *t) --{ -- struct timeval tv; -- tv.tv_sec = *t; -- tv.tv_usec = 0; -- return settimeofday(&tv, NULL); --} -- - int sethostname(const char *name, size_t len) - { - return syscall(__NR_sethostname, name, len); ---- a/util-linux/rdate.c -+++ b/util-linux/rdate.c -@@ -95,9 +95,13 @@ int rdate_main(int argc UNUSED_PARAM, ch - if (!(flags & 2)) { /* no -p (-s may be present) */ - if (time(NULL) == remote_time) - bb_error_msg("current time matches remote time"); -- else -- if (stime(&remote_time) < 0) -+ else { -+ struct timespec ts; -+ ts.tv_sec = remote_time; -+ ts.tv_nsec = 0; -+ if (clock_settime(CLOCK_REALTIME, &ts) < 0) - bb_perror_msg_and_die("can't set time of day"); -+ } - } - - if (flags != 1) /* not lone -s */ diff --git a/package/utils/busybox/patches/110-no_static_libgcc.patch b/package/utils/busybox/patches/110-no_static_libgcc.patch deleted file mode 100644 index 2148a09e00..0000000000 --- a/package/utils/busybox/patches/110-no_static_libgcc.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- a/Makefile.flags -+++ b/Makefile.flags -@@ -51,7 +51,7 @@ CFLAGS += $(call cc-option,-fno-builtin- - # -fno-guess-branch-probability: prohibit pseudo-random guessing - # of branch probabilities (hopefully makes bloatcheck more stable): - CFLAGS += $(call cc-option,-fno-guess-branch-probability,) --CFLAGS += $(call cc-option,-funsigned-char -static-libgcc,) -+CFLAGS += $(call cc-option,-funsigned-char,) - CFLAGS += $(call cc-option,-falign-functions=1 -falign-jumps=1 -falign-labels=1 -falign-loops=1,) - # Defeat .eh_frame bloat (gcc 4.6.3 x86-32 defconfig: 20% smaller busybox binary): - CFLAGS += $(call cc-option,-fno-unwind-tables,) diff --git a/package/utils/busybox/patches/120-lto-jobserver.patch b/package/utils/busybox/patches/120-lto-jobserver.patch index 99c5b51201..d4f997e6d8 100644 --- a/package/utils/busybox/patches/120-lto-jobserver.patch +++ b/package/utils/busybox/patches/120-lto-jobserver.patch @@ -1,6 +1,6 @@ --- a/scripts/Kbuild.include +++ b/scripts/Kbuild.include -@@ -130,7 +130,7 @@ make-cmd = $(subst \#,\\\#,$(subst $$,$$ +@@ -131,7 +131,7 @@ make-cmd = $(subst \#,\\\#,$(subst $$,$$ # if_changed = $(if $(strip $(filter-out $(PHONY),$?) \ $(call arg-check, $(cmd_$(1)), $(cmd_$@)) ), \ @@ -9,7 +9,7 @@ $(echo-cmd) $(cmd_$(1)); \ echo 'cmd_$@ := $(make-cmd)' > $(@D)/.$(@F).cmd) -@@ -139,7 +139,7 @@ if_changed = $(if $(strip $(filter-out $ +@@ -140,7 +140,7 @@ if_changed = $(if $(strip $(filter-out $ if_changed_dep = $(if $(strip $(filter-out $(PHONY),$?) \ $(filter-out FORCE $(wildcard $^),$^) \ $(call arg-check, $(cmd_$(1)), $(cmd_$@)) ), \ @@ -18,7 +18,7 @@ $(echo-cmd) $(cmd_$(1)); \ scripts/basic/fixdep $(depfile) $@ '$(make-cmd)' > $(@D)/.$(@F).tmp; \ rm -f $(depfile); \ -@@ -150,5 +150,5 @@ if_changed_dep = $(if $(strip $(filter-o +@@ -151,5 +151,5 @@ if_changed_dep = $(if $(strip $(filter-o # and if so will execute $(rule_foo) if_changed_rule = $(if $(strip $(filter-out $(PHONY),$?) \ $(call arg-check, $(cmd_$(1)), $(cmd_$@)) ),\ diff --git a/package/utils/busybox/patches/200-udhcpc_reduce_msgs.patch b/package/utils/busybox/patches/200-udhcpc_reduce_msgs.patch index 4bab25a8d5..2e67009224 100644 --- a/package/utils/busybox/patches/200-udhcpc_reduce_msgs.patch +++ b/package/utils/busybox/patches/200-udhcpc_reduce_msgs.patch @@ -1,6 +1,6 @@ --- a/networking/udhcp/dhcpc.c +++ b/networking/udhcp/dhcpc.c -@@ -713,6 +713,7 @@ static int bcast_or_ucast(struct dhcp_pa +@@ -712,6 +712,7 @@ static int bcast_or_ucast(struct dhcp_pa static NOINLINE int send_discover(uint32_t xid, uint32_t requested) { struct dhcp_packet packet; @@ -8,7 +8,7 @@ /* Fill in: op, htype, hlen, cookie, chaddr fields, * random xid field (we override it below), -@@ -730,6 +731,7 @@ static NOINLINE int send_discover(uint32 +@@ -729,6 +730,7 @@ static NOINLINE int send_discover(uint32 */ add_client_options(&packet); diff --git a/package/utils/busybox/patches/201-udhcpc_changed_ifindex.patch b/package/utils/busybox/patches/201-udhcpc_changed_ifindex.patch index 256b049d9e..875f2ce5fc 100644 --- a/package/utils/busybox/patches/201-udhcpc_changed_ifindex.patch +++ b/package/utils/busybox/patches/201-udhcpc_changed_ifindex.patch @@ -1,6 +1,6 @@ --- a/networking/udhcp/dhcpc.c +++ b/networking/udhcp/dhcpc.c -@@ -1416,6 +1416,12 @@ int udhcpc_main(int argc UNUSED_PARAM, c +@@ -1415,6 +1415,12 @@ int udhcpc_main(int argc UNUSED_PARAM, c /* silence "uninitialized!" warning */ unsigned timestamp_before_wait = timestamp_before_wait; diff --git a/package/utils/busybox/patches/203-udhcpc_renew_no_deconfig.patch b/package/utils/busybox/patches/203-udhcpc_renew_no_deconfig.patch index 3d3c0cc403..88a98c0a1c 100644 --- a/package/utils/busybox/patches/203-udhcpc_renew_no_deconfig.patch +++ b/package/utils/busybox/patches/203-udhcpc_renew_no_deconfig.patch @@ -1,6 +1,6 @@ --- a/networking/udhcp/dhcpc.c +++ b/networking/udhcp/dhcpc.c -@@ -1126,7 +1126,6 @@ static void perform_renew(void) +@@ -1125,7 +1125,6 @@ static void perform_renew(void) client_data.state = RENEW_REQUESTED; break; case RENEW_REQUESTED: /* impatient are we? fine, square 1 */ diff --git a/package/utils/busybox/patches/230-add_nslookup_lede.patch b/package/utils/busybox/patches/230-add_nslookup_lede.patch index f0ac4b51c1..446b01c3f1 100644 --- a/package/utils/busybox/patches/230-add_nslookup_lede.patch +++ b/package/utils/busybox/patches/230-add_nslookup_lede.patch @@ -19,9 +19,9 @@ Signed-off-by: Jo-Philipp Wich --- a/Makefile.flags +++ b/Makefile.flags -@@ -134,6 +134,12 @@ else - LDLIBS += m - endif +@@ -158,6 +158,12 @@ endif + # libm may be needed for dc, awk, ntpd + # librt may be needed for clock_gettime() +# nslookup_lede might need the resolv library +RESOLV_AVAILABLE := $(shell echo 'int main(void){res_init();return 0;}' >resolvtest.c; $(CC) $(CFLAGS) -include resolv.h -lresolv -o /dev/null resolvtest.c >/dev/null 2>&1 && echo "y"; rm resolvtest.c) diff --git a/package/utils/busybox/patches/250-date-k-flag.patch b/package/utils/busybox/patches/250-date-k-flag.patch deleted file mode 100644 index 5aadbb233c..0000000000 --- a/package/utils/busybox/patches/250-date-k-flag.patch +++ /dev/null @@ -1,92 +0,0 @@ ---- a/coreutils/date.c -+++ b/coreutils/date.c -@@ -123,6 +123,7 @@ - //usage: IF_FEATURE_DATE_ISOFMT( - //usage: "\n -D FMT Use FMT (strptime format) for -d TIME conversion" - //usage: ) -+//usage: "\n -k Set Kernel timezone from localtime and exit" - //usage: "\n" - //usage: "\nRecognized TIME formats:" - //usage: "\n hh:mm[:ss]" -@@ -139,9 +140,8 @@ - - #include "libbb.h" - #include "common_bufsiz.h" --#if ENABLE_FEATURE_DATE_NANO --# include --#endif -+#include -+#include - - enum { - OPT_RFC2822 = (1 << 0), /* R */ -@@ -149,8 +149,9 @@ enum { - OPT_UTC = (1 << 2), /* u */ - OPT_DATE = (1 << 3), /* d */ - OPT_REFERENCE = (1 << 4), /* r */ -- OPT_TIMESPEC = (1 << 5) * ENABLE_FEATURE_DATE_ISOFMT, /* I */ -- OPT_HINT = (1 << 6) * ENABLE_FEATURE_DATE_ISOFMT, /* D */ -+ OPT_KERNELTZ = (1 << 5), /* k */ -+ OPT_TIMESPEC = (1 << 6) * ENABLE_FEATURE_DATE_ISOFMT, /* I */ -+ OPT_HINT = (1 << 7) * ENABLE_FEATURE_DATE_ISOFMT, /* D */ - }; - - #if ENABLE_LONG_OPTS -@@ -162,6 +163,7 @@ static const char date_longopts[] ALIGN1 - /* "universal\0" No_argument "u" */ - "date\0" Required_argument "d" - "reference\0" Required_argument "r" -+ "set-kernel-tz\0" No_argument "k" - ; - #endif - -@@ -181,6 +183,8 @@ static void maybe_set_utc(int opt) - int date_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE; - int date_main(int argc UNUSED_PARAM, char **argv) - { -+ time_t tt; -+ struct timezone tz; - struct timespec ts; - struct tm tm_time; - char buf_fmt_dt2str[64]; -@@ -193,7 +197,7 @@ int date_main(int argc UNUSED_PARAM, cha - char *isofmt_arg = NULL; - - opt = getopt32long(argv, "^" -- "Rs:ud:r:" -+ "Rs:ud:r:k" - IF_FEATURE_DATE_ISOFMT("I::D:") - "\0" - "d--s:s--d" -@@ -256,6 +260,31 @@ int date_main(int argc UNUSED_PARAM, cha - if (*argv) - bb_show_usage(); - -+ /* Setting of kernel timezone was requested */ -+ if (opt & OPT_KERNELTZ) { -+ tt = time(NULL); -+ localtime_r(&tt, &tm_time); -+ -+ /* workaround warp_clock() on first invocation */ -+ memset(&tz, 0, sizeof(tz)); -+ syscall(SYS_settimeofday, NULL, &tz); -+ -+ memset(&tz, 0, sizeof(tz)); -+#ifdef __USE_MISC -+ tz.tz_minuteswest = -(tm_time.tm_gmtoff / 60); -+#else -+ tz.tz_minuteswest = -(tm_time.__tm_gmtoff / 60); -+#endif -+ -+ if (syscall(SYS_settimeofday, NULL, &tz)) -+ { -+ bb_perror_msg("can't set kernel time zone"); -+ return EXIT_FAILURE; -+ } -+ -+ return EXIT_SUCCESS; -+ } -+ - /* Now we have parsed all the information except the date format - * which depends on whether the clock is being set or read */ - diff --git a/package/utils/busybox/patches/500-move-traceroute-applets-to-bin.patch b/package/utils/busybox/patches/500-move-traceroute-applets-to-bin.patch index 3741e25c3f..0389eed5da 100644 --- a/package/utils/busybox/patches/500-move-traceroute-applets-to-bin.patch +++ b/package/utils/busybox/patches/500-move-traceroute-applets-to-bin.patch @@ -1,6 +1,6 @@ --- a/networking/traceroute.c +++ b/networking/traceroute.c -@@ -237,8 +237,8 @@ +@@ -236,8 +236,8 @@ //config: depends on TRACEROUTE || TRACEROUTE6 /* Needs socket(AF_INET, SOCK_RAW, IPPROTO_ICMP), therefore BB_SUID_MAYBE: */ diff --git a/package/utils/busybox/patches/520-loginutils-handle-crypt-failures.patch b/package/utils/busybox/patches/520-loginutils-handle-crypt-failures.patch index d44375426f..91340d46e6 100644 --- a/package/utils/busybox/patches/520-loginutils-handle-crypt-failures.patch +++ b/package/utils/busybox/patches/520-loginutils-handle-crypt-failures.patch @@ -1,6 +1,6 @@ --- a/loginutils/chpasswd.c +++ b/loginutils/chpasswd.c -@@ -97,6 +97,11 @@ int chpasswd_main(int argc UNUSED_PARAM, +@@ -89,6 +89,11 @@ int chpasswd_main(int argc UNUSED_PARAM, crypt_make_pw_salt(salt, algo); free_me = pass = pw_encrypt(pass, salt, 0); @@ -14,7 +14,7 @@ /* This is rather complex: if user is not found in /etc/shadow, --- a/loginutils/cryptpw.c +++ b/loginutils/cryptpw.c -@@ -95,7 +95,7 @@ int cryptpw_main(int argc UNUSED_PARAM, +@@ -87,7 +87,7 @@ int cryptpw_main(int argc UNUSED_PARAM, /* Supports: cryptpw -m sha256 PASS 'rounds=999999999$SALT' */ char salt[MAX_PW_SALT_LEN + sizeof("rounds=999999999$")]; char *salt_ptr; @@ -23,7 +23,7 @@ const char *opt_m, *opt_S; int fd; -@@ -140,8 +140,12 @@ int cryptpw_main(int argc UNUSED_PARAM, +@@ -132,8 +132,12 @@ int cryptpw_main(int argc UNUSED_PARAM, /* may still be NULL on EOF/error */ } diff --git a/package/utils/busybox/patches/600-allow-ntpd-non-root.patch b/package/utils/busybox/patches/600-allow-ntpd-non-root.patch deleted file mode 100644 index b5d4c2a07d..0000000000 --- a/package/utils/busybox/patches/600-allow-ntpd-non-root.patch +++ /dev/null @@ -1,12 +0,0 @@ ---- a/networking/ntpd.c -+++ b/networking/ntpd.c -@@ -2414,9 +2414,6 @@ static NOINLINE void ntp_init(char **arg - - srand(getpid()); - -- if (getuid()) -- bb_error_msg_and_die(bb_msg_you_must_be_root); -- - /* Set some globals */ - G.discipline_jitter = G_precision_sec; - G.stratum = MAXSTRAT; From patchwork Mon Jan 4 00:24:04 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Rosen Penev X-Patchwork-Id: 1421994 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.openwrt.org (client-ip=2001:8b0:10b:1231::1; helo=merlin.infradead.org; envelope-from=openwrt-devel-bounces+incoming=patchwork.ozlabs.org@lists.openwrt.org; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; secure) header.d=lists.infradead.org header.i=@lists.infradead.org header.a=rsa-sha256 header.s=merlin.20170209 header.b=1rKnuNPm; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20161025 header.b=Dj5SS/WB; dkim-atps=neutral Received: from merlin.infradead.org (merlin.infradead.org [IPv6:2001:8b0:10b:1231::1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4D8Ml15lZjz9sSC for ; Mon, 4 Jan 2021 15:16:29 +1100 (AEDT) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=merlin.20170209; h=Sender:Content-Transfer-Encoding: Content-Type:List-Subscribe:List-Help:List-Post:List-Archive:List-Unsubscribe :List-Id:MIME-Version:References:In-Reply-To:Message-Id:Date:Subject:To:From: Reply-To:Cc:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=fEREG+mpNRcx+7oPhly2KnNuT5PFGQ1mYJvcOPomcNw=; b=1rKnuNPmbF98bl1iZi9y1nt1sq FyR1fk3bC1ukEUs7Lj/N+TC01vApK4so88vPSN8cAWrPPGujnn+YXU5wY6xpy5htmB/WZ5+rf+FCj gfV9qESloQ93gJH4nb8Wb1ItU5moNd6exky6q53tk6yLlSCYIkdROJL8wochG2lMx/kCRoebpEKv/ 80So59krld+w8BfffqCHeKHfI1JqFM0zpd7LqLurBCFldx6g1wMOO95cdGXaR+jC1XcM7x6UPs4Wp zfhhahqYo66c/lkmoa6vbNZ3HOd2kRfceidPkZadPrkiSijvIBtH7zn68dks+dxg1moD5PXEAJEpq 3LU3rndQ==; Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1kwDfX-0006Jl-7D; Mon, 04 Jan 2021 00:24:19 +0000 Received: from mail-pj1-x102d.google.com ([2607:f8b0:4864:20::102d]) by merlin.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1kwDfS-0006I6-Us for openwrt-devel@lists.openwrt.org; Mon, 04 Jan 2021 00:24:16 +0000 Received: by mail-pj1-x102d.google.com with SMTP id z12so8754625pjn.1 for ; Sun, 03 Jan 2021 16:24:09 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; bh=uq5nhf4v1Z7p3z/dvljyid7o588FOOxhRLY9kQ/vBa0=; b=Dj5SS/WBk4KXBqakcXdiF3YglGm8hi9no4kjOcF7sWulNBULlyoksi9DvPX1zN0a9o 6VwzBhH6Czh2B/fg4LOFW1sz1vChGaRf6LwjTCTx9BBVptm9ZDLc5UVyHf3paVghjSHh yjBb+W+z6ZQoJuDCHcbZS2bBfAqvWChpI5+kPmTfNJIUORQ44zRNGsy6hguqwRP/Ah61 +Uisq76/FD0S765GnctPt95JFAq7hXZDN5U2bVjn4sn0uig/+FWZFOSHyvKIq5vWD4ma bHUSBSVK2ZBUsDAGfhCXe2PSzgVM81gy8nadPoTkiMtQ4DKAOxAwNGP7QciU0xf39QMj GeWQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=uq5nhf4v1Z7p3z/dvljyid7o588FOOxhRLY9kQ/vBa0=; b=qiKcw6rlYZtk0rFJrBGAwTLwfOK2rAe0HVCo75EF5EqAzdmanNF1zdyNzvMdSwr1G0 Qw4o5j20+iWC4SEl8tGr87zKqEGLbLfcxNjvUvUlXqzXDvtaRqfYLgcTNMuOBhwVNrTR vgRgHFsxgrbYvADqNFx/yOuHLuO3MSJhejatDeEF0EnmMUG2RV4rn4tjc7tD5PXdvbrI X1RJODBS/kCzmI/WztZlGFb/nP34ncrTcqanuVokLD4KoWSNyBzQrdhyKX/2hgJNVoI6 nceauopBvFThJ36yTdrximFkWJ1Y9+GemKaWHuvZE7Q+RTPsM2HH/7CVcd7814rVj0LF frhQ== X-Gm-Message-State: AOAM530qpBXfvDikDJj75904hhsqlnZkKcBtfpW79Mfj+zRLxERP8fo1 EmTHT9erYZVBW+m5c46Egwv9zHOBrav30Q== X-Google-Smtp-Source: ABdhPJw8kOEjpchNGl1fjuQr8U47rf2i2cq2T91flnmU21ic7IWn0Pn/ZJWO6a09iCUV1FueaxwecQ== X-Received: by 2002:a17:902:7c8f:b029:dc:8e14:95a8 with SMTP id y15-20020a1709027c8fb02900dc8e1495a8mr5836914pll.52.1609719848258; Sun, 03 Jan 2021 16:24:08 -0800 (PST) Received: from mangix-trapnet.lan ([2001:470:1f05:79e::a89]) by smtp.gmail.com with ESMTPSA id d124sm56936111pgc.68.2021.01.03.16.24.07 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 03 Jan 2021 16:24:07 -0800 (PST) From: Rosen Penev To: openwrt-devel@lists.openwrt.org Subject: [PATCH 2/3] busybox: remove useless busybox patches Date: Sun, 3 Jan 2021 16:24:04 -0800 Message-Id: <20210104002405.758959-2-rosenp@gmail.com> X-Mailer: git-send-email 2.29.2 In-Reply-To: <20210104002405.758959-1-rosenp@gmail.com> References: <20210104002405.758959-1-rosenp@gmail.com> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20210103_192415_066928_104441F8 X-CRM114-Status: GOOD ( 11.92 ) X-Spam-Score: -0.2 (/) X-Spam-Report: SpamAssassin version 3.4.4 on merlin.infradead.org summary: Content analysis details: (-0.2 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 RCVD_IN_DNSWL_NONE RBL: Sender listed at https://www.dnswl.org/, no trust [2607:f8b0:4864:20:0:0:0:102d listed in] [list.dnswl.org] 0.0 FREEMAIL_FROM Sender email is commonly abused enduser mail provider [rosenp[at]gmail.com] -0.0 SPF_PASS SPF: sender matches SPF record 0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record 0.1 DKIM_SIGNED Message has a DKIM or DK signature, not necessarily valid -0.1 DKIM_VALID Message has at least one valid DKIM or DK signature -0.1 DKIM_VALID_AU Message has a valid DKIM or DK signature from author's domain -0.1 DKIM_VALID_EF Message has a valid DKIM or DK signature from envelope-from domain X-BeenThere: openwrt-devel@lists.openwrt.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: OpenWrt Development List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "openwrt-devel" Errors-To: openwrt-devel-bounces+incoming=patchwork.ozlabs.org@lists.openwrt.org The first two are useless as /bin/sh can execute those scripts just fine. Shellcheck reports no problems. Telnet patch is useless as telnet is no longer used in OpenWrt. Signed-off-by: Rosen Penev --- package/utils/busybox/patches/100-trylink_bash.patch | 8 -------- .../busybox/patches/101-gen_build_files_bash.patch | 8 -------- package/utils/busybox/patches/240-telnetd_intr.patch | 10 ---------- 3 files changed, 26 deletions(-) delete mode 100644 package/utils/busybox/patches/100-trylink_bash.patch delete mode 100644 package/utils/busybox/patches/101-gen_build_files_bash.patch delete mode 100644 package/utils/busybox/patches/240-telnetd_intr.patch diff --git a/package/utils/busybox/patches/100-trylink_bash.patch b/package/utils/busybox/patches/100-trylink_bash.patch deleted file mode 100644 index f9571fcbc8..0000000000 --- a/package/utils/busybox/patches/100-trylink_bash.patch +++ /dev/null @@ -1,8 +0,0 @@ ---- a/scripts/trylink -+++ b/scripts/trylink -@@ -1,4 +1,4 @@ --#!/bin/sh -+#!/usr/bin/env bash - - debug=false - diff --git a/package/utils/busybox/patches/101-gen_build_files_bash.patch b/package/utils/busybox/patches/101-gen_build_files_bash.patch deleted file mode 100644 index d258fb8bc4..0000000000 --- a/package/utils/busybox/patches/101-gen_build_files_bash.patch +++ /dev/null @@ -1,8 +0,0 @@ ---- a/scripts/gen_build_files.sh -+++ b/scripts/gen_build_files.sh -@@ -1,4 +1,4 @@ --#!/bin/sh -+#!/usr/bin/env bash - - # Note: was using sed OPTS CMD -- FILES - # but users complain that many sed implementations diff --git a/package/utils/busybox/patches/240-telnetd_intr.patch b/package/utils/busybox/patches/240-telnetd_intr.patch deleted file mode 100644 index 773ba44db5..0000000000 --- a/package/utils/busybox/patches/240-telnetd_intr.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- a/networking/telnetd.c -+++ b/networking/telnetd.c -@@ -509,6 +509,7 @@ make_new_session( - - /* Restore default signal handling ASAP */ - bb_signals((1 << SIGCHLD) + (1 << SIGPIPE), SIG_DFL); -+ signal(SIGINT, SIG_DFL); - - pid = getpid(); - From patchwork Mon Jan 4 00:24:05 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Rosen Penev X-Patchwork-Id: 1421981 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.openwrt.org (client-ip=2001:8b0:10b:1231::1; helo=merlin.infradead.org; envelope-from=openwrt-devel-bounces+incoming=patchwork.ozlabs.org@lists.openwrt.org; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; secure) header.d=lists.infradead.org header.i=@lists.infradead.org header.a=rsa-sha256 header.s=merlin.20170209 header.b=P/a/EAdh; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20161025 header.b=e5Lf1paO; dkim-atps=neutral Received: from merlin.infradead.org (merlin.infradead.org [IPv6:2001:8b0:10b:1231::1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4D8HQf11M8z9s1l for ; Mon, 4 Jan 2021 12:02:01 +1100 (AEDT) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=merlin.20170209; h=Sender:Content-Transfer-Encoding: Content-Type:List-Subscribe:List-Help:List-Post:List-Archive:List-Unsubscribe :List-Id:MIME-Version:References:In-Reply-To:Message-Id:Date:Subject:To:From: Reply-To:Cc:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=S3OpQsDpkNirDjCFoPcr/tgLZINgioHc+WIxW6jL3lA=; b=P/a/EAdhomGpI40Gbe/NsbB9DZ maacMOmsBrfq4WyMriRlp6I1DKUz2H/3c/NLdGZl7tKqom//ZOc4QJgc+9LXqQRsT9BjBjiWPLpfc 2fgxLFCwgEzy4jh9V1OBoMOCWq1oRB70WcXSD5aIakB/bvkLgspeM6s7WUFW9iwrXkuPcJKXerUxA 0EaEpOjdHWcUEUtcnnqN/3rGAJ9N2EjveDn048RxpOFXcqiejHuovWwocpbd8W46NmIvre+VV8TKj Halfvz0AZKaHk3/m4Qd7pYTZE1A8XImSys+eZXwvwHeolzeH64MvXyXSR90ye7AxFA0FQm7c7WMcs kB9PyQSw==; Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1kwDff-0006Kt-J7; Mon, 04 Jan 2021 00:24:27 +0000 Received: from mail-pg1-x531.google.com ([2607:f8b0:4864:20::531]) by merlin.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1kwDfT-0006IB-2s for openwrt-devel@lists.openwrt.org; Mon, 04 Jan 2021 00:24:16 +0000 Received: by mail-pg1-x531.google.com with SMTP id p18so17667988pgm.11 for ; Sun, 03 Jan 2021 16:24:11 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; bh=QnPy6IUY5VLEVeQbWur//C+2rQYsGKr3Yx5gtyffNSQ=; b=e5Lf1paOvS7AIcJnkiek9OQnCWkIJTwteoumFPzYXjwFNGjXTwjxdWJIPT1W0T9WZf 4TMMkr+Ujh5tOyVr9yAAqF+8/4Zh8sfboN6P0SqR3FfFE+hNRYNyRCQcWS/PDFi3BlCC IUaWzKyTw6vfCx/POHoYI8Wp73QOKOajsKVcj/A8FD8kn0OBst91xK49oeYihADT0vV2 M9Cf00x9kBt5nMDejdgoPbV/fiZlm6VDUmwrSjnqRwNG6/Y8seOpEvQZJy+F/mpZ7gMh ylIKHn6E0aC7EAyIZIlR44pSDbsZwtm4dVjhj6NbKQSQqyPzdrL3jeHemW2ii9xhJHJ+ htmQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=QnPy6IUY5VLEVeQbWur//C+2rQYsGKr3Yx5gtyffNSQ=; b=DmOLPlVe406BqdC9IteGIvLKVlRVjomNXinJ0sjaOvIilt44u9jJZdPfNGd7LQIB0L fSrOimirI9230gm/xVb+S8m1tmedm4sburN2K5eNPXDUZcbKOWCyO3K7JoMrNAJkArUI vvGJJWIQLv+xDzoretNftJjTNtAZ6LgtgF8sYeDlY6fzDmgDl9n1rJ+A4D1Qs/dWN4L7 4pLp/x8GUxVWWKS/1L6EpEzVO2gt1XpUjpbs1SdTN3MCxlz5Q9wJm/6MPbgDk2zofKpr AJrfXbXekEE0o+qOpIKChT3nMwnE/LPTBDjgqhPc8RzJv4KR6/SvXzpqHKTIHJ+MtlhW HrDw== X-Gm-Message-State: AOAM532lFummT85q+IAPwxYfQpVzZaXtBDbU9YM18dj7T+fdzYTysAJi ln5+vOIrY/lQLGKXHMAzGXifWMvRmhKqlw== X-Google-Smtp-Source: ABdhPJxPSwuOouPHH+9h5akCPegBH+fe2k3iFDILECB1BFyu0YuFno7Uu6MDxuRMFwM//LARbrJ1kg== X-Received: by 2002:a62:bd05:0:b029:1ab:6d2:5edf with SMTP id a5-20020a62bd050000b02901ab06d25edfmr63159155pff.32.1609719849276; Sun, 03 Jan 2021 16:24:09 -0800 (PST) Received: from mangix-trapnet.lan ([2001:470:1f05:79e::a89]) by smtp.gmail.com with ESMTPSA id d124sm56936111pgc.68.2021.01.03.16.24.08 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 03 Jan 2021 16:24:08 -0800 (PST) From: Rosen Penev To: openwrt-devel@lists.openwrt.org Subject: [PATCH 3/3] base-files: use hwclock --systz Date: Sun, 3 Jan 2021 16:24:05 -0800 Message-Id: <20210104002405.758959-3-rosenp@gmail.com> X-Mailer: git-send-email 2.29.2 In-Reply-To: <20210104002405.758959-1-rosenp@gmail.com> References: <20210104002405.758959-1-rosenp@gmail.com> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20210103_192415_191806_D3774071 X-CRM114-Status: GOOD ( 12.99 ) X-Spam-Score: -0.2 (/) X-Spam-Report: SpamAssassin version 3.4.4 on merlin.infradead.org summary: Content analysis details: (-0.2 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 RCVD_IN_DNSWL_NONE RBL: Sender listed at https://www.dnswl.org/, no trust [2607:f8b0:4864:20:0:0:0:531 listed in] [list.dnswl.org] 0.0 FREEMAIL_FROM Sender email is commonly abused enduser mail provider [rosenp[at]gmail.com] -0.0 SPF_PASS SPF: sender matches SPF record 0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record 0.1 DKIM_SIGNED Message has a DKIM or DK signature, not necessarily valid -0.1 DKIM_VALID Message has at least one valid DKIM or DK signature -0.1 DKIM_VALID_AU Message has a valid DKIM or DK signature from author's domain -0.1 DKIM_VALID_EF Message has a valid DKIM or DK signature from envelope-from domain X-BeenThere: openwrt-devel@lists.openwrt.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: OpenWrt Development List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "openwrt-devel" Errors-To: openwrt-devel-bounces+incoming=patchwork.ozlabs.org@lists.openwrt.org The date -k patch is non standard and was removed. Tested behavior to be identical with a simple C program: #define _GNU_SOURCE #include #include #include #include int main() { struct timezone tt; struct timezone tz; int a = syscall(SYS_gettimeofday, NULL, &tt); int b = gettimeofday(NULL, &tz); printf("%d - %d, %d\n", a, tt.tz_minuteswest, tt.tz_dsttime); printf("%d - %d, %d\n", b, tz.tz_minuteswest, tz.tz_dsttime); } Signed-off-by: Rosen Penev --- package/base-files/files/etc/init.d/system | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/base-files/files/etc/init.d/system b/package/base-files/files/etc/init.d/system index 0e33c522b4..585eeeef7e 100755 --- a/package/base-files/files/etc/init.d/system +++ b/package/base-files/files/etc/init.d/system @@ -27,7 +27,7 @@ system_config() { ln -sf "/usr/share/zoneinfo/$zonename" /tmp/localtime && rm -f /tmp/TZ # apply timezone to kernel - busybox date -k + hwclock --systz } reload_service() {