fixed memory overwrite in bio patch

5 files changed, 110 insertions, 11 deletions

diff --git a/sys-cluster/drbd/ChangeLog b/sys-cluster/drbd/ChangeLog
index f203406480d5..8d73ea19a1b1 100644
--- a/sys-cluster/drbd/ChangeLog
+++ b/sys-cluster/drbd/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for sys-cluster/drbd
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-cluster/drbd/ChangeLog,v 1.17 2005/01/26 01:43:28 xmerlin Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/drbd/ChangeLog,v 1.18 2005/01/26 17:15:16 xmerlin Exp $
+
+  26 Jan 2005; Christian Zoffoli <xmerlin@gentoo.org> :
+  fixed memory overwrite in bio patch
 
   26 Jan 2005; Christian Zoffoli <xmerlin@gentoo.org>
   -files/drbd-0.7-bio.patch, -drbd-0.7.8-r1.ebuild, -drbd-0.7.8.ebuild,
diff --git a/sys-cluster/drbd/Manifest b/sys-cluster/drbd/Manifest
index 0c0249a19ba8..a3349e9ec634 100644
--- a/sys-cluster/drbd/Manifest
+++ b/sys-cluster/drbd/Manifest
@@ -1,10 +1,8 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 MD5 0a023c3e9a5d76250c2b1600f09d774a ChangeLog 3817
 MD5 a64b9a1937a5cfc2fbaf373521f65d47 metadata.xml 223
 MD5 b149aaae0a018b3d665b28b7c8ac2b41 drbd-0.6.12-r1.ebuild 2136
 MD5 94fdc488435ae129202d942afacf6169 drbd-0.7.9.ebuild 2045
+MD5 94fdc488435ae129202d942afacf6169 drbd-0.7.9-r1.ebuild 2045
 MD5 463c9c89c7d3f156fc5581070abce14d files/0.6.12-conf.d 69
 MD5 4ab78154d6a32d13d416f9915ad4bc28 files/0.6.12-init 701
 MD5 7416c44daab264a36cc8c5a2c35e757f files/0.6.12-scripts-Makefile.patch 1072
