- openSUSE Commits

commit xgl
by root＠suse.de 05 Apr '06

05 Apr '06

Hello community, here is the log from the commit of package xgl checked in at Wed Apr 5 18:02:27 CEST 2006. -------- --- xgl/xgl.changes 2006-03-28 13:33:40.000000000 +0200 +++ xgl/xgl.changes 2006-04-05 18:01:13.000000000 +0200 @@ -1,0 +2,30 @@ +Wed Apr 5 18:01:07 CEST 2006 - ro(a)suse.de + +- do not build as root + +------------------------------------------------------------------- +Wed Apr 5 11:23:24 CEST 2006 - dreveman(a)suse.de + +- Remove compat71 and add packages instead. +- DPMS support. +- Fix acceleration and threshold control for pointer devices. + +------------------------------------------------------------------- +Mon Apr 3 16:05:58 CEST 2006 - dreveman(a)suse.de + +- Update to CVS version of Xgl (2006-04-03). +- Remove libglx -> libglxext patch (included with CVS version). +- Remove XKB patch (included with CVS version). +- Remove starvation patch (included with CVS version). +- Remove GLX patch (included with CVS version). +- Include compat71.tar.bz2 as headers not part of compat70 are + required by Xgl. +- New version glitz, with copy-sub-buffer support. +- New version Mesa, with copy-sub-buffer support. +- Fixed support for GL_ARB_vertex_program, GL_ARB_fragment_program + and GL_EXT_framebuffer_object. +- Workaround for dead-lock when using fglrx driver. +- Add xgl-xpstubs-link-hack.diff patch to avoid a small linking + issue. + +------------------------------------------------------------------- Old: ---- Mesa-CVS-20060309.tar.bz2 xgl-glxcontext.diff xgl-libglx-to-libglxext-1.diff xgl-schedyield.diff xgl-xkb-initialization.diff xorg-server-1.0.1.tar.bz2 New: ---- Mesa-CVS-20060321-csb.tar.bz2 compositeproto-0.3.tar.bz2 fixesproto-4.0.tar.bz2 glproto-1.4.6.tar.bz2 scrnsaverproto-1.1.0.tar.bz2 xgl-xpstubs-link-hack.diff xorg-server-1.1.99.1.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ xgl.spec ++++++ --- /var/tmp/diff_new_pack.wVOcIr/_old 2006-04-05 18:01:21.000000000 +0200 +++ /var/tmp/diff_new_pack.wVOcIr/_new 2006-04-05 18:01:21.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package xgl (Version cvs_060313) +# spec file for package xgl (Version cvs_060405) # # Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine @@ -8,6 +8,7 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # +# norootforbuild Name: xgl BuildRequires: freeglut-devel freetype2-devel gcc-c++ gconf2-devel libdrm-devel libpng-devel xorg-x11-compat70-devel @@ -21,24 +22,25 @@ Obsoletes: Xglx xglx PreReq: %fillup_prereq Autoreqprov: on -Version: cvs_060313 -Release: 9 +Version: cvs_060405 +Release: 1 Summary: Xserver that uses OpenGL for its drawing operations. BuildRoot: %{_tmppath}/%{name}-%{version}-build ExclusiveArch: %ix86 x86_64 ppc ppc64 ia64 -Source: xorg-server-1.0.1.tar.bz2 +Source: xorg-server-1.1.99.1.tar.bz2 Source1: glitz-0.5.4.tar.gz Source2: README.SUSE Source3: sysconfig.displaymanager.template -Source4: Mesa-CVS-20060309.tar.bz2 +Source4: Mesa-CVS-20060321-csb.tar.bz2 Source5: xgl-cards-white-list +Source6: fixesproto-4.0.tar.bz2 +Source7: compositeproto-0.3.tar.bz2 +Source8: scrnsaverproto-1.1.0.tar.bz2 +Source9: glproto-1.4.6.tar.bz2 ### /bin/ls *.{diff,patch} 2>/dev/null | perl -ne 'print "Patch$n: ".$_; $n++;' Patch: Xserver-suse-sysconfig.diff -Patch1: xgl-glxcontext.diff -Patch2: xgl-schedyield.diff -Patch3: xgl-security-file-dir.diff -Patch4: xgl-xkb-initialization.diff -Patch5: xgl-libglx-to-libglxext-1.diff +Patch1: xgl-security-file-dir.diff +Patch2: xgl-xpstubs-link-hack.diff %description Xgl is an Xserver that uses OpenGL for its drawing operations. Some @@ -73,13 +75,10 @@ PREFIX=/usr/X11R6/lib/xgl rm -rf $RPM_BUILD_DIR/* rm -rf $PREFIX -%setup -q -n . -D -T -b 0 -b 1 -b 4 -patch -d xorg-* -p0 < $RPM_SOURCE_DIR/Xserver-suse-sysconfig.diff -patch -d xorg-* -p0 < $RPM_SOURCE_DIR/xgl-glxcontext.diff -patch -d xorg-* -p0 < $RPM_SOURCE_DIR/xgl-schedyield.diff -patch -d xorg-* -p0 < $RPM_SOURCE_DIR/xgl-xkb-initialization.diff -patch -d xorg-* -p0 < $RPM_SOURCE_DIR/xgl-security-file-dir.diff -patch -d xorg-* -p0 < $RPM_SOURCE_DIR/xgl-libglx-to-libglxext-1.diff +%setup -q -n . -D -T -b 0 -b 1 -b 4 -b 6 -b 7 -b 8 -b 9 +patch -d xorg-* -p0 < $RPM_SOURCE_DIR/Xserver-suse-sysconfig.diff || exit 1 +patch -d xorg-* -p0 < $RPM_SOURCE_DIR/xgl-security-file-dir.diff || exit 1 +patch -d xorg-* -p0 < $RPM_SOURCE_DIR/xgl-xpstubs-link-hack.diff || exit 1 %build PREFIX=/usr/X11R6/lib/xgl @@ -95,8 +94,15 @@ CFLAGS="-fPIC $RPM_OPT_FLAGS" ./configure --prefix=$PREFIX --libdir=$PREFIX/%_lib --disable-shared CFLAGS="-fPIC $RPM_OPT_FLAGS" make install popd +for pkg in fixesproto compositeproto scrnsaverproto glproto +do +pushd $pkg-* +./configure --prefix=$PREFIX --libdir=$PREFIX/%_lib +make install +popd +done pushd xorg-server-* -./configure --prefix=/usr/X11R6 --libdir=/usr/X11R6/%_lib --enable-xgl --disable-xorg --disable-xprint --enable-glx --enable-dri --with-mesa-source=$RPM_BUILD_DIR/Mesa --with-release-snap=1 --disable-dmx --disable-xvfb --disable-xnest --enable-xglx --with-default-font-path=/usr/X11R6/lib/X11/fonts/misc,/usr/X11R6/lib/X11/fonts/TTF,/usr/X11R6/lib/X11/fonts/Type1,/usr/X11R6/lib/X11/fonts/100dpi,/usr/X11R6/lib/X11/fonts/75dpi --sysconfdir=/etc/X11 --localstatedir=/var --with-rgb-path=/usr/X11R6/lib/X11/rgb --with-xkb-path=/etc/X11/xkb --with-xkb-output=/etc/X11/xkb/compiled +./configure --prefix=/usr/X11R6 --libdir=/usr/X11R6/%_lib --enable-xgl --disable-xorg --disable-xprint --enable-glx --enable-dri --with-mesa-source=$RPM_BUILD_DIR/Mesa --with-release-snap=1 --disable-dmx --disable-xvfb --disable-xnest --enable-xglx --with-default-font-path=/usr/X11R6/lib/X11/fonts/misc,/usr/X11R6/lib/X11/fonts/TTF,/usr/X11R6/lib/X11/fonts/Type1,/usr/X11R6/lib/X11/fonts/100dpi,/usr/X11R6/lib/X11/fonts/75dpi --sysconfdir=/etc/X11 --localstatedir=/var --with-rgb-path=/usr/X11R6/lib/X11/rgb --with-xkb-path=/etc/X11/xkb --with-xkb-output=/etc/X11/xkb/compiled --disable-aiglx make popd @@ -123,6 +129,8 @@ rm $RPM_BUILD_ROOT/usr/X11R6/share/aclocal/xorg-server.m4 rm $RPM_BUILD_ROOT/etc/X11/xserver/SecurityPolicy rm $RPM_BUILD_ROOT/etc/X11/xkb/compiled/README.compiled +rm $RPM_BUILD_ROOT/exa.h +rm $RPM_BUILD_ROOT/randrstr.h %post %{fillup_only -an displaymanager} @@ -143,6 +151,27 @@ /etc/X11/xgl-cards-white-list %changelog -n xgl +* Wed Apr 05 2006 - ro(a)suse.de +- do not build as root +* Wed Apr 05 2006 - dreveman(a)suse.de +- Remove compat71 and add packages instead. +- DPMS support. +- Fix acceleration and threshold control for pointer devices. +* Mon Apr 03 2006 - dreveman(a)suse.de +- Update to CVS version of Xgl (2006-04-03). +- Remove libglx -> libglxext patch (included with CVS version). +- Remove XKB patch (included with CVS version). +- Remove starvation patch (included with CVS version). +- Remove GLX patch (included with CVS version). +- Include compat71.tar.bz2 as headers not part of compat70 are + required by Xgl. +- New version glitz, with copy-sub-buffer support. +- New version Mesa, with copy-sub-buffer support. +- Fixed support for GL_ARB_vertex_program, GL_ARB_fragment_program + and GL_EXT_framebuffer_object. +- Workaround for dead-lock when using fglrx driver. +- Add xgl-xpstubs-link-hack.diff patch to avoid a small linking + issue. * Tue Mar 28 2006 - mhopf(a)suse.de - Fix for #159733 from David: libglx -> libglxext. * Wed Mar 22 2006 - mhopf(a)suse.de ++++++ glitz-0.5.4.tar.gz ++++++ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/glitz-0.5.4/src/agl/glitz_agl_context.c new/glitz-0.5.4/src/agl/glitz_agl_context.c --- old/glitz-0.5.4/src/agl/glitz_agl_context.c 2005-12-21 17:19:51.000000000 +0100 +++ new/glitz-0.5.4/src/agl/glitz_agl_context.c 2006-03-12 14:38:05.000000000 +0100 @@ -302,6 +302,7 @@ context->backend.attach_notify = _glitz_agl_notify_dummy; context->backend.detach_notify = _glitz_agl_notify_dummy; context->backend.swap_buffers = glitz_agl_swap_buffers; + context->backend.copy_sub_buffer = glitz_agl_copy_sub_buffer; context->backend.create_context = _glitz_agl_create_context; context->backend.destroy_context = _glitz_agl_context_destroy; @@ -423,6 +424,8 @@ { AGLContext context; + drawable->base.flushed = drawable->base.finished = 0; + switch (constraint) { case GLITZ_NONE: break; @@ -472,13 +475,17 @@ glitz_bool_t glitz_agl_push_current (void *abstract_drawable, glitz_surface_t *surface, - glitz_constraint_t constraint) + glitz_constraint_t constraint, + glitz_bool_t *restore_state) { glitz_agl_drawable_t *drawable = (glitz_agl_drawable_t *) abstract_drawable; glitz_agl_context_info_t *context_info; int index; + if (restore_state) + *restore_state = 0; + index = drawable->thread_info->context_stack_size++; context_info = &drawable->thread_info->context_stack[index]; diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/glitz-0.5.4/src/agl/glitz_agl_drawable.c new/glitz-0.5.4/src/agl/glitz_agl_drawable.c --- old/glitz-0.5.4/src/agl/glitz_agl_drawable.c 2005-11-09 13:22:04.000000000 +0100 +++ new/glitz-0.5.4/src/agl/glitz_agl_drawable.c 2006-03-12 14:35:20.000000000 +0100 @@ -57,7 +57,7 @@ width, height); if (!context->initialized) { - glitz_agl_push_current (drawable, NULL, GLITZ_CONTEXT_CURRENT); + glitz_agl_push_current (drawable, NULL, GLITZ_CONTEXT_CURRENT, NULL); glitz_agl_pop_current (drawable); } @@ -203,7 +203,7 @@ * be our last chance to have a context current. */ glitz_agl_push_current (abstract_drawable, NULL, - GLITZ_CONTEXT_CURRENT); + GLITZ_CONTEXT_CURRENT, NULL); glitz_program_map_fini (drawable->base.backend->gl, &drawable->thread_info->program_map); glitz_program_map_init (&drawable->thread_info->program_map); @@ -241,9 +241,20 @@ glitz_agl_drawable_t *drawable = (glitz_agl_drawable_t *) abstract_drawable; - glitz_agl_push_current (abstract_drawable, NULL, GLITZ_DRAWABLE_CURRENT); + glitz_agl_push_current (abstract_drawable, NULL, GLITZ_DRAWABLE_CURRENT, + NULL); aglSwapBuffers (drawable->context->context); glitz_agl_pop_current (abstract_drawable); return 1; } + +glitz_bool_t +glitz_agl_copy_sub_buffer (void *abstract_drawable, + int x, + int y, + int width, + int height) +{ + return 0; +} diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/glitz-0.5.4/src/agl/glitz_aglint.h new/glitz-0.5.4/src/agl/glitz_aglint.h --- old/glitz-0.5.4/src/agl/glitz_aglint.h 2005-11-09 13:22:04.000000000 +0100 +++ new/glitz-0.5.4/src/agl/glitz_aglint.h 2006-03-12 14:34:28.000000000 +0100 @@ -119,7 +119,8 @@ extern glitz_bool_t __internal_linkage glitz_agl_push_current (void *abstract_drawable, glitz_surface_t *surface, - glitz_constraint_t constraint); + glitz_constraint_t constraint, + glitz_bool_t *restore_state); extern glitz_surface_t __internal_linkage * glitz_agl_pop_current (void *abstract_drawable); @@ -131,6 +132,13 @@ glitz_agl_swap_buffers (void *abstract_drawable); extern glitz_bool_t __internal_linkage +glitz_agl_copy_sub_buffer (void *abstract_drawable, + int x, + int y, + int width, + int height); + +extern glitz_bool_t __internal_linkage glitz_agl_drawable_update_size (glitz_agl_drawable_t *drawable, int width, int height); diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/glitz-0.5.4/src/egl/glitz_egl_context.c new/glitz-0.5.4/src/egl/glitz_egl_context.c --- old/glitz-0.5.4/src/egl/glitz_egl_context.c 2006-01-02 14:23:45.000000000 +0100 +++ new/glitz-0.5.4/src/egl/glitz_egl_context.c 2006-03-12 14:38:24.000000000 +0100 @@ -199,6 +199,7 @@ context->backend.attach_notify = _glitz_egl_notify_dummy; context->backend.detach_notify = _glitz_egl_notify_dummy; context->backend.swap_buffers = glitz_egl_swap_buffers; + context->backend.copy_sub_buffer = glitz_egl_copy_sub_buffer; context->backend.create_context = _glitz_egl_create_context; context->backend.destroy_context = _glitz_egl_context_destroy; @@ -324,6 +325,8 @@ { EGLContext egl_context; + drawable->base.flushed = drawable->base.finished = 0; + switch (constraint) { case GLITZ_NONE: break; @@ -364,12 +367,16 @@ glitz_bool_t glitz_egl_push_current (void *abstract_drawable, glitz_surface_t *surface, - glitz_constraint_t constraint) + glitz_constraint_t constraint, + glitz_bool_t *restore_state) { glitz_egl_surface_t *drawable = (glitz_egl_surface_t *) abstract_drawable; glitz_egl_context_info_t *context_info; int index; + if (restore_state) + *restore_state = 0; + index = drawable->screen_info->context_stack_size++; context_info = &drawable->screen_info->context_stack[index]; diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/glitz-0.5.4/src/egl/glitz_egl_surface.c new/glitz-0.5.4/src/egl/glitz_egl_surface.c --- old/glitz-0.5.4/src/egl/glitz_egl_surface.c 2005-11-29 23:41:27.000000000 +0100 +++ new/glitz-0.5.4/src/egl/glitz_egl_surface.c 2006-03-12 14:36:27.000000000 +0100 @@ -55,7 +55,7 @@ width, height); if (!context->initialized) { - glitz_egl_push_current (surface, NULL, GLITZ_CONTEXT_CURRENT); + glitz_egl_push_current (surface, NULL, GLITZ_CONTEXT_CURRENT, NULL); glitz_egl_pop_current (surface); } @@ -212,10 +212,10 @@ * be our last chance to have a context current. */ glitz_egl_push_current (abstract_drawable, NULL, - GLITZ_CONTEXT_CURRENT); + GLITZ_CONTEXT_CURRENT, NULL); glitz_program_map_fini (surface->base.backend->gl, &surface->screen_info->program_map); - glitz_program_map_init (&surface->screen_info->program_map); + glitz_program_map_init (&surface->screen_info->program_map); glitz_egl_pop_current (abstract_drawable); } @@ -242,3 +242,13 @@ return 1; } + +glitz_bool_t +glitz_egl_copy_sub_buffer (void *abstract_drawable, + int x, + int y, + int width, + int height) +{ + return 0; +} diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/glitz-0.5.4/src/egl/glitz_eglint.h new/glitz-0.5.4/src/egl/glitz_eglint.h --- old/glitz-0.5.4/src/egl/glitz_eglint.h 2005-09-14 17:57:16.000000000 +0200 +++ new/glitz-0.5.4/src/egl/glitz_eglint.h 2006-03-12 14:34:50.000000000 +0100 @@ -143,7 +143,8 @@ extern glitz_bool_t __internal_linkage glitz_egl_push_current (void *abstract_drawable, glitz_surface_t *surface, - glitz_constraint_t constraint); + glitz_constraint_t constraint, + glitz_bool_t *restore_state); extern glitz_surface_t __internal_linkage * glitz_egl_pop_current (void *abstract_drawable); @@ -161,6 +162,13 @@ extern glitz_bool_t __internal_linkage glitz_egl_swap_buffers (void *abstract_drawable); +extern glitz_bool_t __internal_linkage +glitz_egl_copy_sub_buffer (void *abstract_drawable, + int x, + int y, + int width, + int height); + /* Avoid unnecessary PLT entries. */ slim_hidden_proto(glitz_egl_init) diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/glitz-0.5.4/src/glitz.h new/glitz-0.5.4/src/glitz.h --- old/glitz-0.5.4/src/glitz.h 2006-02-23 02:14:56.000000000 +0100 +++ new/glitz-0.5.4/src/glitz.h 2006-03-12 13:32:28.000000000 +0100 @@ -129,6 +129,7 @@ #define GLITZ_FEATURE_PACKED_PIXELS_MASK (1L << 14) #define GLITZ_FEATURE_MULTI_DRAW_ARRAYS_MASK (1L << 15) #define GLITZ_FEATURE_FRAMEBUFFER_OBJECT_MASK (1L << 16) +#define GLITZ_FEATURE_COPY_SUB_BUFFER_MASK (1L << 17) /* glitz_format.c */ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/glitz-0.5.4/src/glitz_buffer.c new/glitz-0.5.4/src/glitz_buffer.c --- old/glitz-0.5.4/src/glitz_buffer.c 2006-02-14 15:23:47.000000000 +0100 +++ new/glitz-0.5.4/src/glitz_buffer.c 2006-03-12 14:28:55.000000000 +0100 @@ -80,7 +80,7 @@ glitz_drawable_reference (drawable); drawable->backend->push_current (drawable, NULL, - GLITZ_ANY_CONTEXT_CURRENT); + GLITZ_ANY_CONTEXT_CURRENT, NULL); gl->gen_buffers (1, &buffer->name); if (buffer->name) { @@ -219,7 +219,8 @@ if (buffer->drawable) { buffer->drawable->backend->push_current (buffer->drawable, NULL, - GLITZ_ANY_CONTEXT_CURRENT); + GLITZ_ANY_CONTEXT_CURRENT, + NULL); buffer->drawable->backend->gl->delete_buffers (1, &buffer->name); buffer->drawable->backend->pop_current (buffer->drawable); glitz_drawable_destroy (buffer->drawable); @@ -248,7 +249,8 @@ GLITZ_GL_DRAWABLE (buffer->drawable); buffer->drawable->backend->push_current (buffer->drawable, NULL, - GLITZ_ANY_CONTEXT_CURRENT); + GLITZ_ANY_CONTEXT_CURRENT, + NULL); gl->bind_buffer (buffer->target, buffer->name); gl->buffer_sub_data (buffer->target, offset, size, data); gl->bind_buffer (buffer->target, 0); @@ -268,8 +270,8 @@ GLITZ_GL_DRAWABLE (buffer->drawable); buffer->drawable->backend->push_current (buffer->drawable, NULL, - GLITZ_ANY_CONTEXT_CURRENT); - + GLITZ_ANY_CONTEXT_CURRENT, + NULL); gl->bind_buffer (buffer->target, buffer->name); gl->get_buffer_sub_data (buffer->target, offset, size, data); gl->bind_buffer (buffer->target, 0); @@ -292,7 +294,8 @@ GLITZ_GL_DRAWABLE (buffer->drawable); buffer->drawable->backend->push_current (buffer->drawable, NULL, - GLITZ_ANY_CONTEXT_CURRENT); + GLITZ_ANY_CONTEXT_CURRENT, + NULL); switch (access) { case GLITZ_BUFFER_ACCESS_READ_ONLY: @@ -328,7 +331,8 @@ GLITZ_GL_DRAWABLE (buffer->drawable); buffer->drawable->backend->push_current (buffer->drawable, NULL, - GLITZ_ANY_CONTEXT_CURRENT); + GLITZ_ANY_CONTEXT_CURRENT, + NULL); gl->bind_buffer (buffer->target, buffer->name); diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/glitz-0.5.4/src/glitz_drawable.c new/glitz-0.5.4/src/glitz_drawable.c --- old/glitz-0.5.4/src/glitz_drawable.c 2006-02-06 23:26:04.000000000 +0100 +++ new/glitz-0.5.4/src/glitz_drawable.c 2006-03-13 10:27:08.000000000 +0100 @@ -53,6 +53,8 @@ drawable->viewport.height = 65535; drawable->update_all = 1; + drawable->flushed = 0; + drawable->finished = 0; } void @@ -195,125 +197,158 @@ glitz_box_t *box, int n_box) { - if (drawable->format->d.doublebuffer && n_box) - { - glitz_box_t rect; - glitz_surface_t *surface = NULL; - int x_pos, y_pos; - int x, y, w, h; + glitz_box_t rect; + glitz_surface_t *surface = NULL; + int x_pos, y_pos; + int x, y, w, h; + + GLITZ_GL_DRAWABLE (drawable); - GLITZ_GL_DRAWABLE (drawable); + if (!drawable->format->d.doublebuffer || !n_box) + return; - if (n_box == 1) + /* try swap buffers (fastest) */ + if (n_box == 1) + { + rect.x1 = x_origin + box->x1; + rect.y1 = y_origin + box->y1; + rect.x2 = x_origin + box->x2; + rect.y2 = y_origin + box->y2; + + if (rect.x1 <= 0 && + rect.y1 <= 0 && + rect.x2 >= drawable->width && + rect.x2 >= drawable->height) { - rect.x1 = x_origin + box->x1; - rect.y1 = y_origin + box->y1; - rect.x2 = x_origin + box->x2; - rect.y2 = y_origin + box->y2; - - if (rect.x1 <= 0 && - rect.y1 <= 0 && - rect.x2 >= drawable->width && - rect.x2 >= drawable->height) + if (drawable->backend->swap_buffers (drawable)) { - if (drawable->backend->swap_buffers (drawable)) + if (drawable->front) { - if (drawable->front) - { - REGION_EMPTY (&drawable->front->drawable_damage); - glitz_surface_damage (drawable->front, NULL, - GLITZ_DAMAGE_TEXTURE_MASK | - GLITZ_DAMAGE_SOLID_MASK); - } - return; + REGION_EMPTY (&drawable->front->drawable_damage); + glitz_surface_damage (drawable->front, NULL, + GLITZ_DAMAGE_TEXTURE_MASK | + GLITZ_DAMAGE_SOLID_MASK); } + return; } } + } - if (drawable->front) + /* try copy sub buffer (almost as fast) */ + while (n_box) + { + rect.x1 = x_origin + box->x1; + rect.y1 = y_origin + box->y1; + rect.x2 = x_origin + box->x2; + rect.y2 = y_origin + box->y2; + + if (rect.x1 < rect.x2 && rect.y1 < rect.y2) { - if (glitz_surface_push_current (drawable->front, - GLITZ_DRAWABLE_CURRENT)) - surface = drawable->front; + x = rect.x1; + y = drawable->height - rect.y2; + w = rect.x2 - rect.x1; + h = rect.y2 - rect.y1; + + if (!drawable->backend->copy_sub_buffer (drawable, x, y, w, h)) + break; + + if (drawable->front) + glitz_surface_damage (drawable->front, &rect, + GLITZ_DAMAGE_TEXTURE_MASK | + GLITZ_DAMAGE_SOLID_MASK); } - if (!surface) + n_box--; + box++; + } + + if (!n_box) + return; + + /* do copy pixels (slow) */ + if (drawable->front) + { + if (glitz_surface_push_current (drawable->front, + GLITZ_DRAWABLE_CURRENT)) + surface = drawable->front; + } + if (!surface) + { + if (drawable->backend->push_current (drawable, NULL, + GLITZ_DRAWABLE_CURRENT, NULL)) { - if (drawable->backend->push_current (drawable, NULL, - GLITZ_DRAWABLE_CURRENT)) - { - drawable->update_all = 1; + drawable->update_all = 1; - gl->viewport (0, 0, drawable->width, drawable->height); - gl->matrix_mode (GLITZ_GL_PROJECTION); - gl->load_identity (); - gl->ortho (0.0, drawable->width, 0.0, - drawable->height, -1.0, 1.0); - gl->matrix_mode (GLITZ_GL_MODELVIEW); - gl->load_identity (); - gl->scale_f (1.0f, -1.0f, 1.0f); - gl->translate_f (0.0f, -drawable->height, 0.0f); - } - else - { - drawable->backend->pop_current (drawable); - return; - } + gl->viewport (0, 0, drawable->width, drawable->height); + gl->matrix_mode (GLITZ_GL_PROJECTION); + gl->load_identity (); + gl->ortho (0.0, drawable->width, 0.0, + drawable->height, -1.0, 1.0); + gl->matrix_mode (GLITZ_GL_MODELVIEW); + gl->load_identity (); + gl->scale_f (1.0f, -1.0f, 1.0f); + gl->translate_f (0.0f, -drawable->height, 0.0f); + } + else + { + drawable->backend->pop_current (drawable); + return; } + } + + gl->disable (GLITZ_GL_DITHER); - gl->disable (GLITZ_GL_DITHER); + drawable->backend->read_buffer (drawable, GLITZ_GL_BACK); + drawable->backend->draw_buffer (drawable, GLITZ_GL_FRONT); - drawable->backend->read_buffer (drawable, GLITZ_GL_BACK); - drawable->backend->draw_buffer (drawable, GLITZ_GL_FRONT); + glitz_set_operator (gl, GLITZ_OPERATOR_SRC); - glitz_set_operator (gl, GLITZ_OPERATOR_SRC); + x_pos = 0; + y_pos = 0; - x_pos = 0; - y_pos = 0; + glitz_set_raster_pos (gl, x_pos, y_pos); - glitz_set_raster_pos (gl, x_pos, y_pos); + while (n_box--) + { + rect.x1 = x_origin + box->x1; + rect.y1 = y_origin + box->y1; + rect.x2 = x_origin + box->x2; + rect.y2 = y_origin + box->y2; - while (n_box--) + if (rect.x1 < rect.x2 && rect.y1 < rect.y2) { - rect.x1 = x_origin + box->x1; - rect.y1 = y_origin + box->y1; - rect.x2 = x_origin + box->x2; - rect.y2 = y_origin + box->y2; + x = rect.x1; + y = drawable->height - rect.y2; + w = rect.x2 - rect.x1; + h = rect.y2 - rect.y1; - if (rect.x1 < rect.x2 && rect.y1 < rect.y2) + if (x != x_pos || y != y_pos) { - x = rect.x1; - y = drawable->height - rect.y2; - w = rect.x2 - rect.x1; - h = rect.y2 - rect.y1; + gl->bitmap (0, 0, 0, 0, x - x_pos, y - y_pos, NULL); - if (x != x_pos || y != y_pos) - { - gl->bitmap (0, 0, 0, 0, x - x_pos, y - y_pos, NULL); - - x_pos = x; - y_pos = y; - } + x_pos = x; + y_pos = y; + } - gl->scissor (x, y, w, h); - gl->copy_pixels (x, y, w, h, GLITZ_GL_COLOR); + gl->scissor (x, y, w, h); + gl->copy_pixels (x, y, w, h, GLITZ_GL_COLOR); - if (surface) - glitz_surface_damage (surface, &rect, - GLITZ_DAMAGE_TEXTURE_MASK | - GLITZ_DAMAGE_SOLID_MASK); + if (surface) + glitz_surface_damage (surface, &rect, + GLITZ_DAMAGE_TEXTURE_MASK | + GLITZ_DAMAGE_SOLID_MASK); - box++; - } + box++; } + } - drawable->backend->gl->flush (); + drawable->backend->gl->flush (); + drawable->flushed = 1; - if (surface) - glitz_surface_pop_current (surface); - else - drawable->backend->pop_current (drawable); - } + if (surface) + glitz_surface_pop_current (surface); + else + drawable->backend->pop_current (drawable); } void @@ -333,18 +368,30 @@ void glitz_drawable_flush (glitz_drawable_t *drawable) { - drawable->backend->push_current (drawable, NULL, GLITZ_DRAWABLE_CURRENT); + if (drawable->flushed) + return; + + drawable->backend->push_current (drawable, NULL, GLITZ_DRAWABLE_CURRENT, + NULL); drawable->backend->gl->flush (); drawable->backend->pop_current (drawable); + + drawable->flushed = 1; } slim_hidden_def(glitz_drawable_flush); void glitz_drawable_finish (glitz_drawable_t *drawable) { - drawable->backend->push_current (drawable, NULL, GLITZ_DRAWABLE_CURRENT); + if (drawable->finished) + return; + + drawable->backend->push_current (drawable, NULL, GLITZ_DRAWABLE_CURRENT, + NULL); drawable->backend->gl->finish (); drawable->backend->pop_current (drawable); + + drawable->finished = drawable->flushed = 1; } slim_hidden_def(glitz_drawable_finish); diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/glitz-0.5.4/src/glitz_framebuffer.c new/glitz-0.5.4/src/glitz_framebuffer.c --- old/glitz-0.5.4/src/glitz_framebuffer.c 2005-12-21 17:19:51.000000000 +0100 +++ new/glitz-0.5.4/src/glitz_framebuffer.c 2006-03-12 14:26:40.000000000 +0100 @@ -201,7 +201,8 @@ if (!TEXTURE_ALLOCATED (texture)) { drawable->other->backend->push_current (drawable->other, NULL, - GLITZ_ANY_CONTEXT_CURRENT); + GLITZ_ANY_CONTEXT_CURRENT, + NULL); glitz_texture_allocate (gl, texture); drawable->other->backend->pop_current (drawable->other); @@ -225,7 +226,8 @@ GLITZ_GL_DRAWABLE (drawable->other); drawable->other->backend->push_current (drawable->other, NULL, - GLITZ_ANY_CONTEXT_CURRENT); + GLITZ_ANY_CONTEXT_CURRENT, + NULL); gl->bind_framebuffer (GLITZ_GL_FRAMEBUFFER, drawable->fb); @@ -258,13 +260,14 @@ static glitz_bool_t _glitz_fbo_push_current (void *abstract_drawable, glitz_surface_t *surface, - glitz_constraint_t constraint) + glitz_constraint_t constraint, + glitz_bool_t *restore_state) { glitz_fbo_drawable_t *drawable = (glitz_fbo_drawable_t *) abstract_drawable; drawable->other->backend->push_current (drawable->other, surface, - constraint); + constraint, restore_state); if (constraint == GLITZ_DRAWABLE_CURRENT) { @@ -329,6 +332,16 @@ return 0; } +static glitz_bool_t +_glitz_fbo_copy_sub_buffer (void *abstract_drawable, + int x, + int y, + int width, + int height) +{ + return 0; +} + static void _glitz_fbo_destroy (void *abstract_drawable) { @@ -340,7 +353,8 @@ GLITZ_GL_DRAWABLE (drawable->other); drawable->other->backend->push_current (drawable->other, NULL, - GLITZ_ANY_CONTEXT_CURRENT); + GLITZ_ANY_CONTEXT_CURRENT, + NULL); gl->delete_framebuffers (1, &drawable->fb); @@ -427,15 +441,16 @@ backend = (glitz_backend_t *) (drawable + 1); *backend = *other->backend; - backend->destroy = _glitz_fbo_destroy; - backend->push_current = _glitz_fbo_push_current; - backend->pop_current = _glitz_fbo_pop_current; - backend->attach_notify = _glitz_fbo_attach_notify; - backend->detach_notify = _glitz_fbo_detach_notify; - backend->swap_buffers = _glitz_fbo_swap_buffers; - backend->make_current = _glitz_fbo_make_current; - backend->draw_buffer = _glitz_fbo_draw_buffer; - backend->read_buffer = _glitz_fbo_read_buffer; + backend->destroy = _glitz_fbo_destroy; + backend->push_current = _glitz_fbo_push_current; + backend->pop_current = _glitz_fbo_pop_current; + backend->attach_notify = _glitz_fbo_attach_notify; + backend->detach_notify = _glitz_fbo_detach_notify; + backend->swap_buffers = _glitz_fbo_swap_buffers; + backend->copy_sub_buffer = _glitz_fbo_copy_sub_buffer; + backend->make_current = _glitz_fbo_make_current; + backend->draw_buffer = _glitz_fbo_draw_buffer; + backend->read_buffer = _glitz_fbo_read_buffer; drawable->fb = 0; diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/glitz-0.5.4/src/glitz_gl.h new/glitz-0.5.4/src/glitz_gl.h --- old/glitz-0.5.4/src/glitz_gl.h 2006-02-23 02:11:28.000000000 +0100 +++ new/glitz-0.5.4/src/glitz_gl.h 2006-03-12 15:38:34.000000000 +0100 @@ -116,6 +116,9 @@ #define GLITZ_GL_TEXTURE_HEIGHT 0x1001 #define GLITZ_GL_TEXTURE_BORDER_COLOR 0x1004 +#define GLITZ_GL_TEXTURE_BINDING_2D 0x8069 +#define GLITZ_GL_TEXTURE_BINDING_RECTANGLE 0x84F6 + #define GLITZ_GL_TEXTURE_ENV 0x2300 #define GLITZ_GL_TEXTURE_ENV_MODE 0x2200 #define GLITZ_GL_TEXTURE_2D 0x0DE1 diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/glitz-0.5.4/src/glitz_pixel.c new/glitz-0.5.4/src/glitz_pixel.c --- old/glitz-0.5.4/src/glitz_pixel.c 2006-02-16 02:20:44.000000000 +0100 +++ new/glitz-0.5.4/src/glitz_pixel.c 2006-03-12 16:00:51.000000000 +0100 @@ -901,6 +901,11 @@ glitz_image_t src_image, dst_image; unsigned long color_mask; glitz_box_t box; + glitz_surface_t *surface; + glitz_bool_t restore_state; + glitz_gl_int_t unpackrowlength, unpackalignment; + glitz_gl_int_t unpackskiprows, unpackskippixels; + glitz_gl_int_t t2d, tbind2d, trect, tbindrect; GLITZ_GL_SURFACE (dst); @@ -1041,12 +1046,49 @@ feature_mask); } - glitz_surface_push_current (dst, GLITZ_ANY_CONTEXT_CURRENT); + /* avoid context switch in this case */ + if (!dst->attached && + TEXTURE_ALLOCATED (&dst->texture) && + !REGION_NOTEMPTY (&dst->texture_damage)) + { + dst->drawable->backend->push_current (dst->drawable, dst, + GLITZ_ANY_CONTEXT_CURRENT, + &restore_state); + texture = &dst->texture; + + /* we are using a foreign context so we must restore all state when we + are done */ + if (restore_state) + { + /* get pixel store state */ + gl->get_integer_v (GLITZ_GL_UNPACK_ROW_LENGTH, &unpackrowlength); + gl->get_integer_v (GLITZ_GL_UNPACK_ALIGNMENT, &unpackalignment); + gl->get_integer_v (GLITZ_GL_UNPACK_SKIP_ROWS, &unpackskiprows); + gl->get_integer_v (GLITZ_GL_UNPACK_SKIP_PIXELS, &unpackskippixels); + + /* get texture bindings */ + gl->get_integer_v (GLITZ_GL_TEXTURE_2D, &t2d); + gl->get_integer_v (GLITZ_GL_TEXTURE_BINDING_2D, &tbind2d); + gl->get_integer_v (GLITZ_GL_TEXTURE_RECTANGLE, &trect); + gl->get_integer_v (GLITZ_GL_TEXTURE_BINDING_RECTANGLE, &tbindrect); - texture = glitz_surface_get_texture (dst, 1); - if (!texture) { - glitz_surface_pop_current (dst); - return; + /* TODO: save PBO state */ + } + + surface = NULL; + } + else + { + glitz_surface_push_current (dst, GLITZ_ANY_CONTEXT_CURRENT); + + texture = glitz_surface_get_texture (dst, 1); + if (!texture) { + glitz_surface_pop_current (dst); + return; + } + + restore_state = 0; + surface = dst; } if (height > 1) { @@ -1247,7 +1289,39 @@ BAIL: glitz_texture_unbind (gl, texture); - glitz_surface_pop_current (dst); + + if (surface) + { + glitz_surface_pop_current (surface); + } + else + { + dst->drawable->backend->pop_current (dst->drawable); + } + + if (restore_state) + { + /* pixel store state */ + gl->pixel_store_i (GLITZ_GL_UNPACK_ROW_LENGTH, unpackrowlength); + gl->pixel_store_i (GLITZ_GL_UNPACK_ALIGNMENT, unpackalignment); + gl->pixel_store_i (GLITZ_GL_UNPACK_SKIP_ROWS, unpackskiprows); + gl->pixel_store_i (GLITZ_GL_UNPACK_SKIP_PIXELS, unpackskippixels); + + /* get texture bindings */ + if (t2d) + gl->enable (GLITZ_GL_TEXTURE_2D); + else + gl->disable (GLITZ_GL_TEXTURE_2D); + + gl->bind_texture (GLITZ_GL_TEXTURE_2D, tbind2d); + + if (trect) + gl->enable (GLITZ_GL_TEXTURE_RECTANGLE); + else + gl->disable (GLITZ_GL_TEXTURE_RECTANGLE); + + gl->bind_texture (GLITZ_GL_TEXTURE_RECTANGLE, tbindrect); + } } void diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/glitz-0.5.4/src/glitz_surface.c new/glitz-0.5.4/src/glitz_surface.c --- old/glitz-0.5.4/src/glitz_surface.c 2005-12-21 17:19:51.000000000 +0100 +++ new/glitz-0.5.4/src/glitz_surface.c 2006-03-12 14:23:12.000000000 +0100 @@ -601,7 +601,7 @@ { drawable = surface->attached; if (drawable->backend->push_current (drawable, surface, - constraint)) + constraint, NULL)) { if (constraint == GLITZ_DRAWABLE_CURRENT) { @@ -641,12 +641,12 @@ if (constraint == GLITZ_DRAWABLE_CURRENT) { drawable->backend->push_current (drawable, surface, - GLITZ_ANY_CONTEXT_CURRENT); + GLITZ_ANY_CONTEXT_CURRENT, NULL); } else { return drawable->backend->push_current (drawable, surface, - constraint); + constraint, NULL); } } diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/glitz-0.5.4/src/glitzint.h new/glitz-0.5.4/src/glitzint.h --- old/glitz-0.5.4/src/glitzint.h 2005-12-21 17:19:51.000000000 +0100 +++ new/glitz-0.5.4/src/glitzint.h 2006-03-12 14:22:19.000000000 +0100 @@ -374,7 +374,8 @@ glitz_bool_t (*push_current) (void *drawable, glitz_surface_t *surface, - glitz_constraint_t constraint); + glitz_constraint_t constraint, + glitz_bool_t *restore_state); glitz_surface_t * (*pop_current) (void *drawable); @@ -390,6 +391,12 @@ glitz_bool_t (*swap_buffers) (void *drawable); + glitz_bool_t + (*copy_sub_buffer) (void *drawable, + int x, + int y, + int width, + int height); glitz_context_t * (*create_context) (void *drawable, @@ -444,6 +451,8 @@ int width, height; glitz_rectangle_t viewport; glitz_bool_t update_all; + glitz_bool_t flushed; + glitz_bool_t finished; glitz_surface_t *front; glitz_surface_t *back; }; diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/glitz-0.5.4/src/glx/glitz_glx_context.c new/glitz-0.5.4/src/glx/glitz_glx_context.c --- old/glitz-0.5.4/src/glx/glitz_glx_context.c 2005-12-21 17:19:51.000000000 +0100 +++ new/glitz-0.5.4/src/glx/glitz_glx_context.c 2006-03-12 15:59:42.000000000 +0100 @@ -279,6 +279,7 @@ context->backend.attach_notify = _glitz_glx_notify_dummy; context->backend.detach_notify = _glitz_glx_notify_dummy; context->backend.swap_buffers = glitz_glx_swap_buffers; + context->backend.copy_sub_buffer = glitz_glx_copy_sub_buffer; context->backend.create_context = _glitz_glx_create_context; context->backend.destroy_context = _glitz_glx_context_destroy; @@ -364,6 +365,9 @@ } } + if (screen_info->glx_feature_mask & GLITZ_GLX_FEATURE_COPY_SUB_BUFFER_MASK) + context->backend.feature_mask |= GLITZ_FEATURE_COPY_SUB_BUFFER_MASK; + context->initialized = 1; } @@ -375,7 +379,10 @@ drawable->screen_info->display_info; if (finish) + { glFinish (); + drawable->base.finished = 1; + } if (display_info->thread_info->cctx) { @@ -400,11 +407,23 @@ static void _glitz_glx_context_update (glitz_glx_drawable_t *drawable, - glitz_constraint_t constraint) + glitz_constraint_t constraint, + glitz_bool_t *restore_state) { glitz_glx_display_info_t *dinfo = drawable->screen_info->display_info; GLXContext context = NULL; + if (restore_state && constraint == GLITZ_ANY_CONTEXT_CURRENT) + { + if (dinfo->thread_info->cctx) + { + *restore_state = 1; + return; + } + } + + drawable->base.flushed = drawable->base.finished = 0; + switch (constraint) { case GLITZ_NONE: break; @@ -442,13 +461,17 @@ glitz_bool_t glitz_glx_push_current (void *abstract_drawable, glitz_surface_t *surface, - glitz_constraint_t constraint) + glitz_constraint_t constraint, + glitz_bool_t *restore_state) { glitz_glx_drawable_t *drawable = (glitz_glx_drawable_t *) abstract_drawable; glitz_glx_context_info_t *context_info; int index; + if (restore_state) + *restore_state = 0; + index = drawable->screen_info->context_stack_size++; context_info = &drawable->screen_info->context_stack[index]; @@ -456,7 +479,8 @@ context_info->surface = surface; context_info->constraint = constraint; - _glitz_glx_context_update (context_info->drawable, constraint); + _glitz_glx_context_update (context_info->drawable, constraint, + restore_state); return 1; } @@ -476,7 +500,8 @@ if (context_info->drawable) _glitz_glx_context_update (context_info->drawable, - context_info->constraint); + context_info->constraint, + NULL); if (context_info->constraint == GLITZ_DRAWABLE_CURRENT) return context_info->surface; diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/glitz-0.5.4/src/glx/glitz_glx_drawable.c new/glitz-0.5.4/src/glx/glitz_glx_drawable.c --- old/glitz-0.5.4/src/glx/glitz_glx_drawable.c 2006-02-06 23:26:05.000000000 +0100 +++ new/glitz-0.5.4/src/glx/glitz_glx_drawable.c 2006-03-13 10:27:43.000000000 +0100 @@ -57,7 +57,7 @@ width, height); if (!context->initialized) { - glitz_glx_push_current (drawable, NULL, GLITZ_CONTEXT_CURRENT); + glitz_glx_push_current (drawable, NULL, GLITZ_CONTEXT_CURRENT, NULL); glitz_glx_pop_current (drawable); } @@ -213,7 +213,7 @@ * be our last chance to have a context current. */ glitz_glx_push_current (abstract_drawable, NULL, - GLITZ_CONTEXT_CURRENT); + GLITZ_CONTEXT_CURRENT, NULL); glitz_program_map_fini (drawable->base.backend->gl, &drawable->screen_info->program_map); glitz_program_map_init (&drawable->screen_info->program_map); @@ -241,3 +241,26 @@ return 1; } + +glitz_bool_t +glitz_glx_copy_sub_buffer (void *abstract_drawable, + int x, + int y, + int width, + int height) +{ + glitz_glx_drawable_t *drawable = (glitz_glx_drawable_t *) + abstract_drawable; + glitz_glx_screen_info_t *screen_info = drawable->screen_info; + + if (screen_info->glx_feature_mask & GLITZ_GLX_FEATURE_COPY_SUB_BUFFER_MASK) + { + screen_info->glx.copy_sub_buffer (screen_info->display_info->display, + drawable->drawable, + x, y, width, height); + + return 1; + } + + return 0; +} diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/glitz-0.5.4/src/glx/glitz_glx_extension.c new/glitz-0.5.4/src/glx/glitz_glx_extension.c --- old/glitz-0.5.4/src/glx/glitz_glx_extension.c 2006-02-14 15:23:47.000000000 +0100 +++ new/glitz-0.5.4/src/glx/glitz_glx_extension.c 2006-03-12 21:03:24.000000000 +0100 @@ -39,17 +39,27 @@ { 0.0, NULL, 0 } }; +static glitz_extension_map glx_client_extensions[] = { + { 0.0, "GLX_MESA_copy_sub_buffer", GLITZ_GLX_FEATURE_COPY_SUB_BUFFER_MASK }, + { 0.0, NULL, 0 } +}; + void glitz_glx_query_extensions (glitz_glx_screen_info_t *screen_info, glitz_gl_float_t glx_version) { const char *glx_extensions_string; + const char *glx_client_extensions_string; const char *vendor; glx_extensions_string = glXQueryExtensionsString (screen_info->display_info->display, screen_info->screen); + glx_client_extensions_string = + glXGetClientString (screen_info->display_info->display, + GLX_EXTENSIONS); + vendor = glXGetClientString (screen_info->display_info->display, GLX_VENDOR); @@ -68,6 +78,11 @@ glx_extensions_string, glx_extensions); + screen_info->glx_feature_mask |= + glitz_extensions_query (glx_version, + glx_client_extensions_string, + glx_client_extensions); + if (vendor) { if (screen_info->glx_feature_mask & GLITZ_GLX_FEATURE_MULTISAMPLE_MASK) diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/glitz-0.5.4/src/glx/glitz_glx_info.c new/glitz-0.5.4/src/glx/glitz_glx_info.c --- old/glitz-0.5.4/src/glx/glitz_glx_info.c 2005-09-14 17:57:16.000000000 +0200 +++ new/glitz-0.5.4/src/glx/glitz_glx_info.c 2006-03-11 12:10:48.000000000 +0100 @@ -256,6 +256,17 @@ ~GLITZ_GLX_FEATURE_MAKE_CURRENT_READ_MASK; } + if (screen_info->glx_feature_mask & GLITZ_GLX_FEATURE_COPY_SUB_BUFFER_MASK) + { + screen_info->glx.copy_sub_buffer = (glitz_glx_copy_sub_buffer_t) + glitz_glx_get_proc_address ("glXCopySubBufferMESA", + (void *) screen_info); + + if (!screen_info->glx.copy_sub_buffer) + screen_info->glx_feature_mask &= + ~GLITZ_GLX_FEATURE_COPY_SUB_BUFFER_MASK; + } + if (screen_info->glx_feature_mask & GLITZ_GLX_FEATURE_GET_PROC_ADDRESS_MASK) { if (screen_info->glx_version >= 1.4f) { diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/glitz-0.5.4/src/glx/glitz_glxext.h new/glitz-0.5.4/src/glx/glitz_glxext.h --- old/glitz-0.5.4/src/glx/glitz_glxext.h 2005-09-14 17:57:16.000000000 +0200 +++ new/glitz-0.5.4/src/glx/glitz_glxext.h 2006-03-11 12:26:12.000000000 +0100 @@ -120,9 +120,7 @@ #define GLX_SAMPLES_ARB 0x186a1 #endif -typedef Bool *(* glitz_glx_bind_tex_image_t) - (Display *display, GLXPbuffer pbuffer, int buffer); -typedef Bool (* glitz_glx_release_tex_image_t) - (Display *display, GLXPbuffer pbuffer, int buffer); +typedef void *(* glitz_glx_copy_sub_buffer_t) + (Display *display, GLXDrawable draw, int x, int y, int w, int h); #endif /* GLITZ_GLXEXT_H_INCLUDED */ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/glitz-0.5.4/src/glx/glitz_glxint.h new/glitz-0.5.4/src/glx/glitz_glxint.h --- old/glitz-0.5.4/src/glx/glitz_glxint.h 2005-09-14 17:57:16.000000000 +0200 +++ new/glitz-0.5.4/src/glx/glitz_glxint.h 2006-03-12 14:32:41.000000000 +0100 @@ -43,6 +43,7 @@ #define GLITZ_GLX_FEATURE_GET_PROC_ADDRESS_MASK (1L << 4) #define GLITZ_GLX_FEATURE_MULTISAMPLE_MASK (1L << 5) #define GLITZ_GLX_FEATURE_PBUFFER_MULTISAMPLE_MASK (1L << 6) +#define GLITZ_GLX_FEATURE_COPY_SUB_BUFFER_MASK (1L << 7) typedef struct _glitz_glx_drawable glitz_glx_drawable_t; typedef struct _glitz_glx_screen_info_t glitz_glx_screen_info_t; @@ -58,6 +59,7 @@ glitz_glx_query_drawable_t query_drawable; glitz_glx_make_context_current_t make_context_current; glitz_glx_create_new_context_t create_new_context; + glitz_glx_copy_sub_buffer_t copy_sub_buffer; } glitz_glx_static_proc_address_list_t; typedef struct _glitz_glx_thread_info_t { @@ -165,7 +167,8 @@ extern glitz_bool_t __internal_linkage glitz_glx_push_current (void *abstract_drawable, glitz_surface_t *surface, - glitz_constraint_t constraint); + glitz_constraint_t constraint, + glitz_bool_t *restore_state); extern glitz_surface_t __internal_linkage * glitz_glx_pop_current (void *abstract_drawable); @@ -183,6 +186,13 @@ extern glitz_bool_t __internal_linkage glitz_glx_swap_buffers (void *abstract_drawable); +extern glitz_bool_t __internal_linkage +glitz_glx_copy_sub_buffer (void *abstract_drawable, + int x, + int y, + int width, + int height); + /* Avoid unnecessary PLT entries. */ slim_hidden_proto(glitz_glx_init) diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/glitz-0.5.4/src/wgl/glitz_wgl_context.c new/glitz-0.5.4/src/wgl/glitz_wgl_context.c --- old/glitz-0.5.4/src/wgl/glitz_wgl_context.c 2005-12-21 17:19:51.000000000 +0100 +++ new/glitz-0.5.4/src/wgl/glitz_wgl_context.c 2006-03-12 14:38:16.000000000 +0100 @@ -186,6 +186,7 @@ context->backend.attach_notify = _glitz_wgl_notify_dummy; context->backend.detach_notify = _glitz_wgl_notify_dummy; context->backend.swap_buffers = glitz_wgl_swap_buffers; + context->backend.copy_sub_buffer = glitz_wgl_copy_sub_buffer; context->backend.create_context = _glitz_wgl_create_context; context->backend.destroy_context = _glitz_wgl_destroy_context; @@ -265,6 +266,8 @@ { HGLRC context; + drawable->base.flushed = drawable->base.finished = 0; + switch (constraint) { case GLITZ_NONE: break; @@ -290,12 +293,16 @@ glitz_bool_t glitz_wgl_push_current (void *abstract_drawable, glitz_surface_t *surface, - glitz_constraint_t constraint) + glitz_constraint_t constraint, + glitz_bool_t *restore_state) { glitz_wgl_drawable_t *drawable = (glitz_wgl_drawable_t *) abstract_drawable; glitz_wgl_context_info_t *context_info; int index; + if (restore_state) + *restore_state = 0; + index = drawable->screen_info->context_stack_size++; context_info = &drawable->screen_info->context_stack[index]; diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/glitz-0.5.4/src/wgl/glitz_wgl_drawable.c new/glitz-0.5.4/src/wgl/glitz_wgl_drawable.c --- old/glitz-0.5.4/src/wgl/glitz_wgl_drawable.c 2005-12-07 22:22:49.000000000 +0100 +++ new/glitz-0.5.4/src/wgl/glitz_wgl_drawable.c 2006-03-12 14:35:57.000000000 +0100 @@ -75,7 +75,7 @@ height); if (!context->initialized) { - glitz_wgl_push_current (drawable, NULL, GLITZ_CONTEXT_CURRENT); + glitz_wgl_push_current (drawable, NULL, GLITZ_CONTEXT_CURRENT, NULL); glitz_wgl_pop_current (drawable); } @@ -199,7 +199,8 @@ * Last drawable? We have to destroy all fragment programs as this may * be our last chance to have a context current. */ - glitz_wgl_push_current (abstract_drawable, NULL, GLITZ_CONTEXT_CURRENT); + glitz_wgl_push_current (abstract_drawable, NULL, GLITZ_CONTEXT_CURRENT, + NULL); glitz_program_map_fini (drawable->base.backend->gl, &drawable->screen_info->program_map); glitz_program_map_init (&drawable->screen_info->program_map); @@ -226,3 +227,13 @@ return 1; } + +glitz_bool_t +glitz_wgl_copy_sub_buffer (void *abstract_drawable, + int x, + int y, + int width, + int height) +{ + return 0; +} diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/glitz-0.5.4/src/wgl/glitz_wglint.h new/glitz-0.5.4/src/wgl/glitz_wglint.h --- old/glitz-0.5.4/src/wgl/glitz_wglint.h 2005-11-09 13:32:24.000000000 +0100 +++ new/glitz-0.5.4/src/wgl/glitz_wglint.h 2006-03-12 14:34:39.000000000 +0100 @@ -173,7 +173,8 @@ extern glitz_bool_t __internal_linkage glitz_wgl_push_current (void *abstract_drawable, glitz_surface_t *surface, - glitz_constraint_t constraint); + glitz_constraint_t constraint, + glitz_bool_t *restore_state); extern glitz_surface_t *__internal_linkage glitz_wgl_pop_current (void *abstract_drawable); @@ -187,6 +188,13 @@ extern glitz_bool_t __internal_linkage glitz_wgl_swap_buffers (void *abstract_drawable); +extern glitz_bool_t __internal_linkage +glitz_wgl_copy_sub_buffer (void *abstract_drawable, + int x, + int y, + int width, + int height); + extern void __internal_linkage glitz_wgl_print_win32_error_string (int error_code); ++++++ xgl-xpstubs-link-hack.diff ++++++ --- hw/xgl/Makefile.in.orig 2006-04-03 09:38:17.000000000 +0200 +++ hw/xgl/Makefile.in 2006-04-03 09:39:20.000000000 +0200 @@ -454,7 +454,7 @@ XSERVERCFLAGS_LIBS = @XSERVERCFLAGS_LIBS@ XSERVERLIBS_CFLAGS = @XSERVERLIBS_CFLAGS@ XSERVERLIBS_LIBS = @XSERVERLIBS_LIBS@ -XSERVER_LIBS = @XSERVER_LIBS@ +XSERVER_LIBS = @XSERVER_LIBS@ ../../dix/libxpstubs.la XTRAP_FALSE = @XTRAP_FALSE@ XTRAP_TRUE = @XTRAP_TRUE@ XTSTEXAMPLES_DEP_CFLAGS = @XTSTEXAMPLES_DEP_CFLAGS@ ++++++ xorg-server-1.0.1.tar.bz2 -> xorg-server-1.1.99.1.tar.bz2 ++++++ ++++ 112640 lines of diff (skipped) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun...

