| 1 |
commit: f0f544fbeb5cf2fabe9c11a743c1507da46ad3b4 |
| 2 |
Author: Dan F <44616e46 <AT> gmail <DOT> com> |
| 3 |
AuthorDate: Mon May 16 12:20:11 2022 +0000 |
| 4 |
Commit: Robin H. Johnson <robbat2 <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Mon May 16 12:20:39 2022 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=f0f544fb |
| 7 |
|
| 8 |
Updating open-iscsi to 2.1.4 |
| 9 |
|
| 10 |
Signed-off-by: DanF <44616e46 <AT> gmail.com> |
| 11 |
|
| 12 |
.../2.0.878/open-iscsi-2.0.878-gcc-10.patch | 107 --------------------- |
| 13 |
.../open-iscsi-2.0.878-static-iscsistart.patch | 11 --- |
| 14 |
.../open-iscsi-2.1.4-Makefiles.patch} | 8 +- |
| 15 |
.../2.1.4/open-iscsi-2.1.4-static-iscsistart.patch | 11 +++ |
| 16 |
4 files changed, 15 insertions(+), 122 deletions(-) |
| 17 |
|
| 18 |
diff --git a/patches/open-iscsi/2.0.878/open-iscsi-2.0.878-gcc-10.patch b/patches/open-iscsi/2.0.878/open-iscsi-2.0.878-gcc-10.patch |
| 19 |
deleted file mode 100644 |
| 20 |
index b614765..0000000 |
| 21 |
--- a/patches/open-iscsi/2.0.878/open-iscsi-2.0.878-gcc-10.patch |
| 22 |
+++ /dev/null |
| 23 |
@@ -1,107 +0,0 @@ |
| 24 |
-From 499a006a7d6bb154f9e1ab430e4c9e231ba6096a Mon Sep 17 00:00:00 2001 |
| 25 |
-From: Lee Duncan <lduncan@××××.com> |
| 26 |
-Date: Tue, 28 Jan 2020 16:36:56 -0800 |
| 27 |
-Subject: [PATCH] Updates to support gcc -fno-common option. |
| 28 |
- |
| 29 |
-This meant cleaning up the definition of some |
| 30 |
-global variables, so that they were only defined |
| 31 |
-in one place and refered to as external elsewhere. |
| 32 |
---- |
| 33 |
- include/iscsi_err.h | 6 ++++-- |
| 34 |
- iscsiuio/configure.ac | 2 +- |
| 35 |
- iscsiuio/src/uip/uip.h | 4 ++-- |
| 36 |
- usr/iscsi_err.c | 2 ++ |
| 37 |
- usr/log.c | 1 + |
| 38 |
- usr/log.h | 2 +- |
| 39 |
- 6 files changed, 11 insertions(+), 6 deletions(-) |
| 40 |
- |
| 41 |
-diff --git a/include/iscsi_err.h b/include/iscsi_err.h |
| 42 |
-index ed000dd0..04a8723e 100644 |
| 43 |
---- a/include/iscsi_err.h |
| 44 |
-+++ b/include/iscsi_err.h |
| 45 |
-@@ -4,7 +4,7 @@ |
| 46 |
- #ifndef _ISCSI_ERR_ |
| 47 |
- #define _ISCSI_ERR_ |
| 48 |
- |
| 49 |
--enum { |
| 50 |
-+enum iscsi_error_list { |
| 51 |
- ISCSI_SUCCESS = 0, |
| 52 |
- /* Generic error */ |
| 53 |
- ISCSI_ERR = 1, |
| 54 |
-@@ -73,7 +73,9 @@ enum { |
| 55 |
- |
| 56 |
- /* Always last. Indicates end of error code space */ |
| 57 |
- ISCSI_MAX_ERR_VAL, |
| 58 |
--} iscsi_err; |
| 59 |
-+}; |
| 60 |
-+ |
| 61 |
-+extern enum iscsi_error_list iscsi_err; |
| 62 |
- |
| 63 |
- extern void iscsi_err_print_msg(int err); |
| 64 |
- extern char *iscsi_err_to_str(int err); |
| 65 |
-diff --git a/iscsiuio/configure.ac b/iscsiuio/configure.ac |
| 66 |
-index b41df0ec..8099f09c 100644 |
| 67 |
---- a/iscsiuio/configure.ac |
| 68 |
-+++ b/iscsiuio/configure.ac |
| 69 |
-@@ -78,7 +78,7 @@ AC_CONFIG_COMMANDS([default],[[ |
| 70 |
- else |
| 71 |
- echo 'char *build_date = "'`date`'";' > src/unix/build_date.c |
| 72 |
- fi |
| 73 |
-- echo 'char *build_date;'> src/unix/build_date.h |
| 74 |
-+ echo 'extern char *build_date;'> src/unix/build_date.h |
| 75 |
- ]],[[]]) |
| 76 |
- |
| 77 |
- AC_PREFIX_DEFAULT() |
| 78 |
-diff --git a/iscsiuio/src/uip/uip.h b/iscsiuio/src/uip/uip.h |
| 79 |
-index 1180ab50..9d9428a2 100644 |
| 80 |
---- a/iscsiuio/src/uip/uip.h |
| 81 |
-+++ b/iscsiuio/src/uip/uip.h |
| 82 |
-@@ -70,8 +70,8 @@ struct uip_stack; |
| 83 |
- typedef u16_t uip_ip4addr_t[2]; |
| 84 |
- typedef u16_t uip_ip6addr_t[8]; |
| 85 |
- |
| 86 |
--const uip_ip6addr_t all_zeroes_addr6; |
| 87 |
--const uip_ip4addr_t all_zeroes_addr4; |
| 88 |
-+extern const uip_ip6addr_t all_zeroes_addr6; |
| 89 |
-+extern const uip_ip4addr_t all_zeroes_addr4; |
| 90 |
- |
| 91 |
- #define ETH_BUF(buf) ((struct uip_eth_hdr *)buf) |
| 92 |
- #define VLAN_ETH_BUF(buf) ((struct uip_vlan_eth_hdr *)buf) |
| 93 |
-diff --git a/usr/iscsi_err.c b/usr/iscsi_err.c |
| 94 |
-index 23c61fc3..4a057d57 100644 |
| 95 |
---- a/usr/iscsi_err.c |
| 96 |
-+++ b/usr/iscsi_err.c |
| 97 |
-@@ -21,6 +21,8 @@ |
| 98 |
- #include "iscsi_err.h" |
| 99 |
- #include "log.h" |
| 100 |
- |
| 101 |
-+enum iscsi_error_list iscsi_err; |
| 102 |
-+ |
| 103 |
- static char *iscsi_err_msgs[] = { |
| 104 |
- /* 0 */ "", |
| 105 |
- /* 1 */ "unknown error", |
| 106 |
-diff --git a/usr/log.c b/usr/log.c |
| 107 |
-index f29b54b3..6e16e7ce 100644 |
| 108 |
---- a/usr/log.c |
| 109 |
-+++ b/usr/log.c |
| 110 |
-@@ -33,6 +33,7 @@ |
| 111 |
- |
| 112 |
- char *log_name; |
| 113 |
- int log_level = 0; |
| 114 |
-+struct logarea *la = NULL; |
| 115 |
- |
| 116 |
- static int log_stop_daemon = 0; |
| 117 |
- static void (*log_func)(int prio, void *priv, const char *fmt, va_list ap); |
| 118 |
-diff --git a/usr/log.h b/usr/log.h |
| 119 |
-index 486a08ea..c548791e 100644 |
| 120 |
---- a/usr/log.h |
| 121 |
-+++ b/usr/log.h |
| 122 |
-@@ -64,7 +64,7 @@ struct logarea { |
| 123 |
- union semun semarg; |
| 124 |
- }; |
| 125 |
- |
| 126 |
--struct logarea *la; |
| 127 |
-+extern struct logarea *la; |
| 128 |
- |
| 129 |
- extern int log_init(char *program_name, int size, |
| 130 |
- void (*func)(int prio, void *priv, const char *fmt, va_list ap), |
| 131 |
|
| 132 |
diff --git a/patches/open-iscsi/2.0.878/open-iscsi-2.0.878-static-iscsistart.patch b/patches/open-iscsi/2.0.878/open-iscsi-2.0.878-static-iscsistart.patch |
| 133 |
deleted file mode 100644 |
| 134 |
index 2b06109..0000000 |
| 135 |
--- a/patches/open-iscsi/2.0.878/open-iscsi-2.0.878-static-iscsistart.patch |
| 136 |
+++ /dev/null |
| 137 |
@@ -1,11 +0,0 @@ |
| 138 |
---- a/usr/Makefile |
| 139 |
-+++ b/usr/Makefile |
| 140 |
-@@ -74,7 +74,7 @@ iscsiadm: $(ISCSI_LIB_SRCS) $(DISCOVERY_SRCS) iscsiadm.o session_mgmt.o mntcheck |
| 141 |
- |
| 142 |
- iscsistart: $(ISCSI_LIB_SRCS) $(INITIATOR_SRCS) $(FW_BOOT_SRCS) \ |
| 143 |
- iscsistart.o statics.o |
| 144 |
-- $(CC) $(CFLAGS) $^ -o $@ -lrt $(LDFLAGS) $(ISCSI_LIB) |
| 145 |
-+ $(CC) $(CFLAGS) $^ -o $@ -static -lrt $(LDFLAGS) $(ISCSI_LIB) |
| 146 |
- clean: |
| 147 |
- rm -f *.o $(PROGRAMS) .depend $(LIBSYS) |
| 148 |
- |
| 149 |
|
| 150 |
diff --git a/patches/open-iscsi/2.0.878/open-iscsi-2.0.878-Makefiles.patch b/patches/open-iscsi/2.1.4/open-iscsi-2.1.4-Makefiles.patch |
| 151 |
similarity index 89% |
| 152 |
rename from patches/open-iscsi/2.0.878/open-iscsi-2.0.878-Makefiles.patch |
| 153 |
rename to patches/open-iscsi/2.1.4/open-iscsi-2.1.4-Makefiles.patch |
| 154 |
index b45ff6e..2488b73 100644 |
| 155 |
--- a/patches/open-iscsi/2.0.878/open-iscsi-2.0.878-Makefiles.patch |
| 156 |
+++ b/patches/open-iscsi/2.1.4/open-iscsi-2.1.4-Makefiles.patch |
| 157 |
@@ -9,7 +9,7 @@ |
| 158 |
|
| 159 |
LIBISCSI_USR_DIR=$(TOPDIR)/libopeniscsiusr |
| 160 |
|
| 161 |
-@@ -44,17 +44,18 @@ EXTRA_MAN_FILES = libopeniscsiusr.h.3 |
| 162 |
+@@ -45,17 +45,18 @@ EXTRA_MAN_FILES = libopeniscsiusr.h.3 |
| 163 |
OBJS = context.o misc.o session.o sysfs.o iface.o idbm.o node.o default.o |
| 164 |
|
| 165 |
CFLAGS ?= -O2 -g |
| 166 |
@@ -40,10 +40,10 @@ |
| 167 |
+PKG_CONFIG ?= pkg-config |
| 168 |
|
| 169 |
CFLAGS ?= -O2 -g |
| 170 |
- WARNFLAGS ?= -Wall -Wstrict-prototypes |
| 171 |
-@@ -76,9 +76,9 @@ iscsistart: $(ISCSI_LIB_SRCS) $(INITIATOR_SRCS) $(FW_BOOT_SRCS) \ |
| 172 |
+ WARNFLAGS ?= -Wall -Wextra -Werror -Wstrict-prototypes -fno-common |
| 173 |
+@@ -78,9 +78,9 @@ iscsistart: $(ISCSI_LIB_SRCS) $(INITIATOR_SRCS) $(FW_BOOT_SRCS) \ |
| 174 |
iscsistart.o statics.o |
| 175 |
- $(CC) $(CFLAGS) $^ -o $@ -static -lrt $(LDFLAGS) $(ISCSI_LIB) |
| 176 |
+ $(CC) $(CFLAGS) $^ -o $@ -lcrypto -lrt $(LDFLAGS) $(ISCSI_LIB) |
| 177 |
clean: |
| 178 |
- rm -f *.o $(PROGRAMS) .depend $(LIBSYS) |
| 179 |
+ $(RM) *.o $(PROGRAMS) .depend $(LIBSYS) |
| 180 |
|
| 181 |
diff --git a/patches/open-iscsi/2.1.4/open-iscsi-2.1.4-static-iscsistart.patch b/patches/open-iscsi/2.1.4/open-iscsi-2.1.4-static-iscsistart.patch |
| 182 |
new file mode 100644 |
| 183 |
index 0000000..b84ba92 |
| 184 |
--- /dev/null |
| 185 |
+++ b/patches/open-iscsi/2.1.4/open-iscsi-2.1.4-static-iscsistart.patch |
| 186 |
@@ -0,0 +1,11 @@ |
| 187 |
+--- a/usr/Makefile |
| 188 |
++++ b/usr/Makefile |
| 189 |
+@@ -76,7 +76,7 @@ $(CC) $(CFLAGS) $^ -o $@ -lisns -lcrypto -lmount $(LDFLAGS) $(ISCSI_LIB) |
| 190 |
+ |
| 191 |
+ iscsistart: $(ISCSI_LIB_SRCS) $(INITIATOR_SRCS) $(FW_BOOT_SRCS) \ |
| 192 |
+ iscsistart.o statics.o |
| 193 |
+- $(CC) $(CFLAGS) $^ -o $@ -lcrypto -lrt $(LDFLAGS) $(ISCSI_LIB) |
| 194 |
++ $(CC) $(CFLAGS) $^ -o $@ -static -lcrypto -lrt $(LDFLAGS) $(ISCSI_LIB) |
| 195 |
+ clean: |
| 196 |
+ $(RM) *.o $(PROGRAMS) .depend $(LIBSYS) |
| 197 |
+ |
Archives