Date: Wednesday, June 18, 2014 @ 16:08:51
Author: tpowa
Revision: 215284
db-move: moved pam from [testing] to [core] (i686, x86_64)
Added:
pam/repos/core-i686/PKGBUILD
(from rev 215283, pam/repos/testing-i686/PKGBUILD)
pam/repos/core-i686/other
(from rev 215283, pam/repos/testing-i686/other)
pam/repos/core-i686/pam-1.1.8-cve-2013-7041.patch
(from rev 215283, pam/repos/testing-i686/pam-1.1.8-cve-2013-7041.patch)
pam/repos/core-i686/pam-1.1.8-cve-2014-2583.patch
(from rev 215283, pam/repos/testing-i686/pam-1.1.8-cve-2014-2583.patch)
pam/repos/core-i686/pam_unix2-glibc216.patch
(from rev 215283, pam/repos/testing-i686/pam_unix2-glibc216.patch)
pam/repos/core-x86_64/PKGBUILD
(from rev 215283, pam/repos/testing-x86_64/PKGBUILD)
pam/repos/core-x86_64/other
(from rev 215283, pam/repos/testing-x86_64/other)
pam/repos/core-x86_64/pam-1.1.8-cve-2013-7041.patch
(from rev 215283, pam/repos/testing-x86_64/pam-1.1.8-cve-2013-7041.patch)
pam/repos/core-x86_64/pam-1.1.8-cve-2014-2583.patch
(from rev 215283, pam/repos/testing-x86_64/pam-1.1.8-cve-2014-2583.patch)
pam/repos/core-x86_64/pam_unix2-glibc216.patch
(from rev 215283, pam/repos/testing-x86_64/pam_unix2-glibc216.patch)
Deleted:
pam/repos/core-i686/PKGBUILD
pam/repos/core-i686/other
pam/repos/core-i686/pam-1.1.8-cve-2013-7041.patch
pam/repos/core-i686/pam-1.1.8-cve-2014-2583.patch
pam/repos/core-i686/pam_unix2-glibc216.patch
pam/repos/core-x86_64/PKGBUILD
pam/repos/core-x86_64/other
pam/repos/core-x86_64/pam-1.1.8-cve-2013-7041.patch
pam/repos/core-x86_64/pam-1.1.8-cve-2014-2583.patch
pam/repos/core-x86_64/pam_unix2-glibc216.patch
pam/repos/testing-i686/
pam/repos/testing-x86_64/
-------------------------------------------+
/PKGBUILD | 170 ++++++++++++++++++++++++++++
/other | 10 +
/pam-1.1.8-cve-2013-7041.patch | 104 +++++++++++++++++
/pam-1.1.8-cve-2014-2583.patch | 112 ++++++++++++++++++
/pam_unix2-glibc216.patch | 40 ++++++
core-i686/PKGBUILD | 82 -------------
core-i686/other | 5
core-i686/pam-1.1.8-cve-2013-7041.patch | 52 --------
core-i686/pam-1.1.8-cve-2014-2583.patch | 56 ---------
core-i686/pam_unix2-glibc216.patch | 20 ---
core-x86_64/PKGBUILD | 82 -------------
core-x86_64/other | 5
core-x86_64/pam-1.1.8-cve-2013-7041.patch | 52 --------
core-x86_64/pam-1.1.8-cve-2014-2583.patch | 56 ---------
core-x86_64/pam_unix2-glibc216.patch | 20 ---
15 files changed, 436 insertions(+), 430 deletions(-)
Deleted: core-i686/PKGBUILD
===================================================================
--- core-i686/PKGBUILD 2014-06-18 14:07:37 UTC (rev 215283)
+++ core-i686/PKGBUILD 2014-06-18 14:08:51 UTC (rev 215284)
@@ -1,82 +0,0 @@
-# $Id$
-# Maintainer: Tobias Powalowski <[email protected]>
-# Contributor: judd <[email protected]>
-
-pkgname=pam
-pkgver=1.1.8
-pkgrel=4
-pkgdesc="PAM (Pluggable Authentication Modules) library"
-arch=('i686' 'x86_64')
-license=('GPL2')
-url="http://linux-pam.org";
-depends=('glibc' 'cracklib' 'libtirpc' 'pambase')
-makedepends=('flex' 'w3m' 'docbook-xml>=4.4' 'docbook-xsl')
-backup=(etc/security/{access.conf,group.conf,limits.conf,namespace.conf,namespace.init,pam_env.conf,time.conf}
etc/default/passwd etc/environment)
-source=(https://fedorahosted.org/releases/l/i/linux-pam/Linux-PAM-$pkgver.tar.bz2
- ftp://ftp.archlinux.org/other/pam_unix2/pam_unix2-2.9.1.tar.bz2
- pam_unix2-glibc216.patch
- pam-1.1.8-cve-2013-7041.patch
- pam-1.1.8-cve-2014-2583.patch)
-md5sums=('35b6091af95981b1b2cd60d813b5e4ee'
- 'da6a46e5f8cd3eaa7cbc4fc3a7e2b555'
- 'dac109f68e04a4df37575fda6001ea17'
- '653661bea920de3bb2713bb85b408bc2'
- '144ea8e2f9d49a0f4021027ca2c1558f')
-
-options=('!emptydirs')
-
-prepare () {
- cd $srcdir/Linux-PAM-$pkgver
- # fix CVEs in pam
- patch -Np1 -i "${srcdir}/pam-1.1.8-cve-2013-7041.patch"
- patch -Np1 -i "${srcdir}/pam-1.1.8-cve-2014-2583.patch"
-
- # fix pam_unix2 building
- cd $srcdir/pam_unix2-2.9.1
- patch -Np1 -i "${srcdir}/pam_unix2-glibc216.patch"
-}
-
-build() {
- cd $srcdir/Linux-PAM-$pkgver
- ./configure --libdir=/usr/lib --sbindir=/usr/bin --disable-db
- make
-
- cd $srcdir/pam_unix2-2.9.1
- # modify flags to build against the pam compiled here, not a system lib.
- ./configure \
- CFLAGS="$CFLAGS -I$srcdir/Linux-PAM-$pkgver/libpam/include/" \
- LDFLAGS="$LDFLAGS -L$srcdir/Linux-PAM-$pkgver/libpam/.libs/" \
- --libdir=/usr/lib \
- --sbindir=/usr/bin
- make
-}
-
-package() {
- cd $srcdir/Linux-PAM-$pkgver
- make DESTDIR=$pkgdir SCONFIGDIR=/etc/security install
-
- # build pam_unix2 module
- # source ftp://ftp.suse.com/pub/people/kukuk/pam/pam_unix2
- cd $srcdir/pam_unix2-2.9.1
- make DESTDIR=$pkgdir install
-
- # add the realtime permissions for audio users
- sed -i 's|# End of file||' $pkgdir/etc/security/limits.conf
- cat >>$pkgdir/etc/security/limits.conf <<_EOT
-* - rtprio 0
-* - nice 0
-@audio - rtprio 65
-@audio - nice -10
-@audio - memlock 40000
-_EOT
-
- # fix some missing symlinks from old pam for compatibility
- cd $pkgdir/usr/lib/security
- ln -s pam_unix.so pam_unix_acct.so
- ln -s pam_unix.so pam_unix_auth.so
- ln -s pam_unix.so pam_unix_passwd.so
- ln -s pam_unix.so pam_unix_session.so
-
- # set unix_chkpwd uid
- chmod +s $pkgdir/usr/bin/unix_chkpwd
-}
Copied: pam/repos/core-i686/PKGBUILD (from rev 215283,
pam/repos/testing-i686/PKGBUILD)
===================================================================
--- core-i686/PKGBUILD (rev 0)
+++ core-i686/PKGBUILD 2014-06-18 14:08:51 UTC (rev 215284)
@@ -0,0 +1,85 @@
+# $Id$
+# Maintainer: Tobias Powalowski <[email protected]>
+# Contributor: judd <[email protected]>
+
+pkgname=pam
+pkgver=1.1.8
+pkgrel=5
+pkgdesc="PAM (Pluggable Authentication Modules) library"
+arch=('i686' 'x86_64')
+license=('GPL2')
+url="http://linux-pam.org";
+depends=('glibc' 'cracklib' 'libtirpc' 'pambase')
+makedepends=('flex' 'w3m' 'docbook-xml>=4.4' 'docbook-xsl')
+backup=(etc/security/{access.conf,group.conf,limits.conf,namespace.conf,namespace.init,pam_env.conf,time.conf}
etc/default/passwd etc/environment)
+source=(https://fedorahosted.org/releases/l/i/linux-pam/Linux-PAM-$pkgver.tar.bz2
+ ftp://ftp.archlinux.org/other/pam_unix2/pam_unix2-2.9.1.tar.bz2
+ pam_unix2-glibc216.patch
+ pam-1.1.8-cve-2013-7041.patch
+ pam-1.1.8-cve-2014-2583.patch)
+md5sums=('35b6091af95981b1b2cd60d813b5e4ee'
+ 'da6a46e5f8cd3eaa7cbc4fc3a7e2b555'
+ 'dac109f68e04a4df37575fda6001ea17'
+ '653661bea920de3bb2713bb85b408bc2'
+ '144ea8e2f9d49a0f4021027ca2c1558f')
+
+options=('!emptydirs')
+
+prepare () {
+ cd $srcdir/Linux-PAM-$pkgver
+ # fix CVEs in pam
+ patch -Np1 -i "${srcdir}/pam-1.1.8-cve-2013-7041.patch"
+ patch -Np1 -i "${srcdir}/pam-1.1.8-cve-2014-2583.patch"
+
+ # fix pam_unix2 building
+ cd $srcdir/pam_unix2-2.9.1
+ patch -Np1 -i "${srcdir}/pam_unix2-glibc216.patch"
+}
+
+build() {
+ cd $srcdir/Linux-PAM-$pkgver
+ ./configure --libdir=/usr/lib --sbindir=/usr/bin --disable-db
+ make
+
+ cd $srcdir/pam_unix2-2.9.1
+ # modify flags to build against the pam compiled here, not a system lib.
+ ./configure \
+ CFLAGS="$CFLAGS -I$srcdir/Linux-PAM-$pkgver/libpam/include/" \
+ LDFLAGS="$LDFLAGS -L$srcdir/Linux-PAM-$pkgver/libpam/.libs/" \
+ --libdir=/usr/lib \
+ --sbindir=/usr/bin
+ make
+}
+
+package() {
+ cd $srcdir/Linux-PAM-$pkgver
+ make DESTDIR=$pkgdir SCONFIGDIR=/etc/security install
+
+ # build pam_unix2 module
+ # source ftp://ftp.suse.com/pub/people/kukuk/pam/pam_unix2
+ cd $srcdir/pam_unix2-2.9.1
+ make DESTDIR=$pkgdir install
+
+ # add the realtime permissions for audio users
+ sed -i 's|# End of file||' $pkgdir/etc/security/limits.conf
+ cat >>$pkgdir/etc/security/limits.conf <<_EOT
+* - rtprio 0
+* - nice 0
+@audio - rtprio 65
+@audio - nice -10
+@audio - memlock 40000
+_EOT
+
+ # fix some missing symlinks from old pam for compatibility
+ cd $pkgdir/usr/lib/security
+ ln -s pam_unix.so pam_unix_acct.so
+ ln -s pam_unix.so pam_unix_auth.so
+ ln -s pam_unix.so pam_unix_passwd.so
+ ln -s pam_unix.so pam_unix_session.so
+
+ # set unix_chkpwd uid
+ chmod +s $pkgdir/usr/bin/unix_chkpwd
+ # remove doc which is not used anymore
+ # FS #40749
+ rm $pkgdir/usr/share/doc/Linux-PAM/sag-pam_userdb.html
+}
Deleted: core-i686/other
===================================================================
--- core-i686/other 2014-06-18 14:07:37 UTC (rev 215283)
+++ core-i686/other 2014-06-18 14:08:51 UTC (rev 215284)
@@ -1,5 +0,0 @@
-#%PAM-1.0
-auth required pam_unix.so
-account required pam_unix.so
-password required pam_unix.so
-session required pam_unix.so
Copied: pam/repos/core-i686/other (from rev 215283,
pam/repos/testing-i686/other)
===================================================================
--- core-i686/other (rev 0)
+++ core-i686/other 2014-06-18 14:08:51 UTC (rev 215284)
@@ -0,0 +1,5 @@
+#%PAM-1.0
+auth required pam_unix.so
+account required pam_unix.so
+password required pam_unix.so
+session required pam_unix.so
Deleted: core-i686/pam-1.1.8-cve-2013-7041.patch
===================================================================
--- core-i686/pam-1.1.8-cve-2013-7041.patch 2014-06-18 14:07:37 UTC (rev
215283)
+++ core-i686/pam-1.1.8-cve-2013-7041.patch 2014-06-18 14:08:51 UTC (rev
215284)
@@ -1,52 +0,0 @@
-From 57a1e2b274d0a6376d92ada9926e5c5741e7da20 Mon Sep 17 00:00:00 2001
-From: "Dmitry V. Levin" <[email protected]>
-Date: Fri, 24 Jan 2014 22:18:32 +0000
-Subject: [PATCH] pam_userdb: fix password hash comparison
-
-Starting with commit Linux-PAM-0-77-28-g0b3e583 that introduced hashed
-passwords support in pam_userdb, hashes are compared case-insensitively.
-This bug leads to accepting hashes for completely different passwords in
-addition to those that should be accepted.
-
-Additionally, commit Linux-PAM-1_1_6-13-ge2a8187 that added support for
-modern password hashes with different lengths and settings, did not
-update the hash comparison accordingly, which leads to accepting
-computed hashes longer than stored hashes when the latter is a prefix
-of the former.
-
-* modules/pam_userdb/pam_userdb.c (user_lookup): Reject the computed
-hash whose length differs from the stored hash length.
-Compare computed and stored hashes case-sensitively.
-Fixes CVE-2013-7041.
-
-Bug-Debian: http://bugs.debian.org/731368
----
- modules/pam_userdb/pam_userdb.c | 9 ++++++---
- 1 file changed, 6 insertions(+), 3 deletions(-)
-
-diff --git a/modules/pam_userdb/pam_userdb.c b/modules/pam_userdb/pam_userdb.c
-index de8b5b1..ff040e6 100644
---- a/modules/pam_userdb/pam_userdb.c
-+++ b/modules/pam_userdb/pam_userdb.c
-@@ -222,12 +222,15 @@ user_lookup (pam_handle_t *pamh, const char *database,
const char *cryptmode,
- } else {
- cryptpw = crypt (pass, data.dptr);
-
-- if (cryptpw) {
-- compare = strncasecmp (data.dptr, cryptpw, data.dsize);
-+ if (cryptpw && strlen(cryptpw) == (size_t)data.dsize) {
-+ compare = memcmp(data.dptr, cryptpw, data.dsize);
- } else {
- compare = -2;
- if (ctrl & PAM_DEBUG_ARG) {
-- pam_syslog(pamh, LOG_INFO, "crypt() returned NULL");
-+ if (cryptpw)
-+ pam_syslog(pamh, LOG_INFO, "lengths of computed and stored
hashes differ");
-+ else
-+ pam_syslog(pamh, LOG_INFO, "crypt() returned NULL");
- }
- };
-
---
-1.8.3.1
-
Copied: pam/repos/core-i686/pam-1.1.8-cve-2013-7041.patch (from rev 215283,
pam/repos/testing-i686/pam-1.1.8-cve-2013-7041.patch)
===================================================================
--- core-i686/pam-1.1.8-cve-2013-7041.patch (rev 0)
+++ core-i686/pam-1.1.8-cve-2013-7041.patch 2014-06-18 14:08:51 UTC (rev
215284)
@@ -0,0 +1,52 @@
+From 57a1e2b274d0a6376d92ada9926e5c5741e7da20 Mon Sep 17 00:00:00 2001
+From: "Dmitry V. Levin" <[email protected]>
+Date: Fri, 24 Jan 2014 22:18:32 +0000
+Subject: [PATCH] pam_userdb: fix password hash comparison
+
+Starting with commit Linux-PAM-0-77-28-g0b3e583 that introduced hashed
+passwords support in pam_userdb, hashes are compared case-insensitively.
+This bug leads to accepting hashes for completely different passwords in
+addition to those that should be accepted.
+
+Additionally, commit Linux-PAM-1_1_6-13-ge2a8187 that added support for
+modern password hashes with different lengths and settings, did not
+update the hash comparison accordingly, which leads to accepting
+computed hashes longer than stored hashes when the latter is a prefix
+of the former.
+
+* modules/pam_userdb/pam_userdb.c (user_lookup): Reject the computed
+hash whose length differs from the stored hash length.
+Compare computed and stored hashes case-sensitively.
+Fixes CVE-2013-7041.
+
+Bug-Debian: http://bugs.debian.org/731368
+---
+ modules/pam_userdb/pam_userdb.c | 9 ++++++---
+ 1 file changed, 6 insertions(+), 3 deletions(-)
+
+diff --git a/modules/pam_userdb/pam_userdb.c b/modules/pam_userdb/pam_userdb.c
+index de8b5b1..ff040e6 100644
+--- a/modules/pam_userdb/pam_userdb.c
++++ b/modules/pam_userdb/pam_userdb.c
+@@ -222,12 +222,15 @@ user_lookup (pam_handle_t *pamh, const char *database,
const char *cryptmode,
+ } else {
+ cryptpw = crypt (pass, data.dptr);
+
+- if (cryptpw) {
+- compare = strncasecmp (data.dptr, cryptpw, data.dsize);
++ if (cryptpw && strlen(cryptpw) == (size_t)data.dsize) {
++ compare = memcmp(data.dptr, cryptpw, data.dsize);
+ } else {
+ compare = -2;
+ if (ctrl & PAM_DEBUG_ARG) {
+- pam_syslog(pamh, LOG_INFO, "crypt() returned NULL");
++ if (cryptpw)
++ pam_syslog(pamh, LOG_INFO, "lengths of computed and stored
hashes differ");
++ else
++ pam_syslog(pamh, LOG_INFO, "crypt() returned NULL");
+ }
+ };
+
+--
+1.8.3.1
+
Deleted: core-i686/pam-1.1.8-cve-2014-2583.patch
===================================================================
--- core-i686/pam-1.1.8-cve-2014-2583.patch 2014-06-18 14:07:37 UTC (rev
215283)
+++ core-i686/pam-1.1.8-cve-2014-2583.patch 2014-06-18 14:08:51 UTC (rev
215284)
@@ -1,56 +0,0 @@
-From 9dcead87e6d7f66d34e7a56d11a30daca367dffb Mon Sep 17 00:00:00 2001
-From: "Dmitry V. Levin" <[email protected]>
-Date: Wed, 26 Mar 2014 22:17:23 +0000
-Subject: [PATCH] pam_timestamp: fix potential directory traversal issue
- (ticket #27)
-
-pam_timestamp uses values of PAM_RUSER and PAM_TTY as components of
-the timestamp pathname it creates, so extra care should be taken to
-avoid potential directory traversal issues.
-
-* modules/pam_timestamp/pam_timestamp.c (check_tty): Treat
-"." and ".." tty values as invalid.
-(get_ruser): Treat "." and ".." ruser values, as well as any ruser
-value containing '/', as invalid.
-
-Fixes CVE-2014-2583.
-
-Reported-by: Sebastian Krahmer <[email protected]>
----
- modules/pam_timestamp/pam_timestamp.c | 13 ++++++++++++-
- 1 file changed, 12 insertions(+), 1 deletion(-)
-
-diff --git a/modules/pam_timestamp/pam_timestamp.c
b/modules/pam_timestamp/pam_timestamp.c
-index 5193733..b3f08b1 100644
---- a/modules/pam_timestamp/pam_timestamp.c
-+++ b/modules/pam_timestamp/pam_timestamp.c
-@@ -158,7 +158,7 @@ check_tty(const char *tty)
- tty = strrchr(tty, '/') + 1;
- }
- /* Make sure the tty wasn't actually a directory (no basename). */
-- if (strlen(tty) == 0) {
-+ if (!strlen(tty) || !strcmp(tty, ".") || !strcmp(tty, "..")) {
- return NULL;
- }
- return tty;
-@@ -243,6 +243,17 @@ get_ruser(pam_handle_t *pamh, char *ruserbuf, size_t
ruserbuflen)
- if (pwd != NULL) {
- ruser = pwd->pw_name;
- }
-+ } else {
-+ /*
-+ * This ruser is used by format_timestamp_name as a component
-+ * of constructed timestamp pathname, so ".", "..", and '/'
-+ * are disallowed to avoid potential path traversal issues.
-+ */
-+ if (!strcmp(ruser, ".") ||
-+ !strcmp(ruser, "..") ||
-+ strchr(ruser, '/')) {
-+ ruser = NULL;
-+ }
- }
- if (ruser == NULL || strlen(ruser) >= ruserbuflen) {
- *ruserbuf = '\0';
---
-1.8.3.1
-
Copied: pam/repos/core-i686/pam-1.1.8-cve-2014-2583.patch (from rev 215283,
pam/repos/testing-i686/pam-1.1.8-cve-2014-2583.patch)
===================================================================
--- core-i686/pam-1.1.8-cve-2014-2583.patch (rev 0)
+++ core-i686/pam-1.1.8-cve-2014-2583.patch 2014-06-18 14:08:51 UTC (rev
215284)
@@ -0,0 +1,56 @@
+From 9dcead87e6d7f66d34e7a56d11a30daca367dffb Mon Sep 17 00:00:00 2001
+From: "Dmitry V. Levin" <[email protected]>
+Date: Wed, 26 Mar 2014 22:17:23 +0000
+Subject: [PATCH] pam_timestamp: fix potential directory traversal issue
+ (ticket #27)
+
+pam_timestamp uses values of PAM_RUSER and PAM_TTY as components of
+the timestamp pathname it creates, so extra care should be taken to
+avoid potential directory traversal issues.
+
+* modules/pam_timestamp/pam_timestamp.c (check_tty): Treat
+"." and ".." tty values as invalid.
+(get_ruser): Treat "." and ".." ruser values, as well as any ruser
+value containing '/', as invalid.
+
+Fixes CVE-2014-2583.
+
+Reported-by: Sebastian Krahmer <[email protected]>
+---
+ modules/pam_timestamp/pam_timestamp.c | 13 ++++++++++++-
+ 1 file changed, 12 insertions(+), 1 deletion(-)
+
+diff --git a/modules/pam_timestamp/pam_timestamp.c
b/modules/pam_timestamp/pam_timestamp.c
+index 5193733..b3f08b1 100644
+--- a/modules/pam_timestamp/pam_timestamp.c
++++ b/modules/pam_timestamp/pam_timestamp.c
+@@ -158,7 +158,7 @@ check_tty(const char *tty)
+ tty = strrchr(tty, '/') + 1;
+ }
+ /* Make sure the tty wasn't actually a directory (no basename). */
+- if (strlen(tty) == 0) {
++ if (!strlen(tty) || !strcmp(tty, ".") || !strcmp(tty, "..")) {
+ return NULL;
+ }
+ return tty;
+@@ -243,6 +243,17 @@ get_ruser(pam_handle_t *pamh, char *ruserbuf, size_t
ruserbuflen)
+ if (pwd != NULL) {
+ ruser = pwd->pw_name;
+ }
++ } else {
++ /*
++ * This ruser is used by format_timestamp_name as a component
++ * of constructed timestamp pathname, so ".", "..", and '/'
++ * are disallowed to avoid potential path traversal issues.
++ */
++ if (!strcmp(ruser, ".") ||
++ !strcmp(ruser, "..") ||
++ strchr(ruser, '/')) {
++ ruser = NULL;
++ }
+ }
+ if (ruser == NULL || strlen(ruser) >= ruserbuflen) {
+ *ruserbuf = '\0';
+--
+1.8.3.1
+
Deleted: core-i686/pam_unix2-glibc216.patch
===================================================================
--- core-i686/pam_unix2-glibc216.patch 2014-06-18 14:07:37 UTC (rev 215283)
+++ core-i686/pam_unix2-glibc216.patch 2014-06-18 14:08:51 UTC (rev 215284)
@@ -1,20 +0,0 @@
-Index: pam_unix2-2.9.1/src/read-files.c
-===================================================================
---- pam_unix2-2.9.1.orig/src/read-files.c
-+++ pam_unix2-2.9.1/src/read-files.c
-@@ -30,8 +30,14 @@
- #include <errno.h>
- #include <fcntl.h>
- #include <nss.h>
--#include <bits/libc-lock.h>
-+#include <pthread.h>
- #define __libc_lock_t pthread_mutex_t
-+#define __libc_lock_define_initialized(CLASS,NAME) \
-+ CLASS __libc_lock_t NAME = PTHREAD_MUTEX_INITIALIZER;
-+#define __libc_lock_lock(NAME) \
-+ pthread_mutex_lock, (&(NAME))
-+#define __libc_lock_unlock(NAME) \
-+ pthread_mutex_unlock, (&(NAME))
-
- #include "read-files.h"
-
Copied: pam/repos/core-i686/pam_unix2-glibc216.patch (from rev 215283,
pam/repos/testing-i686/pam_unix2-glibc216.patch)
===================================================================
--- core-i686/pam_unix2-glibc216.patch (rev 0)
+++ core-i686/pam_unix2-glibc216.patch 2014-06-18 14:08:51 UTC (rev 215284)
@@ -0,0 +1,20 @@
+Index: pam_unix2-2.9.1/src/read-files.c
+===================================================================
+--- pam_unix2-2.9.1.orig/src/read-files.c
++++ pam_unix2-2.9.1/src/read-files.c
+@@ -30,8 +30,14 @@
+ #include <errno.h>
+ #include <fcntl.h>
+ #include <nss.h>
+-#include <bits/libc-lock.h>
++#include <pthread.h>
+ #define __libc_lock_t pthread_mutex_t
++#define __libc_lock_define_initialized(CLASS,NAME) \
++ CLASS __libc_lock_t NAME = PTHREAD_MUTEX_INITIALIZER;
++#define __libc_lock_lock(NAME) \
++ pthread_mutex_lock, (&(NAME))
++#define __libc_lock_unlock(NAME) \
++ pthread_mutex_unlock, (&(NAME))
+
+ #include "read-files.h"
+
Deleted: core-x86_64/PKGBUILD
===================================================================
--- core-x86_64/PKGBUILD 2014-06-18 14:07:37 UTC (rev 215283)
+++ core-x86_64/PKGBUILD 2014-06-18 14:08:51 UTC (rev 215284)
@@ -1,82 +0,0 @@
-# $Id$
-# Maintainer: Tobias Powalowski <[email protected]>
-# Contributor: judd <[email protected]>
-
-pkgname=pam
-pkgver=1.1.8
-pkgrel=4
-pkgdesc="PAM (Pluggable Authentication Modules) library"
-arch=('i686' 'x86_64')
-license=('GPL2')
-url="http://linux-pam.org";
-depends=('glibc' 'cracklib' 'libtirpc' 'pambase')
-makedepends=('flex' 'w3m' 'docbook-xml>=4.4' 'docbook-xsl')
-backup=(etc/security/{access.conf,group.conf,limits.conf,namespace.conf,namespace.init,pam_env.conf,time.conf}
etc/default/passwd etc/environment)
-source=(https://fedorahosted.org/releases/l/i/linux-pam/Linux-PAM-$pkgver.tar.bz2
- ftp://ftp.archlinux.org/other/pam_unix2/pam_unix2-2.9.1.tar.bz2
- pam_unix2-glibc216.patch
- pam-1.1.8-cve-2013-7041.patch
- pam-1.1.8-cve-2014-2583.patch)
-md5sums=('35b6091af95981b1b2cd60d813b5e4ee'
- 'da6a46e5f8cd3eaa7cbc4fc3a7e2b555'
- 'dac109f68e04a4df37575fda6001ea17'
- '653661bea920de3bb2713bb85b408bc2'
- '144ea8e2f9d49a0f4021027ca2c1558f')
-
-options=('!emptydirs')
-
-prepare () {
- cd $srcdir/Linux-PAM-$pkgver
- # fix CVEs in pam
- patch -Np1 -i "${srcdir}/pam-1.1.8-cve-2013-7041.patch"
- patch -Np1 -i "${srcdir}/pam-1.1.8-cve-2014-2583.patch"
-
- # fix pam_unix2 building
- cd $srcdir/pam_unix2-2.9.1
- patch -Np1 -i "${srcdir}/pam_unix2-glibc216.patch"
-}
-
-build() {
- cd $srcdir/Linux-PAM-$pkgver
- ./configure --libdir=/usr/lib --sbindir=/usr/bin --disable-db
- make
-
- cd $srcdir/pam_unix2-2.9.1
- # modify flags to build against the pam compiled here, not a system lib.
- ./configure \
- CFLAGS="$CFLAGS -I$srcdir/Linux-PAM-$pkgver/libpam/include/" \
- LDFLAGS="$LDFLAGS -L$srcdir/Linux-PAM-$pkgver/libpam/.libs/" \
- --libdir=/usr/lib \
- --sbindir=/usr/bin
- make
-}
-
-package() {
- cd $srcdir/Linux-PAM-$pkgver
- make DESTDIR=$pkgdir SCONFIGDIR=/etc/security install
-
- # build pam_unix2 module
- # source ftp://ftp.suse.com/pub/people/kukuk/pam/pam_unix2
- cd $srcdir/pam_unix2-2.9.1
- make DESTDIR=$pkgdir install
-
- # add the realtime permissions for audio users
- sed -i 's|# End of file||' $pkgdir/etc/security/limits.conf
- cat >>$pkgdir/etc/security/limits.conf <<_EOT
-* - rtprio 0
-* - nice 0
-@audio - rtprio 65
-@audio - nice -10
-@audio - memlock 40000
-_EOT
-
- # fix some missing symlinks from old pam for compatibility
- cd $pkgdir/usr/lib/security
- ln -s pam_unix.so pam_unix_acct.so
- ln -s pam_unix.so pam_unix_auth.so
- ln -s pam_unix.so pam_unix_passwd.so
- ln -s pam_unix.so pam_unix_session.so
-
- # set unix_chkpwd uid
- chmod +s $pkgdir/usr/bin/unix_chkpwd
-}
Copied: pam/repos/core-x86_64/PKGBUILD (from rev 215283,
pam/repos/testing-x86_64/PKGBUILD)
===================================================================
--- core-x86_64/PKGBUILD (rev 0)
+++ core-x86_64/PKGBUILD 2014-06-18 14:08:51 UTC (rev 215284)
@@ -0,0 +1,85 @@
+# $Id$
+# Maintainer: Tobias Powalowski <[email protected]>
+# Contributor: judd <[email protected]>
+
+pkgname=pam
+pkgver=1.1.8
+pkgrel=5
+pkgdesc="PAM (Pluggable Authentication Modules) library"
+arch=('i686' 'x86_64')
+license=('GPL2')
+url="http://linux-pam.org";
+depends=('glibc' 'cracklib' 'libtirpc' 'pambase')
+makedepends=('flex' 'w3m' 'docbook-xml>=4.4' 'docbook-xsl')
+backup=(etc/security/{access.conf,group.conf,limits.conf,namespace.conf,namespace.init,pam_env.conf,time.conf}
etc/default/passwd etc/environment)
+source=(https://fedorahosted.org/releases/l/i/linux-pam/Linux-PAM-$pkgver.tar.bz2
+ ftp://ftp.archlinux.org/other/pam_unix2/pam_unix2-2.9.1.tar.bz2
+ pam_unix2-glibc216.patch
+ pam-1.1.8-cve-2013-7041.patch
+ pam-1.1.8-cve-2014-2583.patch)
+md5sums=('35b6091af95981b1b2cd60d813b5e4ee'
+ 'da6a46e5f8cd3eaa7cbc4fc3a7e2b555'
+ 'dac109f68e04a4df37575fda6001ea17'
+ '653661bea920de3bb2713bb85b408bc2'
+ '144ea8e2f9d49a0f4021027ca2c1558f')
+
+options=('!emptydirs')
+
+prepare () {
+ cd $srcdir/Linux-PAM-$pkgver
+ # fix CVEs in pam
+ patch -Np1 -i "${srcdir}/pam-1.1.8-cve-2013-7041.patch"
+ patch -Np1 -i "${srcdir}/pam-1.1.8-cve-2014-2583.patch"
+
+ # fix pam_unix2 building
+ cd $srcdir/pam_unix2-2.9.1
+ patch -Np1 -i "${srcdir}/pam_unix2-glibc216.patch"
+}
+
+build() {
+ cd $srcdir/Linux-PAM-$pkgver
+ ./configure --libdir=/usr/lib --sbindir=/usr/bin --disable-db
+ make
+
+ cd $srcdir/pam_unix2-2.9.1
+ # modify flags to build against the pam compiled here, not a system lib.
+ ./configure \
+ CFLAGS="$CFLAGS -I$srcdir/Linux-PAM-$pkgver/libpam/include/" \
+ LDFLAGS="$LDFLAGS -L$srcdir/Linux-PAM-$pkgver/libpam/.libs/" \
+ --libdir=/usr/lib \
+ --sbindir=/usr/bin
+ make
+}
+
+package() {
+ cd $srcdir/Linux-PAM-$pkgver
+ make DESTDIR=$pkgdir SCONFIGDIR=/etc/security install
+
+ # build pam_unix2 module
+ # source ftp://ftp.suse.com/pub/people/kukuk/pam/pam_unix2
+ cd $srcdir/pam_unix2-2.9.1
+ make DESTDIR=$pkgdir install
+
+ # add the realtime permissions for audio users
+ sed -i 's|# End of file||' $pkgdir/etc/security/limits.conf
+ cat >>$pkgdir/etc/security/limits.conf <<_EOT
+* - rtprio 0
+* - nice 0
+@audio - rtprio 65
+@audio - nice -10
+@audio - memlock 40000
+_EOT
+
+ # fix some missing symlinks from old pam for compatibility
+ cd $pkgdir/usr/lib/security
+ ln -s pam_unix.so pam_unix_acct.so
+ ln -s pam_unix.so pam_unix_auth.so
+ ln -s pam_unix.so pam_unix_passwd.so
+ ln -s pam_unix.so pam_unix_session.so
+
+ # set unix_chkpwd uid
+ chmod +s $pkgdir/usr/bin/unix_chkpwd
+ # remove doc which is not used anymore
+ # FS #40749
+ rm $pkgdir/usr/share/doc/Linux-PAM/sag-pam_userdb.html
+}
Deleted: core-x86_64/other
===================================================================
--- core-x86_64/other 2014-06-18 14:07:37 UTC (rev 215283)
+++ core-x86_64/other 2014-06-18 14:08:51 UTC (rev 215284)
@@ -1,5 +0,0 @@
-#%PAM-1.0
-auth required pam_unix.so
-account required pam_unix.so
-password required pam_unix.so
-session required pam_unix.so
Copied: pam/repos/core-x86_64/other (from rev 215283,
pam/repos/testing-x86_64/other)
===================================================================
--- core-x86_64/other (rev 0)
+++ core-x86_64/other 2014-06-18 14:08:51 UTC (rev 215284)
@@ -0,0 +1,5 @@
+#%PAM-1.0
+auth required pam_unix.so
+account required pam_unix.so
+password required pam_unix.so
+session required pam_unix.so
Deleted: core-x86_64/pam-1.1.8-cve-2013-7041.patch
===================================================================
--- core-x86_64/pam-1.1.8-cve-2013-7041.patch 2014-06-18 14:07:37 UTC (rev
215283)
+++ core-x86_64/pam-1.1.8-cve-2013-7041.patch 2014-06-18 14:08:51 UTC (rev
215284)
@@ -1,52 +0,0 @@
-From 57a1e2b274d0a6376d92ada9926e5c5741e7da20 Mon Sep 17 00:00:00 2001
-From: "Dmitry V. Levin" <[email protected]>
-Date: Fri, 24 Jan 2014 22:18:32 +0000
-Subject: [PATCH] pam_userdb: fix password hash comparison
-
-Starting with commit Linux-PAM-0-77-28-g0b3e583 that introduced hashed
-passwords support in pam_userdb, hashes are compared case-insensitively.
-This bug leads to accepting hashes for completely different passwords in
-addition to those that should be accepted.
-
-Additionally, commit Linux-PAM-1_1_6-13-ge2a8187 that added support for
-modern password hashes with different lengths and settings, did not
-update the hash comparison accordingly, which leads to accepting
-computed hashes longer than stored hashes when the latter is a prefix
-of the former.
-
-* modules/pam_userdb/pam_userdb.c (user_lookup): Reject the computed
-hash whose length differs from the stored hash length.
-Compare computed and stored hashes case-sensitively.
-Fixes CVE-2013-7041.
-
-Bug-Debian: http://bugs.debian.org/731368
----
- modules/pam_userdb/pam_userdb.c | 9 ++++++---
- 1 file changed, 6 insertions(+), 3 deletions(-)
-
-diff --git a/modules/pam_userdb/pam_userdb.c b/modules/pam_userdb/pam_userdb.c
-index de8b5b1..ff040e6 100644
---- a/modules/pam_userdb/pam_userdb.c
-+++ b/modules/pam_userdb/pam_userdb.c
-@@ -222,12 +222,15 @@ user_lookup (pam_handle_t *pamh, const char *database,
const char *cryptmode,
- } else {
- cryptpw = crypt (pass, data.dptr);
-
-- if (cryptpw) {
-- compare = strncasecmp (data.dptr, cryptpw, data.dsize);
-+ if (cryptpw && strlen(cryptpw) == (size_t)data.dsize) {
-+ compare = memcmp(data.dptr, cryptpw, data.dsize);
- } else {
- compare = -2;
- if (ctrl & PAM_DEBUG_ARG) {
-- pam_syslog(pamh, LOG_INFO, "crypt() returned NULL");
-+ if (cryptpw)
-+ pam_syslog(pamh, LOG_INFO, "lengths of computed and stored
hashes differ");
-+ else
-+ pam_syslog(pamh, LOG_INFO, "crypt() returned NULL");
- }
- };
-
---
-1.8.3.1
-
Copied: pam/repos/core-x86_64/pam-1.1.8-cve-2013-7041.patch (from rev 215283,
pam/repos/testing-x86_64/pam-1.1.8-cve-2013-7041.patch)
===================================================================
--- core-x86_64/pam-1.1.8-cve-2013-7041.patch (rev 0)
+++ core-x86_64/pam-1.1.8-cve-2013-7041.patch 2014-06-18 14:08:51 UTC (rev
215284)
@@ -0,0 +1,52 @@
+From 57a1e2b274d0a6376d92ada9926e5c5741e7da20 Mon Sep 17 00:00:00 2001
+From: "Dmitry V. Levin" <[email protected]>
+Date: Fri, 24 Jan 2014 22:18:32 +0000
+Subject: [PATCH] pam_userdb: fix password hash comparison
+
+Starting with commit Linux-PAM-0-77-28-g0b3e583 that introduced hashed
+passwords support in pam_userdb, hashes are compared case-insensitively.
+This bug leads to accepting hashes for completely different passwords in
+addition to those that should be accepted.
+
+Additionally, commit Linux-PAM-1_1_6-13-ge2a8187 that added support for
+modern password hashes with different lengths and settings, did not
+update the hash comparison accordingly, which leads to accepting
+computed hashes longer than stored hashes when the latter is a prefix
+of the former.
+
+* modules/pam_userdb/pam_userdb.c (user_lookup): Reject the computed
+hash whose length differs from the stored hash length.
+Compare computed and stored hashes case-sensitively.
+Fixes CVE-2013-7041.
+
+Bug-Debian: http://bugs.debian.org/731368
+---
+ modules/pam_userdb/pam_userdb.c | 9 ++++++---
+ 1 file changed, 6 insertions(+), 3 deletions(-)
+
+diff --git a/modules/pam_userdb/pam_userdb.c b/modules/pam_userdb/pam_userdb.c
+index de8b5b1..ff040e6 100644
+--- a/modules/pam_userdb/pam_userdb.c
++++ b/modules/pam_userdb/pam_userdb.c
+@@ -222,12 +222,15 @@ user_lookup (pam_handle_t *pamh, const char *database,
const char *cryptmode,
+ } else {
+ cryptpw = crypt (pass, data.dptr);
+
+- if (cryptpw) {
+- compare = strncasecmp (data.dptr, cryptpw, data.dsize);
++ if (cryptpw && strlen(cryptpw) == (size_t)data.dsize) {
++ compare = memcmp(data.dptr, cryptpw, data.dsize);
+ } else {
+ compare = -2;
+ if (ctrl & PAM_DEBUG_ARG) {
+- pam_syslog(pamh, LOG_INFO, "crypt() returned NULL");
++ if (cryptpw)
++ pam_syslog(pamh, LOG_INFO, "lengths of computed and stored
hashes differ");
++ else
++ pam_syslog(pamh, LOG_INFO, "crypt() returned NULL");
+ }
+ };
+
+--
+1.8.3.1
+
Deleted: core-x86_64/pam-1.1.8-cve-2014-2583.patch
===================================================================
--- core-x86_64/pam-1.1.8-cve-2014-2583.patch 2014-06-18 14:07:37 UTC (rev
215283)
+++ core-x86_64/pam-1.1.8-cve-2014-2583.patch 2014-06-18 14:08:51 UTC (rev
215284)
@@ -1,56 +0,0 @@
-From 9dcead87e6d7f66d34e7a56d11a30daca367dffb Mon Sep 17 00:00:00 2001
-From: "Dmitry V. Levin" <[email protected]>
-Date: Wed, 26 Mar 2014 22:17:23 +0000
-Subject: [PATCH] pam_timestamp: fix potential directory traversal issue
- (ticket #27)
-
-pam_timestamp uses values of PAM_RUSER and PAM_TTY as components of
-the timestamp pathname it creates, so extra care should be taken to
-avoid potential directory traversal issues.
-
-* modules/pam_timestamp/pam_timestamp.c (check_tty): Treat
-"." and ".." tty values as invalid.
-(get_ruser): Treat "." and ".." ruser values, as well as any ruser
-value containing '/', as invalid.
-
-Fixes CVE-2014-2583.
-
-Reported-by: Sebastian Krahmer <[email protected]>
----
- modules/pam_timestamp/pam_timestamp.c | 13 ++++++++++++-
- 1 file changed, 12 insertions(+), 1 deletion(-)
-
-diff --git a/modules/pam_timestamp/pam_timestamp.c
b/modules/pam_timestamp/pam_timestamp.c
-index 5193733..b3f08b1 100644
---- a/modules/pam_timestamp/pam_timestamp.c
-+++ b/modules/pam_timestamp/pam_timestamp.c
-@@ -158,7 +158,7 @@ check_tty(const char *tty)
- tty = strrchr(tty, '/') + 1;
- }
- /* Make sure the tty wasn't actually a directory (no basename). */
-- if (strlen(tty) == 0) {
-+ if (!strlen(tty) || !strcmp(tty, ".") || !strcmp(tty, "..")) {
- return NULL;
- }
- return tty;
-@@ -243,6 +243,17 @@ get_ruser(pam_handle_t *pamh, char *ruserbuf, size_t
ruserbuflen)
- if (pwd != NULL) {
- ruser = pwd->pw_name;
- }
-+ } else {
-+ /*
-+ * This ruser is used by format_timestamp_name as a component
-+ * of constructed timestamp pathname, so ".", "..", and '/'
-+ * are disallowed to avoid potential path traversal issues.
-+ */
-+ if (!strcmp(ruser, ".") ||
-+ !strcmp(ruser, "..") ||
-+ strchr(ruser, '/')) {
-+ ruser = NULL;
-+ }
- }
- if (ruser == NULL || strlen(ruser) >= ruserbuflen) {
- *ruserbuf = '\0';
---
-1.8.3.1
-
Copied: pam/repos/core-x86_64/pam-1.1.8-cve-2014-2583.patch (from rev 215283,
pam/repos/testing-x86_64/pam-1.1.8-cve-2014-2583.patch)
===================================================================
--- core-x86_64/pam-1.1.8-cve-2014-2583.patch (rev 0)
+++ core-x86_64/pam-1.1.8-cve-2014-2583.patch 2014-06-18 14:08:51 UTC (rev
215284)
@@ -0,0 +1,56 @@
+From 9dcead87e6d7f66d34e7a56d11a30daca367dffb Mon Sep 17 00:00:00 2001
+From: "Dmitry V. Levin" <[email protected]>
+Date: Wed, 26 Mar 2014 22:17:23 +0000
+Subject: [PATCH] pam_timestamp: fix potential directory traversal issue
+ (ticket #27)
+
+pam_timestamp uses values of PAM_RUSER and PAM_TTY as components of
+the timestamp pathname it creates, so extra care should be taken to
+avoid potential directory traversal issues.
+
+* modules/pam_timestamp/pam_timestamp.c (check_tty): Treat
+"." and ".." tty values as invalid.
+(get_ruser): Treat "." and ".." ruser values, as well as any ruser
+value containing '/', as invalid.
+
+Fixes CVE-2014-2583.
+
+Reported-by: Sebastian Krahmer <[email protected]>
+---
+ modules/pam_timestamp/pam_timestamp.c | 13 ++++++++++++-
+ 1 file changed, 12 insertions(+), 1 deletion(-)
+
+diff --git a/modules/pam_timestamp/pam_timestamp.c
b/modules/pam_timestamp/pam_timestamp.c
+index 5193733..b3f08b1 100644
+--- a/modules/pam_timestamp/pam_timestamp.c
++++ b/modules/pam_timestamp/pam_timestamp.c
+@@ -158,7 +158,7 @@ check_tty(const char *tty)
+ tty = strrchr(tty, '/') + 1;
+ }
+ /* Make sure the tty wasn't actually a directory (no basename). */
+- if (strlen(tty) == 0) {
++ if (!strlen(tty) || !strcmp(tty, ".") || !strcmp(tty, "..")) {
+ return NULL;
+ }
+ return tty;
+@@ -243,6 +243,17 @@ get_ruser(pam_handle_t *pamh, char *ruserbuf, size_t
ruserbuflen)
+ if (pwd != NULL) {
+ ruser = pwd->pw_name;
+ }
++ } else {
++ /*
++ * This ruser is used by format_timestamp_name as a component
++ * of constructed timestamp pathname, so ".", "..", and '/'
++ * are disallowed to avoid potential path traversal issues.
++ */
++ if (!strcmp(ruser, ".") ||
++ !strcmp(ruser, "..") ||
++ strchr(ruser, '/')) {
++ ruser = NULL;
++ }
+ }
+ if (ruser == NULL || strlen(ruser) >= ruserbuflen) {
+ *ruserbuf = '\0';
+--
+1.8.3.1
+
Deleted: core-x86_64/pam_unix2-glibc216.patch
===================================================================
--- core-x86_64/pam_unix2-glibc216.patch 2014-06-18 14:07:37 UTC (rev
215283)
+++ core-x86_64/pam_unix2-glibc216.patch 2014-06-18 14:08:51 UTC (rev
215284)
@@ -1,20 +0,0 @@
-Index: pam_unix2-2.9.1/src/read-files.c
-===================================================================
---- pam_unix2-2.9.1.orig/src/read-files.c
-+++ pam_unix2-2.9.1/src/read-files.c
-@@ -30,8 +30,14 @@
- #include <errno.h>
- #include <fcntl.h>
- #include <nss.h>
--#include <bits/libc-lock.h>
-+#include <pthread.h>
- #define __libc_lock_t pthread_mutex_t
-+#define __libc_lock_define_initialized(CLASS,NAME) \
-+ CLASS __libc_lock_t NAME = PTHREAD_MUTEX_INITIALIZER;
-+#define __libc_lock_lock(NAME) \
-+ pthread_mutex_lock, (&(NAME))
-+#define __libc_lock_unlock(NAME) \
-+ pthread_mutex_unlock, (&(NAME))
-
- #include "read-files.h"
-
Copied: pam/repos/core-x86_64/pam_unix2-glibc216.patch (from rev 215283,
pam/repos/testing-x86_64/pam_unix2-glibc216.patch)
===================================================================
--- core-x86_64/pam_unix2-glibc216.patch (rev 0)
+++ core-x86_64/pam_unix2-glibc216.patch 2014-06-18 14:08:51 UTC (rev
215284)
@@ -0,0 +1,20 @@
+Index: pam_unix2-2.9.1/src/read-files.c
+===================================================================
+--- pam_unix2-2.9.1.orig/src/read-files.c
++++ pam_unix2-2.9.1/src/read-files.c
+@@ -30,8 +30,14 @@
+ #include <errno.h>
+ #include <fcntl.h>
+ #include <nss.h>
+-#include <bits/libc-lock.h>
++#include <pthread.h>
+ #define __libc_lock_t pthread_mutex_t
++#define __libc_lock_define_initialized(CLASS,NAME) \
++ CLASS __libc_lock_t NAME = PTHREAD_MUTEX_INITIALIZER;
++#define __libc_lock_lock(NAME) \
++ pthread_mutex_lock, (&(NAME))
++#define __libc_lock_unlock(NAME) \
++ pthread_mutex_unlock, (&(NAME))
+
+ #include "read-files.h"
+
