Version bumped. Fixes #56659.

6 files changed, 142 insertions, 10 deletions

diff --git a/sys-cluster/drbd/ChangeLog b/sys-cluster/drbd/ChangeLog
index a4d08ffc05bb..a04c5e8315a9 100644
--- a/sys-cluster/drbd/ChangeLog
+++ b/sys-cluster/drbd/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sys-cluster/drbd
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-cluster/drbd/ChangeLog,v 1.6 2004/06/24 22:37:07 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/drbd/ChangeLog,v 1.7 2004/08/30 13:51:12 tantive Exp $
+
+*drbd-0.6.12-r1 (30 Aug 2004)
+
+  30 Aug 2004; Michael Imhof <tantive@gentoo.org> +files/0.6.12-conf.d,
+  +files/0.6.12-init, +drbd-0.6.12-r1.ebuild:
+  Version bumped. Fixes #56659.
 
 *drbd-0.6.12 (30 Apr 2004)
 
diff --git a/sys-cluster/drbd/Manifest b/sys-cluster/drbd/Manifest
index 74f819d38416..2222ba65134a 100644
--- a/sys-cluster/drbd/Manifest
+++ b/sys-cluster/drbd/Manifest
@@ -1,13 +1,27 @@
-MD5 c189b2a85daa0f46bdfa881e5b936ed0 drbd-0.6.6-r2.ebuild 1920
-MD5 02564fab57e0c737ee7b981168b05c92 drbd-0.6.12.ebuild 2081
-MD5 0d5ef79b312e8d16ebf44916d5786e26 ChangeLog 1181
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 MD5 a64b9a1937a5cfc2fbaf373521f65d47 metadata.xml 223
-MD5 545a301fed86260ef910d0874f31bb2d files/0.6.6-Makefile.vars.patch 936
-MD5 7fccd0c1159fb79cd60fc45ace182a56 files/digest-drbd-0.6.6-r2 62
+MD5 7e3f0df7e3abc647010506e9ce00c374 ChangeLog 1362
+MD5 b4ce1a4ad0f310ba649b88a09bf20c19 drbd-0.6.12-r1.ebuild 2179
+MD5 02564fab57e0c737ee7b981168b05c92 drbd-0.6.12.ebuild 2081
+MD5 c189b2a85daa0f46bdfa881e5b936ed0 drbd-0.6.6-r2.ebuild 1920
+MD5 f8ceed0b6be2ded4cdb079d38ac0c3d0 files/0.6.12-Makefile.vars.patch 675
+MD5 7416c44daab264a36cc8c5a2c35e757f files/0.6.12-scripts-Makefile.patch 1072
 MD5 3959588a14b9fba5df432a29d00fa63f files/digest-drbd-0.6.12 63
-MD5 54de4ff29f16698f6d1aa861935f7a53 files/0.6.6-drbd-Makefile.patch 816
 MD5 ce7682bc39b5263e80bea51b039e7252 files/0.6.6-init 256
-MD5 7416c44daab264a36cc8c5a2c35e757f files/0.6.12-scripts-Makefile.patch 1072
-MD5 52dc2e272f064349f8f70277159d4a5f files/0.6.12-module-Makefile.patch 776
-MD5 f8ceed0b6be2ded4cdb079d38ac0c3d0 files/0.6.12-Makefile.vars.patch 675
+MD5 54de4ff29f16698f6d1aa861935f7a53 files/0.6.6-drbd-Makefile.patch 816
+MD5 3959588a14b9fba5df432a29d00fa63f files/digest-drbd-0.6.12-r1 63
+MD5 4ab78154d6a32d13d416f9915ad4bc28 files/0.6.12-init 701
+MD5 545a301fed86260ef910d0874f31bb2d files/0.6.6-Makefile.vars.patch 936
 MD5 0fd7f6bf10cd5fc99f2c79c88355ea8c files/0.6.6-scripts-Makefile.patch 1008
