commit 3e15d8af8e164642097eeb42bbfa3078605fea5c
parent 26dd98b7b41fb47962bc862a55503ab06548c710
Author: Raymond Li <hi@raymond.li>
Date: Mon, 15 Feb 2021 00:31:38 -0500
Merge branch 'master' into bar-count
Diffstat:
4 files changed, 12 insertions(+), 20 deletions(-)
diff --git a/.gitignore b/.gitignore
@@ -3,7 +3,7 @@ i3lock
tags
*.swp
*.gz
-/pam/i3lock
+*~
################################################################################
# https://raw.githubusercontent.com/github/gitignore/master/Autotools.gitignore
@@ -31,4 +31,3 @@ Makefile.in
/install-sh
/missing
/stamp-h1
-*.in~
diff --git a/configure.ac b/configure.ac
@@ -2,7 +2,7 @@
# Run autoreconf -fi to generate a configure script from this file.
AC_PREREQ([2.69])
-AC_INIT([i3lock-color], [m4_esyscmd_s([cat I3LOCK_VERSION])], [https://github.com/Raymo11/i3lock-color/issues])
+AC_INIT([i3lock-color],[m4_esyscmd_s([cat I3LOCK_VERSION])],[https://github.com/Raymo11/i3lock-color/issues])
# For AX_EXTEND_SRCDIR
AX_ENABLE_BUILDDIR
AM_INIT_AUTOMAKE([foreign subdir-objects -Wall no-dist-gzip dist-bzip2])
@@ -50,7 +50,7 @@ dnl is_release must be lowercase because AX_CHECK_ENABLE_DEBUG calls m4_tolower
dnl on its fourth argument.
AX_CHECK_ENABLE_DEBUG([yes], , [UNUSED_NDEBUG], [$is_release])
-AC_PROG_CC_C99
+AC_PROG_CC
# For strnlen() and vasprintf().
AC_USE_SYSTEM_EXTENSIONS
@@ -76,17 +76,10 @@ AC_SEARCH_LIBS([ev_run], [ev], , [AC_MSG_FAILURE([cannot find the required ev_ru
AC_SEARCH_LIBS([shm_open], [rt])
-# Use system-auth instead of login on Arch
-if [[ -f /etc/arch-release ]]; then
- echo "Using PAM for Arch"
- sed -i "s/^#auth include system-auth/auth include system-auth/g" ../pam/i3lock
- sed -i "s/^auth include login/#auth include login/g" ../pam/i3lock
-fi
-
-# Use system-auth instead of login on Gentoo
-if [[ -f /etc/gentoo-release ]]; then
- echo "Using PAM for Gentoo"
- sed -i "s/^#auth include system-auth/auth include system-auth/g" ../pam/i3lock
+# Use system-local-login instead of login on Arch and Gentoo
+if [[ -f /etc/arch-release ]] || [[ -f /etc/gentoo-release ]]; then
+ echo "Using PAM for Arch/Gentoo"
+ sed -i "s/^#auth include system-local-login/auth include system-local-login/g" ../pam/i3lock
sed -i "s/^auth include login/#auth include login/g" ../pam/i3lock
fi
diff --git a/pam/i3lock b/pam/i3lock
@@ -1,9 +1,9 @@
#
-# PAM configuration file for the i3lock-color screen locker. By default, it
-# includes the 'system-auth' configuration file (see /etc/pam.d/system-auth)
-# for Arch and Gentoo and 'login' for Debian. Note that upstream uses only
-# 'login', which breaks on Arch and Gentoo.
+# PAM configuration file for the i3lock-color screen locker. By default, it includes
+# the 'system-local-login' configuration file (see /etc/pam.d/system-local-login)
+# for Arch and Gentoo and 'login' for Debian. Note that upstream uses only 'login',
+# which doesn't work on Arch and Gentoo.
#
-#auth include system-auth # For Arch/Gentoo
+#auth include system-local-login # For Arch/Gentoo
auth include login # For Debian
diff --git a/tinyexpr.c b/tinyexpr.c