1 0

commit yast2-iscsi-server
by root＠suse.de 05 Apr '06

05 Apr '06

Hello community, here is the log from the commit of package yast2-iscsi-server checked in at Wed Apr 5 18:00:32 CEST 2006. -------- --- yast2-iscsi-server/yast2-iscsi-server.changes 2006-03-23 16:14:38.000000000 +0100 +++ yast2-iscsi-server/yast2-iscsi-server.changes 2006-04-05 17:56:31.000000000 +0200 @@ -1,0 +2,15 @@ +Wed Apr 5 17:50:29 CEST 2006 - mzugec(a)suse.cz + +- fixed #157648 - when modify target, can edit LUN + +------------------------------------------------------------------- +Wed Apr 5 17:16:42 CEST 2006 - mzugec(a)suse.cz + +- fixed #163299 - Iscsi->iSCSI + +------------------------------------------------------------------- +Wed Apr 5 17:06:10 CEST 2006 - mzugec(a)suse.cz + +- fixed #158546 cannot set the same user/pass fot incoming and outgoing auth + +------------------------------------------------------------------- Old: ---- yast2-iscsi-server-2.13.12.tar.bz2 New: ---- yast2-iscsi-server-2.13.13.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-iscsi-server.spec ++++++ --- /var/tmp/diff_new_pack.9ZRLK7/_old 2006-04-05 18:00:20.000000000 +0200 +++ /var/tmp/diff_new_pack.9ZRLK7/_new 2006-04-05 18:00:20.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package yast2-iscsi-server (Version 2.13.12) +# spec file for package yast2-iscsi-server (Version 2.13.13) # # 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-iscsi-server -Version: 2.13.12 +Version: 2.13.13 Release: 1 License: GPL Group: System/YaST BuildRoot: %{_tmppath}/%{name}-%{version}-build -Source0: yast2-iscsi-server-2.13.12.tar.bz2 +Source0: yast2-iscsi-server-2.13.13.tar.bz2 prefix: /usr BuildRequires: docbook-xsl-stylesheets doxygen libxslt perl-XML-Writer popt-devel sgml-skel update-desktop-files yast2 yast2-devtools yast2-packagemanager-devel yast2-perl-bindings yast2-testsuite Requires: yast2 @@ -29,7 +29,7 @@ %prep -%setup -n yast2-iscsi-server-2.13.12 +%setup -n yast2-iscsi-server-2.13.13 %build %{prefix}/bin/y2tool y2autoconf @@ -58,12 +58,18 @@ /usr/share/YaST2/include/iscsi-server/* /usr/share/YaST2/clients/iscsi-server.ycp /usr/share/YaST2/clients/iscsi-server_*.ycp -/usr/share/YaST2/modules/IscsiServer.* +/usr/share/YaST2/modules/IscsiServer* %{prefix}/share/applications/YaST2/iscsi-server.desktop /usr/share/YaST2/scrconf/ietd.scr %doc %{prefix}/share/doc/packages/yast2-iscsi-server %changelog -n yast2-iscsi-server +* Wed Apr 05 2006 - mzugec(a)suse.cz +- fixed #157648 - when modify target, can edit LUN +* Wed Apr 05 2006 - mzugec(a)suse.cz +- fixed #163299 - Iscsi->iSCSI +* Wed Apr 05 2006 - mzugec(a)suse.cz +- fixed #158546 cannot set the same user/pass fot incoming and outgoing auth * Thu Mar 23 2006 - mzugec(a)suse.cz - fixed #160315 - check if user is root * Tue Mar 21 2006 - mzugec(a)suse.cz ++++++ yast2-iscsi-server-2.13.12.tar.bz2 -> yast2-iscsi-server-2.13.13.tar.bz2 ++++++ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-iscsi-server-2.13.12/VERSION new/yast2-iscsi-server-2.13.13/VERSION --- old/yast2-iscsi-server-2.13.12/VERSION 2006-03-23 16:11:09.000000000 +0100 +++ new/yast2-iscsi-server-2.13.13/VERSION 2006-04-05 17:54:56.000000000 +0200 @@ -1 +1 @@ -2.13.12 +2.13.13 diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-iscsi-server-2.13.12/src/IscsiServer.ycp new/yast2-iscsi-server-2.13.13/src/IscsiServer.ycp --- old/yast2-iscsi-server-2.13.12/src/IscsiServer.ycp 2006-03-23 16:11:34.000000000 +0100 +++ new/yast2-iscsi-server-2.13.13/src/IscsiServer.ycp 2006-04-05 16:03:45.000000000 +0200 @@ -4,7 +4,7 @@ * Summary: IscsiServer settings, input and output functions * Authors: Michal Zugec <mzugec(a)suse.cz> * - * $Id: IscsiServer.ycp 29339 2006-03-23 15:11:30Z mzugec $ + * $Id: IscsiServer.ycp 29726 2006-04-05 14:03:42Z mzugec $ * * Representation of the configuration of iscsi-server. * Input and output routines. @@ -24,9 +24,8 @@ import "Popup"; import "SuSEFirewall"; import "Confirm"; +import "IscsiServerFunctions"; -map <string, any> config_file = $[]; -global map<string, any> config = $[]; boolean serviceStatus = false; /** @@ -90,142 +89,26 @@ // boolean additional_parameter = true; boolean readConfig(){ - config_file = (map<string, any>)SCR::Read(.etc.ietd.all); - string c_scope="auth"; - foreach(map<string, any> row, config_file["value"]:[], { - if (row["name"]:"" == "Target") { - c_scope = row["value"]:""; - config[c_scope] = [ $[ "KEY":"Target", "VALUE":row["value"]:"" ] ]; - } - else config[c_scope] = add(config[c_scope]:[], $[ "KEY":row["name"]:"", "VALUE":row["value"]:"" ]); - }); + IscsiServerFunctions::parseConfig( (map<string, any>)SCR::Read(.etc.ietd.all) ); return true; } -boolean find_in(map<string, any> my_conf, string to_find){ - boolean ret = false; - foreach(string key, any value, my_conf, { - if ( key == to_find ) ret = true; - }); - return ret; -} - -map<string, any> removeKeyFromMap(map<string,any>myMap,string key){ - map <string, any> conf_map = $[]; - foreach(string k, any v, myMap, { - if (k != key) conf_map[k] = v; - }); - return conf_map; -} - -global map<string, any> removeKey(string key){ - return removeKeyFromMap(config, key); -} - -global integer getHighestLun(){ - integer lun = -1; - foreach(string key, list<map<string, any> > val, (map<string, list<map<string, any> > >)removeKey("auth"), { - foreach(map<string, any> row,val, { - if (row["KEY"]:""=="Lun"){ - integer curr_lun = 0; - curr_lun = tointeger((splitstring(row["VALUE"]:"", " "))[0]:"0"); - if (curr_lun > lun) lun = curr_lun; - } - }); - }); - return lun; -} - -map<string, any> createMap(map<string, any> old_map, list<string> comments) -{ - string comment = ""; - foreach(string row, comments, { - comment = sformat("%1%2", comment, row); - }); - return $[ "name":old_map["KEY"]:"", - "value":old_map["VALUE"]:"", - "kind":"value", - "type":1, - "comment":comment - ]; -} - -list<string> getKeys(map<string, any> searched){ - list<string> keys = []; - foreach(string s, any a, searched, { - keys = add(keys, s); - }); - return keys; -} - -map<string, any> addToConfig( map<string, any> m_config_file, string key){ - list <map<string, any> > new_list = []; - foreach(map<string, any> row, config[key]:[], { - new_list = add(new_list, createMap(row, [])); - }); - m_config_file[key] = new_list; - return m_config_file; -} - boolean writeConfig(){ - string c_scope = "auth"; - map<string, any> m_config_file = $[]; - - + map <string, any> config_file = IscsiServerFunctions::writeConfig(); + config_file["type"]=tointeger(config_file["type"]:"1"); + config_file["file"]=tointeger(config_file["file"]:"1"); + list <map<string, any> > value = []; foreach(map<string, any> row, config_file["value"]:[], { - if ( c_scope=="auth" && row["name"]:"" != "Target" ) { m_config_file["auth"] = add(m_config_file["auth"]:[], row); - } - if (row["name"]:"" == "Target"){ - c_scope = row["value"]:""; - m_config_file[c_scope] = add(m_config_file[c_scope]:[], row); - } else if(c_scope!="auth"){ m_config_file[c_scope] = add(m_config_file[c_scope]:[], row); - } + row["type"]=tointeger(row["type"]:"1"); + row["file"]=tointeger(row["file"]:"1"); + value = add(value, row); }); - foreach(string old_key, getKeys(config), { - if(size(config[old_key]:[])==0) config = removeKey(old_key); - }); - foreach(string old_key, getKeys(config), { - if(!( contains(getKeys(m_config_file), old_key) )){ - m_config_file = addToConfig( m_config_file, old_key ); - } else { - - map<string, any> comments = $[]; - foreach(map<string, any> old_list, m_config_file[old_key]:[], { - string key = old_list["name"]:""; - comments[key] = add(comments[key]:[], old_list["comment"]:""); - }); - list<map<string, any> > new = []; - foreach(map<string, any> old_map, config[old_key]:[], { - string key = old_map["KEY"]:""; -y2internal("%1", comments[key]:nil); - if (size(comments[key]:[])>0){ - new = add(new, - createMap(old_map, comments[key]:[])); - comments = removeKeyFromMap(comments,key); - } else new = add(new, - createMap(old_map, comments[key]:[])); - }); -y2internal("%1", new); - m_config_file[old_key] = new; - } - }); - - foreach(string old_key, getKeys(m_config_file), { - if(!( contains(getKeys(config), old_key) )){ - m_config_file = removeKeyFromMap(m_config_file, old_key); - } - }); - - config_file["value"] = m_config_file["auth"]:[]; - - foreach(string key, any val, removeKeyFromMap(m_config_file, "auth"), { - config_file["value"] = flatten([ config_file["value"]:[], (list<map<string, any> >)val ]); - }); -SCR::Write(.etc.ietd.all, config_file); -SCR::Write(.etc.ietd, nil); - + config_file["value"] = value; + y2milestone("%1", config_file); + SCR::Write(.etc.ietd.all, config_file); + SCR::Write(.etc.ietd, nil); return true; } @@ -371,9 +254,6 @@ "" ); - // write settings -// if(Abort()) return false; - Progress::set(false); SuSEFirewall::Write(); diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-iscsi-server-2.13.12/src/IscsiServerFunctions.pm new/yast2-iscsi-server-2.13.13/src/IscsiServerFunctions.pm --- old/yast2-iscsi-server-2.13.12/src/IscsiServerFunctions.pm 1970-01-01 01:00:00.000000000 +0100 +++ new/yast2-iscsi-server-2.13.13/src/IscsiServerFunctions.pm 2006-04-05 16:53:34.000000000 +0200 @@ -0,0 +1,247 @@ +#! /usr/bin/perl -w +# +# functions for IscsiServer module written in Perl +# + +package IscsiServerFunctions; +use strict; +use Data::Dumper; +use YaPI; + +our %TYPEINFO; + +my %config = (); +my %config_file = (); +my %changes = (); + +BEGIN { $TYPEINFO{parseConfig} = ["function", ["map", "string", "any"], ["map", "string", "any"] ]; } +sub parseConfig { + my $self = shift; + %config_file = %{+shift}; + my $values = $config_file{'value'}; + + my $scope="auth"; + foreach my $row ( @$values ){ + if ($$row{'name'} eq 'Target'){ + $scope = $$row{'value'}; + $config{$scope} = [ {'KEY' => 'Target', 'VALUE' => $scope } ]; + } else { + if (!ref($config{$scope})) { + $config{$scope} = [ {'KEY' => $$row{'name'}, 'VALUE' => $$row{'value'} } ]; + } else { + push(@{$config{$scope}}, ({'KEY'=>$$row{'name'}, 'VALUE'=>$$row{'value'}})); + } + } + }; + return \%config; +} + +BEGIN { $TYPEINFO{removeItem} = ["function", ["map", "string", "any"], "string" ]; } +sub removeItem { + my $self = shift; + my $key = shift; + %config = %{$self->removeKeyFromMap(\%config, $key)}; + return \%config; +} + +BEGIN { $TYPEINFO{getConfig} = ["function", ["map", "string", "any"] ]; } +sub getConfig { + my $self = shift; + return \%config; +} + +sub removeKeyFromMap { + my $self = shift; + my %tmp_map = %{+shift}; + my $key = shift; + + delete $tmp_map{$key} if defined $tmp_map{$key}; + return \%tmp_map; +} + +BEGIN { $TYPEINFO{getTargets} = ["function", ["map", "string", "any"] ] ; } +sub getTargets { + my $self = shift; + + return $self->removeKeyFromMap(\%config, 'auth'); +} + +BEGIN { $TYPEINFO{setAuth} = ["function", "void", ["list", "string"], "string" ]; } +sub setAuth { + my $self = shift; + my @incoming = @{+shift}; + my $outgoing = shift; + my @tmp_auth = (); + + foreach my $row (@incoming){ + push(@tmp_auth, {'KEY'=>'IncomingUser', 'VALUE'=>$row}); + } + +open(FILE, ">>/tmp/perl.log"); +print FILE Dumper($outgoing); + push(@tmp_auth, {'KEY'=>'OutgoingUser', 'VALUE'=>$outgoing}) if ($outgoing =~/[\w]+/); +print FILE Dumper(@tmp_auth); + $config{'auth'}=\@tmp_auth; +close(FILE); +} + +BEGIN { $TYPEINFO{setTargetAuth} = ["function", "void", "string", ["list", "string"], "string" ]; } +sub setTargetAuth { + my $self = shift; + my $target = shift; + my @incoming = @{+shift}; + my $outgoing = shift; + my $tmp_auth = $config{$target}; + + foreach my $row (@incoming){ + push(@$tmp_auth, {'KEY'=>'IncomingUser', 'VALUE'=>$row}); + } + push(@$tmp_auth, {'KEY'=>'OutgoingUser', 'VALUE'=>$outgoing}) if ($outgoing =~/[\w]+/); +} + +BEGIN { $TYPEINFO{addTarget} = ["function", "void", "string", "string" ] ; } +sub addTarget { + my $self = shift; + my $target = shift; + my $lun = shift; + + if (ref($config{$target})){ + my $tmp_list = $config{$target} ; + push(@$tmp_list, {'KEY'=>'Target', 'VALUE'=>$target}, {'KEY'=>'Lun', 'VALUE'=>$lun}); + } else { + $config{$target} = [ {'KEY'=>'Target', 'VALUE'=>$target}, {'KEY'=>'Lun', 'VALUE'=>$lun} ]; + } + +} + + + +BEGIN { $TYPEINFO{ifExists} = ["function", "boolean", "string", "string" ] ; } +sub ifExists { + my $self = shift; + my $key = shift; + my $val = shift; + + my $ret = 0; + + foreach my $target (keys %config) { + if ($target ne 'auth'){ + foreach my $tmp_hash (@{$config{$target}}){ + if (($$tmp_hash{'KEY'} eq $key)&&($$tmp_hash{'VALUE'} eq $val)) { + $ret = 1; + } + } + } + } + return $ret; +} + +BEGIN { $TYPEINFO{getNextLun} = [ "function", "integer" ] ; } +sub getNextLun { + my $self = shift; + my $lun = -1; + foreach my $target (keys %{$self->removeKeyFromMap(\%config, 'auth')}){ + foreach my $tmp_hash (@{$config{$target}}){ + if ($$tmp_hash{'KEY'} eq 'Lun'){ + if ($$tmp_hash{'VALUE'}=~/([\d]+)[\s]*/) { + $lun=$1 if ($1>$lun); + } + } + } + } + return $lun+1; +} + +sub createMap { + my ($old_map, $comment) = @_; + + $comment='' if (ref($comment) eq 'ARRAY'); + my %tmp_map = ( + "name"=>$old_map->{"KEY"}, + "value"=>$old_map->{"VALUE"}, + "kind"=>"value", + "type"=>1, + "comment"=> $comment + ); + return \%tmp_map; +} + +sub addTo { + my ($old_map, $target) = @_; + my @tmp_list = (); + + foreach my $row (@{$config{$target}}){ + push(@tmp_list, createMap( $row, [] )); + } + $old_map->{$target}=\@tmp_list; + return $old_map; +} + +BEGIN { $TYPEINFO{writeConfig} = ["function", ["map", "string", "any"] ]; } +sub writeConfig { + my $self = shift; + my $values = $config_file{'value'}; + my %new_config = (); + + my $scope="auth"; + foreach my $row ( @$values ){ + if ($$row{'name'} eq 'Target'){ + $scope = $$row{'value'}; + $new_config{$scope} = [ $row ]; + } else { + if (!ref($new_config{$scope})) { + $new_config{$scope} = [ $row ]; + } else { + push(@{$new_config{$scope}}, ($row)); + } + } + }; + + foreach my $key (keys %new_config){ + if (! defined $config{$key}){ + delete($new_config{$key}); + push(@{$changes{'del'}}, $key); + } + } + + foreach my $key (keys %config){ + if (! defined $new_config{$key}){ + addTo(\%new_config, $key); + push(@{$changes{'add'}}, $key); + } else { + my %comments = (); + foreach my $row (@{$new_config{$key}}){ + $comments{$row->{'name'}} = $row->{'comment'} if ($row->{'comment'} ne ''); + $comments{$row->{'name'}}='' if (not defined $comments{$row->{'name'}}); + } + my @new = (); + foreach my $row (@{$config{$key}}){ + my $k = $row->{'KEY'}; + $comments{$k}='' if not defined $comments{$k}; + push(@new, createMap($row, $comments{$k})); + $comments{$k}=''; + } + $new_config{$key} = \@new; + } + } + $config_file{'value'} = $new_config{'auth'}; + delete ($new_config{'auth'}); + + foreach my $key (reverse(keys %new_config )){ + if (not ref($new_config{$key})){ + push(@{$config_file{'value'}}, $new_config{$key}) ; + } else { + push(@{$config_file{'value'}}, @{$new_config{$key}}) ; + } + } + return \%config_file; +} + + +BEGIN { $TYPEINFO{getChanges} = ["function", ["map", "string", "any"] ]; } +sub getChanges { + return \%changes; +} + +1; +# EOF diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-iscsi-server-2.13.12/src/Makefile.am new/yast2-iscsi-server-2.13.13/src/Makefile.am --- old/yast2-iscsi-server-2.13.12/src/Makefile.am 2006-02-14 10:31:05.000000000 +0100 +++ new/yast2-iscsi-server-2.13.13/src/Makefile.am 2006-03-24 11:10:19.000000000 +0100 @@ -18,7 +18,8 @@ iscsi-server.desktop module_DATA = \ - IscsiServer.ycp + IscsiServer.ycp \ + IscsiServerFunctions.pm EXTRA_DIST = $(client_DATA) $(ynclude_DATA) $(module_DATA) $(desktop_DATA) diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-iscsi-server-2.13.12/src/Makefile.in new/yast2-iscsi-server-2.13.13/src/Makefile.in --- old/yast2-iscsi-server-2.13.12/src/Makefile.in 2006-03-23 16:13:10.000000000 +0100 +++ new/yast2-iscsi-server-2.13.13/src/Makefile.in 2006-04-05 17:52:08.000000000 +0200 @@ -190,7 +190,8 @@ iscsi-server.desktop module_DATA = \ - IscsiServer.ycp + IscsiServer.ycp \ + IscsiServerFunctions.pm EXTRA_DIST = $(client_DATA) $(ynclude_DATA) $(module_DATA) $(desktop_DATA) modulebin_DATA = $(patsubst %.ycp,%.ybc,$(module_DATA)) diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-iscsi-server-2.13.12/src/dialogs.ycp new/yast2-iscsi-server-2.13.13/src/dialogs.ycp --- old/yast2-iscsi-server-2.13.12/src/dialogs.ycp 2006-03-17 19:14:50.000000000 +0100 +++ new/yast2-iscsi-server-2.13.13/src/dialogs.ycp 2006-04-05 17:07:16.000000000 +0200 @@ -4,7 +4,7 @@ * Summary: Dialogs definitions * Authors: Michal Zugec <mzugec(a)suse.cz> * - * $Id: dialogs.ycp 29113 2006-03-17 18:14:44Z mzugec $ + * $Id: dialogs.ycp 29740 2006-04-05 15:07:13Z mzugec $ */ { @@ -140,8 +140,8 @@ "init" : initGlobal, "handle" : handleAuth, "store" : storeGlobal, -// "validate_type" : `function, -// "validate_function" : validateGlobal, + "validate_type" : `function, + "validate_function" : validateGlobal, // "label" : _("Settings of SLP server"), "help" : HELPS["global_config"]:"" ], @@ -215,8 +215,8 @@ "init" : initGlobal, "handle" : handleAuth, "store" : storeGlobal, -// "validate_type" : `function, -// "validate_function" : validateGlobal, + "validate_type" : `function, + "validate_function" : validateGlobal, "help" : HELPS["global_config"]:"" ], "target-modify" : $[ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-iscsi-server-2.13.12/src/iscsi-server.desktop new/yast2-iscsi-server-2.13.13/src/iscsi-server.desktop --- old/yast2-iscsi-server-2.13.12/src/iscsi-server.desktop 2006-03-21 09:21:37.000000000 +0100 +++ new/yast2-iscsi-server-2.13.13/src/iscsi-server.desktop 2006-04-05 17:36:02.000000000 +0200 @@ -19,6 +19,6 @@ Icon=yast-iscsi-server Exec=/sbin/yast2 iscsi-server -Name=Iscsi Target -GenericName=iscsi-target +Name=iSCSI Target +GenericName=Configure an iSCSI target X-KDE-SubstituteUID=true diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-iscsi-server-2.13.12/src/widgets.ycp new/yast2-iscsi-server-2.13.13/src/widgets.ycp --- old/yast2-iscsi-server-2.13.12/src/widgets.ycp 2006-03-17 18:45:23.000000000 +0100 +++ new/yast2-iscsi-server-2.13.13/src/widgets.ycp 2006-04-05 17:48:19.000000000 +0200 @@ -1,6 +1,7 @@ { textdomain "iscsi-server"; +import "IscsiServerFunctions"; // **************** global funcions and variables ***** string curr_target = ""; @@ -11,9 +12,9 @@ UI::ChangeWidget(`id(`incoming_table),`Enabled, status ); UI::ChangeWidget(`id(`auth_in),`Value, status ); - UI::ChangeWidget(`id(`add),`Value, status ); - UI::ChangeWidget(`id(`edit),`Value, status ); - UI::ChangeWidget(`id(`delete),`Value, status ); + UI::ChangeWidget(`id(`add),`Enabled, status ); + UI::ChangeWidget(`id(`edit),`Enabled, status ); + UI::ChangeWidget(`id(`delete),`Enabled, status ); if(status) UI::ChangeWidget(`id(`auth_none),`Value, !status ); } @@ -28,19 +29,12 @@ list<string> getIncomingValues(){ list <string> values = []; if ((boolean)UI::QueryWidget(`id(`auth_in), `Value) == true){ -/* - foreach(term row, (list<term>)UI::QueryWidget(`id(`incoming_table), `Items), { - values=add(values, sformat("%1 %2", row[1]:"", row[2]:"")); - }); -*/ integer count = -1; while (count<size(inc_auth)-1){ - count = count+1; -// inc_items = add(inc_items, `item(`id(count),inc_auth[count, "USER"]:"", "*****")); -values=add(values, sformat("%1 %2", inc_auth[count, "USER"]:"", inc_auth[count, "PASS"]:"")); - } - - return values; + count = count+1; + values=add(values, sformat("%1 %2", inc_auth[count, "USER"]:"", inc_auth[count, "PASS"]:"")); + } + return values; } else return []; } @@ -51,7 +45,6 @@ } list <string> getDialogValues(string user, string pass){ - UI::OpenDialog( `VBox( `TextEntry(`id(`p_user),_("Username"), user), `Password(`id(`p_pass), _("Password"), pass), @@ -79,26 +72,13 @@ else return []; } -boolean if_exists(string key, string value){ - boolean ret = false; - foreach(string target, any row,IscsiServer::config, { - foreach( map<string, any> v, (list<map<string, any> >)row, { - if ( v["KEY"]:"" == key && v["VALUE"]:"" == value){ - ret = true; - break; - } - }); - }); - return ret; -} - // **************** Server Dialog ********************* void initTable (string key) ``{ integer count = 0; list <term> inc_items = []; - if (size(IscsiServer::removeKey("auth"))>0){ - foreach(string key, any value, IscsiServer::removeKey("auth"), { + if (size(IscsiServerFunctions::getTargets())>0){ + foreach(string key, any value, IscsiServerFunctions::getTargets(), { inc_items = add(inc_items, `item(`id(count), key)); count = count + 1; }); @@ -116,13 +96,13 @@ case(`del) : if (Popup::ContinueCancel(_("Really delete this item?"))){ integer del=tointeger( UI::QueryWidget(`id(`server), `CurrentItem) ); - IscsiServer::config = remove(IscsiServer::config, ((term)UI::QueryWidget(`id(`server), `Item(del)))[1]:"" ); + IscsiServerFunctions::removeItem( ((term)UI::QueryWidget(`id(`server), `Item(del)))[1]:"" ); initTable(""); } break; case(`edit) : - integer del=tointeger( UI::QueryWidget(`id(`server), `CurrentItem) ); - curr_target = ((term)UI::QueryWidget(`id(`server), `Item(del)))[1]:""; + integer edit=tointeger( UI::QueryWidget(`id(`server), `CurrentItem) ); + curr_target = ((term)UI::QueryWidget(`id(`server), `Item(edit)))[1]:""; ret = `edit; break; } @@ -166,37 +146,23 @@ } void initGlobal (string key){ - if (size(curr_target)>0) initGlobalValues(IscsiServer::config[curr_target]:[]); - else if (size(IscsiServer::config["auth"]:[])>0) initGlobalValues(IscsiServer::config["auth"]:[]); + if (size(curr_target)>0) initGlobalValues(IscsiServerFunctions::getConfig()[curr_target]:[]); + else if (size(IscsiServerFunctions::getConfig()["auth"]:[])>0) initGlobalValues(IscsiServerFunctions::getConfig()["auth"]:[]); } void storeGlobal(string option_id, map option_map){ - if (size(curr_target)>0){ - list<map<string, any> > old = []; - if(size(IscsiServer::config[curr_target]:[])>0){ - foreach(map<string, any> row, IscsiServer::config[curr_target]:[], { - if ( (row["KEY"]:""=="Target")||(row["KEY"]:""=="Lun") ) old = add(old, row); - }); - } - IscsiServer::config[curr_target] = old; - foreach(string row, getIncomingValues(), { - IscsiServer::config[curr_target] = add(IscsiServer::config[curr_target]:[], $[ "KEY":"IncomingUser", "VALUE":row ]); - }); - string out = getOutgoingValues(); - if (size(out)>0) IscsiServer::config[curr_target] = - add(IscsiServer::config[curr_target]:[], $[ "KEY":"OutgoingUser", "VALUE":out ]); - - - } else{ - IscsiServer::config["auth"] = []; - foreach(string row, getIncomingValues(), { - IscsiServer::config["auth"] = add(IscsiServer::config["auth"]:[], $[ "KEY":"IncomingUser", "VALUE":row ]); - }); - string out = getOutgoingValues(); - if (size(out)>0) IscsiServer::config["auth"] = add(IscsiServer::config["auth"]:[], $[ "KEY":"OutgoingUser", "VALUE":out ]); - } + if (size(curr_target)>0){ + IscsiServerFunctions::setTargetAuth( curr_target, getIncomingValues(), getOutgoingValues() ); + } else{ + IscsiServerFunctions::setAuth( getIncomingValues(), getOutgoingValues() ); + } +} +boolean validateGlobal(string key, map event){ + boolean ret=false; + if (!contains(getIncomingValues(), getOutgoingValues())) ret=true; + else Popup::Error(_("Cannot use same secret for incoming and outgoing authentication.")); + return ret; } - // ************** Add Target Dialog ****************** void initAddTarget(string key){ string target = "iqn"; @@ -212,23 +178,14 @@ UI::ChangeWidget(`id(`target), `Value, target); UI::ChangeWidget(`id(`identifier), `Value, uuid); - UI::ChangeWidget(`id(`lun), `Value, tostring( IscsiServer::getHighestLun() + 1)); + UI::ChangeWidget(`id(`lun), `Value, tostring(IscsiServerFunctions::getNextLun()) ); } void storeAddTarget(string option_id, map option_map){ list<map<string, any> > old = []; - string target = tostring( sformat("%1:%2",UI::QueryWidget(`id(`target), `Value), UI::QueryWidget(`id(`identifier), `Value)) ); + string target = tostring( sformat("%1:%2",UI::QueryWidget(`id(`target), `Value), UI::QueryWidget(`id(`identifier), `Value)) ); string lun = sformat("%1 Path=%2,Type=fileio",UI::QueryWidget(`id(`lun), `Value), UI::QueryWidget(`id(`path), `Value) ); - if(size(IscsiServer::config[target]:[])>0){ - foreach(map<string, any> row, IscsiServer::config[target]:[], { - if ( (row["KEY"]:""!="Target")&&(row["KEY"]:""!="Lun") ) old = add(old, row); - }); - } - IscsiServer::config[target] = flatten([ - [ - $[ "KEY":"Target", "VALUE":target ], - $[ "KEY":"Lun", "VALUE":lun ] - ], old ]); + IscsiServerFunctions::addTarget(target, lun); curr_target = target; } @@ -237,12 +194,12 @@ string lun = tostring( UI::QueryWidget(`id(`lun), `Value) ); string type = "no"; if (( size(target)==0 && (Popup::Error(_("The target cannot be empty."))==nil) ) || - ( if_exists("Target", target) && (Popup::Error(_("The target already exists."))==nil) )){ + ( IscsiServerFunctions::ifExists("Target", target) && (Popup::Error(_("The target already exists."))==nil) )){ UI::SetFocus(`id(`target)); return false; } if ((size(lun)==0 && (Popup::Error(_("The logical unit definition cannot be empty."))==nil))|| - ( if_exists("Lun", lun) && (Popup::Error(_("The logical unit already exists."))==nil))){ + ( IscsiServerFunctions::ifExists("Lun", lun) && (Popup::Error(_("The logical unit already exists."))==nil))){ UI::SetFocus(`id(`lun)); return false; } @@ -279,20 +236,17 @@ string user = values[0]:""; string pass = values[1]:""; integer count = size((list)UI::QueryWidget(`id (`incoming_table),`Items)); - - + inc_auth[size(inc_auth)]= $["USER":user, "PASS":pass]; UI::ChangeWidget (`id (`incoming_table), `Items, getAuthItems()); - -// add((list)UI::QueryWidget(`id (`incoming_table),`Items), `item(`id(count), user, pass))); } break; case(`edit) : integer curr = tointeger( UI::QueryWidget(`id (`incoming_table),`CurrentItem) ); if (curr!=nil){ - string user = inc_auth[curr, "USER"]:""; //((term)UI::QueryWidget(`id(`incoming_table), `Item(curr)))[1]:"" ; - string pass = inc_auth[curr, "PASS"]:"";//((term)UI::QueryWidget(`id(`incoming_table), `Item(curr)))[2]:"" ; + string user = inc_auth[curr, "USER"]:""; + string pass = inc_auth[curr, "PASS"]:""; list<string> values = getDialogValues(user, pass); if (size(values)==2 ){ @@ -332,7 +286,7 @@ // **************** Edit Dialog ***************************** void initModify (string key) ``{ - foreach( map<string, any> row, (list<map<string, any> >) IscsiServer::config[curr_target]:[], { + foreach( map<string, any> row, (list<map<string, any> >) IscsiServerFunctions::getConfig()[curr_target]:[], { switch(row["KEY"]:""){ case("Target") : UI::ChangeWidget( `id(`target),`Value, (splitstring(row["VALUE"]:"", ":"))[0]:""); @@ -344,7 +298,7 @@ case("Lun") : list<string> lun = splitstring(row["VALUE"]:"", " "); UI::ChangeWidget(`id(`lun), `Value, lun[0]:""); - UI::ChangeWidget(`id(`lun),`Enabled, false); +// UI::ChangeWidget(`id(`lun),`Enabled, false); string full_path = (splitstring(lun[1]:"", ","))[0]:""; UI::ChangeWidget(`id(`path), `Value, (splitstring(full_path, "="))[1]:"" ); break; ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun...