+MD5 463c9c89c7d3f156fc5581070abce14d files/0.6.12-conf.d 69
+MD5 7fccd0c1159fb79cd60fc45ace182a56 files/digest-drbd-0.6.6-r2 62
+MD5 52dc2e272f064349f8f70277159d4a5f files/0.6.12-module-Makefile.patch 776
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.2.4 (GNU/Linux)
+
+iD8DBQFBMzExKtJO8LeSoosRAuBAAKCPXigcgVzOpPd2q/83cCNvYa6Q5gCgiByA
+Nlr8m0DzMr+iad0VcLsj9pA=
+=qmoj
+-----END PGP SIGNATURE-----
diff --git a/sys-cluster/drbd/drbd-0.6.12-r1.ebuild b/sys-cluster/drbd/drbd-0.6.12-r1.ebuild
new file mode 100644
index 000000000000..a1e81799d201
--- /dev/null
+++ b/sys-cluster/drbd/drbd-0.6.12-r1.ebuild
@@ -0,0 +1,87 @@
+# Copyright 1999-2004 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/drbd/drbd-0.6.12-r1.ebuild,v 1.1 2004/08/30 13:51:12 tantive Exp $
+
+inherit eutils
+
+LICENSE="GPL-2"
+KEYWORDS="~x86"
+
+DESCRIPTION="mirror/replicate block-devices across a network-connection"
+#SRC_URI="http://www.linbit.com/en/filemanager/download/44/drbd-${PV}.tar.gz"
+SRC_URI="http://www.drbd.org/uploads/media/drbd-${PV}.tar.gz"
+HOMEPAGE="http://www.drbd.org"
+
+IUSE=""
+
+DEPEND="virtual/linux-sources"
+RDEPEND=">=sys-cluster/heartbeat-1.0*"
+SLOT="0"
+
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+	epatch ${FILESDIR}/${PV}-Makefile.vars.patch
+	cd drbd
+	epatch ${FILESDIR}/${PV}-module-Makefile.patch
+	cd ..
+	cd scripts
+	epatch ${FILESDIR}/${PV}-scripts-Makefile.patch
+	cd ${S}
+}
+
+src_compile() {
+	check_KV
+	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 ""
+	cd ${S}
+	cp -R /usr/src/linux-${KV} ${WORKDIR}
+	emake KDIR=/${WORKDIR}/linux-${KV} || die
+}
+
+src_install() {
+	cd ${S}
+	make PREFIX=${D} install
+
+	# gentoo-ish init-script
+	dodir /etc
+	dodir /etc/init.d
+	exeinto /etc/init.d
+	newexe ${FILESDIR}/${PV}-init drbd || die
+
+	# config
+	dodir /etc/conf.d
+	insinto /etc/conf.d
+	doins ${FILESDIR}/${PV}-conf.d || die
+
+	# needed by drbd startup script
+	dodir /var/lib/drbd
+	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
+	dodoc scripts/drbd.conf
+}
+
+pkg_postinst() {
+	einfo ""
+	einfo "upgrading module dependencies ... "
+	/sbin/depmod -a -F /lib/modules/${KV}/build/System.map
+	einfo "... done"
+	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 ""
+}
diff --git a/sys-cluster/drbd/files/0.6.12-conf.d b/sys-cluster/drbd/files/0.6.12-conf.d
new file mode 100644
index 000000000000..8e47a0b10f6a
--- /dev/null
+++ b/sys-cluster/drbd/files/0.6.12-conf.d
@@ -0,0 +1,2 @@
+DRBD=/drbd      # This is an odd place for the script!
+DRBDDEV=drbd0
diff --git a/sys-cluster/drbd/files/0.6.12-init b/sys-cluster/drbd/files/0.6.12-init
new file mode 100644
index 000000000000..d617b580ef6f
--- /dev/null
+++ b/sys-cluster/drbd/files/0.6.12-init
@@ -0,0 +1,22 @@
+#!/sbin/runscript
+                                                                                
+depend() {
+  need   net
+  before heartbeat
+  after  sshd           # In case there are sync problems
+}
+                                                                                
+start() {
+  ebegin "Starting drbd mirror driver"
+  ${DRBD} ${DRBDDEV} start
+  if [ "$?" == "1" ]; then      # In case you decide this
+    eend 0                      # node is primary the
+  fi                            # script returns 1
+  eend $?
+}
+                                                                                
+stop() {
+  ebegin "Stopping drbd mirror driver"
+  ${DRBD} ${DRBDDEV} stop
+  eend $?
+}
diff --git a/sys-cluster/drbd/files/digest-drbd-0.6.12-r1 b/sys-cluster/drbd/files/digest-drbd-0.6.12-r1
new file mode 100644
index 000000000000..05fb3e33c4a6
--- /dev/null
+++ b/sys-cluster/drbd/files/digest-drbd-0.6.12-r1
@@ -0,0 +1 @@
+MD5 b0fb5753a750d7057e42a2cbf0e66c89 drbd-0.6.12.tar.gz 217896