March 2006 - openSUSE Commits - openSUSE Mailing Lists

commit dicts
by root＠suse.de 31 Mar '06

31 Mar '06

Hello community, here is the log from the commit of package dicts checked in at Fri Mar 31 15:30:33 CEST 2006. -------- --- dicts/dicts.changes 2006-01-25 21:35:29.000000000 +0100 +++ dicts/dicts.changes 2006-03-29 16:19:28.000000000 +0200 @@ -1,0 +2,5 @@ +Wed Mar 29 16:09:33 CEST 2006 - werner(a)suse.de + +- Add locale provides (bug #161478) + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ dicts.spec ++++++ --- /var/tmp/diff_new_pack.nOT8q9/_old 2006-03-31 15:29:54.000000000 +0200 +++ /var/tmp/diff_new_pack.nOT8q9/_new 2006-03-31 15:29:54.000000000 +0200 @@ -1,11 +1,11 @@ # # spec file for package dicts (Version 1.5) # -# Copyright (c) 2005 SUSE LINUX Products GmbH, Nuernberg, Germany. +# 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://www.suse.de/feedback/ +# Please submit bugfixes or comments via http://bugs.opensuse.org/ # # norootforbuild @@ -16,7 +16,7 @@ Group: Productivity/Text/Spell Autoreqprov: on Version: 1.5 -Release: 246 +Release: 253 BuildRoot: %{_tmppath}/%{name}-%{version}-build Summary: Ispell Dictionary Files # @@ -99,7 +99,7 @@ for Estonian (already compiled for ispell in package ispell-estonian) -Please read the README's under /usr/src/dicts. +Read the READMEs under /usr/src/dicts. @@ -130,12 +130,12 @@ %package -n ispell-german Summary: German ispell dictionary Group: Productivity/Text/Spell -Provides: ispell_dictionary igerman +Provides: ispell_dictionary igerman locale(ispell:de;de_DE) Obsoletes: igerman Autoreqprov: on %description -n ispell-german -This packages includes a ready german dictionary for ispell. A short +This packages includes a ready German dictionary for ispell. A short usage description is given in /usr/share/doc/packages/ispell/README of the packages ispell. The sources for this dictionary are included in the package dicts. @@ -150,7 +150,7 @@ License: GPL, Other License(s), see package Summary: New Swiss ispell dictionary Group: Productivity/Text/Spell -Provides: ispell_dictionary inswiss +Provides: ispell_dictionary inswiss locale(ispell:de;de_CH) Obsoletes: inswiss Autoreqprov: on @@ -172,7 +172,7 @@ License: GPL, Other License(s), see package Summary: New German ispell dictionary Group: Productivity/Text/Spell -Provides: ispell_dictionary ingerman +Provides: ispell_dictionary ingerman locale(ispell:de;de_DE) Obsoletes: ingerman Autoreqprov: on @@ -193,7 +193,7 @@ %package -n ispell-danish Summary: Danish ispell dictionary Group: Productivity/Text/Spell -Provides: ispell_dictionary idanish +Provides: ispell_dictionary idanish locale(ispell:da) Obsoletes: idanish Autoreqprov: on @@ -212,7 +212,7 @@ %package -n ispell-spanish Summary: Spanish ispell dictionary Group: Productivity/Text/Spell -Provides: ispell_dictionary ispanish +Provides: ispell_dictionary ispanish locale(ispell:es;an_ES) Obsoletes: ispanish Autoreqprov: on @@ -232,7 +232,7 @@ %package -n ispell-french Summary: French ispell dictionary Group: Productivity/Text/Spell -Provides: ispell_dictionary ifrench +Provides: ispell_dictionary ifrench locale(ispell:fr;br_FR) Obsoletes: ifrench Conflicts: ispell-french-gutenberg Autoreqprov: on @@ -250,7 +250,7 @@ %package -n ispell-italian Summary: Italian ispell dictionary Group: Productivity/Text/Spell -Provides: ispell_dictionary iitalian +Provides: ispell_dictionary iitalian locale(ispell:it) Obsoletes: iitalian Autoreqprov: on @@ -269,7 +269,7 @@ %package -n ispell-dutch Summary: Dutch ispell dictionary Group: Productivity/Text/Spell -Provides: ispell_dictionary idutch +Provides: ispell_dictionary idutch locale(ispell:nl) Obsoletes: idutch Autoreqprov: on @@ -288,7 +288,7 @@ %package -n ispell-swedish Summary: Swedish ispell dictionary Group: Productivity/Text/Spell -Provides: ispell_dictionary iswedish +Provides: ispell_dictionary iswedish locale(ispell:sv) Obsoletes: iswedish Autoreqprov: on @@ -307,7 +307,7 @@ %package -n ispell-norsk Summary: Norwegian ispell dictionary Group: Productivity/Text/Spell -Provides: ispell_dictionary inorsk +Provides: ispell_dictionary inorsk locale(ispell:nb;nn;no;se_NO) Obsoletes: inorsk Autoreqprov: on @@ -326,7 +326,7 @@ %package -n ispell-portuguese Summary: Portuguese ispell dictionary Group: Productivity/Text/Spell -Provides: ispell_dictionary iportug +Provides: ispell_dictionary iportug locale(ispell:pt;pt_PT) Obsoletes: iportug Autoreqprov: on @@ -345,7 +345,7 @@ %package -n ispell-catalan Summary: Catalan ispell dictionary Group: Productivity/Text/Spell -Provides: ispell_dictionary icatalan +Provides: ispell_dictionary icatalan locale(ispell:ca) Obsoletes: icatalan Autoreqprov: on @@ -364,7 +364,7 @@ %package -n ispell-czech Summary: Czech ispell dictionary Group: Productivity/Text/Spell -Provides: ispell_dictionary iczech +Provides: ispell_dictionary iczech locale(ispell:cs;sk) Obsoletes: iczech Autoreqprov: on @@ -386,7 +386,7 @@ %package -n ispell-polish Summary: Polish ispell dictionary Group: Productivity/Text/Spell -Provides: ispell_dictionary ipolish +Provides: ispell_dictionary ipolish locale(ispell:pl) Obsoletes: ipolish Autoreqprov: on @@ -406,7 +406,7 @@ %package -n ispell-greek Summary: Greek ispell dictionary Group: Productivity/Text/Spell -Provides: ispell_dictionary igreek +Provides: ispell_dictionary igreek locale(ispell:el) Obsoletes: igreek Autoreqprov: on @@ -421,7 +421,7 @@ %package -n ispell-russian Summary: Russian ispell dictionary Group: Productivity/Text/Spell -Provides: ispell_dictionary irussian +Provides: ispell_dictionary irussian locale(ispell:ru) Obsoletes: irussian Autoreqprov: on @@ -459,12 +459,12 @@ %package -n ispell-slovene Summary: Slovenian ispell dictionary Group: Productivity/Text/Spell -Provides: ispell_dictionary islovene +Provides: ispell_dictionary islovene locale(ispell:sl;sk) Obsoletes: islovene Autoreqprov: on %description -n ispell-slovene -This packages includes a ready sloveniandictionary for ispell. A short +This packages includes a ready slovenian dictionary for ispell. A short usage description is given in /usr/share/doc/packages/ispell/README of the packages ispell. The sources for this dictionary are included in the package dicts. @@ -478,7 +478,7 @@ %package -n ispell-brazilian Summary: Brazilian ispell dictionary Group: Productivity/Text/Spell -Provides: ispell_dictionary +Provides: ispell_dictionary locale(ispell:pt_BR;pt) Autoreqprov: on %description -n ispell-brazilian @@ -496,7 +496,7 @@ %package -n ispell-finnish Summary: Finnish ispell dictionary Group: Productivity/Text/Spell -Provides: ispell_dictionary +Provides: ispell_dictionary locale(ispell:fi) Autoreqprov: on %description -n ispell-finnish @@ -515,7 +515,7 @@ %package -n ispell-estonian Summary: Estonian ispell dictionary Group: Productivity/Text/Spell -Provides: ispell_dictionary +Provides: ispell_dictionary locale(ispell:et) Autoreqprov: on %description -n ispell-estonian @@ -727,6 +727,8 @@ %doc /usr/share/doc/packages/dicts/ %changelog -n dicts +* Wed Mar 29 2006 - werner(a)suse.de +- Add locale provides (bug #161478) * Wed Jan 25 2006 - mls(a)suse.de - converted neededforbuild to BuildRequires * Fri Jul 01 2005 - werner(a)suse.de ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun...

1 0

commit dia
by root＠suse.de 31 Mar '06

31 Mar '06

Hello community, here is the log from the commit of package dia checked in at Fri Mar 31 15:29:57 CEST 2006. -------- --- GNOME/dia/dia.changes 2006-02-24 13:55:33.000000000 +0100 +++ dia/dia.changes 2006-03-30 17:27:07.000000000 +0200 @@ -1,0 +2,6 @@ +Thu Mar 30 17:26:12 CEST 2006 - sbrabec(a)suse.cz + +- Fixed XFig import buffer overflows (#162074). + http://mail.gnome.org/archives/dia-list/2006-March/msg00149.html + +------------------------------------------------------------------- New: ---- dia-xfig.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ dia.spec ++++++ --- /var/tmp/diff_new_pack.UmIcdE/_old 2006-03-31 15:29:35.000000000 +0200 +++ /var/tmp/diff_new_pack.UmIcdE/_new 2006-03-31 15:29:35.000000000 +0200 @@ -19,7 +19,7 @@ Autoreqprov: on Summary: A Diagram Creation Program Version: 0.94 -Release: 27 +Release: 33 Source: ftp://ftp.gnome.org/pub/GNOME/stable/sources/dia/dia-%{version}.tar.bz2 Source1: font-test-japanese.dia Source2: font-test-czech.dia @@ -32,6 +32,7 @@ Patch7: dia-cairo-0.5.patch Patch8: dia-group-props-size.patch Patch9: dia-can-2005-2966.patch +Patch10: dia-xfig.patch URL: http://www.gnome.org/projects/dia/ BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -66,6 +67,9 @@ %patch7 %patch8 %patch9 +cd plug-ins/xfig +%patch10 +cd ../.. gnome-patch-translation-update cp $RPM_SOURCE_DIR/font-test*dia . @@ -110,6 +114,9 @@ %prefix/share/pixmaps/* %changelog -n dia +* Thu Mar 30 2006 - sbrabec(a)suse.cz +- Fixed XFig import buffer overflows (#162074). + http://mail.gnome.org/archives/dia-list/2006-March/msg00149.html * Fri Feb 24 2006 - sbrabec(a)suse.cz - Improved Categories. * Wed Feb 15 2006 - stbinner(a)suse.de ++++++ dia-xfig.patch ++++++ diff -u /tmp/dia-0.94/plug-ins/xfig/xfig.h ./xfig.h --- /tmp/dia-0.94/plug-ins/xfig/xfig.h 2004-08-16 09:56:21.000000000 +0200 +++ ./xfig.h 2006-03-29 21:40:15.000000000 +0200 @@ -6,6 +6,7 @@ #define FIG_MAX_DEFAULT_COLORS 32 #define FIG_MAX_USER_COLORS 512 +#define FIG_MAX_DEPTHS 1000 /* 1200 PPI */ #define FIG_UNIT 472.440944881889763779527559055118 /* 1/80 inch */ diff -u /tmp/dia-0.94/plug-ins/xfig/xfig-import.c ./xfig-import.c --- /tmp/dia-0.94/plug-ins/xfig/xfig-import.c 2004-08-16 09:56:21.000000000 +0200 +++ ./xfig-import.c 2006-03-29 21:40:21.000000000 +0200 @@ -441,11 +441,17 @@ static Color fig_color(int color_index) { - if (color_index == -1) + if (color_index <= -1) return color_black; /* Default color */ - if (color_index < FIG_MAX_DEFAULT_COLORS) + else if (color_index < FIG_MAX_DEFAULT_COLORS) return fig_default_colors[color_index]; - else return fig_colors[color_index-FIG_MAX_DEFAULT_COLORS]; + else if (color_index < FIG_MAX_USER_COLORS) + return fig_colors[color_index-FIG_MAX_DEFAULT_COLORS]; + else { + message_error(_("Color index %d too high, only 512 colors allowed. Using black instead."), + color_index); + return color_black; + } } static Color @@ -563,23 +569,25 @@ static int fig_read_n_points(FILE *file, int n, Point **points) { int i; - Point *new_points; - - new_points = (Point*)g_malloc(sizeof(Point)*n); + GArray *points_list = g_array_sized_new(FALSE, FALSE, sizeof(Point), n); for (i = 0; i < n; i++) { int x,y; + Point p; if (fscanf(file, " %d %d ", &x, &y) != 2) { message_error(_("Error while reading %dth of %d points: %s\n"), i, n, strerror(errno)); - free(new_points); + g_array_free(points_list, TRUE); return FALSE; } - new_points[i].x = x/FIG_UNIT; - new_points[i].y = y/FIG_UNIT; + p.x = x/FIG_UNIT; + p.y = y/FIG_UNIT; + g_array_append_val(points_list, p); } fscanf(file, "\n"); - *points = new_points; + + *points = (Point *)points_list->data; + g_array_free(points_list, FALSE); return TRUE; } @@ -683,7 +691,7 @@ return text_buf; } -static GList *depths[1000]; +static GList *depths[FIG_MAX_DEPTHS]; /* If there's something in the compound stack, we ignore the depth field, as it will be determined by the group anyway */ @@ -693,6 +701,26 @@ level. Best we can do now. */ static int compound_depth; +/** Add an object at a given depth. This function checks for depth limits + * and updates the compound depth if needed. + * + * @param newobj An object to add. If we're inside a compound, this + * doesn't really add the object. + * @param depth A depth as in the Fig format, max 999 + */ +static void +add_at_depth(DiaObject *newobj, int depth) { + if (depth < 0 || depth >= FIG_MAX_DEPTHS) { + message_error(_("Depth %d of of range, only 0-%d allowed.\n"), + depth, FIG_MAX_DEPTHS-1); + depth = FIG_MAX_DEPTHS - 1; + } + if (compound_stack == NULL) + depths[depth] = g_list_append(depths[depth], newobj); + else + if (compound_depth > depth) compound_depth = depth; +} + static DiaObject * fig_read_ellipse(FILE *file, DiagramData *dia) { int sub_type; @@ -749,10 +777,7 @@ /* Angle -- can't rotate yet */ /* Depth field */ - if (compound_stack == NULL) - depths[depth] = g_list_append(depths[depth], newobj); - else - if (compound_depth > depth) compound_depth = depth; + add_at_depth(newobj, depth); return newobj; } @@ -885,10 +910,7 @@ /* Cap style */ /* Depth field */ - if (compound_stack == NULL) - depths[depth] = g_list_append(depths[depth], newobj); - else - if (compound_depth > depth) compound_depth = depth; + add_at_depth(newobj, depth); exit: prop_list_free(props); g_free(forward_arrow_info); @@ -1111,10 +1133,7 @@ /* Cap style */ /* Depth field */ - if (compound_stack == NULL) - depths[depth] = g_list_append(depths[depth], newobj); - else - if (compound_depth > depth) compound_depth = depth; + add_at_depth(newobj, depth); exit: prop_list_free(props); g_free(forward_arrow_info); @@ -1202,10 +1221,7 @@ /* Cap style */ /* Depth field */ - if (compound_stack == NULL) - depths[depth] = g_list_append(depths[depth], newobj); - else - if (compound_depth > depth) compound_depth = depth; + add_at_depth(newobj, depth); exit: g_free(forward_arrow_info); @@ -1298,10 +1314,7 @@ newobj->ops->set_props(newobj, props); /* Depth field */ - if (compound_stack == NULL) - depths[depth] = g_list_append(depths[depth], newobj); - else - if (compound_depth > depth) compound_depth = depth; + add_at_depth(newobj, depth); exit: if (text_buf != NULL) free(text_buf); @@ -1347,6 +1360,12 @@ return FALSE; } + if (colornumber < 32 || colornumber > FIG_MAX_USER_COLORS) { + message_error(_("Color number %d out of range 0..%d. Discarding color.\n"), + colornumber, FIG_MAX_USER_COLORS); + return FALSE; + } + color.red = ((colorvalues & 0x00ff0000)>>16) / 255.0; color.green = ((colorvalues & 0x0000ff00)>>8) / 255.0; color.blue = (colorvalues & 0x000000ff) / 255.0; @@ -1393,7 +1412,7 @@ } /* Group extends don't really matter */ if (compound_stack == NULL) - compound_depth = 999; + compound_depth = FIG_MAX_DEPTHS - 1; compound_stack = g_slist_append(compound_stack, NULL); return TRUE; break; @@ -1551,7 +1570,7 @@ for (i = 0; i < FIG_MAX_USER_COLORS; i++) { fig_colors[i] = color_black; } - for (i = 0; i < 1000; i++) { + for (i = 0; i < FIG_MAX_DEPTHS; i++) { depths[i] = NULL; } @@ -1606,7 +1625,7 @@ } while (TRUE); /* Now we can reorder for the depth fields */ - for (i = 0; i < 1000; i++) { + for (i = 0; i < FIG_MAX_DEPTHS; i++) { if (depths[i] != NULL) layer_add_objects_first(dia->active_layer, depths[i]); } ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun...

1 0

commit dhcp
by root＠suse.de 31 Mar '06

31 Mar '06

Hello community, here is the log from the commit of package dhcp checked in at Fri Mar 31 15:29:42 CEST 2006. -------- --- dhcp/dhcp.changes 2006-01-27 01:11:32.000000000 +0100 +++ dhcp/dhcp.changes 2006-03-29 15:48:09.000000000 +0200 @@ -1,0 +2,11 @@ +Wed Mar 29 15:47:38 CEST 2006 - poeml(a)suse.de + +- fix two further include paths in dhcpctl.3 and omapi.3 + +------------------------------------------------------------------- +Wed Mar 29 12:50:24 CEST 2006 - poeml(a)suse.de + +- package the static libdst.a library [#158271] +- fix the include path in dhcpctl.3 and omapi.3 [#158271] + +------------------------------------------------------------------- New: ---- dhcp-3.0.3-man.dif ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ dhcp.spec ++++++ --- /var/tmp/diff_new_pack.QytYgq/_old 2006-03-31 15:29:12.000000000 +0200 +++ /var/tmp/diff_new_pack.QytYgq/_new 2006-03-31 15:29:12.000000000 +0200 @@ -5,7 +5,7 @@ # This file and all modifications and additions to the pristine # package are under the same license as the package itself. # -# Please submit bugfixes or comments via http://bugs.opensuse.org +# Please submit bugfixes or comments via http://bugs.opensuse.org/ # # norootforbuild @@ -16,7 +16,7 @@ Group: Productivity/Networking/Boot/Servers Autoreqprov: on Version: 3.0.3 -Release: 8 +Release: 15 Summary: Common Files Used by ISC DHCP Software URL: http://www.isc.org/isc/dhcp.html Source: dhcp-%{version}.tar.bz2 @@ -52,8 +52,10 @@ Patch32: dhclient.c.dif ## duplicate stdin, stdout and stderr for dhclient childs Patch40: dhcp-3.0rc10.filedes.dif +## other stuff Patch41: makefile.diff Patch51: dhcp-3.0.1rc14-tmpfile.dif +Patch52: dhcp-3.0.3-man.dif ## LDAP support for DHCP server ## patch lives here: http://home.ntelos.net/~masneyb/ %define DHCPD_LDAP 1 @@ -188,6 +190,7 @@ %patch40 %patch41 %patch51 -p1 +%patch52 -p1 %if %DHCPD_LDAP %patch60 -p1 %endif @@ -240,6 +243,7 @@ rm -rf $RPM_BUILD_ROOT MANDIR=%{_mandir} DESTDIR=$RPM_BUILD_ROOT LIBDIR=%{_libdir} make install install -m 744 work.linux-2.2/omapip/svtest $RPM_BUILD_ROOT/usr/sbin/svtest +install -m 644 work.linux-2.2/dst/libdst.a $RPM_BUILD_ROOT/%{_libdir} # install the saved bsd flavor binary install -m 755 work.linux-2.2/server/dhcpd.bsd $RPM_BUILD_ROOT/usr/sbin/dhcpd.bsd mkdir -p $RPM_BUILD_ROOT/etc/init.d @@ -481,6 +485,11 @@ %doc %{_mandir}/man3/dhcpctl.3.gz %changelog -n dhcp +* Wed Mar 29 2006 - poeml(a)suse.de +- fix two further include paths in dhcpctl.3 and omapi.3 +* Wed Mar 29 2006 - poeml(a)suse.de +- package the static libdst.a library [#158271] +- fix the include path in dhcpctl.3 and omapi.3 [#158271] * Fri Jan 27 2006 - mls(a)suse.de - converted neededforbuild to BuildRequires * Wed Jan 25 2006 - poeml(a)suse.de ++++++ dhcp-3.0.3-man.dif ++++++ diff -uNr dhcp-3.0.3.orig/dhcpctl/dhcpctl.3 dhcp-3.0.3/dhcpctl/dhcpctl.3 --- dhcp-3.0.3.orig/dhcpctl/dhcpctl.3 2004-09-24 23:08:38.000000000 +0200 +++ dhcp-3.0.3/dhcpctl/dhcpctl.3 2006-03-29 15:46:13.281689267 +0200 @@ -425,8 +425,8 @@ #include <stdio.h> #include <netinet/in.h> -#include <isc/result.h> -#include <dhcpctl/dhcpctl.h> +#include <isc-dhcp/result.h> +#include <dhcpctl.h> int main (int argc, char **argv) { dhcpctl_data_string ipaddrstring = NULL; diff -uNr dhcp-3.0.3.orig/omapip/omapi.3 dhcp-3.0.3/omapip/omapi.3 --- dhcp-3.0.3.orig/omapip/omapi.3 2004-09-24 23:08:38.000000000 +0200 +++ dhcp-3.0.3/omapip/omapi.3 2006-03-29 15:46:57.128056679 +0200 @@ -87,8 +87,8 @@ #include <stdio.h> #include <netinet/in.h> - #include <isc/result.h> - #include <dhcpctl/dhcpctl.h> + #include <isc-dhcp/result.h> + #include <dhcpctl.h> int main (int argc, char **argv) { dhcpctl_data_string ipaddrstring = NULL; ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun...

1 0

commit bitchx
by root＠suse.de 31 Mar '06

31 Mar '06

Hello community, here is the log from the commit of package bitchx checked in at Fri Mar 31 15:29:29 CEST 2006. -------- --- bitchx/bitchx.changes 2006-01-25 21:34:38.000000000 +0100 +++ bitchx/bitchx.changes 2006-03-29 21:29:17.000000000 +0200 @@ -1,0 +2,18 @@ +Wed Mar 29 21:21:23 CEST 2006 - lmichnovic(a)suse.cz + +- fixed calling of different function that caused crashing on 64bit + arch, needed for 32bit too [#157927] (not_in_display.patch) +- fixed cast to pointer from integer of different size on 64bit arch + (pointer_casting_64.patch) + +------------------------------------------------------------------- +Thu Mar 16 21:16:37 CET 2006 - lmichnovic(a)suse.cz + +- creation of manpage fixed in mandir.patch + +------------------------------------------------------------------- +Thu Mar 16 19:21:04 CET 2006 - lmichnovic(a)suse.cz + +- fixed missing debuginfo.rpm + +------------------------------------------------------------------- Old: ---- BitchX-64bit.patch BitchX-gcc34.patch BitchX-non_static_decl.patch BitchX-overflow.patch bitchx-configs.dif New: ---- bitchx-64bit.patch bitchx-configs.patch bitchx-gcc34.patch bitchx-mandir.patch bitchx-non_static_decl.patch bitchx-not_in_display.patch bitchx-overflow.patch bitchx-pointer_casting_64.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ bitchx.spec ++++++ --- /var/tmp/diff_new_pack.zOXSQ7/_old 2006-03-31 15:28:40.000000000 +0200 +++ /var/tmp/diff_new_pack.zOXSQ7/_new 2006-03-31 15:28:40.000000000 +0200 @@ -1,11 +1,11 @@ # # spec file for package bitchx (Version 1.1) # -# Copyright (c) 2005 SUSE LINUX Products GmbH, Nuernberg, Germany. +# 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://www.suse.de/feedback/ +# Please submit bugfixes or comments via http://bugs.opensuse.org/ # # norootforbuild @@ -19,16 +19,18 @@ Summary: An IRC Client URL: http://www.bitchx.org/ Version: 1.1 -Release: 7 +Release: 15 Source: ircii-pana-%{version}-final.tar.bz2 -Patch0: bitchx-configs.dif +Patch0: bitchx-configs.patch Patch1: bitchx-conf.patch -Patch3: BitchX-64bit.patch -Patch4: BitchX-gcc34.patch -Patch5: BitchX-non_static_decl.patch -Patch6: BitchX-overflow.patch +Patch3: bitchx-64bit.patch +Patch4: bitchx-gcc34.patch +Patch5: bitchx-non_static_decl.patch +Patch6: bitchx-overflow.patch +Patch7: bitchx-mandir.patch +Patch8: bitchx-not_in_display.patch +Patch9: bitchx-pointer_casting_64.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build -Nosource: 0 %description BitchX is one of the most well-known IRC clients for the text console. @@ -49,7 +51,10 @@ %patch4 -p1 %patch5 %patch6 -p1 -gzip -c9 < doc/BitchX.1 > BitchX.1.gz +%patch7 +%patch8 +%patch9 +#gzip -c9 < doc/BitchX.1 > BitchX.1.gz rm -rf macros/sanity.m4 %build @@ -61,12 +66,16 @@ --mandir=%{_mandir} \ --enable-ipv6 \ --with-ssl -make +make %{?jobs:-j%jobs} %install make prefix=$RPM_BUILD_ROOT/usr/ install ln -sf BitchX-%{version}-final $RPM_BUILD_ROOT/usr/bin/BitchX -install -D -m 644 BitchX.1.gz $RPM_BUILD_ROOT/%{_mandir}/man1/BitchX.1.gz +pushd $RPM_BUILD_ROOT/%{_mandir}/man1/ +gzip -c9 < BitchX.1 > BitchX.1.gz +popd +#install -D -m 644 BitchX.1.gz $RPM_BUILD_ROOT/%{_mandir}/man1/BitchX.1.gz +pwd ln -s BitchX.1.gz $RPM_BUILD_ROOT/%{_mandir}/man1/bitchx.1.gz ln -s BitchX $RPM_BUILD_ROOT/usr/bin/bitchx chmod 0644 $RPM_BUILD_ROOT/usr/lib/bx/help/findcomm.bz2 @@ -77,7 +86,7 @@ %files %defattr(-,root,root) %doc BitchX.help BitchX.ircnames BitchX.quit BitchX.reasons -%doc COMPILE-PROBLEMS Changelog INSTALL README INSTALL +%doc COMPILE-PROBLEMS Changelog INSTALL README %doc doc/* %doc %{_mandir}/man1/BitchX.1.gz %doc %{_mandir}/man1/bitchx.1.gz @@ -88,6 +97,15 @@ /usr/lib/bx/ %changelog -n bitchx +* Wed Mar 29 2006 - lmichnovic(a)suse.cz +- fixed calling of different function that caused crashing on 64bit + arch, needed for 32bit too [#157927] (not_in_display.patch) +- fixed cast to pointer from integer of different size on 64bit arch + (pointer_casting_64.patch) +* Thu Mar 16 2006 - lmichnovic(a)suse.cz +- creation of manpage fixed in mandir.patch +* Thu Mar 16 2006 - lmichnovic(a)suse.cz +- fixed missing debuginfo.rpm * Wed Jan 25 2006 - mls(a)suse.de - converted neededforbuild to BuildRequires * Mon Sep 05 2005 - pnemec(a)suse.cz ++++++ bitchx-64bit.patch ++++++ --- BitchX/include/module.h +++ BitchX/include/module.h @@ -15,7 +15,7 @@ #include "struct.h" -typedef int (*Function_ptr)(); +typedef long (*Function_ptr)(); #ifdef WANT_DLL #ifdef HPUX --- BitchX/include/modval.h +++ BitchX/include/modval.h @@ -318,7 +318,7 @@ #define show_window(x) ((void) (global[SHOW_WINDOW]((Window *)x))) #define get_status_by_refnum(x, y) ((char *) (global[GET_STATUS_BY_REFNUM]((unsigned int)x, (unsigned int)y))) #define get_visible_by_refnum(x) ((int) (global[GET_VISIBLE_BY_REFNUM]((char *)x))) -#define get_window_by_desc(x) ((Window *) (global[GET_WINDOW_BY_DESC]((unsigned int)x))) +#define get_window_by_desc(x) ((Window *) (global[GET_WINDOW_BY_DESC]((unsigned long)x))) #define get_window_by_refnum(x) ((Window *) (global[GET_WINDOW_BY_REFNUM]((unsigned int)x))) #define get_window_by_name(x) ((Window *) (global[GET_WINDOW_BY_NAME]((char *)x))) #define next_window(x, y) ((void) (global[FUNC_NEXT_WINDOW]((char)x, (char *)y))) ++++++ bitchx-conf.patch ++++++ --- /var/tmp/diff_new_pack.zOXSQ7/_old 2006-03-31 15:28:40.000000000 +0200 +++ /var/tmp/diff_new_pack.zOXSQ7/_new 2006-03-31 15:28:40.000000000 +0200 @@ -1,6 +1,6 @@ --- configure.in +++ configure.in -@@ -982,7 +982,6 @@ +@@ -997,7 +997,6 @@ dll/amp/Makefile dll/arcfour/Makefile dll/autocycle/Makefile ++++++ bitchx-configs.dif -> bitchx-configs.patch ++++++ --- bitchx/bitchx-configs.dif 2002-05-14 08:02:31.000000000 +0200 +++ bitchx/bitchx-configs.patch 2006-03-29 19:38:08.000000000 +0200 @@ -1,7 +1,6 @@ -diff -ur BitchX/include/color.h BitchX.mmj/include/color.h ---- BitchX/include/color.h Mon Mar 5 20:38:48 2001 -+++ BitchX.mmj/include/color.h Mon May 13 17:59:37 2002 -@@ -717,8 +717,8 @@ +--- BitchX/include/color.h ++++ BitchX/include/color.h +@@ -759,8 +759,8 @@ #define DEFAULT_FORMAT_NICK_MSG_FSET "$0 $1 $2-" @@ -12,10 +11,9 @@ #define DEFAULT_FORMAT_STATUS_FSET "%4%W$0-" #define DEFAULT_FORMAT_STATUS1_FSET "%4%W$0-" -diff -ur BitchX/include/config.h BitchX.mmj/include/config.h ---- BitchX/include/config.h Sun Mar 24 10:31:04 2002 -+++ BitchX.mmj/include/config.h Mon May 13 18:00:43 2002 -@@ -239,7 +239,7 @@ +--- BitchX/include/config.h ++++ BitchX/include/config.h +@@ -225,7 +225,7 @@ * in the client. defining this variable to 1 allows that happen. It also * adds a HEBREW_TOGGLE variable which can turn this feature on/off */ @@ -24,7 +22,7 @@ /* if you use cidentd the filename is called .authlie instead of .noident. * as well some modifications to the format of the file were made. So we -@@ -325,7 +325,7 @@ +@@ -311,7 +311,7 @@ * * Is here there any solution to use both fonts nethertheless ? */ @@ -33,7 +31,7 @@ /* * If you use LINUX and non ISO8859-1 fonts with custom screen mapping, -@@ -377,12 +377,12 @@ +@@ -363,12 +363,12 @@ #define DEFAULT_MSGLOG ON #define DEFAULT_AUTO_NSLOOKUP OFF #define DEFAULT_ALT_CHARSET ON @@ -49,7 +47,7 @@ #define DEFAULT_AUTO_UNMARK_AWAY OFF #define DEFAULT_AUTO_WHOWAS OFF #define DEFAULT_BANTIME 600 -@@ -393,7 +393,7 @@ +@@ -379,7 +379,7 @@ #define DEFAULT_BLINK_VIDEO ON #define DEFAULT_CHANNEL_NAME_WIDTH 10 #define DEFAULT_CLOCK ON @@ -58,7 +56,7 @@ #define DEFAULT_COMMAND_MODE OFF #define DEFAULT_COMMENT_HACK ON #define DEFAULT_DCC_BLOCK_SIZE 2048 -@@ -430,7 +430,7 @@ +@@ -416,7 +416,7 @@ #define DEFAULT_SEND_IGNORE_MSG OFF #define DEFAULT_SEND_OP_MSG ON #define DEFAULT_SHELL_LIMIT 0 @@ -67,7 +65,7 @@ #define DEFAULT_SHOW_CHANNEL_NAMES ON #define DEFAULT_SHOW_END_OF_MSGS OFF #define DEFAULT_SHOW_NUMERICS OFF -@@ -447,14 +447,14 @@ +@@ -433,14 +433,14 @@ #define DEFAULT_SEND_AWAY_MSG OFF #define DEFAULT_SEND_CTCP_MSG ON #define DEFAULT_SOCKS_PORT 1080 @@ -84,7 +82,7 @@ #define DEFAULT_DCC_AUTORENAME ON #define DEFAULT_DCC_AUTORESUME OFF #define DEFAULT_DCC_AUTORENAME_ON_NICKNAME OFF -@@ -494,10 +494,10 @@ +@@ -480,10 +480,10 @@ #define DEFAULT_AINV 0 #define DEFAULT_ANNOY_KICK OFF #define DEFAULT_AOP_VAR OFF @@ -98,7 +96,7 @@ #if defined(__EMXPM__) || defined(WIN32) #define DEFAULT_CODEPAGE 437 #endif -@@ -508,16 +508,16 @@ +@@ -494,16 +494,16 @@ #define DEFAULT_DEOP_ON_KICKFLOOD 3 #define DEFAULT_KICK_IF_BANNED OFF #define DEFAULT_HACKING 0 /* 0 1 2 */ @@ -118,7 +116,7 @@ #define DEFAULT_NICKFLOOD_TIME 30 #ifdef __EMXPM__ #define DEFAULT_NICKLIST 10 -@@ -589,7 +589,7 @@ +@@ -575,7 +575,7 @@ #endif /* _USE_LOCAL_CONFIG */ @@ -127,7 +125,7 @@ #define DEFAULT_PROTECT_CHANNELS "*" #define DEFAULT_SHITLIST_REASON "Surplus Lamerz must go!!!!" #define DEFAULT_BEEP_ON_MSG "MSGS" -@@ -602,7 +602,7 @@ +@@ -588,7 +588,7 @@ #define DEFAULT_SHELL "/bin/sh" #define DEFAULT_SHELL_FLAGS "-c" #define DEFAULT_USERINFO "" @@ -136,7 +134,7 @@ #define DEFAULT_XTERM_OPTIONS "-bg black -fg white" #define DEFAULT_DCC_DLDIR "~" -@@ -693,9 +693,7 @@ +@@ -679,9 +679,7 @@ #undef WANT_CHATNET /* define just for codelogic */ #endif ++++++ bitchx-gcc34.patch ++++++ --- BitchX/source/term.c +++ BitchX/source/term.c @@ -92,7 +92,7 @@ #endif extern char *getenv(); -extern char *tparm(); +extern char *tparm(const char *str, ...); /* * The old code assumed termcap. termcap is almost always present, but on ++++++ bitchx-mandir.patch ++++++ --- Makefile.in +++ Makefile.in @@ -297,7 +297,7 @@ cd $(top_srcdir)/doc; \ for i in BitchX.1; do \ if test -f $$i; then \ - $(INSTALL_DATA) $$i $(mandir)/man1; \ + $(INSTALL_DATA) $$i $(prefix)/share/man/man1; \ fi; \ done; \ fi; \ @@ -306,7 +306,7 @@ (xargs bzip2 -9f || xargs gzip -9f) || :) 2>/dev/null installdirs: - umask 022; $(top_srcdir)/mkinstalldirs $(bindir) $(IRCLIB) $(mandir)/man1 $(TRANSLATION_PATH) $(INSTALL_SCRIPT) $(HELPDIR) + umask 022; $(top_srcdir)/mkinstalldirs $(bindir) $(IRCLIB) $(prefix)/share/man/man1 $(TRANSLATION_PATH) $(INSTALL_SCRIPT) $(HELPDIR) local_installdirs: umask 022; $(top_srcdir)/mkinstalldirs $(local_dir)/bin $(DEFAULT_CTOOLZ_DIR) $(DEFAULT_CTOOLZ_DIR)/plugins $(DEFAULT_CTOOLZ_DIR)/logs ++++++ bitchx-non_static_decl.patch ++++++ --- source/ctcp.c +++ source/ctcp.c @@ -176,7 +176,7 @@ /* CDE do ops and unban logging */ -static char *ctcp_type[] = +char *ctcp_type[] = { "PRIVMSG", "NOTICE" --- source/timer.c +++ source/timer.c @@ -148,7 +148,7 @@ * This is put here on purpose -- we dont want any of the above functions * to have any knowledge of this struct. */ -static TimerList *PendingTimers; +TimerList *PendingTimers; static char *schedule_timer (TimerList *ntimer); static char *current_exec_timer = empty_string; ++++++ bitchx-not_in_display.patch ++++++ --- include/modval.h +++ include/modval.h @@ -169,7 +169,7 @@ #define MatchingBracket(x, y, z) ((char *) (global[MATCHINGBRACKET]((char *)x, ( char)y, (char)z))) #define parse_number(x) ((int) (global[PARSE_NUMBER]((char **)x))) #define splitw(x, y) ((int) (global[SPLITW]((char *)x, (char ***)y))) -#define unsplitw(x, y) ((char *) (global[UNSPLITW]((char ***)x, (char *)y))) +#define unsplitw(x, y) ((char *) (global[UNSPLITW]((char ***)x, (int)y))) #define check_val(x) ((int) (global[CHECK_VAL]((char *)x))) #define on_off(x) ((char *) (global[ON_OFF]((int)x))) #define strextend(x, y, n) ((char *) (global[STREXTEND]((char *)x, (char)y, (int)n))) @@ -279,7 +279,7 @@ #define output_line(x) ((int) (global[OUTPUT_LINE]((const unsigned char *)x))) #define output_with_count(x, y, z) ((int) (global[OUTPUT_WITH_COUNT]((const unsigned char *)x, (int)y, (int)z))) #define scroll_window(x) ((void) (global[SCROLL_WINDOW]((Window *)x))) -#define cursor_not_in_display(x) ((void) (global[CURSOR_IN_DISPLAY]((Screen *)x))) +#define cursor_not_in_display(x) ((void) (global[CURSOR_NOT_IN_DISPLAY]((Screen *)x))) #define cursor_in_display(x) ((void) (global[CURSOR_IN_DISPLAY]((Screen *)x))) #define is_cursor_in_display(x) ((int) (global[IS_CURSOR_IN_DISPLAY]((Screen *)x))) #define repaint_window(x, y, z) ((void) (global[REPAINT_WINDOW]((Window *)x, (int)y, (int)z))) ++++++ bitchx-overflow.patch ++++++ --- BitchX/source/server.c +++ BitchX/source/server.c @@ -151,7 +151,7 @@ if (x_debug & DEBUG_OUTBOUND) yell("Closing server %d because [%s]", cs_index, message ? message : empty_string); - snprintf(buffer, BIG_BUFFER_SIZE, "QUIT :%s\n", message); + snprintf(buffer, sizeof(buffer), "QUIT :%s\n", message); #ifdef HAVE_SSL if (get_server_ssl(cs_index)) SSL_write(server_list[cs_index].ssl_fd, buffer, strlen(buffer)); ++++++ bitchx-pointer_casting_64.patch ++++++ ++++ 763 lines (skipped) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun...

1 0

commit dragonegg
by root＠suse.de 31 Mar '06

31 Mar '06

Hello community, here is the log from the commit of package dragonegg checked in at Fri Mar 31 15:29:17 CEST 2006. -------- --- KDE/dragonegg/dragonegg.changes 2006-02-14 20:08:57.000000000 +0100 +++ dragonegg/dragonegg.changes 2006-03-29 17:25:08.000000000 +0200 @@ -1,0 +2,5 @@ +Wed Mar 29 16:03:36 CEST 2006 - dmueller(a)suse.de + +- ignore mtime changes (#155318) + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ dragonegg.spec ++++++ --- /var/tmp/diff_new_pack.5Br90x/_old 2006-03-31 15:29:14.000000000 +0200 +++ /var/tmp/diff_new_pack.5Br90x/_new 2006-03-31 15:29:14.000000000 +0200 @@ -16,7 +16,7 @@ Group: System/GUI/KDE Summary: Mozilla Plug-In to Embed KDE KParts Version: 0.1 -Release: 6 +Release: 13 BuildRoot: %{_tmppath}/%{name}-%{version}-build Source0: %name-%version.tar.bz2 @@ -50,9 +50,11 @@ %files %defattr(-,root,root) -/usr/%_lib/browser-plugins/libdragonegg.so +%verify(not mtime) /usr/%_lib/browser-plugins/libdragonegg.so %changelog -n dragonegg +* Wed Mar 29 2006 - dmueller(a)suse.de +- ignore mtime changes (#155318) * Tue Feb 14 2006 - dmueller(a)suse.de - make the error label show properly if no kpdf is found - don't fall back to kghostview if kpdf is not loading (#116389) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun...

1 0

commit apache2
by root＠suse.de 31 Mar '06

31 Mar '06

Hello community, here is the log from the commit of package apache2 checked in at Fri Mar 31 15:28:33 CEST 2006. -------- --- apache2/apache2.changes 2006-02-20 13:49:29.000000000 +0100 +++ apache2/apache2.changes 2006-03-29 12:27:04.000000000 +0200 @@ -1,0 +2,6 @@ +Wed Mar 29 11:54:00 CEST 2006 - poeml(a)suse.de + +- remove php4 from default modules [#155333] +- fix comment in /etc/init.d/apache2 [#148559] + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ apache2.spec ++++++ --- /var/tmp/diff_new_pack.jaJsu4/_old 2006-03-31 15:28:02.000000000 +0200 +++ /var/tmp/diff_new_pack.jaJsu4/_new 2006-03-31 15:28:02.000000000 +0200 @@ -56,7 +56,7 @@ Group: Productivity/Networking/Web/Servers %define realver 2.2.0 Version: 2.2.0 -Release: 7 +Release: 13 #Source0: http://www.apache.org/dist/httpd-%{version}.tar.bz2 Source0: http://httpd.apache.org/dev/dist/httpd-%{realver}.tar.bz2 Source10: SUSE-NOTICE @@ -979,6 +979,9 @@ fi %changelog -n apache2 +* Wed Mar 29 2006 - poeml(a)suse.de +- remove php4 from default modules [#155333] +- fix comment in /etc/init.d/apache2 [#148559] * Mon Feb 20 2006 - poeml(a)suse.de - fixed comment in init script which indicated wrong version [#148559] * Mon Jan 30 2006 - poeml(a)suse.de ++++++ rc.apache2 ++++++ --- apache2/rc.apache2 2006-02-20 13:48:25.000000000 +0100 +++ apache2/rc.apache2 2006-03-29 12:01:54.000000000 +0200 @@ -18,7 +18,7 @@ # X-UnitedLinux-Should-Stop: # Default-Start: 3 5 # Default-Stop: 0 1 2 6 -# Short-Description: Apache 2.1 httpd +# Short-Description: Apache 2.2 httpd # Description: Start the httpd daemon Apache ### END INIT INFO ++++++ sysconfig.apache2 ++++++ --- apache2/sysconfig.apache2 2005-12-15 13:08:13.000000000 +0100 +++ apache2/sysconfig.apache2 2006-03-07 10:14:51.000000000 +0100 @@ -30,7 +30,7 @@ APACHE_CONF_INCLUDE_DIRS="" ## Type: string -## Default: "actions alias auth_basic authz_host authn_file authz_groupfile authz_default authz_user autoindex cgi dir env expires include log_config mime negotiation setenvif ssl suexec userdir php4 php5" +## Default: "actions alias auth_basic authz_host authn_file authz_groupfile authz_default authz_user autoindex cgi dir env expires include log_config mime negotiation setenvif ssl suexec userdir php5" ## ServiceRestart: apache2 # # [It might look silly to not simply edit httpd.conf for the LoadModule statements. @@ -71,7 +71,7 @@ # apache's default installation # APACHE_MODULES="authz_host actions alias asis auth autoindex cgi dir imap include log_config mime negotiation setenvif status userdir" # your settings -APACHE_MODULES="actions alias auth_basic authn_file authz_host authz_groupfile authz_default authz_user authn_dbm autoindex cgi dir env expires include log_config mime negotiation setenvif ssl suexec userdir php4 php5" +APACHE_MODULES="actions alias auth_basic authn_file authz_host authz_groupfile authz_default authz_user authn_dbm autoindex cgi dir env expires include log_config mime negotiation setenvif ssl suexec userdir php5" ## Type: string ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun...

1 0

commit alsa
by root＠suse.de 31 Mar '06

31 Mar '06

Hello community, here is the log from the commit of package alsa checked in at Fri Mar 31 15:28:18 CEST 2006. -------- --- alsa/alsa.changes 2006-03-24 19:04:17.000000000 +0100 +++ alsa/alsa.changes 2006-03-29 12:17:49.000000000 +0200 @@ -1,0 +2,7 @@ +Wed Mar 29 12:15:16 CEST 2006 - tiwai(a)suse.de + +- fix the bogus -EPIPE detection (and thus may lead to hang up) + in 32bit compat mode (ALSA bug#1938). +- correct a typo in the help text of speaker-test + +------------------------------------------------------------------- New: ---- alsa-lib-32bit-compat-fix.diff alsa-lib-applptr-sync-fix.diff ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ alsa.spec ++++++ --- /var/tmp/diff_new_pack.1pV27R/_old 2006-03-31 15:25:30.000000000 +0200 +++ /var/tmp/diff_new_pack.1pV27R/_new 2006-03-31 15:25:30.000000000 +0200 @@ -21,7 +21,7 @@ Autoreqprov: on Summary: Advanced Linux Sound Architecture Version: 1.0.11 -Release: 20 +Release: 21 Source1: ftp://ftp.alsa-project.org/pub/lib/alsa-lib-%{package_version}.tar.bz2 Source2: ftp://ftp.alsa-project.org/pub/util/alsa-utils-%{package_version}.tar.bz2 # Source5: ftp://ftp.alsa-project.org/pub/oss/alsa-oss-%{package_version}.tar.bz2 @@ -69,6 +69,8 @@ Patch31: alsa-lib-pcm-timer-size-hack.diff Patch32: alsa-lib-dmix-generic-fix.diff Patch33: alsa-lib-dmix-2-periods-fix.diff +Patch34: alsa-lib-32bit-compat-fix.diff +Patch35: alsa-lib-applptr-sync-fix.diff Patch50: alsa-utils-speaker-test-5.1-fix.diff Patch51: alsa-utils-speaker-test-buffer-fix.diff Patch52: alsa-utils-alsaconf-lspci-fix.diff @@ -151,6 +153,8 @@ %patch31 -p1 %patch32 -p1 %patch33 -p1 +%patch34 -p1 +%patch35 -p1 cd .. cd alsa-utils*/. # %patch2 -p1 @@ -434,6 +438,10 @@ %doc alsa-lib*/doc/doxygen/html/* %changelog -n alsa +* Wed Mar 29 2006 - tiwai(a)suse.de +- fix the bogus -EPIPE detection (and thus may lead to hang up) + in 32bit compat mode (ALSA bug#1938). +- correct a typo in the help text of speaker-test * Fri Mar 24 2006 - tiwai(a)suse.de - fix the endless poll() loop without starting PCM - fix the noisy output and xrun from dmix with 2 periods ++++++ alsa-lib-32bit-compat-fix.diff ++++++ Index: alsa-lib/src/pcm/pcm_hw.c =================================================================== RCS file: /home/iwai/cvs/alsa/alsa-lib/src/pcm/pcm_hw.c,v retrieving revision 1.113 retrieving revision 1.114 diff -u -r1.113 -r1.114 --- alsa-lib/src/pcm/pcm_hw.c 20 Mar 2006 11:15:55 -0000 1.113 +++ alsa-lib/src/pcm/pcm_hw.c 29 Mar 2006 09:30:49 -0000 1.114 @@ -942,6 +942,7 @@ } } snd_pcm_mmap_appl_forward(pcm, size); + sync_ptr(hw, 0); #ifdef DEBUG_MMAP fprintf(stderr, "appl_forward: hw_ptr = %li, appl_ptr = %li, size = %li\n", *pcm->hw.ptr, *pcm->appl.ptr, size); #endif Index: alsa-lib/src/pcm/pcm_plugin.c =================================================================== RCS file: /home/iwai/cvs/alsa/alsa-lib/src/pcm/pcm_plugin.c,v retrieving revision 1.52 retrieving revision 1.54 diff -u -r1.52 -r1.54 --- alsa-lib/src/pcm/pcm_plugin.c 22 May 2005 18:06:44 -0000 1.52 +++ alsa-lib/src/pcm/pcm_plugin.c 29 Mar 2006 09:34:15 -0000 1.54 @@ -137,7 +137,7 @@ snd_atomic_write_init(&plugin->watom); } -int snd_pcm_plugin_delay(snd_pcm_t *pcm, snd_pcm_sframes_t *delayp) +static int snd_pcm_plugin_delay(snd_pcm_t *pcm, snd_pcm_sframes_t *delayp) { snd_pcm_plugin_t *plugin = pcm->private_data; snd_pcm_sframes_t sd; @@ -150,7 +150,7 @@ return 0; } -int snd_pcm_plugin_prepare(snd_pcm_t *pcm) +static int snd_pcm_plugin_prepare(snd_pcm_t *pcm) { snd_pcm_plugin_t *plugin = pcm->private_data; int err; @@ -192,7 +192,7 @@ return 0; } -snd_pcm_sframes_t snd_pcm_plugin_rewind(snd_pcm_t *pcm, snd_pcm_uframes_t frames) +static snd_pcm_sframes_t snd_pcm_plugin_rewind(snd_pcm_t *pcm, snd_pcm_uframes_t frames) { snd_pcm_plugin_t *plugin = pcm->private_data; snd_pcm_sframes_t n = snd_pcm_mmap_hw_avail(pcm); @@ -221,7 +221,7 @@ return n; } -snd_pcm_sframes_t snd_pcm_plugin_forward(snd_pcm_t *pcm, snd_pcm_uframes_t frames) +static snd_pcm_sframes_t snd_pcm_plugin_forward(snd_pcm_t *pcm, snd_pcm_uframes_t frames) { snd_pcm_plugin_t *plugin = pcm->private_data; snd_pcm_sframes_t n = snd_pcm_mmap_avail(pcm); @@ -345,7 +345,8 @@ } -snd_pcm_sframes_t snd_pcm_plugin_writei(snd_pcm_t *pcm, const void *buffer, snd_pcm_uframes_t size) +static snd_pcm_sframes_t +snd_pcm_plugin_writei(snd_pcm_t *pcm, const void *buffer, snd_pcm_uframes_t size) { snd_pcm_channel_area_t areas[pcm->channels]; snd_pcm_areas_from_buf(pcm, areas, (void*)buffer); @@ -353,7 +354,8 @@ snd_pcm_plugin_write_areas); } -snd_pcm_sframes_t snd_pcm_plugin_writen(snd_pcm_t *pcm, void **bufs, snd_pcm_uframes_t size) +static snd_pcm_sframes_t +snd_pcm_plugin_writen(snd_pcm_t *pcm, void **bufs, snd_pcm_uframes_t size) { snd_pcm_channel_area_t areas[pcm->channels]; snd_pcm_areas_from_bufs(pcm, areas, bufs); @@ -361,7 +363,8 @@ snd_pcm_plugin_write_areas); } -snd_pcm_sframes_t snd_pcm_plugin_readi(snd_pcm_t *pcm, void *buffer, snd_pcm_uframes_t size) +static snd_pcm_sframes_t +snd_pcm_plugin_readi(snd_pcm_t *pcm, void *buffer, snd_pcm_uframes_t size) { snd_pcm_channel_area_t areas[pcm->channels]; snd_pcm_areas_from_buf(pcm, areas, buffer); @@ -369,7 +372,8 @@ snd_pcm_plugin_read_areas); } -snd_pcm_sframes_t snd_pcm_plugin_readn(snd_pcm_t *pcm, void **bufs, snd_pcm_uframes_t size) +static snd_pcm_sframes_t +snd_pcm_plugin_readn(snd_pcm_t *pcm, void **bufs, snd_pcm_uframes_t size) { snd_pcm_channel_area_t areas[pcm->channels]; snd_pcm_areas_from_bufs(pcm, areas, bufs); @@ -377,9 +381,10 @@ snd_pcm_plugin_read_areas); } -snd_pcm_sframes_t snd_pcm_plugin_mmap_commit(snd_pcm_t *pcm, - snd_pcm_uframes_t offset ATTRIBUTE_UNUSED, - snd_pcm_uframes_t size) +static snd_pcm_sframes_t +snd_pcm_plugin_mmap_commit(snd_pcm_t *pcm, + snd_pcm_uframes_t offset ATTRIBUTE_UNUSED, + snd_pcm_uframes_t size) { snd_pcm_plugin_t *plugin = pcm->private_data; snd_pcm_t *slave = plugin->gen.slave; @@ -445,7 +450,7 @@ return xfer; } -snd_pcm_sframes_t snd_pcm_plugin_avail_update(snd_pcm_t *pcm) +static snd_pcm_sframes_t snd_pcm_plugin_avail_update(snd_pcm_t *pcm) { snd_pcm_plugin_t *plugin = pcm->private_data; snd_pcm_t *slave = plugin->gen.slave; @@ -516,7 +521,7 @@ } } -int snd_pcm_plugin_status(snd_pcm_t *pcm, snd_pcm_status_t * status) +static int snd_pcm_plugin_status(snd_pcm_t *pcm, snd_pcm_status_t * status) { snd_pcm_plugin_t *plugin = pcm->private_data; snd_pcm_sframes_t err; @@ -524,6 +529,9 @@ snd_atomic_read_init(&ratom, &plugin->watom); _again: snd_atomic_read_begin(&ratom); + /* sync with the latest hw and appl ptrs */ + snd_pcm_plugin_avail_update(pcm); + err = snd_pcm_status(plugin->gen.slave, status); if (err < 0) { snd_atomic_read_ok(&ratom); @@ -545,7 +553,7 @@ } snd_pcm_fast_ops_t snd_pcm_plugin_fast_ops = { - .status = snd_pcm_generic_status, + .status = snd_pcm_plugin_status, .state = snd_pcm_generic_state, .hwsync = snd_pcm_generic_hwsync, .delay = snd_pcm_plugin_delay, Index: alsa-lib/src/pcm/pcm_plugin.h =================================================================== RCS file: /home/iwai/cvs/alsa/alsa-lib/src/pcm/pcm_plugin.h,v retrieving revision 1.32 retrieving revision 1.33 diff -u -r1.32 -r1.33 --- alsa-lib/src/pcm/pcm_plugin.h 20 Jan 2005 17:38:12 -0000 1.32 +++ alsa-lib/src/pcm/pcm_plugin.h 29 Mar 2006 09:34:15 -0000 1.33 @@ -52,16 +52,6 @@ } snd_pcm_plugin_t; void snd_pcm_plugin_init(snd_pcm_plugin_t *plugin); -int snd_pcm_plugin_status(snd_pcm_t *pcm, snd_pcm_status_t * status); -int snd_pcm_plugin_delay(snd_pcm_t *pcm, snd_pcm_sframes_t *delayp); -int snd_pcm_plugin_prepare(snd_pcm_t *pcm); -snd_pcm_sframes_t snd_pcm_plugin_rewind(snd_pcm_t *pcm, snd_pcm_uframes_t frames); -snd_pcm_sframes_t snd_pcm_plugin_writei(snd_pcm_t *pcm, const void *buffer, snd_pcm_uframes_t size); -snd_pcm_sframes_t snd_pcm_plugin_writen(snd_pcm_t *pcm, void **bufs, snd_pcm_uframes_t size); -snd_pcm_sframes_t snd_pcm_plugin_readi(snd_pcm_t *pcm, void *buffer, snd_pcm_uframes_t size); -snd_pcm_sframes_t snd_pcm_plugin_readn(snd_pcm_t *pcm, void **bufs, snd_pcm_uframes_t size); -snd_pcm_sframes_t snd_pcm_plugin_mmap_commit(snd_pcm_t *pcm, snd_pcm_uframes_t offset, snd_pcm_uframes_t size); -snd_pcm_sframes_t snd_pcm_plugin_avail_update(snd_pcm_t *pcm); extern snd_pcm_fast_ops_t snd_pcm_plugin_fast_ops; Index: alsa-lib/src/pcm/pcm_rate.c =================================================================== RCS file: /home/iwai/cvs/alsa/alsa-lib/src/pcm/pcm_rate.c,v retrieving revision 1.85 retrieving revision 1.86 diff -u -r1.85 -r1.86 --- alsa-lib/src/pcm/pcm_rate.c 17 Mar 2006 18:03:44 -0000 1.85 +++ alsa-lib/src/pcm/pcm_rate.c 29 Mar 2006 09:33:00 -0000 1.86 @@ -1060,10 +1060,12 @@ result = snd_pcm_mmap_begin(rate->gen.slave, &slave_areas, &slave_offset, &slave_frames); if (result < 0) return result; +#if 0 if (slave_offset) { SNDERR("non-zero slave_offset %ld", slave_offset); return -EIO; } +#endif snd_pcm_areas_copy(slave_areas, slave_offset, rate->sareas, xfer, pcm->channels, cont, @@ -1151,10 +1153,12 @@ result = snd_pcm_mmap_begin(rate->gen.slave, &slave_areas, &slave_offset, &slave_frames); if (result < 0) return result; +#if 0 if (slave_offset) { SNDERR("non-zero slave_offset %ld", slave_offset); return -EIO; } +#endif snd_pcm_areas_copy(rate->sareas, xfer, slave_areas, slave_offset, pcm->channels, cont, ++++++ alsa-lib-applptr-sync-fix.diff ++++++ Index: alsa-lib/src/pcm/pcm_hw.c =================================================================== RCS file: /home/iwai/cvs/alsa/alsa-lib/src/pcm/pcm_hw.c,v retrieving revision 1.114 diff -u -r1.114 pcm_hw.c --- alsa-lib/src/pcm/pcm_hw.c 29 Mar 2006 09:30:49 -0000 1.114 +++ alsa-lib/src/pcm/pcm_hw.c 31 Mar 2006 10:04:17 -0000 @@ -624,6 +624,9 @@ SYSMSG("SNDRV_PCM_IOCTL_REWIND failed"); return err; } + err = sync_ptr(hw, SNDRV_PCM_SYNC_PTR_APPL); + if (err < 0) + return err; return frames; } @@ -637,6 +640,9 @@ SYSMSG("SNDRV_PCM_IOCTL_FORWARD failed"); return err; } + err = sync_ptr(hw, SNDRV_PCM_SYNC_PTR_APPL); + if (err < 0) + return err; return frames; } else { snd_pcm_sframes_t avail; Index: alsa-lib/src/pcm/pcm_multi.c =================================================================== RCS file: /home/iwai/cvs/alsa/alsa-lib/src/pcm/pcm_multi.c,v retrieving revision 1.72 diff -u -r1.72 pcm_multi.c --- alsa-lib/src/pcm/pcm_multi.c 27 Feb 2006 12:39:29 -0000 1.72 +++ alsa-lib/src/pcm/pcm_multi.c 31 Mar 2006 10:04:17 -0000 @@ -424,8 +424,9 @@ int err = 0; unsigned int i; for (i = 0; i < multi->slaves_count; ++i) { - if (multi->slaves[i].linked) - continue; + /* We call prepare to each slave even if it's linked. + * This is to make sure to sync non-mmaped control/status. + */ err = snd_pcm_prepare(multi->slaves[i].pcm); if (err < 0) return err; @@ -439,8 +440,7 @@ int err = 0; unsigned int i; for (i = 0; i < multi->slaves_count; ++i) { - if (multi->slaves[i].linked) - continue; + /* Reset each slave, as well as in prepare */ err = snd_pcm_reset(multi->slaves[i].pcm); if (err < 0) return err; ++++++ alsa-utils-speaker-test-buffer-fix.diff ++++++ --- /var/tmp/diff_new_pack.1pV27R/_old 2006-03-31 15:25:31.000000000 +0200 +++ /var/tmp/diff_new_pack.1pV27R/_new 2006-03-31 15:25:31.000000000 +0200 @@ -303,7 +303,7 @@ + "-P,--nperiods number of periods\n" "-t,--test pink=use pink noise, sine=use sine wave, wav=WAV file\n" - "-s,--speaker single speaker test. Values 1=Left or 2=right\n" -+ "-n,--nloops specify number of loops to test, 0 = infinite\n" ++ "-l,--nloops specify number of loops to test, 0 = infinite\n" + "-s,--speaker single speaker test. Values 1=Left, 2=right, etc\n" "-w,--wavfile Use the given WAV file as a test sound\n" "-W,--wavdir Specify the directory containing WAV files\n" ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun...

1 0

commit NetworkManager-vpnc
by root＠suse.de 31 Mar '06

31 Mar '06

Hello community, here is the log from the commit of package NetworkManager-vpnc checked in at Fri Mar 31 15:25:23 CEST 2006. -------- --- NetworkManager-vpnc/NetworkManager-vpnc.changes 2006-03-20 21:50:36.000000000 +0100 +++ NetworkManager-vpnc/NetworkManager-vpnc.changes 2006-03-29 21:16:27.000000000 +0200 @@ -1,0 +2,5 @@ +Wed Mar 29 21:15:54 CEST 2006 - rml(a)suse.de + +- Send MSS parameter to NetworkManager (see bug #157988) + +------------------------------------------------------------------- New: ---- nm-vpnc-0.6-branch.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ NetworkManager-vpnc.spec ++++++ --- /var/tmp/diff_new_pack.m6JPdj/_old 2006-03-31 15:25:13.000000000 +0200 +++ /var/tmp/diff_new_pack.m6JPdj/_new 2006-03-31 15:25:13.000000000 +0200 @@ -17,13 +17,14 @@ %define sysconfdir /etc Summary: NetworkManager VPN Support for vpnc Version: 0.5.0cvs20060202 -Release: 8 +Release: 10 License: GPL Group: Productivity/Networking/System URL: http://people.redhat.com/dcbw/NetworkManager/ Source0: %{name}-%{version}.tar.gz Source1: gnome-mime-application-x-cisco-vpn-settings.png Patch0: nm-vpnc-desktop.patch +Patch1: nm-vpnc-0.6-branch.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build Requires: vpnc NetworkManager NetworkManager-gnome @@ -39,7 +40,8 @@ %prep %setup -q -%patch0 +%patch0 -p0 +%patch1 -p1 %build autoreconf -f -i @@ -86,6 +88,8 @@ /opt/gnome/share/icons/hicolor/48x48/apps/gnome-mime-application-x-cisco-vpn-settings.png %changelog -n NetworkManager-vpnc +* Wed Mar 29 2006 - rml(a)suse.de +- Send MSS parameter to NetworkManager (see bug #157988) * Mon Mar 20 2006 - rml(a)suse.de - Require NetworkManager-gnome (Novell bug #158691) * Thu Feb 02 2006 - rml(a)suse.de ++++++ nm-vpnc-0.6-branch.patch ++++++ diff -urN NetworkManager-vpnc-0.5.0cvs20060202/src/nm-vpnc-service.c /home/rml/src/NetworkManager/NetworkManager-0.6-branch/vpn-daemons/vpnc/src/nm-vpnc-service.c --- NetworkManager-vpnc-0.5.0cvs20060202/src/nm-vpnc-service.c 2006-01-16 17:58:13.000000000 -0500 +++ /home/rml/src/NetworkManager/NetworkManager-0.6-branch/vpn-daemons/vpnc/src/nm-vpnc-service.c 2006-03-29 14:03:05.000000000 -0500 @@ -576,9 +576,11 @@ static gboolean nm_vpnc_dbus_handle_start_vpn (DBusMessage *message, NmVpncData *data) { char ** data_items = NULL; - int num_items = -1; + int num_items = -1; char ** password_items = NULL; - int num_passwords = -1; + int num_passwords = -1; + char ** user_routes = NULL; + int user_routes_count = -1; const char * name = NULL; const char * user_name = NULL; DBusError error; @@ -596,6 +598,7 @@ DBUS_TYPE_STRING, &user_name, DBUS_TYPE_ARRAY, DBUS_TYPE_STRING, &password_items, &num_passwords, DBUS_TYPE_ARRAY, DBUS_TYPE_STRING, &data_items, &num_items, + DBUS_TYPE_ARRAY, DBUS_TYPE_STRING, &user_routes, &user_routes_count, DBUS_TYPE_INVALID)) { nm_warning ("Could not process the request because its arguments were invalid. dbus said: '%s'", error.message); @@ -622,6 +625,8 @@ out: dbus_free_string_array (data_items); + dbus_free_string_array (password_items); + dbus_free_string_array (user_routes); if (!success) nm_vpnc_set_state (data, NM_VPN_STATE_STOPPED); return success; @@ -864,6 +869,7 @@ guint32 ip4_dns_len; guint32 * ip4_nbns; guint32 ip4_nbns_len; + guint32 mss; char * cisco_def_domain; char * cisco_banner; gboolean success = FALSE; @@ -892,6 +898,10 @@ /* For Cisco/vpnc, PtP address == local VPN address */ ip4_ptp_address = ip4_address; + + /* and we don't specify an MSS */ + mss = 0; + #if 0 print_vpn_config (ip4_vpn_gateway, tundev, ip4_address, ip4_netmask, ip4_dns, ip4_dns_len, ip4_nbns, ip4_nbns_len, @@ -909,6 +919,7 @@ DBUS_TYPE_UINT32, &ip4_netmask, DBUS_TYPE_ARRAY, DBUS_TYPE_UINT32, &ip4_dns, ip4_dns_len, DBUS_TYPE_ARRAY, DBUS_TYPE_UINT32, &ip4_nbns, ip4_nbns_len, + DBUS_TYPE_UINT32, &mss, DBUS_TYPE_STRING, &cisco_def_domain, DBUS_TYPE_STRING, &cisco_banner, DBUS_TYPE_INVALID); if (!dbus_connection_send (data->con, signal, NULL)) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun...

1 0

commit NetworkManager-openvpn
by root＠suse.de 31 Mar '06

31 Mar '06

Hello community, here is the log from the commit of package NetworkManager-openvpn checked in at Fri Mar 31 15:25:21 CEST 2006. -------- --- NetworkManager-openvpn/NetworkManager-openvpn.changes 2006-03-20 21:50:57.000000000 +0100 +++ NetworkManager-openvpn/NetworkManager-openvpn.changes 2006-03-29 21:22:50.000000000 +0200 @@ -1,0 +2,5 @@ +Wed Mar 29 21:22:25 CEST 2006 - rml(a)suse.de + +- Send per-route MSS information to NetworkManager (bug #157988) + +------------------------------------------------------------------- New: ---- nm-openvpn-0.6-branch.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ NetworkManager-openvpn.spec ++++++ --- /var/tmp/diff_new_pack.l0NARQ/_old 2006-03-31 15:25:11.000000000 +0200 +++ /var/tmp/diff_new_pack.l0NARQ/_new 2006-03-31 15:25:11.000000000 +0200 @@ -17,13 +17,14 @@ %define sysconfdir /etc Summary: NetworkManager VPN support for OpenVPN Version: 0.3.2cvs20060202 -Release: 8 +Release: 10 License: GPL Group: Productivity/Networking/System URL: http://www.gnome.org/projects/NetworkManager Source0: %{name}-%{version}.tar.gz Source1: gnome-mime-application-x-openvpn-settings.png Patch0: nm-openvpn-desktop.patch +Patch1: nm-openvpn-0.6-branch.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build Requires: openvpn NetworkManager NetworkManager-gnome @@ -39,7 +40,8 @@ %prep %setup -q -%patch0 +%patch0 -p0 +%patch1 -p1 %build autoreconf -f -i @@ -86,6 +88,8 @@ /opt/gnome/share/icons/hicolor/48x48/apps/gnome-mime-application-x-openvpn-settings.png %changelog -n NetworkManager-openvpn +* Wed Mar 29 2006 - rml(a)suse.de +- Send per-route MSS information to NetworkManager (bug #157988) * Mon Mar 20 2006 - rml(a)suse.de - Require NetworkManager-gnome (Novell bug #158691) * Thu Feb 02 2006 - rml(a)suse.de ++++++ nm-openvpn-0.6-branch.patch ++++++ diff -urN NetworkManager-openvpn-0.3.2cvs20060202/src/nm-openvpn-service.c NetworkManager-0.6-branch/vpn-daemons/openvpn/src/nm-openvpn-service.c --- NetworkManager-openvpn-0.3.2cvs20060202/src/nm-openvpn-service.c 2006-01-16 17:58:12.000000000 -0500 +++ NetworkManager-0.6-branch/vpn-daemons/openvpn/src/nm-openvpn-service.c 2006-03-29 14:24:25.000000000 -0500 @@ -17,7 +17,7 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * - * $Id: nm-openvpn-service.c,v 1.9 2006/01/16 22:58:12 dcbw Exp $ + * $Id: nm-openvpn-service.c,v 1.10.2.2 2006/03/29 19:24:25 rml Exp $ * */ @@ -1007,6 +1007,8 @@ int num_items = -1; char ** password_items = NULL; int num_passwords = -1; + char ** user_routes = NULL; + int user_routes_count = -1; const char * name = NULL; const char * user_name = NULL; DBusError error; @@ -1024,6 +1026,7 @@ DBUS_TYPE_STRING, &user_name, DBUS_TYPE_ARRAY, DBUS_TYPE_STRING, &password_items, &num_passwords, DBUS_TYPE_ARRAY, DBUS_TYPE_STRING, &data_items, &num_items, + DBUS_TYPE_ARRAY, DBUS_TYPE_STRING, &user_routes, &user_routes_count, DBUS_TYPE_INVALID)) { nm_warning ("Could not process the request because its arguments were invalid. dbus said: '%s'", error.message); @@ -1047,6 +1050,8 @@ out: dbus_free_string_array (data_items); + dbus_free_string_array (password_items); + dbus_free_string_array (user_routes); if (!success) nm_openvpn_set_state (data, NM_VPN_STATE_STOPPED); return success; @@ -1240,6 +1245,7 @@ guint32 ip4_dns_len; guint32 * ip4_nbns; guint32 ip4_nbns_len; + guint32 mss; gboolean success = FALSE; char * empty = ""; @@ -1272,6 +1278,9 @@ goto out; } + /* OpenVPN does not care about the MSS */ + mss = 0; + dbus_message_append_args (signal, DBUS_TYPE_UINT32, &ip4_vpn_gateway, DBUS_TYPE_STRING, &tundev, @@ -1280,6 +1289,7 @@ DBUS_TYPE_UINT32, &ip4_netmask, DBUS_TYPE_ARRAY, DBUS_TYPE_UINT32, &ip4_dns, ip4_dns_len, DBUS_TYPE_ARRAY, DBUS_TYPE_UINT32, &ip4_nbns, ip4_nbns_len, + DBUS_TYPE_UINT32, &mss, DBUS_TYPE_STRING, &empty, DBUS_TYPE_STRING, &empty, DBUS_TYPE_INVALID); diff -urN NetworkManager-openvpn-0.3.2cvs20060202/src/nm-openvpn-service-openvpn-helper.c NetworkManager-0.6-branch/vpn-daemons/openvpn/src/nm-openvpn-service-openvpn-helper.c --- NetworkManager-openvpn-0.3.2cvs20060202/src/nm-openvpn-service-openvpn-helper.c 2006-01-16 17:58:12.000000000 -0500 +++ NetworkManager-0.6-branch/vpn-daemons/openvpn/src/nm-openvpn-service-openvpn-helper.c 2006-03-30 12:20:57.000000000 -0500 @@ -21,7 +21,7 @@ * (C) Copyright 2005 Red Hat, Inc. * (C) Copyright 2005 Tim Niemueller * - * $Id: nm-openvpn-service-openvpn-helper.c,v 1.6 2006/01/16 22:58:12 dcbw Exp $ + * $Id: nm-openvpn-service-openvpn-helper.c,v 1.6.2.1 2006/03/30 17:20:57 rml Exp $ * */ @@ -175,7 +175,7 @@ goto out; } - if (! ipstr_to_uint32 (str_ip4_ptpaddr, &uint_ip4_ptpaddr) ) { + if (str_ip4_ptpaddr && ! ipstr_to_uint32 (str_ip4_ptpaddr, &uint_ip4_ptpaddr) ) { nm_warning ("nm-openvpn-service-openvpn-helper didn't receive a valid PtP IP4 Address from openvpn."); send_config_error (con, "IP4 PtP Address"); goto out; ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun...

1 0

commit NetworkManager
by root＠suse.de 31 Mar '06

31 Mar '06

Hello community, here is the log from the commit of package NetworkManager checked in at Fri Mar 31 15:25:08 CEST 2006. -------- --- NetworkManager/NetworkManager.changes 2006-03-28 17:37:59.000000000 +0200 +++ NetworkManager/NetworkManager.changes 2006-03-30 16:45:55.000000000 +0200 @@ -1,0 +2,8 @@ +Wed Mar 29 21:17:42 CEST 2006 - rml(a)suse.de + +- Allow VPN modules to specify a per-route MSS value (bug #157988) +- Fix possible crash in strcmp (Novell bug #162104) +- Have NetworkManager require NetworkManager-client and have + NetworkManager-gnome provide NetworkManager-client (bug #158326) + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ NetworkManager.spec ++++++ --- /var/tmp/diff_new_pack.eRdzKR/_old 2006-03-31 15:24:30.000000000 +0200 +++ /var/tmp/diff_new_pack.eRdzKR/_new 2006-03-31 15:24:30.000000000 +0200 @@ -31,7 +31,7 @@ URL: http://www.gnome.org/projects/NetworkManager/ Autoreqprov: on Version: 0.6.2 -Release: 2 +Release: 3 Summary: Network Link Manager and User Applications Source0: NetworkManager-%{version}.tar.gz Source1: nm-icons.tar.gz @@ -43,6 +43,7 @@ Patch5: nm-debug-wpa-less-rml.patch Patch6: nm-0.6-branch.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build +Requires: %{name}-client Requires: wireless-tools >= %{wireless_version} Requires: dbus-1 >= %{dbus_version} Requires: dbus-1-glib >= %{dbus_version} @@ -74,6 +75,7 @@ %package gnome Summary: GNOME applications for use with NetworkManager Group: System/GUI/GNOME +Provides: %{name}-client Requires: %{name} = %{version}-%{release} Requires: gnome-panel libgnomesu Requires: dbus-1 >= %{dbus_version} @@ -242,6 +244,11 @@ %{_libdir}/libnm_glib.so.0.0.0 %changelog -n NetworkManager +* Wed Mar 29 2006 - rml(a)suse.de +- Allow VPN modules to specify a per-route MSS value (bug #157988) +- Fix possible crash in strcmp (Novell bug #162104) +- Have NetworkManager require NetworkManager-client and have + NetworkManager-gnome provide NetworkManager-client (bug #158326) * Tue Mar 28 2006 - rml(a)suse.de - Don't let wpa_supplicant scan with the airo driver (bug #161389) - Don't let wpa_supplicant scan when creating a new Ad-Hoc network, ++++++ nm-0.6-branch.patch ++++++ ++++ 690 lines (skipped) ++++ between NetworkManager/nm-0.6-branch.patch ++++ and NetworkManager/nm-0.6-branch.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun...

1 0

commit NetworkManager-kde
by root＠suse.de 31 Mar '06

31 Mar '06

Hello community, here is the log from the commit of package NetworkManager-kde checked in at Fri Mar 31 15:25:06 CEST 2006. -------- --- KDE/NetworkManager-kde/NetworkManager-kde.changes 2006-03-27 18:47:44.000000000 +0200 +++ NetworkManager-kde/NetworkManager-kde.changes 2006-03-29 17:50:12.000000000 +0200 @@ -1,0 +2,10 @@ +Wed Mar 29 17:47:49 CEST 2006 - thoenig(a)suse.de + +- update to SVN r5964 +- add "Provides: NetworkManager-client" to spec file (b.n.c. + #158326) +- refuse to check context menu entries if we're not connected to a + network (b.n.c. #161245) +- update meta data + +------------------------------------------------------------------- Old: ---- knetworkmanager-0.1r5961.tar.bz2 New: ---- knetworkmanager-0.1r5964.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ NetworkManager-kde.spec ++++++ --- /var/tmp/diff_new_pack.LCIhXL/_old 2006-03-31 15:24:44.000000000 +0200 +++ /var/tmp/diff_new_pack.LCIhXL/_new 2006-03-31 15:24:44.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package NetworkManager-kde (Version 0.1r5961) +# spec file for package NetworkManager-kde (Version 0.1r5964) # # Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine @@ -19,11 +19,12 @@ License: GPL Group: System/GUI/KDE Autoreqprov: on -Version: 0.1r5961 +Version: 0.1r5964 Release: 1 Summary: KNetworkManager application for use with NetworkManager BuildRoot: %{_tmppath}/%{name}-%{version}-build Requires: NetworkManager +Provides: NetworkManager-client Source0: %{appname}-%{version}.tar.bz2 Source1: knetworkmanager.default.sh @@ -82,6 +83,13 @@ /opt/kde3/env %changelog -n NetworkManager-kde +* Wed Mar 29 2006 - thoenig(a)suse.de +- update to SVN r5964 +- add "Provides: NetworkManager-client" to spec file (b.n.c. + [#158326]) +- refuse to check context menu entries if we're not connected to a + network (b.n.c. #161245) +- update meta data * Mon Mar 27 2006 - thoenig(a)suse.de - update to SVN r5961 - don't crash on exit if VPN module is active ++++++ knetworkmanager-0.1r5961.tar.bz2 -> knetworkmanager-0.1r5964.tar.bz2 ++++++ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/knetworkmanager-0.1r5961/AUTHORS new/knetworkmanager-0.1r5964/AUTHORS --- old/knetworkmanager-0.1r5961/AUTHORS 2006-03-27 18:47:03.000000000 +0200 +++ new/knetworkmanager-0.1r5964/AUTHORS 2006-03-29 16:44:15.000000000 +0200 @@ -1 +1,3 @@ Timo Hoenig <thoenig(a)suse.de> +Will Stephenson <wstephenson(a)kde.org> +Stefan Bogner <sbogner(a)suse.de> diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/knetworkmanager-0.1r5961/COPYING new/knetworkmanager-0.1r5964/COPYING --- old/knetworkmanager-0.1r5961/COPYING 2006-03-27 18:47:03.000000000 +0200 +++ new/knetworkmanager-0.1r5964/COPYING 2006-03-29 16:44:15.000000000 +0200 @@ -2,7 +2,7 @@ Version 2, June 1991 Copyright (C) 1989, 1991 Free Software Foundation, Inc. - 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + 51 Franklin St, Fifth Floor, Boston, MA 02111-1301 USA Everyone is permitted to copy and distribute verbatim copies of this license document, but changing it is not allowed. diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/knetworkmanager-0.1r5961/Makefile.am new/knetworkmanager-0.1r5964/Makefile.am --- old/knetworkmanager-0.1r5961/Makefile.am 2006-03-27 18:47:03.000000000 +0200 +++ new/knetworkmanager-0.1r5964/Makefile.am 2006-03-29 16:44:15.000000000 +0200 @@ -4,7 +4,8 @@ package-messages: cd $(top_srcdir) && $(MAKE) -f admin/Makefile.common package-messages - $(MAKE) -C po merge + $(MAKE) -C po +#merge dbusservicedir = $(DBUS_SYS_DIR) dbusservice_DATA = knetworkmanager.conf diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/knetworkmanager-0.1r5961/NEWS new/knetworkmanager-0.1r5964/NEWS --- old/knetworkmanager-0.1r5961/NEWS 2006-03-27 18:47:03.000000000 +0200 +++ new/knetworkmanager-0.1r5964/NEWS 2006-03-29 16:44:15.000000000 +0200 @@ -0,0 +1 @@ +28 March 2006 - KNetworkManager moves to KDE SVN diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/knetworkmanager-0.1r5961/README new/knetworkmanager-0.1r5964/README --- old/knetworkmanager-0.1r5961/README 2006-03-27 18:47:03.000000000 +0200 +++ new/knetworkmanager-0.1r5964/README 2006-03-29 16:44:15.000000000 +0200 @@ -1,5 +1,4 @@ -KNetworkManager is a system tray application for controlling network connections on -systems that use the NetworkManager daemon. +KNetworkManager is a system tray application for controlling network connections on systems that use the NetworkManager daemon. Currently the following things work: @@ -17,8 +16,10 @@ * VPN support * Notifications (new networks, new devices, NM status changes) [WIP] +NetworkManager 0.6.2 is required to build this version of KNetworkManager. + If you encounter bugs, please report them using - * http://bugzilla.novell.com + * http://bugs.kde.org -Last update: 26-Mar-2006 - Timo Hoenig <thoenig(a)suse.de> +Last update: 28-Mar-2006 - Will Stephenson <wstephenson(a)kde.org> diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/knetworkmanager-0.1r5961/TODO new/knetworkmanager-0.1r5964/TODO --- old/knetworkmanager-0.1r5961/TODO 2006-03-27 18:47:03.000000000 +0200 +++ new/knetworkmanager-0.1r5964/TODO 2006-03-29 16:44:15.000000000 +0200 @@ -0,0 +1 @@ +*) Fix KWallet integration so that it only opens the wallet when a password is actually needed, not on startup. diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/knetworkmanager-0.1r5961/admin/acinclude.m4.in new/knetworkmanager-0.1r5964/admin/acinclude.m4.in --- old/knetworkmanager-0.1r5961/admin/acinclude.m4.in 2006-03-27 18:47:08.000000000 +0200 +++ new/knetworkmanager-0.1r5964/admin/acinclude.m4.in 2006-03-29 16:44:17.000000000 +0200 @@ -3023,8 +3023,8 @@ [ kde_cv_opt_noinline_match=irrelevant dnl if we don't use both -O2 and -fno-inline, this check is moot - if echo "$CFLAGS" | grep -qe -O2 \ - && echo "$CFLAGS" | grep -qe -fno-inline ; then + if echo "$CFLAGS" | grep -e -O2 >/dev/null 2>/dev/null \ + && echo "$CFLAGS" | grep -e -fno-inline >/dev/null 2>/dev/null ; then ac_cflags_save="$CFLAGS" CFLAGS="$CFLAGS -D_USE_GNU" diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/knetworkmanager-0.1r5961/knetworkmanager.kdevelop new/knetworkmanager-0.1r5964/knetworkmanager.kdevelop --- old/knetworkmanager-0.1r5961/knetworkmanager.kdevelop 2006-03-27 18:47:03.000000000 +0200 +++ new/knetworkmanager-0.1r5964/knetworkmanager.kdevelop 2006-03-29 16:44:15.000000000 +0200 @@ -16,7 +16,8 @@ <ignoreparts/> <projectdirectory>.</projectdirectory> <absoluteprojectpath>false</absoluteprojectpath> - <description/> + <description>KNetworkManager is a system tray application for controlling network connections on systems that use the NetworkManager daemon. +</description> </general> <kdevautoproject> <general> @@ -33,9 +34,7 @@ <programargs>--nofork</programargs> <terminal>false</terminal> <autocompile>true</autocompile> - <envvars> - <envvar value="/home/will/tmp/knetworkmanager/debug/src/.libs" name="LD_LIBRARY_PATH" /> - </envvars> + <envvars/> </run> <configurations> <optimized> @@ -46,21 +45,23 @@ <cxxflags>-O2 -g0</cxxflags> </optimized> <debug> - <configargs>--enable-debug=full --with-extra-includes=/usr/include/dbus-1</configargs> + <configargs>--enable-debug --prefix=/space/kde/installs/3_5</configargs> <builddir>debug</builddir> <ccompiler>kdevgccoptions</ccompiler> <cxxcompiler>kdevgppoptions</cxxcompiler> <f77compiler>kdevg77options</f77compiler> <cxxflags>-O0 -g3</cxxflags> - <envvars/> - <topsourcedir>/home/will/tmp/knetworkmanager</topsourcedir> - <cppflags/> - <ldflags/> - <ccompilerbinary/> + <envvars> + <envvar value="/space/kde/installs/3_5" name="KDEDIR" /> + </envvars> + <topsourcedir></topsourcedir> + <cppflags></cppflags> + <ldflags></ldflags> + <ccompilerbinary></ccompilerbinary> <cxxcompilerbinary>/opt/icecream/bin/g++</cxxcompilerbinary> - <f77compilerbinary/> - <cflags/> - <f77flags/> + <f77compilerbinary></f77compilerbinary> + <cflags></cflags> + <f77flags></f77flags> </debug> </configurations> <make> @@ -71,7 +72,7 @@ <abortonerror>true</abortonerror> <numberofjobs>1</numberofjobs> <dontact>false</dontact> - <makebin>unsermake --compile-jobs=15</makebin> + <makebin>unsermake -p</makebin> <prio>0</prio> </make> </kdevautoproject> @@ -131,10 +132,10 @@ <general> <dbgshell>libtool</dbgshell> <programargs>--nofork</programargs> - <gdbpath/> - <configGdbScript/> - <runShellScript/> - <runGdbScript/> + <gdbpath></gdbpath> + <configGdbScript></configGdbScript> + <runShellScript></runShellScript> + <runGdbScript></runGdbScript> <breakonloadinglibs>true</breakonloadinglibs> <separatetty>false</separatetty> <floatingtoolbar>false</floatingtoolbar> @@ -157,6 +158,7 @@ <projectdoc> <docsystem>Doxygen Documentation Collection</docsystem> <docurl>knetworkmanager.tag</docurl> + <usermanualurl></usermanualurl> </projectdoc> </kdevdocumentation> <substmap> @@ -197,7 +199,7 @@ <headerCompletionDelay>250</headerCompletionDelay> </codecompletion> <creategettersetter> - <prefixGet/> + <prefixGet></prefixGet> <prefixSet>set</prefixSet> <prefixVariable>m_,_</prefixVariable> <parameterName>theValue</parameterName> @@ -206,7 +208,10 @@ </creategettersetter> <references> <pcs>Qt</pcs> - <pcs>Qt Private API</pcs> </references> </kdevcppsupport> + <ctagspart> + <customArguments></customArguments> + <customTagfilePath></customTagfilePath> + </ctagspart> </kdevelop> diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/knetworkmanager-0.1r5961/src/knetworkmanager-device.cpp new/knetworkmanager-0.1r5964/src/knetworkmanager-device.cpp --- old/knetworkmanager-0.1r5961/src/knetworkmanager-device.cpp 2006-03-27 18:47:02.000000000 +0200 +++ new/knetworkmanager-0.1r5964/src/knetworkmanager-device.cpp 2006-03-29 16:44:14.000000000 +0200 @@ -4,7 +4,8 @@ * * Copyright (C) 2005, 2006 Novell, Inc. * - * Author: Timo Hoenig <thoenig(a)suse.de>, <thoenig(a)nouse.net> + * Author: Timo Hoenig <thoenig(a)suse.de>, <thoenig(a)nouse.net> + * Will Stephenson <wstephenson(a)suse.de>, <wstephenson(a)kde.org> * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/knetworkmanager-0.1r5961/src/knetworkmanager-device.h new/knetworkmanager-0.1r5964/src/knetworkmanager-device.h --- old/knetworkmanager-0.1r5961/src/knetworkmanager-device.h 2006-03-27 18:47:02.000000000 +0200 +++ new/knetworkmanager-0.1r5964/src/knetworkmanager-device.h 2006-03-29 16:44:14.000000000 +0200 @@ -4,7 +4,8 @@ * * Copyright (C) 2005, 2006 Novell, Inc. * - * Author: Timo Hoenig <thoenig(a)suse.de>, <thoenig(a)nouse.net> + * Author: Timo Hoenig <thoenig(a)suse.de>, <thoenig(a)nouse.net> + * Will Stephenson <wstephenson(a)suse.de>, <wstephenson(a)kde.org> * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/knetworkmanager-0.1r5961/src/knetworkmanager-devicestore.cpp new/knetworkmanager-0.1r5964/src/knetworkmanager-devicestore.cpp --- old/knetworkmanager-0.1r5961/src/knetworkmanager-devicestore.cpp 2006-03-27 18:47:02.000000000 +0200 +++ new/knetworkmanager-0.1r5964/src/knetworkmanager-devicestore.cpp 2006-03-29 16:44:14.000000000 +0200 @@ -4,7 +4,8 @@ * * Copyright (C) 2005, 2006 Novell, Inc. * - * Author: Timo Hoenig <thoenig(a)suse.de>, <thoenig(a)nouse.net> + * Author: Timo Hoenig <thoenig(a)suse.de>, <thoenig(a)nouse.net> + * Will Stephenson <wstephenson(a)suse.de>, <wstephenson(a)kde.org> * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/knetworkmanager-0.1r5961/src/knetworkmanager-devicestore.h new/knetworkmanager-0.1r5964/src/knetworkmanager-devicestore.h --- old/knetworkmanager-0.1r5961/src/knetworkmanager-devicestore.h 2006-03-27 18:47:02.000000000 +0200 +++ new/knetworkmanager-0.1r5964/src/knetworkmanager-devicestore.h 2006-03-29 16:44:14.000000000 +0200 @@ -4,7 +4,8 @@ * * Copyright (C) 2005, 2006 Novell, Inc. * - * Author: Timo Hoenig <thoenig(a)suse.de>, <thoenig(a)nouse.net> + * Author: Timo Hoenig <thoenig(a)suse.de>, <thoenig(a)nouse.net> + * Will Stephenson <wstephenson(a)suse.de>, <wstephenson(a)kde.org> * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/knetworkmanager-0.1r5961/src/knetworkmanager-dialogfab.cpp new/knetworkmanager-0.1r5964/src/knetworkmanager-dialogfab.cpp --- old/knetworkmanager-0.1r5961/src/knetworkmanager-dialogfab.cpp 2006-03-27 18:47:02.000000000 +0200 +++ new/knetworkmanager-0.1r5964/src/knetworkmanager-dialogfab.cpp 2006-03-29 16:44:14.000000000 +0200 @@ -4,8 +4,8 @@ * * Copyright (C) 2005, 2006 Novell, Inc. * - * Author: Timo Hoenig <thoenig(a)suse.de>, <thoenig(a)nouse.net> - * Will Stephenson <wstephenson(a)suse.de> + * Author: Timo Hoenig <thoenig(a)suse.de>, <thoenig(a)nouse.net> + * Will Stephenson <wstephenson(a)suse.de>, <wstephenson(a)kde.org> * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/knetworkmanager-0.1r5961/src/knetworkmanager-dialogfab.h new/knetworkmanager-0.1r5964/src/knetworkmanager-dialogfab.h --- old/knetworkmanager-0.1r5961/src/knetworkmanager-dialogfab.h 2006-03-27 18:47:02.000000000 +0200 +++ new/knetworkmanager-0.1r5964/src/knetworkmanager-dialogfab.h 2006-03-29 16:44:14.000000000 +0200 @@ -4,7 +4,8 @@ * * Copyright (C) 2005, 2006 Novell, Inc. * - * Author: Timo Hoenig <thoenig(a)suse.de>, <thoenig(a)nouse.net> + * Author: Timo Hoenig <thoenig(a)suse.de>, <thoenig(a)nouse.net> + * Will Stephenson <wstephenson(a)suse.de>, <wstephenson(a)kde.org> * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/knetworkmanager-0.1r5961/src/knetworkmanager-encryption.cpp new/knetworkmanager-0.1r5964/src/knetworkmanager-encryption.cpp --- old/knetworkmanager-0.1r5961/src/knetworkmanager-encryption.cpp 2006-03-27 18:47:02.000000000 +0200 +++ new/knetworkmanager-0.1r5964/src/knetworkmanager-encryption.cpp 2006-03-29 16:44:14.000000000 +0200 @@ -4,7 +4,8 @@ * * Copyright (C) 2006 Novell, Inc. * - * Author: Timo Hoenig <thoenig(a)suse.de>, <thoenig(a)nouse.net> + * Author: Timo Hoenig <thoenig(a)suse.de>, <thoenig(a)nouse.net> + * Will Stephenson <wstephenson(a)suse.de>, <wstephenson(a)kde.org> * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/knetworkmanager-0.1r5961/src/knetworkmanager-encryption.h new/knetworkmanager-0.1r5964/src/knetworkmanager-encryption.h --- old/knetworkmanager-0.1r5961/src/knetworkmanager-encryption.h 2006-03-27 18:47:02.000000000 +0200 +++ new/knetworkmanager-0.1r5964/src/knetworkmanager-encryption.h 2006-03-29 16:44:14.000000000 +0200 @@ -4,7 +4,8 @@ * * Copyright (C) 2006 Novell, Inc. * - * Author: Timo Hoenig <thoenig(a)suse.de>, <thoenig(a)nouse.net> + * Author: Timo Hoenig <thoenig(a)suse.de>, <thoenig(a)nouse.net> + * Will Stephenson <wstephenson(a)suse.de>, <wstephenson(a)kde.org> * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/knetworkmanager-0.1r5961/src/knetworkmanager-network.cpp new/knetworkmanager-0.1r5964/src/knetworkmanager-network.cpp --- old/knetworkmanager-0.1r5961/src/knetworkmanager-network.cpp 2006-03-27 18:47:02.000000000 +0200 +++ new/knetworkmanager-0.1r5964/src/knetworkmanager-network.cpp 2006-03-29 16:44:14.000000000 +0200 @@ -4,8 +4,8 @@ * * Copyright (C) 2005, 2006 Novell, Inc. * - * Author: Timo Hoenig <thoenig(a)suse.de>, <thoenig(a)nouse.net> - * Author: Will Stephenson <wstephenson(a)suse.de> + * Author: Timo Hoenig <thoenig(a)suse.de>, <thoenig(a)nouse.net> + * Will Stephenson <wstephenson(a)suse.de>, <wstephenson(a)kde.org> * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/knetworkmanager-0.1r5961/src/knetworkmanager-network.h new/knetworkmanager-0.1r5964/src/knetworkmanager-network.h --- old/knetworkmanager-0.1r5961/src/knetworkmanager-network.h 2006-03-27 18:47:02.000000000 +0200 +++ new/knetworkmanager-0.1r5964/src/knetworkmanager-network.h 2006-03-29 16:44:14.000000000 +0200 @@ -4,8 +4,8 @@ * * Copyright (C) 2005, 2006 Novell, Inc. * - * Author: Timo Hoenig <thoenig(a)suse.de>, <thoenig(a)nouse.net> - * Author: Will Stephenson <wstephenson(a)suse.de> + * Author: Timo Hoenig <thoenig(a)suse.de>, <thoenig(a)nouse.net> + * Will Stephenson <wstephenson(a)suse.de>, <wstephenson(a)kde.org> * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/knetworkmanager-0.1r5961/src/knetworkmanager-storage.cpp new/knetworkmanager-0.1r5964/src/knetworkmanager-storage.cpp --- old/knetworkmanager-0.1r5961/src/knetworkmanager-storage.cpp 2006-03-27 18:47:02.000000000 +0200 +++ new/knetworkmanager-0.1r5964/src/knetworkmanager-storage.cpp 2006-03-29 16:44:14.000000000 +0200 @@ -4,8 +4,9 @@ * * Copyright (C) 2005, 2006 Novell, Inc. * - * Authors: Timo Hoenig <thoenig(a)suse.de>, <thoenig(a)nouse.net> - * Stefan Bogner <sbogner(a)suse.de>, <bochi(a)kmobiletools.org> + * Author: Timo Hoenig <thoenig(a)suse.de>, <thoenig(a)nouse.net> + * Will Stephenson <wstephenson(a)suse.de>, <wstephenson(a)kde.org> + * Stefan Bogner <sbogner(a)suse.de>, <bochi(a)kmobiletools.org> * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/knetworkmanager-0.1r5961/src/knetworkmanager-storage.h new/knetworkmanager-0.1r5964/src/knetworkmanager-storage.h --- old/knetworkmanager-0.1r5961/src/knetworkmanager-storage.h 2006-03-27 18:47:02.000000000 +0200 +++ new/knetworkmanager-0.1r5964/src/knetworkmanager-storage.h 2006-03-29 16:44:14.000000000 +0200 @@ -4,8 +4,9 @@ * * Copyright (C) 2005, 2006 Novell, Inc. * - * Authors: Timo Hoenig <thoenig(a)suse.de>, <thoenig(a)nouse.net> - * Stefan Bogner <sbogner(a)suse.de>, <bochi(a)kmobiletools.org> + * Author: Timo Hoenig <thoenig(a)suse.de>, <thoenig(a)nouse.net> + * Will Stephenson <wstephenson(a)suse.de>, <wstephenson(a)kde.org> + * Stefan Bogner <sbogner(a)suse.de>, <bochi(a)kmobiletools.org> * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/knetworkmanager-0.1r5961/src/knetworkmanager-tray.cpp new/knetworkmanager-0.1r5964/src/knetworkmanager-tray.cpp --- old/knetworkmanager-0.1r5961/src/knetworkmanager-tray.cpp 2006-03-27 18:47:02.000000000 +0200 +++ new/knetworkmanager-0.1r5964/src/knetworkmanager-tray.cpp 2006-03-29 16:44:14.000000000 +0200 @@ -5,7 +5,7 @@ * Copyright (C) 2005, 2006 Novell, Inc. * * Author: Timo Hoenig <thoenig(a)suse.de>, <thoenig(a)nouse.net> - * Will Stephenson <wstephenson(a)suse.de> + * Will Stephenson <wstephenson(a)suse.de>, <wstephenson(a)kde.org> * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -489,7 +489,7 @@ QPixmap icon; QString descr; WirelessNetworkItem* wirelessNetworkItem; - + bool online = _ctx->getState ()-> isConnected (); int id; if (!net->getEssid ()) { @@ -499,7 +499,7 @@ wirelessNetworkItem = new WirelessNetworkItem (contextMenu (), net->getEssid (), (net->isActive () && dev->isActive ()), net->getStrength (), net->isEncrypted ()); id = contextMenu ()->insertItem (wirelessNetworkItem, -1, -1); - if (net->isActive () && dev->isActive ()) { + if (online && net->isActive () && dev->isActive ()) { contextMenu ()->setItemChecked (id, true); } else { contextMenu ()->setItemChecked (id, false); @@ -512,11 +512,12 @@ Tray::addWiredDevice (Device* dev, const QString & descr) { QPixmap icon; + bool online = _ctx->getState ()-> isConnected (); int id; id = contextMenu ()->insertItem (descr, -1, -1); - if (dev->isActive ()) { + if (online && dev->isActive ()) { contextMenu ()->setItemChecked (id, true); } else { contextMenu ()->setItemChecked (id, false); diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/knetworkmanager-0.1r5961/src/knetworkmanager-tray.h new/knetworkmanager-0.1r5964/src/knetworkmanager-tray.h --- old/knetworkmanager-0.1r5961/src/knetworkmanager-tray.h 2006-03-27 18:47:02.000000000 +0200 +++ new/knetworkmanager-0.1r5964/src/knetworkmanager-tray.h 2006-03-29 16:44:14.000000000 +0200 @@ -4,8 +4,8 @@ * * Copyright (C) 2005, 2006 Novell, Inc. * - * Author: Timo Hoenig <thoenig(a)suse.de>, <thoenig(a)nouse.net> - * Will Stephenson <wstephenson(a)suse.de> + * Author: Timo Hoenig <thoenig(a)suse.de>, <thoenig(a)nouse.net> + * Will Stephenson <wstephenson(a)suse.de>, <wstephenson(a)kde.org> * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/knetworkmanager-0.1r5961/src/knetworkmanager.cpp new/knetworkmanager-0.1r5964/src/knetworkmanager.cpp --- old/knetworkmanager-0.1r5961/src/knetworkmanager.cpp 2006-03-27 18:47:02.000000000 +0200 +++ new/knetworkmanager-0.1r5964/src/knetworkmanager.cpp 2006-03-29 16:44:14.000000000 +0200 @@ -4,7 +4,8 @@ * * Copyright (C) 2005, 2006 Novell, Inc. * - * Author: Timo Hoenig <thoenig(a)suse.de>, <thoenig(a)nouse.net> + * Author: Timo Hoenig <thoenig(a)suse.de>, <thoenig(a)nouse.net> + * Will Stephenson <wstephenson(a)suse.de>, <wstephenson(a)kde.org> * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun...

1 0

commit yast2-storage
by root＠suse.de 30 Mar '06

30 Mar '06

Hello community, here is the log from the commit of package yast2-storage checked in at Thu Mar 30 21:03:04 CEST 2006. -------- --- yast2-storage/yast2-storage.changes 2006-03-30 15:57:14.000000000 +0200 +++ yast2-storage/yast2-storage.changes 2006-03-30 19:58:49.000000000 +0200 @@ -1,0 +2,8 @@ +Thu Mar 30 16:37:50 CEST 2006 - fehr(a)suse.de + +- prevent reuse of partitions already used by other entities +- wait for udev activity to be finished after calls to + "dmsetup remove ..." (#162279) +- version 2.13.44 + +------------------------------------------------------------------- Old: ---- yast2-storage-2.13.43.tar.bz2 New: ---- yast2-storage-2.13.44.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-storage.spec ++++++ --- /var/tmp/diff_new_pack.W157CA/_old 2006-03-30 21:01:50.000000000 +0200 +++ /var/tmp/diff_new_pack.W157CA/_new 2006-03-30 21:01:50.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package yast2-storage (Version 2.13.43) +# spec file for package yast2-storage (Version 2.13.44) # # 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-storage -Version: 2.13.43 +Version: 2.13.44 Release: 1 License: GPL Group: System/YaST BuildRoot: %{_tmppath}/%{name}-%{version}-build -Source0: yast2-storage-2.13.43.tar.bz2 +Source0: yast2-storage-2.13.44.tar.bz2 prefix: /usr BuildRequires: blocxx-devel docbook-xsl-stylesheets doxygen evms gcc-c++ libxcrypt-devel libxslt openssl-devel perl-XML-Writer sablot sgml-skel swig update-desktop-files yast2 yast2-devtools yast2-installation yast2-perl-bindings yast2-testsuite Requires: yast2 parted yast2-installation yast2-storage-lib yast2-perl-bindings @@ -40,7 +40,7 @@ %prep -%setup -n yast2-storage-2.13.43 +%setup -n yast2-storage-2.13.44 %build %{prefix}/bin/y2tool y2autoconf @@ -165,6 +165,11 @@ %changelog -n yast2-storage * Thu Mar 30 2006 - fehr(a)suse.de +- prevent reuse of partitions already used by other entities +- wait for udev activity to be finished after calls to + "dmsetup remove ..." (#162279) +- version 2.13.44 +* Thu Mar 30 2006 - fehr(a)suse.de - fix random crashes during volume removal - version 2.13.43 * Wed Mar 29 2006 - fehr(a)suse.de ++++++ yast2-storage-2.13.43.tar.bz2 -> yast2-storage-2.13.44.tar.bz2 ++++++ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-storage-2.13.43/VERSION new/yast2-storage-2.13.44/VERSION --- old/yast2-storage-2.13.43/VERSION 2006-03-30 15:50:34.000000000 +0200 +++ new/yast2-storage-2.13.44/VERSION 2006-03-30 20:01:20.000000000 +0200 @@ -1 +1 @@ -2.13.43 +2.13.44 diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-storage-2.13.43/libstorage/src/Dm.cc new/yast2-storage-2.13.44/libstorage/src/Dm.cc --- old/yast2-storage-2.13.43/libstorage/src/Dm.cc 2006-03-29 15:37:10.000000000 +0200 +++ new/yast2-storage-2.13.44/libstorage/src/Dm.cc 2006-03-30 19:50:16.000000000 +0200 @@ -128,11 +128,7 @@ bool Dm::removeTable() { - string cmd = "dmsetup remove " + tname; - SystemCmd c( cmd ); - bool ret = c.retcode()==0; - y2milestone( "ret:%d", ret ); - return( ret ); + return( getContainer()->getStorage()->removeDmTable( tname )); } string Dm::getDevice( const string& majmin ) diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-storage-2.13.43/libstorage/src/DmCo.cc new/yast2-storage-2.13.44/libstorage/src/DmCo.cc --- old/yast2-storage-2.13.43/libstorage/src/DmCo.cc 2006-02-07 18:46:10.000000000 +0100 +++ new/yast2-storage-2.13.44/libstorage/src/DmCo.cc 2006-03-30 19:46:41.000000000 +0200 @@ -222,6 +222,8 @@ SystemCmd c( cmd ); if( c.retcode()!=0 ) ret = DM_REMOVE_FAILED; + else + getStorage()->waitForDevice(); } if( ret==0 ) { diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-storage-2.13.43/libstorage/src/Storage.cc new/yast2-storage-2.13.44/libstorage/src/Storage.cc --- old/yast2-storage-2.13.43/libstorage/src/Storage.cc 2006-03-30 15:46:09.000000000 +0200 +++ new/yast2-storage-2.13.44/libstorage/src/Storage.cc 2006-03-30 19:51:25.000000000 +0200 @@ -1750,7 +1750,7 @@ if( ret==0 && cont->type()==DISK && haveEvms() ) { Disk* disk = dynamic_cast<Disk *>(&(*cont)); - y2mil( "disk:" << disk << " vol:" << &(*vol) ); + y2mil( "disk:" << disk ); string tmp = vdev; string::size_type pos = tmp.find_last_not_of( "0123456789" ); tmp.erase( 0, pos+1 ); @@ -3110,7 +3110,7 @@ } b << "> "; y2milestone( "%s", b.str().c_str() ); - c.execute( "dmsetup remove " + tblname ); + removeDmTable( tblname ); string fname = tmpDir()+"/tfile"; unlink( fname.c_str() ); ofstream tfile( fname.c_str() ); @@ -3128,7 +3128,7 @@ } EvmsCo::activateDevices(); if( !vol.empty() ) - c.execute( "dmsetup remove " + tblname ); + removeDmTable( tblname ); } static bool isDmContainer( const Container& co ) @@ -3652,13 +3652,18 @@ removeDmTableTo( *vol ); } -void Storage::removeDmTable( const string& table ) +bool Storage::removeDmTable( const string& table ) { SystemCmd c( "dmsetup table \"" + table + "\"" ); + bool ret = false; if( c.retcode()==0 ) { c.execute( "dmsetup remove \"" + table + "\"" ); + waitForDevice(); + ret = c.retcode()==0; } + y2milestone( "ret:%d", ret ); + return( ret ); } void diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-storage-2.13.43/libstorage/src/Storage.h new/yast2-storage-2.13.44/libstorage/src/Storage.h --- old/yast2-storage-2.13.43/libstorage/src/Storage.h 2006-03-30 14:26:39.000000000 +0200 +++ new/yast2-storage-2.13.44/libstorage/src/Storage.h 2006-03-30 19:49:51.000000000 +0200 @@ -333,7 +333,7 @@ void activateHld( bool val=true ); void removeDmTableTo( const Volume& vol ); void removeDmTableTo( const string& device ); - void removeDmTable( const string& table ); + bool removeDmTable( const string& table ); void removeDmMapsTo( const string& dev ); void setCallbackProgressBar( storage::CallbackProgressBar pfnc ) diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-storage-2.13.43/storage/src/include/do_proposal_flexible.ycp new/yast2-storage-2.13.44/storage/src/include/do_proposal_flexible.ycp --- old/yast2-storage-2.13.43/storage/src/include/do_proposal_flexible.ycp 2006-03-28 19:51:20.000000000 +0200 +++ new/yast2-storage-2.13.44/storage/src/include/do_proposal_flexible.ycp 2006-03-30 16:38:24.000000000 +0200 @@ -14,7 +14,7 @@ * ************************************************************* - $Id: do_proposal_flexible.ycp 29485 2006-03-28 17:51:11Z fehr $ + $Id: do_proposal_flexible.ycp 29573 2006-03-30 14:38:22Z fehr $ */ { @@ -2014,6 +2014,7 @@ ``(!p["delete"]:false && p["fsid"]:Partitions::fsid_native == Partitions::fsid_native && + p["used_by_type"]:`UB_NONE == `UB_NONE && size(p["mount"]:"")==0 && p["size_k"]:0/1024 >= min && (max==0 || p["size_k"]:0/1024 <= max))); ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun...

1 0

commit yast2-storage
by root＠suse.de 30 Mar '06

30 Mar '06

Hello community, here is the log from the commit of package yast2-storage checked in at Thu Mar 30 16:01:08 CEST 2006. -------- --- yast2-storage/yast2-storage.changes 2006-03-29 16:33:49.000000000 +0200 +++ yast2-storage/yast2-storage.changes 2006-03-30 15:57:14.000000000 +0200 @@ -1,0 +2,6 @@ +Thu Mar 30 15:50:22 CEST 2006 - fehr(a)suse.de + +- fix random crashes during volume removal +- version 2.13.43 + +------------------------------------------------------------------- Old: ---- yast2-storage-2.13.42.tar.bz2 New: ---- yast2-storage-2.13.43.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-storage.spec ++++++ --- /var/tmp/diff_new_pack.LslZrh/_old 2006-03-30 15:58:50.000000000 +0200 +++ /var/tmp/diff_new_pack.LslZrh/_new 2006-03-30 15:58:50.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package yast2-storage (Version 2.13.42) +# spec file for package yast2-storage (Version 2.13.43) # # 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-storage -Version: 2.13.42 +Version: 2.13.43 Release: 1 License: GPL Group: System/YaST BuildRoot: %{_tmppath}/%{name}-%{version}-build -Source0: yast2-storage-2.13.42.tar.bz2 +Source0: yast2-storage-2.13.43.tar.bz2 prefix: /usr BuildRequires: blocxx-devel docbook-xsl-stylesheets doxygen evms gcc-c++ libxcrypt-devel libxslt openssl-devel perl-XML-Writer sablot sgml-skel swig update-desktop-files yast2 yast2-devtools yast2-installation yast2-perl-bindings yast2-testsuite Requires: yast2 parted yast2-installation yast2-storage-lib yast2-perl-bindings @@ -40,7 +40,7 @@ %prep -%setup -n yast2-storage-2.13.42 +%setup -n yast2-storage-2.13.43 %build %{prefix}/bin/y2tool y2autoconf @@ -164,6 +164,9 @@ %doc %{prefix}/share/doc/packages/yast2-storage/libstorage %changelog -n yast2-storage +* Thu Mar 30 2006 - fehr(a)suse.de +- fix random crashes during volume removal +- version 2.13.43 * Wed Mar 29 2006 - fehr(a)suse.de - fix problems of EVMS non-EVMS coexistence - version 2.13.42 ++++++ yast2-storage-2.13.42.tar.bz2 -> yast2-storage-2.13.43.tar.bz2 ++++++ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-storage-2.13.42/VERSION new/yast2-storage-2.13.43/VERSION --- old/yast2-storage-2.13.42/VERSION 2006-03-29 16:33:52.000000000 +0200 +++ new/yast2-storage-2.13.43/VERSION 2006-03-30 15:50:34.000000000 +0200 @@ -1 +1 @@ -2.13.42 +2.13.43 diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-storage-2.13.42/libstorage/src/Disk.cc new/yast2-storage-2.13.43/libstorage/src/Disk.cc --- old/yast2-storage-2.13.42/libstorage/src/Disk.cc 2006-03-29 16:18:20.000000000 +0200 +++ new/yast2-storage-2.13.43/libstorage/src/Disk.cc 2006-03-30 14:24:35.000000000 +0200 @@ -2011,6 +2011,10 @@ if( !getPartedValues( p )) ret = DISK_PARTITION_NOT_FOUND; } + if( ret==0 && p->type()!=EXTENDED ) + { + getStorage()->checkDeviceExclusive( p->device(), 3 ); + } if( ret==0 ) { if( getStorage()->getZeroNewPartitions() ) diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-storage-2.13.42/libstorage/src/Storage.cc new/yast2-storage-2.13.43/libstorage/src/Storage.cc --- old/yast2-storage-2.13.42/libstorage/src/Storage.cc 2006-03-29 12:35:40.000000000 +0200 +++ new/yast2-storage-2.13.43/libstorage/src/Storage.cc 2006-03-30 15:46:09.000000000 +0200 @@ -5,6 +5,7 @@ #include <dirent.h> #include <glob.h> #include <unistd.h> +#include <fcntl.h> #include <sys/stat.h> #include <sys/types.h> #include <sys/statvfs.h> @@ -1741,21 +1742,23 @@ { if( vol->getUsedByType() == UB_NONE || recursiveRemove ) { + string vdev = vol->device(); if( vol->getUsedByType() != UB_NONE ) - ret = removeUsing( vol->device(), vol->getUsedBy() ); + ret = removeUsing( vdev, vol->getUsedBy() ); if( ret==0 ) ret = cont->removeVolume( &(*vol) ); if( ret==0 && cont->type()==DISK && haveEvms() ) { Disk* disk = dynamic_cast<Disk *>(&(*cont)); - string tmp = vol->device(); + y2mil( "disk:" << disk << " vol:" << &(*vol) ); + string tmp = vdev; string::size_type pos = tmp.find_last_not_of( "0123456789" ); tmp.erase( 0, pos+1 ); unsigned num = 0; if( !tmp.empty() ) tmp >> num; bool rename = disk!=NULL && num>0 && disk->isLogical(num); - handleEvmsRemoveDevice( disk, vol->device(), rename ); + handleEvmsRemoveDevice( disk, vdev, rename ); } } else @@ -4562,6 +4565,22 @@ return( ret ); } +void Storage::checkDeviceExclusive( const string& device, unsigned secs ) + { + const int delay = 50000; + unsigned count = secs * 1000000/delay; + int fd; + y2mil( "dev:" << device << " sec:" << secs << " count:" << count ); + for( unsigned i=0; i<count; i++ ) + { + fd = open( device.c_str(), O_RDONLY|O_EXCL ); + y2mil( "count:" <=0 ) + close(fd); + usleep( delay ); + } + } + namespace storage { std::ostream& operator<< (std::ostream& s, Storage &v ) diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-storage-2.13.42/libstorage/src/Storage.h new/yast2-storage-2.13.43/libstorage/src/Storage.h --- old/yast2-storage-2.13.42/libstorage/src/Storage.h 2006-02-07 13:13:22.000000000 +0100 +++ new/yast2-storage-2.13.43/libstorage/src/Storage.h 2006-03-30 14:26:39.000000000 +0200 @@ -325,6 +325,7 @@ void eraseFreeInfo( const string& device ); int waitForDevice() const; int waitForDevice( const string& device ) const; + void checkDeviceExclusive( const string& device, unsigned secs ); void getDiskList( bool (* CheckFnc)( const Disk& ), std::list<Disk*>& dl ); ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun...

1 0

commit libzypp-zmd-backend
by root＠suse.de 30 Mar '06

30 Mar '06

Hello community, here is the log from the commit of package libzypp-zmd-backend checked in at Thu Mar 30 15:03:35 CEST 2006. -------- --- libzypp-zmd-backend/libzypp-zmd-backend.changes 2006-03-30 13:40:24.000000000 +0200 +++ libzypp-zmd-backend/libzypp-zmd-backend.changes 2006-03-30 15:02:23.000000000 +0200 @@ -1,0 +2,6 @@ +Thu Mar 30 15:01:13 CEST 2006 - kkaempf(a)suse.de + +- let the target fill the pool. +- rev 2792. + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libzypp-zmd-backend.spec ++++++ --- /var/tmp/diff_new_pack.ZxhztV/_old 2006-03-30 15:03:21.000000000 +0200 +++ /var/tmp/diff_new_pack.ZxhztV/_new 2006-03-30 15:03:21.000000000 +0200 @@ -22,7 +22,7 @@ Obsoletes: zmd-librc-backend Summary: ZMD backend for Package, Patch, Pattern, and Product Management Version: 7.1.1 -Release: 24 +Release: 25 Source: zmd-backend-%{version}.tar.bz2 Prefix: /usr @@ -69,6 +69,9 @@ %changelog -n libzypp-zmd-backend * Thu Mar 30 2006 - kkaempf(a)suse.de +- let the target fill the pool. +- rev 2792. +* Thu Mar 30 2006 - kkaempf(a)suse.de - add resolvable kind to output of query-pool. - move the zsources table to separate database (#161318) - rev 2786 ++++++ zmd-backend-7.1.1.tar.bz2 ++++++ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/zmd-backend-7.1.1/src/query-pool.cc new/zmd-backend-7.1.1/src/query-pool.cc --- old/zmd-backend-7.1.1/src/query-pool.cc 2006-03-30 12:01:57.000000000 +0200 +++ new/zmd-backend-7.1.1/src/query-pool.cc 2006-03-30 14:58:53.000000000 +0200 @@ -59,6 +59,7 @@ if (filter == "packages") kind = ResTraits<zypp::Package>::kind; else if (filter == "patches") kind = ResTraits<zypp::Patch>::kind; else if (filter == "patterns") kind = ResTraits<zypp::Pattern>::kind; + else if (filter == "selections") kind = ResTraits<zypp::Selection>::kind; else if (filter == "products") kind = ResTraits<zypp::Product>::kind; else if (!filter.empty() && filter != FILTER_ALL) { std::cerr << "usage: query-pool [packages|patches|patterns|products] [<alias>]" << endl; @@ -82,47 +83,41 @@ } } - if (system - || catalog.empty()) - { - zypp::ResStore store = Z->target()->resolvables(); - MIL << "System contributing " << store.size() << " resolvables" << endl; - Z->addResolvables( store, true ); - } + // add all non-installed (cached sources) resolvables to the pool + // remark: If only the systems resolvables should be shown (catalog == "@system") + // then the SourceManager is not initialized (see approx. 20 lines above) + // and the following loop is not run at all. for (SourceManager::Source_const_iterator it = manager->Source_begin(); it != manager->Source_end(); ++it) { zypp::ResStore store = it->resolvables(); MIL << "Catalog " << it->id() << " contributing " << store.size() << " resolvables" << endl; - Z->addResolvables( store, (it->id() == "@system") ); + Z->addResolvables( store, false ); } + MIL << "Pool has " << Z->pool().size() << " entries" << endl; + if (filter.empty() || filter == FILTER_ALL) { - if (system) { - PrintItem printitem( "" ); - zypp::invokeOnEach( Z->pool().begin(), Z->pool().end(), - zypp::resfilter::ByInstalled (), - zypp::functor::functorRef<bool,PoolItem> (printitem) ); - } - else { - PrintItem printitem( catalog ); - zypp::invokeOnEach( Z->pool().begin(), Z->pool().end(), - zypp::functor::functorRef<bool,PoolItem> (printitem) ); - } + PrintItem printitem( system ? "" : catalog ); + if (system) + zypp::invokeOnEach( Z->pool().begin(), Z->pool().end(), // all kinds + zypp::resfilter::ByInstalled(), + zypp::functor::functorRef<bool,PoolItem> (printitem) ); + else + zypp::invokeOnEach( Z->pool().begin(), Z->pool().end(), // all kinds + zypp::functor::functorRef<bool,PoolItem> (printitem) ); + } else { - if (system) { - PrintItem printitem( "" ); - zypp::invokeOnEach( Z->pool().byKindBegin( kind ), Z->pool().byKindEnd( kind ), - zypp::resfilter::ByInstalled (), - zypp::functor::functorRef<bool,PoolItem> (printitem) ); - } - else { - PrintItem printitem( catalog ); - zypp::invokeOnEach( Z->pool().byKindBegin( kind ), Z->pool().byKindEnd( kind ), - zypp::functor::functorRef<bool,PoolItem> (printitem) ); - } + PrintItem printitem( system ? "" : catalog ); + if (system) + zypp::invokeOnEach( Z->pool().byKindBegin( kind ), Z->pool().byKindEnd( kind ), // filter kind + zypp::resfilter::ByInstalled(), + zypp::functor::functorRef<bool,PoolItem> (printitem) ); + else + zypp::invokeOnEach( Z->pool().byKindBegin( kind ), Z->pool().byKindEnd( kind ), // filter kind + zypp::functor::functorRef<bool,PoolItem> (printitem) ); } return; } @@ -149,7 +144,7 @@ MIL << "START query-pool " << filter << " " << catalog << endl; ZYpp::Ptr Z = backend::getZYpp(); - Target_Ptr target = backend::initTarget( Z ); + Target_Ptr target = backend::initTarget( Z, false ); query_pool( Z, filter, catalog ); diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/zmd-backend-7.1.1/src/query-system.cc new/zmd-backend-7.1.1/src/query-system.cc --- old/zmd-backend-7.1.1/src/query-system.cc 2006-03-30 13:19:23.000000000 +0200 +++ new/zmd-backend-7.1.1/src/query-system.cc 2006-03-30 14:45:03.000000000 +0200 @@ -156,7 +156,7 @@ MIL << "START query-system " << argv[1] << endl; ZYpp::Ptr God = backend::getZYpp(); - Target_Ptr target = backend::initTarget( God ); + Target_Ptr target = backend::initTarget( God, false ); DbAccess db( argv[1] ); if (!db.openDb( true )) diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/zmd-backend-7.1.1/src/zmd-backend.cc new/zmd-backend-7.1.1/src/zmd-backend.cc --- old/zmd-backend-7.1.1/src/zmd-backend.cc 2006-03-29 13:26:13.000000000 +0200 +++ new/zmd-backend-7.1.1/src/zmd-backend.cc 2006-03-30 14:44:22.000000000 +0200 @@ -26,12 +26,12 @@ } Target_Ptr -initTarget( ZYpp::Ptr Z ) +initTarget( ZYpp::Ptr Z, bool commit_only ) { Target_Ptr T; try { - Z->initTarget( "/", true ); // its always "/", and we never populate the pool (commit_only = true) + Z->initTarget( "/", commit_only ); // its always "/", and we never populate the pool (commit_only = true) T = Z->target(); } catch (Exception & excpt_r) { diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/zmd-backend-7.1.1/src/zmd-backend.h new/zmd-backend-7.1.1/src/zmd-backend.h --- old/zmd-backend-7.1.1/src/zmd-backend.h 2006-03-29 13:27:36.000000000 +0200 +++ new/zmd-backend-7.1.1/src/zmd-backend.h 2006-03-30 14:44:31.000000000 +0200 @@ -15,7 +15,7 @@ zypp::ZYpp::Ptr getZYpp(); // init Target (root="/", commit_only=true), exit(1) on error -zypp::Target_Ptr initTarget( zypp::ZYpp::Ptr Z ); +zypp::Target_Ptr initTarget( zypp::ZYpp::Ptr Z, bool commit_only = true ); } ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun...

1 0

commit suseRegister
by root＠suse.de 30 Mar '06

30 Mar '06

Hello community, here is the log from the commit of package suseRegister checked in at Thu Mar 30 14:01:20 CEST 2006. -------- --- suseRegister/suseRegister.changes 2006-03-30 11:53:27.000000000 +0200 +++ suseRegister/suseRegister.changes 2006-03-30 12:54:54.000000000 +0200 @@ -1,0 +2,5 @@ +Thu Mar 30 12:54:23 CEST 2006 - mc(a)suse.de + +- adapt new output of query-pool + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ suseRegister.spec ++++++ --- /var/tmp/diff_new_pack.4PFRAF/_old 2006-03-30 14:01:12.000000000 +0200 +++ /var/tmp/diff_new_pack.4PFRAF/_new 2006-03-30 14:01:12.000000000 +0200 @@ -12,7 +12,7 @@ Name: suseRegister Version: 1.0 -Release: 36 +Release: 37 Summary: Registration tool Group: Productivity/Other License: GPL @@ -57,6 +57,8 @@ %changelog -n suseRegister * Thu Mar 30 2006 - mc(a)suse.de +- adapt new output of query-pool +* Thu Mar 30 2006 - mc(a)suse.de - remove hack - use query-pool to get the products - remove rugProductArch ++++++ suseRegister-1.0.tar.bz2 ++++++ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/suseRegister-1.0/suse_register new/suseRegister-1.0/suse_register --- old/suseRegister-1.0/suse_register 2006-03-30 11:52:25.000000000 +0200 +++ new/suseRegister-1.0/suse_register 2006-03-30 12:53:49.000000000 +0200 @@ -89,8 +89,6 @@ my $uname = "/bin/uname"; my $hwinfo = "/usr/sbin/hwinfo"; my $zmdInit = "/etc/init.d/novell-zmd"; -#my $xm = "/usr/sbin/xm"; -#my $xenstorelist = "/usr/bin/xenstore-list"; my $xenstoreread = "/usr/bin/xenstore-read"; my $xenstorewrite = "/usr/bin/xenstore-write"; @@ -1257,9 +1255,10 @@ my @p = split('\|', $line); my $installed = $p[0]; - my $product = $p[1]; - my $version = $p[2]; - my $arch = $p[3]; + my $type = $p[1]; + my $product = $p[2]; + my $version = $p[3]; + my $arch = $p[4]; if(!defined $arch || $arch eq "" || $arch eq "noarch") { @@ -1267,7 +1266,7 @@ chomp($arch); } - if($installed eq "i") + if($installed eq "i" && lc($type) eq lc("product")) { push @installedProducts, [$product, $version, $arch]; } ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun...

1 0

commit libzypp-zmd-backend
by root＠suse.de 30 Mar '06

30 Mar '06

Hello community, here is the log from the commit of package libzypp-zmd-backend checked in at Thu Mar 30 14:01:08 CEST 2006. -------- --- libzypp-zmd-backend/libzypp-zmd-backend.changes 2006-03-30 10:14:11.000000000 +0200 +++ libzypp-zmd-backend/libzypp-zmd-backend.changes 2006-03-30 13:40:24.000000000 +0200 @@ -1,0 +2,7 @@ +Thu Mar 30 13:24:01 CEST 2006 - kkaempf(a)suse.de + +- add resolvable kind to output of query-pool. +- move the zsources table to separate database (#161318) +- rev 2786 + +------------------------------------------------------------------- @@ -5 +12 @@ -- treat "@system" catalog as subscribed. +- treat "@system" catalog as subscribed (#161699) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libzypp-zmd-backend.spec ++++++ --- /var/tmp/diff_new_pack.zSBThe/_old 2006-03-30 14:00:11.000000000 +0200 +++ /var/tmp/diff_new_pack.zSBThe/_new 2006-03-30 14:00:11.000000000 +0200 @@ -22,7 +22,7 @@ Obsoletes: zmd-librc-backend Summary: ZMD backend for Package, Patch, Pattern, and Product Management Version: 7.1.1 -Release: 23 +Release: 24 Source: zmd-backend-%{version}.tar.bz2 Prefix: /usr @@ -69,8 +69,12 @@ %changelog -n libzypp-zmd-backend * Thu Mar 30 2006 - kkaempf(a)suse.de +- add resolvable kind to output of query-pool. +- move the zsources table to separate database (#161318) +- rev 2786 +* Thu Mar 30 2006 - kkaempf(a)suse.de - prepare for "query-pool" helper. -- treat "@system" catalog as subscribed. +- treat "@system" catalog as subscribed (#161699) - rev 2779 * Wed Mar 29 2006 - kkaempf(a)suse.de - always treat zmd sources as 'remote' (#160402) ++++++ zmd-backend-7.1.1.tar.bz2 ++++++ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/zmd-backend-7.1.1/src/query-pool.cc new/zmd-backend-7.1.1/src/query-pool.cc --- old/zmd-backend-7.1.1/src/query-pool.cc 2006-03-30 10:11:59.000000000 +0200 +++ new/zmd-backend-7.1.1/src/query-pool.cc 2006-03-30 12:01:57.000000000 +0200 @@ -9,109 +9,119 @@ #include <zypp/SourceManager.h> #include <zypp/base/Logger.h> #include <zypp/base/Exception.h> +#include <zypp/base/Algorithm.h> using namespace std; using namespace zypp; -#include <sqlite3.h> -#include "dbsource/DbAccess.h" - #undef ZYPP_BASE_LOGGER_LOGGROUP #define ZYPP_BASE_LOGGER_LOGGROUP "query-pool" //----------------------------------------------------------------------------- +class PrintItem : public resfilter::PoolItemFilterFunctor +{ + public: + const string & _catalog; + + PrintItem( const string & catalog ) + : _catalog( catalog ) + { } + + bool operator()( PoolItem_Ref item ) + { + if (_catalog.empty() + || _catalog == item->source().alias()) + { + cout << (item.status().isInstalled() ? "i" : " ") << "|"; + cout << item->kind() << "|"; + cout << item->name() << "|"; + cout << item->edition().version(); + if (!item->edition().release().empty()) + cout << "-" << item->edition().release(); + cout << "|"; + cout << item->arch() << endl; + } + return true; + } +}; + + + + static void -sync_sources( sqlite3 *db ) +query_pool( ZYpp::Ptr Z, const string & filter, const string & catalog) { - const char *query = - "CREATE TABLE zsources (" - "id INTEGER NOT NULL PRIMARY KEY AUTOINCREMENT, " - "zmd_id INTEGER DEFAULT 0, " // reference to catalogs table for zmd, 0 for zypp - "alias VARCHAR, " - "type VARCHAR, " - "url VARCHAR, " - "path VARCHAR " - ")"; - - int rc = sqlite3_exec( db, query, NULL, NULL, NULL ); - if (rc != SQLITE_OK) { - ERR << "Can not create 'zsources'[" << rc << "]: " << sqlite3_errmsg( db ) << endl; - ERR << query << endl; -// ignore error, possibly already exists return; - } - - // 1 - query = "SELECT id FROM zsources WHERE zmd_id = 0 AND alias = ?"; - - sqlite3_stmt *select_h = NULL; - rc = sqlite3_prepare( db, query, -1, &select_h, NULL ); - if (rc != SQLITE_OK) { - ERR << "Can not create select query: " << sqlite3_errmsg( db ) << endl; - return; - } - - // 1 2 3 4 - query = "INSERT INTO zsources (alias, type, url, path) VALUES (?, ?, ?, ?)"; - - sqlite3_stmt *insert_h = NULL; - rc = sqlite3_prepare( db, query, -1, &insert_h, NULL ); - if (rc != SQLITE_OK) { - ERR << "Can not create insert query: " << sqlite3_errmsg( db ) << endl; - return; + Resolvable::Kind kind; + +#define FILTER_ALL "all" + + if (filter == "packages") kind = ResTraits<zypp::Package>::kind; + else if (filter == "patches") kind = ResTraits<zypp::Patch>::kind; + else if (filter == "patterns") kind = ResTraits<zypp::Pattern>::kind; + else if (filter == "products") kind = ResTraits<zypp::Product>::kind; + else if (!filter.empty() && filter != FILTER_ALL) { + std::cerr << "usage: query-pool [packages|patches|patterns|products] [<alias>]" << endl; + exit( 1 ); } + bool system = (catalog == "@system"); + + MIL << "query_pool kind '" << kind << "', catalog '" << catalog << "'" << endl; + SourceManager_Ptr manager = SourceManager::sourceManager(); - try { - manager->restore( "/" ); - } - catch (Exception & excpt_r) { - ZYPP_CAUGHT( excpt_r ); - ERR << "Couldn't restore sources" << endl; - return; - } - - std::list<SourceManager::SourceId> sources = manager->allSources(); - MIL << "Found " << sources.size() << " sources" << endl; - - for (std::list<SourceManager::SourceId>::const_iterator it = sources.begin(); it != sources.end(); ++it) { - Source_Ref source = manager->findSource( *it ); - - if (!source) { - ERR << "SourceManager can't find source " << *it << endl; - continue; + if (!system) { + try { + manager->restore( "/" ); } + catch (Exception & excpt_r) { + ZYPP_CAUGHT( excpt_r ); + ERR << "Couldn't restore sources" << endl; + exit( 1 ); + } + } - - sqlite3_bind_text( select_h, 1, source.alias().c_str(), -1, SQLITE_STATIC ); - rc = sqlite3_step( select_h ); - - bool found = false; - if (rc == SQLITE_ROW) { - found = true; - DBG << "Source '" << source.alias() << "' already synched" << endl; - } - else if (rc != SQLITE_DONE) { - ERR << "rc " << rc << ": " << sqlite3_errmsg( db ) << endl; - break; - } - sqlite3_reset( select_h ); - - if (!found) { - DBG << "Syncing source '" << source.alias() << "'" << endl; - sqlite3_bind_text( insert_h, 1, source.alias().c_str(), -1, SQLITE_STATIC ); - std::string type = source.type(); - if (type.empty()) type = "YaST"; - sqlite3_bind_text( insert_h, 2, type.c_str(), -1, SQLITE_STATIC ); - sqlite3_bind_text( insert_h, 3, source.url().asString().c_str(), -1, SQLITE_STATIC ); - sqlite3_bind_text( insert_h, 4, source.path().asString().c_str(), -1, SQLITE_STATIC ); - rc = sqlite3_step( insert_h ); - if (rc != SQLITE_DONE) { - ERR << "rc " << rc << ": " << sqlite3_errmsg( db ) << endl; - break; - } - sqlite3_reset( insert_h ); + if (system + || catalog.empty()) + { + zypp::ResStore store = Z->target()->resolvables(); + MIL << "System contributing " << store.size() << " resolvables" << endl; + Z->addResolvables( store, true ); + } + + for (SourceManager::Source_const_iterator it = manager->Source_begin(); it != manager->Source_end(); ++it) { + zypp::ResStore store = it->resolvables(); + MIL << "Catalog " << it->id() << " contributing " << store.size() << " resolvables" << endl; + Z->addResolvables( store, (it->id() == "@system") ); + } + + if (filter.empty() + || filter == FILTER_ALL) + { + if (system) { + PrintItem printitem( "" ); + zypp::invokeOnEach( Z->pool().begin(), Z->pool().end(), + zypp::resfilter::ByInstalled (), + zypp::functor::functorRef<bool,PoolItem> (printitem) ); + } + else { + PrintItem printitem( catalog ); + zypp::invokeOnEach( Z->pool().begin(), Z->pool().end(), + zypp::functor::functorRef<bool,PoolItem> (printitem) ); + } + } + else { + if (system) { + PrintItem printitem( "" ); + zypp::invokeOnEach( Z->pool().byKindBegin( kind ), Z->pool().byKindEnd( kind ), + zypp::resfilter::ByInstalled (), + zypp::functor::functorRef<bool,PoolItem> (printitem) ); + } + else { + PrintItem printitem( catalog ); + zypp::invokeOnEach( Z->pool().byKindBegin( kind ), Z->pool().byKindEnd( kind ), + zypp::functor::functorRef<bool,PoolItem> (printitem) ); } } return; @@ -122,11 +132,6 @@ int main (int argc, char **argv) { - if (argc != 2) { - std::cerr << "usage: " << argv[0] << " <database>" << endl; - return 1; - } - const char *logfile = getenv("ZYPP_LOGFILE"); if (logfile != NULL) zypp::base::LogControl::instance().logfile( logfile ); @@ -134,21 +139,19 @@ zypp::base::LogControl::instance().logfile( ZMD_BACKEND_LOG ); MIL << "-------------------------------------" << endl; - MIL << "START query-pool " << argv[1] << endl; - - ZYpp::Ptr God = backend::getZYpp(); - Target_Ptr target = backend::initTarget( God ); - - DbAccess db( argv[1] ); - if (!db.openDb( true )) - return 1; + string filter; + if (argc > 1) + filter = argv[1]; + string catalog; + if (argc > 2) + catalog = argv[2]; - db.writeStore( God->target()->resolvables(), ResStatus::installed, "@system" ); + MIL << "START query-pool " << filter << " " << catalog << endl; - // sync SourceManager with sources table - sync_sources( db.db() ); + ZYpp::Ptr Z = backend::getZYpp(); + Target_Ptr target = backend::initTarget( Z ); - db.closeDb(); + query_pool( Z, filter, catalog ); MIL << "END query-pool" << endl; diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/zmd-backend-7.1.1/src/query-system.cc new/zmd-backend-7.1.1/src/query-system.cc --- old/zmd-backend-7.1.1/src/query-system.cc 2006-03-28 22:25:22.000000000 +0200 +++ new/zmd-backend-7.1.1/src/query-system.cc 2006-03-30 13:19:23.000000000 +0200 @@ -22,8 +22,22 @@ //----------------------------------------------------------------------------- static void -sync_sources( sqlite3 *db ) +sync_sources( ) { + + MIL << "sync_sources" << endl; + + sqlite3 *db; + int rc = sqlite3_open( "/var/lib/zypp/backend.db", &db ); + + if (rc != SQLITE_OK) { + ERR << "Can not open SQL database zsources.db: " << sqlite3_errmsg( db ) << endl; + return; + } + + sqlite3_exec (db, "PRAGMA synchronous = 0", NULL, NULL, NULL); + sqlite3_exec (db, "BEGIN", NULL, NULL, NULL); + const char *query = "CREATE TABLE zsources (" "id INTEGER NOT NULL PRIMARY KEY AUTOINCREMENT, " @@ -34,7 +48,7 @@ "path VARCHAR " ")"; - int rc = sqlite3_exec( db, query, NULL, NULL, NULL ); + rc = sqlite3_exec( db, query, NULL, NULL, NULL ); if (rc != SQLITE_OK) { ERR << "Can not create 'zsources'[" << rc << "]: " << sqlite3_errmsg( db ) << endl; ERR << query << endl; @@ -114,6 +128,11 @@ sqlite3_reset( insert_h ); } } + + sqlite3_finalize( select_h ); + sqlite3_finalize( insert_h ); + sqlite3_close( db ); + return; } @@ -146,7 +165,7 @@ db.writeStore( God->target()->resolvables(), ResStatus::installed, "@system" ); // sync SourceManager with sources table - sync_sources( db.db() ); + sync_sources( ); db.closeDb(); ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun...

1 0

commit suseRegister
by root＠suse.de 30 Mar '06

30 Mar '06

Hello community, here is the log from the commit of package suseRegister checked in at Thu Mar 30 11:54:56 CEST 2006. -------- --- suseRegister/suseRegister.changes 2006-03-29 17:34:09.000000000 +0200 +++ suseRegister/suseRegister.changes 2006-03-30 11:53:27.000000000 +0200 @@ -1,0 +2,7 @@ +Thu Mar 30 11:52:42 CEST 2006 - mc(a)suse.de + +- remove hack +- use query-pool to get the products +- remove rugProductArch + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ suseRegister.spec ++++++ --- /var/tmp/diff_new_pack.26C65g/_old 2006-03-30 11:54:28.000000000 +0200 +++ /var/tmp/diff_new_pack.26C65g/_new 2006-03-30 11:54:28.000000000 +0200 @@ -12,7 +12,7 @@ Name: suseRegister Version: 1.0 -Release: 35 +Release: 36 Summary: Registration tool Group: Productivity/Other License: GPL @@ -56,6 +56,10 @@ %{_bindir}/* %changelog -n suseRegister +* Thu Mar 30 2006 - mc(a)suse.de +- remove hack +- use query-pool to get the products +- remove rugProductArch * Wed Mar 29 2006 - mc(a)suse.de - add hack to make rug products work * Wed Mar 29 2006 - mc(a)suse.de ++++++ suseRegister-1.0.tar.bz2 ++++++ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/suseRegister-1.0/suse_register new/suseRegister-1.0/suse_register --- old/suseRegister-1.0/suse_register 2006-03-29 17:03:03.000000000 +0200 +++ new/suseRegister-1.0/suse_register 2006-03-30 11:52:25.000000000 +0200 @@ -83,6 +83,7 @@ my @registerReadableText = (); my $registerPrivPol = ""; +my $querypool = "/usr/lib/zmd/query-pool"; my $rug = "/usr/bin/rug"; my $lsb_release = "/usr/bin/lsb_release"; my $uname = "/bin/uname"; @@ -97,6 +98,7 @@ my $lastResponse = ""; my $initialDomain = ""; + push(@LWP::Protocol::http::EXTRA_SOCK_OPTS, 'SSL_ca_path', $CA_PATH); push(@LWP::Protocol::http::EXTRA_SOCK_OPTS, 'SSL_ca_file', undef); push(@LWP::Protocol::http::EXTRA_SOCK_OPTS, 'SSL_verify_mode', 0x01 | 0x02 | 0x04); @@ -1234,116 +1236,47 @@ return 1; } -sub rugProductArch +sub rugProducts { - my $product = shift || undef; - my $ret = "noarch"; - my $err = ""; - - if(!defined $product || $product eq "") - { - return "noarch"; - } - - my @rugArgs = ("--terse", "product-info", "$product"); - - print STDERR "rug product-info command: $rug ".join(" ",@rugArgs)."\n" if($debug >= 1); - - my $pid = open3(\*INA, \*OUTA, \*ERRA, $rug, @rugArgs) or do { - logPrintExit("Cannot execute $rug ".join(" ", @rugArgs).": $!\n",13); - }; - - while (<OUTA>) - { - if($_ =~ /^Arch:\s*(.+)\s*$/ && defined $1 && $1 ne "") - { - $ret = $1; - last; - } - } - #chomp($msg) if(defined $msg && $msg ne ""); - while (<ERRA>) - { - $err .= "$_"; - } - close OUTA; - close ERRA; - close INA; - waitpid $pid, 0; + print STDERR "query pool command: $querypool products \@system \n" if($debug >= 1); + my $result = `$querypool products \@system`; my $code = ($?>>8); - if($code != 0) - { - $code += 20; - } - print STDERR "Get product-info failed($code): $err\n" if($debug && $code != 0); - if(!defined $ret || $ret eq "" || $ret eq "noarch") + if($code != 0) { - $ret = `$uname -i`; - chomp($ret); + $code += 30; + syslog("err", "Query products failed($code): $result"); } - - return $ret; -} - - -sub rugProducts -{ - my $msg = ""; - my $err = ""; - - my @rugArgs = ("--terse", "--no-abbrev", "products", "-i"); - - print STDERR "rug products command: $rug ".join(" ",@rugArgs)."\n" if($debug >= 1); - - my $pid = open3(\*IN, \*OUT, \*ERR, $rug, @rugArgs) or do { - logPrintExit("Cannot execute $rug ".join(" ", @rugArgs).": $!\n",13); - }; - - while (<OUT>) + else { - next if($_ =~ /^\s*$/); - $msg .= "$_"; - - my @p = split('\|', $_); - my $product = ""; - my $version = ""; - my $arch = ""; - if(defined $p[1] && $p[1] ne "") - { - $product = $p[1]; - $arch = rugProductArch($product); - } - if(defined $p[2] && $p[2] ne "") + foreach my $line (split("\n", $result)) { - $version = $p[2]; - $version =~ s/-\s*$//; - } + next if($line =~ /^\s*$/); + + my @p = split('\|', $line); + my $installed = $p[0]; + my $product = $p[1]; + my $version = $p[2]; + my $arch = $p[3]; - push @installedProducts, [$product, $version, $arch]; - } - #chomp($msg) if(defined $msg && $msg ne ""); - while (<ERR>) - { - $err .= "$_"; + if(!defined $arch || $arch eq "" || $arch eq "noarch") + { + $arch = `$uname -i`; + chomp($arch); + } + + if($installed eq "i") + { + push @installedProducts, [$product, $version, $arch]; + } + } } - close OUT; - close ERR; - close IN; - waitpid $pid, 0; - my $code = ($?>>8); - if($code != 0) - { - $code += 20; - } - - print STDERR "Get products failed($code): $msg $err\n" if($debug && $code != 0); - + print STDERR "Query products failed($code): $result\n" if($debug && $code != 0); + print STDERR "installed products: ".Data::Dumper->Dump([\@installedProducts])."\n" if($debug); - } @@ -2067,20 +2000,10 @@ # call this as soon as possible. rugStart(); - -############################################ -### BEGIN ugly hack -############################################ - -my $msg = `$zmdInit restart 2>&1`; - -sleep 6; - -### END ugly hack - if (defined $logfile && $logfile ne "") { - open($LOGDESCR, ">> $logfile") or do { + open($LOGDESCR, ">> $logfile") or do + { if(!$yastcall) { logPrintExit("Cannot open logfile <$logfile>: $!\n", 12); @@ -2150,7 +2073,6 @@ } } - if (defined $locale) { my ($l, $e) = split(/\.|@/, $locale, 2); ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun...

1 0

commit zmd
by root＠suse.de 30 Mar '06

30 Mar '06

Hello community, here is the log from the commit of package zmd checked in at Thu Mar 30 11:53:29 CEST 2006. -------- --- zmd/zmd.changes 2006-03-30 10:46:04.000000000 +0200 +++ zmd/zmd.changes 2006-03-30 10:12:57.000000000 +0200 @@ -2 +2 @@ -Thu Mar 30 10:45:52 CEST 2006 - aj(a)suse.de +Thu Mar 30 10:10:52 CEST 2006 - aj(a)suse.de @@ -6,0 +7,12 @@ +Thu Mar 30 04:03:14 CEST 2006 - maw(a)suse.de + +- Teach zmd to restart when it's updated (#162043). + +------------------------------------------------------------------- +Thu Mar 30 02:42:17 CEST 2006 - thunder(a)suse.de + +- New source drop (r26462) which: +- Adds arch filtering (#158187). +- Expires the web cache after refresh. + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ zmd.spec ++++++ --- /var/tmp/diff_new_pack.1A10fD/_old 2006-03-30 11:51:47.000000000 +0200 +++ /var/tmp/diff_new_pack.1A10fD/_new 2006-03-30 11:51:47.000000000 +0200 @@ -14,7 +14,7 @@ BuildRequires: dbus-1-mono log4net mono-basic mono-data-sqlite mono-devel perl-XML-Parser rpm-devel sqlite-devel URL: http://www.novell.com Version: 7.1.1 -Release: 34 +Release: 35 License: LGPL BuildRoot: %{_tmppath}/%{name}-%{version}-build Source0: %name-7.1.1.tar.bz2 @@ -106,6 +106,7 @@ %{insserv_force_if_yast novell-zmd} %postun +%{restart_on_update zmd} %{insserv_cleanup} %files -f %{name}.lang @@ -157,6 +158,12 @@ %changelog -n zmd * Thu Mar 30 2006 - aj(a)suse.de - Package /var/run/zmd [#162079]. +* Thu Mar 30 2006 - maw(a)suse.de +- Teach zmd to restart when it's updated (#162043). +* Thu Mar 30 2006 - thunder(a)suse.de +- New source drop (r26462) which: +- Adds arch filtering (#158187). +- Expires the web cache after refresh. * Wed Mar 29 2006 - maw(a)suse.de - New source drop (r26368) which: - Makes sure there is sufficient disk space before downloading ++++++ zmd-7.1.1.tar.bz2 ++++++ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/zmd-7.1.1/modules/ChangeLog new/zmd-7.1.1/modules/ChangeLog --- old/zmd-7.1.1/modules/ChangeLog 2006-03-29 02:26:06.000000000 +0200 +++ new/zmd-7.1.1/modules/ChangeLog 2006-03-30 02:29:20.000000000 +0200 @@ -1,3 +1,14 @@ +2006-03-29 Chris Rivera <cmr(a)ximian.com> + + * linux/PackageManager.cs: Add arch filtering for QueryLatest and + GetLatestVersion. + +2006-03-28 James Willcox <james(a)ximian.com> + + * linux/RPMBackend.cs: only delay loading the installed packages + when the db changes outsize of zmd. After transactions, do it + immediately. + 2006-03-28 James Willcox <james(a)ximian.com> * linux/Transaction.cs: check to make sure we have enough disk diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/zmd-7.1.1/modules/linux/Backend.cs new/zmd-7.1.1/modules/linux/Backend.cs --- old/zmd-7.1.1/modules/linux/Backend.cs 2006-03-25 01:29:42.000000000 +0100 +++ new/zmd-7.1.1/modules/linux/Backend.cs 2006-03-29 17:32:10.000000000 +0200 @@ -49,19 +49,6 @@ public event EventHandler InstalledPackagesChanged; public void OnInstalledPackagesChanged () { - lock (this) { - if (delayedSchedule != null) { - ScheduleManager.Instance.RemoveSchedule (delayedSchedule); - delayedSchedule = null; - } - delayedSchedule = new SimpleSchedule ("Package DB changed delay"); - delayedSchedule.Triggered += DelayedInstalledPackagesChanged; - delayedSchedule.StartTime = DateTime.Now + TimeSpan.FromSeconds (30); - ScheduleManager.Instance.AddSchedule (delayedSchedule); - } - } - - private void DelayedInstalledPackagesChanged (object o, EventArgs args) { if (InstalledPackagesChanged != null) InstalledPackagesChanged (this, null); } diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/zmd-7.1.1/modules/linux/PackageManager.cs new/zmd-7.1.1/modules/linux/PackageManager.cs --- old/zmd-7.1.1/modules/linux/PackageManager.cs 2006-03-29 02:07:30.000000000 +0200 +++ new/zmd-7.1.1/modules/linux/PackageManager.cs 2006-03-30 02:12:02.000000000 +0200 @@ -141,27 +141,12 @@ } public static Package GetLatestVersion (string name, bool subscribedOnly) { - // Find latest installed version - Package latestInstalled = null; - foreach (Package pkg in Query ("Name", QueryType.Equal, name, QueryType.And, - "IsInstalled", QueryType.Equal, true)) { - if (latestInstalled == null || pkg.CompareTo (latestInstalled) > 0) - latestInstalled = pkg; + IEnumerable pkgs = Query ("Name", "is", name, "and", "IsSubscribed", "is", subscribedOnly); + foreach (Package pkg in FilterPackagesForArch (pkgs)) { + return pkg; } - // Find latest version - Package latest = null; - foreach (Package pkg in Query ("Name", QueryType.Equal, name, - QueryType.And, - "IsSubscribed", QueryType.Equal, subscribedOnly)) { - if (latestInstalled != null && latestInstalled.CompareTo (pkg) >= 0) - continue; - - if (latest == null || pkg.CompareTo (latest) > 0) - latest = pkg; - } - - return latest; + return null; } public static ResolverResult Verify () { @@ -319,6 +304,72 @@ return packages.Query (query); } + // -1: old package 0: update 1: new install + private static int GetPackageStatus (Package pkg) { + foreach (Package p in installed.Query ("Name", "is", pkg.Name, "and", "IsInstalled", "is", true, "and", + "Arch", "is", pkg.Arch)) { + return pkg.CompareTo (p) > 0 ? 0 : -1; + } + + return 1; + } + + /* + * This function returns all updates for all arches and at most one "best" + * installation per package name. + */ + private static IEnumerable FilterPackagesForArch (IEnumerable list) { + Hashtable installs = new Hashtable (); + Hashtable updates = new Hashtable (); + + foreach (IResolvable res in list) { + Package pkg = res as Package; + if (pkg == null) + continue; + + int pkgScore = ArchUtility.GetCompatability (DaemonProperties.Target.Arch, pkg.Arch); + if (pkgScore < 0) + continue; + + int packageStatus = GetPackageStatus (pkg); + if (packageStatus == 0) { + string key = String.Format ("{0}.{1}", pkg.Name, pkg.Arch); + Package existing = updates[key] as Package; + if (existing == null || pkg.CompareTo (existing) > 0) { + updates[key] = pkg; + } + } else if (packageStatus == 1) { + Package existing = installs[pkg.Name] as Package; + if (existing == null) { + installs[pkg.Name] = pkg; + } else { + int exScore = ArchUtility.GetCompatability (DaemonProperties.Target.Arch, existing.Arch); + if (pkgScore == 0 && exScore == 0) { + if (pkg.CompareTo (existing) > 0) { + installs[pkg.Name] = pkg; + } + } else if (pkgScore == 0) { + installs[pkg.Name] = pkg; + } else if (exScore != 0) { + installs[pkg.Name] = pkgScore > exScore ? pkg : existing; + } + } + } + } + + // We want to remove installs for packages we are going to upgrade + ArrayList ret = new ArrayList (); + foreach (Package up in updates.Values) { + if (installs[up.Name] != null) { + installs.Remove (up.Name); + } + } + + ret.AddRange (updates.Values); + ret.AddRange (installs.Values); + return ret; + } + public static ICollection FilterResolvables (IEnumerable list) { Hashtable hash = new Hashtable (); Backend be = Backend.Current; @@ -334,7 +385,7 @@ } public static IEnumerable QueryLatest (IList query) { - return FilterResolvables (packages.Query (query)); + return FilterPackagesForArch (packages.Query (query)); } public static Package QueryFile (string path) { diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/zmd-7.1.1/modules/linux/RPMBackend.cs new/zmd-7.1.1/modules/linux/RPMBackend.cs --- old/zmd-7.1.1/modules/linux/RPMBackend.cs 2006-03-16 16:53:22.000000000 +0100 +++ new/zmd-7.1.1/modules/linux/RPMBackend.cs 2006-03-29 17:32:10.000000000 +0200 @@ -2,6 +2,7 @@ using System; using System.IO; using System.Runtime.InteropServices; +using Novell.Zenworks.Zmd.Scheduling; using log4net; @@ -9,6 +10,7 @@ public abstract class RPMBackend : Backend { private FileSystemWatcher watcher; private bool ignoring; + private SimpleSchedule delayedSchedule; private static bool useLibrpm = true; private static readonly ILog log = LogManager.GetLogger (typeof (RPMBackend)); @@ -179,8 +181,21 @@ } private void Changed (object sender, FileSystemEventArgs e) { - if (!ignoring) { - OnInstalledPackagesChanged (); + if (ignoring) + return; + + lock (this) { + if (delayedSchedule != null) { + ScheduleManager.Instance.RemoveSchedule (delayedSchedule); + delayedSchedule = null; + } + delayedSchedule = new SimpleSchedule ("Package DB changed delay"); + delayedSchedule.Triggered += delegate { + OnInstalledPackagesChanged (); + }; + + delayedSchedule.StartTime = DateTime.Now + TimeSpan.FromSeconds (30); + ScheduleManager.Instance.AddSchedule (delayedSchedule); } } } diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/zmd-7.1.1/po/zmd.pot new/zmd-7.1.1/po/zmd.pot --- old/zmd-7.1.1/po/zmd.pot 2006-03-29 02:30:22.000000000 +0200 +++ new/zmd-7.1.1/po/zmd.pot 2006-03-30 02:30:58.000000000 +0200 @@ -9,7 +9,7 @@ msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2006-03-28 19:30-0500\n" +"POT-Creation-Date: 2006-03-29 19:30-0500\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" @@ -102,16 +102,16 @@ msgid "Save transaction history and changed files, allowing rollback" msgstr "" -#: modules/linux/PackageManager.cs:170 modules/linux/PackageManager.cs:178 -#: modules/linux/PackageManager.cs:261 modules/linux/PackageManager.cs:288 +#: modules/linux/PackageManager.cs:155 modules/linux/PackageManager.cs:163 +#: modules/linux/PackageManager.cs:246 modules/linux/PackageManager.cs:273 msgid "Another transaction is already running." msgstr "" -#: modules/linux/PackageManager.cs:258 modules/linux/PackageManager.cs:283 +#: modules/linux/PackageManager.cs:243 modules/linux/PackageManager.cs:268 msgid "You do not have permission to install and/or remove packages." msgstr "" -#: modules/linux/PackageManager.cs:357 +#: modules/linux/PackageManager.cs:408 msgid "File list not available." msgstr "" @@ -696,12 +696,12 @@ msgid "Refreshing Services" msgstr "" -#: src/ServiceManager.cs:621 +#: src/ServiceManager.cs:622 #, csharp-format msgid "The '{0}' service does not support registration." msgstr "" -#: src/ServiceManager.cs:784 +#: src/ServiceManager.cs:785 #, csharp-format msgid "Unknown service storage version '{0}'" msgstr "" diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/zmd-7.1.1/src/BuildConfig.cs new/zmd-7.1.1/src/BuildConfig.cs --- old/zmd-7.1.1/src/BuildConfig.cs 2006-03-27 00:42:20.000000000 +0200 +++ new/zmd-7.1.1/src/BuildConfig.cs 2006-03-30 02:15:40.000000000 +0200 @@ -1,14 +1,14 @@ namespace Novell.Zenworks.Zmd { public class BuildConfig { - public const string PREFIX = "/opt/zypp"; - public const string SYSCONFDIR = "/opt/zypp/etc"; - public const string DATADIR = "/opt/zypp/share"; - public const string LIBDIR = "/opt/zypp/lib"; - public const string LIBDIR_MANAGED = "/opt/zypp" + "/lib"; - public const string LOCALSTATEDIR = "/opt/zypp/var"; + public const string PREFIX = "/usr"; + public const string SYSCONFDIR = "/etc"; + public const string DATADIR = "/usr/share"; + public const string LIBDIR = "/usr/lib64"; + public const string LIBDIR_MANAGED = "/usr" + "/lib"; + public const string LOCALSTATEDIR = "/var"; - public const string LOGDIR = "/opt/zypp/var/log"; + public const string LOGDIR = "/var/log"; public const string LOGFILE = LOGDIR + "/zmd-messages.log"; public const string MODULE_PATH = LIBDIR_MANAGED + "/zmd/modules"; diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/zmd-7.1.1/src/ChangeLog new/zmd-7.1.1/src/ChangeLog --- old/zmd-7.1.1/src/ChangeLog 2006-03-29 02:26:06.000000000 +0200 +++ new/zmd-7.1.1/src/ChangeLog 2006-03-30 02:26:02.000000000 +0200 @@ -1,3 +1,7 @@ +2006-03-29 James Willcox <james(a)ximian.com> + + * ServiceManager.cs: expire the cache after refresh + 2006-03-28 James Willcox <james(a)ximian.com> * DaemonProperties.cs: add MonoVersion property, which uses evil diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/zmd-7.1.1/src/ServiceManager.cs new/zmd-7.1.1/src/ServiceManager.cs --- old/zmd-7.1.1/src/ServiceManager.cs 2006-03-27 02:51:26.000000000 +0200 +++ new/zmd-7.1.1/src/ServiceManager.cs 2006-03-30 02:26:02.000000000 +0200 @@ -559,6 +559,7 @@ public static void OnRefreshFinished (Progress progress) { WebCache.ForceCache = false; + WebCache.Expire (); if (progress.Status == ProgressStatus.Finished) { log.Info ("Finished Service Refresh"); ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun...

1 0

commit zmd
by root＠suse.de 30 Mar '06

30 Mar '06

Hello community, here is the log from the commit of package zmd checked in at Thu Mar 30 10:47:19 CEST 2006. -------- --- zmd/zmd.changes 2006-03-30 10:12:57.000000000 +0200 +++ zmd/zmd.changes 2006-03-30 10:46:04.000000000 +0200 @@ -2 +2 @@ -Thu Mar 30 10:10:52 CEST 2006 - aj(a)suse.de +Thu Mar 30 10:45:52 CEST 2006 - aj(a)suse.de @@ -7,12 +6,0 @@ -Thu Mar 30 04:03:14 CEST 2006 - maw(a)suse.de - -- Teach zmd to restart when it's updated (#162043). - -------------------------------------------------------------------- -Thu Mar 30 02:42:17 CEST 2006 - thunder(a)suse.de - -- New source drop (r26462) which: -- Adds arch filtering (#158187). -- Expires the web cache after refresh. - -------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ zmd.spec ++++++ --- /var/tmp/diff_new_pack.UqeNsd/_old 2006-03-30 10:46:58.000000000 +0200 +++ /var/tmp/diff_new_pack.UqeNsd/_new 2006-03-30 10:46:58.000000000 +0200 @@ -14,7 +14,7 @@ BuildRequires: dbus-1-mono log4net mono-basic mono-data-sqlite mono-devel perl-XML-Parser rpm-devel sqlite-devel URL: http://www.novell.com Version: 7.1.1 -Release: 33 +Release: 34 License: LGPL BuildRoot: %{_tmppath}/%{name}-%{version}-build Source0: %name-7.1.1.tar.bz2 @@ -106,7 +106,6 @@ %{insserv_force_if_yast novell-zmd} %postun -%{restart_on_update zmd} %{insserv_cleanup} %files -f %{name}.lang @@ -158,12 +157,6 @@ %changelog -n zmd * Thu Mar 30 2006 - aj(a)suse.de - Package /var/run/zmd [#162079]. -* Thu Mar 30 2006 - maw(a)suse.de -- Teach zmd to restart when it's updated (#162043). -* Thu Mar 30 2006 - thunder(a)suse.de -- New source drop (r26462) which: -- Adds arch filtering (#158187). -- Expires the web cache after refresh. * Wed Mar 29 2006 - maw(a)suse.de - New source drop (r26368) which: - Makes sure there is sufficient disk space before downloading ++++++ zmd-7.1.1.tar.bz2 ++++++ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/zmd-7.1.1/modules/ChangeLog new/zmd-7.1.1/modules/ChangeLog --- old/zmd-7.1.1/modules/ChangeLog 2006-03-30 02:29:20.000000000 +0200 +++ new/zmd-7.1.1/modules/ChangeLog 2006-03-29 02:26:06.000000000 +0200 @@ -1,14 +1,3 @@ -2006-03-29 Chris Rivera <cmr(a)ximian.com> - - * linux/PackageManager.cs: Add arch filtering for QueryLatest and - GetLatestVersion. - -2006-03-28 James Willcox <james(a)ximian.com> - - * linux/RPMBackend.cs: only delay loading the installed packages - when the db changes outsize of zmd. After transactions, do it - immediately. - 2006-03-28 James Willcox <james(a)ximian.com> * linux/Transaction.cs: check to make sure we have enough disk diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/zmd-7.1.1/modules/linux/Backend.cs new/zmd-7.1.1/modules/linux/Backend.cs --- old/zmd-7.1.1/modules/linux/Backend.cs 2006-03-29 17:32:10.000000000 +0200 +++ new/zmd-7.1.1/modules/linux/Backend.cs 2006-03-25 01:29:42.000000000 +0100 @@ -49,6 +49,19 @@ public event EventHandler InstalledPackagesChanged; public void OnInstalledPackagesChanged () { + lock (this) { + if (delayedSchedule != null) { + ScheduleManager.Instance.RemoveSchedule (delayedSchedule); + delayedSchedule = null; + } + delayedSchedule = new SimpleSchedule ("Package DB changed delay"); + delayedSchedule.Triggered += DelayedInstalledPackagesChanged; + delayedSchedule.StartTime = DateTime.Now + TimeSpan.FromSeconds (30); + ScheduleManager.Instance.AddSchedule (delayedSchedule); + } + } + + private void DelayedInstalledPackagesChanged (object o, EventArgs args) { if (InstalledPackagesChanged != null) InstalledPackagesChanged (this, null); } diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/zmd-7.1.1/modules/linux/PackageManager.cs new/zmd-7.1.1/modules/linux/PackageManager.cs --- old/zmd-7.1.1/modules/linux/PackageManager.cs 2006-03-30 02:12:02.000000000 +0200 +++ new/zmd-7.1.1/modules/linux/PackageManager.cs 2006-03-29 02:07:30.000000000 +0200 @@ -141,12 +141,27 @@ } public static Package GetLatestVersion (string name, bool subscribedOnly) { - IEnumerable pkgs = Query ("Name", "is", name, "and", "IsSubscribed", "is", subscribedOnly); - foreach (Package pkg in FilterPackagesForArch (pkgs)) { - return pkg; + // Find latest installed version + Package latestInstalled = null; + foreach (Package pkg in Query ("Name", QueryType.Equal, name, QueryType.And, + "IsInstalled", QueryType.Equal, true)) { + if (latestInstalled == null || pkg.CompareTo (latestInstalled) > 0) + latestInstalled = pkg; } - return null; + // Find latest version + Package latest = null; + foreach (Package pkg in Query ("Name", QueryType.Equal, name, + QueryType.And, + "IsSubscribed", QueryType.Equal, subscribedOnly)) { + if (latestInstalled != null && latestInstalled.CompareTo (pkg) >= 0) + continue; + + if (latest == null || pkg.CompareTo (latest) > 0) + latest = pkg; + } + + return latest; } public static ResolverResult Verify () { @@ -304,72 +319,6 @@ return packages.Query (query); } - // -1: old package 0: update 1: new install - private static int GetPackageStatus (Package pkg) { - foreach (Package p in installed.Query ("Name", "is", pkg.Name, "and", "IsInstalled", "is", true, "and", - "Arch", "is", pkg.Arch)) { - return pkg.CompareTo (p) > 0 ? 0 : -1; - } - - return 1; - } - - /* - * This function returns all updates for all arches and at most one "best" - * installation per package name. - */ - private static IEnumerable FilterPackagesForArch (IEnumerable list) { - Hashtable installs = new Hashtable (); - Hashtable updates = new Hashtable (); - - foreach (IResolvable res in list) { - Package pkg = res as Package; - if (pkg == null) - continue; - - int pkgScore = ArchUtility.GetCompatability (DaemonProperties.Target.Arch, pkg.Arch); - if (pkgScore < 0) - continue; - - int packageStatus = GetPackageStatus (pkg); - if (packageStatus == 0) { - string key = String.Format ("{0}.{1}", pkg.Name, pkg.Arch); - Package existing = updates[key] as Package; - if (existing == null || pkg.CompareTo (existing) > 0) { - updates[key] = pkg; - } - } else if (packageStatus == 1) { - Package existing = installs[pkg.Name] as Package; - if (existing == null) { - installs[pkg.Name] = pkg; - } else { - int exScore = ArchUtility.GetCompatability (DaemonProperties.Target.Arch, existing.Arch); - if (pkgScore == 0 && exScore == 0) { - if (pkg.CompareTo (existing) > 0) { - installs[pkg.Name] = pkg; - } - } else if (pkgScore == 0) { - installs[pkg.Name] = pkg; - } else if (exScore != 0) { - installs[pkg.Name] = pkgScore > exScore ? pkg : existing; - } - } - } - } - - // We want to remove installs for packages we are going to upgrade - ArrayList ret = new ArrayList (); - foreach (Package up in updates.Values) { - if (installs[up.Name] != null) { - installs.Remove (up.Name); - } - } - - ret.AddRange (updates.Values); - ret.AddRange (installs.Values); - return ret; - } - public static ICollection FilterResolvables (IEnumerable list) { Hashtable hash = new Hashtable (); Backend be = Backend.Current; @@ -385,7 +334,7 @@ } public static IEnumerable QueryLatest (IList query) { - return FilterPackagesForArch (packages.Query (query)); + return FilterResolvables (packages.Query (query)); } public static Package QueryFile (string path) { diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/zmd-7.1.1/modules/linux/RPMBackend.cs new/zmd-7.1.1/modules/linux/RPMBackend.cs --- old/zmd-7.1.1/modules/linux/RPMBackend.cs 2006-03-29 17:32:10.000000000 +0200 +++ new/zmd-7.1.1/modules/linux/RPMBackend.cs 2006-03-16 16:53:22.000000000 +0100 @@ -2,7 +2,6 @@ using System; using System.IO; using System.Runtime.InteropServices; -using Novell.Zenworks.Zmd.Scheduling; using log4net; @@ -10,7 +9,6 @@ public abstract class RPMBackend : Backend { private FileSystemWatcher watcher; private bool ignoring; - private SimpleSchedule delayedSchedule; private static bool useLibrpm = true; private static readonly ILog log = LogManager.GetLogger (typeof (RPMBackend)); @@ -181,21 +179,8 @@ } private void Changed (object sender, FileSystemEventArgs e) { - if (ignoring) - return; - - lock (this) { - if (delayedSchedule != null) { - ScheduleManager.Instance.RemoveSchedule (delayedSchedule); - delayedSchedule = null; - } - delayedSchedule = new SimpleSchedule ("Package DB changed delay"); - delayedSchedule.Triggered += delegate { - OnInstalledPackagesChanged (); - }; - - delayedSchedule.StartTime = DateTime.Now + TimeSpan.FromSeconds (30); - ScheduleManager.Instance.AddSchedule (delayedSchedule); + if (!ignoring) { + OnInstalledPackagesChanged (); } } } diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/zmd-7.1.1/po/zmd.pot new/zmd-7.1.1/po/zmd.pot --- old/zmd-7.1.1/po/zmd.pot 2006-03-30 02:30:58.000000000 +0200 +++ new/zmd-7.1.1/po/zmd.pot 2006-03-29 02:30:22.000000000 +0200 @@ -9,7 +9,7 @@ msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2006-03-29 19:30-0500\n" +"POT-Creation-Date: 2006-03-28 19:30-0500\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" @@ -102,16 +102,16 @@ msgid "Save transaction history and changed files, allowing rollback" msgstr "" -#: modules/linux/PackageManager.cs:155 modules/linux/PackageManager.cs:163 -#: modules/linux/PackageManager.cs:246 modules/linux/PackageManager.cs:273 +#: modules/linux/PackageManager.cs:170 modules/linux/PackageManager.cs:178 +#: modules/linux/PackageManager.cs:261 modules/linux/PackageManager.cs:288 msgid "Another transaction is already running." msgstr "" -#: modules/linux/PackageManager.cs:243 modules/linux/PackageManager.cs:268 +#: modules/linux/PackageManager.cs:258 modules/linux/PackageManager.cs:283 msgid "You do not have permission to install and/or remove packages." msgstr "" -#: modules/linux/PackageManager.cs:408 +#: modules/linux/PackageManager.cs:357 msgid "File list not available." msgstr "" @@ -696,12 +696,12 @@ msgid "Refreshing Services" msgstr "" -#: src/ServiceManager.cs:622 +#: src/ServiceManager.cs:621 #, csharp-format msgid "The '{0}' service does not support registration." msgstr "" -#: src/ServiceManager.cs:785 +#: src/ServiceManager.cs:784 #, csharp-format msgid "Unknown service storage version '{0}'" msgstr "" diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/zmd-7.1.1/src/BuildConfig.cs new/zmd-7.1.1/src/BuildConfig.cs --- old/zmd-7.1.1/src/BuildConfig.cs 2006-03-30 02:15:40.000000000 +0200 +++ new/zmd-7.1.1/src/BuildConfig.cs 2006-03-27 00:42:20.000000000 +0200 @@ -1,14 +1,14 @@ namespace Novell.Zenworks.Zmd { public class BuildConfig { - public const string PREFIX = "/usr"; - public const string SYSCONFDIR = "/etc"; - public const string DATADIR = "/usr/share"; - public const string LIBDIR = "/usr/lib64"; - public const string LIBDIR_MANAGED = "/usr" + "/lib"; - public const string LOCALSTATEDIR = "/var"; + public const string PREFIX = "/opt/zypp"; + public const string SYSCONFDIR = "/opt/zypp/etc"; + public const string DATADIR = "/opt/zypp/share"; + public const string LIBDIR = "/opt/zypp/lib"; + public const string LIBDIR_MANAGED = "/opt/zypp" + "/lib"; + public const string LOCALSTATEDIR = "/opt/zypp/var"; - public const string LOGDIR = "/var/log"; + public const string LOGDIR = "/opt/zypp/var/log"; public const string LOGFILE = LOGDIR + "/zmd-messages.log"; public const string MODULE_PATH = LIBDIR_MANAGED + "/zmd/modules"; diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/zmd-7.1.1/src/ChangeLog new/zmd-7.1.1/src/ChangeLog --- old/zmd-7.1.1/src/ChangeLog 2006-03-30 02:26:02.000000000 +0200 +++ new/zmd-7.1.1/src/ChangeLog 2006-03-29 02:26:06.000000000 +0200 @@ -1,7 +1,3 @@ -2006-03-29 James Willcox <james(a)ximian.com> - - * ServiceManager.cs: expire the cache after refresh - 2006-03-28 James Willcox <james(a)ximian.com> * DaemonProperties.cs: add MonoVersion property, which uses evil diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/zmd-7.1.1/src/ServiceManager.cs new/zmd-7.1.1/src/ServiceManager.cs --- old/zmd-7.1.1/src/ServiceManager.cs 2006-03-30 02:26:02.000000000 +0200 +++ new/zmd-7.1.1/src/ServiceManager.cs 2006-03-27 02:51:26.000000000 +0200 @@ -559,7 +559,6 @@ public static void OnRefreshFinished (Progress progress) { WebCache.ForceCache = false; - WebCache.Expire (); if (progress.Status == ProgressStatus.Finished) { log.Info ("Finished Service Refresh"); ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun...

1 0

commit release-notes
by root＠suse.de 30 Mar '06

30 Mar '06

Hello community, here is the log from the commit of package release-notes checked in at Thu Mar 30 10:29:45 CEST 2006. -------- --- release-notes/release-notes.changes 2006-03-27 14:40:21.000000000 +0200 +++ release-notes/release-notes.changes 2006-03-30 09:32:38.000000000 +0200 @@ -1,0 +2,9 @@ +Thu Mar 30 09:31:48 CEST 2006 - ke(a)suse.de + +- Update to version 10.1.12: + * Update: Updating Software Packages Using Catalogs [#153037], kernel + modules [# 157554]. + * Update: cs, sk. + + +------------------------------------------------------------------- Old: ---- release-notes-10.1.11.tar.bz2 New: ---- release-notes-10.1.12.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ release-notes.spec ++++++ --- /var/tmp/diff_new_pack.2gVcnS/_old 2006-03-30 10:29:34.000000000 +0200 +++ /var/tmp/diff_new_pack.2gVcnS/_new 2006-03-30 10:29:34.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package release-notes (Version 10.1.11) +# spec file for package release-notes (Version 10.1.12) # # Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine @@ -18,7 +18,7 @@ BuildArch: noarch BuildRoot: %{_tmppath}/%{name}-%{version}-build Provides: kdebase-SuSE:/usr/share/doc/RELEASE_NOTES.en.html -Version: 10.1.11 +Version: 10.1.12 Release: 1 Source0: %{name}-%{version}.tar.bz2 Source8: release-notes.desktop.in @@ -81,6 +81,11 @@ %doc /usr/share/doc/release-notes %changelog -n release-notes +* Thu Mar 30 2006 - ke(a)suse.de +- Update to version 10.1.12: + * Update: Updating Software Packages Using Catalogs [#153037], kernel + modules [# 157554]. + * Update: cs, sk. * Mon Mar 27 2006 - ke(a)suse.de - Update to version 10.1.11: * New: it, ja, pt_BR, zh_CN, and zh_TW. ++++++ release-notes-10.1.11.tar.bz2 -> release-notes-10.1.12.tar.bz2 ++++++ ++++ 8873 lines of diff (skipped) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun...

1 0

commit libzypp-zmd-backend
by root＠suse.de 30 Mar '06

30 Mar '06

Hello community, here is the log from the commit of package libzypp-zmd-backend checked in at Thu Mar 30 10:28:13 CEST 2006. -------- --- libzypp-zmd-backend/libzypp-zmd-backend.changes 2006-03-29 18:31:33.000000000 +0200 +++ libzypp-zmd-backend/libzypp-zmd-backend.changes 2006-03-30 10:14:11.000000000 +0200 @@ -1,0 +2,7 @@ +Thu Mar 30 10:13:24 CEST 2006 - kkaempf(a)suse.de + +- prepare for "query-pool" helper. +- treat "@system" catalog as subscribed. +- rev 2779 + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libzypp-zmd-backend.spec ++++++ --- /var/tmp/diff_new_pack.a9JRcB/_old 2006-03-30 10:28:02.000000000 +0200 +++ /var/tmp/diff_new_pack.a9JRcB/_new 2006-03-30 10:28:02.000000000 +0200 @@ -22,7 +22,7 @@ Obsoletes: zmd-librc-backend Summary: ZMD backend for Package, Patch, Pattern, and Product Management Version: 7.1.1 -Release: 22 +Release: 23 Source: zmd-backend-%{version}.tar.bz2 Prefix: /usr @@ -68,6 +68,10 @@ /etc/logrotate.d/zmd-backend %changelog -n libzypp-zmd-backend +* Thu Mar 30 2006 - kkaempf(a)suse.de +- prepare for "query-pool" helper. +- treat "@system" catalog as subscribed. +- rev 2779 * Wed Mar 29 2006 - kkaempf(a)suse.de - always treat zmd sources as 'remote' (#160402) - rev 2757 ++++++ zmd-backend-7.1.1.tar.bz2 ++++++ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/zmd-backend-7.1.1/src/Makefile.am new/zmd-backend-7.1.1/src/Makefile.am --- old/zmd-backend-7.1.1/src/Makefile.am 2006-03-28 22:17:23.000000000 +0200 +++ new/zmd-backend-7.1.1/src/Makefile.am 2006-03-30 10:10:42.000000000 +0200 @@ -14,6 +14,7 @@ bindir = $(libdir)/zmd bin_PROGRAMS = \ + query-pool \ query-system \ query-files \ resolve-dependencies \ @@ -23,6 +24,7 @@ update-status \ transact +query_pool_SOURCES = query-pool.cc zmd-backend.cc query_system_SOURCES = query-system.cc zmd-backend.cc query_files_SOURCES = query-files.cc zmd-backend.cc resolve_dependencies_SOURCES = resolve-dependencies.cc transactions.cc transactions.h zmd-backend.cc diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/zmd-backend-7.1.1/src/Makefile.in new/zmd-backend-7.1.1/src/Makefile.in --- old/zmd-backend-7.1.1/src/Makefile.in 2006-03-28 22:22:07.000000000 +0200 +++ new/zmd-backend-7.1.1/src/Makefile.in 2006-03-30 10:10:45.000000000 +0200 @@ -38,10 +38,10 @@ build_triplet = @build@ host_triplet = @host@ target_triplet = @target@ -bin_PROGRAMS = query-system$(EXEEXT) query-files$(EXEEXT) \ - resolve-dependencies$(EXEEXT) package-files$(EXEEXT) \ - parse-metadata$(EXEEXT) find-file$(EXEEXT) \ - update-status$(EXEEXT) transact$(EXEEXT) +bin_PROGRAMS = query-pool$(EXEEXT) query-system$(EXEEXT) \ + query-files$(EXEEXT) resolve-dependencies$(EXEEXT) \ + package-files$(EXEEXT) parse-metadata$(EXEEXT) \ + find-file$(EXEEXT) update-status$(EXEEXT) transact$(EXEEXT) subdir = src DIST_COMMON = $(noinst_HEADERS) $(srcdir)/Makefile.am \ $(srcdir)/Makefile.in @@ -79,6 +79,11 @@ query_files_LDADD = $(LDADD) query_files_DEPENDENCIES = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_2) \ $(am__DEPENDENCIES_2) +am_query_pool_OBJECTS = query-pool.$(OBJEXT) zmd-backend.$(OBJEXT) +query_pool_OBJECTS = $(am_query_pool_OBJECTS) +query_pool_LDADD = $(LDADD) +query_pool_DEPENDENCIES = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_2) \ + $(am__DEPENDENCIES_2) am_query_system_OBJECTS = query-system.$(OBJEXT) zmd-backend.$(OBJEXT) query_system_OBJECTS = $(am_query_system_OBJECTS) query_system_LDADD = $(LDADD) @@ -123,12 +128,14 @@ $(AM_LDFLAGS) $(LDFLAGS) -o $@ SOURCES = $(find_file_SOURCES) $(package_files_SOURCES) \ $(parse_metadata_SOURCES) $(query_files_SOURCES) \ - $(query_system_SOURCES) $(resolve_dependencies_SOURCES) \ - $(transact_SOURCES) $(update_status_SOURCES) + $(query_pool_SOURCES) $(query_system_SOURCES) \ + $(resolve_dependencies_SOURCES) $(transact_SOURCES) \ + $(update_status_SOURCES) DIST_SOURCES = $(find_file_SOURCES) $(package_files_SOURCES) \ $(parse_metadata_SOURCES) $(query_files_SOURCES) \ - $(query_system_SOURCES) $(resolve_dependencies_SOURCES) \ - $(transact_SOURCES) $(update_status_SOURCES) + $(query_pool_SOURCES) $(query_system_SOURCES) \ + $(resolve_dependencies_SOURCES) $(transact_SOURCES) \ + $(update_status_SOURCES) RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \ html-recursive info-recursive install-data-recursive \ install-exec-recursive install-info-recursive \ @@ -293,6 +300,7 @@ AM_CXXFLAGS = $(PKG_MANAGEMENT_CFLAGS) $(SQLITE_CFLAGS) $(ZYPP_CFLAGS) LDADD = $(PKG_MANAGEMENT_LIBS) $(SQLITE_LIBS) $(ZYPP_LIBS) noinst_HEADERS = zmd-backend.h +query_pool_SOURCES = query-pool.cc zmd-backend.cc query_system_SOURCES = query-system.cc zmd-backend.cc query_files_SOURCES = query-files.cc zmd-backend.cc resolve_dependencies_SOURCES = resolve-dependencies.cc transactions.cc transactions.h zmd-backend.cc @@ -374,6 +382,9 @@ query-files$(EXEEXT): $(query_files_OBJECTS) $(query_files_DEPENDENCIES) @rm -f query-files$(EXEEXT) $(CXXLINK) $(query_files_LDFLAGS) $(query_files_OBJECTS) $(query_files_LDADD) $(LIBS) +query-pool$(EXEEXT): $(query_pool_OBJECTS) $(query_pool_DEPENDENCIES) + @rm -f query-pool$(EXEEXT) + $(CXXLINK) $(query_pool_LDFLAGS) $(query_pool_OBJECTS) $(query_pool_LDADD) $(LIBS) query-system$(EXEEXT): $(query_system_OBJECTS) $(query_system_DEPENDENCIES) @rm -f query-system$(EXEEXT) $(CXXLINK) $(query_system_LDFLAGS) $(query_system_OBJECTS) $(query_system_LDADD) $(LIBS) @@ -397,6 +408,7 @@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/package-files.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/parse-metadata.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/query-files.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/query-pool.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/query-system.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/resolve-dependencies.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/transact.Po@am__quote@ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/zmd-backend-7.1.1/src/dbsource/DbSources.cc new/zmd-backend-7.1.1/src/dbsource/DbSources.cc --- old/zmd-backend-7.1.1/src/dbsource/DbSources.cc 2006-03-29 06:31:17.000000000 +0200 +++ new/zmd-backend-7.1.1/src/dbsource/DbSources.cc 2006-03-30 09:52:59.000000000 +0200 @@ -122,7 +122,9 @@ << ", subs " << subscribed << endl; - if (subscribed == 0) { + if (id != "@system" + && subscribed == 0) + { MIL << "Not subscribed, skipping" << endl; continue; } diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/zmd-backend-7.1.1/src/query-pool.cc new/zmd-backend-7.1.1/src/query-pool.cc --- old/zmd-backend-7.1.1/src/query-pool.cc 1970-01-01 01:00:00.000000000 +0100 +++ new/zmd-backend-7.1.1/src/query-pool.cc 2006-03-30 10:11:59.000000000 +0200 @@ -0,0 +1,156 @@ +/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 4 -*- */ + +#include <iostream> + +#include "zmd-backend.h" + +#include <zypp/ZYpp.h> +#include <zypp/ZYppFactory.h> +#include <zypp/SourceManager.h> +#include <zypp/base/Logger.h> +#include <zypp/base/Exception.h> + +using namespace std; +using namespace zypp; + +#include <sqlite3.h> +#include "dbsource/DbAccess.h" + +#undef ZYPP_BASE_LOGGER_LOGGROUP +#define ZYPP_BASE_LOGGER_LOGGROUP "query-pool" + +//----------------------------------------------------------------------------- + +static void +sync_sources( sqlite3 *db ) +{ + const char *query = + "CREATE TABLE zsources (" + "id INTEGER NOT NULL PRIMARY KEY AUTOINCREMENT, " + "zmd_id INTEGER DEFAULT 0, " // reference to catalogs table for zmd, 0 for zypp + "alias VARCHAR, " + "type VARCHAR, " + "url VARCHAR, " + "path VARCHAR " + ")"; + + int rc = sqlite3_exec( db, query, NULL, NULL, NULL ); + if (rc != SQLITE_OK) { + ERR << "Can not create 'zsources'[" << rc << "]: " << sqlite3_errmsg( db ) << endl; + ERR << query << endl; +// ignore error, possibly already exists return; + } + + // 1 + query = "SELECT id FROM zsources WHERE zmd_id = 0 AND alias = ?"; + + sqlite3_stmt *select_h = NULL; + rc = sqlite3_prepare( db, query, -1, &select_h, NULL ); + if (rc != SQLITE_OK) { + ERR << "Can not create select query: " << sqlite3_errmsg( db ) << endl; + return; + } + + // 1 2 3 4 + query = "INSERT INTO zsources (alias, type, url, path) VALUES (?, ?, ?, ?)"; + + sqlite3_stmt *insert_h = NULL; + rc = sqlite3_prepare( db, query, -1, &insert_h, NULL ); + if (rc != SQLITE_OK) { + ERR << "Can not create insert query: " << sqlite3_errmsg( db ) << endl; + return; + } + + SourceManager_Ptr manager = SourceManager::sourceManager(); + + try { + manager->restore( "/" ); + } + catch (Exception & excpt_r) { + ZYPP_CAUGHT( excpt_r ); + ERR << "Couldn't restore sources" << endl; + return; + } + + std::list<SourceManager::SourceId> sources = manager->allSources(); + MIL << "Found " << sources.size() << " sources" << endl; + + for (std::list<SourceManager::SourceId>::const_iterator it = sources.begin(); it != sources.end(); ++it) { + Source_Ref source = manager->findSource( *it ); + + if (!source) { + ERR << "SourceManager can't find source " << *it << endl; + continue; + } + + + sqlite3_bind_text( select_h, 1, source.alias().c_str(), -1, SQLITE_STATIC ); + rc = sqlite3_step( select_h ); + + bool found = false; + if (rc == SQLITE_ROW) { + found = true; + DBG << "Source '" << source.alias() << "' already synched" << endl; + } + else if (rc != SQLITE_DONE) { + ERR << "rc " << rc << ": " << sqlite3_errmsg( db ) << endl; + break; + } + sqlite3_reset( select_h ); + + if (!found) { + DBG << "Syncing source '" << source.alias() << "'" << endl; + sqlite3_bind_text( insert_h, 1, source.alias().c_str(), -1, SQLITE_STATIC ); + std::string type = source.type(); + if (type.empty()) type = "YaST"; + sqlite3_bind_text( insert_h, 2, type.c_str(), -1, SQLITE_STATIC ); + sqlite3_bind_text( insert_h, 3, source.url().asString().c_str(), -1, SQLITE_STATIC ); + sqlite3_bind_text( insert_h, 4, source.path().asString().c_str(), -1, SQLITE_STATIC ); + rc = sqlite3_step( insert_h ); + if (rc != SQLITE_DONE) { + ERR << "rc " << rc << ": " << sqlite3_errmsg( db ) << endl; + break; + } + sqlite3_reset( insert_h ); + } + } + return; +} + +//----------------------------------------------------------------------------- + +int +main (int argc, char **argv) +{ + if (argc != 2) { + std::cerr << "usage: " << argv[0] << " <database>" << endl; + return 1; + } + + const char *logfile = getenv("ZYPP_LOGFILE"); + if (logfile != NULL) + zypp::base::LogControl::instance().logfile( logfile ); + else + zypp::base::LogControl::instance().logfile( ZMD_BACKEND_LOG ); + + MIL << "-------------------------------------" << endl; + MIL << "START query-pool " << argv[1] << endl; + + ZYpp::Ptr God = backend::getZYpp(); + Target_Ptr target = backend::initTarget( God ); + + DbAccess db( argv[1] ); + if (!db.openDb( true )) + return 1; + + db.writeStore( God->target()->resolvables(), ResStatus::installed, "@system" ); + + // sync SourceManager with sources table + sync_sources( db.db() ); + + db.closeDb(); + + MIL << "END query-pool" << endl; + + return 0; +} ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun...

1 0

commit zmd
by root＠suse.de 30 Mar '06

30 Mar '06

Hello community, here is the log from the commit of package zmd checked in at Thu Mar 30 10:27:58 CEST 2006. -------- --- zmd/zmd.changes 2006-03-29 03:48:47.000000000 +0200 +++ zmd/zmd.changes 2006-03-30 10:12:57.000000000 +0200 @@ -1,0 +2,17 @@ +Thu Mar 30 10:10:52 CEST 2006 - aj(a)suse.de + +- Package /var/run/zmd [#162079]. + +------------------------------------------------------------------- +Thu Mar 30 04:03:14 CEST 2006 - maw(a)suse.de + +- Teach zmd to restart when it's updated (#162043). + +------------------------------------------------------------------- +Thu Mar 30 02:42:17 CEST 2006 - thunder(a)suse.de + +- New source drop (r26462) which: +- Adds arch filtering (#158187). +- Expires the web cache after refresh. + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ zmd.spec ++++++ --- /var/tmp/diff_new_pack.AL1v0j/_old 2006-03-30 10:27:10.000000000 +0200 +++ /var/tmp/diff_new_pack.AL1v0j/_new 2006-03-30 10:27:10.000000000 +0200 @@ -14,7 +14,7 @@ BuildRequires: dbus-1-mono log4net mono-basic mono-data-sqlite mono-devel perl-XML-Parser rpm-devel sqlite-devel URL: http://www.novell.com Version: 7.1.1 -Release: 32 +Release: 33 License: LGPL BuildRoot: %{_tmppath}/%{name}-%{version}-build Source0: %name-7.1.1.tar.bz2 @@ -97,6 +97,7 @@ rm -rf $RPM_BUILD_ROOT/%{_libdir}/zmd/parse-metadata # ugh(2)! mkdir -p $RPM_BUILD_ROOT/var/cache/zmd +mkdir -p $RPM_BUILD_ROOT/var/run/zmd %clean rm -rf $RPM_BUILD_ROOT @@ -105,6 +106,7 @@ %{insserv_force_if_yast novell-zmd} %postun +%{restart_on_update zmd} %{insserv_cleanup} %files -f %{name}.lang @@ -146,6 +148,7 @@ %{_datadir}/zmd # XXX: should /var be replaced by a macro? %dir /var/cache/zmd +%attr(755, root,root) /var/run/zmd %files devel %defattr(-, root, root) @@ -153,6 +156,14 @@ # %{_libdir}/monodoc/sources/* %changelog -n zmd +* Thu Mar 30 2006 - aj(a)suse.de +- Package /var/run/zmd [#162079]. +* Thu Mar 30 2006 - maw(a)suse.de +- Teach zmd to restart when it's updated (#162043). +* Thu Mar 30 2006 - thunder(a)suse.de +- New source drop (r26462) which: +- Adds arch filtering (#158187). +- Expires the web cache after refresh. * Wed Mar 29 2006 - maw(a)suse.de - New source drop (r26368) which: - Makes sure there is sufficient disk space before downloading ++++++ zmd-7.1.1.tar.bz2 ++++++ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/zmd-7.1.1/modules/ChangeLog new/zmd-7.1.1/modules/ChangeLog --- old/zmd-7.1.1/modules/ChangeLog 2006-03-29 02:26:06.000000000 +0200 +++ new/zmd-7.1.1/modules/ChangeLog 2006-03-30 02:29:20.000000000 +0200 @@ -1,3 +1,14 @@ +2006-03-29 Chris Rivera <cmr(a)ximian.com> + + * linux/PackageManager.cs: Add arch filtering for QueryLatest and + GetLatestVersion. + +2006-03-28 James Willcox <james(a)ximian.com> + + * linux/RPMBackend.cs: only delay loading the installed packages + when the db changes outsize of zmd. After transactions, do it + immediately. + 2006-03-28 James Willcox <james(a)ximian.com> * linux/Transaction.cs: check to make sure we have enough disk diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/zmd-7.1.1/modules/linux/Backend.cs new/zmd-7.1.1/modules/linux/Backend.cs --- old/zmd-7.1.1/modules/linux/Backend.cs 2006-03-25 01:29:42.000000000 +0100 +++ new/zmd-7.1.1/modules/linux/Backend.cs 2006-03-29 17:32:10.000000000 +0200 @@ -49,19 +49,6 @@ public event EventHandler InstalledPackagesChanged; public void OnInstalledPackagesChanged () { - lock (this) { - if (delayedSchedule != null) { - ScheduleManager.Instance.RemoveSchedule (delayedSchedule); - delayedSchedule = null; - } - delayedSchedule = new SimpleSchedule ("Package DB changed delay"); - delayedSchedule.Triggered += DelayedInstalledPackagesChanged; - delayedSchedule.StartTime = DateTime.Now + TimeSpan.FromSeconds (30); - ScheduleManager.Instance.AddSchedule (delayedSchedule); - } - } - - private void DelayedInstalledPackagesChanged (object o, EventArgs args) { if (InstalledPackagesChanged != null) InstalledPackagesChanged (this, null); } diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/zmd-7.1.1/modules/linux/PackageManager.cs new/zmd-7.1.1/modules/linux/PackageManager.cs --- old/zmd-7.1.1/modules/linux/PackageManager.cs 2006-03-29 02:07:30.000000000 +0200 +++ new/zmd-7.1.1/modules/linux/PackageManager.cs 2006-03-30 02:12:02.000000000 +0200 @@ -141,27 +141,12 @@ } public static Package GetLatestVersion (string name, bool subscribedOnly) { - // Find latest installed version - Package latestInstalled = null; - foreach (Package pkg in Query ("Name", QueryType.Equal, name, QueryType.And, - "IsInstalled", QueryType.Equal, true)) { - if (latestInstalled == null || pkg.CompareTo (latestInstalled) > 0) - latestInstalled = pkg; + IEnumerable pkgs = Query ("Name", "is", name, "and", "IsSubscribed", "is", subscribedOnly); + foreach (Package pkg in FilterPackagesForArch (pkgs)) { + return pkg; } - // Find latest version - Package latest = null; - foreach (Package pkg in Query ("Name", QueryType.Equal, name, - QueryType.And, - "IsSubscribed", QueryType.Equal, subscribedOnly)) { - if (latestInstalled != null && latestInstalled.CompareTo (pkg) >= 0) - continue; - - if (latest == null || pkg.CompareTo (latest) > 0) - latest = pkg; - } - - return latest; + return null; } public static ResolverResult Verify () { @@ -319,6 +304,72 @@ return packages.Query (query); } + // -1: old package 0: update 1: new install + private static int GetPackageStatus (Package pkg) { + foreach (Package p in installed.Query ("Name", "is", pkg.Name, "and", "IsInstalled", "is", true, "and", + "Arch", "is", pkg.Arch)) { + return pkg.CompareTo (p) > 0 ? 0 : -1; + } + + return 1; + } + + /* + * This function returns all updates for all arches and at most one "best" + * installation per package name. + */ + private static IEnumerable FilterPackagesForArch (IEnumerable list) { + Hashtable installs = new Hashtable (); + Hashtable updates = new Hashtable (); + + foreach (IResolvable res in list) { + Package pkg = res as Package; + if (pkg == null) + continue; + + int pkgScore = ArchUtility.GetCompatability (DaemonProperties.Target.Arch, pkg.Arch); + if (pkgScore < 0) + continue; + + int packageStatus = GetPackageStatus (pkg); + if (packageStatus == 0) { + string key = String.Format ("{0}.{1}", pkg.Name, pkg.Arch); + Package existing = updates[key] as Package; + if (existing == null || pkg.CompareTo (existing) > 0) { + updates[key] = pkg; + } + } else if (packageStatus == 1) { + Package existing = installs[pkg.Name] as Package; + if (existing == null) { + installs[pkg.Name] = pkg; + } else { + int exScore = ArchUtility.GetCompatability (DaemonProperties.Target.Arch, existing.Arch); + if (pkgScore == 0 && exScore == 0) { + if (pkg.CompareTo (existing) > 0) { + installs[pkg.Name] = pkg; + } + } else if (pkgScore == 0) { + installs[pkg.Name] = pkg; + } else if (exScore != 0) { + installs[pkg.Name] = pkgScore > exScore ? pkg : existing; + } + } + } + } + + // We want to remove installs for packages we are going to upgrade + ArrayList ret = new ArrayList (); + foreach (Package up in updates.Values) { + if (installs[up.Name] != null) { + installs.Remove (up.Name); + } + } + + ret.AddRange (updates.Values); + ret.AddRange (installs.Values); + return ret; + } + public static ICollection FilterResolvables (IEnumerable list) { Hashtable hash = new Hashtable (); Backend be = Backend.Current; @@ -334,7 +385,7 @@ } public static IEnumerable QueryLatest (IList query) { - return FilterResolvables (packages.Query (query)); + return FilterPackagesForArch (packages.Query (query)); } public static Package QueryFile (string path) { diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/zmd-7.1.1/modules/linux/RPMBackend.cs new/zmd-7.1.1/modules/linux/RPMBackend.cs --- old/zmd-7.1.1/modules/linux/RPMBackend.cs 2006-03-16 16:53:22.000000000 +0100 +++ new/zmd-7.1.1/modules/linux/RPMBackend.cs 2006-03-29 17:32:10.000000000 +0200 @@ -2,6 +2,7 @@ using System; using System.IO; using System.Runtime.InteropServices; +using Novell.Zenworks.Zmd.Scheduling; using log4net; @@ -9,6 +10,7 @@ public abstract class RPMBackend : Backend { private FileSystemWatcher watcher; private bool ignoring; + private SimpleSchedule delayedSchedule; private static bool useLibrpm = true; private static readonly ILog log = LogManager.GetLogger (typeof (RPMBackend)); @@ -179,8 +181,21 @@ } private void Changed (object sender, FileSystemEventArgs e) { - if (!ignoring) { - OnInstalledPackagesChanged (); + if (ignoring) + return; + + lock (this) { + if (delayedSchedule != null) { + ScheduleManager.Instance.RemoveSchedule (delayedSchedule); + delayedSchedule = null; + } + delayedSchedule = new SimpleSchedule ("Package DB changed delay"); + delayedSchedule.Triggered += delegate { + OnInstalledPackagesChanged (); + }; + + delayedSchedule.StartTime = DateTime.Now + TimeSpan.FromSeconds (30); + ScheduleManager.Instance.AddSchedule (delayedSchedule); } } } diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/zmd-7.1.1/po/zmd.pot new/zmd-7.1.1/po/zmd.pot --- old/zmd-7.1.1/po/zmd.pot 2006-03-29 02:30:22.000000000 +0200 +++ new/zmd-7.1.1/po/zmd.pot 2006-03-30 02:30:58.000000000 +0200 @@ -9,7 +9,7 @@ msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2006-03-28 19:30-0500\n" +"POT-Creation-Date: 2006-03-29 19:30-0500\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" @@ -102,16 +102,16 @@ msgid "Save transaction history and changed files, allowing rollback" msgstr "" -#: modules/linux/PackageManager.cs:170 modules/linux/PackageManager.cs:178 -#: modules/linux/PackageManager.cs:261 modules/linux/PackageManager.cs:288 +#: modules/linux/PackageManager.cs:155 modules/linux/PackageManager.cs:163 +#: modules/linux/PackageManager.cs:246 modules/linux/PackageManager.cs:273 msgid "Another transaction is already running." msgstr "" -#: modules/linux/PackageManager.cs:258 modules/linux/PackageManager.cs:283 +#: modules/linux/PackageManager.cs:243 modules/linux/PackageManager.cs:268 msgid "You do not have permission to install and/or remove packages." msgstr "" -#: modules/linux/PackageManager.cs:357 +#: modules/linux/PackageManager.cs:408 msgid "File list not available." msgstr "" @@ -696,12 +696,12 @@ msgid "Refreshing Services" msgstr "" -#: src/ServiceManager.cs:621 +#: src/ServiceManager.cs:622 #, csharp-format msgid "The '{0}' service does not support registration." msgstr "" -#: src/ServiceManager.cs:784 +#: src/ServiceManager.cs:785 #, csharp-format msgid "Unknown service storage version '{0}'" msgstr "" diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/zmd-7.1.1/src/BuildConfig.cs new/zmd-7.1.1/src/BuildConfig.cs --- old/zmd-7.1.1/src/BuildConfig.cs 2006-03-27 00:42:20.000000000 +0200 +++ new/zmd-7.1.1/src/BuildConfig.cs 2006-03-30 02:15:40.000000000 +0200 @@ -1,14 +1,14 @@ namespace Novell.Zenworks.Zmd { public class BuildConfig { - public const string PREFIX = "/opt/zypp"; - public const string SYSCONFDIR = "/opt/zypp/etc"; - public const string DATADIR = "/opt/zypp/share"; - public const string LIBDIR = "/opt/zypp/lib"; - public const string LIBDIR_MANAGED = "/opt/zypp" + "/lib"; - public const string LOCALSTATEDIR = "/opt/zypp/var"; + public const string PREFIX = "/usr"; + public const string SYSCONFDIR = "/etc"; + public const string DATADIR = "/usr/share"; + public const string LIBDIR = "/usr/lib64"; + public const string LIBDIR_MANAGED = "/usr" + "/lib"; + public const string LOCALSTATEDIR = "/var"; - public const string LOGDIR = "/opt/zypp/var/log"; + public const string LOGDIR = "/var/log"; public const string LOGFILE = LOGDIR + "/zmd-messages.log"; public const string MODULE_PATH = LIBDIR_MANAGED + "/zmd/modules"; diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/zmd-7.1.1/src/ChangeLog new/zmd-7.1.1/src/ChangeLog --- old/zmd-7.1.1/src/ChangeLog 2006-03-29 02:26:06.000000000 +0200 +++ new/zmd-7.1.1/src/ChangeLog 2006-03-30 02:26:02.000000000 +0200 @@ -1,3 +1,7 @@ +2006-03-29 James Willcox <james(a)ximian.com> + + * ServiceManager.cs: expire the cache after refresh + 2006-03-28 James Willcox <james(a)ximian.com> * DaemonProperties.cs: add MonoVersion property, which uses evil diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/zmd-7.1.1/src/ServiceManager.cs new/zmd-7.1.1/src/ServiceManager.cs --- old/zmd-7.1.1/src/ServiceManager.cs 2006-03-27 02:51:26.000000000 +0200 +++ new/zmd-7.1.1/src/ServiceManager.cs 2006-03-30 02:26:02.000000000 +0200 @@ -559,6 +559,7 @@ public static void OnRefreshFinished (Progress progress) { WebCache.ForceCache = false; + WebCache.Expire (); if (progress.Status == ProgressStatus.Finished) { log.Info ("Finished Service Refresh"); ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun...

1 0

commit zen-updater
by root＠suse.de 29 Mar '06

29 Mar '06

Hello community, here is the log from the commit of package zen-updater checked in at Thu Mar 30 00:47:29 CEST 2006. -------- --- zen-updater/zen-updater.changes 2006-03-28 14:00:20.000000000 +0200 +++ zen-updater/zen-updater.changes 2006-03-29 21:32:43.000000000 +0200 @@ -1,0 +2,8 @@ +Wed Mar 29 04:17:43 CEST 2006 - maw(a)suse.de + +- New source drop (r26362) which: +- Moves the autostart stuff to /etc/xdg +- Implements autostart handling of XDG_CONFIG_DIRS +- Fixes localization. + +------------------------------------------------------------------- Old: ---- etc-xdg-autostart.diff ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ zen-updater.spec ++++++ --- /var/tmp/diff_new_pack.7qQeLA/_old 2006-03-30 00:47:17.000000000 +0200 +++ /var/tmp/diff_new_pack.7qQeLA/_new 2006-03-30 00:47:17.000000000 +0200 @@ -14,13 +14,12 @@ BuildRequires: glib-sharp2 gtk-sharp2 gtk2-devel log4net mono-basic mono-data-sqlite mono-devel perl-XML-Parser update-desktop-files zmd-devel URL: http://novell.com/ Version: 7.1.0 -Release: 25 +Release: 26 License: LGPL BuildRoot: %{_tmppath}/%{name}-%{version}-build Source0: %name-%version.tar.bz2 Source1: %name-po.tar.bz2 Patch0: zen-updater-transparent-trayicon.patch -Patch1: etc-xdg-autostart.diff Summary: Novell ZENworks Linux Management daemon Group: System/Management Autoreqprov: on @@ -41,7 +40,6 @@ %setup -q -a1 sed -i 's/^ALL_LINGUAS="/&ar bg bn br bs ca cs cy da de el_GR es fi fr gl he hi hr hu id it ja ka km ko lo lt nb nl pa pl pt_BR pt ro ru sk sl_SI sr sv ta tr uk zh_CN zh zh_TW /' configure.in configure %patch0 -p0 -%patch1 %build CFLAGS="$RPM_OPT_FLAGS" CPPFLAGS="-w" \ @@ -76,6 +74,11 @@ %{_mandir}/*/* %changelog -n zen-updater +* Wed Mar 29 2006 - maw(a)suse.de +- New source drop (r26362) which: +- Moves the autostart stuff to /etc/xdg +- Implements autostart handling of XDG_CONFIG_DIRS +- Fixes localization. * Tue Mar 28 2006 - sbrabec(a)suse.cz - Added Hungarian translation and partial translations for other languages (#153732). ++++++ zen-updater-7.1.0.tar.bz2 ++++++ ++++ 4567 lines of diff (skipped) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun...

1 0

commit banshee
by root＠suse.de 29 Mar '06

29 Mar '06

Hello community, here is the log from the commit of package banshee checked in at Thu Mar 30 00:47:13 CEST 2006. -------- --- GNOME/banshee/banshee.changes 2006-03-27 22:08:28.000000000 +0200 +++ banshee/banshee.changes 2006-03-29 19:02:56.000000000 +0200 @@ -1,0 +2,5 @@ +Wed Mar 29 19:02:21 CEST 2006 - gekker(a)suse.de + +- Add mDNSResponder mDNSResponder-devel to BuildRequires + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ banshee.spec ++++++ --- /var/tmp/diff_new_pack.cCfdhb/_old 2006-03-30 00:47:03.000000000 +0200 +++ /var/tmp/diff_new_pack.cCfdhb/_new 2006-03-30 00:47:03.000000000 +0200 @@ -11,7 +11,7 @@ # norootforbuild Name: banshee -BuildRequires: dbus-1-mono gcc-c++ gconf-sharp2 gdk-pixbuf-devel glade-sharp2 gnome-desktop-devel gnome-sharp2 gstreamer-plugins-devel gstreamer-plugins-extra gtk-sharp2-gapi intltool ipod-sharp libglade2-devel libidl-devel libmusicbrainz-devel libnjb-devel libwnck-devel mono-basic mono-data-sqlite monodoc-core nautilus-cd-burner-devel njb-sharp perl-XML-Parser sqlite-devel update-desktop-files +BuildRequires: dbus-1-mono gcc-c++ gconf-sharp2 gdk-pixbuf-devel glade-sharp2 gnome-desktop-devel gnome-sharp2 gstreamer-plugins-devel gstreamer-plugins-extra gtk-sharp2-gapi intltool ipod-sharp libglade2-devel libidl-devel libmusicbrainz-devel libnjb-devel libwnck-devel mDNSResponder mDNSResponder-devel mono-basic mono-data-sqlite monodoc-core nautilus-cd-burner-devel njb-sharp perl-XML-Parser sqlite-devel update-desktop-files %define prefix /usr %define sysconfdir /etc/opt/gnome %define gstreamerprefix /opt/gnome @@ -22,7 +22,7 @@ PreReq: filesystem gconf2 Requires: mono-core Version: 0.10.8 -Release: 8 +Release: 10 Source0: banshee-%{version}.tar.gz Patch0: %{name}-libaoss-preload.patch Patch1: %{name}.exe.config.in.patch @@ -286,6 +286,8 @@ %{prefix}/%{_lib}/banshee/Banshee.Plugins/Daap.dll* %changelog -n banshee +* Wed Mar 29 2006 - gekker(a)suse.de +- Add mDNSResponder mDNSResponder-devel to BuildRequires * Mon Mar 27 2006 - gekker(a)suse.de - Split out DAAP plugin and mDNSResponder dep (#160630) * Sun Mar 19 2006 - danw(a)suse.de ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun...

1 0

commit yast2
by root＠suse.de 29 Mar '06

29 Mar '06

Hello community, here is the log from the commit of package yast2 checked in at Wed Mar 29 21:21:31 CEST 2006. -------- --- yast2/yast2.changes 2006-03-29 17:04:40.000000000 +0200 +++ yast2/yast2.changes 2006-03-29 21:20:35.000000000 +0200 @@ -2,11 +1,0 @@ -Wed Mar 29 17:04:09 CEST 2006 - mvidner(a)suse.cz - -- Added PackageLock, a module to handle the big Zypp lock (#160319). -- 2.13.41 - -------------------------------------------------------------------- -Mon Mar 27 10:24:51 CEST 2006 - locilka(a)suse.cz - -- TERM=raw -> TERM=dumb in Service::RunInitScriptWithTimeOut() - -------------------------------------------------------------------- Old: ---- yast2-2.13.41.tar.bz2 New: ---- yast2-2.13.40.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2.spec ++++++ --- /var/tmp/diff_new_pack.6aVrLy/_old 2006-03-29 21:21:17.000000000 +0200 +++ /var/tmp/diff_new_pack.6aVrLy/_new 2006-03-29 21:21:17.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package yast2 (Version 2.13.41) +# spec file for package yast2 (Version 2.13.40) # # Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine @@ -11,24 +11,22 @@ # norootforbuild Name: yast2 -Version: 2.13.41 -Release: 1 +Version: 2.13.40 +Release: 3 License: GPL Group: System/YaST BuildRoot: %{_tmppath}/%{name}-%{version}-build -Source0: yast2-2.13.41.tar.bz2 +Source0: yast2-2.13.40.tar.bz2 prefix: /usr BuildRequires: perl-XML-Writer update-desktop-files yast2-devtools yast2-pkg-bindings yast2-testsuite # Need the new file popups Requires: yast2-core >= 2.7.1 -# Pkg::Connect -Requires: yast2-pkg-bindings >= 2.13.43 Requires: yast2_ui yast2_theme # For Cron Agent, Module Requires: perl-Config-Crontab # for ag_tty (/bin/stty) Requires: coreutils -Requires: yast2-xml, yast2-hardware-detection +Requires: yast2-pkg-bindings, yast2-xml, yast2-hardware-detection Requires: SuSEfirewall2 Provides: yast2-lib-sequencer Obsoletes: yast2-lib-sequencer @@ -93,7 +91,7 @@ Steffen Winterfeldt <snwint(a)suse.de> %prep -%setup -n yast2-2.13.41 +%setup -n yast2-2.13.40 %build %{prefix}/bin/y2tool y2autoconf @@ -192,11 +190,6 @@ %doc %{prefix}/share/doc/packages/yast2/wizard %changelog -n yast2 -* Wed Mar 29 2006 - mvidner(a)suse.cz -- Added PackageLock, a module to handle the big Zypp lock (#160319). -- 2.13.41 -* Mon Mar 27 2006 - locilka(a)suse.cz -- TERM=raw -> TERM=dumb in Service::RunInitScriptWithTimeOut() * Wed Mar 22 2006 - locilka(a)suse.cz - better testing of UTF-8 support using the testutf8 binary (#158001) ++++++ yast2-2.13.41.tar.bz2 -> yast2-2.13.40.tar.bz2 ++++++ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-2.13.41/Makefile.am new/yast2-2.13.40/Makefile.am --- old/yast2-2.13.41/Makefile.am 2006-03-29 17:06:25.000000000 +0200 +++ new/yast2-2.13.40/Makefile.am 2006-03-22 13:03:49.000000000 +0100 @@ -154,7 +154,7 @@ $(PREFIX)/bin/y2tool create-spec < $$i > $$here/package/$${newname} ; \ done -package: check-up-to-date check-tagversion check-all-packages check-textdomain package-local +package: check-up-to-date check-tagversion check-all-packages package-local TAGVERSION = $(PREFIX)/bin/y2tool tagversion @@ -199,9 +199,6 @@ false; \ fi -check-textdomain: - $(PREFIX)/bin/y2tool check-textdomain $(srcdir) - stable: checkin-stable checkin-stable: package diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-2.13.41/Makefile.in new/yast2-2.13.40/Makefile.in --- old/yast2-2.13.41/Makefile.in 2006-03-29 17:07:07.000000000 +0200 +++ new/yast2-2.13.40/Makefile.in 2006-03-22 13:04:04.000000000 +0100 @@ -789,7 +789,7 @@ $(PREFIX)/bin/y2tool create-spec < $$i > $$here/package/$${newname} ; \ done -package: check-up-to-date check-tagversion check-all-packages check-textdomain package-local +package: check-up-to-date check-tagversion check-all-packages package-local check-up-to-date check-cvs-up-to-date check-svn-up-to-date: if [ -d $(srcdir)/CVS ]; then \ @@ -832,9 +832,6 @@ false; \ fi -check-textdomain: - $(PREFIX)/bin/y2tool check-textdomain $(srcdir) - stable: checkin-stable checkin-stable: package diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-2.13.41/VERSION new/yast2-2.13.40/VERSION --- old/yast2-2.13.41/VERSION 2006-03-29 17:03:01.000000000 +0200 +++ new/yast2-2.13.40/VERSION 2006-03-22 13:01:38.000000000 +0100 @@ -1 +1 @@ -2.13.41 +2.13.40 diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-2.13.41/base.pot new/yast2-2.13.40/base.pot --- old/yast2-2.13.41/base.pot 2005-12-14 16:33:36.000000000 +0100 +++ new/yast2-2.13.40/base.pot 2006-02-07 16:03:17.000000000 +0100 @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2005-12-14 16:33+0100\n" +"POT-Creation-Date: 2006-02-07 16:03+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" @@ -258,53 +258,53 @@ msgstr "" #. translators: progress message - command line interface ready -#: library/commandline/src/CommandLine.ycp:1263 +#: library/commandline/src/CommandLine.ycp:1258 msgid "Ready" msgstr "" #. non-GUI handling -#: library/commandline/src/CommandLine.ycp:1287 +#: library/commandline/src/CommandLine.ycp:1282 msgid "Initializing" msgstr "" #. translators: Progress message - the command line interface is about to finish -#: library/commandline/src/CommandLine.ycp:1326 +#: library/commandline/src/CommandLine.ycp:1321 msgid "Finishing" msgstr "" #. translators: The command line interface is finished -#: library/commandline/src/CommandLine.ycp:1333 +#: library/commandline/src/CommandLine.ycp:1328 msgid "Done" msgstr "" #. translators: The command line interface is finished without writing the changes -#: library/commandline/src/CommandLine.ycp:1336 +#: library/commandline/src/CommandLine.ycp:1331 msgid "Quitting (without changes)" msgstr "" #. prompt message displayed in the commandline mode #. when user is asked to replay "yes" or "no" (localized) -#: library/commandline/src/CommandLine.ycp:1351 -msgid "yes/no?: " +#: library/commandline/src/CommandLine.ycp:1346 +msgid "yes or no?" msgstr "" #. yes - used in the command line mode as input text for yes/no confirmation -#: library/commandline/src/CommandLine.ycp:1356 +#: library/commandline/src/CommandLine.ycp:1351 msgid "yes" msgstr "" #. no - used in the command line mode as input text for yes/no confirmation -#: library/commandline/src/CommandLine.ycp:1359 +#: library/commandline/src/CommandLine.ycp:1354 msgid "no" msgstr "" #. error report -#: library/control/src/ProductControl.ycp:811 +#: library/control/src/ProductControl.ycp:813 msgid "No workflow defined for this installation mode." msgstr "" #. message popup, %1 is a label of some widget -#: library/cwm/src/CWM.ycp:630 +#: library/cwm/src/CWM.ycp:626 #, ycp-format msgid "The value of %1 is invalid." msgstr "" @@ -598,37 +598,37 @@ msgstr "" #. combobox header -#: library/cwm/src/TablePopup.ycp:413 +#: library/cwm/src/TablePopup.ycp:417 msgid "&Selected Option" msgstr "" #. heading / label -#: library/cwm/src/TablePopup.ycp:459 +#: library/cwm/src/TablePopup.ycp:463 msgid "Current Option: " msgstr "" #. error report -#: library/cwm/src/TablePopup.ycp:652 +#: library/cwm/src/TablePopup.ycp:663 msgid "The selected option is already present." msgstr "" #. table header, shortcut for changed, keep very short -#: library/cwm/src/TablePopup.ycp:823 +#: library/cwm/src/TablePopup.ycp:835 msgid "Ch." msgstr "" #. table header -#: library/cwm/src/TablePopup.ycp:825 library/cwm/src/TablePopup.ycp:830 +#: library/cwm/src/TablePopup.ycp:837 library/cwm/src/TablePopup.ycp:842 msgid "Option" msgstr "" #. table header -#: library/cwm/src/TablePopup.ycp:827 library/cwm/src/TablePopup.ycp:832 +#: library/cwm/src/TablePopup.ycp:839 library/cwm/src/TablePopup.ycp:844 msgid "Value" msgstr "" #. help 1/4 -#: library/cwm/src/TablePopup.ycp:836 +#: library/cwm/src/TablePopup.ycp:848 msgid "" "<big>Editing the Settings</big> \n" "To edit the settings, choose the appropriate\n" @@ -636,21 +636,21 @@ msgstr "" #. help 2/4, optional -#: library/cwm/src/TablePopup.ycp:841 +#: library/cwm/src/TablePopup.ycp:853 msgid "" "To add a new option, click Add. To remove\n" "an option, select it and click Delete." msgstr "" #. help 3/4, optional -#: library/cwm/src/TablePopup.ycp:846 +#: library/cwm/src/TablePopup.ycp:858 msgid "" "The Ch. column of the table shows \n" "whether the option was changed." msgstr "" #. help 4/4, optional -#: library/cwm/src/TablePopup.ycp:851 +#: library/cwm/src/TablePopup.ycp:863 msgid "" "To reorder the options, select an option\n" "and use Up and Down to move it up or down\n" @@ -659,12 +659,12 @@ #. push button #. Button label -#: library/cwm/src/TablePopup.ycp:859 library/modules/Label.ycp:184 +#: library/cwm/src/TablePopup.ycp:871 library/modules/Label.ycp:184 msgid "&Up" msgstr "" #. push button -#: library/cwm/src/TablePopup.ycp:861 +#: library/cwm/src/TablePopup.ycp:873 msgid "&Down" msgstr "" @@ -1277,43 +1277,176 @@ msgid "All changes will be lost!" msgstr "" +#. translators: summary header for messages generated through autoinstallation +#: library/modules/Report.ycp:81 +msgid "Messages" +msgstr "" + +#. Report configuration - will be normal messages displayed? +#. '%1' will be replaced by translated string "Yes" or "No" +#: library/modules/Report.ycp:86 +#, ycp-format +msgid "Display Messages: %1" +msgstr "" + +#. translators: summary if the messages should be displayed +#. translators: summary if the messages should be written to log file +#. translators: summary if the warnings should be displayed +#. translators: summary if the warnings should be written to log file +#. translators: summary if the errors should be displayed +#. translators: summary if the errors should be written to log file +#: library/modules/Report.ycp:88 library/modules/Report.ycp:96 +#: library/modules/Report.ycp:105 library/modules/Report.ycp:113 +#: library/modules/Report.ycp:122 library/modules/Report.ycp:130 +msgid "Yes" +msgstr "" + +#. translators: summary if the errors should be written to log file +#: library/modules/Report.ycp:88 library/modules/Report.ycp:96 +#: library/modules/Report.ycp:105 library/modules/Report.ycp:113 +#: library/modules/Report.ycp:122 library/modules/Report.ycp:132 +msgid "No" +msgstr "" + +#. Report configuration - will have normal messages timeout? +#. '%1' will be replaced by number of seconds +#: library/modules/Report.ycp:91 +#, ycp-format +msgid "Time-out Messages: %1" +msgstr "" + +#. Report configuration - will be normal messages logged to file? +#. '%1' will be replaced by translated string "Yes" or "No" +#: library/modules/Report.ycp:94 +#, ycp-format +msgid "Log Messages: %1" +msgstr "" + +#. translators: summary header for warnings generated through autoinstallation +#: library/modules/Report.ycp:99 +msgid "Warnings" +msgstr "" + +#. Report configuration - will be warning messages displayed? +#. '%1' will be replaced by translated string "Yes" or "No" +#: library/modules/Report.ycp:103 +#, ycp-format +msgid "Display Warnings: %1" +msgstr "" + +#. Report configuration - will have warning messages timeout? +#. '%1' will be replaced by number of seconds +#: library/modules/Report.ycp:108 +#, ycp-format +msgid "Time-out Warnings: %1" +msgstr "" + +#. Report configuration - will be warning messages logged to file? +#. '%1' will be replaced by translated string "Yes" or "No" +#: library/modules/Report.ycp:111 +#, ycp-format +msgid "Log Warnings: %1" +msgstr "" + +#. translators: summary header for errors generated through autoinstallation +#: library/modules/Report.ycp:116 +msgid "Errors" +msgstr "" + +#. Report configuration - will be error messages displayed? +#. '%1' will be replaced by translated string "Yes" or "No" +#: library/modules/Report.ycp:120 +#, ycp-format +msgid "Display Errors: %1" +msgstr "" + +#. Report configuration - will have error messages timeout? +#. '%1' will be replaced by number of seconds +#: library/modules/Report.ycp:125 +#, ycp-format +msgid "Time-out Errors: %1" +msgstr "" + +#. Report configuration - will be error messages logged to file? +#. '%1' will be replaced by translated string "Yes" or "No" +#: library/modules/Report.ycp:128 +#, ycp-format +msgid "Log Errors: %1" +msgstr "" + +#. translators: warnings summary header +#: library/modules/Report.ycp:635 +msgid "Warning:" +msgid_plural "Warnings:" +msgstr[0] "" +msgstr[1] "" + +#. translators: errors summary header +#: library/modules/Report.ycp:649 +msgid "Error:" +msgid_plural "Errors:" +msgstr[0] "" +msgstr[1] "" + +#. translators: message summary header +#: library/modules/Report.ycp:663 library/modules/Report.ycp:677 +msgid "Message:" +msgid_plural "Messages:" +msgstr[0] "" +msgstr[1] "" + +#. translators: summary if the module has not been used yet in AutoYaST profile +#: library/modules/Summary.ycp:49 +msgid "Not configured yet." +msgstr "" + +#. translators: summary if no hardware was detected +#: library/modules/Summary.ycp:65 +msgid "Not detected." +msgstr "" + #. translators: Tree header #: library/modules/ValueBrowser.ycp:141 msgid "&Variable" msgstr "" #. label -#: library/network/src/CWMFirewallInterfaces.ycp:77 +#: library/network/src/CWMFirewallInterfaces.ycp:104 msgid "Firewall is disabled" msgstr "" #. label -#: library/network/src/CWMFirewallInterfaces.ycp:82 +#: library/network/src/CWMFirewallInterfaces.ycp:109 msgid "Firewall port is closed" msgstr "" #. label -#: library/network/src/CWMFirewallInterfaces.ycp:87 +#: library/network/src/CWMFirewallInterfaces.ycp:114 msgid "Firewall port is open on all interfaces" msgstr "" #. label -#: library/network/src/CWMFirewallInterfaces.ycp:92 +#: library/network/src/CWMFirewallInterfaces.ycp:119 msgid "Firewall port is open on selected interfaces" msgstr "" #. label -#: library/network/src/CWMFirewallInterfaces.ycp:97 +#: library/network/src/CWMFirewallInterfaces.ycp:124 msgid "No network interfaces are configured" msgstr "" +#. multi selection box item +#: library/network/src/CWMFirewallInterfaces.ycp:186 +msgid "All NetworkManager Interfaces" +msgstr "" + #. transaltors: selection box title -#: library/network/src/CWMFirewallInterfaces.ycp:278 +#: library/network/src/CWMFirewallInterfaces.ycp:365 msgid "&Network Interfaces with Open Port in Firewall" msgstr "" #. question popup -#: library/network/src/CWMFirewallInterfaces.ycp:338 +#: library/network/src/CWMFirewallInterfaces.ycp:431 msgid "" "No interface is selected. Service will not\n" "be available for other computers.\n" @@ -1322,7 +1455,7 @@ msgstr "" #. yes-no popup -#: library/network/src/CWMFirewallInterfaces.ycp:358 +#: library/network/src/CWMFirewallInterfaces.ycp:475 #, ycp-format msgid "" "Because of SuSE Firewall settings, the port\n" @@ -1333,7 +1466,7 @@ msgstr "" #. yes-no popup -#: library/network/src/CWMFirewallInterfaces.ycp:373 +#: library/network/src/CWMFirewallInterfaces.ycp:492 #, ycp-format msgid "" "Because of SuSE Firewall settings, the port\n" @@ -1344,23 +1477,23 @@ msgstr "" #. translators: selection box title -#: library/network/src/CWMFirewallInterfaces.ycp:450 +#: library/network/src/CWMFirewallInterfaces.ycp:569 msgid "Network &Interfaces with Open Port in Firewall" msgstr "" #. push button to select all network intefaces for firewall -#: library/network/src/CWMFirewallInterfaces.ycp:459 +#: library/network/src/CWMFirewallInterfaces.ycp:578 msgid "Select &All" msgstr "" #. push button to deselect all network intefaces for firewall -#: library/network/src/CWMFirewallInterfaces.ycp:462 +#: library/network/src/CWMFirewallInterfaces.ycp:581 msgid "Select &None" msgstr "" #. help text for firewall settings widget 1/3, #. %1 is check box label, eg. "Open Port in Firewall" (without quotes) -#: library/network/src/CWMFirewallInterfaces.ycp:680 +#: library/network/src/CWMFirewallInterfaces.ycp:799 #, ycp-format msgid "" "<big>Firewall Settings</big> \n" @@ -1371,7 +1504,7 @@ #. help text for firewall port openning widget 2/3, optional #. %1 is push button label, eg. "Firewall &Details" (without quotes) #. note: %2 is correct, do not replace with %1!!! -#: library/network/src/CWMFirewallInterfaces.ycp:688 +#: library/network/src/CWMFirewallInterfaces.ycp:807 #, ycp-format msgid "" "To select interfaces on which to open the port,\n" @@ -1379,37 +1512,46 @@ msgstr "" #. help text for firewall settings widget 3/3, -#: library/network/src/CWMFirewallInterfaces.ycp:692 +#: library/network/src/CWMFirewallInterfaces.ycp:811 msgid "" "This option is available only if the firewall\n" "is enabled." msgstr "" #. part of help text - check box label, NO SHORTCUT!!! -#: library/network/src/CWMFirewallInterfaces.ycp:705 +#: library/network/src/CWMFirewallInterfaces.ycp:824 msgid "Open Port in Firewall" msgstr "" #. part of help text - push button label, NO SHORTCUT!!! -#: library/network/src/CWMFirewallInterfaces.ycp:707 +#: library/network/src/CWMFirewallInterfaces.ycp:826 msgid "Firewall Details" msgstr "" #. check box -#: library/network/src/CWMFirewallInterfaces.ycp:736 +#: library/network/src/CWMFirewallInterfaces.ycp:855 msgid "Open Port in &Firewall" msgstr "" #. push button -#: library/network/src/CWMFirewallInterfaces.ycp:739 +#: library/network/src/CWMFirewallInterfaces.ycp:858 msgid "Firewall &Details" msgstr "" #. label text -#: library/network/src/CWMFirewallInterfaces.ycp:768 +#: library/network/src/CWMFirewallInterfaces.ycp:887 msgid "Firewall is open" msgstr "" +#. TRANSLATORS: pop-up question when reading the service configuration +#: library/network/src/NetworkService.ycp:108 +msgid "" +"Your network interfaces are currently controlled by NetworkManager\n" +"but the service to configure might not work well with it.\n" +"\n" +"Really continue?" +msgstr "" + #. TRANSLATORS: popup informing message, allowed characters for port-names #: library/network/src/PortAliases.ycp:112 msgid "" @@ -1419,39 +1561,39 @@ msgstr "" #. TRANSLATORS: Firewall zone name - used in combo box or dialog title -#: library/network/src/SuSEFirewall.ycp:72 +#: library/network/src/SuSEFirewall.ycp:79 msgid "External Zone" msgstr "" #. TRANSLATORS: Firewall zone name - used in combo box or dialog title -#: library/network/src/SuSEFirewall.ycp:74 +#: library/network/src/SuSEFirewall.ycp:81 msgid "Internal Zone" msgstr "" #. TRANSLATORS: Firewall zone name - used in combo box or dialog title -#: library/network/src/SuSEFirewall.ycp:76 +#: library/network/src/SuSEFirewall.ycp:83 msgid "Demilitarized Zone" msgstr "" #. TRANSLATORS: Firewall zone full-name, used as combo box item or dialog title -#: library/network/src/SuSEFirewall.ycp:1103 +#: library/network/src/SuSEFirewall.ycp:1140 msgid "Unknown Zone" msgstr "" #. TRANSLATORS: a popup error message -#: library/network/src/SuSEFirewall.ycp:1323 +#: library/network/src/SuSEFirewall.ycp:1360 #, ycp-format msgid "Cannot enable service '%1'." msgstr "" #. TRANSLATORS: a popup error message -#: library/network/src/SuSEFirewall.ycp:1345 +#: library/network/src/SuSEFirewall.ycp:1382 #, ycp-format msgid "Cannot disable service '%1'." msgstr "" #. TRANSLATORS: Error message, %1 = interface name (like eth0) -#: library/network/src/SuSEFirewall.ycp:1458 +#: library/network/src/SuSEFirewall.ycp:1497 #, ycp-format msgid "" "Interface '%1' is included in multiple firewall zones.\n" @@ -1462,8 +1604,8 @@ msgstr "" #. TRANSLATORS: Error message, %1 = interface name (like eth0) -#: library/network/src/SuSEFirewall.ycp:1730 -#: library/network/src/SuSEFirewall.ycp:1787 +#: library/network/src/SuSEFirewall.ycp:1782 +#: library/network/src/SuSEFirewall.ycp:1843 #, ycp-format msgid "" "Interface '%1' is not assigned to any firewall zone.\n" @@ -1471,78 +1613,78 @@ msgstr "" #. TRANSLATORS: Dialog caption -#: library/network/src/SuSEFirewall.ycp:2111 +#: library/network/src/SuSEFirewall.ycp:2175 msgid "Initializing Firewall Configuration" msgstr "" #. TRANSLATORS: Progress step -#: library/network/src/SuSEFirewall.ycp:2116 +#: library/network/src/SuSEFirewall.ycp:2180 msgid "Check for network devices" msgstr "" #. TRANSLATORS: Progress step -#: library/network/src/SuSEFirewall.ycp:2118 +#: library/network/src/SuSEFirewall.ycp:2182 msgid "Read current configuration" msgstr "" #. TRANSLATORS: Progress step -#: library/network/src/SuSEFirewall.ycp:2120 +#: library/network/src/SuSEFirewall.ycp:2184 msgid "Check possibly conflicting services" msgstr "" #. TRANSLATORS: Progress step -#: library/network/src/SuSEFirewall.ycp:2124 +#: library/network/src/SuSEFirewall.ycp:2188 msgid "Checking for network devices..." msgstr "" #. TRANSLATORS: Progress step -#: library/network/src/SuSEFirewall.ycp:2126 +#: library/network/src/SuSEFirewall.ycp:2190 msgid "Reading current configuration..." msgstr "" #. TRANSLATORS: Progress step -#: library/network/src/SuSEFirewall.ycp:2128 +#: library/network/src/SuSEFirewall.ycp:2192 msgid "Checking possibly conflicting services..." msgstr "" #. TRANSLATORS: Dialog caption -#: library/network/src/SuSEFirewall.ycp:2227 +#: library/network/src/SuSEFirewall.ycp:2291 msgid "Writing Firewall Configuration" msgstr "" #. TRANSLATORS: Progress step -#: library/network/src/SuSEFirewall.ycp:2232 +#: library/network/src/SuSEFirewall.ycp:2296 msgid "Write firewall settings" msgstr "" #. TRANSLATORS: Progress step -#: library/network/src/SuSEFirewall.ycp:2234 +#: library/network/src/SuSEFirewall.ycp:2298 msgid "Adjust firewall service" msgstr "" #. TRANSLATORS: Progress step -#: library/network/src/SuSEFirewall.ycp:2238 +#: library/network/src/SuSEFirewall.ycp:2302 msgid "Writing firewall settings..." msgstr "" #. TRANSLATORS: Progress step -#: library/network/src/SuSEFirewall.ycp:2240 +#: library/network/src/SuSEFirewall.ycp:2304 msgid "Adjusting firewall service..." msgstr "" #. TRANSLATORS: a popup error message -#: library/network/src/SuSEFirewall.ycp:2256 +#: library/network/src/SuSEFirewall.ycp:2320 msgid "Writing settings failed" msgstr "" #. TRANSLATORS: Warning in installation proposal, %1 is a device name (eth0, sl0, ...) -#: library/network/src/SuSEFirewallProposal.ycp:136 +#: library/network/src/SuSEFirewallProposal.ycp:137 #, ycp-format msgid "New network device '%1' found; added as an internal firewall interface" msgstr "" #. TRANSLATORS: Warning in installation proposal, %1 is a device name (eth0, sl0, ...) -#: library/network/src/SuSEFirewallProposal.ycp:143 +#: library/network/src/SuSEFirewallProposal.ycp:144 #, ycp-format msgid "New network device '%1' found; added as an external firewall interface" msgstr "" @@ -1550,7 +1692,7 @@ #. TRANSLATORS: Proposal informative text "Firewall is enabled" with link around #. "enabled" must be surrounded with the "%1" and "%2" strings #. %1 is the start and %2 is the end of the HTML link "<a href...>" and "</a>" -#: library/network/src/SuSEFirewallProposal.ycp:330 +#: library/network/src/SuSEFirewallProposal.ycp:349 #, ycp-format msgid "Firewall is %1enabled%2" msgstr "" @@ -1558,7 +1700,7 @@ #. TRANSLATORS: Proposal informative text "Firewall is disabled" with link around #. "disabled" must be surrounded with the "%1" and "%2" strings #. %1 is the start and %2 is the end of the HTML link "<a href...>" and "</a>" -#: library/network/src/SuSEFirewallProposal.ycp:335 +#: library/network/src/SuSEFirewallProposal.ycp:354 #, ycp-format msgid "Firewall is %1disabled%2" msgstr "" @@ -1566,7 +1708,7 @@ #. TRANSLATORS: Network proposal informative text "SSH is enabled" with link around #. "enabled" must be surrounded with the "%1" and "%2" strings #. %1 is the start and %2 is the end of the HTML link "<a href...>" and "</a>" -#: library/network/src/SuSEFirewallProposal.ycp:353 +#: library/network/src/SuSEFirewallProposal.ycp:384 #, ycp-format msgid "SSH port is %1open%2" msgstr "" @@ -1574,20 +1716,20 @@ #. TRANSLATORS: Network proposal informative text "SSH is disabled" with link around #. "disabled" must be surrounded with the "%1" and "%2" strings #. %1 is the start and %2 is the end of the HTML link "<a href...>" and "</a>" -#: library/network/src/SuSEFirewallProposal.ycp:358 +#: library/network/src/SuSEFirewallProposal.ycp:389 #, ycp-format msgid "SSH port is %1blocked%2" msgstr "" #. TRANSLATORS: This is a warning message. Installation over SSH without SSH allowed on firewall -#: library/network/src/SuSEFirewallProposal.ycp:364 -msgid "You are installing system over the SSH but you have not opened the SSH port on the firewall." +#: library/network/src/SuSEFirewallProposal.ycp:395 +msgid "You are installing a system over SSH, but you have not opened the SSH port on the firewall." msgstr "" #. TRANSLATORS: Network proposal informative text "Remote Administration (VNC) is enabled" with link around #. "enabled" must be surrounded with the "%1" and "%2" strings #. %1 is the start and %2 is the end of the HTML link "<a href...>" and "</a>" -#: library/network/src/SuSEFirewallProposal.ycp:383 +#: library/network/src/SuSEFirewallProposal.ycp:414 #, ycp-format msgid "Remote Administration (VNC) ports are %1open%2" msgstr "" @@ -1595,14 +1737,14 @@ #. TRANSLATORS: Network proposal informative text "Remote Administration (VNC) is disabled" with link around #. "disabled" must be surrounded with the "%1" and "%2" strings #. %1 is the start and %2 is the end of the HTML link "<a href...>" and "</a>" -#: library/network/src/SuSEFirewallProposal.ycp:388 +#: library/network/src/SuSEFirewallProposal.ycp:419 #, ycp-format msgid "Remote Administration (VNC) ports are %1blocked%2" msgstr "" #. TRANSLATORS: This is a warning message. Installation over VNC without VNC allowed on firewall -#: library/network/src/SuSEFirewallProposal.ycp:393 -msgid "You are installing system over the Remote Administration (VNC) but you have not opened the VNC ports on the firewall." +#: library/network/src/SuSEFirewallProposal.ycp:424 +msgid "You are installing a system using remote administration (VNC), but you have not opened the VNC ports on the firewall." msgstr "" #. TRANSLATORS: Name of Service, can be used as check box, item in multiple selection box... @@ -1736,49 +1878,43 @@ msgstr "" #. TRANSLATORS: Name of Service, can be used as check box, item in multiple selection box... -#: library/network/src/SuSEFirewallServices.ycp:183 +#: library/network/src/SuSEFirewallServices.ycp:185 msgid "Remote Access to Display Manager" msgstr "" #. TRANSLATORS: Name of Service, can be used as check box, item in multiple selection box... -#: library/network/src/SuSEFirewallServices.ycp:191 +#: library/network/src/SuSEFirewallServices.ycp:193 msgid "Remote File Alteration Monitor" msgstr "" #. TRANSLATORS: Name of Service, can be used as check box, item in multiple selection box... -#: library/network/src/SuSEFirewallServices.ycp:197 +#: library/network/src/SuSEFirewallServices.ycp:199 msgid "Portable Batch System (PBS)" msgstr "" #. TRANSLATORS: Name of Service, can be used as check box, item in multiple selection box... -#: library/network/src/SuSEFirewallServices.ycp:204 +#: library/network/src/SuSEFirewallServices.ycp:206 msgid "MySQL Remote Access" msgstr "" #. TRANSLATORS: Name of unknown service. This should never happen, just for cases..., %1 is a requested service id like nis-server -#: library/network/src/SuSEFirewallServices.ycp:234 +#: library/network/src/SuSEFirewallServices.ycp:236 #, ycp-format msgid "Unknown service '%1'" msgstr "" #. Popup when initializing the package manager -#. popup when initializing the package manager #: library/packages/src/PackageSystem.ycp:77 -#: library/packages/src/Require.ycp:75 msgid "Reading package information..." msgstr "" #. Error message, no packages sources found -#. error popup, no packages sources -#. FIXME: translation #: library/packages/src/PackageSystem.ycp:99 -#: library/packages/src/Require.ycp:87 msgid "No package source defined." msgstr "" #. popup heading, with rich text widget and Yes/No buttons #: library/packages/src/PackageSystem.ycp:128 -#: library/packages/src/Require.ycp:343 msgid "Do you accept this license agreement?" msgid_plural "Do you accept these license agreements?" msgstr[0] "" @@ -1809,19 +1945,14 @@ "packages, YaST may not work properly.\n" msgstr "" -#. this is a separator used at merging package list items -#: library/packages/src/common.ycp:83 -msgid ", " -msgstr "" - #. the message is followed by list of required packages #. Popup Text -#: library/packages/src/common.ycp:85 library/packages/src/common.ycp:109 +#: library/packages/src/common.ycp:84 library/packages/src/common.ycp:108 msgid "These packages need to be installed:" msgstr "" #. Popup Text -#: library/packages/src/common.ycp:111 +#: library/packages/src/common.ycp:110 msgid "These packages need to be removed:" msgstr "" @@ -1933,22 +2064,22 @@ msgstr "" #. KiloByte abbreviated -#: library/types/src/String.ycp:80 +#: library/types/src/String.ycp:96 msgid "KB" msgstr "" #. MegaByte abbreviated -#: library/types/src/String.ycp:82 +#: library/types/src/String.ycp:98 msgid "MB" msgstr "" #. GigaByte abbreviated -#: library/types/src/String.ycp:84 +#: library/types/src/String.ycp:100 msgid "GB" msgstr "" #. TeraByte abbreviated -#: library/types/src/String.ycp:86 +#: library/types/src/String.ycp:102 msgid "TB" msgstr "" @@ -2024,134 +2155,6 @@ msgid "&Exported Directories" msgstr "" -#. translators: summary header for messages generated through autoinstallation -#: library/wizard/src/Report.ycp:81 -msgid "Messages" -msgstr "" - -#. Report configuration - will be normal messages displayed? -#. '%1' will be replaced by translated string "Yes" or "No" -#: library/wizard/src/Report.ycp:86 -#, ycp-format -msgid "Display Messages: %1" -msgstr "" - -#. translators: summary if the messages should be displayed -#. translators: summary if the messages should be written to log file -#. translators: summary if the warnings should be displayed -#. translators: summary if the warnings should be written to log file -#. translators: summary if the errors should be displayed -#. translators: summary if the errors should be written to log file -#: library/wizard/src/Report.ycp:88 library/wizard/src/Report.ycp:96 -#: library/wizard/src/Report.ycp:105 library/wizard/src/Report.ycp:113 -#: library/wizard/src/Report.ycp:122 library/wizard/src/Report.ycp:130 -msgid "Yes" -msgstr "" - -#. translators: summary if the errors should be written to log file -#: library/wizard/src/Report.ycp:88 library/wizard/src/Report.ycp:96 -#: library/wizard/src/Report.ycp:105 library/wizard/src/Report.ycp:113 -#: library/wizard/src/Report.ycp:122 library/wizard/src/Report.ycp:132 -msgid "No" -msgstr "" - -#. Report configuration - will have normal messages timeout? -#. '%1' will be replaced by number of seconds -#: library/wizard/src/Report.ycp:91 -#, ycp-format -msgid "Time-out Messages: %1" -msgstr "" - -#. Report configuration - will be normal messages logged to file? -#. '%1' will be replaced by translated string "Yes" or "No" -#: library/wizard/src/Report.ycp:94 -#, ycp-format -msgid "Log Messages: %1" -msgstr "" - -#. translators: summary header for warnings generated through autoinstallation -#: library/wizard/src/Report.ycp:99 -msgid "Warnings" -msgstr "" - -#. Report configuration - will be warning messages displayed? -#. '%1' will be replaced by translated string "Yes" or "No" -#: library/wizard/src/Report.ycp:103 -#, ycp-format -msgid "Display Warnings: %1" -msgstr "" - -#. Report configuration - will have warning messages timeout? -#. '%1' will be replaced by number of seconds -#: library/wizard/src/Report.ycp:108 -#, ycp-format -msgid "Time-out Warnings: %1" -msgstr "" - -#. Report configuration - will be warning messages logged to file? -#. '%1' will be replaced by translated string "Yes" or "No" -#: library/wizard/src/Report.ycp:111 -#, ycp-format -msgid "Log Warnings: %1" -msgstr "" - -#. translators: summary header for errors generated through autoinstallation -#: library/wizard/src/Report.ycp:116 -msgid "Errors" -msgstr "" - -#. Report configuration - will be error messages displayed? -#. '%1' will be replaced by translated string "Yes" or "No" -#: library/wizard/src/Report.ycp:120 -#, ycp-format -msgid "Display Errors: %1" -msgstr "" - -#. Report configuration - will have error messages timeout? -#. '%1' will be replaced by number of seconds -#: library/wizard/src/Report.ycp:125 -#, ycp-format -msgid "Time-out Errors: %1" -msgstr "" - -#. Report configuration - will be error messages logged to file? -#. '%1' will be replaced by translated string "Yes" or "No" -#: library/wizard/src/Report.ycp:128 -#, ycp-format -msgid "Log Errors: %1" -msgstr "" - -#. translators: warnings summary header -#: library/wizard/src/Report.ycp:635 -msgid "Warning:" -msgid_plural "Warnings:" -msgstr[0] "" -msgstr[1] "" - -#. translators: errors summary header -#: library/wizard/src/Report.ycp:649 -msgid "Error:" -msgid_plural "Errors:" -msgstr[0] "" -msgstr[1] "" - -#. translators: message summary header -#: library/wizard/src/Report.ycp:663 library/wizard/src/Report.ycp:677 -msgid "Message:" -msgid_plural "Messages:" -msgstr[0] "" -msgstr[1] "" - -#. translators: summary if the module has not been used yet in AutoYaST profile -#: library/wizard/src/Summary.ycp:49 -msgid "Not configured yet." -msgstr "" - -#. translators: summary if no hardware was detected -#: library/wizard/src/Summary.ycp:65 -msgid "Not detected." -msgstr "" - #. button text #: library/wizard/src/Wizard.ycp:153 library/wizard/src/Wizard.ycp:306 msgid "&Apply" diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-2.13.41/configure new/yast2-2.13.40/configure --- old/yast2-2.13.41/configure 2006-03-29 17:06:37.000000000 +0200 +++ new/yast2-2.13.40/configure 2006-03-22 13:03:53.000000000 +0100 @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.59 for yast2 2.13.41. +# Generated by GNU Autoconf 2.59 for yast2 2.13.40. # # Report bugs to <http://www.suse.de/feedback>. # @@ -269,8 +269,8 @@ # Identity of this package. PACKAGE_NAME='yast2' PACKAGE_TARNAME='yast2' -PACKAGE_VERSION='2.13.41' -PACKAGE_STRING='yast2 2.13.41' +PACKAGE_VERSION='2.13.40' +PACKAGE_STRING='yast2 2.13.40' 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 2.13.41 to adapt to many kinds of systems. +\`configure' configures yast2 2.13.40 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 2.13.41:";; + short | recursive ) echo "Configuration of yast2 2.13.40:";; esac cat <<\_ACEOF @@ -908,7 +908,7 @@ test -n "$ac_init_help" && exit 0 if $ac_init_version; then cat <<\_ACEOF -yast2 configure 2.13.41 +yast2 configure 2.13.40 generated by GNU Autoconf 2.59 Copyright (C) 2003 Free Software Foundation, Inc. @@ -922,7 +922,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 $as_me 2.13.41, which was +It was created by yast2 $as_me 2.13.40, which was generated by GNU Autoconf 2.59. Invocation command line was $ $0 $@ @@ -1652,7 +1652,7 @@ # Define the identity of the package. PACKAGE='yast2' - VERSION='2.13.41' + VERSION='2.13.40' cat >>confdefs.h <<_ACEOF @@ -1863,7 +1863,7 @@ -VERSION="2.13.41" +VERSION="2.13.40" RPMNAME="yast2" MAINTAINER="Stanislav Visnovsky <visnov(a)suse.cz>" @@ -2797,7 +2797,7 @@ } >&5 cat >&5 <<_CSEOF -This file was extended by yast2 $as_me 2.13.41, which was +This file was extended by yast2 $as_me 2.13.40, which was generated by GNU Autoconf 2.59. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -2852,7 +2852,7 @@ cat >>$CONFIG_STATUS <<_ACEOF ac_cs_version="\\ -yast2 config.status 2.13.41 +yast2 config.status 2.13.40 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-2.13.41/configure.in new/yast2-2.13.40/configure.in --- old/yast2-2.13.41/configure.in 2006-03-29 17:06:24.000000000 +0200 +++ new/yast2-2.13.40/configure.in 2006-03-22 13:03:49.000000000 +0100 @@ -1,9 +1,9 @@ dnl configure.in for yast2 dnl -dnl -- This file is generated by y2autoconf 2.13.16 - DO NOT EDIT! -- +dnl -- This file is generated by y2autoconf - DO NOT EDIT! -- dnl (edit configure.in.in instead) -AC_INIT(yast2, 2.13.41, http://www.suse.de/feedback, yast2) +AC_INIT(yast2, 2.13.40, http://www.suse.de/feedback, yast2) dnl Check for presence of file 'RPMNAME' AC_CONFIG_SRCDIR([RPMNAME]) @@ -17,7 +17,7 @@ AM_INIT_AUTOMAKE(tar-ustar) dnl searches for some needed programs dnl Important YaST2 variables -VERSION="2.13.41" +VERSION="2.13.40" RPMNAME="yast2" MAINTAINER="Stanislav Visnovsky <visnov(a)suse.cz>" diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-2.13.41/library/modules/Version.ycp new/yast2-2.13.40/library/modules/Version.ycp --- old/yast2-2.13.41/library/modules/Version.ycp 2006-03-29 17:07:15.000000000 +0200 +++ new/yast2-2.13.40/library/modules/Version.ycp 2006-03-22 13:04:05.000000000 +0100 @@ -20,7 +20,7 @@ /** * Version of the yast2 package */ -global string yast2 = "2.13.41"; +global string yast2 = "2.13.40"; /* EOF */ } diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-2.13.41/library/packages/src/Makefile.am new/yast2-2.13.40/library/packages/src/Makefile.am --- old/yast2-2.13.41/library/packages/src/Makefile.am 2006-03-28 18:46:35.000000000 +0200 +++ new/yast2-2.13.40/library/packages/src/Makefile.am 2006-02-03 08:47:25.000000000 +0100 @@ -5,7 +5,6 @@ YCPCFLAGS = -M ../../modules/ -M ../../wizard/src -M ../../system/src/ -M ../../types/src -M ../../commandline/src -M ../../xml/src module_DATA = \ - PackageLock.ycp \ Package.ycp \ PackageAI.ycp \ PackageSystem.ycp \ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-2.13.41/library/packages/src/Makefile.in new/yast2-2.13.40/library/packages/src/Makefile.in --- old/yast2-2.13.41/library/packages/src/Makefile.in 2006-03-29 17:06:54.000000000 +0200 +++ new/yast2-2.13.40/library/packages/src/Makefile.in 2006-03-22 13:03:59.000000000 +0100 @@ -174,7 +174,6 @@ ystartupdir = @ystartupdir@ YCPCFLAGS = -M ../../modules/ -M ../../wizard/src -M ../../system/src/ -M ../../types/src -M ../../commandline/src -M ../../xml/src module_DATA = \ - PackageLock.ycp \ Package.ycp \ PackageAI.ycp \ PackageSystem.ycp \ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-2.13.41/library/packages/src/PackageLock.ycp new/yast2-2.13.40/library/packages/src/PackageLock.ycp --- old/yast2-2.13.41/library/packages/src/PackageLock.ycp 2006-03-29 15:32:27.000000000 +0200 +++ new/yast2-2.13.40/library/packages/src/PackageLock.ycp 1970-01-01 01:00:00.000000000 +0100 @@ -1,42 +0,0 @@ -/** - * File: modules/PackageLock.ycp - * Package: yast2 - * Summary: Packages manipulation (system) - * Authors: Martin Vidner <mvidner(a)suse.cz> - * - * $Id: PackageLock.ycp 29512 2006-03-29 13:32:23Z mvidner $ - * - * This should be used everywhere before Pkg is first used. #160319 - */ - -{ - -module "PackageLock"; -textdomain "base"; - -import "Report"; - -boolean have_lock = nil; -/** - * Tries to acquire the packager (zypp) lock. - * Reports an error if another process has the lock already. - * Will only report once even if called multiple times. - * @return true if we can continue - */ -global boolean Check () { - if (have_lock == nil) - { - // Invoke a cheap call that accesses the zypp lock - have_lock = Pkg::Connect () == true; // nil guard - if (!have_lock) - { - Report::Error (_("Another process is accessing the package database. -Package management will not work!")); - // ContinueCancel? What about CLI? - } - } - return have_lock; -} - - -} diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-2.13.41/library/packages/src/PackageSystem.ycp new/yast2-2.13.40/library/packages/src/PackageSystem.ycp --- old/yast2-2.13.41/library/packages/src/PackageSystem.ycp 2006-03-29 17:04:49.000000000 +0200 +++ new/yast2-2.13.40/library/packages/src/PackageSystem.ycp 2006-02-20 12:08:10.000000000 +0100 @@ -5,7 +5,7 @@ * Authors: Martin Vidner <mvidner(a)suse.cz> * Michal Svec <msvec(a)suse.cz> * - * $Id: PackageSystem.ycp 29534 2006-03-29 15:04:45Z mvidner $ + * $Id: PackageSystem.ycp 27893 2006-02-13 12:08:32Z lslezak $ * * The documentation is maintained at * <a href="../index.html">.../docs/index.html</a>. @@ -18,7 +18,6 @@ import "Mode"; import "PackageCallbacksInit"; -import "PackageLock"; import "Report"; import "Stage"; import "CommandLine"; @@ -53,7 +52,6 @@ * This may become superfluous. */ global void EnsureTargetInit() { - PackageLock::Check (); PackageCallbacksInit::InitPackageCallbacks (); // target_initialized = target_initialized || Pkg::TargetInit ("/", false); // always initizalize target, it should be cheap according to #45356 @@ -64,7 +62,6 @@ * Ensure that Pkg:: calls working with the installation sources work */ global void EnsureSourceInit() { - PackageLock::Check (); if(source_initialized) { // this way, if somebody closed the cache outside of Package @@ -113,11 +110,6 @@ global boolean DoInstallAndRemove(list<string> toinstall, list<string> toremove) { y2debug ("toinstall: %1, toremove: %2", toinstall, toremove); - if (!PackageLock::Check ()) - { - return false; - } - EnsureSourceInit (); EnsureTargetInit (); boolean ok = true; diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-2.13.41/library/runlevel/src/Service.ycp new/yast2-2.13.40/library/runlevel/src/Service.ycp --- old/yast2-2.13.41/library/runlevel/src/Service.ycp 2006-03-28 13:46:13.000000000 +0200 +++ new/yast2-2.13.40/library/runlevel/src/Service.ycp 2006-02-13 12:22:17.000000000 +0100 @@ -6,7 +6,7 @@ * Petr Blahos <pblahos(a)suse.cz> * Michal Svec <msvec(a)suse.cz> * - * $Id: Service.ycp 29400 2006-03-27 08:26:00Z locilka $ + * $Id: Service.ycp 27885 2006-02-13 11:22:17Z locilka $ * * Functions for service (init script) handling used by other modules. */ @@ -293,7 +293,7 @@ */ global define integer RunInitScriptWithTimeOut (string name, string param) { y2milestone("Running service initscript %1 %2", name, param); - string command = sformat ("TERM=dumb %2/%1 %3", name, init_d, param); + string command = sformat ("TERM=raw %2/%1 %3", name, init_d, param); // default return code integer return_code = nil; ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun...

1 0