Sun Apr 14 17:37:33 2019 UTC ()
Fix typo in patch, reported by Greg A. Woods in PR pkg/54119.
While ipxe/src/net/fcels.c is build, it part of a library archive and
as none of its functions are used it's not inclued in the final link.
That's why calling the nonexistant suzeif() here doesn't matters.


(bouyer)
diff -r1.4 -r1.5 pkgsrc/sysutils/xentools411/distinfo
diff -r1.1 -r1.2 pkgsrc/sysutils/xentools411/patches/patch-.._ipxe_src_net_fcels.c
cvs diff -r1.4 -r1.5 pkgsrc/sysutils/xentools411/Attic/distinfo (expand / switch to unified diff)

--- pkgsrc/sysutils/xentools411/Attic/distinfo 2019/03/16 16:39:17 1.4
+++ pkgsrc/sysutils/xentools411/Attic/distinfo 2019/04/14 17:37:33 1.5
@@ -1,25 +1,25 @@ @@ -1,25 +1,25 @@
1$NetBSD: distinfo,v 1.4 2019/03/16 16:39:17 bouyer Exp $ 1$NetBSD: distinfo,v 1.5 2019/04/14 17:37:33 bouyer Exp $
2 2
3SHA1 (xen411/ipxe-git-356f6c1b64d7a97746d1816cef8ca22bdd8d0b5d.tar.gz) = 272b8c904dc0127690eca2c5c20c67479e40da34 3SHA1 (xen411/ipxe-git-356f6c1b64d7a97746d1816cef8ca22bdd8d0b5d.tar.gz) = 272b8c904dc0127690eca2c5c20c67479e40da34
4RMD160 (xen411/ipxe-git-356f6c1b64d7a97746d1816cef8ca22bdd8d0b5d.tar.gz) = cfcb4a314c15da19b36132b27126f3bd9699d0e5 4RMD160 (xen411/ipxe-git-356f6c1b64d7a97746d1816cef8ca22bdd8d0b5d.tar.gz) = cfcb4a314c15da19b36132b27126f3bd9699d0e5
5SHA512 (xen411/ipxe-git-356f6c1b64d7a97746d1816cef8ca22bdd8d0b5d.tar.gz) = bbcce5e55040e7e29adebd4a5253a046016a6e2e7ff34cf801a42d147e1ec1af57e0297318249bfa9c5bbeac969fe4b37c18cbf845a80b2136d65387a4fc31da 5SHA512 (xen411/ipxe-git-356f6c1b64d7a97746d1816cef8ca22bdd8d0b5d.tar.gz) = bbcce5e55040e7e29adebd4a5253a046016a6e2e7ff34cf801a42d147e1ec1af57e0297318249bfa9c5bbeac969fe4b37c18cbf845a80b2136d65387a4fc31da
6Size (xen411/ipxe-git-356f6c1b64d7a97746d1816cef8ca22bdd8d0b5d.tar.gz) = 3732065 bytes 6Size (xen411/ipxe-git-356f6c1b64d7a97746d1816cef8ca22bdd8d0b5d.tar.gz) = 3732065 bytes
7SHA1 (xen411/xen-4.11.1.tar.gz) = aeb45f3b05aaa73dd2ef3a0c533a975495b58c17 7SHA1 (xen411/xen-4.11.1.tar.gz) = aeb45f3b05aaa73dd2ef3a0c533a975495b58c17
8RMD160 (xen411/xen-4.11.1.tar.gz) = c0eaf57cfbd4f762e8367bcf88e99912d2089084 8RMD160 (xen411/xen-4.11.1.tar.gz) = c0eaf57cfbd4f762e8367bcf88e99912d2089084
9SHA512 (xen411/xen-4.11.1.tar.gz) = c1655c5decdaed95a2b9a99652318cfc72f6cfdae957cfe60d635f7787e8850f33e8fafc4c4b8d61fb579c9b9d93028a6382903e71808a0418b931e76d72a649 9SHA512 (xen411/xen-4.11.1.tar.gz) = c1655c5decdaed95a2b9a99652318cfc72f6cfdae957cfe60d635f7787e8850f33e8fafc4c4b8d61fb579c9b9d93028a6382903e71808a0418b931e76d72a649
10Size (xen411/xen-4.11.1.tar.gz) = 25152217 bytes 10Size (xen411/xen-4.11.1.tar.gz) = 25152217 bytes
11SHA1 (patch-.._ipxe_src_core_settings.c) = 1eab2fbd8b22dde2b8aa830ae7701603486f74e4 11SHA1 (patch-.._ipxe_src_core_settings.c) = 1eab2fbd8b22dde2b8aa830ae7701603486f74e4
12SHA1 (patch-.._ipxe_src_net_fcels.c) = 3b515307d8203b60815ad76bfd2a82289e05ebc5 12SHA1 (patch-.._ipxe_src_net_fcels.c) = eda41b25c3d5f5bef33caa9a6af28c40cb91e66b
13SHA1 (patch-Config.mk) = c41005a60de2f94a72b0206030eb021c137653d3 13SHA1 (patch-Config.mk) = c41005a60de2f94a72b0206030eb021c137653d3
14SHA1 (patch-Makefile) = 2f3a5eafc5039b149c98dd5e59c39a3197fd9264 14SHA1 (patch-Makefile) = 2f3a5eafc5039b149c98dd5e59c39a3197fd9264
15SHA1 (patch-docs_man_xl-disk-configuration.pod.5) = 03ff4c22dde1e1b60ab8750c8971ea057e479151 15SHA1 (patch-docs_man_xl-disk-configuration.pod.5) = 03ff4c22dde1e1b60ab8750c8971ea057e479151
16SHA1 (patch-docs_man_xl.cfg.pod.5.in) = 951915037a9975b76cc5c41a0e1abe0a202a3696 16SHA1 (patch-docs_man_xl.cfg.pod.5.in) = 951915037a9975b76cc5c41a0e1abe0a202a3696
17SHA1 (patch-docs_man_xl.conf.pod.5) = d77e3313750db315d540d7713c95cd54d6f02938 17SHA1 (patch-docs_man_xl.conf.pod.5) = d77e3313750db315d540d7713c95cd54d6f02938
18SHA1 (patch-docs_man_xl.pod.1.in) = 9b37ef724f2827bc05110e5456a8668257509cab 18SHA1 (patch-docs_man_xl.pod.1.in) = 9b37ef724f2827bc05110e5456a8668257509cab
19SHA1 (patch-docs_man_xlcpupool.cfg.pod.5) = 3f6db65d95b5fc607c2fa7e2fc975e0ddbfdd5e5 19SHA1 (patch-docs_man_xlcpupool.cfg.pod.5) = 3f6db65d95b5fc607c2fa7e2fc975e0ddbfdd5e5
20SHA1 (patch-docs_misc_block-scripts.txt) = 29a49edc4d15c4c8db822fd1d6356d07aeb27b86 20SHA1 (patch-docs_misc_block-scripts.txt) = 29a49edc4d15c4c8db822fd1d6356d07aeb27b86
21SHA1 (patch-extras_mini-os_Config.mk) = cb5cdb32f1b3c55abad702ab6768caf59d886ff2 21SHA1 (patch-extras_mini-os_Config.mk) = cb5cdb32f1b3c55abad702ab6768caf59d886ff2
22SHA1 (patch-extras_mini-os_arch_x86_arch.mk) = 8b4f1fe0e888f5b70408d2cc3a3968ce27eae5dc 22SHA1 (patch-extras_mini-os_arch_x86_arch.mk) = 8b4f1fe0e888f5b70408d2cc3a3968ce27eae5dc
23SHA1 (patch-extras_mini-os_include_fcntl.h) = 4ed18497227c8c327ee3db9d793caa4ac6254822 23SHA1 (patch-extras_mini-os_include_fcntl.h) = 4ed18497227c8c327ee3db9d793caa4ac6254822
24SHA1 (patch-extras_mini-os_include_time.h) = ab3b0794bf892ce6a036aa889c6852d65b508596 24SHA1 (patch-extras_mini-os_include_time.h) = ab3b0794bf892ce6a036aa889c6852d65b508596
25SHA1 (patch-extras_mini-os_lib_sys.c) = f6514ad743a206c0e81dcccd2586e8fe65bfd1b9 25SHA1 (patch-extras_mini-os_lib_sys.c) = f6514ad743a206c0e81dcccd2586e8fe65bfd1b9
cvs diff -r1.1 -r1.2 pkgsrc/sysutils/xentools411/patches/Attic/patch-.._ipxe_src_net_fcels.c (expand / switch to unified diff)

