Upgrade smproxy to version 1.0.7 · jcs.org/openbsd-xenocara@ae7cfb4

+149 -1

app/smproxy/ChangeLog

··· 1 + commit 36db00ecdce06709d7590f338eda7e2e7d96839a 2 + Author: Alan Coopersmith <alan.coopersmith@oracle.com> 3 + Date: Sat Oct 15 09:40:43 2022 -0700 4 + 5 + smproxy 1.0.7 6 + 7 + Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com> 8 + 9 + commit f92f80fbb8926d980a6a46c488f7f60a35c9bf9c 10 + Author: Alan Coopersmith <alan.coopersmith@oracle.com> 11 + Date: Sun Aug 14 10:41:39 2022 -0700 12 + 13 + CheckFullyQuantifiedName: improve gethostname() handling 14 + 15 + Handle errors and use HOST_NAME_MAX for the buffer size if it is 16 + defined by <limits.h> 17 + 18 + Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com> 19 + 20 + commit 5bf2e626a25f0ac1503effbf89c01573392ea658 21 + Author: Alan Coopersmith <alan.coopersmith@oracle.com> 22 + Date: Sun Aug 14 10:15:06 2022 -0700 23 + 24 + CheckFullyQuantifiedName: return unqualified name if alloc fails 25 + 26 + Makes a failure to allocate by asprintf() match other failure 27 + cases and return the unqualified name instead of NULL. 28 + 29 + Fixes gcc warning: 30 + smproxy.c: In function ‘FinishSaveYourself’: 31 + smproxy.c:269:31: warning: ‘%s’ directive argument is null [-Wformat-truncation=] 32 + "rstart-rsh/%s", fullyQuantifiedName); 33 + ^~ 34 + 35 + Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com> 36 + 37 + commit 88262a274bdd850e14cc27dd3d421182bbc157d5 38 + Author: Alan Coopersmith <alan.coopersmith@oracle.com> 39 + Date: Sun Aug 14 10:10:23 2022 -0700 40 + 41 + Use calloc instead of malloc to allocate arrays 42 + 43 + Most important in ReadProxyFileEntry, if we goto give_up before we 44 + finish initializing the array, makes sure we don't try to free 45 + uninitialized pointers during cleanup pass. 46 + 47 + Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com> 48 + 49 + commit 0c55e2eabe6755b88de9835da8185a52b7712847 50 + Author: Alan Coopersmith <alan.coopersmith@oracle.com> 51 + Date: Sun Aug 14 10:04:12 2022 -0700 52 + 53 + Remove or correct obsolete casts 54 + 55 + Bring code up to C89 levels 56 + 57 + Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com> 58 + 59 + commit 5fdd590f9b9a9f5aa3a60e44fe8f010c43f8c54e 60 + Author: Alan Coopersmith <alan.coopersmith@oracle.com> 61 + Date: Sun Aug 14 09:49:22 2022 -0700 62 + 63 + NullIceErrorHandler: make arg names match between definition & declaration 64 + 65 + Solves cppcheck warning: 66 + [smproxy.c:73] -> [smproxy.c:448]: (style, inconclusive) 67 + Function 'NullIceErrorHandler' argument 3 names different: 68 + declaration 'offendingMinorOpCode' definition 'offendingMinorOpcode'. 69 + 70 + Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com> 71 + 72 + commit f4800d0cfbadf9fc50dddbe2b1eb8d62548d7fe5 73 + Author: Alan Coopersmith <alan.coopersmith@oracle.com> 74 + Date: Sun Aug 14 09:47:41 2022 -0700 75 + 76 + Reduce variable scopes as suggested by cppcheck 77 + 78 + [save.c:203]: (style) The scope of the variable 'i' can be reduced. 79 + [save.c:457]: (style) The scope of the variable 'i' can be reduced. 80 + [smproxy.c:101]: (style) The scope of the variable 'i' can be reduced. 81 + [smproxy.c:1114]: (style) The scope of the variable 'client_window' can be reduced. 82 + 83 + Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com> 84 + 85 + commit 8f72bea9644450a3492349236a2d57610c7c78bc 86 + Author: Alan Coopersmith <alan.coopersmith@oracle.com> 87 + Date: Sat Dec 4 10:05:43 2021 -0800 88 + 89 + Build xz tarballs instead of bzip2 90 + 91 + Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com> 92 + 93 + commit ef7d5344e9d96f4a6632f5a6f353ee809bef1001 94 + Author: Alan Coopersmith <alan.coopersmith@oracle.com> 95 + Date: Sat Dec 4 10:05:39 2021 -0800 96 + 97 + gitlab CI: add a basic build test 98 + 99 + Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com> 100 + 101 + commit 2c60568de14fb3953b3cfe42ee32352298572fd8 102 + Author: Alan Coopersmith <alan.coopersmith@oracle.com> 103 + Date: Wed Nov 21 16:57:31 2018 -0800 104 + 105 + Update configure.ac bug URL for gitlab migration 106 + 107 + Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com> 108 + 109 + commit b9c0047416eff09519bfe6a8088817c270f91d0a 110 + Author: Alan Coopersmith <alan.coopersmith@oracle.com> 111 + Date: Fri Nov 16 20:49:33 2018 -0800 112 + 113 + Update README for gitlab migration 114 + 115 + Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com> 116 + 117 + commit 94d925a449d5ea22c14ed0261389787a76c026ef 118 + Author: Mihail Konev <k.mvc@ya.ru> 119 + Date: Thu Jan 26 14:00:20 2017 +1000 120 + 121 + autogen: add default patch prefix 122 + 123 + Signed-off-by: Mihail Konev <k.mvc@ya.ru> 124 + 125 + commit d914bd6488ba53f648df442af9e182236cf63983 126 + Author: Emil Velikov <emil.l.velikov@gmail.com> 127 + Date: Mon Mar 9 12:00:52 2015 +0000 128 + 129 + autogen.sh: use quoted string variables 130 + 131 + Place quotes around the $srcdir, $ORIGDIR and $0 variables to prevent 132 + fall-outs, when they contain space. 133 + 134 + Signed-off-by: Emil Velikov <emil.l.velikov@gmail.com> 135 + Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net> 136 + Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net> 137 + 138 + commit eb3eabf9d910270026a2705afca1a8ceb385ea3f 139 + Author: Peter Hutterer <peter.hutterer@who-t.net> 140 + Date: Tue Jan 24 10:32:07 2017 +1000 141 + 142 + autogen.sh: use exec instead of waiting for configure to finish 143 + 144 + Syncs the invocation of configure with the one from the server. 145 + 146 + Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net> 147 + Reviewed-by: Emil Velikov <emil.velikov@collabora.com> 148 + 1 149 commit 31b7fe5cc4e3f39f7265800a78a397935163990b 2 150 Author: Alan Coopersmith <alan.coopersmith@oracle.com> 3 151 Date: Thu Apr 16 22:32:22 2015 -0700 ··· 491 639 against tempfile race conditions in many places) 492 640 493 641 commit 05ef9ba24d0b1b5c17e04036d03770a44efd6b78 494 - Author: Søren Sandmann Pedersen <sandmann@daimi.au.dk> 642 + Author: Søren Sandmann Pedersen <sandmann@daimi.au.dk> 495 643 Date: Wed Jul 6 17:25:57 2005 +0000 496 644 497 645 Build system for smproxy

+2

app/smproxy/Makefile.am

··· 41 41 $(CHANGELOG_CMD) 42 42 43 43 dist-hook: ChangeLog INSTALL 44 + 45 + EXTRA_DIST = README.md

+6 -4

app/smproxy/Makefile.in

