Hello community,

here is the log from the commit of package pam_ssh for openSUSE:Factory checked 
in at 2012-01-19 09:43:46
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/pam_ssh (Old)
 and      /work/SRC/openSUSE:Factory/.pam_ssh.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Package is "pam_ssh", Maintainer is "vci...@suse.com"

Changes:
--------
--- /work/SRC/openSUSE:Factory/pam_ssh/pam_ssh.changes  2011-11-28 
12:55:33.000000000 +0100
+++ /work/SRC/openSUSE:Factory/.pam_ssh.new/pam_ssh.changes     2012-01-19 
09:43:48.000000000 +0100
@@ -1,0 +2,12 @@
+Thu Jan 12 15:57:39 UTC 2012 - vci...@suse.com
+
+- added patch that prevents segfault when empty passphrase is
+  supplied (bnc#741541)
+
+-------------------------------------------------------------------
+Mon Nov 28 11:47:01 UTC 2011 - jeng...@medozas.de
+
+- Remove redundant/unwanted tags/section (cf. specfile guidelines)
+- Use %_smp_mflags for parallel building
+
+-------------------------------------------------------------------

New:
----
  pam_ssh-1.97-empty_passphrase_segfault.patch

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Other differences:
------------------
++++++ pam_ssh.spec ++++++
--- /var/tmp/diff_new_pack.phklDF/_old  2012-01-19 09:43:49.000000000 +0100
+++ /var/tmp/diff_new_pack.phklDF/_new  2012-01-19 09:43:49.000000000 +0100
@@ -1,7 +1,7 @@
 #
 # spec file for package pam_ssh
 #
-# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -16,20 +16,24 @@
 #
 
 
-
 Name:           pam_ssh
-BuildRequires:  libtool openssh openssl-devel pam-devel
-License:        BSD3c(or similar)
-Group:          Productivity/Networking/SSH
+BuildRequires:  libtool
+BuildRequires:  openssh
+BuildRequires:  openssl-devel
+BuildRequires:  pam-devel
 Version:        1.97
 Release:        0
 Summary:        PAM Module for SSH Authentication
+License:        BSD-3-Clause
+Group:          Productivity/Networking/SSH
 Url:            http://sourceforge.net/projects/pam-ssh/
 Source:         %{name}-%{version}.tar.bz2
 Source2:        baselibs.conf
 Patch0:         pam_ssh-double-free.patch
 Patch1:         pam_ssh-1.97-setgid.patch
 Patch2:         pam_ssh-1.97-sigmask.patch
+# PATCH-FIX-OPENSUSE crashed on EOF passphrase (bnc#741541)
+Patch3:         pam_ssh-1.97-empty_passphrase_segfault.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 
 %description
@@ -50,16 +54,15 @@
 %patch0 -p1
 %patch1 -p1
 %patch2 -p0
+%patch3 -p1
 
 %build
 %{suse_update_config -f}
 autoreconf --verbose --force --install
-CFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing"  \
-./configure --libdir=/%{_lib} \
-            --with-pamdir=/%{_lib}/security \
-            --prefix=%{_prefix} \
-           --mandir=%{_mandir}
-make
+export CFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing"
+%configure --libdir=/%{_lib} \
+            --with-pamdir=/%{_lib}/security
+make %{?_smp_mflags}
 
 %install
 install -d 755 $RPM_BUILD_ROOT/%{_lib}/security
@@ -67,9 +70,6 @@
 install -d 755 $RPM_BUILD_ROOT%{_mandir}/man8
 install -m 644 pam_ssh.8 $RPM_BUILD_ROOT%{_mandir}/man8/
 
-%clean
-rm -rf $RPM_BUILD_ROOT
-
 %files
 %defattr(444,root,root,755)
 %doc README TODO NEWS

++++++ pam_ssh-1.97-empty_passphrase_segfault.patch ++++++
--- pam_ssh-1.92.orig/pam_get_pass.c    2004-02-19 19:59:05.000000000 +0100
+++ pam_ssh-1.92/pam_get_pass.c 2009-04-18 13:51:10.000000000 +0200
@@ -63,6 +63,8 @@
        retval = conv->conv(1, msgs, &resp, conv->appdata_ptr);
        if (retval != PAM_SUCCESS)
                return retval;
+       if (resp[0].resp == NULL)
+               return PAM_AUTHTOK_RECOVERY_ERR;
        retval = pam_set_item(pamh, PAM_AUTHTOK, resp[0].resp);
        if (retval != PAM_SUCCESS)
                return retval;

++++++ pam_ssh-1.97-sigmask.patch ++++++
--- /var/tmp/diff_new_pack.phklDF/_old  2012-01-19 09:43:49.000000000 +0100
+++ /var/tmp/diff_new_pack.phklDF/_new  2012-01-19 09:43:49.000000000 +0100
@@ -1,7 +1,8 @@
-diff -up pam_ssh.c.orig-sigmask pam_ssh.c
---- pam_ssh.c.orig-sigmask     2011-10-30 16:38:41.365415881 +0100
-+++ pam_ssh.c  2011-10-30 16:39:09.396068291 +0100
-@@ -554,6 +554,7 @@ pam_sm_open_session(pam_handle_t *pamh,
+Index: pam_ssh.c
+===================================================================
+--- pam_ssh.c.orig     2012-01-12 12:20:00.108458104 +0100
++++ pam_ssh.c  2012-01-12 16:00:01.650388767 +0100
+@@ -554,6 +554,7 @@
          time_t file_ctime;              /* creation time of per-agent file */
          time_t time_now;                /* current time */
          time_t time_up;                 /* uptime */
@@ -9,7 +10,7 @@
  
          memset(&options, 0, sizeof options);
          pam_std_option(&options, other_options, argc, argv);
-@@ -708,6 +709,10 @@ pam_sm_open_session(pam_handle_t *pamh,
+@@ -708,6 +714,10 @@
                                        _exit(EX_OSERR);
                                }
                        }

-- 
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org

Reply via email to