Hello community,

here is the log from the commit of package openssh for openSUSE:Factory checked 
in at 2012-05-31 17:07:32
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/openssh (Old)
 and      /work/SRC/openSUSE:Factory/.openssh.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Package is "openssh", Maintainer is "pce...@suse.com"

Changes:
--------
--- /work/SRC/openSUSE:Factory/openssh/openssh-askpass-gnome.changes    
2012-04-12 09:44:09.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.openssh.new/openssh-askpass-gnome.changes       
2012-05-31 17:07:34.000000000 +0200
@@ -1,0 +2,6 @@
+Tue May 29 07:14:53 UTC 2012 - meiss...@suse.com
+
+- use correct tarball url
+- update to 6.0p1.
+
+-------------------------------------------------------------------
--- /work/SRC/openSUSE:Factory/openssh/openssh.changes  2012-05-21 
10:01:19.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.openssh.new/openssh.changes     2012-05-31 
17:07:34.000000000 +0200
@@ -1,0 +2,11 @@
+Tue May 29 07:14:36 UTC 2012 - meiss...@suse.com
+
+- use correct download url and tarball format.
+
+-------------------------------------------------------------------
+Tue May 29 06:52:13 UTC 2012 - crrodrig...@opensuse.org
+
+- Update to version 6.0, large list of changes, seen
+  http://www.openssh.org/txt/release-6.0 for detail.
+
+-------------------------------------------------------------------

Old:
----
  openssh-5.9p1.tar.bz2

New:
----
  openssh-6.0p1.tar.gz

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

Other differences:
------------------
++++++ openssh-askpass-gnome.spec ++++++
--- /var/tmp/diff_new_pack.mqvvSX/_old  2012-05-31 17:07:37.000000000 +0200
+++ /var/tmp/diff_new_pack.mqvvSX/_new  2012-05-31 17:07:37.000000000 +0200
@@ -26,7 +26,7 @@
 BuildRequires:  pam-devel
 BuildRequires:  tcpd-devel
 BuildRequires:  update-desktop-files
-Version:        5.9p1
+Version:        6.0p1
 Release:        0
 Requires:       openssh = %{version}
 Requires:       openssh-askpass = %{version}
@@ -35,7 +35,7 @@
 Group:          Productivity/Networking/SSH
 Url:            http://www.openssh.com/
 %define _name openssh
-Source:         %{_name}-%{version}.tar.bz2
+Source:         
ftp://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable/openssh-%{version}.tar.gz
 Patch:          %{_name}-5.9p1-sshd_config.diff
 Patch1:         %{_name}-5.9p1-pam-fix2.diff
 Patch2:         %{_name}-5.9p1-saveargv-fix.diff

++++++ openssh.spec ++++++
--- /var/tmp/diff_new_pack.mqvvSX/_old  2012-05-31 17:07:37.000000000 +0200
+++ /var/tmp/diff_new_pack.mqvvSX/_new  2012-05-31 17:07:37.000000000 +0200
@@ -33,14 +33,14 @@
 Requires:       /bin/netstat
 PreReq:         pwdutils %{insserv_prereq} %{fillup_prereq} coreutils
 Conflicts:      nonfreessh
-Version:        5.9p1
+Version:        6.0p1
 Release:        0
 %define xversion 1.2.4.1
 Summary:        Secure Shell Client and Server (Remote Login Program)
 License:        BSD-3-Clause ; MIT
 Group:          Productivity/Networking/SSH
 Url:            http://www.openssh.com/
-Source:         %{name}-%{version}.tar.bz2
+Source:         
ftp://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable/openssh-%{version}.tar.gz
 Source1:        sshd.init
 Source2:        sshd.pamd
 Source3:        x11-ssh-askpass-%{xversion}.tar.bz2

++++++ openssh-nocrazyabicheck.patch ++++++
--- /var/tmp/diff_new_pack.mqvvSX/_old  2012-05-31 17:07:37.000000000 +0200
+++ /var/tmp/diff_new_pack.mqvvSX/_new  2012-05-31 17:07:37.000000000 +0200
@@ -1,15 +1,17 @@
 --- entropy.c.orig
 +++ entropy.c
-@@ -213,10 +213,11 @@ seed_rng(void)
-        * OpenSSL version numbers: MNNFFPPS: major minor fix patch status
-        * We match major, minor, fix and status (not patch)
+@@ -216,12 +216,13 @@ seed_rng(void)
+        * allow 1.0.1 to work with 1.0.0). Going backwards is only allowed
+        * within a patch series.
         */
-+    /*
-       if ((SSLeay() ^ OPENSSL_VERSION_NUMBER) & ~0xff0L)
++#if 0
+       u_long version_mask = SSLeay() >= 0x1000000f ?  ~0xffff0L : ~0xff0L;
+       if (((SSLeay() ^ OPENSSL_VERSION_NUMBER) & version_mask) ||
+           (SSLeay() >> 12) < (OPENSSL_VERSION_NUMBER >> 12))
                fatal("OpenSSL version mismatch. Built against %lx, you "
                    "have %lx", (u_long)OPENSSL_VERSION_NUMBER, SSLeay());
 -
-+*/
++#endif
  #ifndef OPENSSL_PRNG_ONLY
        if (RAND_status() == 1) {
                debug3("RNG is ready, skipping seeding");

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

Reply via email to