diff --git a/iscsi-initiator-utils-add-rh-ver.patch b/iscsi-initiator-utils-add-rh-ver.patch index e62b168..7f7670a 100644 --- a/iscsi-initiator-utils-add-rh-ver.patch +++ b/iscsi-initiator-utils-add-rh-ver.patch @@ -5,7 +5,7 @@ * some other maintainer could merge a patch without going through us */ -#define ISCSI_VERSION_STR "2.0-872" -+#define ISCSI_VERSION_STR "2.0-872.39.el6" ++#define ISCSI_VERSION_STR "2.0-872.40.el6" #define ISCSI_VERSION_FILE "/sys/module/scsi_transport_iscsi/version" #endif diff --git a/iscsi-initiator-utils-mod-iface-andport-fixes.patch b/iscsi-initiator-utils-mod-iface-andport-fixes.patch index cc9cd55..8945bd2 100644 --- a/iscsi-initiator-utils-mod-iface-andport-fixes.patch +++ b/iscsi-initiator-utils-mod-iface-andport-fixes.patch @@ -1,6 +1,6 @@ -diff -aurp open-iscsi-2.0-872-rc4-bnx2i/include/iscsi_if.h open-iscsi-2.0-872-rc4-bnx2i.work/include/iscsi_if.h ---- open-iscsi-2.0-872-rc4-bnx2i/include/iscsi_if.h 2012-03-28 17:50:46.000000000 -0500 -+++ open-iscsi-2.0-872-rc4-bnx2i.work/include/iscsi_if.h 2012-03-28 17:51:03.000000000 -0500 +diff -Naurp open-iscsi-2.0-872-rc4-bnx2i/include/iscsi_if.h open-iscsi-2.0-872-rc4-bnx2i.work/include/iscsi_if.h +--- open-iscsi-2.0-872-rc4-bnx2i/include/iscsi_if.h 2012-04-04 20:58:29.000000000 -0500 ++++ open-iscsi-2.0-872-rc4-bnx2i.work/include/iscsi_if.h 2012-04-04 20:58:40.000000000 -0500 @@ -270,7 +270,8 @@ struct iscsi_uevent { } host_event; struct msg_ping_comp { @@ -32,9 +32,9 @@ diff -aurp open-iscsi-2.0-872-rc4-bnx2i/include/iscsi_if.h open-iscsi-2.0-872-rc #define iscsi_ptr(_handle) ((void*)(unsigned long)_handle) #define iscsi_handle(_ptr) ((uint64_t)(unsigned long)_ptr) -diff -aurp open-iscsi-2.0-872-rc4-bnx2i/include/iscsi_net_util.h open-iscsi-2.0-872-rc4-bnx2i.work/include/iscsi_net_util.h ---- open-iscsi-2.0-872-rc4-bnx2i/include/iscsi_net_util.h 2012-03-28 17:50:46.000000000 -0500 -+++ open-iscsi-2.0-872-rc4-bnx2i.work/include/iscsi_net_util.h 2012-03-28 17:51:03.000000000 -0500 +diff -Naurp open-iscsi-2.0-872-rc4-bnx2i/include/iscsi_net_util.h open-iscsi-2.0-872-rc4-bnx2i.work/include/iscsi_net_util.h +--- open-iscsi-2.0-872-rc4-bnx2i/include/iscsi_net_util.h 2012-04-04 20:58:29.000000000 -0500 ++++ open-iscsi-2.0-872-rc4-bnx2i.work/include/iscsi_net_util.h 2012-04-04 20:58:40.000000000 -0500 @@ -7,5 +7,6 @@ extern int net_get_transport_name_from_n extern int net_get_netdev_from_hwaddress(char *hwaddress, char *netdev); extern int net_setup_netdev(char *netdev, char *local_ip, char *mask, @@ -42,9 +42,9 @@ diff -aurp open-iscsi-2.0-872-rc4-bnx2i/include/iscsi_net_util.h open-iscsi-2.0- +extern int net_ifup_netdev(char *netdev); #endif -diff -aurp open-iscsi-2.0-872-rc4-bnx2i/iscsiuio/include/config.h open-iscsi-2.0-872-rc4-bnx2i.work/iscsiuio/include/config.h ---- open-iscsi-2.0-872-rc4-bnx2i/iscsiuio/include/config.h 2012-03-28 17:50:46.000000000 -0500 -+++ open-iscsi-2.0-872-rc4-bnx2i.work/iscsiuio/include/config.h 2012-03-28 17:51:03.000000000 -0500 +diff -Naurp open-iscsi-2.0-872-rc4-bnx2i/iscsiuio/include/config.h open-iscsi-2.0-872-rc4-bnx2i.work/iscsiuio/include/config.h +--- open-iscsi-2.0-872-rc4-bnx2i/iscsiuio/include/config.h 2012-04-04 20:58:29.000000000 -0500 ++++ open-iscsi-2.0-872-rc4-bnx2i.work/iscsiuio/include/config.h 2012-04-04 20:58:40.000000000 -0500 @@ -59,6 +59,9 @@ typedef struct iface_rec { * 1 = enable */ uint16_t mtu; @@ -55,9 +55,9 @@ diff -aurp open-iscsi-2.0-872-rc4-bnx2i/iscsiuio/include/config.h open-iscsi-2.0 /* * TODO: we may have to make this bigger and interconnect * specific for infinniband -diff -aurp open-iscsi-2.0-872-rc4-bnx2i/libiscsi/libiscsi.c open-iscsi-2.0-872-rc4-bnx2i.work/libiscsi/libiscsi.c ---- open-iscsi-2.0-872-rc4-bnx2i/libiscsi/libiscsi.c 2012-03-28 17:50:46.000000000 -0500 -+++ open-iscsi-2.0-872-rc4-bnx2i.work/libiscsi/libiscsi.c 2012-03-28 17:51:03.000000000 -0500 +diff -Naurp open-iscsi-2.0-872-rc4-bnx2i/libiscsi/libiscsi.c open-iscsi-2.0-872-rc4-bnx2i.work/libiscsi/libiscsi.c +--- open-iscsi-2.0-872-rc4-bnx2i/libiscsi/libiscsi.c 2012-04-04 20:58:29.000000000 -0500 ++++ open-iscsi-2.0-872-rc4-bnx2i.work/libiscsi/libiscsi.c 2012-04-04 20:58:40.000000000 -0500 @@ -626,12 +626,15 @@ int libiscsi_node_set_parameter(struct l const char *parameter, const char *value) { @@ -79,9 +79,9 @@ diff -aurp open-iscsi-2.0-872-rc4-bnx2i/libiscsi/libiscsi.c open-iscsi-2.0-872-r (char *)node->name, node->tpgt, (char *)node->address, node->port)) if (nr_found == 0) { -diff -aurp open-iscsi-2.0-872-rc4-bnx2i/usr/config.h open-iscsi-2.0-872-rc4-bnx2i.work/usr/config.h ---- open-iscsi-2.0-872-rc4-bnx2i/usr/config.h 2012-03-28 17:50:46.000000000 -0500 -+++ open-iscsi-2.0-872-rc4-bnx2i.work/usr/config.h 2012-03-28 17:51:03.000000000 -0500 +diff -Naurp open-iscsi-2.0-872-rc4-bnx2i/usr/config.h open-iscsi-2.0-872-rc4-bnx2i.work/usr/config.h +--- open-iscsi-2.0-872-rc4-bnx2i/usr/config.h 2012-04-04 20:58:29.000000000 -0500 ++++ open-iscsi-2.0-872-rc4-bnx2i.work/usr/config.h 2012-04-04 20:58:40.000000000 -0500 @@ -229,6 +229,8 @@ typedef struct iface_rec { * 1 = enable */ uint16_t mtu; @@ -91,9 +91,9 @@ diff -aurp open-iscsi-2.0-872-rc4-bnx2i/usr/config.h open-iscsi-2.0-872-rc4-bnx2 /* * TODO: we may have to make this bigger and interconnect * specific for infinniband -diff -aurp open-iscsi-2.0-872-rc4-bnx2i/usr/host.c open-iscsi-2.0-872-rc4-bnx2i.work/usr/host.c ---- open-iscsi-2.0-872-rc4-bnx2i/usr/host.c 2012-03-28 17:50:46.000000000 -0500 -+++ open-iscsi-2.0-872-rc4-bnx2i.work/usr/host.c 2012-03-28 17:51:03.000000000 -0500 +diff -Naurp open-iscsi-2.0-872-rc4-bnx2i/usr/host.c open-iscsi-2.0-872-rc4-bnx2i.work/usr/host.c +--- open-iscsi-2.0-872-rc4-bnx2i/usr/host.c 2012-04-04 20:58:29.000000000 -0500 ++++ open-iscsi-2.0-872-rc4-bnx2i.work/usr/host.c 2012-04-04 20:58:40.000000000 -0500 @@ -174,6 +174,16 @@ static int print_host_iface(void *data, iface->ipv6_router); } @@ -119,35 +119,18 @@ diff -aurp open-iscsi-2.0-872-rc4-bnx2i/usr/host.c open-iscsi-2.0-872-rc4-bnx2i. err = iscsi_sysfs_for_each_host(&flags, &num_found, host_info_print_tree); break; -diff -aurp open-iscsi-2.0-872-rc4-bnx2i/usr/idbm.c open-iscsi-2.0-872-rc4-bnx2i.work/usr/idbm.c ---- open-iscsi-2.0-872-rc4-bnx2i/usr/idbm.c 2012-03-28 17:50:46.000000000 -0500 -+++ open-iscsi-2.0-872-rc4-bnx2i.work/usr/idbm.c 2012-03-28 17:51:09.000000000 -0500 -@@ -603,11 +603,14 @@ int idbm_rec_update_param(recinfo_t *inf - int i; - int passwd_done = 0; - char passwd_len[8]; -+ int found = 0; - - setup_passwd_len: +diff -Naurp open-iscsi-2.0-872-rc4-bnx2i/usr/idbm.c open-iscsi-2.0-872-rc4-bnx2i.work/usr/idbm.c +--- open-iscsi-2.0-872-rc4-bnx2i/usr/idbm.c 2012-04-04 20:58:29.000000000 -0500 ++++ open-iscsi-2.0-872-rc4-bnx2i.work/usr/idbm.c 2012-04-04 20:58:47.000000000 -0500 +@@ -608,6 +608,7 @@ setup_passwd_len: for (i=0; i '%s'", name, info[i].value, value); /* parse recinfo by type */ -@@ -662,6 +665,9 @@ setup_passwd_len: - } - } - -+ if (!found) -+ log_error("Unknown parameter %s.", name); -+ - return ISCSI_ERR_INVAL; - - updated: -@@ -2358,70 +2364,83 @@ idbm_slp_defaults(struct iscsi_slp_confi +@@ -2358,70 +2359,86 @@ idbm_slp_defaults(struct iscsi_slp_confi sizeof(struct iscsi_slp_config)); } @@ -240,8 +223,11 @@ diff -aurp open-iscsi-2.0-872-rc4-bnx2i/usr/idbm.c open-iscsi-2.0-872-rc4-bnx2i. - goto free_info; + list_for_each_entry(param, params, list) { + rc = idbm_rec_update_param(info, param->name, param->value, 0); -+ if (rc) ++ if (rc) { ++ if (rc == ISCSI_ERR_INVAL) ++ log_error("Unknown parameter %s.", param->name); + goto free_info; ++ } + } free_info: @@ -268,7 +254,7 @@ diff -aurp open-iscsi-2.0-872-rc4-bnx2i/usr/idbm.c open-iscsi-2.0-872-rc4-bnx2i. recinfo_t *info; int rc = 0; -@@ -2431,13 +2450,17 @@ int idbm_discovery_set_param(void *data, +@@ -2431,13 +2448,17 @@ int idbm_discovery_set_param(void *data, idbm_recinfo_discovery((discovery_rec_t *)rec, info); @@ -292,9 +278,9 @@ diff -aurp open-iscsi-2.0-872-rc4-bnx2i/usr/idbm.c open-iscsi-2.0-872-rc4-bnx2i. rc = idbm_discovery_write((discovery_rec_t *)rec); if (rc) -diff -aurp open-iscsi-2.0-872-rc4-bnx2i/usr/idbm.h open-iscsi-2.0-872-rc4-bnx2i.work/usr/idbm.h ---- open-iscsi-2.0-872-rc4-bnx2i/usr/idbm.h 2012-03-28 17:50:46.000000000 -0500 -+++ open-iscsi-2.0-872-rc4-bnx2i.work/usr/idbm.h 2012-03-28 17:51:03.000000000 -0500 +diff -Naurp open-iscsi-2.0-872-rc4-bnx2i/usr/idbm.h open-iscsi-2.0-872-rc4-bnx2i.work/usr/idbm.h +--- open-iscsi-2.0-872-rc4-bnx2i/usr/idbm.h 2012-04-04 20:58:29.000000000 -0500 ++++ open-iscsi-2.0-872-rc4-bnx2i.work/usr/idbm.h 2012-04-04 20:58:40.000000000 -0500 @@ -26,6 +26,7 @@ #include #include "initiator.h" @@ -327,9 +313,9 @@ diff -aurp open-iscsi-2.0-872-rc4-bnx2i/usr/idbm.h open-iscsi-2.0-872-rc4-bnx2i. extern void idbm_node_setup_defaults(node_rec_t *rec); extern struct node_rec *idbm_find_rec_in_list(struct list_head *rec_list, char *targetname, char *addr, -diff -aurp open-iscsi-2.0-872-rc4-bnx2i/usr/iface.c open-iscsi-2.0-872-rc4-bnx2i.work/usr/iface.c ---- open-iscsi-2.0-872-rc4-bnx2i/usr/iface.c 2012-03-28 17:50:46.000000000 -0500 -+++ open-iscsi-2.0-872-rc4-bnx2i.work/usr/iface.c 2012-03-28 17:51:03.000000000 -0500 +diff -Naurp open-iscsi-2.0-872-rc4-bnx2i/usr/iface.c open-iscsi-2.0-872-rc4-bnx2i.work/usr/iface.c +--- open-iscsi-2.0-872-rc4-bnx2i/usr/iface.c 2012-04-04 20:58:29.000000000 -0500 ++++ open-iscsi-2.0-872-rc4-bnx2i.work/usr/iface.c 2012-04-04 20:58:40.000000000 -0500 @@ -169,7 +169,7 @@ free_conf: int iface_conf_read(struct iface_rec *iface) { @@ -466,9 +452,9 @@ diff -aurp open-iscsi-2.0-872-rc4-bnx2i/usr/iface.c open-iscsi-2.0-872-rc4-bnx2i if (!t) { log_error("Could not get transport for host%u. " "Make sure the iSCSI driver is loaded.", -diff -aurp open-iscsi-2.0-872-rc4-bnx2i/usr/iface.h open-iscsi-2.0-872-rc4-bnx2i.work/usr/iface.h ---- open-iscsi-2.0-872-rc4-bnx2i/usr/iface.h 2012-03-28 17:50:46.000000000 -0500 -+++ open-iscsi-2.0-872-rc4-bnx2i.work/usr/iface.h 2012-03-28 17:51:03.000000000 -0500 +diff -Naurp open-iscsi-2.0-872-rc4-bnx2i/usr/iface.h open-iscsi-2.0-872-rc4-bnx2i.work/usr/iface.h +--- open-iscsi-2.0-872-rc4-bnx2i/usr/iface.h 2012-04-04 20:58:29.000000000 -0500 ++++ open-iscsi-2.0-872-rc4-bnx2i.work/usr/iface.h 2012-04-04 20:58:40.000000000 -0500 @@ -26,7 +26,6 @@ struct iface_rec; @@ -486,9 +472,9 @@ diff -aurp open-iscsi-2.0-872-rc4-bnx2i/usr/iface.h open-iscsi-2.0-872-rc4-bnx2i struct iface_rec *iface); extern int iface_conf_write(struct iface_rec *iface); extern int iface_conf_delete(struct iface_rec *iface); -diff -aurp open-iscsi-2.0-872-rc4-bnx2i/usr/initiator_common.c open-iscsi-2.0-872-rc4-bnx2i.work/usr/initiator_common.c ---- open-iscsi-2.0-872-rc4-bnx2i/usr/initiator_common.c 2012-03-28 17:50:46.000000000 -0500 -+++ open-iscsi-2.0-872-rc4-bnx2i.work/usr/initiator_common.c 2012-03-28 17:51:03.000000000 -0500 +diff -Naurp open-iscsi-2.0-872-rc4-bnx2i/usr/initiator_common.c open-iscsi-2.0-872-rc4-bnx2i.work/usr/initiator_common.c +--- open-iscsi-2.0-872-rc4-bnx2i/usr/initiator_common.c 2012-04-04 20:58:29.000000000 -0500 ++++ open-iscsi-2.0-872-rc4-bnx2i.work/usr/initiator_common.c 2012-04-04 20:58:40.000000000 -0500 @@ -35,6 +35,7 @@ #include "host.h" #include "sysdeps.h" @@ -528,9 +514,9 @@ diff -aurp open-iscsi-2.0-872-rc4-bnx2i/usr/initiator_common.c open-iscsi-2.0-87 rc = iscsi_set_net_config(t, session, iface); if (rc != 0) return rc; -diff -aurp open-iscsi-2.0-872-rc4-bnx2i/usr/iscsiadm.c open-iscsi-2.0-872-rc4-bnx2i.work/usr/iscsiadm.c ---- open-iscsi-2.0-872-rc4-bnx2i/usr/iscsiadm.c 2012-03-28 17:50:46.000000000 -0500 -+++ open-iscsi-2.0-872-rc4-bnx2i.work/usr/iscsiadm.c 2012-03-28 17:51:13.000000000 -0500 +diff -Naurp open-iscsi-2.0-872-rc4-bnx2i/usr/iscsiadm.c open-iscsi-2.0-872-rc4-bnx2i.work/usr/iscsiadm.c +--- open-iscsi-2.0-872-rc4-bnx2i/usr/iscsiadm.c 2012-04-04 20:58:29.000000000 -0500 ++++ open-iscsi-2.0-872-rc4-bnx2i.work/usr/iscsiadm.c 2012-04-04 20:58:40.000000000 -0500 @@ -110,6 +110,7 @@ static struct option const long_options[ {"ip", required_argument, NULL, 'a'}, {"packetsize", required_argument, NULL, 'b'}, @@ -1000,9 +986,9 @@ diff -aurp open-iscsi-2.0-872-rc4-bnx2i/usr/iscsiadm.c open-iscsi-2.0-872-rc4-bn goto out; } -diff -aurp open-iscsi-2.0-872-rc4-bnx2i/usr/iscsid.c open-iscsi-2.0-872-rc4-bnx2i.work/usr/iscsid.c ---- open-iscsi-2.0-872-rc4-bnx2i/usr/iscsid.c 2012-03-28 17:50:46.000000000 -0500 -+++ open-iscsi-2.0-872-rc4-bnx2i.work/usr/iscsid.c 2012-03-28 17:51:03.000000000 -0500 +diff -Naurp open-iscsi-2.0-872-rc4-bnx2i/usr/iscsid.c open-iscsi-2.0-872-rc4-bnx2i.work/usr/iscsid.c +--- open-iscsi-2.0-872-rc4-bnx2i/usr/iscsid.c 2012-04-04 20:58:29.000000000 -0500 ++++ open-iscsi-2.0-872-rc4-bnx2i.work/usr/iscsid.c 2012-04-04 20:58:40.000000000 -0500 @@ -409,11 +409,6 @@ int main(int argc, char *argv[]) exit(ISCSI_ERR); } @@ -1015,9 +1001,9 @@ diff -aurp open-iscsi-2.0-872-rc4-bnx2i/usr/iscsid.c open-iscsi-2.0-872-rc4-bnx2 umask(0177); mgmt_ipc_fd = -1; -diff -aurp open-iscsi-2.0-872-rc4-bnx2i/usr/iscsi_ipc.h open-iscsi-2.0-872-rc4-bnx2i.work/usr/iscsi_ipc.h ---- open-iscsi-2.0-872-rc4-bnx2i/usr/iscsi_ipc.h 2012-03-28 17:50:46.000000000 -0500 -+++ open-iscsi-2.0-872-rc4-bnx2i.work/usr/iscsi_ipc.h 2012-03-28 17:51:03.000000000 -0500 +diff -Naurp open-iscsi-2.0-872-rc4-bnx2i/usr/iscsi_ipc.h open-iscsi-2.0-872-rc4-bnx2i.work/usr/iscsi_ipc.h +--- open-iscsi-2.0-872-rc4-bnx2i/usr/iscsi_ipc.h 2012-04-04 20:58:29.000000000 -0500 ++++ open-iscsi-2.0-872-rc4-bnx2i.work/usr/iscsi_ipc.h 2012-04-04 20:58:40.000000000 -0500 @@ -137,7 +137,7 @@ struct iscsi_ipc { int (*exec_ping) (uint64_t transport_handle, uint32_t host_no, @@ -1027,9 +1013,9 @@ diff -aurp open-iscsi-2.0-872-rc4-bnx2i/usr/iscsi_ipc.h open-iscsi-2.0-872-rc4-b int (*get_chap) (uint64_t transport_handle, uint32_t host_no, uint16_t chap_tbl_idx, uint32_t num_entries, -diff -aurp open-iscsi-2.0-872-rc4-bnx2i/usr/iscsi_net_util.c open-iscsi-2.0-872-rc4-bnx2i.work/usr/iscsi_net_util.c ---- open-iscsi-2.0-872-rc4-bnx2i/usr/iscsi_net_util.c 2012-03-28 17:50:46.000000000 -0500 -+++ open-iscsi-2.0-872-rc4-bnx2i.work/usr/iscsi_net_util.c 2012-03-28 17:51:03.000000000 -0500 +diff -Naurp open-iscsi-2.0-872-rc4-bnx2i/usr/iscsi_net_util.c open-iscsi-2.0-872-rc4-bnx2i.work/usr/iscsi_net_util.c +--- open-iscsi-2.0-872-rc4-bnx2i/usr/iscsi_net_util.c 2012-04-04 20:58:29.000000000 -0500 ++++ open-iscsi-2.0-872-rc4-bnx2i.work/usr/iscsi_net_util.c 2012-04-04 20:58:40.000000000 -0500 @@ -72,7 +72,7 @@ int net_get_transport_name_from_netdev(c ifr.ifr_data = (caddr_t)&drvinfo; err = ioctl(fd, SIOCETHTOOL, &ifr); @@ -1099,9 +1085,9 @@ diff -aurp open-iscsi-2.0-872-rc4-bnx2i/usr/iscsi_net_util.c open-iscsi-2.0-872- } -diff -aurp open-iscsi-2.0-872-rc4-bnx2i/usr/iscsistart.c open-iscsi-2.0-872-rc4-bnx2i.work/usr/iscsistart.c ---- open-iscsi-2.0-872-rc4-bnx2i/usr/iscsistart.c 2012-03-28 17:50:46.000000000 -0500 -+++ open-iscsi-2.0-872-rc4-bnx2i.work/usr/iscsistart.c 2012-03-28 17:51:09.000000000 -0500 +diff -Naurp open-iscsi-2.0-872-rc4-bnx2i/usr/iscsistart.c open-iscsi-2.0-872-rc4-bnx2i.work/usr/iscsistart.c +--- open-iscsi-2.0-872-rc4-bnx2i/usr/iscsistart.c 2012-04-04 20:58:29.000000000 -0500 ++++ open-iscsi-2.0-872-rc4-bnx2i.work/usr/iscsistart.c 2012-04-04 20:58:40.000000000 -0500 @@ -40,6 +40,7 @@ #include "log.h" #include "iscsi_util.h" @@ -1238,9 +1224,9 @@ diff -aurp open-iscsi-2.0-872-rc4-bnx2i/usr/iscsistart.c open-iscsi-2.0-872-rc4- if (err) exit(err); break; -diff -aurp open-iscsi-2.0-872-rc4-bnx2i/usr/iscsi_sysfs.c open-iscsi-2.0-872-rc4-bnx2i.work/usr/iscsi_sysfs.c ---- open-iscsi-2.0-872-rc4-bnx2i/usr/iscsi_sysfs.c 2012-03-28 17:50:46.000000000 -0500 -+++ open-iscsi-2.0-872-rc4-bnx2i.work/usr/iscsi_sysfs.c 2012-03-28 17:51:03.000000000 -0500 +diff -Naurp open-iscsi-2.0-872-rc4-bnx2i/usr/iscsi_sysfs.c open-iscsi-2.0-872-rc4-bnx2i.work/usr/iscsi_sysfs.c +--- open-iscsi-2.0-872-rc4-bnx2i/usr/iscsi_sysfs.c 2012-04-04 20:58:29.000000000 -0500 ++++ open-iscsi-2.0-872-rc4-bnx2i.work/usr/iscsi_sysfs.c 2012-04-04 20:58:40.000000000 -0500 @@ -532,6 +532,12 @@ static int iscsi_sysfs_read_iface(struct ret = 0; } @@ -1343,9 +1329,9 @@ diff -aurp open-iscsi-2.0-872-rc4-bnx2i/usr/iscsi_sysfs.c open-iscsi-2.0-872-rc4 - ISCSI_VERSION_FILE); - return -1; -} -diff -aurp open-iscsi-2.0-872-rc4-bnx2i/usr/iscsi_sysfs.h open-iscsi-2.0-872-rc4-bnx2i.work/usr/iscsi_sysfs.h ---- open-iscsi-2.0-872-rc4-bnx2i/usr/iscsi_sysfs.h 2012-03-28 17:50:46.000000000 -0500 -+++ open-iscsi-2.0-872-rc4-bnx2i.work/usr/iscsi_sysfs.h 2012-03-28 17:51:03.000000000 -0500 +diff -Naurp open-iscsi-2.0-872-rc4-bnx2i/usr/iscsi_sysfs.h open-iscsi-2.0-872-rc4-bnx2i.work/usr/iscsi_sysfs.h +--- open-iscsi-2.0-872-rc4-bnx2i/usr/iscsi_sysfs.h 2012-04-04 20:58:29.000000000 -0500 ++++ open-iscsi-2.0-872-rc4-bnx2i.work/usr/iscsi_sysfs.h 2012-04-04 20:58:40.000000000 -0500 @@ -36,7 +36,6 @@ struct iscsi_auth_config; extern void free_transports(void); @@ -1362,9 +1348,9 @@ diff -aurp open-iscsi-2.0-872-rc4-bnx2i/usr/iscsi_sysfs.h open-iscsi-2.0-872-rc4 extern int iscsi_sysfs_session_supports_nop(int sid); extern int iscsi_sysfs_session_user_created(int sid); -diff -aurp open-iscsi-2.0-872-rc4-bnx2i/usr/iscsi_util.c open-iscsi-2.0-872-rc4-bnx2i.work/usr/iscsi_util.c ---- open-iscsi-2.0-872-rc4-bnx2i/usr/iscsi_util.c 2012-03-28 17:50:46.000000000 -0500 -+++ open-iscsi-2.0-872-rc4-bnx2i.work/usr/iscsi_util.c 2012-03-28 17:51:03.000000000 -0500 +diff -Naurp open-iscsi-2.0-872-rc4-bnx2i/usr/iscsi_util.c open-iscsi-2.0-872-rc4-bnx2i.work/usr/iscsi_util.c +--- open-iscsi-2.0-872-rc4-bnx2i/usr/iscsi_util.c 2012-04-04 20:58:29.000000000 -0500 ++++ open-iscsi-2.0-872-rc4-bnx2i.work/usr/iscsi_util.c 2012-04-04 20:58:40.000000000 -0500 @@ -90,13 +90,24 @@ str_to_ipport(char *str, int *port, int if (!strchr(ip, '.')) { @@ -1408,9 +1394,9 @@ diff -aurp open-iscsi-2.0-872-rc4-bnx2i/usr/iscsi_util.c open-iscsi-2.0-872-rc4- if ((f = fopen(pathname, "r"))) { while ((line = fgets(buffer, sizeof (buffer), f))) { param = strstr(line, key); -diff -aurp open-iscsi-2.0-872-rc4-bnx2i/usr/Makefile open-iscsi-2.0-872-rc4-bnx2i.work/usr/Makefile ---- open-iscsi-2.0-872-rc4-bnx2i/usr/Makefile 2012-03-28 17:50:46.000000000 -0500 -+++ open-iscsi-2.0-872-rc4-bnx2i.work/usr/Makefile 2012-03-28 17:51:03.000000000 -0500 +diff -Naurp open-iscsi-2.0-872-rc4-bnx2i/usr/Makefile open-iscsi-2.0-872-rc4-bnx2i.work/usr/Makefile +--- open-iscsi-2.0-872-rc4-bnx2i/usr/Makefile 2012-04-04 20:58:29.000000000 -0500 ++++ open-iscsi-2.0-872-rc4-bnx2i.work/usr/Makefile 2012-04-04 20:58:40.000000000 -0500 @@ -33,7 +33,7 @@ endif OPTFLAGS ?= -O2 -g WARNFLAGS ?= -Wall -Wstrict-prototypes @@ -1429,9 +1415,9 @@ diff -aurp open-iscsi-2.0-872-rc4-bnx2i/usr/Makefile open-iscsi-2.0-872-rc4-bnx2 iscsiadm: $(ISCSI_LIB_SRCS) $(DISCOVERY_SRCS) iscsiadm.o session_mgmt.o $(CC) $(CFLAGS) $^ -o $@ -L../utils/open-isns -lisns -diff -aurp open-iscsi-2.0-872-rc4-bnx2i/usr/netlink.c open-iscsi-2.0-872-rc4-bnx2i.work/usr/netlink.c ---- open-iscsi-2.0-872-rc4-bnx2i/usr/netlink.c 2012-03-28 17:50:46.000000000 -0500 -+++ open-iscsi-2.0-872-rc4-bnx2i.work/usr/netlink.c 2012-03-28 17:51:03.000000000 -0500 +diff -Naurp open-iscsi-2.0-872-rc4-bnx2i/usr/netlink.c open-iscsi-2.0-872-rc4-bnx2i.work/usr/netlink.c +--- open-iscsi-2.0-872-rc4-bnx2i/usr/netlink.c 2012-04-04 20:58:29.000000000 -0500 ++++ open-iscsi-2.0-872-rc4-bnx2i.work/usr/netlink.c 2012-04-04 20:58:40.000000000 -0500 @@ -1085,13 +1085,15 @@ ksend_ping(uint64_t transport_handle, ui static int kexec_ping(uint64_t transport_handle, uint32_t host_no, @@ -1462,9 +1448,9 @@ diff -aurp open-iscsi-2.0-872-rc4-bnx2i/usr/netlink.c open-iscsi-2.0-872-rc4-bnx break; } -diff -aurp open-iscsi-2.0-872-rc4-bnx2i/usr/transport.c open-iscsi-2.0-872-rc4-bnx2i.work/usr/transport.c ---- open-iscsi-2.0-872-rc4-bnx2i/usr/transport.c 2012-03-28 17:50:46.000000000 -0500 -+++ open-iscsi-2.0-872-rc4-bnx2i.work/usr/transport.c 2012-03-28 17:51:03.000000000 -0500 +diff -Naurp open-iscsi-2.0-872-rc4-bnx2i/usr/transport.c open-iscsi-2.0-872-rc4-bnx2i.work/usr/transport.c +--- open-iscsi-2.0-872-rc4-bnx2i/usr/transport.c 2012-04-04 20:58:29.000000000 -0500 ++++ open-iscsi-2.0-872-rc4-bnx2i.work/usr/transport.c 2012-04-04 20:58:40.000000000 -0500 @@ -19,7 +19,17 @@ #include #include @@ -1635,9 +1621,9 @@ diff -aurp open-iscsi-2.0-872-rc4-bnx2i/usr/transport.c open-iscsi-2.0-872-rc4-b int set_transport_template(struct iscsi_transport *t) { struct iscsi_transport_template *tmpl; -diff -aurp open-iscsi-2.0-872-rc4-bnx2i/usr/transport.h open-iscsi-2.0-872-rc4-bnx2i.work/usr/transport.h ---- open-iscsi-2.0-872-rc4-bnx2i/usr/transport.h 2012-03-28 17:50:46.000000000 -0500 -+++ open-iscsi-2.0-872-rc4-bnx2i.work/usr/transport.h 2012-03-28 17:51:03.000000000 -0500 +diff -Naurp open-iscsi-2.0-872-rc4-bnx2i/usr/transport.h open-iscsi-2.0-872-rc4-bnx2i.work/usr/transport.h +--- open-iscsi-2.0-872-rc4-bnx2i/usr/transport.h 2012-04-04 20:58:29.000000000 -0500 ++++ open-iscsi-2.0-872-rc4-bnx2i.work/usr/transport.h 2012-04-04 20:58:40.000000000 -0500 @@ -51,5 +51,7 @@ struct iscsi_transport { }; @@ -1646,9 +1632,9 @@ diff -aurp open-iscsi-2.0-872-rc4-bnx2i/usr/transport.h open-iscsi-2.0-872-rc4-b +extern int transport_probe_for_offload(void); #endif -diff -aurp open-iscsi-2.0-872-rc4-bnx2i/utils/fwparam_ibft/fw_entry.c open-iscsi-2.0-872-rc4-bnx2i.work/utils/fwparam_ibft/fw_entry.c ---- open-iscsi-2.0-872-rc4-bnx2i/utils/fwparam_ibft/fw_entry.c 2012-03-28 17:50:46.000000000 -0500 -+++ open-iscsi-2.0-872-rc4-bnx2i.work/utils/fwparam_ibft/fw_entry.c 2012-03-28 17:51:03.000000000 -0500 +diff -Naurp open-iscsi-2.0-872-rc4-bnx2i/utils/fwparam_ibft/fw_entry.c open-iscsi-2.0-872-rc4-bnx2i.work/utils/fwparam_ibft/fw_entry.c +--- open-iscsi-2.0-872-rc4-bnx2i/utils/fwparam_ibft/fw_entry.c 2012-04-04 20:58:29.000000000 -0500 ++++ open-iscsi-2.0-872-rc4-bnx2i.work/utils/fwparam_ibft/fw_entry.c 2012-04-04 20:58:40.000000000 -0500 @@ -35,6 +35,8 @@ #include "idbm_fields.h" #include "iscsi_net_util.h" diff --git a/iscsi-initiator-utils.spec b/iscsi-initiator-utils.spec index ab4276f..afe35ee 100644 --- a/iscsi-initiator-utils.spec +++ b/iscsi-initiator-utils.spec @@ -3,7 +3,7 @@ Summary: iSCSI daemon and utility programs Name: iscsi-initiator-utils Version: 6.2.0.872 -Release: 39%{?dist} +Release: 40%{?dist} Source0: http://people.redhat.com/mchristi/iscsi/rhel6.0/source/open-iscsi-2.0-872-rc4-bnx2i.tar.gz Source1: iscsid.init Source2: iscsidevs.init @@ -37,7 +37,7 @@ Patch11: iscsi-initiator-utils-libiscsi-to-support-offload.patch # sync to upstream commit f9f627fbf0fc96545931ae65aa2b6214841bfd4e to # add iscsiadm ping and host chap support and fix default iface handling Patch12: iscsi-initiator-utils-ping-and-chap.patch -# sync to upstream 0d63a8c4471213e6db4c155c1bb009cf74a38032 +# sync to upstream d43143e673eec118e6645a2f46a9f202f341afd7 Patch13: iscsi-initiator-utils-mod-iface-andport-fixes.patch # add rhel version info to iscsi tools Patch14: iscsi-initiator-utils-add-rh-ver.patch @@ -208,6 +208,10 @@ fi %{_includedir}/libiscsi.h %changelog +* Wed Apr 4 2012 Mike Christie 6.2.0.872.40 +- 738192 Fix regression added when handling 738192 where unknown params + messages got logged by mistake. + * Wed Mar 28 2012 Mike Christie 6.2.0.872.39 - 738192 Fix invalid param handling. - 790609 Fix --interval iscsiadm handling.