--- pkgsrc/sysutils/xentools411/patches/Attic/patch-.._ipxe_src_net_fcels.c 2018/07/24 13:40:11 1.1
+++ pkgsrc/sysutils/xentools411/patches/Attic/patch-.._ipxe_src_net_fcels.c 2019/04/14 17:37:33 1.2
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1$NetBSD: patch-.._ipxe_src_net_fcels.c,v 1.1 2018/07/24 13:40:11 bouyer Exp $ 1$NetBSD: patch-.._ipxe_src_net_fcels.c,v 1.2 2019/04/14 17:37:33 bouyer Exp $
2 2
3--- ../ipxe/src/net/fcels.c.orig 2015-01-25 20:27:57.000000000 +0000 3--- ../ipxe/src/net/fcels.c.orig 2015-01-25 20:27:57.000000000 +0000
4+++ ../ipxe/src/net/fcels.c 4+++ ../ipxe/src/net/fcels.c
5@@ -946,8 +946,11 @@ int fc_els_prli_tx ( struct fc_els *els, 5@@ -946,8 +946,11 @@ int fc_els_prli_tx ( struct fc_els *els,
6 struct fc_els_prli_descriptor *descriptor, void *param ) { 6 struct fc_els_prli_descriptor *descriptor, void *param ) {
7 struct { 7 struct {
8 struct fc_prli_frame frame; 8 struct fc_prli_frame frame;
9- uint8_t param[descriptor->param_len]; 9- uint8_t param[descriptor->param_len];
10- } __attribute__ (( packed )) prli; 10- } __attribute__ (( packed )) prli;
11+ uint8_t param[]; 11+ uint8_t param[];
12+ } __attribute__ (( packed )) *prli; 12+ } __attribute__ (( packed )) *prli;
13+ size_t plen = sizeof(*prli) + descriptor->param_len; 13+ size_t plen = sizeof(*prli) + descriptor->param_len;
14+ uint8_t prli_buf[plen]; 14+ uint8_t prli_buf[plen];
@@ -100,25 +100,25 @@ $NetBSD: patch-.._ipxe_src_net_fcels.c,v @@ -100,25 +100,25 @@ $NetBSD: patch-.._ipxe_src_net_fcels.c,v
100 /* Check for sufficient length to contain service parameter page */ 100 /* Check for sufficient length to contain service parameter page */
101- if ( len < sizeof ( *prli ) ) 101- if ( len < sizeof ( *prli ) )
102+ if ( len < plen ) 102+ if ( len < plen )
103 return -EINVAL; 103 return -EINVAL;
104  104
105 /* Check for upper-layer protocol type */ 105 /* Check for upper-layer protocol type */
106@@ -1252,15 +1257,16 @@ static int fc_els_echo_rx_request ( stru 106@@ -1252,15 +1257,16 @@ static int fc_els_echo_rx_request ( stru
107 size_t len ) { 107 size_t len ) {
108 struct { 108 struct {
109 struct fc_echo_frame_header echo; 109 struct fc_echo_frame_header echo;
110- char payload[ len - sizeof ( struct fc_echo_frame_header ) ]; 110- char payload[ len - sizeof ( struct fc_echo_frame_header ) ];
111+ char payload[]; 111+ char payload[];
112 } *echo = data; 112 } *echo = data;
113+ size_t plen = suzeif(*echo) + len - sizeof ( struct fc_echo_frame_header ); 113+ size_t plen = sizeof(*echo) + len - sizeof ( struct fc_echo_frame_header );
114 int rc; 114 int rc;
115  115
116 DBGC ( els, FCELS_FMT "\n", FCELS_ARGS ( els ) ); 116 DBGC ( els, FCELS_FMT "\n", FCELS_ARGS ( els ) );
117  117
118 /* Transmit response */ 118 /* Transmit response */
119 echo->echo.command = FC_ELS_LS_ACC; 119 echo->echo.command = FC_ELS_LS_ACC;
120- if ( ( rc = fc_els_tx ( els, echo, sizeof ( *echo ) ) ) != 0 ) 120- if ( ( rc = fc_els_tx ( els, echo, sizeof ( *echo ) ) ) != 0 )
121+ if ( ( rc = fc_els_tx ( els, echo, plen ) ) != 0 ) 121+ if ( ( rc = fc_els_tx ( els, echo, plen ) ) != 0 )
122 return rc; 122 return rc;
123  123
124 /* Nothing to do */ 124 /* Nothing to do */