diff -u drbd8-8.3.1/debian/control drbd8-8.3.1/debian/control --- drbd8-8.3.1/debian/control +++ drbd8-8.3.1/debian/control @@ -1,9 +1,10 @@ Source: drbd8 Section: admin Priority: extra -Maintainer: Debian DRBD Maintainers +Maintainer: Ubuntu Core Developers +XSBC-Original-Maintainer: Debian DRBD Maintainers Uploaders: Norbert Tretkowski , Martin Loschwitz , Philipp Hug -Build-Depends: debhelper (>= 5), debconf-utils, sp, docbook-utils, bison, flex, dpatch, bzip2, dpatch +Build-Depends: debhelper (>= 5), debconf-utils, sp, docbook-utils, bison, flex, dpatch, bzip2 Standards-Version: 3.8.0 Homepage: http://www.drbd.org/ Vcs-Browser: http://svn.debian.org/wsvn/debian-ha/drbd8/ @@ -30,15 +31,2 @@ - -Package: drbd8-source -Architecture: all -Section: admin -Depends: module-assistant, debhelper (>= 5), dpatch, bzip2 -Provides: drbd-module-source, drbd-source, drbd8-module-source -Recommends: dpkg-dev, kernel-package, debconf-utils -Description: RAID 1 over tcp/ip for Linux module source - Drbd is a block device which is designed to build high availability - clusters by providing a virtual shared device which keeps disks in - nodes synchronised using TCP/IP. This simulates RAID 1 but avoiding - the use of uncommon hardware (shared SCSI buses or Fibre Channel). - It is currently limited to fail-over HA clusters. . - This package contains the source code for the drbd kernel module. + Homepage: http://www.drbd.org diff -u drbd8-8.3.1/debian/rules drbd8-8.3.1/debian/rules --- drbd8-8.3.1/debian/rules +++ drbd8-8.3.1/debian/rules @@ -15,7 +15,6 @@ export DH_OPTIONS PACKAGE=drbd8 -MA_DIR ?= /usr/share/modass -include $(MA_DIR)/include/generic.make -include $(MA_DIR)/include/common-rules.make @@ -30,12 +29,6 @@ INSTALL_PROGRAM += -s endif -# module-assistant stuff -MAJOR=$(shell echo $(KVERS) | sed -e 's/\(...\).*/\1/') -ifeq ($(MAJOR),2.6) -KO=k -endif - ifeq ($(DEB_BUILD_ARCH),i386) ifeq ($(KPKG_ARCH),amd64) KBUILD_PARAMS := "CROSS_COMPILE=amd64-linux- ARCH=x86_64" @@ -58,10 +51,7 @@ dh_testdir dh_testroot dh_clean -k - make -C $(KSRC) M=$(CURDIR)/drbd/ modules - install -m644 -b -D drbd/drbd.$(KO)o $(CURDIR)/debian/$(PKGNAME)/lib/modules/$(KVERS)/kernel/extra/drbd.$(KO)o - # this is broken, dunno why: - #make -C $(KSRC) M=$(CURDIR)/drbd/ modules_install INSTALL_MOD_PATH=$(CURDIR)/debian/$(PKGNAME) INSTALL_MOD_DIR=extra/ + #make -C $(KSRC) M=$(CURDIR)/drbd/ modules dh_installdocs dh_installchangelogs dh_compress @@ -103,30 +93,7 @@ $(MAKE) -C drbd clean dh_clean -install: install-arch install-indep -install-indep: - dh_testdir - dh_testroot - dh_clean -k -i - dh_installdirs -i - cp -a drbd/* debian/$(PACKAGE)-source/usr/src/modules/drbd8/drbd/ - rm debian/$(PACKAGE)-source/usr/src/modules/drbd8/drbd/Makefile \ - debian/$(PACKAGE)-source/usr/src/modules/drbd8/drbd/Makefile-2.6 - cp debian/drbd8-source.Makefile debian/$(PACKAGE)-source/usr/src/modules/drbd8/Makefile - cp debian/drbd8-source.drbd-Makefile debian/$(PACKAGE)-source/usr/src/modules/drbd8/drbd/Makefile - cp drbd/linux/drbd_config.h debian/$(PACKAGE)-source/usr/src/modules/drbd8 -# cp -a scripts/adjust_drbd_config_h.sh debian/$(PACKAGE)-source/usr/src/modules/drbd/scripts/ - -# install debian/ files - mkdir -p debian/$(PACKAGE)-source/usr/src/modules/drbd8/debian/ - cd debian ; cp changelog control compat *.modules.in rules copyright $(PACKAGE)-source/usr/src/modules/drbd8/debian - -# tar the stuff - cd debian/$(PACKAGE)-source/usr/src/ ; tar cjpvf drbd8.tar.bz2 modules ; rm -rf modules - - install -m 755 $(CURDIR)/debian/modass.drbd8-source $(CURDIR)/debian/$(PACKAGE)-source/usr/share/modass/overrides/drbd8-source - dh_install -i - +install: install-arch install-arch: dh_testdir dh_testroot @@ -170,7 +137,7 @@ dh_md5sums dh_builddeb # Build architecture independant packages using the common target. -binary-indep: build-indep install-indep +binary-indep: build-indep $(MAKE) -f debian/rules DH_OPTIONS=-i binary-common # Build architecture dependant packages using the common target. reverted: --- drbd8-8.3.1/debian/drbd8-source.Makefile +++ drbd8-8.3.1.orig/debian/drbd8-source.Makefile @@ -1 +0,0 @@ -obj-m = drbd/ reverted: --- drbd8-8.3.1/debian/modass.drbd8-source +++ drbd8-8.3.1.orig/debian/modass.drbd8-source @@ -1,16 +0,0 @@ -#!/bin/sh -# -# (c) Eduard Bloch , 2003 -# generic maintainer script for module-assistant controled packages -# to be sourced or copied as example code - -# autodetecting values. They may be overriden by the caller. - -MA_DIR=${MA_DIR:-/usr/share/modass} - -TARBALL=/usr/src/drbd8.tar.bz2 -BUILDDIR=${MODULE_LOC:-/usr/src/modules}/drbd8 - -. $MA_DIR/packages/generic.sh - -$1 "$@" diff -u drbd8-8.3.1/debian/changelog drbd8-8.3.1/debian/changelog --- drbd8-8.3.1/debian/changelog +++ drbd8-8.3.1/debian/changelog @@ -1,3 +1,12 @@ +drbd8 (2:8.3.1-1ubuntu1) karmic; urgency=low + + * Merge from debian unstable (LP: #371829), remaining changes: + - Update maintainer according to spec.. + - Drop the kernel modules since it is apart of linux-ubuntu-modules. + - Change CN_IDX_DRBD to 0x6 in drbd/linux/drbd.h + + -- Andres Rodriguez Mon, 04 May 2009 14:07:14 -0500 + drbd8 (2:8.3.1-1) unstable; urgency=low * New upstream release. @@ -37,6 +46,20 @@ -- Martin Loschwitz Wed, 11 Mar 2009 16:45:00 +0100 +drbd8 (2:8.3.0-1ubuntu1) jaunty; urgency=low + + * Closes (LP: #320831) + * Modify init script's default runlevels (LP: #282876): + - start by default on 2, 3, 4 and 5 + - stop by default on 0, 1 and 6 + * Merge from debian unstable, remaining changes: + - Update maintainer according to spec. + - Made the lsb init script a bit more compliant. + - Drop the kernel modules since it is apart of linux-ubuntu-modules. + - Change CN_IDX_DRBD to 0x6 in drbd/linux/drbd.h + + -- Ante Karamatic Wed, 24 Dec 2008 08:54:58 +0100 + drbd8 (2:8.3.0-1) unstable; urgency=low * New upstream release. @@ -92,6 +115,16 @@ -- Norbert Tretkowski Thu, 09 Oct 2008 16:26:00 +0200 +drbd8 (2:8.2.6-2ubuntu1) intrepid; urgency=low + + * Merge from debian experimental, remaining changes: + - Update maintainer according to spec. + - Made the lsb init script a bit more compliant. + - Drop the kernel modules since it is apart of linux-ubuntu-modules. + * Change CN_IDX_DRBD to 0x6 in drbd/linux/drbd.h + + -- Ante Karamatic Sat, 04 Oct 2008 11:33:52 +0200 + drbd8 (2:8.2.6-2) experimental; urgency=low * Fix build on Linux 2.6.26. @@ -147,6 +180,15 @@ -- Norbert Tretkowski Mon, 04 Aug 2008 17:56:03 +0200 +drbd8 (2:8.0.12-1ubuntu1) intrepid; urgency=low + + * Merge from debian unstable, remaining changes: + - Update maintainer according to spec. + - Made the lsb init script a bit more compliant. + - Drop the kernel modules since it is apart of linux-ubuntu-modules. + + -- Chuck Short Thu, 19 Jun 2008 09:23:29 -0500 + drbd8 (2:8.0.12-1) unstable; urgency=low * New upstream release. @@ -161,6 +203,25 @@ -- Philipp Hug Wed, 13 Feb 2008 19:12:53 +0100 +drbd8 (2:8.0.11-0ubuntu3) hardy; urgency=low + + * Made the init script LSB compliant. + + -- Chuck Short Fri, 15 Feb 2008 13:23:29 -0500 + +drbd8 (2:8.0.11-0ubuntu2) hardy; urgency=low + + * Fix FTBFS. + + -- Chuck Short Thu, 14 Feb 2008 11:11:05 -0500 + +drbd8 (2:8.0.11-0ubuntu1) hardy; urgency=low + + * New upstream version. + * Dropped kernel source since it is in linux-ubuntu-modules. + + -- Chuck Short Wed, 13 Feb 2008 09:41:06 -0500 + drbd8 (2:8.0.10-1) unstable; urgency=low * New upstream release @@ -562,14 +623,12 @@ -- Philipp Reisner Fri, 16 Jul 2004 10:13:33 +0200 drbd (0.7_pre10-1) unstable; urgency=low - * A fix to a generic bug in the bitmap code introduced with the -pre9 release (with the 64 bit work) * A fix to a bug in the bitmap code only relevant for 64 bit platforms. * Better 2.4.x compatibility and compatibility to 2.4.x vendor kernels. * Improvements in the way to deal with incompatible protocol releases. * Added the "dialog-refresh" config option. - changes up to -pre9: * Re-enabled zero copy IO for protocols B and C. (Zero copy IO is not used with protocol A) @@ -582,19 +641,470 @@ * Support for meta-data on block devices with hardsect size != 512 Byte (e.g. dasd on s390x) * New debian subdir - -- Lars Ellenberg Fri, 09 Jul 2004 20:00:19 +0200 -drbd (0.7_pre8-2) unstable; urgency=low +drbd (0.6.12-5) unstable; urgency=low - * fix up the modules source package + * Changed default drbd.conf file to set a negative inittimeout value and + updated the README.Debian file to reflect this change. + (Closes Bug#221751) + + -- David Krovich Tue, 25 May 2004 12:51:15 -0400 + +drbd (0.6.12-4) unstable; urgency=low + + * Refactored rules file in an attempt to use binary-arch and binary-indep + targets more wisely. This is an attempt to fix Bug#244392. + * Listed /etc/ha.d/resource.d/drbd in debian/conffiles. (Closes Bug#247606) + * Moved drbdsetup from /usr/bin/ to /usr/sbin. I think I introduced this + when I overhauled the debian directory in the 0.6.12-1 release. + (Closes Bug#247607) + + -- David Krovich Sun, 16 May 2004 15:20:59 -0400 + +drbd (0.6.12-3) unstable; urgency=low + + * After discussing with upstream, tweak /etc/init.d/drbd script so the + stop target works if the module is not loaded. (Closes: Bug#243417) + * Put the drbd script in the /etc/ha.d/resource.d directory. (Closes: Bug#245219) + + -- David Krovich Thu, 22 Apr 2004 18:12:47 -0400 + +drbd (0.6.12-2) unstable; urgency=low + + * Create /dev/nb[0-7] devices in postinst script. (Closes: Bug#221545) + + -- David Krovich Sat, 17 Apr 2004 15:18:29 -0400 + +drbd (0.6.12-1) unstable; urgency=low + + * new upstream release. (Closes: Bug#239804) + * Completely overhauled the debian/ directory. + * Changed sequence number in the runlevel to start at 70 and stop + at 08. drbd should start after things like ssh, but before + heartbeat. + + -- David Krovich Mon, 22 Mar 2004 00:04:35 -0500 + +drbd (0.6.10-3) unstable; urgency=low + * Added back the drbd.postinst, drbd.postrm, and drbd.prerm scripts until + I figure out why they aren't being handled by dh_installinit. + * As of drbd-0.6.9, The drbd module no longer builds against just the + kernel-headers package and now needs a full kernel-source tree. + + -- David Krovich Mon, 26 Jan 2004 00:32:49 -0500 + +drbd (0.6.10-2) unstable; urgency=low + * noel: fixed lintian warning: + W: drbd: package-contains-CVS-dir usr/share/doc/drbd/HOWTO/CVS/ + W: drbd: script-in-etc-init.d-not-registered-via-update-rc.d /etc/init.d/drbd + + * Lintian/Linda fixes. + + * Tweaked the drbd-0.6.10.orig.tar.gz to not have a debian/ directory in it. + * Stopped tweaking the copyright notice on drbd_fs.c and drbd_receiver.c. + I'm not sure how that got there in the first place. + * Removed mystery report_to_html.pl.debdiff file. + * Put the datadisk in the correct location. (Closes: Bug#221544) + + * Removed drbd.postinst, drbd.postrm, and drbd.prerm as they are + being generated by dh_installinit during the build process and do not + need to part of the source package. + * removed dependancy on automake and autoconf + * Changed control.modules to require debhelper >= 4. + * Stop settting $KSRC in the rules file. + + * Removed conffiles, files, kernel-patch-wup.substvars as they are + unneccessary. + * Tightened the build dependancy on debhelper. >=4 + * Updated Debian packages up to newest upstream version. (Closes: Bug#197906) + * Updated Package descriptions. (Closes: Bug#209462) + * Verified support for devfs. (Closes: Bug#203552) + * I'd like to become a Debian Developer and take over maintenance for + this package. I'm working with Debian Devolpers on making this happen. + + -- David Krovich Tue, 20 Jan 2004 01:36:58 -0500 + +drbd (0.6.10-1) unstable; urgency=low + + * With 0.6.9 there was a bug introduced which prevented the sending + of ACK packets during resync. Fixed. + * A fix to drbdsetup's wait_connect command. + * Replaced all invocations of the sleep_on() family functions with the + invocations of the wait_event() macros. This removes lost wakup events + and race conditions. + * New implementation of drbd_wait_ee(). This makes the + "(BUG?) Moving bh=%p to done_ee" go away. + * Handle the case if vmalloc() of the bitmap fails. + + -- Philipp Reisner Thu, 12 Dec 2003 15:10:44 +0200 + +drbd (0.6.9-1) unstable; urgency=low + + * New module build system (using kernel source tree build system) + * New net section option 'ko-count'. It allows you to kick out a + secondary node which does no longer process data in acceptable time. + Its default value is 0 which disables this feature. + * Changing syncgroups while resync runs has shows now the correct behaviour. + * In case thread creations fails DRBD would deadlock on its own + semaphore. Fixed now. + * BKL is no longer used on Linux-2.4.x. + * Now you can stack mapping block devices like LVM2 (and maybe md) on + top of drbd (a one character fix). + * drbdsetup wait_connect on a StandAlone node looked like a timeout and + forced primary. fixed. + * if drbdsetup wait_* in fact did timeout this looked like a failed ioctl. + this bug was newly introduced in 0.6.8. fixed. + * A fix to a race in _drbd_alloc_ee(). You could trigger this race if + your filesystem uses a blocksize < 4K and your machine has multiple CPUs. + By Eric W. Biederman. + * A maybe bugfix regarding calls to free_page() by Eric W. Biederman. + * A cleanup patch to drbd_process_done_ee() by Eric W. Biederman. + + -- Philipp Reisner Thu, 27 Nov 2003 08:21:34 +0200 + +drbd (0.6.8-1) unstable; urgency=low + + * Two fixes to the sync-group functionality. + + -- Philipp Reisner Mon, 20 Oct 2003 11:45:33 +0200 + +drbd (0.6.7-1) unstable; urgency=low + + * A fix to a bug that could cause data corruption if you use a + other blocksize than 4k to access the DRBD device. + * A fix to a SMP race in the syncer code. The problem was tirggered + when using DRBD on QLogic fiber channel adapters. + * Replaced various calls to sleep_on() variants with the wait_event() + macros. -- This removes potential (, non-critical) SMP races. + * This release includes the sync-group option. + + -- Philipp Reisner Thu, 13 Oct 2003 11:17:27 +0200 + +drbd (0.6.6-1) unstable; urgency=low + + * In the 0.6.5 release the secondary_remote command was badly broken, + it succeeded when it should fail silently. This is fixed now. + * Probabely in all previous releases, the resyncer thread did not + exit properly if the secondary node goes away during resync. + This was not fatal sind the resyncher thread did exit at soon + as it gets a network error. This is fixed now. + * Some new switches to the drbd script. + + -- Philipp Reisner Mon, 28 Jul 2003 14:40:43 +0200 + +drbd (0.6.5-1) unstable; urgency=low + + * Improvements to the build system + * Now it is possible to tune the socket send buffer size via drbdsetup/ + drbd.conf. This is especially usefull for WAN mirroring / using + protocol A. + * Compatibility code to compile DRBD under RedHat 9.0 (RH's version of + Linux-2.4.20) + * Improved sample drbd.conf file + + -- Philipp Reisner Sun, 06 Jul 2003 13:35:00 +0100 + +drbd (0.6.4-1) unstable; urgency=low + + * Reworked build system (i.e. better Makefiles) + * SyncAll works forward instead of backwards. Improves performance on + some storage controlers. + * Reworked /etc/init.d/drbd script (i.e. better support of + different bash releases) + + -- Philipp Reisner Thu, 01 May 2003 21:00:00 +0100 + +drbd (0.6.3-1) unstable; urgency=low + + * Lockup of primary if secondary fails during resync. Fixed. (Stupid!) + * Probabely SMP only deadlock in the drop-conection code path. + * Improved connect code. (The old code could trap into a distributed + deadlock, resulting in an endless connect/disconnect loop.) + * The 'BitMap too small bug' was actually caused by a patch in + SuSE's distribution kernel. This patch makes DRBD 'more' compatible + with SuSE's kernel. + * Improved code to allocate buffers for the rsynchronisation process. + The old code allocated physical adjacent pages although the syncer + does not need them! The old code could fail under high memory pressure. + + -- Philipp Reisner Thu, 20 Mar 2003 20:23:40 +0100 + +drbd (0.6.2-1) unstable; urgency=low + + * SMP fix in drbd_dio_end_sec() + * /etc/init.d/drbd knows about returncodes of fsck + * SUSE style rcdrbd + * Fixes for uninstall Target of the Makefiles. + + -- Philipp Reisner Tue, 11 Feb 2003 15:58:49 +0100 + +drbd (0.6.1-1) unstable; urgency=low + + * Stable release + + -- Philipp Reisner Mon, 25 Nov 2002 14:51:39 +0100 + +drbd (0.6-1.pre16-0cvs20020909.1) unstable; urgency=low + + * changed the maintainer to jan@debian.org in agreement with + Ard who currently doesn't work on drbd. + * changed name of generated drbd-module-... package to include + the full version number of the kernel package + * place generated drbd-module-... package in $(KSRC)/.. + + -- Jan Niehusmann Fri, 13 Sep 2002 15:57:01 +0200 + +drbd (0.6-1.pre16-0cvs20020909) unstable; urgency=low + + * updated version + * strange version number because debian versioning doesn't handle + -pre versions sanely + * uploading to unstable. (Closes: Bug#130031) + + -- Jan Niehusmann Wed, 11 Sep 2002 13:10:03 +0200 + +drbd (cvs20010511-1) unstable; urgency=low + + * First deb-anized version + + -- Ard van Breemen Fri, 11 May 2001 11:59:53 +0200 + +drbd (0.7_pre8-2) unstable; urgency=low + * fix up the modules source package -- Bernd Schubert Mon, 05 Jul 2004 00:57:38 -0100 -drbd (0.7_pre8-1) unstable; urgency=low +drbd (0.6.12-5) unstable; urgency=low - * initial 0.7 debian package + * Changed default drbd.conf file to set a negative inittimeout value and + updated the README.Debian file to reflect this change. + (Closes Bug#221751) + + -- David Krovich Tue, 25 May 2004 12:51:15 -0400 + +drbd (0.6.12-4) unstable; urgency=low + + * Refactored rules file in an attempt to use binary-arch and binary-indep + targets more wisely. This is an attempt to fix Bug#244392. + * Listed /etc/ha.d/resource.d/drbd in debian/conffiles. (Closes Bug#247606) + * Moved drbdsetup from /usr/bin/ to /usr/sbin. I think I introduced this + when I overhauled the debian directory in the 0.6.12-1 release. + (Closes Bug#247607) + + -- David Krovich Sun, 16 May 2004 15:20:59 -0400 + +drbd (0.6.12-3) unstable; urgency=low + + * After discussing with upstream, tweak /etc/init.d/drbd script so the + stop target works if the module is not loaded. (Closes: Bug#243417) + * Put the drbd script in the /etc/ha.d/resource.d directory. (Closes: Bug#245219) + + -- David Krovich Thu, 22 Apr 2004 18:12:47 -0400 + +drbd (0.6.12-2) unstable; urgency=low + + * Create /dev/nb[0-7] devices in postinst script. (Closes: Bug#221545) + + -- David Krovich Sat, 17 Apr 2004 15:18:29 -0400 + +drbd (0.6.12-1) unstable; urgency=low + + * new upstream release. (Closes: Bug#239804) + * Completely overhauled the debian/ directory. + * Changed sequence number in the runlevel to start at 70 and stop + at 08. drbd should start after things like ssh, but before + heartbeat. + + -- David Krovich Mon, 22 Mar 2004 00:04:35 -0500 + +drbd (0.6.10-3) unstable; urgency=low + * Added back the drbd.postinst, drbd.postrm, and drbd.prerm scripts until + I figure out why they aren't being handled by dh_installinit. + * As of drbd-0.6.9, The drbd module no longer builds against just the + kernel-headers package and now needs a full kernel-source tree. + + -- David Krovich Mon, 26 Jan 2004 00:32:49 -0500 + +drbd (0.6.10-2) unstable; urgency=low + + * noel: fixed lintian warning: + W: drbd: package-contains-CVS-dir usr/share/doc/drbd/HOWTO/CVS/ + W: drbd: script-in-etc-init.d-not-registered-via-update-rc.d /etc/init.d/drbd + + * Lintian/Linda fixes. + + * Tweaked the drbd-0.6.10.orig.tar.gz to not have a debian/ directory in it. + * Stopped tweaking the copyright notice on drbd_fs.c and drbd_receiver.c. + I'm not sure how that got there in the first place. + * Removed mystery report_to_html.pl.debdiff file. + * Put the datadisk in the correct location. (Closes: Bug#221544) + + * Removed drbd.postinst, drbd.postrm, and drbd.prerm as they are + being generated by dh_installinit during the build process and do not + need to part of the source package. + * removed dependancy on automake and autoconf + * Changed control.modules to require debhelper >= 4. + * Stop settting $KSRC in the rules file. + + * Removed conffiles, files, kernel-patch-wup.substvars as they are + unneccessary. + * Tightened the build dependancy on debhelper. >=4 + * Updated Debian packages up to newest upstream version. (Closes: Bug#197906) + * Updated Package descriptions. (Closes: Bug#209462) + * Verified support for devfs. (Closes: Bug#203552) + * I'd like to become a Debian Developer and take over maintenance for + this package. I'm working with Debian Devolpers on making this happen. + + -- David Krovich Tue, 20 Jan 2004 01:36:58 -0500 + +drbd (0.6.10-1) unstable; urgency=low + + * With 0.6.9 there was a bug introduced which prevented the sending + of ACK packets during resync. Fixed. + * A fix to drbdsetup's wait_connect command. + * Replaced all invocations of the sleep_on() family functions with the + invocations of the wait_event() macros. This removes lost wakup events + and race conditions. + * New implementation of drbd_wait_ee(). This makes the + "(BUG?) Moving bh=%p to done_ee" go away. + * Handle the case if vmalloc() of the bitmap fails. + + -- Philipp Reisner Thu, 12 Dec 2003 15:10:44 +0200 + +drbd (0.6.9-1) unstable; urgency=low + + * New module build system (using kernel source tree build system) + * New net section option 'ko-count'. It allows you to kick out a + secondary node which does no longer process data in acceptable time. + Its default value is 0 which disables this feature. + * Changing syncgroups while resync runs has shows now the correct behaviour. + * In case thread creations fails DRBD would deadlock on its own + semaphore. Fixed now. + * BKL is no longer used on Linux-2.4.x. + * Now you can stack mapping block devices like LVM2 (and maybe md) on + top of drbd (a one character fix). + * drbdsetup wait_connect on a StandAlone node looked like a timeout and + forced primary. fixed. + * if drbdsetup wait_* in fact did timeout this looked like a failed ioctl. + this bug was newly introduced in 0.6.8. fixed. + * A fix to a race in _drbd_alloc_ee(). You could trigger this race if + your filesystem uses a blocksize < 4K and your machine has multiple CPUs. + By Eric W. Biederman. + * A maybe bugfix regarding calls to free_page() by Eric W. Biederman. + * A cleanup patch to drbd_process_done_ee() by Eric W. Biederman. + + -- Philipp Reisner Thu, 27 Nov 2003 08:21:34 +0200 + +drbd (0.6.8-1) unstable; urgency=low + + * Two fixes to the sync-group functionality. + + -- Philipp Reisner Mon, 20 Oct 2003 11:45:33 +0200 + +drbd (0.6.7-1) unstable; urgency=low + + * A fix to a bug that could cause data corruption if you use a + other blocksize than 4k to access the DRBD device. + * A fix to a SMP race in the syncer code. The problem was tirggered + when using DRBD on QLogic fiber channel adapters. + * Replaced various calls to sleep_on() variants with the wait_event() + macros. -- This removes potential (, non-critical) SMP races. + * This release includes the sync-group option. + + -- Philipp Reisner Thu, 13 Oct 2003 11:17:27 +0200 + +drbd (0.6.6-1) unstable; urgency=low + + * In the 0.6.5 release the secondary_remote command was badly broken, + it succeeded when it should fail silently. This is fixed now. + * Probabely in all previous releases, the resyncer thread did not + exit properly if the secondary node goes away during resync. + This was not fatal sind the resyncher thread did exit at soon + as it gets a network error. This is fixed now. + * Some new switches to the drbd script. + + -- Philipp Reisner Mon, 28 Jul 2003 14:40:43 +0200 + +drbd (0.6.5-1) unstable; urgency=low + + * Improvements to the build system + * Now it is possible to tune the socket send buffer size via drbdsetup/ + drbd.conf. This is especially usefull for WAN mirroring / using + protocol A. + * Compatibility code to compile DRBD under RedHat 9.0 (RH's version of + Linux-2.4.20) + * Improved sample drbd.conf file + + -- Philipp Reisner Sun, 06 Jul 2003 13:35:00 +0100 + +drbd (0.6.4-1) unstable; urgency=low + + * Reworked build system (i.e. better Makefiles) + * SyncAll works forward instead of backwards. Improves performance on + some storage controlers. + * Reworked /etc/init.d/drbd script (i.e. better support of + different bash releases) + -- Philipp Reisner Thu, 01 May 2003 21:00:00 +0100 + +drbd (0.6.3-1) unstable; urgency=low + + * Lockup of primary if secondary fails during resync. Fixed. (Stupid!) + * Probabely SMP only deadlock in the drop-conection code path. + * Improved connect code. (The old code could trap into a distributed + deadlock, resulting in an endless connect/disconnect loop.) + * The 'BitMap too small bug' was actually caused by a patch in + SuSE's distribution kernel. This patch makes DRBD 'more' compatible + with SuSE's kernel. + * Improved code to allocate buffers for the rsynchronisation process. + The old code allocated physical adjacent pages although the syncer + does not need them! The old code could fail under high memory pressure. + + -- Philipp Reisner Thu, 20 Mar 2003 20:23:40 +0100 + +drbd (0.6.2-1) unstable; urgency=low + + * SMP fix in drbd_dio_end_sec() + * /etc/init.d/drbd knows about returncodes of fsck + * SUSE style rcdrbd + * Fixes for uninstall Target of the Makefiles. + + -- Philipp Reisner Tue, 11 Feb 2003 15:58:49 +0100 + +drbd (0.6.1-1) unstable; urgency=low + + * Stable release + + -- Philipp Reisner Mon, 25 Nov 2002 14:51:39 +0100 + +drbd (0.6-1.pre16-0cvs20020909.1) unstable; urgency=low + + * changed the maintainer to jan@debian.org in agreement with + Ard who currently doesn't work on drbd. + * changed name of generated drbd-module-... package to include + the full version number of the kernel package + * place generated drbd-module-... package in $(KSRC)/.. + + -- Jan Niehusmann Fri, 13 Sep 2002 15:57:01 +0200 + +drbd (0.6-1.pre16-0cvs20020909) unstable; urgency=low + + * updated version + * strange version number because debian versioning doesn't handle + -pre versions sanely + * uploading to unstable. (Closes: Bug#130031) + + -- Jan Niehusmann Wed, 11 Sep 2002 13:10:03 +0200 + +drbd (cvs20010511-1) unstable; urgency=low + + * First deb-anized version + + -- Ard van Breemen Fri, 11 May 2001 11:59:53 +0200 + +drbd (0.7_pre8-1) unstable; urgency=low + * initial 0.7 debian package -- Bernd Schubert Mon, 21 Jun 2004 19:57:38 -0400 drbd (0.6.12-5) unstable; urgency=low @@ -826,0 +1337 @@ + reverted: --- drbd8-8.3.1/debian/drbd8-source.drbd-Makefile +++ drbd8-8.3.1.orig/debian/drbd8-source.drbd-Makefile @@ -1,14 +0,0 @@ -#CFLAGS_drbd_sizeof_sanity_check.o = -Wpadded # -Werror - -EXTRA_CFLAGS += -I$(src) - -obj-m := drbd.o - -drbd-objs := drbd_buildtag.o drbd_bitmap.o drbd_proc.o \ - drbd_worker.o drbd_receiver.o drbd_req.o drbd_actlog.o \ - lru_cache.o drbd_main.o drbd_strings.o drbd_nl.o - -ifndef CONFIG_CONNECTOR - drbd-objs += connector.o cn_queue.o -endif - reverted: --- drbd8-8.3.1/debian/control.modules.in +++ drbd8-8.3.1.orig/debian/control.modules.in @@ -1,30 +0,0 @@ -Source: drbd8 -Section: misc -Priority: extra -Maintainer: Philipp Hug -Build-Depends: debhelper (>= 4), drbd8-source, bzip2 -Standards-Version: 3.6.1 - -Package: drbd8-_KVERS_ -Architecture: any -Depends: drbd8-utils -Conflicts: drbd-_KVERS_ -Provides: drbd-_KVERS_ -Replaces: drbd-_KVERS_ -Section: misc -Recommends: kernel-image-_KVERS_ -Description: RAID 1 over tcp/ip for Linux kernel module - Drbd is a block device which is designed to build high availability - clusters by providing a virtual shared device which keeps disks in nodes - synchronised using TCP/IP. This simulates RAID 1 but avoiding the - use of uncommon hardware (shared SCSI buses or Fibre Channel). - It is currently limited to fail-over HA clusters. - . - This package contains the DRBD kernel module for the kernel version - _KVERS_ - . - If you want to build DRBD against your another kernel, install the - drbd-source package and use module-assistant to create a new - module package. - . - Homepage: http://www.drbd.org reverted: --- drbd8-8.3.1/debian/drbd8-source.dirs +++ drbd8-8.3.1.orig/debian/drbd8-source.dirs @@ -1,3 +0,0 @@ -usr/src/modules/drbd8/debian -usr/src/modules/drbd8/drbd -usr/share/modass/overrides reverted: --- drbd8-8.3.1/debian/drbd8-module-_KVERS_.postinst.modules.in +++ drbd8-8.3.1.orig/debian/drbd8-module-_KVERS_.postinst.modules.in @@ -1,14 +0,0 @@ -#!/bin/sh -set -e - -SYSTEMMAP=/boot/System.map-_KVERS_ - -if [ -f $SYSTEMMAP ] -then - depmod -ae -F $SYSTEMMAP _KVERS_ -elif [ "`uname -r`" = "_KVERS_" ] -then - depmod -a & -fi - -#DEBHELPER# reverted: --- drbd8-8.3.1/debian/drbd8-source.README.Debian +++ drbd8-8.3.1.orig/debian/drbd8-source.README.Debian @@ -1,17 +0,0 @@ -drbd for Debian ---------------- - -The Debian drbd-source package can be used in several ways, - - - Using module-assistant(1) commands provided by the module-assistant Debian - package: - - # module-assistant auto-install drbd8 - - - Using the make-kpkg(1) command provided by the kernel-package Debian - package. See the "modules_image" section of the make-kpkg(1) man page. - - - Unpacking /usr/src/drbd*.tar.bz2 and installing the module on your own. - - -- Philipp Hug Thu, 21 Jun 2007 18:08:00 +0000 - only in patch2: unchanged: --- drbd8-8.3.1.orig/drbd/linux/drbd.h +++ drbd8-8.3.1/drbd/linux/drbd.h @@ -351,7 +351,7 @@ /* The following line should be moved over to linux/connector.h * when the time comes */ #ifndef CN_IDX_DRBD -# define CN_IDX_DRBD 0x4 +# define CN_IDX_DRBD 0x6 /* Ubuntu "intrepid ibex" release defined CN_IDX_DRBD as 0x6 */ #endif #define CN_VAL_DRBD 0x1