Skip to content
This repository was archived by the owner on May 21, 2024. It is now read-only.

Commit d91faa5

Browse files
committed
update openwrt to 19.07.5
This fixes several CVEs. See https://openwrt.org/releases/19.07/notes-19.07.5 for details.
1 parent a3500c7 commit d91faa5

20 files changed

+882
-209
lines changed

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ Build commands for the console:
2020
```bash
2121
git clone https://git.openwrt.org/openwrt/openwrt.git
2222
cd openwrt
23-
git reset --hard c963e4267b916fa3b074b5ae1f5b5d2b9fc0af68
23+
git reset --hard d0b8be75ff248b4cda009a6c1ce72eb0072c6f82
2424

2525
git clone -b v2.3.0 https://github.com/ffulm/firmware.git
2626
cp -rf firmware/files firmware/package firmware/feeds.conf .

feeds.conf

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
src-git packages https://git.openwrt.org/feed/packages.git^f5cb61cee5ef79903ee3c093fb31974c13e78ea5
1+
src-git packages https://git.openwrt.org/feed/packages.git^2974079d3db786fe5da00c10f1d80e79b0112093
22
src-git luci https://git.openwrt.org/project/luci.git;openwrt-19.07
3-
src-git routing https://git.openwrt.org/feed/routing.git^9b42e24a54f03ebb6f58224b49036e8f739b175f
3+
src-git routing https://git.openwrt.org/feed/routing.git^02b4dbfcb7b8f8b566940847d22d5a6f229d2e66
44
src-git telephony https://git.openwrt.org/feed/telephony.git;openwrt-19.07

patches/openwrt/0001-build-create-JSON-files-containing-image-info.patch

Lines changed: 0 additions & 180 deletions
This file was deleted.
Lines changed: 99 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,99 @@
1+
From ab238e0240b007bc845097e24fdda3ffe2886c14 Mon Sep 17 00:00:00 2001
2+
From: Matthias Schiffer <mschiffer@universe-factory.net>
3+
Date: Wed, 6 Aug 2014 19:12:00 +0200
4+
Subject: [PATCH 01/16] procd: add support for alternative rc.d directories
5+
6+
---
7+
...ort-for-alternative-rc.d-directories.patch | 80 +++++++++++++++++++
8+
1 file changed, 80 insertions(+)
9+
create mode 100644 package/system/procd/patches/0001-Add-support-for-alternative-rc.d-directories.patch
10+
11+
diff --git a/package/system/procd/patches/0001-Add-support-for-alternative-rc.d-directories.patch b/package/system/procd/patches/0001-Add-support-for-alternative-rc.d-directories.patch
12+
new file mode 100644
13+
index 0000000000..16d3179f05
14+
--- /dev/null
15+
+++ b/package/system/procd/patches/0001-Add-support-for-alternative-rc.d-directories.patch
16+
@@ -0,0 +1,80 @@
17+
+From 03a2bc70e4260ec9f669391c47b9a7a9ecd0b75d Mon Sep 17 00:00:00 2001
18+
+Message-Id: <03a2bc70e4260ec9f669391c47b9a7a9ecd0b75d.1407329621.git.mschiffer@universe-factory.net>
19+
+From: Matthias Schiffer <mschiffer@universe-factory.net>
20+
+Date: Wed, 6 Aug 2014 14:51:49 +0200
21+
+Subject: [PATCH] Add support for alternative rc.d directories
22+
+
23+
+---
24+
+ initd/preinit.c | 38 ++++++++++++++++++++++++++++++++++++++
25+
+ rcS.c | 2 +-
26+
+ 2 files changed, 39 insertions(+), 1 deletion(-)
27+
+
28+
+--- a/initd/preinit.c
29+
++++ b/initd/preinit.c
30+
+@@ -87,12 +87,42 @@ fail:
31+
+ free(command);
32+
+ }
33+
+
34+
++static char*
35+
++get_rc_d(void)
36+
++{
37+
++ size_t n = 0;
38+
++ ssize_t len;
39+
++ char *ret = NULL;
40+
++
41+
++ FILE *fp = fopen("/tmp/rc_d_path", "r");
42+
++
43+
++ if (!fp)
44+
++ return NULL;
45+
++
46+
++ len = getline(&ret, &n, fp);
47+
++
48+
++ fclose(fp);
49+
++
50+
++ unlink("/tmp/rc_d_path");
51+
++
52+
++ if (len <= 0) {
53+
++ free(ret);
54+
++ return NULL;
55+
++ }
56+
++
57+
++ if (ret[len-1] == '\n')
58+
++ ret[len-1] = 0;
59+
++
60+
++ return ret;
61+
++}
62+
++
63+
+ static void
64+
+ spawn_procd(struct uloop_process *proc, int ret)
65+
+ {
66+
+ char *wdt_fd = watchdog_fd();
67+
+ char *argv[] = { "/sbin/procd", NULL};
68+
+ char dbg[2];
69+
++ char *rc_d_path;
70+
+
71+
+ if (plugd_proc.pid > 0)
72+
+ kill(plugd_proc.pid, SIGKILL);
73+
+@@ -112,6 +142,12 @@ spawn_procd(struct uloop_process *proc,
74+
+ setenv("DBGLVL", dbg, 1);
75+
+ }
76+
+
77+
++ rc_d_path = get_rc_d();
78+
++ if (rc_d_path) {
79+
++ setenv("RC_D_PATH", rc_d_path, 1);
80+
++ free(rc_d_path);
81+
++ }
82+
++
83+
+ execvp(argv[0], argv);
84+
+ }
85+
+
86+
+--- a/rcS.c
87+
++++ b/rcS.c
88+
+@@ -184,7 +184,7 @@ int rcS(char *pattern, char *param, void
89+
+ q.empty_cb = q_empty;
90+
+ q.max_running_tasks = 1;
91+
+
92+
+- return _rc(&q, "/etc/rc.d", pattern, "*", param);
93+
++ return _rc(&q, getenv("RC_D_PATH") ?: "/etc/rc.d", pattern, "*", param);
94+
+ }
95+
+
96+
+ int rc(const char *file, char *param)
97+
--
98+
2.30.0
99+
Lines changed: 51 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,51 @@
1+
From 83e2d2a61a074534ffc8dc512c53a6152cef2efc Mon Sep 17 00:00:00 2001
2+
From: Matthias Schiffer <mschiffer@universe-factory.net>
3+
Date: Sat, 21 Mar 2015 16:40:52 +0100
4+
Subject: [PATCH 02/16] base-files: disable reset button handling
5+
6+
This conflicts with our reset button usage.
7+
---
8+
package/base-files/files/etc/rc.button/reset | 31 --------------------
9+
1 file changed, 31 deletions(-)
10+
delete mode 100755 package/base-files/files/etc/rc.button/reset
11+
12+
diff --git a/package/base-files/files/etc/rc.button/reset b/package/base-files/files/etc/rc.button/reset
13+
deleted file mode 100755
14+
index 2403122ad2..0000000000
15+
--- a/package/base-files/files/etc/rc.button/reset
16+
+++ /dev/null
17+
@@ -1,31 +0,0 @@
18+
-#!/bin/sh
19+
-
20+
-. /lib/functions.sh
21+
-
22+
-OVERLAY="$( grep ' /overlay ' /proc/mounts )"
23+
-
24+
-case "$ACTION" in
25+
-pressed)
26+
- [ -z "$OVERLAY" ] && return 0
27+
-
28+
- return 5
29+
-;;
30+
-timeout)
31+
- . /etc/diag.sh
32+
- set_state failsafe
33+
-;;
34+
-released)
35+
- if [ "$SEEN" -lt 1 ]
36+
- then
37+
- echo "REBOOT" > /dev/console
38+
- sync
39+
- reboot
40+
- elif [ "$SEEN" -ge 5 -a -n "$OVERLAY" ]
41+
- then
42+
- echo "FACTORY RESET" > /dev/console
43+
- jffs2reset -y && reboot &
44+
- fi
45+
-;;
46+
-esac
47+
-
48+
-return 0
49+
--
50+
2.30.0
51+

0 commit comments

Comments
 (0)