Timo Aaltonen pushed to branch debian-unstable at X Strike Force / xorg
Commits: 039fbd42 by Timo Aaltonen at 2021-08-18T10:20:08+03:00 Xsession: Use mktemp instead of tempfile. (Closes: #992385) - - - - - 2dc0a34e by Timo Aaltonen at 2021-08-18T10:25:23+03:00 control: Drop dependency on dummy package libgl1-mesa-glx. (Closes: #930609) - - - - - 0051d887 by Timo Aaltonen at 2021-08-18T10:34:19+03:00 90x11-common_ssh-agent: Clean up. (Closes: #861071) - - - - - 4 changed files: - debian/changelog - debian/control - debian/local/Xsession - debian/local/Xsession.d/90x11-common_ssh-agent Changes: ===================================== debian/changelog ===================================== @@ -1,3 +1,12 @@ +xorg (1:7.7+23) UNRELEASED; urgency=medium + + * 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) + + -- Timo Aaltonen <[email protected]> Wed, 18 Aug 2021 10:18:07 +0300 + xorg (1:7.7+22) unstable; urgency=medium [ Josh Triplett ] ===================================== debian/control ===================================== @@ -88,7 +88,7 @@ Package: xorg Architecture: any Depends: xserver-xorg (>= ${binary:Version}), - libgl1-mesa-glx | libgl1, + libgl1, libgl1-mesa-dri, libglu1-mesa, xfonts-base (>= 1:1.0.0-1), ===================================== debian/local/Xsession ===================================== @@ -82,7 +82,7 @@ has_option() { 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" \ @@ -104,9 +104,9 @@ fi # 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" ===================================== debian/local/Xsession.d/90x11-common_ssh-agent ===================================== @@ -7,18 +7,9 @@ SSHAGENT=/usr/bin/ssh-agent 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: View it on GitLab: https://salsa.debian.org/xorg-team/xorg/-/compare/5d639e5e15d2bace1130cc052c8a2378ac422292...0051d887e41cdea6f291c83bd25fd8f1efdaed9e -- View it on GitLab: https://salsa.debian.org/xorg-team/xorg/-/compare/5d639e5e15d2bace1130cc052c8a2378ac422292...0051d887e41cdea6f291c83bd25fd8f1efdaed9e You're receiving this email because of your account on salsa.debian.org.
