Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package xrdb for openSUSE:Factory checked in at 2021-09-03 21:25:40 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/xrdb (Old) and /work/SRC/openSUSE:Factory/.xrdb.new.1899 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "xrdb" Fri Sep 3 21:25:40 2021 rev:10 rq:914784 version:1.2.1 Changes: -------- --- /work/SRC/openSUSE:Factory/xrdb/xrdb.changes 2021-05-05 20:39:22.419077785 +0200 +++ /work/SRC/openSUSE:Factory/.xrdb.new.1899/xrdb.changes 2021-09-03 21:26:06.778173069 +0200 @@ -1,0 +2,6 @@ +Sat Aug 28 13:32:16 UTC 2021 - Stefan Dirsch <[email protected]> + +- Update to version 1.2.1 + * bugfix release + +------------------------------------------------------------------- Old: ---- xrdb-1.2.0.tar.bz2 New: ---- xrdb-1.2.1.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ xrdb.spec ++++++ --- /var/tmp/diff_new_pack.Kw1l49/_old 2021-09-03 21:26:07.162173469 +0200 +++ /var/tmp/diff_new_pack.Kw1l49/_new 2021-09-03 21:26:07.162173469 +0200 @@ -17,7 +17,7 @@ Name: xrdb -Version: 1.2.0 +Version: 1.2.1 Release: 0 Summary: X server resource database utility License: MIT ++++++ xrdb-1.2.0.tar.bz2 -> xrdb-1.2.1.tar.bz2 ++++++ ++++ 1620 lines of diff (skipped) ++++ retrying with extended exclude list diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xrdb-1.2.0/ChangeLog new/xrdb-1.2.1/ChangeLog --- old/xrdb-1.2.0/ChangeLog 2019-02-20 00:44:57.000000000 +0100 +++ new/xrdb-1.2.1/ChangeLog 2021-08-09 19:34:24.000000000 +0200 @@ -1,3 +1,65 @@ +commit 9c3a19e3f13252c6ac5b02ce703531b2bf9f7463 +Author: Matthieu Herrb <[email protected]> +Date: Mon Aug 9 19:31:28 2021 +0200 + + xrdb 1.2.1 + + Signed-off-by: Matthieu Herrb <[email protected]> + +commit 4d3c11bee8c81abbc033a4731648a88db14508e1 +Author: Walter Harms <[email protected]> +Date: Sat Jun 26 23:11:25 2021 +0200 + + fix assignment discards ???const??? qualifier + + xrdb.c: In function ???main???: + xrdb.c:1071:52: warning: assignment discards ???const??? qualifier from pointer target type [-Wdiscarded-qualifiers] + cmd_defines[num_cmd_defines++] = "-undef"; + + Signed-off-by: Walter Harms <[email protected]> + +commit 7d69c7f52b83a9b732325a16603b22e6c2f15d93 +Author: Walter Harms <[email protected]> +Date: Sat Jun 26 23:06:23 2021 +0200 + + XFree() can handle NULL arg + + Signed-off-by: Walter Harms <[email protected]> + +commit 2c57bc85c4cea7a159985a446e1f5f61a4c0f139 +Author: Walter Harms <[email protected]> +Date: Sat Jun 26 22:55:46 2021 +0200 + + Add actual querying capabilities + + The world is littered with broken grep commands because `xrdb -query` + can only dump the database and doesn't implement this simple search + feature. This patch adds a new `-get` option to search and print the + content of a single property by name. + + Signed-off-by: Michele Guerini Rocco <[email protected]> + Reviewed-by: Walter Harms <[email protected]> + Signed-off-by: Walter Harms <[email protected]> + +commit 9c51a2829f65ea03ef87376ca9561037d9262f6d +Author: Tobias Stoeckmann <[email protected]> +Date: Sun Jun 7 19:56:43 2020 +0200 + + Fix out of boundary read. + + If a binary file which starts with 0x00 is edited, xrdb performs + an off-by-one read outside of its buffer. + + The fix is simple: Do not try to append an empty string to buffer, + which would be a no-op anyway. + + Proof of Concept (compile with -fsanitize=address): + + $ dd if=/dev/zero bs=1 count=1 of=poc.txt + $ xrdb -edit poc.txt + + Signed-off-by: Tobias Stoeckmann <[email protected]> + commit c281cadb06657c2a15a52598be6cf9c30fad1b12 Author: Alan Coopersmith <[email protected]> Date: Tue Feb 19 15:43:17 2019 -0800 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xrdb-1.2.0/compile new/xrdb-1.2.1/compile --- old/xrdb-1.2.0/compile 2019-02-20 00:44:51.000000000 +0100 +++ new/xrdb-1.2.1/compile 2021-08-09 19:34:08.000000000 +0200 @@ -1,9 +1,9 @@ #! /bin/sh # Wrapper for compilers which do not understand '-c -o'. -scriptversion=2012-10-14.11; # UTC +scriptversion=2018-03-07.03; # UTC -# Copyright (C) 1999-2014 Free Software Foundation, Inc. +# Copyright (C) 1999-2018 Free Software Foundation, Inc. # Written by Tom Tromey <[email protected]>. # # This program is free software; you can redistribute it and/or modify @@ -17,7 +17,7 @@ # GNU General Public License for more details. # # You should have received a copy of the GNU General Public License -# along with this program. If not, see <http://www.gnu.org/licenses/>. +# along with this program. If not, see <https://www.gnu.org/licenses/>. # As a special exception to the GNU General Public License, if you # distribute this file as part of a program that contains a @@ -255,7 +255,8 @@ echo "compile $scriptversion" exit $? ;; - cl | *[/\\]cl | cl.exe | *[/\\]cl.exe ) + cl | *[/\\]cl | cl.exe | *[/\\]cl.exe | \ + icl | *[/\\]icl | icl.exe | *[/\\]icl.exe ) func_cl_wrapper "$@" # Doesn't return... ;; esac @@ -339,9 +340,9 @@ # Local Variables: # mode: shell-script # sh-indentation: 2 -# eval: (add-hook 'write-file-hooks 'time-stamp) +# eval: (add-hook 'before-save-hook 'time-stamp) # time-stamp-start: "scriptversion=" # time-stamp-format: "%:y-%02m-%02d.%02H" -# time-stamp-time-zone: "UTC" +# time-stamp-time-zone: "UTC0" # time-stamp-end: "; # UTC" # End: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xrdb-1.2.0/configure.ac new/xrdb-1.2.1/configure.ac --- old/xrdb-1.2.0/configure.ac 2019-02-20 00:44:47.000000000 +0100 +++ new/xrdb-1.2.1/configure.ac 2021-08-09 19:34:05.000000000 +0200 @@ -22,7 +22,7 @@ # Initialize Autoconf AC_PREREQ([2.60]) -AC_INIT([xrdb], [1.2.0], +AC_INIT([xrdb], [1.2.1], [https://gitlab.freedesktop.org/xorg/app/xrdb/issues], [xrdb]) AC_CONFIG_SRCDIR([Makefile.am]) AC_CONFIG_HEADERS([config.h]) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xrdb-1.2.0/man/xrdb.man new/xrdb-1.2.1/man/xrdb.man --- old/xrdb-1.2.0/man/xrdb.man 2019-02-20 00:44:47.000000000 +0100 +++ new/xrdb-1.2.1/man/xrdb.man 2021-08-09 19:34:05.000000000 +0200 @@ -251,6 +251,10 @@ option can be used to merge the contents of properties back into the input resource file without damaging preprocessor commands. .TP 8 +.B \-get \fIname\fP +This option indicates that the current content of the property matching +\fIname\fP should be printed onto the standard output. +.TP 8 .B \-load This option indicates that the input should be loaded as the new value of the specified properties, replacing whatever was there (i.e. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xrdb-1.2.0/missing new/xrdb-1.2.1/missing --- old/xrdb-1.2.0/missing 2019-02-20 00:44:51.000000000 +0100 +++ new/xrdb-1.2.1/missing 2021-08-09 19:34:08.000000000 +0200 @@ -1,9 +1,9 @@ #! /bin/sh # Common wrapper for a few potentially missing GNU programs. -scriptversion=2013-10-28.13; # UTC +scriptversion=2018-03-07.03; # UTC -# Copyright (C) 1996-2014 Free Software Foundation, Inc. +# Copyright (C) 1996-2018 Free Software Foundation, Inc. # Originally written by Fran,cois Pinard <[email protected]>, 1996. # This program is free software; you can redistribute it and/or modify @@ -17,7 +17,7 @@ # GNU General Public License for more details. # You should have received a copy of the GNU General Public License -# along with this program. If not, see <http://www.gnu.org/licenses/>. +# along with this program. If not, see <https://www.gnu.org/licenses/>. # As a special exception to the GNU General Public License, if you # distribute this file as part of a program that contains a @@ -101,9 +101,9 @@ exit $st fi -perl_URL=http://www.perl.org/ -flex_URL=http://flex.sourceforge.net/ -gnu_software_URL=http://www.gnu.org/software +perl_URL=https://www.perl.org/ +flex_URL=https://github.com/westes/flex +gnu_software_URL=https://www.gnu.org/software program_details () { @@ -207,9 +207,9 @@ exit $st # Local variables: -# eval: (add-hook 'write-file-hooks 'time-stamp) +# eval: (add-hook 'before-save-hook 'time-stamp) # time-stamp-start: "scriptversion=" # time-stamp-format: "%:y-%02m-%02d.%02H" -# time-stamp-time-zone: "UTC" +# time-stamp-time-zone: "UTC0" # time-stamp-end: "; # UTC" # End: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xrdb-1.2.0/xrdb.c new/xrdb-1.2.1/xrdb.c --- old/xrdb-1.2.0/xrdb.c 2019-02-20 00:44:47.000000000 +0100 +++ new/xrdb-1.2.1/xrdb.c 2021-08-09 19:34:05.000000000 +0200 @@ -48,6 +48,7 @@ #include <X11/Xatom.h> #include <X11/Xos.h> #include <X11/Xmu/SysUtil.h> +#include <X11/Xresource.h> #include <stdio.h> #include <ctype.h> #include <errno.h> @@ -84,6 +85,7 @@ #define OPLOAD 4 #define OPMERGE 5 #define OPOVERRIDE 6 +#define OPGET 7 #define BACKUP_SUFFIX ".bak" /* for editing */ @@ -126,6 +128,7 @@ static const char *cpp_program = NULL; static const char * const cpp_locations[] = { CPP }; static const char *backup_suffix = BACKUP_SUFFIX; +static const char *resource_name = NULL; static Bool dont_execute = False; static Bool show_cpp = False; static String defines; @@ -745,6 +748,8 @@ buff[0] = '\0'; if (!fgets(buff, BUFSIZ, in)) goto cleanup; + if (buff[0] == '\0') + continue; AppendToBuffer(&b, buff, strlen(buff)); c = &b.buff[b.used - 1]; if ((*(c--) == '\n') && (b.used == 1 || *c != '\\')) @@ -784,6 +789,7 @@ " -nocpp do not use a preprocessor\n" " -E show preprocessor command & processed input file\n" " -query query resources\n" + " -get name get the content of a resource\n" " -load load resources from file [default]\n" " -override add in resources from file\n" " -merge merge resources from file & sort\n" @@ -982,6 +988,13 @@ oper = OPQUERY; continue; } + else if (isabbreviation("-get", arg, 2)) { + oper = OPGET; + if (++i >= argc) + Syntax("-get requires an argument"); + resource_name = argv[i]; + continue; + } else if (isabbreviation("-load", arg, 2)) { oper = OPLOAD; continue; @@ -1055,7 +1068,7 @@ } else if (!strcmp("-undef", arg)) { if (num_cmd_defines < MAX_CMD_DEFINES) { - cmd_defines[num_cmd_defines++] = "-undef"; + cmd_defines[num_cmd_defines++] = (char *) "-undef"; } else { fatal("%s: Too many cpp arguments\n", ProgramName); @@ -1282,7 +1295,19 @@ } else if (oper == OPQUERY) { if (xdefs) - printf("%s", xdefs); /* fputs broken in SunOS 4.0 */ + fputs(xdefs, stdout); + } + else if (oper == OPGET) { + if (xdefs && resource_name != NULL) { + char *type = NULL; + XrmValue value; + XrmDatabase xrdb = XrmGetStringDatabase(xdefs); + Bool found = XrmGetResource(xrdb, resource_name, + resource_name, &type, &value); + if (found == True && value.addr != NULL) + printf("%s\n", value.addr); + XrmDestroyDatabase(xrdb); + } } else if (oper == OPREMOVE) { if (xdefs) @@ -1454,7 +1479,7 @@ } if (execute) FreeEntries(&newDB); - if (doScreen && xdefs) + if (doScreen) XFree(xdefs); }
