[xsrc/trunk]: xsrc/external/mit/xmodmap/dist initial import of xmodmap-1.0.11

To: source-changes-hg%NetBSD.org@localhost
Subject: [xsrc/trunk]: xsrc/external/mit/xmodmap/dist initial import of xmodmap-1.0.11
From: mrg <mrg%NetBSD.org@localhost>
Date: Mon, 11 Jul 2022 09:18:41 +0000
details:   https://anonhg.NetBSD.org/xsrc/rev/dc218dc314f1
branches:  trunk
changeset: 7024:dc218dc314f1
user:      mrg <mrg%NetBSD.org@localhost>
date:      Mon Jul 11 08:48:05 2022 +0000

description:
initial import of xmodmap-1.0.11

diffstat:

 external/mit/xmodmap/dist/ChangeLog       |   103 +-
 external/mit/xmodmap/dist/Makefile.in     |   116 +-
 external/mit/xmodmap/dist/aclocal.m4      |  2313 ++++----
 external/mit/xmodmap/dist/compile         |    17 +-
 external/mit/xmodmap/dist/config.guess    |  1488 +++--
 external/mit/xmodmap/dist/config.h.in     |    98 +-
 external/mit/xmodmap/dist/config.sub      |  2885 +++++----
 external/mit/xmodmap/dist/configure       |  8181 +++++++++++++++-------------
 external/mit/xmodmap/dist/configure.ac    |     4 +-
 external/mit/xmodmap/dist/depcomp         |    10 +-
 external/mit/xmodmap/dist/exec.c          |    27 +-
 external/mit/xmodmap/dist/install-sh      |   172 +-
 external/mit/xmodmap/dist/man/Makefile.in |    19 +-
 external/mit/xmodmap/dist/missing         |    16 +-
 14 files changed, 8261 insertions(+), 7188 deletions(-)

diffs (truncated from 21569 to 300 lines):

diff -r 7501d15919df -r dc218dc314f1 external/mit/xmodmap/dist/ChangeLog
--- a/external/mit/xmodmap/dist/ChangeLog       Mon Jul 11 08:48:03 2022 +0000
+++ b/external/mit/xmodmap/dist/ChangeLog       Mon Jul 11 08:48:05 2022 +0000
@@ -1,3 +1,98 @@
+commit 5579ae02a6b44f3072955f3e2f3249d2bd1201e4
+Author: Alan Coopersmith <alan.coopersmith%oracle.com@localhost>
+Date:   Sun Jul 10 15:49:43 2022 -0700
+
+    xmodmap 1.0.11
+    
+    Signed-off-by: Alan Coopersmith <alan.coopersmith%oracle.com@localhost>
+
+commit 34df50af33d38621ce5d5a5510c7a4e70e1c17c1
+Author: Alan Coopersmith <alan.coopersmith%oracle.com@localhost>
+Date:   Sun Apr 17 10:34:10 2022 -0700
+
+    PrintModifierMapping: stop leaking the map returned by XGetKeyboardMapping
+    
+    Resolves issue reported by Oracle Parfait static analyzer:
+    
+    Error: Memory leak
+       Memory leak [memory-leak] (CWE 401):
+          Memory leak of pointer pointer allocated with XGetKeyboardMapping(...)
+            at line 251 of app/xmodmap/exec.c in function 'PrintModifierMapping'.
+              pointer allocated at line 222 with XGetKeyboardMapping(...)
+    
+    Signed-off-by: Alan Coopersmith <alan.coopersmith%oracle.com@localhost>
+
+commit 10eecbe868b5c898ea9cd05d014fbf13c29c3a26
+Author: Alan Coopersmith <alan.coopersmith%oracle.com@localhost>
+Date:   Sun Apr 17 10:19:58 2022 -0700
+
+    handle.c: avoid leaks when realloc() fails
+    
+    Resolves issues reported by Oracle Parfait static analyzer:
+    
+    Error: Memory leak
+       Memory leak [memory-leak] (CWE 401):
+          Memory leak of pointer kclist allocated with malloc((n * 1))
+            at line 698 of app/xmodmap/handle.c in function 'do_remove'.
+              kclist allocated at line 662 with malloc((n * 1))
+              kclist leaks when num_kcs != 0 at line 676
+                  and (j + 1) >= num_kcs at line 687
+                  and (nc + num_kcs) > tot at line 691
+                  and (num_kcs - 1) < 0 at line 701.
+       Memory leak [memory-leak] (CWE 401):
+          Memory leak of pointer kclist allocated with malloc((n * 1))
+            at line 711 of app/xmodmap/handle.c in function 'do_remove'.
+              kclist allocated at line 662 with malloc((n * 1))
+              kclist leaks when (i + 1) >= n at line 672.
+    Error: Memory leak
+       Memory leak [memory-leak] (CWE 401):
+          Memory leak of pointer kclist allocated with realloc(kclist, (tot * 1))
+            at line 711 of app/xmodmap/handle.c in function 'do_remove'.
+              kclist allocated at line 693 with realloc(kclist, (tot * 1))
+              kclist leaks when (num_kcs - 1) < 0 at line 701
+                  and (i + 1) >= n at line 672.
+    
+    Signed-off-by: Alan Coopersmith <alan.coopersmith%oracle.com@localhost>
+
+commit d14cb47d9e9a10d04b1a7de9d2799fef9b0436e0
+Author: Alan Coopersmith <alan.coopersmith%oracle.com@localhost>
+Date:   Tue Dec 7 12:36:29 2021 -0800
+
+    Build xz tarballs instead of bzip2
+    
+    Signed-off-by: Alan Coopersmith <alan.coopersmith%oracle.com@localhost>
+
+commit 90e2004549d79093ef7e1c17f99e64331c3e6661
+Author: Alan Coopersmith <alan.coopersmith%oracle.com@localhost>
+Date:   Tue Dec 7 12:36:27 2021 -0800
+
+    gitlab CI: add a basic build test
+    
+    Signed-off-by: Alan Coopersmith <alan.coopersmith%oracle.com@localhost>
+
+commit fa9c38e6e7f1caa12d38f35c5633735bcaef3ba1
+Author: Karl Fogel <kfogel%red-bean.com@localhost>
+Date:   Sat Mar 16 21:29:04 2019 -0500
+
+    Fix warning about number of mouse buttons
+    
+    Change a warning to distinguish between too few buttons and too many.
+    
+    Before this change:
+    
+        $ xmodmap -e "pointer = 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15"
+        Warning: Only changing the first 15 of 10 buttons.
+        $
+    
+    After this change:
+    
+        $ xmodmap -e "pointer = 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15"
+        Warning: Not changing 5 extra buttons beyond 10.
+        $
+    
+    Fixes: https://gitlab.freedesktop.org/xorg/app/xmodmap/issues/2
+    Signed-off-by: Karl Fogel <kfogel%red-bean.com@localhost>
+
 commit c5a5fb06fd25c044f343f4571c645fd6c954d038
 Author: Alan Coopersmith <alan.coopersmith%oracle.com@localhost>
 Date:   Tue Feb 19 15:33:29 2019 -0800