@@ -14,10 +12,5 @@ MD5 f8ceed0b6be2ded4cdb079d38ac0c3d0 files/0.6.12-Makefile.vars.patch 675
 MD5 a977b79c0da39dcb625d9aeb8287d60e files/drbd-0.7-init 1189
 MD5 cc42f194896b14c87944e9a5c5aaebf9 files/drbd-0.7-module-Makefile.patch 948
 MD5 d90c0b05f1d6b0d03aa540b0afc34701 files/digest-drbd-0.7.9 62
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.2.6 (GNU/Linux)
-
-iD8DBQFB901qgMUyd/cdjWsRAo1iAKCSvMO9+kR7lZLHND0fYpm9n4ZzngCeIaVV
-Q5ji4+ss6x5ajd8w5Nflid0=
-=s4Fs
------END PGP SIGNATURE-----
+MD5 42947095a3ce5384891fa4c80deb45b2 files/drbd-0.7.9-2.diff 741
+MD5 d90c0b05f1d6b0d03aa540b0afc34701 files/digest-drbd-0.7.9-r1 62
diff --git a/sys-cluster/drbd/drbd-0.7.9-r1.ebuild b/sys-cluster/drbd/drbd-0.7.9-r1.ebuild
new file mode 100644
index 000000000000..12ab868fe41b
--- /dev/null
+++ b/sys-cluster/drbd/drbd-0.7.9-r1.ebuild
@@ -0,0 +1,79 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/drbd/drbd-0.7.9-r1.ebuild,v 1.1 2005/01/26 17:15:16 xmerlin Exp $
+
+inherit eutils versionator linux-mod
+
+LICENSE="GPL-2"
+KEYWORDS="~x86"
+
+MY_MAJ_PV="$(get_version_component_range 1-2 ${PV})"
+DESCRIPTION="mirror/replicate block-devices across a network-connection"
+SRC_URI="http://oss.linbit.com/drbd/${MY_MAJ_PV}/${P}.tar.gz"
+HOMEPAGE="http://www.drbd.org"
+
+IUSE=""
+
+DEPEND="virtual/linux-sources"
+RDEPEND=">=sys-cluster/heartbeat-1.0.4"
+SLOT="0"
+
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+	epatch ${FILESDIR}/${PN}-${MY_MAJ_PV}-module-Makefile.patch || die
+	epatch ${FILESDIR}/${P}-bio_patch_memory_overwrite.patch || die
+}
+
+src_compile() {
+	check_KV
+	set_arch_to_kernel
+
+	einfo ""
+	einfo "Your kernel-sources in /usr/src/linux-${KV} must be properly configured"
+	#einfo "and match the currently running kernel version ${KV}"
+	einfo "If otherwise -> build will fail."
+	einfo ""
+	einfo "Please don't use XFS with drbd (see drbd mailing list archives)"
+	einfo ""
+
+	emake KDIR=${KERNEL_DIR} || die "compile problem"
+}
+
+src_install() {
+	make PREFIX=${D} install || die "install problem"
+
+	# gentoo-ish init-script
+	dodir /etc/init.d
+	exeinto /etc/init.d
+	newexe ${FILESDIR}/drbd-0.7-init drbd || die
+
+	# needed by drbd startup script
+	#keepdir /var/lib/drbd
+
+	# docs
+	dodoc README ChangeLog COPYING
+	dodoc documentation/NFS-Server-README.txt
+
+	# we put drbd.conf into docs
+	# it doesnt make sense to install a default conf in /etc
+	# put it to the docs
+	rm -f ${D}/etc/drbd.conf
+	dodoc scripts/drbd.conf || die
+	dodoc upgrade_0.6.x_to_0.7.0.txt upgrade_0.7.0_to_0.7.1.txt || die
+}
+
+pkg_postinst() {
+	linux-mod_pkg_postinst
+
+	einfo ""
+	einfo "Please remember to re-emerge drbd when you upgrade your kernel!"
+	einfo ""
+	einfo "Please copy and gunzip the configuration file"
+	einfo "from /usr/share/doc/${PF}/drbd.conf.gz to /etc"
+	einfo "and edit it to your needs. Helpful commands:"
+	einfo "man 5 drbd.conf"
+	einfo "man 8 drbdsetup"
+	einfo "man 8 drbdadm"
+	einfo ""
+}
diff --git a/sys-cluster/drbd/files/digest-drbd-0.7.9-r1 b/sys-cluster/drbd/files/digest-drbd-0.7.9-r1
new file mode 100644
index 000000000000..de157e0b4cdb
--- /dev/null
+++ b/sys-cluster/drbd/files/digest-drbd-0.7.9-r1
@@ -0,0 +1 @@
+MD5 d7b227064b171a8b488aee6a481731f5 drbd-0.7.9.tar.gz 277353
diff --git a/sys-cluster/drbd/files/drbd-0.7.9-bio_patch_memory_overwrite.patch b/sys-cluster/drbd/files/drbd-0.7.9-bio_patch_memory_overwrite.patch
new file mode 100644
index 000000000000..16a57e0f40b5
--- /dev/null
+++ b/sys-cluster/drbd/files/drbd-0.7.9-bio_patch_memory_overwrite.patch
@@ -0,0 +1,23 @@
+diff -uNr drbd-0.7.9.old/drbd/drbd_compat_wrappers.h drbd-0.7.9/drbd/drbd_compat_wrappers.h
+--- drbd-0.7.9.old/drbd/drbd_compat_wrappers.h	2005-01-25 10:22:12.000000000 +0000
++++ drbd-0.7.9/drbd/drbd_compat_wrappers.h	2005-01-26 23:39:15.857468856 +0000
+@@ -538,7 +538,9 @@
+ 	bio_init(bio); // bio->bi_flags   = 0;
+ 	bio->bi_io_vec = bvec;
+ 	bio->bi_max_vecs = 1;
+-
++	
++	/* FIXME: __bio_clone() workaround, fix me properly later! */
++	bio_src->bi_max_vecs = 1;
+ 	__bio_clone(bio,bio_src);
+ 	bio->bi_bdev    = mdev->backing_bdev;
+ 	bio->bi_private = mdev;
+@@ -559,6 +561,8 @@
+ 	bio->bi_io_vec = bvec;
+ 	bio->bi_max_vecs = 1;
+ 
++	/* FIXME: __bio_clone() workaround, fix me properly later! */
++	bio_src->bi_max_vecs = 1;
+ 	__bio_clone(bio,bio_src);
+ 	bio->bi_bdev    = mdev->backing_bdev;
+ 	bio->bi_private = mdev;