From a3abcefc4aaae3fba272c4181826c951bf179353 Mon Sep 17 00:00:00 2001
From: Simeon Simeonov
Date: Wed, 15 Apr 2020 14:00:52 +0200
Subject: Fix a PAM related bug and update README.md

---
 CHANGELOG      |  6 ++++++
 I3LOCK_VERSION |  2 +-
 README.md      | 16 ++++++++++++++--
 configure.ac   |  2 +-
 i3lock.c       |  4 ++++
 5 files changed, 26 insertions(+), 4 deletions(-)

diff --git a/CHANGELOG b/CHANGELOG
index 85615ab..bed8d7f 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,9 @@
+2020-04-15 i3lock-extended 1.2.12a
+
+ • Fix a PAM related bug
+ • Update README.md
+
+
 2020-03-19 i3lock-extended 1.2.12
 
  • 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
diff --git a/README.md b/README.md
index 47f225d..a0576ab 100644
--- a/README.md
+++ b/README.md
@@ -39,8 +39,20 @@ extended revision if used].
 ### Gentoo
 
    ```bash
-   layman -a sgs
-   emerge x11-misc/i3lock-extended
+   # layman -a sgs
+   # emerge x11-misc/i3lock-extended
+   ```
+
+### Fedora
+
+Set up a custom repo as described: https://pkg.pichove.org/Fedora/README.txt
+
+Key fingerprint: A664 5797 661E 2F47 3DD3  FF06 BCE7 0555 C3BB 08F7
+
+Install the package:
+
+   ```bash
+   $ sudo dnf install i3lock-extended
    ```
 
 
diff --git a/configure.ac b/configure.ac
index 5fe3e33..79f23a9 100644
--- 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-extended], [1.2.12], [https://simeon.simeonov.no])
+AC_INIT([i3lock-extended], [1.2.12a], [https://simeon.simeonov.no])
 # For AX_EXTEND_SRCDIR
 AX_ENABLE_BUILDDIR
 AM_INIT_AUTOMAKE([foreign subdir-objects -Wall no-dist-gzip dist-bzip2])
diff --git a/i3lock.c b/i3lock.c
index 7f8763a..4ef0f73 100644
--- a/i3lock.c
+++ b/i3lock.c
@@ -1384,7 +1384,11 @@ int main(int argc, char *argv[]) {
 
 #ifndef __OpenBSD__
     /* Initialize PAM */
+#ifdef EXTRAS
+    if ((ret = pam_start("i3lock-extended", username, &conv, &pam_handle)) != PAM_SUCCESS)
+#else
     if ((ret = pam_start("i3lock", username, &conv, &pam_handle)) != PAM_SUCCESS)
+#endif
         errx(EXIT_FAILURE, "PAM: %s", pam_strerror(pam_handle, ret));
 
     if ((ret = pam_set_item(pam_handle, PAM_TTY, getenv("DISPLAY"))) != PAM_SUCCESS)
-- 
cgit v1.3