Hello community, here is the log from the commit of package sysconfig for openSUSE:Factory checked in at 2016-05-23 17:30:59 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/sysconfig (Old) and /work/SRC/openSUSE:Factory/.sysconfig.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "sysconfig" Changes: -------- --- /work/SRC/openSUSE:Factory/sysconfig/sysconfig.changes 2015-06-11 09:09:33.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.sysconfig.new/sysconfig.changes 2016-05-23 17:31:00.000000000 +0200 @@ -1,0 +2,9 @@ +Fri May 20 14:52:18 UTC 2016 - [email protected] + +- version 0.83.9 +- ppp: install refactored ip-up and related scripts (bsc#865573) +- removed patches shipped inside of the source archive + [- 0001-dhcp-network-variables-for-dhcp4-user-class.909307.patch] + [- 0002-netconfig-use-ntpd.service-on-13.2-boo-930309.patch] + +------------------------------------------------------------------- Old: ---- 0001-dhcp-network-variables-for-dhcp4-user-class.909307.patch 0002-netconfig-use-ntpd.service-on-13.2-boo-930309.patch sysconfig-0.83.8.tar.bz2 New: ---- sysconfig-0.83.9.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ sysconfig.spec ++++++ --- /var/tmp/diff_new_pack.Fqi3ZO/_old 2016-05-23 17:31:01.000000000 +0200 +++ /var/tmp/diff_new_pack.Fqi3ZO/_new 2016-05-23 17:31:01.000000000 +0200 @@ -1,7 +1,7 @@ # # spec file for package sysconfig # -# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2016 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 @@ -17,7 +17,7 @@ Name: sysconfig -Version: 0.83.8 +Version: 0.83.9 Release: 0 Summary: The sysconfig scheme for traditional network scripts License: GPL-2.0+ @@ -33,8 +33,6 @@ %define udevdir /lib/udev %endif Source: %name-%version.tar.bz2 -Patch1: 0001-dhcp-network-variables-for-dhcp4-user-class.909307.patch -Patch2: 0002-netconfig-use-ntpd.service-on-13.2-boo-930309.patch Requires: /sbin/ifup Requires: /sbin/netconfig Requires: sysvinit(network) @@ -77,8 +75,6 @@ %prep %setup -n sysconfig-%{version} -%patch1 -p1 -%patch2 -p1 %build autoreconf --force --install @@ -122,6 +118,19 @@ /usr/share/omc/svcinfo.d/network.xml /sbin/rcnetwork /sbin/ifuser +%dir %attr(0750,root,dialout) %_sysconfdir/ppp +%dir %_sysconfdir/ppp/ip-up.d +%dir %_sysconfdir/ppp/ip-down.d +%dir %_sysconfdir/ppp/ipv6-up.d +%dir %_sysconfdir/ppp/ipv6-down.d +%dir %_sysconfdir/ppp/pre-start.d +%dir %_sysconfdir/ppp/post-stop.d +%_sysconfdir/ppp/ip-up +%_sysconfdir/ppp/ip-down +%_sysconfdir/ppp/ipv6-up +%_sysconfdir/ppp/ipv6-down +%_sysconfdir/ppp/post-stop +%_sysconfdir/ppp/pre-start %files netconfig %defattr(-,root,root) @@ -131,6 +140,11 @@ /sbin/netconfig /usr/share/man/man8/netconfig.8.gz %doc /usr/share/doc/packages/sysconfig/netconfig.png +%_sysconfdir/ppp/netconfig +%_sysconfdir/ppp/ip-up.d/10-netconfig +%_sysconfdir/ppp/ip-down.d/90-netconfig +%_sysconfdir/ppp/pre-start.d/10-netconfig +%_sysconfdir/ppp/post-stop.d/90-netconfig %pre # package update ? ++++++ sysconfig-0.83.8.tar.bz2 -> sysconfig-0.83.9.tar.bz2 ++++++ ++++ 2168 lines of diff (skipped) ++++ retrying with extended exclude list diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/sysconfig-0.83.8/ChangeLog new/sysconfig-0.83.9/ChangeLog --- old/sysconfig-0.83.8/ChangeLog 2015-01-13 20:05:47.000000000 +0100 +++ new/sysconfig-0.83.9/ChangeLog 2016-05-20 16:56:05.000000000 +0200 @@ -1,4 +1,76 @@ -commit f814bc671ce629191fe14cab2771c226acd3d488 (HEAD, master) +commit 135751ce941696b2ecc202c7e06ffc4f22f1bfaf (HEAD -> sle12-sp2, tag: version-0.83.9) +Author: Marius Tomaschewski <[email protected]> +Date: Fri May 20 16:54:54 2016 +0200 + + version 0.83.9 + +commit f3e6e4e09b4843551d3ea787f24b55a3d6536b0d (sle12-sp2-1, ppp) +Author: Marius Tomaschewski <[email protected]> +Date: Fri May 20 16:09:19 2016 +0200 + + ppp: install ip-up and related scripts (bsc#865573) + +commit 5b664b18d8445094c40ca1da326d70795af87b5f +Author: Marius Tomaschewski <[email protected]> +Date: Fri May 20 16:05:43 2016 +0200 + + ppp: added a netconfig updater ip-up script plugin + +commit e9e6f46c637431d0c496c43887a79dbf508a1d41 +Author: Marius Tomaschewski <[email protected]> +Date: Fri May 20 16:02:48 2016 +0200 + + ppp: refactored and cleaned up main ip-up script + +commit 2da2343e68d07316db7fadcbd35e3ab4ddf21bb9 +Author: Marius Tomaschewski <[email protected]> +Date: Fri May 20 15:57:26 2016 +0200 + + ppp: create ip-up.d/ip-down.d and related directories + +commit 859d78e8baacdcf8657871e106776a4d62feb068 +Author: Marius Tomaschewski <[email protected]> +Date: Fri May 20 11:53:10 2016 +0200 + + scripts: moved ppp scripts into ppp subdirectory + +commit befef347ba91d30e185486c1fcb14ef32c34898e (origin/master, opensuse-13.2, master) +Author: Marius Tomaschewski <[email protected]> +Date: Tue Jun 9 10:37:50 2015 +0200 + + updated changes file + +commit 1f86f4bdd35da517a23e3fc375b4c86036a92d30 +Author: Marius Tomaschewski <[email protected]> +Date: Tue Jun 9 10:33:25 2015 +0200 + + Applied changes from OBS/Base:System/sysconfig + +commit dbd61e9c9446d86aced4f7405505c22353539627 (origin/ntpd-service, ntpd-service) +Author: Marius Tomaschewski <[email protected]> +Date: Tue Jun 9 10:12:15 2015 +0200 + + netconfig: use ntpd.service on >13.1 (boo#930309) + +commit 68c41a432d57d04900031871c58f4277e4940eaa +Author: Marius Tomaschewski <[email protected]> +Date: Tue Feb 17 12:36:14 2015 +0100 + + fixed changes file to use bug references as in 13.2 + +commit 077f802b00cd1479d1f9f0f7fd14ee9de554503e +Author: Marius Tomaschewski <[email protected]> +Date: Tue Feb 17 12:29:35 2015 +0100 + + updated changes file + +commit 59b8496ff57b745d988cff32596a6988cd045e34 (kmroz/update-user-class) +Author: Karol Mroz <[email protected]> +Date: Thu Jan 22 17:17:54 2015 -0800 + + dhcp-network: add sysconfig variables for handling DHCP user-class + +commit f814bc671ce629191fe14cab2771c226acd3d488 (tag: version-0.83.8, origin/opensuse-13.2, kmroz/master) Author: Marius Tomaschewski <[email protected]> Date: Tue Jan 13 20:04:45 2015 +0100 @@ -26,7 +98,7 @@ netconfig: merge NetworkManager settings on -m (bsc#900982) -commit b16e505aedf3278f81870616c75999f240b3b2c2 (origin/sle12-sp0-test, origin/master, sle12-sp0-test) +commit b16e505aedf3278f81870616c75999f240b3b2c2 (origin/sle12-sp0-test) Author: Marius Tomaschewski <[email protected]> Date: Tue Oct 28 15:25:58 2014 +0100 @@ -42,7 +114,7 @@ ensure to kill all (child) processes when migrating from the NETWORKMANAGER=no variable (bnc#895447). -commit e7c55fe579ae36d3d8e670177af35f09bb23ef7b (origin/sle12-sp0, sle12-sp0) +commit e7c55fe579ae36d3d8e670177af35f09bb23ef7b Author: Marius Tomaschewski <[email protected]> Date: Wed Sep 24 08:15:16 2014 +0200 @@ -133,7 +205,7 @@ Changed to send gratuitous arp by default, when duplicate IPv4 check is enabled and were successful (bnc#879911,fate#314399). -commit ab37fb0b77603c4ecf6f501c24f4a8be2425e0f2 (master-netconfig) +commit ab37fb0b77603c4ecf6f501c24f4a8be2425e0f2 Author: Marius Tomaschewski <[email protected]> Date: Wed Mar 19 13:44:05 2014 +0100 @@ -146,7 +218,7 @@ Fixed to log info/warnings that were printed to stderr only before (bnc#860644, bnc#868323). -commit 33bb956a2effdc88eeeaf1939205217da6caea4b (tag: version-0.83.4) +commit 33bb956a2effdc88eeeaf1939205217da6caea4b (tag: version-0.83.4, kmroz/sle12-sp0) Author: Marius Tomaschewski <[email protected]> Date: Wed Mar 12 18:40:29 2014 +0100 @@ -768,7 +840,7 @@ the bonding interface is using the MAC of the currently active slave (bnc#815025). -commit 865c699a6dc85ff9d73ccf9159d7ae6f02530011 (origin/opensuse-12.3, opensuse-12.3) +commit 865c699a6dc85ff9d73ccf9159d7ae6f02530011 (origin/opensuse-12.3, kmroz/opensuse-12.3, opensuse-12.3) Author: Marius Tomaschewski <[email protected]> Date: Thu Apr 4 12:49:28 2013 +0200 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/sysconfig-0.83.8/VERSION new/sysconfig-0.83.9/VERSION --- old/sysconfig-0.83.8/VERSION 2015-01-13 19:55:39.000000000 +0100 +++ new/sysconfig-0.83.9/VERSION 2016-05-20 16:53:20.000000000 +0200 @@ -1 +1 @@ -0.83.8 +0.83.9 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/sysconfig-0.83.8/compile new/sysconfig-0.83.9/compile --- old/sysconfig-0.83.8/compile 2015-01-13 20:05:40.000000000 +0100 +++ new/sysconfig-0.83.9/compile 1970-01-01 01:00:00.000000000 +0100 @@ -1,347 +0,0 @@ -#! /bin/sh -# Wrapper for compilers which do not understand '-c -o'. - -scriptversion=2012-10-14.11; # UTC - -# Copyright (C) 1999-2013 Free Software Foundation, Inc. -# Written by Tom Tromey <[email protected]>. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2, or (at your option) -# any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program. If not, see <http://www.gnu.org/licenses/>. - -# As a special exception to the GNU General Public License, if you -# distribute this file as part of a program that contains a -# configuration script generated by Autoconf, you may include it under -# the same distribution terms that you use for the rest of that program. - -# This file is maintained in Automake, please report -# bugs to <[email protected]> or send patches to -# <[email protected]>. - -nl=' -' - -# We need space, tab and new line, in precisely that order. Quoting is -# there to prevent tools from complaining about whitespace usage. -IFS=" "" $nl" - -file_conv= - -# func_file_conv build_file lazy -# Convert a $build file to $host form and store it in $file -# Currently only supports Windows hosts. If the determined conversion -# type is listed in (the comma separated) LAZY, no conversion will -# take place. -func_file_conv () -{ - file=$1 - case $file in - / | /[!/]*) # absolute file, and not a UNC file - if test -z "$file_conv"; then - # lazily determine how to convert abs files - case `uname -s` in - MINGW*) - file_conv=mingw - ;; - CYGWIN*) - file_conv=cygwin - ;; - *) - file_conv=wine - ;; - esac - fi - case $file_conv/,$2, in - *,$file_conv,*) - ;; - mingw/*) - file=`cmd //C echo "$file " | sed -e 's/"\(.*\) " *$/\1/'` - ;; - cygwin/*) - file=`cygpath -m "$file" || echo "$file"` - ;; - wine/*) - file=`winepath -w "$file" || echo "$file"` - ;; - esac - ;; - esac -} - -# func_cl_dashL linkdir -# Make cl look for libraries in LINKDIR -func_cl_dashL () -{ - func_file_conv "$1" - if test -z "$lib_path"; then - lib_path=$file - else - lib_path="$lib_path;$file" - fi - linker_opts="$linker_opts -LIBPATH:$file" -} - -# func_cl_dashl library -# Do a library search-path lookup for cl -func_cl_dashl () -{ - lib=$1 - found=no - save_IFS=$IFS - IFS=';' - for dir in $lib_path $LIB - do - IFS=$save_IFS - if $shared && test -f "$dir/$lib.dll.lib"; then - found=yes - lib=$dir/$lib.dll.lib - break - fi - if test -f "$dir/$lib.lib"; then - found=yes - lib=$dir/$lib.lib - break - fi - if test -f "$dir/lib$lib.a"; then - found=yes - lib=$dir/lib$lib.a - break - fi - done - IFS=$save_IFS - - if test "$found" != yes; then - lib=$lib.lib - fi -} - -# func_cl_wrapper cl arg... -# Adjust compile command to suit cl -func_cl_wrapper () -{ - # Assume a capable shell - lib_path= - shared=: - linker_opts= - for arg - do - if test -n "$eat"; then - eat= - else - case $1 in - -o) - # configure might choose to run compile as 'compile cc -o foo foo.c'. - eat=1 - case $2 in - *.o | *.[oO][bB][jJ]) - func_file_conv "$2" - set x "$@" -Fo"$file" - shift - ;; - *) - func_file_conv "$2" - set x "$@" -Fe"$file" - shift - ;; - esac - ;; - -I) - eat=1 - func_file_conv "$2" mingw - set x "$@" -I"$file" - shift - ;; - -I*) - func_file_conv "${1#-I}" mingw - set x "$@" -I"$file" - shift - ;; - -l) - eat=1 - func_cl_dashl "$2" - set x "$@" "$lib" - shift - ;; - -l*) - func_cl_dashl "${1#-l}" - set x "$@" "$lib" - shift - ;; - -L) - eat=1 - func_cl_dashL "$2" - ;; - -L*) - func_cl_dashL "${1#-L}" - ;; - -static) - shared=false - ;; - -Wl,*) - arg=${1#-Wl,} - save_ifs="$IFS"; IFS=',' - for flag in $arg; do - IFS="$save_ifs" - linker_opts="$linker_opts $flag" - done - IFS="$save_ifs" - ;; - -Xlinker) - eat=1 - linker_opts="$linker_opts $2" - ;; - -*) - set x "$@" "$1" - shift - ;; - *.cc | *.CC | *.cxx | *.CXX | *.[cC]++) - func_file_conv "$1" - set x "$@" -Tp"$file" - shift - ;; - *.c | *.cpp | *.CPP | *.lib | *.LIB | *.Lib | *.OBJ | *.obj | *.[oO]) - func_file_conv "$1" mingw - set x "$@" "$file" - shift - ;; - *) - set x "$@" "$1" - shift - ;; - esac - fi - shift - done - if test -n "$linker_opts"; then - linker_opts="-link$linker_opts" - fi - exec "$@" $linker_opts - exit 1 -} - -eat= - -case $1 in - '') - echo "$0: No command. Try '$0 --help' for more information." 1>&2 - exit 1; - ;; - -h | --h*) - cat <<\EOF -Usage: compile [--help] [--version] PROGRAM [ARGS] - -Wrapper for compilers which do not understand '-c -o'. -Remove '-o dest.o' from ARGS, run PROGRAM with the remaining -arguments, and rename the output as expected. - -If you are trying to build a whole package this is not the -right script to run: please start by reading the file 'INSTALL'. - -Report bugs to <[email protected]>. -EOF - exit $? - ;; - -v | --v*) - echo "compile $scriptversion" - exit $? - ;; - cl | *[/\\]cl | cl.exe | *[/\\]cl.exe ) - func_cl_wrapper "$@" # Doesn't return... - ;; -esac - -ofile= -cfile= - -for arg -do - if test -n "$eat"; then - eat= - else - case $1 in - -o) - # configure might choose to run compile as 'compile cc -o foo foo.c'. - # So we strip '-o arg' only if arg is an object. - eat=1 - case $2 in - *.o | *.obj) - ofile=$2 - ;; - *) - set x "$@" -o "$2" - shift - ;; - esac - ;; - *.c) - cfile=$1 - set x "$@" "$1" - shift - ;; - *) - set x "$@" "$1" - shift - ;; - esac - fi - shift -done - -if test -z "$ofile" || test -z "$cfile"; then - # If no '-o' option was seen then we might have been invoked from a - # pattern rule where we don't need one. That is ok -- this is a - # normal compilation that the losing compiler can handle. If no - # '.c' file was seen then we are probably linking. That is also - # ok. - exec "$@" -fi - -# Name of file we expect compiler to create. -cofile=`echo "$cfile" | sed 's|^.*[\\/]||; s|^[a-zA-Z]:||; s/\.c$/.o/'` - -# Create the lock directory. -# Note: use '[/\\:.-]' here to ensure that we don't use the same name -# that we are using for the .o file. Also, base the name on the expected -# object file name, since that is what matters with a parallel build. -lockdir=`echo "$cofile" | sed -e 's|[/\\:.-]|_|g'`.d -while true; do - if mkdir "$lockdir" >/dev/null 2>&1; then - break - fi - sleep 1 -done -# FIXME: race condition here if user kills between mkdir and trap. -trap "rmdir '$lockdir'; exit 1" 1 2 15 - -# Run the compile. -"$@" -ret=$? - -if test -f "$cofile"; then - test "$cofile" = "$ofile" || mv "$cofile" "$ofile" -elif test -f "${cofile}bj"; then - test "${cofile}bj" = "$ofile" || mv "${cofile}bj" "$ofile" -fi - -rmdir "$lockdir" -exit $ret - -# Local Variables: -# mode: shell-script -# sh-indentation: 2 -# eval: (add-hook 'write-file-hooks 'time-stamp) -# time-stamp-start: "scriptversion=" -# time-stamp-format: "%:y-%02m-%02d.%02H" -# time-stamp-time-zone: "UTC" -# time-stamp-end: "; # UTC" -# End: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/sysconfig-0.83.8/config/sysconfig.dhcp-network new/sysconfig-0.83.9/config/sysconfig.dhcp-network --- old/sysconfig-0.83.8/config/sysconfig.dhcp-network 2014-10-28 15:13:50.000000000 +0100 +++ new/sysconfig-0.83.9/config/sysconfig.dhcp-network 2016-05-20 15:25:44.000000000 +0200 @@ -77,6 +77,30 @@ # DHCLIENT_VENDOR_CLASS_ID="" +## Type: list<rfc3004,string> +## Default: string +# +# Specifies the format of the DHCLIENT_USER_CLASS_ID variable. +# +# The DHCPv4 option and it's format is specified by RFC3004 as an array +# of class identifiers, but most DHCP clients/servers aren't compliant +# with the specification and send/expect a single string without proper +# RFC3004 length-value tuple format instead. +# +# When set to "rfc3004" DHCLIENT_USER_CLASS_ID[SUFFIX] permit an RFC +# compliant array, otherwise DHCLIENT_USER_CLASS_ID is used as string. +# +DHCLIENT_USER_CLASS_FORMAT="" + +## Type: string +## Default: "" +## Suffix: yes +# +# Specifies the user class identifier (array) to send in dhcp requests. +# The DHCLIENT_USER_CLASS_FORMAT variable specified how to interpret it. +# +DHCLIENT_USER_CLASS_ID="" + ## Type: integer ## Default: "" # diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/sysconfig-0.83.8/configure.in new/sysconfig-0.83.9/configure.in --- old/sysconfig-0.83.8/configure.in 2014-10-28 15:12:57.000000000 +0100 +++ new/sysconfig-0.83.9/configure.in 2016-05-20 16:45:41.000000000 +0200 @@ -80,6 +80,7 @@ tools/Makefile sysconfig.spec scripts/Makefile + scripts/ppp/Makefile scripts/netconfig.d/Makefile scripts/hardware/Makefile]) AC_OUTPUT diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/sysconfig-0.83.8/missing new/sysconfig-0.83.9/missing --- old/sysconfig-0.83.8/missing 2015-01-13 20:05:40.000000000 +0100 +++ new/sysconfig-0.83.9/missing 2016-05-20 16:55:18.000000000 +0200 @@ -1,7 +1,7 @@ #! /bin/sh # Common wrapper for a few potentially missing GNU programs. -scriptversion=2013-10-28.13; # UTC +scriptversion=2012-06-26.16; # UTC # Copyright (C) 1996-2013 Free Software Foundation, Inc. # Originally written by Fran,cois Pinard <[email protected]>, 1996. @@ -160,7 +160,7 @@ ;; autom4te*) echo "You might have modified some maintainer files that require" - echo "the 'autom4te' program to be rebuilt." + echo "the 'automa4te' program to be rebuilt." program_details 'autom4te' ;; bison*|yacc*) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/sysconfig-0.83.8/scripts/Makefile.am new/sysconfig-0.83.9/scripts/Makefile.am --- old/sysconfig-0.83.8/scripts/Makefile.am 2014-10-28 15:12:57.000000000 +0100 +++ new/sysconfig-0.83.9/scripts/Makefile.am 2016-05-20 16:45:41.000000000 +0200 @@ -3,7 +3,7 @@ CLEANFILES = *~ MAINTAINERCLEANFILES = Makefile.in -SUBDIRS = hardware netconfig.d +SUBDIRS = hardware netconfig.d ppp sysconfig_network_scripts_SCRIPTS = functions.rpm-utils \ functions.netconfig diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/sysconfig-0.83.8/scripts/netconfig.d/ntp-runtime new/sysconfig-0.83.9/scripts/netconfig.d/ntp-runtime --- old/sysconfig-0.83.8/scripts/netconfig.d/ntp-runtime 2014-10-28 15:13:50.000000000 +0100 +++ new/sysconfig-0.83.9/scripts/netconfig.d/ntp-runtime 2016-05-20 16:44:49.000000000 +0200 @@ -227,7 +227,7 @@ NTPDC_BIN="/usr/sbin/ntpdc" local status - systemctl --quiet is-active ntp.service &>/dev/null + systemctl --quiet is-active ntpd.service &>/dev/null status=$? if [ -n "${NTP_SERVER_LIST[*]}" -a -f "${NTP_CONF}" ] && [ $status -eq 0 ]; then diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/sysconfig-0.83.8/scripts/ppp/Makefile.am new/sysconfig-0.83.9/scripts/ppp/Makefile.am --- old/sysconfig-0.83.8/scripts/ppp/Makefile.am 1970-01-01 01:00:00.000000000 +0100 +++ new/sysconfig-0.83.9/scripts/ppp/Makefile.am 2016-05-20 16:45:41.000000000 +0200 @@ -0,0 +1,30 @@ +## Process this file with automake to produce Makefile.in + +CLEANFILES = *~ +MAINTAINERCLEANFILES = Makefile.in + +ppp_SCRIPTS = ip-up netconfig + +EXTRA_DIST = $(ppp_SCRIPTS) + +install-data-hook: + install -d -m 0755 $(DESTDIR)$(pppdir)/ip-up.d + install -d -m 0755 $(DESTDIR)$(pppdir)/ip-down.d + install -d -m 0755 $(DESTDIR)$(pppdir)/ipv6-up.d + install -d -m 0755 $(DESTDIR)$(pppdir)/ipv6-down.d + install -d -m 0755 $(DESTDIR)$(pppdir)/pre-start.d + install -d -m 0755 $(DESTDIR)$(pppdir)/post-stop.d + ln -sf ip-up $(DESTDIR)$(pppdir)/ip-down + ln -sf ip-up $(DESTDIR)$(pppdir)/ipv6-up + ln -sf ip-up $(DESTDIR)$(pppdir)/ipv6-down + ln -sf ip-up $(DESTDIR)$(pppdir)/pre-start + ln -sf ip-up $(DESTDIR)$(pppdir)/post-stop + ln -sf ../netconfig $(DESTDIR)$(pppdir)/ip-up.d/10-netconfig + ln -sf ../netconfig $(DESTDIR)$(pppdir)/ip-down.d/90-netconfig + ln -sf ../netconfig $(DESTDIR)$(pppdir)/pre-start.d/10-netconfig + ln -sf ../netconfig $(DESTDIR)$(pppdir)/post-stop.d/90-netconfig + +check: + list='$(ppp_SCRIPTS)'; \ + for i in $$list; do bash -n $(srcdir)/$$i && printf '%-30s %s\n' $$i "Syntax OK" || exit 1; done + diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/sysconfig-0.83.8/scripts/ppp/ip-up new/sysconfig-0.83.9/scripts/ppp/ip-up --- old/sysconfig-0.83.8/scripts/ppp/ip-up 1970-01-01 01:00:00.000000000 +0100 +++ new/sysconfig-0.83.9/scripts/ppp/ip-up 2016-05-20 16:45:41.000000000 +0200 @@ -0,0 +1,115 @@ +#!/bin/bash +# +# /etc/ppp/ip-{up,down} dispatcher script +# Put your scripts into ip-{up,down}.d/* instead +# +# Copyright (C) 1997-2016 SUSE LINUX GmbH, Nuernberg, Germany. +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2 of the License, or +# (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License along +# with this program; if not, see <http://www.gnu.org/licenses/>. +# +# Authors: +# Klaus Franken 25.02.1998 +# Remo Behn 18.07.1998 +# Arvin Schnell 28.02.2002 +# Ludwig Nussel 26.02.2004 +# Marius Tomaschewski <[email protected]> +# Pawel Wieczorkiewicz <[email protected]> +### +unset POSIXLY_CORRECT ; set +o posix # we are using non-posix bash features +shopt -s nullglob + +BASENAME=${0##*/} +INTERFACE=$1 +DEVICE=$2 +SPEED=$3 +LOCALIP=$4 +REMOTEIP=$5 +IPPARAM=$6 + +### +### send all output to syslog +### +exec > >(logger -p security.notice -t "$BASENAME") 2>&1 +### +### or remove comment chars to trace this script: +### +#exec &>/tmp/$BASENAME.$$.trace +#set -x +#echo 1>&2 "$0: $@" +#env 1>&2 + +if [ "X$REMOTEIP" = X -o "X$LOCALIP" = X -o "X$INTERFACE" = X ] ; then + echo "Usage: $0 <INTERFACE> <DEVICE> <SPEED> <LOCALIP> <REMOTEIP>" + exit 1 +fi + +TERM=raw +export TERM + +filter_ext() +{ + case $1 in + *.rpm*|*.old|*.bak|*.orig|*.rej|*.scpmbackup|*~|"") + return 1 ;; + *) return 0 ;; + esac +} + +run_script() +{ + local SCRIPT="$1" ; shift + + # Filter out non-regular files + test -f "$SCRIPT" || return 1 + + # Filter out non-executable files + test -x "$SCRIPT" || return 1 + + "$SCRIPT" "$@" | logger -p security.notice -t "${SCRIPT#/etc/ppp/}" 2>&1 +} + +run_scripts() +{ + local S SCRIPTS="$1" ; shift + + test -d "$SCRIPTS" || return 1 + for S in "$SCRIPTS"/* ; do + filter_ext "$S" || continue + run_script "$S" "$@" + done + return 0 +} + +case $BASENAME in +# +# The ip-up/ip-down scripts are called by pppd on connect / disconnect. +# See also "man 8 pppd" for all up/down script names supported by pppd. +# +*-up|*-down) + run_scripts /etc/ppp/${BASENAME}.d "$@" + run_script /etc/ppp/${BASENAME}.local "$@" +;; + +# +# The pre-start/post-stop scripts can be called by the process before starting +# pppd to initialize demand dialing (e.g. to apply dns servers, so a dns query +# triggers pppd to estabish connection) and to preform a cleanup on pppd exit. +# +pre-start|post-stop) + run_scripts /etc/ppp/${BASENAME}.d "$@" +;; +esac + +exit 0 + diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/sysconfig-0.83.8/scripts/ppp/netconfig new/sysconfig-0.83.9/scripts/ppp/netconfig --- old/sysconfig-0.83.8/scripts/ppp/netconfig 1970-01-01 01:00:00.000000000 +0100 +++ new/sysconfig-0.83.9/scripts/ppp/netconfig 2016-05-20 16:45:41.000000000 +0200 @@ -0,0 +1,90 @@ +#!/bin/bash +# +# /etc/ppp/ip-{up,down}.d/ netconfig(8) update script +# +# Copyright (C) 2016 SUSE LINUX GmbH, Nuernberg, Germany. +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2 of the License, or +# (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License along +# with this program; if not, see <http://www.gnu.org/licenses/>. +# +# Authors: +# Pawel Wieczorkiewicz <[email protected]> +# Marius Tomaschewski <[email protected]> +### +unset POSIXLY_CORRECT ; set +o posix # we are using non-posix bash features + +BASENAME=${0##*/} +INTERFACE=$1 +DEVICE=$2 +SPEED=$3 +LOCALIP=$4 +REMOTEIP=$5 +IPPARAM=$6 +ACTION=${0#/etc/ppp/} + +### +### remove comment chars to trace this script: +### +#exec &>/tmp/${ACTION//\//-}.$$.trace +#set -x +#echo 1>&2 "$0: $@" +#env 1>&2 + +test "X$INTERFACE" = X && exit 1 +test -x /sbin/netconfig || exit 0 + +# this assumes, there is a ifcfg file, let's look +# if the user tried to enable verbose netconfig +# processing ... +if test -f "/etc/sysconfig/network/ifcfg-$INTERFACE" ; then + eval `grep -hs "^NETCONFIG_VERBOSE=" -- \ + "/etc/sysconfig/network/ifcfg-$INTERFACE"` +fi +test "X$NETCONFIG_VERBOSE" = "Xyes" && VERBOSE="-v" + +netconfig_format() +{ + if test "X$DNS1$DNS2" != X ; then + echo "DNSSERVERS='$DNS1 $DNS2'" + fi + if test "X$MS_WINS1$MS_WINS2" != X ; then + echo "NETBIOSNAMESERVER='$MS_WINS1 $MS_WINS2'" + fi +} + +case ${ACTION} in +# on effective connect +ip-up.d/*) + netconfig_format | \ + /sbin/netconfig modify $VERBOSE -s pppd-ipv4 -i "$INTERFACE" +;; +# on disconnect (e.g. idle) +ip-down.d/*) + /sbin/netconfig remove $VERBOSE -s pppd-ipv4 -i "$INTERFACE" +;; + +# pre start init +pre-start.d/*) + # using pppd-auto causes netconfig to lower the + # preference of the settings via dns ranking. + netconfig_format | \ + /sbin/netconfig modify $VERBOSE -s pppd-auto4 -i "$INTERFACE" +;; +# post stop cleanup +post-stop.d/*) + /sbin/netconfig remove $VERBOSE -s pppd-auto4 -i "$INTERFACE" +;; +esac + +exit 0 + diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/sysconfig-0.83.8/sysconfig.spec new/sysconfig-0.83.9/sysconfig.spec --- old/sysconfig-0.83.8/sysconfig.spec 2015-01-13 20:05:42.000000000 +0100 +++ new/sysconfig-0.83.9/sysconfig.spec 2016-05-20 16:55:21.000000000 +0200 @@ -1,7 +1,7 @@ # # spec file for package sysconfig # -# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2016 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 @@ -16,9 +16,8 @@ # - Name: sysconfig -Version: 0.83.8 +Version: 0.83.9 Release: 0 Summary: The sysconfig scheme for traditional network scripts License: GPL-2.0+ @@ -61,6 +60,7 @@ Group: System/Base Requires(pre): sysconfig = %{version} Provides: /sbin/netconfig +Requires: /bin/logger %description netconfig This package provides the netconfig scripts to apply network @@ -118,6 +118,19 @@ /usr/share/omc/svcinfo.d/network.xml /sbin/rcnetwork /sbin/ifuser +%dir %attr(0750,root,dialout) %_sysconfdir/ppp +%dir %_sysconfdir/ppp/ip-up.d +%dir %_sysconfdir/ppp/ip-down.d +%dir %_sysconfdir/ppp/ipv6-up.d +%dir %_sysconfdir/ppp/ipv6-down.d +%dir %_sysconfdir/ppp/pre-start.d +%dir %_sysconfdir/ppp/post-stop.d +%_sysconfdir/ppp/ip-up +%_sysconfdir/ppp/ip-down +%_sysconfdir/ppp/ipv6-up +%_sysconfdir/ppp/ipv6-down +%_sysconfdir/ppp/post-stop +%_sysconfdir/ppp/pre-start %files netconfig %defattr(-,root,root) @@ -127,6 +140,11 @@ /sbin/netconfig /usr/share/man/man8/netconfig.8.gz %doc /usr/share/doc/packages/sysconfig/netconfig.png +%_sysconfdir/ppp/netconfig +%_sysconfdir/ppp/ip-up.d/10-netconfig +%_sysconfdir/ppp/ip-down.d/90-netconfig +%_sysconfdir/ppp/pre-start.d/10-netconfig +%_sysconfdir/ppp/post-stop.d/90-netconfig %pre # package update ? diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/sysconfig-0.83.8/sysconfig.spec.in new/sysconfig-0.83.9/sysconfig.spec.in --- old/sysconfig-0.83.8/sysconfig.spec.in 2014-10-28 15:26:30.000000000 +0100 +++ new/sysconfig-0.83.9/sysconfig.spec.in 2016-05-20 16:51:43.000000000 +0200 @@ -1,7 +1,7 @@ # # spec file for package sysconfig # -# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2016 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 @@ -16,7 +16,6 @@ # - Name: sysconfig Version: @VERSION@ Release: 0 @@ -61,6 +60,7 @@ Group: System/Base Requires(pre): sysconfig = %{version} Provides: /sbin/netconfig +Requires: /bin/logger %description netconfig This package provides the netconfig scripts to apply network @@ -118,6 +118,19 @@ /usr/share/omc/svcinfo.d/network.xml /sbin/rcnetwork /sbin/ifuser +%dir %attr(0750,root,dialout) %_sysconfdir/ppp +%dir %_sysconfdir/ppp/ip-up.d +%dir %_sysconfdir/ppp/ip-down.d +%dir %_sysconfdir/ppp/ipv6-up.d +%dir %_sysconfdir/ppp/ipv6-down.d +%dir %_sysconfdir/ppp/pre-start.d +%dir %_sysconfdir/ppp/post-stop.d +%_sysconfdir/ppp/ip-up +%_sysconfdir/ppp/ip-down +%_sysconfdir/ppp/ipv6-up +%_sysconfdir/ppp/ipv6-down +%_sysconfdir/ppp/post-stop +%_sysconfdir/ppp/pre-start %files netconfig %defattr(-,root,root) @@ -127,6 +140,11 @@ /sbin/netconfig /usr/share/man/man8/netconfig.8.gz %doc /usr/share/doc/packages/sysconfig/netconfig.png +%_sysconfdir/ppp/netconfig +%_sysconfdir/ppp/ip-up.d/10-netconfig +%_sysconfdir/ppp/ip-down.d/90-netconfig +%_sysconfdir/ppp/pre-start.d/10-netconfig +%_sysconfdir/ppp/post-stop.d/90-netconfig %pre # package update ?
