Hello community, here is the log from the commit of package sysconfig for openSUSE:Factory checked in at 2013-10-29 11:04:55 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 2013-10-18 19:25:55.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.sysconfig.new/sysconfig.changes 2013-10-29 11:04:57.000000000 +0100 @@ -1,0 +2,12 @@ +Tue Oct 29 07:24:52 UTC 2013 - [email protected] + +- version 0.81.6 +- Merged changes from $OBS/Base:System/sysconfig + +------------------------------------------------------------------- +Wed Oct 16 13:42:52 UTC 2013 - [email protected] + +- blacklist udlfb because only udl can be used with xrandr 1.4 + (bnc#846218) + +------------------------------------------------------------------- @@ -7,0 +20,23 @@ + +------------------------------------------------------------------- +Wed Oct 2 15:06:05 UTC 2013 - [email protected] + +- /etc/modprobe.d/50-blacklist.conf: cleaned up obsolete/dropped + kernel drivers (bnc#843141,bnc#843169). Thanks to Michal Marek! + sk98lin: dropped from the kernel in 2.6.26 + stradis: dropped in 2.6.38 (39c3d48) + eepro100: dropped in 2.6.29 (6b1abba) + slamr,slusb: no smartlink-softmodem-kmp since 10.3 + ich2rom: rplaced by ichxrom in 2.6.12 (304aa41) + eth1394: dropped in 2.6.37 (66fa12c) + uhci: dropped in 2.5.27 + tsdev: removed in 2.6.24 (7009317) + snd_bt87x: duplicate of snd-bt87x + clgenfb: replaced by cirrusfb in 2.5.67 + cyblafb: replaced by tridentfb in 2.6.30 + unikey: not in mainline history, 2.4? + encode-{big5,gb,gbk,jis,kscm}: not in mainline history, 2.4? + fbcon-{afb,ilbm,iplan2p2,iplan2p4,iplan2p8}: removed in 2.5.51 + fbcon-{cfb2,cfb4,hga,mfb,vga-planes},fbgen: removed in 2.5.51 + fbcon-{mac,vga}: removed in 2.5.28 + vmware: never upstream, no reference in 2.5+ Old: ---- 0001-bt878-card-causes-udevd-to-complain-bnc-800897.patch sysconfig-0.81.5-netconfig-use_systemctl.patch sysconfig-0.81.5-restore_selinux_context_on_RUN_FILES_BASE.patch sysconfig-0.81.5.tar.bz2 New: ---- sysconfig-0.81.6.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ sysconfig.spec ++++++ --- /var/tmp/diff_new_pack.s00aYr/_old 2013-10-29 11:04:59.000000000 +0100 +++ /var/tmp/diff_new_pack.s00aYr/_new 2013-10-29 11:04:59.000000000 +0100 @@ -17,7 +17,7 @@ Name: sysconfig -Version: 0.81.5 +Version: 0.81.6 Release: 0 Summary: The sysconfig scheme for traditional network scripts License: GPL-2.0+ @@ -38,9 +38,6 @@ Requires: udevmountd = %{version} Requires: sysvinit(network) Recommends: sysconfig-network = %{version} -Patch1: 0001-bt878-card-causes-udevd-to-complain-bnc-800897.patch -Patch2: sysconfig-0.81.5-netconfig-use_systemctl.patch -Patch3: sysconfig-0.81.5-restore_selinux_context_on_RUN_FILES_BASE.patch %description This package provides the SuSE system configuration scheme for the @@ -122,9 +119,6 @@ %prep %setup -n sysconfig-%{version} -%patch1 -p1 -%patch2 -p1 -%patch3 -p1 %build autoreconf --force --install ++++++ sysconfig-0.81.5.tar.bz2 -> sysconfig-0.81.6.tar.bz2 ++++++ ++++ 5070 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.81.5/ChangeLog new/sysconfig-0.81.6/ChangeLog --- old/sysconfig-0.81.5/ChangeLog 2013-09-27 17:07:57.000000000 +0200 +++ new/sysconfig-0.81.6/ChangeLog 2013-10-29 08:27:15.000000000 +0100 @@ -1,4 +1,155 @@ -commit 2c186e52f27a19406b9ef967520892d45fe5beeb (HEAD, origin/master, master) +commit 32895959980dd820c198d29e6e37524d930bcf01 (HEAD, master) +Author: Marius Tomaschewski <[email protected]> +Date: Tue Oct 29 08:26:38 2013 +0100 + + version 0.81.6, updated changes + +commit 98a8824657636848edf1d5932a17641092c4ad76 (origin/master) +Author: Marius Tomaschewski <[email protected]> +Date: Wed Oct 16 13:42:52 2013 +0000 + + Updated changes for patches from Base:System/sysconfig + +commit 70ddbf101a2e74d101e667c604e95871ba91483c +Author: Oliver Neukum <[email protected]> +Date: Wed Oct 16 13:42:52 2013 +0000 + + blacklist udlfb because only udl can be used with xrandr 1.4 (bnc#846218) + +commit 6d758aed2c480638d3833f344e3b15382dc8e335 +Author: Marius Tomaschewski <[email protected]> +Date: Mon Oct 14 13:07:27 2013 +0000 + + Updated changes from Base:System/sysconfig + +commit 5dcede6fb9dfb8753db2c5d5588d245402c523c0 +Author: Vitezslav Cizek <[email protected]> +Date: Mon Oct 14 13:07:27 2013 +0000 + + set SELinux label for /dev/.sysconfig after creation (bnc#845792) + +commit 5416aeb2e95cf296dc4ffcd83a6f725a9316b171 +Author: Vitezslav Cizek <[email protected]> +Date: Mon Oct 14 13:07:27 2013 +0000 + + use systemctl when possible instead of calling init scripts directly + +commit 3c18855e431c8f05faea3075c00c044a914043d6 +Author: Marius Tomaschewski <[email protected]> +Date: Wed Oct 2 17:12:06 2013 +0200 + + updated changes + +commit 312c427ae58ce78297384d1599ac32cce7f29e50 (master-blacklist1) +Author: Marius Tomaschewski <[email protected]> +Date: Wed Oct 2 16:21:30 2013 +0200 + + bt878 card causes udevd to complain (bnc#800897) + + Fixed to use 'echo' shell builtin instead /bin/echo + +commit 2a765ddbf5be1b637fdef0e50fefdd285c0edb12 +Author: Marius Tomaschewski <[email protected]> +Date: Wed Oct 2 16:18:21 2013 +0200 + + /etc/modprobe.d/50-blacklist.conf: cleanup + + bnc#843169#c7: + vmware: never upstream, no reference in 2.5+ + +commit cea201e54b93abbe5e82cc572d3bfb0b1fa7cde7 +Author: Marius Tomaschewski <[email protected]> +Date: Wed Oct 2 16:17:09 2013 +0200 + + /etc/modprobe.d/50-blacklist.conf: cleanup + + bnc#843169#c6: + unikey: not in mainline history, 2.4? + +commit 3a9c0fb934c27913d56ae7a53a8151cab05f8193 +Author: Marius Tomaschewski <[email protected]> +Date: Wed Oct 2 16:13:59 2013 +0200 + + /etc/modprobe.d/50-blacklist.conf: cleanup + + bnc#843169#c5: + fbcon-{cfb2,cfb4,hga,mfb,vga-planes},fbgen: removed in 2.5.51 + fbcon-{mac,vga}: removed in 2.5.28 + +commit 846801900f1e7f2327ae6f3f5a331c5139d15f43 +Author: Marius Tomaschewski <[email protected]> +Date: Wed Oct 2 16:12:10 2013 +0200 + + /etc/modprobe.d/50-blacklist.conf: cleanup + + bnc#843169#c4: + fbcon-{afb,ilbm,iplan2p2,iplan2p4,iplan2p8}: removed in 2.5.51 + +commit 8981dbaff5e751ce5c37cb671772092d6fcff935 +Author: Marius Tomaschewski <[email protected]> +Date: Wed Oct 2 16:10:27 2013 +0200 + + /etc/modprobe.d/50-blacklist.conf: cleanup + + bnc#843169#c3: + encode-{big5,gb,gbk,jis,kscm}: not in mainline history, 2.4? + +commit 9e3ddfdccae11a3ed840dce6c92c4ffe9086c585 +Author: Marius Tomaschewski <[email protected]> +Date: Wed Oct 2 16:06:53 2013 +0200 + + /etc/modprobe.d/50-blacklist.conf: cleanup + + bnc#843169#c2: + clgenfb: replaced by cirrusfb in 2.5.67 + cyblafb: replaced by tridentfb in 2.6.30 + +commit bd787c39fa5edc318c2d30ae361aa9daf5e69251 +Author: Marius Tomaschewski <[email protected]> +Date: Wed Oct 2 16:05:23 2013 +0200 + + /etc/modprobe.d/50-blacklist.conf: cleanup + + bnc#843169#c1: + tsdev: removed in 2.6.24 (7009317) + snd_bt87x: duplicate of snd-bt87x + +commit 8f793928c5c90951383481fac563b78ee2dbd541 +Author: Marius Tomaschewski <[email protected]> +Date: Wed Oct 2 16:03:05 2013 +0200 + + /etc/modprobe.d/50-blacklist.conf: cleanup + + bnc#843169#c0: + stradis: dropped in 2.6.38 (39c3d48) + eepro100: dropped in 2.6.29 (6b1abba) + slamr,slusb: no smartlink-softmodem-kmp since 10.3 + ich2rom: rplaced by ichxrom in 2.6.12 (304aa41) + eth1394: dropped in 2.6.37 (66fa12c) + uhci: dropped in 2.5.27 + tsdev: removed in 2.6.24 (7009317) + +commit b9a8a25ce6710dc489563a0cbc61c7f7d111255a +Author: Marius Tomaschewski <[email protected]> +Date: Mon Sep 30 13:20:37 2013 +0200 + + Fixed bugzilla reference in changes file + +commit d27e801151c39bedd55b3e52f179df72268de6ed +Author: Marius Tomaschewski <[email protected]> +Date: Mon Sep 30 11:52:42 2013 +0200 + + updated changes file + +commit 056d5fd788be2e41136dd07c7b8ecb4357462562 +Author: Marius Tomaschewski <[email protected]> +Date: Mon Sep 30 11:48:16 2013 +0200 + + /etc/modprobe.d/50-blacklist.conf: removed sk98lin + + the sk98lin driver has been dropped from the kernel in 2.6.26 + +commit 2c186e52f27a19406b9ef967520892d45fe5beeb (origin/opensuse-13.1, opensuse-13.1) Author: Marius Tomaschewski <[email protected]> Date: Fri Sep 27 17:05:40 2013 +0200 @@ -168,7 +319,7 @@ Started new 0.81 series in master branch -commit b43e43c2d65593b71cb0321420b628ed52731940 (tag: version-0.80.7, origin/opensuse-13.1, gitorious/opensuse-13.1, opensuse-13.1) +commit b43e43c2d65593b71cb0321420b628ed52731940 (tag: version-0.80.7, gitorious/opensuse-13.1) Author: Marius Tomaschewski <[email protected]> Date: Wed Aug 14 11:21:06 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.81.5/VERSION new/sysconfig-0.81.6/VERSION --- old/sysconfig-0.81.5/VERSION 2013-09-27 17:04:38.000000000 +0200 +++ new/sysconfig-0.81.6/VERSION 2013-10-29 08:25:09.000000000 +0100 @@ -1 +1 @@ -0.81.5 +0.81.6 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.81.5/config/hardware/50-blacklist.conf new/sysconfig-0.81.6/config/hardware/50-blacklist.conf --- old/sysconfig-0.81.5/config/hardware/50-blacklist.conf 2013-08-26 14:07:16.000000000 +0200 +++ new/sysconfig-0.81.6/config/hardware/50-blacklist.conf 2013-10-29 08:20:42.000000000 +0100 @@ -10,8 +10,6 @@ # See 'man modprobe'. # -# uhci ... usb-uhci handles the same pci class -blacklist uhci # usbcore ... module is loaded implicitly, ignore it otherwise blacklist usbcore @@ -27,28 +25,7 @@ # sed -e '/\/drivers\/video\/.*\.\(o\|ko\)$/{s@^.*/@@;s@\..*$@@;p};d' blacklist aty128fb blacklist atyfb -blacklist clgenfb blacklist cyber2000fb -# cyblafb, bug 466280 -blacklist cyblafb -blacklist encode-big5 -blacklist encode-gb -blacklist encode-gbk -blacklist encode-jis -blacklist encode-kscm -blacklist fbcon-afb -blacklist fbcon-cfb2 -blacklist fbcon-cfb4 -blacklist fbcon-hga -blacklist fbcon-ilbm -blacklist fbcon-iplan2p2 -blacklist fbcon-iplan2p4 -blacklist fbcon-iplan2p8 -blacklist fbcon-mac -blacklist fbcon-mfb -blacklist fbcon-vga -blacklist fbcon-vga-planes -blacklist fbgen blacklist g450_pll blacklist hgafb blacklist i2c-matroxfb @@ -74,10 +51,8 @@ blacklist sstfb blacklist tdfxfb blacklist tridentfb -blacklist unikey blacklist vga16fb blacklist vgastate -blacklist vmware # for kyrofb see Bug 35810 blacklist kyrofb # list was not complete (bug 106715) @@ -102,7 +77,8 @@ blacklist viafb blacklist vmlfb blacklist vt8623fb - +#bug 846218 +blacklist udlfb # ISDN modules are load from /lib/udev/isdn.sh blacklist fcusb @@ -168,45 +144,21 @@ blacklist via82cxxx_audio blacklist ymfpci -# If you really need firewire direct networking, then remove this entry -blacklist eth1394 - # this is a debugging module which should only be loaded manually blacklist evbug # These mtd drivers should be loaded manually. blacklist scb2_flash -blacklist ich2rom blacklist pci blacklist l440gx blacklist amd76xrom # job of rcdvb -blacklist snd_bt87x blacklist snd-bt87x -# HP Touch Screen usb input driver. breaks all other mouse input devices -blacklist tsdev - -# https://bugzilla.novell.com/show_bug.cgi?id=115132 -blacklist slamr -blacklist slusb - # This module seems to be good for nothing. See bug 129301. blacklist dpt_i2o -# This driver is obsolete and should never be loaded as default. -# See https://bugzilla.novell.com/show_bug.cgi?id=146728 -blacklist eepro100 - -# This driver is obsolete and should never be loaded as default. -# See https://bugzilla.novell.com/show_bug.cgi?id=146930 -blacklist sk98lin - -# This driver is rarely needed and causes trouble when scanning devices. -# See: https://bugzilla.novell.com/show_bug.cgi?id=144623 -blacklist stradis - # These devices have bt878 chip without PCI Subsystem ID. Without that info bttv # does not know how to treat them properly. Therefore we disable autoloading of # modules for these devices. @@ -217,7 +169,7 @@ # look in /usr/src/linux/Documentation/video4linux/CARDLIST.bttv. alias pci:v0000109Ed0000036Esv00000000sd00000000bc04sc00i00 bttv_skip_it alias pci:v0000109Ed00000878sv00000000sd00000000bc04sc80i00 bttv_skip_it -install bttv_skip_it /bin/echo "module alias skipped (bt878 chip without PCI Subsystem ID)" +install bttv_skip_it echo "module alias skipped (bt878 chip without PCI Subsystem ID)" # For some bridges both intel-agp and i82875p_edac are loaded. If i82875p_edac # is loaded first it will grab the device. Then intel-agp doesn't work. 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.81.5/missing new/sysconfig-0.81.6/missing --- old/sysconfig-0.81.5/missing 2013-09-27 17:07:51.000000000 +0200 +++ new/sysconfig-0.81.6/missing 2013-10-29 08:27:04.000000000 +0100 @@ -1,10 +1,10 @@ #! /bin/sh -# Common stub for a few missing GNU programs while installing. +# Common wrapper for a few potentially missing GNU programs. -scriptversion=2012-01-06.18; # UTC +scriptversion=2012-06-26.16; # UTC -# Copyright (C) 1996-2012 Free Software Foundation, Inc. -# Originally by Fran,cois Pinard <[email protected]>, 1996. +# Copyright (C) 1996-2013 Free Software Foundation, Inc. +# Originally written by Fran,cois Pinard <[email protected]>, 1996. # 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 @@ -29,61 +29,33 @@ exit 1 fi -run=: -sed_output='s/.* --output[ =]\([^ ]*\).*/\1/p' -sed_minuso='s/.* -o \([^ ]*\).*/\1/p' - -# In the cases where this matters, 'missing' is being run in the -# srcdir already. -if test -f configure.ac; then - configure_ac=configure.ac -else - configure_ac=configure.in -fi +case $1 in -msg="missing on your system" + --is-lightweight) + # Used by our autoconf macros to check whether the available missing + # script is modern enough. + exit 0 + ;; -case $1 in ---run) - # Try to run requested program, and just exit if it succeeds. - run= - shift - "$@" && exit 0 - # Exit code 63 means version mismatch. This often happens - # when the user try to use an ancient version of a tool on - # a file that requires a minimum version. In this case we - # we should proceed has if the program had been absent, or - # if --run hadn't been passed. - if test $? = 63; then - run=: - msg="probably too old" - fi - ;; + --run) + # Back-compat with the calling convention used by older automake. + shift + ;; -h|--h|--he|--hel|--help) echo "\ $0 [OPTION]... PROGRAM [ARGUMENT]... -Handle 'PROGRAM [ARGUMENT]...' for when PROGRAM is missing, or return an -error status if there is no known handling for PROGRAM. +Run 'PROGRAM [ARGUMENT]...', returning a proper advice when this fails due +to PROGRAM being missing or too old. Options: -h, --help display this help and exit -v, --version output version information and exit - --run try to run the given command, and emulate it if it fails Supported PROGRAM values: - aclocal touch file 'aclocal.m4' - autoconf touch file 'configure' - autoheader touch file 'config.h.in' - autom4te touch the output file, or create a stub one - automake touch all 'Makefile.in' files - bison create 'y.tab.[ch]', if possible, from existing .[ch] - flex create 'lex.yy.c', if possible, from existing .c - help2man touch the output file - lex create 'lex.yy.c', if possible, from existing .c - makeinfo touch the output file - yacc create 'y.tab.[ch]', if possible, from existing .[ch] + aclocal autoconf autoheader autom4te automake makeinfo + bison yacc flex lex help2man Version suffixes to PROGRAM as well as the prefixes 'gnu-', 'gnu', and 'g' are ignored when checking the name. @@ -98,228 +70,141 @@ ;; -*) - echo 1>&2 "$0: Unknown '$1' option" + echo 1>&2 "$0: unknown '$1' option" echo 1>&2 "Try '$0 --help' for more information" exit 1 ;; esac -# normalize program name to check for. -program=`echo "$1" | sed ' - s/^gnu-//; t - s/^gnu//; t - s/^g//; t'` - -# Now exit if we have it, but it failed. Also exit now if we -# don't have it and --version was passed (most likely to detect -# the program). This is about non-GNU programs, so use $1 not -# $program. -case $1 in - lex*|yacc*) - # Not GNU programs, they don't have --version. - ;; +# Run the given program, remember its exit status. +"$@"; st=$? - *) - if test -z "$run" && ($1 --version) > /dev/null 2>&1; then - # We have it, but it failed. - exit 1 - elif test "x$2" = "x--version" || test "x$2" = "x--help"; then - # Could not run --version or --help. This is probably someone - # running '$TOOL --version' or '$TOOL --help' to check whether - # $TOOL exists and not knowing $TOOL uses missing. - exit 1 - fi - ;; -esac - -# If it does not exist, or fails to run (possibly an outdated version), -# try to emulate it. -case $program in - aclocal*) - echo 1>&2 "\ -WARNING: '$1' is $msg. You should only need it if - you modified 'acinclude.m4' or '${configure_ac}'. You might want - to install the Automake and Perl packages. Grab them from - any GNU archive site." - touch aclocal.m4 - ;; - - autoconf*) - echo 1>&2 "\ -WARNING: '$1' is $msg. You should only need it if - you modified '${configure_ac}'. You might want to install the - Autoconf and GNU m4 packages. Grab them from any GNU - archive site." - touch configure - ;; - - autoheader*) - echo 1>&2 "\ -WARNING: '$1' is $msg. You should only need it if - you modified 'acconfig.h' or '${configure_ac}'. You might want - to install the Autoconf and GNU m4 packages. Grab them - from any GNU archive site." - files=`sed -n 's/^[ ]*A[CM]_CONFIG_HEADER(\([^)]*\)).*/\1/p' ${configure_ac}` - test -z "$files" && files="config.h" - touch_files= - for f in $files; do - case $f in - *:*) touch_files="$touch_files "`echo "$f" | - sed -e 's/^[^:]*://' -e 's/:.*//'`;; - *) touch_files="$touch_files $f.in";; - esac - done - touch $touch_files - ;; +# If it succeeded, we are done. +test $st -eq 0 && exit 0 - automake*) - echo 1>&2 "\ -WARNING: '$1' is $msg. You should only need it if - you modified 'Makefile.am', 'acinclude.m4' or '${configure_ac}'. - You might want to install the Automake and Perl packages. - Grab them from any GNU archive site." - find . -type f -name Makefile.am -print | - sed 's/\.am$/.in/' | - while read f; do touch "$f"; done - ;; - - autom4te*) - echo 1>&2 "\ -WARNING: '$1' is needed, but is $msg. - You might have modified some files without having the - proper tools for further handling them. - You can get '$1' as part of Autoconf from any GNU - archive site." - - file=`echo "$*" | sed -n "$sed_output"` - test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"` - if test -f "$file"; then - touch $file - else - test -z "$file" || exec >$file - echo "#! /bin/sh" - echo "# Created by GNU Automake missing as a replacement of" - echo "# $ $@" - echo "exit 0" - chmod +x $file - exit 1 - fi - ;; - - bison*|yacc*) - echo 1>&2 "\ -WARNING: '$1' $msg. You should only need it if - you modified a '.y' file. You may need the Bison package - in order for those modifications to take effect. You can get - Bison from any GNU archive site." - rm -f y.tab.c y.tab.h - if test $# -ne 1; then - eval LASTARG=\${$#} - case $LASTARG in - *.y) - SRCFILE=`echo "$LASTARG" | sed 's/y$/c/'` - if test -f "$SRCFILE"; then - cp "$SRCFILE" y.tab.c - fi - SRCFILE=`echo "$LASTARG" | sed 's/y$/h/'` - if test -f "$SRCFILE"; then - cp "$SRCFILE" y.tab.h - fi - ;; - esac - fi - if test ! -f y.tab.h; then - echo >y.tab.h - fi - if test ! -f y.tab.c; then - echo 'main() { return 0; }' >y.tab.c - fi - ;; - - lex*|flex*) - echo 1>&2 "\ -WARNING: '$1' is $msg. You should only need it if - you modified a '.l' file. You may need the Flex package - in order for those modifications to take effect. You can get - Flex from any GNU archive site." - rm -f lex.yy.c - if test $# -ne 1; then - eval LASTARG=\${$#} - case $LASTARG in - *.l) - SRCFILE=`echo "$LASTARG" | sed 's/l$/c/'` - if test -f "$SRCFILE"; then - cp "$SRCFILE" lex.yy.c - fi - ;; - esac - fi - if test ! -f lex.yy.c; then - echo 'main() { return 0; }' >lex.yy.c - fi - ;; - - help2man*) - echo 1>&2 "\ -WARNING: '$1' is $msg. You should only need it if - you modified a dependency of a manual page. You may need the - Help2man package in order for those modifications to take - effect. You can get Help2man from any GNU archive site." - - file=`echo "$*" | sed -n "$sed_output"` - test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"` - if test -f "$file"; then - touch $file - else - test -z "$file" || exec >$file - echo ".ab help2man is required to generate this page" - exit $? - fi - ;; - - makeinfo*) - echo 1>&2 "\ -WARNING: '$1' is $msg. You should only need it if - you modified a '.texi' or '.texinfo' file, or any other file - indirectly affecting the aspect of the manual. The spurious - call might also be the consequence of using a buggy 'make' (AIX, - DU, IRIX). You might want to install the Texinfo package or - the GNU make package. Grab either from any GNU archive site." - # The file to touch is that specified with -o ... - file=`echo "$*" | sed -n "$sed_output"` - test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"` - if test -z "$file"; then - # ... or it is the one specified with @setfilename ... - infile=`echo "$*" | sed 's/.* \([^ ]*\) *$/\1/'` - file=`sed -n ' - /^@setfilename/{ - s/.* \([^ ]*\) *$/\1/ - p - q - }' $infile` - # ... or it is derived from the source name (dir/f.texi becomes f.info) - test -z "$file" && file=`echo "$infile" | sed 's,.*/,,;s,.[^.]*$,,'`.info - fi - # If the file does not exist, the user really needs makeinfo; - # let's fail without touching anything. - test -f $file || exit 1 - touch $file - ;; - - *) - echo 1>&2 "\ -WARNING: '$1' is needed, and is $msg. - You might have modified some files without having the - proper tools for further handling them. Check the 'README' file, - it often tells you about the needed prerequisites for installing - this package. You may also peek at any GNU archive site, in case - some other package would contain this missing '$1' program." - exit 1 - ;; -esac +# Also exit now if we it failed (or wasn't found), and '--version' was +# passed; such an option is passed most likely to detect whether the +# program is present and works. +case $2 in --version|--help) exit $st;; esac + +# Exit code 63 means version mismatch. This often happens when the user +# tries to use an ancient version of a tool on a file that requires a +# minimum version. +if test $st -eq 63; then + msg="probably too old" +elif test $st -eq 127; then + # Program was missing. + msg="missing on your system" +else + # Program was found and executed, but failed. Give up. + exit $st +fi -exit 0 +perl_URL=http://www.perl.org/ +flex_URL=http://flex.sourceforge.net/ +gnu_software_URL=http://www.gnu.org/software + +program_details () +{ + case $1 in + aclocal|automake) + echo "The '$1' program is part of the GNU Automake package:" + echo "<$gnu_software_URL/automake>" + echo "It also requires GNU Autoconf, GNU m4 and Perl in order to run:" + echo "<$gnu_software_URL/autoconf>" + echo "<$gnu_software_URL/m4/>" + echo "<$perl_URL>" + ;; + autoconf|autom4te|autoheader) + echo "The '$1' program is part of the GNU Autoconf package:" + echo "<$gnu_software_URL/autoconf/>" + echo "It also requires GNU m4 and Perl in order to run:" + echo "<$gnu_software_URL/m4/>" + echo "<$perl_URL>" + ;; + esac +} + +give_advice () +{ + # Normalize program name to check for. + normalized_program=`echo "$1" | sed ' + s/^gnu-//; t + s/^gnu//; t + s/^g//; t'` + + printf '%s\n' "'$1' is $msg." + + configure_deps="'configure.ac' or m4 files included by 'configure.ac'" + case $normalized_program in + autoconf*) + echo "You should only need it if you modified 'configure.ac'," + echo "or m4 files included by it." + program_details 'autoconf' + ;; + autoheader*) + echo "You should only need it if you modified 'acconfig.h' or" + echo "$configure_deps." + program_details 'autoheader' + ;; + automake*) + echo "You should only need it if you modified 'Makefile.am' or" + echo "$configure_deps." + program_details 'automake' + ;; + aclocal*) + echo "You should only need it if you modified 'acinclude.m4' or" + echo "$configure_deps." + program_details 'aclocal' + ;; + autom4te*) + echo "You might have modified some maintainer files that require" + echo "the 'automa4te' program to be rebuilt." + program_details 'autom4te' + ;; + bison*|yacc*) + echo "You should only need it if you modified a '.y' file." + echo "You may want to install the GNU Bison package:" + echo "<$gnu_software_URL/bison/>" + ;; + lex*|flex*) + echo "You should only need it if you modified a '.l' file." + echo "You may want to install the Fast Lexical Analyzer package:" + echo "<$flex_URL>" + ;; + help2man*) + echo "You should only need it if you modified a dependency" \ + "of a man page." + echo "You may want to install the GNU Help2man package:" + echo "<$gnu_software_URL/help2man/>" + ;; + makeinfo*) + echo "You should only need it if you modified a '.texi' file, or" + echo "any other file indirectly affecting the aspect of the manual." + echo "You might want to install the Texinfo package:" + echo "<$gnu_software_URL/texinfo/>" + echo "The spurious makeinfo call might also be the consequence of" + echo "using a buggy 'make' (AIX, DU, IRIX), in which case you might" + echo "want to install GNU make:" + echo "<$gnu_software_URL/make/>" + ;; + *) + echo "You might have modified some files without having the proper" + echo "tools for further handling them. Check the 'README' file, it" + echo "often tells you about the needed prerequisites for installing" + echo "this package. You may also peek at any GNU archive site, in" + echo "case some other package contains this missing '$1' program." + ;; + esac +} + +give_advice "$1" | sed -e '1s/^/WARNING: /' \ + -e '2,$s/^/ /' >&2 + +# Propagate the correct exit status (expected to be 127 for a program +# not found, 63 for a program that failed due to version mismatch). +exit $st # Local variables: # eval: (add-hook 'write-file-hooks 'time-stamp) 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.81.5/scripts/functions.common new/sysconfig-0.81.6/scripts/functions.common --- old/sysconfig-0.81.5/scripts/functions.common 2013-08-26 14:07:16.000000000 +0200 +++ new/sysconfig-0.81.6/scripts/functions.common 2013-10-29 08:17:39.000000000 +0100 @@ -28,6 +28,7 @@ # It __must__ __not__ contain a trailing slash. RUN_FILES_BASE=/dev/.sysconfig/network test -d $RUN_FILES_BASE || mkdir -p $RUN_FILES_BASE +restorecon -R /dev/.sysconfig 2>/dev/null || : ##################################################################### # Returnvalues 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.81.5/scripts/netconfig.d/nis new/sysconfig-0.81.6/scripts/netconfig.d/nis --- old/sysconfig-0.81.5/scripts/netconfig.d/nis 2013-08-26 14:07:16.000000000 +0200 +++ new/sysconfig-0.81.6/scripts/netconfig.d/nis 2013-10-29 08:17:32.000000000 +0100 @@ -444,7 +444,9 @@ # here we should restart services if needed # => reload ypbind -if [ -x $r/etc/init.d/ypbind ]; then +if [ "$(cat /proc/1/comm)" = "systemd" ]; then + systemctl reload ypbind >/dev/null 2>&1 +elif [ -x $r/etc/init.d/ypbind ]; then $r/etc/init.d/ypbind reload >/dev/null 2>&1 fi 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.81.5/scripts/netconfig.d/ntp-runtime new/sysconfig-0.81.6/scripts/netconfig.d/ntp-runtime --- old/sysconfig-0.81.5/scripts/netconfig.d/ntp-runtime 2013-08-26 14:07:16.000000000 +0200 +++ new/sysconfig-0.81.6/scripts/netconfig.d/ntp-runtime 2013-10-29 08:17:32.000000000 +0100 @@ -226,8 +226,16 @@ NTP_CONF="/etc/ntp.conf" NTPDC_BIN="/usr/sbin/ntpdc" + local status + if [ "$(cat /proc/1/comm)" = "systemd" ]; then + systemctl status ntp >/dev/null 2>&1 + elif [ -x $r/etc/init.d/ntp ]; then + $r/etc/init.d/ntp status >/dev/null 2>&1 + fi + status=$? + if [ -n "${NTP_SERVER_LIST[*]}" -a -f "${NTP_CONF}" ] && \ - /etc/init.d/ntp status >/dev/null 2>/dev/null ; then + [ $status -eq 0 ]; then NTP_KEYS=$(awk -- '/^keys/ { print $2 }' $NTP_CONF 2>/dev/null) NTP_KEYID=$(awk -- '/^requestkey[[:blank:]]/ { print $2 }' $NTP_CONF 2>/dev/null) NTP_PASSWD=$(test -n "$NTP_KEYS" -a -n "$NTP_KEYID" -a -r "$NTP_KEYS" && \ 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.81.5/sysconfig.spec new/sysconfig-0.81.6/sysconfig.spec --- old/sysconfig-0.81.5/sysconfig.spec 2013-09-27 17:07:53.000000000 +0200 +++ new/sysconfig-0.81.6/sysconfig.spec 2013-10-29 08:27:06.000000000 +0100 @@ -18,7 +18,7 @@ Name: sysconfig -Version: 0.81.5 +Version: 0.81.6 Release: 0 Summary: The sysconfig scheme for traditional network scripts License: GPL-2.0+ -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
