diff options
| author | Simeon Simeonov | 2020-04-15 14:00:52 +0200 |
|---|---|---|
| committer | Simeon Simeonov | 2020-04-15 14:00:52 +0200 |
| commit | a3abcefc4aaae3fba272c4181826c951bf179353 (patch) | |
| tree | 901afed57481e26daef93562a6d27e68cb068081 | |
| parent | f12c8e4e28951b88e788cd1f8b446886707d4d04 (diff) | |
Fix a PAM related bug and update README.md1.2.12a
| -rw-r--r-- | CHANGELOG | 6 | ||||
| -rw-r--r-- | I3LOCK_VERSION | 2 | ||||
| -rw-r--r-- | README.md | 16 | ||||
| -rw-r--r-- | configure.ac | 2 | ||||
| -rw-r--r-- | i3lock.c | 4 |
5 files changed, 26 insertions, 4 deletions
| @@ -1,3 +1,9 @@ | |||
| 1 | 2020-04-15 i3lock-extended 1.2.12a | ||
| 2 | |||
| 3 | • Fix a PAM related bug | ||
| 4 | • Update README.md | ||
| 5 | |||
| 6 | |||
| 1 | 2020-03-19 i3lock-extended 1.2.12 | 7 | 2020-03-19 i3lock-extended 1.2.12 |
| 2 | 8 | ||
| 3 | • Initial import and functionality | 9 | • Initial import and functionality |
diff --git a/I3LOCK_VERSION b/I3LOCK_VERSION index f2ae0b4..91a7521 100644 --- a/I3LOCK_VERSION +++ b/I3LOCK_VERSION | |||
| @@ -1 +1 @@ | |||
| 1.2.12 | 1.2.12a | ||
| @@ -39,8 +39,20 @@ extended revision if used]. | |||
| 39 | ### Gentoo | 39 | ### Gentoo |
| 40 | 40 | ||
| 41 | ```bash | 41 | ```bash |
| 42 | layman -a sgs | 42 | # layman -a sgs |
| 43 | emerge x11-misc/i3lock-extended | 43 | # emerge x11-misc/i3lock-extended |
| 44 | ``` | ||
| 45 | |||
| 46 | ### Fedora | ||
| 47 | |||
| 48 | Set up a custom repo as described: https://pkg.pichove.org/Fedora/README.txt | ||
| 49 | |||
| 50 | Key fingerprint: A664 5797 661E 2F47 3DD3 FF06 BCE7 0555 C3BB 08F7 | ||
| 51 | |||
| 52 | Install the package: | ||
| 53 | |||
| 54 | ```bash | ||
| 55 | $ sudo dnf install i3lock-extended | ||
| 44 | ``` | 56 | ``` |
| 45 | 57 | ||
| 46 | 58 | ||
diff --git a/configure.ac b/configure.ac index 5fe3e33..79f23a9 100644 --- a/configure.ac +++ b/configure.ac | |||
| @@ -2,7 +2,7 @@ | |||
| 2 | # Run autoreconf -fi to generate a configure script from this file. | 2 | # Run autoreconf -fi to generate a configure script from this file. |
| 3 | 3 | ||
| 4 | AC_PREREQ([2.69]) | 4 | AC_PREREQ([2.69]) |
| 5 | AC_INIT([i3lock-extended], [1.2.12], [https://simeon.simeonov.no]) | 5 | AC_INIT([i3lock-extended], [1.2.12a], [https://simeon.simeonov.no]) |
| 6 | # For AX_EXTEND_SRCDIR | 6 | # For AX_EXTEND_SRCDIR |
| 7 | AX_ENABLE_BUILDDIR | 7 | AX_ENABLE_BUILDDIR |
| 8 | AM_INIT_AUTOMAKE([foreign subdir-objects -Wall no-dist-gzip dist-bzip2]) | 8 | AM_INIT_AUTOMAKE([foreign subdir-objects -Wall no-dist-gzip dist-bzip2]) |
| @@ -1384,7 +1384,11 @@ int main(int argc, char *argv[]) { | |||
| 1384 | 1384 | ||
| 1385 | #ifndef __OpenBSD__ | 1385 | #ifndef __OpenBSD__ |
| 1386 | /* Initialize PAM */ | 1386 | /* Initialize PAM */ |
| 1387 | #ifdef EXTRAS | ||
| 1388 | if ((ret = pam_start("i3lock-extended", username, &conv, &pam_handle)) != PAM_SUCCESS) | ||
| 1389 | #else | ||
| 1387 | if ((ret = pam_start("i3lock", username, &conv, &pam_handle)) != PAM_SUCCESS) | 1390 | if ((ret = pam_start("i3lock", username, &conv, &pam_handle)) != PAM_SUCCESS) |
| 1391 | #endif | ||
| 1388 | errx(EXIT_FAILURE, "PAM: %s", pam_strerror(pam_handle, ret)); | 1392 | errx(EXIT_FAILURE, "PAM: %s", pam_strerror(pam_handle, ret)); |
| 1389 | 1393 | ||
| 1390 | if ((ret = pam_set_item(pam_handle, PAM_TTY, getenv("DISPLAY"))) != PAM_SUCCESS) | 1394 | if ((ret = pam_set_item(pam_handle, PAM_TTY, getenv("DISPLAY"))) != PAM_SUCCESS) |
