Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[xsrc/xorg]: xsrc/external/mit/xrdb/dist initial import of xrdb-1.2.1
details: https://anonhg.NetBSD.org/xsrc/rev/a87f8a80a540
branches: xorg
changeset: 10777:a87f8a80a540
user: mrg <mrg%NetBSD.org@localhost>
date: Mon Aug 23 21:27:56 2021 +0000
description:
initial import of xrdb-1.2.1
diffstat:
external/mit/xrdb/dist/ChangeLog | 62 ++++++++
external/mit/xrdb/dist/Makefile.in | 71 +++++----
external/mit/xrdb/dist/aclocal.m4 | 215 +++++++++++++---------------
external/mit/xrdb/dist/compile | 13 +-
external/mit/xrdb/dist/config.guess | 8 +-
external/mit/xrdb/dist/config.sub | 4 +-
external/mit/xrdb/dist/configure | 245 +++++++++++++++++---------------
external/mit/xrdb/dist/configure.ac | 2 +-
external/mit/xrdb/dist/depcomp | 10 +-
external/mit/xrdb/dist/install-sh | 47 ++++--
external/mit/xrdb/dist/man/Makefile.in | 14 +-
external/mit/xrdb/dist/man/xrdb.man | 4 +
external/mit/xrdb/dist/missing | 16 +-
external/mit/xrdb/dist/xrdb.c | 31 +++-
14 files changed, 429 insertions(+), 313 deletions(-)
diffs (truncated from 1620 to 300 lines):
diff -r 275c2aef5f9d -r a87f8a80a540 external/mit/xrdb/dist/ChangeLog
--- a/external/mit/xrdb/dist/ChangeLog Mon Aug 23 21:27:55 2021 +0000
+++ b/external/mit/xrdb/dist/ChangeLog Mon Aug 23 21:27:56 2021 +0000
@@ -1,3 +1,65 @@
+commit 9c3a19e3f13252c6ac5b02ce703531b2bf9f7463
+Author: Matthieu Herrb <matthieu.herrb%laas.fr@localhost>
+Date: Mon Aug 9 19:31:28 2021 +0200
+
+ xrdb 1.2.1
+
+ Signed-off-by: Matthieu Herrb <matthieu.herrb%laas.fr@localhost>
+
+commit 4d3c11bee8c81abbc033a4731648a88db14508e1
+Author: Walter Harms <wharms%bfs.de@localhost>
+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 <wharms%bfs.de@localhost>
+
+commit 7d69c7f52b83a9b732325a16603b22e6c2f15d93
+Author: Walter Harms <wharms%bfs.de@localhost>
+Date: Sat Jun 26 23:06:23 2021 +0200
+
+ XFree() can handle NULL arg
+
+ Signed-off-by: Walter Harms <wharms%bfs.de@localhost>
+
+commit 2c57bc85c4cea7a159985a446e1f5f61a4c0f139
+Author: Walter Harms <wharms%bfs.de@localhost>
+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 <rnhm...%inventati.org@localhost>
+ Reviewed-by: Walter Harms <wharms%bfs.de@localhost>
+ Signed-off-by: Walter Harms <wharms%bfs.de@localhost>
+
+commit 9c51a2829f65ea03ef87376ca9561037d9262f6d
+Author: Tobias Stoeckmann <tobias%stoeckmann.org@localhost>
+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 <tobias%stoeckmann.org@localhost>
+
commit c281cadb06657c2a15a52598be6cf9c30fad1b12
Author: Alan Coopersmith <alan.coopersmith%oracle.com@localhost>
Date: Tue Feb 19 15:43:17 2019 -0800
diff -r 275c2aef5f9d -r a87f8a80a540 external/mit/xrdb/dist/Makefile.in
--- a/external/mit/xrdb/dist/Makefile.in Mon Aug 23 21:27:55 2021 +0000
+++ b/external/mit/xrdb/dist/Makefile.in Mon Aug 23 21:27:56 2021 +0000
@@ -1,7 +1,7 @@
-# Makefile.in generated by automake 1.15 from Makefile.am.
+# Makefile.in generated by automake 1.16.1 from Makefile.am.
# @configure_input@
-# Copyright (C) 1994-2014 Free Software Foundation, Inc.
+# Copyright (C) 1994-2018 Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -143,7 +143,8 @@
am__v_at_1 =
DEFAULT_INCLUDES = -I.@am__isrc@
depcomp = $(SHELL) $(top_srcdir)/depcomp
-am__depfiles_maybe = depfiles
+am__maybe_remake_depfiles = depfiles
+am__depfiles_remade = ./$(DEPDIR)/xrdb.Po
am__mv = mv -f
COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
@@ -179,7 +180,7 @@
$(RECURSIVE_CLEAN_TARGETS) \
$(am__extra_recursive_targets)
AM_RECURSIVE_TARGETS = $(am__recursive_targets:-recursive=) TAGS CTAGS \
- cscope distdir dist dist-all distcheck
+ cscope distdir distdir-am dist dist-all distcheck
am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) \
$(LISP)config.h.in
# Read a list of newline-separated strings from the standard input,
@@ -360,6 +361,7 @@
prefix = @prefix@
program_transform_name = @program_transform_name@
psdir = @psdir@
+runstatedir = @runstatedir@
sbindir = @sbindir@
sharedstatedir = @sharedstatedir@
srcdir = @srcdir@
@@ -402,8 +404,8 @@
echo ' $(SHELL) ./config.status'; \
$(SHELL) ./config.status;; \
*) \
- echo ' cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe)'; \
- cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe);; \
+ echo ' cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__maybe_remake_depfiles)'; \
+ cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__maybe_remake_depfiles);; \
esac;
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
@@ -482,7 +484,13 @@
distclean-compile:
-rm -f *.tab.c
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xrdb.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xrdb.Po@am__quote@ # am--include-marker
+
+$(am__depfiles_remade):
+ @$(MKDIR_P) $(@D)
+ @echo '# dummy' >$@-t && $(am__mv) $@-t $@
+
+am--depfiles: $(am__depfiles_remade)
.c.o:
@am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
@@ -604,7 +612,10 @@
-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
-rm -f cscope.out cscope.in.out cscope.po.out cscope.files
-distdir: $(DISTFILES)
+distdir: $(BUILT_SOURCES)
+ $(MAKE) $(AM_MAKEFLAGS) distdir-am
+
+distdir-am: $(DISTFILES)
$(am__remove_distdir)
test -d "$(distdir)" || mkdir "$(distdir)"
@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
@@ -672,7 +683,7 @@
! -type d ! -perm -444 -exec $(install_sh) -c -m a+r {} {} \; \
|| chmod -R a+r "$(distdir)"
dist-gzip: distdir
- tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz
+ tardir=$(distdir) && $(am__tar) | eval GZIP= gzip $(GZIP_ENV) -c >$(distdir).tar.gz
$(am__post_remove_distdir)
dist-bzip2: distdir
tardir=$(distdir) && $(am__tar) | BZIP2=$${BZIP2--9} bzip2 -c >$(distdir).tar.bz2
@@ -697,7 +708,7 @@
@echo WARNING: "Support for shar distribution archives is" \
"deprecated." >&2
@echo WARNING: "It will be removed altogether in Automake 2.0" >&2
- shar $(distdir) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).shar.gz
+ shar $(distdir) | eval GZIP= gzip $(GZIP_ENV) -c >$(distdir).shar.gz
$(am__post_remove_distdir)
dist-zip: distdir
@@ -715,7 +726,7 @@
distcheck: dist
case '$(DIST_ARCHIVES)' in \
*.tar.gz*) \
- GZIP=$(GZIP_ENV) gzip -dc $(distdir).tar.gz | $(am__untar) ;;\
+ eval GZIP= gzip $(GZIP_ENV) -dc $(distdir).tar.gz | $(am__untar) ;;\
*.tar.bz2*) \
bzip2 -dc $(distdir).tar.bz2 | $(am__untar) ;;\
*.tar.lz*) \
@@ -725,7 +736,7 @@
*.tar.Z*) \
uncompress -c $(distdir).tar.Z | $(am__untar) ;;\
*.shar.gz*) \
- GZIP=$(GZIP_ENV) gzip -dc $(distdir).shar.gz | unshar ;;\
+ eval GZIP= gzip $(GZIP_ENV) -dc $(distdir).shar.gz | unshar ;;\
*.zip*) \
unzip $(distdir).zip ;;\
esac
@@ -839,7 +850,7 @@
distclean: distclean-recursive
-rm -f $(am__CONFIG_DISTCLEAN_FILES)
- -rm -rf ./$(DEPDIR)
+ -rm -f ./$(DEPDIR)/xrdb.Po
-rm -f Makefile
distclean-am: clean-am distclean-compile distclean-generic \
distclean-hdr distclean-tags
@@ -887,7 +898,7 @@
maintainer-clean: maintainer-clean-recursive
-rm -f $(am__CONFIG_DISTCLEAN_FILES)
-rm -rf $(top_srcdir)/autom4te.cache
- -rm -rf ./$(DEPDIR)
+ -rm -f ./$(DEPDIR)/xrdb.Po
-rm -f Makefile
maintainer-clean-am: distclean-am maintainer-clean-generic
@@ -908,22 +919,22 @@
.MAKE: $(am__recursive_targets) all install-am install-strip
.PHONY: $(am__recursive_targets) CTAGS GTAGS TAGS all all-am \
- am--refresh check check-am clean clean-binPROGRAMS \
- clean-cscope clean-generic cscope cscopelist-am ctags ctags-am \
- dist dist-all dist-bzip2 dist-gzip dist-hook dist-lzip \
- dist-shar dist-tarZ dist-xz dist-zip distcheck distclean \
- distclean-compile distclean-generic distclean-hdr \
- distclean-tags distcleancheck distdir distuninstallcheck dvi \
- dvi-am html html-am info info-am install install-am \
- install-binPROGRAMS install-data install-data-am install-dvi \
- install-dvi-am install-exec install-exec-am install-html \
- install-html-am install-info install-info-am install-man \
- install-pdf install-pdf-am install-ps install-ps-am \
- install-strip installcheck installcheck-am installdirs \
- installdirs-am maintainer-clean maintainer-clean-generic \
- mostlyclean mostlyclean-compile mostlyclean-generic pdf pdf-am \
- ps ps-am tags tags-am uninstall uninstall-am \
- uninstall-binPROGRAMS
+ am--depfiles am--refresh check check-am clean \
+ clean-binPROGRAMS clean-cscope clean-generic cscope \
+ cscopelist-am ctags ctags-am dist dist-all dist-bzip2 \
+ dist-gzip dist-hook dist-lzip dist-shar dist-tarZ dist-xz \
+ dist-zip distcheck distclean distclean-compile \
+ distclean-generic distclean-hdr distclean-tags distcleancheck \
+ distdir distuninstallcheck dvi dvi-am html html-am info \
+ info-am install install-am install-binPROGRAMS install-data \
+ install-data-am install-dvi install-dvi-am install-exec \
+ install-exec-am install-html install-html-am install-info \
+ install-info-am install-man install-pdf install-pdf-am \
+ install-ps install-ps-am install-strip installcheck \
+ installcheck-am installdirs installdirs-am maintainer-clean \
+ maintainer-clean-generic mostlyclean mostlyclean-compile \
+ mostlyclean-generic pdf pdf-am ps ps-am tags tags-am uninstall \
+ uninstall-am uninstall-binPROGRAMS
.PRECIOUS: Makefile
diff -r 275c2aef5f9d -r a87f8a80a540 external/mit/xrdb/dist/aclocal.m4
--- a/external/mit/xrdb/dist/aclocal.m4 Mon Aug 23 21:27:55 2021 +0000
+++ b/external/mit/xrdb/dist/aclocal.m4 Mon Aug 23 21:27:56 2021 +0000
@@ -1,6 +1,6 @@
-# generated automatically by aclocal 1.15 -*- Autoconf -*-
+# generated automatically by aclocal 1.16.1 -*- Autoconf -*-
-# Copyright (C) 1996-2014 Free Software Foundation, Inc.
+# Copyright (C) 1996-2018 Free Software Foundation, Inc.
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -21,7 +21,7 @@
To do so, use the procedure documented by the package, typically 'autoreconf'.])])
dnl pkg.m4 - Macros to locate and utilise pkg-config. -*- Autoconf -*-
-dnl serial 11 (pkg-config-0.29)
+dnl serial 11 (pkg-config-0.29.1)
dnl
dnl Copyright © 2004 Scott James Remnant <scott%netsplit.com@localhost>.
dnl Copyright © 2012-2015 Dan Nicholson <dbn.lists%gmail.com@localhost>
@@ -63,7 +63,7 @@
dnl See the "Since" comment for each macro you use to see what version
dnl of the macros you require.
m4_defun([PKG_PREREQ],
-[m4_define([PKG_MACROS_VERSION], [0.29])
+[m4_define([PKG_MACROS_VERSION], [0.29.1])
m4_if(m4_version_compare(PKG_MACROS_VERSION, [$1]), -1,
[m4_fatal([pkg.m4 version $1 or higher is required but ]PKG_MACROS_VERSION[ found])])
])dnl PKG_PREREQ
@@ -298,7 +298,7 @@
dnl xorg-macros.m4. Generated from xorg-macros.m4.in xorgversion.m4 by configure.
dnl
-dnl Copyright (c) 2005, 2015, Oracle and/or its affiliates. All rights reserved.
+dnl Copyright (c) 2005, 2006, Oracle and/or its affiliates. All rights reserved.
dnl
dnl Permission is hereby granted, free of charge, to any person obtaining a
dnl copy of this software and associated documentation files (the "Software"),
@@ -428,9 +428,8 @@
if test x$FILE_MAN_SUFFIX = x ; then
case $host_os in
- # Solaris 2.0 - 11 use SysV man page sections
- solaris2.?|solaris2.1[[01]]) FILE_MAN_SUFFIX=4 ;;
- *) FILE_MAN_SUFFIX=5 ;;
+ solaris*) FILE_MAN_SUFFIX=4 ;;
+ *) FILE_MAN_SUFFIX=5 ;;
esac
fi
if test x$FILE_MAN_DIR = x ; then
@@ -439,9 +438,8 @@
if test x$MISC_MAN_SUFFIX = x ; then
case $host_os in
- # Solaris 2.0 - 11 use SysV man page sections
- solaris2.?|solaris2.1[[01]]) MISC_MAN_SUFFIX=5 ;;
- *) MISC_MAN_SUFFIX=7 ;;
+ solaris*) MISC_MAN_SUFFIX=5 ;;
+ *) MISC_MAN_SUFFIX=7 ;;
Home |
Main Index |
Thread Index |
Old Index