··· 73 73 host_triplet = @host@ 74 74 bin_PROGRAMS = smproxy$(EXEEXT) 75 75 subdir = . 76 - DIST_COMMON = README $(am__configure_deps) $(srcdir)/Makefile.am \ 76 + DIST_COMMON = $(am__configure_deps) $(srcdir)/Makefile.am \ 77 77 $(srcdir)/Makefile.in $(srcdir)/config.h.in \ 78 78 $(top_srcdir)/configure COPYING ChangeLog INSTALL compile \ 79 79 config.guess config.sub depcomp install-sh missing ··· 179 179 dir1=`echo "$$dir1" | sed -e "$$sed_rest"`; \ 180 180 done; \ 181 181 reldir="$$dir2" 182 - DIST_ARCHIVES = $(distdir).tar.gz $(distdir).tar.bz2 182 + DIST_ARCHIVES = $(distdir).tar.gz $(distdir).tar.xz 183 183 GZIP_ENV = --best 184 - DIST_TARGETS = dist-bzip2 dist-gzip 184 + DIST_TARGETS = dist-xz dist-gzip 185 185 distuninstallcheck_listfiles = find . -type f -print 186 186 am__distuninstallcheck_listfiles = $(distuninstallcheck_listfiles) \ 187 187 | sed 's|^\./|$(prefix)/|' | grep -v '$(infodir)/dir$$' ··· 299 299 prefix = @prefix@ 300 300 program_transform_name = @program_transform_name@ 301 301 psdir = @psdir@ 302 + runstatedir = @runstatedir@ 302 303 sbindir = @sbindir@ 303 304 sharedstatedir = @sharedstatedir@ 304 305 srcdir = @srcdir@ ··· 316 317 smproxy.h 317 318 318 319 MAINTAINERCLEANFILES = ChangeLog INSTALL 320 + EXTRA_DIST = README.md 319 321 all: config.h 320 322 $(MAKE) $(AM_MAKEFLAGS) all-recursive 321 323 ··· 643 645 dist-gzip: distdir 644 646 tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz 645 647 $(am__post_remove_distdir) 648 + 646 649 dist-bzip2: distdir 647 650 tardir=$(distdir) && $(am__tar) | BZIP2=$${BZIP2--9} bzip2 -c >$(distdir).tar.bz2 648 651 $(am__post_remove_distdir) ··· 650 653 dist-lzip: distdir 651 654 tardir=$(distdir) && $(am__tar) | lzip -c $${LZIP_OPT--9} >$(distdir).tar.lz 652 655 $(am__post_remove_distdir) 653 - 654 656 dist-xz: distdir 655 657 tardir=$(distdir) && $(am__tar) | XZ_OPT=$${XZ_OPT--e} xz -c >$(distdir).tar.xz 656 658 $(am__post_remove_distdir)

-26

app/smproxy/README

··· 1 - smproxy allows X applications that do not support X11R6 session 2 - management to participate in an X11R6 session. 3 - 4 - All questions regarding this software should be directed at the 5 - Xorg mailing list: 6 - 7 - http://lists.freedesktop.org/mailman/listinfo/xorg 8 - 9 - Please submit bug reports to the Xorg bugzilla: 10 - 11 - https://bugs.freedesktop.org/enter_bug.cgi?product=xorg 12 - 13 - The master development code repository can be found at: 14 - 15 - git://anongit.freedesktop.org/git/xorg/app/smproxy 16 - 17 - http://cgit.freedesktop.org/xorg/app/smproxy 18 - 19 - For patch submission instructions, see: 20 - 21 - http://www.x.org/wiki/Development/Documentation/SubmittingPatches 22 - 23 - For more information on the git code manager, see: 24 - 25 - http://wiki.x.org/wiki/GitPage 26 -

+18

app/smproxy/README.md

··· 1 + smproxy allows X applications that do not support X11R6 session 2 + management to participate in an X11R6 session. 3 + 4 + All questions regarding this software should be directed at the 5 + Xorg mailing list: 6 + 7 + https://lists.x.org/mailman/listinfo/xorg 8 + 9 + The master development code repository can be found at: 10 + 11 + https://gitlab.freedesktop.org/xorg/app/smproxy 12 + 13 + Please submit bug reports and requests to merge patches there. 14 + 15 + For patch submission instructions, see: 16 + 17 + https://www.x.org/wiki/Development/Documentation/SubmittingPatches 18 +

+193 -93

app/smproxy/aclocal.m4

