Hello community,
here is the log from the commit of package blog for openSUSE:Factory checked in
at 2018-08-06 11:52:32
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/blog (Old)
and /work/SRC/openSUSE:Factory/.blog.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "blog"
Mon Aug 6 11:52:32 2018 rev:9 rq:627027 version:2.19
Changes:
--------
--- /work/SRC/openSUSE:Factory/blog/blog.changes 2018-03-26
12:00:37.760084832 +0200
+++ /work/SRC/openSUSE:Factory/.blog.new/blog.changes 2018-08-06
11:52:33.313064973 +0200
@@ -1,0 +2,19 @@
+Thu Aug 2 08:03:10 UTC 2018 - wer...@suse.de
+
+- Update to version 2.19 which integrates the patches now removed:
+ * sysmacros.patch
+ * libconsole-Really-allow-to-use-dev-console-as-a-fall.patch
+ * libconsole-never-return-empty-list-from-getconsoles.patch
+ * showconsole-2.18.tar.gz
+ * libconsole-Add-console-into-the-list-only-when-succe.patch
+ * libconsole-Correctly-ignore-early-consoles.patch
+ as well as the changes
+ * Correct wants directory for systemd-ask-password-blog.service
+ * Sort input files for reproducible builds
+
+-------------------------------------------------------------------
+Wed Aug 1 14:33:06 UTC 2018 - sch...@suse.de
+
+- sysmacros.patch: Include <sys/sysmacros.h> for makedev
+
+-------------------------------------------------------------------
Old:
----
libconsole-Add-console-into-the-list-only-when-succe.patch
libconsole-Correctly-ignore-early-consoles.patch
libconsole-Really-allow-to-use-dev-console-as-a-fall.patch
libconsole-never-return-empty-list-from-getconsoles.patch
showconsole-2.18.tar.gz
New:
----
showconsole-2.19.tar.gz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ blog.spec ++++++
--- /var/tmp/diff_new_pack.DFRI03/_old 2018-08-06 11:52:33.977066125 +0200
+++ /var/tmp/diff_new_pack.DFRI03/_new 2018-08-06 11:52:33.977066125 +0200
@@ -17,7 +17,7 @@
Name: blog
-Version: 2.18
+Version: 2.19
Release: 0
Summary: Boot logging
License: GPL-2.0-or-later
@@ -29,14 +29,6 @@
Requires(post): coreutils
BuildRoot: %{_tmppath}/%{name}-%{version}-build
Provides: sysvinit-tools:/sbin/blogd
-# PATCH-FIX-UPSTREAM libconsole-never-return-empty-list-from-getconsoles.patch
bsc#1071568
-Patch0: libconsole-never-return-empty-list-from-getconsoles.patch
-# PATCH-FIX-UPSTREAM
libconsole-Really-allow-to-use-dev-console-as-a-fall.patch bsc#1071568
-Patch1: libconsole-Really-allow-to-use-dev-console-as-a-fall.patch
-# PATCH-FIX-UPSTREAM
libconsole-Add-console-into-the-list-only-when-succe.patch bsc#1071568
-Patch2: libconsole-Add-console-into-the-list-only-when-succe.patch
-# PATCH-FIX-UPSTREAM libconsole-Correctly-ignore-early-consoles.patch
bsc#1071568
-Patch3: libconsole-Correctly-ignore-early-consoles.patch
%description
The blogd daemon determines the real underlying character device of
@@ -74,10 +66,6 @@
%prep
%setup -q -n showconsole-%version
-%patch0 -p1
-%patch1 -p1
-%patch2 -p1
-%patch3 -p1
%build
make %{?_smp_mflags} CC="%__cc" \
++++++ showconsole-2.18.tar.gz -> showconsole-2.19.tar.gz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/showconsole-2.18/Makefile
new/showconsole-2.19/Makefile
--- old/showconsole-2.18/Makefile 2016-04-26 15:04:45.000000000 +0200
+++ new/showconsole-2.19/Makefile 2018-08-02 09:33:35.000000000 +0200
@@ -71,7 +71,7 @@
TODO += blog-store-messages.service blogd.8 blogger.8
L := libconsole/
CFLAGS += -I ./ -I ./$(L)
-libfiles := $(wildcard $(L)*.c)
+libfiles := $(sort $(wildcard $(L)*.c))
all: $(TODO)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/showconsole-2.18/libconsole/console.c
new/showconsole-2.19/libconsole/console.c
--- old/showconsole-2.18/libconsole/console.c 2016-04-26 15:04:45.000000000
+0200
+++ new/showconsole-2.19/libconsole/console.c 2018-08-02 09:33:35.000000000
+0200
@@ -27,6 +27,7 @@
#include <sys/socket.h>
#include <sys/stat.h>
#include <sys/types.h>
+#include <sys/sysmacros.h>
#include <sys/vfs.h>
#include <sys/wait.h>
#include <unistd.h>
@@ -531,13 +532,39 @@
return;
}
+static int consinitIO(struct console *newc)
+{
+ int tflags;
+
+ if ((newc->fd = open(newc->tty, O_WRONLY|O_NONBLOCK|O_NOCTTY)) < 0) {
+ if (errno == EACCES)
+ error("can not open %s", newc->tty);
+ warn("can not open %s", newc->tty);
+ return 0;
+ }
+
+ newc->tlock = 0;
+ newc->max_canon = _POSIX_MAX_CANON;
+ memset(&newc->ltio, 0, sizeof(newc->ltio));
+ memset(&newc->otio, 0, sizeof(newc->otio));
+ memset(&newc->ctio, 0, sizeof(newc->ctio));
+ if ((tflags = fcntl(newc->fd, F_GETFL)) < 0)
+ warn("can not get terminal flags of %s", newc->tty);
+
+ tflags &= ~(O_NONBLOCK);
+ tflags |= O_NOCTTY;
+ if (fcntl(newc->fd, F_SETFL, tflags) < 0)
+ warn("can not set terminal flags of %s", newc->tty);
+
+ return 1;
+}
+
/* Allocate a console */
static list_t lcons = { &(lcons), &(lcons) };
static int consalloc(struct console **cons, char *name, const int cflags,
const dev_t dev, int io)
{
struct console *newc;
list_t *head;
- int tflags;
if (!cons)
error("missing console pointer");
@@ -551,6 +578,11 @@
newc->dev = dev;
newc->pid = -1;
+ if (io && !consinitIO(newc)) {
+ free(newc);
+ return 0;
+ }
+
if (!*cons) {
head = &lcons;
*cons = (struct console*)head;
@@ -558,30 +590,6 @@
head = &(*cons)->node;
insert(&newc->node, head);
- if (!io)
- return 0;
-
- if ((newc->fd = open(newc->tty, O_WRONLY|O_NONBLOCK|O_NOCTTY)) < 0) {
- if (errno == EACCES)
- error("can not open %s", newc->tty);
- warn("can not open %s", newc->tty);
- free(newc);
- return 0;
- }
-
- newc->tlock = 0;
- newc->max_canon = _POSIX_MAX_CANON;
- memset(&newc->ltio, 0, sizeof(newc->ltio));
- memset(&newc->otio, 0, sizeof(newc->otio));
- memset(&newc->ctio, 0, sizeof(newc->ctio));
- if ((tflags = fcntl(newc->fd, F_GETFL)) < 0)
- warn("can not get terminal flags of %s", newc->tty);
-
- tflags &= ~(O_NONBLOCK);
- tflags |= O_NOCTTY;
- if (fcntl(newc->fd, F_SETFL, tflags) < 0)
- warn("can not set terminal flags of %s", newc->tty);
-
return 1;
}
@@ -602,6 +610,7 @@
char fbuf[16], dev[64];
char *tty = NULL;
FILE *fc;
+ int items;
if (!cons)
error("error: console pointer empty");
@@ -614,11 +623,16 @@
goto err;
}
- while ((fscanf(fc, "%*s %*s (%[^)]) %[0-9:]", &fbuf[0], &dev[0]) == 2)) {
+ while ((items = fscanf(fc, "%*s %*s (%[^)]) %[0-9:]", &fbuf[0], &dev[0]))
+ != EOF) {
char *tmp;
int flags, n, maj, min;
int ret;
+ /* Ignore consoles without tty binding. */
+ if (items != 2)
+ continue;
+
if (!strchr(fbuf, 'E'))
continue;
@@ -662,8 +676,10 @@
if (!tty)
error("can not allocate string");
- if (consalloc(&c, tty, CON_CONSDEV, makedev(TTYAUX_MAJOR, 1), io))
- *cons = c;
+ if (!consalloc(&c, tty, CON_CONSDEV, makedev(TTYAUX_MAJOR, 1), io))
+ error("/dev/console is not a valid fallback\n");
+
+ *cons = c;
}
/*
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/showconsole-2.18/libconsole/devices.c
new/showconsole-2.19/libconsole/devices.c
--- old/showconsole-2.18/libconsole/devices.c 2016-04-26 15:04:45.000000000
+0200
+++ new/showconsole-2.19/libconsole/devices.c 2018-08-02 09:33:35.000000000
+0200
@@ -16,6 +16,7 @@
#include <stdlib.h>
#include <sys/stat.h>
#include <sys/types.h>
+#include <sys/sysmacros.h>
#include "libconsole.h"
char *charname(const char *str)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/showconsole-2.18/module-setup.sh
new/showconsole-2.19/module-setup.sh
--- old/showconsole-2.18/module-setup.sh 2016-04-26 15:04:45.000000000
+0200
+++ new/showconsole-2.19/module-setup.sh 2018-08-02 09:33:35.000000000
+0200
@@ -25,7 +25,7 @@
test -d "${initdir}${systemdsystemunitdir}/${t}.target.wants" &&
continue
mkdir -p "${initdir}${systemdsystemunitdir}/${t}.target.wants"
done
- for t in systemd-ask-password-plymouth.service
+ for t in systemd-ask-password-blog.service
do
test -d "${initdir}${systemdsystemunitdir}/${t}.wants" && continue
mkdir -p "${initdir}${systemdsystemunitdir}/${t}.wants"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/showconsole-2.18/showconsole.c
new/showconsole-2.19/showconsole.c
--- old/showconsole-2.18/showconsole.c 2016-04-26 15:04:45.000000000 +0200
+++ new/showconsole-2.19/showconsole.c 2018-08-02 09:33:35.000000000 +0200
@@ -10,6 +10,7 @@
*/
#include <sys/types.h> /* Defines the macros major and minor */
+#include <sys/sysmacros.h> /* Defines the macros major and minor */
#include <sys/stat.h>
#include <sys/ioctl.h>
#include <err.h>
