December 2019 - openSUSE Commits - openSUSE Mailing Lists

commit kirigami2 for openSUSE:Factory
by root 02 Dec '19

02 Dec '19

Hello community, here is the log from the commit of package kirigami2 for openSUSE:Factory checked in at 2019-12-02 11:27:34 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/kirigami2 (Old) and /work/SRC/openSUSE:Factory/.kirigami2.new.4691 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "kirigami2" Mon Dec 2 11:27:34 2019 rev:34 rq:749979 version:5.64.1 Changes: -------- --- /work/SRC/openSUSE:Factory/kirigami2/kirigami2.changes 2019-11-12 11:48:08.834894161 +0100 +++ /work/SRC/openSUSE:Factory/.kirigami2.new.4691/kirigami2.changes 2019-12-02 11:29:09.218620869 +0100 @@ -1,0 +2,8 @@ +Wed Nov 20 18:17:03 UTC 2019 - Wolfgang Bauer <wbauer(a)tmo.at> + +- Update to 5.64.1 + * New bugfix release +- Changes since 5.64.0: + * Make QmlComponentsPool one instance per engine (kde#414003) + +------------------------------------------------------------------- Old: ---- kirigami2-5.64.0.tar.xz kirigami2-5.64.0.tar.xz.sig New: ---- kirigami2-5.64.1.tar.xz kirigami2-5.64.1.tar.xz.sig ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kirigami2.spec ++++++ --- /var/tmp/diff_new_pack.Sv6aAj/_old 2019-12-02 11:29:10.634620213 +0100 +++ /var/tmp/diff_new_pack.Sv6aAj/_new 2019-12-02 11:29:10.666620198 +0100 @@ -24,7 +24,7 @@ %{!?_kf5_bugfix_version: %define _kf5_bugfix_version %(echo %{_kf5_version} | awk -F. '{print $1"."$2}')} %bcond_without lang Name: kirigami2 -Version: 5.64.0 +Version: 5.64.1 Release: 0 Summary: Set of QtQuick components License: LGPL-2.1-or-later ++++++ kirigami2-5.64.0.tar.xz -> kirigami2-5.64.1.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kirigami2-5.64.0/src/columnview.cpp new/kirigami2-5.64.1/src/columnview.cpp --- old/kirigami2-5.64.0/src/columnview.cpp 2019-11-07 03:58:43.000000000 +0100 +++ new/kirigami2-5.64.1/src/columnview.cpp 2019-11-20 16:28:32.000000000 +0100 @@ -38,23 +38,37 @@ public: QmlComponentsPoolSingleton() {} - - QmlComponentsPool self; + static QmlComponentsPool *instance(QQmlEngine *engine); +private: + QHash<QQmlEngine*, QmlComponentsPool*> m_instances; }; Q_GLOBAL_STATIC(QmlComponentsPoolSingleton, privateQmlComponentsPoolSelf) -QmlComponentsPool::QmlComponentsPool(QObject *parent) - : QObject(parent) -{} - -void QmlComponentsPool::initialize(QQmlEngine *engine) +QmlComponentsPool *QmlComponentsPoolSingleton::instance(QQmlEngine *engine) { - if (!engine || m_instance) { - return; + Q_ASSERT(engine); + auto componentPool = privateQmlComponentsPoolSelf->m_instances.value(engine); + + if (componentPool) { + return componentPool; } + componentPool = new QmlComponentsPool(engine); + + QObject::connect(componentPool, &QObject::destroyed, [engine]() { + if (privateQmlComponentsPoolSelf) { + privateQmlComponentsPoolSelf->m_instances.remove(engine); + } + }); + privateQmlComponentsPoolSelf->m_instances[engine] = componentPool; + return componentPool; +} + +QmlComponentsPool::QmlComponentsPool(QQmlEngine *engine) + : QObject(engine) +{ QQmlComponent *component = new QQmlComponent(engine, this); component->setData(QByteArrayLiteral("import QtQuick 2.7\n" @@ -575,12 +589,12 @@ QQuickItem *separatorItem = m_separators.value(item); if (!separatorItem) { - separatorItem = qobject_cast<QQuickItem *>(privateQmlComponentsPoolSelf->self.m_separatorComponent->beginCreate(QQmlEngine::contextForObject(item))); + separatorItem = qobject_cast<QQuickItem *>(privateQmlComponentsPoolSelf->instance(qmlEngine(item))->m_separatorComponent->beginCreate(QQmlEngine::contextForObject(item))); if (separatorItem) { separatorItem->setParentItem(item); separatorItem->setZ(9999); separatorItem->setProperty("column", QVariant::fromValue(item)); - privateQmlComponentsPoolSelf->self.m_separatorComponent->completeCreate(); + QmlComponentsPoolSingleton::instance(qmlEngine(item))->m_separatorComponent->completeCreate(); m_separators[item] = separatorItem; } } @@ -593,12 +607,12 @@ QQuickItem *separatorItem = m_rightSeparators.value(item); if (!separatorItem) { - separatorItem = qobject_cast<QQuickItem *>(privateQmlComponentsPoolSelf->self.m_rightSeparatorComponent->beginCreate(QQmlEngine::contextForObject(item))); + separatorItem = qobject_cast<QQuickItem *>(QmlComponentsPoolSingleton::instance(qmlEngine(item))->m_rightSeparatorComponent->beginCreate(QQmlEngine::contextForObject(item))); if (separatorItem) { separatorItem->setParentItem(item); separatorItem->setZ(9999); separatorItem->setProperty("column", QVariant::fromValue(item)); - privateQmlComponentsPoolSelf->self.m_rightSeparatorComponent->completeCreate(); + QmlComponentsPoolSingleton::instance(qmlEngine(item))->m_rightSeparatorComponent->completeCreate(); m_rightSeparators[item] = separatorItem; } } @@ -772,7 +786,7 @@ void ColumnView::setColumnWidth(qreal width) { // Always forget the internal binding when the user sets anything, even the same value - disconnect(&privateQmlComponentsPoolSelf->self, &QmlComponentsPool::gridUnitChanged, this, nullptr); + disconnect(QmlComponentsPoolSingleton::instance(qmlEngine(this)), &QmlComponentsPool::gridUnitChanged, this, nullptr); if (m_contentItem->m_columnWidth == width) { return; @@ -915,7 +929,7 @@ void ColumnView::setScrollDuration(int duration) { - disconnect(&privateQmlComponentsPoolSelf->self, &QmlComponentsPool::longDurationChanged, this, nullptr); + disconnect(QmlComponentsPoolSingleton::instance(qmlEngine(this)), &QmlComponentsPool::longDurationChanged, this, nullptr); if (m_contentItem->m_slideAnim->duration() == duration) { return; @@ -1416,22 +1430,20 @@ void ColumnView::classBegin() { - privateQmlComponentsPoolSelf->self.initialize(qmlEngine(this)); - auto syncColumnWidth = [this]() { - m_contentItem->m_columnWidth = privateQmlComponentsPoolSelf->self.m_units->property("gridUnit").toInt() * 20; + m_contentItem->m_columnWidth = privateQmlComponentsPoolSelf->instance(qmlEngine(this))->m_units->property("gridUnit").toInt() * 20; emit columnWidthChanged(); }; - connect(&privateQmlComponentsPoolSelf->self, &QmlComponentsPool::gridUnitChanged, this, syncColumnWidth); + connect(QmlComponentsPoolSingleton::instance(qmlEngine(this)), &QmlComponentsPool::gridUnitChanged, this, syncColumnWidth); syncColumnWidth(); auto syncDuration = [this]() { - m_contentItem->m_slideAnim->setDuration(privateQmlComponentsPoolSelf->self.m_units->property("longDuration").toInt()); + m_contentItem->m_slideAnim->setDuration(QmlComponentsPoolSingleton::instance(qmlEngine(this))->m_units->property("longDuration").toInt()); emit scrollDurationChanged(); }; - connect(&privateQmlComponentsPoolSelf->self, &QmlComponentsPool::longDurationChanged, this, syncDuration); + connect(QmlComponentsPoolSingleton::instance(qmlEngine(this)), &QmlComponentsPool::longDurationChanged, this, syncDuration); syncDuration(); QQuickItem::classBegin(); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kirigami2-5.64.0/src/columnview_p.h new/kirigami2-5.64.1/src/columnview_p.h --- old/kirigami2-5.64.0/src/columnview_p.h 2019-11-07 03:58:43.000000000 +0100 +++ new/kirigami2-5.64.1/src/columnview_p.h 2019-11-20 16:28:32.000000000 +0100 @@ -32,11 +32,9 @@ Q_OBJECT public: - QmlComponentsPool(QObject *parent = nullptr); + QmlComponentsPool(QQmlEngine *engine); ~QmlComponentsPool(); - void initialize(QQmlEngine *engine); - QQmlComponent *m_separatorComponent = nullptr; QQmlComponent *m_rightSeparatorComponent = nullptr; QObject *m_units = nullptr;

1 0

commit cloud-netconfig for openSUSE:Factory
by root 02 Dec '19

02 Dec '19

Hello community, here is the log from the commit of package cloud-netconfig for openSUSE:Factory checked in at 2019-12-02 11:27:27 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/cloud-netconfig (Old) and /work/SRC/openSUSE:Factory/.cloud-netconfig.new.4691 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "cloud-netconfig" Mon Dec 2 11:27:27 2019 rev:9 rq:751653 version:1.3 Changes: -------- --- /work/SRC/openSUSE:Factory/cloud-netconfig/cloud-netconfig.changes 2019-05-22 15:42:10.086427021 +0200 +++ /work/SRC/openSUSE:Factory/.cloud-netconfig.new.4691/cloud-netconfig.changes 2019-12-02 11:29:02.778623849 +0100 @@ -1,0 +2,27 @@ +Thu Nov 28 15:22:49 UTC 2019 - Joachim Gleissner <jgleissner(a)suse.com> + +- Removed obsolete Group tag from spec file + +------------------------------------------------------------------- +Tue Nov 26 16:31:27 UTC 2019 - Joachim Gleissner <jgleissner(a)suse.com> + +- Update to version 1.3: + + Fix IPv4 address handling on secondary NICs in Azure + +------------------------------------------------------------------- +Tue Nov 26 08:43:38 UTC 2019 - Joachim Gleissner <jgleissner(a)suse.com> + +- Update to version 1.2: + + support AWS IMDSv2 token + +------------------------------------------------------------------- +Thu Nov 21 13:19:18 UTC 2019 - Joachim Gleissner <jgleissner(a)suse.com> + +- Update to version 1.1 + + fix use of GATEWAY variable (bsc#1157117, bsc#1157190) + + remove secondary IPv4 address only when added by cloud-netconfig + (bsc#1144282) + + simplify routing setup for single NIC systems (partly fixes + bsc#1135592) + +------------------------------------------------------------------- Old: ---- cloud-netconfig-1.0.tar.bz2 New: ---- cloud-netconfig-1.3.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ cloud-netconfig.spec ++++++ --- /var/tmp/diff_new_pack.LNvqkk/_old 2019-12-02 11:29:03.542623495 +0100 +++ /var/tmp/diff_new_pack.LNvqkk/_new 2019-12-02 11:29:03.550623492 +0100 @@ -1,7 +1,7 @@ # # spec file for package cloud-netconfig # -# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2019 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -33,12 +33,11 @@ %endif Name: %{base_name}%{flavor_suffix} -Version: 1.0 +Version: 1.3 Release: 0 Summary: Network configuration scripts for %{csp_string} License: GPL-3.0-or-later -Group: System/Management -Url: https://github.com/SUSE-Enceladus/cloud-netconfig +URL: https://github.com/SUSE-Enceladus/cloud-netconfig Source0: %{base_name}-%{version}.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildArch: noarch ++++++ cloud-netconfig-1.0.tar.bz2 -> cloud-netconfig-1.3.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cloud-netconfig-1.0/.git/COMMIT_EDITMSG new/cloud-netconfig-1.3/.git/COMMIT_EDITMSG --- old/cloud-netconfig-1.0/.git/COMMIT_EDITMSG 2019-05-15 22:18:31.591315910 +0200 +++ new/cloud-netconfig-1.3/.git/COMMIT_EDITMSG 1970-01-01 01:00:00.000000000 +0100 @@ -1,19 +0,0 @@ -slow API requests down if necessary - -If an instance has many IP addresses (about 40+) repeated requests to the -metadata server may be denied in Azure. This change makes cloud-netconfig slow -down when this situation is detected. [bsc#1135257 bsc#1135263] -# Please enter the commit message for your changes. Lines starting -# with '#' will be ignored, and an empty message aborts the commit. -# -# On branch fix-azure-throttle -# Changes to be committed: -# modified: VERSION -# modified: azure/functions.cloud-netconfig -# modified: cloud-netconfig-azure.spec -# modified: cloud-netconfig-ec2.spec -# modified: cloud-netconfig.spec -# -# Untracked files: -# cloud-netconfig-0.9.tar.bz2 -# diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cloud-netconfig-1.0/.git/FETCH_HEAD new/cloud-netconfig-1.3/.git/FETCH_HEAD --- old/cloud-netconfig-1.0/.git/FETCH_HEAD 2019-05-15 22:09:32.234241555 +0200 +++ new/cloud-netconfig-1.3/.git/FETCH_HEAD 1970-01-01 01:00:00.000000000 +0100 @@ -1 +0,0 @@ -737eef55e55d7dfc91c693d4863c1ac0191d7481 branch 'master' of github.com:SUSE-Enceladus/cloud-netconfig diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cloud-netconfig-1.0/.git/HEAD new/cloud-netconfig-1.3/.git/HEAD --- old/cloud-netconfig-1.0/.git/HEAD 2019-05-15 22:09:54.642451697 +0200 +++ new/cloud-netconfig-1.3/.git/HEAD 1970-01-01 01:00:00.000000000 +0100 @@ -1 +0,0 @@ -ref: refs/heads/fix-azure-throttle diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cloud-netconfig-1.0/.git/ORIG_HEAD new/cloud-netconfig-1.3/.git/ORIG_HEAD --- old/cloud-netconfig-1.0/.git/ORIG_HEAD 2019-05-15 22:09:32.394243055 +0200 +++ new/cloud-netconfig-1.3/.git/ORIG_HEAD 1970-01-01 01:00:00.000000000 +0100 @@ -1 +0,0 @@ -737eef55e55d7dfc91c693d4863c1ac0191d7481 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cloud-netconfig-1.0/.git/config new/cloud-netconfig-1.3/.git/config --- old/cloud-netconfig-1.0/.git/config 2018-07-10 18:22:11.169301686 +0200 +++ new/cloud-netconfig-1.3/.git/config 1970-01-01 01:00:00.000000000 +0100 @@ -1,11 +0,0 @@ -[core] - repositoryformatversion = 0 - filemode = true - bare = false - logallrefupdates = true -[remote "origin"] - url = git@github.com:SUSE-Enceladus/cloud-netconfig.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/cloud-netconfig-1.0/.git/description new/cloud-netconfig-1.3/.git/description --- old/cloud-netconfig-1.0/.git/description 2018-07-10 18:22:09.533288144 +0200 +++ new/cloud-netconfig-1.3/.git/description 1970-01-01 01:00:00.000000000 +0100 @@ -1 +0,0 @@ -Unnamed repository; edit this file 'description' to name the repository. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cloud-netconfig-1.0/.git/hooks/applypatch-msg.sample new/cloud-netconfig-1.3/.git/hooks/applypatch-msg.sample --- old/cloud-netconfig-1.0/.git/hooks/applypatch-msg.sample 2018-07-10 18:22:09.529288112 +0200 +++ new/cloud-netconfig-1.3/.git/hooks/applypatch-msg.sample 1970-01-01 01:00:00.000000000 +0100 @@ -1,15 +0,0 @@ -#!/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 -commitmsg="$(git rev-parse --git-path hooks/commit-msg)" -test -x "$commitmsg" && exec "$commitmsg" ${1+"$@"} -: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cloud-netconfig-1.0/.git/hooks/commit-msg.sample new/cloud-netconfig-1.3/.git/hooks/commit-msg.sample --- old/cloud-netconfig-1.0/.git/hooks/commit-msg.sample 2018-07-10 18:22:09.529288112 +0200 +++ new/cloud-netconfig-1.3/.git/hooks/commit-msg.sample 1970-01-01 01:00:00.000000000 +0100 @@ -1,24 +0,0 @@ -#!/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/cloud-netconfig-1.0/.git/hooks/fsmonitor-watchman.sample new/cloud-netconfig-1.3/.git/hooks/fsmonitor-watchman.sample --- old/cloud-netconfig-1.0/.git/hooks/fsmonitor-watchman.sample 2018-07-10 18:22:09.529288112 +0200 +++ new/cloud-netconfig-1.3/.git/hooks/fsmonitor-watchman.sample 1970-01-01 01:00:00.000000000 +0100 @@ -1,114 +0,0 @@ -#!/usr/bin/perl - -use strict; -use warnings; -use IPC::Open2; - -# An example hook script to integrate Watchman -# (https://facebook.github.io/watchman/) with git to speed up detecting -# new and modified files. -# -# The hook is passed a version (currently 1) and a time in nanoseconds -# formatted as a string and outputs to stdout all files that have been -# modified since the given time. Paths must be relative to the root of -# the working tree and separated by a single NUL. -# -# To enable this hook, rename this file to "query-watchman" and set -# 'git config core.fsmonitor .git/hooks/query-watchman' -# -my ($version, $time) = @ARGV; - -# Check the hook interface version - -if ($version == 1) { - # convert nanoseconds to seconds - $time = int $time / 1000000000; -} else { - die "Unsupported query-fsmonitor hook version '$version'.\n" . - "Falling back to scanning...\n"; -} - -my $git_work_tree; -if ($^O =~ 'msys' || $^O =~ 'cygwin') { - $git_work_tree = Win32::GetCwd(); - $git_work_tree =~ tr/\\/\//; -} else { - require Cwd; - $git_work_tree = Cwd::cwd(); -} - -my $retry = 1; - -launch_watchman(); - -sub launch_watchman { - - my $pid = open2(\*CHLD_OUT, \*CHLD_IN, 'watchman -j --no-pretty') - or die "open2() failed: $!\n" . - "Falling back to scanning...\n"; - - # In the query expression below we're asking for names of files that - # changed since $time but were not transient (ie created after - # $time but no longer exist). - # - # To accomplish this, we're using the "since" generator to use the - # recency index to select candidate nodes and "fields" to limit the - # output to file names only. Then we're using the "expression" term to - # further constrain the results. - # - # The category of transient files that we want to ignore will have a - # creation clock (cclock) newer than $time_t value and will also not - # currently exist. - - my $query = <<" END"; - ["query", "$git_work_tree", { - "since": $time, - "fields": ["name"], - "expression": ["not", ["allof", ["since", $time, "cclock"], ["not", "exists"]]] - }] - END - - print CHLD_IN $query; - close CHLD_IN; - my $response = do {local $/; <CHLD_OUT>}; - - die "Watchman: command returned no output.\n" . - "Falling back to scanning...\n" if $response eq ""; - die "Watchman: command returned invalid output: $response\n" . - "Falling back to scanning...\n" unless $response =~ /^\{/; - - my $json_pkg; - eval { - require JSON::XS; - $json_pkg = "JSON::XS"; - 1; - } or do { - require JSON::PP; - $json_pkg = "JSON::PP"; - }; - - my $o = $json_pkg->new->utf8->decode($response); - - if ($retry > 0 and $o->{error} and $o->{error} =~ m/unable to resolve root .* directory (.*) is not watched/) { - print STDERR "Adding '$git_work_tree' to watchman's watch list.\n"; - $retry--; - qx/watchman watch "$git_work_tree"/; - die "Failed to make watchman watch '$git_work_tree'.\n" . - "Falling back to scanning...\n" if $? != 0; - - # Watchman will always return all files on the first query so - # return the fast "everything is dirty" flag to git and do the - # Watchman query just to get it over with now so we won't pay - # the cost in git to look up each individual file. - print "/\0"; - eval { launch_watchman() }; - exit 0; - } - - die "Watchman: $o->{error}.\n" . - "Falling back to scanning...\n" if $o->{error}; - - binmode STDOUT, ":utf8"; - local $, = "\0"; - print @{$o->{files}}; -} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cloud-netconfig-1.0/.git/hooks/post-update.sample new/cloud-netconfig-1.3/.git/hooks/post-update.sample --- old/cloud-netconfig-1.0/.git/hooks/post-update.sample 2018-07-10 18:22:09.529288112 +0200 +++ new/cloud-netconfig-1.3/.git/hooks/post-update.sample 1970-01-01 01:00:00.000000000 +0100 @@ -1,8 +0,0 @@ -#!/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/cloud-netconfig-1.0/.git/hooks/pre-applypatch.sample new/cloud-netconfig-1.3/.git/hooks/pre-applypatch.sample --- old/cloud-netconfig-1.0/.git/hooks/pre-applypatch.sample 2018-07-10 18:22:09.529288112 +0200 +++ new/cloud-netconfig-1.3/.git/hooks/pre-applypatch.sample 1970-01-01 01:00:00.000000000 +0100 @@ -1,14 +0,0 @@ -#!/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 -precommit="$(git rev-parse --git-path hooks/pre-commit)" -test -x "$precommit" && exec "$precommit" ${1+"$@"} -: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cloud-netconfig-1.0/.git/hooks/pre-commit.sample new/cloud-netconfig-1.3/.git/hooks/pre-commit.sample --- old/cloud-netconfig-1.0/.git/hooks/pre-commit.sample 2018-07-10 18:22:09.529288112 +0200 +++ new/cloud-netconfig-1.3/.git/hooks/pre-commit.sample 1970-01-01 01:00:00.000000000 +0100 @@ -1,49 +0,0 @@ -#!/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=$(git hash-object -t tree /dev/null) -fi - -# If you want to allow non-ASCII filenames set this variable to true. -allownonascii=$(git config --bool 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 - cat <<\EOF -Error: Attempt to add a non-ASCII file name. - -This can cause problems if you want to work with people on other platforms. - -To be portable it is advisable to rename the file. - -If you know what you are doing you can disable this check using: - - git config hooks.allownonascii true -EOF - 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/cloud-netconfig-1.0/.git/hooks/pre-push.sample new/cloud-netconfig-1.3/.git/hooks/pre-push.sample --- old/cloud-netconfig-1.0/.git/hooks/pre-push.sample 2018-07-10 18:22:09.529288112 +0200 +++ new/cloud-netconfig-1.3/.git/hooks/pre-push.sample 1970-01-01 01:00:00.000000000 +0100 @@ -1,53 +0,0 @@ -#!/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 - -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 >&2 "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/cloud-netconfig-1.0/.git/hooks/pre-rebase.sample new/cloud-netconfig-1.3/.git/hooks/pre-rebase.sample --- old/cloud-netconfig-1.0/.git/hooks/pre-rebase.sample 2018-07-10 18:22:09.529288112 +0200 +++ new/cloud-netconfig-1.3/.git/hooks/pre-rebase.sample 1970-01-01 01:00:00.000000000 +0100 @@ -1,169 +0,0 @@ -#!/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 - -<<\DOC_END - -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". - -DOC_END diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cloud-netconfig-1.0/.git/hooks/pre-receive.sample new/cloud-netconfig-1.3/.git/hooks/pre-receive.sample --- old/cloud-netconfig-1.0/.git/hooks/pre-receive.sample 2018-07-10 18:22:09.529288112 +0200 +++ new/cloud-netconfig-1.3/.git/hooks/pre-receive.sample 1970-01-01 01:00:00.000000000 +0100 @@ -1,24 +0,0 @@ -#!/bin/sh -# -# An example hook script to make use of push options. -# The example simply echoes all push options that start with 'echoback=' -# and rejects all pushes when the "reject" push option is used. -# -# To enable this hook, rename this file to "pre-receive". - -if test -n "$GIT_PUSH_OPTION_COUNT" -then - i=0 - while test "$i" -lt "$GIT_PUSH_OPTION_COUNT" - do - eval "value=\$GIT_PUSH_OPTION_$i" - case "$value" in - echoback=*) - echo "echo from the pre-receive-hook: ${value#*=}" >&2 - ;; - reject) - exit 1 - esac - i=$((i + 1)) - done -fi diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cloud-netconfig-1.0/.git/hooks/prepare-commit-msg.sample new/cloud-netconfig-1.3/.git/hooks/prepare-commit-msg.sample --- old/cloud-netconfig-1.0/.git/hooks/prepare-commit-msg.sample 2018-07-10 18:22:09.529288112 +0200 +++ new/cloud-netconfig-1.3/.git/hooks/prepare-commit-msg.sample 1970-01-01 01:00:00.000000000 +0100 @@ -1,42 +0,0 @@ -#!/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 one removes the -# "# Please enter the commit message..." help message. -# -# 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. - -COMMIT_MSG_FILE=$1 -COMMIT_SOURCE=$2 -SHA1=$3 - -/usr/bin/perl -i.bak -ne 'print unless(m/^. Please enter the commit message/..m/^#$/)' "$COMMIT_MSG_FILE" - -# case "$COMMIT_SOURCE,$SHA1" in -# ,|template,) -# /usr/bin/perl -i.bak -pe ' -# print "\n" . `git diff --cached --name-status -r` -# if /^#/ && $first++ == 0' "$COMMIT_MSG_FILE" ;; -# *) ;; -# esac - -# SOB=$(git var GIT_COMMITTER_IDENT | sed -n 's/^$.*>$.*$/Signed-off-by: \1/p') -# git interpret-trailers --in-place --trailer "$SOB" "$COMMIT_MSG_FILE" -# if test -z "$COMMIT_SOURCE" -# then -# /usr/bin/perl -i.bak -pe 'print "\n" if !$first_line++' "$COMMIT_MSG_FILE" -# fi diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cloud-netconfig-1.0/.git/hooks/update.sample new/cloud-netconfig-1.3/.git/hooks/update.sample --- old/cloud-netconfig-1.0/.git/hooks/update.sample 2018-07-10 18:22:09.529288112 +0200 +++ new/cloud-netconfig-1.3/.git/hooks/update.sample 1970-01-01 01:00:00.000000000 +0100 @@ -1,128 +0,0 @@ -#!/bin/sh -# -# An example hook script to block 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/cloud-netconfig-1.0/.git/index and new/cloud-netconfig-1.3/.git/index differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cloud-netconfig-1.0/.git/info/exclude new/cloud-netconfig-1.3/.git/info/exclude --- old/cloud-netconfig-1.0/.git/info/exclude 2018-07-10 18:22:09.533288144 +0200 +++ new/cloud-netconfig-1.3/.git/info/exclude 1970-01-01 01:00:00.000000000 +0100 @@ -1,6 +0,0 @@ -# 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/cloud-netconfig-1.0/.git/logs/HEAD new/cloud-netconfig-1.3/.git/logs/HEAD --- old/cloud-netconfig-1.0/.git/logs/HEAD 2019-05-15 22:18:34.671345031 +0200 +++ new/cloud-netconfig-1.3/.git/logs/HEAD 1970-01-01 01:00:00.000000000 +0100 @@ -1,15 +0,0 @@ -0000000000000000000000000000000000000000 e0616bb9d8f7935e02c23b8a9b462c9a08ae3bf5 Joachim Gleissner <jgleissner(a)suse.com> 1531239731 +0200 clone: from git@github.com:SUSE-Enceladus/cloud-netconfig.git -e0616bb9d8f7935e02c23b8a9b462c9a08ae3bf5 e0616bb9d8f7935e02c23b8a9b462c9a08ae3bf5 Joachim Gleissner <jgleissner(a)suse.com> 1545065645 +0100 checkout: moving from master to timeout-fix -e0616bb9d8f7935e02c23b8a9b462c9a08ae3bf5 796f9018f2db0d79a3c82355241d9316cb4ad9cb Joachim Gleissner <jgleissner(a)suse.com> 1545069164 +0100 commit: reduce timeout on metadata read (bsc#1112822) -796f9018f2db0d79a3c82355241d9316cb4ad9cb e0616bb9d8f7935e02c23b8a9b462c9a08ae3bf5 Joachim Gleissner <jgleissner(a)suse.com> 1548779137 +0100 checkout: moving from timeout-fix to master -e0616bb9d8f7935e02c23b8a9b462c9a08ae3bf5 2f1207e6cea5f7f0b14dab0982d39425437ec099 Joachim Gleissner <jgleissner(a)suse.com> 1548779143 +0100 pull --rebase: Fast-forward -2f1207e6cea5f7f0b14dab0982d39425437ec099 2f1207e6cea5f7f0b14dab0982d39425437ec099 Joachim Gleissner <jgleissner(a)suse.com> 1548781615 +0100 checkout: moving from master to fixes -2f1207e6cea5f7f0b14dab0982d39425437ec099 4b83c00df18f23c88ae32e1f642a6b4a44efbcd6 Joachim Gleissner <jgleissner(a)suse.com> 1548854431 +0100 commit: ec2: fix search-and-replace accident -4b83c00df18f23c88ae32e1f642a6b4a44efbcd6 d43a993fe138431f16ee2a62a5e450551a4b1420 Joachim Gleissner <jgleissner(a)suse.com> 1548862579 +0100 commit: do not treat eth0 special wrt routing policies (bsc#1123008) -d43a993fe138431f16ee2a62a5e450551a4b1420 c706e96b9c508b7df831ed7d5c41e689372d357e Joachim Gleissner <jgleissner(a)suse.com> 1548863506 +0100 commit: run cloud-netconfig periodically (bsc#1118783 bsc#1122013) -c706e96b9c508b7df831ed7d5c41e689372d357e 2f1207e6cea5f7f0b14dab0982d39425437ec099 Joachim Gleissner <jgleissner(a)suse.com> 1548940283 +0100 checkout: moving from fixes to master -2f1207e6cea5f7f0b14dab0982d39425437ec099 737eef55e55d7dfc91c693d4863c1ac0191d7481 Joachim Gleissner <jgleissner(a)suse.com> 1548940287 +0100 pull --rebase: Fast-forward -737eef55e55d7dfc91c693d4863c1ac0191d7481 737eef55e55d7dfc91c693d4863c1ac0191d7481 Joachim Gleissner <jgleissner(a)suse.com> 1548940329 +0100 reset: moving to HEAD -737eef55e55d7dfc91c693d4863c1ac0191d7481 737eef55e55d7dfc91c693d4863c1ac0191d7481 Joachim Gleissner <jgleissner(a)suse.com> 1557950956 +0100 reset: moving to HEAD -737eef55e55d7dfc91c693d4863c1ac0191d7481 737eef55e55d7dfc91c693d4863c1ac0191d7481 Joachim Gleissner <jgleissner(a)suse.com> 1557950994 +0100 checkout: moving from master to fix-azure-throttle -737eef55e55d7dfc91c693d4863c1ac0191d7481 ef84f3b5b4c1383fb8850bdb33f20f155616e9d9 Joachim Gleissner <jgleissner(a)suse.com> 1557951273 +0100 commit: slow API requests down if necessary diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cloud-netconfig-1.0/.git/logs/refs/heads/fix-azure-throttle new/cloud-netconfig-1.3/.git/logs/refs/heads/fix-azure-throttle --- old/cloud-netconfig-1.0/.git/logs/refs/heads/fix-azure-throttle 2019-05-15 22:18:34.671345031 +0200 +++ new/cloud-netconfig-1.3/.git/logs/refs/heads/fix-azure-throttle 1970-01-01 01:00:00.000000000 +0100 @@ -1,2 +0,0 @@ -0000000000000000000000000000000000000000 737eef55e55d7dfc91c693d4863c1ac0191d7481 Joachim Gleissner <jgleissner(a)suse.com> 1557950994 +0100 branch: Created from HEAD -737eef55e55d7dfc91c693d4863c1ac0191d7481 ef84f3b5b4c1383fb8850bdb33f20f155616e9d9 Joachim Gleissner <jgleissner(a)suse.com> 1557951273 +0100 commit: slow API requests down if necessary diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cloud-netconfig-1.0/.git/logs/refs/heads/fixes new/cloud-netconfig-1.3/.git/logs/refs/heads/fixes --- old/cloud-netconfig-1.0/.git/logs/refs/heads/fixes 2019-01-30 16:53:13.518767715 +0100 +++ new/cloud-netconfig-1.3/.git/logs/refs/heads/fixes 1970-01-01 01:00:00.000000000 +0100 @@ -1,4 +0,0 @@ -0000000000000000000000000000000000000000 2f1207e6cea5f7f0b14dab0982d39425437ec099 Joachim Gleissner <jgleissner(a)suse.com> 1548781615 +0100 branch: Created from HEAD -2f1207e6cea5f7f0b14dab0982d39425437ec099 4b83c00df18f23c88ae32e1f642a6b4a44efbcd6 Joachim Gleissner <jgleissner(a)suse.com> 1548854431 +0100 commit: ec2: fix search-and-replace accident -4b83c00df18f23c88ae32e1f642a6b4a44efbcd6 d43a993fe138431f16ee2a62a5e450551a4b1420 Joachim Gleissner <jgleissner(a)suse.com> 1548862579 +0100 commit: do not treat eth0 special wrt routing policies (bsc#1123008) -d43a993fe138431f16ee2a62a5e450551a4b1420 c706e96b9c508b7df831ed7d5c41e689372d357e Joachim Gleissner <jgleissner(a)suse.com> 1548863506 +0100 commit: run cloud-netconfig periodically (bsc#1118783 bsc#1122013) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cloud-netconfig-1.0/.git/logs/refs/heads/master new/cloud-netconfig-1.3/.git/logs/refs/heads/master --- old/cloud-netconfig-1.0/.git/logs/refs/heads/master 2019-01-31 14:11:27.891295667 +0100 +++ new/cloud-netconfig-1.3/.git/logs/refs/heads/master 1970-01-01 01:00:00.000000000 +0100 @@ -1,3 +0,0 @@ -0000000000000000000000000000000000000000 e0616bb9d8f7935e02c23b8a9b462c9a08ae3bf5 Joachim Gleissner <jgleissner(a)suse.com> 1531239731 +0200 clone: from git@github.com:SUSE-Enceladus/cloud-netconfig.git -e0616bb9d8f7935e02c23b8a9b462c9a08ae3bf5 2f1207e6cea5f7f0b14dab0982d39425437ec099 Joachim Gleissner <jgleissner(a)suse.com> 1548779143 +0100 pull --rebase: Fast-forward -2f1207e6cea5f7f0b14dab0982d39425437ec099 737eef55e55d7dfc91c693d4863c1ac0191d7481 Joachim Gleissner <jgleissner(a)suse.com> 1548940287 +0100 pull --rebase: Fast-forward diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cloud-netconfig-1.0/.git/logs/refs/heads/timeout-fix new/cloud-netconfig-1.3/.git/logs/refs/heads/timeout-fix --- old/cloud-netconfig-1.0/.git/logs/refs/heads/timeout-fix 2018-12-17 18:55:31.043403154 +0100 +++ new/cloud-netconfig-1.3/.git/logs/refs/heads/timeout-fix 1970-01-01 01:00:00.000000000 +0100 @@ -1,2 +0,0 @@ -0000000000000000000000000000000000000000 e0616bb9d8f7935e02c23b8a9b462c9a08ae3bf5 Joachim Gleissner <jgleissner(a)suse.com> 1545065645 +0100 branch: Created from HEAD -e0616bb9d8f7935e02c23b8a9b462c9a08ae3bf5 796f9018f2db0d79a3c82355241d9316cb4ad9cb Joachim Gleissner <jgleissner(a)suse.com> 1545069164 +0100 commit: reduce timeout on metadata read (bsc#1112822) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cloud-netconfig-1.0/.git/logs/refs/remotes/origin/HEAD new/cloud-netconfig-1.3/.git/logs/refs/remotes/origin/HEAD --- old/cloud-netconfig-1.0/.git/logs/refs/remotes/origin/HEAD 2018-07-10 18:22:11.165301652 +0200 +++ new/cloud-netconfig-1.3/.git/logs/refs/remotes/origin/HEAD 1970-01-01 01:00:00.000000000 +0100 @@ -1 +0,0 @@ -0000000000000000000000000000000000000000 e0616bb9d8f7935e02c23b8a9b462c9a08ae3bf5 Joachim Gleissner <jgleissner(a)suse.com> 1531239731 +0200 clone: from git@github.com:SUSE-Enceladus/cloud-netconfig.git diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cloud-netconfig-1.0/.git/logs/refs/remotes/origin/fix-azure-throttle new/cloud-netconfig-1.3/.git/logs/refs/remotes/origin/fix-azure-throttle --- old/cloud-netconfig-1.0/.git/logs/refs/remotes/origin/fix-azure-throttle 2019-05-15 22:19:00.291587328 +0200 +++ new/cloud-netconfig-1.3/.git/logs/refs/remotes/origin/fix-azure-throttle 1970-01-01 01:00:00.000000000 +0100 @@ -1 +0,0 @@ -0000000000000000000000000000000000000000 ef84f3b5b4c1383fb8850bdb33f20f155616e9d9 Joachim Gleissner <jgleissner(a)suse.com> 1557951540 +0100 update by push diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cloud-netconfig-1.0/.git/logs/refs/remotes/origin/fixes new/cloud-netconfig-1.3/.git/logs/refs/remotes/origin/fixes --- old/cloud-netconfig-1.0/.git/logs/refs/remotes/origin/fixes 2019-01-30 16:53:22.570830496 +0100 +++ new/cloud-netconfig-1.3/.git/logs/refs/remotes/origin/fixes 1970-01-01 01:00:00.000000000 +0100 @@ -1 +0,0 @@ -0000000000000000000000000000000000000000 c706e96b9c508b7df831ed7d5c41e689372d357e Joachim Gleissner <jgleissner(a)suse.com> 1548863602 +0100 update by push diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cloud-netconfig-1.0/.git/logs/refs/remotes/origin/master new/cloud-netconfig-1.3/.git/logs/refs/remotes/origin/master --- old/cloud-netconfig-1.0/.git/logs/refs/remotes/origin/master 2019-01-31 14:11:27.867295451 +0100 +++ new/cloud-netconfig-1.3/.git/logs/refs/remotes/origin/master 1970-01-01 01:00:00.000000000 +0100 @@ -1,2 +0,0 @@ -e0616bb9d8f7935e02c23b8a9b462c9a08ae3bf5 2f1207e6cea5f7f0b14dab0982d39425437ec099 Joachim Gleissner <jgleissner(a)suse.com> 1548779143 +0100 pull --rebase: fast-forward -2f1207e6cea5f7f0b14dab0982d39425437ec099 737eef55e55d7dfc91c693d4863c1ac0191d7481 Joachim Gleissner <jgleissner(a)suse.com> 1548940287 +0100 pull --rebase: fast-forward diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cloud-netconfig-1.0/.git/logs/refs/remotes/origin/timeout-fix new/cloud-netconfig-1.3/.git/logs/refs/remotes/origin/timeout-fix --- old/cloud-netconfig-1.0/.git/logs/refs/remotes/origin/timeout-fix 2018-12-17 18:55:48.847561483 +0100 +++ new/cloud-netconfig-1.3/.git/logs/refs/remotes/origin/timeout-fix 1970-01-01 01:00:00.000000000 +0100 @@ -1 +0,0 @@ -0000000000000000000000000000000000000000 796f9018f2db0d79a3c82355241d9316cb4ad9cb Joachim Gleissner <jgleissner(a)suse.com> 1545069348 +0100 update by push diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cloud-netconfig-1.0/.git/objects/04/6cc9365ec9653588d97831e6a5dd9a8827cda1 new/cloud-netconfig-1.3/.git/objects/04/6cc9365ec9653588d97831e6a5dd9a8827cda1 --- old/cloud-netconfig-1.0/.git/objects/04/6cc9365ec9653588d97831e6a5dd9a8827cda1 2019-01-30 16:51:33.330076410 +0100 +++ new/cloud-netconfig-1.3/.git/objects/04/6cc9365ec9653588d97831e6a5dd9a8827cda1 1970-01-01 01:00:00.000000000 +0100 @@ -1 +0,0 @@ -xeÍ1Â0@Qf"[§( ±fNUÄ54R±£ÄAp{ã_ÞO$s8îwÓÈYg8QÃfa?%*Ü€/IQøo&ö0ª4ÃåUÈS[Eáü$«zëRfb[E3žöÉcïrÿxSÁ4\ \ No newline at end of file Binary files old/cloud-netconfig-1.0/.git/objects/07/1f4b5f79e241938292e093ba0c10fbcba40ada and new/cloud-netconfig-1.3/.git/objects/07/1f4b5f79e241938292e093ba0c10fbcba40ada differ Binary files old/cloud-netconfig-1.0/.git/objects/12/c36215c1a207f5f65f645e6d5377e2d24707da and new/cloud-netconfig-1.3/.git/objects/12/c36215c1a207f5f65f645e6d5377e2d24707da differ Binary files old/cloud-netconfig-1.0/.git/objects/13/b39fb65834123021738237b8fc4d708112620a and new/cloud-netconfig-1.3/.git/objects/13/b39fb65834123021738237b8fc4d708112620a differ Binary files old/cloud-netconfig-1.0/.git/objects/1c/fb47615b0cf98cacdb6275b3241f8ca43e5cca and new/cloud-netconfig-1.3/.git/objects/1c/fb47615b0cf98cacdb6275b3241f8ca43e5cca differ Binary files old/cloud-netconfig-1.0/.git/objects/2f/1207e6cea5f7f0b14dab0982d39425437ec099 and new/cloud-netconfig-1.3/.git/objects/2f/1207e6cea5f7f0b14dab0982d39425437ec099 differ Binary files old/cloud-netconfig-1.0/.git/objects/3e/339cd857644a997adabd21cd657996fc85dc7d and new/cloud-netconfig-1.3/.git/objects/3e/339cd857644a997adabd21cd657996fc85dc7d differ Binary files old/cloud-netconfig-1.0/.git/objects/48/40019d6ffabbcb9042f28dfef38067d0a308f8 and new/cloud-netconfig-1.3/.git/objects/48/40019d6ffabbcb9042f28dfef38067d0a308f8 differ Binary files old/cloud-netconfig-1.0/.git/objects/49/6a942a8d96bac29c93815998acbce1f6c2fd25 and new/cloud-netconfig-1.3/.git/objects/49/6a942a8d96bac29c93815998acbce1f6c2fd25 differ Binary files old/cloud-netconfig-1.0/.git/objects/4a/dd01ba4a5e729e023d967d743c180b9fae8b6e and new/cloud-netconfig-1.3/.git/objects/4a/dd01ba4a5e729e023d967d743c180b9fae8b6e differ Binary files old/cloud-netconfig-1.0/.git/objects/4b/83c00df18f23c88ae32e1f642a6b4a44efbcd6 and new/cloud-netconfig-1.3/.git/objects/4b/83c00df18f23c88ae32e1f642a6b4a44efbcd6 differ Binary files old/cloud-netconfig-1.0/.git/objects/4b/e816e55e0b2e0f4a1a859b37ef754ce7bba79d and new/cloud-netconfig-1.3/.git/objects/4b/e816e55e0b2e0f4a1a859b37ef754ce7bba79d differ Binary files old/cloud-netconfig-1.0/.git/objects/4d/a1372a5345b2bcb0c963251cc1c16004503ff0 and new/cloud-netconfig-1.3/.git/objects/4d/a1372a5345b2bcb0c963251cc1c16004503ff0 differ Binary files old/cloud-netconfig-1.0/.git/objects/5c/56f1f9a7efce40caf157485791ac27dabb4a5a and new/cloud-netconfig-1.3/.git/objects/5c/56f1f9a7efce40caf157485791ac27dabb4a5a differ Binary files old/cloud-netconfig-1.0/.git/objects/60/f86a550f51231ff1265ca4d2e0eff1d594da49 and new/cloud-netconfig-1.3/.git/objects/60/f86a550f51231ff1265ca4d2e0eff1d594da49 differ Binary files old/cloud-netconfig-1.0/.git/objects/6d/94b3ff49c6123eb07f45e74a7d5ff21e1af71a and new/cloud-netconfig-1.3/.git/objects/6d/94b3ff49c6123eb07f45e74a7d5ff21e1af71a differ Binary files old/cloud-netconfig-1.0/.git/objects/70/11b267c7f77f50c531103e1b331d6d8d330d24 and new/cloud-netconfig-1.3/.git/objects/70/11b267c7f77f50c531103e1b331d6d8d330d24 differ Binary files old/cloud-netconfig-1.0/.git/objects/73/7eef55e55d7dfc91c693d4863c1ac0191d7481 and new/cloud-netconfig-1.3/.git/objects/73/7eef55e55d7dfc91c693d4863c1ac0191d7481 differ Binary files old/cloud-netconfig-1.0/.git/objects/79/6f9018f2db0d79a3c82355241d9316cb4ad9cb and new/cloud-netconfig-1.3/.git/objects/79/6f9018f2db0d79a3c82355241d9316cb4ad9cb differ Binary files old/cloud-netconfig-1.0/.git/objects/7c/04573ce239e4de2f37db3b00307cc2268605eb and new/cloud-netconfig-1.3/.git/objects/7c/04573ce239e4de2f37db3b00307cc2268605eb differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cloud-netconfig-1.0/.git/objects/7e/34485e7d3874dbbec8b73c601654cc7087323d new/cloud-netconfig-1.3/.git/objects/7e/34485e7d3874dbbec8b73c601654cc7087323d --- old/cloud-netconfig-1.0/.git/objects/7e/34485e7d3874dbbec8b73c601654cc7087323d 2019-01-30 16:51:33.330076410 +0100 +++ new/cloud-netconfig-1.3/.git/objects/7e/34485e7d3874dbbec8b73c601654cc7087323d 1970-01-01 01:00:00.000000000 +0100 @@ -1,4 +0,0 @@ -x=± -Â0@ï+ú -Á9ÅÅIAÅ!dH/g9Hï$¹ -ý{ÛÅñ=xo(:tîèvá)lÎÔ°òÇXÅßš²fÆTÊÒÕY:,:çœ¡ÊGðàj«ôªv'ônbYqÐøK á"ÍÖWW£Ü/Þ¶Œ,Õ~ I1Ï \ No newline at end of file Binary files old/cloud-netconfig-1.0/.git/objects/82/86b36a8d28cf6d56101cd418a5bf5af40125c3 and new/cloud-netconfig-1.3/.git/objects/82/86b36a8d28cf6d56101cd418a5bf5af40125c3 differ Binary files old/cloud-netconfig-1.0/.git/objects/89/a5a3b338143dd9ac70691d8dd482c5e4060dd2 and new/cloud-netconfig-1.3/.git/objects/89/a5a3b338143dd9ac70691d8dd482c5e4060dd2 differ Binary files old/cloud-netconfig-1.0/.git/objects/8e/000346ea1962f51c5a5ca7bce3d3786e9b4157 and new/cloud-netconfig-1.3/.git/objects/8e/000346ea1962f51c5a5ca7bce3d3786e9b4157 differ Binary files old/cloud-netconfig-1.0/.git/objects/97/d11cb66ab2c429a8202573fe7ef3bf66321798 and new/cloud-netconfig-1.3/.git/objects/97/d11cb66ab2c429a8202573fe7ef3bf66321798 differ Binary files old/cloud-netconfig-1.0/.git/objects/a2/c0140c77324435d782eaab908478462ad12456 and new/cloud-netconfig-1.3/.git/objects/a2/c0140c77324435d782eaab908478462ad12456 differ Binary files old/cloud-netconfig-1.0/.git/objects/ae/c258df73d39d2122706793921981f4a0f672f8 and new/cloud-netconfig-1.3/.git/objects/ae/c258df73d39d2122706793921981f4a0f672f8 differ Binary files old/cloud-netconfig-1.0/.git/objects/b6/3ba696b7a7e4d89fa1517b02bfdccb2f1a10e1 and new/cloud-netconfig-1.3/.git/objects/b6/3ba696b7a7e4d89fa1517b02bfdccb2f1a10e1 differ Binary files old/cloud-netconfig-1.0/.git/objects/c2/b4feaffc8bf22017302d294c1edaa93396c34c and new/cloud-netconfig-1.3/.git/objects/c2/b4feaffc8bf22017302d294c1edaa93396c34c differ Binary files old/cloud-netconfig-1.0/.git/objects/c5/061e53e3c111670cfbb0950d292c3a92a2896c and new/cloud-netconfig-1.3/.git/objects/c5/061e53e3c111670cfbb0950d292c3a92a2896c differ Binary files old/cloud-netconfig-1.0/.git/objects/c7/06e96b9c508b7df831ed7d5c41e689372d357e and new/cloud-netconfig-1.3/.git/objects/c7/06e96b9c508b7df831ed7d5c41e689372d357e differ Binary files old/cloud-netconfig-1.0/.git/objects/d1/fe500e9088901e6f954daf0815cc080ba386c7 and new/cloud-netconfig-1.3/.git/objects/d1/fe500e9088901e6f954daf0815cc080ba386c7 differ Binary files old/cloud-netconfig-1.0/.git/objects/d3/827e75a5cadb9fe4a27e1cb9b6d192e7323120 and new/cloud-netconfig-1.3/.git/objects/d3/827e75a5cadb9fe4a27e1cb9b6d192e7323120 differ Binary files old/cloud-netconfig-1.0/.git/objects/d4/3a993fe138431f16ee2a62a5e450551a4b1420 and new/cloud-netconfig-1.3/.git/objects/d4/3a993fe138431f16ee2a62a5e450551a4b1420 differ Binary files old/cloud-netconfig-1.0/.git/objects/e5/542e464447d1beb5b6cf426eb8c2247c6e0ab1 and new/cloud-netconfig-1.3/.git/objects/e5/542e464447d1beb5b6cf426eb8c2247c6e0ab1 differ Binary files old/cloud-netconfig-1.0/.git/objects/eb/606f2ee5e19f79c366d1fa47cfe4abae4f33b0 and new/cloud-netconfig-1.3/.git/objects/eb/606f2ee5e19f79c366d1fa47cfe4abae4f33b0 differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cloud-netconfig-1.0/.git/objects/ef/84f3b5b4c1383fb8850bdb33f20f155616e9d9 new/cloud-netconfig-1.3/.git/objects/ef/84f3b5b4c1383fb8850bdb33f20f155616e9d9 --- old/cloud-netconfig-1.0/.git/objects/ef/84f3b5b4c1383fb8850bdb33f20f155616e9d9 2019-05-15 22:18:34.671345031 +0200 +++ new/cloud-netconfig-1.3/.git/objects/ef/84f3b5b4c1383fb8850bdb33f20f155616e9d9 1970-01-01 01:00:00.000000000 +0100 @@ -1 +0,0 @@ -xRËnÛ0ì_±@/-8%ê4EåGmÙ±l§Ií€è"×tDÊ¯¯/¢COÝÓb03Á.WUUÝð©ÁgB8nÎ|F1ìÄèt<¡}»ÇkQ Ù±¥z!âR€TbÍc±'ü(°|Æ7v6r kL¡j+Æ²áK%Öðáqókÿ€m®ªàRÆÔíŽ×qEmPcÿm±Ùmt¹éióáŸ€Ã,¹œ»Œâ£ttœ€.ÓÅb9Rc~ö×é>GÓD_ŠÁ\µhnwœUvt>UB?,·gÞ¡[ü©{«l{]eû|Lz7©Zô>ûåìÓûdu0îLÑô1jÈ.c?ÓŸæ€?~)5}¯ÞxsEàêÄ'}ò³É ëÿ«Ñ[udBÏ j£Ašr 9jÍê!éÅ€6Lriš<A:ûµ¥¡w,Wßiœ·f;dÅW£ÀH*4L0Ã@cœ·WªØ r²ŽìRBrnjlÃmQjàŽ'kÏ·ª WrmïóŒf=(¹èÒ4ÌÊfµ=Ð ·Úð-×üëzŽCCøœÞwòQæ\ \ No newline at end of file Binary files old/cloud-netconfig-1.0/.git/objects/ef/8c805970ea806cf5bcfe83836bf6df497185bc and new/cloud-netconfig-1.3/.git/objects/ef/8c805970ea806cf5bcfe83836bf6df497185bc differ Binary files old/cloud-netconfig-1.0/.git/objects/f3/0b99c472500392a2f3968b8d180291a2f3ce03 and new/cloud-netconfig-1.3/.git/objects/f3/0b99c472500392a2f3968b8d180291a2f3ce03 differ Binary files old/cloud-netconfig-1.0/.git/objects/f3/c5fc104902b88e088d404eeba1766e265839e7 and new/cloud-netconfig-1.3/.git/objects/f3/c5fc104902b88e088d404eeba1766e265839e7 differ Binary files old/cloud-netconfig-1.0/.git/objects/pack/pack-ec8edb97d66920a48612f9b67aaa17c4d6ad40f3.idx and new/cloud-netconfig-1.3/.git/objects/pack/pack-ec8edb97d66920a48612f9b67aaa17c4d6ad40f3.idx differ Binary files old/cloud-netconfig-1.0/.git/objects/pack/pack-ec8edb97d66920a48612f9b67aaa17c4d6ad40f3.pack and new/cloud-netconfig-1.3/.git/objects/pack/pack-ec8edb97d66920a48612f9b67aaa17c4d6ad40f3.pack differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cloud-netconfig-1.0/.git/packed-refs new/cloud-netconfig-1.3/.git/packed-refs --- old/cloud-netconfig-1.0/.git/packed-refs 2018-07-10 18:22:11.165301652 +0200 +++ new/cloud-netconfig-1.3/.git/packed-refs 1970-01-01 01:00:00.000000000 +0100 @@ -1,2 +0,0 @@ -# pack-refs with: peeled fully-peeled sorted -e0616bb9d8f7935e02c23b8a9b462c9a08ae3bf5 refs/remotes/origin/master diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cloud-netconfig-1.0/.git/refs/heads/fix-azure-throttle new/cloud-netconfig-1.3/.git/refs/heads/fix-azure-throttle --- old/cloud-netconfig-1.0/.git/refs/heads/fix-azure-throttle 2019-05-15 22:18:34.671345031 +0200 +++ new/cloud-netconfig-1.3/.git/refs/heads/fix-azure-throttle 1970-01-01 01:00:00.000000000 +0100 @@ -1 +0,0 @@ -ef84f3b5b4c1383fb8850bdb33f20f155616e9d9 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cloud-netconfig-1.0/.git/refs/heads/fixes new/cloud-netconfig-1.3/.git/refs/heads/fixes --- old/cloud-netconfig-1.0/.git/refs/heads/fixes 2019-01-30 16:53:13.518767715 +0100 +++ new/cloud-netconfig-1.3/.git/refs/heads/fixes 1970-01-01 01:00:00.000000000 +0100 @@ -1 +0,0 @@ -c706e96b9c508b7df831ed7d5c41e689372d357e diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cloud-netconfig-1.0/.git/refs/heads/master new/cloud-netconfig-1.3/.git/refs/heads/master --- old/cloud-netconfig-1.0/.git/refs/heads/master 2019-01-31 14:11:27.891295667 +0100 +++ new/cloud-netconfig-1.3/.git/refs/heads/master 1970-01-01 01:00:00.000000000 +0100 @@ -1 +0,0 @@ -737eef55e55d7dfc91c693d4863c1ac0191d7481 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cloud-netconfig-1.0/.git/refs/heads/timeout-fix new/cloud-netconfig-1.3/.git/refs/heads/timeout-fix --- old/cloud-netconfig-1.0/.git/refs/heads/timeout-fix 2018-12-17 18:55:31.043403154 +0100 +++ new/cloud-netconfig-1.3/.git/refs/heads/timeout-fix 1970-01-01 01:00:00.000000000 +0100 @@ -1 +0,0 @@ -796f9018f2db0d79a3c82355241d9316cb4ad9cb diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cloud-netconfig-1.0/.git/refs/remotes/origin/HEAD new/cloud-netconfig-1.3/.git/refs/remotes/origin/HEAD --- old/cloud-netconfig-1.0/.git/refs/remotes/origin/HEAD 2018-07-10 18:22:11.165301652 +0200 +++ new/cloud-netconfig-1.3/.git/refs/remotes/origin/HEAD 1970-01-01 01:00:00.000000000 +0100 @@ -1 +0,0 @@ -ref: refs/remotes/origin/master diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cloud-netconfig-1.0/.git/refs/remotes/origin/fix-azure-throttle new/cloud-netconfig-1.3/.git/refs/remotes/origin/fix-azure-throttle --- old/cloud-netconfig-1.0/.git/refs/remotes/origin/fix-azure-throttle 2019-05-15 22:19:00.291587328 +0200 +++ new/cloud-netconfig-1.3/.git/refs/remotes/origin/fix-azure-throttle 1970-01-01 01:00:00.000000000 +0100 @@ -1 +0,0 @@ -ef84f3b5b4c1383fb8850bdb33f20f155616e9d9 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cloud-netconfig-1.0/.git/refs/remotes/origin/fixes new/cloud-netconfig-1.3/.git/refs/remotes/origin/fixes --- old/cloud-netconfig-1.0/.git/refs/remotes/origin/fixes 2019-01-30 16:53:22.570830496 +0100 +++ new/cloud-netconfig-1.3/.git/refs/remotes/origin/fixes 1970-01-01 01:00:00.000000000 +0100 @@ -1 +0,0 @@ -c706e96b9c508b7df831ed7d5c41e689372d357e diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cloud-netconfig-1.0/.git/refs/remotes/origin/master new/cloud-netconfig-1.3/.git/refs/remotes/origin/master --- old/cloud-netconfig-1.0/.git/refs/remotes/origin/master 2019-01-31 14:11:27.867295451 +0100 +++ new/cloud-netconfig-1.3/.git/refs/remotes/origin/master 1970-01-01 01:00:00.000000000 +0100 @@ -1 +0,0 @@ -737eef55e55d7dfc91c693d4863c1ac0191d7481 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cloud-netconfig-1.0/.git/refs/remotes/origin/timeout-fix new/cloud-netconfig-1.3/.git/refs/remotes/origin/timeout-fix --- old/cloud-netconfig-1.0/.git/refs/remotes/origin/timeout-fix 2018-12-17 18:55:48.847561483 +0100 +++ new/cloud-netconfig-1.3/.git/refs/remotes/origin/timeout-fix 1970-01-01 01:00:00.000000000 +0100 @@ -1 +0,0 @@ -796f9018f2db0d79a3c82355241d9316cb4ad9cb diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cloud-netconfig-1.0/Makefile new/cloud-netconfig-1.3/Makefile --- old/cloud-netconfig-1.0/Makefile 2019-01-31 14:11:27.887295630 +0100 +++ new/cloud-netconfig-1.3/Makefile 2019-11-26 17:29:23.506433126 +0100 @@ -56,6 +56,7 @@ --warning=no-file-changed \ --exclude cloud-netconfig-$(verSrc)/cloud-netconfig-$(verSrc) \ --exclude cloud-netconfig-$(verSrc)/cloud-netconfig-$(verSrc).tar.bz2 \ + --exclude .git \ cloud-netconfig-$(verSrc) @rm -f cloud-netconfig-$(verSrc) @ls -l cloud-netconfig-$(verSrc).tar.bz2 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cloud-netconfig-1.0/VERSION new/cloud-netconfig-1.3/VERSION --- old/cloud-netconfig-1.0/VERSION 2019-05-15 22:13:24.984426821 +0200 +++ new/cloud-netconfig-1.3/VERSION 2019-11-26 17:28:15.794079567 +0100 @@ -1 +1 @@ -1.0 +1.3 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cloud-netconfig-1.0/azure/functions.cloud-netconfig new/cloud-netconfig-1.3/azure/functions.cloud-netconfig --- old/cloud-netconfig-1.0/azure/functions.cloud-netconfig 2019-05-15 22:10:36.470844110 +0200 +++ new/cloud-netconfig-1.3/azure/functions.cloud-netconfig 2019-11-26 17:28:15.794079567 +0100 @@ -67,7 +67,7 @@ for idx in `get_from_metadata "${if_idx}/ipv4/ipAddress"` ; do [[ $count -ge 1 ]] && echo -n " " - get_from_metadata "${if_idx}/ipv4/ipAddress/${idx}/privateIpAddress" + get_from_metadata "${if_idx}/ipv4/ipAddress/${idx}privateIpAddress" echo -n "/" get_from_metadata "${if_idx}/ipv4/subnet/0/prefix" count=$((count+1)) @@ -85,9 +85,9 @@ local oldopt=$(shopt -p nocasematch) shopt -s nocasematch get_from_metadata | \ - while read idx || [[ -n "$idx" ]] ; do - if [[ "$(get_iface_mac $idx)" == "${hwaddr//:/}" ]]; then - get_ipv4_addresses_by_index $idx + for idx in $(get_from_metadata) ; do + if [[ "$(get_iface_mac ${idx%/*})" == "${hwaddr//:/}" ]]; then + get_ipv4_addresses_by_index ${idx%/*} fi done eval "$oldopt" Binary files old/cloud-netconfig-1.0/cloud-netconfig-0.9.tar.bz2 and new/cloud-netconfig-1.3/cloud-netconfig-0.9.tar.bz2 differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cloud-netconfig-1.0/cloud-netconfig-azure.spec new/cloud-netconfig-1.3/cloud-netconfig-azure.spec --- old/cloud-netconfig-1.0/cloud-netconfig-azure.spec 2019-05-15 22:13:48.776650510 +0200 +++ new/cloud-netconfig-1.3/cloud-netconfig-azure.spec 2019-11-26 17:28:15.794079567 +0100 @@ -18,7 +18,7 @@ %define base_name cloud-netconfig Name: %{base_name}-azure -Version: 1.0 +Version: 1.3 Release: 0 License: GPL-3.0+ Summary: Network configuration scripts for Microsoft Azure diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cloud-netconfig-1.0/cloud-netconfig-ec2.spec new/cloud-netconfig-1.3/cloud-netconfig-ec2.spec --- old/cloud-netconfig-1.0/cloud-netconfig-ec2.spec 2019-05-15 22:13:53.952699180 +0200 +++ new/cloud-netconfig-1.3/cloud-netconfig-ec2.spec 2019-11-26 17:28:15.794079567 +0100 @@ -18,7 +18,7 @@ %define base_name cloud-netconfig Name: %{base_name}-ec2 -Version: 1.0 +Version: 1.3 Release: 0 License: GPL-3.0+ Summary: Network configuration scripts for Amazon EC2 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cloud-netconfig-1.0/cloud-netconfig.spec new/cloud-netconfig-1.3/cloud-netconfig.spec --- old/cloud-netconfig-1.0/cloud-netconfig.spec 2019-05-15 22:14:00.660762259 +0200 +++ new/cloud-netconfig-1.3/cloud-netconfig.spec 2019-11-26 17:28:15.794079567 +0100 @@ -32,7 +32,7 @@ %endif Name: %{base_name}%{flavor_suffix} -Version: 1.0 +Version: 1.3 Release: 0 License: GPL-3.0+ Summary: Network configuration scripts for %{csp_string} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cloud-netconfig-1.0/common/cloud-netconfig new/cloud-netconfig-1.3/common/cloud-netconfig --- old/cloud-netconfig-1.0/common/cloud-netconfig 2019-01-31 14:11:27.891295667 +0100 +++ new/cloud-netconfig-1.3/common/cloud-netconfig 2019-11-21 14:12:18.156387464 +0100 @@ -27,6 +27,7 @@ . "$r/etc/sysconfig/network/scripts/functions.cloud-netconfig" STATEDIR=/var/run/netconfig +ADDRDIR=/var/run/netconfig/cloud # ------------------------------------------------------------------- # return all IPv4 addresses currently configured on given interface @@ -77,6 +78,21 @@ } # ------------------------------------------------------------------- +# check wether $2 is an element of array $1 +# +is_element() +{ + local array=(${!1}) item=${2} + local elem + for elem in ${array[@]} ; do + if [[ $elem == $item ]]; then + return 0 + fi + done + return 1 +} + +# ------------------------------------------------------------------- # look up a free priority with a given prefix from the rule table # get_free_priority() @@ -108,6 +124,58 @@ } # ------------------------------------------------------------------- +# get IPv4 addresses from log dir +# +get_cn_assigned_addrs() +{ + local iface="$1" + test -z "$iface" && return 1 + + if [[ -e ${ADDRDIR}/${iface} ]]; then + echo $(cat ${ADDRDIR}/${iface}) + fi +} + +# ------------------------------------------------------------------- +# add address to log +# +add_addr_to_log() +{ + local iface="$1" + local addr="$2" + + test -z "$iface" -o -z "$addr" && return 1 + addr_log_file="${ADDRDIR}/${iface}" + if [[ -e ${addr_log_file} ]]; then + grep -q -x "${addr}" "${addr_log_file}" || echo "${addr}" >> "${addr_log_file}" + else + mkdir -p "${ADDRDIR}" + echo "${addr}" > "${addr_log_file}" + fi +} + +# ------------------------------------------------------------------- +# remove address from log +# +remove_addr_from_log() +{ + local iface="$1" + local addr="$2" + + test -z "$iface" -o -z "$addr" && return 1 + addr_log_file="${ADDRDIR}/${iface}" + if [[ -e ${addr_log_file} ]]; then + addr_log_file_tmp=$(mktemp ${ADDRDIR}/${iface}.XXXXXXXX) + if [ $? -ne 0 ]; then + log "could not create temp file, not removing address from log" + else + grep -v -x "${addr}" "${addr_log_file}" >> "${addr_log_file_tmp}" + mv "${addr_log_file_tmp}" "${addr_log_file}" + fi + fi +} + +# ------------------------------------------------------------------- # configure interface with secondary IPv4 addresses configured in the # cloud framework and set up routing policies # @@ -132,11 +200,14 @@ # get differences local addr_to_remove=($(get_extra_elements laddrs[@] raddrs[@])) local addr_to_add=($(get_extra_elements raddrs[@] laddrs[@])) - + + # get addresses cloud-netconfig configured + local addr_cn=($(get_cn_assigned_addrs $INTERFACE)) + debug "active IPv4 addresses on $INTERFACE: ${laddrs[@]}" - debug "configured IPv4 addresses on $INTERFACE: ${raddrs[@]}" - debug "addresses to remove on $INTERFACE: ${addr_to_remove[@]}" - debug "addresses to add on $INTERFACE: ${addr_to_add[@]}" + debug "configured IPv4 addresses for $INTERFACE: ${raddrs[@]}" + debug "excess addresses on $INTERFACE: ${addr_to_remove[@]}" + debug "addresses to configure on $INTERFACE: ${addr_to_add[@]}" local addr priority for addr in ${addr_to_remove[@]} ; do @@ -147,19 +218,32 @@ continue fi - # remove old IP address - log "removing address $addr from interface $INTERFACE" - ip -4 addr del $addr dev $INTERFACE + if is_element addr_cn[@] ${addr} ; then + # remove old IP address + log "removing address $addr from interface $INTERFACE" + ip -4 addr del $addr dev $INTERFACE + + # drop routing policy rule + ip -4 rule del from ${addr%/*} - # drop routing policy rule - ip -4 rule del from ${addr%/*} + # remove from address log + remove_addr_from_log $INTERFACE $addr + else + debug "not removing address ${addr} (was not added by cloud-netconfig)" + fi done for addr in ${addr_to_add[@]} ; do # add new IP address log "adding address $addr to interface $INTERFACE" ip -4 addr add $addr broadcast $BROADCAST dev $INTERFACE + add_addr_to_log $INTERFACE $addr done + # If we have a single NIC configuration, skip routing policies + if [[ $SINGLE_NIC = yes ]]; then + return + fi + # To make a working default route for secondary interfaces, we # need a separate route table so we can send packets there # using routing policy. Check whether the table is there and @@ -168,8 +252,8 @@ local GW GWS=() # we simply take the first gateway in case there is more than one eval GWS=$${GATEWAYS}$ - if [[ -n "${GW[0]}" ]]; then - GW="${GW[0]}" + if [[ -n "${GWS[0]}" ]]; then + GW="${GWS[0]}" else # no default route, guess one # FIXME: this is not ideal; make it at least configurable @@ -288,7 +372,20 @@ done } -for IFDIR in $STATEDIR/* ; do +if_dirs=() +for IFDIR in $STATEDIR/* ; do test -d $IFDIR -a -d "/sys/class/net/${IFDIR##*/}" || continue + test ${IFDIR##*/} = "lo" && continue + if_dirs+=($IFDIR) +done + +# set single NIC flag if appropriate +if [[ ${#if_dirs[@]} -eq 1 ]]; then + SINGLE_NIC=yes +else + SINGLE_NIC=no +fi + +for IFDIR in ${if_dirs[@]} ; do manage_interfaceconfig $IFDIR done diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cloud-netconfig-1.0/ec2/functions.cloud-netconfig new/cloud-netconfig-1.3/ec2/functions.cloud-netconfig --- old/cloud-netconfig-1.0/ec2/functions.cloud-netconfig 2019-01-31 14:11:27.891295667 +0100 +++ new/cloud-netconfig-1.3/ec2/functions.cloud-netconfig 2019-11-26 09:42:05.428870360 +0100 @@ -16,9 +16,52 @@ # # You should have received a copy of the GNU General Public License -API_VERSION="2016-09-02" -METADATA_URL_BASE="http://169.254.169.254/${API_VERSION}/meta-data/network/interfaces/macs/" +API_VERSION="2018-09-24" +METADATA_URL_BASE="http://169.254.169.254/${API_VERSION}" +METADATA_URL_IFACE="${METADATA_URL_BASE}/meta-data/network/interfaces/macs" CURL="curl -m 3" +TOKEN_TTL="60" +declare TOKEN + +# ------------------------------------------------------------------- +# get a session token for metadata access and store it in TOKEN +# +set_metadata_token() +{ + if [ -z "$TOKEN" ]; then + TOKEN=$($CURL -X PUT "http://169.254.169.254/latest/api/token" \ + -H "X-aws-ec2-metadata-token-ttl-seconds: $TOKEN_TTL" 2>/dev/null) + fi +} + +# ------------------------------------------------------------------- +# check whether given URL is available +# +check_url() +{ + test -z "$1" && return 1 + set_metadata_token + CODE=$($CURL -H "X-aws-ec2-metadata-token: $TOKEN" -I "$1" 2>/dev/null | \ + grep '^HTTP' | cut -d' ' -f2) + [ "$CODE" = "200" ] + return $? +} + +# ------------------------------------------------------------------- +# assign provided variable with value from metadata URL +# refresh token if necessary +# +set_from_metadata() +{ + test -z "$1" -o -z "$2" && return 1 + set_metadata_token + if check_url "$2" ; then + eval ${1}=\"$($CURL -H "X-aws-ec2-metadata-token: $TOKEN" "$2" 2>/dev/null)\" + else + return 1 + fi + return 0 +} # ------------------------------------------------------------------- # get IPv4 address from the EC2 meta data server and return them @@ -26,25 +69,23 @@ get_ipv4_addresses_from_metadata() { local addr count=0 hwaddr="$1" prefixlen - test -z "$hwaddr" && return 1 + test -z "$hwaddr" && return - # sometimes the entry for a newly attach NIC is not there yet - local check_md=$($CURL "${METADATA_URL_BASE}" 2>/dev/null | grep "$hwaddr") - local attempts=0 - while [ -z "$check_md" ]; do - if [ $attempts -ge 5 ]; then + # sometimes the entry for a newly attached NIC is not there yet, retry + # a few times if necessary + local cidr_block local_ips attempts=0 + while ! set_from_metadata cidr_block "${METADATA_URL_IFACE}/${hwaddr}/subnet-ipv4-cidr-block" ; do + if [[ $attempts -ge 5 ]]; then log "Could not get metadata for nic $hwaddr" return fi attempts=$((attempts+1)) sleep 1 - check_md=$($CURL "${METADATA_URL_BASE}" 2>/dev/null | grep "$hwaddr") done - local cidr_block=$($CURL "${METADATA_URL_BASE}/$hwaddr/subnet-ipv4-cidr-block" 2>/dev/null) - prefixlen=${cidr_block##*/} - $CURL "${METADATA_URL_BASE}/$hwaddr/local-ipv4s" 2>/dev/null | \ - while read -r addr || [[ -n "$addr" ]]; do + set_from_metadata local_ips "${METADATA_URL_IFACE}/${hwaddr}/local-ipv4s" + local prefixlen=${cidr_block##*/} + for addr in ${local_ips} ; do [[ $count -ge 1 ]] && echo -n " " echo -n "${addr}/${prefixlen}" count=$((count+1)) @@ -56,8 +97,7 @@ # metadata_available() { - local resp=$($CURL "http://169.254.169.254/latest/meta-data/" 2>/dev/null) - [[ "$resp" == *ami-id* ]] + check_url "${METADATA_URL_BASE}/meta-data/" return $? }

1 0

commit libwacom for openSUSE:Factory
by root 02 Dec '19

02 Dec '19

Hello community, here is the log from the commit of package libwacom for openSUSE:Factory checked in at 2019-12-02 11:27:27 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/libwacom (Old) and /work/SRC/openSUSE:Factory/.libwacom.new.4691 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "libwacom" Mon Dec 2 11:27:27 2019 rev:28 rq:749965 version:1.1 Changes: -------- --- /work/SRC/openSUSE:Factory/libwacom/libwacom.changes 2019-11-21 09:41:00.486630002 +0100 +++ /work/SRC/openSUSE:Factory/.libwacom.new.4691/libwacom.changes 2019-12-02 11:28:53.082628336 +0100 @@ -2 +2 @@ -Thu Nov 21 08:30:23 UTC 2019 - Dominique Leuenberger <dimstar(a)opensuse.org> +Wed Nov 20 15:13:38 UTC 2019 - Stefan Brüns <stefan.bruens(a)rwth-aachen.de> @@ -4,3 +4,2 @@ -- Add libwacom-meson-0.51-lto.patch: Completely strip the - test_deprecated linkingn from meson.build> 174.patch would only - properly work with meson 0.52+. +- Pass b_lto option to meson, otherwise the previous patch has no + effect (meson does not derive the b_lto value from the FLAGS). Old: ---- libwacom-meson-0.51-lto.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libwacom.spec ++++++ --- /var/tmp/diff_new_pack.1q0xNd/_old 2019-12-02 11:28:55.506627214 +0100 +++ /var/tmp/diff_new_pack.1q0xNd/_new 2019-12-02 11:28:55.506627214 +0100 @@ -1,7 +1,7 @@ # # spec file for package libwacom # -# Copyright (c) 2019 SUSE LLC. +# 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 @@ -33,7 +33,6 @@ Source3: %{name}.keyring Source99: baselibs.conf Patch0: https://patch-diff.githubusercontent.com/raw/linuxwacom/libwacom/pull/174.p… -Patch1: libwacom-meson-0.51-lto.patch %if %{with meson} BuildRequires: meson >= 0.47.0 %endif @@ -88,11 +87,10 @@ %prep %setup -q %patch0 -p1 -%patch1 -p1 %build %if %{with meson} -%meson +%meson -Db_lto=true %meson_build %else %configure \

1 0

commit python-clikit for openSUSE:Factory
by root 02 Dec '19

02 Dec '19

Hello community, here is the log from the commit of package python-clikit for openSUSE:Factory checked in at 2019-12-02 11:27:19 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/python-clikit (Old) and /work/SRC/openSUSE:Factory/.python-clikit.new.4691 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "python-clikit" Mon Dec 2 11:27:19 2019 rev:3 rq:751628 version:0.4.0 Changes: -------- --- /work/SRC/openSUSE:Factory/python-clikit/python-clikit.changes 2019-10-10 11:53:12.403359222 +0200 +++ /work/SRC/openSUSE:Factory/.python-clikit.new.4691/python-clikit.changes 2019-12-02 11:28:48.562630428 +0100 @@ -1,0 +2,7 @@ +Thu Nov 28 15:05:12 CET 2019 - Matej Cepl <mcepl(a)suse.com> + +- Update to 0.4.0: + - Changed the way event names are stored and exposed. + - Fixed parsing of options after a -- token. + +------------------------------------------------------------------- Old: ---- clikit-0.3.2.tar.gz New: ---- clikit-0.4.0.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ python-clikit.spec ++++++ --- /var/tmp/diff_new_pack.SpjwMX/_old 2019-12-02 11:28:50.018629754 +0100 +++ /var/tmp/diff_new_pack.SpjwMX/_new 2019-12-02 11:28:50.018629754 +0100 @@ -1,7 +1,7 @@ # # spec file for package python-clikit # -# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2019 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -18,7 +18,7 @@ %{?!python_module:%define python_module() python-%{**} python3-%{**}} Name: python-clikit -Version: 0.3.2 +Version: 0.4.0 Release: 0 Summary: Helper to build testable command line interfaces License: MIT ++++++ clikit-0.3.2.tar.gz -> clikit-0.4.0.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/clikit-0.3.2/.github/workflows/push.yml new/clikit-0.4.0/.github/workflows/push.yml --- old/clikit-0.3.2/.github/workflows/push.yml 2019-09-20 15:59:56.000000000 +0200 +++ new/clikit-0.4.0/.github/workflows/push.yml 2019-10-25 14:22:57.000000000 +0200 @@ -1,4 +1,4 @@ -name: Push +name: Tests on: [push, pull_request] @@ -82,16 +82,15 @@ with: python-version: ${{ matrix.python-version }} - name: Install Poetry - shell: pwsh run: | Invoke-WebRequest https://raw.githubusercontent.com/sdispater/poetry/master/get-poetry.py -O get-poetry.py python get-poetry.py --preview -y $env:Path += ";$env:Userprofile\.poetry\bin" - name: Install dependencies run: | - SET PATH=%USERPROFILE%\\.poetry\\bin;%PATH% + $env:Path += ";$env:Userprofile\.poetry\bin" poetry install - name: Test run: | - SET PATH=%USERPROFILE%\\.poetry\\bin;%PATH% + $env:Path += ";$env:Userprofile\.poetry\bin" poetry run pytest -q tests diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/clikit-0.3.2/.gitignore new/clikit-0.4.0/.gitignore --- old/clikit-0.3.2/.gitignore 2019-09-20 15:59:56.000000000 +0200 +++ new/clikit-0.4.0/.gitignore 2019-10-25 14:22:57.000000000 +0200 @@ -23,3 +23,5 @@ /test poetry.lock .pytest_cache +pip-wheel-metadata +setup.py diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/clikit-0.3.2/CHANGELOG.md new/clikit-0.4.0/CHANGELOG.md --- old/clikit-0.3.2/CHANGELOG.md 2019-09-20 15:59:56.000000000 +0200 +++ new/clikit-0.4.0/CHANGELOG.md 2019-10-25 14:22:57.000000000 +0200 @@ -1,5 +1,17 @@ # Change Log +## [0.4.0] - 2019-10-25 + +### Changed + +- Changed the way event names are stored and exposed. + + +### Fixed + +- Fixed parsing of options after a `--` token. + + ## [0.3.2] - 2019-09-20 ### Fixed @@ -74,7 +86,8 @@ - Fixed the progress indicator component. -[Unreleased]: https://github.com/sdispater/tomlkit/compare/0.3.2...master +[Unreleased]: https://github.com/sdispater/tomlkit/compare/0.4.0...master +[0.4.0]: https://github.com/sdispater/tomlkit/releases/tag/0.4.0 [0.3.2]: https://github.com/sdispater/tomlkit/releases/tag/0.3.2 [0.3.1]: https://github.com/sdispater/tomlkit/releases/tag/0.3.1 [0.3.0]: https://github.com/sdispater/tomlkit/releases/tag/0.3.0 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/clikit-0.3.2/pyproject.toml new/clikit-0.4.0/pyproject.toml --- old/clikit-0.3.2/pyproject.toml 2019-09-20 15:59:56.000000000 +0200 +++ new/clikit-0.4.0/pyproject.toml 2019-10-25 14:22:57.000000000 +0200 @@ -1,6 +1,6 @@ [tool.poetry] name = "clikit" -version = "0.3.2" +version = "0.4.0" description = "CliKit is a group of utilities to build beautiful and testable command line interfaces." authors = ["Sébastien Eustace <sebastien(a)eustace.io>"] license = "MIT" @@ -33,5 +33,5 @@ pre-commit = "^1.12" [build-system] -requires = ["poetry>=0.12"] +requires = ["poetry>=1.0.0b2"] build-backend = "poetry.masonry.api" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/clikit-0.3.2/src/clikit/__init__.py new/clikit-0.4.0/src/clikit/__init__.py --- old/clikit-0.3.2/src/clikit/__init__.py 2019-09-20 15:59:56.000000000 +0200 +++ new/clikit-0.4.0/src/clikit/__init__.py 2019-10-25 14:22:57.000000000 +0200 @@ -3,4 +3,4 @@ from .config.default_application_config import DefaultApplicationConfig -__version__ = "0.3.2" +__version__ = "0.4.0" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/clikit-0.3.2/src/clikit/api/args/raw_args.py new/clikit-0.4.0/src/clikit/api/args/raw_args.py --- old/clikit-0.3.2/src/clikit/api/args/raw_args.py 2019-09-20 15:59:56.000000000 +0200 +++ new/clikit-0.4.0/src/clikit/api/args/raw_args.py 2019-10-25 14:22:57.000000000 +0200 @@ -20,3 +20,11 @@ def to_string(self, script_name=True): # type: (bool) -> str raise NotImplementedError() + + @property + def option_tokens(self): # type: () -> List[str] + raise NotImplementedError() + return list(itertools.takewhile(lambda arg: arg != "--", self.tokens)) + + def has_option_token(self, token): # type: (str) -> bool + raise NotImplementedError() diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/clikit-0.3.2/src/clikit/api/command/command.py new/clikit-0.4.0/src/clikit/api/command/command.py --- old/clikit-0.3.2/src/clikit/api/command/command.py 2019-09-20 15:59:56.000000000 +0200 +++ new/clikit-0.4.0/src/clikit/api/command/command.py 2019-10-25 14:22:57.000000000 +0200 @@ -5,7 +5,7 @@ from clikit.api.args.raw_args import RawArgs from clikit.api.args.format.args_format import ArgsFormat from clikit.api.config.command_config import CommandConfig -from clikit.api.event import ConsoleEvents +from clikit.api.event import PRE_HANDLE from clikit.api.event import PreHandleEvent from clikit.api.io import IO @@ -158,11 +158,9 @@ self._named_sub_commands.add(command) def _do_handle(self, args, io): # type: (Args, IO) -> Optional[int] - if self._dispatcher and self._dispatcher.has_listeners( - ConsoleEvents.PRE_HANDLE.value - ): + if self._dispatcher and self._dispatcher.has_listeners(PRE_HANDLE): event = PreHandleEvent(args, io, self) - self._dispatcher.dispatch(ConsoleEvents.PRE_HANDLE.value, event) + self._dispatcher.dispatch(PRE_HANDLE, event) if event.is_handled(): return event.status_code diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/clikit-0.3.2/src/clikit/api/event/__init__.py new/clikit-0.4.0/src/clikit/api/event/__init__.py --- old/clikit-0.3.2/src/clikit/api/event/__init__.py 2019-09-20 15:59:56.000000000 +0200 +++ new/clikit-0.4.0/src/clikit/api/event/__init__.py 2019-10-25 14:22:57.000000000 +0200 @@ -1,5 +1,7 @@ from .config_event import ConfigEvent -from .console_events import ConsoleEvents +from .console_events import CONFIG +from .console_events import PRE_HANDLE +from .console_events import PRE_RESOLVE from .event import Event from .event_dispatcher import EventDispatcher from .pre_handle_event import PreHandleEvent diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/clikit-0.3.2/src/clikit/api/event/console_events.py new/clikit-0.4.0/src/clikit/api/event/console_events.py --- old/clikit-0.3.2/src/clikit/api/event/console_events.py 2019-09-20 15:59:56.000000000 +0200 +++ new/clikit-0.4.0/src/clikit/api/event/console_events.py 2019-10-25 14:22:57.000000000 +0200 @@ -1,10 +1,5 @@ -from enum import Enum +PRE_RESOLVE = "pre-resolve" +PRE_HANDLE = "pre-handle" -class ConsoleEvents(Enum): - - PRE_RESOLVE = "pre-resolve" - - PRE_HANDLE = "pre-handle" - - CONFIG = "config" +CONFIG = "config" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/clikit-0.3.2/src/clikit/args/argv_args.py new/clikit-0.4.0/src/clikit/args/argv_args.py --- old/clikit-0.3.2/src/clikit/args/argv_args.py 2019-09-20 15:59:56.000000000 +0200 +++ new/clikit-0.4.0/src/clikit/args/argv_args.py 2019-10-25 14:22:57.000000000 +0200 @@ -1,3 +1,4 @@ +import itertools import sys from typing import List @@ -19,6 +20,9 @@ argv = argv[:] self._script_name = argv.pop(0) self._tokens = argv + self._option_tokens = list( + itertools.takewhile(lambda arg: arg != "--", self.tokens) + ) @property def script_name(self): # type: () -> str @@ -28,9 +32,16 @@ def tokens(self): # type: () -> List[str] return self._tokens + @property + def option_tokens(self): # type: () -> List[str] + return self._option_tokens + def has_token(self, token): # type: (str) -> bool return token in self._tokens + def has_option_token(self, token): # type: (str) -> bool + return token in self._option_tokens + def to_string(self, script_name=True): # type: (bool) -> str string = " ".join(self._tokens) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/clikit-0.3.2/src/clikit/args/string_args.py new/clikit-0.4.0/src/clikit/args/string_args.py --- old/clikit-0.3.2/src/clikit/args/string_args.py 2019-09-20 15:59:56.000000000 +0200 +++ new/clikit-0.4.0/src/clikit/args/string_args.py 2019-10-25 14:22:57.000000000 +0200 @@ -1,3 +1,5 @@ +import itertools + from typing import List from typing import Optional @@ -16,6 +18,9 @@ parser = TokenParser() self._tokens = parser.parse(string) + self._option_tokens = list( + itertools.takewhile(lambda arg: arg != "--", self.tokens) + ) @property def script_name(self): # type: () -> Optional[str] @@ -25,8 +30,15 @@ def tokens(self): # type: () -> List[str] return self._tokens + @property + def option_tokens(self): # type: () -> List[str] + return self._option_tokens + def has_token(self, token): # type: (str) -> bool return token in self._tokens + def has_option_token(self, token): # type: (str) -> bool + return token in self._option_tokens + def to_string(self, script_name=True): # type: (bool) -> str return " ".join(self._tokens) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/clikit-0.3.2/src/clikit/config/default_application_config.py new/clikit-0.4.0/src/clikit/config/default_application_config.py --- old/clikit-0.3.2/src/clikit/config/default_application_config.py 2019-09-20 15:59:56.000000000 +0200 +++ new/clikit-0.4.0/src/clikit/config/default_application_config.py 2019-10-25 14:22:57.000000000 +0200 @@ -2,7 +2,8 @@ from clikit.api.args.raw_args import RawArgs from clikit.api.args.format.argument import Argument from clikit.api.args.format.option import Option -from clikit.api.event import ConsoleEvents +from clikit.api.event import PRE_HANDLE +from clikit.api.event import PRE_RESOLVE from clikit.api.event import EventDispatcher from clikit.api.event import PreHandleEvent from clikit.api.event import PreResolveEvent @@ -35,10 +36,8 @@ def configure(self): self.set_io_factory(self.create_io) - self.add_event_listener( - ConsoleEvents.PRE_RESOLVE.value, self.resolve_help_command - ) - self.add_event_listener(ConsoleEvents.PRE_HANDLE.value, self.print_version) + self.add_event_listener(PRE_RESOLVE, self.resolve_help_command) + self.add_event_listener(PRE_HANDLE, self.print_version) self.add_option("help", "h", Option.NO_VALUE, "Display this help message") self.add_option("quiet", "q", Option.NO_VALUE, "Do not output any message") @@ -90,9 +89,9 @@ style_set = application.config.style_set - if args.has_token("--no-ansi"): + if args.has_option_token("--no-ansi"): output_formatter = error_formatter = PlainFormatter(style_set) - elif args.has_token("--ansi"): + elif args.has_option_token("--ansi"): output_formatter = error_formatter = AnsiFormatter(style_set, True) else: if output_stream.supports_ansi(): @@ -111,17 +110,17 @@ Output(error_stream, error_formatter), ) - if args.has_token("-vvv") or self.is_debug(): + if args.has_option_token("-vvv") or self.is_debug(): io.set_verbosity(DEBUG) - elif args.has_token("-vv"): + elif args.has_option_token("-vv"): io.set_verbosity(VERY_VERBOSE) - elif args.has_token("-v"): + elif args.has_option_token("-v"): io.set_verbosity(VERBOSE) - if args.has_token("--quiet") or args.has_token("-q"): + if args.has_option_token("--quiet") or args.has_option_token("-q"): io.set_quiet(True) - if args.has_token("--no-interaction") or args.has_token("-n"): + if args.has_option_token("--no-interaction") or args.has_option_token("-n"): io.set_interactive(False) return io @@ -144,7 +143,7 @@ args = event.raw_args application = event.application - if args.has_token("-h") or args.has_token("--help"): + if args.has_option_token("-h") or args.has_option_token("--help"): command = application.get_command("help") # Enable lenient parsing diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/clikit-0.3.2/src/clikit/console_application.py new/clikit-0.4.0/src/clikit/console_application.py --- old/clikit-0.3.2/src/clikit/console_application.py 2019-09-20 15:59:56.000000000 +0200 +++ new/clikit-0.4.0/src/clikit/console_application.py 2019-10-25 14:22:57.000000000 +0200 @@ -8,8 +8,9 @@ from .api.command.exceptions import CannotAddCommandException from .api.config.application_config import ApplicationConfig from .api.config.command_config import CommandConfig +from .api.event import CONFIG +from .api.event import PRE_RESOLVE from .api.event import ConfigEvent -from .api.event import ConsoleEvents from .api.event import PreResolveEvent from .api.exceptions import CliKitException from .api.io import IO @@ -37,8 +38,8 @@ try: dispatcher = config.dispatcher - if dispatcher and dispatcher.has_listeners(ConsoleEvents.CONFIG.value): - dispatcher.dispatch(ConsoleEvents.CONFIG.value, ConfigEvent(config)) + if dispatcher and dispatcher.has_listeners(CONFIG): + dispatcher.dispatch(CONFIG, ConfigEvent(config)) self._config = config self._dispatcher = config.dispatcher @@ -98,11 +99,9 @@ return not self._default_commands.is_empty() def resolve_command(self, args): # type: (RawArgs) -> ResolvedCommand - if self._dispatcher and self._dispatcher.has_listeners( - ConsoleEvents.PRE_RESOLVE.value - ): + if self._dispatcher and self._dispatcher.has_listeners(PRE_RESOLVE): event = PreResolveEvent(args, self) - self._dispatcher.dispatch(ConsoleEvents.PRE_RESOLVE.value, event) + self._dispatcher.dispatch(PRE_RESOLVE, event) resolved_command = event.resolved_command if resolved_command: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/clikit-0.3.2/tests/args/test_argv_args.py new/clikit-0.4.0/tests/args/test_argv_args.py --- old/clikit-0.3.2/tests/args/test_argv_args.py 2019-09-20 15:59:56.000000000 +0200 +++ new/clikit-0.4.0/tests/args/test_argv_args.py 2019-10-25 14:22:57.000000000 +0200 @@ -42,6 +42,33 @@ assert not args.has_token("foo") +def test_has_option_token(): + args = ArgvArgs( + [ + "console", + "server", + "add", + "--port", + "80", + "localhost", + "--", + "-h", + "--test", + "remainder", + ] + ) + + assert args.has_option_token("server") + assert args.has_option_token("add") + assert args.has_option_token("--port") + assert args.has_option_token("80") + assert args.has_option_token("localhost") + assert not args.has_option_token("console") + assert not args.has_option_token("-h") + assert not args.has_option_token("--test") + assert not args.has_option_token("remainder") + + def test_to_string(): args = ArgvArgs(["console", "server", "add", "--port", "80", "localhost"]) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/clikit-0.3.2/tests/handler/help/test_help_option.py new/clikit-0.4.0/tests/handler/help/test_help_option.py --- old/clikit-0.3.2/tests/handler/help/test_help_option.py 1970-01-01 01:00:00.000000000 +0100 +++ new/clikit-0.4.0/tests/handler/help/test_help_option.py 2019-10-25 14:22:57.000000000 +0200 @@ -0,0 +1,87 @@ +# -*- coding: utf-8 -*- +from __future__ import unicode_literals + +from contextlib import contextmanager + +import pytest + +from clikit.api.args import Args +from clikit.api.args.format import Argument +from clikit.args.string_args import StringArgs +from clikit.config.default_application_config import DefaultApplicationConfig +from clikit.console_application import ConsoleApplication +from clikit.io.output_stream import BufferedOutputStream + + +(a)pytest.fixture() +def app(): + config = DefaultApplicationConfig() + config.set_catch_exceptions(True) + config.set_terminate_after_run(False) + config.set_display_name("The Application") + config.set_version("1.2.3") + + with config.command("command") as c: + with c.sub_command("run") as sc: + sc.set_description('Description of "run"') + sc.add_argument("args", Argument.MULTI_VALUED, 'Description of "argument"') + + application = ConsoleApplication(config) + + return application + + +def func_spy(): + def decorator(func): + def wrapper(*args, **kwargs): + decorator.called = True + return func(*args, **kwargs) + + return wrapper + + decorator.called = False + return decorator + + +@contextmanager +def help_spy(help_command): + spy = func_spy() + original = help_command.config.handler.handle + try: + help_command.config.handler.handle = spy(original) + yield spy + finally: + help_command.config.handler.handle = original + + +(a)pytest.mark.parametrize( + "args", + [ + "command run --help", + "command run --help --another", + "command run --help -- whatever", + "command run -h", + "command run -h --another", + "command run -h -- whatever", + ], +) +def test_help_option(app, args): + help_command = app.get_command("help") + with help_spy(help_command) as spy: + app.run(StringArgs(args)) + assert spy.called, "help command not called" + + +(a)pytest.mark.parametrize( + "args", + [ + "command run -- whatever --help", + "command run -- whatever -h", + "command run -- --help", + ], +) +def test_help_option_ignored(app, args): + help_command = app.get_command("help") + with help_spy(help_command) as spy: + app.run(StringArgs(args)) + assert not spy.called, "help command called"

1 0

commit schily for openSUSE:Factory
by root 02 Dec '19

02 Dec '19

Hello community, here is the log from the commit of package schily for openSUSE:Factory checked in at 2019-12-02 11:27:17 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/schily (Old) and /work/SRC/openSUSE:Factory/.schily.new.4691 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "schily" Mon Dec 2 11:27:17 2019 rev:20 rq:749949 version:unknown Changes: -------- --- /work/SRC/openSUSE:Factory/schily/schily.changes 2019-10-27 13:35:35.976858964 +0100 +++ /work/SRC/openSUSE:Factory/.schily.new.4691/schily.changes 2019-12-02 11:28:31.858638158 +0100 @@ -1,0 +2,28 @@ +Wed Nov 20 11:11:10 UTC 2019 - Jan Engelhardt <jengelh(a)inai.de> + +- Update to relesae 2019.11.11 + * star: When using star -copy, the default is now + -no-secure-links. This is what users like since they are + copying their own data that per definition cannot be + untrusted external data. + * star: star -diff is now "more smooth" to use, when the + archive type is GNU TAR and the "atime" or "ctime" properties + are not present for a specific file. Before, Jan 1 1970 was + the assumed time in the archive. + * star: star -diff now prints a diff statistics summary. + * SCCS: Added a new delta type 'U' that allows to tell get(1) + to remove the g-file. Such SCCS history files are going to be + used as placeholders for removed files in the upcomming + project mode. + * SCCS: admin now has a new option -Xunlink. It can be used + together with -n to create special SCCS history files that + remove the g-file on extraction if a delta is to be extracted + that is of type 'U'. + * SCCS: get now honors delta table entries that use the new 'U' + delta type and removed non-writable g-files on extraction. + This feature only works if the history file is in SCCS V6 + mode. + * SCCS: a new option -Xmail=address allows admin(1) and delta(1) + to add an email address to the delta meta data. + +------------------------------------------------------------------- Old: ---- schily-2019-10-25.tar.bz2 New: ---- schily-2019-11-11.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ schily.spec ++++++ --- /var/tmp/diff_new_pack.No7InC/_old 2019-12-02 11:28:34.466636951 +0100 +++ /var/tmp/diff_new_pack.No7InC/_new 2019-12-02 11:28:34.470636949 +0100 @@ -1,7 +1,7 @@ # # spec file for package schily # -# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2019 SUSE LLC. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -16,15 +16,15 @@ # -# grep -r define.VERSION (sometimes also noted down in schily-%rver/AN-%rver) -%global box_version 2019.10.25 +# grep -Pir 'define\s+VERSION|strvers' +%global box_version 2019.11.11 %global cdr_version 3.02~a10 %global sccs_version 5.09 %global smake_version 1.3 %global star_version 1.6.1 %global libfind_version 1.7 %global ved_version 1.7 -%define rver 2019-10-25 +%define rver 2019-11-11 Name: schily Version: %box_version @@ -560,7 +560,6 @@ $b/usr/bin/pxupgrade \ $b/usr/bin/scgcheck \ $b/usr/bin/scgskeleton \ - $b/usr/bin/scpio \ $b/usr/bin/scut \ $b/usr/bin/sdd \ $b/usr/bin/sfind \ @@ -616,7 +615,6 @@ $b/usr/share/man/man1/pxupgrade.1 \ $b/usr/share/man/man1/scgcheck.1 \ $b/usr/share/man/man1/scgskeleton.1 \ - $b/usr/share/man/man1/scpio.1 \ $b/usr/share/man/man1/scut.1 \ $b/usr/share/man/man1/sdd.1 \ $b/usr/share/man/man1/sfind.1 \ @@ -630,11 +628,9 @@ $b/usr/share/man/man1/translit.1 \ $b/usr/share/man/man1/udiff.1 \ $b/usr/share/man/man3/getopt.3 \ - $b/usr/share/man/man5/changeset.5 \ + $b/usr/share/man/man3/getsubopt.3 \ $b/usr/share/man/man5/makefiles.5 \ $b/usr/share/man/man5/makerules.5 \ - $b/usr/share/man/man5/sccschangeset.5 \ - $b/usr/share/man/man5/sccsfile.5 \ $b/usr/share/man/man5/streamarchive.5 \ $b/usr/share/man/man8/sformat.8 \ $b/usr/share/doc/packages/dotfiles.tar.bz2 @@ -870,10 +866,18 @@ %_mandir/man3/fpipe.3* %exclude %_mandir/man3/fprintf.3* %_mandir/man3/getallargs.3* +%_mandir/man3/getargerror.3* +%_mandir/man3/getarginit.3* %_mandir/man3/getargs.3* %_mandir/man3/geterrno.3* %_mandir/man3/getfiles.3* +%_mandir/man3/getlallargs.3* +%_mandir/man3/getlargs.3* +%_mandir/man3/getlfiles.3* %exclude %_mandir/man3/getline.3* +%_mandir/man3/getvallargs.3* +%_mandir/man3/getvargs.3* +%_mandir/man3/getvfiles.3* %_mandir/man3/handlecond.3* %_mandir/man3/movebytes.3* %_mandir/man3/ofindline.3* @@ -986,6 +990,9 @@ %_mandir/man1/val.1* %_mandir/man1/vc.1* %_mandir/man1/what.1* +%_mandir/man5/changeset.5* +%_mandir/man5/sccschangeset.5* +%_mandir/man5/sccsfile.5* %files -n schily-mt %license CDDL.Schily.txt @@ -1021,10 +1028,12 @@ %license CDDL.Schily.txt %doc AN-* %config(noreplace) %_sysconfdir/default/star +%_bindir/scpio %_bindir/star %_bindir/tartest %_bindir/ustar %_docdir/star/ +%_mandir/man1/scpio.1* %_mandir/man1/star.1* %_mandir/man1/ustar.1* %_mandir/man5/star.5* ++++++ schily-2019-10-25.tar.bz2 -> schily-2019-11-11.tar.bz2 ++++++ ++++ 6910 lines of diff (skipped)

1 0

commit aqbanking for openSUSE:Factory
by root 02 Dec '19

02 Dec '19

Hello community, here is the log from the commit of package aqbanking for openSUSE:Factory checked in at 2019-12-02 11:27:11 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/aqbanking (Old) and /work/SRC/openSUSE:Factory/.aqbanking.new.4691 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "aqbanking" Mon Dec 2 11:27:11 2019 rev:78 rq:747448 version:5.99.44 Changes: -------- --- /work/SRC/openSUSE:Factory/aqbanking/aqbanking.changes 2019-10-24 23:02:59.216089728 +0200 +++ /work/SRC/openSUSE:Factory/.aqbanking.new.4691/aqbanking.changes 2019-12-02 11:28:16.618645211 +0100 @@ -1,0 +2,12 @@ +Mon Nov 11 20:28:06 UTC 2019 - Nico Kruber <nico.kruber(a)gmail.com> + +- Update to 5.99.44 + + fixed crashes on Windows + + small bug fix on synchronization of investment accounts + + initial work on AqFinTS + + add "chipTAN-QR" to the list of TAN method names (DKB uses + "Q1S" as TAN method ID to designate chipTAN-QR; fortunately, + the TAN method name "chipTAN-QR" is more expressive) + + enable optical TAN methods for aqanking-cli and aqhbci-tool4 + +------------------------------------------------------------------- Old: ---- aqbanking-5.99.40beta.tar.gz New: ---- aqbanking-5.99.44beta.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ aqbanking.spec ++++++ --- /var/tmp/diff_new_pack.eLPQ2O/_old 2019-12-02 11:28:19.194644019 +0100 +++ /var/tmp/diff_new_pack.eLPQ2O/_new 2019-12-02 11:28:19.198644017 +0100 @@ -35,7 +35,7 @@ %define q4b_cfgmoddir %{fronts_libdir}/q4banking/cfgmodules Name: aqbanking -Version: 5.99.40 +Version: 5.99.44 %define _version %{version}beta Release: 0 Summary: Library for Online Banking Functions and Financial Data Import and Export @@ -52,8 +52,8 @@ BuildRequires: fdupes BuildRequires: gcc-c++ BuildRequires: gmp-devel -BuildRequires: gwenhywfar-devel >= 4.99.19 -BuildRequires: gwenhywfar-tools >= 4.99.19 +BuildRequires: gwenhywfar-devel >= 4.99.24 +BuildRequires: gwenhywfar-tools >= 4.99.24 BuildRequires: ktoblzcheck-devel >= 1.10 BuildRequires: pkgconfig %if !0%{?sles_version} @@ -83,7 +83,7 @@ Requires: %{name} = %{version} Requires: cmake Requires: glibc-devel -Requires: gwenhywfar-devel >= 4.99.19 +Requires: gwenhywfar-devel >= 4.99.24 Requires: ktoblzcheck-devel %if %build_ofx Requires: libofx-devel ++++++ aqbanking-5.99.40beta.tar.gz -> aqbanking-5.99.44beta.tar.gz ++++++ ++++ 22133 lines of diff (skipped)

1 0

commit growpart for openSUSE:Factory
by root 02 Dec '19

02 Dec '19

Hello community, here is the log from the commit of package growpart for openSUSE:Factory checked in at 2019-12-02 11:27:10 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/growpart (Old) and /work/SRC/openSUSE:Factory/.growpart.new.4691 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "growpart" Mon Dec 2 11:27:10 2019 rev:8 rq:749938 version:0.30 Changes: -------- --- /work/SRC/openSUSE:Factory/growpart/growpart.changes 2019-06-26 16:00:55.691372729 +0200 +++ /work/SRC/openSUSE:Factory/.growpart.new.4691/growpart.changes 2019-12-02 11:28:07.570649398 +0100 @@ -1,0 +2,28 @@ +Tue Oct 29 14:17:46 UTC 2019 - Fabian Vogt <fvogt(a)suse.com> + +- Clean growpart.spec: + * Drop obsolete tags + * Use install instead of mkdir+cp+chmod + * Fix build on SLE 12 SP4 + +------------------------------------------------------------------- +Fri Oct 25 14:21:20 UTC 2019 - Ignaz Forster <iforster(a)suse.com> + +- Replaced hardcoded systemd paths with macros in spec file + +------------------------------------------------------------------- +Thu Oct 24 12:40:11 UTC 2019 - Marcus Schaefer <ms(a)suse.com> + +- Reference entry for maintenance + + Tracker bug for the submission set to: bsc#1154357 + +------------------------------------------------------------------- +Thu Oct 17 14:04:18 UTC 2019 - Marcus Schaefer <ms(a)suse.com> + +- Deleted rootgrow source and sub-package build + + rootgrow is provided on github: https://github.com/SUSE-Enceladus/rootgrow + and builds a standalone package now + +------------------------------------------------------------------- Old: ---- rootgrow rootgrow.service ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ growpart.spec ++++++ --- /var/tmp/diff_new_pack.k1jHRK/_old 2019-12-02 11:28:09.018648728 +0100 +++ /var/tmp/diff_new_pack.k1jHRK/_new 2019-12-02 11:28:09.022648726 +0100 @@ -1,7 +1,7 @@ # # spec file for package growpart # -# 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 @@ -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/ # @@ -25,13 +25,9 @@ Group: System/Management Url: http://launchpad.net/cloud-utils Source0: cloud-utils-%{base_version}.tar.gz -Source1: rootgrow -Source2: rootgrow.service Patch: licenseGPLv3.patch Requires: util-linux -%if 0%{?suse_version} && 0%{?suse_version} > 1220 Requires: gptfdisk -%endif BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildArch: noarch @@ -40,43 +36,14 @@ is started with a larger root partition than the image size. The root partition can be expanded to take up the additional size. -%if 0%{?suse_version} && 0%{?suse_version} > 1220 -%package rootgrow -Version: 1.0.0 -Release: 0 -Summary: Resize root partition -Group: System/Management -Requires: growpart -Requires: python3 -Requires: systemd -# pkg-config is needed to find correct systemd unit dir -BuildRequires: pkg-config -BuildRequires: pkgconfig(systemd) - -%description rootgrow -Provides as script and service togrow the root partition -%endif - %prep -%setup -q -n cloud-utils-%{base_version} -%patch -p1 +%autosetup -p1 -n cloud-utils-%{base_version} %build %install -mkdir -p %{buildroot}/%{_mandir}/man1 -mkdir -p %{buildroot}/%{_sbindir} -cp bin/growpart %{buildroot}/%{_sbindir} -cp man/growpart.1 %{buildroot}/%{_mandir}/man1 -%if 0%{?suse_version} && 0%{?suse_version} > 1220 -mkdir -p %{buildroot}/usr/lib/systemd/system -cp %SOURCE1 %{buildroot}/%{_sbindir} -cp %SOURCE2 %{buildroot}/usr/lib/systemd/system -chmod 755 %{buildroot}/%{_sbindir}/rootgrow -%endif - -%clean -rm -rf $RPM_BUILD_ROOT +install -Dm0755 -t %{buildroot}%{_sbindir} bin/growpart +install -Dm0644 -t %{buildroot}%{_mandir}/man1 man/growpart.1 %files %defattr(-,root,root,-) @@ -84,11 +51,4 @@ %{_sbindir}/growpart %{_mandir}/man1/* -%if 0%{?suse_version} && 0%{?suse_version} > 1220 -%files rootgrow -%defattr(-,root,root,-) -%{_sbindir}/rootgrow -/usr/lib/systemd/system/rootgrow.service -%endif - %changelog

1 0

commit re2 for openSUSE:Factory
by root 02 Dec '19

02 Dec '19

Hello community, here is the log from the commit of package re2 for openSUSE:Factory checked in at 2019-12-02 11:27:08 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/re2 (Old) and /work/SRC/openSUSE:Factory/.re2.new.4691 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "re2" Mon Dec 2 11:27:08 2019 rev:25 rq:749044 version:MACRO Changes: -------- --- /work/SRC/openSUSE:Factory/re2/re2.changes 2019-09-23 12:00:05.733977837 +0200 +++ /work/SRC/openSUSE:Factory/.re2.new.4691/re2.changes 2019-12-02 11:27:54.990655219 +0100 @@ -1,0 +2,6 @@ +Sat Nov 16 08:56:37 UTC 2019 - Andreas Stieger <andreas.stieger(a)gmx.de> + +- update to 2019-11-01: + * new benchmark API + +------------------------------------------------------------------- Old: ---- re2-2019-09-01.tar.gz New: ---- re2-2019-11-01.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ re2.spec ++++++ --- /var/tmp/diff_new_pack.XgJvmW/_old 2019-12-02 11:28:00.854652506 +0100 +++ /var/tmp/diff_new_pack.XgJvmW/_new 2019-12-02 11:28:00.854652506 +0100 @@ -16,7 +16,7 @@ # -%global longver 2019-09-01 +%global longver 2019-11-01 %global shortver %(echo %{longver}|sed 's|-||g') %define libname libre2-0 Name: re2 ++++++ re2-2019-09-01.tar.gz -> re2-2019-11-01.tar.gz ++++++ ++++ 4456 lines of diff (skipped)

1 0

commit golang-packaging for openSUSE:Factory
by root 02 Dec '19

02 Dec '19

Hello community, here is the log from the commit of package golang-packaging for openSUSE:Factory checked in at 2019-12-02 11:27:02 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/golang-packaging (Old) and /work/SRC/openSUSE:Factory/.golang-packaging.new.4691 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "golang-packaging" Mon Dec 2 11:27:02 2019 rev:25 rq:749021 version:15.0.12 Changes: -------- --- /work/SRC/openSUSE:Factory/golang-packaging/golang-packaging.changes 2018-06-22 13:15:37.786489228 +0200 +++ /work/SRC/openSUSE:Factory/.golang-packaging.new.4691/golang-packaging.changes 2019-12-02 11:27:32.218665758 +0100 @@ -1,0 +2,12 @@ +Sat Nov 16 05:45:43 UTC 2019 - jkowalczyk(a)suse.com + +- Update to version 15.0.12: + * Drop ppc64-nopie.patch + * golang.sh: integrate ppc64-nopie.patch -buildmode=pie only on ppc64 + * golang.sh: avoid excessive "rpm --eval..." calls + * Install Bazel files in src directory + * Replace rpmdev-vercmp by "sort -V" to remove rpmdev-vercmp dependency + * Remove s build flag no longer supported in go 1.10 boo#776058 + * Packaging: improve _service tar_scm declarations add _servicedata + +------------------------------------------------------------------- Old: ---- golang-packaging-15.0.11.tar.xz ppc64-nopie.patch New: ---- _servicedata golang-packaging-15.0.12.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ golang-packaging.spec ++++++ --- /var/tmp/diff_new_pack.RWKerp/_old 2019-12-02 11:27:33.310665253 +0100 +++ /var/tmp/diff_new_pack.RWKerp/_new 2019-12-02 11:27:33.314665251 +0100 @@ -1,7 +1,7 @@ # # spec file for package golang-packaging # -# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2019 SUSE LLC. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -12,19 +12,18 @@ # 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/ # Name: golang-packaging -Version: 15.0.11 +Version: 15.0.12 Release: 0 Summary: A toolchain to help packaging golang License: GPL-3.0-only Group: Development/Languages/Golang -Url: https://github.com/openSUSE/%{name} +URL: https://github.com/openSUSE/%{name} Source: %{name}-%{version}.tar.xz -Patch: ppc64-nopie.patch BuildRequires: rpm BuildRequires: xz @@ -37,7 +36,6 @@ %prep %setup -q -%patch -p1 %build ++++++ _service ++++++ --- /var/tmp/diff_new_pack.RWKerp/_old 2019-12-02 11:27:33.334665242 +0100 +++ /var/tmp/diff_new_pack.RWKerp/_new 2019-12-02 11:27:33.338665240 +0100 @@ -4,9 +4,10 @@ <param name="scm">git</param> <param name="filename">golang-packaging</param> <param name="exclude">.git</param> - <param name="versionformat">15.0.11</param> - <param name="revision">v15.0.11</param> + <param name="versionformat">@PARENT_TAG@</param> + <param name="revision">v15.0.12</param> <param name="changesgenerate">enable</param> + <param name="versionrewrite-pattern">v(.*)</param> </service> <service name="recompress" mode="disabled"> <param name="file">*.tar</param> ++++++ _servicedata ++++++ <servicedata> <service name="tar_scm"> <param name="url">https://github.com/openSUSE/golang-packaging</param> <param name="changesrevision">7898ac7e21212888bd3a2ba014871bb4b48e5c0b</param></service></servicedata>++++++ golang-packaging-15.0.11.tar.xz -> golang-packaging-15.0.12.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/golang-packaging-15.0.11/CHANGELOG new/golang-packaging-15.0.12/CHANGELOG --- old/golang-packaging-15.0.11/CHANGELOG 2018-06-11 16:17:13.000000000 +0200 +++ new/golang-packaging-15.0.12/CHANGELOG 2019-11-16 06:19:50.000000000 +0100 @@ -1,3 +1,13 @@ +== update version 15.0.12 == + + * golang.sh: integrate ppc64-nopie.patch -buildmode=pie only on ppc64 + * golang.sh: avoid excessive "rpm --eval..." calls + * Install Bazel files in src directory + +== update version 15.0.11 == + + * Replace rpmdev-vercmp by "sort -V" to remove rpmdev-vercmp dependency + == update version 15.0.10 == * Remove s flag for go version >= 1.10 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/golang-packaging-15.0.11/golang.sh new/golang-packaging-15.0.12/golang.sh --- old/golang-packaging-15.0.11/golang.sh 2018-06-11 16:17:13.000000000 +0200 +++ new/golang-packaging-15.0.12/golang.sh 2019-11-16 06:19:50.000000000 +0100 @@ -2,6 +2,9 @@ set -e set -x +# this is used most +GO_CONTRIBSRCDIR=$(rpm --eval %go_contribsrcdir) + go_version() { go version | awk '{print $3}' | sed 's/go//' } @@ -54,7 +57,7 @@ } get_source_path() { - echo $(rpm --eval %go_contribsrcdir) + echo $GO_CONTRIBSRCDIR } get_tool_path() { @@ -139,7 +142,11 @@ local last=$(($#-1)) fi - local build_flags="-v -p 4 -x -buildmode=pie" + local build_flags="-v -p 4 -x" + case "$(uname -m)" in + ppc64) ;; + *) build_flags="$build_flags -buildmode=pie" ;; + esac # Add s flag if go is older than 1.10. # s flag is an openSUSE flag to fix # https://bugzilla.suse.com/show_bug.cgi?id=776058 @@ -179,23 +186,17 @@ } process_source() { - echo "This will copy all *.go, *.s and *.h files in $(get_build_path)/src without resources" - - for file in $(find $(get_build_path)/src -type f -iname \*.go); do - local destination=${RPM_BUILD_ROOT}$(get_source_path)${file#$(get_build_path)/src/} - - echo "Copying ${file} to ${destination}" - install -D -m0644 ${file} ${destination} - done - - for file in $(find $(get_build_path)/src -type f -iname \*.s); do - local destination=${RPM_BUILD_ROOT}$(get_source_path)${file#$(get_build_path)/src/} - - echo "Copying ${file} to ${destination}" - install -D -m0644 ${file} ${destination} - done + echo "This will copy all *.go, *.s, *.h, BUILD, BUILD.bazel and WORKSPACE files in $(get_build_path)/src without resources" - for file in $(find $(get_build_path)/src -type f -iname \*.h); do + local files=$(find $(get_build_path)/src \ + -type f \ + $ -iname "*.go" \ + -o -iname "*.s" \ + -o -iname "*.h" \ + -o -iname "BUILD" \ + -o -iname "BUILD.bazel" \ + -o -iname "WORKSPACE" $) + for file in ${files}; do local destination=${RPM_BUILD_ROOT}$(get_source_path)${file#$(get_build_path)/src/} echo "Copying ${file} to ${destination}"

1 0

commit kcm_sddm for openSUSE:Factory
by root 02 Dec '19

02 Dec '19

Hello community, here is the log from the commit of package kcm_sddm for openSUSE:Factory checked in at 2019-12-02 11:26:58 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/kcm_sddm (Old) and /work/SRC/openSUSE:Factory/.kcm_sddm.new.4691 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "kcm_sddm" Mon Dec 2 11:26:58 2019 rev:79 rq:747832 version:5.17.3 Changes: -------- --- /work/SRC/openSUSE:Factory/kcm_sddm/kcm_sddm.changes 2019-09-07 11:36:25.546411723 +0200 +++ /work/SRC/openSUSE:Factory/.kcm_sddm.new.4691/kcm_sddm.changes 2019-12-02 11:27:12.698674607 +0100 @@ -1,0 +2,76 @@ +Tue Nov 12 11:01:06 UTC 2019 - Fabian Vogt <fabian(a)ritter-vogt.de> + +- Update to 5.17.3 + * New bugfix release + * For more details please see: + * https://www.kde.org/announcements/plasma-5.17.3.php +- No code changes since 5.17.2 + +------------------------------------------------------------------- +Tue Oct 29 20:45:50 UTC 2019 - Fabian Vogt <fabian(a)ritter-vogt.de> + +- Update to 5.17.2 + * New bugfix release + * For more details please see: + * https://www.kde.org/announcements/plasma-5.17.2.php +- No code changes since 5.17.1 + +------------------------------------------------------------------- +Tue Oct 22 16:44:43 UTC 2019 - Fabian Vogt <fabian(a)ritter-vogt.de> + +- Update to 5.17.1 + * New bugfix release + * For more details please see: + * https://www.kde.org/announcements/plasma-5.17.1.php +- Changes since 5.17.0: + * Set preview to correct device size (kde#407689) + +------------------------------------------------------------------- +Thu Oct 10 14:25:46 UTC 2019 - Fabian Vogt <fabian(a)ritter-vogt.de> + +- Update to 5.17.0 + * New bugfix release + * For more details please see: + * https://www.kde.org/announcements/plasma-5.17.0.php +- Changes since 5.16.90: + * Check if sddm user exists + +------------------------------------------------------------------- +Thu Sep 19 12:32:34 UTC 2019 - Fabian Vogt <fabian(a)ritter-vogt.de> + +- Update to 5.16.90 + * New feature release + * For more details please see: + * https://www.kde.org/announcements/plasma-5.16.90.php +- Changes since 5.16.5: + * update to latest kf5 dependency + * Also remove the dependency on libxcb + * Remove unneeded dependencies on X11 and QtX11Extras + * It compile file without deprecated method + * Add a warning message about needing globally installed theme files + * Remove leftover mentions of "AdvanceConfig" + * Rename "AdvanceConfig" to "AdvancedConfig" + * Remove persistence from the kauth helper + * Minor code improvements + * Fix build failure + * Make sure "-dpi" doesn't get passed without an argument + * Sync scaling DPI from Plasma to SDDM + * Sync NumLock preference + * Remove cursor theme option + * Implement syncing of theme preferences between SDDM and Plasma + * Make includes more orderly + * [sddm-kcm] Write settings to /etc/sddm.conf.d instead of etc/sddm.conf (kde#386241) + * Redesign Advanced tab + * Fix forward declaration + * Clean up trailing whitespace + * Minor grammar fix exists -> exists +- Patch rework: + * Rename 0002-Support-default.session-symlink.patch to + 0001-Support-default.session-symlink.patch + * Merge 0001-Replace-autologin-configuration-with-a-note-to-use-Y.patch + with dont-set-empty-autologin.patch into + 0002-Replace-autologin-configuration-with-a-note-to-use-Y.patch + * Rename remove-wayland-suffix.patch to + 0003-Don-t-add-a-Wayland-suffix-to-Wayland-sessions.patch + +------------------------------------------------------------------- Old: ---- 0001-Replace-autologin-configuration-with-a-note-to-use-Y.patch 0002-Support-default.session-symlink.patch dont-set-empty-autologin.patch remove-wayland-suffix.patch sddm-kcm-5.16.5.tar.xz sddm-kcm-5.16.5.tar.xz.sig New: ---- 0001-Support-default.session-symlink.patch 0002-Replace-autologin-configuration-with-a-note-to-use-Y.patch 0003-Don-t-add-a-Wayland-suffix-to-Wayland-sessions.patch sddm-kcm-5.17.3.tar.xz sddm-kcm-5.17.3.tar.xz.sig ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kcm_sddm.spec ++++++ --- /var/tmp/diff_new_pack.uvVVNo/_old 2019-12-02 11:27:18.730672001 +0100 +++ /var/tmp/diff_new_pack.uvVVNo/_new 2019-12-02 11:27:18.730672001 +0100 @@ -18,7 +18,7 @@ %bcond_without lang Name: kcm_sddm -Version: 5.16.5 +Version: 5.17.3 Release: 0 Summary: A sddm control module for KDE License: GPL-2.0-only @@ -30,14 +30,10 @@ Source2: plasma.keyring %endif # PATCH-FIX-OPENSUSE -Patch1: dont-set-empty-autologin.patch -# PATCH-FIX-OPENSUSE -Patch2: 0002-Support-default.session-symlink.patch -# PATCH-FIX-OPENSUSE -Patch3: 0001-Replace-autologin-configuration-with-a-note-to-use-Y.patch -# PATCH-FIX-UPSTREAM -Patch4: remove-wayland-suffix.patch -BuildRequires: extra-cmake-modules >= 1.0.0 +Patch1: 0001-Support-default.session-symlink.patch +Patch2: 0002-Replace-autologin-configuration-with-a-note-to-use-Y.patch +Patch3: 0003-Don-t-add-a-Wayland-suffix-to-Wayland-sessions.patch +BuildRequires: extra-cmake-modules BuildRequires: kf5-filesystem BuildRequires: pkgconfig BuildRequires: cmake(KF5Archive) @@ -48,18 +44,11 @@ BuildRequires: cmake(KF5KIO) BuildRequires: cmake(KF5NewStuff) BuildRequires: cmake(KF5XmlGui) -BuildRequires: cmake(Qt5Core) >= 5.4.0 -BuildRequires: cmake(Qt5Designer) >= 5.4.0 -BuildRequires: cmake(Qt5Gui) >= 5.4.0 -BuildRequires: cmake(Qt5Quick) >= 5.4.0 -BuildRequires: cmake(Qt5QuickWidgets) >= 5.4.0 -BuildRequires: cmake(Qt5Widgets) >= 5.4.0 -BuildRequires: cmake(Qt5X11Extras) >= 5.4.0 -BuildRequires: pkgconfig(x11) -BuildRequires: pkgconfig(xcb) -BuildRequires: pkgconfig(xcb-image) -BuildRequires: pkgconfig(xcb-shm) -BuildRequires: pkgconfig(xcursor) +BuildRequires: cmake(Qt5Core) >= 5.12.0 +BuildRequires: cmake(Qt5Gui) +BuildRequires: cmake(Qt5Quick) +BuildRequires: cmake(Qt5QuickWidgets) +BuildRequires: cmake(Qt5Widgets) Supplements: packageand(sddm:plasma5-workspace) Recommends: %{name}-lang @@ -70,8 +59,7 @@ %lang_package %prep -%setup -q -n sddm-kcm-%{version} -%autopatch -p1 +%autosetup -p1 -n sddm-kcm-%{version} %build %cmake_kf5 -d build ++++++ 0002-Support-default.session-symlink.patch -> 0001-Support-default.session-symlink.patch ++++++ --- /work/SRC/openSUSE:Factory/kcm_sddm/0002-Support-default.session-symlink.patch 2018-02-28 19:57:13.763909852 +0100 +++ /work/SRC/openSUSE:Factory/.kcm_sddm.new.4691/0001-Support-default.session-symlink.patch 2019-12-02 11:27:10.806675323 +0100 @@ -1,7 +1,7 @@ -From dd3be6bbca6069ba04ae6f7557c0f959fc10d49c Mon Sep 17 00:00:00 2001 +From 63f7e6b7b0ce899f9dcc8e4b7fc8aba071175ffb Mon Sep 17 00:00:00 2001 From: Fabian Vogt <fabian(a)ritter-vogt.de> Date: Tue, 11 Jul 2017 13:13:13 +0200 -Subject: [PATCH 2/2] Support default.session symlink +Subject: [PATCH 1/3] Support default.session symlink Display it under a different name, otherwise it is indistinguishable from a normal session. @@ -9,11 +9,11 @@ src/sessionmodel.cpp | 6 ++++++ 1 file changed, 6 insertions(+) -Index: sddm-kcm-5.12.2/src/sessionmodel.cpp -=================================================================== ---- sddm-kcm-5.12.2.orig/src/sessionmodel.cpp -+++ sddm-kcm-5.12.2/src/sessionmodel.cpp -@@ -95,6 +95,12 @@ void SessionModel::loadDir(const QString +diff --git a/src/sessionmodel.cpp b/src/sessionmodel.cpp +index 0bbe217..429d664 100644 +--- a/src/sessionmodel.cpp ++++ b/src/sessionmodel.cpp +@@ -96,6 +96,12 @@ void SessionModel::loadDir(const QString &path, SessionType type) if (line.startsWith(QLatin1String("Hidden="))) isHidden = line.mid(7).toLower() == QLatin1String("true"); } @@ -26,3 +26,6 @@ if (!isHidden) { // add to sessions list d->sessions.push_back(si); +-- +2.21.0 + ++++++ 0001-Replace-autologin-configuration-with-a-note-to-use-Y.patch -> 0002-Replace-autologin-configuration-with-a-note-to-use-Y.patch ++++++ --- /work/SRC/openSUSE:Factory/kcm_sddm/0001-Replace-autologin-configuration-with-a-note-to-use-Y.patch 2018-05-16 11:23:07.564586112 +0200 +++ /work/SRC/openSUSE:Factory/.kcm_sddm.new.4691/0002-Replace-autologin-configuration-with-a-note-to-use-Y.patch 2019-12-02 11:27:11.454675078 +0100 @@ -1,38 +1,104 @@ -From 54594141b22474cfc1a0dc3f57258a60706e54c0 Mon Sep 17 00:00:00 2001 +From f605191a7833e9791711d2272e05b52d92bcfb18 Mon Sep 17 00:00:00 2001 From: Fabian Vogt <fabian(a)ritter-vogt.de> Date: Wed, 27 Dec 2017 18:54:36 +0100 -Subject: [PATCH] Replace autologin configuration with a note to use YaST +Subject: [PATCH 2/3] Replace autologin configuration with a note to use YaST instead sddm looks at sysconfig for autologin and ignores other configuration files. +Also change the default value for the autologin session to "default.desktop", +which is what sddm uses as well. --- - src/ui/advanceconfig.ui | 10 +++++++--- - 1 file changed, 7 insertions(+), 3 deletions(-) + src/advancedconfig.cpp | 4 ++-- + src/ui/advancedconfig.ui | 21 +++++++++++++++++---- + 2 files changed, 19 insertions(+), 6 deletions(-) + +diff --git a/src/advancedconfig.cpp b/src/advancedconfig.cpp +index 3ac31dd..3bc01cd 100644 +--- a/src/advancedconfig.cpp ++++ b/src/advancedconfig.cpp +@@ -84,7 +84,7 @@ void AdvanceConfig::load() + const QString currentUser = mConfig->group("Autologin").readEntry("User", ""); + configUi->userList->setCurrentIndex(userModel->indexOf(currentUser)); + +- const QString autologinSession = mConfig->group("Autologin").readEntry("Session", ""); ++ const QString autologinSession = mConfig->group("Autologin").readEntry("Session", "default.desktop"); + configUi->sessionList->setCurrentIndex(sessionModel->indexOf(autologinSession)); + + configUi->autoLogin->setChecked(!currentUser.isEmpty()); +@@ -108,7 +108,7 @@ QVariantMap AdvanceConfig::save() + QVariantMap args; + + args[QStringLiteral("kde_settings.conf/Autologin/User")] = ( configUi->autoLogin->isChecked() ) ? configUi->userList->currentText() : QString(); +- args[QStringLiteral("kde_settings.conf/Autologin/Session")] = ( configUi->autoLogin->isChecked() ) ? configUi->sessionList->currentData() : QString(); ++ args[QStringLiteral("kde_settings.conf/Autologin/Session")] = configUi->sessionList->currentData(); + + args[QStringLiteral("kde_settings.conf/Autologin/Relogin")] = configUi->reloginAfterQuit->isChecked(); + //TODO session +diff --git a/src/ui/advancedconfig.ui b/src/ui/advancedconfig.ui +index 537d932..85a73f9 100644 +--- a/src/ui/advancedconfig.ui ++++ b/src/ui/advancedconfig.ui +@@ -19,7 +19,14 @@ + <property name="formAlignment"> + <set>Qt::AlignHCenter|Qt::AlignTop</set> + </property> +- <item row="1" column="0"> ++ <item row="0" column="1"> ++ <widget class="QLabel" name="yastlabel"> ++ <property name="text"> ++ <string>The user for autologin needs to be configured using YaST or by
setting DISPLAYMANAGER_AUTOLOGIN in /etc/sysconfig/displaymanager.</string> ++ </property> ++ </widget> ++ </item> ++ <item row="0" column="0"> + <widget class="QLabel" name="label_3"> + <property name="text"> + <string>Automatically log in:</string> +@@ -33,6 +40,9 @@ + <property name="text"> + <string>as user:</string> + </property> ++ <property name="visible"> ++ <bool>false</bool> ++ </property> + </widget> + </item> + <item> +@@ -40,12 +50,15 @@ + <property name="enabled"> + <bool>false</bool> + </property> ++ <property name="visible"> ++ <bool>false</bool> ++ </property> + </widget> + </item> + <item> + <widget class="QLabel" name="label_4"> + <property name="enabled"> +- <bool>false</bool> ++ <bool>true</bool> + </property> + <property name="text"> + <string>with session:</string> +@@ -55,7 +68,7 @@ + <item> + <widget class="QComboBox" name="sessionList"> + <property name="enabled"> +- <bool>false</bool> ++ <bool>true</bool> + </property> + </widget> + </item> +@@ -64,7 +77,7 @@ + <item row="2" column="1"> + <widget class="QCheckBox" name="reloginAfterQuit"> + <property name="enabled"> +- <bool>false</bool> ++ <bool>true</bool> + </property> + <property name="sizePolicy"> + <sizepolicy hsizetype="Minimum" vsizetype="Fixed"> +-- +2.22.0 -Index: sddm-kcm-5.12.5/src/ui/advanceconfig.ui -=================================================================== ---- sddm-kcm-5.12.5.orig/src/ui/advanceconfig.ui -+++ sddm-kcm-5.12.5/src/ui/advanceconfig.ui -@@ -45,15 +45,19 @@ - <property name="fieldGrowthPolicy"> - <enum>QFormLayout::ExpandingFieldsGrow</enum> - </property> -- <item row="0" column="0"> -+ <item row="0" column="0" colspan="2"> - <widget class="QLabel" name="label_7"> - <property name="text"> -- <string>User:</string> -+ <string>The user for autologin needs to be configured using YaST or by setting DISPLAYMANAGER_AUTOLOGIN in /etc/sysconfig/displaymanager.</string> - </property> - </widget> - </item> - <item row="0" column="1"> -- <widget class="QComboBox" name="userList"/> -+ <widget class="QComboBox" name="userList"> -+ <property name="visible"> -+ <bool>false</bool> -+ </property> -+ </widget> - </item> - <item row="1" column="0"> - <widget class="QLabel" name="label_3"> ++++++ 0003-Don-t-add-a-Wayland-suffix-to-Wayland-sessions.patch ++++++ >From 9e7e7bb056a91ec62c40e2cd94454ea006d452c9 Mon Sep 17 00:00:00 2001 From: Fabian Vogt <fabian(a)ritter-vogt.de> Date: Sat, 7 Jul 2018 20:34:44 +0200 Subject: [PATCH 3/3] Don't add a (Wayland) suffix to Wayland sessions It got removed from sddm as well. --- src/sessionmodel.cpp | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/src/sessionmodel.cpp b/src/sessionmodel.cpp index 429d664..99c5d51 100644 --- a/src/sessionmodel.cpp +++ b/src/sessionmodel.cpp @@ -57,6 +57,7 @@ SessionModel::~SessionModel() { void SessionModel::loadDir(const QString &path, SessionType type) { + Q_UNUSED(type); QDir dir(path); dir.setNameFilters(QStringList() << QStringLiteral("*.desktop")); dir.setFilter(QDir::Files); @@ -82,13 +83,8 @@ void SessionModel::loadDir(const QString &path, SessionType type) if (current_section != QLatin1String("Desktop Entry")) continue; // We are only interested in the "Desktop Entry" section - if (line.startsWith(QLatin1String("Name="))) { + if (line.startsWith(QLatin1String("Name="))) si->name = line.mid(5); - if (type == SessionTypeWayland) { - //we want to exactly match the SDDM prompt which is formatted in this way - si->name = i18nc("%1 is the name of a session", "%1 (Wayland)", si->name); - } - } if (line.startsWith(QLatin1String("Exec="))) si->exec = line.mid(5); if (line.startsWith(QLatin1String("Comment="))) -- 2.21.0 ++++++ sddm-kcm-5.16.5.tar.xz -> sddm-kcm-5.17.3.tar.xz ++++++ ++++ 16868 lines of diff (skipped)

1 0