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 2023-06-18 23:07:42 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/open-iscsi (Old) and /work/SRC/openSUSE:Factory/.open-iscsi.new.15902 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "open-iscsi" Sun Jun 18 23:07:42 2023 rev:128 rq:1093512 version:unknown Changes: -------- --- /work/SRC/openSUSE:Factory/open-iscsi/open-iscsi.changes 2023-04-20 15:13:16.245625915 +0200 +++ /work/SRC/openSUSE:Factory/.open-iscsi.new.15902/open-iscsi.changes 2023-06-18 23:07:43.445382340 +0200 @@ -1,0 +2,25 @@ +Thu Jun 15 17:39:33 UTC 2023 - Lee Duncan <[email protected]> + +- Upgrade to upstream version 2.1.9 with tag "2.1.9-suse" + (bsc#1210514), replacing open-iscsi-2.1.8-suse.tar.bz2 with + open-iscsi-2.1.9-suse.tar.bz2, and resetting + open-iscsi-SUSE-latest.diff.bz2. A summary rom the ChangeLog + file: + * Fix discoveryd compiler warning + * Sync iscsi_if.h with kernel + * Handle old DB records correctly + * Make IQN configuration for iscsi-iname + * remove OFFLOAD_BOOT_SUPPORTED, which is always true + * Use UUID for IPC, not "root" + * do not support SHA3 for libressl + * build meson cleanups, including changing default DB home + * Updated README about NOPs + * Remove "BindTo" in systemd service file + * Some iscsiuio fixes, including licensing and memory leaks + (bsc#1210514) + * Small netlink fixes + * Fix OOM adjustment + * Some error recovery fixes + * Some spelling fixes + +------------------------------------------------------------------- Old: ---- open-iscsi-2.1.8-suse.tar.bz2 New: ---- open-iscsi-2.1.9-suse.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ open-iscsi.spec ++++++ --- /var/tmp/diff_new_pack.1VJtAM/_old 2023-06-18 23:07:44.509388706 +0200 +++ /var/tmp/diff_new_pack.1VJtAM/_new 2023-06-18 23:07:44.513388730 +0200 @@ -46,12 +46,12 @@ %endif %define iscsi_minor_release 1 -%define iscsi_patch_release 8 +%define iscsi_patch_release 9 %define iscsi_patch_release_suse %{iscsi_patch_release}-suse %define libname libopeniscsiusr0 %define libversion 0.2.0 Name: open-iscsi -Version: 2.1.8 +Version: 2.1.9 Release: 0 Summary: Linux iSCSI Software Initiator License: GPL-2.0-or-later ++++++ open-iscsi-2.1.8-suse.tar.bz2 -> open-iscsi-2.1.9-suse.tar.bz2 ++++++ ++++ 3696 lines of diff (skipped) ++++++ open-iscsi-SUSE-latest.diff.bz2 ++++++ --- /var/tmp/diff_new_pack.1VJtAM/_old 2023-06-18 23:07:44.889390980 +0200 +++ /var/tmp/diff_new_pack.1VJtAM/_new 2023-06-18 23:07:44.893391004 +0200 @@ -1,269 +1,3 @@ -diff --git a/etc/README.DB-files-moved.template b/etc/README.DB-files-moved.template -new file mode 100644 -index 000000000000..b69a3de83e55 ---- /dev/null -+++ b/etc/README.DB-files-moved.template -@@ -0,0 +1,12 @@ -+# -+# README file for open-iscsi Home Directory -+# -+ -+Note: the database (DB) files that used to be located here have moved. -+They have moved from this directory to: -+ -+ @DBROOT@ -+ -+If you use the normal open-iscsi tools for manipulating these DB files, -+they will work fine. But if you wish to manually edit them, please note -+the new location. -diff --git a/etc/iscsid.conf b/etc/iscsid.conf -index 79d8127cacca..93118e953749 100644 ---- a/etc/iscsid.conf -+++ b/etc/iscsid.conf -@@ -19,7 +19,7 @@ - # the time then leave this attribute commented out. - # - # Default for Fedora and RHEL. Uncomment to activate. --# iscsid.startup = /bin/systemctl start iscsid.socket iscsiuio.socket -+iscsid.startup = /bin/systemctl start iscsid.socket iscsiuio.socket - # - # Default for Debian and Ubuntu. Uncomment to activate. - # iscsid.startup = /bin/systemctl start iscsid.socket -@@ -29,7 +29,7 @@ - - # Check for active mounts on devices reachable through a session - # and refuse to logout if there are any. Defaults to "No". --# iscsid.safe_logout = Yes -+iscsid.safe_logout = Yes - - # Only require UID auth for MGMT IPCs, and not username. - # Useful if you want to run iscsid in a constrained environment. -diff --git a/etc/meson.build b/etc/meson.build -index 3d44f54459fe..f72718a30e2f 100644 ---- a/etc/meson.build -+++ b/etc/meson.build -@@ -7,3 +7,13 @@ iscsi_etc_iface_file_src = files('iface.example') - - # for our config file - iscsi_etc_config_file_src = files('iscsid.conf') -+ -+# templated etc files -+iscsi_etc_files_arr = {} -+if install_dbdir_move_readme -+ iscsi_etc_files = ['README.DB-files-moved'] -+ iscsi_etc_files_arr = {} -+ foreach u: iscsi_etc_files -+ iscsi_etc_files_arr += {u: files(u + '.template')} -+ endforeach -+endif -diff --git a/etc/systemd/iscsid.service.template b/etc/systemd/iscsid.service.template -index e2a50d371ebe..a67a8fa2b1e0 100644 ---- a/etc/systemd/iscsid.service.template -+++ b/etc/systemd/iscsid.service.template -@@ -3,6 +3,8 @@ Description=Open-iSCSI - Documentation=man:iscsid(8) man:iscsiuio(8) man:iscsiadm(8) - DefaultDependencies=no - After=network-online.target iscsiuio.service iscsi-init.service -+Requires=iscsid.socket -+After=iscsid.socket - Before=remote-fs-pre.target - Wants=remote-fs-pre.target - Requires=iscsi-init.service -diff --git a/iscsiuio/src/unix/main.c b/iscsiuio/src/unix/main.c -index 0c9ad49441d1..9a2a60cdb721 100644 ---- a/iscsiuio/src/unix/main.c -+++ b/iscsiuio/src/unix/main.c -@@ -201,35 +201,43 @@ static void daemon_init() - close(fd); - } - --#define ISCSI_OOM_PATH_LEN 48 -- -+/* -+ * make a best effort at ajusting our nice -+ * score and our OOM score, but it's not considered -+ * fatal if either adjustment fails -+ * -+ * return 0 on success of OOM adjustment -+ */ - int oom_adjust(void) - { - int fd; -- char path[ISCSI_OOM_PATH_LEN]; -- struct stat statb; -+ int res = 0; - -- if (nice(-10) < 0) -+ errno = 0; -+ if (nice(-10) == -1 && errno != 0) - LOG_DEBUG("Could not increase process priority: %s", - strerror(errno)); - -- snprintf(path, ISCSI_OOM_PATH_LEN, "/proc/%d/oom_score_adj", getpid()); -- if (stat(path, &statb)) { -- /* older kernel so use old oom_adj file */ -- snprintf(path, ISCSI_OOM_PATH_LEN, "/proc/%d/oom_adj", -- getpid()); -- } -- fd = open(path, O_WRONLY); -- if (fd < 0) -+ /* -+ * try the modern method of adjusting our OOM score, -+ * then try the old one, if that fails -+ */ -+ if ((fd = open("/proc/self/oom_score_adj", O_WRONLY)) >= 0) { -+ if ((res = write(fd, "-1000", 5)) < 0) -+ LOG_DEBUG("Could not set /proc/self/oom_score_adj to -1000: %s", -+ strerror(errno)); -+ } else if ((fd = open("/proc/self/oom_adj", O_WRONLY)) >= 0) { -+ if ((res = write(fd, "-17", 3)) < 0) -+ LOG_DEBUG("Could not set /proc/self/oom_adj to -16: %s", -+ strerror(errno)); -+ } else - return -1; -- if (write(fd, "-16", 3) < 0) /* for 2.6.11 */ -- LOG_DEBUG("Could not set oom score to -16: %s", -- strerror(errno)); -- if (write(fd, "-17", 3) < 0) /* for Andrea's patch */ -- LOG_DEBUG("Could not set oom score to -17: %s", -- strerror(errno)); -+ - close(fd); -- return 0; -+ if (res < 0) -+ return res; -+ else -+ return 0; - } - - -diff --git a/meson.build b/meson.build -index 74e61033e7a4..be41e680835c 100644 ---- a/meson.build -+++ b/meson.build -@@ -41,6 +41,7 @@ endif - c_args = get_option('c_args') - man_dir = get_option('mandir') - iscsi_sbindir = get_option('iscsi_sbindir') -+install_dbdir_move_readme = get_option('install_dbdir_move_readme') - - # - # get list of sources from subdirs (iscsiuio included at bottom) -@@ -277,6 +278,16 @@ if not meson.is_cross_build() - install_mode: 'rw-r--r--') - endif - -+# handle any etc templated files (e.g. README*) -+foreach k,v: iscsi_etc_files_arr -+ configure_file( -+ input: v, -+ output: k, -+ configuration: conf, -+ install: true, -+ install_dir: home_dir) -+endforeach -+ - # - # handle documentation from 'doc' - # -diff --git a/meson_options.txt b/meson_options.txt -index b76f044d628b..627ab89ecf06 100644 ---- a/meson_options.txt -+++ b/meson_options.txt -@@ -3,8 +3,6 @@ option('systemddir', type: 'string', value: '/usr/lib/systemd', - description: 'Systemd directory [/usr/lib/systemd], if systemd used') - option('no_systemd', type: 'boolean', value: false, - description: 'Do not use systemd') --option('source_date_epoch', type: 'string', value: 'NONE', -- description: 'Set the Build Source Date (for iscsiuio), for repeatable builds') - # these are in the 'sysconfigdir' (/etc by default) unless overridden - option('homedir', type: 'string', value: 'iscsi', - description: 'Set the HOME directory [/etc/iscsi]') -@@ -18,3 +16,5 @@ option('rulesdir', type: 'string', value: 'udev/rules.d', - # older version of meson do not allow overriding sbindir - option('iscsi_sbindir', type: 'string', value: '/usr/sbin', - description: 'Set the directory where our binaries go [/usr/sbin]') -+option('install_dbdir_move_readme', type: 'boolean', value: false, -+ description: 'Install README in home directory saying DB files have moved') -diff --git a/usr/iscsi_util.c b/usr/iscsi_util.c -index db1dc377727f..2f1de3e61dc3 100644 ---- a/usr/iscsi_util.c -+++ b/usr/iscsi_util.c -@@ -65,36 +65,43 @@ void daemon_init(void) - close(fd); - } - --#define ISCSI_OOM_PATH_LEN 48 -- -+/* -+ * make a best effort at ajusting our nice -+ * score and our OOM score, but it's not considered -+ * fatal if either adjustment fails -+ * -+ * return 0 on success of OOM adjustment -+ */ - int oom_adjust(void) - { - int fd; -- char path[ISCSI_OOM_PATH_LEN]; -- struct stat statb; -+ int res = 0; - - errno = 0; - if (nice(-10) == -1 && errno != 0) -- log_debug(1, "Could not increase process priority: %s", -+ log_warning("Could not increase process priority: %s", - strerror(errno)); - -- snprintf(path, ISCSI_OOM_PATH_LEN, "/proc/%d/oom_score_adj", getpid()); -- if (stat(path, &statb)) { -- /* older kernel so use old oom_adj file */ -- snprintf(path, ISCSI_OOM_PATH_LEN, "/proc/%d/oom_adj", -- getpid()); -- } -- fd = open(path, O_WRONLY); -- if (fd < 0) -+ /* -+ * try the modern method of adjusting our OOM score, -+ * then try the old one, if that fails -+ */ -+ if ((fd = open("/proc/self/oom_score_adj", O_WRONLY)) >= 0) { -+ if ((res = write(fd, "-1000", 5)) < 0) -+ log_warning("Could not set /proc/self/oom_score_adj to -1000: %s", -+ strerror(errno)); -+ } else if ((fd = open("/proc/self/oom_adj", O_WRONLY)) >= 0) { -+ if ((res = write(fd, "-17", 3)) < 0) -+ log_warning("Could not set /proc/self/oom_adj to -16: %s", -+ strerror(errno)); -+ } else - return -1; -- if (write(fd, "-16", 3) < 0) /* for 2.6.11 */ -- log_debug(1, "Could not set oom score to -16: %s", -- strerror(errno)); -- if (write(fd, "-17", 3) < 0) /* for Andrea's patch */ -- log_debug(1, "Could not set oom score to -17: %s", -- strerror(errno)); -+ - close(fd); -- return 0; -+ if (res < 0) -+ return res; -+ else -+ return 0; - } - - char* -diff --git a/usr/iscsid.c b/usr/iscsid.c -index 8441037042f3..0cf2368a7f39 100644 ---- a/usr/iscsid.c -+++ b/usr/iscsid.c -@@ -621,7 +621,7 @@ int main(int argc, char *argv[]) - - /* oom-killer will not kill us at the night... */ - if (oom_adjust()) -- log_debug(1, "can not adjust oom-killer's pardon"); -+ log_warning("Cannot adjust oom-killer's pardon"); - - /* we don't want our active sessions to be paged out... */ - if (mlockall(MCL_CURRENT | MCL_FUTURE)) { + +(No newline at EOF)