··· 19 19 If you have problems, you may need to regenerate the build system entirely. 20 20 To do so, use the procedure documented by the package, typically 'autoreconf'.])]) 21 21 22 - # pkg.m4 - Macros to locate and utilise pkg-config. -*- Autoconf -*- 23 - # serial 1 (pkg-config-0.24) 24 - # 25 - # Copyright © 2004 Scott James Remnant <scott@netsplit.com>. 26 - # 27 - # This program is free software; you can redistribute it and/or modify 28 - # it under the terms of the GNU General Public License as published by 29 - # the Free Software Foundation; either version 2 of the License, or 30 - # (at your option) any later version. 31 - # 32 - # This program is distributed in the hope that it will be useful, but 33 - # WITHOUT ANY WARRANTY; without even the implied warranty of 34 - # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU 35 - # General Public License for more details. 36 - # 37 - # You should have received a copy of the GNU General Public License 38 - # along with this program; if not, write to the Free Software 39 - # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. 40 - # 41 - # As a special exception to the GNU General Public License, if you 42 - # distribute this file as part of a program that contains a 43 - # configuration script generated by Autoconf, you may include it under 44 - # the same distribution terms that you use for the rest of that program. 22 + # pkg.m4 - Macros to locate and utilise pkg-config. -*- Autoconf -*- 23 + # serial 12 (pkg-config-0.29.2) 45 24 46 - # PKG_PROG_PKG_CONFIG([MIN-VERSION]) 47 - # ---------------------------------- 25 + dnl Copyright © 2004 Scott James Remnant <scott@netsplit.com>. 26 + dnl Copyright © 2012-2015 Dan Nicholson <dbn.lists@gmail.com> 27 + dnl 28 + dnl This program is free software; you can redistribute it and/or modify 29 + dnl it under the terms of the GNU General Public License as published by 30 + dnl the Free Software Foundation; either version 2 of the License, or 31 + dnl (at your option) any later version. 32 + dnl 33 + dnl This program is distributed in the hope that it will be useful, but 34 + dnl WITHOUT ANY WARRANTY; without even the implied warranty of 35 + dnl MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU 36 + dnl General Public License for more details. 37 + dnl 38 + dnl You should have received a copy of the GNU General Public License 39 + dnl along with this program; if not, write to the Free Software 40 + dnl Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 41 + dnl 02111-1307, USA. 42 + dnl 43 + dnl As a special exception to the GNU General Public License, if you 44 + dnl distribute this file as part of a program that contains a 45 + dnl configuration script generated by Autoconf, you may include it under 46 + dnl the same distribution terms that you use for the rest of that 47 + dnl program. 48 + 49 + dnl PKG_PREREQ(MIN-VERSION) 50 + dnl ----------------------- 51 + dnl Since: 0.29 52 + dnl 53 + dnl Verify that the version of the pkg-config macros are at least 54 + dnl MIN-VERSION. Unlike PKG_PROG_PKG_CONFIG, which checks the user's 55 + dnl installed version of pkg-config, this checks the developer's version 56 + dnl of pkg.m4 when generating configure. 57 + dnl 58 + dnl To ensure that this macro is defined, also add: 59 + dnl m4_ifndef([PKG_PREREQ], 60 + dnl [m4_fatal([must install pkg-config 0.29 or later before running autoconf/autogen])]) 61 + dnl 62 + dnl See the "Since" comment for each macro you use to see what version 63 + dnl of the macros you require. 64 + m4_defun([PKG_PREREQ], 65 + [m4_define([PKG_MACROS_VERSION], [0.29.2]) 66 + m4_if(m4_version_compare(PKG_MACROS_VERSION, [$1]), -1, 67 + [m4_fatal([pkg.m4 version $1 or higher is required but ]PKG_MACROS_VERSION[ found])]) 68 + ])dnl PKG_PREREQ 69 + 70 + dnl PKG_PROG_PKG_CONFIG([MIN-VERSION]) 71 + dnl ---------------------------------- 72 + dnl Since: 0.16 73 + dnl 74 + dnl Search for the pkg-config tool and set the PKG_CONFIG variable to 75 + dnl first found in the path. Checks that the version of pkg-config found 76 + dnl is at least MIN-VERSION. If MIN-VERSION is not specified, 0.9.0 is 77 + dnl used since that's the first version where most current features of 78 + dnl pkg-config existed. 48 79 AC_DEFUN([PKG_PROG_PKG_CONFIG], 49 80 [m4_pattern_forbid([^_?PKG_[A-Z_]+$]) 50 81 m4_pattern_allow([^PKG_CONFIG(_(PATH|LIBDIR|SYSROOT_DIR|ALLOW_SYSTEM_(CFLAGS|LIBS)))?$]) ··· 66 97 PKG_CONFIG="" 67 98 fi 68 99 fi[]dnl 69 - ])# PKG_PROG_PKG_CONFIG 100 + ])dnl PKG_PROG_PKG_CONFIG 70 101 71 - # PKG_CHECK_EXISTS(MODULES, [ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND]) 72 - # 73 - # Check to see whether a particular set of modules exists. Similar 74 - # to PKG_CHECK_MODULES(), but does not set variables or print errors. 75 - # 76 - # Please remember that m4 expands AC_REQUIRE([PKG_PROG_PKG_CONFIG]) 77 - # only at the first occurence in configure.ac, so if the first place 78 - # it's called might be skipped (such as if it is within an "if", you 79 - # have to call PKG_CHECK_EXISTS manually 80 - # -------------------------------------------------------------- 102 + dnl PKG_CHECK_EXISTS(MODULES, [ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND]) 103 + dnl ------------------------------------------------------------------- 104 + dnl Since: 0.18 105 + dnl 106 + dnl Check to see whether a particular set of modules exists. Similar to 107 + dnl PKG_CHECK_MODULES(), but does not set variables or print errors. 108 + dnl 109 + dnl Please remember that m4 expands AC_REQUIRE([PKG_PROG_PKG_CONFIG]) 110 + dnl only at the first occurence in configure.ac, so if the first place 111 + dnl it's called might be skipped (such as if it is within an "if", you 112 + dnl have to call PKG_CHECK_EXISTS manually 81 113 AC_DEFUN([PKG_CHECK_EXISTS], 82 114 [AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl 83 115 if test -n "$PKG_CONFIG" && \ ··· 87 119 $3])dnl 88 120 fi]) 89 121 90 - # _PKG_CONFIG([VARIABLE], [COMMAND], [MODULES]) 91 - # --------------------------------------------- 122 + dnl _PKG_CONFIG([VARIABLE], [COMMAND], [MODULES]) 123 + dnl --------------------------------------------- 124 + dnl Internal wrapper calling pkg-config via PKG_CONFIG and setting 125 + dnl pkg_failed based on the result. 92 126 m4_define([_PKG_CONFIG], 93 127 [if test -n "$$1"; then 94 128 pkg_cv_[]$1="$$1" ··· 100 134 else 101 135 pkg_failed=untried 102 136 fi[]dnl 103 - ])# _PKG_CONFIG 137 + ])dnl _PKG_CONFIG 104 138 105 - # _PKG_SHORT_ERRORS_SUPPORTED 106 - # ----------------------------- 139 + dnl _PKG_SHORT_ERRORS_SUPPORTED 140 + dnl --------------------------- 141 + dnl Internal check to see if pkg-config supports short errors. 107 142 AC_DEFUN([_PKG_SHORT_ERRORS_SUPPORTED], 108 143 [AC_REQUIRE([PKG_PROG_PKG_CONFIG]) 109 144 if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then ··· 111 146 else 112 147 _pkg_short_errors_supported=no 113 148 fi[]dnl 114 - ])# _PKG_SHORT_ERRORS_SUPPORTED 149 + ])dnl _PKG_SHORT_ERRORS_SUPPORTED 115 150 116 151 117 - # PKG_CHECK_MODULES(VARIABLE-PREFIX, MODULES, [ACTION-IF-FOUND], 118 - # [ACTION-IF-NOT-FOUND]) 119 - # 120 - # 121 - # Note that if there is a possibility the first call to 122 - # PKG_CHECK_MODULES might not happen, you should be sure to include an 123 - # explicit call to PKG_PROG_PKG_CONFIG in your configure.ac 124 - # 125 - # 126 - # -------------------------------------------------------------- 152 + dnl PKG_CHECK_MODULES(VARIABLE-PREFIX, MODULES, [ACTION-IF-FOUND], 153 + dnl [ACTION-IF-NOT-FOUND]) 154 + dnl -------------------------------------------------------------- 155 + dnl Since: 0.4.0 156 + dnl 157 + dnl Note that if there is a possibility the first call to 158 + dnl PKG_CHECK_MODULES might not happen, you should be sure to include an 159 + dnl explicit call to PKG_PROG_PKG_CONFIG in your configure.ac 127 160 AC_DEFUN([PKG_CHECK_MODULES], 128 161 [AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl 129 162 AC_ARG_VAR([$1][_CFLAGS], [C compiler flags for $1, overriding pkg-config])dnl 130 163 AC_ARG_VAR([$1][_LIBS], [linker flags for $1, overriding pkg-config])dnl 131 164 132 165 pkg_failed=no 133 - AC_MSG_CHECKING([for $1]) 166 + AC_MSG_CHECKING([for $2]) 134 167 135 168 _PKG_CONFIG([$1][_CFLAGS], [cflags], [$2]) 136 169 _PKG_CONFIG([$1][_LIBS], [libs], [$2]) ··· 140 173 See the pkg-config man page for more details.]) 141 174 142 175 if test $pkg_failed = yes; then 143 - AC_MSG_RESULT([no]) 176 + AC_MSG_RESULT([no]) 144 177 _PKG_SHORT_ERRORS_SUPPORTED 145 178 if test $_pkg_short_errors_supported = yes; then 146 179 $1[]_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "$2" 2>&1` 147 - else 180 + else 148 181 $1[]_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "$2" 2>&1` 149 182 fi 150 183 # Put the nasty error message in config.log where it belongs ··· 161 194 _PKG_TEXT])[]dnl 162 195 ]) 163 196 elif test $pkg_failed = untried; then 164 - AC_MSG_RESULT([no]) 197 + AC_MSG_RESULT([no]) 165 198 m4_default([$4], [AC_MSG_FAILURE( 166 199 [The pkg-config script could not be found or is too old. Make sure it 167 200 is in your PATH or set the PKG_CONFIG environment variable to the full ··· 177 210 AC_MSG_RESULT([yes]) 178 211 $3 179 212 fi[]dnl 180 - ])# PKG_CHECK_MODULES 213 + ])dnl PKG_CHECK_MODULES 181 214 182 215 183 - # PKG_INSTALLDIR(DIRECTORY) 184 - # ------------------------- 185 - # Substitutes the variable pkgconfigdir as the location where a module 186 - # should install pkg-config .pc files. By default the directory is 187 - # $libdir/pkgconfig, but the default can be changed by passing 188 - # DIRECTORY. The user can override through the --with-pkgconfigdir 189 - # parameter. 216 + dnl PKG_CHECK_MODULES_STATIC(VARIABLE-PREFIX, MODULES, [ACTION-IF-FOUND], 217 + dnl [ACTION-IF-NOT-FOUND]) 218 + dnl --------------------------------------------------------------------- 219 + dnl Since: 0.29 220 + dnl 221 + dnl Checks for existence of MODULES and gathers its build flags with 222 + dnl static libraries enabled. Sets VARIABLE-PREFIX_CFLAGS from --cflags 223 + dnl and VARIABLE-PREFIX_LIBS from --libs. 224 + dnl 225 + dnl Note that if there is a possibility the first call to 226 + dnl PKG_CHECK_MODULES_STATIC might not happen, you should be sure to 227 + dnl include an explicit call to PKG_PROG_PKG_CONFIG in your 228 + dnl configure.ac. 229 + AC_DEFUN([PKG_CHECK_MODULES_STATIC], 230 + [AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl 231 + _save_PKG_CONFIG=$PKG_CONFIG 232 + PKG_CONFIG="$PKG_CONFIG --static" 233 + PKG_CHECK_MODULES($@) 234 + PKG_CONFIG=$_save_PKG_CONFIG[]dnl 235 + ])dnl PKG_CHECK_MODULES_STATIC 236 + 237 + 238 + dnl PKG_INSTALLDIR([DIRECTORY]) 239 + dnl ------------------------- 240 + dnl Since: 0.27 241 + dnl 242 + dnl Substitutes the variable pkgconfigdir as the location where a module 243 + dnl should install pkg-config .pc files. By default the directory is 244 + dnl $libdir/pkgconfig, but the default can be changed by passing 245 + dnl DIRECTORY. The user can override through the --with-pkgconfigdir 246 + dnl parameter. 190 247 AC_DEFUN([PKG_INSTALLDIR], 191 248 [m4_pushdef([pkg_default], [m4_default([$1], ['${libdir}/pkgconfig'])]) 192 249 m4_pushdef([pkg_description], ··· 197 254 AC_SUBST([pkgconfigdir], [$with_pkgconfigdir]) 198 255 m4_popdef([pkg_default]) 199 256 m4_popdef([pkg_description]) 200 - ]) dnl PKG_INSTALLDIR 257 + ])dnl PKG_INSTALLDIR 201 258 202 259 203 - # PKG_NOARCH_INSTALLDIR(DIRECTORY) 204 - # ------------------------- 205 - # Substitutes the variable noarch_pkgconfigdir as the location where a 206 - # module should install arch-independent pkg-config .pc files. By 207 - # default the directory is $datadir/pkgconfig, but the default can be 208 - # changed by passing DIRECTORY. The user can override through the 209 - # --with-noarch-pkgconfigdir parameter. 260 + dnl PKG_NOARCH_INSTALLDIR([DIRECTORY]) 261 + dnl -------------------------------- 262 + dnl Since: 0.27 263 + dnl 264 + dnl Substitutes the variable noarch_pkgconfigdir as the location where a 265 + dnl module should install arch-independent pkg-config .pc files. By 266 + dnl default the directory is $datadir/pkgconfig, but the default can be 267 + dnl changed by passing DIRECTORY. The user can override through the 268 + dnl --with-noarch-pkgconfigdir parameter. 210 269 AC_DEFUN([PKG_NOARCH_INSTALLDIR], 211 270 [m4_pushdef([pkg_default], [m4_default([$1], ['${datadir}/pkgconfig'])]) 212 271 m4_pushdef([pkg_description], ··· 217 276 AC_SUBST([noarch_pkgconfigdir], [$with_noarch_pkgconfigdir]) 218 277 m4_popdef([pkg_default]) 219 278 m4_popdef([pkg_description]) 220 - ]) dnl PKG_NOARCH_INSTALLDIR 279 + ])dnl PKG_NOARCH_INSTALLDIR 280 + 281 + 282 + dnl PKG_CHECK_VAR(VARIABLE, MODULE, CONFIG-VARIABLE, 283 + dnl [ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND]) 284 + dnl ------------------------------------------- 285 + dnl Since: 0.28 286 + dnl 287 + dnl Retrieves the value of the pkg-config variable for the given module. 288 + AC_DEFUN([PKG_CHECK_VAR], 289 + [AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl 290 + AC_ARG_VAR([$1], [value of $3 for $2, overriding pkg-config])dnl 291 + 292 + _PKG_CONFIG([$1], [variable="][$3]["], [$2]) 293 + AS_VAR_COPY([$1], [pkg_cv_][$1]) 294 + 295 + AS_VAR_IF([$1], [""], [$5], [$4])dnl 296 + ])dnl PKG_CHECK_VAR 221 297 222 298 # Copyright (C) 2002-2012 Free Software Foundation, Inc. 223 299 # ··· 1242 1318 1243 1319 dnl xorg-macros.m4. Generated from xorg-macros.m4.in xorgversion.m4 by configure. 1244 1320 dnl 1245 - dnl Copyright (c) 2005, 2006, Oracle and/or its affiliates. All rights reserved. 1321 + dnl Copyright (c) 2005, 2015, Oracle and/or its affiliates. All rights reserved. 1246 1322 dnl 1247 1323 dnl Permission is hereby granted, free of charge, to any person obtaining a 1248 1324 dnl copy of this software and associated documentation files (the "Software"), ··· 1279 1355 # See the "minimum version" comment for each macro you use to see what 1280 1356 # version you require. 1281 1357 m4_defun([XORG_MACROS_VERSION],[ 1282 - m4_define([vers_have], [1.19.0]) 1358 + m4_define([vers_have], [1.19.2]) 1283 1359 m4_define([maj_have], m4_substr(vers_have, 0, m4_index(vers_have, [.]))) 1284 1360 m4_define([maj_needed], m4_substr([$1], 0, m4_index([$1], [.]))) 1285 1361 m4_if(m4_cmp(maj_have, maj_needed), 0,, ··· 1356 1432 AC_DEFUN([XORG_MANPAGE_SECTIONS],[ 1357 1433 AC_REQUIRE([AC_CANONICAL_HOST]) 1358 1434 AC_REQUIRE([AC_PROG_SED]) 1435 + 1436 + case $host_os in 1437 + solaris*) 1438 + # Solaris 2.0 - 11.3 use SysV man page section numbers, so we 1439 + # check for a man page file found in later versions that use 1440 + # traditional section numbers instead 1441 + AC_CHECK_FILE([/usr/share/man/man7/attributes.7], 1442 + [SYSV_MAN_SECTIONS=false], [SYSV_MAN_SECTIONS=true]) 1443 + ;; 1444 + *) SYSV_MAN_SECTIONS=false ;; 1445 + esac 1359 1446 1360 1447 if test x$APP_MAN_SUFFIX = x ; then 1361 1448 APP_MAN_SUFFIX=1 ··· 1372 1459 fi 1373 1460 1374 1461 if test x$FILE_MAN_SUFFIX = x ; then 1375 - case $host_os in 1376 - solaris*) FILE_MAN_SUFFIX=4 ;; 1377 - *) FILE_MAN_SUFFIX=5 ;; 1462 + case $SYSV_MAN_SECTIONS in 1463 + true) FILE_MAN_SUFFIX=4 ;; 1464 + *) FILE_MAN_SUFFIX=5 ;; 1378 1465 esac 1379 1466 fi 1380 1467 if test x$FILE_MAN_DIR = x ; then ··· 1382 1469 fi 1383 1470 1384 1471 if test x$MISC_MAN_SUFFIX = x ; then 1385 - case $host_os in 1386 - solaris*) MISC_MAN_SUFFIX=5 ;; 1387 - *) MISC_MAN_SUFFIX=7 ;; 1472 + case $SYSV_MAN_SECTIONS in 1473 + true) MISC_MAN_SUFFIX=5 ;; 1474 + *) MISC_MAN_SUFFIX=7 ;; 1388 1475 esac 1389 1476 fi 1390 1477 if test x$MISC_MAN_DIR = x ; then ··· 1392 1479 fi 1393 1480 1394 1481 if test x$DRIVER_MAN_SUFFIX = x ; then 1395 - case $host_os in 1396 - solaris*) DRIVER_MAN_SUFFIX=7 ;; 1397 - *) DRIVER_MAN_SUFFIX=4 ;; 1482 + case $SYSV_MAN_SECTIONS in 1483 + true) DRIVER_MAN_SUFFIX=7 ;; 1484 + *) DRIVER_MAN_SUFFIX=4 ;; 1398 1485 esac 1399 1486 fi 1400 1487 if test x$DRIVER_MAN_DIR = x ; then ··· 1402 1489 fi 1403 1490 1404 1491 if test x$ADMIN_MAN_SUFFIX = x ; then 1405 - case $host_os in 1406 - solaris*) ADMIN_MAN_SUFFIX=1m ;; 1407 - *) ADMIN_MAN_SUFFIX=8 ;; 1492 + case $SYSV_MAN_SECTIONS in 1493 + true) ADMIN_MAN_SUFFIX=1m ;; 1494 + *) ADMIN_MAN_SUFFIX=8 ;; 1408 1495 esac 1409 1496 fi 1410 1497 if test x$ADMIN_MAN_DIR = x ; then ··· 1665 1752 fi]) 1666 1753 1667 1754 # Test for the ability of xmlto to generate a text target 1755 + # 1756 + # NOTE: xmlto 0.0.27 or higher return a non-zero return code in the 1757 + # following test for empty XML docbook files. 1758 + # For compatibility reasons use the following empty XML docbook file and if 1759 + # it fails try it again with a non-empty XML file. 1668 1760 have_xmlto_text=no 1669 1761 cat > conftest.xml << "EOF" 1670 1762 EOF 1671 1763 AS_IF([test "$have_xmlto" = yes], 1672 1764 [AS_IF([$XMLTO --skip-validation txt conftest.xml >/dev/null 2>&1], 1673 1765 [have_xmlto_text=yes], 1674 - [AC_MSG_WARN([xmlto cannot generate text format, this format skipped])])]) 1766 + [# Try it again with a non-empty XML file. 1767 + cat > conftest.xml << "EOF" 1768 + <x></x> 1769 + EOF 1770 + AS_IF([$XMLTO --skip-validation txt conftest.xml >/dev/null 2>&1], 1771 + [have_xmlto_text=yes], 1772 + [AC_MSG_WARN([xmlto cannot generate text format, this format skipped])])])]) 1675 1773 rm -f conftest.xml 1676 1774 AM_CONDITIONAL([HAVE_XMLTO_TEXT], [test $have_xmlto_text = yes]) 1677 1775 AM_CONDITIONAL([HAVE_XMLTO], [test "$have_xmlto" = yes]) ··· 3067 3165 macros_datadir=`$PKG_CONFIG --print-errors --variable=pkgdatadir xorg-macros` 3068 3166 INSTALL_CMD="(cp -f "$macros_datadir/INSTALL" \$(top_srcdir)/.INSTALL.tmp && \ 3069 3167 mv \$(top_srcdir)/.INSTALL.tmp \$(top_srcdir)/INSTALL) \ 3070 - || (rm -f \$(top_srcdir)/.INSTALL.tmp; touch \$(top_srcdir)/INSTALL; \ 3071 - echo 'util-macros \"pkgdatadir\" from xorg-macros.pc not found: installing possibly empty INSTALL.' >&2)" 3168 + || (rm -f \$(top_srcdir)/.INSTALL.tmp; test -e \$(top_srcdir)/INSTALL || ( \ 3169 + touch \$(top_srcdir)/INSTALL; \ 3170 + echo 'failed to copy INSTALL from util-macros: installing empty INSTALL.' >&2))" 3072 3171 AC_SUBST([INSTALL_CMD]) 3073 3172 ]) # XORG_INSTALL 3074 3173 dnl Copyright 2005 Red Hat, Inc ··· 3129 3228 # 3130 3229 # 3131 3230 AC_DEFUN([XORG_CHANGELOG], [ 3132 - CHANGELOG_CMD="(GIT_DIR=\$(top_srcdir)/.git git log > \$(top_srcdir)/.changelog.tmp && \ 3231 + CHANGELOG_CMD="((GIT_DIR=\$(top_srcdir)/.git git log > \$(top_srcdir)/.changelog.tmp) 2>/dev/null && \ 3133 3232 mv \$(top_srcdir)/.changelog.tmp \$(top_srcdir)/ChangeLog) \ 3134 - || (rm -f \$(top_srcdir)/.changelog.tmp; touch \$(top_srcdir)/ChangeLog; \ 3135 - echo 'git directory not found: installing possibly empty changelog.' >&2)" 3233 + || (rm -f \$(top_srcdir)/.changelog.tmp; test -e \$(top_srcdir)/ChangeLog || ( \ 3234 + touch \$(top_srcdir)/ChangeLog; \ 3235 + echo 'git failed to create ChangeLog: installing empty ChangeLog.' >&2))" 3136 3236 AC_SUBST([CHANGELOG_CMD]) 3137 3237 ]) # XORG_CHANGELOG 3138 3238

