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
-
2dc0a34e
by Timo Aaltonen at 2021-08-18T10:25:23+03:00
-
0051d887
by Timo Aaltonen at 2021-08-18T10:34:19+03:00
4 changed files:
- debian/changelog
- debian/control
- debian/local/Xsession
- debian/local/Xsession.d/90x11-common_ssh-agent
Changes:
| 1 |
+xorg (1:7.7+23) UNRELEASED; urgency=medium
|
|
| 2 |
+ |
|
| 3 |
+ * Xsession: Use mktemp instead of tempfile. (Closes: #992385)
|
|
| 4 |
+ * control: Drop dependency on dummy package libgl1-mesa-glx. (Closes:
|
|
| 5 |
+ #930609)
|
|
| 6 |
+ * 90x11-common_ssh-agent: Clean up. (Closes: #861071)
|
|
| 7 |
+ |
|
| 8 |
+ -- Timo Aaltonen <tjaalton@debian.org> Wed, 18 Aug 2021 10:18:07 +0300
|
|
| 9 |
+ |
|
| 1 | 10 |
xorg (1:7.7+22) unstable; urgency=medium
|
| 2 | 11 |
|
| 3 | 12 |
[ Josh Triplett ]
|
| ... | ... | @@ -88,7 +88,7 @@ Package: xorg |
| 88 | 88 |
Architecture: any
|
| 89 | 89 |
Depends:
|
| 90 | 90 |
xserver-xorg (>= ${binary:Version}),
|
| 91 |
- libgl1-mesa-glx | libgl1,
|
|
| 91 |
+ libgl1,
|
|
| 92 | 92 |
libgl1-mesa-dri,
|
| 93 | 93 |
libglu1-mesa,
|
| 94 | 94 |
xfonts-base (>= 1:1.0.0-1),
|
| ... | ... | @@ -82,7 +82,7 @@ has_option() { |
| 82 | 82 |
if (umask 077 && touch "$ERRFILE") 2> /dev/null && [ -w "$ERRFILE" ] &&
|
| 83 | 83 |
[ ! -L "$ERRFILE" ]; then
|
| 84 | 84 |
chmod 600 "$ERRFILE"
|
| 85 |
-elif ERRFILE=$(tempfile 2> /dev/null); then
|
|
| 85 |
+elif ERRFILE=$(mktemp 2> /dev/null); then
|
|
| 86 | 86 |
if ! ln -sf "$ERRFILE" "${TMPDIR:=/tmp}/xsession-$USER"; then
|
| 87 | 87 |
message "warning: unable to symlink \"$TMPDIR/xsession-$USER\" to" \
|
| 88 | 88 |
"\"$ERRFILE\"; look for session log/errors in" \
|
| ... | ... | @@ -104,9 +104,9 @@ fi |
| 104 | 104 |
# Attempt to create a file of non-zero length in /tmp; a full filesystem can
|
| 105 | 105 |
# cause mysterious X session failures. We do not use touch, :, or test -w
|
| 106 | 106 |
# because they won't actually create a file with contents. We also let standard
|
| 107 |
-# error from tempfile and echo go to the error file to aid the user in
|
|
| 107 |
+# error from mktemp and echo go to the error file to aid the user in
|
|
| 108 | 108 |
# determining what went wrong.
|
| 109 |
-WRITE_TEST=$(tempfile)
|
|
| 109 |
+WRITE_TEST=$(mktemp)
|
|
| 110 | 110 |
if ! echo "*" >>"$WRITE_TEST"; then
|
| 111 | 111 |
message "warning: unable to write to ${WRITE_TEST%/*}; X session may exit" \
|
| 112 | 112 |
"with an error"
|
| ... | ... | @@ -7,18 +7,9 @@ SSHAGENT=/usr/bin/ssh-agent |
| 7 | 7 |
SSHAGENTARGS=
|
| 8 | 8 |
|
| 9 | 9 |
if has_option use-ssh-agent; then
|
| 10 |
- if [ -x "$SSHAGENT" ] && [ -z "$SSH_AUTH_SOCK" ] \
|
|
| 11 |
- && [ -z "$SSH2_AUTH_SOCK" ]; then
|
|
| 12 |
- STARTSSH=yes
|
|
| 13 |
- if [ -f /usr/bin/ssh-add1 ] && cmp -s $SSHAGENT /usr/bin/ssh-agent2; then
|
|
| 14 |
- # use ssh-agent2's ssh-agent1 compatibility mode
|
|
| 15 |
- SSHAGENTARGS=-1
|
|
| 16 |
- fi
|
|
| 10 |
+ if [ -x "$SSHAGENT" ] && [ -z "$SSH_AUTH_SOCK" ]; then
|
|
| 11 |
+ STARTUP="$SSHAGENT $SSHAGENTARGS ${TMPDIR:+env TMPDIR=$TMPDIR} $STARTUP"
|
|
| 17 | 12 |
fi
|
| 18 | 13 |
fi
|
| 19 | 14 |
|
| 20 |
-if [ -n "$STARTSSH" ]; then
|
|
| 21 |
- STARTUP="$SSHAGENT $SSHAGENTARGS ${TMPDIR:+env TMPDIR=$TMPDIR} $STARTUP"
|
|
| 22 |
-fi
|
|
| 23 |
- |
|
| 24 | 15 |
# vim:set ai et sts=2 sw=2 tw=80:
|