openSUSE Commits
Threads by month
- ----- 2025 -----
- January
- ----- 2024 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2023 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2022 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2021 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2020 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2019 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2018 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2017 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2016 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2015 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2014 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2013 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2012 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2011 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2010 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2009 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2008 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2007 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2006 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
September 2008
- 1 participants
- 1828 discussions
Hello community,
here is the log from the commit of package yast2-ntp-client
checked in at Mon Sep 29 18:28:30 CEST 2008.
--------
--- yast2-ntp-client/yast2-ntp-client.changes 2008-08-18 12:29:07.000000000 +0200
+++ /mounts/work_src_done/STABLE/yast2-ntp-client/yast2-ntp-client.changes 2008-09-29 16:10:26.118845000 +0200
@@ -1,0 +2,6 @@
+Mon Sep 29 15:13:54 CEST 2008 - visnov(a)suse.cz
+
+- avoid reading configuration during install (bnc #427712)
+- 2.17.2
+
+-------------------------------------------------------------------
Old:
----
yast2-ntp-client-2.17.1.tar.bz2
New:
----
yast2-ntp-client-2.17.2.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ yast2-ntp-client.spec ++++++
--- /var/tmp/diff_new_pack.v10154/_old 2008-09-29 18:28:21.000000000 +0200
+++ /var/tmp/diff_new_pack.v10154/_new 2008-09-29 18:28:21.000000000 +0200
@@ -1,5 +1,5 @@
#
-# spec file for package yast2-ntp-client (Version 2.17.1)
+# spec file for package yast2-ntp-client (Version 2.17.2)
#
# Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
@@ -19,12 +19,12 @@
Name: yast2-ntp-client
-Version: 2.17.1
+Version: 2.17.2
Release: 1
License: GPL v2 or later
Group: System/YaST
BuildRoot: %{_tmppath}/%{name}-%{version}-build
-Source0: yast2-ntp-client-2.17.1.tar.bz2
+Source0: yast2-ntp-client-2.17.2.tar.bz2
Prefix: /usr
BuildRequires: perl-XML-Writer update-desktop-files yast2 yast2-devtools yast2-testsuite
BuildRequires: yast2-country-data
@@ -46,7 +46,7 @@
Lukas Ocilka <locilka(a)suse.cz>
%prep
-%setup -n yast2-ntp-client-2.17.1
+%setup -n yast2-ntp-client-2.17.2
%build
%{prefix}/bin/y2tool y2autoconf
@@ -83,6 +83,9 @@
%doc %{prefix}/share/doc/packages/yast2-ntp-client
/usr/share/YaST2/schema/autoyast/rnc/ntpclient.rnc
%changelog
+* Mon Sep 29 2008 visnov(a)suse.cz
+- avoid reading configuration during install (bnc #427712)
+- 2.17.2
* Mon Aug 18 2008 mvidner(a)suse.cz
- Applied Netconfig patch for fine-grained merging of static and
DHCP-supplied data (thanks to Michael Calmer)
++++++ yast2-ntp-client-2.17.1.tar.bz2 -> yast2-ntp-client-2.17.2.tar.bz2 ++++++
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-ntp-client-2.17.1/config.guess new/yast2-ntp-client-2.17.2/config.guess
--- old/yast2-ntp-client-2.17.1/config.guess 2008-08-18 12:29:26.000000000 +0200
+++ new/yast2-ntp-client-2.17.2/config.guess 2008-09-04 14:57:50.000000000 +0200
@@ -1,10 +1,10 @@
#! /bin/sh
# Attempt to guess a canonical system name.
# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
-# 2000, 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation,
-# Inc.
+# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008
+# Free Software Foundation, Inc.
-timestamp='2007-07-22'
+timestamp='2008-01-08'
# This file is free software; you can redistribute it and/or modify it
# under the terms of the GNU General Public License as published by
@@ -56,8 +56,8 @@
GNU config.guess ($timestamp)
Originally written by Per Bothner.
-Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005
-Free Software Foundation, Inc.
+Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001,
+2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
This is free software; see the source for copying conditions. There is NO
warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
@@ -139,6 +139,16 @@
UNAME_SYSTEM=`(uname -s) 2>/dev/null` || UNAME_SYSTEM=unknown
UNAME_VERSION=`(uname -v) 2>/dev/null` || UNAME_VERSION=unknown
+case "${UNAME_MACHINE}" in
+ i?86)
+ test -z "$VENDOR" && VENDOR=pc
+ ;;
+ *)
+ test -z "$VENDOR" && VENDOR=unknown
+ ;;
+esac
+test -f /etc/SuSE-release -o -f /.buildenv && VENDOR=suse
+
# Note: order is significant - the case branches are not exclusive.
case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
@@ -532,7 +542,7 @@
echo rs6000-ibm-aix3.2
fi
exit ;;
- *:AIX:*:[45])
+ *:AIX:*:[456])
IBM_CPU_ID=`/usr/sbin/lsdev -C -c processor -S available | sed 1q | awk '{ print $1 }'`
if /usr/sbin/lsattr -El ${IBM_CPU_ID} | grep ' POWER' >/dev/null 2>&1; then
IBM_ARCH=rs6000
@@ -799,6 +809,9 @@
EM64T | authenticamd)
echo x86_64-unknown-interix${UNAME_RELEASE}
exit ;;
+ IA64)
+ echo ia64-unknown-interix${UNAME_RELEASE}
+ exit ;;
esac ;;
[345]86:Windows_95:* | [345]86:Windows_98:* | [345]86:Windows_NT:*)
echo i${UNAME_MACHINE}-pc-mks
@@ -833,10 +846,17 @@
echo ${UNAME_MACHINE}-pc-minix
exit ;;
arm*:Linux:*:*)
- echo ${UNAME_MACHINE}-unknown-linux-gnu
+ eval $set_cc_for_build
+ if echo __ARM_EABI__ | $CC_FOR_BUILD -E - 2>/dev/null \
+ | grep -q __ARM_EABI__
+ then
+ echo ${UNAME_MACHINE}-${VENDOR}-linux-gnu
+ else
+ echo ${UNAME_MACHINE}-${VENDOR}-linux-gnueabi
+ fi
exit ;;
avr32*:Linux:*:*)
- echo ${UNAME_MACHINE}-unknown-linux-gnu
+ echo ${UNAME_MACHINE}-${VENDOR}-linux-gnu
exit ;;
cris:Linux:*:*)
echo cris-axis-linux-gnu
@@ -845,16 +865,16 @@
echo crisv32-axis-linux-gnu
exit ;;
frv:Linux:*:*)
- echo frv-unknown-linux-gnu
+ echo frv-${VENDOR}-linux-gnu
exit ;;
ia64:Linux:*:*)
- echo ${UNAME_MACHINE}-unknown-linux-gnu
+ echo ${UNAME_MACHINE}-${VENDOR}-linux-gnu
exit ;;
m32r*:Linux:*:*)
- echo ${UNAME_MACHINE}-unknown-linux-gnu
+ echo ${UNAME_MACHINE}-${VENDOR}-linux-gnu
exit ;;
m68*:Linux:*:*)
- echo ${UNAME_MACHINE}-unknown-linux-gnu
+ echo ${UNAME_MACHINE}-${VENDOR}-linux-gnu
exit ;;
mips:Linux:*:*)
eval $set_cc_for_build
@@ -877,7 +897,7 @@
s: ::g
p
}'`"
- test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; }
+ test x"${CPU}" != x && { echo "${CPU}-${VENDOR}-linux-gnu"; exit; }
;;
mips64:Linux:*:*)
eval $set_cc_for_build
@@ -900,16 +920,16 @@
s: ::g
p
}'`"
- test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; }
+ test x"${CPU}" != x && { echo "${CPU}-${VENDOR}-linux-gnu"; exit; }
;;
or32:Linux:*:*)
- echo or32-unknown-linux-gnu
+ echo or32-${VENDOR}-linux-gnu
exit ;;
ppc:Linux:*:*)
- echo powerpc-unknown-linux-gnu
+ echo powerpc-${VENDOR}-linux-gnu
exit ;;
ppc64:Linux:*:*)
- echo powerpc64-unknown-linux-gnu
+ echo powerpc64-${VENDOR}-linux-gnu
exit ;;
alpha:Linux:*:*)
case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in
@@ -923,39 +943,39 @@
esac
objdump --private-headers /bin/sh | grep ld.so.1 >/dev/null
if test "$?" = 0 ; then LIBC="libc1" ; else LIBC="" ; fi
- echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC}
+ echo ${UNAME_MACHINE}-${VENDOR}-linux-gnu${LIBC}
exit ;;
parisc:Linux:*:* | hppa:Linux:*:*)
# Look for CPU level
case `grep '^cpu[^a-z]*:' /proc/cpuinfo 2>/dev/null | cut -d' ' -f2` in
- PA7*) echo hppa1.1-unknown-linux-gnu ;;
- PA8*) echo hppa2.0-unknown-linux-gnu ;;
- *) echo hppa-unknown-linux-gnu ;;
+ PA7*) echo hppa1.1-${VENDOR}-linux-gnu ;;
+ PA8*) echo hppa2.0-${VENDOR}-linux-gnu ;;
+ *) echo hppa-${VENDOR}-linux-gnu ;;
esac
exit ;;
parisc64:Linux:*:* | hppa64:Linux:*:*)
- echo hppa64-unknown-linux-gnu
+ echo hppa64-${VENDOR}-linux-gnu
exit ;;
s390:Linux:*:* | s390x:Linux:*:*)
echo ${UNAME_MACHINE}-ibm-linux
exit ;;
sh64*:Linux:*:*)
- echo ${UNAME_MACHINE}-unknown-linux-gnu
+ echo ${UNAME_MACHINE}-${VENDOR}-linux-gnu
exit ;;
sh*:Linux:*:*)
- echo ${UNAME_MACHINE}-unknown-linux-gnu
+ echo ${UNAME_MACHINE}-${VENDOR}-linux-gnu
exit ;;
sparc:Linux:*:* | sparc64:Linux:*:*)
- echo ${UNAME_MACHINE}-unknown-linux-gnu
+ echo ${UNAME_MACHINE}-${VENDOR}-linux-gnu
exit ;;
vax:Linux:*:*)
echo ${UNAME_MACHINE}-dec-linux-gnu
exit ;;
x86_64:Linux:*:*)
- echo x86_64-unknown-linux-gnu
+ echo x86_64-${VENDOR}-linux-gnu
exit ;;
- xtensa:Linux:*:*)
- echo xtensa-unknown-linux-gnu
+ xtensa*:Linux:*:*)
+ echo ${UNAME_MACHINE}-${VENDOR}-linux-gnu
exit ;;
i*86:Linux:*:*)
# The BFD linker knows what the default object file format is, so
@@ -970,18 +990,18 @@
p'`
case "$ld_supported_targets" in
elf32-i386)
- TENTATIVE="${UNAME_MACHINE}-pc-linux-gnu"
+ TENTATIVE="${UNAME_MACHINE}-${VENDOR}-linux-gnu"
;;
a.out-i386-linux)
- echo "${UNAME_MACHINE}-pc-linux-gnuaout"
+ echo "${UNAME_MACHINE}-${VENDOR}-linux-gnuaout"
exit ;;
coff-i386)
- echo "${UNAME_MACHINE}-pc-linux-gnucoff"
+ echo "${UNAME_MACHINE}-${VENDOR}-linux-gnucoff"
exit ;;
"")
# Either a pre-BFD a.out linker (linux-gnuoldld) or
# one that does not give us useful --help.
- echo "${UNAME_MACHINE}-pc-linux-gnuoldld"
+ echo "${UNAME_MACHINE}-${VENDOR}-linux-gnuoldld"
exit ;;
esac
# Determine whether the default compiler is a.out or elf
@@ -1015,7 +1035,7 @@
p
}'`"
test x"${LIBC}" != x && {
- echo "${UNAME_MACHINE}-pc-linux-${LIBC}"
+ echo "${UNAME_MACHINE}-${VENDOR}-linux-${LIBC}"
exit
}
test x"${TENTATIVE}" != x && { echo "${TENTATIVE}"; exit; }
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-ntp-client-2.17.1/config.sub new/yast2-ntp-client-2.17.2/config.sub
--- old/yast2-ntp-client-2.17.1/config.sub 2008-08-18 12:29:26.000000000 +0200
+++ new/yast2-ntp-client-2.17.2/config.sub 2008-09-04 14:57:50.000000000 +0200
@@ -1,10 +1,10 @@
#! /bin/sh
# Configuration validation subroutine script.
# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
-# 2000, 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation,
-# Inc.
+# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008
+# Free Software Foundation, Inc.
-timestamp='2007-06-28'
+timestamp='2008-01-16'
# This file is (in principle) common to ALL GNU software.
# The presence of a machine in this file suggests that SOME GNU software
@@ -72,8 +72,8 @@
version="\
GNU config.sub ($timestamp)
-Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005
-Free Software Foundation, Inc.
+Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001,
+2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
This is free software; see the source for copying conditions. There is NO
warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
@@ -369,10 +369,14 @@
| v850-* | v850e-* | vax-* \
| we32k-* \
| x86-* | x86_64-* | xc16x-* | xps100-* | xscale-* | xscalee[bl]-* \
- | xstormy16-* | xtensa-* \
+ | xstormy16-* | xtensa*-* \
| ymp-* \
| z8k-*)
;;
+ # Recognize the basic CPU types without company name, with glob match.
+ xtensa*)
+ basic_machine=$basic_machine-unknown
+ ;;
# Recognize the various machine names and aliases which stand
# for a CPU type and a company and sometimes even an OS.
386bsd)
@@ -443,6 +447,14 @@
basic_machine=ns32k-sequent
os=-dynix
;;
+ blackfin)
+ basic_machine=bfin-unknown
+ os=-linux
+ ;;
+ blackfin-*)
+ basic_machine=bfin-`echo $basic_machine | sed 's/^[^-]*-//'`
+ os=-linux
+ ;;
c90)
basic_machine=c90-cray
os=-unicos
@@ -668,6 +680,14 @@
basic_machine=m68k-isi
os=-sysv
;;
+ m68knommu)
+ basic_machine=m68k-unknown
+ os=-linux
+ ;;
+ m68knommu-*)
+ basic_machine=m68k-`echo $basic_machine | sed 's/^[^-]*-//'`
+ os=-linux
+ ;;
m88k-omron*)
basic_machine=m88k-omron
;;
@@ -813,6 +833,14 @@
basic_machine=i860-intel
os=-osf
;;
+ parisc)
+ basic_machine=hppa-unknown
+ os=-linux
+ ;;
+ parisc-*)
+ basic_machine=hppa-`echo $basic_machine | sed 's/^[^-]*-//'`
+ os=-linux
+ ;;
pbd)
basic_machine=sparc-tti
;;
@@ -1021,6 +1049,10 @@
basic_machine=tic6x-unknown
os=-coff
;;
+ tile*)
+ basic_machine=tile-unknown
+ os=-linux-gnu
+ ;;
tx39)
basic_machine=mipstx39-unknown
;;
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-ntp-client-2.17.1/src/ntp-client_proposal.ycp new/yast2-ntp-client-2.17.2/src/ntp-client_proposal.ycp
--- old/yast2-ntp-client-2.17.1/src/ntp-client_proposal.ycp 2008-08-18 11:00:38.000000000 +0200
+++ new/yast2-ntp-client-2.17.2/src/ntp-client_proposal.ycp 2008-09-29 14:51:44.000000000 +0200
@@ -56,6 +56,8 @@
ntp_items = maplist(string server, NtpClient::GetUsedNtpServers(),{
return `item(`id(server), server);
});
+ // avoid calling Read again (bnc #427712)
+ NtpClient::config_has_been_read = true;
}
if( ntp_items == [])
{
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-ntp-client-2.17.1/VERSION new/yast2-ntp-client-2.17.2/VERSION
--- old/yast2-ntp-client-2.17.1/VERSION 2008-08-18 12:25:40.000000000 +0200
+++ new/yast2-ntp-client-2.17.2/VERSION 2008-09-29 15:54:03.000000000 +0200
@@ -1 +1 @@
-2.17.1
+2.17.2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org
For additional commands, e-mail: opensuse-commit+help(a)opensuse.org
1
0
Hello community,
here is the log from the commit of package yast2-nis-client
checked in at Mon Sep 29 18:28:21 CEST 2008.
--------
--- yast2-nis-client/yast2-nis-client.changes 2008-09-25 10:32:48.000000000 +0200
+++ /mounts/work_src_done/STABLE/yast2-nis-client/yast2-nis-client.changes 2008-09-29 09:59:13.538052000 +0200
@@ -1,0 +2,11 @@
+Mon Sep 29 09:31:32 CEST 2008 - jsuchome(a)suse.cz
+
+- autoyast API updated for network policy (bnc#429162)
+- 2.17.5
+
+-------------------------------------------------------------------
+Fri Sep 26 11:01:04 CEST 2008 - ug(a)suse.de
+
+- rnc file fixed
+
+-------------------------------------------------------------------
Old:
----
yast2-nis-client-2.17.4.tar.bz2
New:
----
yast2-nis-client-2.17.5.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ yast2-nis-client.spec ++++++
--- /var/tmp/diff_new_pack.Mu9535/_old 2008-09-29 18:28:13.000000000 +0200
+++ /var/tmp/diff_new_pack.Mu9535/_new 2008-09-29 18:28:13.000000000 +0200
@@ -1,5 +1,5 @@
#
-# spec file for package yast2-nis-client (Version 2.17.4)
+# spec file for package yast2-nis-client (Version 2.17.5)
#
# Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
@@ -19,12 +19,12 @@
Name: yast2-nis-client
-Version: 2.17.4
+Version: 2.17.5
Release: 1
License: GPL v2 or later
Group: System/YaST
BuildRoot: %{_tmppath}/%{name}-%{version}-build
-Source0: yast2-nis-client-2.17.4.tar.bz2
+Source0: yast2-nis-client-2.17.5.tar.bz2
Prefix: /usr
BuildRequires: doxygen gcc-c++ perl-XML-Writer update-desktop-files yast2 yast2-core-devel yast2-devtools yast2-pam yast2-testsuite
Requires: yast2 yast2-pam
@@ -50,7 +50,7 @@
Jiri Suchomel <jsuchome(a)suse.cz>
%prep
-%setup -n yast2-nis-client-2.17.4
+%setup -n yast2-nis-client-2.17.5
%build
%{prefix}/bin/y2tool y2autoconf
@@ -92,6 +92,11 @@
/usr/share/YaST2/schema/autoyast/rnc/nis.rnc
%doc %{prefix}/share/doc/packages/yast2-nis-client
%changelog
+* Mon Sep 29 2008 jsuchome(a)suse.cz
+- autoyast API updated for network policy (bnc#429162)
+- 2.17.5
+* Fri Sep 26 2008 ug(a)suse.de
+- rnc file fixed
* Thu Sep 25 2008 jsuchome(a)suse.cz
- reset netconfig settings before reading (bnc#427630)
- 2.17.4
++++++ yast2-nis-client-2.17.4.tar.bz2 -> yast2-nis-client-2.17.5.tar.bz2 ++++++
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-nis-client-2.17.4/src/nis.rnc new/yast2-nis-client-2.17.5/src/nis.rnc
--- old/yast2-nis-client-2.17.4/src/nis.rnc 2006-10-26 15:25:47.000000000 +0200
+++ new/yast2-nis-client-2.17.5/src/nis.rnc 2008-09-29 09:30:50.000000000 +0200
@@ -1,7 +1,7 @@
nis =
element nis {
element start_nis { BOOLEAN }? &
- element nis_by_dhcp {BOOLEAN }? &
+ element netconfig_policy {BOOLEAN }? &
nis_domain? & # may be set by dhcp
nis_servers? &
nis_broadcast? &
@@ -17,7 +17,10 @@
element nis_local_only { BOOLEAN }? &
element nis_options { text }? &
- element start_autofs { BOOLEAN }?
+ element start_autofs { BOOLEAN }? &
+ element slp_domain {
+ Anything?
+ }?
}
nis_domain =
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-nis-client-2.17.4/src/Nis.ycp new/yast2-nis-client-2.17.5/src/Nis.ycp
--- old/yast2-nis-client-2.17.4/src/Nis.ycp 2008-09-25 10:19:11.000000000 +0200
+++ new/yast2-nis-client-2.17.5/src/Nis.ycp 2008-09-25 14:58:34.000000000 +0200
@@ -13,7 +13,7 @@
* Dan Vesely <dan(a)suse.cz>
* Martin Vidner <mvidner(a)suse.cz>
*
- * $Id: Nis.ycp 51260 2008-09-18 08:45:59Z jsuchome $
+ * $Id: Nis.ycp 51503 2008-09-25 11:11:16Z jsuchome $
*
*/
@@ -111,8 +111,6 @@
global map slp_domain = $[];
- global boolean manual = false;
-
// netconfig policy
global string policy = "auto";
@@ -628,6 +626,9 @@
required_packages = (list <string>)
union (required_packages, ["autofs", "nfs-client"]);
+ policy = settings["netconfig_policy"]:policy;
+ slp_domain = settings["slp_domain"]:slp_domain;
+
touched = true;
}
@@ -703,13 +704,14 @@
"nis_other_domains": other_domains,
- //"nis_by_dhcp": dhcp_wanted,
-
"nis_local_only": local_only,
"nis_broken_server": broken_server,
"nis_options": options,
"start_autofs": _start_autofs,
+
+ "slp_domain" : slp_domain,
+ "netconfig_policy" : policy,
];
}
@@ -818,8 +820,6 @@
global define string ShortSummary() ``{
string summary = "";
- // summary value, used in "Servers: by DHCP" or "Domain: by DHCP"
- string dhcp = _("by DHCP");
string nc = Summary::NotConfigured ();
summary =
// summary item
@@ -1108,7 +1108,7 @@
}
SCR::Write (.sysconfig.network.config.NETCONFIG_NIS_SETDOMAINNAME,
- manual? "no" : "yes");
+ policy == "" ? "no" : "yes");
if (! SCR::Write (.sysconfig.network.dhcp, nil))
{
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-nis-client-2.17.4/src/ui.ycp new/yast2-nis-client-2.17.5/src/ui.ycp
--- old/yast2-nis-client-2.17.4/src/ui.ycp 2008-09-16 16:14:21.000000000 +0200
+++ new/yast2-nis-client-2.17.5/src/ui.ycp 2008-09-25 13:10:33.000000000 +0200
@@ -11,7 +11,7 @@
* Authors:
* Martin Vidner <mvidner(a)suse.cz>
*
- * $Id: ui.ycp 51185 2008-09-16 14:14:30Z jsuchome $
+ * $Id: ui.ycp 51503 2008-09-25 11:11:16Z jsuchome $
*
* All user interface functions.
*
@@ -384,13 +384,13 @@
//UI::ChangeWidget (`id (`custompolicy), `Enabled, yp_client);
UI::ChangeWidget (`id (`autofs), `Enabled, yp_client);
- Nis::manual = ((symbol) UI::QueryWidget (`id (`policy), `Value) == `nomodify);
- UI::ChangeWidget (`id (`domain), `Enabled, !Nis::manual && yp_client);
- UI::ChangeWidget (`id (`servers), `Enabled, !Nis::manual && yp_client);
- UI::ChangeWidget (`id (`broadcast), `Enabled, !Nis::manual && yp_client);
- UI::ChangeWidget (`id (`find), `Enabled, !Nis::manual && yp_client);
- UI::ChangeWidget (`id (`edit), `Enabled, !Nis::manual && yp_client);
- UI::ChangeWidget (`id (`adddomains), `Enabled, !Nis::manual && yp_client);
+ boolean manual = (UI::QueryWidget(`id(`policy),`Value)== `nomodify);
+ UI::ChangeWidget (`id (`domain), `Enabled, !manual && yp_client);
+ UI::ChangeWidget (`id (`servers), `Enabled, !manual && yp_client);
+ UI::ChangeWidget (`id (`broadcast), `Enabled, !manual && yp_client);
+ UI::ChangeWidget (`id (`find), `Enabled, !manual && yp_client);
+ UI::ChangeWidget (`id (`edit), `Enabled, !manual && yp_client);
+ UI::ChangeWidget (`id (`adddomains), `Enabled,!manual && yp_client);
if (result == `policy)
{
@@ -472,7 +472,7 @@
servers = (string) UI::QueryWidget (`id (`servers), `Value);
default_broadcast = (boolean) UI::QueryWidget (`id (`broadcast), `Value);
- if (yp_client && !Nis::manual &&
+ if (yp_client && !manual &&
domain != "" &&
!Nis::check_nisdomainname (domain))
{
@@ -485,7 +485,7 @@
list<string> temp_ad = filter (
string a, splitstring (servers, " "), ``(a != ""));
- if (yp_client && !Nis::manual && !default_broadcast &&
+ if (yp_client && !manual && !default_broadcast &&
servers != "" &&
(size (temp_ad) == 0 || find (string a, temp_ad,
``(!Nis::check_address_nis (a))) != nil
@@ -1078,7 +1078,7 @@
* It is done only after read.
*/
define void FitIntoSingle () ``{
- if (!Nis::manual && Nis::dhcpcd_running)
+ if (Nis::policy != "" && Nis::dhcpcd_running)
{
string d = Nis::GetDomain ();
if (size (Nis::multidomain_servers) == 1)
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-nis-client-2.17.4/testsuite/tests/readwrite.out new/yast2-nis-client-2.17.5/testsuite/tests/readwrite.out
--- old/yast2-nis-client-2.17.4/testsuite/tests/readwrite.out 2008-09-18 10:39:05.000000000 +0200
+++ new/yast2-nis-client-2.17.5/testsuite/tests/readwrite.out 2008-09-29 09:38:20.000000000 +0200
@@ -1,8 +1,8 @@
-Dump DHCP off
+Dump no policy
Read .init.scripts.exists "ypbind" true
Read .init.scripts.runlevel "ypbind" $["autofs":$["start":["3", "5"], "stop":["3", "5"]], "rpcbind":$["start":["3", "5"], "stop":["3", "5"]], "ypbind":$["start":["3", "5"], "stop":["3", "5"]]]
-Read .sysconfig.network.config.NETCONFIG_NIS_POLICY nil
-Dir .sysconfig.network.config: []
+Read .sysconfig.network.config.NETCONFIG_NIS_POLICY ""
+Dir .sysconfig.network.config: ["NETCONFIG_NIS_POLICY"]
Execute .target.bash_output "/bin/ypdomainname" $["exit":0, "stderr":"", "stdout":"mydomain\n"]
Execute .target.bash "ls /var/run/dhcpcd-*.pid" 0
Read .sysconfig.ypbind.YPBIND_LOCAL_ONLY "no"
@@ -45,7 +45,7 @@
Write .sysconfig.ypbind.YPBIND_BROKEN_SERVER "no" true
Write .sysconfig.ypbind.YPBIND_OPTIONS "" true
Write .sysconfig.ypbind nil true
-Write .sysconfig.network.config.NETCONFIG_NIS_SETDOMAINNAME "yes" true
+Write .sysconfig.network.config.NETCONFIG_NIS_SETDOMAINNAME "no" true
Write .sysconfig.network.dhcp nil true
Read .etc.nsswitch_conf."passwd" "compat"
Write .etc.nsswitch_conf."passwd_compat" nil true
@@ -87,11 +87,11 @@
Read .init.scripts.exists "SuSEfirewall2_init" true
Execute .target.bash "/etc/init.d/SuSEfirewall2_init status" $["TERM":"raw"] 0
Return true
-Dump DHCP on
+Dump auto policy
Read .init.scripts.exists "ypbind" true
Read .init.scripts.runlevel "ypbind" $["autofs":$["start":["3", "5"], "stop":["3", "5"]], "rpcbind":$["start":["3", "5"], "stop":["3", "5"]], "ypbind":$["start":["3", "5"], "stop":["3", "5"]]]
-Read .sysconfig.network.config.NETCONFIG_NIS_POLICY nil
-Dir .sysconfig.network.config: []
+Read .sysconfig.network.config.NETCONFIG_NIS_POLICY "auto"
+Dir .sysconfig.network.config: ["NETCONFIG_NIS_POLICY"]
Execute .target.bash_output "/bin/ypdomainname" $["exit":0, "stderr":"", "stdout":"mydomain\n"]
Execute .target.bash "ls /var/run/dhcpcd-*.pid" 0
Read .sysconfig.ypbind.YPBIND_LOCAL_ONLY "no"
@@ -121,7 +121,7 @@
Read .init.scripts.comment "ypbind" $["autofs":$[], "rpcbind":$[], "ypbind":$[]]
Write .etc.defaultdomain "mydomain" true
Execute .target.remove "/etc/yp.conf.sv" true
-Write .sysconfig.network.config.NETCONFIG_NIS_POLICY "" true
+Write .sysconfig.network.config.NETCONFIG_NIS_POLICY "auto" true
Write .sysconfig.network.config.NETCONFIG_NIS_STATIC_DOMAIN "" true
Write .sysconfig.network.config.NETCONFIG_NIS_STATIC_SERVERS "" true
Write .sysconfig.network.config nil true
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-nis-client-2.17.4/testsuite/tests/readwrite.ycp new/yast2-nis-client-2.17.5/testsuite/tests/readwrite.ycp
--- old/yast2-nis-client-2.17.4/testsuite/tests/readwrite.ycp 2008-09-04 14:52:34.000000000 +0200
+++ new/yast2-nis-client-2.17.5/testsuite/tests/readwrite.ycp 2008-09-29 09:38:06.000000000 +0200
@@ -33,15 +33,6 @@
import "Nis";
- map dhcp_yes = $[
- "DHCLIENT_MODIFY_NIS_CONF": "yes",
- "DHCLIENT_SET_DOMAINNAME": "yes",
- ];
- map dhcp_no = $[
- "DHCLIENT_MODIFY_NIS_CONF": "no",
- "DHCLIENT_SET_DOMAINNAME": "no",
- ];
-
map READ = $[
// Runlevel:
"init": $[
@@ -101,8 +92,10 @@
"YPBIND_OPTIONS": "",
],
"network": $[
- "dhcp": dhcp_no,
+ "config": $[
+ "NETCONFIG_NIS_POLICY" : ""
],
+ ],
"displaymanager": $[
"DISPLAYMANAGER": "kdm",
"DISPLAYMANAGER_AUTOLOGIN": "no",
@@ -129,12 +122,12 @@
],
];
- DUMP ("DHCP off");
+ DUMP ("no policy");
TEST (``(Nis::Read ()), [READ, WRITE, EXECUTE], nil);
TEST (``(Nis::Write ()), [READ, WRITE, EXECUTE], nil);
- DUMP ("DHCP on");
- READ["sysconfig", "network", "dhcp"] = dhcp_yes;
+ DUMP ("auto policy");
+ READ["sysconfig", "network", "config", "NETCONFIG_NIS_POLICY"] = "auto";
TEST (``(Nis::Read ()), [READ, WRITE, EXECUTE], nil);
TEST (``(Nis::Touch (true)), [], nil);
TEST (``(Nis::Write ()), [READ, WRITE, EXECUTE], nil);
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-nis-client-2.17.4/VERSION new/yast2-nis-client-2.17.5/VERSION
--- old/yast2-nis-client-2.17.4/VERSION 2008-09-25 10:27:44.000000000 +0200
+++ new/yast2-nis-client-2.17.5/VERSION 2008-09-29 09:31:44.000000000 +0200
@@ -1 +1 @@
-2.17.4
+2.17.5
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org
For additional commands, e-mail: opensuse-commit+help(a)opensuse.org
1
0
Hello community,
here is the log from the commit of package yast2-libyui
checked in at Mon Sep 29 18:28:11 CEST 2008.
--------
--- yast2-libyui/yast2-libyui.changes 2008-09-24 18:33:32.000000000 +0200
+++ /mounts/work_src_done/STABLE/yast2-libyui/yast2-libyui.changes 2008-09-29 14:39:38.814650000 +0200
@@ -1,0 +2,6 @@
+Fri Sep 26 15:41:16 CEST 2008 - tgoettlicher(a)suse.de
+
+- Fixed bnc #418443: Yast modules windows have no title
+- V 2.17.12
+
+-------------------------------------------------------------------
Old:
----
yast2-libyui-2.17.11.tar.bz2
New:
----
yast2-libyui-2.17.12.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ yast2-libyui.spec ++++++
--- /var/tmp/diff_new_pack.De7271/_old 2008-09-29 18:27:44.000000000 +0200
+++ /var/tmp/diff_new_pack.De7271/_new 2008-09-29 18:27:44.000000000 +0200
@@ -1,5 +1,5 @@
#
-# spec file for package yast2-libyui (Version 2.17.11)
+# spec file for package yast2-libyui (Version 2.17.12)
#
# Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
@@ -19,12 +19,12 @@
Name: yast2-libyui
-Version: 2.17.11
+Version: 2.17.12
Release: 1
License: GPL v2 or later
Group: System/YaST
BuildRoot: %{_tmppath}/%{name}-%{version}-build
-Source0: yast2-libyui-2.17.11.tar.bz2
+Source0: yast2-libyui-2.17.12.tar.bz2
Prefix: /usr
Source1: yast2-libyui-rpmlintrc
BuildRequires: gcc-c++
@@ -77,7 +77,7 @@
Stefan Hundhammer <sh(a)suse.de>
%prep
-%setup -n yast2-libyui-2.17.11
+%setup -n yast2-libyui-2.17.12
%build
%{prefix}/bin/y2tool y2autoconf
@@ -123,6 +123,9 @@
%{_datadir}/cmake/Modules/*
%doc %{prefix}/share/doc/packages/yast2-libyui
%changelog
+* Fri Sep 26 2008 tgoettlicher(a)suse.de
+- Fixed bnc #418443: Yast modules windows have no title
+- V 2.17.12
* Wed Sep 24 2008 sh(a)suse.de
- Improved robustness against already-deleted widgets (bnc #421794)
- V 2.17.11
++++++ yast2-libyui-2.17.11.tar.bz2 -> yast2-libyui-2.17.12.tar.bz2 ++++++
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-libyui-2.17.11/configure new/yast2-libyui-2.17.12/configure
--- old/yast2-libyui-2.17.11/configure 2008-07-01 10:33:48.000000000 +0200
+++ new/yast2-libyui-2.17.12/configure 2008-07-28 10:25:33.000000000 +0200
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.61 for yast2-libyui 2.17.2.
+# Generated by GNU Autoconf 2.61 for yast2-libyui 2.17.5.
#
# Report bugs to <http://bugs.opensuse.org/>.
#
@@ -728,8 +728,8 @@
# Identity of this package.
PACKAGE_NAME='yast2-libyui'
PACKAGE_TARNAME='yast2-libyui'
-PACKAGE_VERSION='2.17.2'
-PACKAGE_STRING='yast2-libyui 2.17.2'
+PACKAGE_VERSION='2.17.5'
+PACKAGE_STRING='yast2-libyui 2.17.5'
PACKAGE_BUGREPORT='http://bugs.opensuse.org/'
ac_unique_file="RPMNAME"
@@ -1443,7 +1443,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 yast2-libyui 2.17.2 to adapt to many kinds of systems.
+\`configure' configures yast2-libyui 2.17.5 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1514,7 +1514,7 @@
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of yast2-libyui 2.17.2:";;
+ short | recursive ) echo "Configuration of yast2-libyui 2.17.5:";;
esac
cat <<\_ACEOF
@@ -1621,7 +1621,7 @@
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-yast2-libyui configure 2.17.2
+yast2-libyui configure 2.17.5
generated by GNU Autoconf 2.61
Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
@@ -1635,7 +1635,7 @@
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
-It was created by yast2-libyui $as_me 2.17.2, which was
+It was created by yast2-libyui $as_me 2.17.5, which was
generated by GNU Autoconf 2.61. Invocation command line was
$ $0 $@
@@ -2456,7 +2456,7 @@
# Define the identity of the package.
PACKAGE='yast2-libyui'
- VERSION='2.17.2'
+ VERSION='2.17.5'
cat >>confdefs.h <<_ACEOF
@@ -2684,7 +2684,7 @@
-VERSION="2.17.2"
+VERSION="2.17.5"
RPMNAME="yast2-libyui"
MAINTAINER="Stefan Hundhammer <sh(a)suse.de>"
@@ -22483,7 +22483,7 @@
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
-This file was extended by yast2-libyui $as_me 2.17.2, which was
+This file was extended by yast2-libyui $as_me 2.17.5, which was
generated by GNU Autoconf 2.61. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -22536,7 +22536,7 @@
_ACEOF
cat >>$CONFIG_STATUS <<_ACEOF
ac_cs_version="\\
-yast2-libyui config.status 2.17.2
+yast2-libyui config.status 2.17.5
configured by $0, generated by GNU Autoconf 2.61,
with options \\"`echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-libyui-2.17.11/configure.in new/yast2-libyui-2.17.12/configure.in
--- old/yast2-libyui-2.17.11/configure.in 2008-07-01 10:33:26.000000000 +0200
+++ new/yast2-libyui-2.17.12/configure.in 2008-07-28 10:25:17.000000000 +0200
@@ -3,7 +3,7 @@
dnl -- This file is generated by y2autoconf 2.16.7 - DO NOT EDIT! --
dnl (edit configure.in.in instead)
-AC_INIT(yast2-libyui, 2.17.2, http://bugs.opensuse.org/, yast2-libyui)
+AC_INIT(yast2-libyui, 2.17.5, http://bugs.opensuse.org/, yast2-libyui)
dnl Check for presence of file 'RPMNAME'
AC_CONFIG_SRCDIR([RPMNAME])
@@ -18,7 +18,7 @@
AM_INIT_AUTOMAKE(tar-ustar -Wno-portability)
dnl Important YaST2 variables
-VERSION="2.17.2"
+VERSION="2.17.5"
RPMNAME="yast2-libyui"
MAINTAINER="Stefan Hundhammer <sh(a)suse.de>"
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-libyui-2.17.11/src/YWizard.h new/yast2-libyui-2.17.12/src/YWizard.h
--- old/yast2-libyui-2.17.11/src/YWizard.h 2008-06-05 16:18:43.000000000 +0200
+++ new/yast2-libyui-2.17.12/src/YWizard.h 2008-09-24 16:16:05.000000000 +0200
@@ -167,6 +167,12 @@
virtual void setDialogIcon( const string & iconName ) = 0;
/**
+ * Set the dialog title shown in the window manager's title bar.
+ An empty string clears the current title.
+ **/
+ virtual void setDialogTitle( const string & titleText ) = 0;
+
+ /**
* Set the dialog heading.
**/
virtual void setDialogHeading( const string & headingText ) = 0;
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-libyui-2.17.11/VERSION new/yast2-libyui-2.17.12/VERSION
--- old/yast2-libyui-2.17.11/VERSION 2008-09-24 17:45:53.000000000 +0200
+++ new/yast2-libyui-2.17.12/VERSION 2008-09-26 15:33:12.000000000 +0200
@@ -1 +1 @@
-2.17.11
+2.17.12
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org
For additional commands, e-mail: opensuse-commit+help(a)opensuse.org
1
0
Hello community,
here is the log from the commit of package yast2-mail
checked in at Mon Sep 29 18:28:05 CEST 2008.
--------
--- yast2-mail/yast2-mail.changes 2008-09-11 11:13:20.000000000 +0200
+++ /mounts/work_src_done/STABLE/yast2-mail/yast2-mail.changes 2008-09-28 10:48:39.515136000 +0200
@@ -1,0 +2,5 @@
+Sun Sep 28 10:28:17 CEST 2008 - varkoly(a)suse.de
+
+- Fixing (bnc#422022) - HTML markup shows in YAST dialogue
+
+-------------------------------------------------------------------
Old:
----
yast2-mail-2.16.8.tar.bz2
New:
----
yast2-mail-2.16.9.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ yast2-mail.spec ++++++
--- /var/tmp/diff_new_pack.Rn7479/_old 2008-09-29 18:27:49.000000000 +0200
+++ /var/tmp/diff_new_pack.Rn7479/_new 2008-09-29 18:27:49.000000000 +0200
@@ -1,5 +1,5 @@
#
-# spec file for package yast2-mail (Version 2.16.8)
+# spec file for package yast2-mail (Version 2.16.9)
#
# Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
@@ -19,12 +19,12 @@
Name: yast2-mail
-Version: 2.16.8
+Version: 2.16.9
Release: 1
License: GPL v2 or later
Group: System/YaST
BuildRoot: %{_tmppath}/%{name}-%{version}-build
-Source0: yast2-mail-2.16.8.tar.bz2
+Source0: yast2-mail-2.16.9.tar.bz2
Prefix: /usr
BuildRequires: perl-XML-Writer update-desktop-files yast2-devtools yast2-testsuite
BuildRequires: yast2-ldap-server yast2-network yast2-perl-bindings yast2-users
@@ -77,7 +77,7 @@
Peter Varkoly <varkoly(a)novell.com>
%prep
-%setup -n yast2-mail-2.16.8
+%setup -n yast2-mail-2.16.9
%build
%{prefix}/bin/y2tool y2autoconf
@@ -171,6 +171,8 @@
%dir /usr/share/YaST2/clients
/usr/share/YaST2/clients/users*
%changelog
+* Sun Sep 28 2008 varkoly(a)suse.de
+- Fixing (bnc#422022) - HTML markup shows in YAST dialogue
* Thu Sep 11 2008 varkoly(a)suse.de
- (bnc#425343) - string in mail.po not written well
* Thu Sep 11 2008 jsrain(a)suse.cz
++++++ yast2-mail-2.16.8.tar.bz2 -> yast2-mail-2.16.9.tar.bz2 ++++++
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-mail-2.16.8/src/mail-server_dialogs.ycp new/yast2-mail-2.16.9/src/mail-server_dialogs.ycp
--- old/yast2-mail-2.16.8/src/mail-server_dialogs.ycp 2008-09-11 10:53:27.000000000 +0200
+++ new/yast2-mail-2.16.9/src/mail-server_dialogs.ycp 2008-09-23 18:05:39.000000000 +0200
@@ -43,12 +43,17 @@
Ldap::LDAPInit();
map<string, any> LDAPSettings = (map <string, any>) Ldap::Export();
list args = [];
+ integer size1 = (integer)SCR::Read(.target.size, "/etc/ssl/servercerts/servercert.pem");
+ integer size2 = (integer)SCR::Read(.target.size, "/etc/ssl/servercerts/serverkey.pem");
+ if( size1 <= 0 || size2 <= 0)
+ {
+ ca_mgm = true;
+ }
y2milestone(" LDAPSettings %1", LDAPSettings);
//if( ! LDAPSettings["start_ldap"]:false )
if( LDAPSettings["bind_dn"]:"" == "" )
{ //No LDAP-Client configuration
setup_ldap_server = true;
- ca_mgm = true;
conf_ldap_client = true;
ldap_server_local = true;
comment = _("Your computer is not configured as an LDAP client.") + "<br>" +
@@ -57,7 +62,7 @@
}
else
{ //The computer is configured as LDAP-Client
- if( LDAPSettings["ldap_server"]:"" == "127.0.0.1" )
+ if( LDAPSettings["ldap_server"]:"" == "127.0.0.1" || LDAPSettings["ldap_server"]:"" == "localhost" )
{ // The LDAP-Server is local
comment = _("Your computer is configured as an LDAP client and the LDAP server is local.") + "<br>" +
_("We suggest you adapt the LDAP server configuration for the mail server.") + "<br>" +
@@ -661,11 +666,14 @@
list<map<string,string> > AccessList = (list<map<string,string> >) MailServer::MailPrevention["AccessList"]:[];
boolean VirusScanning = (boolean)MailServer::MailPrevention["VirusScanning"]:false;
boolean SpamLearning = (boolean)MailServer::MailPrevention["SpamLearning"]:false;
- integer VSCount = (integer)MailServer::MailPrevention["VSCount "]:10;
+ integer VSCount = (integer)MailServer::MailPrevention["VSCount"]:10;
boolean BasicProtectionOff = false;
boolean BasicProtectionMedium = false;
boolean BasicProtectionHard = true;
+y2milestone("---- MailPrevention %1",MailServer::MailPrevention);
+y2milestone("---- VSCount %1",VSCount);
+
if(BasicProtection == "off"){
BasicProtectionOff = true;
BasicProtectionHard = false;
@@ -696,7 +704,7 @@
`HBox(
`Left(`CheckBox (`id(`VirusScanning), `opt(`notify), _("Start Virus Scanner AMAVIS"), VirusScanning)),
`HSpacing (1),
- `Left(`TextEntry (`id(`VSCount), `opt(`notify), _("Count of Virsus Scanner Process"), sformat("%1",VSCount)))
+ `Left(`TextEntry (`id(`VSCount), _("Count of Virsus Scanner Process"), sformat("%1",VSCount)))
),
`VSpacing (1),
SpamL,
@@ -1461,7 +1469,7 @@
MailServer::MailPrevention["BasicProtection"] = (string) UI::QueryWidget(`id(`BasicProtection), `CurrentButton);
MailServer::MailPrevention["VirusScanning"] = (boolean)UI::QueryWidget(`id(`VirusScanning), `Value);
MailServer::MailPrevention["SpamLearning"] = (boolean)UI::QueryWidget(`id(`SpamLearning), `Value);
- MailServer::MailPrevention["VSCount"] = (boolean)UI::QueryWidget(`id(`VSCount), `Value);
+ MailServer::MailPrevention["VSCount"] = (integer)UI::QueryWidget(`id(`VSCount), `Value);
title = _("Mail Server SPAM Basic Prevention Configuration");
content = MailPreventionDialog(CID,CIDRBL);
helptext = HELPS["MailPrevention"]:"Bla Bla Bla";
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-mail-2.16.8/src/mail.ycp new/yast2-mail-2.16.9/src/mail.ycp
--- old/yast2-mail-2.16.8/src/mail.ycp 2008-09-11 10:38:32.000000000 +0200
+++ new/yast2-mail-2.16.9/src/mail.ycp 2008-09-28 10:27:21.000000000 +0200
@@ -9,10 +9,10 @@
* Main file
*
* Authors:
- * Martin Vidner <mvidner(a)suse.cz>
* Peter Varkoly <varkoly(a)novell.com>
+ * Martin Vidner <mvidner(a)suse.cz>
*
- * $Id: mail.ycp 51003 2008-09-11 06:30:20Z jsrain $
+ * $Id: mail.ycp 51613 2008-09-28 08:27:20Z varkoly $
*
* Main file for mail configuration. Uses all other files.
*
@@ -81,13 +81,13 @@
{
if( type == "standard" )
{
- status = _("The running mail server configuration is based on the <b>Standard</b> type.")+ "\n"+
- _("It is possible to change to <b>Advanced</b> settings. This will overwrite all existing settings.");
+ status = _("The running mail server configuration is based on the \"Standard\" type.")+ "\n"+
+ _("It is possible to change to \"Advanced\" settings. This will overwrite all existing settings.");
}
else if( type == "advanced" )
{
- status = _("The running mail server configuration is based on the <b>Advanced</b> type.")+"\n"+
- _("It is possible to change to <b>Standard</b> settings. This will overwrite all existing settings.");
+ status = _("The running mail server configuration is based on the \"Advanced\" type.")+"\n"+
+ _("It is possible to change to \"Standard\" settings. This will overwrite all existing settings.");
}
}
term contents =
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-mail-2.16.8/src/YaPI/MailServer.pm new/yast2-mail-2.16.9/src/YaPI/MailServer.pm
--- old/yast2-mail-2.16.8/src/YaPI/MailServer.pm 2008-08-06 10:00:06.000000000 +0200
+++ new/yast2-mail-2.16.9/src/YaPI/MailServer.pm 2008-09-28 10:46:32.000000000 +0200
@@ -1161,12 +1161,16 @@
}
# Now we looking for if vscan (virusscanning) is started.
- my $smtp = SCR->Execute('.mail.postfix.mastercf.findService',
- { 'service' => 'smtp',
- 'command' => 'smtpd'});
my $vscan = SCR->Execute('.mail.postfix.mastercf.findService',
{ 'service' => 'localhost:10025',
'command' => 'smtpd'} );
+ my $smtp = SCR->Execute('.mail.postfix.mastercf.findService',
+ { 'service' => 'smtp',
+ 'command' => 'smtpd'});
+print "SMTP";
+print Dumper ($smtp);
+print "VSCAN";
+print Dumper ($vscan);
if( defined $smtp->[0] && defined $smtp->[0]->{'options'} )
{
if( $smtp->[0]->{'options'}->{'content_filter'} eq 'smtp:[localhost]:10024' && $vscan )
@@ -1186,6 +1190,7 @@
{
$MailPrevention{'VSCount'} = $1;
}
+ $ismax = 1;
}
if( !$ismax )
{
@@ -1200,7 +1205,7 @@
{
$ret = $imap->login($imapadm, $AdminPassword);
if($$ret{Status} eq "ok") {
- $ret = $imap->select('NEWSPAM');
+ $ret = $imap->select('NewSpam');
if( $ret->{Status} eq 'ok' )
{
$MailPrevention{'SpamLearning'} = YaST::YCP::Boolean(1);
@@ -1358,6 +1363,7 @@
SCR->Read('.mail.postfix.mastercf');
if( $MailPrevention->{'VirusScanning'} )
{
+ $MailPrevention->{'VSCount'} = 5 if( ! defined $MailPrevention->{'VSCount'});
my $err = activate_virus_scanner($MailPrevention->{'VSCount'});
if( $err ne "" )
{
@@ -1450,8 +1456,51 @@
$ret = $imap->setacl('NoSpam', $imapadm, "lrswipkxtea");
$ret = $imap->setacl('NewSpam', 'anyone', "lrswi");
$ret = $imap->setacl('NoSpam', 'anyone', "lsi");
+ my $lernspam = '#!/bin/bash
+LOG=/var/log/lern-spam
+/usr/share/oss/tools/oss_date.sh >> $LOG
+if [ ! -d /var/spool/imap/NewSpam ]
+then
+ exit
+fi
+
+setfacl -m u:vscan:rx /var/spool/imap /var/spool/imap/{NoSpam,NewSpam}
+setfacl -m m::rx /var/spool/imap /var/spool/imap/{NoSpam,NewSpam}
+
+su - vscan -c "/usr/bin/sa-learn --sync"
+(
+for i in `ls /var/spool/imap/NewSpam/[0-9]* 2> /dev/null`
+do
+ setfacl -m user:vscan:r-x $i
+ echo $i
+ su - vscan -c "/usr/bin/sa-learn --spam $i"
+ rm $i
+done
+) >> $LOG 2>&1
+su - cyrus -c "reconstruct NewSpam" &>/dev/null
+
+(
+for i in `ls /var/spool/imap/NoSpam/[0-9]* 2> /dev/null`
+do
+ setfacl -m user:vscan:r-x $i
+ echo $i
+ su - vscan -c "/usr/bin/sa-learn --ham $i"
+ rm $i
+done
+) >> $LOG 2>&1
+su - cyrus -c "reconstruct NoSpam" &>/dev/null
+
+setfacl -b /var/spool/imap /var/spool/imap/{NoSpam,NewSpam}
+';
+ SCR->Write(".target.string","/etc/cron.hourly/lern-spam",$lernspam);
+ SCR->Write(".target.bash","chmod 755 /etc/cron.hourly/lern-spam");
}
}
+ else
+ {
+ SCR->Write(".target.bash","test -e /etc/cron.hourly/lern-spam && rm /etc/cron.hourly/lern-spam");
+ $ret = $imap->delete('NewSpam');
+ }
}
return 1;
}
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-mail-2.16.8/VERSION new/yast2-mail-2.16.9/VERSION
--- old/yast2-mail-2.16.8/VERSION 2008-09-10 14:53:45.000000000 +0200
+++ new/yast2-mail-2.16.9/VERSION 2008-09-28 10:27:42.000000000 +0200
@@ -1 +1 @@
-2.16.8
+2.16.9
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org
For additional commands, e-mail: opensuse-commit+help(a)opensuse.org
1
0
Hello community,
here is the log from the commit of package yast2-ldap-server
checked in at Mon Sep 29 18:27:40 CEST 2008.
--------
--- yast2-ldap-server/yast2-ldap-server.changes 2008-09-24 14:11:49.000000000 +0200
+++ /mounts/work_src_done/STABLE/yast2-ldap-server/yast2-ldap-server.changes 2008-09-29 13:56:33.000000000 +0200
@@ -1,0 +2,8 @@
+Mon Sep 29 13:03:41 CEST 2008 - rhafer(a)suse.de
+
+- Version 2.17.8
+ * revived AutoYaST support (bnc#429528)
+ * Additional fix for installation proposal. Don't propose
+ configuration if openldap2 is not installed (bnc#426593)
+
+-------------------------------------------------------------------
Old:
----
yast2-ldap-server-2.17.7.tar.bz2
New:
----
yast2-ldap-server-2.17.8.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ yast2-ldap-server.spec ++++++
--- /var/tmp/diff_new_pack.FI6154/_old 2008-09-29 18:27:26.000000000 +0200
+++ /var/tmp/diff_new_pack.FI6154/_new 2008-09-29 18:27:26.000000000 +0200
@@ -1,5 +1,5 @@
#
-# spec file for package yast2-ldap-server (Version 2.17.7)
+# spec file for package yast2-ldap-server (Version 2.17.8)
#
# Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
@@ -19,12 +19,12 @@
Name: yast2-ldap-server
-Version: 2.17.7
+Version: 2.17.8
Release: 1
License: GPL v2 or later; X11/MIT
Group: System/YaST
BuildRoot: %{_tmppath}/%{name}-%{version}-build
-Source0: yast2-ldap-server-2.17.7.tar.bz2
+Source0: yast2-ldap-server-2.17.8.tar.bz2
Prefix: /usr
BuildRequires: boost-devel gcc-c++ libldapcpp-devel perl-Digest-SHA1 perl-X500-DN perl-gettext pkg-config update-desktop-files yast2 yast2-core-devel yast2-devtools yast2-ldap-client
Requires: acl net-tools perl perl-Digest-SHA1 perl-gettext perl-X500-DN yast2 yast2-ca-management yast2-ldap-client yast2-perl-bindings yast2-users
@@ -41,7 +41,7 @@
Andreas Bauer <abauer(a)suse.de>
%prep
-%setup -n yast2-ldap-server-2.17.7
+%setup -n yast2-ldap-server-2.17.8
%build
%{prefix}/bin/y2tool y2autoconf
@@ -86,6 +86,11 @@
/usr/share/YaST2/scrconf/*
%doc %{prefix}/share/doc/packages/yast2-ldap-server
%changelog
+* Mon Sep 29 2008 rhafer(a)suse.de
+- Version 2.17.8
+ * revived AutoYaST support (bnc#429528)
+ * Additional fix for installation proposal. Don't propose
+ configuration if openldap2 is not installed (bnc#426593)
* Wed Sep 24 2008 rhafer(a)suse.de
- Version 2.17.7
* Fixed crashes and consistency checks for ACLs ((bnc#425821)
++++++ yast2-ldap-server-2.17.7.tar.bz2 -> yast2-ldap-server-2.17.8.tar.bz2 ++++++
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-ldap-server-2.17.7/configure new/yast2-ldap-server-2.17.8/configure
--- old/yast2-ldap-server-2.17.7/configure 2008-09-24 13:03:01.000000000 +0200
+++ new/yast2-ldap-server-2.17.8/configure 2008-09-29 13:09:06.000000000 +0200
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.63 for yast2-ldap-server 2.17.7.
+# Generated by GNU Autoconf 2.63 for yast2-ldap-server 2.17.8.
#
# Report bugs to <http://bugs.opensuse.org/>.
#
@@ -750,8 +750,8 @@
# Identity of this package.
PACKAGE_NAME='yast2-ldap-server'
PACKAGE_TARNAME='yast2-ldap-server'
-PACKAGE_VERSION='2.17.7'
-PACKAGE_STRING='yast2-ldap-server 2.17.7'
+PACKAGE_VERSION='2.17.8'
+PACKAGE_STRING='yast2-ldap-server 2.17.8'
PACKAGE_BUGREPORT='http://bugs.opensuse.org/'
ac_unique_file="RPMNAME"
@@ -1529,7 +1529,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 yast2-ldap-server 2.17.7 to adapt to many kinds of systems.
+\`configure' configures yast2-ldap-server 2.17.8 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1601,7 +1601,7 @@
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of yast2-ldap-server 2.17.7:";;
+ short | recursive ) echo "Configuration of yast2-ldap-server 2.17.8:";;
esac
cat <<\_ACEOF
@@ -1714,7 +1714,7 @@
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-yast2-ldap-server configure 2.17.7
+yast2-ldap-server configure 2.17.8
generated by GNU Autoconf 2.63
Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
@@ -1728,7 +1728,7 @@
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
-It was created by yast2-ldap-server $as_me 2.17.7, which was
+It was created by yast2-ldap-server $as_me 2.17.8, which was
generated by GNU Autoconf 2.63. Invocation command line was
$ $0 $@
@@ -2575,7 +2575,7 @@
# Define the identity of the package.
PACKAGE='yast2-ldap-server'
- VERSION='2.17.7'
+ VERSION='2.17.8'
cat >>confdefs.h <<_ACEOF
@@ -2799,7 +2799,7 @@
-VERSION="2.17.7"
+VERSION="2.17.8"
RPMNAME="yast2-ldap-server"
MAINTAINER="Ralf Haferkamp <rhafer(a)suse.de>"
@@ -22183,7 +22183,7 @@
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
-This file was extended by yast2-ldap-server $as_me 2.17.7, which was
+This file was extended by yast2-ldap-server $as_me 2.17.8, which was
generated by GNU Autoconf 2.63. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -22246,7 +22246,7 @@
_ACEOF
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
ac_cs_version="\\
-yast2-ldap-server config.status 2.17.7
+yast2-ldap-server config.status 2.17.8
configured by $0, generated by GNU Autoconf 2.63,
with options \\"`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-ldap-server-2.17.7/configure.in new/yast2-ldap-server-2.17.8/configure.in
--- old/yast2-ldap-server-2.17.7/configure.in 2008-09-24 13:02:13.000000000 +0200
+++ new/yast2-ldap-server-2.17.8/configure.in 2008-09-29 13:08:47.000000000 +0200
@@ -3,7 +3,7 @@
dnl -- This file is generated by y2autoconf 2.17.6 - DO NOT EDIT! --
dnl (edit configure.in.in instead)
-AC_INIT(yast2-ldap-server, 2.17.7, http://bugs.opensuse.org/, yast2-ldap-server)
+AC_INIT(yast2-ldap-server, 2.17.8, http://bugs.opensuse.org/, yast2-ldap-server)
dnl Check for presence of file 'RPMNAME'
AC_CONFIG_SRCDIR([RPMNAME])
@@ -18,7 +18,7 @@
AM_INIT_AUTOMAKE(tar-ustar -Wno-portability)
dnl Important YaST2 variables
-VERSION="2.17.7"
+VERSION="2.17.8"
RPMNAME="yast2-ldap-server"
MAINTAINER="Ralf Haferkamp <rhafer(a)suse.de>"
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-ldap-server-2.17.7/src/agent/SlapdConfigAgent.cc new/yast2-ldap-server-2.17.8/src/agent/SlapdConfigAgent.cc
--- old/yast2-ldap-server-2.17.7/src/agent/SlapdConfigAgent.cc 2008-09-24 12:57:37.000000000 +0200
+++ new/yast2-ldap-server-2.17.8/src/agent/SlapdConfigAgent.cc 2008-09-29 13:08:17.000000000 +0200
@@ -238,6 +238,7 @@
else if ( path->component_str(0) == "initDatabases" )
{
YCPList dbList = arg->asList();
+ databases.clear();
for ( int i = 0; i < dbList->size(); i++ )
{
YCPMap dbMap = dbList->value(i)->asMap();
@@ -535,6 +536,8 @@
YCPString( (*i)->getStringValue("olcSuffix") ));
resMap.add( YCPString("rootdn"),
YCPString( (*i)->getStringValue("olcRootDn") ));
+ resMap.add( YCPString("rootpw"),
+ YCPString( (*i)->getStringValue("olcRootPw") ));
if ( dbtype == "bdb" || dbtype == "hdb" )
{
boost::shared_ptr<OlcBdbDatabase> bdb =
@@ -718,12 +721,7 @@
const YCPValue &arg,
const YCPValue &opt)
{
- if ( path->length() !=1 )
- {
- y2milestone("Unsupported Path: %s", path->toString().c_str() );
- return YCPNull();
- }
- else if ( path->component_str(0) == "attributeTypes" )
+ if ( path->component_str(0) == "attributeTypes" )
{
if ( schema.size() == 0 )
{
@@ -775,6 +773,30 @@
}
return resMap;
}
+ else if ( path->component_str(0) == "ldif" )
+ {
+ std::string name = path->component_str(1);
+ if ( schema.size() == 0 )
+ {
+ schema = olc.getSchemaNames();
+ }
+ OlcSchemaList::const_iterator i;
+ YCPMap resMap;
+ std::string result = "";
+ for (i = schema.begin(); i != schema.end(); i++ )
+ {
+ if ( (*i)->getName() == name )
+ {
+ ostringstream oldifstr;
+ LdifWriter oldif(oldifstr);
+ oldif.writeRecord((*i)->getChangedEntry());
+ result = oldifstr.str();
+ break;
+ }
+ }
+ return YCPString( result.c_str() );
+ }
+ y2milestone("Unsupported Path: %s", path->toString().c_str() );
return YCPNull();
}
@@ -1226,8 +1248,12 @@
{
boost::shared_ptr<OlcAccess> acl( new OlcAccess() );
+ YCPMap target;
// create the "to dn.<scope>=<dn> ...." part of the ACL
- YCPMap target = argList->value(j)->asMap()->value(YCPString("target"))->asMap();
+ if (! argList->value(j)->asMap()->value(YCPString("target")).isNull() )
+ {
+ target = argList->value(j)->asMap()->value(YCPString("target"))->asMap();
+ }
if (target.size() == 0 )
{
acl->setFilter("");
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-ldap-server-2.17.7/src/config/ldap-server.rnc new/yast2-ldap-server-2.17.8/src/config/ldap-server.rnc
--- old/yast2-ldap-server-2.17.7/src/config/ldap-server.rnc 2008-01-08 12:12:15.000000000 +0100
+++ new/yast2-ldap-server-2.17.8/src/config/ldap-server.rnc 2008-09-29 13:08:17.000000000 +0200
@@ -2,52 +2,85 @@
namespace a = "http://relaxng.org/ns/compatibility/annotations/1.0"
namespace config = "http://www.suse.com/1.0/configns"
+#start = element profile { ldap-server }
+#include '/usr/share/YaST2/schema/autoyast/rnc/common.rnc'
ldap-server = element ldap-server {
- element allowList {
- LIST,
- element listentry { text }*
- }? &
- element commonServerCertificateAvailable { text }? &
- element configureCommonServerCertificate { text }? &
- element tlsSettings {
- element TLSCertificateKeyFile { text }? &
- element TLSCertificateFile { text }? &
- element TLSCACertificateFile { text }? &
- element TLSCACertificatePath { text }?
+ element daemon {
+ element listeners {
+ LIST,
+ element listentry { text }+
+ }? &
+ element serviceEnabled { BOOLEAN }? &
+ element slp { BOOLEAN }?
}? &
- element database {
+ element databases {
LIST,
element listentry {
- element cachesize { text }? &
- element checkpoint { text }? &
- element createdatabasedir { text }? &
- element cryptmethod { text }? &
- element database { text }? &
- element directory { text }? &
- element overlay {
+ element access {
LIST,
element listentry {
- LIST,
- element listentry { Anything }*
+ element access {
+ LIST,
+ element listentry {
+ element level { text } &
+ element type { text } &
+ element value { text }?
+ }+
+ }+ &
+ element target {
+ element attrs { text }? &
+ element filter { text }? &
+ element dn {
+ element style { text }? &
+ element value { text }?
+ }?
+ }?
}*
+ }* &
+ element indexes { Anything }* &
+ element checkpoint {
+ LIST,
+ element listentry { text }+
}? &
- element passwd { text }? &
- element ppolicy_default_changed { text }? &
+ element directory { text }? &
+ element entrycache { text }? &
+ element idlcache { text }? &
element rootdn { text }? &
- element suffix { text }?
+ element rootpw { text }? &
+ element suffix { text }? &
+ element type { text }?
}*
}? &
- element loglevel { text }? &
- element schemaIncludeList {
- LIST,
- element listentry { text }*
+ element globals {
+ element allow {
+ LIST,
+ element listentry { text }*
+ }? &
+ element disallow {
+ LIST,
+ element listentry { text }*
+ }? &
+ element loglevel {
+ LIST,
+ element listentry { text }*
+ }? &
+ element tlsconfig {
+ element caCertDir { text }? &
+ element caCertFile { text }? &
+ element certFile { text }? &
+ element certKeyFile { text }? &
+ element crlCheck { text }? &
+ element crlFile { text }? &
+ element verifyClient { text }?
+ }?
}? &
- element serviceEnabled { text }? &
- element importCertificates {
- element CACertificatesFile { text }? &
- element ServerCertificateFile { text }? &
- element ServerKeyFile { text }?
+ element schema {
+ LIST,
+ element listentry {
+ element includeldif { text }? &
+ element includeschema { text }?
+ }*
}?
}
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-ldap-server-2.17.7/src/ldap-server_auto.ycp new/yast2-ldap-server-2.17.8/src/ldap-server_auto.ycp
--- old/yast2-ldap-server-2.17.7/src/ldap-server_auto.ycp 2008-09-18 15:50:25.000000000 +0200
+++ new/yast2-ldap-server-2.17.8/src/ldap-server_auto.ycp 2008-09-29 13:08:17.000000000 +0200
@@ -4,7 +4,7 @@
* Summary: Client for autoinstallation
* Authors: Andreas Bauer <abauer(a)suse.de>
*
- * $Id: ldap-server_auto.ycp 51284 2008-09-18 13:50:25Z rhafer $
+ * $Id: ldap-server_auto.ycp 51476 2008-09-24 14:55:34Z rhafer $
*
* This is a client for autoinstallation. It takes its arguments,
* goes through the configuration and return the setting.
@@ -39,7 +39,7 @@
if(size(WFM::Args()) > 1 && is(WFM::Args(1), map))
param = (map) WFM::Args(1);
}
-y2debug("func=%1", func);
+y2milestone("func=%1", func);
y2debug("param=%1", param);
/* Create a summary*/
@@ -54,6 +54,7 @@
/* Change configuration (run AutoSequence) */
else if (func == "Change") {
ret = LdapServerAutoSequence();
+ LdapServer::ReadFromDefaults();
}
/* Import configuration */
else if (func == "Import") {
@@ -87,7 +88,7 @@
* return boolean
*/
else if (func == "GetModified") {
- ret = false;
+ ret = ! LdapServer::UseDefaults();
}
/**
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-ldap-server-2.17.7/src/LdapServer.pm new/yast2-ldap-server-2.17.8/src/LdapServer.pm
--- old/yast2-ldap-server-2.17.7/src/LdapServer.pm 2008-09-24 12:57:38.000000000 +0200
+++ new/yast2-ldap-server-2.17.8/src/LdapServer.pm 2008-09-29 13:08:17.000000000 +0200
@@ -4,7 +4,7 @@
# Summary: LdapServer settings, input and output functions
# Authors: Ralf Haferkamp <rhafer(a)suse.de>, Andreas Bauer <abauer(a)suse.de>
#
-# $Id: LdapServer.pm 51443 2008-09-24 10:38:25Z rhafer $
+# $Id: LdapServer.pm 51556 2008-09-25 19:31:17Z rhafer $
#
# Representation of the configuration of ldap-server.
# Input and output routines.
@@ -134,7 +134,7 @@
]
}
];
-my @defaultIndexes = (
+my $defaultIndexes = [
{ "name" => "objectclass",
"eq" => YaST::YCP::Boolean(1)
},
@@ -170,7 +170,7 @@
"eq" => YaST::YCP::Boolean(1),
"sub" => YaST::YCP::Boolean(1)
}
- );
+ ];
my @schema = ();
@@ -228,10 +228,9 @@
{
# assume a changed config as we don't ship a default for back-config
$slapdConfChanged = 1;
- # How do we get the LDAP password?
- y2milestone("LDAP server is running. How should I connect?");
SCR->Execute('.ldapserver.init' );
my $rc = SCR->Read('.ldapserver.databases');
+ $usingDefaults = 0;
}
else
{
@@ -375,7 +374,7 @@
my $ldapERR;
my $db_auth = $self->ReadAuthInfo( $db );
- if ( defined $db_auth )
+ if ( keys( %$db_auth ) )
{
if (! SCR->Execute(".ldap.bind", {"bind_dn" => $db_auth->{'bind_dn'},
"bind_pw" => $db_auth->{'bind_pw'}}) ) {
@@ -573,7 +572,7 @@
chomp $tmpfile;
y2milestone("using tempfile: ".$tmpfile );
my $ldif = SCR->Read('.ldapserver.configAsLdif' );
- y2milestone($ldif);
+ y2debug($ldif);
$rc = SCR->Write('.target.string', $tmpfile, $ldif );
if ( $rc )
{
@@ -747,7 +746,96 @@
sub Import {
my $self = shift;
my $hash = shift;
+ y2milestone("LdapServer::Import() : ". Data::Dumper->Dump([$hash]));
+
+ if ( ! keys( %$hash ) )
+ {
+ $usingDefaults = 1;
+ $overwriteConfig = 0;
+ $self->WriteServiceEnabled( 0 );
+ return 1;
+ }
+ $usingDefaults = 0;
+ $overwriteConfig = 1;
+ $self->WriteServiceEnabled( $hash->{'daemon'}->{'serviceEnabled'} );
+ if ( ! $self->ReadServiceEnabled() )
+ {
+ return 1;
+ }
+ $self->WriteSLPEnabled( $hash->{'daemon'}->{'slp'} );
+ foreach my $listner (@{$hash->{'daemon'}->{'listners'} } )
+ {
+ $self->WriteProtocolListenerEnabled($listner, 1);
+ }
+
+ SCR->Execute('.ldapserver.initGlobals' );
+ if ( defined $hash->{'globals'}->{'loglevel'} )
+ {
+ $self->WriteLogLevels( $hash->{'globals'}->{'loglevel'} );
+ }
+ if ( defined $hash->{'globals'}->{'allow'} )
+ {
+ $self->WriteAllowFeatures( $hash->{'globals'}->{'allow'} );
+ }
+ if ( defined $hash->{'globals'}->{'disallow'} )
+ {
+ $self->WriteDisallowFeatures( $hash->{'globals'}->{'disallow'} );
+ }
+ if ( defined $hash->{'globals'}->{'tlsconfig'} )
+ {
+ $self->WriteTlsConfig( $hash->{'globals'}->{'tlsconfig'} = $self->ReadTlsConfig() );
+ }
+
+ SCR->Execute('.ldapserver.initSchema' );
+ foreach my $schema (@{$hash->{'schema'}})
+ {
+ if ( defined $schema->{'includeldif'} )
+ {
+ $self->AddLdifToSchemaList($schema->{'includeldif'});
+ }
+ elsif ( defined $schema->{'includeschema'} )
+ {
+ $self->AddSchemaToSchemaList($schema->{'includeschema'});
+ }
+ else # Import ldif string
+ {
+
+ }
+ }
+ my $cfgdatabase = { 'type' => 'config',
+ 'rootdn' => 'cn=config' };
+ my $frontenddb = { 'type' => 'frontend' };
+ SCR->Execute('.ldapserver.initDatabases', [ $frontenddb, $cfgdatabase ] );
+ SCR->Write(".ldapserver.database.{-1}.acl", $defaultGlobalAcls );
+ my $i = 1;
+ my $defIdxBak = $defaultIndexes;
+ $defaultIndexes = [];
+ my $defAclBak = $defaultDbAcls;
+ $defaultDbAcls = [];
+ foreach my $database (@{$hash->{'databases'}})
+ {
+ $self->AddDatabase($i, $database, 1);
+ foreach my $idx ( keys %{$database->{'indexes'}} )
+ {
+ my $idxHash = {
+ "name" => $idx,
+ "eq" => $database->{'indexes'}->{$idx}->{'eq'} || 0,
+ "sub" => $database->{'indexes'}->{$idx}->{'sub'} || 0,
+ "pres" => $database->{'indexes'}->{$idx}->{'pres'} || 0,
+ };
+ $self->ChangeDatabaseIndex( $i, $idxHash );
+ }
+ if ( defined $database->{'access'} )
+ {
+ $self->ChangeDatabaseAcl( $i, $database->{'access'} );
+ }
+ }
+ $defaultIndexes = $defIdxBak;
+ $defaultDbAcls = $defAclBak;
+
+ my $ldif = SCR->Read('.ldapserver.configAsLdif' );
+ y2milestone($ldif);
return 1;
}
@@ -761,7 +849,76 @@
my $self = shift;
my $hash = {};
+ if ( ! $self->ReadServiceEnabled() )
+ {
+ return $hash;
+ }
+
+ $hash->{'daemon'}->{'slp'} = $self->ReadSLPEnabled();
+ $hash->{'daemon'}->{'serviceEnabled'} = $self->ReadServiceEnabled();
+ my @listeners = ();
+ if ( $self->ReadProtocolListenerEnabled("ldap") )
+ {
+ push @listeners, "ldap";
+ }
+ if ( $self->ReadProtocolListenerEnabled("ldapi") )
+ {
+ push @listeners, "ldapi";
+ }
+ if ( $self->ReadProtocolListenerEnabled("ldaps") )
+ {
+ push @listeners, "ldaps";
+ }
+ $hash->{'daemon'}->{'listeners'} = \@listeners;
+
+ my @schema = ();
+ my $schemaList = $self->ReadSchemaList();
+
+ foreach my $schema (@$schemaList)
+ {
+ my $schemaDef = {};
+ # Don't include definitions of well know Schema shipping with the
+ # openldap2 RPMs
+ if ( $schema eq "core" || $schema eq "cosine" || $schema eq "inetorgperson" ||
+ $schema eq "nis" )
+ {
+ $schemaDef->{'includeldif'} = "/etc/openldap/schema/".$schema.".ldif";
+ }
+ elsif ( $schema eq "dnszone" || $schema eq "ppolicy" || $schema eq "rfc2307bis" ||
+ $schema eq "suse-mailserver" || $schema eq "yast" )
+ {
+ $schemaDef->{'includeschema'} = "/etc/openldap/schema/".$schema.".schema";
+ }
+ else
+ {
+ $schemaDef->{'name'} = $schema;
+ $schemaDef->{'definition'} = SCR->Read(".ldapserver.schema.ldif.$schema");
+ }
+ push @schema, $schemaDef;
+ }
+ $hash->{'schema'} = \@schema;
+ $hash->{'globals'}->{'loglevel'} = $self->ReadLogLevels();
+ $hash->{'globals'}->{'allow'} = $self->ReadAllowFeatures();
+ $hash->{'globals'}->{'disallow'} = $self->ReadDisallowFeatures();
+ $hash->{'globals'}->{'tlsconfig'} = $self->ReadTlsConfig();
+
+ my $dbList = $self->ReadDatabaseList();
+ my @dbs;
+ foreach my $db (@$dbList)
+ {
+ if ( $db->{'type'} eq "config" || $db->{'type'} eq "frontend" )
+ {
+ next;
+ }
+ my $dbhash = $self->ReadDatabase($db->{'index'} );
+ $dbhash->{'access'} = $self->ReadDatabaseAcl( $db->{'index'} );
+ $dbhash->{'indexes'} = $self->ReadDatabaseIndexes( $db->{'index'} );
+ push @dbs, $dbhash;
+ }
+ $hash->{'databases'} = \@dbs;
+
+ y2milestone("LdapServer::Export() ". Data::Dumper->Dump([$hash]));
return $hash;
}
@@ -773,15 +930,40 @@
sub Summary {
# Configuration summary text for autoyast
my $self = shift;
- my $defaults = $self->CreateInitialDefaults();
my $string;
+ if ( keys(%dbDefaults) && $usingDefaults )
+ {
+ $string .= '<h2>'._("Startup Configuration").'</h2>'
+ .'<p>'._("Start LDAP Server: ").'<code>'.($dbDefaults{'serviceEnabled'}->value?_("Yes"):_("No")).'</code></p>'
+ .'<p>'._("Register at SLP Service: ").'<code>'.($dbDefaults{'slpRegister'}->value?_("Yes"):_("No")).'</code></p>';
- $string .= '<h2>'._("Startup Configuration").'</h2>'
- .'<p>'._("Start LDAP Server: ").'<code>'.($defaults->{'serviceEnabled'}->value?_("Yes"):_("No")).'</code></p>'
- .'<p>'._("Register at SLP Service: ").'<code>'.($defaults->{'slpRegister'}->value?_("Yes"):_("No")).'</code></p>'
- .'<h2>'._("Create initial Database with the following Parameters").'</h2>'
- .'<p>'._("Database Suffix: ").'<code>'.$defaults->{'suffix'}.'</code></p>'
- .'<p>'._("Administrator DN: ").'<code>'.$defaults->{'rootdn'}.'</code></p>';
+ if ( $dbDefaults{'serviceEnabled'}->value )
+ {
+ $string .= '<h2>'._("Create initial Database with the following Parameters").'</h2>'
+ .'<p>'._("Database Suffix: ").'<code>'.$dbDefaults{'suffix'}.'</code></p>'
+ .'<p>'._("Administrator DN: ").'<code>'.$dbDefaults{'rootdn'}.'</code></p>';
+ }
+ }
+ elsif ( ! $usingDefaults )
+ {
+ my $dbList = $self->ReadDatabaseList();
+ $string .= '<h2>'._("Startup Configuration").'</h2>'
+ .'<p>'._("Start LDAP Server: ").'<code>'.($serviceEnabled?_("Yes"):_("No")).'</code></p>'
+ .'<p>'._("Register at SLP Service: ").'<code>'.($registerSlp?_("Yes"):_("No")).'</code></p>'
+ .'<h2>'._("Create the following databases:").'</h2>';
+ foreach my $db ( @$dbList )
+ {
+ if ($db->{'type'} ne "frontend" && $db->{'type'} ne "config" )
+ {
+ $string .= '<p>'._("Database Suffix: ").'<code>'.$db->{'suffix'}.'</code><br>'
+ ._("Database Type: ").'<code>'.$db->{'type'}.'</code></p>';
+ }
+ }
+ }
+ else
+ {
+ $string .= _("Not configured yet.");
+ }
return $string;
}
@@ -1089,6 +1271,7 @@
{
my $self = shift;
my $defaults = shift;
+ $self->WriteServiceEnabled( $defaults->{'serviceEnabled'} );
$defaults->{'serviceEnabled'} = YaST::YCP::Boolean($defaults->{'serviceEnabled'});
$defaults->{'slpRegister'} = YaST::YCP::Boolean($defaults->{'slpRegister'});
y2debug("SetInitialDefaults: ". Data::Dumper->Dump([$defaults]));
@@ -1129,7 +1312,7 @@
$dbDefaults{'idlcache'} = 30000;
$dbDefaults{'checkpoint'} = [ 1024, 5 ];
$dbDefaults{'defaultIndex'} = YaST::YCP::Boolean(1);
- $dbDefaults{'serviceEnabled'} = YaST::YCP::Boolean(0);
+ $dbDefaults{'serviceEnabled'} = YaST::YCP::Boolean(1);
$dbDefaults{'slpRegister'} = YaST::YCP::Boolean(0);
return 1;
}
@@ -1159,7 +1342,10 @@
sub ReadFromDefaults
{
my $self = shift;
-
+
+ $self->WriteServiceEnabled( $dbDefaults{'serviceEnabled'} );
+ $self->WriteSLPEnabled( $dbDefaults{'slpRegister'} );
+
my $pwHash = $self->HashPassword($dbDefaults{'pwenctype'}, $dbDefaults{'rootpw_clear'} );
my $database = { 'type' => 'hdb',
'suffix' => $dbDefaults{'suffix'},
@@ -1217,7 +1403,7 @@
SCR->Execute('.ldapserver.initDatabases', [ $frontenddb, $cfgdatabase, $database ] );
if ( $dbDefaults{'defaultIndex'} == 1 )
{
- foreach my $idx ( @defaultIndexes )
+ foreach my $idx ( @$defaultIndexes )
{
$self->ChangeDatabaseIndex(1, $idx );
}
@@ -1570,7 +1756,10 @@
}
}
my $rc;
- $db->{'rootpw'} = $self->HashPassword($db->{'pwenctype'}, $db->{'rootpw_clear'} );
+ if ( ! defined $db->{'rootpw'} )
+ {
+ $db->{'rootpw'} = $self->HashPassword($db->{'pwenctype'}, $db->{'rootpw_clear'} );
+ }
if ( $index == 0 )
{
# calculate new database index
@@ -1630,7 +1819,7 @@
return 0;
}
# default indexing
- foreach my $idx ( @defaultIndexes )
+ foreach my $idx ( @$defaultIndexes )
{
$self->ChangeDatabaseIndex($index, $idx );
}
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-ldap-server-2.17.7/src/ldap-server_proposal.ycp new/yast2-ldap-server-2.17.8/src/ldap-server_proposal.ycp
--- old/yast2-ldap-server-2.17.7/src/ldap-server_proposal.ycp 2008-09-18 12:19:00.000000000 +0200
+++ new/yast2-ldap-server-2.17.8/src/ldap-server_proposal.ycp 2008-09-29 13:08:17.000000000 +0200
@@ -4,7 +4,7 @@
* Summary: Proposal function dispatcher.
* Authors: Andreas Bauer <abauer(a)suse.de>
*
- * $Id: ldap-server_proposal.ycp 51267 2008-09-18 10:18:38Z rhafer $
+ * $Id: ldap-server_proposal.ycp 51630 2008-09-29 11:07:56Z rhafer $
*
* Proposal function dispatcher for ldap-server configuration.
* See source/installation/proposal/proposal-API.txt
@@ -65,6 +65,7 @@
LdapServer::WriteServiceEnabled( true );
}
defaults = LdapServer::CreateInitialDefaults();
+ defaults["serviceEnabled"] = LdapServer::ReadServiceEnabled();
defaults["rootpw_clear"] = Users::GetRootPassword();
LdapServer::SetInitialDefaults(defaults);
}
@@ -118,7 +119,7 @@
textdomain "ldap-server";
}
- proposal = _("LDAP Server Configuration:") + HTML::Newline() +
+ proposal = _("LDAP Server Configuration:") +
HTML::List( [ _("Base DN: ") + defaults["suffix"]:"",
_("Root DN: ") + defaults["rootdn"]:"",
_("LDAP Password: ") + rootPWString
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-ldap-server-2.17.7/src/wizards.ycp new/yast2-ldap-server-2.17.8/src/wizards.ycp
--- old/yast2-ldap-server-2.17.7/src/wizards.ycp 2008-09-18 12:19:00.000000000 +0200
+++ new/yast2-ldap-server-2.17.8/src/wizards.ycp 2008-09-29 13:08:17.000000000 +0200
@@ -4,7 +4,7 @@
* Summary: Wizards definitions
* Authors: Andreas Bauer <abauer(a)suse.de>
*
- * $Id: wizards.ycp 51194 2008-09-16 15:17:23Z rhafer $
+ * $Id: wizards.ycp 51476 2008-09-24 14:55:34Z rhafer $
*/
{
@@ -265,7 +265,7 @@
Wizard::SetContentsButtons(caption, contents, "",
Label::BackButton(), Label::NextButton());
- any ret = MainSequence();
+ any ret = InstProposalSequence();
UI::CloseDialog();
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-ldap-server-2.17.7/VERSION new/yast2-ldap-server-2.17.8/VERSION
--- old/yast2-ldap-server-2.17.7/VERSION 2008-09-24 13:01:39.000000000 +0200
+++ new/yast2-ldap-server-2.17.8/VERSION 2008-09-29 13:08:17.000000000 +0200
@@ -1 +1 @@
-2.17.7
+2.17.8
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org
For additional commands, e-mail: opensuse-commit+help(a)opensuse.org
1
0
Hello community,
here is the log from the commit of package yast2-iscsi-server
checked in at Mon Sep 29 18:27:31 CEST 2008.
--------
--- yast2-iscsi-server/yast2-iscsi-server.changes 2008-09-08 13:06:29.000000000 +0200
+++ /mounts/work_src_done/STABLE/yast2-iscsi-server/yast2-iscsi-server.changes 2008-09-29 09:31:36.000000000 +0200
@@ -1,0 +2,6 @@
+Mon Sep 29 09:18:47 CEST 2008 - mzugec(a)suse.de
+
+- fixed menu category for gnome (bnc#429431)
+- 2.17.2
+
+-------------------------------------------------------------------
Old:
----
yast2-iscsi-server-2.17.1.tar.bz2
New:
----
yast2-iscsi-server-2.17.2.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ yast2-iscsi-server.spec ++++++
--- /var/tmp/diff_new_pack.nx5819/_old 2008-09-29 18:27:18.000000000 +0200
+++ /var/tmp/diff_new_pack.nx5819/_new 2008-09-29 18:27:18.000000000 +0200
@@ -1,5 +1,5 @@
#
-# spec file for package yast2-iscsi-server (Version 2.17.1)
+# spec file for package yast2-iscsi-server (Version 2.17.2)
#
# Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
@@ -19,12 +19,12 @@
Name: yast2-iscsi-server
-Version: 2.17.1
+Version: 2.17.2
Release: 1
License: GPL v2 or later
Group: System/YaST
BuildRoot: %{_tmppath}/%{name}-%{version}-build
-Source0: yast2-iscsi-server-2.17.1.tar.bz2
+Source0: yast2-iscsi-server-2.17.2.tar.bz2
Prefix: /usr
BuildRequires: docbook-xsl-stylesheets doxygen libxslt perl-XML-Writer popt-devel sgml-skel update-desktop-files yast2 yast2-devtools yast2-packagemanager-devel yast2-perl-bindings yast2-testsuite
Requires: yast2
@@ -37,7 +37,7 @@
%prep
-%setup -n yast2-iscsi-server-2.17.1
+%setup -n yast2-iscsi-server-2.17.2
%build
%{prefix}/bin/y2tool y2autoconf
@@ -71,6 +71,9 @@
/usr/share/YaST2/scrconf/ietd.scr
%doc %{prefix}/share/doc/packages/yast2-iscsi-server
%changelog
+* Mon Sep 29 2008 mzugec(a)suse.de
+- fixed menu category for gnome (bnc#429431)
+- 2.17.2
* Mon Sep 08 2008 mzugec(a)suse.cz
- proofread
- 2.17.1
++++++ yast2-iscsi-server-2.17.1.tar.bz2 -> yast2-iscsi-server-2.17.2.tar.bz2 ++++++
++++ 3017 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/yast2-iscsi-server-2.17.1/configure.in new/yast2-iscsi-server-2.17.2/configure.in
--- old/yast2-iscsi-server-2.17.1/configure.in 2008-09-08 13:03:26.000000000 +0200
+++ new/yast2-iscsi-server-2.17.2/configure.in 2008-09-25 19:47:05.000000000 +0200
@@ -1,9 +1,9 @@
dnl configure.in for yast2-iscsi-server
dnl
-dnl -- This file is generated by y2autoconf 2.17.0 - DO NOT EDIT! --
+dnl -- This file is generated by y2autoconf 2.17.6 - DO NOT EDIT! --
dnl (edit configure.in.in instead)
-AC_INIT(yast2-iscsi-server, 2.16.1, http://bugs.opensuse.org/, yast2-iscsi-server)
+AC_INIT(yast2-iscsi-server, 2.17.1, http://bugs.opensuse.org/, yast2-iscsi-server)
dnl Check for presence of file 'RPMNAME'
AC_CONFIG_SRCDIR([RPMNAME])
@@ -18,7 +18,7 @@
AM_INIT_AUTOMAKE(tar-ustar -Wno-portability)
dnl Important YaST2 variables
-VERSION="2.16.1"
+VERSION="2.17.1"
RPMNAME="yast2-iscsi-server"
MAINTAINER="Michal Zugec <mzugec(a)suse.cz>"
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/yast2-iscsi-server-2.17.1/src/iscsi-server.desktop new/yast2-iscsi-server-2.17.2/src/iscsi-server.desktop
--- old/yast2-iscsi-server-2.17.1/src/iscsi-server.desktop 2008-05-20 12:13:03.000000000 +0200
+++ new/yast2-iscsi-server-2.17.2/src/iscsi-server.desktop 2008-09-25 19:46:54.000000000 +0200
@@ -1,6 +1,6 @@
[Desktop Entry]
Type=Application
-Categories=Settings;System;Qt;X-SuSE-YaST;X-SuSE-YaST-Misc;
+Categories=Settings;System;Qt;X-SuSE-YaST;X-SuSE-YaST-Net_advanced;
X-KDE-ModuleType=Library
X-KDE-RootOnly=true
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/yast2-iscsi-server-2.17.1/VERSION new/yast2-iscsi-server-2.17.2/VERSION
--- old/yast2-iscsi-server-2.17.1/VERSION 2008-09-08 13:05:25.000000000 +0200
+++ new/yast2-iscsi-server-2.17.2/VERSION 2008-09-25 19:48:10.000000000 +0200
@@ -1 +1 @@
-2.17.1
+2.17.2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org
For additional commands, e-mail: opensuse-commit+help(a)opensuse.org
1
0
Hello community,
here is the log from the commit of package yast2-fingerprint-reader
checked in at Mon Sep 29 18:27:16 CEST 2008.
--------
--- yast2-fingerprint-reader/yast2-fingerprint-reader.changes 2008-09-26 16:29:14.000000000 +0200
+++ /mounts/work_src_done/STABLE/yast2-fingerprint-reader/yast2-fingerprint-reader.changes 2008-09-29 16:04:21.795256000 +0200
@@ -1,0 +2,6 @@
+Mon Sep 29 15:51:23 CEST 2008 - jsuchome(a)suse.cz
+
+- check the values returned by agent (fp_enroll_finger_img) in YCP
+- 2.17.2
+
+-------------------------------------------------------------------
Old:
----
yast2-fingerprint-reader-2.17.1.tar.bz2
New:
----
yast2-fingerprint-reader-2.17.2.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ yast2-fingerprint-reader.spec ++++++
--- /var/tmp/diff_new_pack.mr4979/_old 2008-09-29 18:27:09.000000000 +0200
+++ /var/tmp/diff_new_pack.mr4979/_new 2008-09-29 18:27:09.000000000 +0200
@@ -1,5 +1,5 @@
#
-# spec file for package yast2-fingerprint-reader (Version 2.17.1)
+# spec file for package yast2-fingerprint-reader (Version 2.17.2)
#
# Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
@@ -19,12 +19,12 @@
Name: yast2-fingerprint-reader
-Version: 2.17.1
+Version: 2.17.2
Release: 1
License: GPL v2 or later
Group: System/YaST
BuildRoot: %{_tmppath}/%{name}-%{version}-build
-Source0: yast2-fingerprint-reader-2.17.1.tar.bz2
+Source0: yast2-fingerprint-reader-2.17.2.tar.bz2
Prefix: /usr
Requires: yast2 yast2-pam
BuildRequires: libfprint-devel libfprint0 libusb-devel
@@ -44,7 +44,7 @@
Jiri Suchomel <jsuchome(a)suse.cz>
%prep
-%setup -n yast2-fingerprint-reader-2.17.1
+%setup -n yast2-fingerprint-reader-2.17.2
%build
%{prefix}/bin/y2tool y2autoconf
@@ -80,6 +80,9 @@
%{_libdir}/YaST2/plugin/libpy2ag_fprint.*
%doc %{prefix}/share/doc/packages/yast2-fingerprint-reader
%changelog
+* Mon Sep 29 2008 jsuchome(a)suse.cz
+- check the values returned by agent (fp_enroll_finger_img) in YCP
+- 2.17.2
* Fri Sep 26 2008 jsuchome(a)suse.cz
- initial version of agent based on linfprint library (fate#300416)
- 2.17.1
++++++ yast2-fingerprint-reader-2.17.1.tar.bz2 -> yast2-fingerprint-reader-2.17.2.tar.bz2 ++++++
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-fingerprint-reader-2.17.1/agent-fprint/src/FPrintAgent.cc new/yast2-fingerprint-reader-2.17.2/agent-fprint/src/FPrintAgent.cc
--- old/yast2-fingerprint-reader-2.17.1/agent-fprint/src/FPrintAgent.cc 2008-09-26 16:17:45.000000000 +0200
+++ new/yast2-fingerprint-reader-2.17.2/agent-fprint/src/FPrintAgent.cc 2008-09-29 15:49:37.000000000 +0200
@@ -135,11 +135,16 @@
sleep (1);
y2internal ("Scan your finger now.");
+ // FIXME not possible, this is total number of stages
+ y2milestone ("remaining stages: %d", fp_dev_get_nr_enroll_stages(dev));
+
r = fp_enroll_finger (dev, &enrolled_print);
if (r < 0) {
y2error ("Enroll failed with error %d", r);
-// break; FIXME what now?
+ instance().finalize ();
+ signal (15, SIG_DFL);
+ return r;
}
y2internal ("retval: %d", r);
if (write (write_fd, &r, sizeof (int)) == -1)
@@ -152,8 +157,9 @@
break;
case FP_ENROLL_FAIL:
y2milestone("Enroll failed, something wen't wrong :(");
-// return NULL; FIXME
- break;
+ instance().finalize ();
+ signal (15, SIG_DFL);
+ return r;
case FP_ENROLL_PASS:
y2milestone("Enroll stage passed. Yay!");
break;
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-fingerprint-reader-2.17.1/src/users_plugin_fingerprint_reader.ycp new/yast2-fingerprint-reader-2.17.2/src/users_plugin_fingerprint_reader.ycp
--- old/yast2-fingerprint-reader-2.17.1/src/users_plugin_fingerprint_reader.ycp 2008-09-26 16:17:45.000000000 +0200
+++ new/yast2-fingerprint-reader-2.17.2/src/users_plugin_fingerprint_reader.ycp 2008-09-29 15:49:37.000000000 +0200
@@ -12,7 +12,7 @@
* Authors:
* Jiri Suchomel <jsuchome(a)suse.cz>
*
- * $Id: users_plugin_fingerprint_reader.ycp 51598 2008-09-26 14:05:42Z jsuchome $
+ * $Id: users_plugin_fingerprint_reader.ycp 51656 2008-09-29 13:50:29Z jsuchome $
*/
{
@@ -117,6 +117,7 @@
}
// helper function, form the string for UI from actuall data
+ // FIXME we don't know number of remaining swipes...
void replace_swipe_string () {
UI::ReplaceWidget (`id (`rpstatus), `Label (
@@ -125,6 +126,14 @@
swipe_success, swipe_failed)
));
}
+
+
+ void status_message (string label, string message) {
+ UI::ReplaceWidget (`id (`rp), `Label (label));
+ UI::ReplaceWidget (`id (`rpstatus), `Label (message));
+ }
+
+
if (SCR::Execute (.fprint.enroll, bir_path) != true)
{
ui = `cancel;
@@ -132,13 +141,16 @@
UI::ReplaceWidget (`id (`rp),
`Label (_("Initialization of fingerprint reader failed.")));
}
+// FIXME show generic message... the user can enroll finger
while (ui != `cancel)
{
map statemap = (map) SCR::Read (.fprint.state);
if (statemap != nil && statemap != $[])
{
integer state = statemap["state"]:0;
+y2security ("state: %1", state);
switch (state) {
+ /*
case 8: { // TF_STATE_ACQUIRE_SUCCESS
UI::ReplaceWidget (`id (`rp),
// status label
@@ -176,7 +188,7 @@
replace_swipe_string ();
break;
}
-
+ */
case 1: { // FP_ENROLL_COMPLETE
UI::ReplaceWidget (`id (`rp),
// status label
@@ -185,13 +197,70 @@
exit = true;
break;
}
- case -1: { // FP_ENROLL_FAIL FIXME
- UI::ReplaceWidget (`id (`rp),
- `Label (_("Acquiring fingerprint failed.")));
+ case 2: { // FP_ENROLL_FAILED ?? FIXME
+ status_message (
+ // status label
+ _("Scan failed."),
+ // status message
+ _("Swipe finger again."));
+ break;
+ }
+ case 3: { // FP_ENROLL_PASS
+ swipe_success = swipe_success + 1;
+// replace_swipe_string ();
+
+ status_message (
+ // status label
+ _("Enroll stage passed."),
+ // status message
+ _("Swipe finger again."));
+ break;
+ }
+ case 101: { // FP_ENROLL_RETRY_TOO_SHORT:
+
+ status_message (
+ // status label
+ _("Scan failed."),
+ // status message
+ _("Swipe was too short, try again."));
+ break;
+ }
+ case 102: { // FP_ENROLL_RETRY_CENTER_FINGER:
+
+ status_message (
+ // status label
+ _("Scan failed."),
+ // status message
+ _("Center your finger on the sensor and try again."));
+ break;
+ }
+ case 103: { // FP_ENROLL_RETRY_REMOVE_FINGER:
+
+ // status message
+ status_message (
+ // status label
+ _("Scan failed."),
+ // status message
+ _("Remove your finger and try again."));
+ break;
+ }
+ case -1: { // FP_ENROLL_FAIL
+ // some fatal error
+ status_message (
+ // status label
+ _("Acquiring fingerprint failed."), "");
exit = true;
break;
}
}
+ if (state < -1)
+ {
+ // some fatal error
+ status_message (
+ // status label
+ _("Acquiring fingerprint failed."), "");
+ exit = true;
+ }
}
else if (statemap == nil)
{
@@ -217,10 +286,6 @@
sleep (100);
}
y2milestone ("agent exit status: %1", exit_status);
-// FIXME FIXME
- // 9 is failed acquire, 253 is USB error, 254 communication error
- // FIXME what's the meaning of TF_STATE_ENROLL_SUCCESS (7)?
-// if (exit_status == 7 || exit_status == 8)
if (exit_status == 1)
{
// status label
@@ -253,6 +318,7 @@
ret = UI::UserInput ();
if (ret == `next)
{
+ // FIXME no bir file can be defined yet FIXME
// modified data to add to user
map<string, any> tmp_data = $[
"bir_file" : username,
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-fingerprint-reader-2.17.1/VERSION new/yast2-fingerprint-reader-2.17.2/VERSION
--- old/yast2-fingerprint-reader-2.17.1/VERSION 2008-09-26 16:18:27.000000000 +0200
+++ new/yast2-fingerprint-reader-2.17.2/VERSION 2008-09-29 15:53:13.000000000 +0200
@@ -1 +1 @@
-2.17.1
+2.17.2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org
For additional commands, e-mail: opensuse-commit+help(a)opensuse.org
1
0
Hello community,
here is the log from the commit of package yast2-country
checked in at Mon Sep 29 18:27:10 CEST 2008.
--------
--- yast2-country/yast2-country.changes 2008-09-26 16:34:12.000000000 +0200
+++ /mounts/work_src_done/STABLE/yast2-country/yast2-country.changes 2008-09-29 16:05:26.795059000 +0200
@@ -1,0 +2,6 @@
+Mon Sep 29 15:50:31 CEST 2008 - jsuchome(a)suse.cz
+
+- save system time from ntpdate to HW clock (#429079)
+- 2.17.14
+
+-------------------------------------------------------------------
Old:
----
yast2-country-2.17.13.tar.bz2
New:
----
yast2-country-2.17.14.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ yast2-country.spec ++++++
--- /var/tmp/diff_new_pack.DB3959/_old 2008-09-29 18:26:54.000000000 +0200
+++ /var/tmp/diff_new_pack.DB3959/_new 2008-09-29 18:26:54.000000000 +0200
@@ -1,5 +1,5 @@
#
-# spec file for package yast2-country (Version 2.17.13)
+# spec file for package yast2-country (Version 2.17.14)
#
# Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
@@ -19,12 +19,12 @@
Name: yast2-country
-Version: 2.17.13
+Version: 2.17.14
Release: 1
License: GPL v2 or later
Group: System/YaST
BuildRoot: %{_tmppath}/%{name}-%{version}-build
-Source0: yast2-country-2.17.13.tar.bz2
+Source0: yast2-country-2.17.14.tar.bz2
Prefix: /usr
BuildRequires: perl-XML-Writer update-desktop-files yast2 yast2-devtools yast2-perl-bindings yast2-testsuite
Requires: yast2-trans-stats yast2-perl-bindings timezone
@@ -75,7 +75,7 @@
Jiri Suchomel <jsuchome(a)suse.cz>
%prep
-%setup -n yast2-country-2.17.13
+%setup -n yast2-country-2.17.14
%build
%{prefix}/bin/y2tool y2autoconf
@@ -143,6 +143,9 @@
/usr/share/YaST2/data/languages/*.ycp
/usr/share/YaST2/modules/Language.y*
%changelog
+* Mon Sep 29 2008 jsuchome(a)suse.cz
+- save system time from ntpdate to HW clock (#429079)
+- 2.17.14
* Fri Sep 26 2008 jsuchome(a)suse.cz
- added Georgian language support
- 2.17.13
++++++ yast2-country-2.17.13.tar.bz2 -> yast2-country-2.17.14.tar.bz2 ++++++
++++ 7507 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/yast2-country-2.17.13/timezone/src/dialogs.ycp new/yast2-country-2.17.14/timezone/src/dialogs.ycp
--- old/yast2-country-2.17.13/timezone/src/dialogs.ycp 2008-09-26 16:20:57.000000000 +0200
+++ new/yast2-country-2.17.14/timezone/src/dialogs.ycp 2008-09-29 15:32:52.000000000 +0200
@@ -486,7 +486,8 @@
// read NTP status
- if (first_run && NetworkService::isNetworkRunning())
+ if (first_run && NetworkService::isNetworkRunning() &&
+ !GetInstArgs::going_back())
{
// true by default (fate#303520)
ntp_used = true;
@@ -512,6 +513,7 @@
}
else
{
+ Timezone::SystemTime2HWClock ();
y2milestone ("proposing NTP server %1", server);
WFM::CallFunction ("ntp-client_proposal",
[ "SetUseNTP", $["ntp_used" : ntp_used] ]);
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/yast2-country-2.17.13/VERSION new/yast2-country-2.17.14/VERSION
--- old/yast2-country-2.17.13/VERSION 2008-09-26 16:27:04.000000000 +0200
+++ new/yast2-country-2.17.14/VERSION 2008-09-29 15:51:16.000000000 +0200
@@ -1 +1 @@
-2.17.13
+2.17.14
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org
For additional commands, e-mail: opensuse-commit+help(a)opensuse.org
1
0
Hello community,
here is the log from the commit of package yast2
checked in at Mon Sep 29 18:26:59 CEST 2008.
--------
--- yast2/yast2.changes 2008-09-26 16:01:12.000000000 +0200
+++ /mounts/work_src_done/STABLE/yast2/yast2.changes 2008-09-29 14:34:02.000000000 +0200
@@ -1,0 +2,13 @@
+Fri Sep 29 14:55:50 CEST 2008 - tgoettlicher(a)suse.de
+
+- Fixed bnc #418443: Yast modules windows have no title
+- 2.17.34
+
+-------------------------------------------------------------------
+Mon Sep 29 10:38:07 CEST 2008 - locilka(a)suse.cz
+
+- Added possibility to restart YaST from any module by checking for
+ /var/lib/YaST2/restart_yast (FATE #304118).
+- 2.17.33
+
+-------------------------------------------------------------------
Old:
----
yast2-2.17.32.tar.bz2
New:
----
yast2-2.17.34.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ yast2.spec ++++++
--- /var/tmp/diff_new_pack.ft3054/_old 2008-09-29 18:26:13.000000000 +0200
+++ /var/tmp/diff_new_pack.ft3054/_new 2008-09-29 18:26:13.000000000 +0200
@@ -1,5 +1,5 @@
#
-# spec file for package yast2 (Version 2.17.32)
+# spec file for package yast2 (Version 2.17.34)
#
# Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
@@ -19,12 +19,12 @@
Name: yast2
-Version: 2.17.32
+Version: 2.17.34
Release: 1
License: GPL v2 or later
Group: System/YaST
BuildRoot: %{_tmppath}/%{name}-%{version}-build
-Source0: yast2-2.17.32.tar.bz2
+Source0: yast2-2.17.34.tar.bz2
Prefix: /usr
Source1: yast2-rpmlintrc
BuildRequires: perl-XML-Writer update-desktop-files yast2-devtools yast2-perl-bindings yast2-testsuite
@@ -36,7 +36,7 @@
Requires: yast2-core >= 2.17.1
# Mod_UI
# new YButtonBox widget (fate #303446)
-Requires: yast2-ycp-ui-bindings >= 2.17.3
+Requires: yast2-ycp-ui-bindings >= 2.17.8
# changed GPG callbacks
Requires: yast2-pkg-bindings >= 2.17.13
Requires: yast2_ui yast2-branding
@@ -147,7 +147,7 @@
Steffen Winterfeldt <snwint(a)suse.de>
%prep
-%setup -n yast2-2.17.32
+%setup -n yast2-2.17.34
%build
%{prefix}/bin/y2tool y2autoconf
@@ -251,6 +251,13 @@
%doc %{prefix}/share/doc/packages/yast2/types
%doc %{prefix}/share/doc/packages/yast2/wizard
%changelog
+* Mon Sep 29 2008 tgoettlicher(a)suse.de
+- Fixed bnc #418443: Yast modules windows have no title
+- 2.17.34
+* Mon Sep 29 2008 locilka(a)suse.cz
+- Added possibility to restart YaST from any module by checking for
+ /var/lib/YaST2/restart_yast (FATE #304118).
+- 2.17.33
* Fri Sep 26 2008 locilka(a)suse.cz
- Disabling firewall functions in Stage::initial (bnc #429861).
- 2.17.32
++++++ yast2-2.17.32.tar.bz2 -> yast2-2.17.34.tar.bz2 ++++++
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-2.17.32/configure new/yast2-2.17.34/configure
--- old/yast2-2.17.32/configure 2008-09-26 15:57:15.000000000 +0200
+++ new/yast2-2.17.34/configure 2008-08-05 15:51:53.000000000 +0200
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.61 for yast2 2.17.32.
+# Generated by GNU Autoconf 2.61 for yast2 2.17.9.
#
# Report bugs to <http://bugs.opensuse.org/>.
#
@@ -574,8 +574,8 @@
# Identity of this package.
PACKAGE_NAME='yast2'
PACKAGE_TARNAME='yast2'
-PACKAGE_VERSION='2.17.32'
-PACKAGE_STRING='yast2 2.17.32'
+PACKAGE_VERSION='2.17.9'
+PACKAGE_STRING='yast2 2.17.9'
PACKAGE_BUGREPORT='http://bugs.opensuse.org/'
ac_unique_file="RPMNAME"
@@ -690,7 +690,6 @@
YCPC
MYEXPECT
MYRUNTEST
-IFCFG_DIR
LIBOBJS
LTLIBOBJS'
ac_subst_files=''
@@ -1200,7 +1199,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 yast2 2.17.32 to adapt to many kinds of systems.
+\`configure' configures yast2 2.17.9 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1271,7 +1270,7 @@
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of yast2 2.17.32:";;
+ short | recursive ) echo "Configuration of yast2 2.17.9:";;
esac
cat <<\_ACEOF
@@ -1349,7 +1348,7 @@
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-yast2 configure 2.17.32
+yast2 configure 2.17.9
generated by GNU Autoconf 2.61
Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
@@ -1363,7 +1362,7 @@
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
-It was created by yast2 $as_me 2.17.32, which was
+It was created by yast2 $as_me 2.17.9, which was
generated by GNU Autoconf 2.61. Invocation command line was
$ $0 $@
@@ -2184,7 +2183,7 @@
# Define the identity of the package.
PACKAGE='yast2'
- VERSION='2.17.32'
+ VERSION='2.17.9'
cat >>confdefs.h <<_ACEOF
@@ -2412,7 +2411,7 @@
-VERSION="2.17.32"
+VERSION="2.17.9"
RPMNAME="yast2"
MAINTAINER="Jiri Srain <jsrain(a)suse.cz>"
@@ -2968,22 +2967,8 @@
fi
-{ echo "$as_me:$LINENO: checking for ifcfg location" >&5
-echo $ECHO_N "checking for ifcfg location... $ECHO_C" >&6; }
-# fallback, default on openSUSE
-IFCFG_DIR=/etc/sysconfig/network
-for TRY in /etc/sysconfig/network-scripts; do
- if test -d $TRY; then
- IFCFG_DIR=$TRY
- break
- fi
-done
-
-{ echo "$as_me:$LINENO: result: $IFCFG_DIR" >&5
-echo "${ECHO_T}$IFCFG_DIR" >&6; }
-
# also done via makefile
-ac_config_files="$ac_config_files library/modules/Version.ycp library/network/agents/network.scr"
+ac_config_files="$ac_config_files ./library/modules/Version.ycp"
ac_config_files="$ac_config_files Makefile data/Makefile doc/autodocs/Makefile doc/examples/Makefile doc/screenshots/Makefile doc/Makefile library/agents/Makefile library/types/src/Makefile library/types/testsuite/Makefile library/types/doc/autodocs/Makefile library/types/doc/Makefile library/types/Makefile library/modules/testsuite/Makefile library/modules/Makefile library/runlevel/doc/autodocs/Makefile library/runlevel/doc/Makefile library/runlevel/src/Makefile library/runlevel/testsuite/Makefile library/runlevel/Makefile library/sequencer/doc/autodocs/Makefile library/sequencer/doc/images/Makefile library/sequencer/doc/examples/Makefile library/sequencer/doc/Makefile library/sequencer/src/Makefile library/sequencer/testsuite/Makefile library/sequencer/Makefile library/xml/doc/autodocs/Makefile library/xml/doc/Makefile library/xml/src/Makefile library/xml/Makefile library/commandline/agents/Makefile library/commandline/doc/autodocs/Makefile library/commandline/doc/Makefile library/commandline/src/Makefile library/commandline/testsuite/Makefile library/commandline/Makefile library/wizard/doc/autodocs/Makefile library/wizard/doc/examples/Makefile library/wizard/doc/screenshots/Makefile library/wizard/doc/Makefile library/wizard/src/Makefile library/wizard/testsuite/Makefile library/wizard/Makefile library/control/doc/autodocs/Makefile library/control/doc/Makefile library/control/src/Makefile library/control/testsuite/Makefile library/control/Makefile library/cwm/doc/autodocs/Makefile library/cwm/doc/Makefile library/cwm/src/Makefile library/cwm/testsuite/Makefile library/cwm/Makefile library/log/doc/autodocs/Makefile library/log/doc/Makefile library/log/src/Makefile library/log/Makefile library/system/agents/Makefile library/system/doc/autodocs/Makefile library/system/doc/Makefile library/system/src/Makefile library/system/testsuite/Makefile library/system/Makefile library/packages/src/Makefile library/packages/testsuite/Makefile library/packages/doc/autodocs/Makefile library/packages/doc/Makefile library/packages/Makefile library/cron/src/Makefile library/cron/doc/autodocs/Makefile library/cron/doc/Makefile library/cron/Makefile library/desktop/doc/autodocs/Makefile library/desktop/doc/Makefile library/desktop/groups/Makefile library/desktop/src/Makefile library/desktop/Makefile library/network/agents/Makefile library/network/doc/autodocs/Makefile library/network/doc/Makefile library/network/src/Makefile library/network/testsuite/Makefile library/network/Makefile library/gpg/doc/autodocs/Makefile library/gpg/doc/Makefile library/gpg/src/Makefile library/gpg/testsuite/Makefile library/gpg/Makefile library/Makefile remote/Makefile scripts/Makefile"
@@ -3427,7 +3412,7 @@
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
-This file was extended by yast2 $as_me 2.17.32, which was
+This file was extended by yast2 $as_me 2.17.9, which was
generated by GNU Autoconf 2.61. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -3470,7 +3455,7 @@
_ACEOF
cat >>$CONFIG_STATUS <<_ACEOF
ac_cs_version="\\
-yast2 config.status 2.17.32
+yast2 config.status 2.17.9
configured by $0, generated by GNU Autoconf 2.61,
with options \\"`echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"
@@ -3570,8 +3555,7 @@
for ac_config_target in $ac_config_targets
do
case $ac_config_target in
- "library/modules/Version.ycp") CONFIG_FILES="$CONFIG_FILES library/modules/Version.ycp" ;;
- "library/network/agents/network.scr") CONFIG_FILES="$CONFIG_FILES library/network/agents/network.scr" ;;
+ "./library/modules/Version.ycp") CONFIG_FILES="$CONFIG_FILES ./library/modules/Version.ycp" ;;
"Makefile") CONFIG_FILES="$CONFIG_FILES Makefile" ;;
"data/Makefile") CONFIG_FILES="$CONFIG_FILES data/Makefile" ;;
"doc/autodocs/Makefile") CONFIG_FILES="$CONFIG_FILES doc/autodocs/Makefile" ;;
@@ -3874,12 +3858,11 @@
YCPC!$YCPC$ac_delim
MYEXPECT!$MYEXPECT$ac_delim
MYRUNTEST!$MYRUNTEST$ac_delim
-IFCFG_DIR!$IFCFG_DIR$ac_delim
LIBOBJS!$LIBOBJS$ac_delim
LTLIBOBJS!$LTLIBOBJS$ac_delim
_ACEOF
- if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 16; then
+ if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 15; then
break
elif $ac_last_try; then
{ { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-2.17.32/configure.in new/yast2-2.17.34/configure.in
--- old/yast2-2.17.32/configure.in 2008-09-26 15:57:10.000000000 +0200
+++ new/yast2-2.17.34/configure.in 2008-08-05 15:51:48.000000000 +0200
@@ -1,9 +1,9 @@
dnl configure.in for yast2
dnl
-dnl -- This file is generated by y2autoconf 2.17.3 - DO NOT EDIT! --
+dnl -- This file is generated by y2autoconf 2.16.7 - DO NOT EDIT! --
dnl (edit configure.in.in instead)
-AC_INIT(yast2, 2.17.32, http://bugs.opensuse.org/, yast2)
+AC_INIT(yast2, 2.17.9, http://bugs.opensuse.org/, yast2)
dnl Check for presence of file 'RPMNAME'
AC_CONFIG_SRCDIR([RPMNAME])
@@ -18,7 +18,7 @@
AM_INIT_AUTOMAKE(tar-ustar -Wno-portability)
dnl Important YaST2 variables
-VERSION="2.17.32"
+VERSION="2.17.9"
RPMNAME="yast2"
MAINTAINER="Jiri Srain <jsrain(a)suse.cz>"
@@ -170,21 +170,8 @@
fi
-AC_MSG_CHECKING([for ifcfg location])
-# fallback, default on openSUSE
-IFCFG_DIR=/etc/sysconfig/network
-for TRY in /etc/sysconfig/network-scripts; do
- if test -d $TRY; then
- IFCFG_DIR=$TRY
- break
- fi
-done
-AC_SUBST([IFCFG_DIR])
-AC_MSG_RESULT([$IFCFG_DIR])
-
# also done via makefile
-AC_CONFIG_FILES(library/modules/Version.ycp
-library/network/agents/network.scr)
+AC_CONFIG_FILES(./library/modules/Version.ycp)
AC_CONFIG_FILES(Makefile data/Makefile
doc/autodocs/Makefile
doc/examples/Makefile
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-2.17.32/data/Makefile.in new/yast2-2.17.34/data/Makefile.in
--- old/yast2-2.17.32/data/Makefile.in 2008-09-26 15:57:16.000000000 +0200
+++ new/yast2-2.17.34/data/Makefile.in 2008-08-05 15:51:54.000000000 +0200
@@ -76,7 +76,6 @@
ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
ECHO_T = @ECHO_T@
-IFCFG_DIR = @IFCFG_DIR@
INSTALL = @INSTALL@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-2.17.32/doc/autodocs/Makefile.in new/yast2-2.17.34/doc/autodocs/Makefile.in
--- old/yast2-2.17.32/doc/autodocs/Makefile.in 2008-09-26 15:57:16.000000000 +0200
+++ new/yast2-2.17.34/doc/autodocs/Makefile.in 2008-08-05 15:51:55.000000000 +0200
@@ -66,7 +66,6 @@
ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
ECHO_T = @ECHO_T@
-IFCFG_DIR = @IFCFG_DIR@
INSTALL = @INSTALL@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-2.17.32/doc/examples/Makefile.in new/yast2-2.17.34/doc/examples/Makefile.in
--- old/yast2-2.17.32/doc/examples/Makefile.in 2008-09-26 15:57:17.000000000 +0200
+++ new/yast2-2.17.34/doc/examples/Makefile.in 2008-08-05 15:51:55.000000000 +0200
@@ -68,7 +68,6 @@
ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
ECHO_T = @ECHO_T@
-IFCFG_DIR = @IFCFG_DIR@
INSTALL = @INSTALL@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-2.17.32/doc/Makefile.in new/yast2-2.17.34/doc/Makefile.in
--- old/yast2-2.17.32/doc/Makefile.in 2008-09-26 15:57:16.000000000 +0200
+++ new/yast2-2.17.34/doc/Makefile.in 2008-08-05 15:51:55.000000000 +0200
@@ -85,7 +85,6 @@
ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
ECHO_T = @ECHO_T@
-IFCFG_DIR = @IFCFG_DIR@
INSTALL = @INSTALL@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-2.17.32/doc/screenshots/Makefile.in new/yast2-2.17.34/doc/screenshots/Makefile.in
--- old/yast2-2.17.32/doc/screenshots/Makefile.in 2008-09-26 15:57:17.000000000 +0200
+++ new/yast2-2.17.34/doc/screenshots/Makefile.in 2008-08-05 15:51:55.000000000 +0200
@@ -68,7 +68,6 @@
ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
ECHO_T = @ECHO_T@
-IFCFG_DIR = @IFCFG_DIR@
INSTALL = @INSTALL@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-2.17.32/library/agents/Makefile.in new/yast2-2.17.34/library/agents/Makefile.in
--- old/yast2-2.17.32/library/agents/Makefile.in 2008-09-26 15:57:17.000000000 +0200
+++ new/yast2-2.17.34/library/agents/Makefile.in 2008-09-24 13:50:05.000000000 +0200
@@ -70,7 +70,6 @@
ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
ECHO_T = @ECHO_T@
-IFCFG_DIR = @IFCFG_DIR@
INSTALL = @INSTALL@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-2.17.32/library/commandline/agents/Makefile.in new/yast2-2.17.34/library/commandline/agents/Makefile.in
--- old/yast2-2.17.32/library/commandline/agents/Makefile.in 2008-09-26 15:57:17.000000000 +0200
+++ new/yast2-2.17.34/library/commandline/agents/Makefile.in 2008-08-05 15:51:55.000000000 +0200
@@ -71,7 +71,6 @@
ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
ECHO_T = @ECHO_T@
-IFCFG_DIR = @IFCFG_DIR@
INSTALL = @INSTALL@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-2.17.32/library/commandline/doc/autodocs/Makefile.in new/yast2-2.17.34/library/commandline/doc/autodocs/Makefile.in
--- old/yast2-2.17.32/library/commandline/doc/autodocs/Makefile.in 2008-09-26 15:57:17.000000000 +0200
+++ new/yast2-2.17.34/library/commandline/doc/autodocs/Makefile.in 2008-08-05 15:51:55.000000000 +0200
@@ -66,7 +66,6 @@
ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
ECHO_T = @ECHO_T@
-IFCFG_DIR = @IFCFG_DIR@
INSTALL = @INSTALL@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-2.17.32/library/commandline/doc/Makefile.in new/yast2-2.17.34/library/commandline/doc/Makefile.in
--- old/yast2-2.17.32/library/commandline/doc/Makefile.in 2008-09-26 15:57:17.000000000 +0200
+++ new/yast2-2.17.34/library/commandline/doc/Makefile.in 2008-08-05 15:51:55.000000000 +0200
@@ -78,7 +78,6 @@
ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
ECHO_T = @ECHO_T@
-IFCFG_DIR = @IFCFG_DIR@
INSTALL = @INSTALL@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-2.17.32/library/commandline/Makefile.in new/yast2-2.17.34/library/commandline/Makefile.in
--- old/yast2-2.17.32/library/commandline/Makefile.in 2008-09-26 15:57:17.000000000 +0200
+++ new/yast2-2.17.34/library/commandline/Makefile.in 2008-08-05 15:51:55.000000000 +0200
@@ -70,7 +70,6 @@
ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
ECHO_T = @ECHO_T@
-IFCFG_DIR = @IFCFG_DIR@
INSTALL = @INSTALL@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-2.17.32/library/commandline/src/Makefile.in new/yast2-2.17.34/library/commandline/src/Makefile.in
--- old/yast2-2.17.32/library/commandline/src/Makefile.in 2008-09-26 15:57:17.000000000 +0200
+++ new/yast2-2.17.34/library/commandline/src/Makefile.in 2008-08-05 15:51:56.000000000 +0200
@@ -73,7 +73,6 @@
ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
ECHO_T = @ECHO_T@
-IFCFG_DIR = @IFCFG_DIR@
INSTALL = @INSTALL@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-2.17.32/library/commandline/testsuite/Makefile.in new/yast2-2.17.34/library/commandline/testsuite/Makefile.in
--- old/yast2-2.17.32/library/commandline/testsuite/Makefile.in 2008-09-26 15:57:17.000000000 +0200
+++ new/yast2-2.17.34/library/commandline/testsuite/Makefile.in 2008-08-05 15:51:56.000000000 +0200
@@ -64,7 +64,6 @@
ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
ECHO_T = @ECHO_T@
-IFCFG_DIR = @IFCFG_DIR@
INSTALL = @INSTALL@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-2.17.32/library/control/doc/autodocs/Makefile.in new/yast2-2.17.34/library/control/doc/autodocs/Makefile.in
--- old/yast2-2.17.32/library/control/doc/autodocs/Makefile.in 2008-09-26 15:57:17.000000000 +0200
+++ new/yast2-2.17.34/library/control/doc/autodocs/Makefile.in 2008-08-05 15:51:56.000000000 +0200
@@ -68,7 +68,6 @@
ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
ECHO_T = @ECHO_T@
-IFCFG_DIR = @IFCFG_DIR@
INSTALL = @INSTALL@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-2.17.32/library/control/doc/Makefile.in new/yast2-2.17.34/library/control/doc/Makefile.in
--- old/yast2-2.17.32/library/control/doc/Makefile.in 2008-09-26 15:57:17.000000000 +0200
+++ new/yast2-2.17.34/library/control/doc/Makefile.in 2008-08-05 15:51:56.000000000 +0200
@@ -81,7 +81,6 @@
ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
ECHO_T = @ECHO_T@
-IFCFG_DIR = @IFCFG_DIR@
INSTALL = @INSTALL@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-2.17.32/library/control/Makefile.in new/yast2-2.17.34/library/control/Makefile.in
--- old/yast2-2.17.32/library/control/Makefile.in 2008-09-26 15:57:17.000000000 +0200
+++ new/yast2-2.17.34/library/control/Makefile.in 2008-08-05 15:51:56.000000000 +0200
@@ -70,7 +70,6 @@
ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
ECHO_T = @ECHO_T@
-IFCFG_DIR = @IFCFG_DIR@
INSTALL = @INSTALL@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-2.17.32/library/control/src/Makefile.in new/yast2-2.17.34/library/control/src/Makefile.in
--- old/yast2-2.17.32/library/control/src/Makefile.in 2008-09-26 15:57:18.000000000 +0200
+++ new/yast2-2.17.34/library/control/src/Makefile.in 2008-08-05 15:51:56.000000000 +0200
@@ -73,7 +73,6 @@
ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
ECHO_T = @ECHO_T@
-IFCFG_DIR = @IFCFG_DIR@
INSTALL = @INSTALL@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-2.17.32/library/control/testsuite/Makefile.in new/yast2-2.17.34/library/control/testsuite/Makefile.in
--- old/yast2-2.17.32/library/control/testsuite/Makefile.in 2008-09-26 15:57:18.000000000 +0200
+++ new/yast2-2.17.34/library/control/testsuite/Makefile.in 2008-08-05 15:51:56.000000000 +0200
@@ -64,7 +64,6 @@
ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
ECHO_T = @ECHO_T@
-IFCFG_DIR = @IFCFG_DIR@
INSTALL = @INSTALL@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-2.17.32/library/cron/doc/autodocs/Makefile.in new/yast2-2.17.34/library/cron/doc/autodocs/Makefile.in
--- old/yast2-2.17.32/library/cron/doc/autodocs/Makefile.in 2008-09-26 15:57:18.000000000 +0200
+++ new/yast2-2.17.34/library/cron/doc/autodocs/Makefile.in 2008-08-05 15:51:56.000000000 +0200
@@ -66,7 +66,6 @@
ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
ECHO_T = @ECHO_T@
-IFCFG_DIR = @IFCFG_DIR@
INSTALL = @INSTALL@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-2.17.32/library/cron/doc/Makefile.in new/yast2-2.17.34/library/cron/doc/Makefile.in
--- old/yast2-2.17.32/library/cron/doc/Makefile.in 2008-09-26 15:57:18.000000000 +0200
+++ new/yast2-2.17.34/library/cron/doc/Makefile.in 2008-08-05 15:51:56.000000000 +0200
@@ -78,7 +78,6 @@
ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
ECHO_T = @ECHO_T@
-IFCFG_DIR = @IFCFG_DIR@
INSTALL = @INSTALL@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-2.17.32/library/cron/Makefile.in new/yast2-2.17.34/library/cron/Makefile.in
--- old/yast2-2.17.32/library/cron/Makefile.in 2008-09-26 15:57:18.000000000 +0200
+++ new/yast2-2.17.34/library/cron/Makefile.in 2008-08-05 15:51:56.000000000 +0200
@@ -66,7 +66,6 @@
ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
ECHO_T = @ECHO_T@
-IFCFG_DIR = @IFCFG_DIR@
INSTALL = @INSTALL@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-2.17.32/library/cron/src/Makefile.in new/yast2-2.17.34/library/cron/src/Makefile.in
--- old/yast2-2.17.32/library/cron/src/Makefile.in 2008-09-26 15:57:18.000000000 +0200
+++ new/yast2-2.17.34/library/cron/src/Makefile.in 2008-08-05 15:51:57.000000000 +0200
@@ -78,7 +78,6 @@
ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
ECHO_T = @ECHO_T@
-IFCFG_DIR = @IFCFG_DIR@
INSTALL = @INSTALL@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-2.17.32/library/cwm/doc/autodocs/Makefile.in new/yast2-2.17.34/library/cwm/doc/autodocs/Makefile.in
--- old/yast2-2.17.32/library/cwm/doc/autodocs/Makefile.in 2008-09-26 15:57:18.000000000 +0200
+++ new/yast2-2.17.34/library/cwm/doc/autodocs/Makefile.in 2008-08-05 15:51:57.000000000 +0200
@@ -66,7 +66,6 @@
ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
ECHO_T = @ECHO_T@
-IFCFG_DIR = @IFCFG_DIR@
INSTALL = @INSTALL@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-2.17.32/library/cwm/doc/Makefile.in new/yast2-2.17.34/library/cwm/doc/Makefile.in
--- old/yast2-2.17.32/library/cwm/doc/Makefile.in 2008-09-26 15:57:18.000000000 +0200
+++ new/yast2-2.17.34/library/cwm/doc/Makefile.in 2008-08-05 15:51:57.000000000 +0200
@@ -78,7 +78,6 @@
ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
ECHO_T = @ECHO_T@
-IFCFG_DIR = @IFCFG_DIR@
INSTALL = @INSTALL@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-2.17.32/library/cwm/Makefile.in new/yast2-2.17.34/library/cwm/Makefile.in
--- old/yast2-2.17.32/library/cwm/Makefile.in 2008-09-26 15:57:18.000000000 +0200
+++ new/yast2-2.17.34/library/cwm/Makefile.in 2008-08-05 15:51:57.000000000 +0200
@@ -66,7 +66,6 @@
ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
ECHO_T = @ECHO_T@
-IFCFG_DIR = @IFCFG_DIR@
INSTALL = @INSTALL@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-2.17.32/library/cwm/src/Makefile.in new/yast2-2.17.34/library/cwm/src/Makefile.in
--- old/yast2-2.17.32/library/cwm/src/Makefile.in 2008-09-26 15:57:18.000000000 +0200
+++ new/yast2-2.17.34/library/cwm/src/Makefile.in 2008-09-25 15:57:52.000000000 +0200
@@ -71,7 +71,6 @@
ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
ECHO_T = @ECHO_T@
-IFCFG_DIR = @IFCFG_DIR@
INSTALL = @INSTALL@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-2.17.32/library/cwm/testsuite/Makefile.in new/yast2-2.17.34/library/cwm/testsuite/Makefile.in
--- old/yast2-2.17.32/library/cwm/testsuite/Makefile.in 2008-09-26 15:57:19.000000000 +0200
+++ new/yast2-2.17.34/library/cwm/testsuite/Makefile.in 2008-08-05 15:51:57.000000000 +0200
@@ -64,7 +64,6 @@
ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
ECHO_T = @ECHO_T@
-IFCFG_DIR = @IFCFG_DIR@
INSTALL = @INSTALL@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-2.17.32/library/desktop/doc/autodocs/Makefile.in new/yast2-2.17.34/library/desktop/doc/autodocs/Makefile.in
--- old/yast2-2.17.32/library/desktop/doc/autodocs/Makefile.in 2008-09-26 15:57:19.000000000 +0200
+++ new/yast2-2.17.34/library/desktop/doc/autodocs/Makefile.in 2008-08-05 15:51:57.000000000 +0200
@@ -66,7 +66,6 @@
ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
ECHO_T = @ECHO_T@
-IFCFG_DIR = @IFCFG_DIR@
INSTALL = @INSTALL@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-2.17.32/library/desktop/doc/Makefile.in new/yast2-2.17.34/library/desktop/doc/Makefile.in
--- old/yast2-2.17.32/library/desktop/doc/Makefile.in 2008-09-26 15:57:19.000000000 +0200
+++ new/yast2-2.17.34/library/desktop/doc/Makefile.in 2008-08-05 15:51:57.000000000 +0200
@@ -78,7 +78,6 @@
ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
ECHO_T = @ECHO_T@
-IFCFG_DIR = @IFCFG_DIR@
INSTALL = @INSTALL@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-2.17.32/library/desktop/groups/Makefile.in new/yast2-2.17.34/library/desktop/groups/Makefile.in
--- old/yast2-2.17.32/library/desktop/groups/Makefile.in 2008-09-26 15:57:19.000000000 +0200
+++ new/yast2-2.17.34/library/desktop/groups/Makefile.in 2008-08-05 15:51:57.000000000 +0200
@@ -66,7 +66,6 @@
ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
ECHO_T = @ECHO_T@
-IFCFG_DIR = @IFCFG_DIR@
INSTALL = @INSTALL@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-2.17.32/library/desktop/Makefile.in new/yast2-2.17.34/library/desktop/Makefile.in
--- old/yast2-2.17.32/library/desktop/Makefile.in 2008-09-26 15:57:19.000000000 +0200
+++ new/yast2-2.17.34/library/desktop/Makefile.in 2008-08-05 15:51:57.000000000 +0200
@@ -68,7 +68,6 @@
ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
ECHO_T = @ECHO_T@
-IFCFG_DIR = @IFCFG_DIR@
INSTALL = @INSTALL@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-2.17.32/library/desktop/src/Makefile.in new/yast2-2.17.34/library/desktop/src/Makefile.in
--- old/yast2-2.17.32/library/desktop/src/Makefile.in 2008-09-26 15:57:19.000000000 +0200
+++ new/yast2-2.17.34/library/desktop/src/Makefile.in 2008-08-05 15:51:58.000000000 +0200
@@ -73,7 +73,6 @@
ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
ECHO_T = @ECHO_T@
-IFCFG_DIR = @IFCFG_DIR@
INSTALL = @INSTALL@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-2.17.32/library/gpg/doc/autodocs/Makefile.in new/yast2-2.17.34/library/gpg/doc/autodocs/Makefile.in
--- old/yast2-2.17.32/library/gpg/doc/autodocs/Makefile.in 2008-09-26 15:57:19.000000000 +0200
+++ new/yast2-2.17.34/library/gpg/doc/autodocs/Makefile.in 2008-08-05 15:51:58.000000000 +0200
@@ -66,7 +66,6 @@
ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
ECHO_T = @ECHO_T@
-IFCFG_DIR = @IFCFG_DIR@
INSTALL = @INSTALL@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-2.17.32/library/gpg/doc/Makefile.in new/yast2-2.17.34/library/gpg/doc/Makefile.in
--- old/yast2-2.17.32/library/gpg/doc/Makefile.in 2008-09-26 15:57:19.000000000 +0200
+++ new/yast2-2.17.34/library/gpg/doc/Makefile.in 2008-08-05 15:51:58.000000000 +0200
@@ -78,7 +78,6 @@
ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
ECHO_T = @ECHO_T@
-IFCFG_DIR = @IFCFG_DIR@
INSTALL = @INSTALL@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-2.17.32/library/gpg/Makefile.in new/yast2-2.17.34/library/gpg/Makefile.in
--- old/yast2-2.17.32/library/gpg/Makefile.in 2008-09-26 15:57:19.000000000 +0200
+++ new/yast2-2.17.34/library/gpg/Makefile.in 2008-08-05 15:51:58.000000000 +0200
@@ -70,7 +70,6 @@
ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
ECHO_T = @ECHO_T@
-IFCFG_DIR = @IFCFG_DIR@
INSTALL = @INSTALL@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-2.17.32/library/gpg/src/Makefile.in new/yast2-2.17.34/library/gpg/src/Makefile.in
--- old/yast2-2.17.32/library/gpg/src/Makefile.in 2008-09-26 15:57:19.000000000 +0200
+++ new/yast2-2.17.34/library/gpg/src/Makefile.in 2008-08-05 15:51:58.000000000 +0200
@@ -73,7 +73,6 @@
ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
ECHO_T = @ECHO_T@
-IFCFG_DIR = @IFCFG_DIR@
INSTALL = @INSTALL@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-2.17.32/library/gpg/testsuite/Makefile.in new/yast2-2.17.34/library/gpg/testsuite/Makefile.in
--- old/yast2-2.17.32/library/gpg/testsuite/Makefile.in 2008-09-26 15:57:19.000000000 +0200
+++ new/yast2-2.17.34/library/gpg/testsuite/Makefile.in 2008-08-05 15:51:58.000000000 +0200
@@ -64,7 +64,6 @@
ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
ECHO_T = @ECHO_T@
-IFCFG_DIR = @IFCFG_DIR@
INSTALL = @INSTALL@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-2.17.32/library/log/doc/autodocs/Makefile.in new/yast2-2.17.34/library/log/doc/autodocs/Makefile.in
--- old/yast2-2.17.32/library/log/doc/autodocs/Makefile.in 2008-09-26 15:57:20.000000000 +0200
+++ new/yast2-2.17.34/library/log/doc/autodocs/Makefile.in 2008-08-05 15:51:58.000000000 +0200
@@ -66,7 +66,6 @@
ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
ECHO_T = @ECHO_T@
-IFCFG_DIR = @IFCFG_DIR@
INSTALL = @INSTALL@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-2.17.32/library/log/doc/Makefile.in new/yast2-2.17.34/library/log/doc/Makefile.in
--- old/yast2-2.17.32/library/log/doc/Makefile.in 2008-09-26 15:57:20.000000000 +0200
+++ new/yast2-2.17.34/library/log/doc/Makefile.in 2008-08-05 15:51:58.000000000 +0200
@@ -78,7 +78,6 @@
ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
ECHO_T = @ECHO_T@
-IFCFG_DIR = @IFCFG_DIR@
INSTALL = @INSTALL@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-2.17.32/library/log/Makefile.in new/yast2-2.17.34/library/log/Makefile.in
--- old/yast2-2.17.32/library/log/Makefile.in 2008-09-26 15:57:19.000000000 +0200
+++ new/yast2-2.17.34/library/log/Makefile.in 2008-08-05 15:51:58.000000000 +0200
@@ -66,7 +66,6 @@
ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
ECHO_T = @ECHO_T@
-IFCFG_DIR = @IFCFG_DIR@
INSTALL = @INSTALL@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-2.17.32/library/log/src/Makefile.in new/yast2-2.17.34/library/log/src/Makefile.in
--- old/yast2-2.17.32/library/log/src/Makefile.in 2008-09-26 15:57:20.000000000 +0200
+++ new/yast2-2.17.34/library/log/src/Makefile.in 2008-09-24 14:03:29.000000000 +0200
@@ -71,7 +71,6 @@
ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
ECHO_T = @ECHO_T@
-IFCFG_DIR = @IFCFG_DIR@
INSTALL = @INSTALL@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-2.17.32/library/Makefile.in new/yast2-2.17.34/library/Makefile.in
--- old/yast2-2.17.32/library/Makefile.in 2008-09-26 15:57:17.000000000 +0200
+++ new/yast2-2.17.34/library/Makefile.in 2008-08-05 15:51:55.000000000 +0200
@@ -68,7 +68,6 @@
ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
ECHO_T = @ECHO_T@
-IFCFG_DIR = @IFCFG_DIR@
INSTALL = @INSTALL@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-2.17.32/library/modules/Makefile.in new/yast2-2.17.34/library/modules/Makefile.in
--- old/yast2-2.17.32/library/modules/Makefile.in 2008-09-26 15:57:20.000000000 +0200
+++ new/yast2-2.17.34/library/modules/Makefile.in 2008-08-05 15:51:59.000000000 +0200
@@ -39,14 +39,14 @@
host_triplet = @host@
target_triplet = @target@
DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
- $(srcdir)/Version.ycp.in $(top_srcdir)/Makefile.am.common
+ $(top_srcdir)/Makefile.am.common
subdir = library/modules
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
am__aclocal_m4_deps = $(top_srcdir)/configure.in
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
mkinstalldirs = $(install_sh) -d
-CONFIG_CLEAN_FILES = Version.ycp
+CONFIG_CLEAN_FILES =
SOURCES =
DIST_SOURCES =
RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
@@ -83,7 +83,6 @@
ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
ECHO_T = @ECHO_T@
-IFCFG_DIR = @IFCFG_DIR@
INSTALL = @INSTALL@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
@@ -239,8 +238,6 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
$(ACLOCAL_M4): $(am__aclocal_m4_deps)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-Version.ycp: $(top_builddir)/config.status $(srcdir)/Version.ycp.in
- cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
install-moduleDATA: $(module_DATA)
@$(NORMAL_INSTALL)
test -z "$(moduledir)" || $(MKDIR_P) "$(DESTDIR)$(moduledir)"
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-2.17.32/library/modules/testsuite/Makefile.in new/yast2-2.17.34/library/modules/testsuite/Makefile.in
--- old/yast2-2.17.32/library/modules/testsuite/Makefile.in 2008-09-26 15:57:20.000000000 +0200
+++ new/yast2-2.17.34/library/modules/testsuite/Makefile.in 2008-08-05 15:51:59.000000000 +0200
@@ -64,7 +64,6 @@
ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
ECHO_T = @ECHO_T@
-IFCFG_DIR = @IFCFG_DIR@
INSTALL = @INSTALL@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-2.17.32/library/modules/Version.ycp new/yast2-2.17.34/library/modules/Version.ycp
--- old/yast2-2.17.32/library/modules/Version.ycp 2008-09-26 15:57:26.000000000 +0200
+++ new/yast2-2.17.34/library/modules/Version.ycp 2008-09-29 14:31:04.000000000 +0200
@@ -20,7 +20,7 @@
/**
* Version of the yast2 package
*/
-global string yast2 = "2.17.32";
+global string yast2 = "2.17.34";
/* EOF */
}
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-2.17.32/library/network/agents/Makefile.in new/yast2-2.17.34/library/network/agents/Makefile.in
--- old/yast2-2.17.32/library/network/agents/Makefile.in 2008-09-26 15:57:20.000000000 +0200
+++ new/yast2-2.17.34/library/network/agents/Makefile.in 2008-09-24 14:03:47.000000000 +0200
@@ -38,14 +38,13 @@
host_triplet = @host@
target_triplet = @target@
subdir = library/network/agents
-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
- $(srcdir)/network.scr.in
+DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
am__aclocal_m4_deps = $(top_srcdir)/configure.in
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
mkinstalldirs = $(install_sh) -d
-CONFIG_CLEAN_FILES = network.scr
+CONFIG_CLEAN_FILES =
SOURCES =
DIST_SOURCES =
am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
@@ -69,7 +68,6 @@
ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
ECHO_T = @ECHO_T@
-IFCFG_DIR = @IFCFG_DIR@
INSTALL = @INSTALL@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
@@ -210,8 +208,6 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
$(ACLOCAL_M4): $(am__aclocal_m4_deps)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-network.scr: $(top_builddir)/config.status $(srcdir)/network.scr.in
- cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
install-scrconfDATA: $(scrconf_DATA)
@$(NORMAL_INSTALL)
test -z "$(scrconfdir)" || $(MKDIR_P) "$(DESTDIR)$(scrconfdir)"
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-2.17.32/library/network/agents/network.scr.in new/yast2-2.17.34/library/network/agents/network.scr.in
--- old/yast2-2.17.32/library/network/agents/network.scr.in 2008-09-09 16:39:04.000000000 +0200
+++ new/yast2-2.17.34/library/network/agents/network.scr.in 1970-01-01 01:00:00.000000000 +0100
@@ -1,44 +0,0 @@
-// @configure_input@
-/**
- * File: network.scr
- * Summary: Agent for @IFCFG_DIR@/ifcfg-*
- * Author: Michal Svec <msvec(a)suse.cz>
- * Modified: Wenji Huang <wenji.huang(a)oracle.com>
- * Access: read / write
- * See: sysconfig.rpm
- *
- * General syntax:
- * # comment0
- * VAR1=val1 # comment1
- * VAR2="val 2 #blah" # comment2
- * VAR3='val3 x #blah2' # comment3
- *
- * $Id: network.scr.in 49978 2008-08-12 10:45:02Z mvidner $
- *
- * <p>Reads/writes <tt>@IFCFG_DIR@/ifcfg-*</tt>. For more details
- * see its own documentation.</p>
- */
-.network
-
-`ag_ini(
- `IniAgent( [ "@IFCFG_DIR@/ifcfg-*" ],
- $[
- /* values at the top level, allow comments after value */
- "options" : [ "global_values", "comments_last" ],
- /* empty lines, comments after value and whole-line comments */
- "comments" : [ "^[ \t]*$", "[ \t]*#.*$", "^[ \t]*#.*$" ],
- /* matching rules */
- "params" : [
- /* VAR1="val1 'bal x" */
- $[ "match" : [ "^[ \t]*([a-zA-Z_][a-zA-Z0-9_]*)=\"([^\"`\\$]*)\"", "%s='%s'" ] ],
- /* VAR1='val1 xxx" xx' */
- $[ "match" : [ "^[ \t]*([a-zA-Z_][a-zA-Z0-9_]*)='([^']*)'", "%s='%s'" ] ],
- /* VAR1=val1 */
- $[ "match" : [ "^[ \t]*([a-zA-Z_][a-zA-Z0-9_]*)=([^ \t\"$`'\\#]*)", "%s='%s'" ] ],
- ],
- /* matching rules */
- "rewrite" : [
- [ "@IFCFG_DIR@/ifcfg-(.*)", "@IFCFG_DIR@/ifcfg-%s" ],
- ],
- ]
-))
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-2.17.32/library/network/doc/autodocs/Makefile.in new/yast2-2.17.34/library/network/doc/autodocs/Makefile.in
--- old/yast2-2.17.32/library/network/doc/autodocs/Makefile.in 2008-09-26 15:57:20.000000000 +0200
+++ new/yast2-2.17.34/library/network/doc/autodocs/Makefile.in 2008-08-05 15:51:59.000000000 +0200
@@ -66,7 +66,6 @@
ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
ECHO_T = @ECHO_T@
-IFCFG_DIR = @IFCFG_DIR@
INSTALL = @INSTALL@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-2.17.32/library/network/doc/Makefile.in new/yast2-2.17.34/library/network/doc/Makefile.in
--- old/yast2-2.17.32/library/network/doc/Makefile.in 2008-09-26 15:57:20.000000000 +0200
+++ new/yast2-2.17.34/library/network/doc/Makefile.in 2008-08-05 15:51:59.000000000 +0200
@@ -68,7 +68,6 @@
ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
ECHO_T = @ECHO_T@
-IFCFG_DIR = @IFCFG_DIR@
INSTALL = @INSTALL@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-2.17.32/library/network/Makefile.in new/yast2-2.17.34/library/network/Makefile.in
--- old/yast2-2.17.32/library/network/Makefile.in 2008-09-26 15:57:20.000000000 +0200
+++ new/yast2-2.17.34/library/network/Makefile.in 2008-08-05 15:51:59.000000000 +0200
@@ -70,7 +70,6 @@
ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
ECHO_T = @ECHO_T@
-IFCFG_DIR = @IFCFG_DIR@
INSTALL = @INSTALL@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-2.17.32/library/network/src/Makefile.in new/yast2-2.17.34/library/network/src/Makefile.in
--- old/yast2-2.17.32/library/network/src/Makefile.in 2008-09-26 15:57:20.000000000 +0200
+++ new/yast2-2.17.34/library/network/src/Makefile.in 2008-08-05 15:51:59.000000000 +0200
@@ -76,7 +76,6 @@
ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
ECHO_T = @ECHO_T@
-IFCFG_DIR = @IFCFG_DIR@
INSTALL = @INSTALL@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-2.17.32/library/network/testsuite/Makefile.in new/yast2-2.17.34/library/network/testsuite/Makefile.in
--- old/yast2-2.17.32/library/network/testsuite/Makefile.in 2008-09-26 15:57:20.000000000 +0200
+++ new/yast2-2.17.34/library/network/testsuite/Makefile.in 2008-08-05 15:51:59.000000000 +0200
@@ -64,7 +64,6 @@
ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
ECHO_T = @ECHO_T@
-IFCFG_DIR = @IFCFG_DIR@
INSTALL = @INSTALL@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-2.17.32/library/packages/doc/autodocs/Makefile.in new/yast2-2.17.34/library/packages/doc/autodocs/Makefile.in
--- old/yast2-2.17.32/library/packages/doc/autodocs/Makefile.in 2008-09-26 15:57:20.000000000 +0200
+++ new/yast2-2.17.34/library/packages/doc/autodocs/Makefile.in 2008-08-05 15:51:59.000000000 +0200
@@ -66,7 +66,6 @@
ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
ECHO_T = @ECHO_T@
-IFCFG_DIR = @IFCFG_DIR@
INSTALL = @INSTALL@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-2.17.32/library/packages/doc/Makefile.in new/yast2-2.17.34/library/packages/doc/Makefile.in
--- old/yast2-2.17.32/library/packages/doc/Makefile.in 2008-09-26 15:57:20.000000000 +0200
+++ new/yast2-2.17.34/library/packages/doc/Makefile.in 2008-08-05 15:51:59.000000000 +0200
@@ -78,7 +78,6 @@
ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
ECHO_T = @ECHO_T@
-IFCFG_DIR = @IFCFG_DIR@
INSTALL = @INSTALL@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-2.17.32/library/packages/Makefile.in new/yast2-2.17.34/library/packages/Makefile.in
--- old/yast2-2.17.32/library/packages/Makefile.in 2008-09-26 15:57:20.000000000 +0200
+++ new/yast2-2.17.34/library/packages/Makefile.in 2008-08-05 15:51:59.000000000 +0200
@@ -68,7 +68,6 @@
ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
ECHO_T = @ECHO_T@
-IFCFG_DIR = @IFCFG_DIR@
INSTALL = @INSTALL@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-2.17.32/library/packages/src/Makefile.in new/yast2-2.17.34/library/packages/src/Makefile.in
--- old/yast2-2.17.32/library/packages/src/Makefile.in 2008-09-26 15:57:21.000000000 +0200
+++ new/yast2-2.17.34/library/packages/src/Makefile.in 2008-09-24 14:03:32.000000000 +0200
@@ -73,7 +73,6 @@
ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
ECHO_T = @ECHO_T@
-IFCFG_DIR = @IFCFG_DIR@
INSTALL = @INSTALL@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-2.17.32/library/packages/testsuite/Makefile.in new/yast2-2.17.34/library/packages/testsuite/Makefile.in
--- old/yast2-2.17.32/library/packages/testsuite/Makefile.in 2008-09-26 15:57:21.000000000 +0200
+++ new/yast2-2.17.34/library/packages/testsuite/Makefile.in 2008-08-05 15:52:00.000000000 +0200
@@ -64,7 +64,6 @@
ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
ECHO_T = @ECHO_T@
-IFCFG_DIR = @IFCFG_DIR@
INSTALL = @INSTALL@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-2.17.32/library/runlevel/doc/autodocs/Makefile.in new/yast2-2.17.34/library/runlevel/doc/autodocs/Makefile.in
--- old/yast2-2.17.32/library/runlevel/doc/autodocs/Makefile.in 2008-09-26 15:57:21.000000000 +0200
+++ new/yast2-2.17.34/library/runlevel/doc/autodocs/Makefile.in 2008-08-05 15:52:00.000000000 +0200
@@ -66,7 +66,6 @@
ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
ECHO_T = @ECHO_T@
-IFCFG_DIR = @IFCFG_DIR@
INSTALL = @INSTALL@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-2.17.32/library/runlevel/doc/Makefile.in new/yast2-2.17.34/library/runlevel/doc/Makefile.in
--- old/yast2-2.17.32/library/runlevel/doc/Makefile.in 2008-09-26 15:57:21.000000000 +0200
+++ new/yast2-2.17.34/library/runlevel/doc/Makefile.in 2008-08-05 15:52:00.000000000 +0200
@@ -78,7 +78,6 @@
ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
ECHO_T = @ECHO_T@
-IFCFG_DIR = @IFCFG_DIR@
INSTALL = @INSTALL@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-2.17.32/library/runlevel/Makefile.in new/yast2-2.17.34/library/runlevel/Makefile.in
--- old/yast2-2.17.32/library/runlevel/Makefile.in 2008-09-26 15:57:21.000000000 +0200
+++ new/yast2-2.17.34/library/runlevel/Makefile.in 2008-08-05 15:52:00.000000000 +0200
@@ -66,7 +66,6 @@
ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
ECHO_T = @ECHO_T@
-IFCFG_DIR = @IFCFG_DIR@
INSTALL = @INSTALL@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-2.17.32/library/runlevel/src/Makefile.in new/yast2-2.17.34/library/runlevel/src/Makefile.in
--- old/yast2-2.17.32/library/runlevel/src/Makefile.in 2008-09-26 15:57:21.000000000 +0200
+++ new/yast2-2.17.34/library/runlevel/src/Makefile.in 2008-08-05 15:52:00.000000000 +0200
@@ -76,7 +76,6 @@
ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
ECHO_T = @ECHO_T@
-IFCFG_DIR = @IFCFG_DIR@
INSTALL = @INSTALL@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-2.17.32/library/runlevel/testsuite/Makefile.in new/yast2-2.17.34/library/runlevel/testsuite/Makefile.in
--- old/yast2-2.17.32/library/runlevel/testsuite/Makefile.in 2008-09-26 15:57:21.000000000 +0200
+++ new/yast2-2.17.34/library/runlevel/testsuite/Makefile.in 2008-08-05 15:52:00.000000000 +0200
@@ -64,7 +64,6 @@
ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
ECHO_T = @ECHO_T@
-IFCFG_DIR = @IFCFG_DIR@
INSTALL = @INSTALL@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-2.17.32/library/sequencer/doc/autodocs/Makefile.in new/yast2-2.17.34/library/sequencer/doc/autodocs/Makefile.in
--- old/yast2-2.17.32/library/sequencer/doc/autodocs/Makefile.in 2008-09-26 15:57:21.000000000 +0200
+++ new/yast2-2.17.34/library/sequencer/doc/autodocs/Makefile.in 2008-08-05 15:52:00.000000000 +0200
@@ -66,7 +66,6 @@
ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
ECHO_T = @ECHO_T@
-IFCFG_DIR = @IFCFG_DIR@
INSTALL = @INSTALL@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-2.17.32/library/sequencer/doc/examples/Makefile.in new/yast2-2.17.34/library/sequencer/doc/examples/Makefile.in
--- old/yast2-2.17.32/library/sequencer/doc/examples/Makefile.in 2008-09-26 15:57:21.000000000 +0200
+++ new/yast2-2.17.34/library/sequencer/doc/examples/Makefile.in 2008-08-05 15:52:01.000000000 +0200
@@ -68,7 +68,6 @@
ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
ECHO_T = @ECHO_T@
-IFCFG_DIR = @IFCFG_DIR@
INSTALL = @INSTALL@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-2.17.32/library/sequencer/doc/images/Makefile.in new/yast2-2.17.34/library/sequencer/doc/images/Makefile.in
--- old/yast2-2.17.32/library/sequencer/doc/images/Makefile.in 2008-09-26 15:57:21.000000000 +0200
+++ new/yast2-2.17.34/library/sequencer/doc/images/Makefile.in 2008-08-05 15:52:01.000000000 +0200
@@ -68,7 +68,6 @@
ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
ECHO_T = @ECHO_T@
-IFCFG_DIR = @IFCFG_DIR@
INSTALL = @INSTALL@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-2.17.32/library/sequencer/doc/Makefile.in new/yast2-2.17.34/library/sequencer/doc/Makefile.in
--- old/yast2-2.17.32/library/sequencer/doc/Makefile.in 2008-09-26 15:57:21.000000000 +0200
+++ new/yast2-2.17.34/library/sequencer/doc/Makefile.in 2008-08-05 15:52:00.000000000 +0200
@@ -78,7 +78,6 @@
ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
ECHO_T = @ECHO_T@
-IFCFG_DIR = @IFCFG_DIR@
INSTALL = @INSTALL@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-2.17.32/library/sequencer/Makefile.in new/yast2-2.17.34/library/sequencer/Makefile.in
--- old/yast2-2.17.32/library/sequencer/Makefile.in 2008-09-26 15:57:21.000000000 +0200
+++ new/yast2-2.17.34/library/sequencer/Makefile.in 2008-08-05 15:52:00.000000000 +0200
@@ -68,7 +68,6 @@
ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
ECHO_T = @ECHO_T@
-IFCFG_DIR = @IFCFG_DIR@
INSTALL = @INSTALL@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-2.17.32/library/sequencer/src/Makefile.in new/yast2-2.17.34/library/sequencer/src/Makefile.in
--- old/yast2-2.17.32/library/sequencer/src/Makefile.in 2008-09-26 15:57:21.000000000 +0200
+++ new/yast2-2.17.34/library/sequencer/src/Makefile.in 2008-08-05 15:52:01.000000000 +0200
@@ -73,7 +73,6 @@
ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
ECHO_T = @ECHO_T@
-IFCFG_DIR = @IFCFG_DIR@
INSTALL = @INSTALL@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-2.17.32/library/sequencer/testsuite/Makefile.in new/yast2-2.17.34/library/sequencer/testsuite/Makefile.in
--- old/yast2-2.17.32/library/sequencer/testsuite/Makefile.in 2008-09-26 15:57:21.000000000 +0200
+++ new/yast2-2.17.34/library/sequencer/testsuite/Makefile.in 2008-08-05 15:52:01.000000000 +0200
@@ -64,7 +64,6 @@
ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
ECHO_T = @ECHO_T@
-IFCFG_DIR = @IFCFG_DIR@
INSTALL = @INSTALL@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-2.17.32/library/system/agents/Makefile.in new/yast2-2.17.34/library/system/agents/Makefile.in
--- old/yast2-2.17.32/library/system/agents/Makefile.in 2008-09-26 15:57:22.000000000 +0200
+++ new/yast2-2.17.34/library/system/agents/Makefile.in 2008-08-05 15:52:01.000000000 +0200
@@ -68,7 +68,6 @@
ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
ECHO_T = @ECHO_T@
-IFCFG_DIR = @IFCFG_DIR@
INSTALL = @INSTALL@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-2.17.32/library/system/doc/autodocs/Makefile.in new/yast2-2.17.34/library/system/doc/autodocs/Makefile.in
--- old/yast2-2.17.32/library/system/doc/autodocs/Makefile.in 2008-09-26 15:57:22.000000000 +0200
+++ new/yast2-2.17.34/library/system/doc/autodocs/Makefile.in 2008-08-05 15:52:01.000000000 +0200
@@ -66,7 +66,6 @@
ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
ECHO_T = @ECHO_T@
-IFCFG_DIR = @IFCFG_DIR@
INSTALL = @INSTALL@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-2.17.32/library/system/doc/Makefile.in new/yast2-2.17.34/library/system/doc/Makefile.in
--- old/yast2-2.17.32/library/system/doc/Makefile.in 2008-09-26 15:57:22.000000000 +0200
+++ new/yast2-2.17.34/library/system/doc/Makefile.in 2008-08-05 15:52:01.000000000 +0200
@@ -78,7 +78,6 @@
ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
ECHO_T = @ECHO_T@
-IFCFG_DIR = @IFCFG_DIR@
INSTALL = @INSTALL@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-2.17.32/library/system/Makefile.in new/yast2-2.17.34/library/system/Makefile.in
--- old/yast2-2.17.32/library/system/Makefile.in 2008-09-26 15:57:22.000000000 +0200
+++ new/yast2-2.17.34/library/system/Makefile.in 2008-08-05 15:52:01.000000000 +0200
@@ -68,7 +68,6 @@
ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
ECHO_T = @ECHO_T@
-IFCFG_DIR = @IFCFG_DIR@
INSTALL = @INSTALL@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-2.17.32/library/system/src/Makefile.in new/yast2-2.17.34/library/system/src/Makefile.in
--- old/yast2-2.17.32/library/system/src/Makefile.in 2008-09-26 15:57:22.000000000 +0200
+++ new/yast2-2.17.34/library/system/src/Makefile.in 2008-08-05 15:52:01.000000000 +0200
@@ -73,7 +73,6 @@
ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
ECHO_T = @ECHO_T@
-IFCFG_DIR = @IFCFG_DIR@
INSTALL = @INSTALL@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-2.17.32/library/system/testsuite/Makefile.in new/yast2-2.17.34/library/system/testsuite/Makefile.in
--- old/yast2-2.17.32/library/system/testsuite/Makefile.in 2008-09-26 15:57:22.000000000 +0200
+++ new/yast2-2.17.34/library/system/testsuite/Makefile.in 2008-08-05 15:52:01.000000000 +0200
@@ -64,7 +64,6 @@
ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
ECHO_T = @ECHO_T@
-IFCFG_DIR = @IFCFG_DIR@
INSTALL = @INSTALL@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-2.17.32/library/types/doc/autodocs/Makefile.in new/yast2-2.17.34/library/types/doc/autodocs/Makefile.in
--- old/yast2-2.17.32/library/types/doc/autodocs/Makefile.in 2008-09-26 15:57:22.000000000 +0200
+++ new/yast2-2.17.34/library/types/doc/autodocs/Makefile.in 2008-08-05 15:52:02.000000000 +0200
@@ -66,7 +66,6 @@
ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
ECHO_T = @ECHO_T@
-IFCFG_DIR = @IFCFG_DIR@
INSTALL = @INSTALL@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-2.17.32/library/types/doc/Makefile.in new/yast2-2.17.34/library/types/doc/Makefile.in
--- old/yast2-2.17.32/library/types/doc/Makefile.in 2008-09-26 15:57:22.000000000 +0200
+++ new/yast2-2.17.34/library/types/doc/Makefile.in 2008-08-05 15:52:02.000000000 +0200
@@ -78,7 +78,6 @@
ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
ECHO_T = @ECHO_T@
-IFCFG_DIR = @IFCFG_DIR@
INSTALL = @INSTALL@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-2.17.32/library/types/Makefile.in new/yast2-2.17.34/library/types/Makefile.in
--- old/yast2-2.17.32/library/types/Makefile.in 2008-09-26 15:57:22.000000000 +0200
+++ new/yast2-2.17.34/library/types/Makefile.in 2008-08-05 15:52:02.000000000 +0200
@@ -70,7 +70,6 @@
ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
ECHO_T = @ECHO_T@
-IFCFG_DIR = @IFCFG_DIR@
INSTALL = @INSTALL@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-2.17.32/library/types/src/Makefile.in new/yast2-2.17.34/library/types/src/Makefile.in
--- old/yast2-2.17.32/library/types/src/Makefile.in 2008-09-26 15:57:22.000000000 +0200
+++ new/yast2-2.17.34/library/types/src/Makefile.in 2008-08-05 15:52:02.000000000 +0200
@@ -71,7 +71,6 @@
ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
ECHO_T = @ECHO_T@
-IFCFG_DIR = @IFCFG_DIR@
INSTALL = @INSTALL@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-2.17.32/library/types/testsuite/Makefile.in new/yast2-2.17.34/library/types/testsuite/Makefile.in
--- old/yast2-2.17.32/library/types/testsuite/Makefile.in 2008-09-26 15:57:22.000000000 +0200
+++ new/yast2-2.17.34/library/types/testsuite/Makefile.in 2008-08-05 15:52:02.000000000 +0200
@@ -64,7 +64,6 @@
ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
ECHO_T = @ECHO_T@
-IFCFG_DIR = @IFCFG_DIR@
INSTALL = @INSTALL@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-2.17.32/library/wizard/doc/autodocs/Makefile.in new/yast2-2.17.34/library/wizard/doc/autodocs/Makefile.in
--- old/yast2-2.17.32/library/wizard/doc/autodocs/Makefile.in 2008-09-26 15:57:22.000000000 +0200
+++ new/yast2-2.17.34/library/wizard/doc/autodocs/Makefile.in 2008-08-05 15:52:02.000000000 +0200
@@ -66,7 +66,6 @@
ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
ECHO_T = @ECHO_T@
-IFCFG_DIR = @IFCFG_DIR@
INSTALL = @INSTALL@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-2.17.32/library/wizard/doc/examples/Makefile.in new/yast2-2.17.34/library/wizard/doc/examples/Makefile.in
--- old/yast2-2.17.32/library/wizard/doc/examples/Makefile.in 2008-09-26 15:57:23.000000000 +0200
+++ new/yast2-2.17.34/library/wizard/doc/examples/Makefile.in 2008-08-05 15:52:02.000000000 +0200
@@ -68,7 +68,6 @@
ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
ECHO_T = @ECHO_T@
-IFCFG_DIR = @IFCFG_DIR@
INSTALL = @INSTALL@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-2.17.32/library/wizard/doc/Makefile.in new/yast2-2.17.34/library/wizard/doc/Makefile.in
--- old/yast2-2.17.32/library/wizard/doc/Makefile.in 2008-09-26 15:57:22.000000000 +0200
+++ new/yast2-2.17.34/library/wizard/doc/Makefile.in 2008-08-05 15:52:02.000000000 +0200
@@ -80,7 +80,6 @@
ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
ECHO_T = @ECHO_T@
-IFCFG_DIR = @IFCFG_DIR@
INSTALL = @INSTALL@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-2.17.32/library/wizard/doc/screenshots/Makefile.in new/yast2-2.17.34/library/wizard/doc/screenshots/Makefile.in
--- old/yast2-2.17.32/library/wizard/doc/screenshots/Makefile.in 2008-09-26 15:57:23.000000000 +0200
+++ new/yast2-2.17.34/library/wizard/doc/screenshots/Makefile.in 2008-08-05 15:52:02.000000000 +0200
@@ -68,7 +68,6 @@
ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
ECHO_T = @ECHO_T@
-IFCFG_DIR = @IFCFG_DIR@
INSTALL = @INSTALL@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-2.17.32/library/wizard/Makefile.in new/yast2-2.17.34/library/wizard/Makefile.in
--- old/yast2-2.17.32/library/wizard/Makefile.in 2008-09-26 15:57:22.000000000 +0200
+++ new/yast2-2.17.34/library/wizard/Makefile.in 2008-08-05 15:52:02.000000000 +0200
@@ -70,7 +70,6 @@
ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
ECHO_T = @ECHO_T@
-IFCFG_DIR = @IFCFG_DIR@
INSTALL = @INSTALL@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-2.17.32/library/wizard/src/Makefile.in new/yast2-2.17.34/library/wizard/src/Makefile.in
--- old/yast2-2.17.32/library/wizard/src/Makefile.in 2008-09-26 15:57:23.000000000 +0200
+++ new/yast2-2.17.34/library/wizard/src/Makefile.in 2008-08-05 15:52:02.000000000 +0200
@@ -73,7 +73,6 @@
ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
ECHO_T = @ECHO_T@
-IFCFG_DIR = @IFCFG_DIR@
INSTALL = @INSTALL@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-2.17.32/library/wizard/src/Wizard.ycp new/yast2-2.17.34/library/wizard/src/Wizard.ycp
--- old/yast2-2.17.32/library/wizard/src/Wizard.ycp 2008-09-09 16:39:09.000000000 +0200
+++ new/yast2-2.17.34/library/wizard/src/Wizard.ycp 2008-09-26 12:05:56.000000000 +0200
@@ -996,6 +996,20 @@
/**
+ * Sets the dialog title shown in the window manager's title bar.
+ *
+ * @param titleText title of the dialog
+ *
+ * @example
+ * SetDialogTitle ("DNS Server Configuration");
+ **/
+ global void SetDialogTitle( string titleText )
+ {
+ UI::WizardCommand(`SetDialogTitle( titleText ) );
+ }
+
+
+ /**
* Sets the wizard 'title' icon to the specified icon from the standard icon
* directory.
*
@@ -1026,6 +1040,85 @@
UI::WizardCommand(`SetDialogIcon( "" ) );
}
+
+
+ /**
+ * Sets the window title according to the name specified in a .desktop file got as parameter.
+ * Desktop file is placed in a special directory (/usr/share/applications/YaST2).
+ * Parameter file is realative to that directory without ".desktop" suffix.
+ *
+ * @param file desktop file
+ * @return boolean true on success
+ *
+ * @example
+ * // Opens /usr/share/applications/YaST2/lan.desktop
+ * // Reads (localized) "name" entry from there
+ * // Sets the window title.
+ * SetDesktopTitle ("lan")
+ */
+ global boolean SetDesktopTitle( string file )
+ {
+ path filepath = .yast2.desktop1.v."Desktop Entry";
+ string name = "";
+ string localizedkey = "";
+ string Language = "";
+ string LanguageFull = "";
+ string filename = sformat("%1/%2.desktop", Directory::desktopdir, file);
+ // Do not use .yast2.desktop.v.$filename, because ini-agent reads
+ // all the desktop files anyway which is wasteful for setting one icon.
+ // The config is adapted from .yast2.desktop.
+ SCR::RegisterAgent (.yast2.desktop1, `ag_ini(
+ `IniAgent( filename,
+ $[
+ "options" : [ "read_only" ], // rw works but not needed
+ "comments" : [ "^[ \t]*[;#].*", ";.*", "\\{[^}]*\\}", "^[ \t]*$" ],
+ "sections" : [
+ $[ "begin" : [
+ "^[ \t]*\\[[ \t]*(.*[^ \t])[ \t]*\\][ \t]*",
+ "[%s]",
+ ]],
+ ],
+ "params" : [
+ $[ "match" : [
+ "^[ \t]*([^=]*[^ \t=])[ \t]*=[ \t]*(.*[^ \t]|)[ \t]*$" ,
+ "%s=%s",
+ ]],
+ ],
+ ]
+ )));
+
+
+ /* read language */
+ LanguageFull = "";
+ Language = UI::GetLanguage(true);
+ if(regexpmatch(Language, "(.*_[^.]*)\\.?.*")) // matches: ll_TT ll_TT.UTF-8
+ LanguageFull = regexpsub(Language, "(.*_[^.]*)\\.?.*", "\\1");
+ if(regexpmatch(Language, "(.*)_"))
+ Language = regexpsub(Language, "(.*)_", "\\1");
+ y2debug("LanguageFull=%1", LanguageFull);
+ y2debug("Language=%1", Language);
+
+ /* get localized Name value from desktop file */
+ if( LanguageFull != nil || LanguageFull != "" )
+ {
+ localizedkey = sformat("%1[%2]", "Name", LanguageFull);
+ name = (string) SCR::Read(add(filepath, localizedkey));
+ }
+ if( ( name == nil || name == "" ) && ( Language != nil || Language != "" ))
+ {
+ localizedkey = sformat("%1[%2]", "Name", Language);
+ name = (string) SCR::Read(add(filepath, localizedkey));
+ }
+ if( name == nil || name == "" )
+ name = (string) SCR::Read(add(filepath, "Name"));
+
+ y2debug("Set dialog title: %1", name);
+ SetDialogTitle( name );
+ return ( name != nil && name != "");
+ }
+
+
+
/**
* Sets the icon specified in a .desktop file got as parameter.
@@ -1079,10 +1172,11 @@
SetTitleIcon(icon);
SCR::UnregisterAgent (.yast2.desktop1);
+
return true;
}
-
+
/**
* PRIVATE - Replace the entire Wizard button box with a new one.
* @param button_box Button Box term
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-2.17.32/library/wizard/testsuite/Makefile.in new/yast2-2.17.34/library/wizard/testsuite/Makefile.in
--- old/yast2-2.17.32/library/wizard/testsuite/Makefile.in 2008-09-26 15:57:23.000000000 +0200
+++ new/yast2-2.17.34/library/wizard/testsuite/Makefile.in 2008-08-05 15:52:03.000000000 +0200
@@ -62,7 +62,6 @@
ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
ECHO_T = @ECHO_T@
-IFCFG_DIR = @IFCFG_DIR@
INSTALL = @INSTALL@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-2.17.32/library/xml/doc/autodocs/Makefile.in new/yast2-2.17.34/library/xml/doc/autodocs/Makefile.in
--- old/yast2-2.17.32/library/xml/doc/autodocs/Makefile.in 2008-09-26 15:57:23.000000000 +0200
+++ new/yast2-2.17.34/library/xml/doc/autodocs/Makefile.in 2008-08-05 15:52:03.000000000 +0200
@@ -68,7 +68,6 @@
ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
ECHO_T = @ECHO_T@
-IFCFG_DIR = @IFCFG_DIR@
INSTALL = @INSTALL@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-2.17.32/library/xml/doc/Makefile.in new/yast2-2.17.34/library/xml/doc/Makefile.in
--- old/yast2-2.17.32/library/xml/doc/Makefile.in 2008-09-26 15:57:23.000000000 +0200
+++ new/yast2-2.17.34/library/xml/doc/Makefile.in 2008-08-05 15:52:03.000000000 +0200
@@ -81,7 +81,6 @@
ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
ECHO_T = @ECHO_T@
-IFCFG_DIR = @IFCFG_DIR@
INSTALL = @INSTALL@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-2.17.32/library/xml/Makefile.in new/yast2-2.17.34/library/xml/Makefile.in
--- old/yast2-2.17.32/library/xml/Makefile.in 2008-09-26 15:57:23.000000000 +0200
+++ new/yast2-2.17.34/library/xml/Makefile.in 2008-08-05 15:52:03.000000000 +0200
@@ -70,7 +70,6 @@
ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
ECHO_T = @ECHO_T@
-IFCFG_DIR = @IFCFG_DIR@
INSTALL = @INSTALL@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-2.17.32/library/xml/src/Makefile.in new/yast2-2.17.34/library/xml/src/Makefile.in
--- old/yast2-2.17.32/library/xml/src/Makefile.in 2008-09-26 15:57:23.000000000 +0200
+++ new/yast2-2.17.34/library/xml/src/Makefile.in 2008-08-05 15:52:03.000000000 +0200
@@ -73,7 +73,6 @@
ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
ECHO_T = @ECHO_T@
-IFCFG_DIR = @IFCFG_DIR@
INSTALL = @INSTALL@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-2.17.32/Makefile.in new/yast2-2.17.34/Makefile.in
--- old/yast2-2.17.32/Makefile.in 2008-09-26 15:57:23.000000000 +0200
+++ new/yast2-2.17.34/Makefile.in 2008-08-05 15:52:03.000000000 +0200
@@ -44,8 +44,10 @@
@CREATE_PKGCONFIG_TRUE@am__append_1 = $(RPMNAME).pc.in
subdir = .
DIST_COMMON = $(am__configure_deps) $(srcdir)/Makefile.am \
- $(srcdir)/Makefile.in $(top_srcdir)/configure config.guess \
- config.sub install-sh missing
+ $(srcdir)/Makefile.in \
+ $(top_srcdir)/./library/modules/Version.ycp.in \
+ $(top_srcdir)/configure config.guess config.sub install-sh \
+ missing
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
am__aclocal_m4_deps = $(top_srcdir)/configure.in
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
@@ -53,7 +55,7 @@
am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \
configure.lineno config.status.lineno
mkinstalldirs = $(install_sh) -d
-CONFIG_CLEAN_FILES =
+CONFIG_CLEAN_FILES = ./library/modules/Version.ycp
SOURCES =
DIST_SOURCES =
RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
@@ -101,7 +103,6 @@
ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
ECHO_T = @ECHO_T@
-IFCFG_DIR = @IFCFG_DIR@
INSTALL = @INSTALL@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
@@ -282,6 +283,8 @@
cd $(srcdir) && $(AUTOCONF)
$(ACLOCAL_M4): $(am__aclocal_m4_deps)
cd $(srcdir) && $(ACLOCAL) $(ACLOCAL_AMFLAGS)
+./library/modules/Version.ycp: $(top_builddir)/config.status $(top_srcdir)/./library/modules/Version.ycp.in
+ cd $(top_builddir) && $(SHELL) ./config.status $@
install-pkgconfigDATA: $(pkgconfig_DATA)
@$(NORMAL_INSTALL)
test -z "$(pkgconfigdir)" || $(MKDIR_P) "$(DESTDIR)$(pkgconfigdir)"
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-2.17.32/remote/Makefile.in new/yast2-2.17.34/remote/Makefile.in
--- old/yast2-2.17.32/remote/Makefile.in 2008-09-26 15:57:23.000000000 +0200
+++ new/yast2-2.17.34/remote/Makefile.in 2008-08-05 15:52:03.000000000 +0200
@@ -75,7 +75,6 @@
ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
ECHO_T = @ECHO_T@
-IFCFG_DIR = @IFCFG_DIR@
INSTALL = @INSTALL@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-2.17.32/scripts/Makefile.in new/yast2-2.17.34/scripts/Makefile.in
--- old/yast2-2.17.32/scripts/Makefile.in 2008-09-26 15:57:23.000000000 +0200
+++ new/yast2-2.17.34/scripts/Makefile.in 2008-08-05 15:52:03.000000000 +0200
@@ -73,7 +73,6 @@
ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
ECHO_T = @ECHO_T@
-IFCFG_DIR = @IFCFG_DIR@
INSTALL = @INSTALL@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-2.17.32/scripts/yast2 new/yast2-2.17.34/scripts/yast2
--- old/yast2-2.17.32/scripts/yast2 2008-09-09 16:39:15.000000000 +0200
+++ new/yast2-2.17.34/scripts/yast2 2008-09-29 14:23:57.000000000 +0200
@@ -416,11 +416,15 @@
$y2ccbin $Y2UI_ARGS "$@"
exit_code=$?
else
- # loop while necessary
+ # In case YaST has to be restarted, create this file
+ # and exit. Script that creates the file should also
+ # remove it itself.
case "$module" in
+ # special cases
menu) REDO_FILE=/var/lib/YaST2/restart_menu ;;
online_update) REDO_FILE=/var/lib/YaST2/selected_patches.ycp ;;
- *) ;;
+ # all other cases when YaST has to be restarted
+ *) REDO_FILE=/var/lib/YaST2/restart_yast ;;
esac
# break out on errors, #343258
while [ $exit_code = 0 ]; do
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-2.17.32/VERSION new/yast2-2.17.34/VERSION
--- old/yast2-2.17.32/VERSION 2008-09-26 15:56:34.000000000 +0200
+++ new/yast2-2.17.34/VERSION 2008-09-29 14:29:55.000000000 +0200
@@ -1 +1 @@
-2.17.32
+2.17.34
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org
For additional commands, e-mail: opensuse-commit+help(a)opensuse.org
1
0
Hello community,
here is the log from the commit of package x11-input-synaptics
checked in at Mon Sep 29 18:25:51 CEST 2008.
--------
--- x11-input-synaptics/x11-input-synaptics.changes 2008-09-11 01:59:39.000000000 +0200
+++ /mounts/work_src_done/STABLE/x11-input-synaptics/x11-input-synaptics.changes 2008-09-29 15:18:06.983475237 +0200
@@ -1,0 +2,9 @@
+Mon Sep 29 15:17:01 CEST 2008 - sndirsch(a)suse.de
+
+- commit-3097bb3.diff
+ * Autoscale also the MaxTapMove parameter. Make the tapping
+ move radius 7.2 percent of the touchpad width by default.
+ This corresponds to the old settings of 220/3040, but works
+ for all touchpad sizes. (bnc #429760)
+
+-------------------------------------------------------------------
New:
----
commit-3097bb3.diff
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ x11-input-synaptics.spec ++++++
--- /var/tmp/diff_new_pack.FSB654/_old 2008-09-29 18:25:34.000000000 +0200
+++ /var/tmp/diff_new_pack.FSB654/_new 2008-09-29 18:25:34.000000000 +0200
@@ -28,7 +28,7 @@
Group: System/X11/Servers/XF86_4
AutoReqProv: on
Version: 0.15.2
-Release: 1
+Release: 4
Summary: X11 input module for synaptics touchpad
Provides: xorg-x11-server:/usr/X11R6/%{_lib}/modules/input/synaptics_drv.o
Source: xf86-input-synaptics-%{version}.tar.bz2
@@ -37,6 +37,7 @@
Patch1: xorg_gunze.diff
Patch2: gunze-tools.diff
Patch3: wait.diff
+Patch4: commit-3097bb3.diff
BuildRoot: %{_tmppath}/%{name}-%{version}-build
%description
@@ -72,7 +73,7 @@
Group: System/X11/Servers/XF86_4
AutoReqProv: on
Version: 031126
-Release: 264
+Release: 267
%description -n x11-input-gunze
X11 input module for gunze touchscreen
@@ -91,7 +92,7 @@
Requires: x11-input-gunze = %{version}-%{release}
AutoReqProv: on
Version: 031126
-Release: 264
+Release: 267
%description -n x11-input-gunze-tools
Tools to configure and calibrate gunze X11 input driver.
@@ -106,6 +107,7 @@
%prep
%setup -n xf86-input-synaptics-0.15.2 -b1 -b2
%patch3
+%patch4 -p1
pushd ../programs/Xserver/hw/xfree86/input/gunze
patch -p0 -s < $RPM_SOURCE_DIR/xorg_gunze.diff
popd
@@ -180,6 +182,12 @@
/usr/bin/gunzets_calib
%changelog
+* Mon Sep 29 2008 sndirsch(a)suse.de
+- commit-3097bb3.diff
+ * Autoscale also the MaxTapMove parameter. Make the tapping
+ move radius 7.2 percent of the touchpad width by default.
+ This corresponds to the old settings of 220/3040, but works
+ for all touchpad sizes. (bnc #429760)
* Thu Sep 11 2008 sndirsch(a)suse.de
- xf86-input-synaptics 0.15.2
* Add sensible fdi default for bcm5974
++++++ commit-3097bb3.diff ++++++
commit 3097bb31a68151a953668d4581f75d3e08947d68
Author: Henrik Rydberg <rydberg(a)euromail.se>
Date: Fri Sep 12 10:41:59 2008 +0200
Autoscale also the MaxTapMove parameter
Make the tapping move radius 7.2 percent of the touchpad width
by default. This corresponds to the old settings of 220/3040,
but works for all touchpad sizes.
Signed-off-by: Henrik Rydberg <rydberg(a)euromail.se>
Signed-off-by: Peter Hutterer <peter.hutterer(a)redhat.com>
diff --git a/src/synaptics.c b/src/synaptics.c
index 0d1a292..5d12599 100644
--- a/src/synaptics.c
+++ b/src/synaptics.c
@@ -308,6 +308,7 @@ static void set_default_parameters(LocalDevicePtr local)
float minSpeed, maxSpeed;
int horizScrollDelta, vertScrollDelta,
edgeMotionMinSpeed, edgeMotionMaxSpeed;
+ int tapMove;
int l, r, t, b; /* left, right, top, bottom */
/* read the parameters */
@@ -346,6 +347,7 @@ static void set_default_parameters(LocalDevicePtr local)
vertScrollDelta = height * .04;
edgeMotionMinSpeed = 1;
edgeMotionMaxSpeed = width * .1;
+ tapMove = width * .072;
} else {
l = 1900;
r = 5400;
@@ -358,6 +360,7 @@ static void set_default_parameters(LocalDevicePtr local)
vertScrollDelta = 100;
edgeMotionMinSpeed = 1;
edgeMotionMaxSpeed = 400;
+ tapMove = 220;
}
pars->left_edge = xf86SetIntOption(opts, "LeftEdge", l);
@@ -369,7 +372,7 @@ static void set_default_parameters(LocalDevicePtr local)
pars->finger_high = xf86SetIntOption(opts, "FingerHigh", 30);
pars->finger_press = xf86SetIntOption(opts, "FingerPress", 256);
pars->tap_time = xf86SetIntOption(opts, "MaxTapTime", 180);
- pars->tap_move = xf86SetIntOption(opts, "MaxTapMove", 25);
+ pars->tap_move = xf86SetIntOption(opts, "MaxTapMove", tapMove);
pars->tap_time_2 = xf86SetIntOption(opts, "MaxDoubleTapTime", 180);
pars->click_time = xf86SetIntOption(opts, "ClickTime", 100);
pars->fast_taps = xf86SetIntOption(opts, "FastTaps", FALSE);
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org
For additional commands, e-mail: opensuse-commit+help(a)opensuse.org
1
0