@@ -193,7 +288,7 @@
     Signed-off-by: Alan Coopersmith <alan.coopersmith%oracle.com@localhost>
 
 commit bf4620e2d78d2a4766948f136f2372a596ac275d
-Author: Stéphane Aulery <lkppo%free.fr@localhost>
+Author: Stéphane Aulery  <lkppo%free.fr@localhost>
 Date:   Sun Jun 30 01:50:58 2013 +0200
 
     error in manpage example about swapping Control_L/Caps_Lock keys
@@ -762,7 +857,7 @@
     Use sed to fill in variables in man page
 
 commit c4483b314106bcd2bb13e49650cfd279f74da73e
-Author: Kristian Høgsberg <krh%redhat.com@localhost>
+Author: Kristian Høgsberg  <krh%redhat.com@localhost>
 Date:   Wed Sep 28 19:28:15 2005 +0000
 
     Copy bits from COPYING here.
@@ -790,7 +885,7 @@
     Add build system for xmodmap Add xmodmap to build script
 
 commit 9145de293109ba96fc8b97ac59c16c51b992f416
-Author: Kristian Høgsberg <krh%redhat.com@localhost>
+Author: Kristian Høgsberg  <krh%redhat.com@localhost>
 Date:   Thu Nov 11 15:37:01 2004 +0000
 
     Fix #1818
@@ -814,7 +909,7 @@
         4637857 - fix by Sam Lau)
 
 commit ce64b2b312a73b9a4f266da8810ab552af4fbb1e
-Author: Søren Sandmann Pedersen <sandmann%daimi.au.dk@localhost>
+Author: Søren Sandmann Pedersen  <sandmann%daimi.au.dk@localhost>
 Date:   Fri Oct 15 00:44:08 2004 +0000
 
     Thu Oct 14 20:43:03 2004 Søren Sandmann <sandmann%redhat.com@localhost>
diff -r 7501d15919df -r dc218dc314f1 external/mit/xmodmap/dist/Makefile.in
--- a/external/mit/xmodmap/dist/Makefile.in     Mon Jul 11 08:48:03 2022 +0000
+++ b/external/mit/xmodmap/dist/Makefile.in     Mon Jul 11 08:48:05 2022 +0000
@@ -1,7 +1,7 @@
-# Makefile.in generated by automake 1.15 from Makefile.am.
+# Makefile.in generated by automake 1.16.5 from Makefile.am.
 # @configure_input@
 
-# Copyright (C) 1994-2014 Free Software Foundation, Inc.
+# Copyright (C) 1994-2021 Free Software Foundation, Inc.
 
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -144,7 +144,9 @@
 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)/exec.Po ./$(DEPDIR)/handle.Po \
+       ./$(DEPDIR)/pf.Po ./$(DEPDIR)/xmodmap.Po
 am__mv = mv -f
 COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
        $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
