Hello community,
here is the log from the commit of package yast2-network for openSUSE:Factory
checked in at Tue Feb 9 21:56:41 CET 2010.
--------
--- yast2-network/yast2-network.changes 2010-01-27 15:52:34.000000000 +0100
+++ /mounts/work_src_done/STABLE/yast2-network/yast2-network.changes 2010-02-09 15:52:52.000000000 +0100
@@ -1,0 +2,12 @@
+Tue Feb 9 15:51:34 CET 2010 - mzugec@suse.cz
+
+- ipv6: enable/disable both module and sysctl method (bnc#561611)
+- 2.19.11
+
+-------------------------------------------------------------------
+Mon Feb 8 16:23:46 CET 2010 - mzugec@suse.cz
+
+- correctly setup iucv devices (bnc#575950)
+- 2.19.10
+
+-------------------------------------------------------------------
calling whatdependson for head-i586
Old:
----
yast2-network-2.19.9.tar.bz2
New:
----
yast2-network-2.19.11.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ yast2-network.spec ++++++
--- /var/tmp/diff_new_pack.qOoQSi/_old 2010-02-09 21:56:10.000000000 +0100
+++ /var/tmp/diff_new_pack.qOoQSi/_new 2010-02-09 21:56:10.000000000 +0100
@@ -1,5 +1,5 @@
#
-# spec file for package yast2-network (Version 2.19.9)
+# spec file for package yast2-network (Version 2.19.11)
#
# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
@@ -19,10 +19,10 @@
Name: yast2-network
-Version: 2.19.9
+Version: 2.19.11
Release: 1
BuildRoot: %{_tmppath}/%{name}-%{version}-build
-Source0: yast2-network-2.19.9.tar.bz2
+Source0: yast2-network-2.19.11.tar.bz2
Prefix: /usr
Group: System/YaST
License: GPLv2+
@@ -65,7 +65,7 @@
This package contains autogenerated documentation for yast2-network
%prep
-%setup -n yast2-network-2.19.9
+%setup -n yast2-network-2.19.11
%build
%{prefix}/bin/y2tool y2autoconf
++++++ yast2-network-2.19.9.tar.bz2 -> yast2-network-2.19.11.tar.bz2 ++++++
++++ 7015 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-network-2.19.9/VERSION new/yast2-network-2.19.11/VERSION
--- old/yast2-network-2.19.9/VERSION 2010-01-27 15:43:20.000000000 +0100
+++ new/yast2-network-2.19.11/VERSION 2010-02-09 15:51:26.000000000 +0100
@@ -1 +1 @@
-2.19.9
+2.19.11
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-network-2.19.9/configure.in new/yast2-network-2.19.11/configure.in
--- old/yast2-network-2.19.9/configure.in 2010-01-22 15:22:42.000000000 +0100
+++ new/yast2-network-2.19.11/configure.in 2010-02-09 15:48:20.000000000 +0100
@@ -3,7 +3,7 @@
dnl -- This file is generated by y2autoconf 2.18.11 - DO NOT EDIT! --
dnl (edit configure.in.in instead)
-AC_INIT(yast2-network, 2.19.8, http://bugs.opensuse.org/, yast2-network)
+AC_INIT(yast2-network, 2.19.10, http://bugs.opensuse.org/, yast2-network)
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.19.8"
+VERSION="2.19.10"
RPMNAME="yast2-network"
MAINTAINER="Michal Zugec "
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-network-2.19.9/src/modules/Lan.ycp new/yast2-network-2.19.11/src/modules/Lan.ycp
--- old/yast2-network-2.19.9/src/modules/Lan.ycp 2010-01-27 15:21:32.000000000 +0100
+++ new/yast2-network-2.19.11/src/modules/Lan.ycp 2010-02-09 15:52:14.000000000 +0100
@@ -4,7 +4,7 @@
* Summary: Network card data
* Authors: Michal Svec
*
- * $Id: Lan.ycp 60556 2010-01-27 14:21:30Z kmachalkova $
+ * $Id: Lan.ycp 60768 2010-02-09 14:52:13Z mzugec $
*
* Representation of the configuration of network cards.
* Input and output routines.
@@ -141,25 +141,37 @@
void readIPv6(){
ipv6=true;
- list<string> filelist = ["sysctl.conf"];
- string filepath = "/etc/";
- string regexp = "^[[:space:]]*(net.ipv6.conf.all.disable_ipv6)[[:space:]]*=[[:space:]]*1";
-// uncomment bellow to read from old place
-// filelist = ["ipv6", "50-ipv6.conf"];
-// filepath ="/etc/modprobe.d/";
-// regexp = "^[[:space:]]*(install ipv6 /bin/true)";
+ map > methods = $[
+ "builtin" : $[
+ "filelist" : ["sysctl.conf"],
+ "filepath" : "/etc/",
+ "regexp" : "^[[:space:]]*(net.ipv6.conf.all.disable_ipv6)[[:space:]]*=[[:space:]]*1"
+ ],
+ "module" : $[
+ "filelist" : ["ipv6", "50-ipv6.conf"],
+ "filepath" : "/etc/modprobe.d/",
+ "regexp" : "^[[:space:]]*(install ipv6 /bin/true)"
+ ]
+ ];
+
+ foreach(string which,map method, methods, {
+ list<string> filelist = method["filelist"]:[];
+ string filepath = method["filepath"]:"";
+ string regexp = method["regexp"]:"";
foreach(string file, filelist,{
string filename=sformat("%1/%2", filepath, file);
if (FileUtils::Exists(filename)){
foreach(string row, splitstring((string)SCR::Read(.target.string, filename), "\n"), {
if (size(regexptokenize(String::CutBlanks(row), regexp))>0){
- y2milestone("IPv6 is disabled.");
+ y2milestone("IPv6 is disabled by '%1' method.", which);
ipv6=false;
}
});
}
});
+ });
+
}
/**
@@ -326,8 +338,9 @@
}
void writeIPv6(){
+// SCR::Write(.target.string, "/etc/modprobe.d/ipv6", sformat("%1install ipv6 /bin/true", ipv6?"#":""));
// uncomment to write to old place (and comment code bellow)
-// SCR::Write(.target.string, "/etc/modprobe.d/50-ipv6.conf", sformat("%1install ipv6 /bin/true", ipv6?"#":""));
+ SCR::Write(.target.string, "/etc/modprobe.d/50-ipv6.conf", sformat("%1install ipv6 /bin/true\n", ipv6?"#":""));
string filename = "/etc/sysctl.conf";
string sysctl = (string)SCR::Read(.target.string, filename);
string sysctl_row = sformat("%1net.ipv6.conf.all.disable_ipv6 = 1", ipv6?"# ":"");
@@ -342,6 +355,7 @@
});
if (!found) file=add(file, sysctl_row);
SCR::Write(.target.string, filename, mergestring(file, "\n"));
+ SCR::Execute(.target.bash, sformat("sysctl -w net.ipv6.conf.all.disable_ipv6=%1",!ipv6?"1":"0"));
SCR::Write(.sysconfig.windowmanager.KDE_USE_IPV6, ipv6?"yes":"no");
}
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-network-2.19.9/src/modules/LanItems.ycp new/yast2-network-2.19.11/src/modules/LanItems.ycp
--- old/yast2-network-2.19.9/src/modules/LanItems.ycp 2010-01-22 15:22:38.000000000 +0100
+++ new/yast2-network-2.19.11/src/modules/LanItems.ycp 2010-02-08 16:23:12.000000000 +0100
@@ -1435,7 +1435,7 @@
break;
case "iucv":
// router
- command1=sformat("iucv_configure %1", chan_mode);
+ command1=sformat("iucv_configure %1 1", chan_mode);
command2=sformat("ls /sys/devices/%1/*/net/|head -n1|tr -d '\n'", type);
break;
default:
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org