From eeaeaeb01cd984af7fcdf73c9797744b3eddb16f4c539991898b3b0dd63c1713 Mon Sep 17 00:00:00 2001 From: Steffen Winterfeldt Date: Tue, 16 Jul 2019 14:48:19 +0000 Subject: [PATCH 01/11] - release 4.2 OBS-URL: https://build.opensuse.org/package/show/system:install:head/checkmedia?expand=0&rev=46 --- checkmedia-4.1.tar.xz | 3 --- checkmedia-4.2.tar.xz | 3 +++ checkmedia.changes | 17 +++++++++++++++++ checkmedia.spec | 4 ++-- 4 files changed, 22 insertions(+), 5 deletions(-) delete mode 100644 checkmedia-4.1.tar.xz create mode 100644 checkmedia-4.2.tar.xz diff --git a/checkmedia-4.1.tar.xz b/checkmedia-4.1.tar.xz deleted file mode 100644 index b01d1a1..0000000 --- a/checkmedia-4.1.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:c2e046c346fc00c34f659d7f294e51898fcde8d2ded31c6b38e22ceebf43678f -size 46280 diff --git a/checkmedia-4.2.tar.xz b/checkmedia-4.2.tar.xz new file mode 100644 index 0000000..164ab02 --- /dev/null +++ b/checkmedia-4.2.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:b69d5d30ce7689dffea88c4a65e409becf8db02af60dbf139f580e0c0aa250f2 +size 50412 diff --git a/checkmedia.changes b/checkmedia.changes index 5c3364f..8ac5074 100644 --- a/checkmedia.changes +++ b/checkmedia.changes @@ -1,3 +1,20 @@ +-------------------------------------------------------------------- +Tue Jul 16 14:43:12 UTC 2019 - wfeldt@opensuse.org + +- merge gh#openSUSE/checkmedia#10 +- add support for signed media (bsc#1139561) +- adjust tagmedia script +- update doc +- adjust test cases +- add links to signature magic value origins +- allow to set specific gpg key for signature verification +- rearrange data structure to provide some compatibility +- check for empty signature +- better error log +- added tests for signature verification +- signature test results reference +- 4.2 + -------------------------------------------------------------------- Wed Nov 28 15:35:46 UTC 2018 - snwint@suse.de diff --git a/checkmedia.spec b/checkmedia.spec index dd19043..126f141 100644 --- a/checkmedia.spec +++ b/checkmedia.spec @@ -1,7 +1,7 @@ # # spec file for package checkmedia # -# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -22,7 +22,7 @@ Name: checkmedia Summary: Check SUSE installation media License: GPL-3.0-or-later Group: System/Management -Version: 4.1 +Version: 4.2 Release: 0 Url: https://github.com/openSUSE/checkmedia Source: %{name}-%{version}.tar.xz From 6550fbd9bc0e463d761d6430a1c0ed232f6e791fde969a677502bd6965e88cb9 Mon Sep 17 00:00:00 2001 From: Steffen Winterfeldt Date: Tue, 16 Jul 2019 14:52:49 +0000 Subject: [PATCH 02/11] osc copypac from project:system:install:head package:checkmedia revision:45 OBS-URL: https://build.opensuse.org/package/show/system:install:head/checkmedia?expand=0&rev=47 --- checkmedia-4.1.tar.xz | 3 +++ checkmedia-4.2.tar.xz | 3 --- checkmedia.changes | 17 ----------------- checkmedia.spec | 4 ++-- 4 files changed, 5 insertions(+), 22 deletions(-) create mode 100644 checkmedia-4.1.tar.xz delete mode 100644 checkmedia-4.2.tar.xz diff --git a/checkmedia-4.1.tar.xz b/checkmedia-4.1.tar.xz new file mode 100644 index 0000000..b01d1a1 --- /dev/null +++ b/checkmedia-4.1.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:c2e046c346fc00c34f659d7f294e51898fcde8d2ded31c6b38e22ceebf43678f +size 46280 diff --git a/checkmedia-4.2.tar.xz b/checkmedia-4.2.tar.xz deleted file mode 100644 index 164ab02..0000000 --- a/checkmedia-4.2.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:b69d5d30ce7689dffea88c4a65e409becf8db02af60dbf139f580e0c0aa250f2 -size 50412 diff --git a/checkmedia.changes b/checkmedia.changes index 8ac5074..5c3364f 100644 --- a/checkmedia.changes +++ b/checkmedia.changes @@ -1,20 +1,3 @@ --------------------------------------------------------------------- -Tue Jul 16 14:43:12 UTC 2019 - wfeldt@opensuse.org - -- merge gh#openSUSE/checkmedia#10 -- add support for signed media (bsc#1139561) -- adjust tagmedia script -- update doc -- adjust test cases -- add links to signature magic value origins -- allow to set specific gpg key for signature verification -- rearrange data structure to provide some compatibility -- check for empty signature -- better error log -- added tests for signature verification -- signature test results reference -- 4.2 - -------------------------------------------------------------------- Wed Nov 28 15:35:46 UTC 2018 - snwint@suse.de diff --git a/checkmedia.spec b/checkmedia.spec index 126f141..dd19043 100644 --- a/checkmedia.spec +++ b/checkmedia.spec @@ -1,7 +1,7 @@ # # spec file for package checkmedia # -# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -22,7 +22,7 @@ Name: checkmedia Summary: Check SUSE installation media License: GPL-3.0-or-later Group: System/Management -Version: 4.2 +Version: 4.1 Release: 0 Url: https://github.com/openSUSE/checkmedia Source: %{name}-%{version}.tar.xz From c33ca69447d8e627724ea16fee6a157a8dcfa09e2a677ae9c10515e8646f7e3a Mon Sep 17 00:00:00 2001 From: Steffen Winterfeldt Date: Tue, 16 Jul 2019 14:53:18 +0000 Subject: [PATCH 03/11] - release 5.0 OBS-URL: https://build.opensuse.org/package/show/system:install:head/checkmedia?expand=0&rev=48 --- checkmedia-4.1.tar.xz | 3 --- checkmedia-5.0.tar.xz | 3 +++ checkmedia.changes | 17 +++++++++++++++++ checkmedia.spec | 4 ++-- 4 files changed, 22 insertions(+), 5 deletions(-) delete mode 100644 checkmedia-4.1.tar.xz create mode 100644 checkmedia-5.0.tar.xz diff --git a/checkmedia-4.1.tar.xz b/checkmedia-4.1.tar.xz deleted file mode 100644 index b01d1a1..0000000 --- a/checkmedia-4.1.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:c2e046c346fc00c34f659d7f294e51898fcde8d2ded31c6b38e22ceebf43678f -size 46280 diff --git a/checkmedia-5.0.tar.xz b/checkmedia-5.0.tar.xz new file mode 100644 index 0000000..212f626 --- /dev/null +++ b/checkmedia-5.0.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:4caca9ced0776f5235802e3180338c10d3cb3814a9a804342f6d31f5ae60c9cf +size 50404 diff --git a/checkmedia.changes b/checkmedia.changes index 5c3364f..255e6c4 100644 --- a/checkmedia.changes +++ b/checkmedia.changes @@ -1,3 +1,20 @@ +-------------------------------------------------------------------- +Tue Jul 16 14:43:12 UTC 2019 - wfeldt@opensuse.org + +- merge gh#openSUSE/checkmedia#10 +- add support for signed media (bsc#1139561) +- adjust tagmedia script +- update doc +- adjust test cases +- add links to signature magic value origins +- allow to set specific gpg key for signature verification +- rearrange data structure to provide some compatibility +- check for empty signature +- better error log +- added tests for signature verification +- signature test results reference +- 5.0 + -------------------------------------------------------------------- Wed Nov 28 15:35:46 UTC 2018 - snwint@suse.de diff --git a/checkmedia.spec b/checkmedia.spec index dd19043..ff61073 100644 --- a/checkmedia.spec +++ b/checkmedia.spec @@ -1,7 +1,7 @@ # # spec file for package checkmedia # -# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -22,7 +22,7 @@ Name: checkmedia Summary: Check SUSE installation media License: GPL-3.0-or-later Group: System/Management -Version: 4.1 +Version: 5.0 Release: 0 Url: https://github.com/openSUSE/checkmedia Source: %{name}-%{version}.tar.xz From 99aff7f56d661b37cbad362b00c457ade1b7f369ebfa3c2352fcbaf1d75c1d75 Mon Sep 17 00:00:00 2001 From: Steffen Winterfeldt Date: Wed, 17 Jul 2019 08:31:34 +0000 Subject: [PATCH 04/11] - Use noun phrase in summaries. - Drop redundant ldconfig PreReq. OBS-URL: https://build.opensuse.org/package/show/system:install:head/checkmedia?expand=0&rev=49 --- checkmedia.changes | 6 ++++++ checkmedia.spec | 19 ++++++++++--------- 2 files changed, 16 insertions(+), 9 deletions(-) diff --git a/checkmedia.changes b/checkmedia.changes index 255e6c4..969df01 100644 --- a/checkmedia.changes +++ b/checkmedia.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Wed Jul 17 08:29:09 UTC 2019 - Jan Engelhardt + +- Use noun phrase in summaries. +- Drop redundant ldconfig PreReq. + -------------------------------------------------------------------- Tue Jul 16 14:43:12 UTC 2019 - wfeldt@opensuse.org diff --git a/checkmedia.spec b/checkmedia.spec index ff61073..09a367a 100644 --- a/checkmedia.spec +++ b/checkmedia.spec @@ -12,12 +12,10 @@ # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. -# Please submit bugfixes or comments via http://bugs.opensuse.org/ +# Please submit bugfixes or comments via https://bugs.opensuse.org/ # -%define libversion 4 - Name: checkmedia Summary: Check SUSE installation media License: GPL-3.0-or-later @@ -26,15 +24,18 @@ Version: 5.0 Release: 0 Url: https://github.com/openSUSE/checkmedia Source: %{name}-%{version}.tar.xz +BuildRequires: gpg BuildRoot: %{_tmppath}/%{name}-%{version}-build %description -Check SUSE installation media for errors. +The program checks SUSE installation media for errors. + +%define libversion %(echo %version | cut -d. -f1) %package -n libmediacheck%{libversion} Summary: Library for checking SUSE installation media Group: System/Libraries -PreReq: /sbin/ldconfig +Requires: gpg %description -n libmediacheck%{libversion} Library for checking SUSE installation media. Used by checkmedia and linuxrc. @@ -58,11 +59,11 @@ make test %install install -d -m 755 %{buildroot}/usr/bin -make install DESTDIR=%{buildroot} +%make_install -%post -n libmediacheck4 -p /sbin/ldconfig +%post -n libmediacheck%{libversion} -p /sbin/ldconfig -%postun -n libmediacheck4 -p /sbin/ldconfig +%postun -n libmediacheck%{libversion} -p /sbin/ldconfig %files %defattr(-,root,root) @@ -74,7 +75,7 @@ make install DESTDIR=%{buildroot} %{_libdir}/*.so.* %doc README.md %doc mediacheck.md -%doc COPYING +%license COPYING %files -n libmediacheck-devel %defattr(-,root,root) From da6654ac9cdbbe1fa6a3ccda9c0e02574a2b89c110a1397267106cfd58354283 Mon Sep 17 00:00:00 2001 From: Steffen Winterfeldt Date: Wed, 17 Jul 2019 10:04:56 +0000 Subject: [PATCH 05/11] - release 5.1 OBS-URL: https://build.opensuse.org/package/show/system:install:head/checkmedia?expand=0&rev=50 --- checkmedia-5.0.tar.xz | 3 --- checkmedia-5.1.tar.xz | 3 +++ checkmedia.changes | 7 +++++++ checkmedia.spec | 4 ++-- 4 files changed, 12 insertions(+), 5 deletions(-) delete mode 100644 checkmedia-5.0.tar.xz create mode 100644 checkmedia-5.1.tar.xz diff --git a/checkmedia-5.0.tar.xz b/checkmedia-5.0.tar.xz deleted file mode 100644 index 212f626..0000000 --- a/checkmedia-5.0.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:4caca9ced0776f5235802e3180338c10d3cb3814a9a804342f6d31f5ae60c9cf -size 50404 diff --git a/checkmedia-5.1.tar.xz b/checkmedia-5.1.tar.xz new file mode 100644 index 0000000..6f4c603 --- /dev/null +++ b/checkmedia-5.1.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:86dfdbe26e3671effa125488597c34fc86b5335c52a17925fce08c80c73ed328 +size 50456 diff --git a/checkmedia.changes b/checkmedia.changes index 969df01..0c5d7ce 100644 --- a/checkmedia.changes +++ b/checkmedia.changes @@ -1,3 +1,10 @@ +-------------------------------------------------------------------- +Wed Jul 17 10:03:51 UTC 2019 - wfeldt@opensuse.org + +- merge gh#openSUSE/checkmedia#11 +- work also with older gpg versions +- 5.1 + ------------------------------------------------------------------- Wed Jul 17 08:29:09 UTC 2019 - Jan Engelhardt diff --git a/checkmedia.spec b/checkmedia.spec index 09a367a..6ee7f59 100644 --- a/checkmedia.spec +++ b/checkmedia.spec @@ -12,7 +12,7 @@ # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. -# Please submit bugfixes or comments via https://bugs.opensuse.org/ +# Please submit bugfixes or comments via http://bugs.opensuse.org/ # @@ -20,7 +20,7 @@ Name: checkmedia Summary: Check SUSE installation media License: GPL-3.0-or-later Group: System/Management -Version: 5.0 +Version: 5.1 Release: 0 Url: https://github.com/openSUSE/checkmedia Source: %{name}-%{version}.tar.xz From 2e78d2105704af93ebaa08f0393157d74be9f900df8f21e7d3d644e88b5d5a3c Mon Sep 17 00:00:00 2001 From: Steffen Winterfeldt Date: Wed, 17 Jul 2019 10:14:29 +0000 Subject: [PATCH 06/11] OBS-URL: https://build.opensuse.org/package/show/system:install:head/checkmedia?expand=0&rev=51 --- checkmedia.spec | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/checkmedia.spec b/checkmedia.spec index 6ee7f59..493fbdf 100644 --- a/checkmedia.spec +++ b/checkmedia.spec @@ -12,7 +12,7 @@ # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. -# Please submit bugfixes or comments via http://bugs.opensuse.org/ +# Please submit bugfixes or comments via https://bugs.opensuse.org/ # @@ -75,6 +75,7 @@ install -d -m 755 %{buildroot}/usr/bin %{_libdir}/*.so.* %doc README.md %doc mediacheck.md +%dir /usr/share/licenses %license COPYING %files -n libmediacheck-devel From 0d80830333cc19fdd7c5cb29a3ad491368671665047ca8bfc2403f263300b1e1 Mon Sep 17 00:00:00 2001 From: Steffen Winterfeldt Date: Wed, 17 Jul 2019 10:17:29 +0000 Subject: [PATCH 07/11] OBS-URL: https://build.opensuse.org/package/show/system:install:head/checkmedia?expand=0&rev=52 --- checkmedia.spec | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/checkmedia.spec b/checkmedia.spec index 493fbdf..9d67aed 100644 --- a/checkmedia.spec +++ b/checkmedia.spec @@ -75,8 +75,7 @@ install -d -m 755 %{buildroot}/usr/bin %{_libdir}/*.so.* %doc README.md %doc mediacheck.md -%dir /usr/share/licenses -%license COPYING +%doc COPYING %files -n libmediacheck-devel %defattr(-,root,root) From 7132d603da01c44affbd119afa4b3cabbc1fa638c939eda1b23d3882d79f4c6f Mon Sep 17 00:00:00 2001 From: Steffen Winterfeldt Date: Wed, 17 Jul 2019 10:22:45 +0000 Subject: [PATCH 08/11] OBS-URL: https://build.opensuse.org/package/show/system:install:head/checkmedia?expand=0&rev=53 --- checkmedia.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/checkmedia.spec b/checkmedia.spec index 9d67aed..32ea64c 100644 --- a/checkmedia.spec +++ b/checkmedia.spec @@ -25,6 +25,7 @@ Release: 0 Url: https://github.com/openSUSE/checkmedia Source: %{name}-%{version}.tar.xz BuildRequires: gpg +BuildRequires: xz BuildRoot: %{_tmppath}/%{name}-%{version}-build %description From cd996c40edfae99f7626bedbffffd4cb25cd75be89a0ad22c744b009d77c159a Mon Sep 17 00:00:00 2001 From: Steffen Winterfeldt Date: Wed, 17 Jul 2019 11:14:57 +0000 Subject: [PATCH 09/11] OBS-URL: https://build.opensuse.org/package/show/system:install:head/checkmedia?expand=0&rev=54 --- checkmedia.spec | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/checkmedia.spec b/checkmedia.spec index 32ea64c..0207c9c 100644 --- a/checkmedia.spec +++ b/checkmedia.spec @@ -76,7 +76,11 @@ install -d -m 755 %{buildroot}/usr/bin %{_libdir}/*.so.* %doc README.md %doc mediacheck.md +%if "%sles_version" == "11" %doc COPYING +%else +%license COPYING +%endif %files -n libmediacheck-devel %defattr(-,root,root) From 40ac315f388de5c79dd894d66ee9f08b345fae6871b587dd3158ea715480cc2e Mon Sep 17 00:00:00 2001 From: Steffen Winterfeldt Date: Wed, 17 Jul 2019 11:39:40 +0000 Subject: [PATCH 10/11] OBS-URL: https://build.opensuse.org/package/show/system:install:head/checkmedia?expand=0&rev=55 --- checkmedia.spec | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/checkmedia.spec b/checkmedia.spec index 0207c9c..fc5ee9a 100644 --- a/checkmedia.spec +++ b/checkmedia.spec @@ -76,10 +76,10 @@ install -d -m 755 %{buildroot}/usr/bin %{_libdir}/*.so.* %doc README.md %doc mediacheck.md -%if "%sles_version" == "11" -%doc COPYING -%else +%if %suse_version >= 1500 %license COPYING +%else +%doc COPYING %endif %files -n libmediacheck-devel From 5d726dcb265501788be9f7433378cdc53c391a2b3b9184a6e57c4d8e2c1bf323 Mon Sep 17 00:00:00 2001 From: Steffen Winterfeldt Date: Wed, 17 Jul 2019 11:46:32 +0000 Subject: [PATCH 11/11] - release 5.2 OBS-URL: https://build.opensuse.org/package/show/system:install:head/checkmedia?expand=0&rev=56 --- checkmedia-5.1.tar.xz | 3 --- checkmedia-5.2.tar.xz | 3 +++ checkmedia.changes | 7 +++++++ checkmedia.spec | 4 ++-- 4 files changed, 12 insertions(+), 5 deletions(-) delete mode 100644 checkmedia-5.1.tar.xz create mode 100644 checkmedia-5.2.tar.xz diff --git a/checkmedia-5.1.tar.xz b/checkmedia-5.1.tar.xz deleted file mode 100644 index 6f4c603..0000000 --- a/checkmedia-5.1.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:86dfdbe26e3671effa125488597c34fc86b5335c52a17925fce08c80c73ed328 -size 50456 diff --git a/checkmedia-5.2.tar.xz b/checkmedia-5.2.tar.xz new file mode 100644 index 0000000..cb01df9 --- /dev/null +++ b/checkmedia-5.2.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:35bf3ba6dce98e6f35c576a12e766e0234828e1e0de1f24f4cf0b5468038f722 +size 50480 diff --git a/checkmedia.changes b/checkmedia.changes index 0c5d7ce..a69c153 100644 --- a/checkmedia.changes +++ b/checkmedia.changes @@ -1,3 +1,10 @@ +-------------------------------------------------------------------- +Wed Jul 17 11:46:06 UTC 2019 - wfeldt@opensuse.org + +- merge gh#openSUSE/checkmedia#12 +- fix compat issue with older gcc +- 5.2 + -------------------------------------------------------------------- Wed Jul 17 10:03:51 UTC 2019 - wfeldt@opensuse.org diff --git a/checkmedia.spec b/checkmedia.spec index fc5ee9a..eddfc38 100644 --- a/checkmedia.spec +++ b/checkmedia.spec @@ -12,7 +12,7 @@ # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. -# Please submit bugfixes or comments via https://bugs.opensuse.org/ +# Please submit bugfixes or comments via http://bugs.opensuse.org/ # @@ -20,7 +20,7 @@ Name: checkmedia Summary: Check SUSE installation media License: GPL-3.0-or-later Group: System/Management -Version: 5.1 +Version: 5.2 Release: 0 Url: https://github.com/openSUSE/checkmedia Source: %{name}-%{version}.tar.xz