up to 1.2.0

pam-mkhomedir-notfound.patch has one bad chunk

diff --git a/pam-db-gdbm.patch b/pam-db-gdbm.patch
index 55e5f11914cc9f900e7ad521745d5c5b46925005..5f11900ac3cf8cc542d46a59e6e64520fb1774b0 100644 (file)
--- a/pam-db-gdbm.patch
+++ b/pam-db-gdbm.patch
@@ -1,5 +1,5 @@
 --- Linux-PAM-0.99.7.1/configure.in~   2007-02-06 00:04:35.000000000 +0100
-+++ Linux-PAM-0.99.7.1/configure.in    2007-02-06 00:12:08.000000000 +0100
++++ Linux-PAM-0.99.7.1/configure.ac    2007-02-06 00:12:08.000000000 +0100
 @@ -354,7 +354,7 @@
                fi
          fi

diff --git a/pam-mkhomedir-notfound.patch b/pam-mkhomedir-notfound.patch
index ae4267f92b2ae2f4530a1002f29260ca2a0da881..5816e6f7fd96e7e9371b8add4a13cd0dbf18c781 100644 (file)
--- a/pam-mkhomedir-notfound.patch
+++ b/pam-mkhomedir-notfound.patch
@@ -32,8 +32,8 @@ diff -urN Linux-PAM-0.99.7.1.orig/modules/pam_mkhomedir/pam_mkhomedir.8.xml Linu
            <option>skel=<replaceable>/path/to/skel/directory</replaceable></option>
          </term>
          <listitem>
---- Linux-PAM-1.1.0/modules/pam_mkhomedir/pam_mkhomedir.c~     2009-04-09 10:07:18.000000000 +0200
-+++ Linux-PAM-1.1.0/modules/pam_mkhomedir/pam_mkhomedir.c      2009-09-07 12:32:41.109408541 +0200
+--- Linux-PAM-1.2.0/modules/pam_mkhomedir/pam_mkhomedir.c~     2015-04-30 12:15:42.000000000 +0300
++++ Linux-PAM-1.2.0/modules/pam_mkhomedir/pam_mkhomedir.c      2015-04-30 12:16:09.350939182 +0300
 @@ -61,8 +61,11 @@
  #define MAX_FD_NO 10000
  
@@ -74,11 +74,11 @@ diff -urN Linux-PAM-0.99.7.1.orig/modules/pam_mkhomedir/pam_mkhomedir.8.xml Linu
         pam_syslog(pamh, LOG_ERR, "unknown option: %s", *argv);
        }
     }
-@@ -230,7 +242,12 @@
+@@ -235,7 +235,12 @@
        return PAM_SUCCESS;
     }
  
--   return create_homedir(pamh, &opt, pwd);
+-   return create_homedir(pamh, &opt, user, pwd->pw_dir);
 +   if (opt.ctrl & HOMEDIR_CREATE)
 +      return create_homedir(pamh, &opt, pwd);
 +   else if (opt.ctrl & HOMEDIR_DENY)

diff --git a/pam-pld-modules.patch b/pam-pld-modules.patch
index 5072ec151ee67838e3177e411b9847dbf4b588b5..cd7ae4033b8322768f6609bfcf49b38c1a785a2d 100644 (file)
--- a/pam-pld-modules.patch
+++ b/pam-pld-modules.patch
@@ -1,5 +1,5 @@
 --- Linux-PAM-0.99.5.0/configure.in.redhat-modules     2006-06-28 09:25:02.000000000 +0200
-+++ Linux-PAM-0.99.5.0/configure.in    2006-06-30 10:24:35.000000000 +0200
++++ Linux-PAM-0.99.5.0/configure.ac    2006-06-30 10:24:35.000000000 +0200
 @@ -492,6 +492,8 @@
        libpam_misc/Makefile conf/Makefile conf/pam_conv1/Makefile \
        po/Makefile.in \

diff --git a/pam.spec b/pam.spec
index e2105a34255a6413b1420f59a037582785e61942..b429dc9c515e49611aba1f420e41a9c9976cb7de 100644 (file)
--- a/pam.spec
+++ b/pam.spec
@@ -18,13 +18,13 @@ Summary(ru.UTF-8):  Интструмент, обеспечивающий ауте
 Summary(tr.UTF-8):     Modüler, artımsal doğrulama birimleri
 Summary(uk.UTF-8):     Інструмент, що забезпечує аутентифікацію для програм
 Name:          pam
-Version:       1.1.8
-Release:       8
+Version:       1.2.0
+Release:       0.1
 Epoch:         1
 License:       GPL or BSD
 Group:         Base
 Source0:       http://www.linux-pam.org/library/Linux-PAM-%{version}.tar.bz2
-# Source0-md5: 35b6091af95981b1b2cd60d813b5e4ee
+# Source0-md5: ee4a480d77b341c99e8b1375f8f180c0
 Source2:       ftp://ftp.pld-linux.org/software/pam/%{name}-pld-%{pam_pld_version}.tar.gz
 # Source2-md5: f9ec6fcafcf1801bf318e60040244f2e
 Source3:       other.pamd
@@ -50,7 +50,7 @@ BuildRequires:        cracklib-devel >= 2.8.3
 # gdbm due to db pulling libpthread
 BuildRequires: flex
 BuildRequires: gdbm-devel >= 1.8.3-7
-BuildRequires: gettext-tools >= 0.15
+BuildRequires: gettext-tools >= 0.18.3
 BuildRequires: glibc-devel >= 6:2.10.1
 BuildRequires: glibc-misc
 %{?with_prelude:BuildRequires: libprelude-devel >= 0.9.0}