Hello community,
here is the log from the commit of package yast2-network
checked in at Sat Sep 1 13:24:37 CEST 2007.
--------
--- yast2-network/yast2-network.changes 2007-08-31 15:34:50.000000000 +0200
+++ /mounts/work_src_done/STABLE/yast2-network/yast2-network.changes 2007-09-01 09:02:42.000000000 +0200
@@ -1,0 +2,11 @@
+Sat Sep 1 09:01:47 CEST 2007 - mzugec@suse.cz
+
+- read NISDomain instead of NisDomain from install.inf
+
+-------------------------------------------------------------------
+Fri Aug 31 16:04:05 CEST 2007 - locilka@suse.cz
+
+- Using --proxy-user and --proxy in /root/.curlrc (#305163).
+- Changing priorities in syntax for /root/.curlrc parser (#305163).
+
+-------------------------------------------------------------------
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ yast2-network.spec ++++++
--- /var/tmp/diff_new_pack.r10049/_old 2007-09-01 13:24:30.000000000 +0200
+++ /var/tmp/diff_new_pack.r10049/_new 2007-09-01 13:24:30.000000000 +0200
@@ -12,7 +12,7 @@
Name: yast2-network
Version: 2.15.71
-Release: 1
+Release: 2
License: GPL v2 or later
Group: System/YaST
BuildRoot: %{_tmppath}/%{name}-%{version}-build
@@ -44,7 +44,7 @@
Summary: YaST2 - Network Configuration
%package devel-doc
Version: 2.15.71
-Release: 1
+Release: 2
License: GPL v2 or later
Group: System/YaST
BuildRoot: %{_tmppath}/%{name}-%{version}-build
@@ -141,6 +141,11 @@
%exclude %{prefix}/share/doc/packages/yast2-network/README
%changelog
+* Sat Sep 01 2007 - mzugec@suse.cz
+- read NISDomain instead of NisDomain from install.inf
+* Fri Aug 31 2007 - locilka@suse.cz
+- Using --proxy-user and --proxy in /root/.curlrc (#305163).
+- Changing priorities in syntax for /root/.curlrc parser (#305163).
* Fri Aug 31 2007 - mzugec@suse.cz
- autoyast support for udev rules and backport compatibility with
old-style network devices names (#303916)
++++++ yast2-network-2.15.71.tar.bz2 ++++++
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-network-2.15.71/agents/root_curlrc.scr new/yast2-network-2.15.71/agents/root_curlrc.scr
--- old/yast2-network-2.15.71/agents/root_curlrc.scr 2007-08-10 17:24:03.000000000 +0200
+++ new/yast2-network-2.15.71/agents/root_curlrc.scr 2007-08-31 16:32:38.000000000 +0200
@@ -15,7 +15,7 @@
* Write(.root.curlrc.proxy_user, "newuser")
* (true)
*
- * $Id: root_curlrc.scr 12980 2003-12-06 20:51:23Z msvec $
+ * $Id: root_curlrc.scr 40651 2007-08-31 14:06:38Z locilka $
*/
.root.curlrc
@@ -25,12 +25,12 @@
"options" : [ "ignore_case", "global_values", "flat" ],
"comments" : [ "^#.*", "^[ \t]*$", ],
"params" : [
+ $[ "match" : [ "^[ \t]*([a-zA-Z_-]+)[ \t]* [ \t]*\"(.*)\"[ \t]*$", "%s \"%s\"" ] ],
$[ "match" : [ "^[ \t]*([a-zA-Z_-]+)[ \t]*=[ \t]*\"(.*)\"[ \t]*$", "%s = \"%s\"" ] ],
$[ "match" : [ "^[ \t]*([a-zA-Z_-]+)[ \t]*:[ \t]*\"(.*)\"[ \t]*$", "%s : \"%s\"" ] ],
- $[ "match" : [ "^[ \t]*([a-zA-Z_-]+)[ \t]* [ \t]*\"(.*)\"[ \t]*$", "%s \"%s\"" ] ],
+ $[ "match" : [ "^[ \t]*([a-zA-Z_-]+)[ \t]* [ \t]*(.*)[ \t]*$", "%s %s" ] ],
$[ "match" : [ "^[ \t]*([a-zA-Z_-]+)[ \t]*=[ \t]*(.*)[ \t]*$", "%s = %s" ] ],
$[ "match" : [ "^[ \t]*([a-zA-Z_-]+)[ \t]*:[ \t]*(.*)[ \t]*$", "%s : %s" ] ],
- $[ "match" : [ "^[ \t]*([a-zA-Z_-]+)[ \t]* [ \t]*(.*)[ \t]*$", "%s %s" ] ],
]
]
)
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-network-2.15.71/configure new/yast2-network-2.15.71/configure
--- old/yast2-network-2.15.71/configure 2007-08-31 15:27:10.000000000 +0200
+++ new/yast2-network-2.15.71/configure 2007-09-01 08:59:45.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-network 2.15.70.
+# Generated by GNU Autoconf 2.61 for yast2-network 2.15.71.
#
# Report bugs to http://bugs.opensuse.org/.
#
@@ -574,8 +574,8 @@
# Identity of this package.
PACKAGE_NAME='yast2-network'
PACKAGE_TARNAME='yast2-network'
-PACKAGE_VERSION='2.15.70'
-PACKAGE_STRING='yast2-network 2.15.70'
+PACKAGE_VERSION='2.15.71'
+PACKAGE_STRING='yast2-network 2.15.71'
PACKAGE_BUGREPORT='http://bugs.opensuse.org/'
ac_unique_file="RPMNAME"
@@ -1197,7 +1197,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-network 2.15.70 to adapt to many kinds of systems.
+\`configure' configures yast2-network 2.15.71 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1268,7 +1268,7 @@
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of yast2-network 2.15.70:";;
+ short | recursive ) echo "Configuration of yast2-network 2.15.71:";;
esac
cat <<\_ACEOF
@@ -1346,7 +1346,7 @@
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-yast2-network configure 2.15.70
+yast2-network configure 2.15.71
generated by GNU Autoconf 2.61
Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
@@ -1360,7 +1360,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-network $as_me 2.15.70, which was
+It was created by yast2-network $as_me 2.15.71, which was
generated by GNU Autoconf 2.61. Invocation command line was
$ $0 $@
@@ -2181,7 +2181,7 @@
# Define the identity of the package.
PACKAGE='yast2-network'
- VERSION='2.15.70'
+ VERSION='2.15.71'
cat >>confdefs.h <<_ACEOF
@@ -2408,7 +2408,7 @@
-VERSION="2.15.70"
+VERSION="2.15.71"
RPMNAME="yast2-network"
MAINTAINER="Michal Zugec "
@@ -3303,7 +3303,7 @@
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
-This file was extended by yast2-network $as_me 2.15.70, which was
+This file was extended by yast2-network $as_me 2.15.71, which was
generated by GNU Autoconf 2.61. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -3346,7 +3346,7 @@
_ACEOF
cat >>$CONFIG_STATUS <<_ACEOF
ac_cs_version="\\
-yast2-network config.status 2.15.70
+yast2-network config.status 2.15.71
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-network-2.15.71/configure.in new/yast2-network-2.15.71/configure.in
--- old/yast2-network-2.15.71/configure.in 2007-08-31 15:27:05.000000000 +0200
+++ new/yast2-network-2.15.71/configure.in 2007-09-01 08:59:39.000000000 +0200
@@ -1,9 +1,9 @@
dnl configure.in for yast2-network
dnl
-dnl -- This file is generated by y2autoconf 2.15.7 - DO NOT EDIT! --
+dnl -- This file is generated by y2autoconf 2.15.8 - DO NOT EDIT! --
dnl (edit configure.in.in instead)
-AC_INIT(yast2-network, 2.15.70, http://bugs.opensuse.org/, yast2-network)
+AC_INIT(yast2-network, 2.15.71, http://bugs.opensuse.org/, yast2-network)
dnl Check for presence of file 'RPMNAME'
AC_CONFIG_SRCDIR([RPMNAME])
@@ -17,7 +17,7 @@
AM_INIT_AUTOMAKE(tar-ustar) dnl searches for some needed programs
dnl Important YaST2 variables
-VERSION="2.15.70"
+VERSION="2.15.71"
RPMNAME="yast2-network"
MAINTAINER="Michal Zugec "
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-network-2.15.71/Makefile.am new/yast2-network-2.15.71/Makefile.am
--- old/yast2-network-2.15.71/Makefile.am 2007-08-31 15:27:05.000000000 +0200
+++ new/yast2-network-2.15.71/Makefile.am 2007-09-01 08:59:39.000000000 +0200
@@ -30,7 +30,7 @@
extra_COPYRIGHT_files = $(if $(HAS_YAST_LICENSE), $(COPYRIGHT_files_yast), $(COPYRIGHT_files_gpl))
-AUTOMAKE_OPTIONS = foreign dist-bzip2
+AUTOMAKE_OPTIONS = foreign dist-bzip2 no-dist-gzip
# where devtools instal m4 snippets
# argh, executed literally
#ACLOCAL_AMFLAGS = -I $(Y2DEVTOOLS_PREFIX)/share/aclocal
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-network-2.15.71/Makefile.in new/yast2-network-2.15.71/Makefile.in
--- old/yast2-network-2.15.71/Makefile.in 2007-08-31 15:27:14.000000000 +0200
+++ new/yast2-network-2.15.71/Makefile.in 2007-09-01 08:59:47.000000000 +0200
@@ -86,8 +86,8 @@
{ test ! -d $(distdir) \
|| { find $(distdir) -type d ! -perm -200 -exec chmod u+w {} ';' \
&& rm -fr $(distdir); }; }
-DIST_ARCHIVES = $(distdir).tar.gz $(distdir).tar.bz2
GZIP_ENV = --best
+DIST_ARCHIVES = $(distdir).tar.bz2
distuninstallcheck_listfiles = find . -type f -print
distcleancheck_listfiles = find . -type f -print
ACLOCAL = @ACLOCAL@
@@ -222,7 +222,7 @@
COPYRIGHT.french COPYRIGHT.german COPYRIGHT.spanish
extra_COPYRIGHT_files = $(if $(HAS_YAST_LICENSE), $(COPYRIGHT_files_yast), $(COPYRIGHT_files_gpl))
-AUTOMAKE_OPTIONS = foreign dist-bzip2
+AUTOMAKE_OPTIONS = foreign dist-bzip2 no-dist-gzip
# where devtools instal m4 snippets
# argh, executed literally
#ACLOCAL_AMFLAGS = -I $(Y2DEVTOOLS_PREFIX)/share/aclocal
@@ -517,7 +517,6 @@
$(am__remove_distdir)
dist dist-all: distdir
- tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz
tardir=$(distdir) && $(am__tar) | bzip2 -9 -c >$(distdir).tar.bz2
$(am__remove_distdir)
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-network-2.15.71/src/clients/save_network.ycp new/yast2-network-2.15.71/src/clients/save_network.ycp
--- old/yast2-network-2.15.71/src/clients/save_network.ycp 2007-08-31 15:00:04.000000000 +0200
+++ new/yast2-network-2.15.71/src/clients/save_network.ycp 2007-08-31 16:33:06.000000000 +0200
@@ -79,7 +79,7 @@
ReadInstallInfItem(install_inf, "gateway", "Gateway");
ReadInstallInfItem(install_inf, "nameserver", "Nameserver");
ReadInstallInfItem(install_inf, "domain", "Domain");
- ReadInstallInfItem(install_inf, "nisdomain", "NisDomain");
+ ReadInstallInfItem(install_inf, "nisdomain", "NISDomain");
ReadInstallInfItem(install_inf, "hostname", "Hostname");
ReadInstallInfItem(install_inf, "module", "Alias");
// ReadInstallInfItem(install_inf, "options", "Options");
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-network-2.15.71/src/modules/Proxy.ycp new/yast2-network-2.15.71/src/modules/Proxy.ycp
--- old/yast2-network-2.15.71/src/modules/Proxy.ycp 2007-08-10 17:24:04.000000000 +0200
+++ new/yast2-network-2.15.71/src/modules/Proxy.ycp 2007-08-31 16:32:39.000000000 +0200
@@ -4,7 +4,7 @@
* Summary: Proxy data
* Authors: Michal Svec
*
- * $Id: Proxy.ycp 38086 2007-05-22 12:45:35Z kmachalkova $
+ * $Id: Proxy.ycp 40651 2007-08-31 14:06:38Z locilka $
*
* Configures FTP and HTTP proxies via sysconfig & SuSEconfig
* and /root/.curlrc (for YOU)
@@ -71,7 +71,7 @@
/* Read /root/.curlrc */
if(SCR::Read(.target.size, "/root/.curlrc") > 0)
- user = (string) SCR::Read(.root.curlrc.proxy-user);
+ user = (string) SCR::Read (add (.root.curlrc, "--proxy-user"));
if(user == nil) user = "";
@@ -110,7 +110,9 @@
];
string caption = _("Saving Proxy Configuration");
- integer sl = 500; //sleep for longer time, so that progress does not disappear right afterwards
+ // sleep for longer time, so that progress does not disappear right afterwards
+ // but only when Progress is visible
+ integer sl = (Progress::status() == true ? 500 : 0);
Progress::New(caption, " ", size(steps), steps, [], "");
@@ -124,14 +126,40 @@
SCR::Write(.sysconfig.proxy.NO_PROXY, no);
SCR::Write(.sysconfig.proxy, nil);
- /* Update /root/.curlrc */
- string proxyuser = nil;
- if(user != "") {
- proxyuser = user;
- if(pass != "") proxyuser = user + ":" + pass;
+ // proxy is used, write /root/.curlrc
+ // bugzilla #305163
+ if (enabled) {
+ /* Update /root/.curlrc */
+ string proxyuser = nil;
+ if (user != "") {
+ proxyuser = user;
+ if (pass != "") proxyuser = user + ":" + pass;
+ }
+
+ // nil or real value
+ SCR::Write (add (.root.curlrc, "--proxy-user"), proxyuser);
+
+ // not 'nil', not empty
+ // bugzilla #305163
+ if (http != nil && size (http) > 0) {
+ SCR::Write (add (.root.curlrc, "--proxy"), http);
+ } else {
+ SCR::Write (add (.root.curlrc, "--proxy"), nil);
+ }
+
+ // only written value can have a comment
+ if (proxyuser != nil) {
+ SCR::Write (add (add (.root.curlrc, "--proxy-user"), "comment"), ChangedComment("proxy"));
+ // only when set, can have a comment
+ } else if (http != nil && size (http) > 0) {
+ SCR::Write (add (add (.root.curlrc, "--proxy"), "comment"), ChangedComment("proxy"));
+ }
+ // proxy is not used, remove proxy-related settings
+ } else {
+ SCR::Write (add (.root.curlrc, "--proxy-user"), nil);
+ SCR::Write (add (.root.curlrc, "--proxy"), nil);
}
- SCR::Write(.root.curlrc.proxy-user, proxyuser);
- SCR::Write(.root.curlrc.proxy-user.comment, ChangedComment("proxy"));
+
SCR::Write(.root.curlrc, nil);
sleep(sl);
Progress::NextStage();
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org