1 0

commit yast2-x11
by root＠suse.de 05 Apr '06

05 Apr '06

Hello community, here is the log from the commit of package yast2-x11 checked in at Wed Apr 5 18:00:10 CEST 2006. -------- --- yast2-x11/yast2-x11.changes 2006-03-28 13:39:40.000000000 +0200 +++ yast2-x11/yast2-x11.changes 2006-04-05 15:28:06.000000000 +0200 @@ -1,0 +2,5 @@ +Wed Apr 5 15:26:18 CEST 2006 - ms(a)suse.de + +- fixed information shown if the DisplaySize is unknown (#163749) + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-x11.spec ++++++ --- /var/tmp/diff_new_pack.eg4zMh/_old 2006-04-05 18:00:01.000000000 +0200 +++ /var/tmp/diff_new_pack.eg4zMh/_new 2006-04-05 18:00:01.000000000 +0200 @@ -12,7 +12,7 @@ Name: yast2-x11 Version: 2.13.6 -Release: 30 +Release: 31 License: GPL Group: System/YaST BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -81,6 +81,8 @@ %doc %{prefix}/share/doc/packages/yast2-x11 %changelog -n yast2-x11 +* Wed Apr 05 2006 - ms(a)suse.de +- fixed information shown if the DisplaySize is unknown (#163749) * Tue Mar 28 2006 - ms(a)suse.de - add display- / windowmanger setup to AutoinstX11.ycp (#153852) * Mon Mar 13 2006 - ms(a)suse.de ++++++ yast2-x11-2.13.6.tar.bz2 ++++++ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-x11-2.13.6/src/XLib.pm new/yast2-x11-2.13.6/src/XLib.pm --- old/yast2-x11-2.13.6/src/XLib.pm 2006-03-13 17:32:14.000000000 +0100 +++ new/yast2-x11-2.13.6/src/XLib.pm 2006-04-05 15:01:58.000000000 +0200 @@ -207,7 +207,7 @@ my $mDesktop = new SaX::SaXManipulateDesktop ( $section{Desktop},$section{Card},$section{Path} ); - my @result = ("15","4","3"); + my @result = ("undef"); my $traversal = $mDesktop->getDisplayTraversal(); my @ratio = @{$mDesktop->getDisplayRatio()}; if (defined $traversal) { diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-x11-2.13.6/src/proposal/x11_proposal.ycp new/yast2-x11-2.13.6/src/proposal/x11_proposal.ycp --- old/yast2-x11-2.13.6/src/proposal/x11_proposal.ycp 2006-03-08 16:19:46.000000000 +0100 +++ new/yast2-x11-2.13.6/src/proposal/x11_proposal.ycp 2006-04-05 15:11:17.000000000 +0200 @@ -87,6 +87,7 @@ boolean isNoteBookHW= (boolean) XLib::isNoteBookHardware(); boolean extVGAactive= (boolean) XLib::isExternalVGAactive(); list monitorSize = (list) XLib::getDisplaySize(); + string monitorInch = (string) monitorSize[0]:"undef"; //====================================== // Prepare proposal @@ -126,15 +127,25 @@ //====================================== // Monitor name and resolution... //-------------------------------------- - proposal = proposal - + LI - + XMessages::monitor + "<a href=\"sax-monitor\">" - + monitorName + "</a> " + "(<a href=\"sax-displaysize\">" - + monitorSize[0]:"" + " " + XMessages::Inches + ", " - + XMessages::Aspect + " " + monitorSize[1]:"" + ":" - + monitorSize[2]:"" + "</a>)" + " - (<a href=\"sax-resolution\">" - + resolution + "</a>)" - + IL; + if (monitorInch == "undef") { + proposal = proposal + + LI + + XMessages::monitor + "<a href=\"sax-monitor\">" + + monitorName + "</a> " + "(<a href=\"sax-displaysize\">" + + XMessages::Aspect + " " + XMessages::unconfigured + "</a>)" + + " - (<a href=\"sax-resolution\">" + resolution + "</a>)" + + IL; + } else { + proposal = proposal + + LI + + XMessages::monitor + "<a href=\"sax-monitor\">" + + monitorName + "</a> " + "(<a href=\"sax-displaysize\">" + + monitorSize[0]:"" + " " + XMessages::Inches + ", " + + XMessages::Aspect + " " + monitorSize[1]:"" + ":" + + monitorSize[2]:"" + "</a>)" + " - (<a href=\"sax-resolution\">" + + resolution + "</a>)" + + IL; + } //====================================== // Colordepth and number of colors... //-------------------------------------- @@ -231,7 +242,7 @@ list<string> currentSize = XLib::getDisplaySize(); list<string> selectedSize = setupDisplaySize ( currentSize[0]:"15", - currentSize[1]:"5" + "/" + currentSize[2]:"4" + currentSize[1]:"4" + "/" + currentSize[2]:"3" ); y2milestone("X11: setup displaysize <%1>",selectedSize); XLib::setDisplaySize ( selectedSize ); ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun...

1 0

commit yast2-trans-sl_SI
by root＠suse.de 05 Apr '06

05 Apr '06

Hello community, here is the log from the commit of package yast2-trans-sl_SI checked in at Wed Apr 5 17:59:56 CEST 2006. -------- --- yast2-trans-sl_SI/yast2-trans-sl_SI.changes 2006-04-04 13:22:40.000000000 +0200 +++ yast2-trans-sl_SI/yast2-trans-sl_SI.changes 2006-04-05 17:43:43.000000000 +0200 @@ -1,0 +2,5 @@ +Wed Apr 5 17:43:16 2006 - ke(a)suse.de + +- Update to version 2.13.5. + +------------------------------------------------------------------------ Old: ---- yast2-trans-sl_SI-2.13.4.tar.bz2 New: ---- yast2-trans-sl_SI-2.13.5.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-trans-sl_SI.spec ++++++ --- /var/tmp/diff_new_pack.3SY0ZU/_old 2006-04-05 17:59:52.000000000 +0200 +++ /var/tmp/diff_new_pack.3SY0ZU/_new 2006-04-05 17:59:52.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package yast2-trans-sl_SI (Version 2.13.4) +# spec file for package yast2-trans-sl_SI (Version 2.13.5) # # 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-trans-sl_SI -Version: 2.13.4 +Version: 2.13.5 Release: 1 License: GPL Group: System/YaST BuildRoot: %{_tmppath}/%{name}-%{version}-build -Source0: yast2-trans-sl_SI-2.13.4.tar.bz2 +Source0: yast2-trans-sl_SI-2.13.5.tar.bz2 prefix: /usr Provides: locale(yast2:sl_SI) BuildRequires: pkgconfig yast2-devtools @@ -32,7 +32,7 @@ YaST2 - Slovene Translations %prep -%setup -n yast2-trans-sl_SI-2.13.4 +%setup -n yast2-trans-sl_SI-2.13.5 %build autoreconf --force --install @@ -64,6 +64,8 @@ /usr/share/YaST2/locale %changelog -n yast2-trans-sl_SI +* Wed Apr 05 2006 - ke(a)suse.de +- Update to version 2.13.5. * Tue Apr 04 2006 - ke(a)suse.de - Update to version 2.13.4. * Wed Feb 22 2006 - ke(a)suse.de ++++++ yast2-trans-sl_SI-2.13.4.tar.bz2 -> yast2-trans-sl_SI-2.13.5.tar.bz2 ++++++ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-trans-sl_SI-2.13.4/VERSION new/yast2-trans-sl_SI-2.13.5/VERSION --- old/yast2-trans-sl_SI-2.13.4/VERSION 2006-04-04 13:22:16.000000000 +0200 +++ new/yast2-trans-sl_SI-2.13.5/VERSION 2006-04-05 17:43:16.000000000 +0200 @@ -1 +1 @@ -2.13.4 +2.13.5 diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-trans-sl_SI-2.13.4/configure new/yast2-trans-sl_SI-2.13.5/configure --- old/yast2-trans-sl_SI-2.13.4/configure 2006-04-04 13:22:22.000000000 +0200 +++ new/yast2-trans-sl_SI-2.13.5/configure 2006-04-05 17:43:25.000000000 +0200 @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.59 for yast2-trans-sl_SI 2.13.4. +# Generated by GNU Autoconf 2.59 for yast2-trans-sl_SI 2.13.5. # # Report bugs to <http://www.suse.de/feedback>. # @@ -269,8 +269,8 @@ # Identity of this package. PACKAGE_NAME='yast2-trans-sl_SI' PACKAGE_TARNAME='yast2-trans-sl_SI' -PACKAGE_VERSION='2.13.4' -PACKAGE_STRING='yast2-trans-sl_SI 2.13.4' +PACKAGE_VERSION='2.13.5' +PACKAGE_STRING='yast2-trans-sl_SI 2.13.5' PACKAGE_BUGREPORT='http://www.suse.de/feedback' ac_unique_file="RPMNAME" @@ -728,7 +728,7 @@ # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures yast2-trans-sl_SI 2.13.4 to adapt to many kinds of systems. +\`configure' configures yast2-trans-sl_SI 2.13.5 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -795,7 +795,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of yast2-trans-sl_SI 2.13.4:";; + short | recursive ) echo "Configuration of yast2-trans-sl_SI 2.13.5:";; esac cat <<\_ACEOF @@ -910,7 +910,7 @@ test -n "$ac_init_help" && exit 0 if $ac_init_version; then cat <<\_ACEOF -yast2-trans-sl_SI configure 2.13.4 +yast2-trans-sl_SI configure 2.13.5 generated by GNU Autoconf 2.59 Copyright (C) 2003 Free Software Foundation, Inc. @@ -924,7 +924,7 @@ This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by yast2-trans-sl_SI $as_me 2.13.4, which was +It was created by yast2-trans-sl_SI $as_me 2.13.5, which was generated by GNU Autoconf 2.59. Invocation command line was $ $0 $@ @@ -1654,7 +1654,7 @@ # Define the identity of the package. PACKAGE='yast2-trans-sl_SI' - VERSION='2.13.4' + VERSION='2.13.5' cat >>confdefs.h <<_ACEOF @@ -1865,7 +1865,7 @@ -VERSION="2.13.4" +VERSION="2.13.5" RPMNAME="yast2-trans-sl_SI" MAINTAINER="Karl Eichwalder <ke(a)suse.de>" @@ -2761,7 +2761,7 @@ } >&5 cat >&5 <<_CSEOF -This file was extended by yast2-trans-sl_SI $as_me 2.13.4, which was +This file was extended by yast2-trans-sl_SI $as_me 2.13.5, which was generated by GNU Autoconf 2.59. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -2816,7 +2816,7 @@ cat >>$CONFIG_STATUS <<_ACEOF ac_cs_version="\\ -yast2-trans-sl_SI config.status 2.13.4 +yast2-trans-sl_SI config.status 2.13.5 configured by $0, generated by GNU Autoconf 2.59, with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\" diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-trans-sl_SI-2.13.4/configure.in new/yast2-trans-sl_SI-2.13.5/configure.in --- old/yast2-trans-sl_SI-2.13.4/configure.in 2006-04-04 13:22:19.000000000 +0200 +++ new/yast2-trans-sl_SI-2.13.5/configure.in 2006-04-05 17:43:22.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-trans-sl_SI, 2.13.4, http://www.suse.de/feedback, yast2-trans-sl_SI) +AC_INIT(yast2-trans-sl_SI, 2.13.5, http://www.suse.de/feedback, yast2-trans-sl_SI) 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.4" +VERSION="2.13.5" RPMNAME="yast2-trans-sl_SI" MAINTAINER="Karl Eichwalder <ke(a)suse.de>" diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-trans-sl_SI-2.13.4/po/control-center.sl_SI.po new/yast2-trans-sl_SI-2.13.5/po/control-center.sl_SI.po --- old/yast2-trans-sl_SI-2.13.4/po/control-center.sl_SI.po 2006-04-04 13:15:16.000000000 +0200 +++ new/yast2-trans-sl_SI-2.13.5/po/control-center.sl_SI.po 2006-04-05 17:37:55.000000000 +0200 @@ -13,7 +13,7 @@ "Project-Id-Version: control-center.sl_SI\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2006-03-13 14:12+0100\n" -"PO-Revision-Date: 2006-04-03 17:23+0200\n" +"PO-Revision-Date: 2006-04-04 08:25+0200\n" "Last-Translator: Matjaž Kaše <matjaz.kase(a)telemach.net>\n" "Language-Team: Slovenščina <sl(a)li.org>\n" "MIME-Version: 1.0\n" @@ -108,12 +108,12 @@ "YaST2 Control Center is not running as root.\n" "You will only see modules which do not require root privileges" msgstr "" -"Nadzorno središče YaST2 ni bil zagnan s korenskimi pravicami.\n" -"Prikazani bodo samo moduli, ki ne zahtevajo korenskih pravic." +"Nadzornega središča YaST2 niste zagnali s pravicami uporabnika root.\n" +"Prikazani bodo samo moduli, ki ne zahtevajo njegovih pravic." #: src/y2controlcenterview.cpp:419 msgid "Starting module %1..." -msgstr "Zagon modula %1..." +msgstr "Zaganjanje modula %1..." #. title of help message box with help text #: src/y2controlcenterview.cpp:491 @@ -123,7 +123,7 @@ #. button for message box with help text #: src/y2controlcenterview.cpp:493 msgid "Ok" -msgstr "OK" +msgstr "V redu" #. TODO: insert help text #. the helptext it self @@ -134,7 +134,7 @@ "\n" msgstr "" "Z izbiro ikone na levi lahko izbirate tip nastavitvenih\n" -"modulov, ki bodo prikazani (npr. Strojna ali Programska oprema).\n" +"modulov, ki bodo prikazani (npr. strojna oprema ali programska oprema).\n" "\n" #: src/y2controlcenterview.cpp:498 @@ -145,14 +145,14 @@ "Be patient, starting of modules can take some seconds.\n" "\n" msgstr "" -"Z izbiro ikone na desni strani zaženete ustrezni modul.\n" +"Z izbiro ikone na desni strani zaženete ustrezen modul.\n" "\n" "Bodite potrpežljivi, zagon modula lahko traja nekaj sekund.\n" "\n" #: src/y2controlcenterview.cpp:501 msgid "You can also search for keywords (e.g. modem) by clicking on the \"Search\" button" -msgstr "S pritiskom na gumb \"Išči\" lahko ičete tudi po ključnih besedah (npr. modem)" +msgstr "S pritiskom na gumb \"Išči\" lahko iščete tudi po ključnih besedah (npr. modem)" #: src/y2controlcenterview.cpp:567 msgid "Nothing found" @@ -162,14 +162,14 @@ #: src/y2controlcenterview.cpp:572 msgid "%1 module found" msgid_plural "%1 modules found" -msgstr[0] "našel modul %1" -msgstr[1] "našel %1 modula" -msgstr[2] "našel %1 module" +msgstr[0] "zaznan %1 modul" +msgstr[1] "zaznana %1 modula" +msgstr[2] "zaznani %1 moduli" msgstr[3] "našel %1 modulov" #: src/y2controlcenterview.cpp:580 msgid "No search string specified" -msgstr "Iskalni niz ni bil določen" +msgstr "Iskalni niz ni določen" #: src/yastmodules.cpp:85 msgid "" @@ -180,10 +180,10 @@ "permissions.\n" "\n" msgstr "" -"Seznama razpoložljivih sekcij ni možno sestaviti.\n" +"Seznama razpoložljivih odsekov ni mogoče sestaviti.\n" "\n" "To pomeni, da YaST2 ali to Nadzorno središče nista pravilno \n" -"nameščena ali da nimate dovolj uporabniških pravic.\n" +"nameščena ali da nimate zadostnih uporabniških pravic.\n" "\n" #: src/yastmodules.cpp:89 @@ -194,8 +194,8 @@ msgstr "" "V prvem primeru, ponovno namestite vse komponente YaST2, \n" "v drugem primeru pa poizkusite zagnati Nadzorno središče kot \n" -"korenski (root) uporabnik.\n" -"Prepričajte se tudi, da imate na disku še dovolj prostora. " +"uporabnik.root.\n" +"Prepričajte se tudi, da imate na disku dovolj prostora. " #: src/yastmodules.cpp:121 src/yastmodules.cpp:144 msgid "Directory %1 does not exist." diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-trans-sl_SI-2.13.4/po/control.sl_SI.po new/yast2-trans-sl_SI-2.13.5/po/control.sl_SI.po --- old/yast2-trans-sl_SI-2.13.4/po/control.sl_SI.po 2006-04-04 13:15:16.000000000 +0200 +++ new/yast2-trans-sl_SI-2.13.5/po/control.sl_SI.po 2006-04-05 17:37:56.000000000 +0200 @@ -13,7 +13,7 @@ "Project-Id-Version: control.sl_SI\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2006-03-13 14:14+0100\n" -"PO-Revision-Date: 2006-04-03 17:28+0200\n" +"PO-Revision-Date: 2006-04-04 08:24+0200\n" "Last-Translator: Matjaž Kaše <matjaz.kase(a)telemach.net>\n" "Language-Team: Slovenščina <sl(a)li.org>\n" "MIME-Version: 1.0\n" @@ -49,7 +49,7 @@ #: control/control.PROF.glade:101 control/control.SLD.glade:102 #: control/control.SLES.glade:143 control/control.glade:101 msgid "Update Settings" -msgstr "Posodobi nastavitve" +msgstr "Nastavitve za posodobitev" #: control/control.PROF.glade:132 control/control.SLD.glade:133 #: control/control.SLES.glade:190 control/control.SLES.glade:231 @@ -105,7 +105,7 @@ #: control/control.SLES.glade:330 control/control.SLES.glade:420 #: control/control.glade:218 control/control.glade:314 msgid "Disk Activation" -msgstr "&Aktiviranje diska" +msgstr "Aktiviranje diska" #: control/control.PROF.glade:224 control/control.PROF.glade:320 #: control/control.SLD.glade:225 control/control.SLD.glade:321 @@ -202,7 +202,7 @@ #: control/control.PROF.glade:339 control/control.SLD.glade:340 #: control/control.SLES.glade:445 control/control.glade:339 msgid "Update" -msgstr "Posodobi" +msgstr "Posodobitev" #: control/control.PROF.glade:342 control/control.SLD.glade:343 #: control/control.SLES.glade:448 control/control.glade:342 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun...

1 0

commit yast2-trans-hu
by root＠suse.de 05 Apr '06

05 Apr '06

Hello community, here is the log from the commit of package yast2-trans-hu checked in at Wed Apr 5 17:59:48 CEST 2006. -------- --- yast2-trans-hu/yast2-trans-hu.changes 2006-03-27 17:36:32.000000000 +0200 +++ yast2-trans-hu/yast2-trans-hu.changes 2006-04-05 17:42:14.000000000 +0200 @@ -1,0 +2,5 @@ +Wed Apr 5 17:41:44 2006 - ke(a)suse.de + +- Update to version 2.13.17. + +------------------------------------------------------------------------ Old: ---- yast2-trans-hu-2.13.16.tar.bz2 New: ---- yast2-trans-hu-2.13.17.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-trans-hu.spec ++++++ --- /var/tmp/diff_new_pack.32TVK1/_old 2006-04-05 17:59:31.000000000 +0200 +++ /var/tmp/diff_new_pack.32TVK1/_new 2006-04-05 17:59:31.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package yast2-trans-hu (Version 2.13.16) +# spec file for package yast2-trans-hu (Version 2.13.17) # # 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-trans-hu -Version: 2.13.16 +Version: 2.13.17 Release: 1 License: GPL Group: System/YaST BuildRoot: %{_tmppath}/%{name}-%{version}-build -Source0: yast2-trans-hu-2.13.16.tar.bz2 +Source0: yast2-trans-hu-2.13.17.tar.bz2 prefix: /usr Provides: locale(yast2:hu) BuildRequires: pkgconfig yast2-devtools @@ -33,7 +33,7 @@ %prep -%setup -n yast2-trans-hu-2.13.16 +%setup -n yast2-trans-hu-2.13.17 %build autoreconf --force --install @@ -65,6 +65,8 @@ /usr/share/YaST2/locale %changelog -n yast2-trans-hu +* Wed Apr 05 2006 - ke(a)suse.de +- Update to version 2.13.17. * Mon Mar 27 2006 - ke(a)suse.de - Update to version 2.13.16. * Wed Mar 22 2006 - ke(a)suse.de ++++++ yast2-trans-hu-2.13.16.tar.bz2 -> yast2-trans-hu-2.13.17.tar.bz2 ++++++ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-trans-hu-2.13.16/VERSION new/yast2-trans-hu-2.13.17/VERSION --- old/yast2-trans-hu-2.13.16/VERSION 2006-03-27 17:36:06.000000000 +0200 +++ new/yast2-trans-hu-2.13.17/VERSION 2006-04-05 17:41:44.000000000 +0200 @@ -1 +1 @@ -2.13.16 +2.13.17 diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-trans-hu-2.13.16/configure new/yast2-trans-hu-2.13.17/configure --- old/yast2-trans-hu-2.13.16/configure 2006-03-27 17:36:12.000000000 +0200 +++ new/yast2-trans-hu-2.13.17/configure 2006-04-05 17:41:52.000000000 +0200 @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.59 for yast2-trans-hu 2.13.16. +# Generated by GNU Autoconf 2.59 for yast2-trans-hu 2.13.17. # # Report bugs to <http://www.suse.de/feedback>. # @@ -269,8 +269,8 @@ # Identity of this package. PACKAGE_NAME='yast2-trans-hu' PACKAGE_TARNAME='yast2-trans-hu' -PACKAGE_VERSION='2.13.16' -PACKAGE_STRING='yast2-trans-hu 2.13.16' +PACKAGE_VERSION='2.13.17' +PACKAGE_STRING='yast2-trans-hu 2.13.17' PACKAGE_BUGREPORT='http://www.suse.de/feedback' ac_unique_file="RPMNAME" @@ -728,7 +728,7 @@ # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures yast2-trans-hu 2.13.16 to adapt to many kinds of systems. +\`configure' configures yast2-trans-hu 2.13.17 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -795,7 +795,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of yast2-trans-hu 2.13.16:";; + short | recursive ) echo "Configuration of yast2-trans-hu 2.13.17:";; esac cat <<\_ACEOF @@ -910,7 +910,7 @@ test -n "$ac_init_help" && exit 0 if $ac_init_version; then cat <<\_ACEOF -yast2-trans-hu configure 2.13.16 +yast2-trans-hu configure 2.13.17 generated by GNU Autoconf 2.59 Copyright (C) 2003 Free Software Foundation, Inc. @@ -924,7 +924,7 @@ This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by yast2-trans-hu $as_me 2.13.16, which was +It was created by yast2-trans-hu $as_me 2.13.17, which was generated by GNU Autoconf 2.59. Invocation command line was $ $0 $@ @@ -1654,7 +1654,7 @@ # Define the identity of the package. PACKAGE='yast2-trans-hu' - VERSION='2.13.16' + VERSION='2.13.17' cat >>confdefs.h <<_ACEOF @@ -1865,7 +1865,7 @@ -VERSION="2.13.16" +VERSION="2.13.17" RPMNAME="yast2-trans-hu" MAINTAINER="Karl Eichwalder <ke(a)suse.de>" @@ -2761,7 +2761,7 @@ } >&5 cat >&5 <<_CSEOF -This file was extended by yast2-trans-hu $as_me 2.13.16, which was +This file was extended by yast2-trans-hu $as_me 2.13.17, which was generated by GNU Autoconf 2.59. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -2816,7 +2816,7 @@ cat >>$CONFIG_STATUS <<_ACEOF ac_cs_version="\\ -yast2-trans-hu config.status 2.13.16 +yast2-trans-hu config.status 2.13.17 configured by $0, generated by GNU Autoconf 2.59, with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\" diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-trans-hu-2.13.16/configure.in new/yast2-trans-hu-2.13.17/configure.in --- old/yast2-trans-hu-2.13.16/configure.in 2006-03-27 17:36:08.000000000 +0200 +++ new/yast2-trans-hu-2.13.17/configure.in 2006-04-05 17:41:49.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-trans-hu, 2.13.16, http://www.suse.de/feedback, yast2-trans-hu) +AC_INIT(yast2-trans-hu, 2.13.17, http://www.suse.de/feedback, yast2-trans-hu) 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.16" +VERSION="2.13.17" RPMNAME="yast2-trans-hu" MAINTAINER="Karl Eichwalder <ke(a)suse.de>" diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-trans-hu-2.13.16/po/installation.hu.po new/yast2-trans-hu-2.13.17/po/installation.hu.po --- old/yast2-trans-hu-2.13.16/po/installation.hu.po 2006-03-27 17:28:38.000000000 +0200 +++ new/yast2-trans-hu-2.13.17/po/installation.hu.po 2006-04-05 17:36:23.000000000 +0200 @@ -5,6 +5,7 @@ # Copyright (C) 2002 SUSE Linux AG. # Copyright (C) 2000, 2001 SUSE GmbH. # Kéménczy Kálmán, 2006. +# Kéménczy Kálmán, 2006. # Marcel Hilzinger <hili(a)suselinux.hu>, 2001. # Sári Gábor <saga(a)tux.hu>, 2000. # Steve Varadi <svaradi(a)usa.com>, 2000. @@ -12,16 +13,15 @@ # Szabolcs Varga <shirokuma(a)shirokuma.hu>, 2005. # Keresztes Ákos <xsak(a)c2.hu>, 2006. # Kalman Kemenczy <kkemenczy(a)novell.com>, 2006. -# Kéménczy Kálmán, 2006. # msgid "" msgstr "" "Project-Id-Version: installation.hu\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2006-03-13 14:14+0100\n" -"PO-Revision-Date: 2006-03-27 16:21+0200\n" -"Last-Translator: Kéménczy Kálmán\n" -"Language-Team: <en(a)li.org>\n" +"POT-Creation-Date: 2006-03-28 23:07+0200\n" +"PO-Revision-Date: 2006-04-03 21:25+0100\n" +"Last-Translator: Szabolcs Varga <shirokuma(a)shirokuma.hu>\n" +"Language-Team: Hungarian <en(a)li.org>\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" @@ -37,6 +37,16 @@ msgid "&Dummy" msgstr "Ü&res" +#: src/clients/add-on_auto.ycp:55 +#, ycp-format +msgid "<li>Media: %1, Path: %2, Product: %3</li>\n" +msgstr "<li>Média: %1, Útvonal: %2, Termék: %3</li>\n" + +#. error report +#: src/clients/add-on_auto.ycp:123 +msgid "Failed to add Add-On Product." +msgstr "A Kiegészítő termékek telepítése sikertelen" + #. progress step title #: src/clients/copy_files_finish.ycp:45 msgid "Copying files to installed system..." @@ -57,48 +67,6 @@ msgid "Initializing fonts..." msgstr "Betűkészletek betöltése..." -# /usr/lib/YaST2/clients/inst_confirm_abort.ycp:76 -#. main screen heading -#: src/clients/inst_add-on.ycp:27 -msgid "Add-On Product Installation" -msgstr "Kiegészítő termék telepítése" - -#. placeholder for unknown path -#. placeholder for unknown URL -#. placeholder for unknown directory -#. place holder for unknown URL -#: src/clients/inst_add-on.ycp:34 src/clients/inst_add-on.ycp:40 -#: src/include/add-on-workflow.ycp:281 src/include/add-on-workflow.ycp:286 -msgid "Unknown" -msgstr "Ismeretlen" - -#. table cell, %1 is URL, %2 is directory name -#: src/clients/inst_add-on.ycp:38 src/include/add-on-workflow.ycp:284 -#, ycp-format -msgid "URL: %1, Directory: %2" -msgstr "URL: %1, könyvtár: %2" - -#: src/clients/inst_add-on.ycp:43 -#, ycp-format -msgid "Product %1" -msgstr "%1 termék" - -#. table header -#: src/clients/inst_add-on.ycp:48 -msgid "Media" -msgstr "Adathordozó" - -#. table header -#: src/clients/inst_add-on.ycp:50 -msgid "Product" -msgstr "Termék" - -# clients/inst_sw_single.ycp:1318 -#. message report -#: src/clients/inst_add-on.ycp:82 -msgid "Select a product to delete." -msgstr "Válassza ki az eltávolítani kívánt terméket." - #. strings for "ask for online update"-popup #: src/clients/inst_ask_online_update.ycp:34 msgid "Run Update" @@ -362,17 +330,17 @@ msgstr "Telepítési beállítások mentése" #. progress stage -#: src/clients/inst_finish.ycp:86 +#: src/clients/inst_finish.ycp:85 msgid "Prepare system for initial boot" msgstr "Az első indítás előkészítése" #. Headline for last dialog of base installation: Install LILO etc. -#: src/clients/inst_finish.ycp:149 +#: src/clients/inst_finish.ycp:148 msgid "Finishing Basic Installation" msgstr "Az alaptelepítés befejeződött" # /usr/lib/YaST2/clients/lan_inetd_custom.ycp:801 -#: src/clients/inst_finish.ycp:193 +#: src/clients/inst_finish.ycp:192 msgid "Finished." msgstr "Kész." @@ -382,22 +350,22 @@ msgstr "Nem &fogadom el" #. dialog caption -#: src/clients/inst_license.ycp:86 +#: src/clients/inst_license.ycp:85 src/modules/AddOnProduct.ycp:686 msgid "License Agreement" msgstr "Licencmegállapodás" #. radio button -#: src/clients/inst_license.ycp:102 +#: src/clients/inst_license.ycp:101 src/modules/AddOnProduct.ycp:702 msgid "Yes, I Agree to the License Agreement" msgstr "Igen, elfogadom a licencfeltételeket" #. radio button -#: src/clients/inst_license.ycp:106 +#: src/clients/inst_license.ycp:105 src/modules/AddOnProduct.ycp:706 msgid "No, I Do Not Agree" msgstr "Nem, nem fogadom el" #. help text -#: src/clients/inst_license.ycp:115 +#: src/clients/inst_license.ycp:114 src/modules/AddOnProduct.ycp:716 msgid "" "Read the license agreement carefully and select\n" "one of the available options. If you do not agree to the license agreement,\n" @@ -407,7 +375,7 @@ "a telepítés megszakad.\n" #. yes-no popup -#: src/clients/inst_license.ycp:149 +#: src/clients/inst_license.ycp:148 src/modules/AddOnProduct.ycp:823 msgid "Reread or reconsider the license agreement?" msgstr "Újra elolvassa vagy átgondolja a licencfeltételeket?" @@ -415,31 +383,31 @@ # modules/printconf/printconf_filter.ycp:124 # clients/printconf_filter.ycp:207 #. timed ok/cancel popup -#: src/clients/inst_license.ycp:163 +#: src/clients/inst_license.ycp:162 msgid "System is shutting down..." msgstr "A rendszer leáll..." #. message popup -#: src/clients/inst_license.ycp:180 +#: src/clients/inst_license.ycp:179 src/modules/AddOnProduct.ycp:837 msgid "Accept or decline the license agreement." msgstr "Fogadja el vagy utasítsa el a licencmegállapodást." # modules/inst_sw_select.ycp:111 # /usr/lib/YaST2/clients/inst_sw_select.ycp:177 #. label -#: src/clients/inst_mode.ycp:49 src/clients/inst_system_analysis.ycp:45 +#: src/clients/inst_mode.ycp:49 src/clients/inst_system_analysis.ycp:47 msgid "Evaluating root partition. One moment please..." msgstr "A gyökérpartíció kiértékelése - kis türelmet kérek..." #. a popup -#: src/clients/inst_mode.ycp:57 src/clients/inst_system_analysis.ycp:53 +#: src/clients/inst_mode.ycp:57 src/clients/inst_system_analysis.ycp:55 msgid "No Linux root partition found." msgstr "Nem található Linux gyökérpartíciót." #. Information popup: Inform user what partition #. will be booted from after user selected #. "Boot installed system" -#: src/clients/inst_mode.ycp:80 src/clients/inst_system_analysis.ycp:76 +#: src/clients/inst_mode.ycp:80 src/clients/inst_system_analysis.ycp:78 #, ycp-format msgid "Booting from %1" msgstr "Rendszerindítás a(z) %1 partícióról" @@ -480,7 +448,7 @@ "" #. help text for installation method -#: src/clients/inst_mode.ycp:164 src/clients/inst_system_analysis.ycp:154 +#: src/clients/inst_mode.ycp:164 src/clients/inst_system_analysis.ycp:156 msgid "" "\n" "Select New Installation if there is no existing Linux system on your\n" @@ -495,7 +463,7 @@ "" #. help text for installation method -#: src/clients/inst_mode.ycp:175 src/clients/inst_system_analysis.ycp:162 +#: src/clients/inst_mode.ycp:175 src/clients/inst_system_analysis.ycp:164 msgid "" "\n" "Select Update an Existing System to update a Linux system already\n" @@ -558,7 +526,7 @@ #. label for radio button 3: Start repair system #. radio button -#: src/clients/inst_mode.ycp:230 src/clients/inst_system_analysis.ycp:137 +#: src/clients/inst_mode.ycp:230 src/clients/inst_system_analysis.ycp:139 msgid "&Repair Installed System" msgstr "A &telepített rendszer visszaállítása" @@ -573,7 +541,7 @@ msgstr "Válasszon egyet" #. this is a label of a message box -#: src/clients/inst_mode.ycp:333 src/clients/inst_system_analysis.ycp:253 +#: src/clients/inst_mode.ycp:333 src/clients/inst_system_analysis.ycp:265 msgid "" "Choose one of the\n" "options to continue." @@ -641,7 +609,7 @@ #. push button #: src/clients/inst_proposal.ycp:741 msgid "&Show Release Notes" -msgstr "&Kiadási megjegyzések megjelenítése" +msgstr "&Kiadási megjegyzések" #. menu button item #: src/clients/inst_proposal.ycp:803 @@ -821,8 +789,12 @@ msgid "Release Notes" msgstr "Jegyzetek az új kiadáshoz" +#: src/clients/inst_release_notes.ycp:78 +msgid "&Product" +msgstr "&Termék" + #. help text for dialog "Release Notes" -#: src/clients/inst_release_notes.ycp:86 +#: src/clients/inst_release_notes.ycp:85 msgid "" "Here are the release notes for the installed\n" "Linux system. They provide a brief summary of new features and changes." @@ -890,11 +862,16 @@ # modules/printconf/printconf_manuf_model.ycp:71 # clients/printconf_manuf_model.ycp:96 #. strings for main (wizard) layout -#: src/clients/inst_suse_register.ycp:48 +#. Transltors: This is title/brand - only translate the Configuration +#: src/clients/inst_suse_register.ycp:54 msgid "Novell Customer Center Configuration" msgstr "Novell-ügyfélközpont (Customer Center) beállításai" -#: src/clients/inst_suse_register.ycp:49 +#: src/clients/inst_suse_register.ycp:55 +msgid "Update Configuration" +msgstr "Beállítások frissítése" + +#: src/clients/inst_suse_register.ycp:61 msgid "" "Get technical support and product updates and\n" "manage subscriptions with Novell Customer Center." @@ -903,54 +880,64 @@ " frissíéseket kaphat és kezelheti az előfizetésekkel kapcsolatos információkat." # clients/lan_complex.ycp:347 -#: src/clients/inst_suse_register.ycp:52 +#: src/clients/inst_suse_register.ycp:67 msgid "Configure Now (Recommended)" msgstr "Beállítás most (ajánlott)" -#: src/clients/inst_suse_register.ycp:53 +#: src/clients/inst_suse_register.ycp:68 msgid "Configure Later" msgstr "Beállítás később" -# clients/printconf.ycp:323 -#: src/clients/inst_suse_register.ycp:55 -msgid "Include Extra Information" -msgstr "További információk hozzáadása" - -#: src/clients/inst_suse_register.ycp:56 +#: src/clients/inst_suse_register.ycp:70 +msgid "Include for Convenience" +msgstr "A kényelem érdekében" + +#. Translators: Text for UI Label - capitalized +#: src/clients/inst_suse_register.ycp:71 +#: src/clients/suse_register_auto.ycp:198 msgid "Hardware Profile" msgstr "Hardverprofil" -#: src/clients/inst_suse_register.ycp:57 -msgid "Optional Data" -msgstr "Opcionális adat" - -# clients/printconf.ycp:323 -#: src/clients/inst_suse_register.ycp:58 -msgid "Preview Information" -msgstr "Információk előnézete" +#. Translators: Text for UI Label - capitalized +#: src/clients/inst_suse_register.ycp:72 +#: src/clients/suse_register_auto.ycp:200 +msgid "Optional Information" +msgstr "Részletes adatok" + +#: src/clients/inst_suse_register.ycp:73 +msgid "Registration Code" +msgstr "Regisztrációs kód" + +# modules/inst_sw_select.ycp:159 +# /usr/lib/YaST2/clients/inst_sw_select.ycp:262 +# clients/inst_sw_select.ycp:256 +#: src/clients/inst_suse_register.ycp:74 +#: src/clients/inst_suse_register.ycp:164 +msgid "Details..." +msgstr "Részletek..." #. strings for success popup -#: src/clients/inst_suse_register.ycp:62 +#: src/clients/inst_suse_register.ycp:78 msgid "Your configuration was successful." msgstr "A beállítás sikerült." #. strings for manual interaction popup -#: src/clients/inst_suse_register.ycp:66 +#: src/clients/inst_suse_register.ycp:82 msgid "Manual Interaction Required" msgstr "Kézi beavatkozásra van szükség" -#: src/clients/inst_suse_register.ycp:67 +#: src/clients/inst_suse_register.ycp:83 msgid "Needed Information" msgstr "Szükséges információ" # modules/inst_sw_select.ycp:125 # /usr/lib/YaST2/clients/inst_sw_select.ycp:194 # clients/online_update.ycp:39 -#: src/clients/inst_suse_register.ycp:68 +#: src/clients/inst_suse_register.ycp:84 msgid "Continue" msgstr "Folytatás" -#: src/clients/inst_suse_register.ycp:69 +#: src/clients/inst_suse_register.ycp:86 msgid "" "A Web browser will start in which to complete\n" "the configuration on the opened Web site." @@ -958,13 +945,13 @@ "A beállítások befejezése egy weboldalon történik,\n" "ezért most elindul egy webböngésző." +# clients/printconf_ask_remote.ycp:236 #. string for show information popup -#: src/clients/inst_suse_register.ycp:75 -msgid "Information to Send" -msgstr "Továbbításra kerülő adatok" +#: src/clients/inst_suse_register.ycp:92 +msgid "Registration and Privacy Information" +msgstr "Regisztrációs és adatvédelmi információ" -#. strings for conflict popup -#: src/clients/inst_suse_register.ycp:78 +#: src/clients/inst_suse_register.ycp:96 msgid "" "The server requires additional system information. Activating \n" "submission of the hardware profile automatically." @@ -972,49 +959,123 @@ "A kiszolgáló további rendszeradatokat igényel. A hardverprofil\n" "elküldése automatikusan aktiválódik." +#. nonroot-message strings +#: src/clients/inst_suse_register.ycp:101 +msgid "Update Source Issues" +msgstr "Forrásfrissítési problémák" + +#: src/clients/inst_suse_register.ycp:103 +msgid "" +"Registering as a regular user does not include the update source\n" +"in the Online Update YaST module. If you continue and later want \n" +"to update with Online Update, the source must be added manually.\n" +"Other tools, such as Software Updater in the panel, can still be \n" +"used. Alternatively, cancel then register through YaST as root \n" +"so the sources are available to all tools." +msgstr "" +"A normál felhasználóként regisztrálásnak nem része a frissítési\n" +" forrás az Online frissítés YaST-modulban. Ha továbblép és később\n" +"frissíteni kíván az Online frissítés modullal, akkor a forrást\n" +"kézzel kellmajd felvennie. Más eszközök, például a panelen\n" +"található Szoftverfrissítő, továbbra is használható. Alternatív\n" +"megoldásként lépjen vissza, majd regisztráljon root felhasználónként\n" +"a YaST-ban, hogy a források minden eszköz számára elérhetők legyenek." + #. error messages -#: src/clients/inst_suse_register.ycp:83 +#: src/clients/inst_suse_register.ycp:114 msgid "Error: Recieved data is invalid." msgstr "Hiba: a fogadott adatok érvénytelenek!" -#: src/clients/inst_suse_register.ycp:84 +#: src/clients/inst_suse_register.ycp:115 msgid "Error: Could not retrieve data." msgstr "Hiba: az adatok lekérése nem sikerült!" -#. help text for dialog "Novell Customer Center Configuration" -#: src/clients/inst_suse_register.ycp:88 +#: src/clients/inst_suse_register.ycp:121 +msgid "" +"\n" +"Configure your system to enable online updates by registering it with Novell.\n" +"To do this now, select Configure Now. Delay the registration with\n" +"Configure Later.\n" +"" +msgstr "" +"\n" +"Regisztráljon a Novellnél és állítsa be a rendszeren az online frissítés lehetőségét.\n" +"Ehhez nyomja meg a Beállítás most gombot. Ha később kíván\n" +"regisztrálni, nyomja meg a Beállítás később gombot.\n" +"" + +#: src/clients/inst_suse_register.ycp:129 msgid "" -"Novell Customer Center Configuration\n" -"To be replaced by a useful text. This text should explain what we are doing here in this yast module." +"\n" +"To simplify the registration process, include information from your system\n" +"with Optional Information and Hardware Profile. \n" +"Details shows the maximum amount of information that can be involved\n" +" in your registration. To obtain this information, it contacts the Novell\n" +"server to query what information is needed for your product. Only the identity\n" +"of the installed product is sent in this initial exchange.\n" +"" msgstr "" -"Novell ügyfélközpont beállításai\n" -"Állítsa be a Novell ügyfélközpontot (Customer Center), hogy folyamatosan kapja a rendszerfrissítéseket." +"\n" +"A regisztrációs folyamat egyszerűsítése érdekében felvehet adatokat a rendszerről\n" +"az Opcionális adatok és a Hardverprofil gombokkal. \n" +"A Részletek mutatja, hogy maximum mennyi adat vesz részt a regisztrációban. Ezen adat megszerzéséhez kapcsolatba lép a Novell\n" +"szerverével és lekérdezi, hogy a termékhez milyen adatokra van szükség. A kezdeti csrében csak a telepített termék \n" +"azonosító adatai vesznek részt.\n" +"" -#: src/clients/inst_suse_register.ycp:195 +#: src/clients/inst_suse_register.ycp:140 +msgid "" +"\n" +"If you purchased your copy of this product, enable Registration Code\n" +"so you are prompted for your product code. \n" +"This registers you for the installation support included with your product.\n" +"" +msgstr "" +"\n" +"Ha vásárolta a termék példányát, jelölje meg a Regisztrációs kód négyzetet, hogy a\n" +"program bekérje a termékkódot. \n" +"Ez jegyzi be Önt a termékhez járó telepítési támogatáshoz.\n" +"" + +#: src/clients/inst_suse_register.ycp:148 +msgid "" +"\n" +"No information is passed to anyone outside Novell. The data is used for\n" +"statistical purposes and to enhance your convenience regarding driver support\n" +"and your Web account. Find a detailed privacy policy in Details. View\n" +"the transmitted information in the log file <tt>~/.suse_register.log</tt>.\n" +"" +msgstr "" +"\n" +"A Novellen kívül senki máshoz nem kerül semmilyen adat. Az adatokat\n" +"csak statisztikai célokra használjuk, valamint az Ön kényelmének\n" +"növelésére az illesztőprogramokkal kapcsolatos támogatást és a\n" +"webes fiókot illetően. A részletes adatvédelmi nyilatkozat a\n" +"Részletek gombot megnyomva olvasható. Az átküldött adatok\n" +"a <tt>~/.suse_register.log</tt> naplófájlban tekinthetők meg.\n" +"" + +#. further strings +#: src/clients/inst_suse_register.ycp:161 +msgid "Checking..." +msgstr "Ellenőrzés..." + +#: src/clients/inst_suse_register.ycp:162 msgid "Error" msgstr "Hiba" -#: src/clients/inst_suse_register.ycp:197 +#: src/clients/inst_suse_register.ycp:163 msgid "An error occurred while connecting to the server." msgstr "Hiba történt a kiszolgálóhoz való csatlakozás közben." -#: src/clients/inst_suse_register.ycp:201 -msgid "Details" -msgstr "Részletek" - -#: src/clients/inst_suse_register.ycp:212 +#: src/clients/inst_suse_register.ycp:165 msgid "Error Message" msgstr "Hibaüzenet" -#: src/clients/inst_suse_register.ycp:506 +#: src/clients/inst_suse_register.ycp:166 msgid "Starting Browser..." msgstr "Böngésző indítása..." -#. show the user, that we are doing something -#: src/clients/inst_suse_register.ycp:535 -msgid "Checking..." -msgstr "Ellenőrzés..." - #. ////////////////////////////////////////////////////////////////////////////// #. Main Dialog #. ////////////////////////////////////////////////////////////////////////////// @@ -1087,44 +1148,44 @@ " újra kell indítania a rendszert!\n" #. frame -#: src/clients/inst_system_analysis.ycp:103 -#: src/clients/inst_system_analysis.ycp:232 +#: src/clients/inst_system_analysis.ycp:105 +#: src/clients/inst_system_analysis.ycp:238 msgid "Installation Mode" msgstr "Telepítési mód" #. radio button -#: src/clients/inst_system_analysis.ycp:105 +#: src/clients/inst_system_analysis.ycp:107 msgid "New &Installation" msgstr "Új &telepítés" # clients/inst_sw_single.ycp:1408 #. radio button -#: src/clients/inst_system_analysis.ycp:109 +#: src/clients/inst_system_analysis.ycp:111 msgid "&Update" msgstr "&Frissítés" #. check box -#: src/clients/inst_system_analysis.ycp:114 +#: src/clients/inst_system_analysis.ycp:116 msgid "In&clude Add-On Products from Separate Media" msgstr "&Kiegészítő termékek is másik adathordozóról" #. push button -#: src/clients/inst_system_analysis.ycp:125 +#: src/clients/inst_system_analysis.ycp:127 msgid "&Other..." msgstr "&Egyéb..." #. frame -#: src/clients/inst_system_analysis.ycp:133 +#: src/clients/inst_system_analysis.ycp:135 msgid "Other Options" msgstr "Egyéb beállítások" #. radio button -#: src/clients/inst_system_analysis.ycp:140 +#: src/clients/inst_system_analysis.ycp:142 msgid "&Boot Installed System" msgstr "A &telepített rendszer indítása" #. help text for installation method -#: src/clients/inst_system_analysis.ycp:150 +#: src/clients/inst_system_analysis.ycp:152 msgid "" "<big>Installation Mode</big> \n" "Select what to do:" @@ -1133,7 +1194,7 @@ "Válassza ki a további teendőt:" #. help text for installation method -#: src/clients/inst_system_analysis.ycp:169 +#: src/clients/inst_system_analysis.ycp:171 msgid "" "\n" "To install an add-on product from separate media together with &product;, select\n" @@ -1144,7 +1205,7 @@ "Kiegészítő termékekkel másik adathordozóról lehetőséget.\n" #. help text for installation method -#: src/clients/inst_system_analysis.ycp:175 +#: src/clients/inst_system_analysis.ycp:177 msgid "" "Click Other then \n" "select Repair Installed System if you have a damaged Linux system on\n" @@ -1158,7 +1219,7 @@ "" #. help text for installation method -#: src/clients/inst_system_analysis.ycp:181 +#: src/clients/inst_system_analysis.ycp:183 msgid "" "Click Other then\n" "select Boot Installed System if you have a Linux system on your hard\n" @@ -1171,7 +1232,7 @@ "Ezzel a beállítással megpróbálhatja kijavítani automatikusan a hibákat.\n" "" -#: src/clients/inst_system_analysis.ycp:188 +#: src/clients/inst_system_analysis.ycp:190 msgid "Analyzing the Computer" msgstr "A számítógép vizsgálata" @@ -1211,7 +1272,7 @@ # clients/lan.ycp:384 #. } #. dialog caption -#: src/clients/installation.ycp:140 src/modules/AddOnProduct.ycp:689 +#: src/clients/installation.ycp:140 src/modules/AddOnProduct.ycp:915 msgid "Initializing..." msgstr "A modul indítása ..." @@ -1359,7 +1420,7 @@ msgstr "Időzóna-beállítások mentése..." #. progress step title -#: src/clients/save_config_finish.ycp:64 +#: src/clients/save_config_finish.ycp:66 msgid "Saving language..." msgstr "Nyelvi beállítások mentése..." @@ -1370,27 +1431,27 @@ # /usr/lib/YaST2/clients/lan_finish.ycp:281 # clients/lan_manual.ycp:117 #. progress step title -#: src/clients/save_config_finish.ycp:68 +#: src/clients/save_config_finish.ycp:71 msgid "Saving keyboard configuration..." msgstr "Billentyűzetkonfiguráció mentése..." #. progress step title -#: src/clients/save_config_finish.ycp:72 +#: src/clients/save_config_finish.ycp:75 msgid "Saving product information..." msgstr "Termékinformációk mentése..." #. progress step title -#: src/clients/save_config_finish.ycp:78 +#: src/clients/save_config_finish.ycp:81 msgid "Saving automatical installation settings..." msgstr "Automatikus telepítési beállítások mentése..." #. progress step title -#: src/clients/save_config_finish.ycp:83 +#: src/clients/save_config_finish.ycp:86 msgid "Saving console configuration..." msgstr "Konzol beállításainak mentése..." #. progress step title -#: src/clients/save_config_finish.ycp:88 +#: src/clients/save_config_finish.ycp:91 msgid "Configuring the superuser's environment..." msgstr "A superuser környezetének beállítása..." @@ -1406,6 +1467,112 @@ msgid "Copying SSH settings to installed system..." msgstr "SSH-beállítások másolása a telepített rendszerre..." +# modules/inst_sw_select.ycp:125 +# /usr/lib/YaST2/clients/inst_sw_select.ycp:194 +# clients/inst_sw_select.ycp:92 +#. Translators: Heading - capitalized +#: src/clients/suse_register_auto.ycp:64 +#: src/clients/suse_register_auto.ycp:176 +msgid "Product Registration" +msgstr "Termékregisztráció" + +#. Translators: Text in a sentece-like environment - normal capitalization +#: src/clients/suse_register_auto.ycp:66 +msgid "Run during autoinstallation" +msgstr "Futtatás az automatikus telepítés közben" + +#: src/clients/suse_register_auto.ycp:66 +msgid "Do not run during autoinstallation" +msgstr "Ne fusson az automatikus telepítés közben" + +#. Translators: Sentence-like text for singular and plural (incl. zero) of items +#: src/clients/suse_register_auto.ycp:70 +msgid "1 item of registration data" +msgstr "1 tételnyi regisztrációs adat." + +#: src/clients/suse_register_auto.ycp:70 +#, ycp-format +msgid "%1 items of registration data" +msgstr "%1 tételnyi regisztrációs adat." + +# clients/printconf.ycp:323 +#: src/clients/suse_register_auto.ycp:74 +msgid "Included Information" +msgstr "Mellékelt adatok" + +#. Translators: Text in a sentece-like environment - normal capitalization +#: src/clients/suse_register_auto.ycp:77 +msgid "Hardware profile" +msgstr "Hardverprofil" + +#. Translators: Text in a sentece-like environment - normal capitalization +#: src/clients/suse_register_auto.ycp:79 +msgid "Optional information" +msgstr "Opcionális adatok" + +#. TextEntry label +#: src/clients/suse_register_auto.ycp:128 +msgid "&Key" +msgstr "&Kulcs" + +#. TextEntry label +#: src/clients/suse_register_auto.ycp:130 +msgid "&Value" +msgstr "É&rték" + +#: src/clients/suse_register_auto.ycp:157 +msgid "Key is invalid." +msgstr "Érvénytelen kulcs" + +#: src/clients/suse_register_auto.ycp:179 +msgid "Product registration includes your product in Novell's database, enabling you to get online updates and technical support. To register while installing automatically, select Run Product Registration. To simplify the procedure, include information from your system with Hardware Profile and Optional Information." +msgstr "A termékregisztráció során a termék bekerül a Novell adatbázisába, hogy Ön online frissítésekhez és technikai támogatáshoz jusson. Az automatikus telepítés közbeni regisztrációhoz jelölje meg a Termékregisztráció futtatása lehetőséget. Az eljárás leegyszerűsítéséhez csatoljon adatokat a Hardverprofil és az Opcionális adatok kiválasztásával." + +#: src/clients/suse_register_auto.ycp:182 +msgid "Get more information about the registration process with <tt>suse_register -h</tt>." +msgstr "A regisztrációs folyamattal kapcsolatos további információ a <tt>suse_register -h</tt> paranccsal érhető el." + +#: src/clients/suse_register_auto.ycp:185 +msgid "Other information used for registration is shown in Registration Data. Add a new key and value pair by pressing Add then entering the appropriate values. These parameters are those that can be passed with <tt>suse_register -a</tt>. Get more information about them with <tt>suse_register -p</tt>. Remove a pair with Delete or modify an existing pair with Edit." +msgstr "A regisztrációhoz használt egyéb adatok a Regisztrációs adatok ablakban láthatók. Új kulcs-érték párt a Hozzáadás gombra kattintva, majd a megfelelő értékeket beírva vehet fel. Ezek a <tt>suse_register -a</tt> paranccsal átadható paraméterek. További információ róluk a <tt>suse_register -p</tt> paranccsal kérhető. Egy pár törléséhez nyomja meg a Törlés gombot, a módosításukhoz pedig a Módosítás gombot." + +# /usr/lib/YaST2/clients/inst_confirm_abort.ycp:76 +#. Translators: Text for UI Label - capitalized +#: src/clients/suse_register_auto.ycp:193 +msgid "Run Product Registration" +msgstr "Termékregisztráció indítása" + +# clients/printconf.ycp:323 +#. Translators: Text for UI Label - capitalized +#: src/clients/suse_register_auto.ycp:196 +msgid "Include in Registration" +msgstr "Regisztrációban szerepeltetés" + +#. Translators: Text for UI Label - capitalized +#: src/clients/suse_register_auto.ycp:205 +msgid "Registration Data to Use" +msgstr "Használandó regisztrációs adatok" + +#: src/clients/suse_register_auto.ycp:206 +msgid "Key" +msgstr "Kulcs" + +#: src/clients/suse_register_auto.ycp:206 +msgid "Value" +msgstr "Érték" + +#: src/clients/suse_register_auto.ycp:208 +msgid "Ad&d" +msgstr "&Hozzáadás" + +#: src/clients/suse_register_auto.ycp:209 +msgid "&Edit" +msgstr "&Szerkesztés" + +#: src/clients/suse_register_auto.ycp:210 +msgid "De&lete" +msgstr "Tör&lés" + #. progress step title #: src/clients/switch_scr_finish.ycp:42 msgid "Moving to installed system..." @@ -1487,65 +1654,65 @@ # modules/inst_config_x11.ycp:216 # /usr/lib/YaST2/clients/inst_config_x11.ycp:865 #. radio button -#: src/include/add-on-workflow.ycp:43 +#: src/include/add-on-workflow.ycp:61 msgid "&Scan Using SLP..." msgstr "Keresés &SLP-vel..." # clients/inst_source.ycp:161 #. radio button -#: src/include/add-on-workflow.ycp:45 +#: src/include/add-on-workflow.ycp:63 msgid "&FTP..." msgstr "&FTP..." # clients/inst_source.ycp:161 #. radio button -#: src/include/add-on-workflow.ycp:47 +#: src/include/add-on-workflow.ycp:65 msgid "&HTTP..." msgstr "&HTTP..." # clients/inst_source.ycp:161 #. radio button -#: src/include/add-on-workflow.ycp:49 +#: src/include/add-on-workflow.ycp:67 msgid "HTT&PS..." msgstr "HTT&PS..." #. radio button -#: src/include/add-on-workflow.ycp:51 +#: src/include/add-on-workflow.ycp:69 msgid "&SMB/CIFS" msgstr "&SMB/CIFS" #. radio button -#: src/include/add-on-workflow.ycp:53 +#: src/include/add-on-workflow.ycp:71 msgid "&NFS..." msgstr "&NFS..." #. radio button -#: src/include/add-on-workflow.ycp:55 +#: src/include/add-on-workflow.ycp:73 src/include/add-on-workflow.ycp:95 msgid "&CD..." msgstr "&CD..." #. radio button -#: src/include/add-on-workflow.ycp:57 +#: src/include/add-on-workflow.ycp:75 src/include/add-on-workflow.ycp:97 msgid "&DVD..." msgstr "&DVD..." #. radio button -#: src/include/add-on-workflow.ycp:59 +#: src/include/add-on-workflow.ycp:77 src/include/add-on-workflow.ycp:99 msgid "&Local Directory..." msgstr "Helyi köny&vtár..." #. radio button -#: src/include/add-on-workflow.ycp:61 +#: src/include/add-on-workflow.ycp:79 msgid "Specify &URL..." msgstr "&URL megadása..." #. dialog caption -#: src/include/add-on-workflow.ycp:67 +#: src/include/add-on-workflow.ycp:106 msgid "Add-On Product Media" msgstr "Kiegészítő termék adathordozója" #. help -#: src/include/add-on-workflow.ycp:69 +#: src/include/add-on-workflow.ycp:108 msgid "" "<big>Catalog Media</big> \n" "Add-on products can be installed from CD, over a\n" @@ -1556,7 +1723,7 @@ "vagy a merevlemezről is.\n" #. help, continued -#: src/include/add-on-workflow.ycp:75 +#: src/include/add-on-workflow.ycp:114 msgid "" "\n" "To install add-on product from CD,\n" @@ -1566,7 +1733,7 @@ "A kiegészítő termék CD-ről történő telepítéshez legyen kéznél a termék CD vagy DVD készlete." #. help, continued -#: src/include/add-on-workflow.ycp:80 +#: src/include/add-on-workflow.ycp:119 msgid "" "\n" "The product CDs can be copied to the hard disk.\n" @@ -1582,7 +1749,7 @@ "Ha az összes CD tartalmát egy könyvtárba másolta, akkor csak az alapútvonalat kell megadni.\n" #. help, continued -#: src/include/add-on-workflow.ycp:89 +#: src/include/add-on-workflow.ycp:128 msgid "" "\n" "Network installation requires a working network connection.\n" @@ -1596,56 +1763,77 @@ # /usr/lib/YaST2/clients/inst_confirm_abort.ycp:69 #. yes-no popup -#: src/include/add-on-workflow.ycp:115 src/include/add-on-workflow.ycp:319 -#: src/include/add-on-workflow.ycp:430 +#. popup question +#: src/include/add-on-workflow.ycp:154 src/include/add-on-workflow.ycp:375 +#: src/include/add-on-workflow.ycp:512 src/modules/AddOnProduct.ycp:813 msgid "Really abort add-on product installation?" msgstr "Valóban megszakítja a kiegészítő termék telepítését?" #. translators: popup busy message -#: src/include/add-on-workflow.ycp:126 +#: src/include/add-on-workflow.ycp:165 msgid "Scanning network..." msgstr "Keresés a hálózaton..." #. error popup -#: src/include/add-on-workflow.ycp:132 +#: src/include/add-on-workflow.ycp:171 msgid "No SLP catalogs found." msgstr "Nem található SLP katalógus." #. translators: popup heading -#: src/include/add-on-workflow.ycp:146 +#: src/include/add-on-workflow.ycp:185 msgid "Choose SLP Catalog" msgstr "SLP katalógus kiválasztása" #. table header -#: src/include/add-on-workflow.ycp:151 +#: src/include/add-on-workflow.ycp:190 msgid "Type" msgstr "Típus" #. table header -#: src/include/add-on-workflow.ycp:153 +#: src/include/add-on-workflow.ycp:192 msgid "URL" msgstr "URL" -#: src/include/add-on-workflow.ycp:206 +#: src/include/add-on-workflow.ycp:245 msgid "Insert the add-on product CD" msgstr "Tegye be a Kigészítő termék CD-t" -#: src/include/add-on-workflow.ycp:214 +#: src/include/add-on-workflow.ycp:253 msgid "Insert the add-on product DVD" msgstr "Tegye be a Kigészítő termék DVD-t" #. error report -#: src/include/add-on-workflow.ycp:255 +#: src/include/add-on-workflow.ycp:294 msgid "No catalog found on medium." msgstr "Az adathordozón nem található katalógus." +#. error report +#: src/include/add-on-workflow.ycp:315 src/include/add-on-workflow.ycp:416 +msgid "Failed to initialize the catalog." +msgstr "A katalógus inicializálása nem sikerült." + +#. placeholder for unknown directory +#. place holder for unknown URL +#. placeholder for unknown path +#. placeholder for unknown URL +#: src/include/add-on-workflow.ycp:337 src/include/add-on-workflow.ycp:342 +#: src/include/add-on-workflow.ycp:596 src/include/add-on-workflow.ycp:602 +msgid "Unknown" +msgstr "Ismeretlen" + +#. table cell, %1 is URL, %2 is directory name +#: src/include/add-on-workflow.ycp:340 src/include/add-on-workflow.ycp:600 +#, ycp-format +msgid "URL: %1, Directory: %2" +msgstr "URL: %1, könyvtár: %2" + #. dialog caption -#: src/include/add-on-workflow.ycp:290 +#: src/include/add-on-workflow.ycp:346 msgid "Catalog Selection" msgstr "Katalógus kiválasztása" #. help text -#: src/include/add-on-workflow.ycp:292 +#: src/include/add-on-workflow.ycp:348 msgid "" "<big>Catalog Selection</big> \n" "There were multiple catalogs found on the selected medium.\n" @@ -1657,17 +1845,17 @@ # modules/sound/sound.ycp:199 modules/sound/sound.ycp:915 #. popup message -#: src/include/add-on-workflow.ycp:335 +#: src/include/add-on-workflow.ycp:391 msgid "Select a catalog." msgstr "Válasszon ki egy katalógust" #. table cell -#: src/include/add-on-workflow.ycp:375 +#: src/include/add-on-workflow.ycp:450 msgid "No product found in the catalog" msgstr "A katalógusban egy termék sem található" #. message popup -#: src/include/add-on-workflow.ycp:388 +#: src/include/add-on-workflow.ycp:465 msgid "Dependencies of the add-on product cannot be fullfilled." msgstr "A Kiegészítő termék függőségei nem teljesíthetők" @@ -1675,17 +1863,17 @@ # /usr/lib/YaST2/clients/inst_sw_select.ycp:194 # clients/inst_sw_select.ycp:92 #. dialog caption -#: src/include/add-on-workflow.ycp:403 +#: src/include/add-on-workflow.ycp:485 msgid "Product Selection" msgstr "Termék kiválasztása" #. multi selection list -#: src/include/add-on-workflow.ycp:407 +#: src/include/add-on-workflow.ycp:489 msgid "Available Products" msgstr "Rendelkezésre álló termékek" #. help text -#: src/include/add-on-workflow.ycp:411 +#: src/include/add-on-workflow.ycp:493 msgid "" "<big>Product Selection</big> \n" "There were multiple products found in the catalog. Select the products\n" @@ -1696,17 +1884,46 @@ "kívánja telepíteni.\n" #. message popup -#: src/include/add-on-workflow.ycp:447 +#: src/include/add-on-workflow.ycp:529 msgid "Dependencies of the selected add-on products cannot be fullfilled." msgstr "A kiválasztott Kiegészítő termékek függőségei nem teljesíthetők" +# /usr/lib/YaST2/clients/inst_confirm_abort.ycp:76 +#. main screen heading +#: src/include/add-on-workflow.ycp:589 +msgid "Add-On Product Installation" +msgstr "Kiegészítő termék telepítése" + +#: src/include/add-on-workflow.ycp:605 +#, ycp-format +msgid "Product %1" +msgstr "%1 termék" + +#. table header +#: src/include/add-on-workflow.ycp:610 +msgid "Media" +msgstr "Adathordozó" + +#. table header +#: src/include/add-on-workflow.ycp:612 +msgid "Product" +msgstr "Termék" + +# clients/inst_sw_single.ycp:1318 +#. message report +#: src/include/add-on-workflow.ycp:641 +msgid "Select a product to delete." +msgstr "Válassza ki az eltávolítani kívánt terméket." + +#. popup error #. error report -#: src/modules/AddOnProduct.ycp:672 +#: src/modules/AddOnProduct.ycp:767 src/modules/AddOnProduct.ycp:788 +#: src/modules/AddOnProduct.ycp:892 msgid "An error occurred while preparing the installation system." msgstr "Hiba történt a telepítőrendszer előkészítése közben" #. error report -#: src/modules/AddOnProduct.ycp:681 +#: src/modules/AddOnProduct.ycp:907 #, ycp-format msgid "Control file %1 not found on media." msgstr "A(z) %1 vezérlőfájl nem található az adathordozón." diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-trans-hu-2.13.16/po/status.txt new/yast2-trans-hu-2.13.17/po/status.txt --- old/yast2-trans-hu-2.13.16/po/status.txt 2006-03-27 17:30:04.000000000 +0200 +++ new/yast2-trans-hu-2.13.17/po/status.txt 2006-04-05 17:37:40.000000000 +0200 @@ -1,6 +1,6 @@ -Translated : 14994 +Translated : 15026 Fuzzy : 0 Untranslated : 0 -------------------- - All strings : 14994 + All strings : 15026 100 % are translated ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun...

1 0

commit yast2-online-update
by root＠suse.de 05 Apr '06

05 Apr '06

Hello community, here is the log from the commit of package yast2-online-update checked in at Wed Apr 5 17:59:26 CEST 2006. -------- --- yast2-online-update/yast2-online-update.changes 2006-04-04 13:28:05.000000000 +0200 +++ yast2-online-update/yast2-online-update.changes 2006-04-05 17:39:29.000000000 +0200 @@ -1,0 +2,6 @@ +Wed Apr 5 16:51:25 CEST 2006 - jsuchome(a)suse.cz + +- changed label for "Skipping interactive patches" +- 2.13.21 + +------------------------------------------------------------------- Old: ---- yast2-online-update-2.13.20.tar.bz2 New: ---- yast2-online-update-2.13.21.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-online-update.spec ++++++ --- /var/tmp/diff_new_pack.t5cI5c/_old 2006-04-05 17:58:54.000000000 +0200 +++ /var/tmp/diff_new_pack.t5cI5c/_new 2006-04-05 17:58:54.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package yast2-online-update (Version 2.13.20) +# spec file for package yast2-online-update (Version 2.13.21) # # 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.20 +Version: 2.13.21 Release: 1 License: GPL Group: System/YaST BuildRoot: %{_tmppath}/%{name}-%{version}-build -Source0: yast2-online-update-2.13.20.tar.bz2 +Source0: yast2-online-update-2.13.21.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.20 +%setup -n yast2-online-update-2.13.21 %build %{prefix}/bin/y2tool y2autoconf @@ -114,6 +114,9 @@ %{prefix}/share/applications/YaST2/cd_update.desktop %changelog -n yast2-online-update +* Wed Apr 05 2006 - jsuchome(a)suse.cz +- changed label for "Skipping interactive patches" +- 2.13.21 * Tue Apr 04 2006 - jsuchome(a)suse.cz - fixed reading the cron rule (#161253) - 2.13.20 ++++++ yast2-online-update-2.13.20.tar.bz2 -> yast2-online-update-2.13.21.tar.bz2 ++++++ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-online-update-2.13.20/VERSION new/yast2-online-update-2.13.21/VERSION --- old/yast2-online-update-2.13.20/VERSION 2006-04-04 13:20:13.000000000 +0200 +++ new/yast2-online-update-2.13.21/VERSION 2006-04-05 16:52:01.000000000 +0200 @@ -1 +1 @@ -2.13.20 +2.13.21 diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-online-update-2.13.20/src/AutoOnlineUpdate.ycp new/yast2-online-update-2.13.21/src/AutoOnlineUpdate.ycp --- old/yast2-online-update-2.13.20/src/AutoOnlineUpdate.ycp 2006-04-04 09:58:43.000000000 +0200 +++ new/yast2-online-update-2.13.21/src/AutoOnlineUpdate.ycp 2006-04-04 13:28:32.000000000 +0200 @@ -4,7 +4,7 @@ * Summary: Data for configuration of AutoOnlineUpdate, input and output functions. * Authors: Anas Nashif <nashif(a)suse.de> * - * $Id: AutoOnlineUpdate.ycp 29207 2006-03-21 11:43:03Z mvidner $ + * $Id: AutoOnlineUpdate.ycp 29650 2006-04-04 11:28:28Z jsuchome $ * * Representation of the configuration of AutoOnlineUpdate. * Input and output routines. diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-online-update-2.13.20/src/OnlineUpdateDialogs.ycp new/yast2-online-update-2.13.21/src/OnlineUpdateDialogs.ycp --- old/yast2-online-update-2.13.20/src/OnlineUpdateDialogs.ycp 2006-03-31 08:53:38.000000000 +0200 +++ new/yast2-online-update-2.13.21/src/OnlineUpdateDialogs.ycp 2006-04-05 16:43:17.000000000 +0200 @@ -135,6 +135,7 @@ `HSpacing( 0.8 ), `Left (`CheckBox( `id( `skipPre), // checkbox label + true ? _("Skip Interactive Patches") : _("Skip Patches with Preinstall Information"), skipPre) ), diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-online-update-2.13.20/yast2-online-update-2.13.20/online-update.pot new/yast2-online-update-2.13.21/yast2-online-update-2.13.20/online-update.pot --- old/yast2-online-update-2.13.20/yast2-online-update-2.13.20/online-update.pot 2006-02-17 11:41:23.000000000 +0100 +++ new/yast2-online-update-2.13.21/yast2-online-update-2.13.20/online-update.pot 1970-01-01 01:00:00.000000000 +0100 @@ -1,298 +0,0 @@ -# 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 "" -"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." -msgstr "" - -#: src/online_update_install.ycp:61 -msgid "" -"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.\n" -msgstr "" - -#: src/online_update_install.ycp:67 -msgid "" -"After patches are installed, the downloaded\n" -"data is no longer needed. To delete this data, activate \n" -"Remove Source Packages after Update.\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 "" -"YaST Online Update (YOU) is the easy way to get all recommended\n" -"patches and security fixes from a SuSE update server.\n" -"\n" -msgstr "" - -#: src/online_update_start.ycp:372 -msgid "" -"\n" -"If Manually Select Patches is checked, all available patches will be shown\n" -"from which to select the patches to install. \n" -"If Reload All Patches from Server is checked, all patches will be fetched\n" -"from the server even when they already are locally available from a previous\n" -"download.\n" -"\n" -msgstr "" - -#: src/online_update_start.ycp:381 -msgid "" -"After clicking New Server, select a local\n" -"installation source instead of an FTP or HTTP server or select\n" -"another FTP or HTTP server. Click Edit Server to edit the location of the\n" -"selected server.\n" -msgstr "" - -#: src/online_update_start.ycp:387 -msgid "" -"Clicking Configure Fully Automatic Update\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.\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 "" diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-online-update-2.13.20/yast2-online-update-2.13.21/online-update.pot new/yast2-online-update-2.13.21/yast2-online-update-2.13.21/online-update.pot --- old/yast2-online-update-2.13.20/yast2-online-update-2.13.21/online-update.pot 1970-01-01 01:00:00.000000000 +0100 +++ new/yast2-online-update-2.13.21/yast2-online-update-2.13.21/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 "" +"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." +msgstr "" + +#: src/online_update_install.ycp:61 +msgid "" +"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.\n" +msgstr "" + +#: src/online_update_install.ycp:67 +msgid "" +"After patches are installed, the downloaded\n" +"data is no longer needed. To delete this data, activate \n" +"Remove Source Packages after Update.\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 "" +"YaST Online Update (YOU) is the easy way to get all recommended\n" +"patches and security fixes from a SuSE update server.\n" +"\n" +msgstr "" + +#: src/online_update_start.ycp:372 +msgid "" +"\n" +"If Manually Select Patches is checked, all available patches will be shown\n" +"from which to select the patches to install. \n" +"If Reload All Patches from Server is checked, all patches will be fetched\n" +"from the server even when they already are locally available from a previous\n" +"download.\n" +"\n" +msgstr "" + +#: src/online_update_start.ycp:381 +msgid "" +"After clicking New Server, select a local\n" +"installation source instead of an FTP or HTTP server or select\n" +"another FTP or HTTP server. Click Edit Server to edit the location of the\n" +"selected server.\n" +msgstr "" + +#: src/online_update_start.ycp:387 +msgid "" +"Clicking Configure Fully Automatic Update\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.\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

commit yast2-installation
by root＠suse.de 05 Apr '06

05 Apr '06

Hello community, here is the log from the commit of package yast2-installation checked in at Wed Apr 5 17:57:37 CEST 2006. -------- --- yast2-installation/yast2-installation.changes 2006-04-04 18:19:17.000000000 +0200 +++ yast2-installation/yast2-installation.changes 2006-04-05 17:12:26.000000000 +0200 @@ -1,0 +2,7 @@ +Wed Apr 5 17:05:27 CEST 2006 - jsrain(a)suse.de + +- do not rewrite log from SCR running in chroot during installation +- fix checking for duplicate sources (#159662) +- 2.13.59 + +------------------------------------------------------------------- Old: ---- yast2-installation-2.13.58.tar.bz2 New: ---- yast2-installation-2.13.59.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-installation.spec ++++++ --- /var/tmp/diff_new_pack.CZbgFq/_old 2006-04-05 17:55:55.000000000 +0200 +++ /var/tmp/diff_new_pack.CZbgFq/_new 2006-04-05 17:55:55.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package yast2-installation (Version 2.13.58) +# spec file for package yast2-installation (Version 2.13.59) # # 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.58 +Version: 2.13.59 Release: 1 License: GPL Group: System/YaST BuildRoot: %{_tmppath}/%{name}-%{version}-build -Source0: yast2-installation-2.13.58.tar.bz2 +Source0: yast2-installation-2.13.59.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.58 +%setup -n yast2-installation-2.13.59 %build %{prefix}/bin/y2tool y2autoconf @@ -106,6 +106,10 @@ /usr/X11R6/share/fvwm/ %changelog -n yast2-installation +* Wed Apr 05 2006 - jsrain(a)suse.de +- do not rewrite log from SCR running in chroot during installation +- fix checking for duplicate sources (#159662) +- 2.13.59 * Tue Apr 04 2006 - jdsn(a)suse.de - fixed w3m registration again (#162462) - changed Requires to Recommends for suseRegister (hmuelle, aj) ++++++ yast2-installation-2.13.58.tar.bz2 -> yast2-installation-2.13.59.tar.bz2 ++++++ ++++ 14117 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.58/VERSION new/yast2-installation-2.13.59/VERSION --- old/yast2-installation-2.13.58/VERSION 2006-04-04 15:33:44.000000000 +0200 +++ new/yast2-installation-2.13.59/VERSION 2006-04-05 17:06:50.000000000 +0200 @@ -1 +1 @@ -2.13.58 +2.13.59 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.58/configure.in new/yast2-installation-2.13.59/configure.in --- old/yast2-installation-2.13.58/configure.in 2006-04-04 18:17:23.000000000 +0200 +++ new/yast2-installation-2.13.59/configure.in 2006-04-05 17:12:13.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-installation, 2.13.58, http://www.suse.de/feedback, yast2-installation) +AC_INIT(yast2-installation, 2.13.59, 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.58" +VERSION="2.13.59" 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.58/control/docs/control-doc.xml new/yast2-installation-2.13.59/control/docs/control-doc.xml --- old/yast2-installation-2.13.58/control/docs/control-doc.xml 2006-03-15 16:33:54.000000000 +0100 +++ new/yast2-installation-2.13.59/control/docs/control-doc.xml 2006-02-02 19:55:05.000000000 +0100 @@ -28,7 +28,7 @@ 0.1 </revnumber> <date> - $Date: 2004-10-27 16:25:24 +0200 (Wed, 27 Oct 2004) $ + $Date: 2004-10-27 08:25:24 -0600 (Wed, 27 Oct 2004) $ </date> <revremark>Initial Release as PDF</revremark> </revision> 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.58/src/clients/copy_logs_finish.ycp new/yast2-installation-2.13.59/src/clients/copy_logs_finish.ycp --- old/yast2-installation-2.13.58/src/clients/copy_logs_finish.ycp 2006-03-15 16:33:55.000000000 +0100 +++ new/yast2-installation-2.13.59/src/clients/copy_logs_finish.ycp 2006-04-04 20:08:27.000000000 +0200 @@ -8,7 +8,7 @@ * Authors: * Jiri Srain <jsrain(a)suse.cz> * - * $Id: copy_logs_finish.ycp 27936 2006-02-13 20:01:14Z olh $ + * $Id: copy_logs_finish.ycp 29684 2006-04-04 18:07:34Z jsrain $ * */ @@ -60,7 +60,7 @@ InjectRenamedFile( Directory::logdir, file, sformat( "y2log-%1", target_no ) ); } - if ( file == "zypp.log" ) + else if ( file == "zypp.log" ) { // Save zypp.log from the inst-sys InjectRenamedFile( Directory::logdir, file, "zypp.log-1"); 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.58/src/include/add-on-workflow.ycp new/yast2-installation-2.13.59/src/include/add-on-workflow.ycp --- old/yast2-installation-2.13.58/src/include/add-on-workflow.ycp 2006-03-29 00:40:40.000000000 +0200 +++ new/yast2-installation-2.13.59/src/include/add-on-workflow.ycp 2006-04-05 16:46:12.000000000 +0200 @@ -343,6 +343,7 @@ { if (AddOnProduct::last_ret != `next) { + y2milestone ("Deleting source %1", sources[0]:0); Pkg::SourceDelete(sources[0]:0); return AddOnProduct::last_ret; } @@ -354,6 +355,7 @@ y2milestone ("Deleting source %1", src_id); Pkg::SourceDelete (src_id); src_id = Pkg::SourceCreate (url, product_dir); + SourceManager::newSources = [src_id]; if (src_id == -1) { // error report @@ -442,6 +444,7 @@ if (ret != `next) { foreach (integer src, SourceManager::newSources, { + y2milestone ("Deleting source %1", src); Pkg::SourceDelete (src); }); } @@ -449,13 +452,18 @@ { foreach (integer src, SourceManager::newSources, { if (src != selected) + { + y2milestone ("Deleting source %1", src); Pkg::SourceDelete (src); + } }); map data = Pkg::SourceGeneralData (selected); string url = data["url"]:""; string product_dir = data["product_dir"]:""; + y2milestone ("Deleting source %1", selected); Pkg::SourceDelete (selected); selected = Pkg::SourceCreate (url, product_dir); + SourceManager::newSources = [selected]; if (selected == -1) { // error report @@ -471,12 +479,12 @@ } symbol ProductSelect () { - list<map<string,any> > products = Pkg::ResolvableProperties ("", `product, ""); - list<map<string,any> > installed_products = filter (map<string,any> p, products, { + list<map<string,any> > all_products = Pkg::ResolvableProperties ("", `product, ""); + list<map<string,any> > installed_products = filter (map<string,any> p, all_products, { return p["status"]:nil == `selected || p["status"]:nil == `installed; }); y2milestone ("Already installed/selected products: %1", installed_products); - products = filter (map<string,any> p, products, { + list<map<string,any> > products = filter (map<string,any> p, all_products, { return p["source"]:-1 == AddOnProduct::src_id; }); y2milestone ("Products on the media: %1", products); @@ -528,8 +536,9 @@ // message popup Popup::Message (_("The product on the media is already installed or selected for installation.")); - AddOnProduct::last_ret = `back; - return `back; + y2milestone ("Deleting installatino source %1", AddOnProduct::src_id); + Pkg::SourceDelete (AddOnProduct::src_id); + return `finish; } // Display /media.1/info.txt if such file exists // Display license and wait for agreement @@ -544,7 +553,6 @@ { y2milestone ("Only one product available - skipping dialog"); map<string,any> prod = products[0]:$[]; - Pkg::ResolvableInstall (prod["name"]:"", `product); if (! AddOnProduct::CheckProductDependencies ([prod["name"]:""])) { Pkg::ResolvableRemove (prod["name"]:"", `product); @@ -553,6 +561,24 @@ AddOnProduct::last_ret = `back; return `back; } + // check whether the product is already available on some media - it is similar as below + integer found_source = -1; + foreach (map<string,any> p, all_products, { + if (p["name"]:"" == prod["name"]:"" && p["version"]:"" == prod["version"]:"" + && p["media"]:-2 != prod["media"]:-3) + { + y2milestone ("Product %1 already available on media %2", p, p["media"]:-1); + found_source = p["media"]:-1; + break; + } + }); + if (found_source != -1) + { + y2milestone ("Deleting source %1", AddOnProduct::src_id); + Pkg::SourceDelete (AddOnProduct::src_id); + AddOnProduct::src_id = found_source; + } + Pkg::ResolvableInstall (prod["name"]:"", `product); map data = Pkg::SourceGeneralData (AddOnProduct::src_id); string url = data["url"]:""; string product_dir = data["product_dir"]:""; @@ -605,6 +631,31 @@ if (ret == `next) { list<string> selected = (list<string>)UI::QueryWidget (`id (`products), `SelectedItems); + // check whether the product is already available on some media - it is similar as above + list<map<string,any> > prods = filter (map<string,any> p, products, { + return contains (selected, p["name"]:""); + }); + boolean all_found = true; + map<string,integer> prod2src = $[]; + foreach (map<string,any> prod, prods, { + boolean product_found = false; + foreach (map<string,any> p, all_products, { + if (p["name"]:"" == prod["name"]:"" && p["version"]:"" == prod["version"]:"" + && p["media"]:-2 != prod["media"]:-3) + { + product_found = true; + prod2src[prod["name"]:""] = p["media"]:-3; + break; + } + }); + all_found = all_found && product_found; + }); + if (all_found) + { + y2milestone ("Deleting source %1", AddOnProduct::src_id); + Pkg::SourceDelete (AddOnProduct::src_id); + AddOnProduct::src_id = -1; + } foreach (string product, selected, { Pkg::ResolvableInstall (product, `product); }); @@ -623,7 +674,9 @@ string product_dir = data["product_dir"]:""; foreach (string product, selected, { AddOnProduct::add_on_products = add (AddOnProduct::add_on_products, $[ - "media" : AddOnProduct::src_id, + "media" : AddOnProduct::src_id == -1 + ? prod2src[product]:-1 + : AddOnProduct::src_id, "product" : product, "media_url" : url, "product_dir" : product_dir, @@ -637,7 +690,10 @@ } if (ret == `abort) + { + y2milestone ("Deleting source %1", AddOnProduct::src_id); Pkg::SourceDelete (AddOnProduct::src_id); + } AddOnProduct::last_ret = ret; return ret; @@ -737,7 +793,10 @@ return prod["media"]:-1 == media; })); if (med_count == 1) + { + y2milestone ("Deleting source %1", media); Pkg::SourceDelete (media); + } // remove the selected record AddOnProduct::add_on_products[selected] = nil; AddOnProduct::add_on_products = filter (map<string,any> prod, ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun...

1 0

commit update-desktop-files
by root＠suse.de 05 Apr '06

05 Apr '06

Hello community, here is the log from the commit of package update-desktop-files checked in at Wed Apr 5 17:55:46 CEST 2006. -------- --- update-desktop-files/update-desktop-files.changes 2006-03-31 22:28:11.000000000 +0200 +++ update-desktop-files/update-desktop-files.changes 2006-04-05 10:46:22.000000000 +0200 @@ -1,0 +2,5 @@ +Wed Apr 5 10:46:16 CEST 2006 - stbinner(a)suse.de + +- update translations + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ update-desktop-files.spec ++++++ --- /var/tmp/diff_new_pack.7WEM6h/_old 2006-04-05 17:55:13.000000000 +0200 +++ /var/tmp/diff_new_pack.7WEM6h/_new 2006-04-05 17:55:13.000000000 +0200 @@ -12,7 +12,7 @@ Name: update-desktop-files Version: 10.1 -Release: 20 +Release: 22 Summary: A Build Tool to Update Desktop Files License: GPL Group: Development/Tools/Building @@ -122,6 +122,8 @@ /usr/share/locale/*/LC_MESSAGES/*mo %changelog -n update-desktop-files +* Wed Apr 05 2006 - stbinner(a)suse.de +- update translations * Fri Mar 31 2006 - stbinner(a)suse.de - update translations and remove not-to-be-translated strings parts * Fri Mar 31 2006 - stbinner(a)suse.de ++++++ desktop-translations.tar.bz2 ++++++ ++++ 9794 lines of diff (skipped) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun...

1 0

commit phprojekt
by root＠suse.de 05 Apr '06

05 Apr '06

Hello community, here is the log from the commit of package phprojekt checked in at Wed Apr 5 17:53:19 CEST 2006. -------- --- phprojekt/phprojekt.changes 2006-01-25 21:47:24.000000000 +0100 +++ phprojekt/phprojekt.changes 2006-04-05 17:11:41.000000000 +0200 @@ -1,0 +2,5 @@ +Wed Apr 5 17:06:24 CEST 2006 - nadvornik(a)suse.cz + +- updated to bugfix release 5.0.1 [#162857] + +------------------------------------------------------------------- Old: ---- phprojekt.tar.bz2 New: ---- phprojekt-5.0.1-globals.patch phprojekt-5.0.1.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ phprojekt.spec ++++++ --- /var/tmp/diff_new_pack.B8ueUT/_old 2006-04-05 17:53:13.000000000 +0200 +++ /var/tmp/diff_new_pack.B8ueUT/_new 2006-04-05 17:53:13.000000000 +0200 @@ -1,11 +1,11 @@ # -# spec file for package phprojekt (Version 5.0) +# spec file for package phprojekt (Version 5.0.1) # # Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany. # 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 @@ -16,9 +16,10 @@ Group: Productivity/Office/Organizers Requires: http_daemon mod_php_any php-session php-mysql Autoreqprov: on -Version: 5.0 -Release: 4 -Source0: phprojekt.tar.bz2 +Version: 5.0.1 +Release: 1 +Source0: phprojekt-%{version}.tar.bz2 +Patch0: phprojekt-%{version}-globals.patch URL: http://www.phprojekt.com BuildRoot: %{_tmppath}/%{name}-%{version}-build Summary: An open source groupware suite @@ -40,7 +41,8 @@ Albrecht Guenther <ag(a)phprojekt.com> %prep -%setup -n phprojekt50 +%setup -n phprojekt +%patch %build @@ -66,6 +68,8 @@ %config(noreplace) %{apache_serverroot}/htdocs/%{name}/config.inc.php %changelog -n phprojekt +* Wed Apr 05 2006 - nadvornik(a)suse.cz +- updated to bugfix release 5.0.1 [#162857] * Wed Jan 25 2006 - mls(a)suse.de - converted neededforbuild to BuildRequires * Tue Jan 03 2006 - dmueller(a)suse.de ++++++ phprojekt-5.0.1-globals.patch ++++++ --- setup/step2a.php +++ setup/step2a.php @@ -39,6 +39,9 @@ if ($setup == "install") { //*** db test *** + if ($db_type == "") { + die(__('Database type is not set. It may be a problem with php setup or with your browser. Clearing cookies might help.')); + } // test mysql access if ($db_type == "mysql") { ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun...

1 0

commit horde
by root＠suse.de 05 Apr '06

05 Apr '06

Hello community, here is the log from the commit of package horde checked in at Wed Apr 5 17:53:07 CEST 2006. -------- --- horde/horde.changes 2006-04-03 15:45:59.000000000 +0200 +++ horde/horde.changes 2006-04-05 14:10:23.000000000 +0200 @@ -1,0 +2,6 @@ +Wed Apr 5 14:18:27 CEST 2006 - mmarek(a)suse.cz + +- fix displaying arbitrary files in services/go.php + [#163681] (CVE-2006-1260.patch) + +------------------------------------------------------------------- New: ---- horde-3.0.9-CVE-2006-1260.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ horde.spec ++++++ --- /var/tmp/diff_new_pack.TpLhKE/_old 2006-04-05 17:52:53.000000000 +0200 +++ /var/tmp/diff_new_pack.TpLhKE/_new 2006-04-05 17:52:53.000000000 +0200 @@ -17,11 +17,12 @@ Autoreqprov: on Requires: mod_php_any php-gettext php-mcrypt php-imap php-pear php-pear-log php-session php-dom php php5-pear-auth_sasl php5-pear-date php5-pear-db php5-pear-file php5-pear-mail php5-pear-mail_mime Version: 3.0.9 -Release: 11 +Release: 12 Source0: %{name}-%{version}.tar.bz2 Source2: README.SuSE Patch1: %{name}-%{version}-log.patch Patch2: %{name}-%{version}-eval.patch +Patch3: %{name}-%{version}-CVE-2006-1260.patch URL: http://www.horde.org/ BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildArch: noarch @@ -46,6 +47,7 @@ %setup -q %patch1 %patch2 +%patch3 grep -ErZl '/usr/(local/)?bin/php' . | \ xargs -0 sed -ri 's@/usr/(local/)?bin/php@/usr/bin/php5@' cp -a %{S:2} . @@ -89,6 +91,9 @@ /usr/share/php5/Horde* %changelog -n horde +* Wed Apr 05 2006 - mmarek(a)suse.cz +- fix displaying arbitrary files in services/go.php + [#163681] (CVE-2006-1260.patch) * Mon Apr 03 2006 - mmarek(a)suse.cz - make the Horde library available to external applications [#159337] ++++++ horde-3.0.9-CVE-2006-1260.patch ++++++ --- services/go.php +++ services/go.php @@ -71,7 +71,13 @@ // Pass through image content if requested. if (!empty($_GET['untrusted'])) { - readfile($_GET['url']); + $allowed_protocols = array('http', 'https', 'ftp'); + foreach ($allowed_protocols as $proto) { + if (substr($_GET['url'], 0, strlen($proto) + 3) == $proto . '://') { + readfile($_GET['url']); + exit; + } + } exit; } ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun...

1 0