diff -Nru vblade-22/aoe.c vblade-23/aoe.c --- vblade-22/aoe.c 2014-08-11 01:07:14.000000000 +0000 +++ vblade-23/aoe.c 2015-06-15 00:41:02.000000000 +0000 @@ -237,11 +237,9 @@ aoemask(Aoemask *mh, int len) { Mdir *md, *mdi, *mde; - uchar *e; int i, n; n = 0; - e = (uchar *) mh + len; md = mdi = (Mdir *) ((uchar *)mh + Nmaskhdr); switch (mh->cmd) { case Medit: @@ -449,7 +447,7 @@ } void -setserial(char *f, int sh, int sl) +setserial(int sh, int sl) { char h[32]; @@ -515,7 +513,7 @@ } shelf = atoi(argv[0]); slot = atoi(argv[1]); - setserial(argv[3], shelf, slot); + setserial(shelf, slot); size = getsize(bfd); size /= 512; if (size <= offset) { diff -Nru vblade-22/debian/changelog vblade-23/debian/changelog --- vblade-22/debian/changelog 2016-02-16 10:10:19.000000000 +0000 +++ vblade-23/debian/changelog 2016-12-06 22:01:49.000000000 +0000 @@ -1,19 +1,16 @@ -vblade (22-1ubuntu1) xenial; urgency=medium +vblade (23-1) unstable; urgency=medium - * Merge from Debian - * Drop changes (bring closer to sync with Debian): - - Init scripts - - vblade-persist depencency change from recommended to suggested - (this was missing as delta in former changelogs, now behaves as in Debian) - * No remaining changes carried forward. - * init script and its config are conffiles, so dropping them requires - cleaning them up via d/vblade.maintscript - - this is a prep step to be able convert the package to a sync in the next - upgrade - * d/vblade.NEWS contains some extra pointers how to handle the transition - for former users of the conffiles + * New upstream version + * Adopt package. Closes: #845285 + * Packaging cleanup + - Update debian/copyright + - Declare compliance with policy 3.9.8 + - Refresh patch queue, add missing DEP-3 headers + - Bump debhelper compat level to 10 + - Update package description + - Update VCS-* header - -- Christian Ehrhardt Mon, 15 Feb 2016 15:19:13 +0100 + -- Christoph Biedl Tue, 06 Dec 2016 23:01:49 +0100 vblade (22-1) unstable; urgency=low @@ -36,20 +33,6 @@ -- David Martínez Moreno Wed, 29 Jul 2015 01:22:13 -0700 -vblade (20-1ubuntu2) quantal; urgency=low - - * Rebuild for new armel compiler default of ARMv5t. - - -- Colin Watson Mon, 08 Oct 2012 23:24:28 +0100 - -vblade (20-1ubuntu1) lucid; urgency=low - - * Merge from debian unstable, remaining changes: - - Added init script. - - Update maintainer according to spec. - - -- Chuck Short Wed, 21 Oct 2009 22:23:26 +0100 - vblade (20-1) unstable; urgency=low * New upstream release (closes: #537435): @@ -76,33 +59,6 @@ -- David Martínez Moreno Sat, 12 Sep 2009 01:02:11 +0200 -vblade (16-1ubuntu3) karmic; urgency=low - - [Arnaud Soyez] - * Fixed debian/vblade.init: init.d script fails to start because - pid file not created properly. Thanks to J. Bruce Fields. (LP: #223387) - * debian/control: updated standards version to 3.8.0 (added homepage) - * debian/control: Added Homepage - - -- Chuck Short Mon, 10 Aug 2009 15:01:39 -0400 - -vblade (16-1ubuntu2) intrepid; urgency=low - - * Drop vblade-persist to a Suggests: for now. It needs an MIR by itself, and - it pulls in runit, dietlibc, and fgetty as well (which are all in - universe). - - -- Martin Pitt Fri, 01 Aug 2008 13:19:09 +0200 - -vblade (16-1ubuntu1) intrepid; urgency=low - - * Merge from debian unstable, remaining changes: - - Update maintainer no longer in universe. - - Added init script. - - Added example configuration file. - - -- Chuck Short Mon, 16 Jun 2008 09:00:58 -0500 - vblade (16-1) unstable; urgency=low * New upstream release (closes: #484176). Main changes are: @@ -127,13 +83,6 @@ -- David Martínez Moreno Mon, 09 Jun 2008 04:21:38 +0200 -vblade (14-1ubuntu1) hardy; urgency=low - - * Added init script. - * Added example configuration file. - - -- Chuck Short Fri, 08 Feb 2008 11:08:54 -0500 - vblade (14-1) unstable; urgency=low * New upstream release. Main changes are: @@ -187,4 +136,3 @@ * Added a manpage for vbladed. -- David Martínez Moreno Fri, 28 Oct 2005 01:23:59 +0200 - diff -Nru vblade-22/debian/compat vblade-23/debian/compat --- vblade-22/debian/compat 2016-02-16 09:52:55.000000000 +0000 +++ vblade-23/debian/compat 2016-12-06 22:01:49.000000000 +0000 @@ -1 +1 @@ -9 +10 diff -Nru vblade-22/debian/control vblade-23/debian/control --- vblade-22/debian/control 2016-02-16 09:52:55.000000000 +0000 +++ vblade-23/debian/control 2016-12-06 22:01:49.000000000 +0000 @@ -1,18 +1,18 @@ Source: vblade -Section: admin +Maintainer: Christoph Biedl +Homepage: https://github.com/OpenAoE/vblade +Standards-Version: 3.9.8 +Vcs-Browser: https://anonscm.debian.org/gitweb/?p=collab-maint/vblade.git +Vcs-Git: https://anonscm.debian.org/git/collab-maint/vblade.git +Build-Depends: debhelper (>= 10~), Priority: optional -Maintainer: Ubuntu Developers -XSBC-Original-Maintainer: David Martínez Moreno -Standards-Version: 3.9.6 -Build-Depends: debhelper (>= 9) -Homepage: http://aoetools.sf.net -XS-Debian-Vcs-Browser: http://anonscm.debian.org/gitweb/?p=collab-maint/vblade.git -XS-Debian-Vcs-Git: git://anonscm.debian.org/collab-maint/vblade.git +Section: admin Package: vblade Architecture: any -Depends: ${shlibs:Depends}, ${misc:Depends} -Recommends: vblade-persist +Depends: ${misc:Depends}, ${shlibs:Depends}, +Recommends: + vblade-persist, Description: virtual AoE blade emulator The vblade is the virtual EtherDrive (R) blade, a program that makes a seekable file available over an ethernet local area network (LAN) via diff -Nru vblade-22/debian/copyright vblade-23/debian/copyright --- vblade-22/debian/copyright 2016-02-16 09:52:55.000000000 +0000 +++ vblade-23/debian/copyright 2016-12-06 22:01:49.000000000 +0000 @@ -1,13 +1,16 @@ -Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ +Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ Upstream-Name: vblade -Source: http://sourceforge.net/projects/aoetools/files/vblade/ +Source: https://github.com/OpenAoE/vblade Files: * Copyright: 2005-2008 Ed Cashin License: GPL-2 -Files: debian/* -Copyright: 2005-2015 David Martínez Moreno +Files: + debian/* +Copyright: + 2005-2015 David Martínez Moreno + 2016 Christoph Biedl License: GPL-2 License: GPL-2 diff -Nru vblade-22/debian/patches/01_no_hyphen_in_manpages.patch vblade-23/debian/patches/01_no_hyphen_in_manpages.patch --- vblade-22/debian/patches/01_no_hyphen_in_manpages.patch 2016-02-16 09:52:55.000000000 +0000 +++ vblade-23/debian/patches/01_no_hyphen_in_manpages.patch 1970-01-01 00:00:00.000000000 +0000 @@ -1,53 +0,0 @@ -Added fixes for typical confusion hyphen <-> minus sign. -Index: vblade/vblade.8 -=================================================================== ---- vblade.orig/vblade.8 -+++ vblade/vblade.8 -@@ -35,39 +35,39 @@ The name of the regular file or block de - .SS Options - .TP - \fB-b\fP --The -b flag takes an argument, the advertised buffer count, specifying -+The \-b flag takes an argument, the advertised buffer count, specifying - the maximum number of outstanding messages the server can queue for - processing. - .TP - \fB-d\fP --The -d flag selects O_DIRECT mode for accessing the underlying block -+The \-d flag selects O_DIRECT mode for accessing the underlying block - device. - .TP - \fB-s\fP --The -s flag selects O_SYNC mode for accessing the underlying block -+The \-s flag selects O_SYNC mode for accessing the underlying block - device, so all writes are committed to disk before returning to the - client. - .TP - \fB-r\fP --The -r flag restricts the export of the device to be read-only. -+The \-r flag restricts the export of the device to be read-only. - .TP - \fB-m\fP --The -m flag takes an argument, a comma separated list of MAC addresses -+The \-m flag takes an argument, a comma separated list of MAC addresses - permitted access to the vblade. A MAC address can be specified in upper - or lower case, with or without colons. - .TP - \fB-o\fP --The -o flag takes an argument, the number of sectors at the beginning -+The \-o flag takes an argument, the number of sectors at the beginning - of the exported file that are excluded from AoE export (default zero). - .TP - \fB-l\fP --The -l flag takes an argument, the number of sectors to export. -+The \-l flag takes an argument, the number of sectors to export. - Defaults to the file size in sectors minus the offset. - .SH EXAMPLE - In this example, the root user on a host named - .I nai - exports a file named "3TB" to the LAN on eth0 using AoE shelf address 11 --and slot address 1. The process runs in the foreground. Using -+and slot address 1. The process runs in the foreground. Using - .I vbladed - would have resulted in the process running as a daemon in the - background. diff -Nru vblade-22/debian/patches/02_additional_cleaning.patch vblade-23/debian/patches/02_additional_cleaning.patch --- vblade-22/debian/patches/02_additional_cleaning.patch 2016-02-16 09:52:55.000000000 +0000 +++ vblade-23/debian/patches/02_additional_cleaning.patch 1970-01-01 00:00:00.000000000 +0000 @@ -1,17 +0,0 @@ -02_additional_cleaning.patch: Changes added for remaining files after 'clean' target. -Index: vblade-20/makefile -=================================================================== ---- vblade-20.orig/makefile -+++ vblade-20/makefile -@@ -36,8 +36,11 @@ config.h : config/config.h.in makefile - - clean : - rm -f $O vblade -+ rm -f config.h - - install : vblade vbladed -+ install -d ${sbindir}/ - install vblade ${sbindir}/ - install vbladed ${sbindir}/ -+ install -d ${mandir}/man8/ - install vblade.8 ${mandir}/man8/ diff -Nru vblade-22/debian/patches/03_vblade_usage.patch vblade-23/debian/patches/03_vblade_usage.patch --- vblade-22/debian/patches/03_vblade_usage.patch 2016-02-16 09:52:55.000000000 +0000 +++ vblade-23/debian/patches/03_vblade_usage.patch 1970-01-01 00:00:00.000000000 +0000 @@ -1,21 +0,0 @@ -03_vblade_usage.patch: Used for avoiding calling vbladed without arguments, - and while at it, add the usage command line. -Index: vblade/vbladed -=================================================================== ---- vblade.orig/vbladed -+++ vblade/vbladed -@@ -3,4 +3,14 @@ - # output is directed to syslogd - # - -+# Although logging goes to syslog, let's going to -+# protect ourselves against the most common way or -+# calling vbladed: without arguments. While at it, we guard -+# ourselves against wrong number of parameters. -+if [ $# -lt 4 ] -+then -+ echo "usage: ./vblade " >&2 -+ exit 1 -+fi -+ - sh -c "`dirname $0`/vblade $* < /dev/null 2>&1 | logger -t vbladed" & diff -Nru vblade-22/debian/patches/hardening-build.patch vblade-23/debian/patches/hardening-build.patch --- vblade-22/debian/patches/hardening-build.patch 1970-01-01 00:00:00.000000000 +0000 +++ vblade-23/debian/patches/hardening-build.patch 2016-12-06 22:01:49.000000000 +0000 @@ -0,0 +1,36 @@ +Description: Use all buildflags as provided by dpkg +Author: Christoph Biedl +Forwarded: no +Last-Update: 2016-12-06 + +--- a/makefile ++++ b/makefile +@@ -9,23 +9,21 @@ + mandir = ${sharedir}/man + + O=aoe.o bpf.o ${PLATFORM}.o ata.o +-CFLAGS += -Wall -g -O2 +-CC = gcc + + vblade: $O +- ${CC} -o vblade $O ++ ${CC} ${CPPFLAGS} ${CFLAGS} ${LDFLAGS} -o vblade $O + + aoe.o : aoe.c config.h dat.h fns.h makefile +- ${CC} ${CFLAGS} -c $< ++ ${CC} ${CPPFLAGS} ${CFLAGS} ${LDFLAGS} -c $< + + ${PLATFORM}.o : ${PLATFORM}.c config.h dat.h fns.h makefile +- ${CC} ${CFLAGS} -c $< ++ ${CC} ${CPPFLAGS} ${CFLAGS} ${LDFLAGS} -c $< + + ata.o : ata.c config.h dat.h fns.h makefile +- ${CC} ${CFLAGS} -c $< ++ ${CC} $(CPPFLAGS) $(CFLAGS) $(LDFLAGS) -c $< + + bpf.o : bpf.c +- ${CC} ${CFLAGS} -c $< ++ ${CC} $(CPPFLAGS) $(CFLAGS) $(LDFLAGS) -c $< + + config.h : config/config.h.in makefile + @if ${CC} ${CFLAGS} config/u64.c > /dev/null 2>&1; then \ diff -Nru vblade-22/debian/patches/hardening_ldflags.patch vblade-23/debian/patches/hardening_ldflags.patch --- vblade-22/debian/patches/hardening_ldflags.patch 2016-02-16 09:52:55.000000000 +0000 +++ vblade-23/debian/patches/hardening_ldflags.patch 1970-01-01 00:00:00.000000000 +0000 @@ -1,35 +0,0 @@ -Description: Add LDFLAGS to linking phase to enable hardening. - The Makefile is so simple that it doesn't even contemplate the use of LDFLAGS. -Author: David Martínez Moreno -Forwarded: no -Last-Update: 2015-07-29 - -Index: vblade/makefile -=================================================================== ---- vblade.orig/makefile -+++ vblade/makefile -@@ -13,19 +13,19 @@ CFLAGS += -Wall -g -O2 - CC = gcc - - vblade: $O -- ${CC} -o vblade $O -+ ${CC} ${CPPFLAGS} ${CFLAGS} ${LDFLAGS} -o vblade $O - - aoe.o : aoe.c config.h dat.h fns.h makefile -- ${CC} ${CFLAGS} -c $< -+ ${CC} ${CPPFLAGS} ${CFLAGS} ${LDFLAGS} -c $< - - ${PLATFORM}.o : ${PLATFORM}.c config.h dat.h fns.h makefile -- ${CC} ${CFLAGS} -c $< -+ ${CC} ${CPPFLAGS} ${CFLAGS} ${LDFLAGS} -c $< - - ata.o : ata.c config.h dat.h fns.h makefile -- ${CC} ${CFLAGS} -c $< -+ ${CC} $(CPPFLAGS) $(CFLAGS) $(LDFLAGS) -c $< - - bpf.o : bpf.c -- ${CC} ${CFLAGS} -c $< -+ ${CC} $(CPPFLAGS) $(CFLAGS) $(LDFLAGS) -c $< - - config.h : config/config.h.in makefile - @if ${CC} ${CFLAGS} config/u64.c > /dev/null 2>&1; then \ diff -Nru vblade-22/debian/patches/makefile-additional-cleaning.patch vblade-23/debian/patches/makefile-additional-cleaning.patch --- vblade-22/debian/patches/makefile-additional-cleaning.patch 1970-01-01 00:00:00.000000000 +0000 +++ vblade-23/debian/patches/makefile-additional-cleaning.patch 2016-12-06 22:01:49.000000000 +0000 @@ -0,0 +1,18 @@ +Subject: Changes added for remaining files after 'clean' target. +Author: David Martínez Moreno (presumably) +Date: 2007-04-08 + +--- a/makefile ++++ b/makefile +@@ -36,8 +36,11 @@ + + clean : + rm -f $O vblade ++ rm -f config.h + + install : vblade vbladed ++ install -d ${sbindir}/ + install vblade ${sbindir}/ + install vbladed ${sbindir}/ ++ install -d ${mandir}/man8/ + install vblade.8 ${mandir}/man8/ diff -Nru vblade-22/debian/patches/manpage-escape-dash.patch vblade-23/debian/patches/manpage-escape-dash.patch --- vblade-22/debian/patches/manpage-escape-dash.patch 1970-01-01 00:00:00.000000000 +0000 +++ vblade-23/debian/patches/manpage-escape-dash.patch 2016-12-06 22:01:49.000000000 +0000 @@ -0,0 +1,55 @@ +Description: Added fixes for typical confusion hyphen <-> minus sign. +Author: David Martínez Moreno (presumably) +Date: 2007-04-08 +Last-Update: 2015-07-29 + +--- a/vblade.8 ++++ b/vblade.8 +@@ -35,39 +35,39 @@ + .SS Options + .TP + \fB-b\fP +-The -b flag takes an argument, the advertised buffer count, specifying ++The \-b flag takes an argument, the advertised buffer count, specifying + the maximum number of outstanding messages the server can queue for + processing. + .TP + \fB-d\fP +-The -d flag selects O_DIRECT mode for accessing the underlying block ++The \-d flag selects O_DIRECT mode for accessing the underlying block + device. + .TP + \fB-s\fP +-The -s flag selects O_SYNC mode for accessing the underlying block ++The \-s flag selects O_SYNC mode for accessing the underlying block + device, so all writes are committed to disk before returning to the + client. + .TP + \fB-r\fP +-The -r flag restricts the export of the device to be read-only. ++The \-r flag restricts the export of the device to be read-only. + .TP + \fB-m\fP +-The -m flag takes an argument, a comma separated list of MAC addresses ++The \-m flag takes an argument, a comma separated list of MAC addresses + permitted access to the vblade. A MAC address can be specified in upper + or lower case, with or without colons. + .TP + \fB-o\fP +-The -o flag takes an argument, the number of sectors at the beginning ++The \-o flag takes an argument, the number of sectors at the beginning + of the exported file that are excluded from AoE export (default zero). + .TP + \fB-l\fP +-The -l flag takes an argument, the number of sectors to export. ++The \-l flag takes an argument, the number of sectors to export. + Defaults to the file size in sectors minus the offset. + .SH EXAMPLE + In this example, the root user on a host named + .I nai + exports a file named "3TB" to the LAN on eth0 using AoE shelf address 11 +-and slot address 1. The process runs in the foreground. Using ++and slot address 1. The process runs in the foreground. Using + .I vbladed + would have resulted in the process running as a daemon in the + background. diff -Nru vblade-22/debian/patches/series vblade-23/debian/patches/series --- vblade-22/debian/patches/series 2016-02-16 09:52:55.000000000 +0000 +++ vblade-23/debian/patches/series 2016-12-06 22:01:49.000000000 +0000 @@ -1,4 +1,4 @@ -01_no_hyphen_in_manpages.patch -02_additional_cleaning.patch -03_vblade_usage.patch -hardening_ldflags.patch +manpage-escape-dash.patch +makefile-additional-cleaning.patch +vblade-check-params.patch +hardening-build.patch diff -Nru vblade-22/debian/patches/vblade-check-params.patch vblade-23/debian/patches/vblade-check-params.patch --- vblade-22/debian/patches/vblade-check-params.patch 1970-01-01 00:00:00.000000000 +0000 +++ vblade-23/debian/patches/vblade-check-params.patch 2016-12-06 22:01:49.000000000 +0000 @@ -0,0 +1,23 @@ +Subject: Used for avoiding calling vbladed without arguments, + and while at it, add the usage command line. +Author: David Martínez Moreno +Date: 2005-10-28 +Last-Update: 2007-04-08 + +--- a/vbladed ++++ b/vbladed +@@ -3,4 +3,14 @@ + # output is directed to syslogd + # + ++# Although logging goes to syslog, let's going to ++# protect ourselves against the most common way or ++# calling vbladed: without arguments. While at it, we guard ++# ourselves against wrong number of parameters. ++if [ $# -lt 4 ] ++then ++ echo "usage: ./vblade " >&2 ++ exit 1 ++fi ++ + sh -c "`dirname $0`/vblade $* < /dev/null 2>&1 | logger -t vbladed" & diff -Nru vblade-22/debian/README.Debian vblade-23/debian/README.Debian --- vblade-22/debian/README.Debian 1970-01-01 00:00:00.000000000 +0000 +++ vblade-23/debian/README.Debian 2016-12-06 22:01:49.000000000 +0000 @@ -0,0 +1,7 @@ +sparsefile not included +======================= + +Upstream provides a program `sparsefile` to create sparse files +conveniently. It is not included in the Debian package. To create +sparse files, use fallocate(1) provided by the essential package +util-linux. diff -Nru vblade-22/debian/rules vblade-23/debian/rules --- vblade-22/debian/rules 2016-02-16 09:52:55.000000000 +0000 +++ vblade-23/debian/rules 2016-12-06 22:01:49.000000000 +0000 @@ -1,13 +1,12 @@ #!/usr/bin/make -f -# Uncomment this to turn on verbose mode. -# export DH_VERBOSE=1 +export DEB_BUILD_MAINT_OPTIONS = hardening=+all DEB_BUILD_ARCH_OS ?= $(shell dpkg-architecture -qDEB_BUILD_ARCH_OS) ifeq ($(DEB_HOST_ARCH_OS),kfreebsd) - PLATFORM=freebsd + PLATFORM=freebsd else - PLATFORM=linux + PLATFORM=linux endif %: diff -Nru vblade-22/debian/vblade.dirs vblade-23/debian/vblade.dirs --- vblade-22/debian/vblade.dirs 2016-02-16 09:52:55.000000000 +0000 +++ vblade-23/debian/vblade.dirs 1970-01-01 00:00:00.000000000 +0000 @@ -1 +0,0 @@ -usr/sbin diff -Nru vblade-22/debian/vblade.install vblade-23/debian/vblade.install --- vblade-22/debian/vblade.install 2016-02-16 09:52:55.000000000 +0000 +++ vblade-23/debian/vblade.install 2016-12-06 22:01:49.000000000 +0000 @@ -1,2 +1,2 @@ -vblade /usr/sbin -vbladed /usr/sbin +vblade usr/sbin/ +vbladed usr/sbin/ diff -Nru vblade-22/debian/vblade.links vblade-23/debian/vblade.links --- vblade-22/debian/vblade.links 2016-02-16 09:52:55.000000000 +0000 +++ vblade-23/debian/vblade.links 2016-12-06 22:01:49.000000000 +0000 @@ -1 +1 @@ -/usr/share/man/man8/vblade.8 /usr/share/man/man8/vbladed.8 +usr/share/man/man8/vblade.8 usr/share/man/man8/vbladed.8 diff -Nru vblade-22/debian/vblade.maintscript vblade-23/debian/vblade.maintscript --- vblade-22/debian/vblade.maintscript 2016-02-16 09:52:55.000000000 +0000 +++ vblade-23/debian/vblade.maintscript 1970-01-01 00:00:00.000000000 +0000 @@ -1,2 +0,0 @@ -rm_conffile /etc/init.d/vblade 22-1ubuntu1~ -rm_conffile /etc/vblade.conf 22-1ubuntu1~ diff -Nru vblade-22/debian/vblade.NEWS vblade-23/debian/vblade.NEWS --- vblade-22/debian/vblade.NEWS 2016-02-16 09:52:55.000000000 +0000 +++ vblade-23/debian/vblade.NEWS 1970-01-01 00:00:00.000000000 +0000 @@ -1,15 +0,0 @@ -vblade (22-1ubuntu1) xenial; urgency=medium - - * Important note vblade init script users - The init script /etc/init.d/vblade and the associated configuration in - /etc/vblade.conf have been dropped. - If you had a custom configuration it was automatically saved so you can - refer to it in /etc/vblade.conf.dpkg-bak - With the init scripts dropped after upgrade it is in a safe fallback state - not doing anything (wrong). - The new recommended dependency to vblade-persist provides a way to persist - your exports again. - You have to convert your saved configuration into a config for - vblade-persist to continue having persistent vblade exports - - -- Christian Ehrhardt Mon, 15 Feb 2016 15:19:13 +0100 diff -Nru vblade-22/debian/watch vblade-23/debian/watch --- vblade-22/debian/watch 2016-02-16 09:52:55.000000000 +0000 +++ vblade-23/debian/watch 2016-12-06 22:01:49.000000000 +0000 @@ -1,2 +1,3 @@ -version=3 -http://sf.net/aoetools/vblade-(.+)\.tar\.gz +version=4 +https://github.com/OpenAoE/vblade/releases \ + /OpenAoE/vblade/archive/[^/]+([0-9][.0-9]*)\.tar\.gz diff -Nru vblade-22/NEWS vblade-23/NEWS --- vblade-22/NEWS 2014-08-11 01:07:14.000000000 +0000 +++ vblade-23/NEWS 2015-06-15 00:41:02.000000000 +0000 @@ -1,4 +1,14 @@ -*- change-log -*- +2015-06-14 Ed Cashin + Add convenience script for creating sparse files + vblade-23 + +2015-02-25 Catalin Salgau + Warn about Windows problem with CHS misalignment + +2014-09-13 Ed Cashin + code cleanup: remove unused variables + 2014-08-10 Ed Cashin vblade-22 diff -Nru vblade-22/sparsefile vblade-23/sparsefile --- vblade-22/sparsefile 1970-01-01 00:00:00.000000000 +0000 +++ vblade-23/sparsefile 2015-06-15 00:41:02.000000000 +0000 @@ -0,0 +1,36 @@ +#! /bin/sh +# sparsefile - create sparse files conveniently +# +# depends on dd and dc commands. + +usage() { + echo "usage: `basename $0` {10M|10G|10T} {filename}" 1>&2 +} +size=$1 +if test "$size" = "-h"; then + usage + exit +fi +fnam=$2 + +die() { + usage + exit 1 +} +set -e +units=`echo "$size" | sed 's!.*\(.\)$!\1!'` +n=`echo "$size" | sed 's!\(.*\).$!\1!'` +test "$units" && test "$n" && test "$units" != "$n" || die +case "$units" in +M) + seek=`echo "$n 1024 * 1 - p" | dc` ;; +G) + seek=`echo "$n 1024 1024 * * 1 - p" | dc` ;; +T) + seek=`echo "$n 1024 1024 1024 * * * 1 - p" | dc` ;; +*) + die + ;; +esac +sh -xc "dd bs=1k count=1 if=/dev/zero of=$fnam seek=$seek" +ls -lh "$fnam" diff -Nru vblade-22/vblade.8 vblade-23/vblade.8 --- vblade-22/vblade.8 2014-08-11 01:07:14.000000000 +0000 +++ vblade-23/vblade.8 2015-06-15 00:41:02.000000000 +0000 @@ -77,8 +77,17 @@ nai:~# vblade 11 1 eth0 /data/3TB .fi .EE -.SH BUGS +.SH NOTES AND WARNINGS Users of Jumbo frames should read the README file distributed with -vblade to learn about a workaround for kernel buffering limitations. +.I vblade +to learn about a workaround for kernel buffering limitations. +.PP +At least one AoE initiator (WinAoE) has been found to enforce legacy +CHS geometry for drives by discarding sectors. You should ensure that +the underlaying regular file or block device size is a multiple of +8225280 bytes (255 heads, 63 sectors/track, 512 bytes/sector) if you +encounter filesystem corruption. +.SH REPORTING BUGS +Please report bugs to the aoetools-discuss mailing list. .SH AUTHOR Brantley Coile (brantley@coraid.com)