diff --git a/iscsi-initiator-utils-add-rh-ver.patch b/iscsi-initiator-utils-add-rh-ver.patch index eb04ce7..b94d5fd 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.37.el6" ++#define ISCSI_VERSION_STR "2.0-872.38.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 99294fc..792fddc 100644 --- a/iscsi-initiator-utils-mod-iface-andport-fixes.patch +++ b/iscsi-initiator-utils-mod-iface-andport-fixes.patch @@ -1,6 +1,6 @@ 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-03-22 03:20:09.000000000 -0500 -+++ open-iscsi-2.0-872-rc4-bnx2i.work/include/iscsi_if.h 2012-03-22 03:20:29.000000000 -0500 +--- open-iscsi-2.0-872-rc4-bnx2i/include/iscsi_if.h 2012-03-22 23:20:15.000000000 -0500 ++++ open-iscsi-2.0-872-rc4-bnx2i.work/include/iscsi_if.h 2012-03-22 23:19:51.000000000 -0500 @@ -270,7 +270,8 @@ struct iscsi_uevent { } host_event; struct msg_ping_comp { @@ -33,8 +33,8 @@ diff -Naurp open-iscsi-2.0-872-rc4-bnx2i/include/iscsi_if.h open-iscsi-2.0-872-r #define iscsi_handle(_ptr) ((uint64_t)(unsigned long)_ptr) 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-03-22 03:20:09.000000000 -0500 -+++ open-iscsi-2.0-872-rc4-bnx2i.work/include/iscsi_net_util.h 2012-03-22 03:29:53.000000000 -0500 +--- open-iscsi-2.0-872-rc4-bnx2i/include/iscsi_net_util.h 2012-03-22 23:20:15.000000000 -0500 ++++ open-iscsi-2.0-872-rc4-bnx2i.work/include/iscsi_net_util.h 2012-03-22 23:19:51.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, @@ -43,8 +43,8 @@ diff -Naurp open-iscsi-2.0-872-rc4-bnx2i/include/iscsi_net_util.h open-iscsi-2.0 #endif 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-03-22 03:20:09.000000000 -0500 -+++ open-iscsi-2.0-872-rc4-bnx2i.work/iscsiuio/include/config.h 2012-03-22 04:03:27.000000000 -0500 +--- open-iscsi-2.0-872-rc4-bnx2i/iscsiuio/include/config.h 2012-03-22 23:20:15.000000000 -0500 ++++ open-iscsi-2.0-872-rc4-bnx2i.work/iscsiuio/include/config.h 2012-03-22 23:19:51.000000000 -0500 @@ -59,6 +59,9 @@ typedef struct iface_rec { * 1 = enable */ uint16_t mtu; @@ -56,8 +56,8 @@ diff -Naurp open-iscsi-2.0-872-rc4-bnx2i/iscsiuio/include/config.h open-iscsi-2. * TODO: we may have to make this bigger and interconnect * specific for infinniband 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-03-22 03:20:09.000000000 -0500 -+++ open-iscsi-2.0-872-rc4-bnx2i.work/libiscsi/libiscsi.c 2012-03-22 03:49:55.000000000 -0500 +--- open-iscsi-2.0-872-rc4-bnx2i/libiscsi/libiscsi.c 2012-03-22 23:20:15.000000000 -0500 ++++ open-iscsi-2.0-872-rc4-bnx2i.work/libiscsi/libiscsi.c 2012-03-22 23:19:51.000000000 -0500 @@ -626,12 +626,15 @@ int libiscsi_node_set_parameter(struct l const char *parameter, const char *value) { @@ -80,8 +80,8 @@ diff -Naurp open-iscsi-2.0-872-rc4-bnx2i/libiscsi/libiscsi.c open-iscsi-2.0-872- (char *)node->address, node->port)) if (nr_found == 0) { 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-03-22 03:20:09.000000000 -0500 -+++ open-iscsi-2.0-872-rc4-bnx2i.work/usr/config.h 2012-03-22 03:26:57.000000000 -0500 +--- open-iscsi-2.0-872-rc4-bnx2i/usr/config.h 2012-03-22 23:20:15.000000000 -0500 ++++ open-iscsi-2.0-872-rc4-bnx2i.work/usr/config.h 2012-03-22 23:19:51.000000000 -0500 @@ -229,6 +229,8 @@ typedef struct iface_rec { * 1 = enable */ uint16_t mtu; @@ -92,8 +92,8 @@ diff -Naurp open-iscsi-2.0-872-rc4-bnx2i/usr/config.h open-iscsi-2.0-872-rc4-bnx * TODO: we may have to make this bigger and interconnect * specific for infinniband 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-03-22 03:20:09.000000000 -0500 -+++ open-iscsi-2.0-872-rc4-bnx2i.work/usr/host.c 2012-03-22 03:29:48.000000000 -0500 +--- open-iscsi-2.0-872-rc4-bnx2i/usr/host.c 2012-03-22 23:20:15.000000000 -0500 ++++ open-iscsi-2.0-872-rc4-bnx2i.work/usr/host.c 2012-03-22 23:19:51.000000000 -0500 @@ -174,6 +174,16 @@ static int print_host_iface(void *data, iface->ipv6_router); } @@ -120,8 +120,8 @@ diff -Naurp open-iscsi-2.0-872-rc4-bnx2i/usr/host.c open-iscsi-2.0-872-rc4-bnx2i host_info_print_tree); break; 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-03-22 03:20:09.000000000 -0500 -+++ open-iscsi-2.0-872-rc4-bnx2i.work/usr/idbm.c 2012-03-22 03:27:12.000000000 -0500 +--- open-iscsi-2.0-872-rc4-bnx2i/usr/idbm.c 2012-03-22 23:20:15.000000000 -0500 ++++ open-iscsi-2.0-872-rc4-bnx2i.work/usr/idbm.c 2012-03-22 23:19:51.000000000 -0500 @@ -2358,70 +2358,83 @@ idbm_slp_defaults(struct iscsi_slp_confi sizeof(struct iscsi_slp_config)); } @@ -268,8 +268,8 @@ diff -Naurp 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 -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-03-22 03:20:09.000000000 -0500 -+++ open-iscsi-2.0-872-rc4-bnx2i.work/usr/idbm.h 2012-03-22 03:48:10.000000000 -0500 +--- open-iscsi-2.0-872-rc4-bnx2i/usr/idbm.h 2012-03-22 23:20:15.000000000 -0500 ++++ open-iscsi-2.0-872-rc4-bnx2i.work/usr/idbm.h 2012-03-22 23:19:51.000000000 -0500 @@ -26,6 +26,7 @@ #include #include "initiator.h" @@ -303,8 +303,8 @@ diff -Naurp open-iscsi-2.0-872-rc4-bnx2i/usr/idbm.h open-iscsi-2.0-872-rc4-bnx2i extern struct node_rec *idbm_find_rec_in_list(struct list_head *rec_list, char *targetname, char *addr, 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-03-22 03:20:09.000000000 -0500 -+++ open-iscsi-2.0-872-rc4-bnx2i.work/usr/iface.c 2012-03-22 03:28:52.000000000 -0500 +--- open-iscsi-2.0-872-rc4-bnx2i/usr/iface.c 2012-03-22 23:20:15.000000000 -0500 ++++ open-iscsi-2.0-872-rc4-bnx2i.work/usr/iface.c 2012-03-22 23:19:51.000000000 -0500 @@ -169,7 +169,7 @@ free_conf: int iface_conf_read(struct iface_rec *iface) { @@ -442,8 +442,8 @@ diff -Naurp open-iscsi-2.0-872-rc4-bnx2i/usr/iface.c open-iscsi-2.0-872-rc4-bnx2 log_error("Could not get transport for host%u. " "Make sure the iSCSI driver is loaded.", 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-03-22 03:20:09.000000000 -0500 -+++ open-iscsi-2.0-872-rc4-bnx2i.work/usr/iface.h 2012-03-22 03:25:44.000000000 -0500 +--- open-iscsi-2.0-872-rc4-bnx2i/usr/iface.h 2012-03-22 23:20:15.000000000 -0500 ++++ open-iscsi-2.0-872-rc4-bnx2i.work/usr/iface.h 2012-03-22 23:19:51.000000000 -0500 @@ -26,7 +26,6 @@ struct iface_rec; @@ -462,8 +462,8 @@ diff -Naurp open-iscsi-2.0-872-rc4-bnx2i/usr/iface.h open-iscsi-2.0-872-rc4-bnx2 extern int iface_conf_write(struct iface_rec *iface); extern int iface_conf_delete(struct iface_rec *iface); 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-03-22 03:20:09.000000000 -0500 -+++ open-iscsi-2.0-872-rc4-bnx2i.work/usr/initiator_common.c 2012-03-22 03:30:25.000000000 -0500 +--- open-iscsi-2.0-872-rc4-bnx2i/usr/initiator_common.c 2012-03-22 23:20:15.000000000 -0500 ++++ open-iscsi-2.0-872-rc4-bnx2i.work/usr/initiator_common.c 2012-03-22 23:19:51.000000000 -0500 @@ -35,6 +35,7 @@ #include "host.h" #include "sysdeps.h" @@ -504,8 +504,8 @@ diff -Naurp open-iscsi-2.0-872-rc4-bnx2i/usr/initiator_common.c open-iscsi-2.0-8 if (rc != 0) return rc; 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-03-22 03:20:09.000000000 -0500 -+++ open-iscsi-2.0-872-rc4-bnx2i.work/usr/iscsiadm.c 2012-03-22 03:29:48.000000000 -0500 +--- open-iscsi-2.0-872-rc4-bnx2i/usr/iscsiadm.c 2012-03-22 23:20:15.000000000 -0500 ++++ open-iscsi-2.0-872-rc4-bnx2i.work/usr/iscsiadm.c 2012-03-22 23:19:51.000000000 -0500 @@ -1116,6 +1116,17 @@ do_sendtargets(discovery_rec_t *drec, st free(iface); continue; @@ -968,8 +968,8 @@ diff -Naurp open-iscsi-2.0-872-rc4-bnx2i/usr/iscsiadm.c open-iscsi-2.0-872-rc4-b } 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-03-22 03:20:09.000000000 -0500 -+++ open-iscsi-2.0-872-rc4-bnx2i.work/usr/iscsid.c 2012-03-22 03:25:35.000000000 -0500 +--- open-iscsi-2.0-872-rc4-bnx2i/usr/iscsid.c 2012-03-22 23:20:15.000000000 -0500 ++++ open-iscsi-2.0-872-rc4-bnx2i.work/usr/iscsid.c 2012-03-22 23:19:51.000000000 -0500 @@ -409,11 +409,6 @@ int main(int argc, char *argv[]) exit(ISCSI_ERR); } @@ -983,8 +983,8 @@ diff -Naurp open-iscsi-2.0-872-rc4-bnx2i/usr/iscsid.c open-iscsi-2.0-872-rc4-bnx mgmt_ipc_fd = -1; 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-03-22 03:20:09.000000000 -0500 -+++ open-iscsi-2.0-872-rc4-bnx2i.work/usr/iscsi_ipc.h 2012-03-22 03:20:29.000000000 -0500 +--- open-iscsi-2.0-872-rc4-bnx2i/usr/iscsi_ipc.h 2012-03-22 23:20:15.000000000 -0500 ++++ open-iscsi-2.0-872-rc4-bnx2i.work/usr/iscsi_ipc.h 2012-03-22 23:19:51.000000000 -0500 @@ -137,7 +137,7 @@ struct iscsi_ipc { int (*exec_ping) (uint64_t transport_handle, uint32_t host_no, @@ -995,8 +995,8 @@ diff -Naurp open-iscsi-2.0-872-rc4-bnx2i/usr/iscsi_ipc.h open-iscsi-2.0-872-rc4- int (*get_chap) (uint64_t transport_handle, uint32_t host_no, uint16_t chap_tbl_idx, uint32_t num_entries, 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-03-22 03:20:09.000000000 -0500 -+++ open-iscsi-2.0-872-rc4-bnx2i.work/usr/iscsi_net_util.c 2012-03-22 03:29:53.000000000 -0500 +--- open-iscsi-2.0-872-rc4-bnx2i/usr/iscsi_net_util.c 2012-03-22 23:20:15.000000000 -0500 ++++ open-iscsi-2.0-872-rc4-bnx2i.work/usr/iscsi_net_util.c 2012-03-22 23:19:59.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); @@ -1036,7 +1036,7 @@ diff -Naurp open-iscsi-2.0-872-rc4-bnx2i/usr/iscsi_net_util.c open-iscsi-2.0-872 + + memset(&ifr, 0, sizeof(ifr)); + strncpy(ifr.ifr_name, netdev, IFNAMSIZ); -+ if (ioctl(sock, SIOCSIFFLAGS, &ifr) < 0) { ++ if (ioctl(sock, SIOCGIFFLAGS, &ifr) < 0) { + log_error("Could not bring up netdev %s (err %d - %s)", + netdev, errno, strerror(errno)); + ret = errno; @@ -1067,8 +1067,8 @@ diff -Naurp open-iscsi-2.0-872-rc4-bnx2i/usr/iscsi_net_util.c open-iscsi-2.0-872 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-03-22 03:20:09.000000000 -0500 -+++ open-iscsi-2.0-872-rc4-bnx2i.work/usr/iscsistart.c 2012-03-22 03:29:42.000000000 -0500 +--- open-iscsi-2.0-872-rc4-bnx2i/usr/iscsistart.c 2012-03-22 23:20:15.000000000 -0500 ++++ open-iscsi-2.0-872-rc4-bnx2i.work/usr/iscsistart.c 2012-03-22 23:19:51.000000000 -0500 @@ -40,6 +40,7 @@ #include "log.h" #include "iscsi_util.h" @@ -1197,8 +1197,8 @@ diff -Naurp open-iscsi-2.0-872-rc4-bnx2i/usr/iscsistart.c open-iscsi-2.0-872-rc4 exit(err); break; 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-03-22 03:20:09.000000000 -0500 -+++ open-iscsi-2.0-872-rc4-bnx2i.work/usr/iscsi_sysfs.c 2012-03-22 03:27:02.000000000 -0500 +--- open-iscsi-2.0-872-rc4-bnx2i/usr/iscsi_sysfs.c 2012-03-22 23:20:15.000000000 -0500 ++++ open-iscsi-2.0-872-rc4-bnx2i.work/usr/iscsi_sysfs.c 2012-03-22 23:19:51.000000000 -0500 @@ -532,6 +532,12 @@ static int iscsi_sysfs_read_iface(struct ret = 0; } @@ -1302,8 +1302,8 @@ diff -Naurp open-iscsi-2.0-872-rc4-bnx2i/usr/iscsi_sysfs.c open-iscsi-2.0-872-rc - return -1; -} 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-03-22 03:20:09.000000000 -0500 -+++ open-iscsi-2.0-872-rc4-bnx2i.work/usr/iscsi_sysfs.h 2012-03-22 03:27:02.000000000 -0500 +--- open-iscsi-2.0-872-rc4-bnx2i/usr/iscsi_sysfs.h 2012-03-22 23:20:15.000000000 -0500 ++++ open-iscsi-2.0-872-rc4-bnx2i.work/usr/iscsi_sysfs.h 2012-03-22 23:19:51.000000000 -0500 @@ -36,7 +36,6 @@ struct iscsi_auth_config; extern void free_transports(void); @@ -1321,9 +1321,9 @@ diff -Naurp open-iscsi-2.0-872-rc4-bnx2i/usr/iscsi_sysfs.h open-iscsi-2.0-872-rc extern int iscsi_sysfs_session_user_created(int sid); 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-03-22 03:20:09.000000000 -0500 -+++ open-iscsi-2.0-872-rc4-bnx2i.work/usr/iscsi_util.c 2012-03-22 03:25:40.000000000 -0500 -@@ -90,13 +90,16 @@ str_to_ipport(char *str, int *port, int +--- open-iscsi-2.0-872-rc4-bnx2i/usr/iscsi_util.c 2012-03-22 23:20:15.000000000 -0500 ++++ open-iscsi-2.0-872-rc4-bnx2i.work/usr/iscsi_util.c 2012-03-22 23:20:02.000000000 -0500 +@@ -90,13 +90,24 @@ str_to_ipport(char *str, int *port, int if (!strchr(ip, '.')) { if (*ip == '[') { @@ -1334,14 +1334,23 @@ diff -Naurp open-iscsi-2.0-872-rc4-bnx2i/usr/iscsi_util.c open-iscsi-2.0-872-rc4 ip++; str = sport; - } else -+ } else if (!strchr(ip, ':')) -+ /* IPv6 no brackets and no port */ - sport = NULL; -+ /* else hostname with domain info */ +- sport = NULL; ++ } else { ++ /* hostname or ipv6 */ ++ sport = strchr(ip, ':'); ++ if (sport) { ++ if (strchr(sport + 1, ':')) ++ /* ipv6 */ ++ sport = NULL; ++ else ++ /* hostname:port */ ++ str = sport; ++ } ++ } } if (sport && (sport = strchr(str, ':'))) { -@@ -178,7 +181,6 @@ char *strstrip(char *s) +@@ -178,7 +189,6 @@ char *strstrip(char *s) char *cfg_get_string_param(char *pathname, const char *key) { FILE *f = NULL; @@ -1349,7 +1358,7 @@ diff -Naurp open-iscsi-2.0-872-rc4-bnx2i/usr/iscsi_util.c open-iscsi-2.0-872-rc4 char *line, buffer[1024]; char *value = NULL, *param, *comment; -@@ -187,7 +189,6 @@ char *cfg_get_string_param(char *pathnam +@@ -187,7 +197,6 @@ char *cfg_get_string_param(char *pathnam return NULL; } @@ -1358,8 +1367,8 @@ diff -Naurp open-iscsi-2.0-872-rc4-bnx2i/usr/iscsi_util.c open-iscsi-2.0-872-rc4 while ((line = fgets(buffer, sizeof (buffer), f))) { param = strstr(line, key); 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-03-22 03:20:09.000000000 -0500 -+++ open-iscsi-2.0-872-rc4-bnx2i.work/usr/Makefile 2012-03-22 03:25:15.000000000 -0500 +--- open-iscsi-2.0-872-rc4-bnx2i/usr/Makefile 2012-03-22 23:20:15.000000000 -0500 ++++ open-iscsi-2.0-872-rc4-bnx2i.work/usr/Makefile 2012-03-22 23:19:51.000000000 -0500 @@ -33,7 +33,7 @@ endif OPTFLAGS ?= -O2 -g WARNFLAGS ?= -Wall -Wstrict-prototypes @@ -1379,8 +1388,8 @@ diff -Naurp open-iscsi-2.0-872-rc4-bnx2i/usr/Makefile open-iscsi-2.0-872-rc4-bnx iscsiadm: $(ISCSI_LIB_SRCS) $(DISCOVERY_SRCS) iscsiadm.o session_mgmt.o $(CC) $(CFLAGS) $^ -o $@ -L../utils/open-isns -lisns 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-03-22 03:20:09.000000000 -0500 -+++ open-iscsi-2.0-872-rc4-bnx2i.work/usr/netlink.c 2012-03-22 03:20:29.000000000 -0500 +--- open-iscsi-2.0-872-rc4-bnx2i/usr/netlink.c 2012-03-22 23:20:15.000000000 -0500 ++++ open-iscsi-2.0-872-rc4-bnx2i.work/usr/netlink.c 2012-03-22 23:19:51.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, @@ -1412,8 +1421,8 @@ diff -Naurp open-iscsi-2.0-872-rc4-bnx2i/usr/netlink.c open-iscsi-2.0-872-rc4-bn } 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-03-22 03:20:09.000000000 -0500 -+++ open-iscsi-2.0-872-rc4-bnx2i.work/usr/transport.c 2012-03-22 03:27:02.000000000 -0500 +--- open-iscsi-2.0-872-rc4-bnx2i/usr/transport.c 2012-03-22 23:20:15.000000000 -0500 ++++ open-iscsi-2.0-872-rc4-bnx2i.work/usr/transport.c 2012-03-22 23:19:51.000000000 -0500 @@ -19,7 +19,17 @@ #include #include @@ -1585,8 +1594,8 @@ diff -Naurp open-iscsi-2.0-872-rc4-bnx2i/usr/transport.c open-iscsi-2.0-872-rc4- { struct iscsi_transport_template *tmpl; 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-03-22 03:20:09.000000000 -0500 -+++ open-iscsi-2.0-872-rc4-bnx2i.work/usr/transport.h 2012-03-22 03:21:42.000000000 -0500 +--- open-iscsi-2.0-872-rc4-bnx2i/usr/transport.h 2012-03-22 23:20:15.000000000 -0500 ++++ open-iscsi-2.0-872-rc4-bnx2i.work/usr/transport.h 2012-03-22 23:19:51.000000000 -0500 @@ -51,5 +51,7 @@ struct iscsi_transport { }; @@ -1596,8 +1605,8 @@ diff -Naurp open-iscsi-2.0-872-rc4-bnx2i/usr/transport.h open-iscsi-2.0-872-rc4- #endif 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-03-22 03:20:09.000000000 -0500 -+++ open-iscsi-2.0-872-rc4-bnx2i.work/utils/fwparam_ibft/fw_entry.c 2012-03-22 03:27:49.000000000 -0500 +--- open-iscsi-2.0-872-rc4-bnx2i/utils/fwparam_ibft/fw_entry.c 2012-03-22 23:20:15.000000000 -0500 ++++ open-iscsi-2.0-872-rc4-bnx2i.work/utils/fwparam_ibft/fw_entry.c 2012-03-22 23:19:51.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 844a080..ce090cf 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: 37%{?dist} +Release: 38%{?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 @@ -208,6 +208,9 @@ fi %{_includedir}/libiscsi.h %changelog +* Thu Mar 22 2012 Mike Christie 6.2.0.872.38 +- Fix regressions caused by 796574 and 805467. + * Thu Mar 22 2012 Mike Christie 6.2.0.872.37 - 805467 Have iscsistart/iscsiadm bring up offload net interface. - 796574 Fix port handling when hostnames are used for portals.