Hello community,
here is the log from the commit of package suse-module-tools for
openSUSE:Factory checked in at 2019-08-27 11:59:52
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/suse-module-tools (Old)
and /work/SRC/openSUSE:Factory/.suse-module-tools.new.7948 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "suse-module-tools"
Tue Aug 27 11:59:52 2019 rev:31 rq:723940 version:15.2.5
Changes:
--------
--- /work/SRC/openSUSE:Factory/suse-module-tools/suse-module-tools.changes
2019-07-21 11:28:36.516835440 +0200
+++
/work/SRC/openSUSE:Factory/.suse-module-tools.new.7948/suse-module-tools.changes
2019-08-27 11:59:57.451662855 +0200
@@ -1,0 +2,6 @@
+Fri Aug 16 08:46:15 UTC 2019 - [email protected]
+
+- Update to version 15.2.5:
+ * remove 'modhash' - moved to mokutil package (jsc#SLE-6094)
+
+-------------------------------------------------------------------
Old:
----
suse-module-tools-15.2.4.tar.xz
New:
----
suse-module-tools-15.2.5.tar.xz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ suse-module-tools.spec ++++++
--- /var/tmp/diff_new_pack.KxHCxe/_old 2019-08-27 11:59:59.131662622 +0200
+++ /var/tmp/diff_new_pack.KxHCxe/_new 2019-08-27 11:59:59.131662622 +0200
@@ -29,7 +29,7 @@
%endif
Name: suse-module-tools
-Version: 15.2.4
+Version: 15.2.5
Release: 0
Summary: Configuration for module loading and SUSE-specific utilities
for KMPs
License: GPL-2.0-or-later
@@ -116,8 +116,6 @@
install -d -m 755 "%{buildroot}%{_prefix}/bin"
install -pm 755 kmp-install "%{buildroot}%{_bindir}/"
-# modhash for calculating hash of signed kernel module
-install -pm 755 modhash "%{buildroot}%{_bindir}/"
# systemd service to load /boot/sysctl.conf-`uname -r`
install -d -m 755
"%{buildroot}%{_libexecdir}/systemd/system/systemd-sysctl.service.d"
@@ -258,7 +256,6 @@
%if 0%{?suse_version} < 1550
%{_rpmmacrodir}/macros.initrd
%endif
-%{_bindir}/modhash
%{_bindir}/kmp-install
%{_libexecdir}/module-init-tools
%exclude %{_libexecdir}/module-init-tools/weak-modules
++++++ _servicedata ++++++
--- /var/tmp/diff_new_pack.KxHCxe/_old 2019-08-27 11:59:59.159662618 +0200
+++ /var/tmp/diff_new_pack.KxHCxe/_new 2019-08-27 11:59:59.159662618 +0200
@@ -1,4 +1,4 @@
<servicedata>
<service name="tar_scm">
<param
name="url">https://github.com/openSUSE/suse-module-tools.git</param>
- <param
name="changesrevision">cff4830822fe2ba4e40649b58c70e3b178d003fc</param></service></servicedata>
\ No newline at end of file
+ <param
name="changesrevision">c60957409705d36e749e9543e9889483b1115774</param></service></servicedata>
\ No newline at end of file
++++++ suse-module-tools-15.2.4.tar.xz -> suse-module-tools-15.2.5.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/suse-module-tools-15.2.4/modhash
new/suse-module-tools-15.2.5/modhash
--- old/suse-module-tools-15.2.4/modhash 2019-07-15 13:55:54.000000000
+0200
+++ new/suse-module-tools-15.2.5/modhash 1970-01-01 01:00:00.000000000
+0100
@@ -1,149 +0,0 @@
-#!/usr/bin/perl
-#
-# Calculate the digest of the kernel module
-# It will strip kernel modules signature before calculation.
-#
-# Based on modsign-verify, written by Michal Marek
-# Authors:
-# Gary Lin <[email protected]>
-# Joey Lee <[email protected]>
-#
-
-my $USAGE = "Usage: modhash [-v] [-q] [-d <digest algorithm>] <module>\n";
-
-use strict;
-use warnings;
-use IPC::Open2;
-use Getopt::Long;
-use File::Temp qw(tempfile);
-
-my $verbose = 1;
-my $dgst = "sha256";
-GetOptions(
- "d=s" => \$dgst,
- "q|quiet" => sub { $verbose-- if $verbose; },
- "v|verbose" => sub { $verbose++; },
- "h|help" => sub {
- print $USAGE;
- exit(0);
- }
-) or die($USAGE);
-
-sub _verbose {
- my $level = shift;
-
- return if $verbose < $level;
- print STDERR @_;
-}
-
-sub info { _verbose(1, @_); }
-sub verbose { _verbose(2, @_); }
-sub debug { _verbose(3, @_); }
-
-if (@ARGV > 1) {
- print STDERR "Excess arguments\n";
- die($USAGE);
-} elsif (@ARGV < 1) {
- print STDERR "No module supplied\n";
- die($USAGE);
-}
-my $module_name = shift(@ARGV);
-
-if ($dgst ne "sha" and $dgst ne "sha1" and $dgst ne "sha256" and
- $dgst ne "sha384" and $dgst ne "sha512") {
- die("unsupported algorithm: $dgst");
-}
-
-#
-# Function to read the contents of a file into a variable.
-#
-sub read_file($)
-{
- my ($file) = @_;
- my $contents;
- my $len;
-
- open(FD, "<$file") || die $file;
- binmode FD;
- my @st = stat(FD);
- die $file if (!@st);
- $len = read(FD, $contents, $st[7]) || die $file;
- close(FD) || die $file;
- die "$file: Wanted length ", $st[7], ", got ", $len, "\n"
- if ($len != $st[7]);
- return $contents;
-}
-
-sub openssl_pipe($$) {
- my ($input, $cmd) = @_;
- my ($pid, $res);
-
- $pid = open2(*read_from, *write_to, $cmd) || die $cmd;
- binmode write_to;
- if (defined($input) && $input ne "") {
- print write_to $input || die "$cmd: $!";
- }
- close(write_to) || die "$cmd: $!";
-
- binmode read_from;
- read(read_from, $res, 4096) || die "$cmd: $!";
- close(read_from) || die "$cmd: $!";
- waitpid($pid, 0) || die;
- die "$cmd died: $?" if ($? >> 8);
- return $res;
-}
-
-my $module = read_file($module_name);
-my $module_len = length($module);
-my $magic_number = "~Module signature appended~\n";
-my $magic_len = length($magic_number);
-my $info_len = 12;
-
-if ($module_len < $magic_len) {
- die "Module size too short\n";
-}
-
-sub eat
-{
- my $length = shift;
- if ($module_len < $length) {
- die "Module size too short\n";
- }
- my $res = substr($module, -$length);
- $module = substr($module, 0, $module_len - $length);
- $module_len -= $length;
- return $res;
-}
-
-if (substr($module, -$magic_len) eq $magic_number) {
- $module = substr($module, 0, $module_len - $magic_len);
- $module_len -= $magic_len;
- my $info = eat($info_len);
- my ($algo, $hash, $id_type, $name_len, $key_len, $sig_len) =
- unpack("CCCCCxxxN", $info);
- my $signature = eat($sig_len);
- if ($id_type == 1) {
- if (unpack("n", $signature) == $sig_len - 2) {
- verbose ("signed module (X.509)\n");
- } else {
- die "Invalid signature format\n";
- }
- if ($algo != 1) {
- die "Unsupported signature algorithm\n";
- }
- $signature = substr($signature, 2);
- my $key_id = eat($key_len);
- my $name = eat($name_len);
- } elsif ($id_type == 2) {
- verbose ("signed module (PKCS#7)\n");
- }
-} else {
- verbose ("unsigned module\n");
-}
-
-verbose("Hash algorithm: $dgst\n");
-
-my $digest = openssl_pipe($module, "openssl dgst -$dgst");
-$digest =~ s/\(stdin\)= //;
-
-print "$module_name: $digest"
