rpms/kernel/devel patch-2.6.25-rc2-git5.bz2.sign, NONE, 1.1 .cvsignore, 1.766, 1.767 kernel.spec, 1.447, 1.448 linux-2.6-blkcipher-depend-on-chainiv.patch, 1.1, 1.2 sources, 1.726, 1.727 upstream, 1.648, 1.649 patch-2.6.25-rc2-git4.bz2.sign, 1.1, NONE
Kyle McMartin (kyle)
fedora-extras-commits at redhat.com
Thu Feb 21 21:04:53 UTC 2008
Author: kyle
Update of /cvs/pkgs/rpms/kernel/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26374
Modified Files:
.cvsignore kernel.spec
linux-2.6-blkcipher-depend-on-chainiv.patch sources upstream
Added Files:
patch-2.6.25-rc2-git5.bz2.sign
Removed Files:
patch-2.6.25-rc2-git4.bz2.sign
Log Message:
* Thu Feb 21 2008 Kyle McMartin <kmcmartin at redhat.com>
- crypto_blkcipher: big hack caused module dep loop, try another fix
- Linux 2.6.25-rc2-git5
--- NEW FILE patch-2.6.25-rc2-git5.bz2.sign ---
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.7 (GNU/Linux)
Comment: See http://www.kernel.org/signature.html for info
iD8DBQBHvSIoyGugalF9Dw4RAnZGAJ9UvnJfFKg4JEJws/V6IjsYY7lOoQCdGfze
vga/6AnB6bCwX+Hb33P9qhg=
=7t2E
-----END PGP SIGNATURE-----
Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/.cvsignore,v
retrieving revision 1.766
retrieving revision 1.767
diff -u -r1.766 -r1.767
--- .cvsignore 20 Feb 2008 23:07:08 -0000 1.766
+++ .cvsignore 21 Feb 2008 21:04:17 -0000 1.767
@@ -5,4 +5,4 @@
kernel-2.6.24
linux-2.6.24.tar.bz2
patch-2.6.25-rc2.bz2
-patch-2.6.25-rc2-git4.bz2
+patch-2.6.25-rc2-git5.bz2
Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/kernel.spec,v
retrieving revision 1.447
retrieving revision 1.448
diff -u -r1.447 -r1.448
--- kernel.spec 21 Feb 2008 19:33:48 -0000 1.447
+++ kernel.spec 21 Feb 2008 21:04:17 -0000 1.448
@@ -45,7 +45,7 @@
# The rc snapshot level
%define rcrev 2
# The git snapshot level
-%define gitrev 4
+%define gitrev 5
# Set rpm version accordingly
%define rpmversion 2.6.%{upstream_sublevel}
%endif
@@ -1737,6 +1737,10 @@
%kernel_variant_files -a /%{image_install_path}/xen*-%{KVERREL} -e /etc/ld.so.conf.d/kernelcap-%{KVERREL}.conf %{with_xen} xen
%changelog
+* Thu Feb 21 2008 Kyle McMartin <kmcmartin at redhat.com>
+- crypto_blkcipher: big hack caused module dep loop, try another fix
+- Linux 2.6.25-rc2-git5
+
* Thu Feb 21 2008 John W. Linville <linville at redhat.com>
- ath5k: Fix build warnings on some 64-bit platforms.
- p54usb: add USB ID for Phillips CPWUA054
linux-2.6-blkcipher-depend-on-chainiv.patch:
Index: linux-2.6-blkcipher-depend-on-chainiv.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/linux-2.6-blkcipher-depend-on-chainiv.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- linux-2.6-blkcipher-depend-on-chainiv.patch 20 Feb 2008 23:07:08 -0000 1.1
+++ linux-2.6-blkcipher-depend-on-chainiv.patch 21 Feb 2008 21:04:17 -0000 1.2
@@ -1,39 +1,23 @@
-diff --git a/crypto/blkcipher.c b/crypto/blkcipher.c
-index 4a7e65c..0ab656e 100644
---- a/crypto/blkcipher.c
-+++ b/crypto/blkcipher.c
-@@ -27,6 +27,8 @@
+diff --git a/crypto/Makefile b/crypto/Makefile
+index 48c7583..13b8cf8 100644
+--- a/crypto/Makefile
++++ b/crypto/Makefile
+@@ -12,8 +12,8 @@ obj-$(CONFIG_CRYPTO_AEAD) += aead.o
- #include "internal.h"
+ crypto_blkcipher-objs := ablkcipher.o
+ crypto_blkcipher-objs += blkcipher.o
++crypto_blkcipher-objs += chainiv.o
+ obj-$(CONFIG_CRYPTO_BLKCIPHER) += crypto_blkcipher.o
+-obj-$(CONFIG_CRYPTO_BLKCIPHER) += chainiv.o
+ obj-$(CONFIG_CRYPTO_BLKCIPHER) += eseqiv.o
+ obj-$(CONFIG_CRYPTO_SEQIV) += seqiv.o
-+extern int chainiv_dummy_bonghits;
-+
- enum {
- BLKCIPHER_WALK_PHYS = 1 << 0,
- BLKCIPHER_WALK_SLOW = 1 << 1,
-@@ -698,3 +700,11 @@ EXPORT_SYMBOL_GPL(skcipher_geniv_exit);
-
- MODULE_LICENSE("GPL");
- MODULE_DESCRIPTION("Generic block chaining cipher type");
-+
-+int blkcipher_init(void)
-+{
-+ chainiv_dummy_bonghits = 0x900dcafe;
-+
-+ return 0;
-+}
-+module_init(blkcipher_init);
diff --git a/crypto/chainiv.c b/crypto/chainiv.c
-index d17fa04..853eadf 100644
+index d17fa04..170e436 100644
--- a/crypto/chainiv.c
+++ b/crypto/chainiv.c
-@@ -23,6 +23,9 @@
- #include <linux/string.h>
- #include <linux/workqueue.h>
+@@ -329,3 +329,4 @@ module_exit(chainiv_module_exit);
-+static int chainiv_dummy_bonghits = 0;
-+EXPORT_SYMBOL_GPL(chainiv_dummy_bonghits);
-+
- enum {
- CHAINIV_STATE_INUSE = 0,
- };
+ MODULE_LICENSE("GPL");
+ MODULE_DESCRIPTION("Chain IV Generator");
++MODULE_ALIAS("chainiv");
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/sources,v
retrieving revision 1.726
retrieving revision 1.727
diff -u -r1.726 -r1.727
--- sources 20 Feb 2008 23:07:08 -0000 1.726
+++ sources 21 Feb 2008 21:04:17 -0000 1.727
@@ -1,3 +1,3 @@
3f23ad4b69d0a552042d1ed0f4399857 linux-2.6.24.tar.bz2
dbfa4fb224fede6b96ed42497f123946 patch-2.6.25-rc2.bz2
-5c89b6e1378c53e075a14cda9c0d619a patch-2.6.25-rc2-git4.bz2
+4916a74e3fecdb28768dd747925d4434 patch-2.6.25-rc2-git5.bz2
Index: upstream
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/upstream,v
retrieving revision 1.648
retrieving revision 1.649
diff -u -r1.648 -r1.649
--- upstream 20 Feb 2008 23:07:08 -0000 1.648
+++ upstream 21 Feb 2008 21:04:17 -0000 1.649
@@ -1,3 +1,3 @@
linux-2.6.24.tar.bz2
patch-2.6.25-rc2.bz2
-patch-2.6.25-rc2-git4.bz2
+patch-2.6.25-rc2-git5.bz2
--- patch-2.6.25-rc2-git4.bz2.sign DELETED ---
More information about the fedora-extras-commits
mailing list