Hello community,
here is the log from the commit of package sysconfig for openSUSE:Factory checked in at 2017-04-25 08:54:58
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/sysconfig (Old)
and /work/SRC/openSUSE:Factory/.sysconfig.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "sysconfig"
Tue Apr 25 08:54:58 2017 rev:173 rq:487030 version:0.84.1
Changes:
--------
--- /work/SRC/openSUSE:Factory/sysconfig/sysconfig.changes 2016-10-14 09:26:59.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.sysconfig.new/sysconfig.changes 2017-04-25 08:55:00.794026311 +0200
@@ -1,0 +2,9 @@
+Mon Apr 10 11:14:24 UTC 2017 - mt@suse.de
+
+- version 0.84.1
+- netconfig: cleanup tmp files (boo#1010760)
+ When /var/run/ntp/servers-netconfig has been modified externaly,
+ don't try to backup or keep tmp files to show what we would do.
+- netconfig: improve input check for duplicate keys (bsc#1009801)
+
+-------------------------------------------------------------------
Old:
----
sysconfig-0.84.0.tar.bz2
New:
----
sysconfig-0.84.1.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ sysconfig.spec ++++++
--- /var/tmp/diff_new_pack.LQnwEy/_old 2017-04-25 08:55:01.649905288 +0200
+++ /var/tmp/diff_new_pack.LQnwEy/_new 2017-04-25 08:55:01.653904723 +0200
@@ -1,7 +1,7 @@
#
# spec file for package sysconfig
#
-# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2017 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
@@ -23,7 +23,7 @@
%define udevdir /lib/udev
%endif
Name: sysconfig
-Version: 0.84.0
+Version: 0.84.1
Release: 0
Summary: The sysconfig scheme for traditional network scripts
License: GPL-2.0+
@@ -35,7 +35,12 @@
Requires: /sbin/ifup
Requires: /sbin/netconfig
Requires: sysvinit(network)
-PreReq: %fillup_prereq textutils fileutils gawk sed grep
+PreReq: %fillup_prereq
+PreReq: fileutils
+PreReq: gawk
+PreReq: grep
+PreReq: sed
+PreReq: textutils
Recommends: wicked-service
BuildRoot: %{_tmppath}/%{name}-%{version}-build
@@ -74,7 +79,7 @@
make %{?_smp_mflags} check
%install
-make %{?_smp_mflags} DESTDIR=%{buildroot} install
+%make_install
touch %{buildroot}%{_sysconfdir}/sysconfig/network/config
touch %{buildroot}%{_sysconfdir}/sysconfig/network/dhcp
mkdir -p %{buildroot}/sbin
++++++ sysconfig-0.84.0.tar.bz2 -> sysconfig-0.84.1.tar.bz2 ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/sysconfig-0.84.0/ChangeLog new/sysconfig-0.84.1/ChangeLog
--- old/sysconfig-0.84.0/ChangeLog 2016-09-09 19:28:09.000000000 +0200
+++ new/sysconfig-0.84.1/ChangeLog 2017-04-10 13:31:48.000000000 +0200
@@ -1,4 +1,54 @@
-commit 3e8950d6eddaa785b64439c3ac09628be0ba7a0c (HEAD -> master)
+commit 026019b0df4064a2a299e4915cc6df55f326c985 (HEAD -> master, tag: version-0.84.1, origin/master)
+Author: Marius Tomaschewski
+Date: Mon Apr 10 13:29:36 2017 +0200
+
+ version 0.84.1
+
+commit 89d69161e4a022fc235570b630e4398b4fe28a66
+Author: Marius Tomaschewski
+Date: Mon Apr 10 13:26:43 2017 +0200
+
+ version 0.84.1
+
+ updated sysconfig.changes file
+
+commit 33ba5fb078c95d10e4fb5c105954742db820ff16
+Author: Marius Tomaschewski
+Date: Mon Apr 10 13:25:41 2017 +0200
+
+ spec: minor cleanup
+
+commit fbe7f89411c214d7215f13a72e53d0fd9b88bb97
+Author: Marius Tomaschewski
+Date: Mon Apr 10 13:13:18 2017 +0200
+
+ spec: remove requires for not needed insserv (bsc#999850)
+
+commit 307fb54dca59423f56b3f68f3113173de9292b0e
+Merge: 54c4cde e962089
+Author: Marius Tomaschewski
+Date: Mon Apr 10 13:08:32 2017 +0200
+
+ Merge pull request #15 from mtomaschewski/boo-1010760
+
+ ntp-runtime: cleanup tmp files (boo#1010760)
+
+commit e962089c8f63ce09a3254e72b118af28f0c547fb (mt-hub/boo-1010760, boo-1010760)
+Author: Marius Tomaschewski
+Date: Thu Nov 24 14:29:17 2016 +0100
+
+ ntp-runtime: cleanup tmp files (boo#1010760)
+
+ When /var/run/ntp/servers-netconfig has been modified externaly,
+ don't try to backup or keep tmp files to show what we would do.
+
+commit 5612ae93f1337279cd0585ad1cf3b96fdcf302aa (mt-hub/bsc-1009801, bsc-1009801)
+Author: Roberto Sassu
+Date: Mon Dec 5 11:55:00 2016 +0200
+
+ netconfig: improve input check for duplicate keys (bsc#1009801)
+
+commit 3e8950d6eddaa785b64439c3ac09628be0ba7a0c (tag: version-0.84.0)
Author: Marius Tomaschewski
Date: Fri Sep 9 19:25:54 2016 +0200
@@ -15,7 +65,7 @@
It permits to preform multiple modify/remove operations
and call the effective update at the end of the batch.
-commit efa7e7646860e13a61e9c643ebc0491f62e0f282 (mt-hub/master)
+commit efa7e7646860e13a61e9c643ebc0491f62e0f282
Merge: 3f600d0 816afec
Author: Marius Tomaschewski
Date: Thu Sep 8 20:22:37 2016 +0200
@@ -160,7 +210,7 @@
git: added autoconf/automake compile to .gitignore
-commit 1116409b57e3c69a216f6cd97db9a1670bab478f (dns-domain-fallback)
+commit 1116409b57e3c69a216f6cd97db9a1670bab478f
Author: Marius Tomaschewski
Date: Tue Jan 13 19:48:22 2015 +0100
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/sysconfig-0.84.0/VERSION new/sysconfig-0.84.1/VERSION
--- old/sysconfig-0.84.0/VERSION 2016-09-09 19:17:51.000000000 +0200
+++ new/sysconfig-0.84.1/VERSION 2017-04-10 13:29:31.000000000 +0200
@@ -1 +1 @@
-0.84.0
+0.84.1
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/sysconfig-0.84.0/configure new/sysconfig-0.84.1/configure
--- old/sysconfig-0.84.0/configure 2016-09-09 19:28:04.000000000 +0200
+++ new/sysconfig-0.84.1/configure 2017-04-10 13:31:45.000000000 +0200
@@ -1,7 +1,7 @@
#! /bin/sh
# From configure.ac Revision: 1.13 .
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.69 for sysconfig 0.84.0.
+# Generated by GNU Autoconf 2.69 for sysconfig 0.84.1.
#
# Report bugs to http://bugs.opensuse.org.
#
@@ -591,8 +591,8 @@
# Identity of this package.
PACKAGE_NAME='sysconfig'
PACKAGE_TARNAME='sysconfig'
-PACKAGE_VERSION='0.84.0'
-PACKAGE_STRING='sysconfig 0.84.0'
+PACKAGE_VERSION='0.84.1'
+PACKAGE_STRING='sysconfig 0.84.1'
PACKAGE_BUGREPORT='http://bugs.opensuse.org'
PACKAGE_URL='https://github.com/openSUSE/sysconfig'
@@ -1328,7 +1328,7 @@
# Omit some internal or obsolete options to make the list less imposing.
# This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF
-\`configure' configures sysconfig 0.84.0 to adapt to many kinds of systems.
+\`configure' configures sysconfig 0.84.1 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1398,7 +1398,7 @@
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of sysconfig 0.84.0:";;
+ short | recursive ) echo "Configuration of sysconfig 0.84.1:";;
esac
cat <<\_ACEOF
@@ -1507,7 +1507,7 @@
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-sysconfig configure 0.84.0
+sysconfig configure 0.84.1
generated by GNU Autoconf 2.69
Copyright (C) 2012 Free Software Foundation, Inc.
@@ -1876,7 +1876,7 @@
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
-It was created by sysconfig $as_me 0.84.0, which was
+It was created by sysconfig $as_me 0.84.1, which was
generated by GNU Autoconf 2.69. Invocation command line was
$ $0 $@
@@ -2743,7 +2743,7 @@
# Define the identity of the package.
PACKAGE='sysconfig'
- VERSION='0.84.0'
+ VERSION='0.84.1'
cat >>confdefs.h <<_ACEOF
@@ -12247,7 +12247,7 @@
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
-This file was extended by sysconfig $as_me 0.84.0, which was
+This file was extended by sysconfig $as_me 0.84.1, which was
generated by GNU Autoconf 2.69. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -12305,7 +12305,7 @@
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
ac_cs_version="\\
-sysconfig config.status 0.84.0
+sysconfig config.status 0.84.1
configured by $0, generated by GNU Autoconf 2.69,
with options \\"\$ac_cs_config\\"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/sysconfig-0.84.0/scripts/functions.netconfig new/sysconfig-0.84.1/scripts/functions.netconfig
--- old/sysconfig-0.84.0/scripts/functions.netconfig 2016-09-08 20:22:47.000000000 +0200
+++ new/sysconfig-0.84.1/scripts/functions.netconfig 2017-04-10 13:08:54.000000000 +0200
@@ -263,8 +263,14 @@
log "You can find my version in ${OUTFILE}${OSUFFIX}"
test "x$ERR_VAR" != x && eval "$ERR_VAR='${OUTFILE}${OSUFFIX}'"
else
- log "You can find my version in $SRCFILE ..."
- test "x$ERR_VAR" != x && eval "$ERR_VAR='${SRCFILE}'"
+ if test "x$OSUFFIX" != x ; then
+ # backup requested + failed, set err var
+ test "x$ERR_VAR" != x && eval "$ERR_VAR='$SRCFILE'"
+ else
+ # no backup requested, delete src tmp file
+ rm --f -- "$SRCFILE"
+ test "x$ERR_VAR" != x && eval "$ERR_VAR=''"
+ fi
fi
RET=2
else
@@ -279,12 +285,16 @@
fi
rm -f "$SRCFILE"
fi
- rm -f "$MD5FILE"
- {
- test "x${NEW_ERX}" != x && \
- echo "#${NEW_ERX}"
- echo "$NEWMD5SUM"
- } > "$MD5FILE"
+
+ if test $RET -eq 0 ; then
+ # update md5 when we've changed dst file
+ rm -f "$MD5FILE"
+ {
+ test "x${NEW_ERX}" != x && \
+ echo "#${NEW_ERX}"
+ echo "$NEWMD5SUM"
+ } > "$MD5FILE"
+ fi
return $RET
}
@@ -299,8 +309,10 @@
sub("[[:space:]]+$", "", $0);
equ=index($0, "=");
key=substr($0, 1, equ - 1);
- val=substr($0, equ + 2, length($0) - equ - 2)
+ if (key in array) next;
+ val=substr($0, equ + 2, length($0) - equ - 2);
print key"="val;
+ array[key]=1;
next;
}
{ print "="NR; exit(NR); }' "$@"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/sysconfig-0.84.0/scripts/netconfig new/sysconfig-0.84.1/scripts/netconfig
--- old/sysconfig-0.84.0/scripts/netconfig 2016-09-09 19:17:42.000000000 +0200
+++ new/sysconfig-0.84.1/scripts/netconfig 2017-04-10 13:08:46.000000000 +0200
@@ -95,9 +95,6 @@
fi
;;
esac
- for k in ${KEYS[@]} ; do
- test "x$k" = "x$key" && continue 2
- done
KEYS[${#KEYS[@]}]=$key
VALS[${#VALS[@]}]=$val
done < <(prepend "$_PREPEND" ; netconfig_kv_filter ${LEASEFILE:+"$LEASEFILE"})
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/sysconfig-0.84.0/scripts/netconfig.d/ntp-runtime new/sysconfig-0.84.1/scripts/netconfig.d/ntp-runtime
--- old/sysconfig-0.84.0/scripts/netconfig.d/ntp-runtime 2016-09-08 20:22:47.000000000 +0200
+++ new/sysconfig-0.84.1/scripts/netconfig.d/ntp-runtime 2017-04-10 13:08:54.000000000 +0200
@@ -41,7 +41,7 @@
NTP_SERVER_LIST=()
DESTFILE="$r/var/run/ntp/servers-netconfig"
-TMP_FILE=""
+TMP_FILE="$r/var/run/ntp/.servers-netconfig.XXXXXX"
function write_ntp_servers()
{
@@ -62,10 +62,12 @@
local SERVERS
- TMP_FILE=`mktemp -t "ntp-servers-netconfig.XXXXXX"` || return 1
+ TMP_FILE=`mktemp -- "$TMP_FILE"` || return 1
+ # avoid $DESTFILE.$DATE backups, useless in this case
+ test "$FORCE_REPLACE" = true && rm -f -- "$DESTFILE"
if test ! -s "$DESTFILE" ; then
- touch "$DESTFILE" ; chmod 644 "$DESTFILE"
+ touch -- "$DESTFILE" ; chmod 644 -- "$DESTFILE"
fi
# * copy dest => tmp to get the file attributes
@@ -210,7 +212,9 @@
elif [ $RET -eq 2 ]; then
# user modified the config. Copy aborted
echo "ATTENTION: You have modified $DESTFILE. Leaving it untouched..."
- echo "You can find my version in $TMP_FILE ..."
+ if test "x$TMP_FILE" != "x" -a -f "$TMP_FILE" ; then
+ echo "You can find my version in $TMP_FILE ..."
+ fi
exit 20
fi
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/sysconfig-0.84.0/sysconfig.spec new/sysconfig-0.84.1/sysconfig.spec
--- old/sysconfig-0.84.0/sysconfig.spec 2016-09-09 19:28:07.000000000 +0200
+++ new/sysconfig-0.84.1/sysconfig.spec 2017-04-10 13:31:47.000000000 +0200
@@ -1,7 +1,7 @@
#
-# spec file for package sysconfig.spec
+# spec file for package sysconfig
#
-# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2017 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
@@ -23,7 +23,7 @@
%define udevdir /lib/udev
%endif
Name: sysconfig
-Version: 0.84.0
+Version: 0.84.1
Release: 0
Summary: The sysconfig scheme for traditional network scripts
License: GPL-2.0+
@@ -35,7 +35,12 @@
Requires: /sbin/ifup
Requires: /sbin/netconfig
Requires: sysvinit(network)
-PreReq: %fillup_prereq %insserv_prereq textutils fileutils gawk sed grep
+PreReq: %fillup_prereq
+PreReq: fileutils
+PreReq: gawk
+PreReq: grep
+PreReq: sed
+PreReq: textutils
Recommends: wicked-service
BuildRoot: %{_tmppath}/%{name}-%{version}-build
@@ -74,7 +79,7 @@
make %{?_smp_mflags} check
%install
-make %{?_smp_mflags} DESTDIR=%{buildroot} install
+%make_install
touch %{buildroot}%{_sysconfdir}/sysconfig/network/config
touch %{buildroot}%{_sysconfdir}/sysconfig/network/dhcp
mkdir -p %{buildroot}/sbin
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/sysconfig-0.84.0/sysconfig.spec.in new/sysconfig-0.84.1/sysconfig.spec.in
--- old/sysconfig-0.84.0/sysconfig.spec.in 2016-09-08 20:22:47.000000000 +0200
+++ new/sysconfig-0.84.1/sysconfig.spec.in 2017-04-10 13:25:05.000000000 +0200
@@ -1,7 +1,7 @@
#
-# spec file for package sysconfig.spec
+# spec file for package sysconfig
#
-# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2017 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
@@ -35,7 +35,12 @@
Requires: /sbin/ifup
Requires: /sbin/netconfig
Requires: sysvinit(network)
-PreReq: %fillup_prereq %insserv_prereq textutils fileutils gawk sed grep
+PreReq: %fillup_prereq
+PreReq: fileutils
+PreReq: gawk
+PreReq: grep
+PreReq: sed
+PreReq: textutils
Recommends: wicked-service
BuildRoot: %{_tmppath}/%{name}-%{version}-build
@@ -74,7 +79,7 @@
make %{?_smp_mflags} check
%install
-make %{?_smp_mflags} DESTDIR=%{buildroot} install
+%make_install
touch %{buildroot}%{_sysconfdir}/sysconfig/network/config
touch %{buildroot}%{_sysconfdir}/sysconfig/network/dhcp
mkdir -p %{buildroot}/sbin