+9 -8

app/smproxy/compile

··· 1 1 #! /bin/sh 2 2 # Wrapper for compilers which do not understand '-c -o'. 3 3 4 - scriptversion=2012-10-14.11; # UTC 4 + scriptversion=2018-03-07.03; # UTC 5 5 6 - # Copyright (C) 1999-2014 Free Software Foundation, Inc. 6 + # Copyright (C) 1999-2021 Free Software Foundation, Inc. 7 7 # Written by Tom Tromey <tromey@cygnus.com>. 8 8 # 9 9 # This program is free software; you can redistribute it and/or modify ··· 17 17 # GNU General Public License for more details. 18 18 # 19 19 # You should have received a copy of the GNU General Public License 20 - # along with this program. If not, see <http://www.gnu.org/licenses/>. 20 + # along with this program. If not, see <https://www.gnu.org/licenses/>. 21 21 22 22 # As a special exception to the GNU General Public License, if you 23 23 # distribute this file as part of a program that contains a ··· 53 53 MINGW*) 54 54 file_conv=mingw 55 55 ;; 56 - CYGWIN*) 56 + CYGWIN* | MSYS*) 57 57 file_conv=cygwin 58 58 ;; 59 59 *) ··· 67 67 mingw/*) 68 68 file=`cmd //C echo "$file " | sed -e 's/"$.*$ " *$/\1/'` 69 69 ;; 70 - cygwin/*) 70 + cygwin/* | msys/*) 71 71 file=`cygpath -m "$file" || echo "$file"` 72 72 ;; 73 73 wine/*) ··· 255 255 echo "compile $scriptversion" 256 256 exit $? 257 257 ;; 258 - cl | *[/\\]cl | cl.exe | *[/\\]cl.exe ) 258 + cl | *[/\\]cl | cl.exe | *[/\\]cl.exe | \ 259 + icl | *[/\\]icl | icl.exe | *[/\\]icl.exe ) 259 260 func_cl_wrapper "$@" # Doesn't return... 260 261 ;; 261 262 esac ··· 339 340 # Local Variables: 340 341 # mode: shell-script 341 342 # sh-indentation: 2 342 - # eval: (add-hook 'write-file-hooks 'time-stamp) 343 + # eval: (add-hook 'before-save-hook 'time-stamp) 343 344 # time-stamp-start: "scriptversion=" 344 345 # time-stamp-format: "%:y-%02m-%02d.%02H" 345 - # time-stamp-time-zone: "UTC" 346 + # time-stamp-time-zone: "UTC0" 346 347 # time-stamp-end: "; # UTC" 347 348 # End:

