From a8583d00fd4647f59a56bb93a2514038447beb12 Mon Sep 17 00:00:00 2001 From: Alan Coopersmith Date: Sat, 31 May 2014 21:38:41 -0700 Subject: [PATCH 1/7] configure: Drop AM_MAINTAINER_MODE Signed-off-by: Alan Coopersmith --- autogen.sh | 2 +- configure.ac | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/autogen.sh b/autogen.sh index efe433f..ffc6403 100755 --- a/autogen.sh +++ b/autogen.sh @@ -12,5 +12,5 @@ cd $ORIGDIR || exit $? git config --local --get format.subjectPrefix >/dev/null 2>&1 || git config --local format.subjectPrefix "PATCH app/scripts" -$srcdir/configure --enable-maintainer-mode "$@" +$srcdir/configure "$@" diff --git a/configure.ac b/configure.ac index 6448fd5..7e05702 100644 --- a/configure.ac +++ b/configure.ac @@ -24,7 +24,6 @@ dnl Process this file with autoconf to create configure. AC_PREREQ([2.60]) AC_INIT(scripts,[1.0.1], [https://gitlab.freedesktop.org/xorg/app/scripts/issues],scripts) AM_INIT_AUTOMAKE([foreign dist-xz]) -AM_MAINTAINER_MODE # Require X.Org macros 1.8 or later for MAN_SUBSTS set by XORG_MANPAGE_SECTIONS m4_ifndef([XORG_MACROS_VERSION], -- GitLab From e5602cd46d763b5b245e0864c1e7d444b6d2adb7 Mon Sep 17 00:00:00 2001 From: Alan Coopersmith Date: Sun, 24 Jul 2022 11:58:01 -0700 Subject: [PATCH 2/7] config: Add missing AC_CONFIG_SRCDIR Regroup AC statements under the Autoconf initialization section. Regroup AM statements under the Automake initialization section. Signed-off-by: Alan Coopersmith --- configure.ac | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/configure.ac b/configure.ac index 7e05702..bc80acb 100644 --- a/configure.ac +++ b/configure.ac @@ -21,8 +21,12 @@ dnl PERFORMANCE OF THIS SOFTWARE. dnl dnl Process this file with autoconf to create configure. +# Initialize Autoconf AC_PREREQ([2.60]) AC_INIT(scripts,[1.0.1], [https://gitlab.freedesktop.org/xorg/app/scripts/issues],scripts) +AC_CONFIG_SRCDIR([Makefile.am]) + +# Initialize Automake AM_INIT_AUTOMAKE([foreign dist-xz]) # Require X.Org macros 1.8 or later for MAN_SUBSTS set by XORG_MANPAGE_SECTIONS -- GitLab From b42ef62ec2cca47830be94c3b9dba102eddadfc1 Mon Sep 17 00:00:00 2001 From: Alan Coopersmith Date: Sat, 31 May 2014 21:39:32 -0700 Subject: [PATCH 3/7] autogen.sh: Honor NOCONFIGURE=1 See http://people.gnome.org/~walters/docs/build-api.txt Signed-off-by: Alan Coopersmith --- autogen.sh | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/autogen.sh b/autogen.sh index ffc6403..428602d 100755 --- a/autogen.sh +++ b/autogen.sh @@ -12,5 +12,6 @@ cd $ORIGDIR || exit $? git config --local --get format.subjectPrefix >/dev/null 2>&1 || git config --local format.subjectPrefix "PATCH app/scripts" -$srcdir/configure "$@" - +if test -z "$NOCONFIGURE"; then + $srcdir/configure "$@" +fi -- GitLab From 6e6fbc4a0d7804484f6b2fec7744fd87b2c331dd Mon Sep 17 00:00:00 2001 From: Peter Hutterer Date: Tue, 24 Jan 2017 10:32:07 +1000 Subject: [PATCH 4/7] autogen.sh: use exec instead of waiting for configure to finish Syncs the invocation of configure with the one from the server. Signed-off-by: Peter Hutterer Reviewed-by: Emil Velikov Signed-off-by: Alan Coopersmith --- autogen.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/autogen.sh b/autogen.sh index 428602d..e19cf07 100755 --- a/autogen.sh +++ b/autogen.sh @@ -13,5 +13,5 @@ git config --local --get format.subjectPrefix >/dev/null 2>&1 || git config --local format.subjectPrefix "PATCH app/scripts" if test -z "$NOCONFIGURE"; then - $srcdir/configure "$@" + exec $srcdir/configure "$@" fi -- GitLab From 58c826eea039ac3f5e5d85d00c3dcb58b1b05b4c Mon Sep 17 00:00:00 2001 From: Emil Velikov Date: Mon, 9 Mar 2015 12:00:52 +0000 Subject: [PATCH 5/7] autogen.sh: use quoted string variables Place quotes around the $srcdir, $ORIGDIR and $0 variables to prevent fall-outs, when they contain space. Signed-off-by: Emil Velikov Reviewed-by: Peter Hutterer Signed-off-by: Peter Hutterer Signed-off-by: Alan Coopersmith --- autogen.sh | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/autogen.sh b/autogen.sh index e19cf07..211b1ec 100755 --- a/autogen.sh +++ b/autogen.sh @@ -1,17 +1,17 @@ #! /bin/sh -srcdir=`dirname $0` +srcdir=`dirname "$0"` test -z "$srcdir" && srcdir=. ORIGDIR=`pwd` -cd $srcdir +cd "$srcdir" autoreconf -v --install || exit 1 -cd $ORIGDIR || exit $? +cd "$ORIGDIR" || exit $? git config --local --get format.subjectPrefix >/dev/null 2>&1 || git config --local format.subjectPrefix "PATCH app/scripts" if test -z "$NOCONFIGURE"; then - exec $srcdir/configure "$@" + exec "$srcdir"/configure "$@" fi -- GitLab From d93f991c90eb5dc4dae7085bd37757cd99f1ba74 Mon Sep 17 00:00:00 2001 From: Alan Coopersmith Date: Tue, 2 Aug 2022 12:34:04 -0700 Subject: [PATCH 6/7] Fix spelling/wording issues Found by using: codespell --builtin clear,rare,usage,informal,code,names Signed-off-by: Alan Coopersmith --- README.md | 2 +- xauth_switch_to_sun-des-1 | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/README.md b/README.md index 02d098e..5c4aba4 100644 --- a/README.md +++ b/README.md @@ -4,7 +4,7 @@ Xorg mailing list: https://lists.x.org/mailman/listinfo/xorg -The master development code repository can be found at: +The primary development code repository can be found at: https://gitlab.freedesktop.org/xorg/app/scripts diff --git a/xauth_switch_to_sun-des-1 b/xauth_switch_to_sun-des-1 index 13d8fb9..b2a68d8 100644 --- a/xauth_switch_to_sun-des-1 +++ b/xauth_switch_to_sun-des-1 @@ -1,6 +1,6 @@ #!/bin/ksh # X11 MIT-MAGIC-COOKIE to SUN-DES-1 auth. -# this script switched the current Xservers authentification +# this script switched the current Xservers authentication # (usually MIT-MAGIC-COOKIE-1) to SUN-DES-1. # # @@ -120,8 +120,8 @@ fi # grant access for current user and for user root # (a bug in /usr/dt/bin/dtaction requires this for user "root", too - -# Solaris 7/8 dtaction runns setuid root and opens a display connection -# before chaning the EUID to the "destination uid"... ;-( ). +# Solaris 7/8 dtaction runs setuid root and opens a display connection +# before changing the EUID to the "destination uid"... ;-( ). xhost +${LOGNAME}@ +$(user2netname root) # get X server principal(=user) @@ -134,7 +134,7 @@ xhost +${LOGNAME}@ +$(user2netname root) principal_list="" # you can add "most common" principals here... fallback_principal_list="" # you can add "fallback" principals here # (for example, principals for Xterminals (where - # the Xserver always runns under the same UID) + # the Xserver always runs under the same UID) # which use SUN-DES-1) for i in $(pgrep -f ".*X.* :$displaynum*") ; do principal_list="$(user2netname `getUserOfPID $i`) ${principal_list}" -- GitLab From da69b91806f7f0840f9e9fff4a01088ecac17d19 Mon Sep 17 00:00:00 2001 From: Alan Coopersmith Date: Thu, 28 Jul 2022 17:30:21 -0700 Subject: [PATCH 7/7] gitlab CI: stop requiring Signed-off-by in commits Signed-off-by: Alan Coopersmith --- .gitlab-ci.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 132448d..fc498d5 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -35,14 +35,14 @@ variables: # -# Verify that commit messages are as expected, signed-off, etc. +# Verify that commit messages are as expected # check-commits: extends: - .fdo.ci-fairy stage: prep script: - - ci-fairy check-commits --signed-off-by --junit-xml=results.xml + - ci-fairy check-commits --junit-xml=results.xml except: - master@xorg/app/scripts variables: -- GitLab