Hello community, here is the log from the commit of package lio-utils for openSUSE:Factory checked in at 2016-06-07 23:47:41 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/lio-utils (Old) and /work/SRC/openSUSE:Factory/.lio-utils.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "lio-utils" Changes: -------- --- /work/SRC/openSUSE:Factory/lio-utils/lio-utils.changes 2016-05-19 12:15:17.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.lio-utils.new/lio-utils.changes 2016-06-07 23:47:42.000000000 +0200 @@ -1,0 +2,8 @@ +Wed Jun 1 17:51:44 UTC 2016 - [email protected] + +- Fix build issue: Do not use net-snmp U64 type, since + net-snmp removed it because of conflicts with other + packages, adding patch: + * lio-utils-dont-use-U64-from-net-snmp.patch + +------------------------------------------------------------------- New: ---- lio-utils-dont-use-U64-from-net-snmp.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ lio-utils.spec ++++++ --- /var/tmp/diff_new_pack.y1U3fU/_old 2016-06-07 23:47:43.000000000 +0200 +++ /var/tmp/diff_new_pack.y1U3fU/_new 2016-06-07 23:47:43.000000000 +0200 @@ -87,6 +87,7 @@ Patch34: lio-utils-allow-clearing-discovery-auth.patch Patch35: lio-utils-fix-systemd-service-start.patch Patch36: lio-utils-update-HOWTO-for-systemd.patch +Patch37: lio-utils-dont-use-U64-from-net-snmp.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -192,6 +193,7 @@ %patch34 -p1 %patch35 -p1 %patch36 -p1 +%patch37 -p1 %build make %{?_smp_mflags} OPTFLAGS="$RPM_OPT_FLAGS" ++++++ lio-utils-dont-use-U64-from-net-snmp.patch ++++++ diff -aurp lio-utils-4.1.orig/mib-modules/iscsiMib.h lio-utils-4.1/mib-modules/iscsiMib.h --- lio-utils-4.1.orig/mib-modules/iscsiMib.h 2011-05-06 14:16:58.000000000 -0700 +++ lio-utils-4.1/mib-modules/iscsiMib.h 2016-06-01 10:49:33.721745152 -0700 @@ -442,8 +442,8 @@ struct iscsiSessionStats_entry { u_long iscsiSsnIndex; u_long iscsiSsnCmdPDUs; u_long iscsiSsnRspPDUs; - U64 iscsiSsnTxDataOctets; - U64 iscsiSsnRxDataOctets; + struct counter64 iscsiSsnTxDataOctets; + struct counter64 iscsiSsnRxDataOctets; u_long iscsiSsnLCTxDataOctets; u_long iscsiSsnLCRxDataOctets; struct iscsiSessionStats_entry *next; diff -aurp lio-utils-4.1.orig/mib-modules/scsiMib.h lio-utils-4.1/mib-modules/scsiMib.h --- lio-utils-4.1.orig/mib-modules/scsiMib.h 2011-05-06 14:16:58.000000000 -0700 +++ lio-utils-4.1/mib-modules/scsiMib.h 2016-06-01 10:49:09.965092277 -0700 @@ -216,7 +216,7 @@ struct scsiTgtPortTable_entry { u_long scsiTgtPortInCommands; u_long scsiTgtPortWrittenMegaBytes; u_long scsiTgtPortReadMegaBytes; - U64 scsiTgtPortHSInCommands; + struct counter64 scsiTgtPortHSInCommands; struct scsiTgtPortTable_entry *next; }; @@ -257,7 +257,7 @@ struct scsiAuthorizedIntrTable_entry { u_long scsiAuthIntrOutCommands; u_long scsiAuthIntrReadMegaBytes; u_long scsiAuthIntrWrittenMegaBytes; - U64 scsiAuthIntrHSOutCommands; + struct counter64 scsiAuthIntrHSOutCommands; u_long scsiAuthIntrLastCreation; long scsiAuthIntrRowStatus; struct scsiAuthorizedIntrTable_entry *next; @@ -337,7 +337,7 @@ struct scsiLuTable_entry { u_long scsiLuWrittenMegaBytes; u_long scsiLuInResets; u_long scsiLuOutTaskSetFullStatus; - U64 scsiLuHSInCommands; + struct counter64 scsiLuHSInCommands; u_long scsiLuLastCreation; struct scsiLuTable_entry *next; };
