rpms/openssh/devel .cvsignore, 1.15, 1.16 openssh-nukeacss.sh, 1.1, 1.2 openssh.spec, 1.64, 1.65 sources, 1.15, 1.16 openssh-4.1p1-getpeername-race.patch, 1.1, NONE
fedora-cvs-commits at redhat.com
fedora-cvs-commits at redhat.com
Tue Sep 6 19:55:20 UTC 2005
Author: tmraz
Update of /cvs/dist/rpms/openssh/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv1147
Modified Files:
.cvsignore openssh-nukeacss.sh openssh.spec sources
Removed Files:
openssh-4.1p1-getpeername-race.patch
Log Message:
* Tue Sep 06 2005 Tomas Mraz <tmraz at redhat.com> 4.2p1-1
- upgrade to a new upstream version
Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/openssh/devel/.cvsignore,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- .cvsignore 6 Jun 2005 19:45:23 -0000 1.15
+++ .cvsignore 6 Sep 2005 19:55:17 -0000 1.16
@@ -1,2 +1,2 @@
x11-ssh-askpass-1.2.4.1.tar.gz
-openssh-4.1p1-noacss.tar.bz2
+openssh-4.2p1-noacss.tar.bz2
Index: openssh-nukeacss.sh
===================================================================
RCS file: /cvs/dist/rpms/openssh/devel/openssh-nukeacss.sh,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- openssh-nukeacss.sh 13 Sep 2004 19:39:41 -0000 1.1
+++ openssh-nukeacss.sh 6 Sep 2005 19:55:17 -0000 1.2
@@ -4,25 +4,16 @@
# rest of the package can still be built.
#
> acss.c
-patch -sp1 << EOF
---- openssh/cipher.c
-+++ openssh/cipher.c
-@@ -53,6 +53,7 @@
- extern void ssh_rijndael_iv(EVP_CIPHER_CTX *, int, u_char *, u_int);
- #endif
-
-+#if 0
- #if !defined(EVP_CTRL_SET_ACSS_MODE)
- # if (OPENSSL_VERSION_NUMBER >= 0x00907000L)
- extern const EVP_CIPHER *evp_acss(void);
-@@ -62,6 +63,9 @@
- # define EVP_acss NULL /* Don't try to support ACSS on older OpenSSL */
- # endif /* (OPENSSL_VERSION_NUMBER >= 0x00906000L) */
- #endif /* !defined(EVP_CTRL_SET_ACSS_MODE) */
-+#else
+patch -sp0 << EOF
+--- cipher.c.orig 2005-07-17 09:02:10.000000000 +0200
++++ cipher.c 2005-09-06 14:52:06.000000000 +0200
+@@ -45,6 +45,8 @@
+
+ /* compatibility with old or broken OpenSSL versions */
+ #include "openbsd-compat/openssl-compat.h"
++#undef USE_CIPHER_ACSS
+#define EVP_acss NULL
-+#endif /* 0 */
-
+
extern const EVP_CIPHER *evp_ssh1_bf(void);
extern const EVP_CIPHER *evp_ssh1_3des(void);
EOF
Index: openssh.spec
===================================================================
RCS file: /cvs/dist/rpms/openssh/devel/openssh.spec,v
retrieving revision 1.64
retrieving revision 1.65
diff -u -r1.64 -r1.65
--- openssh.spec 16 Aug 2005 11:18:44 -0000 1.64
+++ openssh.spec 6 Sep 2005 19:55:17 -0000 1.65
@@ -73,8 +73,8 @@
Summary: The OpenSSH implementation of SSH protocol versions 1 and 2.
Name: openssh
-Version: 4.1p1
-%define rel 5
+Version: 4.2p1
+%define rel 1
%if %{rescue}
Release: %{rel}rescue
%else
@@ -104,7 +104,6 @@
Patch26: openssh-4.0p1-krb5-valid.patch
Patch27: openssh-4.1p1-pam-loginuid.patch
Patch28: openssh-4.1p1-nologin.patch
-Patch29: openssh-4.1p1-getpeername-race.patch
Patch30: openssh-4.0p1-exit-deadlock.patch
Patch31: openssh-3.9p1-skip-used.patch
License: BSD
@@ -246,7 +245,6 @@
%patch26 -p0 -b .krb5-valid
%patch27 -p1 -b .loginuid
%patch28 -p1 -b .nologin
-%patch29 -p0 -b .getpeername-race
%patch30 -p1 -b .exit-deadlock
%patch31 -p1 -b .skip-used
@@ -293,6 +291,7 @@
--with-privsep-path=%{_var}/empty/sshd \
--enable-vendor-patchlevel="FC-%{version}-%{release}" \
--disable-strip \
+ --without-zlib-version-check \
%if %{scard}
--with-smartcard \
%endif
@@ -525,6 +524,9 @@
%endif
%changelog
+* Tue Sep 06 2005 Tomas Mraz <tmraz at redhat.com> 4.2p1-1
+- upgrade to a new upstream version
+
* Tue Aug 16 2005 Tomas Mraz <tmraz at redhat.com> 4.1p1-5
- use x11-ssh-askpass if openssh-askpass-gnome is not installed (#165207)
- install ssh-copy-id from contrib (#88707)
Index: sources
===================================================================
RCS file: /cvs/dist/rpms/openssh/devel/sources,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- sources 6 Jun 2005 19:45:23 -0000 1.15
+++ sources 6 Sep 2005 19:55:17 -0000 1.16
@@ -1,2 +1,2 @@
8f2e41f3f7eaa8543a2440454637f3c3 x11-ssh-askpass-1.2.4.1.tar.gz
-85a161a501f4b7779eb0dc8fd60872bc openssh-4.1p1-noacss.tar.bz2
+62375456bbf60f29b4d003cbde22c147 openssh-4.2p1-noacss.tar.bz2
--- openssh-4.1p1-getpeername-race.patch DELETED ---
More information about the fedora-cvs-commits
mailing list