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
March 2006
- 2 participants
- 169 discussions
Hello community,
here is the log from the commit of package pvm
checked in at Tue Mar 28 18:35:14 CEST 2006.
--------
--- /work/SRC/all/pvm/pvm.changes 2006-01-25 21:40:42.000000000 +0100
+++ /work/src/done/STABLE/pvm/pvm.changes 2006-03-22 18:47:02.000000000 +0100
@@ -1,0 +2,7 @@
+Wed Mar 22 18:19:15 CET 2006 - mrueckert(a)suse.de
+
+- added pvm-3.4.5_missing_format_param.patch
+ o fixes missing parameter for printf expression. (#133904)
+ o use vsnprintf instead of vsprintf
+
+------------…
[View More]-------------------------------------------------------
New:
----
pvm-3.4.5_missing_format_param.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ pvm.spec ++++++
--- /var/tmp/diff_new_pack.ezkJvQ/_old 2006-03-28 18:34:53.000000000 +0200
+++ /var/tmp/diff_new_pack.ezkJvQ/_new 2006-03-28 18:34:53.000000000 +0200
@@ -5,7 +5,7 @@
# This file and all modifications and additions to the pristine
# package are under the same license as the package itself.
#
-# Please submit bugfixes or comments via http://bugs.opensuse.org
+# Please submit bugfixes or comments via http://bugs.opensuse.org/
#
# norootforbuild
@@ -14,7 +14,7 @@
BuildRequires: gcc-fortran readline-devel tcsh
Summary: Parallel Virtual Machine
Version: 3.4.5
-Release: 9
+Release: 16
License: LGPL, Other License(s), see package
Group: Development/Libraries/Parallel
Source0: ftp://ftp.netlib.org/pvm3/%{name}-%{version}.tar.bz2
@@ -23,6 +23,7 @@
Patch1: pvm-%{version}-cons.patch
Patch2: pvm-%{version}-gcc4.patch
Patch3: pvm-3.4.5_missing_includes.patch
+Patch4: pvm-3.4.5_missing_format_param.patch
URL: http://www.epm.ornl.gov/pvm/pvm_home.html
BuildRoot: %{_tmppath}/%{name}-%{version}-build
%define _pvm_root /usr/lib/pvm3
@@ -151,6 +152,7 @@
%patch1
%patch2 -p1
%patch3
+%patch4
%build
mkdir -p src/%{_pvm_arch}
@@ -239,6 +241,10 @@
%{_mandir}/man3/*
%changelog -n pvm
+* Wed Mar 22 2006 - mrueckert(a)suse.de
+- added pvm-3.4.5_missing_format_param.patch
+ o fixes missing parameter for printf expression. (#133904)
+ o use vsnprintf instead of vsprintf
* Wed Jan 25 2006 - mls(a)suse.de
- converted neededforbuild to BuildRequires
* Mon Jan 23 2006 - mrueckert(a)suse.de
++++++ pvm-3.4.5_missing_format_param.patch ++++++
Index: src/pvmlog.c
===================================================================
--- src/pvmlog.c.orig
+++ src/pvmlog.c
@@ -348,7 +348,8 @@
char *fmt;
va_list ap;
{
- char vtmp[255];
+ size_t vlen = 255;
+ char vtmp[vlen];
int cnt = 0;
int cc;
@@ -362,7 +363,7 @@
/* snag var arg string, in case re-use whacks it... */
/* (thank you very much x86_64... :-Q */
- vsprintf(vtmp, fmt, ap);
+ vsnprintf(vtmp, vlen, fmt, ap);
if (log_how & 1) {
if (atnewline) {
@@ -488,7 +489,7 @@
pvmlogprintf("em=0x%lx\n", (long) em);
for (i=0; i < 10 ; i++ )
- pvmlogprintf("[%x/%c]", em[i]);
+ pvmlogprintf("[%x/%c]", em[i], em[i]);
pvmlogprintf("\n");
pvmlogprintf("%s: %s\n", s, em);
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
[View Less]
1
0
Hello community,
here is the log from the commit of package yast2-packager
checked in at Tue Mar 28 18:34:42 CEST 2006.
--------
--- /work/SRC/all/yast2-packager/yast2-packager.changes 2006-03-28 12:53:17.000000000 +0200
+++ /work/src/done/STABLE/yast2-packager/yast2-packager.changes 2006-03-28 17:43:06.000000000 +0200
@@ -1,0 +2,17 @@
+Tue Mar 28 17:42:20 CEST 2006 - locilka(a)suse.cz
+
+- Added the first implementation of SignatureCheckDialogs module.
+- 2.13.54
+
+--------------------------…
[View More]-----------------------------------------
+Tue Mar 28 14:10:29 CEST 2006 - visnov(a)suse.cz
+
+- Show type of installation source if name is not known
+
+-------------------------------------------------------------------
+Tue Mar 28 13:41:20 CEST 2006 - locilka(a)suse.cz
+
+- Moving ZMD sync to the pkg_finish client that is called after the
+ switch_scr client (#161299).
+
+-------------------------------------------------------------------
Old:
----
yast2-packager-2.13.53.tar.bz2
New:
----
yast2-packager-2.13.54.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ yast2-packager.spec ++++++
--- /var/tmp/diff_new_pack.xwU2sG/_old 2006-03-28 18:34:22.000000000 +0200
+++ /var/tmp/diff_new_pack.xwU2sG/_new 2006-03-28 18:34:22.000000000 +0200
@@ -1,5 +1,5 @@
#
-# spec file for package yast2-packager (Version 2.13.53)
+# spec file for package yast2-packager (Version 2.13.54)
#
# 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-packager
-Version: 2.13.53
+Version: 2.13.54
Release: 1
License: GPL
Group: System/YaST
BuildRoot: %{_tmppath}/%{name}-%{version}-build
-Source0: yast2-packager-2.13.53.tar.bz2
+Source0: yast2-packager-2.13.54.tar.bz2
prefix: /usr
BuildRequires: docbook-xsl-stylesheets doxygen gcc-c++ libxcrypt-devel libxslt perl-XML-Writer sgml-skel update-desktop-files yast2 yast2-country yast2-devtools yast2-installation yast2-testsuite yast2-xml
Requires: yast2 yast2-installation checkmedia yast2-country
@@ -41,7 +41,7 @@
Arvin Schnell <arvin(a)suse.de>
%prep
-%setup -n yast2-packager-2.13.53
+%setup -n yast2-packager-2.13.54
%build
%{prefix}/bin/y2tool y2autoconf
@@ -78,6 +78,14 @@
%doc %{prefix}/share/doc/packages/yast2-packager
%changelog -n yast2-packager
+* Tue Mar 28 2006 - locilka(a)suse.cz
+- Added the first implementation of SignatureCheckDialogs module.
+- 2.13.54
+* Tue Mar 28 2006 - visnov(a)suse.cz
+- Show type of installation source if name is not known
+* Tue Mar 28 2006 - locilka(a)suse.cz
+- Moving ZMD sync to the pkg_finish client that is called after the
+ switch_scr client (#161299).
* Tue Mar 28 2006 - visnov(a)suse.cz
- fix slideshow in 1st stage (#154324)
- 2.13.53
++++++ yast2-packager-2.13.53.tar.bz2 -> yast2-packager-2.13.54.tar.bz2 ++++++
++++ 3256 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-packager-2.13.53/Makefile.am new/yast2-packager-2.13.54/Makefile.am
--- old/yast2-packager-2.13.53/Makefile.am 2006-03-13 14:18:11.000000000 +0100
+++ new/yast2-packager-2.13.54/Makefile.am 2006-03-28 17:45:50.000000000 +0200
@@ -154,7 +154,7 @@
$(PREFIX)/bin/y2tool create-spec < $$i > $$here/package/$${newname} ; \
done
-package: check-up-to-date check-tagversion check-all-packages package-local
+package: check-up-to-date check-tagversion check-all-packages check-textdomain package-local
TAGVERSION = $(PREFIX)/bin/y2tool tagversion
@@ -199,6 +199,9 @@
false; \
fi
+check-textdomain:
+ $(PREFIX)/bin/y2tool check-textdomain $(srcdir)
+
stable: checkin-stable
checkin-stable: package
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-packager-2.13.53/VERSION new/yast2-packager-2.13.54/VERSION
--- old/yast2-packager-2.13.53/VERSION 2006-03-28 11:36:19.000000000 +0200
+++ new/yast2-packager-2.13.54/VERSION 2006-03-28 13:41:14.000000000 +0200
@@ -1 +1 @@
-2.13.53
+2.13.54
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-packager-2.13.53/configure.in new/yast2-packager-2.13.54/configure.in
--- old/yast2-packager-2.13.53/configure.in 2006-03-13 14:18:11.000000000 +0100
+++ new/yast2-packager-2.13.54/configure.in 2006-03-28 17:45:50.000000000 +0200
@@ -3,7 +3,7 @@
dnl -- This file is generated by y2autoconf - DO NOT EDIT! --
dnl (edit configure.in.in instead)
-AC_INIT(yast2-packager, 2.13.41, http://www.suse.de/feedback, yast2-packager)
+AC_INIT(yast2-packager, 2.13.54, http://www.suse.de/feedback, yast2-packager)
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.13.41"
+VERSION="2.13.54"
RPMNAME="yast2-packager"
MAINTAINER="Jiri Srain <jsrain(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-packager-2.13.53/src/clients/inst_rpmcopy.ycp new/yast2-packager-2.13.54/src/clients/inst_rpmcopy.ycp
--- old/yast2-packager-2.13.53/src/clients/inst_rpmcopy.ycp 2006-03-28 11:32:23.000000000 +0200
+++ new/yast2-packager-2.13.54/src/clients/inst_rpmcopy.ycp 2006-03-28 13:42:10.000000000 +0200
@@ -13,7 +13,7 @@
* Packages module :
* "installed"
*
- * $Id: inst_rpmcopy.ycp 29429 2006-03-27 14:28:35Z locilka $
+ * $Id: inst_rpmcopy.ycp 29461 2006-03-28 11:42:01Z locilka $
*/
{
@@ -34,7 +34,6 @@
import "Report";
import "Kernel";
import "Service";
- import "Message";
// variables related to installation source caching
@@ -500,162 +499,6 @@
// end of installation source caching functions
// ------------------------------------------------------------------------------------------------------
- // ------------------------------------------------------------------------------------------------------
- // adding YaST installation source into the ZMD
-
- /**
- * Runs a bash command with timeout.
- * @struct Returns map $[
- * "exit" : int_return_code,
- * "stdout" : [ "script", "stdout", "lines" ],
- * "stderr" : [ "script", "stderr", "lines" ],
- * ]
- *
- * @param string command
- * @param integer timeout in sec.
- * @return map with out, err and ret_code
- */
- map RunCommandWithTimeout (string run_command, integer script_time_out) {
- y2milestone("Running command \"%1\" in background...", run_command);
-
- boolean started = (boolean) SCR::Execute(.background.run_output_err, run_command);
- if (!started) {
- y2error("Cannot run '%1'", run_command);
- return nil;
- }
-
- list<string> script_out = [];
- list<string> script_err = [];
- integer time_spent = 0;
- integer return_code = nil;
- boolean cont_loop = true;
- integer sleep_step = 20;
- script_time_out = script_time_out * 1000;
-
- // while continuing is needed and while it is possible
- while (cont_loop && ((boolean) SCR::Read(.background.output_open) || (integer) SCR::Read(.background.pid) > 0)) {
- // time-out
- if (time_spent >= script_time_out) {
- y2error("Command '%1' timed-out after %2 mces", run_command, time_spent);
- cont_loop = false;
- }
-
- time_spent = time_spent + sleep_step;
- sleep(sleep_step);
- }
- y2milestone("Time spent: %1 msec", time_spent);
-
- // fetching the return code if not timed-out
- if (cont_loop) {
- script_out = (list<string>) SCR::Read(.background.newout);
- script_err = (list<string>) SCR::Read(.background.newerr);
- return_code = (integer) SCR::Read(.background.status);
- }
- SCR::Execute(.background.kill, "");
-
- map command_ret = $[
- "exit" : return_code,
- "stdout" : script_out,
- "stderr" : script_err,
- ];
- return command_ret;
- }
-
- /**
- * Returns count of services matching the pattern. Returns 'nil'
- * if something fails.
- *
- * @param string grep_pattern to match the ZYPP service
- * @return integer count of matching lines
- */
- integer CountOfZMDServicesMatching (string grep_pattern) {
- map ret = RunCommandWithTimeout(
- sformat("TERM=dumb /usr/bin/rug service-list; exit $?"),
- 60
- );
- if (ret != nil && ret["stdout"]:nil != nil) {
- list <string> matching = filter (string one_line, (list <string>) ret["stdout"]:[], {
- return regexpmatch(one_line, grep_pattern);
- });
- return size(matching);
- } else {
- y2error("Counting of services failed, returned %1", ret);
- return nil;
- }
- }
-
- /* Adds a ZYPP service into ZMD */
- boolean AddZYPPServiceIntoZMD () {
- map ret = RunCommandWithTimeout(
- "TERM=dumb /usr/bin/rug service-add --type=zypp /installation; rug subscribe zypp; exit $?",
- 60
- );
- if (ret != nil && ret["exit"]:nil == 0) {
- return true;
- } else {
- y2error("Adding ZYPP service failed, returned %1", ret);
- return false;
- }
- }
-
- /**
- * Checks whether ZMD is running, starts it when isn't. Checks whether a ZYPP source is listed
- * in the ZMD services, adds one if it is missing.
- * Everything is done via the .background agent with timeout (number in seconds).
- */
- boolean SyncYaSTInstSourceWithZMD () {
- // Notes for maintainer:
- // - using .background agent because of ZMD/rug call that can stuck
- // - using 'exit $?' that work well with ZMD/rug and .background together
- // - using TERM=dumb to suppress colors, progress bars etc. from ZMD/rug
-
- y2milestone("--- Syncing YaST inst source with ZMD ---");
- string zmd_service_name = "/etc/init.d/novell-zmd";
- string rug_command = "/usr/bin/rug";
-
- // Check the ZMD status and start if not running, using 'exit $?' because of buggy behavior '.background vs. ZMD'
- map zmd_status = RunCommandWithTimeout(sformat("TERM=dumb %1 ping 1>/dev/null; exit $?", rug_command), 60);
- y2milestone("ZMD status: %1, err: %2", zmd_status["exit"]:nil, zmd_status["stderr"]:[]);
- if (zmd_status == nil || zmd_status["exit"]:nil != 0) {
- // Starting the service
- map zmd_start = RunCommandWithTimeout(sformat("TERM=dumb %1 start; exit $?", zmd_service_name), 60);
- y2milestone("ZMD start: %1", zmd_start);
- // Checking the status after start
- map zmd_status = RunCommandWithTimeout(sformat("TERM=dumb %1 ping 1>/dev/null; exit $?", rug_command), 60);
- y2milestone("ZMD status: %1, err: %2", zmd_status["exit"]:nil, zmd_status["stderr"]:[]);
- if (zmd_status == nil || zmd_status["exit"]:nil != 0) {
- Report::Error(Message::CannotStartService(zmd_service_name));
- y2error("Cannot start service %1, returned %2", zmd_service_name, zmd_status);
- y2milestone("--- Syncing finished ---");
- return false;
- }
- }
-
- // Check whether the ZYPP service is already in zmd db or not
- integer count_of_services = CountOfZMDServicesMatching(".*ZYPP.*/installation.*");
- if (count_of_services == nil) {
- y2warning("Cannot get list of services...");
- } else if (count_of_services > 0) {
- y2milestone("ZYPP service already presented (%1)", count_of_services);
- y2milestone("--- Syncing finished ---");
- return true;
- }
-
- // Count of services were 'nil' or '0'
- if (AddZYPPServiceIntoZMD()) {
- y2milestone("Adding ZYPP service succeeded");
- } else {
- Report::Error(Message::CannotWriteSettingsTo("ZMD"));
- y2error("Adding ZYPP service failed");
- }
-
- y2milestone("--- Syncing finished ---");
- return true;
- }
-
- // adding YaST installation source into the ZMD
- // ------------------------------------------------------------------------------------------------------
-
Pkg::SetLocale (Language::language);
SlideShow::SetLanguage (Language::language);
@@ -937,10 +780,5 @@
}
}
- // Bug 156030 - YaST installation sources must be synced with ZMD
- UI::OpenDialog(`Label(_("Configuring installed system") + "..."));
- boolean sync_ret = SyncYaSTInstSourceWithZMD();
- UI::CloseDialog();
-
return result;
}
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-packager-2.13.53/src/clients/pkg_finish.ycp new/yast2-packager-2.13.54/src/clients/pkg_finish.ycp
--- old/yast2-packager-2.13.53/src/clients/pkg_finish.ycp 2006-02-14 07:29:56.000000000 +0100
+++ new/yast2-packager-2.13.54/src/clients/pkg_finish.ycp 2006-03-28 13:42:10.000000000 +0200
@@ -7,8 +7,9 @@
*
* Authors:
* Jiri Srain <jsrain(a)suse.cz>
+ * Lukas Ocilka <locilka(a)suse.cz>
*
- * $Id: pkg_finish.ycp 27936 2006-02-13 20:01:14Z olh $
+ * $Id: pkg_finish.ycp 29461 2006-03-28 11:42:01Z locilka $
*
*/
@@ -17,11 +18,169 @@
textdomain "packager";
import "Installation";
+import "Report";
+import "Message";
any ret = nil;
string func = "";
map param = $[];
+ // ------------------------------------------------------------------------------------------------------
+ // adding YaST installation source into the ZMD
+
+ /**
+ * Runs a bash command with timeout.
+ * @struct Returns map $[
+ * "exit" : int_return_code,
+ * "stdout" : [ "script", "stdout", "lines" ],
+ * "stderr" : [ "script", "stderr", "lines" ],
+ * ]
+ *
+ * @param string command
+ * @param integer timeout in sec.
+ * @return map with out, err and ret_code
+ */
+ map RunCommandWithTimeout (string run_command, integer script_time_out) {
+ y2milestone("Running command \"%1\" in background...", run_command);
+
+ boolean started = (boolean) SCR::Execute(.background.run_output_err, run_command);
+ if (!started) {
+ y2error("Cannot run '%1'", run_command);
+ return nil;
+ }
+
+ list<string> script_out = [];
+ list<string> script_err = [];
+ integer time_spent = 0;
+ integer return_code = nil;
+ boolean cont_loop = true;
+ integer sleep_step = 20;
+ script_time_out = script_time_out * 1000;
+
+ // while continuing is needed and while it is possible
+ while (cont_loop && ((boolean) SCR::Read(.background.output_open) || (integer) SCR::Read(.background.pid) > 0)) {
+ // time-out
+ if (time_spent >= script_time_out) {
+ y2error("Command '%1' timed-out after %2 mces", run_command, time_spent);
+ cont_loop = false;
+ }
+
+ time_spent = time_spent + sleep_step;
+ sleep(sleep_step);
+ }
+ y2milestone("Time spent: %1 msec", time_spent);
+
+ // fetching the return code if not timed-out
+ if (cont_loop) {
+ script_out = (list<string>) SCR::Read(.background.newout);
+ script_err = (list<string>) SCR::Read(.background.newerr);
+ return_code = (integer) SCR::Read(.background.status);
+ }
+ SCR::Execute(.background.kill, "");
+
+ map command_ret = $[
+ "exit" : return_code,
+ "stdout" : script_out,
+ "stderr" : script_err,
+ ];
+ return command_ret;
+ }
+
+ /**
+ * Returns count of services matching the pattern. Returns 'nil'
+ * if something fails.
+ *
+ * @param string grep_pattern to match the ZYPP service
+ * @return integer count of matching lines
+ */
+ integer CountOfZMDServicesMatching (string grep_pattern) {
+ map ret = RunCommandWithTimeout(
+ sformat("TERM=dumb /usr/bin/rug service-list; exit $?"),
+ 60
+ );
+ if (ret != nil && ret["stdout"]:nil != nil) {
+ list <string> matching = filter (string one_line, (list <string>) ret["stdout"]:[], {
+ return regexpmatch(one_line, grep_pattern);
+ });
+ return size(matching);
+ } else {
+ y2error("Counting of services failed, returned %1", ret);
+ return nil;
+ }
+ }
+
+ /* Adds a ZYPP service into ZMD */
+ boolean AddZYPPServiceIntoZMD () {
+ map ret = RunCommandWithTimeout(
+ "TERM=dumb /usr/bin/rug service-add --type=zypp /installation; rug subscribe zypp; exit $?",
+ 60
+ );
+ if (ret != nil && ret["exit"]:nil == 0) {
+ return true;
+ } else {
+ y2error("Adding ZYPP service failed, returned %1", ret);
+ return false;
+ }
+ }
+
+ /**
+ * Checks whether ZMD is running, starts it when isn't. Checks whether a ZYPP source is listed
+ * in the ZMD services, adds one if it is missing.
+ * Everything is done via the .background agent with timeout (number in seconds).
+ */
+ boolean SyncYaSTInstSourceWithZMD () {
+ // Notes for maintainer:
+ // - using .background agent because of ZMD/rug call that can stuck
+ // - using 'exit $?' that work well with ZMD/rug and .background together
+ // - using TERM=dumb to suppress colors, progress bars etc. from ZMD/rug
+
+ y2milestone("--- Syncing YaST inst source with ZMD ---");
+ string zmd_service_name = "/etc/init.d/novell-zmd";
+ string rug_command = "/usr/bin/rug";
+
+ // Check the ZMD status and start if not running, using 'exit $?' because of buggy behavior '.background vs. ZMD'
+ map zmd_status = RunCommandWithTimeout(sformat("TERM=dumb %1 ping 1>/dev/null; exit $?", rug_command), 60);
+ y2milestone("ZMD status: %1, err: %2", zmd_status["exit"]:nil, zmd_status["stderr"]:[]);
+ if (zmd_status == nil || zmd_status["exit"]:nil != 0) {
+ // Starting the service
+ map zmd_start = RunCommandWithTimeout(sformat("TERM=dumb %1 start; exit $?", zmd_service_name), 60);
+ y2milestone("ZMD start: %1", zmd_start);
+ // Checking the status after start
+ map zmd_status = RunCommandWithTimeout(sformat("TERM=dumb %1 ping 1>/dev/null; exit $?", rug_command), 60);
+ y2milestone("ZMD status: %1, err: %2", zmd_status["exit"]:nil, zmd_status["stderr"]:[]);
+ if (zmd_status == nil || zmd_status["exit"]:nil != 0) {
+ Report::Error(Message::CannotStartService(zmd_service_name));
+ y2error("Cannot start service %1, returned %2", zmd_service_name, zmd_status);
+ y2milestone("--- Syncing finished ---");
+ return false;
+ }
+ }
+
+ // Check whether the ZYPP service is already in zmd db or not
+ integer count_of_services = CountOfZMDServicesMatching(".*ZYPP.*/installation.*");
+ if (count_of_services == nil) {
+ y2warning("Cannot get list of services...");
+ } else if (count_of_services > 0) {
+ y2milestone("ZYPP service already presented (%1)", count_of_services);
+ y2milestone("--- Syncing finished ---");
+ return true;
+ }
+
+ // Count of services were 'nil' or '0'
+ if (AddZYPPServiceIntoZMD()) {
+ y2milestone("Adding ZYPP service succeeded");
+ } else {
+ Report::Error(Message::CannotWriteSettingsTo("ZMD"));
+ y2error("Adding ZYPP service failed");
+ }
+
+ y2milestone("--- Syncing finished ---");
+ return true;
+ }
+
+ // adding YaST installation source into the ZMD
+ // ------------------------------------------------------------------------------------------------------
+
/* Check arguments */
if(size(WFM::Args()) > 0 && is(WFM::Args(0), string)) {
func = (string)WFM::Args(0);
@@ -44,6 +203,9 @@
}
else if (func == "Write")
{
+ // Bug 156030 + 161299 - YaST installation sources must be synced with ZMD
+ boolean sync_ret = SyncYaSTInstSourceWithZMD();
+
Pkg::SourceCacheCopyTo (Installation::destdir);
// disable all sources and finish target
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-packager-2.13.53/src/clients/test.ycp new/yast2-packager-2.13.54/src/clients/test.ycp
--- old/yast2-packager-2.13.53/src/clients/test.ycp 1970-01-01 01:00:00.000000000 +0100
+++ new/yast2-packager-2.13.54/src/clients/test.ycp 2006-03-27 15:55:00.000000000 +0200
@@ -0,0 +1,156 @@
+{
+ textdomain "packager";
+ import "Service";
+ import "Message";
+
+ /**
+ * Runs a bash command with timeout.
+ * @struct Returns map $[
+ * "exit" : int_return_code,
+ * "stdout" : [ "script", "stdout", "lines" ],
+ * "stderr" : [ "script", "stderr", "lines" ],
+ * ]
+ *
+ * @param string command
+ * @param integer timeout in sec.
+ * @return map with out, err and ret_code
+ */
+ map RunCommandWithTimeout (string run_command, integer script_time_out) {
+ y2milestone("Running command \"%1\" in background...", run_command);
+
+ boolean started = (boolean) SCR::Execute(.background.run_output_err, run_command);
+ if (!started) {
+ y2error("Cannot run '%1'", run_command);
+ return nil;
+ }
+
+ list<string> script_out = [];
+ list<string> script_err = [];
+ integer time_spent = 0;
+ integer return_code = nil;
+ boolean cont_loop = true;
+ integer sleep_step = 20;
+ script_time_out = script_time_out * 1000;
+
+ // while continuing is needed and while it is possible
+ while (cont_loop && ((boolean) SCR::Read(.background.output_open) || (integer) SCR::Read(.background.pid) > 0)) {
+ // time-out
+ if (time_spent >= script_time_out) {
+ y2error("Command '%1' timed-out after %2 mces", run_command, time_spent);
+ cont_loop = false;
+ }
+
+ time_spent = time_spent + sleep_step;
+ sleep(sleep_step);
+ }
+ y2milestone("Time spent: %1 msec", time_spent);
+
+ // fetching the return code if not timed-out
+ if (cont_loop) {
+ script_out = (list<string>) SCR::Read(.background.newout);
+ script_err = (list<string>) SCR::Read(.background.newerr);
+ return_code = (integer) SCR::Read(.background.status);
+ }
+ SCR::Execute(.background.kill, "");
+
+ map command_ret = $[
+ "exit" : return_code,
+ "stdout" : script_out,
+ "stderr" : script_err,
+ ];
+ return command_ret;
+ }
+
+ /**
+ * Returns count of services matching the pattern. Returns 'nil'
+ * if something fails.
+ *
+ * @param string grep_pattern to match the ZYPP service
+ * @return integer count of matching lines
+ */
+ integer CountOfZMDServicesMatching (string grep_pattern) {
+ map ret = RunCommandWithTimeout(
+ sformat("TERM=dumb /usr/bin/rug service-list; exit $?"),
+ 60
+ );
+ if (ret != nil && ret["stdout"]:nil != nil) {
+ list <string> matching = filter (string one_line, (list <string>) ret["stdout"]:[], {
+ return regexpmatch(one_line, grep_pattern);
+ });
+ return size(matching);
+ } else {
+ y2error("Counting of services failed, returned %1", ret);
+ return nil;
+ }
+ }
+
+ /* Adds a ZYPP service into ZMD */
+ boolean AddZYPPServiceIntoZMD () {
+ map ret = RunCommandWithTimeout(
+ "TERM=dumb /usr/bin/rug service-add --type=zypp /installation; rug subscribe zypp; exit $?",
+ 60
+ );
+ if (ret != nil && ret["exit"]:nil == 0) {
+ return true;
+ } else {
+ y2error("Adding ZYPP service failed, returned %1", ret);
+ return false;
+ }
+ }
+
+ /**
+ * Checks whether ZMD is running, starts it when isn't. Checks whether a ZYPP source is listed
+ * in the ZMD services, adds one if it is missing.
+ * Everything is done via the .background agent with timeout (number in seconds).
+ */
+ boolean SyncYaSTInstSourceWithZMD () {
+ // Notes for maintainer:
+ // - using .background agent because of ZMD/rug call that can stuck
+ // - using 'exit $?' that work well with ZMD/rug and .background together
+ // - using TERM=dumb to suppress colors, progress bars etc. from ZMD/rug
+
+ y2milestone("--- Syncing YaST inst source with ZMD ---");
+ string zmd_service_name = "/etc/init.d/novell-zmd";
+ string rug_command = "/usr/bin/rug";
+
+ // Check the ZMD status and start if not running, using 'exit $?' because of buggy behavior '.background vs. ZMD'
+ map zmd_status = RunCommandWithTimeout(sformat("TERM=dumb %1 ping 1>/dev/null; exit $?", rug_command), 60);
+ y2milestone("ZMD status: %1, err: %2", zmd_status["exit"]:nil, zmd_status["stderr"]:[]);
+ if (zmd_status == nil || zmd_status["exit"]:nil != 0) {
+ // Starting the service
+ map zmd_start = RunCommandWithTimeout(sformat("TERM=dumb %1 start; exit $?", zmd_service_name), 60);
+ y2milestone("ZMD start: %1", zmd_start);
+ // Checking the status after start
+ map zmd_status = RunCommandWithTimeout(sformat("TERM=dumb %1 ping 1>/dev/null; exit $?", rug_command), 60);
+ y2milestone("ZMD status: %1, err: %2", zmd_status["exit"]:nil, zmd_status["stderr"]:[]);
+ if (zmd_status == nil || zmd_status["exit"]:nil != 0) {
+ Message::CannotStartService(zmd_service_name);
+ y2error("Cannot start service %1, returned %2", zmd_service_name, zmd_status);
+ y2milestone("--- Syncing finished ---");
+ return false;
+ }
+ }
+
+ // Check whether the ZYPP service is already in zmd db or not
+ integer count_of_services = CountOfZMDServicesMatching(".*ZYPP.*/installation.*");
+ if (count_of_services == nil) {
+ y2warning("Cannot get list of services...");
+ } else if (count_of_services > 0) {
+ y2milestone("ZYPP service already presented (%1)", count_of_services);
+ y2milestone("--- Syncing finished ---");
+ return true;
+ }
+
+ // Count of services were 'nil' or '0'
+ if (AddZYPPServiceIntoZMD()) {
+ y2milestone("Adding ZYPP service succeeded");
+ } else {
+ y2error("Adding ZYPP service failed");
+ }
+
+ y2milestone("--- Syncing finished ---");
+ return true;
+ }
+
+ SyncYaSTInstSourceWithZMD();
+}
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-packager-2.13.53/src/modules/SignatureCheckDialogs.ycp new/yast2-packager-2.13.54/src/modules/SignatureCheckDialogs.ycp
--- old/yast2-packager-2.13.53/src/modules/SignatureCheckDialogs.ycp 1970-01-01 01:00:00.000000000 +0100
+++ new/yast2-packager-2.13.54/src/modules/SignatureCheckDialogs.ycp 2006-03-28 17:31:05.000000000 +0200
@@ -0,0 +1,387 @@
+/**
+ * Module: SignatureCheckDialogs.ycp
+ * Authors: Lukas Ocilka <locilka(a)suse.cz>
+ *
+ * Dialogs handling for RPM/Source GPM signatures.
+ *
+ * $Id: SignatureCheckDialogs.ycp 28363 2006-02-24 12:27:15Z locilka $
+ */
+
+{
+ textdomain "packager";
+
+ module "SignatureCheckDialogs";
+
+ import "Label";
+ import "Popup";
+
+ // Defining icons for dialogs
+ term error_icon = `Empty();
+ term warning_icon = `Empty();
+ term question_icon = `Empty();
+
+// TODO: support icons
+// /**
+// * Module constructor
+// */
+// global void InitDialogs () {
+// map ui_capabilities = UI::GetDisplayInfo();
+// if (ui_capabilities["HasLocalImageSupport"]:false) {
+// error_icon = `HBox(`Image("error", ""), `HSpacing(1));
+// warning_icon = `HBox(`Image("warning", ""), `HSpacing(1));
+// question_icon = `HBox(`Image("question", ""), `HSpacing(1));
+// }
+// }
+
+ /**
+ * Returns term of yes/no buttons
+ *
+ * @param symbol default button `yes or `no
+ * @return term with buttons
+ */
+ term YesNoButtons (symbol default_button) {
+ term yes_button = `PushButton(`id(`yes), Label::YesButton());
+ term no_button = `PushButton(`id(`no), Label::NoButton());
+
+ if (default_button == `yes) {
+ yes_button = `PushButton(`id(`yes), `opt(`default), Label::YesButton());
+ } else {
+ no_button = `PushButton(`id(`no), `opt(`default), Label::NoButton());
+ }
+
+ return `HBox (
+ yes_button,
+ `HSpacing(2),
+ no_button
+ );
+ }
+
+ /**
+ * Returns 'true' (yes), 'false' (no) or 'nil' (cancel)
+ *
+ * @return boolean user input yes==true
+ */
+ boolean WaitForYesNoCancelUserInput() {
+ any user_input = nil;
+ boolean ret = nil;
+
+ while (true) {
+ user_input = UI::UserInput();
+ // yes button
+ if (user_input == `yes) {
+ ret = true;
+ break;
+ // no button
+ } else if (user_input == `no) {
+ ret = false;
+ break;
+ // closing window uisng [x]
+ } else if (user_input == `cancel) {
+ ret = nil;
+ break;
+ } else {
+ y2error("Unknown user input: '%1'", user_input);
+ continue;
+ }
+ }
+
+ return ret;
+ }
+
+ /**
+ * Waits for user input and checks it agains accepted symbols.
+ * Returns the default symbol in case of `cancel (user closes the dialog).
+ *
+ * @param list <symbol> of accepted symbol by UserInput
+ * @param symbol default return for case of `cancel
+ */
+ symbol WaitForSymbolUserInput (list <symbol> list_of_accepted, symbol default_symb) {
+ symbol user_input = nil;
+ symbol ret = nil;
+
+ while (true) {
+ user_input = (symbol) UI::UserInput();
+ if (contains(list_of_accepted, user_input)) {
+ ret = user_input;
+ break;
+ } else if (user_input == `cancel) {
+ ret = default_symb;
+ break;
+ } else {
+ y2error("Unknown user input: '%1'", user_input);
+ continue;
+ }
+ }
+
+ return ret;
+ }
+
+ /**
+ * Used for unsiged file or package. Opens dialog asking whether user wants
+ * to use this unsigned item.
+ *
+ * @param symbol item_type `file or `package
+ * @param string item_name file name or package name
+ * @return boolean use or don't use ('true' if 'yes')
+ */
+ global boolean UseUnsignedItem (symbol item_type, string item_name) {
+ string description_text = sformat((item_type == `package ?
+ // popup question, %1 stands for the package name
+ _("The package '%1' is not digitally signed. This means that the origin
+of the integrity of the package can not be verified. Installing the package
+may put the integrity of your system at risk.
+
+Do you want to install it anyway?")
+ :
+ // popup question, %1 stands for the filename
+ _("The file '%1' is not digitally signed. This means that the origin
+of the integrity of the file can not be verified. Using the file
+may put the integrity of your system at risk.
+
+Do you want to use it anyway?")
+ ), item_name);
+
+ UI::OpenDialog(
+ `opt(`decorated),
+ `VBox(
+ `HBox (
+ `VCenter(warning_icon),
+ // popup heading
+ `VCenter(`Heading( _("Signature Check Failed"))),
+ `HStretch()
+ ),
+ `Label(description_text),
+ YesNoButtons(`no)
+ )
+ );
+
+ boolean ret = WaitForYesNoCancelUserInput();
+ // default value
+ if (ret == nil) ret = false;
+
+ UI::CloseDialog();
+ return ret;
+ }
+
+ /**
+ * Used for corrupted file or package. Opens dialog asking whether user wants
+ * to use this corrupted item.
+ *
+ * @param symbol item_type `file or `package
+ * @param string item_name file name or package name
+ * @return boolean use or don't use ('true' if 'yes')
+ */
+ global boolean UseCorruptedItem (symbol item_type, string item_name) {
+ string description_text = sformat((item_type == `package ?
+ // popup question, %1 stands for the package name
+ _("The integrity check for package '%1' failed. This means that
+the package has been changed by accident or by an attacker
+since the repository creator has signed it. Installing it
+is a big risk for the integrity and security of your system.
+
+Do you want to install it anyway?")
+ :
+ // popup question, %1 stands for the filename
+ _("The integrity check for file '%1' failed. This means that
+the file has been changed by accident or by an attacker
+since the repository creator has signed it. Installing it
+is a big risk for the integrity and security of your system.
+
+Do you want to use it anyway?")
+ ), item_name);
+
+ UI::OpenDialog(
+ `opt(`decorated),
+ `VBox(
+ // popup heading
+ `HBox (
+ `VCenter(error_icon),
+ `VCenter(`Heading( _("Validation Check Failed"))),
+ `HStretch()
+ ),
+ `Label(description_text),
+ YesNoButtons(`no)
+ )
+ );
+
+ boolean ret = WaitForYesNoCancelUserInput();
+ // default value
+ if (ret == nil) ret = false;
+
+ UI::CloseDialog();
+ return ret;
+ }
+
+ /**
+ * Used for file or package signed by unknown key.
+ *
+ * @param symbol item_type `file or `package
+ * @param string item_name file name or package name
+ * @param string key_id
+ * @return symbol `yes, `no or `retry
+ */
+ global symbol ItemSignedWithUnknownSignature (symbol item_type, string item_name, string key_id) {
+ string description_text = sformat((item_type == `package ?
+ // popup question, %1 stands for the package name, %2 for the key ID
+ _("The package '%1' is digitally signed with an unknown GnuPG key '%2'
+and we cannot find that key. This means that a trust relationship to the creator of the package
+can not be established. Installing the package may put the integrity of your system at risk.
+
+Do you want to install it anyway?")
+ :
+ // popup question, %1 stands for the filename, %2 for the key ID
+ _("The file '%1' is digitally signed with an unknown GnuPG key '%2'
+and we cannot find that key. This means that a trust relationship to the creator of the file
+can not be established. Using the file may put the integrity of your system at risk.
+
+Do you want to use it anyway?")
+ ), item_name, key_id);
+
+ UI::OpenDialog(
+ `opt(`decorated),
+ `VBox(
+ `HBox (
+ `VCenter(warning_icon),
+ // popup heading
+ `VCenter(`Heading( _("Uknown GnuPG Key"))),
+ `HStretch()
+ ),
+ `Label(description_text),
+ YesNoButtons(`no)
+ )
+ );
+
+ // This will optionally offer to retrieve the key from gpg keyservers
+ // That's why it returns 'symbol' instead of 'boolean'
+ // But by now it only handles yes/no/cancel
+ symbol ret = (WaitForYesNoCancelUserInput() == true ? `yes : `no);
+ // default value
+ if (ret == nil) ret = `no;
+
+ UI::CloseDialog();
+ return ret;
+ }
+
+ /**
+ * Used for file or package signed by a public key. This key is still
+ * not listed in trusted keys.
+ *
+ * @param symbol item_type `file or `package
+ * @param string item_name file name or package name
+ * @param string key_id
+ * @param string key_name
+ * @return symbol `key_import, `install, `skip
+ */
+ global symbol ItemSignedWithPublicSignature (symbol item_type, string item_name, string key_id, string key_name) {
+ string description_text = sformat((item_type == `package ?
+ // popup question, %1 stands for the package name
+ _("The package '%1' is digitally signed
+with key '%2 (%3)'.
+There is no trust relationship to the owner of the key. You may chose to import
+the key into your set of trusted keys in the Import dialog and then proceed
+with the installation. You can also chose just to install the package anyway,
+but be aware that packages from untrusted sources can put the integrity
+of your system at risk.")
+ :
+ // popup question, %1 stands for the filename
+ _("The file '%1' is digitally signed
+with key '%2 (%3)'.
+There is no trust relationship to the owner of the key. You may chose to import
+the key into your set of trusted keys in the Import dialog and then proceed
+with the installation. You can also chose just to use the file anyway,
+but be aware that packages from untrusted sources can put the integrity
+of your system at risk.")
+ ), item_name, key_id, key_name);
+
+ UI::OpenDialog(
+ `opt(`decorated),
+ `VBox(
+ `HBox (
+ `VCenter(warning_icon),
+ // popup heading
+ `VCenter(`Heading( _("Signed with Untrusted Public Key"))),
+ `HStretch()
+ ),
+ `Label(description_text),
+ `HBox (
+ // push button
+ `PushButton(`id(`key_import), _("Key &Import Dialog")),
+ // push button
+ `PushButton(`id(`install), _("Install &Anyway")),
+ // push button
+ `PushButton(`id(`skip), _("&Skip Package"))
+ )
+ )
+ );
+ UI::SetFocus(`skip);
+
+ // wait for one of listed ID's, return the default value in case of `cancel
+ symbol ret = WaitForSymbolUserInput([`key_import, `install, `skip], `skip);
+
+ UI::CloseDialog();
+ return ret;
+ }
+
+ /**
+ * ImportGPGKeyDialog
+ *
+ * @param string key_id
+ * @param string key_name
+ * @param string key_location
+ * @param string key_detailed_description
+ * @return symbol
+ */
+ global symbol ImportGPGKeyDialog (string key_id, string key_name, string key_location, string key_detailed_description) {
+ // FIXME: add somewhere this additional text
+ // additional warning text (kind of help)
+ string warning_text = sformat(_("The owner of the key may distribute updates, packages and package repositories
+that will be considered trusted by your system and which will be offered for installation
+and update without any further warning. Importing the key thus allows the key owner
+to have a certain amount of control over the software on your system and you should
+only do this if you trust her/him. YaST comes up with a warning dialog for every
+package that's not signed by a trusted (imported) key; this will happen to packages
+by the package creator with key '%1' if you chose not to import."), key_id);
+
+ UI::OpenDialog(
+ `opt(`decorated),
+ `VBox(
+ `HBox (
+ `VCenter(question_icon),
+ // popup heading
+ `VCenter(`Heading(_("Import Public GnuPG Key"))),
+ `HStretch()
+ ),
+ `Label(sformat(
+ // popup message, %1 stands for GPG key ID, %2 for key name, %3 for key location (URL or ...)
+ _("The GnuPG key '%1 (%2)' has been found
+on location '%3'.
+
+You can chose to import it into your keyring of trusted public keys - that means
+you trust the owner of the key. You should be sure that you can trust the owner
+and that the key really belongs to that owner before considering to import it."),
+ key_id, key_name, key_location
+ )),
+ `HBox (
+ // push button
+ `PushButton(`id(`import), _("&Import")),
+ // push button
+ `PushButton(`id(`details), _("&Details")),
+ // push button
+ `PushButton(`id(`dont_import), _("Do &Not Import"))
+ )
+ )
+ );
+ UI::SetFocus(`details);
+
+ symbol ret = nil;
+ while (ret == nil || ret == `details) {
+ // wait for one of listed ID's, return the default value in case of `cancel
+ ret = WaitForSymbolUserInput([`import, `details, `dont_import], `dont_import);
+ if (contains([`import, `dont_import], ret)) break;
+ else if (ret == `details) Popup::LongMessage(key_detailed_description);
+ }
+
+ UI::CloseDialog();
+ return ret;
+ }
+}
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-packager-2.13.53/src/modules/SourceManager.ycp new/yast2-packager-2.13.54/src/modules/SourceManager.ycp
--- old/yast2-packager-2.13.53/src/modules/SourceManager.ycp 2006-03-02 09:44:42.000000000 +0100
+++ new/yast2-packager-2.13.54/src/modules/SourceManager.ycp 2006-03-28 15:51:57.000000000 +0200
@@ -5,7 +5,7 @@
* Authors: Anas Nashif <nashif(a)suse.de>
* Status: Work in Progress
*
- * $Id: SourceManager.ycp 28410 2006-02-27 15:47:13Z jsrain $
+ * $Id: SourceManager.ycp 29470 2006-03-28 12:11:22Z visnov $
*
* Representation of the configuration of source-manager.
* Input and output routines.
@@ -576,7 +576,8 @@
string color = source[ "enabled" ]:true ? "#006600" : "#FF0000";
sitem = sitem + HTML::Colorize("["+status+"] ",
color);
- sitem = sitem + productData[ "label" ]:"unknown";
+ // translators: name of a source if no other idenfication found
+ sitem = sitem + productData[ "label" ]:generalData["type"]:_("unknown");
sitem = sitem + " ( " + generalData[ "url" ]:"" + ")";
return sitem;
}
@@ -598,7 +599,7 @@
? _("On")
// corresponds to the "Enable/Disable" button
: _("Off"),
- productData[ "label" ]:"unknown",
+ productData[ "label" ]:generalData["type"]:_("Unknown"),
generalData[ "url" ]:""
);
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
[View Less]
1
0
Hello community,
here is the log from the commit of package xorg-x11
checked in at Tue Mar 28 18:34:15 CEST 2006.
--------
--- /work/SRC/all/BASE/xorg-x11/xorg-x11.changes 2006-03-26 19:19:08.000000000 +0200
+++ /work/src/done/STABLE/xorg-x11/xorg-x11.changes 2006-03-28 17:53:17.000000000 +0200
@@ -1,0 +2,8 @@
+Tue Mar 28 15:40:16 CEST 2006 - sndirsch(a)suse.de
+
+- p_mappciBIOS_complete.diff:
+ * fixes system hang (IERR on PCI bus) on Dell (Bug #151644)
+- p_xauth.diff:
+ * fixed remaining …
[View More]issues (dmueller, Bug #98627/147691)
+
+-------------------------------------------------------------------
New:
----
p_mappciBIOS_complete.diff
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ xorg-x11.spec ++++++
--- /var/tmp/diff_new_pack.mK0tvO/_old 2006-03-28 18:32:16.000000000 +0200
+++ /var/tmp/diff_new_pack.mK0tvO/_new 2006-03-28 18:32:16.000000000 +0200
@@ -40,7 +40,7 @@
%endif
Autoreqprov: on
Version: 6.9.0
-Release: 29
+Release: 30
Summary: The basic X Window System package
Source: xorg-6.9.0.tar.bz2
Source1: xdm.tar.gz
@@ -114,6 +114,7 @@
Patch356: p_bug159532.diff
Patch357: p_pci-ce-x.diff
Patch358: p_setxkbmap.diff
+Patch359: p_mappciBIOS_complete.diff
Patch400: p_bug96328.diff
BuildRoot: %{_tmppath}/%{name}-%{version}-build
@@ -1536,6 +1537,7 @@
%patch356
%patch357 -p2
%patch358
+%patch359
#
UTS_RELEASE=`uname -r`
UTS_MAJOR=${UTS_RELEASE%%%%.*}
@@ -2677,6 +2679,11 @@
%clean
%changelog -n xorg-x11
+* Tue Mar 28 2006 - sndirsch(a)suse.de
+- p_mappciBIOS_complete.diff:
+ * fixes system hang (IERR on PCI bus) on Dell (Bug #151644)
+- p_xauth.diff:
+ * fixed remaining issues (dmueller, Bug #98627/147691)
* Sun Mar 26 2006 - sndirsch(a)suse.de
- p_setxkbmap.diff:
* fixed invalid free() in setxkbmap (Bug #71244)
++++++ FILES ++++++
--- /work/SRC/all/BASE/xorg-x11/FILES 2006-03-26 19:19:32.000000000 +0200
+++ /work/src/done/STABLE/xorg-x11/FILES 2006-03-28 15:34:29.000000000 +0200
@@ -154,3 +154,5 @@
- fixes PCI bus scanning on CE systems (pci-pci bridges, Bug #147261)
p_setxkbmap.diff [KEEP?]
- fixed invalid free() in setxkbmap (Bug #71244)
+p_mappciBIOS_complete.diff [KEEP?]
+- fixes system hang (IERR on PCI bus) on Dell machines (Bug #151644)
++++++ p_mappciBIOS_complete.diff ++++++
Index: programs/Xserver/hw/xfree86/common/xf86Priv.h
===================================================================
RCS file: /work/cvsdir/cvs/xc/programs/Xserver/hw/xfree86/common/xf86Priv.h,v
retrieving revision 1.1.1.26
diff -u -p -r1.1.1.26 xf86Priv.h
--- programs/Xserver/hw/xfree86/common/xf86Priv.h 23 Jan 2006 11:15:21 -0000 1.1.1.26
+++ programs/Xserver/hw/xfree86/common/xf86Priv.h 9 Mar 2006 11:20:37 -0000
@@ -155,6 +155,7 @@ void xf86AddDevToEntity(int entityIndex,
extern void xf86PostPreInit(void);
extern void xf86PostScreenInit(void);
extern memType getValidBIOSBase(PCITAG tag, int num);
+extern memType getEmptyPciRange(PCITAG tag, int base_reg);
extern int pciTestMultiDeviceCard(int bus, int dev, int func, PCITAG** pTag);
/* xf86Config.c */
Index: programs/Xserver/hw/xfree86/common/xf86pciBus.c
===================================================================
RCS file: /work/cvsdir/cvs/xc/programs/Xserver/hw/xfree86/common/xf86pciBus.c,v
retrieving revision 1.1.1.57
diff -u -p -r1.1.1.57 xf86pciBus.c
--- programs/Xserver/hw/xfree86/common/xf86pciBus.c 13 Sep 2005 10:31:26 -0000 1.1.1.57
+++ programs/Xserver/hw/xfree86/common/xf86pciBus.c 9 Mar 2006 11:20:37 -0000
@@ -1516,29 +1516,117 @@ xf86ReallocatePciResources(int entityInd
/*
* BIOS releated
*/
-memType
-getValidBIOSBase(PCITAG tag, int num)
+static resPtr
+getOwnResources(pciVideoPtr pvp, resPtr mem)
+{
+ resRange range;
+ int i;
+ /* Make sure we don't conflict with our own mem resources */
+ for (i = 0; i < 6; i++) {
+ if (!pvp->memBase[i])
+ continue;
+ P_M_RANGE(range,TAG(pvp),pvp->memBase[i],pvp->size[i],
+ ResExcMemBlock);
+ mem = xf86AddResToList(mem,&range,-1);
+ }
+ return mem;
+}
+
+static void
+getPciRangesForMapping(pciVideoPtr pvp, resPtr *map, resPtr *avoid)
{
- pciVideoPtr pvp = NULL;
PciBusPtr pbp;
- resPtr m = NULL;
- resPtr tmp, avoid, mem = NULL;
+ resPtr tmp;
+
+ *avoid = xf86DupResList(pciAvoidRes);
+
+ pbp = xf86PciBus;
+ while (pbp) {
+ if (pbp->secondary == pvp->bus) {
+ if (pbp->preferred_pmem)
+ tmp = xf86DupResList(pbp->preferred_pmem);
+ else
+ tmp = xf86DupResList(pbp->pmem);
+ *map = xf86JoinResLists(*map,tmp);
+ if (pbp->preferred_mem)
+ tmp = xf86DupResList(pbp->preferred_mem);
+ else
+ tmp = xf86DupResList(pbp->mem);
+ *map = xf86JoinResLists(*map,tmp);
+ tmp = *map;
+ while (tmp) {
+ tmp->block_end = min(tmp->block_end,PCI_MEM32_LENGTH_MAX);
+ tmp = tmp->next;
+ }
+ } else if ((pbp->primary == pvp->bus) &&
+ (pbp->secondary >= 0) &&
+ (pbp->primary != pbp->secondary)) {
+ tmp = xf86DupResList(pbp->preferred_pmem);
+ *avoid = xf86JoinResLists(*avoid, tmp);
+ tmp = xf86DupResList(pbp->pmem);
+ *avoid = xf86JoinResLists(*avoid, tmp);
+ tmp = xf86DupResList(pbp->preferred_mem);
+ *avoid = xf86JoinResLists(*avoid, tmp);
+ tmp = xf86DupResList(pbp->mem);
+ *avoid = xf86JoinResLists(*avoid, tmp);
+ }
+ pbp = pbp->next;
+ }
+ pciConvertListToHost(pvp->bus,pvp->device,pvp->func, *avoid);
+ pciConvertListToHost(pvp->bus,pvp->device,pvp->func, *map);
+}
+
+static memType
+findPciRange(PCITAG tag, resPtr m, resPtr avoid, CARD32 size)
+{
resRange range;
- memType ret;
+ CARD32 alignment = (1 << size) - 1;
+
+ while (m) {
+ range = xf86GetBlock(RANGE_TYPE(ResExcMemBlock, xf86GetPciDomain(tag)),
+ PCI_SIZE(ResMem, tag, 1 << size),
+ m->block_begin, m->block_end,
+ PCI_SIZE(ResMem, tag, alignment),
+ avoid);
+ if (range.type != ResEnd) {
+ return M2B(tag, range.rBase);
+ }
+ m = m->next;
+ }
+ return 0;
+}
+
+pciVideoPtr
+getPciVideoPtr(tag)
+{
int n = 0;
- int i;
- CARD32 biosSize, alignment;
+ pciVideoPtr pvp = NULL;
if (!xf86PciVideoInfo) return 0;
while ((pvp = xf86PciVideoInfo[n++])) {
if (pciTag(pvp->bus,pvp->device,pvp->func) == tag)
- break;
+ return pvp;
}
+ return NULL;
+}
+
+memType
+getValidBIOSBase(PCITAG tag, int num)
+{
+ pciVideoPtr pvp = NULL;
+ memType ret;
+ CARD32 biosSize;
+ resPtr mem = NULL;
+ resPtr avoid = NULL, m = NULL;
+ resRange range;
+
+ pvp = getPciVideoPtr(tag);
+
if (!pvp) return 0;
biosSize = pvp->biosSize;
- alignment = (1 << biosSize) - 1;
+
if (biosSize > 24)
biosSize = 24;
@@ -1549,15 +1637,8 @@ getValidBIOSBase(PCITAG tag, int num)
/* In some cases the BIOS base register contains the size mask */
if ((memType)(-1 << biosSize) == PCIGETROM(pvp->biosBase))
return 0;
- /* Make sure we don't conflict with our own mem resources */
- for (i = 0; i < 6; i++) {
- if (!pvp->memBase[i])
- continue;
- P_M_RANGE(range,TAG(pvp),pvp->memBase[i],pvp->size[i],
- ResExcMemBlock);
- mem = xf86AddResToList(mem,&range,-1);
- }
- P_M_RANGE(range, TAG(pvp),pvp->biosBase,biosSize,ResExcMemBlock);
+ mem = getOwnResources(pvp,mem);
+ P_M_RANGE(range, tag, pvp->biosBase,biosSize,ResExcMemBlock);
ret = pvp->biosBase;
break;
case ROM_BASE_MEM0:
@@ -1568,7 +1649,7 @@ getValidBIOSBase(PCITAG tag, int num)
case ROM_BASE_MEM5:
if (!pvp->memBase[num] || (pvp->size[num] < biosSize))
return 0;
- P_M_RANGE(range, TAG(pvp),pvp->memBase[num],biosSize,
+ P_M_RANGE(range, tag ,pvp->memBase[num],biosSize,
ResExcMemBlock);
ret = pvp->memBase[num];
break;
@@ -1580,59 +1661,15 @@ getValidBIOSBase(PCITAG tag, int num)
}
/* Now find the ranges for validation */
- avoid = xf86DupResList(pciAvoidRes);
- pbp = xf86PciBus;
- while (pbp) {
- if (pbp->secondary == pvp->bus) {
- if (pbp->preferred_pmem)
- tmp = xf86DupResList(pbp->preferred_pmem);
- else
- tmp = xf86DupResList(pbp->pmem);
- m = xf86JoinResLists(m,tmp);
- if (pbp->preferred_mem)
- tmp = xf86DupResList(pbp->preferred_mem);
- else
- tmp = xf86DupResList(pbp->mem);
- m = xf86JoinResLists(m,tmp);
- tmp = m;
- while (tmp) {
- tmp->block_end = min(tmp->block_end,PCI_MEM32_LENGTH_MAX);
- tmp = tmp->next;
- }
- } else if ((pbp->primary == pvp->bus) &&
- (pbp->secondary >= 0) &&
- (pbp->primary != pbp->secondary)) {
- tmp = xf86DupResList(pbp->preferred_pmem);
- avoid = xf86JoinResLists(avoid, tmp);
- tmp = xf86DupResList(pbp->pmem);
- avoid = xf86JoinResLists(avoid, tmp);
- tmp = xf86DupResList(pbp->preferred_mem);
- avoid = xf86JoinResLists(avoid, tmp);
- tmp = xf86DupResList(pbp->mem);
- avoid = xf86JoinResLists(avoid, tmp);
- }
- pbp = pbp->next;
- }
- pciConvertListToHost(pvp->bus,pvp->device,pvp->func, avoid);
- if (mem)
- pciConvertListToHost(pvp->bus,pvp->device,pvp->func, mem);
-
+ getPciRangesForMapping(pvp,&m,&avoid);
+
if (!ret) {
/* Return a possible window */
- while (m) {
- range = xf86GetBlock(RANGE_TYPE(ResExcMemBlock, xf86GetPciDomain(tag)),
- PCI_SIZE(ResMem, TAG(pvp), 1 << biosSize),
- m->block_begin, m->block_end,
- PCI_SIZE(ResMem, TAG(pvp), alignment),
- avoid);
- if (range.type != ResEnd) {
- ret = M2B(TAG(pvp), range.rBase);
- break;
- }
- m = m->next;
- }
+ ret = findPciRange(tag,m,avoid,biosSize);
} else {
#if !defined(__ia64__) /* on ia64, trust the kernel, don't look for overlaps */
+ if (mem)
+ pciConvertListToHost(pvp->bus,pvp->device,pvp->func, mem);
if (!xf86IsSubsetOf(range, m) ||
ChkConflict(&range, avoid, SETUP)
|| (mem && ChkConflict(&range, mem, SETUP)))
@@ -1645,6 +1682,22 @@ getValidBIOSBase(PCITAG tag, int num)
return ret;
}
+memType
+getEmptyPciRange(PCITAG tag, int base_reg)
+{
+ resPtr avoid = NULL, m = NULL;
+ memType ret;
+
+ pciVideoPtr pvp = getPciVideoPtr(tag);
+ if (!pvp) return 0;
+ getPciRangesForMapping(pvp,&m,&avoid);
+ ret = findPciRange(tag,m,avoid,pvp->size[base_reg]);
+ xf86FreeResList(avoid);
+ xf86FreeResList(m);
+
+ return ret;
+}
+
/*
* xf86Bus.c interface
*/
Index: programs/Xserver/hw/xfree86/dummylib/Imakefile
===================================================================
RCS file: /work/cvsdir/cvs/xc/programs/Xserver/hw/xfree86/dummylib/Imakefile,v
retrieving revision 1.1.1.8
diff -u -p -r1.1.1.8 Imakefile
--- programs/Xserver/hw/xfree86/dummylib/Imakefile 13 Sep 2005 10:31:34 -0000 1.1.1.8
+++ programs/Xserver/hw/xfree86/dummylib/Imakefile 9 Mar 2006 11:20:38 -0000
@@ -8,6 +8,7 @@ INCLUDES = -I. -I$(XF86COMSRC) -I$(XF86O
SRCS = \
fatalerror.c \
getvalidbios.c \
+ getemptypci.c \
logvwrite.c \
pcitestmulti.c \
verrorf.c \
@@ -32,6 +33,7 @@ SRCS = \
OBJS = \
fatalerror.o \
getvalidbios.o \
+ getemptypci.o \
logvwrite.o \
pcitestmulti.o \
verrorf.o \
Index: programs/Xserver/hw/xfree86/dummylib/getemptypci.c
===================================================================
RCS file: programs/Xserver/hw/xfree86/dummylib/getemptypci.c
diff -N programs/Xserver/hw/xfree86/dummylib/getemptypci.c
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ programs/Xserver/hw/xfree86/dummylib/getemptypci.c 9 Mar 2006 11:20:38 -0000
@@ -0,0 +1,19 @@
+
+#ifdef HAVE_XORG_CONFIG_H
+#include <xorg-config.h>
+#endif
+
+#include <X11/X.h>
+#include "os.h"
+#include "xf86.h"
+#include "xf86Priv.h"
+
+/*
+ * Utility functions required by libxf86_os.
+ */
+
+memType
+getEmptyPciRange(PCITAG tag, int base_reg)
+{
+ return 0;
+}
Index: programs/Xserver/hw/xfree86/os-support/bus/Pci.c
===================================================================
RCS file: /work/cvsdir/cvs/xc/programs/Xserver/hw/xfree86/os-support/bus/Pci.c,v
retrieving revision 1.1.1.60
diff -u -p -r1.1.1.60 Pci.c
--- programs/Xserver/hw/xfree86/os-support/bus/Pci.c 25 Nov 2005 10:05:28 -0000 1.1.1.60
+++ programs/Xserver/hw/xfree86/os-support/bus/Pci.c 9 Mar 2006 11:20:40 -0000
@@ -1068,6 +1068,20 @@ xf86scanpci(int flags)
return pci_devp;
}
+pciConfigPtr
+xf86GetPciConfigFromTag(PCITAG Tag)
+{
+ pciConfigPtr pDev;
+ int i = 0;
+
+ for (i = 0 ; (pDev = pci_devp[i]) && i <= MAX_PCI_DEVICES; i++) {
+ if (Tag == pDev->tag)
+ return pDev;
+ }
+
+ return NULL; /* Bad data */
+}
+
CARD32
pciCheckForBrokenBase(PCITAG Tag,int basereg)
{
@@ -1160,13 +1174,18 @@ handlePciBIOS(PCITAG Tag, int basereg,
/* if we use a mem base save it and move it out of the way */
if (b_reg >= 0 && b_reg <= 5) {
+ memType emptybase;
savebase = pciReadLong(Tag, PCI_MAP_REG_START+(b_reg<<2));
xf86MsgVerb(X_INFO,5,"xf86ReadPciBios: modifying membase[%i]"
" for device %i:%i:%i\n", basereg,
(int)PCI_BUS_FROM_TAG(Tag), (int)PCI_DEV_FROM_TAG(Tag),
(int)PCI_FUNC_FROM_TAG(Tag));
+ if (!(emptybase = getEmptyPciRange(Tag,b_reg))) {
+ xf86Msg(X_ERROR,"Cannot find empty range to map base to\n");
+ return 0;
+ }
pciWriteLong(Tag, PCI_MAP_REG_START + (b_reg << 2),
- (CARD32)~0);
+ emptybase);
}
/* Set ROM base address and enable ROM address decoding */
pciWriteLong(Tag, PCI_MAP_ROM_REG, romaddr
Index: programs/Xserver/hw/xfree86/os-support/bus/xf86Pci.h
===================================================================
RCS file: /work/cvsdir/cvs/xc/programs/Xserver/hw/xfree86/os-support/bus/xf86Pci.h,v
retrieving revision 1.1.1.33
diff -u -p -r1.1.1.33 xf86Pci.h
--- programs/Xserver/hw/xfree86/os-support/bus/xf86Pci.h 27 Apr 2005 16:00:07 -0000 1.1.1.33
+++ programs/Xserver/hw/xfree86/os-support/bus/xf86Pci.h 9 Mar 2006 11:20:40 -0000
@@ -780,6 +780,7 @@ int xf86ReadPciBIOSByType(unsigned
int xf86GetAvailablePciBIOSTypes(PCITAG Tag, int basereg,
PciBiosType *Buf);
pciConfigPtr *xf86scanpci(int flags);
+pciConfigPtr xf86GetPciConfigFromTag(PCITAG Tag);
extern int pciNumBuses;
Index: programs/Xserver/hw/xfree86/os-support/linux/lnx_pci.c
===================================================================
RCS file: /work/cvsdir/cvs/xc/programs/Xserver/hw/xfree86/os-support/linux/lnx_pci.c,v
retrieving revision 1.1.1.10
diff -u -p -r1.1.1.10 lnx_pci.c
--- programs/Xserver/hw/xfree86/os-support/linux/lnx_pci.c 25 Nov 2005 10:05:30 -0000 1.1.1.10
+++ programs/Xserver/hw/xfree86/os-support/linux/lnx_pci.c 9 Mar 2006 11:20:40 -0000
@@ -201,6 +201,8 @@ xf86GetOSOffsetFromPCI(PCITAG tag, int s
fn = devfn & 0x7;
if (tag == pciTag(bus,dev,fn)) {
/* ok now look through all the BAR values of this device */
+ pciConfigPtr pDev = xf86GetPciConfigFromTag(tag);
+
for (ndx=0; ndx<7; ndx++) {
unsigned long savePtr;
/*
@@ -208,11 +210,9 @@ xf86GetOSOffsetFromPCI(PCITAG tag, int s
* memory attributes
*/
if (ndx == 6)
- savePtr = (0xFFFFFFF0) &
- pciReadLong(tag, PCI_CMD_BIOS_REG);
+ savePtr = PCIGETROM(pDev->pci_baserom);
else /* this the ROM bar */
- savePtr = (0xFFFFFFF0) &
- pciReadLong(tag, PCI_CMD_BASE_REG + (0x4 * ndx));
+ savePtr = (0xFFFFFFF0) & (&pDev->pci_base0)[ndx];
/* find the index of the incoming base */
if (base >= savePtr && base <= (savePtr + size[ndx])) {
++++++ p_xauth.diff ++++++
--- /var/tmp/diff_new_pack.mK0tvO/_old 2006-03-28 18:32:19.000000000 +0200
+++ /var/tmp/diff_new_pack.mK0tvO/_new 2006-03-28 18:32:19.000000000 +0200
@@ -327,3 +327,24 @@
XINIT $client $clientargs -- $server $display $serverargs
#endif
+--- lib/xtrans/Xtranssock.c 2005-11-30 11:35:05.000000000 +0100
++++ lib/xtrans/Xtranssock.c 2006-03-28 12:11:36.000000000 +0200
+@@ -1804,6 +1804,7 @@
+
+ {
+ char hostnamebuf[256];
++ char* xauthlocalname = getenv("XAUTHLOCALHOSTNAME");
+
+ #if defined(IPv6) && defined(AF_INET6)
+ if (getaddrinfo == NULL)
+@@ -1816,6 +1817,10 @@
+ {
+ return (1);
+ }
++ else if(xauthlocalname && strcmp (xauthlocalname, host) == 0)
++ {
++ return (1);
++ }
+ #if defined(IPv6) && defined(AF_INET6)
+ else if (haveIPv6)
+ {
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
[View Less]
1
0
Hello community,
here is the log from the commit of package util-linux
checked in at Tue Mar 28 18:31:50 CEST 2006.
--------
--- /work/SRC/all/BASE/util-linux/util-linux.changes 2006-03-21 11:36:03.000000000 +0100
+++ /work/src/done/STABLE/util-linux/util-linux.changes 2006-03-28 17:54:13.000000000 +0200
@@ -1,0 +2,5 @@
+Tue Mar 28 17:53:46 CEST 2006 - hvogel(a)suse.de
+
+- more fixes for the fdiskwrap patch [#160822]
+
+-------------------------------------------------------------------
++++…
[View More]++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ util-linux.spec ++++++
--- /var/tmp/diff_new_pack.vuGkKO/_old 2006-03-28 18:30:10.000000000 +0200
+++ /var/tmp/diff_new_pack.vuGkKO/_new 2006-03-28 18:30:10.000000000 +0200
@@ -20,7 +20,7 @@
Group: System/Base
Autoreqprov: on
Version: 2.12r
-Release: 21
+Release: 23
Summary: A collection of basic system utilities
Source: ftp://ftp.kernel.org/pub/linux/utils/util-linux/%name-%version.tar.bz2
Source2: nologin.c
@@ -577,6 +577,8 @@
%endif
%changelog -n util-linux
+* Tue Mar 28 2006 - hvogel(a)suse.de
+- more fixes for the fdiskwrap patch [#160822]
* Tue Mar 21 2006 - okir(a)suse.de
- Update nfs(5) manpage to document security flavors [#159368]
* Mon Mar 20 2006 - hvogel(a)suse.de
++++++ util-linux-2.12r-fdiskwrap.patch ++++++
--- /var/tmp/diff_new_pack.vuGkKO/_old 2006-03-28 18:30:11.000000000 +0200
+++ /var/tmp/diff_new_pack.vuGkKO/_new 2006-03-28 18:30:11.000000000 +0200
@@ -83,9 +83,11 @@
static void
-seek_sector(int fd, unsigned int secno) {
+- long long offset = (long long) secno * sector_size;
+- if (ext2_llseek(fd, offset, SEEK_SET) == (long long) -1)
+seek_sector(int fd, unsigned long long secno) {
- long long offset = (long long) secno * sector_size;
- if (ext2_llseek(fd, offset, SEEK_SET) == (long long) -1)
++ off_t offset = (off_t) secno * sector_size;
++ if (lseek(fd, offset, SEEK_SET) == (off_t) -1)
fatal(unable_to_seek);
}
@@ -140,7 +142,41 @@
if (doext) {
p = ptes[i].ext_pointer;
-@@ -1799,7 +1798,7 @@
+@@ -1546,7 +1545,7 @@
+ else
+ printf(_("\nDisk %s: %ld.%ld GB, %lld bytes\n"),
+ disk_device, megabytes/1000, (megabytes/100)%10, bytes);
+- printf(_("%d heads, %d sectors/track, %d cylinders"),
++ printf(_("%d heads, %Ld sectors/track, %d cylinders"),
+ heads, sectors, cylinders);
+ if (units_per_sector == 1)
+ printf(_(", total %llu sectors"),
+@@ -1778,20 +1777,21 @@
+ struct partition *p;
+ int i;
+
+- printf(_("\nDisk %s: %d heads, %d sectors, %d cylinders\n\n"),
++ printf(_("\nDisk %s: %d heads, %Ld sectors, %d cylinders\n\n"),
+ disk_device, heads, sectors, cylinders);
+ printf(_("Nr AF Hd Sec Cyl Hd Sec Cyl Start Size ID\n"));
+ for (i = 0 ; i < partitions; i++) {
+ pe = &ptes[i];
+ p = (extend ? pe->ext_pointer : pe->part_table);
+ if (p != NULL) {
+- printf("%2d %02x%4d%4d%5d%4d%4d%5d%11u%11u %02x\n",
++ printf("%2d %02x%4d%4d%5d%4d%4d%5d%11lu%11lu %02x\n",
+ i + 1, p->boot_ind, p->head,
+ sector(p->sector),
+ cylinder(p->sector, p->cyl), p->end_head,
+ sector(p->end_sector),
+ cylinder(p->end_sector, p->end_cyl),
+- get_start_sect(p), get_nr_sects(p), p->sys_ind);
++ (unsigned long) get_start_sect(p),
++ (unsigned long) get_nr_sects(p), p->sys_ind);
+ if (p->sys_ind)
+ check_consistency(p, i);
+ }
+@@ -1799,7 +1799,7 @@
}
static void
@@ -149,7 +185,16 @@
int i;
struct pte *pe = &ptes[0];
struct partition *p;
-@@ -1845,8 +1844,8 @@
+@@ -1832,7 +1832,7 @@
+ n, h + 1, heads);
+ if (real_s >= sectors)
+ fprintf(stderr, _("Partition %d: sector %d greater than "
+- "maximum %d\n"), n, s, sectors);
++ "maximum %Ld\n"), n, s, sectors);
+ if (real_c >= cylinders)
+ fprintf(stderr, _("Partitions %d: cylinder %d greater than "
+ "maximum %d\n"), n, real_c + 1, cylinders);
+@@ -1845,8 +1845,8 @@
static void
verify(void) {
int i, j;
@@ -160,7 +205,7 @@
struct partition *p;
if (warn_geometry())
-@@ -1890,7 +1889,7 @@
+@@ -1890,7 +1890,7 @@
if (extended_offset) {
struct pte *pex = &ptes[ext_index];
@@ -169,7 +214,18 @@
get_nr_sects(pex->part_table) - 1;
for (i = 4; i < partitions; i++) {
-@@ -1923,7 +1922,7 @@
+@@ -1909,8 +1909,8 @@
+ }
+
+ if (total > total_number_of_sectors)
+- printf(_("Total allocated sectors %d greater than the maximum "
+- "%lld\n"), total, total_number_of_sectors);
++ printf(_("Total allocated sectors %ld greater than the maximum"
++ " %lld\n"), total, total_number_of_sectors);
+ else if (total < total_number_of_sectors)
+ printf(_("%lld unallocated sectors\n"),
+ total_number_of_sectors - total);
+@@ -1923,7 +1923,7 @@
struct partition *p = ptes[n].part_table;
struct partition *q = ptes[ext_index].part_table;
long long llimit;
@@ -178,7 +234,16 @@
first[partitions], last[partitions];
if (p && p->sys_ind) {
-@@ -2228,14 +2227,14 @@
+@@ -1969,7 +1969,7 @@
+ if (start > limit)
+ break;
+ if (start >= temp+units_per_sector && read) {
+- printf(_("Sector %d is already allocated\n"), temp);
++ printf(_("Sector %llu is already allocated\n"), temp);
+ temp = start;
+ read = 0;
+ }
+@@ -2228,14 +2228,14 @@
#define MAX_PER_LINE 16
static void
@@ -223,6 +288,41 @@
extern int show_begin;
extern int aix_label;
extern char *partition_type(unsigned char type);
+--- util-linux-2.12r/fdisk/fdiskmaclabel.h
++++ util-linux-2.12r/fdisk/fdiskmaclabel.h
+@@ -25,9 +25,10 @@
+
+ /* fdisk.c */
+ #define maclabel ((mac_partition *)MBRbuffer)
+-extern char MBRbuffer[MAX_SECTOR_SIZE];
++extern unsigned char MBRbuffer[MAX_SECTOR_SIZE];
+ extern char changed[MAXIMUM_PARTS];
+-extern unsigned int heads, sectors, cylinders;
++extern unsigned int heads, cylinders;
++extern unsigned long long sectors;
+ extern int show_begin;
+ extern int mac_label;
+ extern char *partition_type(unsigned char type);
+--- util-linux-2.12r/fdisk/fdisksgilabel.c
++++ util-linux-2.12r/fdisk/fdisksgilabel.c
+@@ -197,7 +197,7 @@
+ w = strlen(disk_device);
+
+ if (xtra) {
+- printf(_("\nDisk %s (SGI disk label): %d heads, %d sectors\n"
++ printf(_("\nDisk %s (SGI disk label): %d heads, %llu sectors\n"
+ "%d cylinders, %d physical cylinders\n"
+ "%d extra sects/cyl, interleave %d:1\n"
+ "%s\n"
+@@ -211,7 +211,7 @@
+ sector_size);
+ } else {
+ printf(_("\nDisk %s (SGI disk label): "
+- "%d heads, %d sectors, %d cylinders\n"
++ "%d heads, %llu sectors, %d cylinders\n"
+ "Units = %s of %d * %d bytes\n\n"),
+ disk_device, heads, sectors, cylinders,
+ str_units(PLURAL), units_per_sector,
--- util-linux-2.12r/fdisk/fdisksgilabel.h
+++ util-linux-2.12r/fdisk/fdisksgilabel.h
@@ -103,8 +103,9 @@
@@ -237,6 +337,35 @@
extern int show_begin;
extern int sgi_label;
extern char *partition_type(unsigned char type);
+--- util-linux-2.12r/fdisk/fdisksunlabel.c
++++ util-linux-2.12r/fdisk/fdisksunlabel.c
+@@ -349,7 +349,7 @@
+ }
+
+ snprintf(sunlabel->info, sizeof(sunlabel->info),
+- "%s%s%s cyl %d alt %d hd %d sec %d",
++ "%s%s%s cyl %d alt %d hd %d sec %llu",
+ p ? p->vendor : "", (p && *p->vendor) ? " " : "",
+ p ? p->model
+ : (floppy ? _("3,5\" floppy") : _("Linux custom")),
+@@ -656,7 +656,7 @@
+ w = strlen(disk_device);
+ if (xtra)
+ printf(
+- _("\nDisk %s (Sun disk label): %d heads, %d sectors, %d rpm\n"
++ _("\nDisk %s (Sun disk label): %d heads, %llu sectors, %d rpm\n"
+ "%d cylinders, %d alternate cylinders, %d physical cylinders\n"
+ "%d extra sects/cyl, interleave %d:1\n"
+ "%s\n"
+@@ -670,7 +670,7 @@
+ str_units(PLURAL), units_per_sector);
+ else
+ printf(
+- _("\nDisk %s (Sun disk label): %d heads, %d sectors, %d cylinders\n"
++ _("\nDisk %s (Sun disk label): %d heads, %llu sectors, %d cylinders\n"
+ "Units = %s of %d * 512 bytes\n\n"),
+ disk_device, heads, sectors, cylinders,
+ str_units(PLURAL), units_per_sector);
--- util-linux-2.12r/fdisk/fdisksunlabel.h
+++ util-linux-2.12r/fdisk/fdisksunlabel.h
@@ -37,8 +37,9 @@
@@ -251,18 +380,3 @@
extern int show_begin;
extern int sun_label;
extern char *partition_type(unsigned char type);
---- util-linux-2.12r/fdisk/fdiskmaclabel.h
-+++ util-linux-2.12r/fdisk/fdiskmaclabel.h
-@@ -25,9 +25,10 @@
-
- /* fdisk.c */
- #define maclabel ((mac_partition *)MBRbuffer)
--extern char MBRbuffer[MAX_SECTOR_SIZE];
-+extern unsigned char MBRbuffer[MAX_SECTOR_SIZE];
- extern char changed[MAXIMUM_PARTS];
--extern unsigned int heads, sectors, cylinders;
-+extern unsigned int heads, cylinders;
-+extern unsigned long long sectors;
- extern int show_begin;
- extern int mac_label;
- extern char *partition_type(unsigned char type);
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
[View Less]
1
0
Hello community,
here is the log from the commit of package lam
checked in at Tue Mar 28 18:30:00 CEST 2006.
--------
--- /work/SRC/all/lam/lam.changes 2006-02-18 00:20:17.000000000 +0100
+++ /work/src/done/STABLE/lam/lam.changes 2006-03-28 17:59:36.000000000 +0200
@@ -1,0 +2,8 @@
+Tue Mar 28 17:57:59 CEST 2006 - mrueckert(a)suse.de
+
+- removed APSL licensed files
+- added lam-7.1.1_no_darwin.patch:
+ removed references to files in the build system
+- cleaned up %build/%install
+
+----------…
[View More]---------------------------------------------------------
New:
----
lam-7.1.1_no_darwin.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ lam.spec ++++++
--- /var/tmp/diff_new_pack.FFzqFg/_old 2006-03-28 18:29:25.000000000 +0200
+++ /var/tmp/diff_new_pack.FFzqFg/_new 2006-03-28 18:29:25.000000000 +0200
@@ -28,7 +28,7 @@
%{!?rpi: %define rpi --with-rpi=usysv}
Summary: Local Area Multicomputer
Version: 7.1.1
-Release: 12
+Release: 17
License: Other License(s), see package
Group: Development/Libraries/Parallel
Source: http://www.mpi.nd.edu/downloads/lam/lam-%{version}.tar.bz2
@@ -37,6 +37,7 @@
Requires: openssh
Provides: mpi
#Conflicts: mpich mpich2
+Patch: lam-7.1.1_no_darwin.patch
%description
LAM (Local Area Multicomputer) is an MPI programming environment and
@@ -61,9 +62,9 @@
Conflicts: mpich-manpages
Summary: Local Area Multicomputer
Group: Development/Libraries/Parallel
-Autoreqprov: on
Obsoletes: lamman lam-manpages
-provides: lamman lam-manpages
+Provides: lamman lam-manpages
+Requires: glibc-devel libstdc++-devel
%description devel
LAM (Local Area Multicomputer) is an MPI programming environment and
@@ -86,40 +87,38 @@
%prep
%setup -q
+%patch
%build
-F77=gfortran CFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing" ./configure \
+autoreconf
+export F77=gfortran
+export CFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing"
+%configure \
%{rpi} \
- --prefix=/usr \
- --sysconfdir=%_sysconfdir \
- --libdir=%_libdir \
- --mandir=%_mandir \
- --with-rsh="/usr/bin/ssh -x"
+ --with-rsh="%{_bindir}/ssh -x"
make %{?jobs:-j%jobs} all
%install
-rm -rf $RPM_BUILD_ROOT
-make DESTDIR=$RPM_BUILD_ROOT install
+
+%makeinstall
for file in README README_LAM COPYRIGHT; do
- mv $RPM_BUILD_DIR/lam-%{version}/romio/$file \
- $RPM_BUILD_DIR/lam-%{version}/romio/romio-$file
+ mv romio/$file romio/romio-$file
done
-mv $RPM_BUILD_DIR/lam-%{version}/romio/doc/users-guide.ps.gz \
- $RPM_BUILD_DIR/lam-%{version}/romio/doc/romio-users-guide.ps.gz
-rm -f $RPM_BUILD_ROOT%{_datadir}/lam/lam-shell-setup.sh
-rm -f $RPM_BUILD_ROOT%{_datadir}/lam/lam-shell-setup.csh
-rm -f $RPM_BUILD_ROOT%{_datadir}/lam/lam_module.tcl
-rm -f $RPM_BUILD_ROOT%{_mandir}/man1/wipe.1*
+mv romio/doc/users-guide.ps.gz romio/doc/romio-users-guide.ps.gz
+rm -f %{buildroot}%{_datadir}/lam/lam-shell-setup.sh
+rm -f %{buildroot}%{_datadir}/lam/lam-shell-setup.csh
+rm -f %{buildroot}%{_datadir}/lam/lam_module.tcl
+rm -f %{buildroot}%{_mandir}/man1/wipe.1*
# Turn off the x bit on the totalview shared library so that rpm
# doesn't strip it. #$%@#$%!!!
%ifarch %ix86 ppc s390 %arm
-chmod a-x $RPM_BUILD_ROOT%{_libdir}/lam/liblam_totalview*so
+chmod a-x %{buildroot}%{_libdir}/lam/liblam_totalview*so
%endif
-rm -f $RPM_BUILD_ROOT/usr/bin/wipe
+rm -f %{buildroot}%{_bindir}/wipe
find examples -name ".deps" | xargs rm -rfv
%clean
-rm -rf $RPM_BUILD_ROOT
+rm -rf %{buildroot}
%files
%defattr(-,root,root)
@@ -174,6 +173,11 @@
%{_mandir}/man3/*
%changelog -n lam
+* Tue Mar 28 2006 - mrueckert(a)suse.de
+- removed APSL licensed files
+- added lam-7.1.1_no_darwin.patch:
+ removed references to files in the build system
+- cleaned up %%build/%%install
* Sat Feb 18 2006 - ro(a)suse.de
- cleanup docs (remove .deps)
* Wed Jan 25 2006 - mls(a)suse.de
++++++ lam-7.1.1.tar.bz2 ++++++
/work/SRC/all/lam/lam-7.1.1.tar.bz2 /work/src/done/STABLE/lam/lam-7.1.1.tar.bz2 differ: char 11, line 1
++++++ lam-7.1.1_no_darwin.patch ++++++
Index: share/memory/Makefile.am
===================================================================
--- share/memory/Makefile.am.orig
+++ share/memory/Makefile.am
@@ -14,7 +14,7 @@
include $(top_srcdir)/config/Makefile.options
-SUBDIRS = ptmalloc ptmalloc2 darwin7
+SUBDIRS = ptmalloc ptmalloc2
noinst_LTLIBRARIES = libmemory.la
libmemory_la_SOURCES = memory_hook.c
Index: configure.in
===================================================================
--- configure.in.orig
+++ configure.in
@@ -2443,7 +2443,6 @@
share/pmpi/Makefile
share/pmpi/f77/Makefile
share/memory/Makefile
- share/memory/darwin7/Makefile
share/memory/ptmalloc/Makefile
share/memory/ptmalloc2/Makefile
share/rreq/Makefile
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
[View Less]
1
0
Hello community,
here is the log from the commit of package kdebase3
checked in at Tue Mar 28 18:29:20 CEST 2006.
--------
--- /work/SRC/all/KDE/kdebase3/kdebase3.changes 2006-03-23 17:21:40.000000000 +0100
+++ /work/src/done/STABLE/kdebase3/kdebase3.changes 2006-03-28 17:46:51.000000000 +0200
@@ -1,0 +2,5 @@
+Tue Mar 28 17:46:23 CEST 2006 - coolo(a)suse.de
+
+- update media_hal.diff to handle fstab entries more correctly
+
+-------------------------------------------------------------------
…
[View More]++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ kdebase3.spec ++++++
--- /var/tmp/diff_new_pack.1fysti/_old 2006-03-28 18:27:28.000000000 +0200
+++ /var/tmp/diff_new_pack.1fysti/_new 2006-03-28 18:27:28.000000000 +0200
@@ -37,7 +37,7 @@
BuildRoot: %{_tmppath}/%{name}-%{version}-build
Url: http://www.kde.org/
Version: 3.5.1
-Release: 46
+Release: 48
%define kde_version 3.5.1
Source0: kdebase-%{kde_version}.tar.bz2
Source3: startkde.suse.sh
@@ -321,7 +321,7 @@
Summary: Set and list fileshares
Group: System/Management
Version: 2.0
-Release: 59
+Release: 61
%description -n fileshareset
This package contains the the fileshareset utility to allow users to
@@ -1383,6 +1383,8 @@
%endif
%changelog -n kdebase3
+* Tue Mar 28 2006 - coolo(a)suse.de
+- update media_hal.diff to handle fstab entries more correctly
* Thu Mar 23 2006 - stbinner(a)suse.de
- add patch to fix jumpy taskbar size (#156621)
- update media_hal.diff to fix setting of mount properties for a
++++++ media_hal.diff ++++++
--- /var/tmp/diff_new_pack.1fysti/_old 2006-03-28 18:27:32.000000000 +0200
+++ /var/tmp/diff_new_pack.1fysti/_new 2006-03-28 18:27:32.000000000 +0200
@@ -1,7 +1,7 @@
Index: medianotifier/medianotifier.cpp
===================================================================
---- medianotifier/medianotifier.cpp (.../KDE/3.5/kdebase/kioslave/media) (revision 501904)
-+++ medianotifier/medianotifier.cpp (.../work/coolos_media) (revision 521818)
+--- medianotifier/medianotifier.cpp (.../KDE/3.5/kdebase/kioslave/media) (Revision 501904)
++++ medianotifier/medianotifier.cpp (.../work/coolos_media) (Revision 523597)
@@ -54,7 +54,10 @@
{
kdDebug() << "MediaNotifier::onMediumChange( " << name << ", "
@@ -30,8 +30,8 @@
return false;
Index: libmediacommon/medium.cpp
===================================================================
---- libmediacommon/medium.cpp (.../KDE/3.5/kdebase/kioslave/media) (revision 501904)
-+++ libmediacommon/medium.cpp (.../work/coolos_media) (revision 521818)
+--- libmediacommon/medium.cpp (.../KDE/3.5/kdebase/kioslave/media) (Revision 501904)
++++ libmediacommon/medium.cpp (.../work/coolos_media) (Revision 523597)
@@ -40,6 +40,8 @@
m_properties+= QString::null; /* ICON_NAME */
@@ -52,8 +52,8 @@
const Medium Medium::create(const QStringList &properties)
Index: libmediacommon/medium.h
===================================================================
---- libmediacommon/medium.h (.../KDE/3.5/kdebase/kioslave/media) (revision 501904)
-+++ libmediacommon/medium.h (.../work/coolos_media) (revision 521818)
+--- libmediacommon/medium.h (.../KDE/3.5/kdebase/kioslave/media) (Revision 501904)
++++ libmediacommon/medium.h (.../work/coolos_media) (Revision 523597)
@@ -22,6 +22,7 @@
#include <qstring.h>
#include <qstringlist.h>
@@ -98,8 +98,8 @@
#endif
Index: mediaimpl.cpp
===================================================================
---- mediaimpl.cpp (.../KDE/3.5/kdebase/kioslave/media) (revision 501904)
-+++ mediaimpl.cpp (.../work/coolos_media) (revision 521818)
+--- mediaimpl.cpp (.../KDE/3.5/kdebase/kioslave/media) (Revision 501904)
++++ mediaimpl.cpp (.../work/coolos_media) (Revision 523597)
@@ -226,6 +226,8 @@
mp_mounting = &medium;
@@ -138,8 +138,8 @@
Index: kfile-plugin/kfile_media.desktop
===================================================================
---- kfile-plugin/kfile_media.desktop (.../KDE/3.5/kdebase/kioslave/media) (revision 501904)
-+++ kfile-plugin/kfile_media.desktop (.../work/coolos_media) (revision 521818)
+--- kfile-plugin/kfile_media.desktop (.../KDE/3.5/kdebase/kioslave/media) (Revision 501904)
++++ kfile-plugin/kfile_media.desktop (.../work/coolos_media) (Revision 523597)
@@ -57,4 +57,4 @@
Name[zh_TW]=媒體資訊
ServiceTypes=KFilePlugin
@@ -148,8 +148,8 @@
+MimeType=media/audiocd;media/hdd_mounted;media/blankcd;media/hdd_unmounted;media/blankdvd;media/cdrom_mounted;media/cdrom_unmounted;media/cdwriter_mounted;media/nfs_mounted;media/cdwriter_unmounted;media/nfs_unmounted;media/removable_mounted;media/dvd_mounted;media/removable_unmounted;media/dvd_unmounted;media/smb_mounted;media/dvdvideo;media/smb_unmounted;media/floppy5_mounted;media/svcd;media/floppy5_unmounted;media/vcd;media/floppy_mounted;media/zip_mounted;media/floppy_unmounted;media/zip_unmounted;media/gphoto2camera,media/camera_mounted,media/camera_unmounted
Index: kfile-plugin/kfilemediaplugin.cpp
===================================================================
---- kfile-plugin/kfilemediaplugin.cpp (.../KDE/3.5/kdebase/kioslave/media) (revision 501904)
-+++ kfile-plugin/kfilemediaplugin.cpp (.../work/coolos_media) (revision 521818)
+--- kfile-plugin/kfilemediaplugin.cpp (.../KDE/3.5/kdebase/kioslave/media) (Revision 501904)
++++ kfile-plugin/kfilemediaplugin.cpp (.../work/coolos_media) (Revision 523597)
@@ -64,12 +64,16 @@
addMimeType( "media/floppy_unmounted" );
addMimeType( "media/zip_unmounted" );
@@ -180,8 +180,8 @@
{
Index: configure.in.in
===================================================================
---- configure.in.in (.../KDE/3.5/kdebase/kioslave/media) (revision 501904)
-+++ configure.in.in (.../work/coolos_media) (revision 521818)
+--- configure.in.in (.../KDE/3.5/kdebase/kioslave/media) (Revision 501904)
++++ configure.in.in (.../work/coolos_media) (Revision 523597)
@@ -90,6 +90,13 @@
if test $dbus_inc != FOUND || test $dbus_lib != FOUND ; then
KDE_PKG_CHECK_MODULES( DBUS, "dbus-1", [ DBUS_INCS=$DBUS_CFLAGS; dbus_inc=FOUND; dbus_lib=FOUND; ] , AC_MSG_RESULT( Nothing found on PKG_CONFIG_PATH ) )
@@ -198,8 +198,8 @@
dbus=FOUND
Index: mounthelper/kio_media_mounthelper.cpp
===================================================================
---- mounthelper/kio_media_mounthelper.cpp (.../KDE/3.5/kdebase/kioslave/media) (revision 501904)
-+++ mounthelper/kio_media_mounthelper.cpp (.../work/coolos_media) (revision 521818)
+--- mounthelper/kio_media_mounthelper.cpp (.../KDE/3.5/kdebase/kioslave/media) (Revision 501904)
++++ mounthelper/kio_media_mounthelper.cpp (.../work/coolos_media) (Revision 523597)
@@ -27,6 +27,7 @@
#include <dcopclient.h>
#include <dcopref.h>
@@ -294,8 +294,8 @@
#include "kio_media_mounthelper.moc"
Index: mounthelper/Makefile.am
===================================================================
---- mounthelper/Makefile.am (.../KDE/3.5/kdebase/kioslave/media) (revision 501904)
-+++ mounthelper/Makefile.am (.../work/coolos_media) (revision 521818)
+--- mounthelper/Makefile.am (.../KDE/3.5/kdebase/kioslave/media) (Revision 501904)
++++ mounthelper/Makefile.am (.../work/coolos_media) (Revision 523597)
@@ -6,7 +6,7 @@
kio_media_mounthelper_SOURCES = kio_media_mounthelper.cpp
@@ -307,8 +307,8 @@
Index: kcmodule/managermodule.cpp
===================================================================
---- kcmodule/managermodule.cpp (.../KDE/3.5/kdebase/kioslave/media) (revision 501904)
-+++ kcmodule/managermodule.cpp (.../work/coolos_media) (revision 521818)
+--- kcmodule/managermodule.cpp (.../KDE/3.5/kdebase/kioslave/media) (Revision 501904)
++++ kcmodule/managermodule.cpp (.../work/coolos_media) (Revision 523597)
@@ -39,15 +39,15 @@
QString hal_text = view->kcfg_HalBackendEnabled->text();
hal_text += " ("+i18n("No support for HAL on this system")+")";
@@ -329,8 +329,8 @@
}
Index: Makefile.am
===================================================================
---- Makefile.am (.../KDE/3.5/kdebase/kioslave/media) (revision 501904)
-+++ Makefile.am (.../work/coolos_media) (revision 521818)
+--- Makefile.am (.../KDE/3.5/kdebase/kioslave/media) (Revision 501904)
++++ Makefile.am (.../work/coolos_media) (Revision 523597)
@@ -1,5 +1,5 @@
SUBDIRS = libmediacommon . mediamanager medianotifier mounthelper \
- kfile-plugin kcmodule mimetypes services
@@ -347,8 +347,8 @@
+ $(XGETTEXT) *.cpp *.h kfile-plugin/*.cpp libmediacommon/*.cpp mediamanager/*.cpp mounthelper/*.cpp propsdlgplugin/*.cpp -o $(podir)/kio_media.pot
Index: propsdlgplugin/propertiespage.h
===================================================================
---- propsdlgplugin/propertiespage.h (.../KDE/3.5/kdebase/kioslave/media) (revision 0)
-+++ propsdlgplugin/propertiespage.h (.../work/coolos_media) (revision 521818)
+--- propsdlgplugin/propertiespage.h (.../KDE/3.5/kdebase/kioslave/media) (Revision 0)
++++ propsdlgplugin/propertiespage.h (.../work/coolos_media) (Revision 523597)
@@ -0,0 +1,46 @@
+/*
+ Copyright (c) 2004 Jan Schaefer <j_schaef(a)informatik.uni-kl.de>
@@ -398,8 +398,8 @@
+#endif
Index: propsdlgplugin/media_propsdlgplugin.desktop
===================================================================
---- propsdlgplugin/media_propsdlgplugin.desktop (.../KDE/3.5/kdebase/kioslave/media) (revision 0)
-+++ propsdlgplugin/media_propsdlgplugin.desktop (.../work/coolos_media) (revision 521818)
+--- propsdlgplugin/media_propsdlgplugin.desktop (.../KDE/3.5/kdebase/kioslave/media) (Revision 0)
++++ propsdlgplugin/media_propsdlgplugin.desktop (.../work/coolos_media) (Revision 523597)
@@ -0,0 +1,7 @@
+[Desktop Entry]
+Encoding=UTF-8
@@ -410,8 +410,8 @@
+ServiceTypes=KPropsDlg/Plugin,media/audiocd,media/hdd_mounted,media/hdd_unmounted,media/cdrom_mounted,media/cdrom_unmounted,media/cdwriter_mounted,media/nfs_mounted,media/cdwriter_unmounted,media/nfs_unmounted,media/removable_mounted,media/dvd_mounted,media/removable_unmounted,media/dvd_unmounted,media/smb_mounted,media/dvdvideo,media/smb_unmounted,media/floppy5_mounted,media/floppy5_unmounted,media/floppy_mounted,media/zip_mounted,media/floppy_unmounted,media/zip_unmounted,media/camera_mounted,media/camera_unmounted
Index: propsdlgplugin/propertiespagegui.ui.h
===================================================================
---- propsdlgplugin/propertiespagegui.ui.h (.../KDE/3.5/kdebase/kioslave/media) (revision 0)
-+++ propsdlgplugin/propertiespagegui.ui.h (.../work/coolos_media) (revision 521818)
+--- propsdlgplugin/propertiespagegui.ui.h (.../KDE/3.5/kdebase/kioslave/media) (Revision 0)
++++ propsdlgplugin/propertiespagegui.ui.h (.../work/coolos_media) (Revision 523597)
@@ -0,0 +1,22 @@
+/****************************************************************************
+** ui.h extension file, included from the uic-generated form implementation.
@@ -437,8 +437,8 @@
+
Index: propsdlgplugin/propsdlgshareplugin.h
===================================================================
---- propsdlgplugin/propsdlgshareplugin.h (.../KDE/3.5/kdebase/kioslave/media) (revision 0)
-+++ propsdlgplugin/propsdlgshareplugin.h (.../work/coolos_media) (revision 521818)
+--- propsdlgplugin/propsdlgshareplugin.h (.../KDE/3.5/kdebase/kioslave/media) (Revision 0)
++++ propsdlgplugin/propsdlgshareplugin.h (.../work/coolos_media) (Revision 523597)
@@ -0,0 +1,44 @@
+/*
+ Copyright (c) 2004 Jan Schaefer <j_schaef(a)informatik.uni-kl.de>
@@ -486,8 +486,8 @@
+
Index: propsdlgplugin/Makefile.am
===================================================================
---- propsdlgplugin/Makefile.am (.../KDE/3.5/kdebase/kioslave/media) (revision 0)
-+++ propsdlgplugin/Makefile.am (.../work/coolos_media) (revision 521818)
+--- propsdlgplugin/Makefile.am (.../KDE/3.5/kdebase/kioslave/media) (Revision 0)
++++ propsdlgplugin/Makefile.am (.../work/coolos_media) (Revision 523597)
@@ -0,0 +1,12 @@
+METASOURCES = AUTO
+
@@ -503,8 +503,8 @@
+media_propsdlgplugin_la_SOURCES = propertiespage.cpp propertiespagegui.ui propsdlgshareplugin.cpp
Index: propsdlgplugin/propertiespage.cpp
===================================================================
---- propsdlgplugin/propertiespage.cpp (.../KDE/3.5/kdebase/kioslave/media) (revision 0)
-+++ propsdlgplugin/propertiespage.cpp (.../work/coolos_media) (revision 521818)
+--- propsdlgplugin/propertiespage.cpp (.../KDE/3.5/kdebase/kioslave/media) (Revision 0)
++++ propsdlgplugin/propertiespage.cpp (.../work/coolos_media) (Revision 523597)
@@ -0,0 +1,217 @@
+/*
+ Copyright (c) 2004 Jan Schaefer <j_schaef(a)informatik.uni-kl.de>
@@ -725,8 +725,8 @@
+#include "propertiespage.moc"
Index: propsdlgplugin/propertiespagegui.ui
===================================================================
---- propsdlgplugin/propertiespagegui.ui (.../KDE/3.5/kdebase/kioslave/media) (revision 0)
-+++ propsdlgplugin/propertiespagegui.ui (.../work/coolos_media) (revision 521818)
+--- propsdlgplugin/propertiespagegui.ui (.../KDE/3.5/kdebase/kioslave/media) (Revision 0)
++++ propsdlgplugin/propertiespagegui.ui (.../work/coolos_media) (Revision 523597)
@@ -0,0 +1,390 @@
+<!DOCTYPE UI><UI version="3.3" stdsetdef="1">
+<class>PropertiesPageGUI</class>
@@ -1120,8 +1120,8 @@
+</UI>
Index: propsdlgplugin/propsdlgshareplugin.cpp
===================================================================
---- propsdlgplugin/propsdlgshareplugin.cpp (.../KDE/3.5/kdebase/kioslave/media) (revision 0)
-+++ propsdlgplugin/propsdlgshareplugin.cpp (.../work/coolos_media) (revision 521818)
+--- propsdlgplugin/propsdlgshareplugin.cpp (.../KDE/3.5/kdebase/kioslave/media) (Revision 0)
++++ propsdlgplugin/propsdlgshareplugin.cpp (.../work/coolos_media) (Revision 523597)
@@ -0,0 +1,100 @@
+/*
+ Copyright (c) 2004 Jan Schaefer <j_schaef(a)informatik.uni-kl.de>
@@ -1224,7 +1224,7 @@
+#include "propsdlgshareplugin.moc"
+
-Property changes on: propsdlgplugin
+Eigenschaftsänderungen: propsdlgplugin
___________________________________________________________________
Name: svn:ignore
+ propertiespagegui.cpp
@@ -1239,8 +1239,8 @@
Index: mediamanager/mediamanager.cpp
===================================================================
---- mediamanager/mediamanager.cpp (.../KDE/3.5/kdebase/kioslave/media) (revision 501904)
-+++ mediamanager/mediamanager.cpp (.../work/coolos_media) (revision 521818)
+--- mediamanager/mediamanager.cpp (.../KDE/3.5/kdebase/kioslave/media) (Revision 501904)
++++ mediamanager/mediamanager.cpp (.../work/coolos_media) (Revision 523597)
@@ -76,14 +76,15 @@
}
@@ -1355,8 +1355,8 @@
const QPtrList<Medium> media = m_mediaList.list();
Index: mediamanager/halbackend.cpp
===================================================================
---- mediamanager/halbackend.cpp (.../KDE/3.5/kdebase/kioslave/media) (revision 501904)
-+++ mediamanager/halbackend.cpp (.../work/coolos_media) (revision 521818)
+--- mediamanager/halbackend.cpp (.../KDE/3.5/kdebase/kioslave/media) (Revision 501904)
++++ mediamanager/halbackend.cpp (.../work/coolos_media) (Revision 523597)
@@ -21,9 +21,16 @@
#include <stdlib.h>
@@ -1842,7 +1842,7 @@
+
+ for (; it!=end; ++it)
+ {
-+ if ((*it)->mountedFrom() == medium->deviceNode() || (*it)->realDeviceName() == medium->deviceNode())
++ if ((*it)->mountedFrom() == medium->deviceNode() || ( !medium->deviceNode().isEmpty() && (*it)->realDeviceName() == medium->deviceNode() ) )
+ {
+ QStringList opts = (*it)->mountOptions();
+ if (opts.contains("user"))
@@ -1861,7 +1861,7 @@
+ QString mountPoint = isInFstab(medium);
+ if (!mountPoint.isNull())
+ {
-+ kdDebug() << "triggering user mount " << medium->deviceNode() << " " << mountPoint << endl;
++ kdDebug() << "triggering user mount " << medium->deviceNode() << " " << mountPoint << " " << medium->id() << endl;
+ KIO::Job *job = KIO::mount( false, 0, medium->deviceNode(), mountPoint );
+ connect(job, SIGNAL( result (KIO::Job *)),
+ SLOT( slotResult( KIO::Job *)));
@@ -2048,8 +2048,8 @@
#include "halbackend.moc"
Index: mediamanager/mediamanager.h
===================================================================
---- mediamanager/mediamanager.h (.../KDE/3.5/kdebase/kioslave/media) (revision 501904)
-+++ mediamanager/mediamanager.h (.../work/coolos_media) (revision 521818)
+--- mediamanager/mediamanager.h (.../KDE/3.5/kdebase/kioslave/media) (Revision 501904)
++++ mediamanager/mediamanager.h (.../work/coolos_media) (Revision 523597)
@@ -28,6 +28,7 @@
#include "removablebackend.h"
#include "mediadirnotify.h"
@@ -2081,8 +2081,8 @@
Index: mediamanager/halbackend.h
===================================================================
---- mediamanager/halbackend.h (.../KDE/3.5/kdebase/kioslave/media) (revision 501904)
-+++ mediamanager/halbackend.h (.../work/coolos_media) (revision 521818)
+--- mediamanager/halbackend.h (.../KDE/3.5/kdebase/kioslave/media) (Revision 501904)
++++ mediamanager/halbackend.h (.../work/coolos_media) (Revision 523597)
@@ -104,6 +104,9 @@
#define libhal_device_query_capability(ctx, udi, capability, error) hal_device_query_capability(ctx, udi, capability)
#endif
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
[View Less]
1
0
Hello community,
here is the log from the commit of package gfxboot
checked in at Tue Mar 28 18:27:16 CEST 2006.
--------
--- /work/SRC/arch/i386/gfxboot/gfxboot.changes 2006-03-27 16:38:53.000000000 +0200
+++ /work/src/done/STABLE/gfxboot/gfxboot.changes 2006-03-28 18:04:09.000000000 +0200
@@ -1,0 +2,5 @@
+Tue Mar 28 18:03:59 CEST 2006 - snwint(a)suse.de
+
+- added new 'welcome' screen
+
+-------------------------------------------------------------------
Old:
----
gfxboot-3.2.16.tar.bz2
…
[View More]New:
----
gfxboot-3.2.17.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ gfxboot.spec ++++++
--- /var/tmp/diff_new_pack.wL9rQM/_old 2006-03-28 18:26:53.000000000 +0200
+++ /var/tmp/diff_new_pack.wL9rQM/_new 2006-03-28 18:26:53.000000000 +0200
@@ -1,5 +1,5 @@
#
-# spec file for package gfxboot (Version 3.2.16)
+# spec file for package gfxboot (Version 3.2.17)
#
# Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany.
# This file and all modifications and additions to the pristine
@@ -17,10 +17,10 @@
Obsoletes: gfxboot-devel
Autoreqprov: on
Summary: Graphical Boot Logo for LILO and SYSLINUX
-Version: 3.2.16
+Version: 3.2.17
Release: 1
BuildRoot: %{_tmppath}/%{name}-%{version}-build
-Source: gfxboot-3.2.16.tar.bz2
+Source: gfxboot-3.2.17.tar.bz2
Source1: NLD.tar.bz2
Source2: SLES.tar.bz2
Source3: SuSE.tar.bz2
@@ -58,6 +58,8 @@
/usr/share/gfxboot
%changelog -n gfxboot
+* Tue Mar 28 2006 - snwint(a)suse.de
+- added new 'welcome' screen
* Mon Mar 27 2006 - snwint(a)suse.de
- translations updated
* Mon Mar 13 2006 - snwint(a)suse.de
++++++ NLD.tar.bz2 ++++++
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/themes/NLD/Makefile new/themes/NLD/Makefile
--- old/themes/NLD/Makefile 2006-03-13 14:25:13.000000000 +0100
+++ new/themes/NLD/Makefile 2006-03-28 17:54:35.000000000 +0200
@@ -17,7 +17,7 @@
DEFAULT_LANG =
PIC_COMMON = timer_a.jpg
-PIC_INSTALL = back.jpg
+PIC_INSTALL = back.jpg welcome.jpg text*.jpg
PIC_BOOT = back-low.jpg
FILES_INST = init languages $(TRANSLATIONS) 16x16.fnt kroete.dat \
Binary files old/themes/NLD/welcome.jpg and new/themes/NLD/welcome.jpg differ
++++++ SLES.tar.bz2 ++++++
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/themes/SLES/Makefile new/themes/SLES/Makefile
--- old/themes/SLES/Makefile 2006-03-13 14:24:28.000000000 +0100
+++ new/themes/SLES/Makefile 2006-03-28 17:54:26.000000000 +0200
@@ -17,7 +17,7 @@
DEFAULT_LANG =
PIC_COMMON = timer_a.jpg
-PIC_INSTALL = back.jpg
+PIC_INSTALL = back.jpg welcome.jpg text*.jpg
PIC_BOOT = back-low.jpg
FILES_INST = init languages $(TRANSLATIONS) 16x16.fnt kroete.dat \
Binary files old/themes/SLES/welcome.jpg and new/themes/SLES/welcome.jpg differ
++++++ SuSE.tar.bz2 ++++++
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/themes/SuSE/Makefile new/themes/SuSE/Makefile
--- old/themes/SuSE/Makefile 2006-03-13 15:08:25.000000000 +0100
+++ new/themes/SuSE/Makefile 2006-03-28 16:18:18.000000000 +0200
@@ -17,7 +17,7 @@
DEFAULT_LANG =
PIC_COMMON = timer_a.jpg
-PIC_INSTALL = back.jpg
+PIC_INSTALL = back.jpg welcome.jpg text*.jpg
PIC_BOOT = back-low.jpg
FILES_INST = init languages $(TRANSLATIONS) 16x16.fnt kroete.dat \
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/themes/SuSE/bsplash.inc new/themes/SuSE/bsplash.inc
--- old/themes/SuSE/bsplash.inc 2005-09-05 11:59:14.000000000 +0200
+++ new/themes/SuSE/bsplash.inc 2006-03-28 17:53:38.000000000 +0200
@@ -8,22 +8,76 @@
% - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
% Some global vars.
-% Boot loader splash areas to uncover.
-%
-/bsplash.areas [
- [ 327 230 144 108 true ]
- [ 82 68 131 35 false ]
- [ 205 157 125 32 false ]
- [ 431 77 173 37 false ]
- [ 661 125 61 112 false ]
- [ 62 358 162 51 false ]
- [ 204 461 95 36 false ]
- [ 388 397 127 34 false ]
- [ 560 450 169 39 false ]
+/.b_x 0 def
+/.b_y 1 def
+/.b_dx 2 def
+/.b_dy 3 def
+/.b_steps 4 def
+/.b_mask 5 def
+/.b_count 6 def
+/.b_w 7 def
+/.b_h 8 def
+/.b_back 9 def
+/.b_tmp1 10 def
+/.b_tmp2 11 def
+
+/bsplash.list [
+ [ 680 45 -5 0 100 "text2a.jpg" -1 0 0 .undef .undef .undef ]
+ [ 680 95 -5 0 100 "text2b.jpg" -1 0 0 .undef .undef .undef ]
+ [ 680 145 -5 0 100 "text2c.jpg" -1 0 0 .undef .undef .undef ]
+ [ 690 470 -5 0 100 "text1.jpg" -50 0 0 .undef .undef .undef ]
+ [ 70 40 0 0 100 "text3.jpg" -80 0 0 .undef .undef .undef ]
+ [ 90 425 0 2 50 "text4a.jpg" -150 0 0 .undef .undef .undef ]
+ [ 90 485 0 0 50 "text4b.jpg" -150 0 0 .undef .undef .undef ]
+ [ 90 535 0 -2 50 "text4c.jpg" -150 0 0 .undef .undef .undef ]
] def
% - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+% Init splash.
+%
+% ( ) ==> ( )
+%
+/bsplash.init {
+ bsplash.list {
+ dup .b_mask get readimage over .b_mask rot put
+ dup .b_mask get dup .undef ne {
+ imgsize
+ 2 index .b_h rot put
+ over .b_w rot put
+
+ dup .b_x get over .b_y get moveto
+ dup .b_w get over .b_steps get 2 index .b_dx get abs mul add
+ over .b_h get 2 index .b_steps get 3 index .b_dy get abs mul add
+ savescreen over .b_back rot put
+
+ dup .b_w get over .b_h get savescreen over .b_tmp1 rot put
+ dup .b_w get over .b_h get savescreen over .b_tmp2 rot put
+ } {
+ pop
+ } ifelse
+ pop
+ } forall
+} def
+
+
+% - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+% Free splash memory.
+%
+% ( ) ==> ( )
+%
+/bsplash.free {
+ bsplash.list {
+ dup .b_mask get free dup .b_mask .undef put
+ dup .b_back get free
+ dup .b_tmp1 get free
+ dup .b_tmp2 get free
+ pop
+ } forall
+} def
+
+
+% - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
% Show boot loader splash.
%
% ( ) ==> ( )
@@ -31,72 +85,77 @@
/bsplash.show {
currentimage
- "splash.jpg" findfile /splash.file over def setimage loadpalette
- /max_image_colors max_image_colors image.colors max def
+ "welcome.jpg" findfile /splash.file over def setimage
-% 0 0 moveto currentpoint 1 1 image getpixel setcolor screen.size fillrect
-
-% 7 0xffffff setpalette
0 0 moveto 0 0 image.size image
- "greeting.jpg" findfile /splash.file2 over def setimage
+ bsplash.init
- % center image
- image.size screen.size exch 4 -1 roll sub 2 div 3 1 roll exch sub 2 div
- /bsplash.y exch def
- /bsplash.x exch def
-
- bsplash.areas 0 get
- dup 0 get over 1 get moveto currentpoint bsplash.x bsplash.y rmoveto
- 2 index 2 get 3 index 3 get 5 -1 roll pop blendit
- 700000 usleep
+ 500000 usleep
{
- bsplash.areas rand over length mod get
- dup 4 get {
- pop
- } {
- dup 0 get over 1 get moveto currentpoint bsplash.x bsplash.y rmoveto
- 2 index 2 get 3 index 3 get 5 -1 roll 4 true put blendit
- 70000 usleep
- } ifelse
-
- true
- 0 1 bsplash.areas length 1 sub {
- bsplash.areas exch get 4 get and
- } for
- { exit } if
+ 0 usleep
+ bsplash.run { exit } if
} loop
+ bsplash.free
+
setimage
- splash.file2 free /splash.file2 .undef def
splash.file free /splash.file .undef def
-} def
-
-
-/blendit {
- /b.w exch def
- /b.h exch def
-
- moveto
- /b.back b.h b.w savescreen def
- /b.mask currentpoint b.h 1 add b.w 1 add unpackimage def
-
- currentpoint
+} def
- 0 0 moveto
- 0x303030 b.mask b.back blend
- 1 1 moveto
- white b.mask b.back blend
+% Run splash animations. Return 'true' when done.
+%
+% ( ) ==> ( true|false )
+%
+/bsplash.run {
+ true
- moveto
- b.back restorescreen
+ bsplash.list {
+ dup .b_mask get .undef ne over .b_count get .undef ne and {
+ exch pop false exch
+
+ dup .b_count get 1 add over .b_count rot put
+
+ % count runs from 0 ... steps inclusive
+
+ dup .b_count get 0 ge {
+
+ % copy background
+ dup .b_dx get over .b_count get mul 10 div
+ over .b_dx get 2 index .b_steps get mul 10 div neg 0 max add
+ over .b_dy get 2 index .b_count get mul 10 div
+ 2 index .b_dy get 3 index .b_steps get mul 10 div neg 0 max add
+ moveto
+ dup .b_back get 0xff 2 index .b_tmp1 get blend
+
+ % we need 2 copies
+ dup .b_tmp2 get over .b_tmp1 get over length memcpy
+
+ % draw text
+ 0 0 moveto white over .b_mask get 2 index .b_tmp1 get blend
+
+ % blend result with background
+ dup .b_tmp1 get over .b_count get 255 mul 2 index .b_steps get div 2 index .b_tmp2 get blend
+
+ % show result
+ dup .b_x get over .b_dx get 2 index .b_count get mul 10 div add
+ over .b_dx get 2 index .b_steps get mul 10 div neg 0 max add
+ over .b_y get 2 index .b_dy get 3 index .b_count get mul 10 div add
+ 2 index .b_dy get 3 index .b_steps get mul 10 div neg 0 max add
+ moveto
+ dup .b_tmp2 get restorescreen
+
+ } if
+
+ dup .b_count get over .b_steps get eq { dup .b_count .undef put } if
+ } if
+ pop
+ } forall
- b.mask free
- b.back free
} def
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/themes/SuSE/common.inc new/themes/SuSE/common.inc
--- old/themes/SuSE/common.inc 2006-03-27 16:37:16.000000000 +0200
+++ new/themes/SuSE/common.inc 2006-03-28 14:51:46.000000000 +0200
@@ -535,8 +535,6 @@
dup window.init
window.show
-% fadein_logo
-
syslinux {
enough_mem not livecd and {
@@ -557,8 +555,6 @@
} ifelse
} if
- % fade_warning.init
-
} def
@@ -1106,26 +1102,6 @@
} def
-/fadeout_logo {
- /cols 256 malloc def
-
- 0 1 255 { cols exch 0 put } for
-
- 10 1 150 {
- 10 1 100 {
- over exch moveto getpixel
- cols exch 1 put
- } for
- pop
- } for
- cols 10 10 moveto getpixel 0 fade
-} def
-
-/fadein_logo {
- cols 10 10 moveto getpixel fadein
-} def
-
-
% Allocate and define a new color.
%
% ( palette ) ==> ( color )
@@ -1166,7 +1142,9 @@
% ( file_name ) ==> ( image )
/readimage {
- findfile dup setimage 0 0 image.size unpackimage exch free
+ findfile dup .undef ne {
+ dup setimage 0 0 image.size unpackimage exch free
+ } if
} def
@@ -1611,57 +1589,8 @@
ptheme small_layout or {
/bsplash.done { } def
} {
- /bsplash.done { } def
- % bsplash.show
+ bsplash.show
} ifelse
check_arch_boot_dir
-
-/fade_warning false def
-
-% ( time ) ==> ( )
-/Timer {
-% fade_warning not { return } if
-
-% /fade.count fade.count 10 sub def
-
-% fade.count 0 lt {
-% /fade_warning false def
-% return
-% } if
-
-% fade.count 255 gt { return } if
-
-% % copy to fade.bg fade.buf
-% 0 0 moveto fade.bg 0xff fade.buf blend
-
-% 0 0 moveto
-% fade.fg fade.count fade.buf blend
-
-% fade.x fade.y moveto fade.buf restorescreen
-
-} def
-
-
-/fade_warning.init {
- /fade.msg "Preliminary theming - no complaints!" def
- fade.msg strsize /fade.height exch 1 add def /fade.width exch 1 add def
- /fade.x clip.size pop fade.width sub 2 div def
- /fade.y 420 def
-
- /fade.bg fade.x fade.y moveto fade.width fade.height savescreen def
-
- fade.x fade.y moveto 1 1 rmoveto
- 0x806080 setcolor fade.msg show
- fade.x fade.y moveto
- 0xc04040 setcolor fade.msg show
-
- /fade.fg fade.x fade.y moveto fade.width fade.height savescreen def
- /fade.buf fade.x fade.y moveto fade.width fade.height savescreen def
-
- /fade.count 0x300 def
-
- /fade_warning true def
-} def
-
Binary files old/themes/SuSE/text1.jpg and new/themes/SuSE/text1.jpg differ
Binary files old/themes/SuSE/text2a.jpg and new/themes/SuSE/text2a.jpg differ
Binary files old/themes/SuSE/text2b.jpg and new/themes/SuSE/text2b.jpg differ
Binary files old/themes/SuSE/text2c.jpg and new/themes/SuSE/text2c.jpg differ
Binary files old/themes/SuSE/text3.jpg and new/themes/SuSE/text3.jpg differ
Binary files old/themes/SuSE/text4a.jpg and new/themes/SuSE/text4a.jpg differ
Binary files old/themes/SuSE/text4b.jpg and new/themes/SuSE/text4b.jpg differ
Binary files old/themes/SuSE/text4c.jpg and new/themes/SuSE/text4c.jpg differ
Binary files old/themes/SuSE/welcome.jpg and new/themes/SuSE/welcome.jpg differ
++++++ gfxboot-3.2.16.tar.bz2 -> gfxboot-3.2.17.tar.bz2 ++++++
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/gfxboot-3.2.16/Changelog new/gfxboot-3.2.17/Changelog
--- old/gfxboot-3.2.16/Changelog 2006-03-27 16:38:32.000000000 +0200
+++ new/gfxboot-3.2.17/Changelog 2006-03-28 18:02:45.000000000 +0200
@@ -1,3 +1,6 @@
+28/3/2006: v3.2.17
+ - added new 'welcome' screen
+
27/3/2006: v3.2.16
- translations updated
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/gfxboot-3.2.16/VERSION new/gfxboot-3.2.17/VERSION
--- old/gfxboot-3.2.16/VERSION 2006-03-21 12:01:56.000000000 +0100
+++ new/gfxboot-3.2.17/VERSION 2006-03-28 18:02:22.000000000 +0200
@@ -1 +1 @@
-3.2.16
+3.2.17
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
[View Less]
1
0
Hello community,
here is the log from the commit of package NetworkManager
checked in at Tue Mar 28 18:26:48 CEST 2006.
--------
--- /work/SRC/all/NetworkManager/NetworkManager.changes 2006-03-27 18:13:21.000000000 +0200
+++ /work/src/done/STABLE/NetworkManager/NetworkManager.changes 2006-03-28 17:37:59.000000000 +0200
@@ -1,0 +2,8 @@
+Tue Mar 28 17:35:54 CEST 2006 - rml(a)suse.de
+
+- Don't let wpa_supplicant scan with the airo driver (bug #161389)
+- Don't let wpa_supplicant scan when …
[View More]creating a new Ad-Hoc network,
+ even if using the madwifi driver
+- nm-applet: minor HIG-related UI tweaks
+
+-------------------------------------------------------------------
New:
----
nm-0.6-branch.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ NetworkManager.spec ++++++
--- /var/tmp/diff_new_pack.3g2atM/_old 2006-03-28 18:25:54.000000000 +0200
+++ /var/tmp/diff_new_pack.3g2atM/_new 2006-03-28 18:25:54.000000000 +0200
@@ -31,7 +31,7 @@
URL: http://www.gnome.org/projects/NetworkManager/
Autoreqprov: on
Version: 0.6.2
-Release: 1
+Release: 2
Summary: Network Link Manager and User Applications
Source0: NetworkManager-%{version}.tar.gz
Source1: nm-icons.tar.gz
@@ -41,6 +41,7 @@
Patch3: nm-madwifi-strength-rml.patch
Patch4: nm-wireless-driver-workarounds-rml.patch
Patch5: nm-debug-wpa-less-rml.patch
+Patch6: nm-0.6-branch.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-build
Requires: wireless-tools >= %{wireless_version}
Requires: dbus-1 >= %{dbus_version}
@@ -141,6 +142,7 @@
%patch3 -p0
%patch4 -p0
%patch5 -p0
+%patch6 -p1
%build
sed -i s/" --sm-disable"// nm-applet.desktop
@@ -205,10 +207,7 @@
%{gnome_datadir}/nm-applet/applet.glade
%{gnome_datadir}/icons/hicolor/16x16/apps/*.png
%{gnome_datadir}/icons/hicolor/22x22/apps/*.png
-%{gnome_datadir}/icons/hicolor/48x48/apps/nm-device-wired.png
-%{gnome_datadir}/icons/hicolor/48x48/apps/nm-device-wireless.png
-%{gnome_datadir}/icons/hicolor/48x48/apps/nm-device-wireless-encrypted.png
-%{gnome_datadir}/icons/hicolor/48x48/apps/nm-no-connection.png
+%{gnome_datadir}/icons/hicolor/48x48/apps/*.png
%dir %{gnome_datadir}/gnome-vpn-properties
%{gnome_datadir}/gnome-vpn-properties/nm-vpn-properties.glade
@@ -243,6 +242,11 @@
%{_libdir}/libnm_glib.so.0.0.0
%changelog -n NetworkManager
+* Tue Mar 28 2006 - rml(a)suse.de
+- Don't let wpa_supplicant scan with the airo driver (bug #161389)
+- Don't let wpa_supplicant scan when creating a new Ad-Hoc network,
+ even if using the madwifi driver
+- nm-applet: minor HIG-related UI tweaks
* Mon Mar 27 2006 - rml(a)suse.de
- Revert ypbind restart behavior (Novell bug #159070)
- Bump wpa_supplicant requirement to version 0.4.8-9 (Bug #144268)
++++++ nm-0.6-branch.patch ++++++
NETWORKMANAGER_0_6_2_RELEASE to NETWORKMANAGER_0_6_0_RELEASE
ChangeLog | 31 +++++++++++++++++++++++
NEWS | 5 +++
gnome/applet/applet.glade | 60 +++++++++++++++++++++++-----------------------
src/nm-netlink-monitor.c | 4 +--
test/nm-tool.c | 4 +--
5 files changed, 69 insertions(+), 35 deletions(-)
diff -urN --exclude=initscript --exclude=backends --exclude=configure.in --exclude=CVS NetworkManager-0.6.2/ChangeLog NetworkManager-0.6-branch/ChangeLog
--- NetworkManager-0.6.2/ChangeLog 2006-03-27 11:05:17.000000000 -0500
+++ NetworkManager-0.6-branch/ChangeLog 2006-03-27 15:33:31.000000000 -0500
@@ -1,3 +1,34 @@
+2006-03-27 Dan Williams <dcbw(a)redhat.com>
+
+ Patch from Christian Persch <chpe(a)gnome.org>
+ * gnome/applet/applet.glade
+ - HIG fixes; mostly for spacing and borders (gnome.org #336220)
+
+2006-03-27 Dan Williams <dcbw(a)redhat.com>
+
+ Patch from Diffe <diffie(a)blazebox.homeip.net>
+ * src/backends/NetworkManagerSlackware.c
+ - Don't restart howl, since it's been replaced by Avahi
+ in most distributions
+
+2006-03-27 Dan Williams <dcbw(a)redhat.com>
+
+ Patch from Tor Krill <bugzilla(a)krill.nu>
+ * configure.in
+ initscript/Makefile.am
+ src/backends/Makefile.am
+ src/backends/NetworkManagerArch.c
+ initscript/Arch/Makefile.am
+ initscript/Arch/networkmanager-dispatcher.in
+ initscript/Arch/networkmanager.in
+ - Add Arch Linux support, fixes gnome.org #335147
+
+2006-03-27 Dan Williams <dcbw(a)redhat.com>
+
+ Patch from Diffe <diffie(a)blazebox.homeip.net>
+ * initscript/Slackware/rc.networkmanager
+ - update, fixed gnome.org #333368
+
2006-03-27 Robert Love <rml(a)novell.com>
* configure.in: Bump version to 0.6.2.
diff -urN --exclude=initscript --exclude=backends --exclude=configure.in --exclude=CVS NetworkManager-0.6.2/gnome/applet/applet.glade NetworkManager-0.6-branch/gnome/applet/applet.glade
--- NetworkManager-0.6.2/gnome/applet/applet.glade 2006-03-23 10:14:45.000000000 -0500
+++ NetworkManager-0.6-branch/gnome/applet/applet.glade 2006-03-27 15:31:57.000000000 -0500
@@ -4,12 +4,12 @@
<glade-interface>
<widget class="GtkDialog" id="trust_dialog">
- <property name="border_width">6</property>
+ <property name="border_width">5</property>
<property name="title" translatable="yes"> </property>
<property name="type">GTK_WINDOW_TOPLEVEL</property>
<property name="window_position">GTK_WIN_POS_CENTER_ALWAYS</property>
<property name="modal">True</property>
- <property name="resizable">True</property>
+ <property name="resizable">False</property>
<property name="destroy_with_parent">False</property>
<property name="decorated">True</property>
<property name="skip_taskbar_hint">False</property>
@@ -24,7 +24,7 @@
<widget class="GtkVBox" id="dialog-vbox1">
<property name="visible">True</property>
<property name="homogeneous">False</property>
- <property name="spacing">12</property>
+ <property name="spacing">14</property>
<child internal-child="action_area">
<widget class="GtkHButtonBox" id="dialog-action_area1">
@@ -68,7 +68,7 @@
<child>
<widget class="GtkHBox" id="hbox1">
- <property name="border_width">6</property>
+ <property name="border_width">5</property>
<property name="visible">True</property>
<property name="homogeneous">False</property>
<property name="spacing">12</property>
@@ -160,12 +160,12 @@
</widget>
<widget class="GtkDialog" id="driver_sucks_dialog">
- <property name="border_width">6</property>
+ <property name="border_width">5</property>
<property name="title" translatable="yes"> </property>
<property name="type">GTK_WINDOW_TOPLEVEL</property>
<property name="window_position">GTK_WIN_POS_CENTER_ALWAYS</property>
<property name="modal">True</property>
- <property name="resizable">True</property>
+ <property name="resizable">False</property>
<property name="destroy_with_parent">False</property>
<property name="decorated">True</property>
<property name="skip_taskbar_hint">False</property>
@@ -180,7 +180,7 @@
<widget class="GtkVBox" id="vbox2">
<property name="visible">True</property>
<property name="homogeneous">False</property>
- <property name="spacing">12</property>
+ <property name="spacing">14</property>
<child internal-child="action_area">
<widget class="GtkHButtonBox" id="hbuttonbox1">
@@ -211,7 +211,7 @@
<child>
<widget class="GtkHBox" id="hbox2">
- <property name="border_width">6</property>
+ <property name="border_width">5</property>
<property name="visible">True</property>
<property name="homogeneous">False</property>
<property name="spacing">12</property>
@@ -303,7 +303,7 @@
</widget>
<widget class="GtkDialog" id="other_network_dialog">
- <property name="border_width">6</property>
+ <property name="border_width">5</property>
<property name="title" translatable="yes">Other Wireless Network...</property>
<property name="type">GTK_WINDOW_TOPLEVEL</property>
<property name="window_position">GTK_WIN_POS_CENTER_ALWAYS</property>
@@ -324,7 +324,7 @@
<widget class="GtkVBox" id="dialog-vbox1">
<property name="visible">True</property>
<property name="homogeneous">False</property>
- <property name="spacing">4</property>
+ <property name="spacing">2</property>
<child internal-child="action_area">
<widget class="GtkHButtonBox" id="dialog-action_area1">
@@ -368,7 +368,7 @@
<child>
<widget class="GtkHBox" id="hbox1">
- <property name="border_width">6</property>
+ <property name="border_width">5</property>
<property name="visible">True</property>
<property name="homogeneous">False</property>
<property name="spacing">12</property>
@@ -427,8 +427,8 @@
<property name="n_rows">4</property>
<property name="n_columns">2</property>
<property name="homogeneous">False</property>
- <property name="row_spacing">12</property>
- <property name="column_spacing">6</property>
+ <property name="row_spacing">6</property>
+ <property name="column_spacing">12</property>
<child>
<widget class="GtkLabel" id="wireless_adapter_label">
@@ -485,7 +485,7 @@
<property name="justify">GTK_JUSTIFY_LEFT</property>
<property name="wrap">False</property>
<property name="selectable">False</property>
- <property name="xalign">1</property>
+ <property name="xalign">0</property>
<property name="yalign">0.5</property>
<property name="xpad">0</property>
<property name="ypad">0</property>
@@ -534,7 +534,7 @@
<property name="justify">GTK_JUSTIFY_LEFT</property>
<property name="wrap">False</property>
<property name="selectable">False</property>
- <property name="xalign">1</property>
+ <property name="xalign">0</property>
<property name="yalign">0.5</property>
<property name="xpad">0</property>
<property name="ypad">0</property>
@@ -618,7 +618,7 @@
</widget>
<widget class="GtkDialog" id="passphrase_dialog">
- <property name="border_width">6</property>
+ <property name="border_width">5</property>
<property name="has_focus">True</property>
<property name="title" translatable="yes">Wireless Network Key Required</property>
<property name="type">GTK_WINDOW_TOPLEVEL</property>
@@ -639,7 +639,7 @@
<widget class="GtkVBox" id="dialog-vbox1">
<property name="visible">True</property>
<property name="homogeneous">False</property>
- <property name="spacing">12</property>
+ <property name="spacing">2</property>
<child internal-child="action_area">
<widget class="GtkHButtonBox" id="dialog-action_area1">
@@ -683,7 +683,7 @@
<child>
<widget class="GtkHBox" id="hbox1">
- <property name="border_width">6</property>
+ <property name="border_width">5</property>
<property name="visible">True</property>
<property name="homogeneous">False</property>
<property name="spacing">12</property>
@@ -741,7 +741,7 @@
<widget class="GtkHBox" id="hbox7">
<property name="visible">True</property>
<property name="homogeneous">False</property>
- <property name="spacing">6</property>
+ <property name="spacing">12</property>
<child>
<widget class="GtkLabel" id="security_combo_label">
@@ -828,7 +828,7 @@
</widget>
<widget class="GtkDialog" id="info_dialog">
- <property name="border_width">6</property>
+ <property name="border_width">5</property>
<property name="title" translatable="yes">Connection Information</property>
<property name="type">GTK_WINDOW_TOPLEVEL</property>
<property name="window_position">GTK_WIN_POS_NONE</property>
@@ -900,7 +900,7 @@
<widget class="GtkHBox" id="hbox2">
<property name="visible">True</property>
<property name="homogeneous">False</property>
- <property name="spacing">6</property>
+ <property name="spacing">12</property>
<child>
<widget class="GtkImage" id="image1">
@@ -926,8 +926,8 @@
<property name="n_rows">14</property>
<property name="n_columns">2</property>
<property name="homogeneous">False</property>
- <property name="row_spacing">3</property>
- <property name="column_spacing">6</property>
+ <property name="row_spacing">6</property>
+ <property name="column_spacing">12</property>
<child>
<widget class="GtkLabel" id="label-interface">
@@ -1752,7 +1752,7 @@
<property name="n_columns">2</property>
<property name="homogeneous">False</property>
<property name="row_spacing">6</property>
- <property name="column_spacing">6</property>
+ <property name="column_spacing">12</property>
<child>
<widget class="GtkLabel" id="wep_key_label">
@@ -1990,7 +1990,7 @@
<property name="n_columns">2</property>
<property name="homogeneous">False</property>
<property name="row_spacing">6</property>
- <property name="column_spacing">6</property>
+ <property name="column_spacing">12</property>
<child>
<widget class="GtkEntry" id="leap_username_entry">
@@ -2179,8 +2179,8 @@
<property name="n_rows">3</property>
<property name="n_columns">2</property>
<property name="homogeneous">False</property>
- <property name="row_spacing">4</property>
- <property name="column_spacing">4</property>
+ <property name="row_spacing">6</property>
+ <property name="column_spacing">12</property>
<child>
<widget class="GtkLabel" id="wpa_psk_label">
@@ -2416,8 +2416,8 @@
<property name="n_rows">10</property>
<property name="n_columns">2</property>
<property name="homogeneous">False</property>
- <property name="row_spacing">4</property>
- <property name="column_spacing">4</property>
+ <property name="row_spacing">6</property>
+ <property name="column_spacing">12</property>
<child>
<widget class="GtkLabel" id="wpa-eap-ca-cert-file-label">
@@ -2985,7 +2985,7 @@
<property name="n_columns">2</property>
<property name="homogeneous">False</property>
<property name="row_spacing">6</property>
- <property name="column_spacing">6</property>
+ <property name="column_spacing">12</property>
<child>
<widget class="GtkLabel" id="wep_passphrase_label">
diff -urN --exclude=initscript --exclude=backends --exclude=configure.in --exclude=CVS NetworkManager-0.6.2/NEWS NetworkManager-0.6-branch/NEWS
--- NetworkManager-0.6.2/NEWS 2006-03-27 11:05:17.000000000 -0500
+++ NetworkManager-0.6-branch/NEWS 2006-03-28 09:47:21.000000000 -0500
@@ -3,7 +3,10 @@
Overview of changes since NetworkManager-0.6.2
==============================================
-0.6.2 is a bug fix release.
+0.6.2 is a bug fix release. Note that NetworkManager no longer automatically
+runs dhcdbd if it is not running. This means that it is now the system's
+responsibility to start dhcdbd prior to NetworkManager, e.g. in the
+distribution's NetworkManager initscript.
* NetworkManager
* Many, many bug fixes (Everyone)
diff -urN --exclude=initscript --exclude=backends --exclude=configure.in --exclude=CVS NetworkManager-0.6.2/src/nm-netlink-monitor.c NetworkManager-0.6-branch/src/nm-netlink-monitor.c
--- NetworkManager-0.6.2/src/nm-netlink-monitor.c 2006-03-27 10:20:28.000000000 -0500
+++ NetworkManager-0.6-branch/src/nm-netlink-monitor.c 2006-03-27 15:35:20.000000000 -0500
@@ -133,8 +133,8 @@
}
gboolean
-nm_netlink_monitor_open_connection (NmNetlinkMonitor *monitor,
- GError **error)
+nm_netlink_monitor_open_connection (NmNetlinkMonitor *monitor,
+ GError **error)
{
struct sockaddr_nl monitor_address = { .nl_family = 0 };
int fd, saved_errno;
diff -urN --exclude=initscript --exclude=backends --exclude=configure.in --exclude=CVS NetworkManager-0.6.2/test/nm-tool.c NetworkManager-0.6-branch/test/nm-tool.c
--- NetworkManager-0.6.2/test/nm-tool.c 2006-03-02 18:01:33.000000000 -0500
+++ NetworkManager-0.6-branch/test/nm-tool.c 2006-03-27 12:58:53.000000000 -0500
@@ -84,7 +84,7 @@
success = FALSE;
break;
}
- fprintf (stderr, "State: %s\n\n", state_string);
+ printf ("State: %s\n\n", state_string);
return success;
}
@@ -327,7 +327,7 @@
print_string ("HW Address", hw_addr);
/* Capabilities */
- fprintf (stderr, "\n Capabilities:\n");
+ printf ("\n Capabilities:\n");
if (caps & NM_DEVICE_CAP_NM_SUPPORTED)
print_string (" Supported", "yes");
else
++++++ nm-wireless-driver-workarounds-rml.patch ++++++
--- /var/tmp/diff_new_pack.3g2atM/_old 2006-03-28 18:25:55.000000000 +0200
+++ /var/tmp/diff_new_pack.3g2atM/_new 2006-03-28 18:25:55.000000000 +0200
@@ -1,10 +1,10 @@
Index: src/nm-device-802-11-wireless.c
===================================================================
RCS file: /cvs/gnome/NetworkManager/src/nm-device-802-11-wireless.c,v
-retrieving revision 1.60.2.3
-diff -u -r1.60.2.3 nm-device-802-11-wireless.c
---- src/nm-device-802-11-wireless.c 9 Mar 2006 21:51:24 -0000 1.60.2.3
-+++ src/nm-device-802-11-wireless.c 27 Mar 2006 15:46:30 -0000
+retrieving revision 1.60.2.5
+diff -u -r1.60.2.5 nm-device-802-11-wireless.c
+--- src/nm-device-802-11-wireless.c 27 Mar 2006 16:11:53 -0000 1.60.2.5
++++ src/nm-device-802-11-wireless.c 28 Mar 2006 15:19:01 -0000
@@ -214,22 +214,13 @@
if ((data_len >= minlen) && range->we_version_compiled >= 18)
@@ -116,14 +116,14 @@
guint32 caps;
gboolean supports_wpa;
-@@ -2489,12 +2494,23 @@
+@@ -2489,12 +2494,25 @@
|| (caps & NM_802_11_CAP_PROTO_WPA2);
/* Use "AP_SCAN 2" if:
- * - The wireless network is non-broadcast or user created
- * - The wireless driver does not support WPA
-+ * - The wireless driver is orinoco or prism54
-+ * - The wireless network is user created, but not madwifi
++ * - The wireless driver is orinoco, prism54, or airo
++ * - The wireless network is user created
+ * - The wireless driver does not support WPA
+ * Otherwise, we prefer "AP_SCAN 1".
*/
@@ -133,8 +133,10 @@
+ if (!strcmp (kernel_driver, "orinoco_cs"))
+ ap_scan = "AP_SCAN 2";
+ else if (!strcmp (kernel_driver, "prism54"))
++ ap_scan = "AP_SCAN 2";
++ else if (!strcmp (kernel_driver, "airo"))
ap_scan = "AP_SCAN 2";
-+ else if (user_created && strcmp (kernel_driver, "ath_pci"))
++ else if (user_created)
+ ap_scan = "AP_SCAN 2";
+ else if (!supports_wpa)
+ ap_scan = "AP_SCAN 2";
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
[View Less]
1
0
Hello community,
here is the log from the commit of package kpowersave
checked in at Tue Mar 28 17:10:39 CEST 2006.
--------
--- /work/SRC/arch/i386/kpowersave/kpowersave.changes 2006-03-28 00:23:12.000000000 +0200
+++ /work/src/done/STABLE/kpowersave/kpowersave.changes 2006-03-28 16:57:29.000000000 +0200
@@ -1,0 +2,5 @@
+Tue Mar 28 16:44:03 CEST 2006 - dkukawka(a)suse.de
+
+- fixed UTF-8 in desktop files
+
+-------------------------------------------------------------------
+++++++++++++++++…
[View More]+++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ kpowersave.spec ++++++
--- /var/tmp/diff_new_pack.VSYxog/_old 2006-03-28 17:10:19.000000000 +0200
+++ /var/tmp/diff_new_pack.VSYxog/_new 2006-03-28 17:10:19.000000000 +0200
@@ -17,7 +17,7 @@
BuildRoot: %{_tmppath}/%{name}-%{version}-build
Summary: KDE Front-End to powersave Package, Battery Monitor, and General Power Management Support
Version: 0.6.0
-Release: 1
+Release: 2
ExclusiveArch: %ix86 x86_64 ia64 ppc
Requires: powersave >= 0.12.7 powersave-libs >= 0.12.7 yast2-power-management /sbin/pidof /usr/X11R6/bin/xset
Source: %{name}-%{version}.tar.bz2
@@ -80,6 +80,8 @@
/opt/kde3/lib*/libkdeinit_kpowersave.*
%changelog -n kpowersave
+* Tue Mar 28 2006 - dkukawka(a)suse.de
+- fixed UTF-8 in desktop files
* Mon Mar 27 2006 - dkukawka(a)suse.de
- updated to new stable release 0.6.0:
- changed powersave dependency to stable version >= 0.12.7
++++++ kpowersave-0.6.0.tar.bz2 ++++++
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kpowersave-0.6.0/ChangeLog new/kpowersave-0.6.0/ChangeLog
--- old/kpowersave-0.6.0/ChangeLog 2006-03-27 23:53:06.000000000 +0200
+++ new/kpowersave-0.6.0/ChangeLog 2006-03-28 16:48:56.000000000 +0200
@@ -1,3 +1,15 @@
+2006-03-28 Danny Kukawka <danny.kukawka(a)web.de>
+
+ Updated package related changelogs:
+ * ChangeLog.package:
+ * doc/doxy/changelog.dox:
+
+2006-03-28 Danny Kukawka <danny.kukawka(a)web.de>
+
+ Fixed UTF-8 in desktop files:
+ * src/kpowersave-autostart.desktop:
+ * src/kpowersave.desktop:
+
2006-03-27 Danny Kukawka <danny.kukawka(a)web.de>
* Doxyfile, configure.in.in, src/main.cpp: update version
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kpowersave-0.6.0/ChangeLog.package new/kpowersave-0.6.0/ChangeLog.package
--- old/kpowersave-0.6.0/ChangeLog.package 2006-03-27 23:53:06.000000000 +0200
+++ new/kpowersave-0.6.0/ChangeLog.package 2006-03-28 16:48:56.000000000 +0200
@@ -5,6 +5,11 @@
* *
*******************************************************************
-------------------------------------------------------------------
+Tue Mar 28 16:44:03 CEST 2006 - dkukawka(a)suse.de
+
+- fixed UTF-8 in desktop files
+
+-------------------------------------------------------------------
Mon Mar 27 23:19:38 CEST 2006 - dkukawka(a)suse.de
- updated to new stable release 0.6.0:
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kpowersave-0.6.0/doc/doxy/changelog.dox new/kpowersave-0.6.0/doc/doxy/changelog.dox
--- old/kpowersave-0.6.0/doc/doxy/changelog.dox 2006-03-27 23:52:18.000000000 +0200
+++ new/kpowersave-0.6.0/doc/doxy/changelog.dox 2006-03-28 16:47:52.000000000 +0200
@@ -2,6 +2,9 @@
* \page changelog Changelog
* \section changelist_sec All changes in the package since init
*
+* Tue Mar 28 16:44:03 CEST 2006 - dkukawka(a)suse.de
+* - fixed UTF-8 in desktop files
+*
* Mon Mar 27 23:19:38 CEST 2006 - dkukawka(a)suse.de
* - updated to new stable release 0.6.0:
* - changed powersave dependency to stable version >= 0.12.7
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kpowersave-0.6.0/src/kpowersave-autostart.desktop new/kpowersave-0.6.0/src/kpowersave-autostart.desktop
--- old/kpowersave-0.6.0/src/kpowersave-autostart.desktop 2006-03-27 23:51:50.000000000 +0200
+++ new/kpowersave-0.6.0/src/kpowersave-autostart.desktop 2006-03-28 16:47:20.000000000 +0200
@@ -1,4 +1,4 @@
-[Desktop Entry]
+[Desktop Entry]
Encoding=UTF-8
Name=kpowersave
Name[xx]=xxkpowersavexx
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kpowersave-0.6.0/src/kpowersave.desktop new/kpowersave-0.6.0/src/kpowersave.desktop
--- old/kpowersave-0.6.0/src/kpowersave.desktop 2006-03-27 23:51:50.000000000 +0200
+++ new/kpowersave-0.6.0/src/kpowersave.desktop 2006-03-28 16:47:20.000000000 +0200
@@ -1,4 +1,4 @@
-[Desktop Entry]
+[Desktop Entry]
Encoding=UTF-8
Name=kpowersave
Name[xx]=xxkpowersavexx
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
[View Less]
1
0
Hello community,
here is the log from the commit of package dhcdbd
checked in at Tue Mar 28 17:09:41 CEST 2006.
--------
--- /work/SRC/all/dhcdbd/dhcdbd.changes 2006-03-21 21:28:17.000000000 +0100
+++ /work/src/done/STABLE/dhcdbd/dhcdbd.changes 2006-03-28 16:58:55.000000000 +0200
@@ -1,0 +2,5 @@
+Tue Mar 28 16:58:28 CEST 2006 - rml(a)suse.de
+
+- Log debugging spew less readily (Novell bug #161138)
+
+-------------------------------------------------------------------
New:
----
dhcdbd-…
[View More]less-verbose-logging-rml.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ dhcdbd.spec ++++++
--- /var/tmp/diff_new_pack.WXlDu9/_old 2006-03-28 17:08:43.000000000 +0200
+++ /var/tmp/diff_new_pack.WXlDu9/_new 2006-03-28 17:08:43.000000000 +0200
@@ -14,7 +14,7 @@
BuildRequires: dbus-1-devel
Summary: DHCP D-BUS Daemon
Version: 1.12
-Release: 8
+Release: 10
License: GPL
Group: Productivity/Networking/Boot/Utilities
URL: http://people.redhat.com/~jvdias/dhcdbd
@@ -23,6 +23,7 @@
Patch1: dhcdbd-remove-named-user-rml.patch
Patch2: dhcdbd-no-nr_open-rml.patch
Patch3: dhcdbd-dbus-reconnect-thoenig-02.patch
+Patch4: dhcdbd-less-verbose-logging-rml.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-build
Requires: dhcp-client >= 3.0.3 dbus-1 >= 0.60
@@ -42,6 +43,7 @@
%patch1 -p1
%patch2 -p1
%patch3 -p0
+%patch4 -p1
%build
make CFLAGS="-Wall $RPM_OPT_FLAGS" CC='gcc' LIBDIR=%_lib
@@ -65,6 +67,8 @@
%dir /var/lib/named
%changelog -n dhcdbd
+* Tue Mar 28 2006 - rml(a)suse.de
+- Log debugging spew less readily (Novell bug #161138)
* Tue Mar 21 2006 - rml(a)suse.de
- Survive DBUS restarts (Novell bug #150042)
* Fri Feb 24 2006 - rml(a)suse.de
++++++ dhcdbd-less-verbose-logging-rml.patch ++++++
dbus_service.c | 5 -----
1 file changed, 5 deletions(-)
diff -urN dhcdbd-1.12/dbus_service.c dhcdbd/dbus_service.c
--- dhcdbd-1.12/dbus_service.c 2006-01-17 16:23:51.000000000 -0500
+++ dhcdbd/dbus_service.c 2006-03-28 09:58:24.000000000 -0500
@@ -247,12 +247,7 @@
return r;
mhpp = tfind(&mhn, &(root->tree), mh_comparator);
if ( (mhpp == 0L) || ((mhp=*mhpp)==0L) )
- {
- if( cs->eh != 0L ) (*(cs->eh))("message_handler: message handler not found under %s for sub-path %s", path, sub_path);
-
-
return DBUS_HANDLER_RESULT_NOT_YET_HANDLED;
- }
}
r =( (*(mhp->mh))
( cs, type, reply, serial, dest, path, member, interface, if_suffix,
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
[View Less]
1
0