diff -Nru xorg-7.7+22ubuntu2/debian/changelog xorg-7.7+23ubuntu2/debian/changelog
--- xorg-7.7+22ubuntu2/debian/changelog	2021-10-07 10:27:07.000000000 +0000
+++ xorg-7.7+23ubuntu2/debian/changelog	2022-03-25 09:58:44.000000000 +0000
@@ -1,3 +1,28 @@
+xorg (1:7.7+23ubuntu2) jammy; urgency=high
+
+  * No change rebuild for ppc64el baseline bump.
+
+ -- Julian Andres Klode <juliank@ubuntu.com>  Fri, 25 Mar 2022 10:58:44 +0100
+
+xorg (1:7.7+23ubuntu1) jammy; urgency=medium
+
+  * Merge from Debian.
+
+ -- Timo Aaltonen <tjaalton@debian.org>  Tue, 19 Oct 2021 12:32:30 +0300
+
+xorg (1:7.7+23) unstable; urgency=medium
+
+  [ Timo Aaltonen ]
+  * Xsession: Use mktemp instead of tempfile. (Closes: #992385)
+  * control: Drop dependency on dummy package libgl1-mesa-glx. (Closes:
+    #930609)
+  * 90x11-common_ssh-agent: Clean up. (Closes: #861071)
+
+  [ Jochen Sprickerhof ]
+  * Replace 'which' by 'command -v'.
+
+ -- Timo Aaltonen <tjaalton@debian.org>  Wed, 18 Aug 2021 14:00:51 +0300
+
 xorg (1:7.7+22ubuntu2) impish; urgency=medium
 
   * No-change rebuild to build packages with zstd compression.
diff -Nru xorg-7.7+22ubuntu2/debian/control xorg-7.7+23ubuntu2/debian/control
--- xorg-7.7+22ubuntu2/debian/control	2021-02-15 10:52:24.000000000 +0000
+++ xorg-7.7+23ubuntu2/debian/control	2021-10-19 09:07:26.000000000 +0000
@@ -91,7 +91,7 @@
 Architecture: any
 Depends:
  xserver-xorg (>= ${binary:Version}),
- libgl1-mesa-glx | libgl1 [!armhf],
+ libgl1 [!armhf],
  libgl1-mesa-dri [!armhf],
  libglu1-mesa [!armhf],
  xfonts-base (>= 1:1.0.0-1),
diff -Nru xorg-7.7+22ubuntu2/debian/local/Xsession xorg-7.7+23ubuntu2/debian/local/Xsession
--- xorg-7.7+22ubuntu2/debian/local/Xsession	2021-02-15 10:52:44.000000000 +0000
+++ xorg-7.7+23ubuntu2/debian/local/Xsession	2021-10-19 09:04:11.000000000 +0000
@@ -15,7 +15,7 @@
   # is available and $DISPLAY is set
   MESSAGE="$PROGNAME: $*"
   echo "$MESSAGE" | fold -s -w ${COLUMNS:-80} >&2
-  if [ -n "$DISPLAY" ] && which xmessage > /dev/null 2>&1; then
+  if [ -n "$DISPLAY" ] && command -v xmessage > /dev/null 2>&1; then
     echo "$MESSAGE" | fold -s -w ${COLUMNS:-80} | xmessage -center -file -
   fi
 }
@@ -25,7 +25,7 @@
   # xmessage if it is available and $DISPLAY is set
   MESSAGE="$PROGNAME: $*"
   echo -n "$MESSAGE" | fold -s -w ${COLUMNS:-80} >&2;
-  if [ -n "$DISPLAY" ] && which xmessage > /dev/null 2>&1; then
+  if [ -n "$DISPLAY" ] && command -v xmessage > /dev/null 2>&1; then
     echo -n "$MESSAGE" | fold -s -w ${COLUMNS:-80} | xmessage -center -file -
   fi
 }
@@ -82,7 +82,7 @@
 if (umask 077 && touch "$ERRFILE") 2> /dev/null && [ -w "$ERRFILE" ] &&
   [ ! -L "$ERRFILE" ]; then
   chmod 600 "$ERRFILE"
-elif ERRFILE=$(tempfile 2> /dev/null); then
+elif ERRFILE=$(mktemp 2> /dev/null); then
   if ! ln -sf "$ERRFILE" "${TMPDIR:=/tmp}/xsession-$USER"; then
     message "warning: unable to symlink \"$TMPDIR/xsession-$USER\" to" \
              "\"$ERRFILE\"; look for session log/errors in" \
@@ -110,9 +110,9 @@
 # Attempt to create a file of non-zero length in /tmp; a full filesystem can
 # cause mysterious X session failures.  We do not use touch, :, or test -w
 # because they won't actually create a file with contents.  We also let standard
-# error from tempfile and echo go to the error file to aid the user in
+# error from mktemp and echo go to the error file to aid the user in
 # determining what went wrong.
-WRITE_TEST=$(tempfile)
+WRITE_TEST=$(mktemp)
 if ! echo "*" >>"$WRITE_TEST"; then
   message "warning: unable to write to ${WRITE_TEST%/*}; X session may exit" \
           "with an error"
diff -Nru xorg-7.7+22ubuntu2/debian/local/Xsession.d/20x11-common_process-args xorg-7.7+23ubuntu2/debian/local/Xsession.d/20x11-common_process-args
--- xorg-7.7+22ubuntu2/debian/local/Xsession.d/20x11-common_process-args	2020-10-15 13:59:26.000000000 +0000
+++ xorg-7.7+23ubuntu2/debian/local/Xsession.d/20x11-common_process-args	2021-10-19 09:04:11.000000000 +0000
@@ -33,7 +33,7 @@
         ;;
       *)
         # Specific program was requested.
