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
April 2006
- 1 participants
- 1177 discussions
Hello community,
here is the log from the commit of package gfxboot
checked in at Fri Apr 28 21:10:29 CEST 2006.
--------
--- arch/i386/gfxboot/gfxboot.changes 2006-04-19 16:57:42.000000000 +0200
+++ STABLE/gfxboot/gfxboot.changes 2006-04-27 16:29:12.000000000 +0200
@@ -1,0 +2,5 @@
+Thu Apr 27 16:29:04 CEST 2006 - snwint(a)suse.de
+
+- implemented inbyte/outbyte to access i/o space (#170167)
+
+-------------------------------------------------------------------
Old:
----
gfxboot-3.2.24.tar.bz2
New:
----
gfxboot-3.2.25.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ gfxboot.spec ++++++
--- /var/tmp/diff_new_pack.UFwM8K/_old 2006-04-28 21:10:20.000000000 +0200
+++ /var/tmp/diff_new_pack.UFwM8K/_new 2006-04-28 21:10:20.000000000 +0200
@@ -1,5 +1,5 @@
#
-# spec file for package gfxboot (Version 3.2.24)
+# spec file for package gfxboot (Version 3.2.25)
#
# 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.24
-Release: 1
+Version: 3.2.25
+Release: 2
BuildRoot: %{_tmppath}/%{name}-%{version}-build
-Source: gfxboot-3.2.24.tar.bz2
+Source: gfxboot-3.2.25.tar.bz2
Source1: NLD.tar.bz2
Source2: SLES.tar.bz2
Source3: SuSE.tar.bz2
@@ -58,6 +58,8 @@
/usr/share/gfxboot
%changelog -n gfxboot
+* Thu Apr 27 2006 - snwint(a)suse.de
+- implemented inbyte/outbyte to access i/o space (#170167)
* Wed Apr 19 2006 - snwint(a)suse.de
- fix drawing bug (#166914)
* Fri Apr 07 2006 - snwint(a)suse.de
++++++ NLD.tar.bz2 ++++++
++++++ SLES.tar.bz2 ++++++
++++++ SuSE.tar.bz2 ++++++
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/themes/SuSE/system.inc new/themes/SuSE/system.inc
--- old/themes/SuSE/system.inc 2006-03-31 14:38:21.000000000 +0200
+++ new/themes/SuSE/system.inc 2006-04-27 16:27:13.000000000 +0200
@@ -486,6 +486,17 @@
} def
+% - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+%
+% Read CMOS RAM.
+%
+% ( index ) ==> ( value )
+%
+/nvram {
+ 0x70 exch outbyte
+ 0x71 inbyte
+} def
+
% - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
% readsector - read sector
++++++ gfxboot-3.2.24.tar.bz2 -> gfxboot-3.2.25.tar.bz2 ++++++
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/gfxboot-3.2.24/Changelog new/gfxboot-3.2.25/Changelog
--- old/gfxboot-3.2.24/Changelog 2006-04-19 16:53:27.000000000 +0200
+++ new/gfxboot-3.2.25/Changelog 2006-04-27 16:26:00.000000000 +0200
@@ -1,3 +1,6 @@
+27/4/2006: v3.2.25
+ - implemented inbyte/outbyte to access i/o space (#170167)
+
19/4/2006: v3.2.24
- fix drawing bug (#166914)
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/gfxboot-3.2.24/VERSION new/gfxboot-3.2.25/VERSION
--- old/gfxboot-3.2.24/VERSION 2006-04-19 16:52:49.000000000 +0200
+++ new/gfxboot-3.2.25/VERSION 2006-04-27 16:24:41.000000000 +0200
@@ -1 +1 @@
-3.2.24
+3.2.25
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/gfxboot-3.2.24/bincode.asm new/gfxboot-3.2.25/bincode.asm
--- old/gfxboot-3.2.24/bincode.asm 2006-04-19 16:56:53.000000000 +0200
+++ new/gfxboot-3.2.25/bincode.asm 2006-04-27 12:43:42.000000000 +0200
@@ -8059,6 +8059,47 @@
jmp pr_getint
+;; inbyte - get byte from i/o port
+;
+; group: system
+;
+; ( int1 -- int2 )
+;
+; int2: byte from port int1
+;
+prim_inbyte:
+ mov dl,t_int
+ call get_1arg
+ jc prim_inbyte_90
+ xchg ax,dx
+ xor eax,eax
+ in al,dx
+ mov dl,t_int
+ xor cx,cx
+ call set_pstack_tos
+prim_inbyte_90:
+ ret
+
+
+;; outbyte - write byte to i/o port
+;
+; group: system
+;
+; ( int1 int2 -- )
+;
+; Write byte int2 to port int1.
+;
+prim_outbyte:
+ mov dx,t_int + (t_int << 8)
+ call get_2args
+ jc prim_outbyte_90
+ mov dx,cx
+ out dx,al
+ sub word [pstack_ptr],byte 2
+prim_outbyte_90:
+ ret
+
+
;; getbyte - get byte from memory
;
; group: system
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/gfxboot-3.2.24/mk_vocabulary new/gfxboot-3.2.25/mk_vocabulary
--- old/gfxboot-3.2.24/mk_vocabulary 2005-11-30 11:52:26.000000000 +0100
+++ new/gfxboot-3.2.25/mk_vocabulary 2006-04-27 12:28:14.000000000 +0200
@@ -57,6 +57,7 @@
64bit
getbyte putbyte getdword putdword
+ inbyte outbyte
findfile filesize getcwd chdir
setmode currentmode videomodeinfo videomodes
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
1
0
Hello community,
here is the log from the commit of package evolution
checked in at Fri Apr 28 21:10:19 CEST 2006.
--------
--- GNOME/evolution/evolution.changes 2006-04-24 12:11:23.000000000 +0200
+++ STABLE/evolution/evolution.changes 2006-04-26 22:11:06.000000000 +0200
@@ -1,0 +2,6 @@
+Wed Apr 26 22:08:27 CEST 2006 - dobey(a)suse.de
+
+- Update trach icon patch to deal with more instances
+ Fixes https://bugzilla.novell.com/show_bug.cgi?id=160837
+
+-------------------------------------------------------------------
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ evolution.spec ++++++
--- /var/tmp/diff_new_pack.ieegik/_old 2006-04-28 21:10:08.000000000 +0200
+++ /var/tmp/diff_new_pack.ieegik/_new 2006-04-28 21:10:08.000000000 +0200
@@ -21,7 +21,7 @@
Autoreqprov: on
Obsoletes: bonobo-conf
Version: 2.6.0
-Release: 33
+Release: 37
Summary: The Integrated GNOME Mail, Calendar, and Address Book Suite
Source: ftp://ftp.gnome.org/pub/gnome/sources/evolution/2.6/%{name}-%{version}.tar.…
Source1: summerdance-about2.png
@@ -482,6 +482,9 @@
%{prefix}/share/gnome-pilot/conduits/*.conduit
%changelog -n evolution
+* Wed Apr 26 2006 - dobey(a)suse.de
+- Update trach icon patch to deal with more instances
+ Fixes https://bugzilla.novell.com/show_bug.cgi?id=160837
* Mon Apr 24 2006 - sragavan(a)novell.com
- Fixes(bnc)
153180 - Fixes a broken dialog, when new appointment is created on a disabled
++++++ evolution-delete-icon.patch ++++++
--- /var/tmp/diff_new_pack.ieegik/_old 2006-04-28 21:10:10.000000000 +0200
+++ /var/tmp/diff_new_pack.ieegik/_new 2006-04-28 21:10:10.000000000 +0200
@@ -1,47 +1,93 @@
+Index: mail/em-folder-tree.c
+===================================================================
+RCS file: /cvs/gnome/evolution/mail/em-folder-tree.c,v
+retrieving revision 1.158
+diff -u -p -r1.158 em-folder-tree.c
+--- mail/em-folder-tree.c 8 Feb 2006 11:51:31 -0000 1.158
++++ mail/em-folder-tree.c 19 Apr 2006 20:01:21 -0000
+@@ -287,7 +287,7 @@ render_pixbuf (GtkTreeViewColumn *column
+ folder_icons[FOLDER_ICON_NORMAL] = e_icon_factory_get_icon ("stock_folder", E_ICON_SIZE_MENU);
+ folder_icons[FOLDER_ICON_INBOX] = e_icon_factory_get_icon ("stock_inbox", E_ICON_SIZE_MENU);
+ folder_icons[FOLDER_ICON_OUTBOX] = e_icon_factory_get_icon ("stock_outbox", E_ICON_SIZE_MENU);
+- folder_icons[FOLDER_ICON_TRASH] = e_icon_factory_get_icon ("stock_delete", E_ICON_SIZE_MENU);
++ folder_icons[FOLDER_ICON_TRASH] = e_icon_factory_get_icon ("gnome-fs-trash-empty", E_ICON_SIZE_MENU);
+ folder_icons[FOLDER_ICON_JUNK] = e_icon_factory_get_icon ("stock_spam", E_ICON_SIZE_MENU);
+ folder_icons[FOLDER_ICON_SHARED_TO_ME] = e_icon_factory_get_icon ("stock_shared-to-me", E_ICON_SIZE_MENU);
+ folder_icons[FOLDER_ICON_SHARED_BY_ME] = e_icon_factory_get_icon ("stock_shared-by-me", E_ICON_SIZE_MENU);
+Index: mail/em-folder-view.c
+===================================================================
+RCS file: /cvs/gnome/evolution/mail/em-folder-view.c,v
+retrieving revision 1.145
+diff -u -p -r1.145 em-folder-view.c
+--- mail/em-folder-view.c 8 Feb 2006 11:51:32 -0000 1.145
++++ mail/em-folder-view.c 19 Apr 2006 20:01:21 -0000
+@@ -1089,7 +1089,7 @@ static EPopupItem emfv_popup_items[] = {
+
+ { E_POPUP_BAR, "40.emfv", NULL, NULL, NULL, NULL },
+ { E_POPUP_ITEM, "40.emfv.00", N_("_Delete"), emfv_popup_delete, NULL, "stock_delete", EM_POPUP_SELECT_DELETE|EM_FOLDER_VIEW_SELECT_LISTONLY },
+- { E_POPUP_ITEM, "40.emfv.01", N_("U_ndelete"), emfv_popup_undelete, NULL, "stock_undelete", EM_POPUP_SELECT_UNDELETE|EM_FOLDER_VIEW_SELECT_LISTONLY },
++ { E_POPUP_ITEM, "40.emfv.01", N_("U_ndelete"), emfv_popup_undelete, NULL, NULL, EM_POPUP_SELECT_UNDELETE|EM_FOLDER_VIEW_SELECT_LISTONLY },
+ { E_POPUP_ITEM, "40.emfv.02", N_("_Move to Folder..."), emfv_popup_move, NULL, "stock_mail-move", EM_POPUP_SELECT_MANY|EM_FOLDER_VIEW_SELECT_LISTONLY },
+ { E_POPUP_ITEM, "40.emfv.03", N_("_Copy to Folder..."), emfv_popup_copy, NULL, "stock_mail-copy", EM_POPUP_SELECT_MANY|EM_FOLDER_VIEW_SELECT_LISTONLY },
+
+@@ -1747,8 +1747,7 @@ static EPixmap emfv_message_pixmaps[] =
+
+ E_PIXMAP ("/commands/PrintMessage", "stock_print", E_ICON_SIZE_MENU),
+ E_PIXMAP ("/commands/PrintPreviewMessage", "stock_print-preview", E_ICON_SIZE_MENU),
+- E_PIXMAP ("/commands/MessageDelete", "stock_delete", E_ICON_SIZE_MENU),
+- E_PIXMAP ("/commands/MessageUndelete", "stock_undelete", E_ICON_SIZE_MENU),
++ E_PIXMAP ("/commands/MessageDelete", "gnome-fs-trash-empty", E_ICON_SIZE_MENU),
+ E_PIXMAP ("/commands/MessageCopy", "stock_mail-copy", E_ICON_SIZE_MENU),
+ E_PIXMAP ("/commands/MessageMove", "stock_mail-move", E_ICON_SIZE_MENU),
+ E_PIXMAP ("/commands/MessageReplyAll", "stock_mail-reply-to-all", E_ICON_SIZE_MENU),
Index: ui/evolution-mail-global.xml
===================================================================
RCS file: /cvs/gnome/evolution/ui/evolution-mail-global.xml,v
retrieving revision 1.40
diff -u -p -r1.40 evolution-mail-global.xml
--- ui/evolution-mail-global.xml 13 Jan 2006 16:24:02 -0000 1.40
-+++ ui/evolution-mail-global.xml 15 Mar 2006 09:14:20 -0000
++++ ui/evolution-mail-global.xml 19 Apr 2006 20:01:21 -0000
@@ -45,7 +45,7 @@
<submenu name="File">
<placeholder name="EmptyTrashPlaceholder">
- <menuitem name="EmptyTrash" verb="" _label="Empty _Trash" pixtype="stock" pixname="gtk-delete"/>
-+ <menuitem name="EmptyTrash" verb="" _label="Empty _Trash" pixtype="pixbuf"/>
++ <menuitem name="EmptyTrash" verb="" _label="Empty _Trash"/>
</placeholder>
</submenu>
-Index: mail/em-folder-browser.c
+Index: ui/evolution-mail-message.xml
===================================================================
-RCS file: /cvs/gnome/evolution/mail/em-folder-browser.c,v
-retrieving revision 1.76
-diff -u -p -r1.76 em-folder-browser.c
---- mail/em-folder-browser.c 16 Feb 2006 08:11:48 -0000 1.76
-+++ mail/em-folder-browser.c 15 Mar 2006 09:14:21 -0000
-@@ -869,6 +869,7 @@ static EPixmap emfb_pixmaps[] = {
- E_PIXMAP ("/commands/ChangeFolderProperties", "stock_folder-properties", E_ICON_SIZE_MENU),
- E_PIXMAP ("/commands/FolderCopy", "stock_folder-copy", E_ICON_SIZE_MENU),
- E_PIXMAP ("/commands/FolderMove", "stock_folder-move", E_ICON_SIZE_MENU),
-+ E_PIXMAP ("/menu/File/EmptyTrashPlaceholder/EmptyTrash", "stock_trash_full", E_ICON_SIZE_MENU),
+RCS file: /cvs/gnome/evolution/ui/evolution-mail-message.xml,v
+retrieving revision 1.90
+diff -u -p -r1.90 evolution-mail-message.xml
+--- ui/evolution-mail-message.xml 5 Feb 2006 22:41:41 -0000 1.90
++++ ui/evolution-mail-message.xml 19 Apr 2006 20:01:21 -0000
+@@ -59,7 +59,7 @@
+ <cmd name="MessageDelete"
+ _tip="Mark the selected messages for deletion"
+ accel="*Control*d"
+- pixtype="stock" pixname="gtk-delete"/>
++ pixtype="pixbuf"/>
- E_PIXMAP_END
- };
-Index: mail/em-folder-tree.c
-===================================================================
-RCS file: /cvs/gnome/evolution/mail/em-folder-tree.c,v
-retrieving revision 1.158
-diff -u -p -r1.158 em-folder-tree.c
---- mail/em-folder-tree.c 8 Feb 2006 11:51:31 -0000 1.158
-+++ mail/em-folder-tree.c 15 Mar 2006 09:14:21 -0000
-@@ -287,7 +287,7 @@ render_pixbuf (GtkTreeViewColumn *column
- folder_icons[FOLDER_ICON_NORMAL] = e_icon_factory_get_icon ("stock_folder", E_ICON_SIZE_MENU);
- folder_icons[FOLDER_ICON_INBOX] = e_icon_factory_get_icon ("stock_inbox", E_ICON_SIZE_MENU);
- folder_icons[FOLDER_ICON_OUTBOX] = e_icon_factory_get_icon ("stock_outbox", E_ICON_SIZE_MENU);
-- folder_icons[FOLDER_ICON_TRASH] = e_icon_factory_get_icon ("stock_delete", E_ICON_SIZE_MENU);
-+ folder_icons[FOLDER_ICON_TRASH] = e_icon_factory_get_icon ("stock_trash_full", E_ICON_SIZE_MENU);
- folder_icons[FOLDER_ICON_JUNK] = e_icon_factory_get_icon ("stock_spam", E_ICON_SIZE_MENU);
- folder_icons[FOLDER_ICON_SHARED_TO_ME] = e_icon_factory_get_icon ("stock_shared-to-me", E_ICON_SIZE_MENU);
- folder_icons[FOLDER_ICON_SHARED_BY_ME] = e_icon_factory_get_icon ("stock_shared-by-me", E_ICON_SIZE_MENU);
+ <cmd name="MessageFollowUpFlag"
+ _tip="Flag selected messages for follow-up"
+@@ -166,8 +166,7 @@
+
+ <cmd name="MessageUndelete"
+ _tip="Undelete the selected messages"
+- accel="*Control**Shift*d"
+- pixtype="stock" pixname="gtk-undelete"/>
++ accel="*Control**Shift*d"/>
+
+ <cmd name="PrintMessage"
+ _tip="Print this message"
+@@ -421,7 +420,7 @@
+
+ <toolitem name="MessageDelete" verb=""
+ _label="Delete"
+- pixtype="stock" pixname="gtk-delete"/>
++ pixtype="pixbuf"/>
+
+ <toolitem name="MessageMarkAsJunk" verb=""
+ _label="Junk"
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
1
0
Hello community,
here is the log from the commit of package evms
checked in at Fri Apr 28 21:10:14 CEST 2006.
--------
--- evms/evms.changes 2006-04-20 16:37:00.000000000 +0200
+++ STABLE/evms/evms.changes 2006-04-26 17:14:00.000000000 +0200
@@ -1,0 +2,5 @@
+Wed Apr 26 17:12:32 CEST 2006 - ghorlacher(a)suse.de
+
+- add md_super_fix.patch for bug #169283
+
+-------------------------------------------------------------------
New:
----
md_super_fix.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ evms.spec ++++++
--- /var/tmp/diff_new_pack.bQcOgZ/_old 2006-04-28 21:10:03.000000000 +0200
+++ /var/tmp/diff_new_pack.bQcOgZ/_new 2006-04-28 21:10:03.000000000 +0200
@@ -20,7 +20,7 @@
%endif
Autoreqprov: on
Version: 2.5.5
-Release: 15
+Release: 19
Summary: EVMS--Enterprise Volume Management System
BuildRoot: %{_tmppath}/%{name}-%{version}-build
Source: http://prdownloads.sourceforge.net/evms/evms-%{version}.tar.bz2
@@ -41,6 +41,7 @@
Patch10: evms_raid5.patch
Patch11: compaq_naming_gpt.patch
Patch12: prevent_unaligned_warning.patch
+Patch13: md_super_fix.patch
%description
This package contains the userspace tools needed to manage EVMS
@@ -106,6 +107,7 @@
%patch10 -p1
%patch11
%patch12
+%patch13 -p1
%build
autoconf
@@ -181,6 +183,8 @@
/etc/ha.d/resource.d/evms_failover
%changelog -n evms
+* Wed Apr 26 2006 - ghorlacher(a)suse.de
+- add md_super_fix.patch for bug #169283
* Thu Apr 20 2006 - fehr(a)suse.de
- prevent warning about misalignment on ia64
* Wed Apr 19 2006 - fehr(a)suse.de
++++++ md_super_fix.patch ++++++
--- evms-2.5.5/plugins/md/md_super.c 2006-02-22 14:34:53.000000000 -0600
+++ evms-2.5.5.fix/plugins/md/md_super.c 2006-04-20 11:00:40.733364216 -0500
@@ -1312,13 +1312,13 @@
static int sb0_zero_superblock(md_member_t *member, boolean now)
{
- mdp_super_t sb;
+ char buf[MD_SB_BYTES];
LOG_ENTRY();
if (now == TRUE) {
- memset(&sb, 0, MD_SB_BYTES);
- if ( WRITE(member->obj, member->super_offset, MD_SB_SECTORS, (char*)&sb)) {
+ memset(buf, 0, MD_SB_BYTES);
+ if ( WRITE(member->obj, member->super_offset, MD_SB_SECTORS, buf)) {
LOG_EXIT_INT(EIO);
return EIO;
}
@@ -1332,7 +1332,7 @@
static int sb0_zero_saved_info(md_member_t *member, boolean now)
{
- md_saved_info_t info;
+ char buf[MD_SAVED_INFO_BYTES];
u_int64_t location;
LOG_ENTRY();
@@ -1341,8 +1341,8 @@
location += MD_SB0_SAVED_INFO_SECTOR_OFFSET;
if (now == TRUE) {
- memset(&info, 0, sizeof(md_saved_info_t));
- if ( WRITE(member->obj, location, MD_SAVED_INFO_SECTS, (char*)&info)) {
+ memset(buf, 0, MD_SAVED_INFO_BYTES);
+ if ( WRITE(member->obj, location, MD_SAVED_INFO_SECTS, buf)) {
LOG_EXIT_INT(EIO);
return EIO;
}
@@ -2451,6 +2451,7 @@
{
int rc = 0;
mdp_sb_1_t *duplicate = NULL;
+ mdp_sb_1_t *master;
md_volume_t *vol;
LOG_ENTRY();
@@ -2462,9 +2463,16 @@
}
vol = member->vol;
+ master = (mdp_sb_1_t *)vol->sb;
+
+ if (vol->flags & (MD_NEW_REGION | MD_DEGRADED)) {
+ LOG_WARNING("%s: Creating new array with missing disk,"
+ " set resync_offset to -1.\n", vol->name);
+ master->resync_offset = -1;
+ }
/* Copy from master superblock */
- rc = sb1_duplicate_sb(&member->sb, vol->sb);
+ rc = sb1_duplicate_sb(&member->sb, master);
if (rc) {
goto out;
}
@@ -2602,8 +2610,8 @@
member->obj->name, member->super_offset);
if (now == TRUE) {
- memset(&sb, 0, MD_SB_1_BYTES);
- if ( WRITE(member->obj, member->super_offset, MD_SB_1_SECTORS, (char*)&sb)) {
+ memset(sb, 0, MD_SB_1_BYTES);
+ if ( WRITE(member->obj, member->super_offset, MD_SB_1_SECTORS, sb)) {
LOG_EXIT_INT(EIO);
return EIO;
}
@@ -2616,7 +2624,7 @@
static int sb1_zero_saved_info(md_member_t *member, boolean now)
{
- md_saved_info_t info;
+ char buf[MD_SAVED_INFO_BYTES];
u_int64_t location;
LOG_ENTRY();
@@ -2627,8 +2635,8 @@
member->obj->name, location);
if (now == TRUE) {
- memset(&info, 0, sizeof(md_saved_info_t));
- if ( WRITE(member->obj, location, MD_SAVED_INFO_SECTS, (char*)&info)) {
+ memset(buf, 0, MD_SAVED_INFO_BYTES);
+ if ( WRITE(member->obj, location, MD_SAVED_INFO_SECTS, buf) ) {
LOG_EXIT_INT(EIO);
return EIO;
}
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
1
0
Hello community,
here is the log from the commit of package dvd+rw-tools
checked in at Fri Apr 28 21:09:58 CEST 2006.
--------
--- dvd+rw-tools/dvd+rw-tools.changes 2006-04-12 11:31:55.000000000 +0200
+++ STABLE/dvd+rw-tools/dvd+rw-tools.changes 2006-04-27 21:11:06.000000000 +0200
@@ -1,0 +2,6 @@
+Thu Apr 27 21:10:20 CEST 2006 - joeshaw(a)suse.de
+
+- Add patch to allow users to burn images that would fit on a
+ single-layer DVD to a dual-layer disc. (bnc #164032)
+
+-------------------------------------------------------------------
New:
----
growisofs-dvd-dl-undersized.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ dvd+rw-tools.spec ++++++
--- /var/tmp/diff_new_pack.UrdAiz/_old 2006-04-28 21:09:54.000000000 +0200
+++ /var/tmp/diff_new_pack.UrdAiz/_new 2006-04-28 21:09:54.000000000 +0200
@@ -16,7 +16,7 @@
Group: Productivity/Multimedia/CD/Record
Autoreqprov: on
Version: 6.1
-Release: 12
+Release: 16
Source: dvd+rw-tools-%{version}.tar.bz2
URL: http://fy.chalmers.se/~appro/linux/DVD+RW/
Summary: Collection of Tools for Mastering DVD+RW/+R Media
@@ -26,6 +26,7 @@
Patch4: utf8ize.patch
Patch5: expand-memlock
Patch6: pthread-stacksize
+Patch7: growisofs-dvd-dl-undersized.patch
%description
Collection of Tools for Mastering DVD+RW/+R Media
@@ -41,6 +42,7 @@
%patch4
%patch5 -p1
%patch6 -p1
+%patch7
%build
make
@@ -65,6 +67,9 @@
/usr/bin/rpl8
%changelog -n dvd+rw-tools
+* Thu Apr 27 2006 - joeshaw(a)suse.de
+- Add patch to allow users to burn images that would fit on a
+ single-layer DVD to a dual-layer disc. (bnc #164032)
* Wed Apr 12 2006 - adrian(a)suse.de
- fix dvd burning from NFS located files (by okir, #149905)
* Tue Apr 04 2006 - rw(a)suse.de
++++++ growisofs-dvd-dl-undersized.patch ++++++
--- ./growisofs_mmc.cpp.joe 2006-04-27 20:45:00.788446635 +0200
+++ ./growisofs_mmc.cpp 2006-04-27 20:46:01.666824300 +0200
@@ -1412,9 +1412,7 @@
blocks += 15, blocks &= ~15;
if (blocks <= split)
- fprintf (stderr,":-( more than 50%% of space will be *wasted*!\n"
- " use single layer media for this recording\n"),
- exit (FATAL_START(EMEDIUMTYPE));
+ fprintf (stderr,":-? more than 50%% of space will be *wasted*!\n");
blocks /= 16;
blocks += 1;
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
1
0
Hello community,
here is the log from the commit of package beagle
checked in at Fri Apr 28 21:09:56 CEST 2006.
--------
--- GNOME/beagle/beagle.changes 2006-04-25 19:35:04.000000000 +0200
+++ STABLE/beagle/beagle.changes 2006-04-27 17:44:32.000000000 +0200
@@ -1,0 +2,11 @@
+Thu Apr 27 17:44:17 CEST 2006 - sbrabec(a)suse.cz
+
+- Fixed typo in cs.po.
+
+-------------------------------------------------------------------
+Thu Apr 27 00:07:28 CEST 2006 - joeshaw(a)suse.de
+
+- Add patch which fixes HTML being returned in snippets for gaim
+ logs and tomboy notes. (bgo #333261, #328770)
+
+-------------------------------------------------------------------
New:
----
beagle-cs.patch
beagle-gaim-note-markup.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ beagle.spec ++++++
--- /var/tmp/diff_new_pack.aaDaSo/_old 2006-04-28 21:09:46.000000000 +0200
+++ /var/tmp/diff_new_pack.aaDaSo/_new 2006-04-28 21:09:46.000000000 +0200
@@ -18,7 +18,7 @@
Group: Productivity/Other
Autoreqprov: on
Version: 0.2.3
-Release: 30
+Release: 35
Summary: Desktop Search Application
URL: http://www.gnome.org/projects/beagle/
Source: %{name}-%{version}.tar.gz
@@ -46,6 +46,8 @@
Patch19: beagle-safe-process-redirect.patch
Patch20: beagle-filter-stop-pulling-on-error.patch
Patch21: beagle-settings-no-hardcoded-size.patch
+Patch22: beagle-gaim-note-markup.patch
+Patch23: beagle-cs.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-build
Prereq: /usr/sbin/groupadd /usr/sbin/useradd
Requires: mono-core >= 1.1.13.5
@@ -305,6 +307,8 @@
%patch19
%patch20
%patch21
+%patch22
+%patch23
%build
rm po/no.*
@@ -461,6 +465,11 @@
%{prefix}/%_lib/pkgconfig/*.pc
%changelog -n beagle
+* Thu Apr 27 2006 - sbrabec(a)suse.cz
+- Fixed typo in cs.po.
+* Thu Apr 27 2006 - joeshaw(a)suse.de
+- Add patch which fixes HTML being returned in snippets for gaim
+ logs and tomboy notes. (bgo #333261, #328770)
* Tue Apr 25 2006 - joeshaw(a)suse.de
- Add a patch to not hardcode the beagle-settings window size.
(bnc #169133, bgo #331161)
++++++ beagle-cs.patch ++++++
--- po/cs.po
+++ po/cs.po
@@ -54,7 +54,7 @@
#: ../search/Category.cs:103
#, csharp-format
msgid "{0}-{1} of {2}"
-msgstr "{0}-{1} x {2}"
+msgstr "{0}-{1} z {2}"
#: ../search/Pages/NoMatch.cs:19
msgid "No results were found."
++++++ beagle-gaim-note-markup.patch ++++++
Index: Util/ImLog.cs
===================================================================
RCS file: /cvs/gnome/beagle/Util/ImLog.cs,v
retrieving revision 1.23
diff -u -p -u -r1.23 ImLog.cs
--- Util/ImLog.cs 21 Feb 2006 21:19:05 -0000 1.23
+++ Util/ImLog.cs 26 Apr 2006 19:29:48 -0000
@@ -133,48 +133,6 @@ namespace Beagle.Util {
public const string MimeType = "beagle/x-gaim-log";
- private static string StripTags (string line, StringBuilder builder)
- {
- int first = line.IndexOf ('<');
- if (first == -1)
- return line;
-
- builder.Length = 0;
-
- int i = 0;
- while (i < line.Length) {
-
- int j;
- if (first == -1) {
- j = line.IndexOf ('<', i);
- } else {
- j = first;
- first = -1;
- }
-
- int k = -1;
- if (j != -1) {
- k = line.IndexOf ('>', j);
-
- // If a "<" is unmatched, preserve it, and the
- // rest of the line
- if (k == -1)
- j = -1;
- }
-
- if (j == -1) {
- builder.Append (line, i, line.Length - i);
- break;
- }
-
- builder.Append (line, i, j-i);
-
- i = k+1;
- }
-
- return builder.ToString ();
- }
-
///////////////////////////////////////
public GaimLog (FileInfo file, TextReader reader) : base ("gaim", file, reader)
@@ -300,7 +258,7 @@ namespace Beagle.Util {
while ((line = TextReader.ReadLine ()) != null) {
if (isHtml)
- line = StripTags (line, builder);
+ line = StringFu.StripTags (line, builder);
ProcessLine (line);
}
Index: Util/Note.cs
===================================================================
RCS file: /cvs/gnome/beagle/Util/Note.cs,v
retrieving revision 1.3
diff -u -p -u -r1.3 Note.cs
--- Util/Note.cs 4 Nov 2005 15:35:34 -0000 1.3
+++ Util/Note.cs 26 Apr 2006 19:29:48 -0000
@@ -27,6 +27,7 @@
using System;
using System.IO;
+using System.Text;
using System.Xml;
namespace Beagle.Util {
@@ -93,37 +94,40 @@ namespace Beagle.Util {
XmlTextReader doc = new XmlTextReader (reader);
doc.Namespaces = false;
+ bool read_text = false;
+ StringBuilder sb = new StringBuilder ();
+
while (doc.Read ()) {
- if (doc.NodeType != XmlNodeType.Element)
+ // FIXME: Extract more information than mere text from the tags in note-content
+ // for hottext, linking notes etc.
+ if (doc.NodeType == XmlNodeType.Element && doc.Name == "note-content") {
+ read_text = true;
+ continue;
+ }
+
+ if (doc.NodeType == XmlNodeType.EndElement && doc.Name == "note-content") {
+ read_text = false;
continue;
-
- switch (doc.Name) {
- case "title":
+ }
+
+ if (doc.NodeType == XmlNodeType.Element && doc.Name == "title") {
note.subject = doc.ReadString ();
- break;
- case "note-content":
- // FIXME: don't discard XML style info
- note.text = StripTags (doc.ReadInnerXml ());
- break;
+ continue;
+ }
+
+ if (doc.NodeType == XmlNodeType.Text) {
+ if (read_text)
+ sb.Append (doc.Value);
+ continue;
}
}
+
doc.Close ();
+ note.text = sb.ToString ();
return note;
}
- private static string StripTags (string line)
- {
- int i, j;
- while (true) {
- i = line.IndexOf ('<');
- if (i == -1)
- break;
- j = line.IndexOf ('>', i);
- line = line.Substring (0, i) + line.Substring (j+1);
- }
- return line;
- }
}
}
Index: Util/StringFu.cs
===================================================================
RCS file: /cvs/gnome/beagle/Util/StringFu.cs,v
retrieving revision 1.41
diff -u -p -u -r1.41 StringFu.cs
--- Util/StringFu.cs 6 Feb 2006 02:51:20 -0000 1.41
+++ Util/StringFu.cs 26 Apr 2006 19:29:48 -0000
@@ -612,5 +612,79 @@ namespace Beagle.Util {
return sb.ToString ();
}
+ public static string StripTags (string line, StringBuilder builder)
+ {
+ int first = line.IndexOf ('<');
+ if (first == -1)
+ return line;
+
+ builder.Length = 0;
+
+ int i = 0;
+ while (i < line.Length) {
+
+ int j;
+ if (first == -1) {
+ j = line.IndexOf ('<', i);
+ } else {
+ j = first;
+ first = -1;
+ }
+
+ int k = -1;
+ if (j != -1) {
+ k = line.IndexOf ('>', j);
+
+ // If a "<" is unmatched, preserve it, and the
+ // rest of the line
+ if (k == -1)
+ j = -1;
+ }
+
+ if (j == -1) {
+ builder.Append (line, i, line.Length - i);
+ break;
+ }
+
+ builder.Append (line, i, j-i);
+
+ i = k+1;
+ }
+
+ return builder.ToString ();
+ }
+
+ public static string StripTags (string line)
+ {
+ StringBuilder sb = new StringBuilder ();
+ return StripTags (line, sb);
+ }
+
+ }
+
+ public class HtmlRemovingReader : TextReader {
+ private TextReader reader;
+ private StringBuilder sb;
+
+ public HtmlRemovingReader (TextReader reader)
+ {
+ this.reader = reader;
+ sb = new StringBuilder ();
+ }
+
+ public override string ReadLine ()
+ {
+ string line = reader.ReadLine ();
+ if (line == null)
+ return null;
+
+ sb.Length = 0;
+ return StringFu.StripTags (line, sb);
+ }
+
+ public override void Close ()
+ {
+ reader.Close ();
+ }
}
}
Index: beagled/GaimLogQueryable/GaimLogQueryable.cs
===================================================================
RCS file: /cvs/gnome/beagle/beagled/GaimLogQueryable/GaimLogQueryable.cs,v
retrieving revision 1.50
diff -u -p -u -r1.50 GaimLogQueryable.cs
--- beagled/GaimLogQueryable/GaimLogQueryable.cs 21 Feb 2006 19:27:17 -0000 1.50
+++ beagled/GaimLogQueryable/GaimLogQueryable.cs 26 Apr 2006 19:29:48 -0000
@@ -268,6 +268,19 @@ namespace Beagle.Daemon.GaimLogQueryable
return true;
}
+ override public string GetSnippet (string [] query_terms, Hit hit)
+ {
+ TextReader reader;
+ reader = TextCache.UserCache.GetReader (hit.Uri);
+ if (reader == null)
+ return null;
+ HtmlRemovingReader html_removing_reader = new HtmlRemovingReader (reader);
+ string snippet = SnippetFu.GetSnippet (query_terms, html_removing_reader);
+ html_removing_reader.Close ();
+
+ return snippet;
+ }
+
}
}
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
1
0
Hello community,
here is the log from the commit of package asterisk
checked in at Fri Apr 28 21:09:27 CEST 2006.
--------
--- asterisk/asterisk.changes 2006-04-24 14:00:58.000000000 +0200
+++ STABLE/asterisk/asterisk.changes 2006-04-27 17:08:31.000000000 +0200
@@ -1,0 +2,7 @@
+Thu Apr 27 16:53:50 CEST 2006 - max(a)suse.de
+
+- Removed example mp3 files from the source tarball. This makes
+ the source and binary package considerably smaller.
+ (Bug #118226)
+
+-------------------------------------------------------------------
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ asterisk.spec ++++++
--- /var/tmp/diff_new_pack.DbarhZ/_old 2006-04-28 21:09:07.000000000 +0200
+++ /var/tmp/diff_new_pack.DbarhZ/_new 2006-04-28 21:09:07.000000000 +0200
@@ -21,7 +21,7 @@
%define build_h323 0
Summary: The Asterisk Open Source PBX
Version: 1.2.5
-Release: 6
+Release: 10
License: GPL, BSD
PreReq: /usr/sbin/useradd
Group: Productivity/Telephony/Servers
@@ -258,6 +258,10 @@
-c "Asterisk PBX" asterisk 2>/dev/null || :
%changelog -n asterisk
+* Thu Apr 27 2006 - max(a)suse.de
+- Removed example mp3 files from the source tarball. This makes
+ the source and binary package considerably smaller.
+ (Bug #118226)
* Mon Apr 24 2006 - max(a)suse.de
- Fixed a buffer overflow in format_jpeg.c.
(Bug #168274, CVE-2006-1827)
++++++ asterisk-1.2.5.tar.bz2 ++++++
asterisk/asterisk-1.2.5.tar.bz2 STABLE/asterisk/asterisk-1.2.5.tar.bz2 differ: char 11, line 1
++++++ asterisk.patch ++++++
--- /var/tmp/diff_new_pack.DbarhZ/_old 2006-04-28 21:09:08.000000000 +0200
+++ /var/tmp/diff_new_pack.DbarhZ/_new 2006-04-28 21:09:08.000000000 +0200
@@ -34,6 +34,14 @@
else \
echo "You need to do a cvs update -d not just cvs update"; \
exit 1; \
+@@ -780,6 +772,7 @@
+ done
+ mkdir -p $(DESTDIR)$(ASTVARLIBDIR)/mohmp3 ; \
+ for x in sounds/*.mp3; do \
++ test -e $$x || break; \
+ $(INSTALL) -m 644 $$x $(DESTDIR)$(ASTVARLIBDIR)/mohmp3 ; \
+ done
+ rm -f $(DESTDIR)$(ASTVARLIBDIR)/mohmp3/sample-hold.mp3
--- cdr/Makefile
+++ cdr/Makefile
@@ -100,6 +100,9 @@
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
1
0
Hello community,
here is the log from the commit of package yast2-samba-client
checked in at Fri Apr 28 21:09:16 CEST 2006.
--------
--- yast2-samba-client/yast2-samba-client.changes 2006-04-19 16:39:13.000000000 +0200
+++ NOARCH/yast2-samba-client/yast2-samba-client.changes 2006-04-28 07:57:15.000000000 +0200
@@ -1,0 +2,8 @@
+Wed Apr 26 14:59:30 CEST 2006 - jsuchome(a)suse.cz
+
+- use tmp samba config file for joining as workaround for #168300
+- do not remove workgroup key when AD is not used
+- use "domain" value for "security" key for non-AD setups (#168300)
+- 2.13.18
+
+-------------------------------------------------------------------
Old:
----
yast2-samba-client-2.13.17.tar.bz2
New:
----
yast2-samba-client-2.13.18.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ yast2-samba-client.spec ++++++
--- /var/tmp/diff_new_pack.ZMJwgp/_old 2006-04-28 21:09:12.000000000 +0200
+++ /var/tmp/diff_new_pack.ZMJwgp/_new 2006-04-28 21:09:12.000000000 +0200
@@ -1,5 +1,5 @@
#
-# spec file for package yast2-samba-client (Version 2.13.17)
+# spec file for package yast2-samba-client (Version 2.13.18)
#
# 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-samba-client
-Version: 2.13.17
+Version: 2.13.18
Release: 2
License: GPL
Group: System/YaST
BuildRoot: %{_tmppath}/%{name}-%{version}-build
-Source0: yast2-samba-client-2.13.17.tar.bz2
+Source0: yast2-samba-client-2.13.18.tar.bz2
prefix: /usr
BuildRequires: perl-XML-Writer update-desktop-files yast2-devtools yast2-pam yast2-perl-bindings yast2-testsuite
Requires: yast2 yast2-pam yast2-kerberos-client
@@ -34,7 +34,7 @@
Stanislav Visnovsky <visnov(a)suse.cz>
%prep
-%setup -n yast2-samba-client-2.13.17
+%setup -n yast2-samba-client-2.13.18
%build
%{prefix}/bin/y2tool y2autoconf
@@ -71,6 +71,11 @@
%doc %{prefix}/share/doc/packages/yast2-samba-client
%changelog -n yast2-samba-client
+* Wed Apr 26 2006 - jsuchome(a)suse.cz
+- use tmp samba config file for joining as workaround for #168300
+- do not remove workgroup key when AD is not used
+- use "domain" value for "security" key for non-AD setups (#168300)
+- 2.13.18
* Wed Apr 19 2006 - jsuchome(a)suse.cz
- fixed Import/Export for keys in /etc/security/pam_winbind.conf
- 2.13.17
++++++ yast2-samba-client-2.13.17.tar.bz2 -> yast2-samba-client-2.13.18.tar.bz2 ++++++
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-samba-client-2.13.17/VERSION new/yast2-samba-client-2.13.18/VERSION
--- old/yast2-samba-client-2.13.17/VERSION 2006-04-19 16:28:42.000000000 +0200
+++ new/yast2-samba-client-2.13.18/VERSION 2006-04-26 15:00:09.000000000 +0200
@@ -1 +1 @@
-2.13.17
+2.13.18
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-samba-client-2.13.17/src/SambaAD.pm new/yast2-samba-client-2.13.18/src/SambaAD.pm
--- old/yast2-samba-client-2.13.17/src/SambaAD.pm 2006-04-18 17:10:25.000000000 +0200
+++ new/yast2-samba-client-2.13.18/src/SambaAD.pm 2006-04-27 16:52:56.000000000 +0200
@@ -246,11 +246,10 @@
# remove special AD values if AD is not used
my $remove = (($ads || "") eq "");
SambaConfig->GlobalSetMap({
- "security" => $remove ? undef : "ADS",
+ "security" => $remove ? "domain" : "ADS",
"realm" => $remove ? undef : $realm,
"template shell" => $remove ? undef : "/bin/bash",
"template homedir" => $remove ? undef : "/home/%D/%U",
- "workgroup" => $remove ? undef : $workgroup,
"winbind refresh tickets" => $remove ? undef : "yes"
});
SambaConfig->WinbindGlobalSetMap({
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-samba-client-2.13.17/src/SambaConfig.pm new/yast2-samba-client-2.13.18/src/SambaConfig.pm
--- old/yast2-samba-client-2.13.17/src/SambaConfig.pm 2006-04-19 16:24:35.000000000 +0200
+++ new/yast2-samba-client-2.13.18/src/SambaConfig.pm 2006-04-19 16:39:35.000000000 +0200
@@ -4,7 +4,7 @@
# Summary: Manage samba configuration data (smb.conf).
# Authors: Martin Lazar <mlazar(a)suse.cz>
#
-# $Id: SambaConfig.pm 30222 2006-04-19 08:42:27Z jsuchome $
+# $Id: SambaConfig.pm 30253 2006-04-19 14:39:32Z jsuchome $
#
# Functions for acess to samba configuration file. It provide
# unified acces to configuration keys including aliases and other
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-samba-client-2.13.17/src/SambaNetJoin.pm new/yast2-samba-client-2.13.18/src/SambaNetJoin.pm
--- old/yast2-samba-client-2.13.17/src/SambaNetJoin.pm 2006-03-16 17:56:53.000000000 +0100
+++ new/yast2-samba-client-2.13.18/src/SambaNetJoin.pm 2006-04-27 16:47:57.000000000 +0200
@@ -37,14 +37,15 @@
my $protocol = SambaAD->ADS () ne "" ? "ads" : "rpc";
my $netbios_name = SambaConfig->GlobalGetStr("netbios name", undef);
- my $conf_file = "/dev/zero";
+ my $conf_file = SCR->Read (".target.tmpdir")."/smb.conf";
if ($protocol eq "ads") {
- $conf_file = SCR->Read (".target.tmpdir")."/smb.conf";
my $realm = SambaAD->Realm ();
-# SCR->Write (".target.string", $conf_file, "[global]\n\trealm = $realm\n\tsecurity = ADS\n\tworkgroup = $domain\n\tuse kerberos keytab = Yes\n");
SCR->Write (".target.string", $conf_file, "[global]\n\trealm = $realm\n\tsecurity = ADS\n\tworkgroup = $domain\n");
}
+ else {
+ SCR->Write (".target.string", $conf_file, "[global]\n\tsecurity = domain\n\tworkgroup = $domain\n");
+ }
# FIXME -P is probably wrong, but suppresses password prompt
my $cmd = "LANG=C net $protocol testjoin -s $conf_file -P";
@@ -74,18 +75,21 @@
my $netbios_name = SambaConfig->GlobalGetStr("netbios name", undef);
my $server = SambaAD->ADS ();
my $protocol = $server ne "" ? "ads" : "rpc";
- my $conf_file = "/dev/zero";
+ my $tmpdir = SCR->Read (".target.tmpdir");
+ my $conf_file = $tmpdir."/smb.conf";
my $cmd = "";
+
if ($protocol eq "ads") {
- my $tmpdir = SCR->Read (".target.tmpdir");
- $conf_file = $tmpdir."/smb.conf";
my $krb_file = $tmpdir."/krb5.conf";
my $realm = SambaAD->Realm ();
-# SCR->Write (".target.string", $conf_file, "[global]\n\trealm = $realm\n\tsecurity = ADS\n\tworkgroup = $domain\n\tuse kerberos keytab = Yes\n");
SCR->Write (".target.string", $conf_file, "[global]\n\trealm = $realm\n\tsecurity = ADS\n\tworkgroup = $domain\n");
$cmd = "KRB5_CONFIG=$krb_file ";
SCR->Write (".target.string", $krb_file, "[realms]\n\t$realm = {\n\tkdc = $server\n\t}\n");
}
+ else {
+ SCR->Write (".target.string", $conf_file, "[global]\n\tsecurity = domain\n\tworkgroup = $domain\n");
+ }
+
$cmd = $cmd."net $protocol join "
. ($protocol ne "ads" ? lc($join_level||"") : "")
. ($protocol ne "ads" ? " -w '$domain'" : "")
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-samba-client-2.13.17/src/SambaWinbind.pm new/yast2-samba-client-2.13.18/src/SambaWinbind.pm
--- old/yast2-samba-client-2.13.17/src/SambaWinbind.pm 2006-03-16 14:51:46.000000000 +0100
+++ new/yast2-samba-client-2.13.18/src/SambaWinbind.pm 2006-04-27 16:52:47.000000000 +0200
@@ -58,7 +58,6 @@
"idmap uid" => "10000-20000",
"idmap gid" => "10000-20000"
});
-# SambaConfig::GlobalSetStr("security", "domain");
}
}
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
1
0
Hello community,
here is the log from the commit of package yast2-online-update
checked in at Fri Apr 28 21:09:05 CEST 2006.
--------
--- yast2-online-update/yast2-online-update.changes 2006-04-25 16:19:10.000000000 +0200
+++ NOARCH/yast2-online-update/yast2-online-update.changes 2006-04-27 16:13:49.000000000 +0200
@@ -1,0 +2,12 @@
+Thu Apr 27 16:03:24 CEST 2006 - jsuchome(a)suse.cz
+
+- show the popup for restarting yast also on installed system
+- 2.13.35
+
+-------------------------------------------------------------------
+Thu Apr 27 15:58:37 CEST 2006 - visnov(a)suse.cz
+
+- fix the dialog term for patch messages (#170155)
+- 2.13.34
+
+-------------------------------------------------------------------
Old:
----
yast2-online-update-2.13.33.tar.bz2
New:
----
yast2-online-update-2.13.35.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ yast2-online-update.spec ++++++
--- /var/tmp/diff_new_pack.nEoKuc/_old 2006-04-28 21:08:46.000000000 +0200
+++ /var/tmp/diff_new_pack.nEoKuc/_new 2006-04-28 21:08:46.000000000 +0200
@@ -1,5 +1,5 @@
#
-# spec file for package yast2-online-update (Version 2.13.33)
+# spec file for package yast2-online-update (Version 2.13.35)
#
# 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-online-update
-Version: 2.13.33
-Release: 1
+Version: 2.13.35
+Release: 2
License: GPL
Group: System/YaST
BuildRoot: %{_tmppath}/%{name}-%{version}-build
-Source0: yast2-online-update-2.13.33.tar.bz2
+Source0: yast2-online-update-2.13.35.tar.bz2
prefix: /usr
BuildRequires: gcc-c++ libxcrypt-devel perl-XML-Writer pkg-config update-desktop-files yast2-bootloader yast2-devtools yast2-packager
PreReq: grep sed
@@ -45,7 +45,7 @@
gs(a)suse.de
%prep
-%setup -n yast2-online-update-2.13.33
+%setup -n yast2-online-update-2.13.35
%build
%{prefix}/bin/y2tool y2autoconf
@@ -114,6 +114,12 @@
%{prefix}/share/applications/YaST2/cd_update.desktop
%changelog -n yast2-online-update
+* Thu Apr 27 2006 - jsuchome(a)suse.cz
+- show the popup for restarting yast also on installed system
+- 2.13.35
+* Thu Apr 27 2006 - visnov(a)suse.cz
+- fix the dialog term for patch messages (#170155)
+- 2.13.34
* Tue Apr 25 2006 - jsuchome(a)suse.cz
- 'Patch CD Update': save CD source at the end
- 2.13.33
++++++ yast2-online-update-2.13.33.tar.bz2 -> yast2-online-update-2.13.35.tar.bz2 ++++++
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-online-update-2.13.33/VERSION new/yast2-online-update-2.13.35/VERSION
--- old/yast2-online-update-2.13.33/VERSION 2006-04-25 15:57:35.000000000 +0200
+++ new/yast2-online-update-2.13.35/VERSION 2006-04-27 16:03:55.000000000 +0200
@@ -1 +1 @@
-2.13.33
+2.13.35
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-online-update-2.13.33/src/OnlineUpdateDialogs.ycp new/yast2-online-update-2.13.35/src/OnlineUpdateDialogs.ycp
--- old/yast2-online-update-2.13.33/src/OnlineUpdateDialogs.ycp 2006-04-05 16:43:17.000000000 +0200
+++ new/yast2-online-update-2.13.35/src/OnlineUpdateDialogs.ycp 2006-04-27 16:03:12.000000000 +0200
@@ -66,7 +66,7 @@
);
if (!Mode::config())
{
- random_dialog = `Empty();
+ random_dialog = `HBox(`Empty);
}
term content = `VBox(
@@ -305,7 +305,7 @@
`HBox( `HSpacing( 0.5 ), `Left( `Heading( heading ) ) ),
`VSpacing( 0.2 ),
`Label( message ),
- `ReplacePoint( `id( `rp ), `Empty() ),
+ `ReplacePoint( `id( `rp ), `HBox(`Empty) ),
buttons
)
);
@@ -536,13 +536,13 @@
term buttons = nil;
if ( pre ) {
buttons = `HBox(
- details == "" ? `Empty : detailsButton,
+ details == "" ? `VSpacing(0) : detailsButton,
`PushButton( `id( `ok ), _("Install Patch") ),
`PushButton( `id( `skip ), _("Skip Patch") )
);
} else {
buttons = `HBox(
- details == "" ? `Empty : detailsButton,
+ details == "" ? `VSpacing(0) : detailsButton,
`PushButton( `id( `ok ), Label::OKButton() )
);
}
@@ -555,6 +555,8 @@
h = 15;
}
+ y2milestone( "Going to open the message dialog" );
+
UI::OpenDialog( `opt( `decorated ),
`VBox(
`HSpacing( w ),
@@ -568,6 +570,8 @@
)
);
+ y2milestone( "Dialog opened");
+
symbol ret = nil;
boolean showDetails = false;
@@ -576,7 +580,7 @@
if ( ret == `details ) {
if ( showDetails ) {
- UI::ReplaceWidget( `id( `rp ), `Empty() );
+ UI::ReplaceWidget( `id( `rp ), `HSpacing(0) );
UI::ChangeWidget( `id( `details ), `Label, detailsStringOff );
} else {
UI::ReplaceWidget( `id( `rp ), `HBox( `HSpacing( 0.5 ),
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-online-update-2.13.33/src/online_update.ycp new/yast2-online-update-2.13.35/src/online_update.ycp
--- old/yast2-online-update-2.13.33/src/online_update.ycp 2006-04-25 15:26:03.000000000 +0200
+++ new/yast2-online-update-2.13.35/src/online_update.ycp 2006-04-27 15:53:35.000000000 +0200
@@ -11,11 +11,13 @@
import "Confirm";
import "Directory";
+ import "FileUtils";
import "Label";
import "Mode";
import "OnlineUpdate";
import "OnlineUpdateCallbacks";
import "PackageLock";
+ import "Popup";
import "Version";
import "Wizard";
import "GetInstArgs";
@@ -168,13 +170,19 @@
if (OnlineUpdate::cd_update && OnlineUpdate::cd_source > -1)
{
- Pkg::SourceFinishAll ();
+ Pkg::SourceFinishAll ();
}
if (OnlineUpdate::restart_yast)
{
- OnlineUpdate::restart_yast = false;
- return -42;
+ if (FileUtils::Exists (Directory::vardir + "/selected_patches.ycp"))
+ {
+ // message popup
+ Popup::Message (_("During online update, YaST was updated.
+Finishing and restarting now."));
+ }
+ OnlineUpdate::restart_yast = false;
+ return -42; // restart menu.ycp even if there are no other patches selected
}
return 0;
}
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-online-update-2.13.33/src/online_update_select.ycp new/yast2-online-update-2.13.35/src/online_update_select.ycp
--- old/yast2-online-update-2.13.33/src/online_update_select.ycp 2006-04-21 11:15:36.000000000 +0200
+++ new/yast2-online-update-2.13.35/src/online_update_select.ycp 2006-04-27 15:49:40.000000000 +0200
@@ -67,6 +67,8 @@
y2debug( "RunPkgSelection returned '%1'", ret );
+ if ( ret == `cancel ) return `abort;
+
boolean restart_yast = false;
list<string> normal_patches = [];
foreach (map patch, Pkg::ResolvableProperties("", `patch, ""), {
@@ -83,10 +85,10 @@
// for later usage
if (restart_yast && size (normal_patches) > 0)
{
- foreach (string pname, normal_patches, {
- Pkg::ResolvableNeutral (pname, `patch, true);
- });
- SCR::Write (.target.ycp, saved_path, normal_patches);
+ foreach (string pname, normal_patches, {
+ Pkg::ResolvableNeutral (pname, `patch, true);
+ });
+ SCR::Write (.target.ycp, saved_path, normal_patches);
}
// no patch selected
if (!restart_yast && normal_patches == [])
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-online-update-2.13.33/yast2-online-update-2.13.35/online-update.pot new/yast2-online-update-2.13.35/yast2-online-update-2.13.35/online-update.pot
--- old/yast2-online-update-2.13.33/yast2-online-update-2.13.35/online-update.pot 1970-01-01 01:00:00.000000000 +0100
+++ new/yast2-online-update-2.13.35/yast2-online-update-2.13.35/online-update.pot 2006-02-17 11:41:23.000000000 +0100
@@ -0,0 +1,298 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR SuSE Linux Products GmbH, Nuernberg
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+#
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2006-02-17 11:41+0100\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: LANGUAGE <LL(a)li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=CHARSET\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\n"
+
+#: src/inst_you.ycp:32
+msgid ""
+"YaST2\n"
+"Initializing ..."
+msgstr ""
+
+#. message popup
+#: src/inst_you.ycp:105
+msgid ""
+"The kernel has been updated. The system will\n"
+"reboot now then continue the installation.\n"
+msgstr ""
+
+#. message popup
+#: src/inst_you.ycp:112
+msgid ""
+"During online update, YaST was updated.\n"
+"Finishing and restarting now."
+msgstr ""
+
+#. popup message; 'rug' is name of command-line tool
+#: src/online_update.ycp:17
+msgid "To install patches for your system in text mode, use the rug command."
+msgstr ""
+
+#: src/online_update_install.ycp:44
+msgid "Progress Log"
+msgstr ""
+
+#: src/online_update_install.ycp:46
+msgid "Patch Progress"
+msgstr ""
+
+#: src/online_update_install.ycp:48
+msgid "Total Progress"
+msgstr ""
+
+#: src/online_update_install.ycp:50
+msgid "&Remove Source Packages after Update"
+msgstr ""
+
+#: src/online_update_install.ycp:57
+msgid ""
+"<p>After connecting to the SuSE update server,\n"
+"YaST2 will download all selected patches.\n"
+"This could take some time. Download details are shown in the log window.</p>"
+msgstr ""
+
+#: src/online_update_install.ycp:61
+msgid ""
+"<p>When the download has finished successfully, the\n"
+"patches will be installed. The progress is shown in the log window. If there\n"
+"are special messages associated with patches, they will be shown in an\n"
+"extra dialog when the patch is being installed.</p>\n"
+msgstr ""
+
+#: src/online_update_install.ycp:67
+msgid ""
+"<p>After patches are installed, the downloaded\n"
+"data is no longer needed. To delete this data, activate \n"
+"<b>Remove Source Packages after Update</b>.</p>\n"
+msgstr ""
+
+#. using SetContents (define in online_update.ycp)
+#: src/online_update_install.ycp:75
+msgid "Patch Download and Installation"
+msgstr ""
+
+#: src/online_update_install.ycp:87
+msgid "Patch processing failed."
+msgstr ""
+
+#: src/online_update_start.ycp:30
+msgid "&Username:"
+msgstr ""
+
+#: src/online_update_start.ycp:40
+msgid "Authentication Data"
+msgstr ""
+
+#: src/online_update_start.ycp:49
+msgid "&Password:"
+msgstr ""
+
+#: src/online_update_start.ycp:53
+msgid "&Keep Authentication Data"
+msgstr ""
+
+#: src/online_update_start.ycp:55
+msgid "&Clear Inputs"
+msgstr ""
+
+#: src/online_update_start.ycp:57
+msgid "&Login"
+msgstr ""
+
+#: src/online_update_start.ycp:107
+msgid "Retrieving information about new updates..."
+msgstr ""
+
+#: src/online_update_start.ycp:151
+msgid "Authorization"
+msgstr ""
+
+#: src/online_update_start.ycp:152
+msgid "Enter the registration data."
+msgstr ""
+
+#: src/online_update_start.ycp:186
+msgid "User-Defined Location"
+msgstr ""
+
+#: src/online_update_start.ycp:201
+msgid "Initializing for CD update..."
+msgstr ""
+
+#: src/online_update_start.ycp:204
+#, ycp-format
+msgid "Getting a list of mirror servers..."
+msgstr ""
+
+#: src/online_update_start.ycp:220
+msgid ""
+"Cannot fetch remote server list. Only user-defined patch\n"
+"sources will be available.\n"
+"\n"
+"Possible solution:\n"
+"Check network connection.\n"
+msgstr ""
+
+#: src/online_update_start.ycp:227
+#, ycp-format
+msgid "URL: %1"
+msgstr ""
+
+#: src/online_update_start.ycp:230
+msgid "Unable to read server list from disk."
+msgstr ""
+
+#: src/online_update_start.ycp:233
+msgid "Could not write server list to disk."
+msgstr ""
+
+#: src/online_update_start.ycp:236
+msgid "Error getting servers."
+msgstr ""
+
+#: src/online_update_start.ycp:258
+msgid "There was no update executed up to now."
+msgstr ""
+
+#: src/online_update_start.ycp:260
+msgid "Last successful update was performed less than one day ago."
+msgstr ""
+
+#: src/online_update_start.ycp:262
+#, ycp-format
+msgid "Last successful update was performed %1 day ago."
+msgid_plural "Last successful update was performed %1 days ago."
+msgstr[0] ""
+msgstr[1] ""
+
+#: src/online_update_start.ycp:294
+msgid "System &Information"
+msgstr ""
+
+#: src/online_update_start.ycp:302
+#, ycp-format
+msgid "Product: %1"
+msgstr ""
+
+#: src/online_update_start.ycp:306
+#, ycp-format
+msgid "Version: %1"
+msgstr ""
+
+#: src/online_update_start.ycp:321
+msgid "Update Configuration"
+msgstr ""
+
+#: src/online_update_start.ycp:327
+msgid "&Installation source"
+msgstr ""
+
+#: src/online_update_start.ycp:332
+msgid "Location"
+msgstr ""
+
+#: src/online_update_start.ycp:337
+msgid "New Server..."
+msgstr ""
+
+#: src/online_update_start.ycp:338
+msgid "Edit Server..."
+msgstr ""
+
+#: src/online_update_start.ycp:344
+msgid "&Manually Select Patches"
+msgstr ""
+
+#: src/online_update_start.ycp:348
+msgid "&Reload All Patches from Server"
+msgstr ""
+
+#: src/online_update_start.ycp:353
+msgid "&Configure Fully Automatic Update..."
+msgstr ""
+
+#. helptext dialog online update start screen
+#: src/online_update_start.ycp:367
+msgid ""
+"<p>YaST Online Update (YOU) is the easy way to get all recommended\n"
+"patches and security fixes from a SuSE update server.\n"
+"</p>\n"
+msgstr ""
+
+#: src/online_update_start.ycp:372
+msgid ""
+"<p>\n"
+"If <b>Manually Select Patches</b> is checked, all available patches will be shown\n"
+"from which to select the patches to install.<br>\n"
+"If <b>Reload All Patches from Server</b> is checked, all patches will be fetched\n"
+"from the server even when they already are locally available from a previous\n"
+"download.\n"
+"</p>\n"
+msgstr ""
+
+#: src/online_update_start.ycp:381
+msgid ""
+"<p>After clicking <b>New Server</b>, select a local\n"
+"installation source instead of an FTP or HTTP server or select\n"
+"another FTP or HTTP server. Click <b>Edit Server</b> to edit the location of the\n"
+"selected server.</p>\n"
+msgstr ""
+
+#: src/online_update_start.ycp:387
+msgid ""
+"<p>Clicking <b>Configure Fully Automatic Update</b>\n"
+"opens a dialog in which to configure YOU to check for updates once a day\n"
+"and automatically download and install updates when new ones are available\n"
+"without the need of user interaction.</p>\n"
+msgstr ""
+
+#: src/online_update_start.ycp:395
+msgid "Welcome to YaST Online Update"
+msgstr ""
+
+#: src/online_update_start.ycp:490
+msgid ""
+"Login failed. Check that you have provided\n"
+"the correct user name and password.\n"
+msgstr ""
+
+#: src/online_update_start.ycp:495
+msgid ""
+"Initialization failed. Check that\n"
+"you have inserted the correct CD.\n"
+msgstr ""
+
+#: src/online_update_start.ycp:500
+msgid ""
+"Initialization failed. Try again.\n"
+"If failure continues, choose\n"
+"another SuSE FTP/HTTP server.\n"
+msgstr ""
+
+#: src/online_update_start.ycp:507
+msgid ""
+"Signature check for patch info files failed.\n"
+"Cannot load patch information.\n"
+msgstr ""
+
+#: src/online_update_start.ycp:514
+msgid "URL is invalid."
+msgstr ""
+
+#: src/online_update_start.ycp:516
+msgid "Patch information retrieval failed."
+msgstr ""
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
1
0
Hello community,
here is the log from the commit of package alsa
checked in at Fri Apr 28 21:08:40 CEST 2006.
--------
--- alsa/alsa.changes 2006-04-24 18:28:17.000000000 +0200
+++ STABLE/alsa/alsa.changes 2006-04-27 15:56:23.000000000 +0200
@@ -1,0 +2,7 @@
+Thu Apr 27 12:59:36 CEST 2006 - tiwai(a)suse.de
+
+- fix segfault with direct plugins when invalid channel binding
+ parameters are given.
+- fix CPU hog by artsd together with rate plugin.
+
+-------------------------------------------------------------------
New:
----
alsa-lib-dmix-binding-range-check.diff
alsa-lib-fix-rate-cpu-hog-in-start.diff
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ alsa.spec ++++++
--- /var/tmp/diff_new_pack.KdJjig/_old 2006-04-28 21:07:33.000000000 +0200
+++ /var/tmp/diff_new_pack.KdJjig/_new 2006-04-28 21:07:33.000000000 +0200
@@ -21,7 +21,7 @@
Autoreqprov: on
Summary: Advanced Linux Sound Architecture
Version: 1.0.11
-Release: 27
+Release: 30
Source1: ftp://ftp.alsa-project.org/pub/lib/alsa-lib-%{package_version}.tar.bz2
Source2: ftp://ftp.alsa-project.org/pub/util/alsa-utils-%{package_version}.tar.bz2
# Source5: ftp://ftp.alsa-project.org/pub/oss/alsa-oss-%{package_version}.tar.bz2
@@ -72,6 +72,8 @@
Patch34: alsa-lib-32bit-compat-fix.diff
Patch35: alsa-lib-applptr-sync-fix.diff
Patch36: alsa-lib-dmix-max-periods.diff
+Patch37: alsa-lib-dmix-binding-range-check.diff
+Patch38: alsa-lib-fix-rate-cpu-hog-in-start.diff
Patch50: alsa-utils-speaker-test-5.1-fix.diff
Patch51: alsa-utils-speaker-test-buffer-fix.diff
Patch52: alsa-utils-alsaconf-lspci-fix.diff
@@ -157,6 +159,8 @@
%patch34 -p1
%patch35 -p1
%patch36 -p1
+%patch37 -p1
+%patch38 -p1
cd ..
cd alsa-utils*/.
# %patch2 -p1
@@ -440,6 +444,10 @@
%doc alsa-lib*/doc/doxygen/html/*
%changelog -n alsa
+* Thu Apr 27 2006 - tiwai(a)suse.de
+- fix segfault with direct plugins when invalid channel binding
+ parameters are given.
+- fix CPU hog by artsd together with rate plugin.
* Mon Apr 24 2006 - tiwai(a)suse.de
- fix udev rules to use "==" instead of "=".
* Wed Apr 12 2006 - tiwai(a)suse.de
++++++ alsa-lib-dmix-binding-range-check.diff ++++++
diff --git a/src/pcm/pcm_direct.c b/src/pcm/pcm_direct.c
--- a/src/pcm/pcm_direct.c Tue Apr 25 15:32:48 2006
+++ b/src/pcm/pcm_direct.c Wed Apr 26 16:30:44 2006
@@ -1223,10 +1223,13 @@
* id == client channel
* value == slave's channel
*/
-int snd_pcm_direct_parse_bindings(snd_pcm_direct_t *dmix, snd_config_t *cfg)
+int snd_pcm_direct_parse_bindings(snd_pcm_direct_t *dmix,
+ struct slave_params *params,
+ snd_config_t *cfg)
{
snd_config_iterator_t i, next;
unsigned int chn, chn1, count = 0;
+ unsigned int *bindings;
int err;
dmix->channels = UINT_MAX;
@@ -1256,11 +1259,11 @@
SNDERR("client channel out of range");
return -EINVAL;
}
- dmix->bindings = malloc(count * sizeof(unsigned int));
- if (dmix->bindings == NULL)
+ bindings = malloc(count * sizeof(unsigned int));
+ if (bindings == NULL)
return -ENOMEM;
for (chn = 0; chn < count; chn++)
- dmix->bindings[chn] = UINT_MAX; /* don't route */
+ bindings[chn] = UINT_MAX; /* don't route */
snd_config_for_each(i, next, cfg) {
snd_config_t *n = snd_config_iterator_entry(i);
const char *id;
@@ -1270,9 +1273,16 @@
safe_strtol(id, &cchannel);
if (snd_config_get_integer(n, &schannel) < 0) {
SNDERR("unable to get slave channel (should be integer type) in binding: %s\n", id);
+ free(bindings);
return -EINVAL;
}
- dmix->bindings[cchannel] = schannel;
+ if (schannel < 0 || schannel >= params->channels) {
+ SNDERR("invalid slave channel number %d in binding to %d",
+ schannel, cchannel);
+ free(bindings);
+ return -EINVAL;
+ }
+ bindings[cchannel] = schannel;
}
if (dmix->type == SND_PCM_TYPE_DSNOOP)
goto __skip_same_dst;
@@ -1280,13 +1290,15 @@
for (chn1 = 0; chn1 < count; chn1++) {
if (chn == chn1)
continue;
- if (dmix->bindings[chn] == dmix->bindings[chn1]) {
- SNDERR("unable to route channels %d,%d to same destination %d", chn, chn1, dmix->bindings[chn]);
+ if (bindings[chn] == dmix->bindings[chn1]) {
+ SNDERR("unable to route channels %d,%d to same destination %d", chn, chn1, bindings[chn]);
+ free(bindings);
return -EINVAL;
}
}
}
__skip_same_dst:
+ dmix->bindings = bindings;
dmix->channels = count;
return 0;
}
diff --git a/src/pcm/pcm_direct.h b/src/pcm/pcm_direct.h
--- a/src/pcm/pcm_direct.h Tue Apr 25 15:32:48 2006
+++ b/src/pcm/pcm_direct.h Wed Apr 26 16:30:44 2006
@@ -170,7 +170,9 @@
int snd_pcm_direct_initialize_slave(snd_pcm_direct_t *dmix, snd_pcm_t *spcm, struct slave_params *params);
int snd_pcm_direct_initialize_poll_fd(snd_pcm_direct_t *dmix);
int snd_pcm_direct_check_interleave(snd_pcm_direct_t *dmix, snd_pcm_t *pcm);
-int snd_pcm_direct_parse_bindings(snd_pcm_direct_t *dmix, snd_config_t *cfg);
+int snd_pcm_direct_parse_bindings(snd_pcm_direct_t *dmix,
+ struct slave_params *params,
+ snd_config_t *cfg);
int snd_pcm_direct_nonblock(snd_pcm_t *pcm, int nonblock);
int snd_pcm_direct_async(snd_pcm_t *pcm, int sig, pid_t pid);
int snd_pcm_direct_poll_revents(snd_pcm_t *pcm, struct pollfd *pfds, unsigned int nfds, unsigned short *revents);
diff --git a/src/pcm/pcm_dmix.c b/src/pcm/pcm_dmix.c
--- a/src/pcm/pcm_dmix.c Tue Apr 25 15:32:48 2006
+++ b/src/pcm/pcm_dmix.c Wed Apr 26 16:30:44 2006
@@ -808,7 +808,7 @@
goto _err_nosem;
}
- ret = snd_pcm_direct_parse_bindings(dmix, opts->bindings);
+ ret = snd_pcm_direct_parse_bindings(dmix, params, opts->bindings);
if (ret < 0)
goto _err_nosem;
diff --git a/src/pcm/pcm_dshare.c b/src/pcm/pcm_dshare.c
--- a/src/pcm/pcm_dshare.c Tue Apr 25 15:32:48 2006
+++ b/src/pcm/pcm_dshare.c Wed Apr 26 16:30:44 2006
@@ -614,7 +614,7 @@
goto _err_nosem;
}
- ret = snd_pcm_direct_parse_bindings(dshare, opts->bindings);
+ ret = snd_pcm_direct_parse_bindings(dshare, params, opts->bindings);
if (ret < 0)
goto _err_nosem;
@@ -706,7 +706,6 @@
snd_pcm_direct_semaphore_down(dshare, DIRECT_IPC_SEM_CLIENT);
ret = snd_pcm_direct_open_secondary_client(&spcm, dshare, "dshare_client");
- ret = snd_pcm_hw_open_fd(&spcm, "dshare_client", dshare->hw_fd, 0, 0);
if (ret < 0)
goto _err;
dshare->spcm = spcm;
diff --git a/src/pcm/pcm_dsnoop.c b/src/pcm/pcm_dsnoop.c
--- a/src/pcm/pcm_dsnoop.c Tue Apr 25 15:32:48 2006
+++ b/src/pcm/pcm_dsnoop.c Wed Apr 26 16:30:44 2006
@@ -502,7 +502,7 @@
goto _err_nosem;
}
- ret = snd_pcm_direct_parse_bindings(dsnoop, opts->bindings);
+ ret = snd_pcm_direct_parse_bindings(dsnoop, params, opts->bindings);
if (ret < 0)
goto _err_nosem;
++++++ alsa-lib-fix-rate-cpu-hog-in-start.diff ++++++
--- alsa-lib-1.0.11rc2/src/pcm/pcm_rate.c-dist 2006-04-27 16:00:51.000000000 +0200
+++ alsa-lib-1.0.11rc2/src/pcm/pcm_rate.c 2006-04-27 16:02:07.000000000 +0200
@@ -85,6 +85,8 @@ struct _snd_pcm_rate {
snd_pcm_channel_area_t *pareas; /* areas for splitted period (rate pcm) */
snd_pcm_channel_area_t *sareas; /* areas for splitted period (slave pcm) */
int16_t *old_sample;
+ int start_pending;
+ snd_htimestamp_t trigger_tstamp;
};
static void snd_pcm_rate_expand(const snd_pcm_channel_area_t *dst_areas,
@@ -764,6 +766,7 @@ static int snd_pcm_rate_init(snd_pcm_t *
assert(0);
}
rate->last_commit_ptr = 0;
+ rate->start_pending = 0;
return 0;
}
@@ -1052,7 +1055,7 @@ static int snd_pcm_rate_commit_area(snd_
xfer = cont;
if (xfer == slave_size)
- return 1;
+ goto commit_done;
/* commit second fragment */
cont = slave_size - cont;
@@ -1080,6 +1083,13 @@ static int snd_pcm_rate_commit_area(snd_
return 0;
}
}
+
+ commit_done:
+ if (rate->start_pending) {
+ /* we have pending start-trigger. let's issue it now */
+ snd_pcm_start(rate->gen.slave);
+ rate->start_pending = 0;
+ }
return 1;
}
@@ -1338,6 +1348,41 @@ static int snd_pcm_rate_drain(snd_pcm_t
return snd_pcm_drain(rate->gen.slave);
}
+static snd_pcm_state_t snd_pcm_rate_state(snd_pcm_t *pcm)
+{
+ snd_pcm_rate_t *rate = pcm->private_data;
+ if (rate->start_pending) /* pseudo-state */
+ return SND_PCM_STATE_RUNNING;
+ return snd_pcm_state(rate->gen.slave);
+}
+
+
+static int snd_pcm_rate_start(snd_pcm_t *pcm)
+{
+ snd_pcm_rate_t *rate = pcm->private_data;
+ snd_pcm_uframes_t avail;
+ struct timeval tv;
+
+ if (pcm->stream == SND_PCM_STREAM_CAPTURE)
+ return snd_pcm_start(rate->gen.slave);
+
+ if (snd_pcm_state(rate->gen.slave) != SND_PCM_STATE_PREPARED)
+ return -EBADFD;
+
+ gettimeofday(&tv, 0);
+ rate->trigger_tstamp.tv_sec = tv.tv_sec;
+ rate->trigger_tstamp.tv_nsec = tv.tv_usec * 1000L;
+
+ avail = snd_pcm_mmap_playback_hw_avail(rate->gen.slave);
+ if (avail == 0) {
+ /* postpone the trigger since we have no data committed yet */
+ rate->start_pending = 1;
+ return 0;
+ }
+ rate->start_pending = 0;
+ return snd_pcm_start(rate->gen.slave);
+}
+
static int snd_pcm_rate_status(snd_pcm_t *pcm, snd_pcm_status_t * status)
{
snd_pcm_rate_t *rate = pcm->private_data;
@@ -1351,6 +1396,11 @@ static int snd_pcm_rate_status(snd_pcm_t
snd_atomic_read_ok(&ratom);
return err;
}
+ if (pcm->stream == SND_PCM_STREAM_PLAYBACK) {
+ if (rate->start_pending)
+ status->state = SND_PCM_STATE_RUNNING;
+ status->trigger_tstamp = rate->trigger_tstamp;
+ }
snd_pcm_rate_sync_hwptr(pcm);
status->appl_ptr = *pcm->appl.ptr;
status->hw_ptr = *pcm->hw.ptr;
@@ -1389,12 +1439,12 @@ static void snd_pcm_rate_dump(snd_pcm_t
static snd_pcm_fast_ops_t snd_pcm_rate_fast_ops = {
.status = snd_pcm_rate_status,
- .state = snd_pcm_generic_state,
+ .state = snd_pcm_rate_state,
.hwsync = snd_pcm_rate_hwsync,
.delay = snd_pcm_rate_delay,
.prepare = snd_pcm_rate_prepare,
.reset = snd_pcm_rate_reset,
- .start = snd_pcm_generic_start,
+ .start = snd_pcm_rate_start,
.drop = snd_pcm_generic_drop,
.drain = snd_pcm_rate_drain,
.pause = snd_pcm_generic_pause,
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
1
0
Hello community,
here is the log from the commit of package yast2-installation
checked in at Fri Apr 28 21:08:38 CEST 2006.
--------
--- yast2-installation/yast2-installation.changes 2006-04-25 16:20:24.000000000 +0200
+++ NOARCH/yast2-installation/yast2-installation.changes 2006-04-28 14:14:06.000000000 +0200
@@ -1,0 +2,57 @@
+Fri Apr 28 14:10:50 CEST 2006 - locilka(a)suse.cz
+
+- Proper checking for available network when adding an Add-On
+ product. Network-related options are disabled in case of missing
+ network both in installation and running system (#170147).
+- 2.13.95
+
+-------------------------------------------------------------------
+Fri Apr 28 11:32:03 CEST 2006 - jsuchome(a)suse.cz
+
+- initialize package callbacks for add on product workflow (#170317)
+- 2.13.94
+
+-------------------------------------------------------------------
+Thu Apr 27 16:50:50 CEST 2006 - mvidner(a)suse.cz
+
+- Tell libzypp-zmd-backend not to write sources to zypp db,
+ we are going to do it ourselves (#170113).
+- 2.13.93
+
+-------------------------------------------------------------------
+Thu Apr 27 16:03:39 CEST 2006 - jsrain(a)suse.de
+
+- handle missing SHORTLABEL in content file (#170129)
+- 2.13.92
+
+-------------------------------------------------------------------
+Thu Apr 27 14:57:23 CEST 2006 - fehr(a)suse.de
+
+- set limit for separate /home to 14G for SLED (#169232)
+
+-------------------------------------------------------------------
+Thu Apr 27 11:16:56 CEST 2006 - ms(a)suse.de
+
+- removed update_xf86config call, checking for /dev/psaux was
+ broken and is no longer needed because the default mouse device
+ is /dev/input/mice since many versions now (#168816)
+
+-------------------------------------------------------------------
+Thu Apr 27 10:52:08 CEST 2006 - mvidner(a)suse.cz
+
+- When asking for update URLs, go trough products, not patterns (#169836).
+- 2.13.91
+
+-------------------------------------------------------------------
+Thu Apr 27 08:34:33 CEST 2006 - locilka(a)suse.cz
+
+- Making "SLP Catalog" selection bigger (maximum ncurses size)
+ (#168718)
+- 2.13.90
+
+-------------------------------------------------------------------
+Tue Apr 25 22:58:52 CEST 2006 - jsrain(a)suse.de
+
+- fixed service proposal in SLES control file (#159771)
+
+-------------------------------------------------------------------
Old:
----
yast2-installation-2.13.89.tar.bz2
New:
----
yast2-installation-2.13.95.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ yast2-installation.spec ++++++
--- /var/tmp/diff_new_pack.FcrzZ2/_old 2006-04-28 21:07:22.000000000 +0200
+++ /var/tmp/diff_new_pack.FcrzZ2/_new 2006-04-28 21:07:22.000000000 +0200
@@ -1,5 +1,5 @@
#
-# spec file for package yast2-installation (Version 2.13.89)
+# spec file for package yast2-installation (Version 2.13.95)
#
# 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-installation
-Version: 2.13.89
+Version: 2.13.95
Release: 1
License: GPL
Group: System/YaST
BuildRoot: %{_tmppath}/%{name}-%{version}-build
-Source0: yast2-installation-2.13.89.tar.bz2
+Source0: yast2-installation-2.13.95.tar.bz2
prefix: /usr
BuildRequires: docbook-xsl-stylesheets doxygen libxslt perl-XML-Writer sgml-skel update-desktop-files yast2 yast2-country yast2-devtools yast2-testsuite
Requires: yast2 yast2-update
@@ -48,7 +48,7 @@
Arvin Schnell <arvin(a)suse.de>
%prep
-%setup -n yast2-installation-2.13.89
+%setup -n yast2-installation-2.13.95
%build
%{prefix}/bin/y2tool y2autoconf
@@ -106,6 +106,36 @@
/usr/X11R6/share/fvwm/
%changelog -n yast2-installation
+* Fri Apr 28 2006 - locilka(a)suse.cz
+- Proper checking for available network when adding an Add-On
+ product. Network-related options are disabled in case of missing
+ network both in installation and running system (#170147).
+- 2.13.95
+* Fri Apr 28 2006 - jsuchome(a)suse.cz
+- initialize package callbacks for add on product workflow (#170317)
+- 2.13.94
+* Thu Apr 27 2006 - mvidner(a)suse.cz
+- Tell libzypp-zmd-backend not to write sources to zypp db,
+ we are going to do it ourselves (#170113).
+- 2.13.93
+* Thu Apr 27 2006 - jsrain(a)suse.de
+- handle missing SHORTLABEL in content file (#170129)
+- 2.13.92
+* Thu Apr 27 2006 - fehr(a)suse.de
+- set limit for separate /home to 14G for SLED (#169232)
+* Thu Apr 27 2006 - ms(a)suse.de
+- removed update_xf86config call, checking for /dev/psaux was
+ broken and is no longer needed because the default mouse device
+ is /dev/input/mice since many versions now (#168816)
+* Thu Apr 27 2006 - mvidner(a)suse.cz
+- When asking for update URLs, go trough products, not patterns (#169836).
+- 2.13.91
+* Thu Apr 27 2006 - locilka(a)suse.cz
+- Making "SLP Catalog" selection bigger (maximum ncurses size)
+ (#168718)
+- 2.13.90
+* Tue Apr 25 2006 - jsrain(a)suse.de
+- fixed service proposal in SLES control file (#159771)
* Tue Apr 25 2006 - locilka(a)suse.cz
- Return `next instead of `ok in case of SLP Add-On Source (#165989)
- 2.13.89
++++++ yast2-installation-2.13.89.tar.bz2 -> yast2-installation-2.13.95.tar.bz2 ++++++
++++ 2152 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-installation-2.13.89/VERSION new/yast2-installation-2.13.95/VERSION
--- old/yast2-installation-2.13.89/VERSION 2006-04-25 16:19:04.000000000 +0200
+++ new/yast2-installation-2.13.95/VERSION 2006-04-28 14:10:42.000000000 +0200
@@ -1 +1 @@
-2.13.89
+2.13.95
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-installation-2.13.89/configure.in new/yast2-installation-2.13.95/configure.in
--- old/yast2-installation-2.13.89/configure.in 2006-04-25 16:22:37.000000000 +0200
+++ new/yast2-installation-2.13.95/configure.in 2006-04-28 14:30:39.000000000 +0200
@@ -3,7 +3,7 @@
dnl -- This file is generated by y2autoconf 2.13.17 - DO NOT EDIT! --
dnl (edit configure.in.in instead)
-AC_INIT(yast2-installation, 2.13.89, http://www.suse.de/feedback, yast2-installation)
+AC_INIT(yast2-installation, 2.13.95, http://www.suse.de/feedback, yast2-installation)
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.89"
+VERSION="2.13.95"
RPMNAME="yast2-installation"
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-installation-2.13.89/src/clients/add-on.ycp new/yast2-installation-2.13.95/src/clients/add-on.ycp
--- old/yast2-installation-2.13.89/src/clients/add-on.ycp 2006-04-03 09:19:53.000000000 +0200
+++ new/yast2-installation-2.13.95/src/clients/add-on.ycp 2006-04-28 14:10:36.000000000 +0200
@@ -12,6 +12,7 @@
import "AddOnProduct";
import "Confirm";
import "PackageLock";
+import "PackageCallbacksInit";
import "Report";
import "Wizard";
import "Pkg";
@@ -30,6 +31,11 @@
return `abort;
}
+// initialize target to import all trusted keys (#165849)
+Pkg::TargetInit( "/", false );
+
+PackageCallbacksInit::InitPackageCallbacks ();
+
// Initialize current sources
Read();
symbol ret = RunWizard();
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-installation-2.13.89/src/clients/inst_addon_update_sources.ycp new/yast2-installation-2.13.95/src/clients/inst_addon_update_sources.ycp
--- old/yast2-installation-2.13.89/src/clients/inst_addon_update_sources.ycp 2006-04-18 13:43:42.000000000 +0200
+++ new/yast2-installation-2.13.95/src/clients/inst_addon_update_sources.ycp 2006-04-27 12:55:34.000000000 +0200
@@ -4,6 +4,10 @@
* Summary: Add installation sources for online update, #163192
* Authors: Martin Vidner <mvidner(a)suse.cz>
*
+ * Assumptions:
+ * - the sources have been initialized
+ * - the sources will be saved afterwards
+ * (this means that running this client alone will not work)
*/
{
@@ -34,8 +38,8 @@
* @return the installation sources to be added
*/
list<string> UpdateUrls () {
- // get available base patterns
- list<map<string,any> > products = Pkg::ResolvableProperties ("", `pattern, "");
+ // get all available products
+ list<map<string,any> > products = Pkg::ResolvableProperties ("", `product, "");
list<list<string> > urls = maplist (map<string, any> p, products, {
return p["update_urls"]:[];
});
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-installation-2.13.89/src/clients/inst_suse_register.ycp new/yast2-installation-2.13.95/src/clients/inst_suse_register.ycp
--- old/yast2-installation-2.13.89/src/clients/inst_suse_register.ycp 2006-04-21 10:48:42.000000000 +0200
+++ new/yast2-installation-2.13.95/src/clients/inst_suse_register.ycp 2006-04-28 09:02:50.000000000 +0200
@@ -29,6 +29,7 @@
import "Label";
import "Internet";
import "Register";
+ import "SourceManager";
// no network - no suse_register
if (!Mode::normal())
@@ -527,6 +528,8 @@
/* -------------------------------- PROGRAM LOGIC START ----------------------------------------------------------- */
+ // #170113, the lock is needed around everything that may end up in ZMD
+ SourceManager::Lock ();
repeat {
ret = Wizard::UserInput();
@@ -772,6 +775,8 @@
} until ( loopend || ret == `back );
+ SourceManager::Unlock ();
+
// Register::finish mandatory as well - do not remove
Register::finish();
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-installation-2.13.89/src/clients/inst_suseconfig.ycp new/yast2-installation-2.13.95/src/clients/inst_suseconfig.ycp
--- old/yast2-installation-2.13.89/src/clients/inst_suseconfig.ycp 2006-02-03 08:52:17.000000000 +0100
+++ new/yast2-installation-2.13.95/src/clients/inst_suseconfig.ycp 2006-04-27 12:55:34.000000000 +0200
@@ -5,7 +5,7 @@
* Authors: Andreas Schwab <schwab(a)suse.de>
* Stefan Hundhammer <sh(a)suse.de>
*
- * $Id: inst_suseconfig.ycp 25923 2005-10-18 10:43:48Z ms $
+ * $Id: inst_suseconfig.ycp 30530 2006-04-27 09:21:14Z ms $
*
* Purpose:
* - shows the "Finishing the installation" frame
@@ -220,15 +220,6 @@
}
}
- // ...
- // Update mouse configuration if device /dev/mouse or /dev/psaux
- // is still in use
- // ---
- if ( Mode::update () )
- {
- SCR::Execute (.target.bash, Directory::ybindir + "/update_xf86config");
- }
-
if ( Mode::update () )
{
return `next;
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-installation-2.13.89/src/include/add-on-workflow.ycp new/yast2-installation-2.13.95/src/include/add-on-workflow.ycp
--- old/yast2-installation-2.13.89/src/include/add-on-workflow.ycp 2006-04-25 15:51:53.000000000 +0200
+++ new/yast2-installation-2.13.95/src/include/add-on-workflow.ycp 2006-04-28 14:10:36.000000000 +0200
@@ -89,7 +89,8 @@
`VBox(
// translators: popup heading
`Heading (_("Choose SLP Catalog")),
- `MinSize( 25, 7,
+ // bugzilla #168718
+ `MinSize( 76, 19,
// translators: table header
`Table (`id(`services), `header(
// table header
@@ -135,6 +136,34 @@
}
/**
+ * Checks whether some network is available in the current moment,
+ * see the bug #170147 for more information.
+ */
+boolean IsAnyNetworkAvailable () {
+ boolean ret = false;
+
+ string command = "TERM=dumb /sbin/ip -o address show | grep inet | grep -v scope.host";
+ y2milestone("Running %1", command);
+ map cmd_run = (map) SCR::Execute(.target.bash_output, command);
+ y2milestone("Command returned: %1", cmd_run);
+
+ // command failed
+ if (cmd_run["exit"]:-1 != 0) {
+ // some errors were there, we don't know the status, rather return that it's available
+ // `grep` also returns non zero exit code when there is nothing to do...
+ if (cmd_run["stdout"]:"" != "") {
+ y2error("Checking the network failed");
+ ret = true;
+ }
+ // some devices are listed
+ } else if (cmd_run["stdout"]:"" != nil && cmd_run["stdout"]:"" != "") {
+ ret = true;
+ }
+
+ return ret;
+}
+
+/**
* Creates dialog content for MediaSelect
*/
void CreateMediaSelectDialog () {
@@ -164,15 +193,10 @@
`VStretch ()
))), `HStretch ()
);
- string netdevice = Linuxrc::InstallInf ("Netdevice");
- boolean net_avail = netdevice != "" && netdevice != nil;
- if (Stage::initial())
- {
- y2milestone ("Network device: %1, Network available: %2", netdevice, net_avail);
- }
- if (Stage::initial() && ! net_avail)
- {
- term contents = `HBox (`HStretch (), `VBox (
+ if (! IsAnyNetworkAvailable()) {
+ y2milestone ("Network is not available, skipping all Network-related options...");
+
+ contents = `HBox (`HStretch (), `VBox (
`RadioButtonGroup (`id (`type), `VBox (
`VStretch (),
// radio button
@@ -181,9 +205,13 @@
`Left (`RadioButton(`id(`dvd), _("&DVD..."))),
// radio button
`Left (`RadioButton(`id(`local_dir), _("&Local Directory..."))),
+ // radio button
+ `Left (`RadioButton (`id (`specify_url),_("Specify &URL..."))),
`VStretch ()
))), `HStretch ()
);
+ } else {
+ y2milestone("Network is available, allowing Network-related options...");
}
// dialog caption
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-installation-2.13.89/src/modules/Product.ycp new/yast2-installation-2.13.95/src/modules/Product.ycp
--- old/yast2-installation-2.13.89/src/modules/Product.ycp 2006-04-24 13:10:06.000000000 +0200
+++ new/yast2-installation-2.13.95/src/modules/Product.ycp 2006-04-27 16:27:16.000000000 +0200
@@ -4,7 +4,7 @@
* Summary: Product data
* Authors: Klaus Kaempf <kkaempf(a)suse.de>
*
- * $Id: Product.ycp 30370 2006-04-21 21:25:01Z jsrain $
+ * $Id: Product.ycp 30541 2006-04-27 14:01:45Z jsrain $
*/
{
@@ -95,6 +95,8 @@
// not reasonable
name = (string) SCR::Read(.content.LABEL);
short_name = (string) SCR::Read(.content.SHORTLABEL);
+ if (short_name == nil)
+ short_name = name;
version = (string) SCR::Read(.content.VERSION);
vendor = (string) SCR::Read(.content.VENDOR);
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-installation-2.13.89/startup/YaST2.call new/yast2-installation-2.13.95/startup/YaST2.call
--- old/yast2-installation-2.13.89/startup/YaST2.call 2006-04-10 15:24:02.000000000 +0200
+++ new/yast2-installation-2.13.95/startup/YaST2.call 2006-04-27 12:55:34.000000000 +0200
@@ -21,7 +21,7 @@
# : - VNC Installation via browser
# :
# :
-# STATUS : $Id: YaST2.call 29814 2006-04-06 15:11:36Z ms $
+# STATUS : $Id: YaST2.call 30531 2006-04-27 09:25:41Z ms $
#----------------
#
#set -x
@@ -355,6 +355,9 @@
log "\t$Y2_OK_MESSAGE"
fi
if [ $SELECTED_MEDIUM = "SSH" ];then
+ echo "*** Preparing SSH installation for reboot ***"
+ echo "*** NOTE: after reboot, you have to reconnect and call ***"
+ echo "*** /usr/lib/YaST2/startup/YaST2.ssh ***"
log "\tPreparing SSH installation for reboot"
echo $Y2_EXIT_CODE > /tmp/YaST2_ssh_installation_finished
fi
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
1
0