[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

Bug#990237: marked as done (unblock: aoetools/36-5)

Your message dated Thu, 1 Jul 2021 15:41:32 +0200
with message-id <d4b10f9c-1579-7e6a-891a-de0cdf3f769b@debian.org>
and subject line Re: Bug#990237: unblock: aoetools/36-5
has caused the Debian Bug report #990237,
regarding unblock: aoetools/36-5
to be marked as done.

This means that you claim that the problem has been dealt with.
If this is not the case it is now your responsibility to reopen the
Bug report if necessary, and/or fix the problem forthwith.

(NB: If you are a system administrator and have no idea what this
message is talking about, this may indicate a serious mail system
misconfiguration somewhere. Please contact owner@bugs.debian.org
immediately.)


-- 
990237: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=990237
Debian Bug Tracking System
Contact owner@bugs.debian.org with problems
--- Begin Message --- 
Package: release.debian.org
Severity: normal
User: release.debian.org@packages.debian.org
Usertags: unblock
X-Debbugs-Cc: Adi Kriegisch <adi@kriegisch.at>

Hello release team,

Please unblock package aoetools (as of 36-5)

To be honest, I feel bad about having to ask you for a manual unblock:
When uploading aoetools 36-4 and -5, I was not aware I had not created
an autopkgtest for that package - not yet. There is a reason for this
situation but that's no excuse, and resolving this is on the agenda for
the first post-release upload.

Enough disclaimers, here's why I'd like to see aoetools 36-5 in the
bullseye release, and why I think the risk is low and therefore
acceptable:

[ Reason ]
There are two major changes, commits cherry-picked from upstream. They
affect two userland programs shipped with but not used by aoetools,
called "aoeping" and "aoe-sancheck"

* (aoeping) "Check amount of data read from network before using it"

  Upstream: https://github.com/OpenAoE/aoetools/commit/aoetools-36-2-ge50247f

  This seems to have some security impact (reading undefined data)
  so it's wise to have it. Exploiting requires local network access,
  though.

* commit "Aoe-sancheck: Refine interface probing"

  Upstream: https://github.com/OpenAoE/aoetools/commit/aoetools-36-11-g4a3ee18
  Debian: https://bugs.debian.org/986671

  Fixes: The aoe-sancheck program assumes interface names start
  with "eth", and probes the first 16 interfaces by index only.

  Both the commit and the bug report have some more details on this.

Some other changes are minor or plain cosmetic:

* aoe-sancheck: Raise the number of supported interfaces.
  Upstream: https://github.com/OpenAoE/aoetools/commit/aoetools-36-12-gc80b1be

* Don't abort installation if the aoe kernel module cannot be loaded.
  For a discussion, see
  https://git.in-ulm.de/cbiedl/aoetools/commit/5b4c995

* Replace some upstreamed patches with the version cherry-picked
  from upstream. This makes the debdiff a bit hard to read but it's
  about manpages only anyway.

[ Impact ]
(What is the impact for the user if the unblock isn't granted?)
* aoeping: Possibly security issue (not very likely to happen, though).
* aoe-sancheck: Missing functionality, see the Debian bug report
  mentioned above.

[ Tests ]
Both programs were tested manually.

[ Risks ]
The changes are small. Quite frankly, I find it hard to believe they
will introduce breakage. And even if, this will not affect pure Debian
installations since AFAICT none of the programs are used by any package.

Kind regards,

    Christoph

unblock aoetools/36-5

diff -Nru aoetools-36/debian/aoetools.postinst aoetools-36/debian/aoetools.postinst
--- aoetools-36/debian/aoetools.postinst	2016-07-04 19:29:07.000000000 +0200
+++ aoetools-36/debian/aoetools.postinst	2021-05-24 12:08:35.000000000 +0200
@@ -9,7 +9,7 @@
     fi
     # load the kernel module (as opposed to letting the init script do it)
     if [ -d /run/systemd/system ] ; then
-        /lib/systemd/systemd-modules-load aoetools.conf
+        /lib/systemd/systemd-modules-load aoetools.conf || true
     fi
     ;;
 abort-upgrade|abort-remove|abort-deconfigure)
diff -Nru aoetools-36/debian/changelog aoetools-36/debian/changelog
--- aoetools-36/debian/changelog	2019-02-26 01:05:45.000000000 +0100
+++ aoetools-36/debian/changelog	2021-05-24 12:40:31.000000000 +0200
@@ -1,3 +1,17 @@
+aoetools (36-5) unstable; urgency=medium
+
+  * postinst: Don't abort from failing module load
+
+ -- Christoph Biedl <debian.axhn@manchmal.in-ulm.de>  Mon, 24 May 2021 12:40:31 +0200
+
+aoetools (36-4) unstable; urgency=medium
+
+  * Cherry-pick (aoeping:) "Check amount of data read from network
+    before using it"
+  * aoe-sancheck: Probe interfaces not named eth*. Closes: #986671
+
+ -- Christoph Biedl <debian.axhn@manchmal.in-ulm.de>  Sat, 22 May 2021 21:50:11 +0200
+
 aoetools (36-3) unstable; urgency=medium
 
   * Update package description. Closes: #862843
diff -Nru aoetools-36/debian/control aoetools-36/debian/control
--- aoetools-36/debian/control	2019-02-26 01:05:40.000000000 +0100
+++ aoetools-36/debian/control	2021-05-24 12:08:20.000000000 +0200
@@ -3,6 +3,8 @@
 Homepage: http://aoetools.sf.net
 Standards-Version: 4.3.0
 Build-Depends: debhelper (>> 10~),
+Vcs-Browser: https://git.in-ulm.de/cbiedl/aoetools
+Vcs-Git: https://git.in-ulm.de/cbiedl/aoetools.git
 Priority: optional
 Section: admin
 
diff -Nru aoetools-36/debian/patches/02_no_hyphen_in_manpages.patch aoetools-36/debian/patches/02_no_hyphen_in_manpages.patch
--- aoetools-36/debian/patches/02_no_hyphen_in_manpages.patch	2014-01-13 22:54:59.000000000 +0100
+++ aoetools-36/debian/patches/02_no_hyphen_in_manpages.patch	1970-01-01 01:00:00.000000000 +0100
@@ -1,95 +0,0 @@
-Description: Patch hyphens in manpages.
- Patched all the manpages in order to avoid usual hyphen->minus confusion.
- Also fixed a typo.
-Author: David Martínez Moreno <ender@debian.org>
-Forwarded: no
-Last-Update: 2014-01-12
-
---- a/aoecfg.8
-+++ b/aoecfg.8
-@@ -3,7 +3,7 @@
- aoecfg \- manipulate AoE configuration strings
- .SH SYNOPSIS
- .B aoecfg
--[-c \fIcmd\fR] [-s \fIcfgstr\fR] [-t \fItimeout\fR] [\fIshelf slot\fR] [\fInetif\fR]
-+[\-c \fIcmd\fR] [\-s \fIcfgstr\fR] [\-t \fItimeout\fR] [\fIshelf slot\fR] [\fInetif\fR]
- .fi
- .SH DESCRIPTION
- .IR Aoecfg (8)
---- a/aoe-mkdevs.8
-+++ b/aoe-mkdevs.8
-@@ -52,13 +52,13 @@
- .IP
- .EX
- .nf
--nai:~# rm -rf /dev/etherd 
-+nai:~# rm \-rf /dev/etherd
- nai:~# aoe-mkdevs /dev/etherd
--nai:~# ls /dev/etherd | wc -l
-+nai:~# ls /dev/etherd | wc \-l
- 1603
--nai:~# rm -rf /dev/etherd
-+nai:~# rm \-rf /dev/etherd
- nai:~# n_partitions=1 aoe-mkdevs /dev/etherd
--nai:~# ls /dev/etherd | wc -l
-+nai:~# ls /dev/etherd | wc \-l
- 103
- .fi
- .EE
---- a/aoe-mkshelf.8
-+++ b/aoe-mkshelf.8
-@@ -52,11 +52,11 @@
- .EX
- .nf
- nai:~# aoe-mkshelf /dev/etherd 7
--nai:~# ls /dev/etherd/e7.* | wc -l
-+nai:~# ls /dev/etherd/e7.* | wc \-l
- 160
- nai:~# rm /dev/etherd/e7.*        
- nai:~# n_partitions=1 aoe-mkshelf /dev/etherd 7
--nai:~# ls /dev/etherd/e7.* | wc -l
-+nai:~# ls /dev/etherd/e7.* | wc \-l
- 10
- nai:~# 
- .fi
---- a/aoeping.8
-+++ b/aoeping.8
-@@ -67,9 +67,9 @@
- SMART commands in the list below are supported.  If the command
- requires data 
- transfer, one sector (512 bytes) of data is always the amount
--transfered.  If the command takes a parameter (for the Low LBA
-+transferred.  If the command takes a parameter (for the Low LBA
- register), then the name of the SMART command is immediately followed
--by a colon and then a number, the value of the parameter, e.g., "-S
-+by a colon and then a number, the value of the parameter, e.g., "\-S
- read_log:1".
- .IP
-   read_data
-@@ -119,7 +119,7 @@
- .IP
- .EX
- .nf
--bash# aoeping -v 10 9 eth0 | head
-+bash# aoeping \-v 10 9 eth0 | head
- tag: 80000000
- eth: eth0
- shelf: 10
-@@ -139,7 +139,7 @@
- .IP
- .EX
- .nf
--bash# aoeping -i -s 20 \\
-+bash# aoeping \-i \-s 20 \\
-   10 9 eth0 > /dev/null \\
-   && echo ok
- ok
-@@ -154,7 +154,7 @@
- .IP
- .EX
- .nf
--bash# aoeping -S return_status \\
-+bash# aoeping \-S return_status \\
-   10 9 eth0 | grep 'LBA Mid: 0x4f' \\
-   > /dev/null \\
-   && echo ok
diff -Nru aoetools-36/debian/patches/cherry-pick/1434503415.aoetools-36-2-ge50247f.check-amount-of-data-read-from-network-before-using-it.patch aoetools-36/debian/patches/cherry-pick/1434503415.aoetools-36-2-ge50247f.check-amount-of-data-read-from-network-before-using-it.patch
--- aoetools-36/debian/patches/cherry-pick/1434503415.aoetools-36-2-ge50247f.check-amount-of-data-read-from-network-before-using-it.patch	1970-01-01 01:00:00.000000000 +0100
+++ aoetools-36/debian/patches/cherry-pick/1434503415.aoetools-36-2-ge50247f.check-amount-of-data-read-from-network-before-using-it.patch	2021-05-22 15:56:36.000000000 +0200
@@ -0,0 +1,17 @@
+Subject: Check amount of data read from network before using it
+Origin: aoetools-36-2-ge50247f <https://github.com/OpenAoE/aoetools/commit/aoetools-36-2-ge50247f>
+Upstream-Author: Ed Cashin <ed.cashin@acm.org>
+Date: Tue Jun 16 21:10:15 2015 -0400
+
+--- a/aoeping.c
++++ b/aoeping.c
+@@ -359,6 +359,9 @@
+ 	}
+ 	n = aoe_pkt_read(buf, sizeof buf, c, tag);
+ 	p = (Ata *) buf;
++	/* We're expecting the AoE and ATA header plus 512 bytes of SMART */
++	if (n < 512 + (&p->data[0] - (uchar *) p))
++		exit(EXIT_FAILURE);
+ 	if (show_smart_regs(p) != 0)
+ 		exit(EXIT_FAILURE);
+ 	if (s->data & SmartDataRet) {
diff -Nru aoetools-36/debian/patches/cherry-pick/1484013170.aoetools-36-7-gf2d2325.avoid-hyphen-vs-minus-issues.patch aoetools-36/debian/patches/cherry-pick/1484013170.aoetools-36-7-gf2d2325.avoid-hyphen-vs-minus-issues.patch
--- aoetools-36/debian/patches/cherry-pick/1484013170.aoetools-36-7-gf2d2325.avoid-hyphen-vs-minus-issues.patch	1970-01-01 01:00:00.000000000 +0100
+++ aoetools-36/debian/patches/cherry-pick/1484013170.aoetools-36-7-gf2d2325.avoid-hyphen-vs-minus-issues.patch	2021-05-24 12:30:41.000000000 +0200
@@ -0,0 +1,96 @@
+Subject: Avoid hyphen vs minus issues
+Origin: aoetools-36-7-gf2d2325 <https://github.com/OpenAoE/aoetools/commit/aoetools-36-7-gf2d2325>
+Upstream-Author: Ed Cashin <ed.cashin@acm.org>
+Date: Mon Jan 9 20:52:50 2017 -0500
+
+    ender@debian.org submitted these changes to the man pages, so
+    that dashes would not by transformed into hyphens.
+
+--- a/aoe-mkdevs.8
++++ b/aoe-mkdevs.8
+@@ -52,13 +52,13 @@
+ .IP
+ .EX
+ .nf
+-nai:~# rm -rf /dev/etherd 
++nai:~# rm \-rf /dev/etherd
+ nai:~# aoe-mkdevs /dev/etherd
+-nai:~# ls /dev/etherd | wc -l
++nai:~# ls /dev/etherd | wc \-l
+ 1603
+-nai:~# rm -rf /dev/etherd
++nai:~# rm \-rf /dev/etherd
+ nai:~# n_partitions=1 aoe-mkdevs /dev/etherd
+-nai:~# ls /dev/etherd | wc -l
++nai:~# ls /dev/etherd | wc \-l
+ 103
+ .fi
+ .EE
+--- a/aoe-mkshelf.8
++++ b/aoe-mkshelf.8
+@@ -52,11 +52,11 @@
+ .EX
+ .nf
+ nai:~# aoe-mkshelf /dev/etherd 7
+-nai:~# ls /dev/etherd/e7.* | wc -l
++nai:~# ls /dev/etherd/e7.* | wc \-l
+ 160
+ nai:~# rm /dev/etherd/e7.*        
+ nai:~# n_partitions=1 aoe-mkshelf /dev/etherd 7
+-nai:~# ls /dev/etherd/e7.* | wc -l
++nai:~# ls /dev/etherd/e7.* | wc \-l
+ 10
+ nai:~# 
+ .fi
+--- a/aoecfg.8
++++ b/aoecfg.8
+@@ -3,7 +3,7 @@
+ aoecfg \- manipulate AoE configuration strings
+ .SH SYNOPSIS
+ .B aoecfg
+-[-c \fIcmd\fR] [-s \fIcfgstr\fR] [-t \fItimeout\fR] [\fIshelf slot\fR] [\fInetif\fR]
++[\-c \fIcmd\fR] [\-s \fIcfgstr\fR] [\-t \fItimeout\fR] [\fIshelf slot\fR] [\fInetif\fR]
+ .fi
+ .SH DESCRIPTION
+ .IR Aoecfg (8)
+--- a/aoeping.8
++++ b/aoeping.8
+@@ -67,9 +67,9 @@
+ SMART commands in the list below are supported.  If the command
+ requires data 
+ transfer, one sector (512 bytes) of data is always the amount
+-transfered.  If the command takes a parameter (for the Low LBA
++transferred.  If the command takes a parameter (for the Low LBA
+ register), then the name of the SMART command is immediately followed
+-by a colon and then a number, the value of the parameter, e.g., "-S
++by a colon and then a number, the value of the parameter, e.g., "\-S
+ read_log:1".
+ .IP
+   read_data
+@@ -119,7 +119,7 @@
+ .IP
+ .EX
+ .nf
+-bash# aoeping -v 10 9 eth0 | head
++bash# aoeping \-v 10 9 eth0 | head
+ tag: 80000000
+ eth: eth0
+ shelf: 10
+@@ -139,7 +139,7 @@
+ .IP
+ .EX
+ .nf
+-bash# aoeping -i -s 20 \\
++bash# aoeping \-i \-s 20 \\
+   10 9 eth0 > /dev/null \\
+   && echo ok
+ ok
+@@ -154,7 +154,7 @@
+ .IP
+ .EX
+ .nf
+-bash# aoeping -S return_status \\
++bash# aoeping \-S return_status \\
+   10 9 eth0 | grep 'LBA Mid: 0x4f' \\
+   > /dev/null \\
+   && echo ok
diff -Nru aoetools-36/debian/patches/cherry-pick/1484013334.aoetools-36-8-g9066acb.biedl-fixes-typos-in-documentation.patch aoetools-36/debian/patches/cherry-pick/1484013334.aoetools-36-8-g9066acb.biedl-fixes-typos-in-documentation.patch
--- aoetools-36/debian/patches/cherry-pick/1484013334.aoetools-36-8-g9066acb.biedl-fixes-typos-in-documentation.patch	1970-01-01 01:00:00.000000000 +0100
+++ aoetools-36/debian/patches/cherry-pick/1484013334.aoetools-36-8-g9066acb.biedl-fixes-typos-in-documentation.patch	2021-05-24 12:30:41.000000000 +0200
@@ -0,0 +1,39 @@
+Subject: Biedl fixes typos in documentation
+Origin: aoetools-36-8-g9066acb <https://github.com/OpenAoE/aoetools/commit/aoetools-36-8-g9066acb>
+Upstream-Author: Ed Cashin <ed.cashin@acm.org>
+Date: Mon Jan 9 20:55:34 2017 -0500
+
+    Christoph Biedl, the debian package maintainer for aoetools,
+    provides these typo corrections.
+
+--- a/aoecfg.8
++++ b/aoecfg.8
+@@ -62,7 +62,7 @@
+ default to broadcast.
+ .TP
+ .B netif
+-specifiy the network interface.  The default is
++specify the network interface.  The default is
+ .IR eth0 .
+ .SH "SEE ALSO"
+ .IR aoe-discover (8),
+--- a/aoeping.8
++++ b/aoeping.8
+@@ -40,7 +40,7 @@
+ Issue an ATA "identify device" command after receiving the AoE
+ device's Config
+ Query response.  The "ident" response will be printed on standard
+-output as a hexidecimal dump.
++output as a hexadecimal dump.
+ .TP
+ \fB-I\fP
+ Issue an ATA "identify device" command after receiving the AoE
+@@ -50,7 +50,7 @@
+ .TP
+ \fB-v\fP
+ Turn on 
+-more copious output, including a hexidecimal dump of the Config Query
++more copious output, including a hexadecimal dump of the Config Query
+ response from the AoE device (see AoE spec at URL below).
+ .TP
+ \fB-s\fP
diff -Nru aoetools-36/debian/patches/cherry-pick/1621687045.aoetools-36-11-g4a3ee18.aoe-sancheck-refine-interface-probing.patch aoetools-36/debian/patches/cherry-pick/1621687045.aoetools-36-11-g4a3ee18.aoe-sancheck-refine-interface-probing.patch
--- aoetools-36/debian/patches/cherry-pick/1621687045.aoetools-36-11-g4a3ee18.aoe-sancheck-refine-interface-probing.patch	1970-01-01 01:00:00.000000000 +0100
+++ aoetools-36/debian/patches/cherry-pick/1621687045.aoetools-36-11-g4a3ee18.aoe-sancheck-refine-interface-probing.patch	2021-05-24 12:30:41.000000000 +0200
@@ -0,0 +1,67 @@
+Subject: Aoe-sancheck: Refine interface probing
+Origin: aoetools-36-11-g4a3ee18 <https://github.com/OpenAoE/aoetools/commit/aoetools-36-11-g4a3ee18>
+Upstream-Author: Christoph Biedl <debian.axhn@manchmal.in-ulm.de>
+Date: Sat May 22 14:37:25 2021 +0200
+
+    There are two issues in the ethlist function in aoe-sancheck.c:
+
+    First it skips all network interfaces that do not start with "eth". This
+    is a problem these days where people use different naming schemes like the
+    so-called predictable interface names as mandated by udev/systemd.
+
+    Second it only probes for interfaces with an interface number of up
+    to 15. At least in current Linux, that number can take huge values and
+    those interfaces will be ignored completely.
+
+    About the first: Probe all interfaces (but lo) that support the ARP
+    protocol, assuming that is a fair indicator for ethernet support.
+
+    About the second, use the if_nameindex function to get a list of all
+    interfaces currently known to the kernel and operate on that one.
+
+--- a/aoe-sancheck.c
++++ b/aoe-sancheck.c
+@@ -501,23 +501,38 @@
+ int
+ ethlist(char **ifs, int nifs)
+ {
+-	int i, s, n;
++	int s, n;
+ 	struct ifreq ifr;
++	struct if_nameindex *if_ni, *i;
+ 
+ 	s = socket(AF_INET, SOCK_STREAM, 0);
+ 	if (s < 0)
+ 		return 0;
++
++	if_ni = if_nameindex();
++	if (if_ni == NULL)
++		return 0;
++
+ 	n = 0;
+-	for (i=0; i<nifs; i++) {
++	for (i = if_ni; ! (i->if_index == 0 && i->if_name == NULL); i++) {
+ 		memset(&ifr, 0, sizeof ifr);
+-		ifr.ifr_ifindex = i;
+-		if (ioctl(s, SIOCGIFNAME, &ifr) < 0)
++		ifr.ifr_ifindex = i->if_index;
++		strcpy(ifr.ifr_name, i->if_name);
++		// get interface flags
++		if (ioctl(s, SIOCGIFFLAGS, &ifr) < 0)
++			continue;
++		// only use interfaces that use arp protocol
++		if (ifr.ifr_flags & IFF_NOARP)
+ 			continue;
+-		if (strncmp(ifr.ifr_name, "eth", 3))
++		// skip loopback interfaces
++		if (ifr.ifr_flags & IFF_LOOPBACK)
+ 			continue;
++		if (n == nifs)
++			break;
+ 		inserteth(ifs, nifs, ifr.ifr_name);
+ 		n++;
+ 	}
++	if_freenameindex(if_ni);
+ 	close(s);
+ 	return n;
+ }
diff -Nru aoetools-36/debian/patches/cherry-pick/1621688081.aoetools-36-12-gc80b1be.aoe-sancheck-raise-the-number-of-interfaces-to-probe-to-32-and-document-the-limit.patch aoetools-36/debian/patches/cherry-pick/1621688081.aoetools-36-12-gc80b1be.aoe-sancheck-raise-the-number-of-interfaces-to-probe-to-32-and-document-the-limit.patch
--- aoetools-36/debian/patches/cherry-pick/1621688081.aoetools-36-12-gc80b1be.aoe-sancheck-raise-the-number-of-interfaces-to-probe-to-32-and-document-the-limit.patch	1970-01-01 01:00:00.000000000 +0100
+++ aoetools-36/debian/patches/cherry-pick/1621688081.aoetools-36-12-gc80b1be.aoe-sancheck-raise-the-number-of-interfaces-to-probe-to-32-and-document-the-limit.patch	2021-05-24 12:30:41.000000000 +0200
@@ -0,0 +1,27 @@
+Subject: Aoe-sancheck: Raise the number of interfaces to probe to 32, and document the limit
+Origin: aoetools-36-12-gc80b1be <https://github.com/OpenAoE/aoetools/commit/aoetools-36-12-gc80b1be>
+Upstream-Author: Christoph Biedl <debian.axhn@manchmal.in-ulm.de>
+Date: Sat May 22 14:54:41 2021 +0200
+
+--- a/aoe-sancheck.8
++++ b/aoe-sancheck.8
+@@ -53,6 +53,8 @@
+ This check detects the situation where a local interface is configured for jumbo frames and the AoE device is capable of jumbo frames, but some aspect of the network is incapable of passing frames that size, for example, a misconfigured switch.  \fIAoe-sancheck\fP reports the maximum payload size the path is capable of if less than the configured payload size.
+ .SH BUGS
+ The program may sometimes display inconsistent results between runs showing that a path is capable of a smaller frame size than it actually is.  If you see this behavior, please email one of the authors with your verbose output.
++.PP
++The program probes only the first 32 ethernet interfaces found in the system.
+ .SH "SEE ALSO"
+ .IR aoeping (8),
+ .IR aoetools (8)
+--- a/aoe-sancheck.c
++++ b/aoe-sancheck.c
+@@ -103,7 +103,7 @@
+ };
+ 
+ enum {
+-	Neth= 16,
++	Neth= 32,
+ 	Nstack= 16*1024,
+ 	Nws= 5,
+ 
diff -Nru aoetools-36/debian/patches/fix-typos.patch aoetools-36/debian/patches/fix-typos.patch
--- aoetools-36/debian/patches/fix-typos.patch	2016-12-26 19:11:13.000000000 +0100
+++ aoetools-36/debian/patches/fix-typos.patch	1970-01-01 01:00:00.000000000 +0100
@@ -1,34 +0,0 @@
-Subject: Fix typos found by lintian
-Author: Christoph Biedl <debian.axhn@manchmal.in-ulm.de>
-
---- a/aoecfg.8
-+++ b/aoecfg.8
-@@ -62,7 +62,7 @@
- default to broadcast.
- .TP
- .B netif
--specifiy the network interface.  The default is
-+specify the network interface.  The default is
- .IR eth0 .
- .SH "SEE ALSO"
- .IR aoe-discover (8),
---- a/aoeping.8
-+++ b/aoeping.8
-@@ -40,7 +40,7 @@
- Issue an ATA "identify device" command after receiving the AoE
- device's Config
- Query response.  The "ident" response will be printed on standard
--output as a hexidecimal dump.
-+output as a hexadecimal dump.
- .TP
- \fB-I\fP
- Issue an ATA "identify device" command after receiving the AoE
-@@ -50,7 +50,7 @@
- .TP
- \fB-v\fP
- Turn on 
--more copious output, including a hexidecimal dump of the Config Query
-+more copious output, including a hexadecimal dump of the Config Query
- response from the AoE device (see AoE spec at URL below).
- .TP
- \fB-s\fP
diff -Nru aoetools-36/debian/patches/series aoetools-36/debian/patches/series
--- aoetools-36/debian/patches/series	2016-12-26 19:11:13.000000000 +0100
+++ aoetools-36/debian/patches/series	2021-05-24 12:33:40.000000000 +0200
@@ -1,5 +1,12 @@
+
+# cherry-picked commits. Keep in upstream's chronological order
+cherry-pick/1434503415.aoetools-36-2-ge50247f.check-amount-of-data-read-from-network-before-using-it.patch
+cherry-pick/1484013170.aoetools-36-7-gf2d2325.avoid-hyphen-vs-minus-issues.patch
+cherry-pick/1484013334.aoetools-36-8-g9066acb.biedl-fixes-typos-in-documentation.patch
+cherry-pick/1621687045.aoetools-36-11-g4a3ee18.aoe-sancheck-refine-interface-probing.patch
+cherry-pick/1621688081.aoetools-36-12-gc80b1be.aoe-sancheck-raise-the-number-of-interfaces-to-probe-to-32-and-document-the-limit.patch
+
+# patches for upstream
 01_no_bashisms.patch
-02_no_hyphen_in_manpages.patch
 03_enable_hardened_build.patch
 04_support_slash_run_slash_udev.patch
-fix-typos.patch

Attachment: signature.asc
Description: PGP signature


--- End Message ---
--- Begin Message --- 
hi

On 01-07-2021 11:24, Paul Gevers wrote:
> Hi,
> 
> On 23-06-2021 19:58, Christoph Biedl wrote:
>> Please unblock package aoetools (as of 36-5)
> 
> unblocked.

Forgot to close.

Paul

Attachment: OpenPGP_signature
Description: OpenPGP digital signature


--- End Message ---
Reply to: