Hello community,
here is the log from the commit of package yast2-network
checked in at Mon Nov 27 18:35:34 CET 2006.
--------
--- yast2-network/yast2-network.changes 2006-11-15 15:30:30.000000000 +0100
+++ /mounts/work_src_done/STABLE/STABLE/yast2-network/yast2-network.changes 2006-11-27 10:45:05.000000000 +0100
@@ -1,0 +2,11 @@
+Mon Nov 27 10:43:17 CET 2006 - mzugec@suse.cz
+
+- #223136 - don't modprobe blacklisted modules
+- 2.14.11
+
+-------------------------------------------------------------------
+Tue Nov 21 10:47:16 CET 2006 - kmachalkova@suse.cz
+
+- Adjusted proxy dialog layout in text mode (#221648)
+
+-------------------------------------------------------------------
Old:
----
yast2-network-2.14.10.tar.bz2
New:
----
yast2-network-2.14.11.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ yast2-network.spec ++++++
--- /var/tmp/diff_new_pack.kHnF0o/_old 2006-11-27 18:34:43.000000000 +0100
+++ /var/tmp/diff_new_pack.kHnF0o/_new 2006-11-27 18:34:43.000000000 +0100
@@ -1,5 +1,5 @@
#
-# spec file for package yast2-network (Version 2.14.10)
+# spec file for package yast2-network (Version 2.14.11)
#
# Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany.
# This file and all modifications and additions to the pristine
@@ -11,12 +11,12 @@
# norootforbuild
Name: yast2-network
-Version: 2.14.10
-Release: 2
+Version: 2.14.11
+Release: 1
License: GNU General Public License (GPL)
Group: System/YaST
BuildRoot: %{_tmppath}/%{name}-%{version}-build
-Source0: yast2-network-2.14.10.tar.bz2
+Source0: yast2-network-2.14.11.tar.bz2
prefix: /usr
# should be required by devtools
BuildRequires: perl-XML-Writer pkgconfig
@@ -50,7 +50,7 @@
Michal Svec
%prep
-%setup -n yast2-network-2.14.10
+%setup -n yast2-network-2.14.11
%build
%{prefix}/bin/y2tool y2autoconf
@@ -106,6 +106,11 @@
/usr/share/YaST2/schema/autoyast/rnc/proxy.rnc
%changelog -n yast2-network
+* Mon Nov 27 2006 - mzugec@suse.cz
+- #223136 - don't modprobe blacklisted modules
+- 2.14.11
+* Tue Nov 21 2006 - kmachalkova@suse.cz
+- Adjusted proxy dialog layout in text mode (#221648)
* Tue Nov 14 2006 - kmachalkova@suse.cz
- Added autoyast validation file for proxy module(#215251)
- Display also https proxy URL in autoyast summary
++++++ yast2-network-2.14.10.tar.bz2 -> yast2-network-2.14.11.tar.bz2 ++++++
++++ 12276 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.14.10/Makefile.am new/yast2-network-2.14.11/Makefile.am
--- old/yast2-network-2.14.10/Makefile.am 2006-11-15 14:46:53.000000000 +0100
+++ new/yast2-network-2.14.11/Makefile.am 2006-11-27 10:27:28.000000000 +0100
@@ -7,7 +7,8 @@
#
#where devtools are
-Y2TOOL = $(Y2DEVTOOLS_PREFIX)/bin/y2tool
+PREFIX := $(shell pkg-config --print-errors --variable=prefix yast2-devtools)
+Y2TOOL = $(PREFIX)/bin/y2tool
VERSION = $(shell cat $(srcdir)/VERSION)
RPMNAME = $(shell cat $(srcdir)/RPMNAME)
@@ -19,7 +20,7 @@
# do we do Makefile.am for devtools? It is a little special...
IS_DEVTOOLS = $(findstring yast2-devtools,$(RPMNAME))
-DEVTOOLS_DIR = $(if $(IS_DEVTOOLS),$(srcdir)/devtools,$(Y2DEVTOOLS_PREFIX)/share/YaST2/data/devtools)
+DEVTOOLS_DIR = $(if $(IS_DEVTOOLS),$(srcdir)/devtools,$(PREFIX)/share/YaST2/data/devtools)
ALL_PACKAGES = $(DEVTOOLS_DIR)/admin/all-packages
LEGALESE_DIR = $(if $(HAS_YAST_LICENSE),$(DEVTOOLS_DIR)/admin/copyright/yast,$(DEVTOOLS_DIR)/admin/copyright/gpl)
@@ -33,7 +34,7 @@
AUTOMAKE_OPTIONS = foreign dist-bzip2
# where devtools instal m4 snippets
# argh, executed literally
-#ACLOCAL_AMFLAGS = -I $(Y2DEVTOOLS_PREFIX)/share/aclocal
+#ACLOCAL_AMFLAGS = -I $(PREFIX)/share/aclocal
ACLOCAL_AMFLAGS = -I `if test -d ./devtools/admin; then echo ./devtools/admin; else pkg-config --print-errors --variable=datadir yast2-devtools; fi`/aclocal
Makefile.am.common: $(DEVTOOLS_DIR)/admin/Makefile.am.common
@@ -66,7 +67,7 @@
# because the prerequisite is made here (not anymore!)
# and we don't want any paths in y2autoconf
# info '(autoconf)config.status Invocation'
-$(RPMNAME).pc: $(RPMNAME).pc.in config.status
+$(RPMNAME).pc: $(RPMNAME).pc.in
./config.status --file=$@:$<
if CREATE_PKGCONFIG_NOARCH
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.14.10/Makefile.am.common new/yast2-network-2.14.11/Makefile.am.common
--- old/yast2-network-2.14.10/Makefile.am.common 2006-11-15 14:46:53.000000000 +0100
+++ new/yast2-network-2.14.11/Makefile.am.common 2006-11-27 10:27:28.000000000 +0100
@@ -29,19 +29,7 @@
dist-hook: check-syntax
-CHECK_SYNTAX = true
check-syntax: $(client_DATA) $(ycpchook)
- @if test "$(client_DATA)"; then \
- if $(CHECK_SYNTAX); then \
- TO_CHECK="$(filter %.ycp,$^)"; \
- echo "Checking syntax of $${TO_CHECK}"; \
- if ! $(YCPC) -qE -M. -I. $(YCPCFLAGS) $${TO_CHECK}; then \
- echo "Failed. Disable by 'make ... CHECK_SYNTAX=false' at your own risk"; \
- exit 1; \
- fi; \
- else \
- echo "Syntax check disabled"; \
- fi; \
- fi
+ if test "$(client_DATA)"; then $(bindir)/ycpc -qE -M. -I. $(YCPCFLAGS) $(filter %.ycp,$^) || exit 1; fi
-include .dep
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.14.10/VERSION new/yast2-network-2.14.11/VERSION
--- old/yast2-network-2.14.10/VERSION 2006-11-14 16:44:10.000000000 +0100
+++ new/yast2-network-2.14.11/VERSION 2006-11-27 10:43:13.000000000 +0100
@@ -1 +1 @@
-2.14.10
+2.14.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.14.10/configure.in new/yast2-network-2.14.11/configure.in
--- old/yast2-network-2.14.10/configure.in 2006-11-15 14:46:53.000000000 +0100
+++ new/yast2-network-2.14.11/configure.in 2006-11-27 10:27:28.000000000 +0100
@@ -1,6 +1,6 @@
dnl configure.in for yast2-network
dnl
-dnl -- This file is generated by y2autoconf 2.13.29 - DO NOT EDIT! --
+dnl -- This file is generated by y2autoconf 2.13.21 - DO NOT EDIT! --
dnl (edit configure.in.in instead)
AC_INIT(yast2-network, 2.14.10, http://bugs.opensuse.org/, yast2-network)
@@ -110,8 +110,6 @@
AC_MSG_ERROR(xgettext is missing; please install gettext-devel.)
fi
-Y2DEVTOOLS_PREFIX=`pkg-config --print-errors --variable=prefix yast2-devtools`
-AC_SUBST(Y2DEVTOOLS_PREFIX)
devtools_ybindir=`pkg-config --print-errors --variable=ybindir yast2-devtools`
devtools_yast2dir=`pkg-config --print-errors --variable=yast2dir yast2-devtools`
@@ -144,9 +142,6 @@
if test "$YCPC" = "false"; then
AC_MSG_ERROR([ycpc is not installed])
fi
-AC_CHECK_FILE($devtools_yast2dir/data/testsuite/Makefile.testsuite, [], [
- AC_MSG_WARN([yast2-testsuite.rpm is not installed])
-])
AC_CONFIG_FILES(Makefile agents/Makefile
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.14.10/src/modules/Detection.ycp new/yast2-network-2.14.11/src/modules/Detection.ycp
--- old/yast2-network-2.14.10/src/modules/Detection.ycp 2006-08-18 13:28:24.000000000 +0200
+++ new/yast2-network-2.14.11/src/modules/Detection.ycp 2006-11-27 10:44:13.000000000 +0100
@@ -4,7 +4,7 @@
* Summary: Network detection
* Authors: Michal Svec
*
- * $Id: Detection.ycp 31391 2006-06-08 13:06:27Z mvidner $
+ * $Id: Detection.ycp 34593 2006-11-27 09:44:06Z mzugec $
*
* <p>Detects network settings, using dhcp or sniffing network traffic</p>
*
@@ -113,7 +113,7 @@
Package::InstallKernel (maplist (string m, detection_modules, ``(m+".ko")));
foreach (string mod, detection_modules, {
y2milestone("Loading module: %1", mod);
- SCR::Execute (.target.bash, sformat ("/sbin/modprobe %1 2>&1", mod));
+ SCR::Execute (.target.bash, sformat ("/sbin/modprobe --use-blacklist %1 2>&1", mod));
});
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.14.10/src/services/proxy.ycp new/yast2-network-2.14.11/src/services/proxy.ycp
--- old/yast2-network-2.14.10/src/services/proxy.ycp 2006-11-07 17:12:11.000000000 +0100
+++ new/yast2-network-2.14.11/src/services/proxy.ycp 2006-11-27 10:27:09.000000000 +0100
@@ -4,7 +4,7 @@
* Summary: Proxy configuration
* Authors: Michal Svec
*
- * $Id: proxy.ycp 34139 2006-11-07 16:12:06Z kmachalkova $
+ * $Id: proxy.ycp 34521 2006-11-21 09:49:41Z kmachalkova $
*/
{
@@ -347,13 +347,18 @@
the current configuration for HTTP, HTTPS, and FTP proxy.</p>
");
+ map display_info = UI::GetDisplayInfo();
+ boolean textmode = display_info["TextMode"]:false;
+
+ float s = (textmode) ? (0.2) : 1.0;
+
/* Proxy dialog contents */
term contents = `HBox(
- `HSpacing(6),
+ `HSpacing(5),
`VBox(
/* CheckBox entry label */
`Left(`CheckBox(`id(`enabled), `opt(`notify), _("&Enable Proxy"), enabled)),
- `VSpacing(1),
+ `VSpacing(s),
/* Frame label */
`Frame(`id(`frame1), _("Proxy Settings"), `HBox(`HSpacing(2), `VBox(
`VSpacing(0.2),
@@ -369,23 +374,23 @@
/* Text entry label */
// domains without proxying
`TextEntry(`id(`no), _("No Proxy &Domains"), no),
- `VSpacing(0.4)
+ (textmode) ? `Empty() : `VSpacing(0.4)
), `HSpacing(2))),
- `VSpacing(1),
+ `VSpacing(s),
`Frame(`id(`frame2), _("Proxy Authentication"), `HBox(`HSpacing(2), `VBox(
/* Text entry label */
`TextEntry(`id(`user), _("Proxy &User Name"), user),
`VSpacing(0.2),
/* Password entry label */
`Password(`id(`pass), _("Proxy &Password"), pass),
- `VSpacing(0.4)
+ (textmode) ? `Empty() : `VSpacing(0.4)
), `HSpacing(2))),
- `VSpacing(1),
+ `VSpacing(s),
/* Test Proxy Settings - push button */
(!Mode::installation()) ?
`PushButton(`id("test_proxy"), _("Test Pr&oxy Settings")): `Empty()
),
- `HSpacing(6)
+ `HSpacing(5)
);
if(standalone == true)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org