+84 -40

app/smproxy/configure

··· 1 1 #! /bin/sh 2 2 # Guess values for system-dependent variables and create Makefiles. 3 - # Generated by GNU Autoconf 2.69 for smproxy 1.0.6. 3 + # Generated by GNU Autoconf 2.69 for smproxy 1.0.7. 4 4 # 5 - # Report bugs to <https://bugs.freedesktop.org/enter_bug.cgi?product=xorg>. 5 + # Report bugs to <https://gitlab.freedesktop.org/xorg/app/smproxy/issues>. 6 6 # 7 7 # 8 8 # Copyright (C) 1992-1996, 1998-2012 Free Software Foundation, Inc. ··· 267 267 $as_echo "$0: be upgraded to zsh 4.3.4 or later." 268 268 else 269 269 $as_echo "$0: Please tell bug-autoconf@gnu.org and 270 - $0: https://bugs.freedesktop.org/enter_bug.cgi?product=xorg 270 + $0: https://gitlab.freedesktop.org/xorg/app/smproxy/issues 271 271 $0: about your system, including any error possibly output 272 272 $0: before this message. Then install a modern shell, or 273 273 $0: manually run the script under such a shell if you do ··· 581 581 # Identity of this package. 582 582 PACKAGE_NAME='smproxy' 583 583 PACKAGE_TARNAME='smproxy' 584 - PACKAGE_VERSION='1.0.6' 585 - PACKAGE_STRING='smproxy 1.0.6' 586 - PACKAGE_BUGREPORT='https://bugs.freedesktop.org/enter_bug.cgi?product=xorg' 584 + PACKAGE_VERSION='1.0.7' 585 + PACKAGE_STRING='smproxy 1.0.7' 586 + PACKAGE_BUGREPORT='https://gitlab.freedesktop.org/xorg/app/smproxy/issues' 587 587 PACKAGE_URL='' 588 588 589 589 ac_unique_file="Makefile.am" ··· 729 729 docdir 730 730 oldincludedir 731 731 includedir 732 + runstatedir 732 733 localstatedir 733 734 sharedstatedir 734 735 sysconfdir ··· 809 810 sysconfdir='${prefix}/etc' 810 811 sharedstatedir='${prefix}/com' 811 812 localstatedir='${prefix}/var' 813 + runstatedir='${localstatedir}/run' 812 814 includedir='${prefix}/include' 813 815 oldincludedir='/usr/include' 814 816 docdir='${datarootdir}/doc/${PACKAGE_TARNAME}' ··· 1061 1063 | -silent | --silent | --silen | --sile | --sil) 1062 1064 silent=yes ;; 1063 1065 1066 + -runstatedir | --runstatedir | --runstatedi | --runstated \ 1067 + | --runstate | --runstat | --runsta | --runst | --runs \ 1068 + | --run | --ru | --r) 1069 + ac_prev=runstatedir ;; 1070 + -runstatedir=* | --runstatedir=* | --runstatedi=* | --runstated=* \ 1071 + | --runstate=* | --runstat=* | --runsta=* | --runst=* | --runs=* \ 1072 + | --run=* | --ru=* | --r=*) 1073 + runstatedir=$ac_optarg ;; 1074 + 1064 1075 -sbindir | --sbindir | --sbindi | --sbind | --sbin | --sbi | --sb) 1065 1076 ac_prev=sbindir ;; 1066 1077 -sbindir=* | --sbindir=* | --sbindi=* | --sbind=* | --sbin=* \ ··· 1198 1209 for ac_var in exec_prefix prefix bindir sbindir libexecdir datarootdir \ 1199 1210 datadir sysconfdir sharedstatedir localstatedir includedir \ 1200 1211 oldincludedir docdir infodir htmldir dvidir pdfdir psdir \ 1201 - libdir localedir mandir 1212 + libdir localedir mandir runstatedir 1202 1213 do 1203 1214 eval ac_val=\$$ac_var 1204 1215 # Remove trailing slashes. ··· 1311 1322 # Omit some internal or obsolete options to make the list less imposing. 1312 1323 # This message is too long to be a string in the A/UX 3.1 sh. 1313 1324 cat <<_ACEOF 1314 - \`configure' configures smproxy 1.0.6 to adapt to many kinds of systems. 1325 + \`configure' configures smproxy 1.0.7 to adapt to many kinds of systems. 1315 1326 1316 1327 Usage: $0 [OPTION]... [VAR=VALUE]... 1317 1328 ··· 1351 1362 --sysconfdir=DIR read-only single-machine data [PREFIX/etc] 1352 1363 --sharedstatedir=DIR modifiable architecture-independent data [PREFIX/com] 1353 1364 --localstatedir=DIR modifiable single-machine data [PREFIX/var] 1365 + --runstatedir=DIR modifiable per-process data [LOCALSTATEDIR/run] 1354 1366 --libdir=DIR object code libraries [EPREFIX/lib] 1355 1367 --includedir=DIR C header files [PREFIX/include] 1356 1368 --oldincludedir=DIR C header files for non-gcc [/usr/include] ··· 1381 1393 1382 1394 if test -n "$ac_init_help"; then 1383 1395 case $ac_init_help in 1384 - short | recursive ) echo "Configuration of smproxy 1.0.6:";; 1396 + short | recursive ) echo "Configuration of smproxy 1.0.7:";; 1385 1397 esac 1386 1398 cat <<\_ACEOF 1387 1399 ··· 1427 1439 Use these variables to override the choices made by `configure' or to help 1428 1440 it to find libraries and programs with nonstandard names/locations. 1429 1441 1430 - Report bugs to <https://bugs.freedesktop.org/enter_bug.cgi?product=xorg>. 1442 + Report bugs to <https://gitlab.freedesktop.org/xorg/app/smproxy/issues>. 1431 1443 _ACEOF 1432 1444 ac_status=$? 1433 1445 fi ··· 1490 1502 test -n "$ac_init_help" && exit $ac_status 1491 1503 if $ac_init_version; then 1492 1504 cat <<\_ACEOF 1493 - smproxy configure 1.0.6 1505 + smproxy configure 1.0.7 1494 1506 generated by GNU Autoconf 2.69 1495 1507 1496 1508 Copyright (C) 2012 Free Software Foundation, Inc. ··· 1649 1661 $as_echo "$as_me: WARNING: $2: section \"Present But Cannot Be Compiled\"" >&2;} 1650 1662 { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: proceeding with the compiler's result" >&5 1651 1663 $as_echo "$as_me: WARNING: $2: proceeding with the compiler's result" >&2;} 1652 - ( $as_echo "## ---------------------------------------------------------------------- ## 1653 - ## Report this to https://bugs.freedesktop.org/enter_bug.cgi?product=xorg ## 1654 - ## ---------------------------------------------------------------------- ##" 1664 + ( $as_echo "## --------------------------------------------------------------------- ## 1665 + ## Report this to https://gitlab.freedesktop.org/xorg/app/smproxy/issues ## 1666 + ## --------------------------------------------------------------------- ##" 1655 1667 ) | sed "s/^/$as_me: WARNING: /" >&2 1656 1668 ;; 1657 1669 esac ··· 1905 1917 This file contains any messages produced by compilers while 1906 1918 running configure, to aid debugging if configure makes a mistake. 1907 1919 1908 - It was created by smproxy $as_me 1.0.6, which was 1920 + It was created by smproxy $as_me 1.0.7, which was 1909 1921 generated by GNU Autoconf 2.69. Invocation command line was 1910 1922 1911 1923 $ $0 $@ ··· 2734 2746 2735 2747 # Define the identity of the package. 2736 2748 PACKAGE='smproxy' 2737 - VERSION='1.0.6' 2749 + VERSION='1.0.7' 2738 2750 2739 2751 2740 2752 cat >>confdefs.h <<_ACEOF ··· 10443 10455 10444 10456 10445 10457 10446 - CHANGELOG_CMD="(GIT_DIR=\$(top_srcdir)/.git git log > \$(top_srcdir)/.changelog.tmp && \ 10458 + CHANGELOG_CMD="((GIT_DIR=\$(top_srcdir)/.git git log > \$(top_srcdir)/.changelog.tmp) 2>/dev/null && \ 10447 10459 mv \$(top_srcdir)/.changelog.tmp \$(top_srcdir)/ChangeLog) \ 10448 - || (rm -f \$(top_srcdir)/.changelog.tmp; touch \$(top_srcdir)/ChangeLog; \ 10449 - echo 'git directory not found: installing possibly empty changelog.' >&2)" 10460 + || (rm -f \$(top_srcdir)/.changelog.tmp; test -e \$(top_srcdir)/ChangeLog || ( \ 10461 + touch \$(top_srcdir)/ChangeLog; \ 10462 + echo 'git failed to create ChangeLog: installing empty ChangeLog.' >&2))" 10450 10463 10451 10464 10452 10465 ··· 10454 10467 macros_datadir=`$PKG_CONFIG --print-errors --variable=pkgdatadir xorg-macros` 10455 10468 INSTALL_CMD="(cp -f "$macros_datadir/INSTALL" \$(top_srcdir)/.INSTALL.tmp && \ 10456 10469 mv \$(top_srcdir)/.INSTALL.tmp \$(top_srcdir)/INSTALL) \ 10457 - || (rm -f \$(top_srcdir)/.INSTALL.tmp; touch \$(top_srcdir)/INSTALL; \ 10458 - echo 'util-macros \"pkgdatadir\" from xorg-macros.pc not found: installing possibly empty INSTALL.' >&2)" 10470 + || (rm -f \$(top_srcdir)/.INSTALL.tmp; test -e \$(top_srcdir)/INSTALL || ( \ 10471 + touch \$(top_srcdir)/INSTALL; \ 10472 + echo 'failed to copy INSTALL from util-macros: installing empty INSTALL.' >&2))" 10459 10473 10460 10474 10461 10475 10462 10476 10463 10477 10464 10478 10479 + case $host_os in 10480 + solaris*) 10481 + # Solaris 2.0 - 11.3 use SysV man page section numbers, so we 10482 + # check for a man page file found in later versions that use 10483 + # traditional section numbers instead 10484 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for /usr/share/man/man7/attributes.7" >&5 10485 + $as_echo_n "checking for /usr/share/man/man7/attributes.7... " >&6; } 10486 + if ${ac_cv_file__usr_share_man_man7_attributes_7+:} false; then : 10487 + $as_echo_n "(cached) " >&6 10488 + else 10489 + test "$cross_compiling" = yes && 10490 + as_fn_error $? "cannot check for file existence when cross compiling" "$LINENO" 5 10491 + if test -r "/usr/share/man/man7/attributes.7"; then 10492 + ac_cv_file__usr_share_man_man7_attributes_7=yes 10493 + else 10494 + ac_cv_file__usr_share_man_man7_attributes_7=no 10495 + fi 10496 + fi 10497 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_file__usr_share_man_man7_attributes_7" >&5 10498 + $as_echo "$ac_cv_file__usr_share_man_man7_attributes_7" >&6; } 10499 + if test "x$ac_cv_file__usr_share_man_man7_attributes_7" = xyes; then : 10500 + SYSV_MAN_SECTIONS=false 10501 + else 10502 + SYSV_MAN_SECTIONS=true 10503 + fi 10504 + 10505 + ;; 10506 + *) SYSV_MAN_SECTIONS=false ;; 10507 + esac 10508 + 10465 10509 if test x$APP_MAN_SUFFIX = x ; then 10466 10510 APP_MAN_SUFFIX=1 10467 10511 fi ··· 10477 10521 fi 10478 10522 10479 10523 if test x$FILE_MAN_SUFFIX = x ; then 10480 - case $host_os in 10481 - solaris*) FILE_MAN_SUFFIX=4 ;; 10482 - *) FILE_MAN_SUFFIX=5 ;; 10524 + case $SYSV_MAN_SECTIONS in 10525 + true) FILE_MAN_SUFFIX=4 ;; 10526 + *) FILE_MAN_SUFFIX=5 ;; 10483 10527 esac 10484 10528 fi 10485 10529 if test x$FILE_MAN_DIR = x ; then ··· 10487 10531 fi 10488 10532 10489 10533 if test x$MISC_MAN_SUFFIX = x ; then 10490 - case $host_os in 10491 - solaris*) MISC_MAN_SUFFIX=5 ;; 10492 - *) MISC_MAN_SUFFIX=7 ;; 10534 + case $SYSV_MAN_SECTIONS in 10535 + true) MISC_MAN_SUFFIX=5 ;; 10536 + *) MISC_MAN_SUFFIX=7 ;; 10493 10537 esac 10494 10538 fi 10495 10539 if test x$MISC_MAN_DIR = x ; then ··· 10497 10541 fi 10498 10542 10499 10543 if test x$DRIVER_MAN_SUFFIX = x ; then 10500 - case $host_os in 10501 - solaris*) DRIVER_MAN_SUFFIX=7 ;; 10502 - *) DRIVER_MAN_SUFFIX=4 ;; 10544 + case $SYSV_MAN_SECTIONS in 10545 + true) DRIVER_MAN_SUFFIX=7 ;; 10546 + *) DRIVER_MAN_SUFFIX=4 ;; 10503 10547 esac 10504 10548 fi 10505 10549 if test x$DRIVER_MAN_DIR = x ; then ··· 10507 10551 fi 10508 10552 10509 10553 if test x$ADMIN_MAN_SUFFIX = x ; then 10510 - case $host_os in 10511 - solaris*) ADMIN_MAN_SUFFIX=1m ;; 10512 - *) ADMIN_MAN_SUFFIX=8 ;; 10554 + case $SYSV_MAN_SECTIONS in 10555 + true) ADMIN_MAN_SUFFIX=1m ;; 10556 + *) ADMIN_MAN_SUFFIX=8 ;; 10513 10557 esac 10514 10558 fi 10515 10559 if test x$ADMIN_MAN_DIR = x ; then ··· 10605 10649 # Checks for pkg-config packages 10606 10650 10607 10651 pkg_failed=no 10608 - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for SMPROXY" >&5 10609 - $as_echo_n "checking for SMPROXY... " >&6; } 10652 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for sm ice xt xmuu" >&5 10653 + $as_echo_n "checking for sm ice xt xmuu... " >&6; } 10610 10654 10611 10655 if test -n "$SMPROXY_CFLAGS"; then 10612 10656 pkg_cv_SMPROXY_CFLAGS="$SMPROXY_CFLAGS" ··· 10646 10690 10647 10691 10648 10692 if test $pkg_failed = yes; then 10649 - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 10693 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 10650 10694 $as_echo "no" >&6; } 10651 10695 10652 10696 if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then ··· 10673 10717 and SMPROXY_LIBS to avoid the need to call pkg-config. 10674 10718 See the pkg-config man page for more details." "$LINENO" 5 10675 10719 elif test $pkg_failed = untried; then 10676 - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 10720 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 10677 10721 $as_echo "no" >&6; } 10678 10722 { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 10679 10723 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} ··· 11231 11275 # report actual input values of CONFIG_FILES etc. instead of their 11232 11276 # values after options handling. 11233 11277 ac_log=" 11234 - This file was extended by smproxy $as_me 1.0.6, which was 11278 + This file was extended by smproxy $as_me 1.0.7, which was 11235 11279 generated by GNU Autoconf 2.69. Invocation command line was 11236 11280 11237 11281 CONFIG_FILES = $CONFIG_FILES ··· 11291 11335 Configuration commands: 11292 11336 $config_commands 11293 11337 11294 - Report bugs to <https://bugs.freedesktop.org/enter_bug.cgi?product=xorg>." 11338 + Report bugs to <https://gitlab.freedesktop.org/xorg/app/smproxy/issues>." 11295 11339 11296 11340 _ACEOF 11297 11341 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 11298 11342 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" 11299 11343 ac_cs_version="\\ 11300 - smproxy config.status 1.0.6 11344 + smproxy config.status 1.0.7 11301 11345 configured by $0, generated by GNU Autoconf 2.69, 11302 11346 with options \\"\$ac_cs_config\\" 11303 11347