-        STARTUP_FULL_PATH=$(/usr/bin/which "${1%% *}" || true)
+        STARTUP_FULL_PATH=$(command -v "${1%% *}" || true)
         if [ -n "$STARTUP_FULL_PATH" ] && [ -e "$STARTUP_FULL_PATH" ]; then
           if [ -x "$STARTUP_FULL_PATH" ]; then
             STARTUP="$1"
diff -Nru xorg-7.7+22ubuntu2/debian/local/Xsession.d/90x11-common_ssh-agent xorg-7.7+23ubuntu2/debian/local/Xsession.d/90x11-common_ssh-agent
--- xorg-7.7+22ubuntu2/debian/local/Xsession.d/90x11-common_ssh-agent	2020-10-09 08:13:51.000000000 +0000
+++ xorg-7.7+23ubuntu2/debian/local/Xsession.d/90x11-common_ssh-agent	2021-10-19 09:04:11.000000000 +0000
@@ -7,18 +7,9 @@
 SSHAGENTARGS=
 
 if has_option use-ssh-agent; then
-  if [ -x "$SSHAGENT" ] && [ -z "$SSH_AUTH_SOCK" ] \
-     && [ -z "$SSH2_AUTH_SOCK" ]; then
-    STARTSSH=yes
-    if [ -f /usr/bin/ssh-add1 ] && cmp -s $SSHAGENT /usr/bin/ssh-agent2; then
-      # use ssh-agent2's ssh-agent1 compatibility mode
-      SSHAGENTARGS=-1
-    fi
+  if [ -x "$SSHAGENT" ] && [ -z "$SSH_AUTH_SOCK" ]; then
+    STARTUP="$SSHAGENT $SSHAGENTARGS ${TMPDIR:+env TMPDIR=$TMPDIR} $STARTUP"
   fi
 fi
 
-if [ -n "$STARTSSH" ]; then
-  STARTUP="$SSHAGENT $SSHAGENTARGS ${TMPDIR:+env TMPDIR=$TMPDIR} $STARTUP"
-fi
-
 # vim:set ai et sts=2 sw=2 tw=80:
diff -Nru xorg-7.7+22ubuntu2/debian/x11-common.init xorg-7.7+23ubuntu2/debian/x11-common.init
--- xorg-7.7+22ubuntu2/debian/x11-common.init	2020-10-09 08:13:51.000000000 +0000
+++ xorg-7.7+23ubuntu2/debian/x11-common.init	2021-10-19 09:04:11.000000000 +0000
@@ -22,7 +22,7 @@
 
 do_restorecon () {
   # Restore file security context (SELinux).
-  if which restorecon >/dev/null 2>&1; then
+  if command -v restorecon >/dev/null 2>&1; then
     restorecon "$1"
   fi
 }