Browse Source

debian/patches: Moved there the .diff.gz changes not under debian/:

- Added 01_no_hyphen_in_manpages.patch to solve a lintian error.
- Added 02_additional_cleaning.patch with changes to main Makefile.
- Added 03_vblade_usage.patch for the usage prompt when called without
  arguments.
David Martínez Moreno 9 years ago
parent
commit
e9e959f2dd

+ 35 - 0
debian/patches/01_no_hyphen_in_manpages.patch

@@ -0,0 +1,35 @@
+Added fixes for typical confusion hyphen <-> minus sign.
+Index: vblade-20/vblade.8
+===================================================================
+--- vblade-20.orig/vblade.8
++++ vblade-20/vblade.8
+@@ -35,24 +35,24 @@ 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.
+ .SH EXAMPLE

+ 17 - 0
debian/patches/02_additional_cleaning.patch

@@ -0,0 +1,17 @@
+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/

+ 21 - 0
debian/patches/03_vblade_usage.patch

@@ -0,0 +1,21 @@
+03_vblade_usage.patch: Used for avoiding calling vbladed without arguments,
+			and while at it, add the usage command line.
+Index: vblade-20/vbladed
+===================================================================
+--- vblade-20.orig/vbladed
++++ vblade-20/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 <shelf> <slot> <ethn> <device>" >&2
++    exit 1
++fi
++
+ sh -c "`dirname $0`/vblade $* < /dev/null 2>&1 | logger -t vbladed" &

+ 3 - 0
debian/patches/series

@@ -0,0 +1,3 @@
+01_no_hyphen_in_manpages.patch
+02_additional_cleaning.patch
+03_vblade_usage.patch

+ 0 - 3
makefile

@@ -36,11 +36,8 @@ 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/

+ 1 - 1
vblade.8

@@ -52,7 +52,7 @@ client.
 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.
 .SH EXAMPLE

+ 0 - 10
vbladed

@@ -3,14 +3,4 @@
 # 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 <shelf> <slot> <ethn> <device>" >&2
-    exit 1
-fi
-
 sh -c "`dirname $0`/vblade $* < /dev/null 2>&1 | logger -t vbladed" &