+3 -3

app/smproxy/configure.ac

··· 22 22 23 23 # Initialize Autoconf 24 24 AC_PREREQ([2.60]) 25 - AC_INIT([smproxy], [1.0.6], 26 - [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], [smproxy]) 25 + AC_INIT([smproxy], [1.0.7], 26 + [https://gitlab.freedesktop.org/xorg/app/smproxy/issues], [smproxy]) 27 27 AC_CONFIG_SRCDIR([Makefile.am]) 28 28 AC_CONFIG_HEADERS([config.h]) 29 29 30 30 # Initialize Automake 31 - AM_INIT_AUTOMAKE([foreign dist-bzip2]) 31 + AM_INIT_AUTOMAKE([foreign dist-xz]) 32 32 33 33 # Set common system defines for POSIX extensions, such as _GNU_SOURCE 34 34 # Must be called before any macros that run the compiler (like

+1

app/smproxy/man/Makefile.in

··· 222 222 prefix = @prefix@ 223 223 program_transform_name = @program_transform_name@ 224 224 psdir = @psdir@ 225 + runstatedir = @runstatedir@ 225 226 sbindir = @sbindir@ 226 227 sharedstatedir = @sharedstatedir@ 227 228 srcdir = @srcdir@

+16 -20

app/smproxy/save.c

