Merge remote-tracking branch 'origin/3.6' into 3.7
This commit is contained in:
commit
1c92f05a24
@ -1,7 +1,7 @@
|
||||
untrusted comment: verify with /etc/ports/core.pub
|
||||
RWRJc1FUaeVeqqtHYTbRxtuL7+lF9W2VuD736SO+O9OVeOPlb58ndrCWZfLwQrRX4XgHM5CSTlm3eLbawrSPe+4/XqCvfh1dZw0=
|
||||
SHA256 (Pkgfile) = 2c44c9a3ea55f6b6ed4ed30af75d8068fcd281aa536b412971ebdf75c9248124
|
||||
RWRJc1FUaeVeqqqqwoI059x+dwusp2gtC6NlbayRdxHJOpwspitd8b4tfzdLmuHxv3lUZhjXRzKk3I6e/lBtRp4XRV5DaynZSAs=
|
||||
SHA256 (Pkgfile) = 02c3e8b5599cf587359120a04fd54e3d6d3c7d950de84314b523fcc657503e37
|
||||
SHA256 (.footprint) = d00e0ded497fc3424fc6b2a0e8744846de99f16968e312011d9994cdf4686351
|
||||
SHA256 (iproute2-5.17.0.tar.xz) = 6e384f1b42c75e1a9daac57866da37dcff909090ba86eb25a6e764da7893660e
|
||||
SHA256 (iproute2-5.18.0.tar.xz) = 5ba3d464d51c8c283550d507ffac3d10f7aec587b7c66b0ccb6950643646389e
|
||||
SHA256 (lo.iproute2) = ce94fcf414aa11927a66a221af14180f125f4efbf985dd4db9a1b43dad9cbcc7
|
||||
SHA256 (net.iproute2) = 0af62a6d674d159ec77ccb46c7ee189c1dc4db0213026d6c42c2b80ce01d231d
|
||||
|
||||
@ -4,7 +4,7 @@
|
||||
# Depends on: db elfutils iptables libcap libmnl
|
||||
|
||||
name=iproute2
|
||||
version=5.17.0
|
||||
version=5.18.0
|
||||
release=1
|
||||
source=(https://www.kernel.org/pub/linux/utils/net/$name/$name-$version.tar.xz
|
||||
lo.iproute2 net.iproute2)
|
||||
|
||||
@ -365,6 +365,7 @@ drwxr-xr-x root/root usr/share/kbd/keymaps/i386/include/
|
||||
-rw-r--r-- root/root usr/share/kbd/keymaps/i386/include/unicode.map.gz
|
||||
-rw-r--r-- root/root usr/share/kbd/keymaps/i386/include/windowkeys.map.gz
|
||||
drwxr-xr-x root/root usr/share/kbd/keymaps/i386/neo/
|
||||
-rw-r--r-- root/root usr/share/kbd/keymaps/i386/neo/3l.map.gz
|
||||
-rw-r--r-- root/root usr/share/kbd/keymaps/i386/neo/adnw.map.gz
|
||||
-rw-r--r-- root/root usr/share/kbd/keymaps/i386/neo/bone.map.gz
|
||||
-rw-r--r-- root/root usr/share/kbd/keymaps/i386/neo/koy.map.gz
|
||||
@ -410,6 +411,7 @@ drwxr-xr-x root/root usr/share/kbd/keymaps/i386/qwerty/
|
||||
-rw-r--r-- root/root usr/share/kbd/keymaps/i386/qwerty/gr.map.gz
|
||||
-rw-r--r-- root/root usr/share/kbd/keymaps/i386/qwerty/hu101.map.gz
|
||||
-rw-r--r-- root/root usr/share/kbd/keymaps/i386/qwerty/hypermap.m4
|
||||
-rw-r--r-- root/root usr/share/kbd/keymaps/i386/qwerty/ie.map.gz
|
||||
-rw-r--r-- root/root usr/share/kbd/keymaps/i386/qwerty/il-heb.map.gz
|
||||
-rw-r--r-- root/root usr/share/kbd/keymaps/i386/qwerty/il-phonetic.map.gz
|
||||
-rw-r--r-- root/root usr/share/kbd/keymaps/i386/qwerty/il.map.gz
|
||||
@ -525,6 +527,8 @@ drwxr-xr-x root/root usr/share/kbd/keymaps/include/
|
||||
-rw-r--r-- root/root usr/share/kbd/keymaps/include/compose.latin3
|
||||
-rw-r--r-- root/root usr/share/kbd/keymaps/include/compose.latin4
|
||||
-rw-r--r-- root/root usr/share/kbd/keymaps/include/vim-compose.latin1
|
||||
drwxr-xr-x root/root usr/share/kbd/keymaps/pine/
|
||||
-rw-r--r-- root/root usr/share/kbd/keymaps/pine/en.map.gz
|
||||
drwxr-xr-x root/root usr/share/kbd/unimaps/
|
||||
-rw-r--r-- root/root usr/share/kbd/unimaps/8859-1.a0-ff.uni
|
||||
-rw-r--r-- root/root usr/share/kbd/unimaps/8859-10.a0-ff.uni
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
untrusted comment: verify with /etc/ports/core.pub
|
||||
RWRJc1FUaeVeqoNo9KJPF83IFEFhwU21cTxQATdLBh8tvbr5MLrj6bAAP8ZPC34edH7rkHZR13Ni8Xe+IaWxEM11G6usZet6nwk=
|
||||
SHA256 (Pkgfile) = 36040aa1ade68df451bca29af5c09a2885ce18c97106528bb661faa564a0d8a0
|
||||
SHA256 (.footprint) = 0bd3b797d70de9bccee1f8733918e3b43319c3258cd5cb99fee3940b148a7d9c
|
||||
SHA256 (kbd-2.4.0.tar.xz) = 55f0740458cfd3a84e775e50d7e8b92dc01846db1edad8e2411ccc293ece9b9f
|
||||
RWRJc1FUaeVeqs7YTq1lsDLTfkdPqyQHi5TIQ8M/IVnz7vkaqRYe1ReQ3KPWEKHH7jf6DoZ19D0EowsJkG68lRRxh19IbNvRNAU=
|
||||
SHA256 (Pkgfile) = 032047ad7529787159d325823f49e7dca0264b6af152a2adfee3749e379ef45e
|
||||
SHA256 (.footprint) = 28798b2a735dc8f4e9cb878353b6b6f8094b505eec4ef64d43665448d1fbe728
|
||||
SHA256 (kbd-2.5.0.tar.xz) = ad95964a4dede55f9239dd63b455fa4498cf3db3a0075ccd1d65a9f0e622a0fd
|
||||
|
||||
@ -3,7 +3,7 @@
|
||||
# Maintainer: CRUX System Team, core-ports at crux dot nu
|
||||
|
||||
name=kbd
|
||||
version=2.4.0
|
||||
version=2.5.0
|
||||
release=1
|
||||
source=(https://www.kernel.org/pub/linux/utils/$name/$name-$version.tar.xz)
|
||||
|
||||
|
||||
@ -1,44 +0,0 @@
|
||||
https://gitlab.com/cjwatson/man-db/-/commit/f4f94402834f20b9da730aeca5daa465be38efdf
|
||||
https://gitlab.com/cjwatson/man-db/-/issues/2
|
||||
|
||||
From f4f94402834f20b9da730aeca5daa465be38efdf Mon Sep 17 00:00:00 2001
|
||||
From: Colin Watson <cjwatson@debian.org>
|
||||
Date: Sun, 6 Feb 2022 12:37:01 +0000
|
||||
Subject: [PATCH] Revert "Reduce indentation depth using C99"
|
||||
|
||||
This reverts commit c4d20840f3487588c4a0da4397b1acb6dc83a1e5. Even in
|
||||
C99, a declaration isn't valid immediately after a label; this didn't
|
||||
become valid until C2x, although gcc allows it as an extension.
|
||||
|
||||
Fixes https://gitlab.com/cjwatson/man-db/-/issues/2.
|
||||
|
||||
* src/man.c (parse_opt): Restore enclosing block for OPT_WARNINGS.
|
||||
--- a/src/man.c
|
||||
+++ b/src/man.c
|
||||
@@ -383,15 +383,18 @@ static error_t parse_opt (int key, char *arg, struct argp_state *state)
|
||||
|
||||
case OPT_WARNINGS:
|
||||
#ifdef NROFF_WARNINGS
|
||||
- char *s = xstrdup (arg ? arg : default_roff_warnings);
|
||||
- const char *warning;
|
||||
+ {
|
||||
+ char *s = xstrdup
|
||||
+ (arg ? arg : default_roff_warnings);
|
||||
+ const char *warning;
|
||||
|
||||
- for (warning = strtok (s, ","); warning;
|
||||
- warning = strtok (NULL, ","))
|
||||
- gl_list_add_last (roff_warnings,
|
||||
- xstrdup (warning));
|
||||
+ for (warning = strtok (s, ","); warning;
|
||||
+ warning = strtok (NULL, ","))
|
||||
+ gl_list_add_last (roff_warnings,
|
||||
+ xstrdup (warning));
|
||||
|
||||
- free (s);
|
||||
+ free (s);
|
||||
+ }
|
||||
#endif /* NROFF_WARNINGS */
|
||||
return 0;
|
||||
|
||||
GitLab
|
||||
@ -1,9 +1,8 @@
|
||||
untrusted comment: verify with /etc/ports/core.pub
|
||||
RWRJc1FUaeVeqjpsMrfVT+MbNKilratUanJ3xyHJPQO2esqYajWEPBuuI+ODqgFgi1Jfo9YuC5sHgHWl6okZPENHEfZCXRJx2AE=
|
||||
SHA256 (Pkgfile) = f480773a76b4de57020ac672fffd7f27bdfb16f8141eecac33110599db202a8d
|
||||
RWRJc1FUaeVeqg8HXhK4gg7yIklssxXyzk1Rjvext74UKxEWSrYp/bRkCvUdbmrefAJf51pFHqkvbxNffMtgz/4qVXwxMCh4OA4=
|
||||
SHA256 (Pkgfile) = 6e228575a42f4f609fb064956ff6e2ac0546db3888dbf2139ba268581b856295
|
||||
SHA256 (.footprint) = 31677d7ab33846d1a9b4a78c8570273d37f05e2ded2e784698af56586e603cd6
|
||||
SHA256 (sysklogd-2.3.0.tar.gz) = 9a410b484713d9600c820d8113f2d80cb14708328c908b1a28e8b7b31fd54f57
|
||||
SHA256 (kmsg.patch) = bdfb4b39bcdf57ca1ba1b61f76e1766e30615cf7b80639d227fff06ecb686a5e
|
||||
SHA256 (sysklogd-2.4.0.tar.gz) = 1d9ed88a772af95c8b46c9e92ddc5bf4a76ac233ec5850f084290b80df7e02c4
|
||||
SHA256 (rotatelog) = 4f51230e8c371d61018d88f6d88d1c6bf6b9aee054302fbf4285c82084bdc98f
|
||||
SHA256 (syslog) = fc29247aaee9baec087d29a6ffef469d8301bddef913bb7eee67151fceba7112
|
||||
SHA256 (syslog.conf) = b38189cac2b80dcd7d74d8759dddcdd57a203becdbece27253d6d2ba25be95c2
|
||||
|
||||
@ -3,18 +3,14 @@
|
||||
# Maintainer: CRUX System Team, core-ports at crux dot nu
|
||||
|
||||
name=sysklogd
|
||||
version=2.3.0
|
||||
release=2
|
||||
version=2.4.0
|
||||
release=1
|
||||
source=(https://github.com/troglobit/sysklogd/releases/download/v$version/$name-$version.tar.gz \
|
||||
kmsg.patch
|
||||
rotatelog syslog syslog.conf sysklogd)
|
||||
|
||||
build() {
|
||||
cd $name-$version
|
||||
|
||||
# https://github.com/troglobit/sysklogd/issues/48
|
||||
patch -Np1 -i $SRC/kmsg.patch
|
||||
|
||||
./configure \
|
||||
--prefix=/usr \
|
||||
--sysconfdir=/etc \
|
||||
|
||||
@ -1,283 +0,0 @@
|
||||
diff --git a/configure.ac b/configure.ac
|
||||
index 4648eea..d6898c7 100644
|
||||
--- a/configure.ac
|
||||
+++ b/configure.ac
|
||||
@@ -25,7 +25,7 @@
|
||||
# OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
|
||||
# SUCH DAMAGE.
|
||||
|
||||
-AC_INIT([sysklogd], [2.3.0], [https://github.com/troglobit/sysklogd/issues],,
|
||||
+AC_INIT([sysklogd], [2.4.0-dev], [https://github.com/troglobit/sysklogd/issues],,
|
||||
[https://github.com/troglobit/sysklogd])
|
||||
AC_CONFIG_AUX_DIR(aux)
|
||||
AM_INIT_AUTOMAKE([1.11 foreign subdir-objects])
|
||||
diff --git a/man/syslog.conf.5 b/man/syslog.conf.5
|
||||
index cdc131e..41fb86e 100644
|
||||
--- a/man/syslog.conf.5
|
||||
+++ b/man/syslog.conf.5
|
||||
@@ -527,7 +527,7 @@ including the main file itself and compressed files kept. The size
|
||||
argument takes the same modifiers as the
|
||||
.Xr syslogd 8
|
||||
command line option,
|
||||
-.Fl R .
|
||||
+.Fl r .
|
||||
.Bd -literal -offset indent
|
||||
# Log all messages, including kernel, to the messages file rotate it
|
||||
# every 100 kiB and keep up to 10 aged out, and compressed, files.
|
||||
diff --git a/man/syslogd.8 b/man/syslogd.8
|
||||
index 78517cd..8bb3863 100644
|
||||
--- a/man/syslogd.8
|
||||
+++ b/man/syslogd.8
|
||||
@@ -38,7 +38,7 @@
|
||||
.Nd log systems messages
|
||||
.Sh SYNOPSIS
|
||||
.Nm
|
||||
-.Op Fl ?46AdFHKknsTv
|
||||
+.Op Fl ?46AdFHKknsTtv
|
||||
.Op Fl a Ar addr[/len][:port]
|
||||
.Op Fl a Ar name[:port]
|
||||
.Op Fl b Ar addr[:port]
|
||||
@@ -256,23 +256,8 @@ and wants to monitor when and how it exits.
|
||||
When logging remote messages use hostname from the message (if supplied)
|
||||
instead of using address from which the message was received.
|
||||
.It Fl K
|
||||
-Keep (trust) kernel timestamp.
|
||||
-.Pp
|
||||
-On Linux systems the
|
||||
-.Pa /dev/kmsg
|
||||
-timestamp is a monotonic clock, in microseconds, relative to the boot of
|
||||
-the system. This timestamp is, among other things,
|
||||
-.Sy not
|
||||
-adjusted for suspend/resume cycles, meaning the kernel logs can start to
|
||||
-go out of sync with the rest of the system. This in turn can make it
|
||||
-really hard to correlate events.
|
||||
-.Pp
|
||||
-.Nm
|
||||
-by default only trusts the kernel timestamp when starting up the first
|
||||
-time. As soon as the the kernel ring buffer has been emptied,
|
||||
-.Nm
|
||||
-uses its own current time for each received kernel log message. This
|
||||
-option disables that behavior.
|
||||
+Disable kernel logging. Useful in container use-cases where kernel logs
|
||||
+har handled by the host system.
|
||||
.It Fl k
|
||||
Disable the translation of
|
||||
messages received with facility
|
||||
@@ -336,6 +321,24 @@ Always use the local time and date for messages received from the network,
|
||||
instead of the timestamp field supplied in the message by the remote host.
|
||||
This is useful if some of the originating hosts cannot keep time properly
|
||||
or are unable to generate a correct timestamp.
|
||||
+.It Fl t
|
||||
+Keep (trust) kernel timestamp.
|
||||
+.Pp
|
||||
+On Linux systems the
|
||||
+.Pa /dev/kmsg
|
||||
+timestamp is a monotonic clock, in microseconds, relative to the boot of
|
||||
+the system. This timestamp is, among other things,
|
||||
+.Sy not
|
||||
+adjusted for suspend/resume cycles, meaning the kernel logs can start to
|
||||
+go out of sync with the rest of the system. This in turn can make it
|
||||
+really hard to correlate events.
|
||||
+.Pp
|
||||
+.Nm
|
||||
+by default only trusts the kernel timestamp when starting up the first
|
||||
+time. As soon as the the kernel ring buffer has been emptied,
|
||||
+.Nm
|
||||
+uses its own current time for each received kernel log message. This
|
||||
+option disables that behavior.
|
||||
.It Fl v
|
||||
Show program version and exit.
|
||||
.El
|
||||
diff --git a/src/syslogd.c b/src/syslogd.c
|
||||
index fa4303f..02d0718 100644
|
||||
--- a/src/syslogd.c
|
||||
+++ b/src/syslogd.c
|
||||
@@ -140,6 +140,7 @@ static int SecureMode; /* when true, receive only unix domain socks */
|
||||
static int RemoteAddDate; /* Always set the date on remote messages */
|
||||
static int RemoteHostname; /* Log remote hostname from the message */
|
||||
|
||||
+static int KernLog = 1; /* Track kernel logs by default */
|
||||
static int KeepKernFac; /* Keep remotely logged kernel facility */
|
||||
static int KeepKernTime; /* Keep kernel timestamp, evern after initial read */
|
||||
|
||||
@@ -188,6 +189,40 @@ static int waitdaemon(int);
|
||||
static void timedout(int);
|
||||
|
||||
|
||||
+/*
|
||||
+ * Very basic, and incomplete, check if we're running in a container.
|
||||
+ * If so, we probably want to disable kernel logging.
|
||||
+ */
|
||||
+static int in_container(void)
|
||||
+{
|
||||
+ const char *files[] = {
|
||||
+ "/run/.containerenv",
|
||||
+ "/.dockerenv"
|
||||
+ };
|
||||
+ const char *containers[] = {
|
||||
+ "lxc",
|
||||
+ "docker",
|
||||
+ "kubepod"
|
||||
+ };
|
||||
+ size_t i;
|
||||
+ char *c;
|
||||
+
|
||||
+ c = getenv("container");
|
||||
+ if (c) {
|
||||
+ for (i = 0; i < NELEMS(containers); i++) {
|
||||
+ if (!strcmp(containers[i], c))
|
||||
+ return 1;
|
||||
+ }
|
||||
+ }
|
||||
+
|
||||
+ for (i = 0; i < NELEMS(files); i++) {
|
||||
+ if (!access(files[i], F_OK))
|
||||
+ return 1;
|
||||
+ }
|
||||
+
|
||||
+ return 0;
|
||||
+}
|
||||
+
|
||||
static int addpeer(struct peer *pe0)
|
||||
{
|
||||
struct peer *pe;
|
||||
@@ -255,8 +290,8 @@ static void sys_seqno_save(void)
|
||||
int usage(int code)
|
||||
{
|
||||
printf("Usage:\n"
|
||||
- " syslogd [-46AdFKknsTv?] [-a PEER] [-b NAME] [-f FILE] [-m INTERVAL]\n"
|
||||
- " [-P PID_FILE] [-p SOCK_PATH] [-r SIZE[:NUM]]\n"
|
||||
+ " syslogd [-46AdFKknsTtv?] [-a PEER] [-b NAME] [-f FILE] [-m INTERVAL]\n"
|
||||
+ " [-P PID_FILE] [-p SOCK_PATH] [-r SIZE[:NUM]]\n"
|
||||
"Options:\n"
|
||||
" -4 Force IPv4 only\n"
|
||||
" -6 Force IPv6 only\n"
|
||||
@@ -285,8 +320,8 @@ int usage(int code)
|
||||
" -d Enable debug mode, implicitly enables -F to prevent backgrounding\n"
|
||||
" -F Run in foreground, required when monitored by init(1)\n"
|
||||
" -f FILE Alternate .conf file, default: %s\n"
|
||||
+ " -K Disable kernel logging, useful in container use-cases\n"
|
||||
" -k Allow logging with facility 'kernel', otherwise remapped to 'user'\n"
|
||||
- " -K Keep kernel timestamp, even after initial ring buffer emptying\n"
|
||||
" -m MINS Interval between MARK messages, 0 to disable, default: 20 min\n"
|
||||
" -n Disable DNS query for every request\n"
|
||||
" -P FILE File to store the process ID, default: %s\n"
|
||||
@@ -298,6 +333,7 @@ int usage(int code)
|
||||
" -s Operate in secure mode, do not log messages from remote machines.\n"
|
||||
" If specified twice, no socket at all will be opened, which also\n"
|
||||
" disables support for logging to remote machines.\n"
|
||||
+ " -t Keep kernel timestamp, even after initial ring buffer emptying\n"
|
||||
" -T Use local time and date for messages received from remote hosts\n"
|
||||
" -? Show this help text\n"
|
||||
" -v Show program version and exit\n"
|
||||
@@ -314,11 +350,13 @@ int usage(int code)
|
||||
int main(int argc, char *argv[])
|
||||
{
|
||||
pid_t ppid = 1;
|
||||
+ int no_sys = 0;
|
||||
+ int pflag = 0;
|
||||
+ int bflag = 0;
|
||||
char *ptr;
|
||||
- int pflag = 0, bflag = 0;
|
||||
int ch;
|
||||
|
||||
- while ((ch = getopt(argc, argv, "46Aa:b:C:dHFf:Kkm:nP:p:r:sTv?")) != EOF) {
|
||||
+ while ((ch = getopt(argc, argv, "46Aa:b:C:dHFf:Kkm:nP:p:r:sTtv?")) != EOF) {
|
||||
switch ((char)ch) {
|
||||
case '4':
|
||||
family = PF_INET;
|
||||
@@ -369,12 +407,12 @@ int main(int argc, char *argv[])
|
||||
RemoteHostname = 1;
|
||||
break;
|
||||
|
||||
- case 'k': /* keep remote kern fac */
|
||||
- KeepKernFac = 1;
|
||||
+ case 'K':
|
||||
+ KernLog = 0;
|
||||
break;
|
||||
|
||||
- case 'K': /* keep/trust kernel timestamp always */
|
||||
- KeepKernTime = 1;
|
||||
+ case 'k': /* keep remote kern fac */
|
||||
+ KeepKernFac = 1;
|
||||
break;
|
||||
|
||||
case 'm': /* mark interval */
|
||||
@@ -414,6 +452,10 @@ int main(int argc, char *argv[])
|
||||
RemoteAddDate = 1;
|
||||
break;
|
||||
|
||||
+ case 't': /* keep/trust kernel timestamp always */
|
||||
+ KeepKernTime = 1;
|
||||
+ break;
|
||||
+
|
||||
case 'v':
|
||||
printf("syslogd v%s\n", VERSION);
|
||||
exit(0);
|
||||
@@ -457,15 +499,24 @@ int main(int argc, char *argv[])
|
||||
* /dev/kmsg and fall back to _PROC_KLOG, which on GLIBC
|
||||
* systems is /proc/kmsg, and /dev/klog on *BSD.
|
||||
*/
|
||||
- sys_seqno_load();
|
||||
- if (opensys("/dev/kmsg")) {
|
||||
- if (opensys(_PATH_KLOG))
|
||||
- warn("Kernel logging disabled, failed opening %s", _PATH_KLOG);
|
||||
- else
|
||||
- kern_console_off();
|
||||
- } else
|
||||
- kern_console_off();
|
||||
+ if (KernLog) {
|
||||
+ if (in_container()) {
|
||||
+ KernLog = 0;
|
||||
+ no_sys = 1;
|
||||
+ goto no_klogd;
|
||||
+ }
|
||||
|
||||
+ sys_seqno_load();
|
||||
+ if (opensys("/dev/kmsg")) {
|
||||
+ if (opensys(_PATH_KLOG))
|
||||
+ warn("Kernel logging disabled, failed opening %s",
|
||||
+ _PATH_KLOG);
|
||||
+ else
|
||||
+ kern_console_off();
|
||||
+ } else
|
||||
+ kern_console_off();
|
||||
+ }
|
||||
+no_klogd:
|
||||
consfile.f_type = F_CONSOLE;
|
||||
strlcpy(consfile.f_un.f_fname, ctty, sizeof(consfile.f_un.f_fname));
|
||||
|
||||
@@ -504,6 +555,10 @@ int main(int argc, char *argv[])
|
||||
if (ppid != 1)
|
||||
kill(ppid, SIGALRM);
|
||||
|
||||
+ /* Log if we disabled klogd */
|
||||
+ if (no_sys)
|
||||
+ NOTE("Running in a container, disabling klogd.");
|
||||
+
|
||||
/* Main loop begins here. */
|
||||
for (;;) {
|
||||
int rc;
|
||||
@@ -523,7 +578,8 @@ int main(int argc, char *argv[])
|
||||
if (rc < 0 && errno != EINTR)
|
||||
ERR("select()");
|
||||
|
||||
- sys_seqno_save();
|
||||
+ if (KernLog)
|
||||
+ sys_seqno_save();
|
||||
}
|
||||
}
|
||||
|
||||
@@ -584,8 +640,12 @@ static void kernel_cb(int fd, void *arg)
|
||||
|
||||
static int opensys(const char *file)
|
||||
{
|
||||
+ struct stat st;
|
||||
int fd;
|
||||
|
||||
+ if (stat(file, &st) || !S_ISCHR(st.st_mode))
|
||||
+ return 1;
|
||||
+
|
||||
fd = open(file, O_RDONLY | O_NONBLOCK | O_CLOEXEC, 0);
|
||||
if (fd < 0)
|
||||
return 1;
|
||||
@ -335,7 +335,9 @@ drwxr-xr-x root/root usr/share/vim/doc/
|
||||
-rw-r--r-- root/root usr/share/vim/doc/usr_43.txt
|
||||
-rw-r--r-- root/root usr/share/vim/doc/usr_44.txt
|
||||
-rw-r--r-- root/root usr/share/vim/doc/usr_45.txt
|
||||
-rw-r--r-- root/root usr/share/vim/doc/usr_46.txt
|
||||
-rw-r--r-- root/root usr/share/vim/doc/usr_50.txt
|
||||
-rw-r--r-- root/root usr/share/vim/doc/usr_51.txt
|
||||
-rw-r--r-- root/root usr/share/vim/doc/usr_52.txt
|
||||
-rw-r--r-- root/root usr/share/vim/doc/usr_90.txt
|
||||
-rw-r--r-- root/root usr/share/vim/doc/usr_toc.txt
|
||||
-rw-r--r-- root/root usr/share/vim/doc/various.txt
|
||||
@ -598,6 +600,8 @@ drwxr-xr-x root/root usr/share/vim/ftplugin/
|
||||
-rw-r--r-- root/root usr/share/vim/ftplugin/vim.vim
|
||||
-rw-r--r-- root/root usr/share/vim/ftplugin/vroom.vim
|
||||
-rw-r--r-- root/root usr/share/vim/ftplugin/wast.vim
|
||||
-rw-r--r-- root/root usr/share/vim/ftplugin/wget.vim
|
||||
-rw-r--r-- root/root usr/share/vim/ftplugin/wget2.vim
|
||||
-rw-r--r-- root/root usr/share/vim/ftplugin/xdefaults.vim
|
||||
-rw-r--r-- root/root usr/share/vim/ftplugin/xf86conf.vim
|
||||
-rw-r--r-- root/root usr/share/vim/ftplugin/xhtml.vim
|
||||
@ -612,6 +616,9 @@ drwxr-xr-x root/root usr/share/vim/ftplugin/
|
||||
-rw-r--r-- root/root usr/share/vim/ftplugin/zsh.vim
|
||||
-rw-r--r-- root/root usr/share/vim/ftplugof.vim
|
||||
-rw-r--r-- root/root usr/share/vim/gvimrc_example.vim
|
||||
drwxr-xr-x root/root usr/share/vim/import/
|
||||
drwxr-xr-x root/root usr/share/vim/import/dist/
|
||||
-rw-r--r-- root/root usr/share/vim/import/dist/vimhelp.vim
|
||||
-rw-r--r-- root/root usr/share/vim/indent.vim
|
||||
drwxr-xr-x root/root usr/share/vim/indent/
|
||||
-rw-r--r-- root/root usr/share/vim/indent/aap.vim
|
||||
@ -1479,6 +1486,7 @@ drwxr-xr-x root/root usr/share/vim/syntax/
|
||||
-rw-r--r-- root/root usr/share/vim/syntax/web.vim
|
||||
-rw-r--r-- root/root usr/share/vim/syntax/webmacro.vim
|
||||
-rw-r--r-- root/root usr/share/vim/syntax/wget.vim
|
||||
-rw-r--r-- root/root usr/share/vim/syntax/wget2.vim
|
||||
-rw-r--r-- root/root usr/share/vim/syntax/whitespace.vim
|
||||
-rw-r--r-- root/root usr/share/vim/syntax/winbatch.vim
|
||||
-rw-r--r-- root/root usr/share/vim/syntax/wml.vim
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
untrusted comment: verify with /etc/ports/core.pub
|
||||
RWRJc1FUaeVeqrqN7bsgF416XCRynZgD0hVCq2EaRWqDUp7tfwJplFtxoO8c6E3xR0nkZRTvl0DE7Vz762UnuQ1z0PKvWtJyGQo=
|
||||
SHA256 (Pkgfile) = 3e8aa53a52960f5dbbb978b1d36e242d9a2bd2d296c157b88012a71f45d699c8
|
||||
SHA256 (.footprint) = 6097c85f685a88a8a79d16d007ec3923270e25f10acfbe55c0ebc2bfd2713441
|
||||
SHA256 (vim-8.2.4846.tar.gz) = 9189d7d484ec65ee7b9ce2574ed135015fd8e98cb909077b7a6ce7a773ed01f9
|
||||
RWRJc1FUaeVeqpaqvCQmqrDt/rnmb35jT1Mgic91QCtN9vNI19SIJvAlN2GFWyop9iYiL1+dA2Z1ucvBM5+gQu3lNqSHrnw+sAk=
|
||||
SHA256 (Pkgfile) = ce3e9d0e09f51c5d46c0b1c825b3961ea80f1b6839fa2f6a731fd8d99e80e82a
|
||||
SHA256 (.footprint) = a76355c7e5ae8bc47512e949ff651ed20ef93811461b2af2b1bf3a5933533809
|
||||
SHA256 (vim-8.2.5054.tar.gz) = 2c7e6d72c368b4de0317ea75e1798f25644cd3bdf700f1e117971cc1a06080b3
|
||||
|
||||
@ -4,7 +4,7 @@
|
||||
# Depends on: ncurses acl
|
||||
|
||||
name=vim
|
||||
version=8.2.4846
|
||||
version=8.2.5054
|
||||
release=1
|
||||
source=(https://github.com/vim/vim/archive/v${version}/$name-$version.tar.gz)
|
||||
|
||||
|
||||
Loading…
Reference in New Issue
Block a user