Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package collectl for openSUSE:Factory
checked in at 2022-05-12 23:00:43
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/collectl (Old)
and /work/SRC/openSUSE:Factory/.collectl.new.1538 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "collectl"
Thu May 12 23:00:43 2022 rev:36 rq:976548 version:4.3.3
Changes:
--------
--- /work/SRC/openSUSE:Factory/collectl/collectl.changes 2021-09-21
21:13:37.946671868 +0200
+++ /work/SRC/openSUSE:Factory/.collectl.new.1538/collectl.changes
2022-05-12 23:01:13.632866635 +0200
@@ -1,0 +2,9 @@
+Mon May 2 17:37:21 UTC 2022 - Ferdinand Thiessen <r...@fthiessen.de>
+
+- Update to version 4.3.3
+ * Minor fix for HCA stats with Mellanox HCA's
+- Update to version 4.3.2
+ * Fix: The last command in perfquery is not in a loop and prevents
+ the collectl daemon from starting via the service.
+
+-------------------------------------------------------------------
Old:
----
collectl-4.3.1.src.tar.gz
New:
----
collectl-4.3.3.src.tar.gz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ collectl.spec ++++++
--- /var/tmp/diff_new_pack.PnnbqZ/_old 2022-05-12 23:01:14.160867344 +0200
+++ /var/tmp/diff_new_pack.PnnbqZ/_new 2022-05-12 23:01:14.164867349 +0200
@@ -1,7 +1,7 @@
#
# spec file for package collectl
#
-# 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,7 +17,7 @@
Name: collectl
-Version: 4.3.1
+Version: 4.3.3
Release: 0
Summary: System status data collection utility
License: Artistic-1.0 AND GPL-2.0-or-later
@@ -48,7 +48,7 @@
* API for importing additional data
%prep
-%setup -q
+%setup -q -n %{name}
%patch0 -p1
%build
@@ -90,11 +90,7 @@
%service_del_postun %{name}.service
%files
-%if 0%{?sle_version} <= 120200
-%doc COPYING ARTISTIC GPL
-%else
%license COPYING ARTISTIC GPL
-%endif
%doc docs/* README RELEASE-collectl
%{_unitdir}/collectl.service
%{_fillupdir}/sysconfig.collectl
++++++ collectl-4.3.1.src.tar.gz -> collectl-4.3.3.src.tar.gz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/collectl-4.3.1/.git/COMMIT_EDITMSG
new/collectl/.git/COMMIT_EDITMSG
--- old/collectl-4.3.1/.git/COMMIT_EDITMSG 1970-01-01 01:00:00.000000000
+0100
+++ new/collectl/.git/COMMIT_EDITMSG 2022-04-01 17:53:32.000000000 +0200
@@ -0,0 +1,16 @@
+Patch to fix IB collection in systems with multiple mellanox cards
+suggested-by: Gary Skouson
+
+The use of HCAName isn't right and should be HCAId, especially if you have
mellanox ethernet and IB in the same box, the '0' or $i isn't going to work
right. For example on one system, we have bonded ethernet on a mellanox
ethernet card and a separate IB card, so /sys/class/infiniband shows two
devices mlx5_2 and mlx5_bond_0.
+
+For the formatit.ph the logic isn't right. The $link comparison should be with
"eq" not "=". I also think we need to chomp $link to remove the newline before
the compare.
+
+# Please enter the commit message for your changes. Lines starting
+# with '#' will be ignored, and an empty message aborts the commit.
+# On branch master
+# Changes to be committed:
+# (use "git reset HEAD <file>..." to unstage)
+#
+# modified: collectl
+# modified: formatit.ph
+#
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/collectl-4.3.1/.git/HEAD new/collectl/.git/HEAD
--- old/collectl-4.3.1/.git/HEAD 1970-01-01 01:00:00.000000000 +0100
+++ new/collectl/.git/HEAD 2022-01-10 22:56:50.000000000 +0100
@@ -0,0 +1 @@
+ref: refs/heads/master
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/collectl-4.3.1/.git/config new/collectl/.git/config
--- old/collectl-4.3.1/.git/config 1970-01-01 01:00:00.000000000 +0100
+++ new/collectl/.git/config 2022-01-10 22:56:15.000000000 +0100
@@ -0,0 +1,11 @@
+[core]
+ repositoryformatversion = 0
+ filemode = true
+ bare = false
+ logallrefupdates = true
+[remote "origin"]
+ url = https://github.com/sharkcz/collectl.git
+ fetch = +refs/heads/*:refs/remotes/origin/*
+[branch "master"]
+ remote = origin
+ merge = refs/heads/master
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/collectl-4.3.1/.git/description
new/collectl/.git/description
--- old/collectl-4.3.1/.git/description 1970-01-01 01:00:00.000000000 +0100
+++ new/collectl/.git/description 2022-01-10 22:56:14.000000000 +0100
@@ -0,0 +1 @@
+Unnamed repository; edit this file 'description' to name the repository.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/collectl-4.3.1/.git/hooks/applypatch-msg.sample
new/collectl/.git/hooks/applypatch-msg.sample
--- old/collectl-4.3.1/.git/hooks/applypatch-msg.sample 1970-01-01
01:00:00.000000000 +0100
+++ new/collectl/.git/hooks/applypatch-msg.sample 2022-01-10
22:56:14.000000000 +0100
@@ -0,0 +1,15 @@
+#!/bin/sh
+#
+# An example hook script to check the commit log message taken by
+# applypatch from an e-mail message.
+#
+# The hook should exit with non-zero status after issuing an
+# appropriate message if it wants to stop the commit. The hook is
+# allowed to edit the commit message file.
+#
+# To enable this hook, rename this file to "applypatch-msg".
+
+. git-sh-setup
+test -x "$GIT_DIR/hooks/commit-msg" &&
+ exec "$GIT_DIR/hooks/commit-msg" ${1+"$@"}
+:
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/collectl-4.3.1/.git/hooks/commit-msg.sample
new/collectl/.git/hooks/commit-msg.sample
--- old/collectl-4.3.1/.git/hooks/commit-msg.sample 1970-01-01
01:00:00.000000000 +0100
+++ new/collectl/.git/hooks/commit-msg.sample 2022-01-10 22:56:14.000000000
+0100
@@ -0,0 +1,24 @@
+#!/bin/sh
+#
+# An example hook script to check the commit log message.
+# Called by "git commit" with one argument, the name of the file
+# that has the commit message. The hook should exit with non-zero
+# status after issuing an appropriate message if it wants to stop the
+# commit. The hook is allowed to edit the commit message file.
+#
+# To enable this hook, rename this file to "commit-msg".
+
+# Uncomment the below to add a Signed-off-by line to the message.
+# Doing this in a hook is a bad idea in general, but the prepare-commit-msg
+# hook is more suited to it.
+#
+# SOB=$(git var GIT_AUTHOR_IDENT | sed -n 's/^\(.*>\).*$/Signed-off-by: \1/p')
+# grep -qs "^$SOB" "$1" || echo "$SOB" >> "$1"
+
+# This example catches duplicate Signed-off-by lines.
+
+test "" = "$(grep '^Signed-off-by: ' "$1" |
+ sort | uniq -c | sed -e '/^[ ]*1[ ]/d')" || {
+ echo >&2 Duplicate Signed-off-by lines.
+ exit 1
+}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/collectl-4.3.1/.git/hooks/post-update.sample
new/collectl/.git/hooks/post-update.sample
--- old/collectl-4.3.1/.git/hooks/post-update.sample 1970-01-01
01:00:00.000000000 +0100
+++ new/collectl/.git/hooks/post-update.sample 2022-01-10 22:56:14.000000000
+0100
@@ -0,0 +1,8 @@
+#!/bin/sh
+#
+# An example hook script to prepare a packed repository for use over
+# dumb transports.
+#
+# To enable this hook, rename this file to "post-update".
+
+exec git update-server-info
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/collectl-4.3.1/.git/hooks/pre-applypatch.sample
new/collectl/.git/hooks/pre-applypatch.sample
--- old/collectl-4.3.1/.git/hooks/pre-applypatch.sample 1970-01-01
01:00:00.000000000 +0100
+++ new/collectl/.git/hooks/pre-applypatch.sample 2022-01-10
22:56:14.000000000 +0100
@@ -0,0 +1,14 @@
+#!/bin/sh
+#
+# An example hook script to verify what is about to be committed
+# by applypatch from an e-mail message.
+#
+# The hook should exit with non-zero status after issuing an
+# appropriate message if it wants to stop the commit.
+#
+# To enable this hook, rename this file to "pre-applypatch".
+
+. git-sh-setup
+test -x "$GIT_DIR/hooks/pre-commit" &&
+ exec "$GIT_DIR/hooks/pre-commit" ${1+"$@"}
+:
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/collectl-4.3.1/.git/hooks/pre-commit.sample
new/collectl/.git/hooks/pre-commit.sample
--- old/collectl-4.3.1/.git/hooks/pre-commit.sample 1970-01-01
01:00:00.000000000 +0100
+++ new/collectl/.git/hooks/pre-commit.sample 2022-01-10 22:56:14.000000000
+0100
@@ -0,0 +1,50 @@
+#!/bin/sh
+#
+# An example hook script to verify what is about to be committed.
+# Called by "git commit" with no arguments. The hook should
+# exit with non-zero status after issuing an appropriate message if
+# it wants to stop the commit.
+#
+# To enable this hook, rename this file to "pre-commit".
+
+if git rev-parse --verify HEAD >/dev/null 2>&1
+then
+ against=HEAD
+else
+ # Initial commit: diff against an empty tree object
+ against=4b825dc642cb6eb9a060e54bf8d69288fbee4904
+fi
+
+# If you want to allow non-ascii filenames set this variable to true.
+allownonascii=$(git config hooks.allownonascii)
+
+# Redirect output to stderr.
+exec 1>&2
+
+# Cross platform projects tend to avoid non-ascii filenames; prevent
+# them from being added to the repository. We exploit the fact that the
+# printable range starts at the space character and ends with tilde.
+if [ "$allownonascii" != "true" ] &&
+ # Note that the use of brackets around a tr range is ok here, (it's
+ # even required, for portability to Solaris 10's /usr/bin/tr), since
+ # the square bracket bytes happen to fall in the designated range.
+ test $(git diff --cached --name-only --diff-filter=A -z $against |
+ LC_ALL=C tr -d '[ -~]\0' | wc -c) != 0
+then
+ echo "Error: Attempt to add a non-ascii file name."
+ echo
+ echo "This can cause problems if you want to work"
+ echo "with people on other platforms."
+ echo
+ echo "To be portable it is advisable to rename the file ..."
+ echo
+ echo "If you know what you are doing you can disable this"
+ echo "check using:"
+ echo
+ echo " git config hooks.allownonascii true"
+ echo
+ exit 1
+fi
+
+# If there are whitespace errors, print the offending file names and fail.
+exec git diff-index --check --cached $against --
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/collectl-4.3.1/.git/hooks/pre-push.sample
new/collectl/.git/hooks/pre-push.sample
--- old/collectl-4.3.1/.git/hooks/pre-push.sample 1970-01-01
01:00:00.000000000 +0100
+++ new/collectl/.git/hooks/pre-push.sample 2022-01-10 22:56:14.000000000
+0100
@@ -0,0 +1,53 @@
+#!/bin/sh
+
+# An example hook script to verify what is about to be pushed. Called by "git
+# push" after it has checked the remote status, but before anything has been
+# pushed. If this script exits with a non-zero status nothing will be pushed.
+#
+# This hook is called with the following parameters:
+#
+# $1 -- Name of the remote to which the push is being done
+# $2 -- URL to which the push is being done
+#
+# If pushing without using a named remote those arguments will be equal.
+#
+# Information about the commits which are being pushed is supplied as lines to
+# the standard input in the form:
+#
+# <local ref> <local sha1> <remote ref> <remote sha1>
+#
+# This sample shows how to prevent push of commits where the log message starts
+# with "WIP" (work in progress).
+
+remote="$1"
+url="$2"
+
+z40=0000000000000000000000000000000000000000
+
+IFS=' '
+while read local_ref local_sha remote_ref remote_sha
+do
+ if [ "$local_sha" = $z40 ]
+ then
+ # Handle delete
+ else
+ if [ "$remote_sha" = $z40 ]
+ then
+ # New branch, examine all commits
+ range="$local_sha"
+ else
+ # Update to existing branch, examine new commits
+ range="$remote_sha..$local_sha"
+ fi
+
+ # Check for WIP commit
+ commit=`git rev-list -n 1 --grep '^WIP' "$range"`
+ if [ -n "$commit" ]
+ then
+ echo "Found WIP commit in $local_ref, not pushing"
+ exit 1
+ fi
+ fi
+done
+
+exit 0
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/collectl-4.3.1/.git/hooks/pre-rebase.sample
new/collectl/.git/hooks/pre-rebase.sample
--- old/collectl-4.3.1/.git/hooks/pre-rebase.sample 1970-01-01
01:00:00.000000000 +0100
+++ new/collectl/.git/hooks/pre-rebase.sample 2022-01-10 22:56:14.000000000
+0100
@@ -0,0 +1,169 @@
+#!/bin/sh
+#
+# Copyright (c) 2006, 2008 Junio C Hamano
+#
+# The "pre-rebase" hook is run just before "git rebase" starts doing
+# its job, and can prevent the command from running by exiting with
+# non-zero status.
+#
+# The hook is called with the following parameters:
+#
+# $1 -- the upstream the series was forked from.
+# $2 -- the branch being rebased (or empty when rebasing the current branch).
+#
+# This sample shows how to prevent topic branches that are already
+# merged to 'next' branch from getting rebased, because allowing it
+# would result in rebasing already published history.
+
+publish=next
+basebranch="$1"
+if test "$#" = 2
+then
+ topic="refs/heads/$2"
+else
+ topic=`git symbolic-ref HEAD` ||
+ exit 0 ;# we do not interrupt rebasing detached HEAD
+fi
+
+case "$topic" in
+refs/heads/??/*)
+ ;;
+*)
+ exit 0 ;# we do not interrupt others.
+ ;;
+esac
+
+# Now we are dealing with a topic branch being rebased
+# on top of master. Is it OK to rebase it?
+
+# Does the topic really exist?
+git show-ref -q "$topic" || {
+ echo >&2 "No such branch $topic"
+ exit 1
+}
+
+# Is topic fully merged to master?
+not_in_master=`git rev-list --pretty=oneline ^master "$topic"`
+if test -z "$not_in_master"
+then
+ echo >&2 "$topic is fully merged to master; better remove it."
+ exit 1 ;# we could allow it, but there is no point.
+fi
+
+# Is topic ever merged to next? If so you should not be rebasing it.
+only_next_1=`git rev-list ^master "^$topic" ${publish} | sort`
+only_next_2=`git rev-list ^master ${publish} | sort`
+if test "$only_next_1" = "$only_next_2"
+then
+ not_in_topic=`git rev-list "^$topic" master`
+ if test -z "$not_in_topic"
+ then
+ echo >&2 "$topic is already up-to-date with master"
+ exit 1 ;# we could allow it, but there is no point.
+ else
+ exit 0
+ fi
+else
+ not_in_next=`git rev-list --pretty=oneline ^${publish} "$topic"`
+ /usr/bin/perl -e '
+ my $topic = $ARGV[0];
+ my $msg = "* $topic has commits already merged to public
branch:\n";
+ my (%not_in_next) = map {
+ /^([0-9a-f]+) /;
+ ($1 => 1);
+ } split(/\n/, $ARGV[1]);
+ for my $elem (map {
+ /^([0-9a-f]+) (.*)$/;
+ [$1 => $2];
+ } split(/\n/, $ARGV[2])) {
+ if (!exists $not_in_next{$elem->[0]}) {
+ if ($msg) {
+ print STDERR $msg;
+ undef $msg;
+ }
+ print STDERR " $elem->[1]\n";
+ }
+ }
+ ' "$topic" "$not_in_next" "$not_in_master"
+ exit 1
+fi
+
+exit 0
+
+################################################################
+
+This sample hook safeguards topic branches that have been
+published from being rewound.
+
+The workflow assumed here is:
+
+ * Once a topic branch forks from "master", "master" is never
+ merged into it again (either directly or indirectly).
+
+ * Once a topic branch is fully cooked and merged into "master",
+ it is deleted. If you need to build on top of it to correct
+ earlier mistakes, a new topic branch is created by forking at
+ the tip of the "master". This is not strictly necessary, but
+ it makes it easier to keep your history simple.
+
+ * Whenever you need to test or publish your changes to topic
+ branches, merge them into "next" branch.
+
+The script, being an example, hardcodes the publish branch name
+to be "next", but it is trivial to make it configurable via
+$GIT_DIR/config mechanism.
+
+With this workflow, you would want to know:
+
+(1) ... if a topic branch has ever been merged to "next". Young
+ topic branches can have stupid mistakes you would rather
+ clean up before publishing, and things that have not been
+ merged into other branches can be easily rebased without
+ affecting other people. But once it is published, you would
+ not want to rewind it.
+
+(2) ... if a topic branch has been fully merged to "master".
+ Then you can delete it. More importantly, you should not
+ build on top of it -- other people may already want to
+ change things related to the topic as patches against your
+ "master", so if you need further changes, it is better to
+ fork the topic (perhaps with the same name) afresh from the
+ tip of "master".
+
+Let's look at this example:
+
+ o---o---o---o---o---o---o---o---o---o "next"
+ / / / /
+ / a---a---b A / /
+ / / / /
+ / / c---c---c---c B /
+ / / / \ /
+ / / / b---b C \ /
+ / / / / \ /
+ ---o---o---o---o---o---o---o---o---o---o---o "master"
+
+
+A, B and C are topic branches.
+
+ * A has one fix since it was merged up to "next".
+
+ * B has finished. It has been fully merged up to "master" and "next",
+ and is ready to be deleted.
+
+ * C has not merged to "next" at all.
+
+We would want to allow C to be rebased, refuse A, and encourage
+B to be deleted.
+
+To compute (1):
+
+ git rev-list ^master ^topic next
+ git rev-list ^master next
+
+ if these match, topic has not merged in next at all.
+
+To compute (2):
+
+ git rev-list master..topic
+
+ if this is empty, it is fully merged to "master".
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/collectl-4.3.1/.git/hooks/prepare-commit-msg.sample
new/collectl/.git/hooks/prepare-commit-msg.sample
--- old/collectl-4.3.1/.git/hooks/prepare-commit-msg.sample 1970-01-01
01:00:00.000000000 +0100
+++ new/collectl/.git/hooks/prepare-commit-msg.sample 2022-01-10
22:56:14.000000000 +0100
@@ -0,0 +1,36 @@
+#!/bin/sh
+#
+# An example hook script to prepare the commit log message.
+# Called by "git commit" with the name of the file that has the
+# commit message, followed by the description of the commit
+# message's source. The hook's purpose is to edit the commit
+# message file. If the hook fails with a non-zero status,
+# the commit is aborted.
+#
+# To enable this hook, rename this file to "prepare-commit-msg".
+
+# This hook includes three examples. The first comments out the
+# "Conflicts:" part of a merge commit.
+#
+# The second includes the output of "git diff --name-status -r"
+# into the message, just before the "git status" output. It is
+# commented because it doesn't cope with --amend or with squashed
+# commits.
+#
+# The third example adds a Signed-off-by line to the message, that can
+# still be edited. This is rarely a good idea.
+
+case "$2,$3" in
+ merge,)
+ /usr/bin/perl -i.bak -ne 's/^/# /, s/^# #/#/ if /^Conflicts/ .. /#/;
print' "$1" ;;
+
+# ,|template,)
+# /usr/bin/perl -i.bak -pe '
+# print "\n" . `git diff --cached --name-status -r`
+# if /^#/ && $first++ == 0' "$1" ;;
+
+ *) ;;
+esac
+
+# SOB=$(git var GIT_AUTHOR_IDENT | sed -n 's/^\(.*>\).*$/Signed-off-by: \1/p')
+# grep -qs "^$SOB" "$1" || echo "$SOB" >> "$1"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/collectl-4.3.1/.git/hooks/update.sample
new/collectl/.git/hooks/update.sample
--- old/collectl-4.3.1/.git/hooks/update.sample 1970-01-01 01:00:00.000000000
+0100
+++ new/collectl/.git/hooks/update.sample 2022-01-10 22:56:14.000000000
+0100
@@ -0,0 +1,128 @@
+#!/bin/sh
+#
+# An example hook script to blocks unannotated tags from entering.
+# Called by "git receive-pack" with arguments: refname sha1-old sha1-new
+#
+# To enable this hook, rename this file to "update".
+#
+# Config
+# ------
+# hooks.allowunannotated
+# This boolean sets whether unannotated tags will be allowed into the
+# repository. By default they won't be.
+# hooks.allowdeletetag
+# This boolean sets whether deleting tags will be allowed in the
+# repository. By default they won't be.
+# hooks.allowmodifytag
+# This boolean sets whether a tag may be modified after creation. By default
+# it won't be.
+# hooks.allowdeletebranch
+# This boolean sets whether deleting branches will be allowed in the
+# repository. By default they won't be.
+# hooks.denycreatebranch
+# This boolean sets whether remotely creating branches will be denied
+# in the repository. By default this is allowed.
+#
+
+# --- Command line
+refname="$1"
+oldrev="$2"
+newrev="$3"
+
+# --- Safety check
+if [ -z "$GIT_DIR" ]; then
+ echo "Don't run this script from the command line." >&2
+ echo " (if you want, you could supply GIT_DIR then run" >&2
+ echo " $0 <ref> <oldrev> <newrev>)" >&2
+ exit 1
+fi
+
+if [ -z "$refname" -o -z "$oldrev" -o -z "$newrev" ]; then
+ echo "usage: $0 <ref> <oldrev> <newrev>" >&2
+ exit 1
+fi
+
+# --- Config
+allowunannotated=$(git config --bool hooks.allowunannotated)
+allowdeletebranch=$(git config --bool hooks.allowdeletebranch)
+denycreatebranch=$(git config --bool hooks.denycreatebranch)
+allowdeletetag=$(git config --bool hooks.allowdeletetag)
+allowmodifytag=$(git config --bool hooks.allowmodifytag)
+
+# check for no description
+projectdesc=$(sed -e '1q' "$GIT_DIR/description")
+case "$projectdesc" in
+"Unnamed repository"* | "")
+ echo "*** Project description file hasn't been set" >&2
+ exit 1
+ ;;
+esac
+
+# --- Check types
+# if $newrev is 0000...0000, it's a commit to delete a ref.
+zero="0000000000000000000000000000000000000000"
+if [ "$newrev" = "$zero" ]; then
+ newrev_type=delete
+else
+ newrev_type=$(git cat-file -t $newrev)
+fi
+
+case "$refname","$newrev_type" in
+ refs/tags/*,commit)
+ # un-annotated tag
+ short_refname=${refname##refs/tags/}
+ if [ "$allowunannotated" != "true" ]; then
+ echo "*** The un-annotated tag, $short_refname, is not
allowed in this repository" >&2
+ echo "*** Use 'git tag [ -a | -s ]' for tags you want
to propagate." >&2
+ exit 1
+ fi
+ ;;
+ refs/tags/*,delete)
+ # delete tag
+ if [ "$allowdeletetag" != "true" ]; then
+ echo "*** Deleting a tag is not allowed in this
repository" >&2
+ exit 1
+ fi
+ ;;
+ refs/tags/*,tag)
+ # annotated tag
+ if [ "$allowmodifytag" != "true" ] && git rev-parse $refname >
/dev/null 2>&1
+ then
+ echo "*** Tag '$refname' already exists." >&2
+ echo "*** Modifying a tag is not allowed in this
repository." >&2
+ exit 1
+ fi
+ ;;
+ refs/heads/*,commit)
+ # branch
+ if [ "$oldrev" = "$zero" -a "$denycreatebranch" = "true" ]; then
+ echo "*** Creating a branch is not allowed in this
repository" >&2
+ exit 1
+ fi
+ ;;
+ refs/heads/*,delete)
+ # delete branch
+ if [ "$allowdeletebranch" != "true" ]; then
+ echo "*** Deleting a branch is not allowed in this
repository" >&2
+ exit 1
+ fi
+ ;;
+ refs/remotes/*,commit)
+ # tracking branch
+ ;;
+ refs/remotes/*,delete)
+ # delete tracking branch
+ if [ "$allowdeletebranch" != "true" ]; then
+ echo "*** Deleting a tracking branch is not allowed in
this repository" >&2
+ exit 1
+ fi
+ ;;
+ *)
+ # Anything else (is there anything else?)
+ echo "*** Update hook: unknown type of update to ref $refname
of type $newrev_type" >&2
+ exit 1
+ ;;
+esac
+
+# --- Finished
+exit 0
Binary files old/collectl-4.3.1/.git/index and new/collectl/.git/index differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/collectl-4.3.1/.git/info/exclude
new/collectl/.git/info/exclude
--- old/collectl-4.3.1/.git/info/exclude 1970-01-01 01:00:00.000000000
+0100
+++ new/collectl/.git/info/exclude 2022-01-10 22:56:14.000000000 +0100
@@ -0,0 +1,6 @@
+# git ls-files --others --exclude-from=.git/info/exclude
+# Lines that start with '#' are comments.
+# For a project mostly in C, the following would be a good set of
+# exclude patterns (uncomment them if you want to use them):
+# *.[oa]
+# *~
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/collectl-4.3.1/.git/logs/HEAD
new/collectl/.git/logs/HEAD
--- old/collectl-4.3.1/.git/logs/HEAD 1970-01-01 01:00:00.000000000 +0100
+++ new/collectl/.git/logs/HEAD 2022-04-01 17:53:32.000000000 +0200
@@ -0,0 +1,4 @@
+0000000000000000000000000000000000000000
dc327fab45370c2f04bf174f8003a75b5134e7e8 Laurence Oberman <lober...@redhat.com>
1641851775 -0500 clone: from https://github.com/sharkcz/collectl.git
+dc327fab45370c2f04bf174f8003a75b5134e7e8
dc327fab45370c2f04bf174f8003a75b5134e7e8 Laurence Oberman <lober...@redhat.com>
1641851810 -0500 checkout: moving from master to master
+dc327fab45370c2f04bf174f8003a75b5134e7e8
8c37d5f9a64457b6e75f31d094503e4feb9808f0 Laurence Oberman <lober...@redhat.com>
1642006659 -0500 commit: Added specifics about version 4.3.2 and uploaded
new version to Sourceforge
+8c37d5f9a64457b6e75f31d094503e4feb9808f0
517c19c94ae623eb7ab373edff1563328d03eb2b Laurence Oberman <lober...@redhat.com>
1648828322 -0400 commit: Patch to fix IB collection in systems with
multiple mellanox cards
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/collectl-4.3.1/.git/logs/refs/heads/master
new/collectl/.git/logs/refs/heads/master
--- old/collectl-4.3.1/.git/logs/refs/heads/master 1970-01-01
01:00:00.000000000 +0100
+++ new/collectl/.git/logs/refs/heads/master 2022-04-01 17:53:32.000000000
+0200
@@ -0,0 +1,3 @@
+0000000000000000000000000000000000000000
dc327fab45370c2f04bf174f8003a75b5134e7e8 Laurence Oberman <lober...@redhat.com>
1641851775 -0500 clone: from https://github.com/sharkcz/collectl.git
+dc327fab45370c2f04bf174f8003a75b5134e7e8
8c37d5f9a64457b6e75f31d094503e4feb9808f0 Laurence Oberman <lober...@redhat.com>
1642006659 -0500 commit: Added specifics about version 4.3.2 and uploaded
new version to Sourceforge
+8c37d5f9a64457b6e75f31d094503e4feb9808f0
517c19c94ae623eb7ab373edff1563328d03eb2b Laurence Oberman <lober...@redhat.com>
1648828322 -0400 commit: Patch to fix IB collection in systems with
multiple mellanox cards
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/collectl-4.3.1/.git/logs/refs/remotes/origin/HEAD
new/collectl/.git/logs/refs/remotes/origin/HEAD
--- old/collectl-4.3.1/.git/logs/refs/remotes/origin/HEAD 1970-01-01
01:00:00.000000000 +0100
+++ new/collectl/.git/logs/refs/remotes/origin/HEAD 2022-01-10
22:56:15.000000000 +0100
@@ -0,0 +1 @@
+0000000000000000000000000000000000000000
dc327fab45370c2f04bf174f8003a75b5134e7e8 Laurence Oberman <lober...@redhat.com>
1641851775 -0500 clone: from https://github.com/sharkcz/collectl.git
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/collectl-4.3.1/.git/logs/refs/remotes/origin/master
new/collectl/.git/logs/refs/remotes/origin/master
--- old/collectl-4.3.1/.git/logs/refs/remotes/origin/master 1970-01-01
01:00:00.000000000 +0100
+++ new/collectl/.git/logs/refs/remotes/origin/master 2022-01-12
18:00:47.000000000 +0100
@@ -0,0 +1 @@
+dc327fab45370c2f04bf174f8003a75b5134e7e8
8c37d5f9a64457b6e75f31d094503e4feb9808f0 Laurence Oberman <lober...@redhat.com>
1642006847 -0500 update by push
Binary files
old/collectl-4.3.1/.git/objects/23/342b21d9cfdc678f71d553a45e890a87d5ff4b and
new/collectl/.git/objects/23/342b21d9cfdc678f71d553a45e890a87d5ff4b differ
Binary files
old/collectl-4.3.1/.git/objects/51/7c19c94ae623eb7ab373edff1563328d03eb2b and
new/collectl/.git/objects/51/7c19c94ae623eb7ab373edff1563328d03eb2b differ
Binary files
old/collectl-4.3.1/.git/objects/5b/b4724733c6a90a9e378f3b2d4600d77dd9dc15 and
new/collectl/.git/objects/5b/b4724733c6a90a9e378f3b2d4600d77dd9dc15 differ
Binary files
old/collectl-4.3.1/.git/objects/71/808794b0498b5681667efc18f8c27462977778 and
new/collectl/.git/objects/71/808794b0498b5681667efc18f8c27462977778 differ
Binary files
old/collectl-4.3.1/.git/objects/86/850e42e9e57666b85029eef77ef19d268954ee and
new/collectl/.git/objects/86/850e42e9e57666b85029eef77ef19d268954ee differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/collectl-4.3.1/.git/objects/8c/37d5f9a64457b6e75f31d094503e4feb9808f0
new/collectl/.git/objects/8c/37d5f9a64457b6e75f31d094503e4feb9808f0
--- old/collectl-4.3.1/.git/objects/8c/37d5f9a64457b6e75f31d094503e4feb9808f0
1970-01-01 01:00:00.000000000 +0100
+++ new/collectl/.git/objects/8c/37d5f9a64457b6e75f31d094503e4feb9808f0
2022-01-12 17:58:09.000000000 +0100
@@ -0,0 +1,2 @@
+x??Kj?0D??)?c??X2 !?d???V?0VYN? ?@?]QU??$??t0?O?1C?i??Q
+?K@;Z?YO:3f7{???Q??!'?}?h???tA?????!???e?A????????K
o??J??U/?????d}?q?q?? t??t??????n9s?}???%?@Q????E*??
?f8???O???_???h???V?Ya?
\ No newline at end of file
Binary files
old/collectl-4.3.1/.git/objects/b2/c98e5a5ac800f0f8041422e262de0d597e4548 and
new/collectl/.git/objects/b2/c98e5a5ac800f0f8041422e262de0d597e4548 differ
Binary files
old/collectl-4.3.1/.git/objects/pack/pack-f49b62add4d6393640261bba5b900c7fdd5fe130.idx
and
new/collectl/.git/objects/pack/pack-f49b62add4d6393640261bba5b900c7fdd5fe130.idx
differ
Binary files
old/collectl-4.3.1/.git/objects/pack/pack-f49b62add4d6393640261bba5b900c7fdd5fe130.pack
and
new/collectl/.git/objects/pack/pack-f49b62add4d6393640261bba5b900c7fdd5fe130.pack
differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/collectl-4.3.1/.git/packed-refs
new/collectl/.git/packed-refs
--- old/collectl-4.3.1/.git/packed-refs 1970-01-01 01:00:00.000000000 +0100
+++ new/collectl/.git/packed-refs 2022-01-10 22:56:15.000000000 +0100
@@ -0,0 +1,50 @@
+# pack-refs with: peeled fully-peeled
+dc327fab45370c2f04bf174f8003a75b5134e7e8 refs/remotes/origin/master
+352b465ed938a4307c8ca1807d4943bcb4eb562f refs/tags/2.3.1
+4e8c98be61cdb0fc3d7cd78aa4fc7827eb683ea0 refs/tags/2.3.2
+fdc730dee91d438384cc34a28a1f168d6bead168 refs/tags/2.3.3
+68fe478fef913fd3c85358c2458fa9d08d222055 refs/tags/2.3.4
+d3ba7f5290e826decba0ec5abb100f7939eb2faa refs/tags/2.4.0
+0c635bb841faeaa8b261851d1825f7f40da7f1e9 refs/tags/2.4.1
+1cd3324019d5cccf3d90cb030bd34aa9c7db1576 refs/tags/2.4.2
+483b0b42b5e31a72bfeb7fc99136e06c1beaa38b refs/tags/2.4.3
+e6aaf1ae0954e2fe0266b8b3e1bc61802357be77 refs/tags/2.5.0
+3d62dd07649b72d416e702a4e28ae5384fdbe276 refs/tags/2.5.1
+d0e4ce9112fcbe7bc5eed94079ac59d81996118e refs/tags/2.6.2
+77b59db8806055c42834c29a88e98693b9fd0ab5 refs/tags/2.6.4
+50e6b80d446ecd68c6662ee5281db0da02ede3cd refs/tags/3.0.0
+f2c6953a69e0e088873d43e2e02850b2af02229e refs/tags/3.1.0
+30dc9ce8eee1ea26f8c93915f9d43ce99eab4f34 refs/tags/3.1.1
+cfb9fef88945d4af9f792bdf445da453bb30005a refs/tags/3.1.2
+aa4e313ccd960740969f820f028549b7cfb6b68f refs/tags/3.1.3
+6d6f72c70a498916d0361a9b136fa018e55f4326 refs/tags/3.2.1
+249eaea61ede3e258e4b408653b910ec9fb15977 refs/tags/3.3.2
+d69651074b9f607a9cfae92b5f33858dc8549183 refs/tags/3.3.4
+6110cb80db17023e66c0effa41a27b711587967b refs/tags/3.3.5
+61deac0bcf89ded889ae356f1aa310f5ad1fddc9 refs/tags/3.3.6
+cff91da2e6baa0b8dc805b9092f4c20204a32b15 refs/tags/3.4.0
+94ffcb2fc2cf25b00711c0898697e738a6c77d64 refs/tags/3.4.1
+b03ab13187165bc619dfb41c9437800fd58a7543 refs/tags/3.4.2
+aef81872173ae8ce7bb64a3a2f068fc1199b9307 refs/tags/3.4.3
+56bd47aa48671471c7eeda804a47ab3edd527f90 refs/tags/3.5.0
+62ddaed721fb320e5f72f7594f13424103c1fd62 refs/tags/3.5.1
+0f47653198860d4f3612a27845004ab8e98406c6 refs/tags/3.6.0
+a8979d149bc5aeb37d7d9d76892adfdd060c4965 refs/tags/3.6.1
+2fd94b17dc036dc44a2f507dac9cdd0bfd237aeb refs/tags/3.6.3
+119a6ef57c4064fe1d6ed56fe4e7c698e1053b8e refs/tags/3.6.5
+b2f2804f3769a1c6da38a12934bc30b8ead4b48e refs/tags/3.6.7
+aae572a91e835e020bb81e4782374b874dc67ccc refs/tags/3.6.8
+4e7787c5ea5894df4d8f232942f858f2dd1d4745 refs/tags/3.6.9
+10f57c30c953398fca7d14b92d49cc69acec0202 refs/tags/3.7.3
+51358880848132a129ad5bf968630b91e9409f60 refs/tags/3.7.4
+6d85f5088c889c5ebe38ba1a31fa276cbe1488d1 refs/tags/4.0.0
+4fe5bae216845467a692845ec88a140286434296 refs/tags/4.0.2
+11eb4b4dbe5055df08768a32af1738b3b52cdd47 refs/tags/4.0.4
+64e963af0b456daa2cd8074e2dbc598aaa700105 refs/tags/4.0.5
+2346c02ea650c4b5ee3ccaa50739b22ae309f4a1 refs/tags/4.1.0
+13195fa36fdd65732306e86841b17cd8cdb559d1 refs/tags/4.1.2
+f4ac2c6dfba0ce35971e098d86cbede3fb3a11cd refs/tags/4.1.3
+c1156cc22df16de7d7ce80520a0beea7259e98cc refs/tags/4.2.0
+7e23c5ee7d8a0d193a0c414001f047ce4e5c24f1 refs/tags/4.3.0
+42450515addc328251e62c4182b3a609698d26dc refs/tags/4.3.1
+dc327fab45370c2f04bf174f8003a75b5134e7e8 refs/tags/4.3.2
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/collectl-4.3.1/.git/refs/heads/master
new/collectl/.git/refs/heads/master
--- old/collectl-4.3.1/.git/refs/heads/master 1970-01-01 01:00:00.000000000
+0100
+++ new/collectl/.git/refs/heads/master 2022-04-01 17:53:32.000000000 +0200
@@ -0,0 +1 @@
+517c19c94ae623eb7ab373edff1563328d03eb2b
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/collectl-4.3.1/.git/refs/remotes/origin/HEAD
new/collectl/.git/refs/remotes/origin/HEAD
--- old/collectl-4.3.1/.git/refs/remotes/origin/HEAD 1970-01-01
01:00:00.000000000 +0100
+++ new/collectl/.git/refs/remotes/origin/HEAD 2022-01-10 22:56:15.000000000
+0100
@@ -0,0 +1 @@
+ref: refs/remotes/origin/master
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/collectl-4.3.1/.git/refs/remotes/origin/master
new/collectl/.git/refs/remotes/origin/master
--- old/collectl-4.3.1/.git/refs/remotes/origin/master 1970-01-01
01:00:00.000000000 +0100
+++ new/collectl/.git/refs/remotes/origin/master 2022-01-12
18:00:47.000000000 +0100
@@ -0,0 +1 @@
+8c37d5f9a64457b6e75f31d094503e4feb9808f0
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/collectl-4.3.1/RELEASE-collectl
new/collectl/RELEASE-collectl
--- old/collectl-4.3.1/RELEASE-collectl 2018-11-01 14:47:48.000000000 +0100
+++ new/collectl/RELEASE-collectl 2022-04-01 23:15:26.000000000 +0200
@@ -27,6 +27,13 @@
COLLECTL CHANGES
+4.3.3 Apr 1, 2022
+ - Minor fix for HCA stats with Mellanox HCA's
+
+4.3.2 Oct 7, 2021
+ - very minor bug. the last command in perfquery is not in a loop and prevents
+ the collectl daemon from starting via the service. [Thanks Edgar]
+
4.3.1 Sept 13, 2018
- very minor bug. If playing back a file with -P in its name, collectl
incorrectly interprets it as the plot format flag! [thanks laurence]
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/collectl-4.3.1/collectl new/collectl/collectl
--- old/collectl-4.3.1/collectl 2018-11-01 14:47:48.000000000 +0100
+++ new/collectl/collectl 2022-04-01 23:16:45.000000000 +0200
@@ -111,7 +111,7 @@
$rootFlag=(!$PcFlag && `whoami`=~/root/) ? 1 : 0;
$SrcArch= $Config{"archname"};
-$Version= '4.3.1-1';
+$Version= '4.3.3';
$Copyright='Copyright 2003-2018 Hewlett-Packard Development Company, L.P.';
$License= "collectl may be copied only under the terms of either the Artistic
License\n";
$License.= "or the GNU General Public License, which may be found in the
source kit";
@@ -2978,7 +2978,7 @@
# for OPA V4, /sys counters always 64 bits
if ($HCAOpaV4[$i][$j])
{
- my $proc="$SysIB/$HCAName[$i]0/ports/$j/counters";
+ my $proc="$SysIB/$HCAId[$i]/ports/$j/counters";
getProc(0, "$proc/port_rcv_data", "ib$i-$j:rcvd");
getProc(0, "$proc/port_xmit_data", "ib$i-$j:xmtd");
getProc(0, "$proc/port_rcv_packets", "ib$i-$j:rcvp");
@@ -2993,7 +2993,7 @@
# non-opa V4 counters but present in /sys, counters come from
counters_ext
elsif ($PQopt eq 'sys')
{
- my $proc="$SysIB/$HCAName[$i]$i/ports/$j/counters_ext";
+ my $proc="$SysIB/$HCAId[$i]/ports/$j/counters_ext";
getProc(0, "$proc/port_rcv_data_64", "ib$i-$j:rcvd");
getProc(0, "$proc/port_xmit_data_64", "ib$i-$j:xmtd");
getProc(0, "$proc/port_rcv_packets_64", "ib$i-$j:rcvp");
@@ -6784,6 +6784,11 @@
{
my $whatsnew=<<EOF6;
What's new in collectl in the last year or so?
+version 4.3.3
+ - Fixed bug with stats for Mellanox adapters
+
+version 4.3.2
+ - fixed bug with Can't "last" outside a loop block
version 4.2.0
- fixed bug in disk summary stats introduced in 4.1.2
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/collectl-4.3.1/formatit.ph new/collectl/formatit.ph
--- old/collectl-4.3.1/formatit.ph 2018-11-01 14:47:48.000000000 +0100
+++ new/collectl/formatit.ph 2022-04-01 17:51:57.000000000 +0200
@@ -375,12 +375,12 @@
$message="Required module missing" if $temp=~/required by/;
$message="No such file or directory" if $temp=~/No such file/;
if ($message ne '')
- {
+ {EXIT_IF:{
disableSubsys('x', "perfquery error: $message!");
$mellanoxFlag=0;
$PQuery='';
- last;
- }
+ last EXIT_IF;
+ }}
# perfquery IS there and we can execute it w/o error...
# Can you believe it? PQuery writes its version output to stderr!
@@ -9539,9 +9539,10 @@
$port=~/(\d+)/;
$port=$1;
$link=cat("$file/$1/link_layer");
+ chomp $link;
$state=cat("$file/$1/state");
$state=~/.*: *(.+)/;
- $portState=($link="InfiniBand" && $1 eq 'ACTIVE') ? 1 : 0;
+ $portState=($link eq "InfiniBand" && $1 eq 'ACTIVE') ? 1 : 0;
$HCAPorts[$NumHCAs][$port]=$portState;
$HCAOpaV4[$NumHCAs][$port]=(-e "$file/$port/counters") ? 1 : 0;
if ($portState)