··· 89 89 static int 90 90 write_byte (FILE *file, unsigned char b) 91 91 { 92 - if (fwrite ((char *) &b, 1, 1, file) != 1) 92 + if (fwrite (&b, 1, 1, file) != 1) 93 93 return 0; 94 94 return 1; 95 95 } ··· 102 102 103 103 file_short[0] = (s & (unsigned)0xff00) >> 8; 104 104 file_short[1] = s & 0xff; 105 - if (fwrite ((char *) file_short, (int) sizeof (file_short), 1, file) != 1) 105 + if (fwrite (file_short, sizeof (file_short), 1, file) != 1) 106 106 return 0; 107 107 return 1; 108 108 } ··· 113 113 { 114 114 if (string) 115 115 { 116 - unsigned char count = strlen (string); 116 + size_t count = strlen (string); 117 117 118 - if (write_byte (file, count) == 0) 118 + if (write_byte (file, (unsigned char)count) == 0) 119 119 return 0; 120 - if (fwrite (string, (int) sizeof (char), (int) count, file) != count) 120 + if (fwrite (string, sizeof (char), count, file) != count) 121 121 return 0; 122 122 } 123 123 else ··· 134 134 static int 135 135 read_byte(FILE *file, unsigned char *bp) 136 136 { 137 - if (fread ((char *) bp, 1, 1, file) != 1) 137 + if (fread (bp, 1, 1, file) != 1) 138 138 return 0; 139 139 return 1; 140 140 } ··· 145 145 { 146 146 unsigned char file_short[2]; 147 147 148 - if (fread ((char *) file_short, (int) sizeof (file_short), 1, file) != 1) 148 + if (fread (file_short, sizeof (file_short), 1, file) != 1) 149 149 return 0; 150 150 *shortp = file_short[0] * 256 + file_short[1]; 151 151 return 1; ··· 163 163 if (len == 0) { 164 164 data = NULL; 165 165 } else { 166 - data = (char *) malloc ((unsigned) len + 1); 166 + data = malloc ((size_t) len + 1); 167 167 if (!data) 168 168 return 0; 169 - if (fread (data, (int) sizeof (char), (int) len, file) != len) { 169 + if (fread (data, sizeof (char), (size_t) len, file) != len) { 170 170 free (data); 171 171 return 0; 172 172 } ··· 200 200 int 201 201 WriteProxyFileEntry(FILE *proxyFile, WinInfo *theWindow) 202 202 { 203 - int i; 204 - 205 203 if (!write_counted_string (proxyFile, theWindow->client_id)) 206 204 return 0; 207 205 if (!write_counted_string (proxyFile, theWindow->class.res_name)) ··· 220 218 { 221 219 if (!write_byte (proxyFile, (char) theWindow->wm_command_count)) 222 220 return 0; 223 - for (i = 0; i < theWindow->wm_command_count; i++) 221 + for (int i = 0; i < theWindow->wm_command_count; i++) 224 222 if (!write_counted_string (proxyFile, theWindow->wm_command[i])) 225 223 return 0; 226 224 } ··· 236 234 unsigned char byte; 237 235 int i; 238 236 239 - *pentry = entry = (ProxyFileEntry *) malloc ( 240 - sizeof (ProxyFileEntry)); 237 + *pentry = entry = malloc (sizeof (ProxyFileEntry)); 241 238 if (!*pentry) 242 239 return 0; 243 240 ··· 266 263 entry->wm_command = NULL; 267 264 else 268 265 { 269 - entry->wm_command = (char **) malloc (entry->wm_command_count * 270 - sizeof (char *)); 266 + entry->wm_command = calloc (entry->wm_command_count, sizeof (char *)); 271 267 272 268 if (!entry->wm_command) 273 269 goto give_up; ··· 297 293 if (entry->wm_command[i]) 298 294 free (entry->wm_command[i]); 299 295 } 300 - free ((char *) entry->wm_command); 296 + free (entry->wm_command); 301 297 } 302 298 303 - free ((char *) entry); 299 + free (entry); 304 300 *pentry = NULL; 305 301 306 302 return 0; ··· 454 450 strcmp (theWindow->class.res_class, ptr->class.res_class) == 0 && 455 451 strcmp (theWindow->wm_name, ptr->wm_name) == 0) 456 452 { 457 - int i; 458 - 459 453 if (theWindow->wm_command_count == ptr->wm_command_count) 460 454 { 455 + int i; 456 + 461 457 for (i = 0; i < theWindow->wm_command_count; i++) 462 458 if (strcmp (theWindow->wm_command[i], 463 459 ptr->wm_command[i]) != 0)

+28 -22

app/smproxy/smproxy.c

··· 28 28 #include "smproxy.h" 29 29 #include <unistd.h> 30 30 #include <X11/Xmu/WinUtil.h> 31 + #include <limits.h> 32 + 33 + #ifndef HOST_NAME_MAX 34 + #define HOST_NAME_MAX 256 35 + #endif 31 36 32 37 static XtAppContext appContext; 33 38 static Display *disp; ··· 70 75 static void ShutdownCancelledCB ( SmcConn smcConn, SmPointer clientData ); 71 76 static void ProcessIceMsgProc ( XtPointer client_data, int *source, XtInputId *id ); 72 77 static void NullIceErrorHandler ( IceConn iceConn, Bool swap, 73 - int offendingMinorOpCode, 78 + int offendingMinorOpcode, 74 79 unsigned long offendingSequence, 75 80 int errorClass, int severity, IcePointer values ); 76 81 static void ConnectClientToSM ( WinInfo *winInfo ); ··· 98 103 { 99 104 Atom *protocols; 100 105 int numProtocols; 101 - int i, found; 106 + int found; 102 107 103 108 protocols = NULL; 104 109 ··· 109 114 110 115 if (protocols != NULL) 111 116 { 112 - for (i = 0; i < numProtocols; i++) 117 + for (int i = 0; i < numProtocols; i++) { 113 118 if (protocols[i] == wmSaveYourselfAtom) 114 119 found = 1; 120 + } 115 121 116 122 XFree (protocols); 117 123 } ··· 198 204 * will have a WM_CLIENT_MACHINE that is not fully quantified. 199 205 * For example, we might get "excon" instead of "excon.x.org". 200 206 * This really stinks. The best we can do is tag on our own 201 - * domain name. 207 + * domain name, if we can - if not, the unquantified name is 208 + * better than nothing. 202 209 */ 203 210 204 211 if (strchr (name, '.') != NULL) ··· 208 215 } 209 216 else 210 217 { 211 - char hostnamebuf[80]; 218 + char hostnamebuf[HOST_NAME_MAX + 1] = { 0 }; 212 219 char *firstDot; 213 220 214 - gethostname (hostnamebuf, sizeof hostnamebuf); 215 - firstDot = strchr (hostnamebuf, '.'); 221 + if (gethostname (hostnamebuf, sizeof hostnamebuf) == 0) 222 + firstDot = strchr (hostnamebuf, '.'); 223 + else 224 + firstDot = NULL; 216 225 217 226 if (!firstDot) 218 227 { ··· 225 234 226 235 if (asprintf (&newptr, "%s.%s", name, firstDot + 1) == -1) { 227 236 *newstring = 0; 228 - return NULL; 237 + return (name); 229 238 } 230 239 *newstring = 1; 231 240 return (newptr); ··· 240 249 { 241 250 SmProp prop1, prop2, prop3, *props[3]; 242 251 SmPropValue prop1val, prop2val, prop3val; 243 - int i; 244 252 245 253 if (!winInfo->got_first_save_yourself) 246 254 { ··· 290 298 prop1.type = SmLISTofARRAY8; 291 299 prop1.num_vals = winInfo->wm_command_count; 292 300 293 - prop1.vals = (SmPropValue *) malloc ( 294 - winInfo->wm_command_count * sizeof (SmPropValue)); 301 + prop1.vals = calloc (winInfo->wm_command_count, sizeof (SmPropValue)); 295 302 296 303 if (!prop1.vals) 297 304 { ··· 299 306 return; 300 307 } 301 308 302 - for (i = 0; i < winInfo->wm_command_count; i++) 309 + for (int i = 0; i < winInfo->wm_command_count; i++) 303 310 { 304 311 prop1.vals[i].value = (SmPointer) winInfo->wm_command[i]; 305 312 prop1.vals[i].length = strlen (winInfo->wm_command[i]); ··· 315 322 316 323 SmcSetProperties (winInfo->smc_conn, 2, props); 317 324 318 - free ((char *) prop1.vals); 325 + free (prop1.vals); 319 326 320 327 /* 321 328 * If the client doesn't support WM_SAVE_YOURSELF, we should ··· 574 581 if (LookupWindow (window, NULL, NULL)) 575 582 return (NULL); 576 583 577 - newptr = (WinInfo *) malloc (sizeof (WinInfo)); 584 + newptr = malloc (sizeof (WinInfo)); 578 585 579 586 if (newptr == NULL) 580 587 return (NULL); ··· 884 891 SmProp prop1, prop2, prop3, *props[3]; 885 892 SmPropValue prop1val, prop2val, prop3val; 886 893 char *discardCommand; 887 - int numVals, i; 894 + int numVals; 888 895 static int first_time = 1; 889 896 890 897 if (first_time) ··· 932 939 prop1.name = SmRestartCommand; 933 940 prop1.type = SmLISTofARRAY8; 934 941 935 - prop1.vals = (SmPropValue *) malloc ( 936 - (Argc + 4) * sizeof (SmPropValue)); 942 + prop1.vals = calloc ((Argc + 4), sizeof (SmPropValue)); 937 943 938 944 if (!prop1.vals) 939 945 { ··· 943 949 944 950 numVals = 0; 945 951 946 - for (i = 0; i < Argc; i++) 952 + for (int i = 0; i < Argc; i++) 947 953 { 948 954 if (strcmp (Argv[i], "-clientId") == 0 || 949 955 strcmp (Argv[i], "-restore") == 0) ··· 987 993 props[1] = &prop2; 988 994 989 995 SmcSetProperties (smcConn, 2, props); 990 - free ((char *) prop1.vals); 996 + free (prop1.vals); 991 997 free (discardCommand); 992 998 993 999 finishUp: ··· 1111 1117 static void 1112 1118 CheckForExistingWindows(Window root) 1113 1119 { 1114 - Window dontCare1, dontCare2, *children, client_window; 1120 + Window dontCare1, dontCare2, *children; 1115 1121 unsigned int nchildren, i; 1116 - XCreateWindowEvent event; 1117 1122 1118 1123 /* 1119 1124 * We query the root tree for all windows created thus far. ··· 1126 1131 1127 1132 for (i = 0; i < nchildren; i++) 1128 1133 { 1129 - event.window = children[i]; 1134 + Window client_window; 1135 + XCreateWindowEvent event = { .window = children[i] }; 1130 1136 1131 1137 HandleCreate (&event); 1132 1138

Configure Feed

Configure Feed