Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package open-iscsi for openSUSE:Factory checked in at 2026-03-14 22:21:05 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/open-iscsi (Old) and /work/SRC/openSUSE:Factory/.open-iscsi.new.8177 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "open-iscsi" Sat Mar 14 22:21:05 2026 rev:139 rq:1338787 version:unknown Changes: -------- --- /work/SRC/openSUSE:Factory/open-iscsi/open-iscsi.changes 2026-02-27 17:08:30.508629310 +0100 +++ /work/SRC/openSUSE:Factory/.open-iscsi.new.8177/open-iscsi.changes 2026-03-14 22:21:34.859107726 +0100 @@ -1,0 +2,8 @@ +Wed Mar 11 21:11:54 UTC 2026 - Lee Duncan <[email protected]> + +- Update to version 2.1.11.suse+88.8e0635b3: + * Make iface.example a doc file. (#526) + * Updated SPEC file to deliver iface.example as a %doc + file, no longer in the database directory. + +------------------------------------------------------------------- Old: ---- open-iscsi-2.1.11.suse+85.4ef97a15.tar.xz New: ---- open-iscsi-2.1.11.suse+88.8e0635b3.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ open-iscsi.spec ++++++ --- /var/tmp/diff_new_pack.VwiPMH/_old 2026-03-14 22:21:35.559136704 +0100 +++ /var/tmp/diff_new_pack.VwiPMH/_new 2026-03-14 22:21:35.563136869 +0100 @@ -47,7 +47,7 @@ %define iscsi_minor_release 1 %define iscsi_patch_release 11 %define iscsi_patch_release_suse %{iscsi_patch_release}.suse -%define iscsi_service_tag 85.4ef97a15 +%define iscsi_service_tag 88.8e0635b3 %define libname libopeniscsiusr0 %define libversion 0.2.0 Name: open-iscsi @@ -231,9 +231,7 @@ %if 0%{?_dbroot_new} %config %{_home_dir}/README.DB-files-moved %endif -%dir %{_dbroot} -%dir %{_dbroot}/ifaces -%{_dbroot}/ifaces/iface.example +%doc etc/iface.example %attr(0644,root,root) %{_unitdir}/iscsid.service %attr(0644,root,root) %{_unitdir}/iscsid.socket %attr(0644,root,root) %{_unitdir}/iscsi-init.service ++++++ _scmsync.obsinfo ++++++ --- /var/tmp/diff_new_pack.VwiPMH/_old 2026-03-14 22:21:35.607138691 +0100 +++ /var/tmp/diff_new_pack.VwiPMH/_new 2026-03-14 22:21:35.611138857 +0100 @@ -1,5 +1,5 @@ -mtime: 1772130993 -commit: 2699e7596aa44fccc9bc0e1944935a4c0cf17669028037e7fa2230cbd4d5bf95 +mtime: 1773264633 +commit: 4626ab3954af029012c2288330e15386878b739b6846ee41b79ccd45c1ea4f97 url: https://src.opensuse.org/lee_duncan/open-iscsi revision: factory ++++++ _servicedata ++++++ --- /var/tmp/diff_new_pack.VwiPMH/_old 2026-03-14 22:21:35.647140347 +0100 +++ /var/tmp/diff_new_pack.VwiPMH/_new 2026-03-14 22:21:35.651140512 +0100 @@ -1,6 +1,6 @@ <servicedata> <service name="tar_scm"> <param name="url">https://github.com/openSUSE/open-iscsi.git</param> - <param name="changesrevision">4ef97a15926e586e30984e23182c5875c4ec1618</param></service></servicedata> + <param name="changesrevision">8e0635b3bc07f057c4f258ded53a75bea9050a56</param></service></servicedata> (No newline at EOF) ++++++ build.specials.obscpio ++++++ ++++++ build.specials.obscpio ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/.gitignore new/.gitignore --- old/.gitignore 1970-01-01 01:00:00.000000000 +0100 +++ new/.gitignore 2026-03-13 18:22:28.000000000 +0100 @@ -0,0 +1 @@ +.osc ++++++ open-iscsi-2.1.11.suse+85.4ef97a15.tar.xz -> open-iscsi-2.1.11.suse+88.8e0635b3.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/open-iscsi-2.1.11.suse+85.4ef97a15/README new/open-iscsi-2.1.11.suse+88.8e0635b3/README --- old/open-iscsi-2.1.11.suse+85.4ef97a15/README 2026-02-26 19:31:17.000000000 +0100 +++ new/open-iscsi-2.1.11.suse+88.8e0635b3/README 2026-03-11 21:24:20.000000000 +0100 @@ -138,6 +138,11 @@ This will install the iSCSI tools, configuration files, interfaces, and documentation. If you do not set DESTDIR, it defaults to "/". +Note that if you install open-iscsi using meson/ninja, you will also +need to manually create/set up an initiatorname.iscsi file in ${HOMEDIR} +(see below for location). There are several tools supplied for +manually creating an initiator name. + MESON-OPTIONS: -------------- @@ -154,7 +159,7 @@ (set to "true" to disable systemd) -Dsystemddir=<DIR> Set systemd unit directory [/usr/lib/systemd] -Dhomedir=<DIR> Set config file directory [/etc/iscsi] --Ddbroot=<DIR> Set Database directory [/etciscsi] +-Ddbroot=<DIR> Set Database directory [/var/lib/iscsi] -Dlockdir=<DIR> Set Lock directory [/run/lock/iscsi] -Drulesdir=<DIR> Set udev rules directory [/usr/lib/udev/rules.d] -Discsi_sbindir=<DIR> Where binaries go [/usr/sbin] @@ -173,9 +178,9 @@ make [DESTDIR=<SOME-DIR>] install Where MAKE-OPTIONS are from: - * SBINDIR=<some-dir> [/usr/bin] for executables - * DBROOT=<some-dir> [/etc/iscsi] for iscsi database files - * HOMEDIR=<some-dir> [/etc/iscsi] for iscsi config files + * SBINDIR=<some-dir> [/usr/bin] for executables + * DBROOT=<some-dir> [/var/lib/iscsi] for iscsi database files + * HOMEDIR=<some-dir> [/etc/iscsi] for iscsi config files 4. Open-iSCSI daemon @@ -194,8 +199,8 @@ Usage: iscsid [OPTION] - -c, --config=[path] Execute in the config file (/etc/iscsi/iscsid.conf). - -i, --initiatorname=[path] read initiatorname from file (/etc/iscsi/initiatorname.iscsi). + -c, --config=[path] Execute in the config file (${HOMEDIR}/iscsid.conf). + -i, --initiatorname=[path] read initiatorname from file (${HOMEDIR}/initiatorname.iscsi). -f, --foreground run iscsid in the foreground -d, --debug debuglevel print debugging information -u, --uid=uid run as uid, default is current user @@ -211,11 +216,12 @@ Open-iSCSI persistent configuration is stored in a number of directories under a configuration root directory, using a flat-file -format. This configuration root directory is /etc/iscsi by default, -but may also commonly be in /var/lib/iscsi (see "dbroot" in the meson -options discussed earlier). +format. This configuration (database) root directory is +/var/lib/iscsi by default, but may also commonly be in /etc/iscsi +(see "DBROOT" in the meson options discussed earlier). -Configuration is contained in directories for: +Configuration is contained in directories for (some of which may +not be present, if they haven't been needed yet): - nodes - isns @@ -621,7 +627,7 @@ To manage both types of initiator stacks, iscsiadm uses the interface (iface) structure. For each HBA port or for software iSCSI for each network device (ethX) or NIC, that you wish to bind sessions to you must create -a iface config /etc/iscsi/ifaces. +a iface config ${DBROOT}/ifaces. Prep ---- @@ -655,7 +661,7 @@ iscsiadm -m iface -will report iface configurations that are setup in /etc/iscsi/ifaces: +will report iface configurations that are setup in ${DBROOT}/ifaces: iface0 qla4xxx,00:c0:dd:08:63:e8,20.15.0.7,default,iqn.2005-06.com.redhat:madmax iface1 qla4xxx,00:c0:dd:08:63:ea,20.15.0.9,default,iqn.2005-06.com.redhat:madmax @@ -666,10 +672,12 @@ For software iSCSI, you can create the iface configs by hand, but it is recommended that you use iscsiadm's iface mode. There is an iface.example in -/etc/iscsi/ifaces which can be used as a template for the daring. +the documentation supplied with this package, along with this README file, +which can be used as a template for the daring. (Note: this used to be +supplied in ${DBROOT}/ifaces/, but has been removed from there.) For each network object you wish to bind a session to, you must create -a separate iface config in /etc/iscsi/ifaces and each iface config file +a separate iface config in ${DBROOT}/ifaces and each iface config file must have a unique name which is less than or equal to 64 characters. Example @@ -677,12 +685,12 @@ If you have NIC1 with MAC address 00:0F:1F:92:6B:BF and NIC2 with MAC address 00:C0:DD:08:63:E7, and you wanted to do software iSCSI over -TCP/IP, then in /etc/iscsi/ifaces/iface0 you would enter: +TCP/IP, then in ${DBROOT}/ifaces/iface0 you would enter: iface.transport_name = tcp iface.hwaddress = 00:0F:1F:92:6B:BF -and in /etc/iscsi/ifaces/iface1 you would enter: +and in ${DBROOT}/ifaces/iface1 you would enter: iface.transport_name = tcp iface.hwaddress = 00:C0:DD:08:63:E7 @@ -728,7 +736,7 @@ iscsiadm -m iface -will report iface configurations that are setup in /etc/iscsi/ifaces: +will report iface configurations that are setup in ${DBROOT}/ifaces: default tcp,<empty>,<empty>,<empty>,<empty> iser iser,<empty>,<empty>,<empty>,<empty> @@ -746,7 +754,7 @@ net_iface_name: will be <empty> because change between reboots. It is used for software iSCSI's vlan or alias binding. initiatorname: Initiatorname to be used if you want to override the - default one in /etc/iscsi/initiatorname.iscsi. + default one in ${HOMEDIR}/initiatorname.iscsi. To display these values in a more friendly way, run: @@ -815,7 +823,7 @@ *This should be fixed in the some future version of Open-iSCSI* For compatibility reasons, when you run iscsiadm to do discovery, it -will check for interfaces in /etc/iscsi/iscsi/ifaces that are using +will check for interfaces in ${DBROOT}/ifaces that are using tcp for the iface.transport, and it will bind the portals that are discovered so that they will be logged in through those ifaces. This behavior can also be overridden by passing in the interfaces you want to use. For the case @@ -832,7 +840,7 @@ iscsiadm -m discoverydb -t st -p ip:port -I default --discover -P 1 -And if you did not define any interfaces in /etc/iscsi/ifaces and do +And if you did not define any interfaces in ${DBROOT}/ifaces and do not pass anything into iscsiadm, running iscsiadm will do the default behavior, allowing the network subsystem to decide which device to use. @@ -873,7 +881,7 @@ iscsiadm -m discoverydb -t st -p 192.168.1.1:3260 --discover - This will search /etc/iscsi/send_targets for a record with the + This will search ${DBROOT}/send_targets for a record with the ID [portal = 192.168.1.1:3260 and type = sendtargets. If found it will perform discovery using the settings stored in the record. If a record does not exist, it will be created using the iscsid.conf @@ -883,7 +891,7 @@ iscsiadm -m discoverydb -t st -p somehost --discover - For the ifaces, iscsiadm will first search /etc/iscsi/ifaces for + For the ifaces, iscsiadm will first search ${DBROOT}/ifaces for interfaces using software iSCSI. If any are found then nodes found during discovery will be setup so that they can logged in through those interfaces. To specify a specific iface, pass the @@ -939,7 +947,7 @@ - SendTargets iSCSI Discovery with a specific interface. If you wish to only use a subset of the interfaces in - /etc/iscsi/ifaces, then you can pass them in during discovery: + ${DBROOT}/ifaces, then you can pass them in during discovery: iscsiadm -m discoverydb -t sendtargets -p 192.168.1.1:3260 \ --interface=iface0 --interface=iface1 --discover @@ -1238,9 +1246,8 @@ 6. Configuration ================ -The default configuration file is /etc/iscsi/iscsid.conf, but the +The default configuration file is ${HOMEDIR}/iscsid.conf, but the directory is configurable with the top-level make option "homedir". -The remainder of this document will assume the /etc/iscsi directory. This file contains only configuration that could be overwritten by iSCSI discovery, or manually updated via iscsiadm utility. Its OK if this file does not exist, in which case compiled-in default configuration will take place @@ -1359,8 +1366,8 @@ is the address and port of the portal. tpgt is the Target Portal Group Tag of the portal, and is not used in iscsiadm commands except for static record creation. ifacename is the name of the iSCSI interface -defined in /etc/iscsi/ifaces. If no interface was defined in -/etc/iscsi/ifaces or passed in, the default behavior is used. +defined in ${DBROOT}/ifaces. If no interface was defined in +${DBROOT}/ifaces or passed in, the default behavior is used. Default here is iscsi_tcp/tcp to be used over whichever NIC the network layer decides is best. @@ -1464,7 +1471,7 @@ iscsiadm -m node -T targetname --op update -n node.startup -v automatic Or to set the "node.startup" attribute to "automatic" as default for -all sessions add the following to the /etc/iscsi/iscsid.conf: +all sessions add the following to the ${HOMEDIR}/iscsid.conf: node.startup = automatic @@ -1498,7 +1505,7 @@ discovery.isns.discoveryd_poll_inval or discovery.sendtargets.discoveryd_poll_inval seconds, and it will log into any portals found from the discovery source using -the ifaces in /etc/iscsi/ifaces. +the ifaces in ${DBROOT}/ifaces. Note that for iSNS the poll_interval does not have to be set. If not set, iscsid will only perform rediscovery when it gets a SCN from the server. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/open-iscsi-2.1.11.suse+85.4ef97a15/etc/Makefile new/open-iscsi-2.1.11.suse+88.8e0635b3/etc/Makefile --- old/open-iscsi-2.1.11.suse+85.4ef97a15/etc/Makefile 2026-02-26 19:31:17.000000000 +0100 +++ new/open-iscsi-2.1.11.suse+88.8e0635b3/etc/Makefile 2026-03-11 21:24:20.000000000 +0100 @@ -35,8 +35,6 @@ SYSTEMD_DEST_SVC_FILES = $(addprefix $(DESTDIR)$(systemddir)/system/,$(SYSTEMD_SOURCE_FILES)) \ $(addprefix $(DESTDIR)$(systemddir)/system/,$(notdir $(SYSTEMD_GENERATED_SERVICE_FILES))) SYSTEMD_DEST_GEN_FILES = $(addprefix $(DESTDIR)$(systemddir)/system-generators/,$(notdir $(SYSTEMD_RULES_SOURCES))) -IFACE_FILES = iface.example -IFACE_DEST_FILES = $(addprefix $(DESTDIR)$(DBROOT)/ifaces/,$(IFACE_FILES)) ETC_FILES = iscsid.conf ETC_DEST_FILES = $(addprefix $(DESTDIR)$(HOMEDIR)/,$(ETC_FILES)) @@ -47,13 +45,6 @@ $(SYSTEMD_GENERATED_SERVICE_FILES): systemd/%.service: systemd/%.service.template $(SED) -e 's:@SBINDIR@:$(SBINDIR):' $? > $@ -install: install_systemd install_iface install_etc - -install_iface: $(DESTDIR)$(DBROOT)/ifaces $(IFACE_DEST_FILES) - -$(IFACE_DEST_FILES): $(DESTDIR)$(DBROOT)/ifaces/%: % - $(INSTALL) -m 644 $? $@ - install_etc: $(DESTDIR)$(HOMEDIR) $(ETC_DEST_FILES) $(ETC_DEST_FILES): $(DESTDIR)$(HOMEDIR)/%: % @@ -109,7 +100,7 @@ distclean: $(RM) $(SYSTEMD_GENERATED_SERVICE_FILES) -.PHONY: all clean install install_iface install_initd install_initd_redhat \ +.PHONY: all clean install install_initd install_initd_redhat \ install_initd_debian install_systemd distclean install_iname \ install_systemd_generator_files install_systemd_service_files \ install_initd_distro install_etc diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/open-iscsi-2.1.11.suse+85.4ef97a15/etc/meson.build new/open-iscsi-2.1.11.suse+88.8e0635b3/etc/meson.build --- old/open-iscsi-2.1.11.suse+85.4ef97a15/etc/meson.build 2026-02-26 19:31:17.000000000 +0100 +++ new/open-iscsi-2.1.11.suse+88.8e0635b3/etc/meson.build 2026-03-11 21:24:20.000000000 +0100 @@ -2,9 +2,6 @@ subdir('systemd') -# for our interface example file -iscsi_etc_iface_file_src = files('iface.example') - # for our config file iscsi_etc_config_file_src = files('iscsid.conf') diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/open-iscsi-2.1.11.suse+85.4ef97a15/libopeniscsiusr/idbm.c new/open-iscsi-2.1.11.suse+88.8e0635b3/libopeniscsiusr/idbm.c --- old/open-iscsi-2.1.11.suse+85.4ef97a15/libopeniscsiusr/idbm.c 2026-02-26 19:31:17.000000000 +0100 +++ new/open-iscsi-2.1.11.suse+88.8e0635b3/libopeniscsiusr/idbm.c 2026-03-11 21:24:20.000000000 +0100 @@ -943,8 +943,17 @@ if (iface_name == NULL) goto out; - if (strcmp(iface_name, "iface.example") == 0) + if (strcmp(iface_name, "iface.example") == 0) { + /* + * iface.example is no longer delivered, but may + * be present from an earlier installation, + * so allow it for now, but print a message + */ + _info(ctx, + "Skipping deprecated \"%s/iface.example\". Please remove it.", + IFACE_CONFIG_DIR); goto out; + } _good(_asprintf(&conf_path, "%s/%s", IFACE_CONFIG_DIR, iface_name), rc, out); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/open-iscsi-2.1.11.suse+85.4ef97a15/meson.build new/open-iscsi-2.1.11.suse+88.8e0635b3/meson.build --- old/open-iscsi-2.1.11.suse+85.4ef97a15/meson.build 2026-02-26 19:31:17.000000000 +0100 +++ new/open-iscsi-2.1.11.suse+88.8e0635b3/meson.build 2026-03-11 21:24:20.000000000 +0100 @@ -271,9 +271,6 @@ install_mode: 'rwxr-xr-x') endif -# the iface.example file -install_data(iscsi_etc_iface_file_src, install_dir: db_root / 'ifaces') - # the iscsid.conf config file install_data(iscsi_etc_config_file_src, install_dir: home_dir) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/open-iscsi-2.1.11.suse+85.4ef97a15/usr/iface.c new/open-iscsi-2.1.11.suse+88.8e0635b3/usr/iface.c --- old/open-iscsi-2.1.11.suse+85.4ef97a15/usr/iface.c 2026-02-26 19:31:17.000000000 +0100 +++ new/open-iscsi-2.1.11.suse+88.8e0635b3/usr/iface.c 2026-03-11 21:24:20.000000000 +0100 @@ -918,8 +918,16 @@ !strcmp(iface_dent->d_name, "..")) continue; - if (!strcmp(iface_dent->d_name, "iface.example")) + /* + * iface.example is no longer delivered, but may + * be present from an earlier installation, + * so allow it for now, but print a message + */ + if (!strcmp(iface_dent->d_name, "iface.example")) { + log_info("Skipping deprecated \"%s/iface.example\". Please remove it.", + IFACE_CONFIG_DIR); continue; + } log_debug(5, "iface_for_each_iface found %s", iface_dent->d_name);