@@ -180,9 +182,9 @@
   $(RECURSIVE_CLEAN_TARGETS) \
   $(am__extra_recursive_targets)
 AM_RECURSIVE_TARGETS = $(am__recursive_targets:-recursive=) TAGS CTAGS \
-       cscope distdir dist dist-all distcheck
-am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) \
-       $(LISP)config.h.in
+       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,
 # and print each of them once, without duplicates.  Input order is
 # *not* preserved.
@@ -199,13 +201,10 @@
   unique=`for i in $$list; do \
     if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
   done | $(am__uniquify_input)`
-ETAGS = etags
-CTAGS = ctags
-CSCOPE = cscope
 DIST_SUBDIRS = $(SUBDIRS)
 am__DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/config.h.in AUTHORS \
-       COPYING ChangeLog INSTALL compile config.guess config.sub \
-       depcomp install-sh missing
+       COPYING ChangeLog INSTALL README.md compile config.guess \
+       config.sub depcomp install-sh missing
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 distdir = $(PACKAGE)-$(VERSION)
 top_distdir = $(distdir)
@@ -241,9 +240,11 @@
     dir1=`echo "$$dir1" | sed -e "$$sed_rest"`; \
   done; \
   reldir="$$dir2"
-DIST_ARCHIVES = $(distdir).tar.gz $(distdir).tar.bz2
+DIST_ARCHIVES = $(distdir).tar.gz $(distdir).tar.xz
 GZIP_ENV = --best
-DIST_TARGETS = dist-bzip2 dist-gzip
+DIST_TARGETS = dist-xz dist-gzip
+# Exists only to be overridden by the user if desired.
+AM_DISTCHECK_DVI_TARGET = dvi
 distuninstallcheck_listfiles = find . -type f -print
 am__distuninstallcheck_listfiles = $(distuninstallcheck_listfiles) \
   | sed 's|^\./|$(prefix)/|' | grep -v '$(infodir)/dir$$'
@@ -264,8 +265,9 @@
 CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
 CHANGELOG_CMD = @CHANGELOG_CMD@
-CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
+CSCOPE = @CSCOPE@
+CTAGS = @CTAGS@
 CWARNFLAGS = @CWARNFLAGS@
 CYGPATH_W = @CYGPATH_W@
 DEFS = @DEFS@
@@ -275,11 +277,10 @@
 ECHO_C = @ECHO_C@
 ECHO_N = @ECHO_N@
 ECHO_T = @ECHO_T@
-EGREP = @EGREP@
+ETAGS = @ETAGS@
 EXEEXT = @EXEEXT@
 FILE_MAN_DIR = @FILE_MAN_DIR@
 FILE_MAN_SUFFIX = @FILE_MAN_SUFFIX@
-GREP = @GREP@
 INSTALL = @INSTALL@
 INSTALL_CMD = @INSTALL_CMD@
 INSTALL_DATA = @INSTALL_DATA@
@@ -362,6 +363,7 @@
 prefix = @prefix@
 program_transform_name = @program_transform_name@
 psdir = @psdir@
+runstatedir = @runstatedir@
 sbindir = @sbindir@
 sharedstatedir = @sharedstatedir@
 srcdir = @srcdir@
@@ -416,8 +418,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)
@@ -496,10 +498,16 @@
 distclean-compile:
        -rm -f *.tab.c
 
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/exec.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/handle.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pf.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xmodmap.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/exec.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/handle.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pf.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xmodmap.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 $@ $<
@@ -620,8 +628,10 @@
 distclean-tags:
        -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
        -rm -f cscope.out cscope.in.out cscope.po.out cscope.files
+distdir: $(BUILT_SOURCES)
+       $(MAKE) $(AM_MAKEFLAGS) distdir-am
 
-distdir: $(DISTFILES)
+distdir-am: $(DISTFILES)
        $(am__remove_distdir)
        test -d "$(distdir)" || mkdir "$(distdir)"
        @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
@@ -689,8 +699,9 @@
          ! -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
        $(am__post_remove_distdir)
@@ -698,11 +709,14 @@
 dist-lzip: distdir
        tardir=$(distdir) && $(am__tar) | lzip -c $${LZIP_OPT--9} >$(distdir).tar.lz
        $(am__post_remove_distdir)
-
 dist-xz: distdir
        tardir=$(distdir) && $(am__tar) | XZ_OPT=$${XZ_OPT--e} xz -c >$(distdir).tar.xz
        $(am__post_remove_distdir)
Prev by Date: [xsrc/trunk]: xsrc/external/mit/xwud/dist initial import of xwud-1.0.6
Next by Date: [xsrc/trunk]: xsrc/external/mit merge xcmsdb 1.0.6, xconsole 1.0.8, xmodmap 1...
Previous by Thread: [xsrc/trunk]: xsrc/external/mit/xwud/dist initial import of xwud-1.0.6
Next by Thread: [xsrc/trunk]: xsrc/external/mit merge xcmsdb 1.0.6, xconsole 1.0.8, xmodmap 1...
Indexes:
Home | Main Index | Thread Index | Old Index