up to 1.1.8

diff --git a/pam.spec b/pam.spec
index 1d402e4450289609794e22d16bfa7d8e98546578..04e5f3c05ebd9e678aec2645ac80589c831912ff 100644 (file)
--- a/pam.spec
+++ b/pam.spec
@@ -16,14 +16,14 @@ Summary(ru.UTF-8):  Интструмент, обеспечивающий ауте
 Summary(tr.UTF-8):     Modüler, artımsal doğrulama birimleri
 Summary(uk.UTF-8):     Інструмент, що забезпечує аутентифікацію для програм
 Name:          pam
-Version:       1.1.7
-Release:       2
+Version:       1.1.8
+Release:       1
 Epoch:         1
 License:       GPL or BSD
 Group:         Base
 #Source0:      http://ftp.kernel.org/pub/linux/libs/pam/library/Linux-PAM-%{version}.tar.bz2
 Source0:       https://fedorahosted.org/releases/l/i/linux-pam/Linux-PAM-%{version}.tar.bz2
-# Source0-md5: 9f90888cd22212a6b5af2920f4eaaf1b
+# Source0-md5: 35b6091af95981b1b2cd60d813b5e4ee
 #xSource1:     http://ftp.kernel.org/pub/linux/libs/pam/library/Linux-PAM-%{version}.tar.bz2.sign
 # xSource1-md5:        2435d4a23aaf871bcec436f863b0de6c
 Source2:       ftp://ftp.pld-linux.org/software/pam/%{name}-pld-%{pam_pld_version}.tar.gz
@@ -36,7 +36,6 @@ Source7:      system-auth.5
 Source8:       config-util.5
 Source9:       %{name}.tmpfiles
 Patch0:                %{name}-pld-modules.patch
-Patch1:                %{name}_unix_passwd-typo.patch
 Patch2:                %{name}-tally-fail-close.patch
 Patch3:                %{name}-mkhomedir-notfound.patch
 Patch4:                %{name}-db-gdbm.patch
@@ -234,7 +233,6 @@ Moduł PAM pozwalający na zmianę kontekstów SELinuksa.
 %prep
 %setup -q -a2 -n Linux-PAM-%{version}
 %patch0 -p1
-%patch1 -p1
 %patch2 -p1
 %patch3 -p1
 %patch4 -p1

diff --git a/pam_unix_passwd-typo.patch b/pam_unix_passwd-typo.patch
deleted file mode 100644 (file)
index ea2174b..0000000
--- a/pam_unix_passwd-typo.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-From 7f9aa8388f19012b6b11b0077422ee0c7a8cb286 Mon Sep 17 00:00:00 2001
-From: Tomas Mraz <tmraz@fedoraproject.org>
-Date: Fri, 13 Sep 2013 12:04:08 +0000
-Subject: Add missing ')'
-
-modules/pam_unix/pam_unix_passwd.c: Add missing ')'..
----
-diff --git a/modules/pam_unix/pam_unix_passwd.c b/modules/pam_unix/pam_unix_passwd.c
-index 9bc1cd9..9aae3b0 100644
---- a/modules/pam_unix/pam_unix_passwd.c
-+++ b/modules/pam_unix/pam_unix_passwd.c
-@@ -255,7 +255,7 @@ static int _unix_run_update_binary(pam_handle_t *pamh, unsigned int ctrl, const
-       close(fds[0]);       /* close here to avoid possible SIGPIPE above */
-       close(fds[1]);
-       /* wait for helper to complete: */
--      while ((rc=waitpid(child, &retval, 0) < 0 && errno == EINTR);
-+      while ((rc=waitpid(child, &retval, 0)) < 0 && errno == EINTR);
-       if (rc<0) {
-         pam_syslog(pamh, LOG_ERR, "unix_update waitpid failed: %m");
-         retval = PAM_AUTHTOK_ERR;
---
-cgit v0.9.2