Hello community, here is the log from the commit of package sysconfig for openSUSE:Factory checked in at 2019-02-25 17:45:51 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/sysconfig (Old) and /work/SRC/openSUSE:Factory/.sysconfig.new.28833 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "sysconfig" Mon Feb 25 17:45:51 2019 rev:184 rq:675195 version:0.85.2 Changes: -------- --- /work/SRC/openSUSE:Factory/sysconfig/sysconfig.changes 2019-02-09 07:16:12.026431701 +0100 +++ /work/SRC/openSUSE:Factory/.sysconfig.new.28833/sysconfig.changes 2019-02-25 17:45:54.342893990 +0100 @@ -1,0 +2,14 @@ +Thu Feb 14 12:12:38 UTC 2019 - [email protected] + +- version 0.85.2 +- Fixed changes file to mention relevant github pull requests. +- Removed remaining preun rpm hook from EOL openSUSE versions +- Merged /var/adm/netconfig move revert from openSUSE:Factory + causing to not find md5 sums from previous netconfig version + due to incorrectly merged hook in spec file and trouble on + transactional systems without writeable /var/lib/netconfig. + Removed obsoletes revert-var-adm-lib-netconfig-move.patch. + (bsc#1124152,bsc#1124340). +- Merged rpm spec bash section marks (gh#openSUSE/sysconfig#23) + +------------------------------------------------------------------- @@ -22,0 +37,4 @@ +- Remove code to update from openSUSE older than 12.3, which is EOL + (gh#openSUSE/sysconfig#19). +- Move /var/adm/netconfig to /var/lib/netconfig to become more FHS + conform (gh#openSUSE/sysconfig#18). Old: ---- revert-var-adm-lib-netconfig-move.patch sysconfig-0.85.1.tar.bz2 New: ---- sysconfig-0.85.2.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ sysconfig.spec ++++++ --- /var/tmp/diff_new_pack.e04i8A/_old 2019-02-25 17:45:54.974893730 +0100 +++ /var/tmp/diff_new_pack.e04i8A/_new 2019-02-25 17:45:54.978893729 +0100 @@ -12,7 +12,7 @@ # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. -# Please submit bugfixes or comments via https://bugs.opensuse.org/ +# Please submit bugfixes or comments via http://bugs.opensuse.org/ # @@ -28,14 +28,13 @@ %define udevdir /lib/udev %endif Name: sysconfig -Version: 0.85.1 +Version: 0.85.2 Release: 0 Summary: The sysconfig scheme for traditional network scripts License: GPL-2.0-or-later Group: System/Base Url: https://github.com/openSUSE/sysconfig Source: %{name}-%{version}.tar.bz2 -Patch1: revert-var-adm-lib-netconfig-move.patch BuildRequires: libtool BuildRequires: pkgconfig Requires: /sbin/ifup @@ -59,8 +58,6 @@ Group: System/Base Requires: /bin/logger Requires(pre): sysconfig = %{version} -Requires(pre): coreutils -Requires(pre): diffutils Provides: /sbin/netconfig %description netconfig @@ -69,7 +66,6 @@ %prep %setup -q -%patch1 -p1 %build autoreconf -fvi @@ -136,22 +132,7 @@ %{_sysconfdir}/ppp/pre-start.d/10-netconfig %{_sysconfdir}/ppp/post-stop.d/90-netconfig -%pre -# package update ? -if [ ${1:-0} -gt 1 ]; then - # trigger update from < 0.80.x only (-> openSUSE 12.3), - # (guard for variable added to network/config later...) - if [ -x %{_sbindir}/NetworkManager ] && grep -qs "^NETWORKMANAGER=" \ - var/adm/fillup-templates/sysconfig.config-network ; then - mkdir -p /dev/.sysconfig/network/ && \ - grep -s "^NETWORKMANAGER=" etc/sysconfig/network/config \ - > /dev/.sysconfig/network/migrate_nm_variable || : - elif [ -f /dev/.sysconfig/network/migrate_nm_variable ] ; then - rm -f /dev/.sysconfig/network/migrate_nm_variable || : - fi -fi - -%post +%post -p /bin/bash # ## we provide own, improved variant of the remove_and_set suse ## rpm macro that is able to handle files in subdirs, and more @@ -196,36 +177,7 @@ done # be a little bit paranoid and set the correct mode even we set umask chmod 0600 etc/sysconfig/network/ifcfg-* 2>/dev/null || : -# bnc#803058: migrate from NETWORKMANAGER=yes/no variable to -# network.service alias link masking rcnetwork. -if [ -f /dev/.sysconfig/network/migrate_nm_variable -a -x %{_bindir}/systemctl ] ; then - . /dev/.sysconfig/network/migrate_nm_variable - case $NETWORKMANAGER in - no) - # NetworkManager.service were always started before; stop - # and disable it, so %{_initddir}/network isn't masked... - # kill all, NM is using KillMode=Process (bnc#895447) - %{_bindir}/systemctl --kill-who=all kill NetworkManager.service || : - %{_bindir}/systemctl stop NetworkManager.service || : - %{_bindir}/systemctl --force disable NetworkManager.service || : - rm -f /dev/.sysconfig/network/migrate_nm_variable || : - ;; - yes) - # Keep the /dev/.sysconfig/network/migrate_nm_variable file, - # as hint for migration in NetworkManager post-install ... - # Mask %{_initddir}/network service until NM update is done. - %{_bindir}/systemctl --force mask network.service || : - ;; - esac -else - # cleanup obsolete NETWORKMANAGER variable - sysconfig_remove_and_set network/config NETWORKMANAGER -fi %postun -p /sbin/ldconfig -%preun -if test "$1" = "0" -a -x %{_initddir}/network ; then - %{_initddir}/network stop-all-dhcp-clients 2>/dev/null || : -fi %changelog ++++++ sysconfig-0.85.1.tar.bz2 -> sysconfig-0.85.2.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/sysconfig-0.85.1/ChangeLog new/sysconfig-0.85.2/ChangeLog --- old/sysconfig-0.85.1/ChangeLog 2019-01-17 12:41:02.000000000 +0100 +++ new/sysconfig-0.85.2/ChangeLog 2019-02-14 13:54:31.000000000 +0100 @@ -1,4 +1,46 @@ -commit 5ddfbeedc6ffdbce09d8e202c93b09e914c1234e (HEAD -> master, tag: version-0.85.1) +commit 31dd90b705394bc62a3d7591ea13284238dfd075 (HEAD -> wip-0.85.2) +Author: Marius Tomaschewski <[email protected]> +Date: Thu Feb 14 12:56:28 2019 +0100 + + Remove preun to update from EOL openSUSE versions + + Commit b0504b0 removed most of the hooks already + +commit d04e4eb484b505598e42f2afac6586c42814bc98 +Author: Marius Tomaschewski <[email protected]> +Date: Thu Feb 14 12:53:51 2019 +0100 + + Update spec file template header comments + +commit 1323e9a647b3979eb3a515a92fd69fbe04bd3a2a (bug-1124152-revert-move) +Merge: 2da4617 7ed90af +Author: Marius Tomaschewski <[email protected]> +Date: Thu Feb 14 12:35:57 2019 +0100 + + Merge /var/adm/netconfig move revert from openSUSE:Factory + +commit 7ed90af79e9da626e49625790a967107bc5aa26c +Author: Ignaz Forster <[email protected]> +Date: Fri Feb 8 15:27:06 2019 +0100 + + Revert "Move /var/adm/netconfig to /var/lib/netconfig" + + This reverts commit 6f3c5aad8122ce83f35255adb499131838161bf3. + On transactional systems this won't work as expected: With the old + directory layout /var/lib/netconfig is not writeable, new MD5 hashes + cannot be written there. On systems with the new /var subvolume the + directory isn't mounted during the update, resulting in a noop. The + MD5 sum will still be incorrect in the running system. + + Temporarily revert this change until a better solution is found. + +commit 501b82ce42f69e375303f6c9d2de8825376ca14c +Author: Jan Engelhardt <[email protected]> +Date: Fri Feb 8 02:51:50 2019 +0100 + + Make rpm spec code sh-compatible or explicitly mark bash sections + +commit 5ddfbeedc6ffdbce09d8e202c93b09e914c1234e (tag: version-0.85.1) Author: Marius Tomaschewski <[email protected]> Date: Thu Jan 17 12:35:20 2019 +0100 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/sysconfig-0.85.1/VERSION new/sysconfig-0.85.2/VERSION --- old/sysconfig-0.85.1/VERSION 2019-01-17 12:39:27.000000000 +0100 +++ new/sysconfig-0.85.2/VERSION 2019-02-14 13:53:20.000000000 +0100 @@ -1 +1 @@ -0.85.1 +0.85.2 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/sysconfig-0.85.1/configure new/sysconfig-0.85.2/configure --- old/sysconfig-0.85.1/configure 2019-01-17 12:40:52.000000000 +0100 +++ new/sysconfig-0.85.2/configure 2019-02-14 13:54:01.000000000 +0100 @@ -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.85.1. +# Generated by GNU Autoconf 2.69 for sysconfig 0.85.2. # # Report bugs to <http://bugs.opensuse.org>. # @@ -591,8 +591,8 @@ # Identity of this package. PACKAGE_NAME='sysconfig' PACKAGE_TARNAME='sysconfig' -PACKAGE_VERSION='0.85.1' -PACKAGE_STRING='sysconfig 0.85.1' +PACKAGE_VERSION='0.85.2' +PACKAGE_STRING='sysconfig 0.85.2' PACKAGE_BUGREPORT='http://bugs.opensuse.org' PACKAGE_URL='https://github.com/openSUSE/sysconfig' @@ -1331,7 +1331,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.85.1 to adapt to many kinds of systems. +\`configure' configures sysconfig 0.85.2 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1401,7 +1401,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of sysconfig 0.85.1:";; + short | recursive ) echo "Configuration of sysconfig 0.85.2:";; esac cat <<\_ACEOF @@ -1515,7 +1515,7 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -sysconfig configure 0.85.1 +sysconfig configure 0.85.2 generated by GNU Autoconf 2.69 Copyright (C) 2012 Free Software Foundation, Inc. @@ -1884,7 +1884,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.85.1, which was +It was created by sysconfig $as_me 0.85.2, which was generated by GNU Autoconf 2.69. Invocation command line was $ $0 $@ @@ -2751,7 +2751,7 @@ # Define the identity of the package. PACKAGE='sysconfig' - VERSION='0.85.1' + VERSION='0.85.2' cat >>confdefs.h <<_ACEOF @@ -12838,7 +12838,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.85.1, which was +This file was extended by sysconfig $as_me 0.85.2, which was generated by GNU Autoconf 2.69. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -12896,7 +12896,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.85.1 +sysconfig config.status 0.85.2 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.85.1/scripts/functions.netconfig new/sysconfig-0.85.2/scripts/functions.netconfig --- old/sysconfig-0.85.1/scripts/functions.netconfig 2018-12-21 14:13:48.000000000 +0100 +++ new/sysconfig-0.85.2/scripts/functions.netconfig 2019-02-14 12:38:22.000000000 +0100 @@ -24,7 +24,7 @@ NETCONFIG_DNS_RANKING_DEFAULT="+/vpn/ -/auto/ +strongswan +openswan +racoon -avahi" test -z "$MD5DIR" && { - MD5DIR=$r/var/lib/netconfig/md5 + MD5DIR=$r/var/adm/netconfig/md5 #echo "Using MD5DIR=\"$MD5DIR\"..." } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/sysconfig-0.85.1/sysconfig.spec new/sysconfig-0.85.2/sysconfig.spec --- old/sysconfig-0.85.1/sysconfig.spec 2019-01-17 12:40:55.000000000 +0100 +++ new/sysconfig-0.85.2/sysconfig.spec 2019-02-14 13:54:04.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package sysconfig # -# 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/ # @@ -28,7 +28,7 @@ %define udevdir /lib/udev %endif Name: sysconfig -Version: 0.85.1 +Version: 0.85.2 Release: 0 Summary: The sysconfig scheme for traditional network scripts License: GPL-2.0-or-later @@ -58,7 +58,6 @@ Group: System/Base Requires: /bin/logger Requires(pre): sysconfig = %{version} -Requires(pre): coreutils Provides: /sbin/netconfig %description netconfig @@ -133,7 +132,7 @@ %{_sysconfdir}/ppp/pre-start.d/10-netconfig %{_sysconfdir}/ppp/post-stop.d/90-netconfig -%post +%post -p /bin/bash # ## we provide own, improved variant of the remove_and_set suse ## rpm macro that is able to handle files in subdirs, and more @@ -180,20 +179,5 @@ chmod 0600 etc/sysconfig/network/ifcfg-* 2>/dev/null || : %postun -p /sbin/ldconfig -%preun -if test "$1" = "0" -a -x %{_initddir}/network ; then - %{_initddir}/network stop-all-dhcp-clients 2>/dev/null || : -fi - -%post netconfig -if [ $1 -eq 2 ]; then - # in upgrade case, move /var/adm/netconfig to /var/lib/netconfig - if [ -d /var/adm/netconfig -a ! -e /var/lib/netconfig ]; then - mkdir -p /var/lib/netconfig - cp -a /var/adm/netconfig/* /var/lib/netconfig - rm -rf /var/adm/netconfig - ln -sf /var/lib/netconfig /var/adm/netconfig - fi -fi %changelog diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/sysconfig-0.85.1/sysconfig.spec.in new/sysconfig-0.85.2/sysconfig.spec.in --- old/sysconfig-0.85.1/sysconfig.spec.in 2019-01-17 12:39:27.000000000 +0100 +++ new/sysconfig-0.85.2/sysconfig.spec.in 2019-02-14 12:55:03.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package sysconfig # -# 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/ # @@ -58,7 +58,6 @@ Group: System/Base Requires: /bin/logger Requires(pre): sysconfig = %{version} -Requires(pre): coreutils Provides: /sbin/netconfig %description netconfig @@ -133,7 +132,7 @@ %{_sysconfdir}/ppp/pre-start.d/10-netconfig %{_sysconfdir}/ppp/post-stop.d/90-netconfig -%post +%post -p /bin/bash # ## we provide own, improved variant of the remove_and_set suse ## rpm macro that is able to handle files in subdirs, and more @@ -180,20 +179,5 @@ chmod 0600 etc/sysconfig/network/ifcfg-* 2>/dev/null || : %postun -p /sbin/ldconfig -%preun -if test "$1" = "0" -a -x %{_initddir}/network ; then - %{_initddir}/network stop-all-dhcp-clients 2>/dev/null || : -fi - -%post netconfig -if [ $1 -eq 2 ]; then - # in upgrade case, move /var/adm/netconfig to /var/lib/netconfig - if [ -d /var/adm/netconfig -a ! -e /var/lib/netconfig ]; then - mkdir -p /var/lib/netconfig - cp -a /var/adm/netconfig/* /var/lib/netconfig - rm -rf /var/adm/netconfig - ln -sf /var/lib/netconfig /var/adm/netconfig - fi -fi %changelog
