Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package nvme-cli for openSUSE:Factory checked in at 2022-01-22 08:17:52 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/nvme-cli (Old) and /work/SRC/openSUSE:Factory/.nvme-cli.new.1938 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "nvme-cli" Sat Jan 22 08:17:52 2022 rev:47 rq:947398 version:2.0~0 Changes: -------- --- /work/SRC/openSUSE:Factory/nvme-cli/nvme-cli.changes 2021-12-09 19:44:54.685113099 +0100 +++ /work/SRC/openSUSE:Factory/.nvme-cli.new.1938/nvme-cli.changes 2022-01-22 08:18:02.434961809 +0100 @@ -1,0 +2,25 @@ +Wed Jan 19 11:46:18 UTC 2022 - Daniel Wagner <daniel.wag...@suse.com> + +- Fix zsh completion package depenedencies. + +------------------------------------------------------------------- +Tue Jan 18 15:42:36 UTC 2022 - Daniel Wagner <daniel.wag...@suse.com> + +- Use osc_scm to manage upstream input source. +- Fix version string. + +------------------------------------------------------------------- +Mon Jan 17 11:29:55 UTC 2022 - Daniel Wagner <daniel.wag...@suse.com> + +- Update Source URL and introduce a variable for the release canditate + version string. + +------------------------------------------------------------------- +Fri Jan 14 17:57:47 UTC 2022 - Daniel Wagner <daniel.wag...@suse.com> + +- Update to v2.0-rc0 + * Depends on libnvme + * rename harden_nvmf-connect@.service.patch to 0100-harden_nvmf-connect@.service.patch + * drop 0102-nvme-cli-Add-script-to-determine-host-NQN.patch + +------------------------------------------------------------------- Old: ---- 0102-nvme-cli-Add-script-to-determine-host-NQN.patch harden_nvmf-connect@.service.patch nvme-cli-1.16.tar.gz New: ---- 0100-harden_nvmf-connect@.service.patch _service _servicedata nvme-cli-2.0~0.obscpio nvme-cli.obsinfo ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ nvme-cli.spec ++++++ --- /var/tmp/diff_new_pack.zA03b1/_old 2022-01-22 08:18:04.270949437 +0100 +++ /var/tmp/diff_new_pack.zA03b1/_new 2022-01-22 08:18:04.274949410 +0100 @@ -1,7 +1,7 @@ # # spec file for package nvme-cli # -# Copyright (c) 2021 SUSE LLC +# Copyright (c) 2022 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -17,27 +17,29 @@ Name: nvme-cli -Version: 1.16 +Version: 2.0~0 Release: 0 Summary: NVM Express user space tools License: GPL-2.0-only Group: Hardware/Other -URL: https://github.com/linux-nvme/nvme-cli -Source: https://github.com/linux-nvme/nvme-cli/archive/v%{version}.tar.gz#/%{name}-%{version}.tar.gz -Source2: nvme-cli-rpmlintrc -# downstream patches: -Patch102: 0102-nvme-cli-Add-script-to-determine-host-NQN.patch -Patch103: harden_nvmf-connect@.service.patch +URL: https://github.com/linux-nvme/nvme-cli/ +Source0: nvme-cli-%{version}.tar.gz +Source1: nvme-cli-rpmlintrc +# downstream patches +Patch100: 0100-harden_nvmf-connect@.service.patch +BuildRequires: gcc +BuildRequires: gcc-c++ BuildRequires: libhugetlbfs-devel +BuildRequires: libjson-c-devel +BuildRequires: libnvme-devel BuildRequires: libuuid-devel +BuildRequires: make +BuildRequires: meson >= 0.47.0 BuildRequires: pkgconfig BuildRequires: xmlto +BuildRequires: zlib-devel BuildRequires: pkgconfig(bash-completion) BuildRequires: pkgconfig(libudev) -BuildRequires: rubygem(asciidoctor) -%ifarch x86_64 aarch64 i586 -Requires(post): dmidecode -%endif %description NVM Express (NVMe) is a direct attached storage interface. The @@ -63,39 +65,45 @@ %description bash-completion Optional dependency offering bash completion for NVM Express user space tools +%package zsh-completion +Summary: NVM Express user space tools zsh completion +Group: System/Shells +Requires: %{name} = %{version} +Requires: zsh +Supplements: (nvme-cli and zsh) + +%description zsh-completion +Optional dependency offering zsh completion for NVM Express user space tools + %prep -%setup -q -%patch102 -p1 -%patch103 -p1 +%autosetup -p1 %build -echo %{version} > version -make CFLAGS="%{optflags} -I." PREFIX=%{_prefix} USE_ASCIIDOCTOR=YesPlease %{?_smp_mflags} all -sed -i '/make.*/d' regress +%meson \ + -Dudevrulesdir=%{_udevrulesdir} \ + -Ddracutrulesdir=%{_sysconfdir}/dracut/dracut.conf.d \ + -Dsystemddir=%{_unitdir} \ + -Ddocs=man +%meson_build %install -make PREFIX=%{_prefix} DESTDIR=%{buildroot} UDEVRULESDIR=%{_udevrulesdir} install-bin install-man install-udev install-systemd %{?_smp_mflags} +%meson_install install -m 644 -D /dev/null %{buildroot}%{_sysconfdir}/nvme/hostnqn -install -m 644 -D completions/bash-nvme-completion.sh %{buildroot}%{_datadir}/bash-completion/completions/nvme -%ifarch x86_64 aarch64 i586 -install -m 744 -D scripts/det-hostnqn.sh %{buildroot}%{_sbindir}/nvme-gen-hostnqn -%endif +install -m 644 -D /dev/null %{buildroot}%{_sysconfdir}/nvme/hostid +install -m 644 -D /dev/null %{buildroot}%{_sysconfdir}/nvme/discovery.conf +rm %{buildroot}%{_sysconfdir}/dracut/dracut.conf.d/70-nvmf-autoconnect.conf + # for subpackage nvme-cli-regress-script: install -m 744 -D regress %{buildroot}%{_sbindir}/nvme-regress -%define services nvmefc-boot-connections.service nvmf-connect.target +%define services nvmefc-boot-connections.service nvmf-connect.target nvmf-autoconnect.service %pre %service_add_pre %services nvmf-connect@.service %post -%ifarch x86_64 aarch64 i586 -if [ ! -s %{_sysconfdir}/nvme/hostnqn ]; then - %{_sbindir}/nvme-gen-hostnqn > %{_sysconfdir}/nvme/hostnqn -fi -%endif if [ ! -s %{_sysconfdir}/nvme/hostnqn ]; then - %{_bindir}/echo "Generating random host NQN." + %{_bindir}/echo "Generating host NQN." %{_sbindir}/nvme gen-hostnqn > %{_sysconfdir}/nvme/hostnqn fi if [ ! -s %{_sysconfdir}/nvme/hostid ]; then @@ -118,9 +126,6 @@ %license LICENSE %doc README.md %{_sbindir}/nvme -%ifarch x86_64 aarch64 i586 -%{_sbindir}/nvme-gen-hostnqn -%endif %{_mandir}/man1/nvme*.1*%{?ext_man} %{_udevrulesdir}/70-nvmf-autoconnect.rules %{_udevrulesdir}/71-nvmf-iopolicy-netapp.rules @@ -131,6 +136,7 @@ %dir %{_sysconfdir}/nvme/ %ghost %{_sysconfdir}/nvme/hostnqn %ghost %{_sysconfdir}/nvme/hostid +%ghost %{_sysconfdir}/nvme/discovery.conf %files -n nvme-cli-regress-script %{_sbindir}/nvme-regress @@ -140,4 +146,9 @@ %dir %{_datadir}/bash-completion/completions %{_datadir}/bash-completion/completions/nvme +%files zsh-completion +%dir %{_datadir}/zsh +%dir %{_datadir}/zsh/site-functions +%{_datadir}/zsh/site-functions/_nvme + %changelog ++++++ 0100-harden_nvmf-connect@.service.patch ++++++ Index: nvme-cli-1.15/nvmf-autoconnect/systemd/nvmf-connect@.service =================================================================== --- nvme-cli-1.15.orig/nvmf-autoconnect/systemd/nvmf-connect@.service +++ nvme-cli-1.15/nvmf-autoconnect/systemd/nvmf-connect@.service @@ -9,6 +9,17 @@ PartOf=nvmf-connect.target Requires=nvmf-connect.target [Service] +# added automatically, for details please see +# https://en.opensuse.org/openSUSE:Security_Features#Systemd_hardening_effort +ProtectSystem=full +ProtectHome=true +ProtectHostname=true +ProtectKernelTunables=true +ProtectKernelModules=true +ProtectKernelLogs=true +ProtectControlGroups=true +RestrictRealtime=true +# end of automatic additions Type=simple Environment="CONNECT_ARGS=%i" ExecStart=/bin/sh -c "nvme connect-all --matching --quiet `/bin/echo -e '${CONNECT_ARGS}'`" ++++++ _service ++++++ <services> <service name="obs_scm" mode="manual"> <param name="scm">git</param> <param name="url">https://github.com/linux-nvme/nvme-cli.git</param> <param name="filename">nvme-cli</param> <!-- <param name="versionformat">@PARENT_TAG@+@TAG_OFFSET@</param> --> <param name="versionformat">@PARENT_TAG@</param> <param name="revision">v2.0-rc0</param> <param name="match-tag">v[02].[0-9]*</param> <param name="versionrewrite-pattern">v([^+]*)-rc([0-9]+)</param> <param name="versionrewrite-replacement">\1~\2</param> <param name="changesgenerate">enable</param> </service> <service name="set_version" mode="manual"> </service> <service mode="buildtime" name="tar" /> <service mode="buildtime" name="recompress"> <param name="file">*.tar</param> <param name="compression">gz</param> </service> </services> ++++++ _servicedata ++++++ <servicedata> <service name="tar_scm"> <param name="url">https://github.com/linux-nvme/nvme-cli.git</param> <param name="changesrevision">5cf86c2cbda7c5140ecca850ff3722c8ed90e622</param> </service> </servicedata> ++++++ nvme-cli.obsinfo ++++++ name: nvme-cli version: 2.0~0 mtime: 1642167092 commit: 7a97bca7b826941225baa96abb9c8551b8cc0b74
