May 2007 - openSUSE Commits - openSUSE Mailing Lists

commit gnuplot
by root＠Hilbert.suse.de 31 May '07

31 May '07

Hello community, here is the log from the commit of package gnuplot checked in at Thu May 31 21:34:47 CEST 2007. -------- --- gnuplot/gnuplot.changes 2007-05-11 16:54:14.000000000 +0200 +++ /mounts/work_src_done/STABLE/gnuplot/gnuplot.changes 2007-05-30 16:15:23.094372000 +0200 @@ -1,0 +2,8 @@ +Wed May 30 16:12:19 CEST 2007 - werner(a)suse.de + +- Overwrite empty default font for UTF-8 locale (bug #277876) +- Get html docs fully build and installed +- Correct datadir +- The patent of gif is expired + +------------------------------------------------------------------ Old: ---- gnuplot-4.0.0-fonts.dif New: ---- gnuplot-4.2.0-fonts.dif ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ gnuplot.spec ++++++ --- /var/tmp/diff_new_pack.m22574/_old 2007-05-31 21:34:06.000000000 +0200 +++ /var/tmp/diff_new_pack.m22574/_new 2007-05-31 21:34:06.000000000 +0200 @@ -13,19 +13,19 @@ Name: gnuplot BuildRequires: cairo-devel freetype2-devel gcc-c++ gd-devel gtk2-devel latex2html libjpeg-devel libpng-devel pango-devel plotutils readline-devel texlive-latex wxGTK-devel xorg-x11-devel URL: http://www.gnuplot.info/ -License: BSD License and BSD-like +License: BSD License and BSD-like, Einschraenkungen bei modifiziertem Code: Group: Productivity/Graphics/Visualization/Graph Autoreqprov: on PreReq: %install_info_prereq Version: 4.2.0 -Release: 13 +Release: 26 Summary: Function Plotting Utility Source0: gnuplot-4.2.0.tar.bz2 Source2: gnuplot-fr.doc.bz2 Source3: README.whynot Patch0: gnuplot-4.2.0.dif Patch1: gnuplot-4.2.0-x11ovf.dif -Patch2: gnuplot-4.0.0-fonts.dif +Patch2: gnuplot-4.2.0-fonts.dif Patch3: gnuplot-4.2.0-wxt.dif BuildRoot: %{_tmppath}/%{name}-%{version}-build %{expand: %%global _exec_prefix %(type -p pkg-config &>/dev/null && pkg-config --variable prefix x11 || echo /usr/X11R6)} @@ -87,7 +87,7 @@ --mandir=%{_mandir} \ --infodir=%{_infodir} \ --libexecdir=/usr/%_lib \ - --datadir=/usr/share/gnuplot \ + --datadir=%{_datadir} \ --with-gcc \ --with-x \ --x-includes=%{_x11inc} \ @@ -97,6 +97,7 @@ --with-linux-vga \ --with-gif=png \ --with-freetype=/usr/%_lib \ + --enable-x11-mbfonts \ --with-zlib \ --with-gd \ --enable-thin-splines \ @@ -121,8 +122,11 @@ mkdir -p $RPM_BUILD_ROOT/%{_docdir}/gnuplot/doc mkdir -p $RPM_BUILD_ROOT/%{_docdir}/gnuplot/doc/html mkdir -p $RPM_BUILD_ROOT/%{_docdir}/gnuplot/demo + rm -vf docs/htmldocs/images.{aux,idx,log,out,tex} rm -vf docs/htmldocs/*.pl + rm -vf docs/htmldocs/*.sty rm -vf docs/htmldocs/WARNINGS + rm -vf docs/htmldocs/VERSION rm -rvf demo/html install -m 0444 docs/*.info* $RPM_BUILD_ROOT/%{_infodir}/ install -m 0444 docs/*.pdf $RPM_BUILD_ROOT/%{_docdir}/gnuplot/doc/ @@ -158,11 +162,16 @@ /usr/%{_lib}/gnuplot %doc %{_infodir}/%{name}.info.gz %doc %{_mandir}/man1/gnuplot.1.gz -/usr/share/gnuplot -/usr/share/texmf/tex/latex/gnuplot/ +%{_datadir}/gnuplot +%{_datadir}/texmf/tex/latex/gnuplot/ %{_appdef}/Gnuplot.app-defaults %changelog +* Wed May 30 2007 - werner(a)suse.de +- Overwrite empty default font for UTF-8 locale (bug #277876) +- Get html docs fully build and installed +- Correct datadir +- The patent of gif is expired * Fri May 11 2007 - werner(a)suse.de - Use setlocale(..,NULL) instead of gentenv() (bug #272915) * Tue Apr 24 2007 - werner(a)suse.de ++++++ gnuplot-4.2.0.dif ++++++ --- /var/tmp/diff_new_pack.m22574/_old 2007-05-31 21:34:06.000000000 +0200 +++ /var/tmp/diff_new_pack.m22574/_new 2007-05-31 21:34:06.000000000 +0200 @@ -41,7 +41,7 @@ pause -1 "Hit return to continue" --- demo/vector.dem -+++ demo/vector.dem 2007-04-05 17:36:08.325186217 +0200 ++++ demo/vector.dem 2007-04-05 17:36:08.325186000 +0200 @@ -62,19 +62,19 @@ splot vtot(x,y) w l print "Now create a file with equipotential lines" pause -1 "Hit return to continue" @@ -77,7 +77,7 @@ reset --- docs/Makefile.in -+++ docs/Makefile.in 2007-04-05 17:36:47.850365425 +0200 ++++ docs/Makefile.in 2007-05-30 15:40:43.577475549 +0200 @@ -37,7 +37,7 @@ # @@ -87,7 +87,16 @@ # this tells GNU make not to export variables into the environment # But other makes dont understand its significance, so it must -@@ -321,12 +321,16 @@ doc2hlp: doc2hlp.o termdoc.o +@@ -239,6 +239,8 @@ html: htmldocs/gnuplot.html + # emacs around to do lisp pre-processing + htmldocs/gnuplot.html: $(srcdir)/gnuplot.tex + mkdir -p htmldocs ++ ln -sf ../../VERSION htmldocs/ ++ ln -sf ../toc_entr.sty htmldocs/ + latex2html -dir htmldocs -local_icons gnuplot + + ### PDF documentation +@@ -321,12 +323,16 @@ doc2hlp: doc2hlp.o termdoc.o $(LINK) doc2hlp.o termdoc.o $(LIBS) ### gnuplot interactive help format @@ -105,7 +114,7 @@ doc2gih: doc2gih.o termdoc.o $(LINK) doc2gih.o termdoc.o $(LIBS) -@@ -415,6 +419,7 @@ install: install-gih install-info +@@ -415,6 +421,7 @@ install: install-gih install-info install-gih: gnuplot.gih $(top_srcdir)/mkinstalldirs $(DESTDIR)$(GIHDIR) $(INSTALL_DATA) gnuplot.gih $(DESTDIR)$(GIHDIR)/gnuplot.gih @@ -113,7 +122,7 @@ install-info: gnuplot.info $(top_srcdir)/mkinstalldirs $(DESTDIR)$(infodir) -@@ -434,6 +439,7 @@ uninstall: uninstall-gih uninstall-info +@@ -434,6 +441,7 @@ uninstall: uninstall-gih uninstall-info uninstall-gih: rm -f $(DESTDIR)$(GIHDIR)/gnuplot.gih @@ -310,7 +319,7 @@ *tm = *tmwhen; break; --- term/linux.trm -+++ term/linux.trm 2007-04-05 17:38:15.433841258 +0200 ++++ term/linux.trm 2007-04-05 17:38:15.433841000 +0200 @@ -80,7 +80,7 @@ TERM_PUBLIC void LINUX_linetype __PROTO( TERM_PUBLIC void LINUX_move __PROTO((unsigned int x, unsigned int y)); TERM_PUBLIC void LINUX_vector __PROTO((unsigned int x, unsigned int y)); ++++++ gnuplot-4.0.0-fonts.dif -> gnuplot-4.2.0-fonts.dif ++++++ --- gnuplot/gnuplot-4.0.0-fonts.dif 2006-08-16 05:35:36.000000000 +0200 +++ /mounts/work_src_done/STABLE/gnuplot/gnuplot-4.2.0-fonts.dif 2007-05-30 15:07:46.766734000 +0200 @@ -9,3 +9,51 @@ { "/usr/X11R6/lib/X11/fonts/Type1" }, { "/usr/X11R6/lib/X11/fonts/truetype" }, /* HP-UX */ +--- src/gplt_x11.c ++++ src/gplt_x11.c 2007-05-30 14:16:08.004124402 +0200 +@@ -133,6 +133,8 @@ Error. Incompatible options. + #include <X11/Xatom.h> + #include <X11/keysym.h> + #ifdef USE_X11_MULTIBYTE ++# include <locale.h> ++# include <langinfo.h> + # include <X11/Xlocale.h> + #endif + +@@ -488,8 +490,8 @@ static char *gpFallbackFont __PROTO((voi + static int gpXGetFontascent __PROTO((XFontStruct *cfont)); + + enum set_encoding_id encoding = S_ENC_DEFAULT; /* EAM - mirrored from core code by 'QE' */ +-static char default_font[64] = { '\0' }; +-static char default_encoding[16] = { '\0' }; ++static char default_font[256] = { '\0' }; ++static char default_encoding[64] = { '\0' }; + + #define Nwidths 10 + static unsigned int widths[Nwidths] = { 2, 0, 0, 0, 0, 0, 0, 0, 0, 0 }; +@@ -2099,6 +2101,8 @@ exec_cmd(plot_struct *plot, char *comman + /* Save the request default font */ + c = &(buffer[strlen(buffer)-1]); + while (*c <= ' ') *c-- = '\0'; ++ if (strlen(&buffer[2]) == 0) ++ break; + strncpy(default_font, &buffer[2], strlen(&buffer[2])+1); + FPRINTF((stderr, "gnuplot_x11: exec_cmd() set default_font to \"%s\"\n", default_font)); + break; +@@ -5487,6 +5491,16 @@ char *fontname; + } + + #ifdef USE_X11_MULTIBYTE ++ if ((!fontname || !(*fontname)) && multibyte_fonts_usable) { ++ const char * codeset = nl_langinfo(CODESET); ++ if (strcasestr(codeset, "UTF-8")) { ++ const char* utf8 = "mbfont:sazanami,16 mincho-medium,verdana-medium,16 dejavu,sans,20"; ++ strncpy(default_font, utf8, strlen(utf8)+1); ++ } ++ } ++#endif ++ ++#ifdef USE_X11_MULTIBYTE + if (fontname && strncmp(fontname, "mbfont:", 7) == 0) { + if (multibyte_fonts_usable) { + usemultibyte = 1; ++++++ README.whynot ++++++ --- gnuplot/README.whynot 2005-07-21 17:46:48.000000000 +0200 +++ /mounts/work_src_done/STABLE/gnuplot/README.whynot 2007-05-30 14:20:04.185512000 +0200 @@ -1,10 +1,5 @@ - Why GIF/PDF support is not enabled: - =================================== + Why PDF support is not enabled: + =============================== -GIF: Support for this terminal has been dropped in favour of the PNG - format for legal reasons; under usual configure conditions, old - scripts that request gif will work but will produce a PNG file - instead. - -PDF: Requires libpdf which is a commercial library and therefore not - part of SuSE LINUX. +Requires libpdf which is a commercial library and therefore not +part of SuSE LINUX. ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit gd
by root＠Hilbert.suse.de 31 May '07

31 May '07

Hello community, here is the log from the commit of package gd checked in at Thu May 31 21:29:36 CEST 2007. -------- --- gd/gd.changes 2007-05-03 17:55:44.000000000 +0200 +++ /mounts/work_src_done/STABLE/gd/gd.changes 2007-05-29 17:20:41.000000000 +0200 @@ -1,0 +2,6 @@ +Tue May 29 17:16:32 CEST 2007 - nadvornik(a)suse.cz + +- fixed infinite loop on truncated png images + CVE-2007-2756 [#276525] + +------------------------------------------------------------------- New: ---- gd-png-loop-CVE-2007-2756.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ gd.spec ++++++ --- /var/tmp/diff_new_pack.Z12863/_old 2007-05-31 21:29:30.000000000 +0200 +++ /var/tmp/diff_new_pack.Z12863/_new 2007-05-31 21:29:30.000000000 +0200 @@ -17,7 +17,7 @@ Obsoletes: gdlib Autoreqprov: on Version: 2.0.34 -Release: 11 +Release: 21 URL: http://www.boutell.com/gd/ Summary: A Drawing Library for Programs That Use PNG and JPEG Output Source: gd-%{version}.tar.bz2 @@ -27,6 +27,7 @@ Patch3: gd-aliasing.patch Patch4: gd-security.patch Patch6: gd-fontpath.patch +Patch7: gd-png-loop-CVE-2007-2756.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build %description @@ -68,6 +69,7 @@ %patch3 %patch4 %patch6 +%patch7 %build %{suse_update_config -f} @@ -136,6 +138,9 @@ %{_libdir}/*.la %changelog +* Tue May 29 2007 - nadvornik(a)suse.cz +- fixed infinite loop on truncated png images + CVE-2007-2756 [#276525] * Thu May 03 2007 - prusnak(a)suse.cz - changed expat to libexpat-devel in Requires of devel subpackage * Tue Feb 20 2007 - nadvornik(a)suse.cz ++++++ gd-png-loop-CVE-2007-2756.patch ++++++ --- gd_png.c 1 Apr 2007 20:41:01 -0000 1.21.2.1 +++ gd_png.c 16 May 2007 19:06:11 -0000 @@ -81,7 +81,11 @@ gdPngErrorHandler (png_structp png_ptr, static void gdPngReadData (png_structp png_ptr, png_bytep data, png_size_t length) { - gdGetBuf (data, length, (gdIOCtx *) png_get_io_ptr (png_ptr)); + int check; + check = gdGetBuf (data, length, (gdIOCtx *) png_get_io_ptr (png_ptr)); + if (check != length) { + png_error(png_ptr, "Read Error: truncated data"); + } } static void ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit yast2-samba-client
by root＠Hilbert.suse.de 31 May '07

31 May '07

Hello community, here is the log from the commit of package yast2-samba-client checked in at Thu May 31 21:29:18 CEST 2007. -------- --- yast2-samba-client/yast2-samba-client.changes 2007-05-17 13:52:00.000000000 +0200 +++ /mounts/work_src_done/NOARCH/yast2-samba-client/yast2-samba-client.changes 2007-05-31 10:26:51.349014000 +0200 @@ -1,0 +2,7 @@ +Wed May 30 09:27:44 CEST 2007 - jsuchome(a)suse.cz + +- added help text for DHCP support (F120090) +- removed Browse button (#240045) +- 2.15.7 + +------------------------------------------------------------------- Old: ---- yast2-samba-client-2.15.6.tar.bz2 New: ---- yast2-samba-client-2.15.7.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-samba-client.spec ++++++ --- /var/tmp/diff_new_pack.M10797/_old 2007-05-31 21:28:47.000000000 +0200 +++ /var/tmp/diff_new_pack.M10797/_new 2007-05-31 21:28:47.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package yast2-samba-client (Version 2.15.6) +# spec file for package yast2-samba-client (Version 2.15.7) # # Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine @@ -11,12 +11,12 @@ # norootforbuild Name: yast2-samba-client -Version: 2.15.6 +Version: 2.15.7 Release: 1 License: GNU General Public License (GPL) Group: System/YaST BuildRoot: %{_tmppath}/%{name}-%{version}-build -Source0: yast2-samba-client-2.15.6.tar.bz2 +Source0: yast2-samba-client-2.15.7.tar.bz2 prefix: /usr BuildRequires: perl-XML-Writer update-desktop-files yast2-devtools yast2-pam yast2-perl-bindings yast2-testsuite Requires: yast2 yast2-kerberos-client @@ -36,7 +36,7 @@ Stanislav Visnovsky <visnov(a)suse.cz> %prep -%setup -n yast2-samba-client-2.15.6 +%setup -n yast2-samba-client-2.15.7 %build %{prefix}/bin/y2tool y2autoconf @@ -74,6 +74,10 @@ %doc %{prefix}/share/doc/packages/yast2-samba-client %changelog +* Wed May 30 2007 - jsuchome(a)suse.cz +- added help text for DHCP support (F120090) +- removed Browse button (#240045) +- 2.15.7 * Thu May 17 2007 - jsuchome(a)suse.cz - fix deleting shares from smb.conf (#264834) - 2.15.6 ++++++ yast2-samba-client-2.15.6.tar.bz2 -> yast2-samba-client-2.15.7.tar.bz2 ++++++ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-samba-client-2.15.6/src/dialogs.ycp new/yast2-samba-client-2.15.7/src/dialogs.ycp --- old/yast2-samba-client-2.15.6/src/dialogs.ycp 2007-03-27 11:34:01.000000000 +0200 +++ new/yast2-samba-client-2.15.7/src/dialogs.ycp 2007-05-31 10:16:54.000000000 +0200 @@ -45,7 +45,9 @@ boolean dhcp_support = Samba::GetDHCP (); // help text, do not translate 'winbind uid', 'winbind gid' - string help_text = _("Specify the range for Samba user and group IDs (<tt>winbind uid</tt> and <tt>winbind gid</tt> values)."); + string help_text = _("Specify the range for Samba user and group IDs (<tt>winbind uid</tt> and <tt>winbind gid</tt> values).") + + + DHCPSupportHelp (); UI::OpenDialog (`opt (`decorated), `HBox ( `HWeight (1, `RichText (`id (`help), help_text)), @@ -213,12 +215,7 @@ `TextEntry(`id(`workgroup), (Stage::cont() ? _("&Domain") : // translators: text entry label - _("&Domain or Workgroup")), Samba::GetWorkgroupOrRealm()), - `VBox ( - `Label(""), - // translators: push button label - `PushButton(`id(`browse), _("Br&owse...")) - ) + _("&Domain or Workgroup")), Samba::GetWorkgroupOrRealm()) ), status_term, winbind_term, @@ -267,9 +264,6 @@ Wizard::HideBackButton(); check_domain_membership (Samba::GetWorkgroupOrRealm()); } - if (Mode::config ()) { - UI::ChangeWidget (`id(`browse), `Enabled, false); - } any ret = nil; while(true) { @@ -436,15 +430,6 @@ ")); } break; - } else if (ret == `browse) { - - string new_workgroup = BrowseNeighbours( Stage::cont() ); - if( new_workgroup != nil && new_workgroup != "" ) { - // fill in the new workgroup name - UI::ChangeWidget( `id(`workgroup), `Value, new_workgroup ); - check_domain_membership (new_workgroup); - } - continue; } else if (ret == `back ) { break; } diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-samba-client-2.15.6/src/helps.ycp new/yast2-samba-client-2.15.7/src/helps.ycp --- old/yast2-samba-client-2.15.6/src/helps.ycp 2006-10-30 16:33:52.000000000 +0100 +++ new/yast2-samba-client-2.15.7/src/helps.ycp 2007-05-30 09:14:53.000000000 +0200 @@ -42,9 +42,7 @@ "MembershipDialog_nocont" : _("<big>Selecting Windows Domain Membership</big>") /* translators: Samba workgroup dialog help 1/3 */ + _("A Linux client can be a member of a workgroup, NT domain, or Active Directory domain. -Here, specify the name of the membership. Browse -presents the list of all workgroups and domains found in the -network. +Here, specify the name of the membership. ") + /* Samba role dialog help 2/3 */ @@ -60,8 +58,7 @@ /* translators: Samba membership dialog help title (installation) */ "MembershipDialog_cont" : _("<big>Selecting Windows Domain Membership</big>") /* translators: Samba membership dialog help 1/2 (installation) */ -+ _("Specify the name of the NT or Active Directory domain. Browse -presents the list of all domains found in the network. ++ _("Specify the name of the NT or Active Directory domain. ") /* translators: Samba membership dialog help 2/2 (installation) */ + _("When you press Next, the system verifies the domain and diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-samba-client-2.15.6/src/routines.ycp new/yast2-samba-client-2.15.7/src/routines.ycp --- old/yast2-samba-client-2.15.6/src/routines.ycp 2007-03-08 11:06:05.000000000 +0100 +++ new/yast2-samba-client-2.15.7/src/routines.ycp 2007-05-31 10:14:13.000000000 +0200 @@ -168,57 +168,8 @@ if (!res) { return `nojoin; } - return JoinDomain(workgroup); } - - -/** - * Show a selection popup to select a workgroup from the ones existing on LAN. - * - * @return string chosen workgroup or nil if cancelled - */ -define string BrowseNeighbours(boolean domains_only) ``{ - list<string> groups = nil; - - UI::OpenDialog ( - // popup window - `Label (_("Looking for available workgroups and domains..."))); - - UI::BusyCursor (); - - if (domains_only) { - groups = SambaNmbLookup::GetAvailableDomains(); - } else { - groups = SambaNmbLookup::GetAvailableNeighbours(_(" (Domain)")); - } - - UI::CloseDialog (); - if( groups == nil ) return nil; - groups = filter (string group, groups, ``(size (group) > 0)); - - // let the user choose a workgroup - UI::OpenDialog( `VBox( - `HSpacing (36), - // translators: selection box label - `SelectionBox(`id(`selection), (domains_only ? _("&Existing Domains") : _("&Existing Neighbours")), groups), - `HBox( - `PushButton( `id(`ok), Label::OKButton() ), - `PushButton( `id(`cancel), Label::CancelButton() ) - ) - ) ); - - any ret = UI::UserInput(); - string sel = (string) UI::QueryWidget( `id(`selection), `CurrentItem ); - // textentry constant (automatically added to some kind of values) - if ( sel != nil && issubstring (sel, _(" (Domain)") ) ) - { - integer pos = search (sel, _(" (Domain)") ); - sel = (pos == nil) ? sel : substring (sel, 0, pos); - } - UI::CloseDialog(); - return ret == `ok ? sel : nil; -} /** @@ -281,6 +232,15 @@ } /** + * return the help text for DHCP support + */ +define string DHCPSupportHelp () { + + // help text ("Retrieve WINS server via DHCP" is a checkbox label) + return _("Check Retrieve WINS server via DHCP to use a WINS server provided by DHCP."); +} + +/** * return the term with shares settings * @param settings map with parameters to show in term */ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-samba-client-2.15.6/src/SambaConfig.pm new/yast2-samba-client-2.15.7/src/SambaConfig.pm --- old/yast2-samba-client-2.15.6/src/SambaConfig.pm 2007-05-17 13:20:01.000000000 +0200 +++ new/yast2-samba-client-2.15.7/src/SambaConfig.pm 2007-05-17 13:51:13.000000000 +0200 @@ -4,7 +4,7 @@ # Summary: Manage samba configuration data (smb.conf). # Authors: Martin Lazar <mlazar(a)suse.cz> # -# $Id: SambaConfig.pm 36773 2007-03-08 10:06:02Z jsuchome $ +# $Id: SambaConfig.pm 38016 2007-05-17 11:52:37Z jsuchome $ # # Functions for acess to samba configuration file. It provide # unified acces to configuration keys including aliases and other diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-samba-client-2.15.6/src/SambaNmbLookup.pm new/yast2-samba-client-2.15.7/src/SambaNmbLookup.pm --- old/yast2-samba-client-2.15.6/src/SambaNmbLookup.pm 2006-03-08 10:11:31.000000000 +0100 +++ new/yast2-samba-client-2.15.7/src/SambaNmbLookup.pm 2007-05-31 10:15:57.000000000 +0200 @@ -207,29 +207,4 @@ return FALSE; } -# Return a list of workgroups and domains already existing in the lan. -# @return list<string> of found workgroups/domains -BEGIN{$TYPEINFO{GetAvailableNeighbours}=["function",["list", "string"], "string"]} -sub GetAvailableNeighbours { - my ($self, $domain_suffix) = @_; - $domain_suffix = "" unless $domain_suffix; - - checkNmbstatus(); - - # TODO: inform user about problems - return [ map {$_ . ($self->IsDomain($_)?$domain_suffix:"")} sort keys %Nmbstatus_output ]; -} - -# Return a list of domains already existing in the lan. -# @return list<string> of found workgroups/domains -BEGIN{$TYPEINFO{GetAvailableDomains}=["function",["list", "string"]]} -sub GetAvailableDomains { - my ($self) = @_; - - checkNmbstatus(); - - # TODO: inform user about problems - return [ grep {$self->IsDomain($_)} sort keys %Nmbstatus_output ]; -} - 8; diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-samba-client-2.15.6/VERSION new/yast2-samba-client-2.15.7/VERSION --- old/yast2-samba-client-2.15.6/VERSION 2007-05-17 13:44:44.000000000 +0200 +++ new/yast2-samba-client-2.15.7/VERSION 2007-05-30 09:28:58.000000000 +0200 @@ -1 +1 @@ -2.15.6 +2.15.7 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit update-desktop-files
by root＠Hilbert.suse.de 31 May '07

31 May '07

Hello community, here is the log from the commit of package update-desktop-files checked in at Thu May 31 21:28:41 CEST 2007. -------- --- update-desktop-files/update-desktop-files.changes 2007-05-21 17:48:46.000000000 +0200 +++ /mounts/work_src_done/NOARCH/update-desktop-files/update-desktop-files.changes 2007-05-29 12:18:15.276086000 +0200 @@ -1,0 +2,10 @@ +Tue May 29 12:18:07 CEST 2007 - coolo(a)suse.de + +- fix rpmlint problems + +------------------------------------------------------------------- +Mon May 28 12:29:30 CEST 2007 - coolo(a)suse.de + +- remove the requires for desktop-file-validate too + +------------------------------------------------------------------- Old: ---- map-desktop-category-pre-10.1.diff ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ update-desktop-files.spec ++++++ --- /var/tmp/diff_new_pack.VY8006/_old 2007-05-31 21:28:31.000000000 +0200 +++ /var/tmp/diff_new_pack.VY8006/_new 2007-05-31 21:28:31.000000000 +0200 @@ -12,13 +12,12 @@ Name: update-desktop-files Version: 10.3 -Release: 22 +Release: 25 Summary: A Build Tool to Update Desktop Files License: GNU General Public License (GPL) Group: Development/Tools/Building BuildRoot: %{_tmppath}/%{name}-%{version}-build Requires: desktop-translations = %{version} -Requires: desktop-file-utils Autoreqprov: on Source: suse_update_desktop_file.sh Source1: map-desktop-category.sh @@ -32,7 +31,6 @@ Source7: kappfinder-icons.tar.bz2 Source10: desktop-translations.tar.bz2 Source99: PREPARE_PACKAGE -Patch: map-desktop-category-pre-10.1.diff BuildArchitectures: noarch %description @@ -63,8 +61,10 @@ mkdir %name cd %name +%build + %install -cd %name +pushd %name tar xfj %SOURCE10 cd po for lang in *; do @@ -83,7 +83,8 @@ done fi done -install -m 0644 %SOURCE5 %SOURCE6 %SOURCE3 %SOURCE4 $RPM_BUILD_ROOT/usr/share/%name/ +install -m 0644 %SOURCE5 %SOURCE6 %SOURCE3 $RPM_BUILD_ROOT/usr/share/%name/ +install -m 755 %SOURCE4 $RPM_BUILD_ROOT/usr/share/%name/ mkdir -p $RPM_BUILD_ROOT/usr/share/%name/templates tar xfj %SOURCE2 -C $RPM_BUILD_ROOT/usr/share/%name/templates tar xfj %SOURCE7 -C $RPM_BUILD_ROOT/usr/share/%name/ @@ -93,16 +94,18 @@ cd $RPM_BUILD_ROOT/usr/lib/rpm patch -p0 <%PATCH0 %endif +popd +%find_lang desktop_translations %clean rm -rf $RPM_BUILD_ROOT %files %defattr(-,root,root) -/usr/share/%name +%lang(en) /usr/share/%name /usr/lib/rpm/* -%files -n desktop-translations +%files -f desktop_translations.lang -n desktop-translations %defattr(-,root,root) %if %suse_version <= 1000 %dir /usr/share/locale/km @@ -120,9 +123,12 @@ %dir /usr/share/locale/tt %dir /usr/share/locale/tt/LC_MESSAGES %endif -/usr/share/locale/*/LC_MESSAGES/*mo %changelog +* Tue May 29 2007 - coolo(a)suse.de +- fix rpmlint problems +* Mon May 28 2007 - coolo(a)suse.de +- remove the requires for desktop-file-validate too * Mon May 21 2007 - coolo(a)suse.de - update from SVN to fix a lot of bugs ;( * Tue May 15 2007 - coolo(a)suse.de ++++++ map-desktop-category.sh ++++++ --- update-desktop-files/map-desktop-category.sh 2007-05-10 20:46:25.000000000 +0200 +++ /mounts/work_src_done/NOARCH/update-desktop-files/map-desktop-category.sh 2007-05-29 12:15:24.417091000 +0200 @@ -1,3 +1,4 @@ +#! /bin/sh function mapCategory() { ret="" ++++++ suse_update_desktop_file.sh ++++++ --- update-desktop-files/suse_update_desktop_file.sh 2007-05-15 10:57:27.000000000 +0200 +++ /mounts/work_src_done/NOARCH/update-desktop-files/suse_update_desktop_file.sh 2007-05-29 12:15:04.550976000 +0200 @@ -1,3 +1,5 @@ +#! /bin/sh + # macro: suse_update_desktop_file # # Used to add easily a category to .desktop files according to XDG ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit man-pages
by root＠Hilbert.suse.de 31 May '07

31 May '07

Hello community, here is the log from the commit of package man-pages checked in at Thu May 31 21:28:05 CEST 2007. -------- --- AUTO/noarch/man-pages/man-pages.changes 2006-12-01 08:40:08.000000000 +0100 +++ /mounts/work_src_done/NOARCH/man-pages/man-pages.changes 2007-05-31 11:05:47.000000000 +0200 @@ -1,0 +2,6 @@ +Thu May 31 10:58:59 CEST 2007 - pgajdos(a)suse.cz + +- workaround in spec file: remove deprecated + man1p/ipcs.1p [#274338] + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ man-pages.spec ++++++ --- /var/tmp/diff_new_pack.go5249/_old 2007-05-31 21:27:52.000000000 +0200 +++ /var/tmp/diff_new_pack.go5249/_new 2007-05-31 21:27:52.000000000 +0200 @@ -1,7 +1,7 @@ # -# spec file for package man-pages (Version 2.36) +# spec file for package man-pages (Version 2.43) # -# Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2007 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. # @@ -12,11 +12,11 @@ Name: man-pages URL: ftp://ftp.win.tue.nl/pub/linux-local/manpages/ -License: BSD, GPL +License: BSD License and BSD-like, GNU General Public License (GPL), All man-pages are freely distributable if nroff source is included. Group: Documentation/Man Autoreqprov: on Version: 2.43 -Release: 2 +Release: 20 Summary: Linux and POSIX Manual Pages BuildRoot: %{_tmppath}/%{name}-%{version}-build Source: man-pages-%{version}.tar.bz2 @@ -76,6 +76,8 @@ if [ $RETVAL -ne 0 ] ; then exit $RETVAL fi +#remove deprecated man page [#247338]; FIXME as soon as upstream remove it +rm -f $RPM_BUILD_ROOT%{_mandir}/man1p/ipcs.1p %clean rm -rf $RPM_BUILD_ROOT @@ -90,7 +92,24 @@ %doc man-pages-*.Announce %doc man-pages-*.lsm -%changelog -n man-pages +%changelog +* Thu May 31 2007 - pgajdos(a)suse.cz +- workaround in spec file: remove deprecated + man1p/ipcs.1p [#274338] +* Fri Dec 01 2006 - kukuk(a)suse.de +- Auto-Update to version 2.43 +* Sat Nov 25 2006 - kukuk(a)suse.de +- Auto-Update to version 2.42 +* Sat Oct 14 2006 - kukuk(a)suse.de +- Auto-Update to version 2.41 +* Wed Oct 11 2006 - kukuk(a)suse.de +- Auto-Update to version 2.40 +* Sun Aug 06 2006 - kukuk(a)suse.de +- Auto-Update to version 2.39 +* Fri Aug 04 2006 - kukuk(a)suse.de +- Auto-Update to version 2.38 +* Thu Aug 03 2006 - kukuk(a)suse.de +- Auto-Update to version 2.37 * Thu Jul 27 2006 - kukuk(a)suse.de - Remove nscd.conf(5) patch, is now upstream * Mon Jul 17 2006 - kukuk(a)suse.de @@ -104,8 +123,8 @@ - Auto-Update to version 2.33 * Wed May 17 2006 - kukuk(a)suse.de - Update to version 2.32 -- document all *at() functions -- lot of small corrections about error handling in various places + - document all *at() functions + - lot of small corrections about error handling in various places * Mon Apr 24 2006 - kukuk(a)suse.de - Auto-Update to version 2.29 * Sat Mar 25 2006 - autobuild(a)suse.de @@ -114,7 +133,7 @@ - Auto-Update to version 2.26 * Fri Mar 03 2006 - kukuk(a)suse.de - Update to version 2.25 -- New pages describing POSIX message queue API + - New pages describing POSIX message queue API * Tue Feb 14 2006 - kukuk(a)suse.de - Update to version 2.23 * Tue Jan 31 2006 - kukuk(a)suse.de ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit apparmor-profiles
by root＠Hilbert.suse.de 31 May '07

31 May '07

Hello community, here is the log from the commit of package apparmor-profiles checked in at Thu May 31 21:27:39 CEST 2007. -------- --- apparmor-profiles/apparmor-profiles.changes 2007-05-29 20:39:58.000000000 +0200 +++ /mounts/work_src_done/NOARCH/apparmor-profiles/apparmor-profiles.changes 2007-05-30 19:31:07.923441000 +0200 @@ -1,0 +2,5 @@ +Wed May 30 19:30:38 CEST 2007 - srarnold(a)suse.de + +- Really check in Marius's update to syslog-ng. + +------------------------------------------------------------------- Old: ---- apparmor-profiles-2.0.2-702.tar.gz New: ---- apparmor-profiles-2.0.2-704.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ apparmor-profiles.spec ++++++ --- /var/tmp/diff_new_pack.gc4065/_old 2007-05-31 21:27:27.000000000 +0200 +++ /var/tmp/diff_new_pack.gc4065/_new 2007-05-31 21:27:27.000000000 +0200 @@ -16,9 +16,9 @@ %endif Summary: AppArmor profiles that are loaded into the apparmor kernel module Version: 2.0.2 -Release: 15 +Release: 17 Group: Productivity/Security -Source0: %{name}-%{version}-702.tar.gz +Source0: %{name}-%{version}-704.tar.gz License: GNU General Public License (GPL) BuildRoot: %{_tmppath}/%{name}-%{version}-build URL: http://forge.novell.com/modules/xfmod/project/?apparmor @@ -76,6 +76,8 @@ %preun %changelog +* Wed May 30 2007 - srarnold(a)suse.de +- Really check in Marius's update to syslog-ng. * Tue May 29 2007 - srarnold(a)suse.de - small update from Marius Tomaschewski for syslog-ng * Fri May 25 2007 - srarnold(a)suse.de ++++++ apparmor-profiles-2.0.2-702.tar.gz -> apparmor-profiles-2.0.2-704.tar.gz ++++++ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/apparmor-profiles-2.0.2/apparmor.d/sbin.syslog-ng new/apparmor-profiles-2.0.2/apparmor.d/sbin.syslog-ng --- old/apparmor-profiles-2.0.2/apparmor.d/sbin.syslog-ng 2007-04-11 01:05:33.000000000 +0200 +++ new/apparmor-profiles-2.0.2/apparmor.d/sbin.syslog-ng 2007-05-29 20:28:38.000000000 +0200 @@ -23,7 +23,7 @@ capability fowner, /dev/log w, - /dev/tty10 w, + /dev/tty10 rw, /dev/xconsole rw, /etc/syslog-ng/* r, /sbin/syslog-ng mr, diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/apparmor-profiles-2.0.2/apparmor-profiles.spec new/apparmor-profiles-2.0.2/apparmor-profiles.spec --- old/apparmor-profiles-2.0.2/apparmor-profiles.spec 2007-05-29 20:30:16.000000000 +0200 +++ new/apparmor-profiles-2.0.2/apparmor-profiles.spec 2007-05-30 19:09:09.000000000 +0200 @@ -24,9 +24,9 @@ Summary: AppArmor profiles Name: apparmor-profiles Version: 2.0.2 -Release: 702 +Release: 704 Group: Productivity/Security -Source0: %{name}-%{version}-702.tar.gz +Source0: %{name}-%{version}-704.tar.gz License: GPL BuildRoot: %{?_tmppath:}%{!?_tmppath:/var/tmp}/%{name}-%{version}-build Url: http://forge.novell.com/modules/xfmod/project/?apparmor ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit kernel-source
by root＠Hilbert.suse.de 31 May '07

31 May '07

Hello community, here is the log from the commit of package kernel-source checked in at Thu May 31 21:26:43 CEST 2007. -------- --- kernel-source/kernel-bigsmp.changes 2007-05-25 18:14:27.000000000 +0200 +++ /mounts/work_src_done/STABLE/kernel-source/kernel-bigsmp.changes 2007-05-27 18:40:11.000000000 +0200 @@ -1,0 +2,117 @@ +Sun May 27 18:26:47 CEST 2007 - bwalle(a)suse.de + +- Update config files: enable MMC_TIFM_SD=m, TIFM_7XX1=m nad + TIFM_CORE. + +------------------------------------------------------------------- +Sat May 26 13:57:18 CEST 2007 - bwalle(a)suse.de + +- config/i386/{bigsmp,debug,default,vanilla}, + config/x86_64/{default,debug,vanilla}: + enable CONFIG_RELOCATABLE=y + +------------------------------------------------------------------- +Sat May 26 11:39:20 CEST 2007 - schwab(a)suse.de + +- Remove obsolete patch ppc-ps3-gelic_2621.patch. + +------------------------------------------------------------------- +Sat May 26 10:55:23 CEST 2007 - schwab(a)suse.de + +- s2io-longlong: Avoid switch on long long. + +------------------------------------------------------------------- +Sat May 26 10:41:21 CEST 2007 - schwab(a)suse.de + +- Reenable macintosh drivers. + +------------------------------------------------------------------- +Sat May 26 06:44:43 CEST 2007 - gregkh(a)suse.de + +- patch tree refresh for fuzz cleanups due to new kernel version. + +------------------------------------------------------------------- +Sat May 26 06:38:55 CEST 2007 - gregkh(a)suse.de + +- Fix up the vanilla config files + +------------------------------------------------------------------- +Sat May 26 01:02:43 CEST 2007 - schwab(a)suse.de + +- Update kdb patches. + +------------------------------------------------------------------- +Sat May 26 00:45:55 CEST 2007 - schwab(a)suse.de + +- Update mol patches. + +------------------------------------------------------------------- +Sat May 26 00:41:14 CEST 2007 - schwab(a)suse.de + +- ppc-efika-of_device-generic-uevent.patch: remove obsolete stuff. + +------------------------------------------------------------------- +Sat May 26 00:00:43 CEST 2007 - jeffm(a)suse.de + +- patches.apparmor/remove_suid_new_case_in_2.6.22.diff: Merge fix. + +------------------------------------------------------------------- +Fri May 25 22:54:45 CEST 2007 - jeffm(a)suse.de + +- Updated to 2.6.22-rc2-git7: + - Removed due to upstream inclusion: + - patches.arch/ppc-generic-check_legacy_ioport.patch + - patches.arch/ppc-pci-hostbridge-window.patch + - patches.arch/ppc-macio-modalias.patch + - patches.arch/ppc-pegasos-via-ide-irq-quirk.patch + - patches.arch/ppc-ps3-allow-duplicate-lmb_reserve.diff + - patches.arch/ppc-ps3-automatically-lmb_reserve-initrd.diff + - patches.arch/ppc-ps3-ps3fb.patch + - patches.arch/ppc-spufs.patch + - patches.arch/ppc-ps3-ps3-fix-slowdown-bug.patch + - patches.arch/acpi_ibm_notify.patch + - patches.arch/ppc-of_device-modalias.patch + - patches.drivers/libata-hardreset-on-SERR_INTERNAL + - patches.drivers/cciss-add-SG_IO + - patches.drivers/ati-rs400_200-480-disable-msi + - patches.fixes/maybe_unused.patch + - patches.fixes/nfs-readdir-timestamp + - patches.fixes/dm_check_device_area.diff + - patches.rpmify/build-timestamp + - patches.suse/add-IV-generation-method-null-to-dm-crypt + - patches.suse/ams-silent-failure.patch + - patches.xen/pmd-shared.patch + - patches.xen/allow-i386-crash-kernels-to-handle-x86_64-dumps.patch + - patches.apparmor/proc_setattr.diff + - patches.apparmor/proc_sys_setattr.diff + - Adjusted context: + - patches.arch/ppc-efika-bestcomm-ethernet.patch + - patches.arch/ppc-efika-of_device-generic-uevent.patch + - patches.drivers/libata-ata_piix-vmw-ign-DMA-err + - patches.fixes/tiocgdev + - patches.kernel.org/patch-2.6.22-rc2 + - patches.kernel.org/patch-2.6.22-rc2-git7 + - patches.rpmify/buildhost + - patches.suse/suse-ppc32-mol-kbuild.patch + - patches.suse/kdb-i386 + - patches.suse/acpi-hotkeys-extra.diff + - patches.suse/bootsplash + - patches.suse/kdb-common + - patches.suse/kdb-ia64 + - patches.suse/scsi-error-test-unit-ready-timeout + - patches.suse/supported-flag + - patches.suse/netfilter-ipt_LOG-mac + - patches.xen/net-csum.patch + - patches.xen/softlockup-no-idle-hz.patch + - rpm/kernel-binary.spec.in + - patches.apparmor/remove_suid.diff + - patches.apparmor/security-xattr-file.diff + - patches.apparmor/vfs-getxattr.diff + - patches.apparmor/vfs-listxattr.diff + - patches.apparmor/vfs-notify_change.diff + - Update config files. + - patches.apparmor/remove_suid_new_case_in_2.6.22.diff: apparmor: + work around new should_remove_suid() case. + - Disabled Xen until patchset can be merged. + +------------------------------------------------------------------- kernel-debug.changes: same change kernel-default.changes: same change kernel-dummy.changes: same change kernel-kdump.changes: same change kernel-ppc64.changes: same change kernel-s390.changes: same change kernel-source.changes: same change kernel-syms.changes: same change kernel-um.changes: same change kernel-vanilla.changes: same change kernel-xen.changes: same change kernel-xenpae.changes: same change New: ---- needed_space_in_mb ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kernel-bigsmp.spec ++++++ --- /var/tmp/diff_new_pack.Km8312/_old 2007-05-31 21:23:54.000000000 +0200 +++ /var/tmp/diff_new_pack.Km8312/_new 2007-05-31 21:23:54.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package kernel-bigsmp (Version 2.6.21) +# spec file for package kernel-bigsmp (Version 2.6.22_rc2_git7) # # Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine @@ -38,8 +38,8 @@ %define build_vanilla 1 %endif Summary: Kernel with PAE Support -Version: 2.6.21 -Release: 11 +Version: 2.6.22_rc2_git7 +Release: 1 License: GNU General Public License (GPL) Group: System/Kernel Autoreqprov: on @@ -83,7 +83,7 @@ #Conflicts: kernel %else %if ! %build_xen -Provides: kernel = 2.6.21-%source_rel +Provides: kernel = 2.6.22_rc2_git7-%source_rel %endif %endif Provides: k_smp4G @@ -156,12 +156,12 @@ -Source Timestamp: 2007/05/25 16:12:26 UTC +Source Timestamp: 2007/05/27 16:27:23 UTC %prep if ! [ -e %_sourcedir/linux-2.6.21.tar.bz2 ]; then - echo "The kernel-bigsmp-2.6.21.nosrc.rpm package does not contain the" \ - "complete sources. Please install kernel-source-2.6.21.src.rpm." + echo "The kernel-bigsmp-2.6.22_rc2_git7.nosrc.rpm package does not contain the" \ + "complete sources. Please install kernel-source-2.6.22_rc2_git7.src.rpm." exit 1 fi echo "Architecture symbol(s):" %symbols @@ -255,7 +255,7 @@ cat > .kernel-binary.spec.buildenv <<EOF # Override the timestamp 'uname -v' reports with the build # timestamp. -export BUILD_TIMESTAMP="$(head -n 1 %_sourcedir/build-source-timestamp)" +export KBUILD_BUILD_TIMESTAMP="$(head -n 1 %_sourcedir/build-source-timestamp)" # The following branch/timestamp will end up in Oopses. export OOPS_TIMESTAMP="$( echo -n $(sed -ne 's/^CVS Branch: $.*$/\1-/p' \ @@ -511,6 +511,87 @@ %files -f kernel.files %changelog +* Sun May 27 2007 - bwalle(a)suse.de +- Update config files: enable MMC_TIFM_SD=m, TIFM_7XX1=m nad + TIFM_CORE. +* Sat May 26 2007 - bwalle(a)suse.de +- config/i386/{bigsmp,debug,default,vanilla}, + config/x86_64/{default,debug,vanilla}: + enable CONFIG_RELOCATABLE=y +* Sat May 26 2007 - schwab(a)suse.de +- Remove obsolete patch ppc-ps3-gelic_2621.patch. +* Sat May 26 2007 - schwab(a)suse.de +- s2io-longlong: Avoid switch on long long. +* Sat May 26 2007 - schwab(a)suse.de +- Reenable macintosh drivers. +* Sat May 26 2007 - gregkh(a)suse.de +- patch tree refresh for fuzz cleanups due to new kernel version. +* Sat May 26 2007 - gregkh(a)suse.de +- Fix up the vanilla config files +* Sat May 26 2007 - schwab(a)suse.de +- Update kdb patches. +* Sat May 26 2007 - schwab(a)suse.de +- Update mol patches. +* Sat May 26 2007 - schwab(a)suse.de +- ppc-efika-of_device-generic-uevent.patch: remove obsolete stuff. +* Sat May 26 2007 - jeffm(a)suse.de +- patches.apparmor/remove_suid_new_case_in_2.6.22.diff: Merge fix. +* Fri May 25 2007 - jeffm(a)suse.de +- Updated to 2.6.22-rc2-git7: + - Removed due to upstream inclusion: + - patches.arch/ppc-generic-check_legacy_ioport.patch + - patches.arch/ppc-pci-hostbridge-window.patch + - patches.arch/ppc-macio-modalias.patch + - patches.arch/ppc-pegasos-via-ide-irq-quirk.patch + - patches.arch/ppc-ps3-allow-duplicate-lmb_reserve.diff + - patches.arch/ppc-ps3-automatically-lmb_reserve-initrd.diff + - patches.arch/ppc-ps3-ps3fb.patch + - patches.arch/ppc-spufs.patch + - patches.arch/ppc-ps3-ps3-fix-slowdown-bug.patch + - patches.arch/acpi_ibm_notify.patch + - patches.arch/ppc-of_device-modalias.patch + - patches.drivers/libata-hardreset-on-SERR_INTERNAL + - patches.drivers/cciss-add-SG_IO + - patches.drivers/ati-rs400_200-480-disable-msi + - patches.fixes/maybe_unused.patch + - patches.fixes/nfs-readdir-timestamp + - patches.fixes/dm_check_device_area.diff + - patches.rpmify/build-timestamp + - patches.suse/add-IV-generation-method-null-to-dm-crypt + - patches.suse/ams-silent-failure.patch + - patches.xen/pmd-shared.patch + - patches.xen/allow-i386-crash-kernels-to-handle-x86_64-dumps.patch + - patches.apparmor/proc_setattr.diff + - patches.apparmor/proc_sys_setattr.diff + - Adjusted context: + - patches.arch/ppc-efika-bestcomm-ethernet.patch + - patches.arch/ppc-efika-of_device-generic-uevent.patch + - patches.drivers/libata-ata_piix-vmw-ign-DMA-err + - patches.fixes/tiocgdev + - patches.kernel.org/patch-2.6.22-rc2 + - patches.kernel.org/patch-2.6.22-rc2-git7 + - patches.rpmify/buildhost + - patches.suse/suse-ppc32-mol-kbuild.patch + - patches.suse/kdb-i386 + - patches.suse/acpi-hotkeys-extra.diff + - patches.suse/bootsplash + - patches.suse/kdb-common + - patches.suse/kdb-ia64 + - patches.suse/scsi-error-test-unit-ready-timeout + - patches.suse/supported-flag + - patches.suse/netfilter-ipt_LOG-mac + - patches.xen/net-csum.patch + - patches.xen/softlockup-no-idle-hz.patch + - rpm/kernel-binary.spec.in + - patches.apparmor/remove_suid.diff + - patches.apparmor/security-xattr-file.diff + - patches.apparmor/vfs-getxattr.diff + - patches.apparmor/vfs-listxattr.diff + - patches.apparmor/vfs-notify_change.diff + - Update config files. + - patches.apparmor/remove_suid_new_case_in_2.6.22.diff: apparmor: + work around new should_remove_suid() case. + - Disabled Xen until patchset can be merged. * Fri May 25 2007 - olh(a)suse.de - update ps3 patches new storage driver provides /dev/ps3da instead of /dev/sda ++++++ kernel-debug.spec ++++++ --- /var/tmp/diff_new_pack.Km8312/_old 2007-05-31 21:23:54.000000000 +0200 +++ /var/tmp/diff_new_pack.Km8312/_new 2007-05-31 21:23:54.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package kernel-debug (Version 2.6.21) +# spec file for package kernel-debug (Version 2.6.22_rc2_git7) # # Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine @@ -38,8 +38,8 @@ %define build_vanilla 1 %endif Summary: A Debug Version of the Kernel -Version: 2.6.21 -Release: 11 +Version: 2.6.22_rc2_git7 +Release: 1 License: GNU General Public License (GPL) Group: System/Kernel Autoreqprov: on @@ -83,7 +83,7 @@ #Conflicts: kernel %else %if ! %build_xen -Provides: kernel = 2.6.21-%source_rel +Provides: kernel = 2.6.22_rc2_git7-%source_rel %endif %endif %ifarch %ix86 @@ -161,12 +161,12 @@ -Source Timestamp: 2007/05/25 16:12:26 UTC +Source Timestamp: 2007/05/27 16:27:23 UTC %prep if ! [ -e %_sourcedir/linux-2.6.21.tar.bz2 ]; then - echo "The kernel-debug-2.6.21.nosrc.rpm package does not contain the" \ - "complete sources. Please install kernel-source-2.6.21.src.rpm." + echo "The kernel-debug-2.6.22_rc2_git7.nosrc.rpm package does not contain the" \ + "complete sources. Please install kernel-source-2.6.22_rc2_git7.src.rpm." exit 1 fi echo "Architecture symbol(s):" %symbols @@ -260,7 +260,7 @@ cat > .kernel-binary.spec.buildenv <<EOF # Override the timestamp 'uname -v' reports with the build # timestamp. -export BUILD_TIMESTAMP="$(head -n 1 %_sourcedir/build-source-timestamp)" +export KBUILD_BUILD_TIMESTAMP="$(head -n 1 %_sourcedir/build-source-timestamp)" # The following branch/timestamp will end up in Oopses. export OOPS_TIMESTAMP="$( echo -n $(sed -ne 's/^CVS Branch: $.*$/\1-/p' \ @@ -516,6 +516,87 @@ %files -f kernel.files %changelog +* Sun May 27 2007 - bwalle(a)suse.de +- Update config files: enable MMC_TIFM_SD=m, TIFM_7XX1=m nad + TIFM_CORE. +* Sat May 26 2007 - bwalle(a)suse.de +- config/i386/{bigsmp,debug,default,vanilla}, + config/x86_64/{default,debug,vanilla}: + enable CONFIG_RELOCATABLE=y +* Sat May 26 2007 - schwab(a)suse.de +- Remove obsolete patch ppc-ps3-gelic_2621.patch. +* Sat May 26 2007 - schwab(a)suse.de +- s2io-longlong: Avoid switch on long long. +* Sat May 26 2007 - schwab(a)suse.de +- Reenable macintosh drivers. +* Sat May 26 2007 - gregkh(a)suse.de +- patch tree refresh for fuzz cleanups due to new kernel version. +* Sat May 26 2007 - gregkh(a)suse.de +- Fix up the vanilla config files +* Sat May 26 2007 - schwab(a)suse.de +- Update kdb patches. +* Sat May 26 2007 - schwab(a)suse.de +- Update mol patches. +* Sat May 26 2007 - schwab(a)suse.de +- ppc-efika-of_device-generic-uevent.patch: remove obsolete stuff. +* Sat May 26 2007 - jeffm(a)suse.de +- patches.apparmor/remove_suid_new_case_in_2.6.22.diff: Merge fix. +* Fri May 25 2007 - jeffm(a)suse.de +- Updated to 2.6.22-rc2-git7: + - Removed due to upstream inclusion: + - patches.arch/ppc-generic-check_legacy_ioport.patch + - patches.arch/ppc-pci-hostbridge-window.patch + - patches.arch/ppc-macio-modalias.patch + - patches.arch/ppc-pegasos-via-ide-irq-quirk.patch + - patches.arch/ppc-ps3-allow-duplicate-lmb_reserve.diff + - patches.arch/ppc-ps3-automatically-lmb_reserve-initrd.diff + - patches.arch/ppc-ps3-ps3fb.patch + - patches.arch/ppc-spufs.patch + - patches.arch/ppc-ps3-ps3-fix-slowdown-bug.patch + - patches.arch/acpi_ibm_notify.patch + - patches.arch/ppc-of_device-modalias.patch + - patches.drivers/libata-hardreset-on-SERR_INTERNAL + - patches.drivers/cciss-add-SG_IO + - patches.drivers/ati-rs400_200-480-disable-msi + - patches.fixes/maybe_unused.patch + - patches.fixes/nfs-readdir-timestamp + - patches.fixes/dm_check_device_area.diff + - patches.rpmify/build-timestamp + - patches.suse/add-IV-generation-method-null-to-dm-crypt + - patches.suse/ams-silent-failure.patch + - patches.xen/pmd-shared.patch + - patches.xen/allow-i386-crash-kernels-to-handle-x86_64-dumps.patch + - patches.apparmor/proc_setattr.diff + - patches.apparmor/proc_sys_setattr.diff + - Adjusted context: + - patches.arch/ppc-efika-bestcomm-ethernet.patch + - patches.arch/ppc-efika-of_device-generic-uevent.patch + - patches.drivers/libata-ata_piix-vmw-ign-DMA-err + - patches.fixes/tiocgdev + - patches.kernel.org/patch-2.6.22-rc2 + - patches.kernel.org/patch-2.6.22-rc2-git7 + - patches.rpmify/buildhost + - patches.suse/suse-ppc32-mol-kbuild.patch + - patches.suse/kdb-i386 + - patches.suse/acpi-hotkeys-extra.diff + - patches.suse/bootsplash + - patches.suse/kdb-common + - patches.suse/kdb-ia64 + - patches.suse/scsi-error-test-unit-ready-timeout + - patches.suse/supported-flag + - patches.suse/netfilter-ipt_LOG-mac + - patches.xen/net-csum.patch + - patches.xen/softlockup-no-idle-hz.patch + - rpm/kernel-binary.spec.in + - patches.apparmor/remove_suid.diff + - patches.apparmor/security-xattr-file.diff + - patches.apparmor/vfs-getxattr.diff + - patches.apparmor/vfs-listxattr.diff + - patches.apparmor/vfs-notify_change.diff + - Update config files. + - patches.apparmor/remove_suid_new_case_in_2.6.22.diff: apparmor: + work around new should_remove_suid() case. + - Disabled Xen until patchset can be merged. * Fri May 25 2007 - olh(a)suse.de - update ps3 patches new storage driver provides /dev/ps3da instead of /dev/sda ++++++ kernel-default.spec ++++++ --- /var/tmp/diff_new_pack.Km8312/_old 2007-05-31 21:23:54.000000000 +0200 +++ /var/tmp/diff_new_pack.Km8312/_new 2007-05-31 21:23:54.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package kernel-default (Version 2.6.21) +# spec file for package kernel-default (Version 2.6.22_rc2_git7) # # Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine @@ -38,8 +38,8 @@ %define build_vanilla 1 %endif Summary: The Standard Kernel for both Uniprocessor and Multiprocessor Systems -Version: 2.6.21 -Release: 11 +Version: 2.6.22_rc2_git7 +Release: 1 License: GNU General Public License (GPL) Group: System/Kernel Autoreqprov: on @@ -83,7 +83,7 @@ #Conflicts: kernel %else %if ! %build_xen -Provides: kernel = 2.6.21-%source_rel +Provides: kernel = 2.6.22_rc2_git7-%source_rel %endif %endif %ifarch alpha @@ -182,12 +182,12 @@ -Source Timestamp: 2007/05/25 16:12:26 UTC +Source Timestamp: 2007/05/27 16:27:23 UTC %prep if ! [ -e %_sourcedir/linux-2.6.21.tar.bz2 ]; then - echo "The kernel-default-2.6.21.nosrc.rpm package does not contain the" \ - "complete sources. Please install kernel-source-2.6.21.src.rpm." + echo "The kernel-default-2.6.22_rc2_git7.nosrc.rpm package does not contain the" \ + "complete sources. Please install kernel-source-2.6.22_rc2_git7.src.rpm." exit 1 fi echo "Architecture symbol(s):" %symbols @@ -281,7 +281,7 @@ cat > .kernel-binary.spec.buildenv <<EOF # Override the timestamp 'uname -v' reports with the build # timestamp. -export BUILD_TIMESTAMP="$(head -n 1 %_sourcedir/build-source-timestamp)" +export KBUILD_BUILD_TIMESTAMP="$(head -n 1 %_sourcedir/build-source-timestamp)" # The following branch/timestamp will end up in Oopses. export OOPS_TIMESTAMP="$( echo -n $(sed -ne 's/^CVS Branch: $.*$/\1-/p' \ @@ -537,6 +537,87 @@ %files -f kernel.files %changelog +* Sun May 27 2007 - bwalle(a)suse.de +- Update config files: enable MMC_TIFM_SD=m, TIFM_7XX1=m nad + TIFM_CORE. +* Sat May 26 2007 - bwalle(a)suse.de +- config/i386/{bigsmp,debug,default,vanilla}, + config/x86_64/{default,debug,vanilla}: + enable CONFIG_RELOCATABLE=y +* Sat May 26 2007 - schwab(a)suse.de +- Remove obsolete patch ppc-ps3-gelic_2621.patch. +* Sat May 26 2007 - schwab(a)suse.de +- s2io-longlong: Avoid switch on long long. +* Sat May 26 2007 - schwab(a)suse.de +- Reenable macintosh drivers. +* Sat May 26 2007 - gregkh(a)suse.de +- patch tree refresh for fuzz cleanups due to new kernel version. +* Sat May 26 2007 - gregkh(a)suse.de +- Fix up the vanilla config files +* Sat May 26 2007 - schwab(a)suse.de +- Update kdb patches. +* Sat May 26 2007 - schwab(a)suse.de +- Update mol patches. +* Sat May 26 2007 - schwab(a)suse.de +- ppc-efika-of_device-generic-uevent.patch: remove obsolete stuff. +* Sat May 26 2007 - jeffm(a)suse.de +- patches.apparmor/remove_suid_new_case_in_2.6.22.diff: Merge fix. +* Fri May 25 2007 - jeffm(a)suse.de +- Updated to 2.6.22-rc2-git7: + - Removed due to upstream inclusion: + - patches.arch/ppc-generic-check_legacy_ioport.patch + - patches.arch/ppc-pci-hostbridge-window.patch + - patches.arch/ppc-macio-modalias.patch + - patches.arch/ppc-pegasos-via-ide-irq-quirk.patch + - patches.arch/ppc-ps3-allow-duplicate-lmb_reserve.diff + - patches.arch/ppc-ps3-automatically-lmb_reserve-initrd.diff + - patches.arch/ppc-ps3-ps3fb.patch + - patches.arch/ppc-spufs.patch + - patches.arch/ppc-ps3-ps3-fix-slowdown-bug.patch + - patches.arch/acpi_ibm_notify.patch + - patches.arch/ppc-of_device-modalias.patch + - patches.drivers/libata-hardreset-on-SERR_INTERNAL + - patches.drivers/cciss-add-SG_IO + - patches.drivers/ati-rs400_200-480-disable-msi + - patches.fixes/maybe_unused.patch + - patches.fixes/nfs-readdir-timestamp + - patches.fixes/dm_check_device_area.diff + - patches.rpmify/build-timestamp + - patches.suse/add-IV-generation-method-null-to-dm-crypt + - patches.suse/ams-silent-failure.patch + - patches.xen/pmd-shared.patch + - patches.xen/allow-i386-crash-kernels-to-handle-x86_64-dumps.patch + - patches.apparmor/proc_setattr.diff + - patches.apparmor/proc_sys_setattr.diff + - Adjusted context: + - patches.arch/ppc-efika-bestcomm-ethernet.patch + - patches.arch/ppc-efika-of_device-generic-uevent.patch + - patches.drivers/libata-ata_piix-vmw-ign-DMA-err + - patches.fixes/tiocgdev + - patches.kernel.org/patch-2.6.22-rc2 + - patches.kernel.org/patch-2.6.22-rc2-git7 + - patches.rpmify/buildhost + - patches.suse/suse-ppc32-mol-kbuild.patch + - patches.suse/kdb-i386 + - patches.suse/acpi-hotkeys-extra.diff + - patches.suse/bootsplash + - patches.suse/kdb-common + - patches.suse/kdb-ia64 + - patches.suse/scsi-error-test-unit-ready-timeout + - patches.suse/supported-flag + - patches.suse/netfilter-ipt_LOG-mac + - patches.xen/net-csum.patch + - patches.xen/softlockup-no-idle-hz.patch + - rpm/kernel-binary.spec.in + - patches.apparmor/remove_suid.diff + - patches.apparmor/security-xattr-file.diff + - patches.apparmor/vfs-getxattr.diff + - patches.apparmor/vfs-listxattr.diff + - patches.apparmor/vfs-notify_change.diff + - Update config files. + - patches.apparmor/remove_suid_new_case_in_2.6.22.diff: apparmor: + work around new should_remove_suid() case. + - Disabled Xen until patchset can be merged. * Fri May 25 2007 - olh(a)suse.de - update ps3 patches new storage driver provides /dev/ps3da instead of /dev/sda ++++++ kernel-dummy.spec ++++++ --- /var/tmp/diff_new_pack.Km8312/_old 2007-05-31 21:23:54.000000000 +0200 +++ /var/tmp/diff_new_pack.Km8312/_new 2007-05-31 21:23:54.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package kernel-dummy (Version 2.6.21) +# spec file for package kernel-dummy (Version 2.6.22_rc2_git7) # # Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine @@ -14,8 +14,8 @@ Name: kernel-dummy URL: http://www.kernel.org/ Summary: Internal dummy package for synchronizing release numbers -Version: 2.6.21 -Release: 11 +Version: 2.6.22_rc2_git7 +Release: 1 License: GNU General Public License (GPL) Group: System/Kernel Autoreqprov: off @@ -28,7 +28,7 @@ -------- Andreas Gruenbacher <agruen(a)suse.de> -Source Timestamp: 2007/05/25 16:12:26 UTC +Source Timestamp: 2007/05/27 16:27:23 UTC %install @@ -41,6 +41,87 @@ /etc/dummy %changelog +* Sun May 27 2007 - bwalle(a)suse.de +- Update config files: enable MMC_TIFM_SD=m, TIFM_7XX1=m nad + TIFM_CORE. +* Sat May 26 2007 - bwalle(a)suse.de +- config/i386/{bigsmp,debug,default,vanilla}, + config/x86_64/{default,debug,vanilla}: + enable CONFIG_RELOCATABLE=y +* Sat May 26 2007 - schwab(a)suse.de +- Remove obsolete patch ppc-ps3-gelic_2621.patch. +* Sat May 26 2007 - schwab(a)suse.de +- s2io-longlong: Avoid switch on long long. +* Sat May 26 2007 - schwab(a)suse.de +- Reenable macintosh drivers. +* Sat May 26 2007 - gregkh(a)suse.de +- patch tree refresh for fuzz cleanups due to new kernel version. +* Sat May 26 2007 - gregkh(a)suse.de +- Fix up the vanilla config files +* Sat May 26 2007 - schwab(a)suse.de +- Update kdb patches. +* Sat May 26 2007 - schwab(a)suse.de +- Update mol patches. +* Sat May 26 2007 - schwab(a)suse.de +- ppc-efika-of_device-generic-uevent.patch: remove obsolete stuff. +* Sat May 26 2007 - jeffm(a)suse.de +- patches.apparmor/remove_suid_new_case_in_2.6.22.diff: Merge fix. +* Fri May 25 2007 - jeffm(a)suse.de +- Updated to 2.6.22-rc2-git7: + - Removed due to upstream inclusion: + - patches.arch/ppc-generic-check_legacy_ioport.patch + - patches.arch/ppc-pci-hostbridge-window.patch + - patches.arch/ppc-macio-modalias.patch + - patches.arch/ppc-pegasos-via-ide-irq-quirk.patch + - patches.arch/ppc-ps3-allow-duplicate-lmb_reserve.diff + - patches.arch/ppc-ps3-automatically-lmb_reserve-initrd.diff + - patches.arch/ppc-ps3-ps3fb.patch + - patches.arch/ppc-spufs.patch + - patches.arch/ppc-ps3-ps3-fix-slowdown-bug.patch + - patches.arch/acpi_ibm_notify.patch + - patches.arch/ppc-of_device-modalias.patch + - patches.drivers/libata-hardreset-on-SERR_INTERNAL + - patches.drivers/cciss-add-SG_IO + - patches.drivers/ati-rs400_200-480-disable-msi + - patches.fixes/maybe_unused.patch + - patches.fixes/nfs-readdir-timestamp + - patches.fixes/dm_check_device_area.diff + - patches.rpmify/build-timestamp + - patches.suse/add-IV-generation-method-null-to-dm-crypt + - patches.suse/ams-silent-failure.patch + - patches.xen/pmd-shared.patch + - patches.xen/allow-i386-crash-kernels-to-handle-x86_64-dumps.patch + - patches.apparmor/proc_setattr.diff + - patches.apparmor/proc_sys_setattr.diff + - Adjusted context: + - patches.arch/ppc-efika-bestcomm-ethernet.patch + - patches.arch/ppc-efika-of_device-generic-uevent.patch + - patches.drivers/libata-ata_piix-vmw-ign-DMA-err + - patches.fixes/tiocgdev + - patches.kernel.org/patch-2.6.22-rc2 + - patches.kernel.org/patch-2.6.22-rc2-git7 + - patches.rpmify/buildhost + - patches.suse/suse-ppc32-mol-kbuild.patch + - patches.suse/kdb-i386 + - patches.suse/acpi-hotkeys-extra.diff + - patches.suse/bootsplash + - patches.suse/kdb-common + - patches.suse/kdb-ia64 + - patches.suse/scsi-error-test-unit-ready-timeout + - patches.suse/supported-flag + - patches.suse/netfilter-ipt_LOG-mac + - patches.xen/net-csum.patch + - patches.xen/softlockup-no-idle-hz.patch + - rpm/kernel-binary.spec.in + - patches.apparmor/remove_suid.diff + - patches.apparmor/security-xattr-file.diff + - patches.apparmor/vfs-getxattr.diff + - patches.apparmor/vfs-listxattr.diff + - patches.apparmor/vfs-notify_change.diff + - Update config files. + - patches.apparmor/remove_suid_new_case_in_2.6.22.diff: apparmor: + work around new should_remove_suid() case. + - Disabled Xen until patchset can be merged. * Fri May 25 2007 - olh(a)suse.de - update ps3 patches new storage driver provides /dev/ps3da instead of /dev/sda ++++++ kernel-kdump.spec ++++++ --- /var/tmp/diff_new_pack.Km8312/_old 2007-05-31 21:23:54.000000000 +0200 +++ /var/tmp/diff_new_pack.Km8312/_new 2007-05-31 21:23:54.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package kernel-kdump (Version 2.6.21) +# spec file for package kernel-kdump (Version 2.6.22_rc2_git7) # # Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine @@ -38,8 +38,8 @@ %define build_vanilla 1 %endif Summary: kernel for kdump -Version: 2.6.21 -Release: 11 +Version: 2.6.22_rc2_git7 +Release: 1 License: GNU General Public License (GPL) Group: System/Kernel Autoreqprov: on @@ -83,7 +83,7 @@ #Conflicts: kernel %else %if ! %build_xen -Provides: kernel = 2.6.21-%source_rel +Provides: kernel = 2.6.22_rc2_git7-%source_rel %endif %endif %ifarch %ix86 @@ -166,12 +166,12 @@ -Source Timestamp: 2007/05/25 16:12:26 UTC +Source Timestamp: 2007/05/27 16:27:23 UTC %prep if ! [ -e %_sourcedir/linux-2.6.21.tar.bz2 ]; then - echo "The kernel-kdump-2.6.21.nosrc.rpm package does not contain the" \ - "complete sources. Please install kernel-source-2.6.21.src.rpm." + echo "The kernel-kdump-2.6.22_rc2_git7.nosrc.rpm package does not contain the" \ + "complete sources. Please install kernel-source-2.6.22_rc2_git7.src.rpm." exit 1 fi echo "Architecture symbol(s):" %symbols @@ -265,7 +265,7 @@ cat > .kernel-binary.spec.buildenv <<EOF # Override the timestamp 'uname -v' reports with the build # timestamp. -export BUILD_TIMESTAMP="$(head -n 1 %_sourcedir/build-source-timestamp)" +export KBUILD_BUILD_TIMESTAMP="$(head -n 1 %_sourcedir/build-source-timestamp)" # The following branch/timestamp will end up in Oopses. export OOPS_TIMESTAMP="$( echo -n $(sed -ne 's/^CVS Branch: $.*$/\1-/p' \ @@ -521,6 +521,87 @@ %files -f kernel.files %changelog +* Sun May 27 2007 - bwalle(a)suse.de +- Update config files: enable MMC_TIFM_SD=m, TIFM_7XX1=m nad + TIFM_CORE. +* Sat May 26 2007 - bwalle(a)suse.de +- config/i386/{bigsmp,debug,default,vanilla}, + config/x86_64/{default,debug,vanilla}: + enable CONFIG_RELOCATABLE=y +* Sat May 26 2007 - schwab(a)suse.de +- Remove obsolete patch ppc-ps3-gelic_2621.patch. +* Sat May 26 2007 - schwab(a)suse.de +- s2io-longlong: Avoid switch on long long. +* Sat May 26 2007 - schwab(a)suse.de +- Reenable macintosh drivers. +* Sat May 26 2007 - gregkh(a)suse.de +- patch tree refresh for fuzz cleanups due to new kernel version. +* Sat May 26 2007 - gregkh(a)suse.de +- Fix up the vanilla config files +* Sat May 26 2007 - schwab(a)suse.de +- Update kdb patches. +* Sat May 26 2007 - schwab(a)suse.de +- Update mol patches. +* Sat May 26 2007 - schwab(a)suse.de +- ppc-efika-of_device-generic-uevent.patch: remove obsolete stuff. +* Sat May 26 2007 - jeffm(a)suse.de +- patches.apparmor/remove_suid_new_case_in_2.6.22.diff: Merge fix. +* Fri May 25 2007 - jeffm(a)suse.de +- Updated to 2.6.22-rc2-git7: + - Removed due to upstream inclusion: + - patches.arch/ppc-generic-check_legacy_ioport.patch + - patches.arch/ppc-pci-hostbridge-window.patch + - patches.arch/ppc-macio-modalias.patch + - patches.arch/ppc-pegasos-via-ide-irq-quirk.patch + - patches.arch/ppc-ps3-allow-duplicate-lmb_reserve.diff + - patches.arch/ppc-ps3-automatically-lmb_reserve-initrd.diff + - patches.arch/ppc-ps3-ps3fb.patch + - patches.arch/ppc-spufs.patch + - patches.arch/ppc-ps3-ps3-fix-slowdown-bug.patch + - patches.arch/acpi_ibm_notify.patch + - patches.arch/ppc-of_device-modalias.patch + - patches.drivers/libata-hardreset-on-SERR_INTERNAL + - patches.drivers/cciss-add-SG_IO + - patches.drivers/ati-rs400_200-480-disable-msi + - patches.fixes/maybe_unused.patch + - patches.fixes/nfs-readdir-timestamp + - patches.fixes/dm_check_device_area.diff + - patches.rpmify/build-timestamp + - patches.suse/add-IV-generation-method-null-to-dm-crypt + - patches.suse/ams-silent-failure.patch + - patches.xen/pmd-shared.patch + - patches.xen/allow-i386-crash-kernels-to-handle-x86_64-dumps.patch + - patches.apparmor/proc_setattr.diff + - patches.apparmor/proc_sys_setattr.diff + - Adjusted context: + - patches.arch/ppc-efika-bestcomm-ethernet.patch + - patches.arch/ppc-efika-of_device-generic-uevent.patch + - patches.drivers/libata-ata_piix-vmw-ign-DMA-err + - patches.fixes/tiocgdev + - patches.kernel.org/patch-2.6.22-rc2 + - patches.kernel.org/patch-2.6.22-rc2-git7 + - patches.rpmify/buildhost + - patches.suse/suse-ppc32-mol-kbuild.patch + - patches.suse/kdb-i386 + - patches.suse/acpi-hotkeys-extra.diff + - patches.suse/bootsplash + - patches.suse/kdb-common + - patches.suse/kdb-ia64 + - patches.suse/scsi-error-test-unit-ready-timeout + - patches.suse/supported-flag + - patches.suse/netfilter-ipt_LOG-mac + - patches.xen/net-csum.patch + - patches.xen/softlockup-no-idle-hz.patch + - rpm/kernel-binary.spec.in + - patches.apparmor/remove_suid.diff + - patches.apparmor/security-xattr-file.diff + - patches.apparmor/vfs-getxattr.diff + - patches.apparmor/vfs-listxattr.diff + - patches.apparmor/vfs-notify_change.diff + - Update config files. + - patches.apparmor/remove_suid_new_case_in_2.6.22.diff: apparmor: + work around new should_remove_suid() case. + - Disabled Xen until patchset can be merged. * Fri May 25 2007 - olh(a)suse.de - update ps3 patches new storage driver provides /dev/ps3da instead of /dev/sda ++++++ kernel-ppc64.spec ++++++ --- /var/tmp/diff_new_pack.Km8312/_old 2007-05-31 21:23:54.000000000 +0200 +++ /var/tmp/diff_new_pack.Km8312/_new 2007-05-31 21:23:54.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package kernel-ppc64 (Version 2.6.21) +# spec file for package kernel-ppc64 (Version 2.6.22_rc2_git7) # # Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine @@ -37,8 +37,8 @@ %define build_vanilla 1 %endif Summary: Kernel for ppc64 Systems -Version: 2.6.21 -Release: 11 +Version: 2.6.22_rc2_git7 +Release: 1 License: GNU General Public License (GPL), GNU Library General Public License v. 2.0 and 2.1 (LGPL) Group: System/Kernel Autoreqprov: on @@ -82,7 +82,7 @@ #Conflicts: kernel %else %if ! %build_xen -Provides: kernel = 2.6.21-%source_rel +Provides: kernel = 2.6.22_rc2_git7-%source_rel %endif %endif %ifarch ppc @@ -172,12 +172,12 @@ Tom Gall <tom_gall(a)vnet.ibm.com> see /usr/src/linux/CREDITS for more details. -Source Timestamp: 2007/05/25 16:12:26 UTC +Source Timestamp: 2007/05/27 16:27:23 UTC %prep if ! [ -e %_sourcedir/linux-2.6.21.tar.bz2 ]; then - echo "The kernel-ppc64-2.6.21.nosrc.rpm package does not contain the" \ - "complete sources. Please install kernel-source-2.6.21.src.rpm." + echo "The kernel-ppc64-2.6.22_rc2_git7.nosrc.rpm package does not contain the" \ + "complete sources. Please install kernel-source-2.6.22_rc2_git7.src.rpm." exit 1 fi echo "Architecture symbol(s):" %symbols @@ -271,7 +271,7 @@ cat > .kernel-binary.spec.buildenv <<EOF # Override the timestamp 'uname -v' reports with the build # timestamp. -export BUILD_TIMESTAMP="$(head -n 1 %_sourcedir/build-source-timestamp)" +export KBUILD_BUILD_TIMESTAMP="$(head -n 1 %_sourcedir/build-source-timestamp)" # The following branch/timestamp will end up in Oopses. export OOPS_TIMESTAMP="$( echo -n $(sed -ne 's/^CVS Branch: $.*$/\1-/p' \ @@ -527,6 +527,87 @@ %files -f kernel.files %changelog +* Sun May 27 2007 - bwalle(a)suse.de +- Update config files: enable MMC_TIFM_SD=m, TIFM_7XX1=m nad + TIFM_CORE. +* Sat May 26 2007 - bwalle(a)suse.de +- config/i386/{bigsmp,debug,default,vanilla}, + config/x86_64/{default,debug,vanilla}: + enable CONFIG_RELOCATABLE=y +* Sat May 26 2007 - schwab(a)suse.de +- Remove obsolete patch ppc-ps3-gelic_2621.patch. +* Sat May 26 2007 - schwab(a)suse.de +- s2io-longlong: Avoid switch on long long. +* Sat May 26 2007 - schwab(a)suse.de +- Reenable macintosh drivers. +* Sat May 26 2007 - gregkh(a)suse.de +- patch tree refresh for fuzz cleanups due to new kernel version. +* Sat May 26 2007 - gregkh(a)suse.de +- Fix up the vanilla config files +* Sat May 26 2007 - schwab(a)suse.de +- Update kdb patches. +* Sat May 26 2007 - schwab(a)suse.de +- Update mol patches. +* Sat May 26 2007 - schwab(a)suse.de +- ppc-efika-of_device-generic-uevent.patch: remove obsolete stuff. +* Sat May 26 2007 - jeffm(a)suse.de +- patches.apparmor/remove_suid_new_case_in_2.6.22.diff: Merge fix. +* Fri May 25 2007 - jeffm(a)suse.de +- Updated to 2.6.22-rc2-git7: + - Removed due to upstream inclusion: + - patches.arch/ppc-generic-check_legacy_ioport.patch + - patches.arch/ppc-pci-hostbridge-window.patch + - patches.arch/ppc-macio-modalias.patch + - patches.arch/ppc-pegasos-via-ide-irq-quirk.patch + - patches.arch/ppc-ps3-allow-duplicate-lmb_reserve.diff + - patches.arch/ppc-ps3-automatically-lmb_reserve-initrd.diff + - patches.arch/ppc-ps3-ps3fb.patch + - patches.arch/ppc-spufs.patch + - patches.arch/ppc-ps3-ps3-fix-slowdown-bug.patch + - patches.arch/acpi_ibm_notify.patch + - patches.arch/ppc-of_device-modalias.patch + - patches.drivers/libata-hardreset-on-SERR_INTERNAL + - patches.drivers/cciss-add-SG_IO + - patches.drivers/ati-rs400_200-480-disable-msi + - patches.fixes/maybe_unused.patch + - patches.fixes/nfs-readdir-timestamp + - patches.fixes/dm_check_device_area.diff + - patches.rpmify/build-timestamp + - patches.suse/add-IV-generation-method-null-to-dm-crypt + - patches.suse/ams-silent-failure.patch + - patches.xen/pmd-shared.patch + - patches.xen/allow-i386-crash-kernels-to-handle-x86_64-dumps.patch + - patches.apparmor/proc_setattr.diff + - patches.apparmor/proc_sys_setattr.diff + - Adjusted context: + - patches.arch/ppc-efika-bestcomm-ethernet.patch + - patches.arch/ppc-efika-of_device-generic-uevent.patch + - patches.drivers/libata-ata_piix-vmw-ign-DMA-err + - patches.fixes/tiocgdev + - patches.kernel.org/patch-2.6.22-rc2 + - patches.kernel.org/patch-2.6.22-rc2-git7 + - patches.rpmify/buildhost + - patches.suse/suse-ppc32-mol-kbuild.patch + - patches.suse/kdb-i386 + - patches.suse/acpi-hotkeys-extra.diff + - patches.suse/bootsplash + - patches.suse/kdb-common + - patches.suse/kdb-ia64 + - patches.suse/scsi-error-test-unit-ready-timeout + - patches.suse/supported-flag + - patches.suse/netfilter-ipt_LOG-mac + - patches.xen/net-csum.patch + - patches.xen/softlockup-no-idle-hz.patch + - rpm/kernel-binary.spec.in + - patches.apparmor/remove_suid.diff + - patches.apparmor/security-xattr-file.diff + - patches.apparmor/vfs-getxattr.diff + - patches.apparmor/vfs-listxattr.diff + - patches.apparmor/vfs-notify_change.diff + - Update config files. + - patches.apparmor/remove_suid_new_case_in_2.6.22.diff: apparmor: + work around new should_remove_suid() case. + - Disabled Xen until patchset can be merged. * Fri May 25 2007 - olh(a)suse.de - update ps3 patches new storage driver provides /dev/ps3da instead of /dev/sda ++++++ kernel-s390.spec ++++++ --- /var/tmp/diff_new_pack.Km8312/_old 2007-05-31 21:23:55.000000000 +0200 +++ /var/tmp/diff_new_pack.Km8312/_new 2007-05-31 21:23:55.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package kernel-s390 (Version 2.6.21) +# spec file for package kernel-s390 (Version 2.6.22_rc2_git7) # # Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine @@ -38,8 +38,8 @@ %define build_vanilla 1 %endif Summary: The Standard Kernel -Version: 2.6.21 -Release: 5 +Version: 2.6.22_rc2_git7 +Release: 1 License: GNU General Public License (GPL) Group: System/Kernel Autoreqprov: on @@ -83,7 +83,7 @@ #Conflicts: kernel %else %if ! %build_xen -Provides: kernel = 2.6.21-%source_rel +Provides: kernel = 2.6.22_rc2_git7-%source_rel %endif %endif Provides: kernel-32bit k_deflt @@ -154,12 +154,12 @@ -Source Timestamp: 2007/05/25 16:12:26 UTC +Source Timestamp: 2007/05/27 16:27:23 UTC %prep if ! [ -e %_sourcedir/linux-2.6.21.tar.bz2 ]; then - echo "The kernel-s390-2.6.21.nosrc.rpm package does not contain the" \ - "complete sources. Please install kernel-source-2.6.21.src.rpm." + echo "The kernel-s390-2.6.22_rc2_git7.nosrc.rpm package does not contain the" \ + "complete sources. Please install kernel-source-2.6.22_rc2_git7.src.rpm." exit 1 fi echo "Architecture symbol(s):" %symbols @@ -253,7 +253,7 @@ cat > .kernel-binary.spec.buildenv <<EOF # Override the timestamp 'uname -v' reports with the build # timestamp. -export BUILD_TIMESTAMP="$(head -n 1 %_sourcedir/build-source-timestamp)" +export KBUILD_BUILD_TIMESTAMP="$(head -n 1 %_sourcedir/build-source-timestamp)" # The following branch/timestamp will end up in Oopses. export OOPS_TIMESTAMP="$( echo -n $(sed -ne 's/^CVS Branch: $.*$/\1-/p' \ @@ -509,6 +509,87 @@ %files -f kernel.files %changelog +* Sun May 27 2007 - bwalle(a)suse.de +- Update config files: enable MMC_TIFM_SD=m, TIFM_7XX1=m nad + TIFM_CORE. +* Sat May 26 2007 - bwalle(a)suse.de +- config/i386/{bigsmp,debug,default,vanilla}, + config/x86_64/{default,debug,vanilla}: + enable CONFIG_RELOCATABLE=y +* Sat May 26 2007 - schwab(a)suse.de +- Remove obsolete patch ppc-ps3-gelic_2621.patch. +* Sat May 26 2007 - schwab(a)suse.de +- s2io-longlong: Avoid switch on long long. +* Sat May 26 2007 - schwab(a)suse.de +- Reenable macintosh drivers. +* Sat May 26 2007 - gregkh(a)suse.de +- patch tree refresh for fuzz cleanups due to new kernel version. +* Sat May 26 2007 - gregkh(a)suse.de +- Fix up the vanilla config files +* Sat May 26 2007 - schwab(a)suse.de +- Update kdb patches. +* Sat May 26 2007 - schwab(a)suse.de +- Update mol patches. +* Sat May 26 2007 - schwab(a)suse.de +- ppc-efika-of_device-generic-uevent.patch: remove obsolete stuff. +* Sat May 26 2007 - jeffm(a)suse.de +- patches.apparmor/remove_suid_new_case_in_2.6.22.diff: Merge fix. +* Fri May 25 2007 - jeffm(a)suse.de +- Updated to 2.6.22-rc2-git7: + - Removed due to upstream inclusion: + - patches.arch/ppc-generic-check_legacy_ioport.patch + - patches.arch/ppc-pci-hostbridge-window.patch + - patches.arch/ppc-macio-modalias.patch + - patches.arch/ppc-pegasos-via-ide-irq-quirk.patch + - patches.arch/ppc-ps3-allow-duplicate-lmb_reserve.diff + - patches.arch/ppc-ps3-automatically-lmb_reserve-initrd.diff + - patches.arch/ppc-ps3-ps3fb.patch + - patches.arch/ppc-spufs.patch + - patches.arch/ppc-ps3-ps3-fix-slowdown-bug.patch + - patches.arch/acpi_ibm_notify.patch + - patches.arch/ppc-of_device-modalias.patch + - patches.drivers/libata-hardreset-on-SERR_INTERNAL + - patches.drivers/cciss-add-SG_IO + - patches.drivers/ati-rs400_200-480-disable-msi + - patches.fixes/maybe_unused.patch + - patches.fixes/nfs-readdir-timestamp + - patches.fixes/dm_check_device_area.diff + - patches.rpmify/build-timestamp + - patches.suse/add-IV-generation-method-null-to-dm-crypt + - patches.suse/ams-silent-failure.patch + - patches.xen/pmd-shared.patch + - patches.xen/allow-i386-crash-kernels-to-handle-x86_64-dumps.patch + - patches.apparmor/proc_setattr.diff + - patches.apparmor/proc_sys_setattr.diff + - Adjusted context: + - patches.arch/ppc-efika-bestcomm-ethernet.patch + - patches.arch/ppc-efika-of_device-generic-uevent.patch + - patches.drivers/libata-ata_piix-vmw-ign-DMA-err + - patches.fixes/tiocgdev + - patches.kernel.org/patch-2.6.22-rc2 + - patches.kernel.org/patch-2.6.22-rc2-git7 + - patches.rpmify/buildhost + - patches.suse/suse-ppc32-mol-kbuild.patch + - patches.suse/kdb-i386 + - patches.suse/acpi-hotkeys-extra.diff + - patches.suse/bootsplash + - patches.suse/kdb-common + - patches.suse/kdb-ia64 + - patches.suse/scsi-error-test-unit-ready-timeout + - patches.suse/supported-flag + - patches.suse/netfilter-ipt_LOG-mac + - patches.xen/net-csum.patch + - patches.xen/softlockup-no-idle-hz.patch + - rpm/kernel-binary.spec.in + - patches.apparmor/remove_suid.diff + - patches.apparmor/security-xattr-file.diff + - patches.apparmor/vfs-getxattr.diff + - patches.apparmor/vfs-listxattr.diff + - patches.apparmor/vfs-notify_change.diff + - Update config files. + - patches.apparmor/remove_suid_new_case_in_2.6.22.diff: apparmor: + work around new should_remove_suid() case. + - Disabled Xen until patchset can be merged. * Fri May 25 2007 - olh(a)suse.de - update ps3 patches new storage driver provides /dev/ps3da instead of /dev/sda ++++++ kernel-source.spec ++++++ --- /var/tmp/diff_new_pack.Km8312/_old 2007-05-31 21:23:55.000000000 +0200 +++ /var/tmp/diff_new_pack.Km8312/_new 2007-05-31 21:23:55.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package kernel-source (Version 2.6.21) +# spec file for package kernel-source (Version 2.6.22_rc2_git7) # # Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine @@ -21,8 +21,8 @@ %define source_rel %release %endif Summary: The Linux Kernel Sources -Version: 2.6.21 -Release: 11 +Version: 2.6.22_rc2_git7 +Release: 1 License: GNU General Public License (GPL) Group: Development/Sources Autoreqprov: off @@ -105,7 +105,7 @@ see /usr/src/linux/CREDITS for more details. -Source Timestamp: 2007/05/25 16:12:26 UTC +Source Timestamp: 2007/05/27 16:27:23 UTC %prep if ! [ -e %_sourcedir/linux-2.6.21.tar.bz2 ]; then @@ -128,16 +128,16 @@ # Apply the patches needed for this architecture. %_sourcedir/guards %symbols < %_sourcedir/series.conf \ - > %_builddir/kernel-source-2.6.21/kernel-source.patches -for patch in $(< %_builddir/kernel-source-2.6.21/kernel-source.patches); do - if ! patch -s -E -p1 --no-backup-if-mismatch -i %_builddir/kernel-source-2.6.21/$patch; then + > %_builddir/kernel-source-2.6.22_rc2_git7/kernel-source.patches +for patch in $(< %_builddir/kernel-source-2.6.22_rc2_git7/kernel-source.patches); do + if ! patch -s -E -p1 --no-backup-if-mismatch -i %_builddir/kernel-source-2.6.22_rc2_git7/$patch; then echo "*** Patch $patch failed ***" exit 1 fi done -%_sourcedir/install-configs %_sourcedir %_builddir/kernel-source-2.6.21 %source_rel -KERNELRELEASE=2.6.21-%source_rel +%_sourcedir/install-configs %_sourcedir %_builddir/kernel-source-2.6.22_rc2_git7 %source_rel +KERNELRELEASE=2.6.22-rc2-git7-%source_rel cat > %_builddir/%{name}-%{version}/.rpm-defs <<EOF KERNELRELEASE=$KERNELRELEASE SYMBOLS="%symbols" @@ -158,8 +158,8 @@ ;; esac %_sourcedir/guards %symbols kernel-$flavor < %_sourcedir/series.conf \ - > %_builddir/kernel-source-2.6.21/kernel-$flavor.patches - diff -q %_builddir/kernel-source-2.6.21/kernel-{source,$flavor}.patches \ + > %_builddir/kernel-source-2.6.22_rc2_git7/kernel-$flavor.patches + diff -q %_builddir/kernel-source-2.6.22_rc2_git7/kernel-{source,$flavor}.patches \ || continue o=$RPM_BUILD_ROOT/usr/src/linux-$KERNELRELEASE-obj/$arch/$flavor mkdir -p $o @@ -292,6 +292,87 @@ %files -f kernel-source.files %changelog +* Sun May 27 2007 - bwalle(a)suse.de +- Update config files: enable MMC_TIFM_SD=m, TIFM_7XX1=m nad + TIFM_CORE. +* Sat May 26 2007 - bwalle(a)suse.de +- config/i386/{bigsmp,debug,default,vanilla}, + config/x86_64/{default,debug,vanilla}: + enable CONFIG_RELOCATABLE=y +* Sat May 26 2007 - schwab(a)suse.de +- Remove obsolete patch ppc-ps3-gelic_2621.patch. +* Sat May 26 2007 - schwab(a)suse.de +- s2io-longlong: Avoid switch on long long. +* Sat May 26 2007 - schwab(a)suse.de +- Reenable macintosh drivers. +* Sat May 26 2007 - gregkh(a)suse.de +- patch tree refresh for fuzz cleanups due to new kernel version. +* Sat May 26 2007 - gregkh(a)suse.de +- Fix up the vanilla config files +* Sat May 26 2007 - schwab(a)suse.de +- Update kdb patches. +* Sat May 26 2007 - schwab(a)suse.de +- Update mol patches. +* Sat May 26 2007 - schwab(a)suse.de +- ppc-efika-of_device-generic-uevent.patch: remove obsolete stuff. +* Sat May 26 2007 - jeffm(a)suse.de +- patches.apparmor/remove_suid_new_case_in_2.6.22.diff: Merge fix. +* Fri May 25 2007 - jeffm(a)suse.de +- Updated to 2.6.22-rc2-git7: + - Removed due to upstream inclusion: + - patches.arch/ppc-generic-check_legacy_ioport.patch + - patches.arch/ppc-pci-hostbridge-window.patch + - patches.arch/ppc-macio-modalias.patch + - patches.arch/ppc-pegasos-via-ide-irq-quirk.patch + - patches.arch/ppc-ps3-allow-duplicate-lmb_reserve.diff + - patches.arch/ppc-ps3-automatically-lmb_reserve-initrd.diff + - patches.arch/ppc-ps3-ps3fb.patch + - patches.arch/ppc-spufs.patch + - patches.arch/ppc-ps3-ps3-fix-slowdown-bug.patch + - patches.arch/acpi_ibm_notify.patch + - patches.arch/ppc-of_device-modalias.patch + - patches.drivers/libata-hardreset-on-SERR_INTERNAL + - patches.drivers/cciss-add-SG_IO + - patches.drivers/ati-rs400_200-480-disable-msi + - patches.fixes/maybe_unused.patch + - patches.fixes/nfs-readdir-timestamp + - patches.fixes/dm_check_device_area.diff + - patches.rpmify/build-timestamp + - patches.suse/add-IV-generation-method-null-to-dm-crypt + - patches.suse/ams-silent-failure.patch + - patches.xen/pmd-shared.patch + - patches.xen/allow-i386-crash-kernels-to-handle-x86_64-dumps.patch + - patches.apparmor/proc_setattr.diff + - patches.apparmor/proc_sys_setattr.diff + - Adjusted context: + - patches.arch/ppc-efika-bestcomm-ethernet.patch + - patches.arch/ppc-efika-of_device-generic-uevent.patch + - patches.drivers/libata-ata_piix-vmw-ign-DMA-err + - patches.fixes/tiocgdev + - patches.kernel.org/patch-2.6.22-rc2 + - patches.kernel.org/patch-2.6.22-rc2-git7 + - patches.rpmify/buildhost + - patches.suse/suse-ppc32-mol-kbuild.patch + - patches.suse/kdb-i386 + - patches.suse/acpi-hotkeys-extra.diff + - patches.suse/bootsplash + - patches.suse/kdb-common + - patches.suse/kdb-ia64 + - patches.suse/scsi-error-test-unit-ready-timeout + - patches.suse/supported-flag + - patches.suse/netfilter-ipt_LOG-mac + - patches.xen/net-csum.patch + - patches.xen/softlockup-no-idle-hz.patch + - rpm/kernel-binary.spec.in + - patches.apparmor/remove_suid.diff + - patches.apparmor/security-xattr-file.diff + - patches.apparmor/vfs-getxattr.diff + - patches.apparmor/vfs-listxattr.diff + - patches.apparmor/vfs-notify_change.diff + - Update config files. + - patches.apparmor/remove_suid_new_case_in_2.6.22.diff: apparmor: + work around new should_remove_suid() case. + - Disabled Xen until patchset can be merged. * Fri May 25 2007 - olh(a)suse.de - update ps3 patches new storage driver provides /dev/ps3da instead of /dev/sda ++++++ kernel-syms.spec ++++++ --- /var/tmp/diff_new_pack.Km8312/_old 2007-05-31 21:23:55.000000000 +0200 +++ /var/tmp/diff_new_pack.Km8312/_new 2007-05-31 21:23:55.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package kernel-syms (Version 2.6.21) +# spec file for package kernel-syms (Version 2.6.22_rc2_git7) # # Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine @@ -13,8 +13,8 @@ Name: kernel-syms URL: http://www.kernel.org/ Summary: Kernel Symbol Versions (modversions) -Version: 2.6.21 -Release: 11 +Version: 2.6.22_rc2_git7 +Release: 1 License: GNU General Public License (GPL) Group: Development/Sources Autoreqprov: off @@ -57,7 +57,7 @@ #!BuildIgnore: irqbalance xen #!BuildIgnore: perl-Bootloader mkinitrd Requires: linux -Requires: kernel-source = 2.6.21-%release +Requires: kernel-source = 2.6.22_rc2_git7-%release Source11: arch-symbols Source12: guards Source21: config.conf @@ -90,7 +90,7 @@ see /usr/src/linux/CREDITS for more details. -Source Timestamp: 2007/05/25 16:12:26 UTC +Source Timestamp: 2007/05/27 16:27:23 UTC %prep echo "Architecture symbol(s):" %symbols @@ -136,6 +136,87 @@ /lib/modules/*/* %changelog +* Sun May 27 2007 - bwalle(a)suse.de +- Update config files: enable MMC_TIFM_SD=m, TIFM_7XX1=m nad + TIFM_CORE. +* Sat May 26 2007 - bwalle(a)suse.de +- config/i386/{bigsmp,debug,default,vanilla}, + config/x86_64/{default,debug,vanilla}: + enable CONFIG_RELOCATABLE=y +* Sat May 26 2007 - schwab(a)suse.de +- Remove obsolete patch ppc-ps3-gelic_2621.patch. +* Sat May 26 2007 - schwab(a)suse.de +- s2io-longlong: Avoid switch on long long. +* Sat May 26 2007 - schwab(a)suse.de +- Reenable macintosh drivers. +* Sat May 26 2007 - gregkh(a)suse.de +- patch tree refresh for fuzz cleanups due to new kernel version. +* Sat May 26 2007 - gregkh(a)suse.de +- Fix up the vanilla config files +* Sat May 26 2007 - schwab(a)suse.de +- Update kdb patches. +* Sat May 26 2007 - schwab(a)suse.de +- Update mol patches. +* Sat May 26 2007 - schwab(a)suse.de +- ppc-efika-of_device-generic-uevent.patch: remove obsolete stuff. +* Sat May 26 2007 - jeffm(a)suse.de +- patches.apparmor/remove_suid_new_case_in_2.6.22.diff: Merge fix. +* Fri May 25 2007 - jeffm(a)suse.de +- Updated to 2.6.22-rc2-git7: + - Removed due to upstream inclusion: + - patches.arch/ppc-generic-check_legacy_ioport.patch + - patches.arch/ppc-pci-hostbridge-window.patch + - patches.arch/ppc-macio-modalias.patch + - patches.arch/ppc-pegasos-via-ide-irq-quirk.patch + - patches.arch/ppc-ps3-allow-duplicate-lmb_reserve.diff + - patches.arch/ppc-ps3-automatically-lmb_reserve-initrd.diff + - patches.arch/ppc-ps3-ps3fb.patch + - patches.arch/ppc-spufs.patch + - patches.arch/ppc-ps3-ps3-fix-slowdown-bug.patch + - patches.arch/acpi_ibm_notify.patch + - patches.arch/ppc-of_device-modalias.patch + - patches.drivers/libata-hardreset-on-SERR_INTERNAL + - patches.drivers/cciss-add-SG_IO + - patches.drivers/ati-rs400_200-480-disable-msi + - patches.fixes/maybe_unused.patch + - patches.fixes/nfs-readdir-timestamp + - patches.fixes/dm_check_device_area.diff + - patches.rpmify/build-timestamp + - patches.suse/add-IV-generation-method-null-to-dm-crypt + - patches.suse/ams-silent-failure.patch + - patches.xen/pmd-shared.patch + - patches.xen/allow-i386-crash-kernels-to-handle-x86_64-dumps.patch + - patches.apparmor/proc_setattr.diff + - patches.apparmor/proc_sys_setattr.diff + - Adjusted context: + - patches.arch/ppc-efika-bestcomm-ethernet.patch + - patches.arch/ppc-efika-of_device-generic-uevent.patch + - patches.drivers/libata-ata_piix-vmw-ign-DMA-err + - patches.fixes/tiocgdev + - patches.kernel.org/patch-2.6.22-rc2 + - patches.kernel.org/patch-2.6.22-rc2-git7 + - patches.rpmify/buildhost + - patches.suse/suse-ppc32-mol-kbuild.patch + - patches.suse/kdb-i386 + - patches.suse/acpi-hotkeys-extra.diff + - patches.suse/bootsplash + - patches.suse/kdb-common + - patches.suse/kdb-ia64 + - patches.suse/scsi-error-test-unit-ready-timeout + - patches.suse/supported-flag + - patches.suse/netfilter-ipt_LOG-mac + - patches.xen/net-csum.patch + - patches.xen/softlockup-no-idle-hz.patch + - rpm/kernel-binary.spec.in + - patches.apparmor/remove_suid.diff + - patches.apparmor/security-xattr-file.diff + - patches.apparmor/vfs-getxattr.diff + - patches.apparmor/vfs-listxattr.diff + - patches.apparmor/vfs-notify_change.diff + - Update config files. + - patches.apparmor/remove_suid_new_case_in_2.6.22.diff: apparmor: + work around new should_remove_suid() case. + - Disabled Xen until patchset can be merged. * Fri May 25 2007 - olh(a)suse.de - update ps3 patches new storage driver provides /dev/ps3da instead of /dev/sda ++++++ kernel-um.spec ++++++ --- /var/tmp/diff_new_pack.Km8312/_old 2007-05-31 21:23:55.000000000 +0200 +++ /var/tmp/diff_new_pack.Km8312/_new 2007-05-31 21:23:55.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package kernel-um (Version 2.6.21) +# spec file for package kernel-um (Version 2.6.22_rc2_git7) # # Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine @@ -38,8 +38,8 @@ %define build_vanilla 1 %endif Summary: The User Mode Linux kernel. -Version: 2.6.21 -Release: 11 +Version: 2.6.22_rc2_git7 +Release: 1 License: GNU General Public License (GPL) Group: System/Kernel Autoreqprov: on @@ -83,7 +83,7 @@ #Conflicts: kernel %else %if ! %build_xen -Provides: kernel = 2.6.21-%source_rel +Provides: kernel = 2.6.22_rc2_git7-%source_rel %endif %endif %ifarch %ix86 @@ -162,12 +162,12 @@ -Source Timestamp: 2007/05/25 16:12:26 UTC +Source Timestamp: 2007/05/27 16:27:23 UTC %prep if ! [ -e %_sourcedir/linux-2.6.21.tar.bz2 ]; then - echo "The kernel-um-2.6.21.nosrc.rpm package does not contain the" \ - "complete sources. Please install kernel-source-2.6.21.src.rpm." + echo "The kernel-um-2.6.22_rc2_git7.nosrc.rpm package does not contain the" \ + "complete sources. Please install kernel-source-2.6.22_rc2_git7.src.rpm." exit 1 fi echo "Architecture symbol(s):" %symbols @@ -261,7 +261,7 @@ cat > .kernel-binary.spec.buildenv <<EOF # Override the timestamp 'uname -v' reports with the build # timestamp. -export BUILD_TIMESTAMP="$(head -n 1 %_sourcedir/build-source-timestamp)" +export KBUILD_BUILD_TIMESTAMP="$(head -n 1 %_sourcedir/build-source-timestamp)" # The following branch/timestamp will end up in Oopses. export OOPS_TIMESTAMP="$( echo -n $(sed -ne 's/^CVS Branch: $.*$/\1-/p' \ @@ -517,6 +517,87 @@ %files -f kernel.files %changelog +* Sun May 27 2007 - bwalle(a)suse.de +- Update config files: enable MMC_TIFM_SD=m, TIFM_7XX1=m nad + TIFM_CORE. +* Sat May 26 2007 - bwalle(a)suse.de +- config/i386/{bigsmp,debug,default,vanilla}, + config/x86_64/{default,debug,vanilla}: + enable CONFIG_RELOCATABLE=y +* Sat May 26 2007 - schwab(a)suse.de +- Remove obsolete patch ppc-ps3-gelic_2621.patch. +* Sat May 26 2007 - schwab(a)suse.de +- s2io-longlong: Avoid switch on long long. +* Sat May 26 2007 - schwab(a)suse.de +- Reenable macintosh drivers. +* Sat May 26 2007 - gregkh(a)suse.de +- patch tree refresh for fuzz cleanups due to new kernel version. +* Sat May 26 2007 - gregkh(a)suse.de +- Fix up the vanilla config files +* Sat May 26 2007 - schwab(a)suse.de +- Update kdb patches. +* Sat May 26 2007 - schwab(a)suse.de +- Update mol patches. +* Sat May 26 2007 - schwab(a)suse.de +- ppc-efika-of_device-generic-uevent.patch: remove obsolete stuff. +* Sat May 26 2007 - jeffm(a)suse.de +- patches.apparmor/remove_suid_new_case_in_2.6.22.diff: Merge fix. +* Fri May 25 2007 - jeffm(a)suse.de +- Updated to 2.6.22-rc2-git7: + - Removed due to upstream inclusion: + - patches.arch/ppc-generic-check_legacy_ioport.patch + - patches.arch/ppc-pci-hostbridge-window.patch + - patches.arch/ppc-macio-modalias.patch + - patches.arch/ppc-pegasos-via-ide-irq-quirk.patch + - patches.arch/ppc-ps3-allow-duplicate-lmb_reserve.diff + - patches.arch/ppc-ps3-automatically-lmb_reserve-initrd.diff + - patches.arch/ppc-ps3-ps3fb.patch + - patches.arch/ppc-spufs.patch + - patches.arch/ppc-ps3-ps3-fix-slowdown-bug.patch + - patches.arch/acpi_ibm_notify.patch + - patches.arch/ppc-of_device-modalias.patch + - patches.drivers/libata-hardreset-on-SERR_INTERNAL + - patches.drivers/cciss-add-SG_IO + - patches.drivers/ati-rs400_200-480-disable-msi + - patches.fixes/maybe_unused.patch + - patches.fixes/nfs-readdir-timestamp + - patches.fixes/dm_check_device_area.diff + - patches.rpmify/build-timestamp + - patches.suse/add-IV-generation-method-null-to-dm-crypt + - patches.suse/ams-silent-failure.patch + - patches.xen/pmd-shared.patch + - patches.xen/allow-i386-crash-kernels-to-handle-x86_64-dumps.patch + - patches.apparmor/proc_setattr.diff + - patches.apparmor/proc_sys_setattr.diff + - Adjusted context: + - patches.arch/ppc-efika-bestcomm-ethernet.patch + - patches.arch/ppc-efika-of_device-generic-uevent.patch + - patches.drivers/libata-ata_piix-vmw-ign-DMA-err + - patches.fixes/tiocgdev + - patches.kernel.org/patch-2.6.22-rc2 + - patches.kernel.org/patch-2.6.22-rc2-git7 + - patches.rpmify/buildhost + - patches.suse/suse-ppc32-mol-kbuild.patch + - patches.suse/kdb-i386 + - patches.suse/acpi-hotkeys-extra.diff + - patches.suse/bootsplash + - patches.suse/kdb-common + - patches.suse/kdb-ia64 + - patches.suse/scsi-error-test-unit-ready-timeout + - patches.suse/supported-flag + - patches.suse/netfilter-ipt_LOG-mac + - patches.xen/net-csum.patch + - patches.xen/softlockup-no-idle-hz.patch + - rpm/kernel-binary.spec.in + - patches.apparmor/remove_suid.diff + - patches.apparmor/security-xattr-file.diff + - patches.apparmor/vfs-getxattr.diff + - patches.apparmor/vfs-listxattr.diff + - patches.apparmor/vfs-notify_change.diff + - Update config files. + - patches.apparmor/remove_suid_new_case_in_2.6.22.diff: apparmor: + work around new should_remove_suid() case. + - Disabled Xen until patchset can be merged. * Fri May 25 2007 - olh(a)suse.de - update ps3 patches new storage driver provides /dev/ps3da instead of /dev/sda ++++++ kernel-vanilla.spec ++++++ --- /var/tmp/diff_new_pack.Km8312/_old 2007-05-31 21:23:55.000000000 +0200 +++ /var/tmp/diff_new_pack.Km8312/_new 2007-05-31 21:23:55.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package kernel-vanilla (Version 2.6.21) +# spec file for package kernel-vanilla (Version 2.6.22_rc2_git7) # # Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine @@ -38,8 +38,8 @@ %define build_vanilla 1 %endif Summary: The Standard Kernel - without any SUSE patches -Version: 2.6.21 -Release: 11 +Version: 2.6.22_rc2_git7 +Release: 1 License: GNU General Public License (GPL) Group: System/Kernel Autoreqprov: on @@ -83,7 +83,7 @@ #Conflicts: kernel %else %if ! %build_xen -Provides: kernel = 2.6.21-%source_rel +Provides: kernel = 2.6.22_rc2_git7-%source_rel %endif %endif %ifarch alpha @@ -174,12 +174,12 @@ -Source Timestamp: 2007/05/25 16:12:26 UTC +Source Timestamp: 2007/05/27 16:27:23 UTC %prep if ! [ -e %_sourcedir/linux-2.6.21.tar.bz2 ]; then - echo "The kernel-vanilla-2.6.21.nosrc.rpm package does not contain the" \ - "complete sources. Please install kernel-source-2.6.21.src.rpm." + echo "The kernel-vanilla-2.6.22_rc2_git7.nosrc.rpm package does not contain the" \ + "complete sources. Please install kernel-source-2.6.22_rc2_git7.src.rpm." exit 1 fi echo "Architecture symbol(s):" %symbols @@ -273,7 +273,7 @@ cat > .kernel-binary.spec.buildenv <<EOF # Override the timestamp 'uname -v' reports with the build # timestamp. -export BUILD_TIMESTAMP="$(head -n 1 %_sourcedir/build-source-timestamp)" +export KBUILD_BUILD_TIMESTAMP="$(head -n 1 %_sourcedir/build-source-timestamp)" # The following branch/timestamp will end up in Oopses. export OOPS_TIMESTAMP="$( echo -n $(sed -ne 's/^CVS Branch: $.*$/\1-/p' \ @@ -529,6 +529,87 @@ %files -f kernel.files %changelog +* Sun May 27 2007 - bwalle(a)suse.de +- Update config files: enable MMC_TIFM_SD=m, TIFM_7XX1=m nad + TIFM_CORE. +* Sat May 26 2007 - bwalle(a)suse.de +- config/i386/{bigsmp,debug,default,vanilla}, + config/x86_64/{default,debug,vanilla}: + enable CONFIG_RELOCATABLE=y +* Sat May 26 2007 - schwab(a)suse.de +- Remove obsolete patch ppc-ps3-gelic_2621.patch. +* Sat May 26 2007 - schwab(a)suse.de +- s2io-longlong: Avoid switch on long long. +* Sat May 26 2007 - schwab(a)suse.de +- Reenable macintosh drivers. +* Sat May 26 2007 - gregkh(a)suse.de +- patch tree refresh for fuzz cleanups due to new kernel version. +* Sat May 26 2007 - gregkh(a)suse.de +- Fix up the vanilla config files +* Sat May 26 2007 - schwab(a)suse.de +- Update kdb patches. +* Sat May 26 2007 - schwab(a)suse.de +- Update mol patches. +* Sat May 26 2007 - schwab(a)suse.de +- ppc-efika-of_device-generic-uevent.patch: remove obsolete stuff. +* Sat May 26 2007 - jeffm(a)suse.de +- patches.apparmor/remove_suid_new_case_in_2.6.22.diff: Merge fix. +* Fri May 25 2007 - jeffm(a)suse.de +- Updated to 2.6.22-rc2-git7: + - Removed due to upstream inclusion: + - patches.arch/ppc-generic-check_legacy_ioport.patch + - patches.arch/ppc-pci-hostbridge-window.patch + - patches.arch/ppc-macio-modalias.patch + - patches.arch/ppc-pegasos-via-ide-irq-quirk.patch + - patches.arch/ppc-ps3-allow-duplicate-lmb_reserve.diff + - patches.arch/ppc-ps3-automatically-lmb_reserve-initrd.diff + - patches.arch/ppc-ps3-ps3fb.patch + - patches.arch/ppc-spufs.patch + - patches.arch/ppc-ps3-ps3-fix-slowdown-bug.patch + - patches.arch/acpi_ibm_notify.patch + - patches.arch/ppc-of_device-modalias.patch + - patches.drivers/libata-hardreset-on-SERR_INTERNAL + - patches.drivers/cciss-add-SG_IO + - patches.drivers/ati-rs400_200-480-disable-msi + - patches.fixes/maybe_unused.patch + - patches.fixes/nfs-readdir-timestamp + - patches.fixes/dm_check_device_area.diff + - patches.rpmify/build-timestamp + - patches.suse/add-IV-generation-method-null-to-dm-crypt + - patches.suse/ams-silent-failure.patch + - patches.xen/pmd-shared.patch + - patches.xen/allow-i386-crash-kernels-to-handle-x86_64-dumps.patch + - patches.apparmor/proc_setattr.diff + - patches.apparmor/proc_sys_setattr.diff + - Adjusted context: + - patches.arch/ppc-efika-bestcomm-ethernet.patch + - patches.arch/ppc-efika-of_device-generic-uevent.patch + - patches.drivers/libata-ata_piix-vmw-ign-DMA-err + - patches.fixes/tiocgdev + - patches.kernel.org/patch-2.6.22-rc2 + - patches.kernel.org/patch-2.6.22-rc2-git7 + - patches.rpmify/buildhost + - patches.suse/suse-ppc32-mol-kbuild.patch + - patches.suse/kdb-i386 + - patches.suse/acpi-hotkeys-extra.diff + - patches.suse/bootsplash + - patches.suse/kdb-common + - patches.suse/kdb-ia64 + - patches.suse/scsi-error-test-unit-ready-timeout + - patches.suse/supported-flag + - patches.suse/netfilter-ipt_LOG-mac + - patches.xen/net-csum.patch + - patches.xen/softlockup-no-idle-hz.patch + - rpm/kernel-binary.spec.in + - patches.apparmor/remove_suid.diff + - patches.apparmor/security-xattr-file.diff + - patches.apparmor/vfs-getxattr.diff + - patches.apparmor/vfs-listxattr.diff + - patches.apparmor/vfs-notify_change.diff + - Update config files. + - patches.apparmor/remove_suid_new_case_in_2.6.22.diff: apparmor: + work around new should_remove_suid() case. + - Disabled Xen until patchset can be merged. * Fri May 25 2007 - olh(a)suse.de - update ps3 patches new storage driver provides /dev/ps3da instead of /dev/sda ++++++ kernel-xenpae.spec ++++++ --- /var/tmp/diff_new_pack.Km8312/_old 2007-05-31 21:23:56.000000000 +0200 +++ /var/tmp/diff_new_pack.Km8312/_new 2007-05-31 21:23:56.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package kernel-xenpae (Version 2.6.21) +# spec file for package kernel-xenpae (Version 2.6.22_rc2_git7) # # Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine @@ -38,8 +38,8 @@ %define build_vanilla 1 %endif Summary: The Xen Kernel with PAE support -Version: 2.6.21 -Release: 11 +Version: 2.6.22_rc2_git7 +Release: 1 License: GNU General Public License (GPL) Group: System/Kernel Autoreqprov: on @@ -83,7 +83,7 @@ #Conflicts: kernel %else %if ! %build_xen -Provides: kernel = 2.6.21-%source_rel +Provides: kernel = 2.6.22_rc2_git7-%source_rel %endif %endif Source0: http://www.kernel.org/pub/linux/kernel/v2.6/linux-2.6.21.tar.bz2 @@ -157,12 +157,12 @@ -Source Timestamp: 2007/05/25 16:12:26 UTC +Source Timestamp: 2007/05/27 16:27:23 UTC %prep if ! [ -e %_sourcedir/linux-2.6.21.tar.bz2 ]; then - echo "The kernel-xenpae-2.6.21.nosrc.rpm package does not contain the" \ - "complete sources. Please install kernel-source-2.6.21.src.rpm." + echo "The kernel-xenpae-2.6.22_rc2_git7.nosrc.rpm package does not contain the" \ + "complete sources. Please install kernel-source-2.6.22_rc2_git7.src.rpm." exit 1 fi echo "Architecture symbol(s):" %symbols @@ -256,7 +256,7 @@ cat > .kernel-binary.spec.buildenv <<EOF # Override the timestamp 'uname -v' reports with the build # timestamp. -export BUILD_TIMESTAMP="$(head -n 1 %_sourcedir/build-source-timestamp)" +export KBUILD_BUILD_TIMESTAMP="$(head -n 1 %_sourcedir/build-source-timestamp)" # The following branch/timestamp will end up in Oopses. export OOPS_TIMESTAMP="$( echo -n $(sed -ne 's/^CVS Branch: $.*$/\1-/p' \ @@ -512,6 +512,87 @@ %files -f kernel.files %changelog +* Sun May 27 2007 - bwalle(a)suse.de +- Update config files: enable MMC_TIFM_SD=m, TIFM_7XX1=m nad + TIFM_CORE. +* Sat May 26 2007 - bwalle(a)suse.de +- config/i386/{bigsmp,debug,default,vanilla}, + config/x86_64/{default,debug,vanilla}: + enable CONFIG_RELOCATABLE=y +* Sat May 26 2007 - schwab(a)suse.de +- Remove obsolete patch ppc-ps3-gelic_2621.patch. +* Sat May 26 2007 - schwab(a)suse.de +- s2io-longlong: Avoid switch on long long. +* Sat May 26 2007 - schwab(a)suse.de +- Reenable macintosh drivers. +* Sat May 26 2007 - gregkh(a)suse.de +- patch tree refresh for fuzz cleanups due to new kernel version. +* Sat May 26 2007 - gregkh(a)suse.de +- Fix up the vanilla config files +* Sat May 26 2007 - schwab(a)suse.de +- Update kdb patches. +* Sat May 26 2007 - schwab(a)suse.de +- Update mol patches. +* Sat May 26 2007 - schwab(a)suse.de +- ppc-efika-of_device-generic-uevent.patch: remove obsolete stuff. +* Sat May 26 2007 - jeffm(a)suse.de +- patches.apparmor/remove_suid_new_case_in_2.6.22.diff: Merge fix. +* Fri May 25 2007 - jeffm(a)suse.de +- Updated to 2.6.22-rc2-git7: + - Removed due to upstream inclusion: + - patches.arch/ppc-generic-check_legacy_ioport.patch + - patches.arch/ppc-pci-hostbridge-window.patch + - patches.arch/ppc-macio-modalias.patch + - patches.arch/ppc-pegasos-via-ide-irq-quirk.patch + - patches.arch/ppc-ps3-allow-duplicate-lmb_reserve.diff + - patches.arch/ppc-ps3-automatically-lmb_reserve-initrd.diff + - patches.arch/ppc-ps3-ps3fb.patch + - patches.arch/ppc-spufs.patch + - patches.arch/ppc-ps3-ps3-fix-slowdown-bug.patch + - patches.arch/acpi_ibm_notify.patch + - patches.arch/ppc-of_device-modalias.patch + - patches.drivers/libata-hardreset-on-SERR_INTERNAL + - patches.drivers/cciss-add-SG_IO + - patches.drivers/ati-rs400_200-480-disable-msi + - patches.fixes/maybe_unused.patch + - patches.fixes/nfs-readdir-timestamp + - patches.fixes/dm_check_device_area.diff + - patches.rpmify/build-timestamp + - patches.suse/add-IV-generation-method-null-to-dm-crypt + - patches.suse/ams-silent-failure.patch + - patches.xen/pmd-shared.patch + - patches.xen/allow-i386-crash-kernels-to-handle-x86_64-dumps.patch + - patches.apparmor/proc_setattr.diff + - patches.apparmor/proc_sys_setattr.diff + - Adjusted context: + - patches.arch/ppc-efika-bestcomm-ethernet.patch + - patches.arch/ppc-efika-of_device-generic-uevent.patch + - patches.drivers/libata-ata_piix-vmw-ign-DMA-err + - patches.fixes/tiocgdev + - patches.kernel.org/patch-2.6.22-rc2 + - patches.kernel.org/patch-2.6.22-rc2-git7 + - patches.rpmify/buildhost + - patches.suse/suse-ppc32-mol-kbuild.patch + - patches.suse/kdb-i386 + - patches.suse/acpi-hotkeys-extra.diff + - patches.suse/bootsplash + - patches.suse/kdb-common + - patches.suse/kdb-ia64 + - patches.suse/scsi-error-test-unit-ready-timeout + - patches.suse/supported-flag + - patches.suse/netfilter-ipt_LOG-mac + - patches.xen/net-csum.patch + - patches.xen/softlockup-no-idle-hz.patch + - rpm/kernel-binary.spec.in + - patches.apparmor/remove_suid.diff + - patches.apparmor/security-xattr-file.diff + - patches.apparmor/vfs-getxattr.diff + - patches.apparmor/vfs-listxattr.diff + - patches.apparmor/vfs-notify_change.diff + - Update config files. + - patches.apparmor/remove_suid_new_case_in_2.6.22.diff: apparmor: + work around new should_remove_suid() case. + - Disabled Xen until patchset can be merged. * Fri May 25 2007 - olh(a)suse.de - update ps3 patches new storage driver provides /dev/ps3da instead of /dev/sda ++++++ kernel-xen.spec ++++++ --- /var/tmp/diff_new_pack.Km8312/_old 2007-05-31 21:23:56.000000000 +0200 +++ /var/tmp/diff_new_pack.Km8312/_new 2007-05-31 21:23:56.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package kernel-xen (Version 2.6.21) +# spec file for package kernel-xen (Version 2.6.22_rc2_git7) # # Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine @@ -38,8 +38,8 @@ %define build_vanilla 1 %endif Summary: The Xen Kernel -Version: 2.6.21 -Release: 11 +Version: 2.6.22_rc2_git7 +Release: 1 License: GNU General Public License (GPL) Group: System/Kernel Autoreqprov: on @@ -83,7 +83,7 @@ #Conflicts: kernel %else %if ! %build_xen -Provides: kernel = 2.6.21-%source_rel +Provides: kernel = 2.6.22_rc2_git7-%source_rel %endif %endif %ifarch %ix86 @@ -160,12 +160,12 @@ -Source Timestamp: 2007/05/25 16:12:26 UTC +Source Timestamp: 2007/05/27 16:27:23 UTC %prep if ! [ -e %_sourcedir/linux-2.6.21.tar.bz2 ]; then - echo "The kernel-xen-2.6.21.nosrc.rpm package does not contain the" \ - "complete sources. Please install kernel-source-2.6.21.src.rpm." + echo "The kernel-xen-2.6.22_rc2_git7.nosrc.rpm package does not contain the" \ + "complete sources. Please install kernel-source-2.6.22_rc2_git7.src.rpm." exit 1 fi echo "Architecture symbol(s):" %symbols @@ -259,7 +259,7 @@ cat > .kernel-binary.spec.buildenv <<EOF # Override the timestamp 'uname -v' reports with the build # timestamp. -export BUILD_TIMESTAMP="$(head -n 1 %_sourcedir/build-source-timestamp)" +export KBUILD_BUILD_TIMESTAMP="$(head -n 1 %_sourcedir/build-source-timestamp)" # The following branch/timestamp will end up in Oopses. export OOPS_TIMESTAMP="$( echo -n $(sed -ne 's/^CVS Branch: $.*$/\1-/p' \ @@ -515,6 +515,87 @@ %files -f kernel.files %changelog +* Sun May 27 2007 - bwalle(a)suse.de +- Update config files: enable MMC_TIFM_SD=m, TIFM_7XX1=m nad + TIFM_CORE. +* Sat May 26 2007 - bwalle(a)suse.de +- config/i386/{bigsmp,debug,default,vanilla}, + config/x86_64/{default,debug,vanilla}: + enable CONFIG_RELOCATABLE=y +* Sat May 26 2007 - schwab(a)suse.de +- Remove obsolete patch ppc-ps3-gelic_2621.patch. +* Sat May 26 2007 - schwab(a)suse.de +- s2io-longlong: Avoid switch on long long. +* Sat May 26 2007 - schwab(a)suse.de +- Reenable macintosh drivers. +* Sat May 26 2007 - gregkh(a)suse.de +- patch tree refresh for fuzz cleanups due to new kernel version. +* Sat May 26 2007 - gregkh(a)suse.de +- Fix up the vanilla config files +* Sat May 26 2007 - schwab(a)suse.de +- Update kdb patches. +* Sat May 26 2007 - schwab(a)suse.de +- Update mol patches. +* Sat May 26 2007 - schwab(a)suse.de +- ppc-efika-of_device-generic-uevent.patch: remove obsolete stuff. +* Sat May 26 2007 - jeffm(a)suse.de +- patches.apparmor/remove_suid_new_case_in_2.6.22.diff: Merge fix. +* Fri May 25 2007 - jeffm(a)suse.de +- Updated to 2.6.22-rc2-git7: + - Removed due to upstream inclusion: + - patches.arch/ppc-generic-check_legacy_ioport.patch + - patches.arch/ppc-pci-hostbridge-window.patch + - patches.arch/ppc-macio-modalias.patch + - patches.arch/ppc-pegasos-via-ide-irq-quirk.patch + - patches.arch/ppc-ps3-allow-duplicate-lmb_reserve.diff + - patches.arch/ppc-ps3-automatically-lmb_reserve-initrd.diff + - patches.arch/ppc-ps3-ps3fb.patch + - patches.arch/ppc-spufs.patch + - patches.arch/ppc-ps3-ps3-fix-slowdown-bug.patch + - patches.arch/acpi_ibm_notify.patch + - patches.arch/ppc-of_device-modalias.patch + - patches.drivers/libata-hardreset-on-SERR_INTERNAL + - patches.drivers/cciss-add-SG_IO + - patches.drivers/ati-rs400_200-480-disable-msi + - patches.fixes/maybe_unused.patch + - patches.fixes/nfs-readdir-timestamp + - patches.fixes/dm_check_device_area.diff + - patches.rpmify/build-timestamp + - patches.suse/add-IV-generation-method-null-to-dm-crypt + - patches.suse/ams-silent-failure.patch + - patches.xen/pmd-shared.patch + - patches.xen/allow-i386-crash-kernels-to-handle-x86_64-dumps.patch + - patches.apparmor/proc_setattr.diff + - patches.apparmor/proc_sys_setattr.diff + - Adjusted context: + - patches.arch/ppc-efika-bestcomm-ethernet.patch + - patches.arch/ppc-efika-of_device-generic-uevent.patch + - patches.drivers/libata-ata_piix-vmw-ign-DMA-err + - patches.fixes/tiocgdev + - patches.kernel.org/patch-2.6.22-rc2 + - patches.kernel.org/patch-2.6.22-rc2-git7 + - patches.rpmify/buildhost + - patches.suse/suse-ppc32-mol-kbuild.patch + - patches.suse/kdb-i386 + - patches.suse/acpi-hotkeys-extra.diff + - patches.suse/bootsplash + - patches.suse/kdb-common + - patches.suse/kdb-ia64 + - patches.suse/scsi-error-test-unit-ready-timeout + - patches.suse/supported-flag + - patches.suse/netfilter-ipt_LOG-mac + - patches.xen/net-csum.patch + - patches.xen/softlockup-no-idle-hz.patch + - rpm/kernel-binary.spec.in + - patches.apparmor/remove_suid.diff + - patches.apparmor/security-xattr-file.diff + - patches.apparmor/vfs-getxattr.diff + - patches.apparmor/vfs-listxattr.diff + - patches.apparmor/vfs-notify_change.diff + - Update config files. + - patches.apparmor/remove_suid_new_case_in_2.6.22.diff: apparmor: + work around new should_remove_suid() case. + - Disabled Xen until patchset can be merged. * Fri May 25 2007 - olh(a)suse.de - update ps3 patches new storage driver provides /dev/ps3da instead of /dev/sda ++++++ build-source-timestamp ++++++ --- kernel-source/build-source-timestamp 2007-05-25 18:14:24.000000000 +0200 +++ /mounts/work_src_done/STABLE/kernel-source/build-source-timestamp 2007-05-27 18:40:08.000000000 +0200 @@ -1 +1 @@ -2007/05/25 16:12:26 UTC +2007/05/27 16:27:23 UTC ++++++ config.tar.bz2 ++++++ ++++ 29215 lines of diff (skipped) ++++++ kabi.tar.bz2 ++++++ ++++++ novell-kmp.tar.bz2 ++++++ ++++++ patches.apparmor.tar.bz2 ++++++ ++++ 2178 lines of diff (skipped) ++++++ patches.arch.tar.bz2 ++++++ ++++ 6324 lines of diff (skipped) ++++++ patches.drivers.tar.bz2 ++++++ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/patches.drivers/always-announce-new-usb-devices.patch new/patches.drivers/always-announce-new-usb-devices.patch --- old/patches.drivers/always-announce-new-usb-devices.patch 2007-03-21 20:44:08.000000000 +0100 +++ new/patches.drivers/always-announce-new-usb-devices.patch 2007-05-26 11:06:20.000000000 +0200 @@ -13,9 +13,9 @@ drivers/usb/core/hub.c | 10 ++++------ 1 files changed, 4 insertions(+), 6 deletions(-) ---- linux-2.6.20.orig/drivers/usb/core/hub.c -+++ linux-2.6.20/drivers/usb/core/hub.c -@@ -1238,7 +1238,6 @@ void usb_disconnect(struct usb_device ** +--- linux-2.6.21.orig/drivers/usb/core/hub.c ++++ linux-2.6.21/drivers/usb/core/hub.c +@@ -1235,7 +1235,6 @@ void usb_disconnect(struct usb_device ** put_device(&udev->dev); } @@ -23,7 +23,7 @@ static void show_string(struct usb_device *udev, char *id, char *string) { if (!string) -@@ -1246,10 +1245,6 @@ static void show_string(struct usb_devic +@@ -1243,10 +1242,6 @@ static void show_string(struct usb_devic dev_printk(KERN_INFO, &udev->dev, "%s: %s\n", id, string); } @@ -34,7 +34,7 @@ #ifdef CONFIG_USB_OTG -@@ -1298,7 +1293,10 @@ int usb_new_device(struct usb_device *ud +@@ -1295,7 +1290,10 @@ int usb_new_device(struct usb_device *ud udev->serial = usb_cache_string(udev, udev->descriptor.iSerialNumber); /* Tell the world! */ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/patches.drivers/ati-rs400_200-480-disable-msi new/patches.drivers/ati-rs400_200-480-disable-msi --- old/patches.drivers/ati-rs400_200-480-disable-msi 2007-04-16 07:11:26.000000000 +0200 +++ new/patches.drivers/ati-rs400_200-480-disable-msi 1970-01-01 01:00:00.000000000 +0100 @@ -1,30 +0,0 @@ -From: Tejun Heo <htejun(a)gmail.com> -Subject: [PATCH] pci-quirks: disable MSI on RS400-200 and RS480 -References: 263893 -Patch-Mainline: Submitted - -MSI doesn't work on RS400-200 and RS480 requiring pci=nomsi kernel -boot parameter for ahci to work. This patch disables MSI on those -chips. - - http://thread.gmane.org/gmane.linux.ide/17516 - https://bugzilla.novell.com/show_bug.cgi?id=263893 - -Signed-off-by: Tejun Heo <htejun(a)gmail.com> ---- - drivers/pci/quirks.c | 2 ++ - 1 file changed, 2 insertions(+) - -Index: linux-2.6.20/drivers/pci/quirks.c -=================================================================== ---- linux-2.6.20.orig/drivers/pci/quirks.c -+++ linux-2.6.20/drivers/pci/quirks.c -@@ -1761,6 +1761,8 @@ static void __devinit quirk_disable_msi( - } - } - DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_8131_BRIDGE, quirk_disable_msi); -+DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_ATI, PCI_DEVICE_ID_ATI_RS400_200, quirk_disable_msi); -+DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_ATI, PCI_DEVICE_ID_ATI_RS480, quirk_disable_msi); - - /* Go through the list of Hypertransport capabilities and - * return 1 if a HT MSI capability is found and enabled */ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/patches.drivers/cciss-add-SG_IO new/patches.drivers/cciss-add-SG_IO --- old/patches.drivers/cciss-add-SG_IO 2007-04-05 12:34:22.000000000 +0200 +++ new/patches.drivers/cciss-add-SG_IO 1970-01-01 01:00:00.000000000 +0100 @@ -1,185 +0,0 @@ -From: Hannes Reinecke <hare(a)suse.de> -Subject: Add SG_IO to cciss - -This patch adds support for the SG_IO ioctl to cciss. This is -required to get scsi_id and persistent device naming working -on this device. - -Index: linux-2.6.20/drivers/block/cciss.c -=================================================================== ---- linux-2.6.20.orig/drivers/block/cciss.c -+++ linux-2.6.20/drivers/block/cciss.c -@@ -45,6 +45,9 @@ - #include <linux/blkdev.h> - #include <linux/genhd.h> - #include <linux/completion.h> -+#include <scsi/scsi.h> -+#include <scsi/scsi_ioctl.h> -+#include <scsi/sg.h> - - #define CCISS_DRIVER_VERSION(maj,min,submin) ((maj<<16)|(min<<8)|(submin)) - #define DRIVER_NAME "HP CISS Driver (v 3.6.14)" -@@ -1152,6 +1155,163 @@ static int cciss_ioctl(struct inode *ino - kfree(ioc); - return status; - } -+ case SG_IO: { -+ struct sg_io_hdr hdr; -+ CommandList_struct *c; -+ char *buff = NULL; -+ u64bit temp64; -+ unsigned long flags; -+ DECLARE_COMPLETION_ONSTACK(wait); -+ -+ if (!capable(CAP_SYS_RAWIO)) -+ return -EPERM; -+ -+ if (copy_from_user(&hdr, argp, sizeof(hdr))) -+ return -EFAULT; -+ -+ if (hdr.interface_id != 'S') -+ return -EINVAL; -+ -+ /* cciss only supports 16-byte commands */ -+ if (hdr.cmd_len > 16) -+ return -EINVAL; -+ -+ /* We don't support proper scatter-gather (yet) */ -+ if (hdr.iovec_count) -+ return -EINVAL; -+ -+ if ((hdr.dxfer_len < 1) && -+ (hdr.dxfer_direction != SG_DXFER_NONE)) -+ return -EINVAL; -+ -+ if (hdr.dxfer_len > 0) { -+ buff = kmalloc(hdr.dxfer_len, GFP_KERNEL); -+ if (buff == NULL) -+ return -EFAULT; -+ } -+ if ((hdr.dxfer_direction == SG_DXFER_TO_DEV) || -+ (hdr.dxfer_direction == SG_DXFER_TO_FROM_DEV)) { -+ /* Copy the data into the buffer we created */ -+ if (copy_from_user (buff, hdr.dxferp, -+ hdr.dxfer_len)) { -+ kfree(buff); -+ return -EFAULT; -+ } -+ } else -+ memset(buff, 0, hdr.dxfer_len); -+ -+ if ((c = cmd_alloc(host, 0)) == NULL) { -+ kfree(buff); -+ return -ENOMEM; -+ } -+ -+ /* Copy CDB */ -+ if (copy_from_user(c->Request.CDB, hdr.cmdp, hdr.cmd_len)) -+ return -EFAULT; -+ -+ /* Fill in the command type */ -+ c->cmd_type = CMD_IOCTL_PEND; -+ /* Fill in Command Header */ -+ c->Header.ReplyQueue = 0; -+ if (hdr.dxfer_len > 0) { -+ c->Header.SGList = 1; -+ c->Header.SGTotal = 1; -+ } else { -+ c->Header.SGList = 0; -+ c->Header.SGTotal = 0; -+ } -+ /* Default to LUN the ioctl was directed to */ -+ c->Header.LUN.LogDev.VolId = drv->LunID & 0x3FFFFFFF; -+ c->Header.LUN.LogDev.Mode = 0x01; /* Logical volume */ -+ c->Header.Tag.lower = c->busaddr; -+ -+ /* Fill in Request block */ -+ c->Request.CDBLen = hdr.cmd_len; -+ c->Request.Type.Type = TYPE_CMD; -+ c->Request.Type.Attribute = ATTR_SIMPLE; -+ switch(hdr.dxfer_direction) { -+ case SG_DXFER_NONE: -+ c->Request.Type.Direction = XFER_NONE; -+ break; -+ case SG_DXFER_TO_DEV: -+ c->Request.Type.Direction = XFER_WRITE; -+ break; -+ case SG_DXFER_FROM_DEV: -+ c->Request.Type.Direction = XFER_READ; -+ break; -+ case SG_DXFER_TO_FROM_DEV: -+ c->Request.Type.Direction = XFER_RSVD; -+ break; -+ } -+ c->Request.Timeout = hdr.timeout; -+ -+ /* Fill in the scatter gather information */ -+ if (hdr.dxfer_len > 0) { -+ temp64.val = pci_map_single(host->pdev, buff, -+ hdr.dxfer_len, -+ PCI_DMA_BIDIRECTIONAL); -+ c->SG[0].Addr.lower = temp64.val32.lower; -+ c->SG[0].Addr.upper = temp64.val32.upper; -+ c->SG[0].Len = hdr.dxfer_len; -+ c->SG[0].Ext = 0; -+ } -+ c->waiting = &wait; -+ -+ /* Put the request on the tail of the request queue */ -+ spin_lock_irqsave(CCISS_LOCK(ctlr), flags); -+ addQ(&host->reqQ, c); -+ host->Qdepth++; -+ start_io(host); -+ spin_unlock_irqrestore(CCISS_LOCK(ctlr), flags); -+ -+ wait_for_completion(&wait); -+ -+ /* unlock the buffers from DMA */ -+ temp64.val32.lower = c->SG[0].Addr.lower; -+ temp64.val32.upper = c->SG[0].Addr.upper; -+ pci_unmap_single(host->pdev, (dma_addr_t) temp64.val, -+ hdr.dxfer_len, -+ PCI_DMA_BIDIRECTIONAL); -+ -+ /* Copy the error information out */ -+ hdr.status = c->err_info->ScsiStatus; -+ if (c->err_info->SenseLen && hdr.mx_sb_len > 0) { -+ int sense_len = c->err_info->SenseLen; -+ -+ if (sense_len > hdr.mx_sb_len) -+ sense_len = hdr.mx_sb_len; -+ -+ if (copy_to_user(hdr.sbp, c->err_info->SenseInfo, -+ sense_len)) { -+ kfree(buff); -+ cmd_free(host, c, 0); -+ return -EFAULT; -+ } -+ hdr.sb_len_wr = sense_len; -+ } -+ hdr.resid = c->err_info->ResidualCnt; -+ /* Copy out the header */ -+ if (copy_to_user(argp, &hdr, sizeof(hdr))) { -+ kfree(buff); -+ cmd_free(host, c, 0); -+ return -EFAULT; -+ } -+ -+ if ((hdr.dxfer_direction == SG_DXFER_FROM_DEV) || -+ (hdr.dxfer_direction == SG_DXFER_TO_FROM_DEV)) { -+ /* Copy the data out to the buffer we created */ -+ if (copy_to_user -+ (hdr.dxferp, buff, hdr.dxfer_len)) { -+ kfree(buff); -+ cmd_free(host, c, 0); -+ return -EFAULT; -+ } -+ } -+ -+ kfree(buff); -+ cmd_free(host, c, 0); -+ return 0; -+ } - default: - return -ENOTTY; - } diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/patches.drivers/e1000-eeprom-cksum.patch new/patches.drivers/e1000-eeprom-cksum.patch --- old/patches.drivers/e1000-eeprom-cksum.patch 2007-03-21 20:44:08.000000000 +0100 +++ new/patches.drivers/e1000-eeprom-cksum.patch 2007-05-26 11:06:20.000000000 +0200 @@ -12,9 +12,9 @@ drivers/net/e1000/e1000_main.c | 8 ++++++-- 1 files changed, 6 insertions(+), 2 deletions(-) ---- linux-2.6.20.orig/drivers/net/e1000/e1000_main.c -+++ linux-2.6.20/drivers/net/e1000/e1000_main.c -@@ -1018,8 +1018,12 @@ e1000_probe(struct pci_dev *pdev, +--- linux-2.6.21.orig/drivers/net/e1000/e1000_main.c ++++ linux-2.6.21/drivers/net/e1000/e1000_main.c +@@ -1007,8 +1007,12 @@ e1000_probe(struct pci_dev *pdev, /* make sure the EEPROM is good */ if (e1000_validate_eeprom_checksum(&adapter->hw) < 0) { diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/patches.drivers/libata-ata_piix-vmw-ign-DMA-err new/patches.drivers/libata-ata_piix-vmw-ign-DMA-err --- old/patches.drivers/libata-ata_piix-vmw-ign-DMA-err 2007-04-10 11:38:00.000000000 +0200 +++ new/patches.drivers/libata-ata_piix-vmw-ign-DMA-err 2007-05-26 11:06:20.000000000 +0200 @@ -8,12 +8,10 @@ Signed-off-by: Tejun Heo <teheo(a)suse.de> --- drivers/ata/ata_piix.c | 52 +++++++++++++++++++++++++++++++++++++++++++++++++ - 1 file changed, 52 insertions(+) + 1 files changed, 52 insertions(+) -Index: linux-2.6.20/drivers/ata/ata_piix.c -=================================================================== ---- linux-2.6.20.orig/drivers/ata/ata_piix.c -+++ linux-2.6.20/drivers/ata/ata_piix.c +--- linux-2.6.21.orig/drivers/ata/ata_piix.c ++++ linux-2.6.21/drivers/ata/ata_piix.c @@ -129,6 +129,7 @@ enum { ich6m_sata_ahci = 8, ich8_sata_ahci = 9, @@ -22,10 +20,10 @@ /* constants for mapping table */ P0 = 0, /* port 0 */ -@@ -160,12 +161,15 @@ static void piix_sata_error_handler(stru - static void piix_set_piomode (struct ata_port *ap, struct ata_device *adev); +@@ -159,12 +160,15 @@ static void piix_set_piomode (struct ata static void piix_set_dmamode (struct ata_port *ap, struct ata_device *adev); static void ich_set_dmamode (struct ata_port *ap, struct ata_device *adev); + static int ich_pata_cable_detect(struct ata_port *ap); +static u8 piix_vmw_bmdma_status(struct ata_port *ap); static unsigned int in_module_init = 1; @@ -38,7 +36,7 @@ /* Intel PIIX4 for the 430TX/440BX/MX chipset: UDMA 33 */ /* Also PIIX4E (fn3 rev 2) and PIIX4M (fn3 rev 3) */ { 0x8086, 0x7111, PCI_ANY_ID, PCI_ANY_ID, 0, 0, piix_pata_33 }, -@@ -377,6 +381,39 @@ static const struct ata_port_operations +@@ -374,6 +378,39 @@ static const struct ata_port_operations .port_start = ata_port_start, }; @@ -78,7 +76,7 @@ static const struct piix_map_db ich5_map_db = { .mask = 0x7, .port_enable = 0x3, -@@ -553,6 +590,16 @@ static struct ata_port_info piix_port_in +@@ -550,6 +587,16 @@ static struct ata_port_info piix_port_in .mwdma_mask = 0x06, /* mwdma1-2 ?? CHECK 0 should be ok but slow */ .port_ops = &piix_pata_ops, }, @@ -95,7 +93,7 @@ }; static struct pci_bits piix_enable_bits[] = { -@@ -912,6 +959,11 @@ static void ich_set_dmamode (struct ata_ +@@ -868,6 +915,11 @@ static void ich_set_dmamode (struct ata_ do_pata_set_dmamode(ap, adev, 1); } diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/patches.drivers/libata-hardreset-on-SERR_INTERNAL new/patches.drivers/libata-hardreset-on-SERR_INTERNAL --- old/patches.drivers/libata-hardreset-on-SERR_INTERNAL 2007-03-21 20:44:08.000000000 +0100 +++ new/patches.drivers/libata-hardreset-on-SERR_INTERNAL 1970-01-01 01:00:00.000000000 +0100 @@ -1,26 +0,0 @@ -From: Tejun Heo <htejun(a)gmail.com> -Subject: [PATCH] libata: hardreset on SERR_INTERNAL -References: 241334 - -There was a rare report where SB600 reported SERR_INTERNAL and SRST -couldn't get it out of the failure mode. Hardreset on SERR_INTERNAL. -As the problem is intermittent, whether this fixes the problem or not -hasn't been verified yet, but hardresetting the channel on internal -error is a good idea anyway. - -Signed-off-by: Tejun Heo <htejun(a)gmail.com> ---- - drivers/ata/libata-eh.c | 2 +- - 1 files changed, 1 insertion(+), 1 deletion(-) - ---- linux-2.6.20.orig/drivers/ata/libata-eh.c -+++ linux-2.6.20/drivers/ata/libata-eh.c -@@ -1055,7 +1055,7 @@ static void ata_eh_analyze_serror(struct - } - if (serror & SERR_INTERNAL) { - err_mask |= AC_ERR_SYSTEM; -- action |= ATA_EH_SOFTRESET; -+ action |= ATA_EH_HARDRESET; - } - if (serror & (SERR_PHYRDY_CHG | SERR_DEV_XCHG)) - ata_ehi_hotplugged(&ehc->i); diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/patches.drivers/nozomi.patch new/patches.drivers/nozomi.patch --- old/patches.drivers/nozomi.patch 2007-03-21 19:52:23.000000000 +0100 +++ new/patches.drivers/nozomi.patch 2007-05-26 11:06:20.000000000 +0200 @@ -20,9 +20,9 @@ drivers/char/nozomi.c | 2251 ++++++++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 2262 insertions(+) ---- a/drivers/char/Kconfig -+++ b/drivers/char/Kconfig -@@ -372,6 +372,16 @@ config ISTALLION +--- linux-2.6.21.orig/drivers/char/Kconfig ++++ linux-2.6.21/drivers/char/Kconfig +@@ -374,6 +374,16 @@ config ISTALLION To compile this driver as a module, choose M here: the module will be called istallion. @@ -39,8 +39,8 @@ config AU1000_UART bool "Enable Au1000 UART Support" depends on SERIAL_NONSTANDARD && MIPS ---- a/drivers/char/Makefile -+++ b/drivers/char/Makefile +--- linux-2.6.21.orig/drivers/char/Makefile ++++ linux-2.6.21/drivers/char/Makefile @@ -25,6 +25,7 @@ obj-$(CONFIG_SERIAL167) += serial167.o obj-$(CONFIG_CYCLADES) += cyclades.o obj-$(CONFIG_STALLION) += stallion.o @@ -50,7 +50,7 @@ obj-$(CONFIG_SPECIALIX) += specialix.o obj-$(CONFIG_MOXA_INTELLIO) += moxa.o --- /dev/null -+++ b/drivers/char/nozomi.c ++++ linux-2.6.21/drivers/char/nozomi.c @@ -0,0 +1,2251 @@ +/* nozomi.c -- HSDPA driver Broadband Wireless Data Card - Globe Trotter +* diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/patches.drivers/ppc64-adb new/patches.drivers/ppc64-adb --- old/patches.drivers/ppc64-adb 2007-01-12 20:45:20.000000000 +0100 +++ new/patches.drivers/ppc64-adb 2007-05-26 11:06:20.000000000 +0200 @@ -9,8 +9,8 @@ drivers/macintosh/adbhid.c | 6 +++++- 3 files changed, 10 insertions(+), 2 deletions(-) ---- linux-2.6.19.orig/drivers/macintosh/adb.c -+++ linux-2.6.19/drivers/macintosh/adb.c +--- linux-2.6.21.orig/drivers/macintosh/adb.c ++++ linux-2.6.21/drivers/macintosh/adb.c @@ -296,6 +296,10 @@ int __init adb_init(void) if (!machine_is(chrp) && !machine_is(powermac)) return 0; @@ -22,8 +22,8 @@ #ifdef CONFIG_MAC if (!MACH_IS_MAC) return 0; ---- linux-2.6.19.orig/drivers/macintosh/adbhid.c -+++ linux-2.6.19/drivers/macintosh/adbhid.c +--- linux-2.6.21.orig/drivers/macintosh/adbhid.c ++++ linux-2.6.21/drivers/macintosh/adbhid.c @@ -1180,10 +1180,14 @@ init_ms_a3(int id) static int __init adbhid_init(void) @@ -40,9 +40,9 @@ led_request.complete = 1; ---- linux-2.6.19.orig/drivers/macintosh/Kconfig -+++ linux-2.6.19/drivers/macintosh/Kconfig -@@ -4,7 +4,7 @@ menu "Macintosh device drivers" +--- linux-2.6.21.orig/drivers/macintosh/Kconfig ++++ linux-2.6.21/drivers/macintosh/Kconfig +@@ -8,7 +8,7 @@ if MACINTOSH_DRIVERS config ADB bool "Apple Desktop Bus (ADB) support" diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/patches.drivers/sysfs-crash-debugging.patch new/patches.drivers/sysfs-crash-debugging.patch --- old/patches.drivers/sysfs-crash-debugging.patch 2007-03-21 20:44:08.000000000 +0100 +++ new/patches.drivers/sysfs-crash-debugging.patch 2007-05-26 11:06:20.000000000 +0200 @@ -24,9 +24,9 @@ include/linux/sysfs.h | 7 +++++++ 4 files changed, 21 insertions(+) ---- linux-2.6.20.orig/arch/i386/kernel/traps.c -+++ linux-2.6.20/arch/i386/kernel/traps.c -@@ -429,6 +429,7 @@ void die(const char * str, struct pt_reg +--- linux-2.6.21.orig/arch/i386/kernel/traps.c ++++ linux-2.6.21/arch/i386/kernel/traps.c +@@ -415,6 +415,7 @@ void die(const char * str, struct pt_reg #endif if (nl) printk("\n"); @@ -34,9 +34,9 @@ if (notify_die(DIE_OOPS, str, regs, err, current->thread.trap_no, SIGSEGV) != NOTIFY_STOP) { ---- linux-2.6.20.orig/arch/x86_64/kernel/traps.c -+++ linux-2.6.20/arch/x86_64/kernel/traps.c -@@ -533,6 +533,7 @@ void __kprobes __die(const char * str, s +--- linux-2.6.21.orig/arch/x86_64/kernel/traps.c ++++ linux-2.6.21/arch/x86_64/kernel/traps.c +@@ -515,6 +515,7 @@ void __kprobes __die(const char * str, s printk("DEBUG_PAGEALLOC"); #endif printk("\n"); @@ -44,8 +44,8 @@ notify_die(DIE_OOPS, str, regs, err, current->thread.trap_no, SIGSEGV); show_registers(regs); /* Executive summary in case the oops scrolled away */ ---- linux-2.6.20.orig/fs/sysfs/file.c -+++ linux-2.6.20/fs/sysfs/file.c +--- linux-2.6.21.orig/fs/sysfs/file.c ++++ linux-2.6.21/fs/sysfs/file.c @@ -6,6 +6,7 @@ #include <linux/fsnotify.h> #include <linux/kobject.h> @@ -54,9 +54,9 @@ #include <linux/poll.h> #include <linux/list.h> #include <asm/uaccess.h> -@@ -16,6 +17,9 @@ - #define to_subsys(k) container_of(k,struct subsystem,kset.kobj) - #define to_sattr(a) container_of(a,struct subsys_attribute,attr) +@@ -15,6 +16,9 @@ + + #define to_sattr(a) container_of(a,struct subsys_attribute, attr) +/* used in crash dumps to help with debugging */ +static char last_sysfs_file[PATH_MAX]; @@ -64,7 +64,7 @@ /* * Subsystem file operations. * These operations allow subsystems to have files that can be -@@ -283,6 +287,9 @@ static int sysfs_open_file(struct inode +@@ -253,6 +257,9 @@ static int sysfs_open_file(struct inode struct sysfs_buffer * buffer; struct sysfs_ops * ops = NULL; int error = 0; @@ -74,7 +74,7 @@ if (!kobj || !attr) goto Einval; -@@ -368,6 +375,11 @@ static int sysfs_open_file(struct inode +@@ -338,6 +345,11 @@ static int sysfs_open_file(struct inode return error; } @@ -86,8 +86,8 @@ static int sysfs_release(struct inode * inode, struct file * filp) { struct kobject * kobj = to_kobj(filp->f_path.dentry->d_parent); ---- linux-2.6.20.orig/include/linux/sysfs.h -+++ linux-2.6.20/include/linux/sysfs.h +--- linux-2.6.21.orig/include/linux/sysfs.h ++++ linux-2.6.21/include/linux/sysfs.h @@ -134,6 +134,8 @@ extern void sysfs_remove_shadow_dir(stru extern int __must_check sysfs_init(void); ++++++ patches.fixes.tar.bz2 ++++++ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/patches.fixes/acpi_execute_notify_threaded.patch new/patches.fixes/acpi_execute_notify_threaded.patch --- old/patches.fixes/acpi_execute_notify_threaded.patch 1970-01-01 01:00:00.000000000 +0100 +++ new/patches.fixes/acpi_execute_notify_threaded.patch 2007-03-22 12:10:29.000000000 +0100 @@ -0,0 +1,144 @@ +From: Alexey Starikovskiy <alexey.y.starikovskiy(a)intel.com> +Subject: Acpi: created a dedicated workqueue for notify() execution +Patch-mainline: not yet +References: http://bugzilla.kernel.org/show_bug.cgi?id=5534 + +Signed-off-by: Thomas Renninger <trenn(a)suse.de> + + +HP nx6125/nx6325/... machines have a _GPE handler with an infinite +loop sending Notify() events to different ACPI subsystems. + +Notify handler in ACPI driver is a C-routine, which may call ACPI +interpreter again to get access to some ACPI variables +(acpi_evaluate_xxx). +On these HP machines such an evaluation changes state of some variable +and lets the loop above break. + +In the current ACPI implementation Notify requests are being deferred +to the same kacpid workqueue on which the above GPE handler with +infinite loop is executing. Thus we have a deadlock -- loop will +continue to spin, sending notify events, and at the same time +preventing these notify events from being run on a workqueue. All +notify events are deferred, thus we see increase in memory consumption +noticed by author of the thread. Also as GPE handling is bloked, +machines overheat. Eventually by external poll of the same +acpi_evaluate, kacpid is released and all the queued notify events are +free to run, thus 100% cpu utilization by kacpid for several seconds +or more. + +To prevent all these horrors it's needed to not put notify events to +kacpid workqueue by either executing them immediately or putting them +on some other thread. It's dangerous to execute notify events in +place, as it will put several ACPI interpreter stacks on top of each +other (at least 4 in case of nx6125), thus causing kernel stack +overflow. + +First attempt to create a new thread was done by Peter Wainwright +He created a bunch of threads, which were stealing work from a kacpid +workqueue. +This patch appeared in 2.6.15 kernel shipped with Ubuntu 6.06 LTS. + +Second attempt was done by me, I created a new thread for each Notify +event. This worked OK on HP nx machines, but broke Linus' Compaq +n620c, by producing threads with a speed what they stopped the machine +completely. Thus this patch was reverted from 18-rc2 as I remember. +I re-made the patch to create second workqueue just for notify events, +thus hopping it will not break Linus' machine. Patch was tested on the +same HP nx machines in #5534 and #7122, but I did not received reply +from Linus on a test patch sent to him. +Patch went to 19-rc and was rejected with much fanfare again. +There was 4th patch, which inserted schedule_timeout(1) into deferred +execution of kacpid, if we had any notify requests pending, but Linus +decided that it was too complex (involved either changes to workqueue +to see if it's empty or atomic inc/dec). +Now you see last variant which adds yield() to every GPE execution. +http://bugzilla.kernel.org/show_bug.cgi?id=5534 + drivers/acpi/osl.c | 43 ++++++++++++++++++++++++++++++++++++------- + 1 files changed, 36 insertions(+), 7 deletions(-) + +--- linux-2.6.20.orig/drivers/acpi/osl.c ++++ linux-2.6.20/drivers/acpi/osl.c +@@ -76,6 +76,7 @@ static unsigned int acpi_irq_irq; + static acpi_osd_handler acpi_irq_handler; + static void *acpi_irq_context; + static struct workqueue_struct *kacpid_wq; ++static struct workqueue_struct *kacpi_notify_wq; + + static void __init acpi_request_region (struct acpi_generic_address *addr, + unsigned int length, char *desc) +@@ -142,8 +143,9 @@ acpi_status acpi_os_initialize1(void) + return AE_NULL_ENTRY; + } + kacpid_wq = create_singlethread_workqueue("kacpid"); ++ kacpi_notify_wq = create_singlethread_workqueue("kacpi_notify"); + BUG_ON(!kacpid_wq); +- ++ BUG_ON(!kacpi_notify_wq); + return AE_OK; + } + +@@ -155,6 +157,7 @@ acpi_status acpi_os_terminate(void) + } + + destroy_workqueue(kacpid_wq); ++ destroy_workqueue(kacpi_notify_wq); + + return AE_OK; + } +@@ -733,9 +736,27 @@ static void acpi_os_execute_deferred(str + + kfree(dpc); + ++ /* Yield cpu to notify thread */ ++ cond_resched(); ++ ++ return; ++} ++ ++static void acpi_os_execute_notify(struct work_struct *work) ++{ ++ struct acpi_os_dpc *dpc = container_of(work, struct acpi_os_dpc, work); ++ if (!dpc) { ++ printk(KERN_ERR PREFIX "Invalid (NULL) context\n"); ++ return; ++ } ++ ++ dpc->function(dpc->context); ++ kfree(dpc); ++ + return; + } + ++ + /******************************************************************************* + * + * FUNCTION: acpi_os_execute +@@ -782,13 +803,21 @@ acpi_status acpi_os_execute(acpi_execute + dpc->function = function; + dpc->context = context; + +- INIT_WORK(&dpc->work, acpi_os_execute_deferred); +- if (!queue_work(kacpid_wq, &dpc->work)) { +- ACPI_DEBUG_PRINT((ACPI_DB_ERROR, +- "Call to queue_work() failed.\n")); +- kfree(dpc); +- status = AE_ERROR; ++ if (type == OSL_NOTIFY_HANDLER) { ++ INIT_WORK(&dpc->work, acpi_os_execute_notify); ++ if (!queue_work(kacpi_notify_wq, &dpc->work)) { ++ kfree(dpc); ++ status = AE_ERROR; ++ } + } ++ else { ++ INIT_WORK(&dpc->work, acpi_os_execute_deferred); ++ if (!queue_work(kacpid_wq, &dpc->work)) { ++ kfree(dpc); ++ status = AE_ERROR; ++ } ++ } ++ + + return_ACPI_STATUS(status); + } diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/patches.fixes/acpi_force-fan-active.patch new/patches.fixes/acpi_force-fan-active.patch --- old/patches.fixes/acpi_force-fan-active.patch 2007-02-15 14:42:39.000000000 +0100 +++ new/patches.fixes/acpi_force-fan-active.patch 2007-05-26 11:06:20.000000000 +0200 @@ -7,13 +7,11 @@ --- drivers/acpi/thermal.c | 6 ++++++ - 1 file changed, 6 insertions(+) + 1 files changed, 6 insertions(+) -Index: linux-2.6.20/drivers/acpi/thermal.c -=================================================================== ---- linux-2.6.20.orig/drivers/acpi/thermal.c -+++ linux-2.6.20/drivers/acpi/thermal.c -@@ -605,8 +605,14 @@ static void acpi_thermal_active(struct a +--- linux-2.6.21.orig/drivers/acpi/thermal.c ++++ linux-2.6.21/drivers/acpi/thermal.c +@@ -593,8 +593,14 @@ static void acpi_thermal_active(struct a if (active->temperature > maxtemp) tz->state.active_index = i; maxtemp = active->temperature; diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/patches.fixes/dm_check_device_area.diff new/patches.fixes/dm_check_device_area.diff --- old/patches.fixes/dm_check_device_area.diff 2006-09-20 20:33:08.000000000 +0200 +++ new/patches.fixes/dm_check_device_area.diff 1970-01-01 01:00:00.000000000 +0100 @@ -1,26 +0,0 @@ -Subject: dm:check_device_area fails on DASD devices during table create -From: Mike Anderson <andmike(a)us.ibm.com> -References: 158777 - LTC22470 - -Allow check_device_area to succeed if a device has an i_size of zero. This -addresses an issue seen on DASD devices setting up a multipath table for -paths in online and offline state. - -Signed-off-by: Mike Anderson <andmike(a)us.ibm.com> -Signed-off-by: Hannes Reinecke <hare(a)suse.de> - - drivers/md/dm-table.c | 3 ++- - 1 files changed, 2 insertions(+), 1 deletion(-) - ---- linux-2.6.18.orig/drivers/md/dm-table.c -+++ linux-2.6.18/drivers/md/dm-table.c -@@ -432,7 +432,8 @@ static int check_device_area(struct dm_d - { - sector_t dev_size; - dev_size = dd->bdev->bd_inode->i_size >> SECTOR_SHIFT; -- return ((start < dev_size) && (len <= (dev_size - start))); -+ return dev_size ? -+ ((start < dev_size) && (len <= (dev_size - start))) : 1; - } - - /* diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/patches.fixes/ipv6-no-autoconf new/patches.fixes/ipv6-no-autoconf --- old/patches.fixes/ipv6-no-autoconf 2007-03-21 20:44:08.000000000 +0100 +++ new/patches.fixes/ipv6-no-autoconf 2007-05-26 11:06:20.000000000 +0200 @@ -17,17 +17,17 @@ net/ipv6/addrconf.c | 2 ++ 1 files changed, 2 insertions(+) ---- linux-2.6.20.orig/net/ipv6/addrconf.c -+++ linux-2.6.20/net/ipv6/addrconf.c -@@ -2489,6 +2489,7 @@ static void addrconf_dad_start(struct in +--- linux-2.6.21.orig/net/ipv6/addrconf.c ++++ linux-2.6.21/net/ipv6/addrconf.c +@@ -2589,6 +2589,7 @@ static void addrconf_dad_start(struct in spin_lock_bh(&ifp->lock); if (dev->flags&(IFF_NOARP|IFF_LOOPBACK) || + !(dev->flags&IFF_MULTICAST) || !(ifp->flags&IFA_F_TENTATIVE) || ifp->flags & IFA_F_NODAD) { - ifp->flags &= ~IFA_F_TENTATIVE; -@@ -2574,6 +2575,7 @@ static void addrconf_dad_completed(struc + ifp->flags &= ~(IFA_F_TENTATIVE|IFA_F_OPTIMISTIC); +@@ -2682,6 +2683,7 @@ static void addrconf_dad_completed(struc if (ifp->idev->cnf.forwarding == 0 && ifp->idev->cnf.rtr_solicits > 0 && (dev->flags&IFF_LOOPBACK) == 0 && diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/patches.fixes/loop-barriers new/patches.fixes/loop-barriers --- old/patches.fixes/loop-barriers 2007-01-09 01:56:04.000000000 +0100 +++ new/patches.fixes/loop-barriers 2007-05-26 11:06:20.000000000 +0200 @@ -14,9 +14,9 @@ drivers/block/loop.c | 51 +++++++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 51 insertions(+) ---- linux-2.6.19.orig/drivers/block/loop.c -+++ linux-2.6.19/drivers/block/loop.c -@@ -199,6 +199,38 @@ lo_do_transfer(struct loop_device *lo, i +--- linux-2.6.21.orig/drivers/block/loop.c ++++ linux-2.6.21/drivers/block/loop.c +@@ -198,6 +198,38 @@ lo_do_transfer(struct loop_device *lo, i return lo->transfer(lo, cmd, rpage, roffs, lpage, loffs, size, rblock); } @@ -55,7 +55,7 @@ /** * do_lo_send_aops - helper for writing data to a loop device * -@@ -211,11 +243,18 @@ static int do_lo_send_aops(struct loop_d +@@ -210,11 +242,18 @@ static int do_lo_send_aops(struct loop_d struct file *file = lo->lo_backing_file; /* kudos to NFsckingS */ struct address_space *mapping = file->f_mapping; const struct address_space_operations *aops = mapping->a_ops; @@ -74,7 +74,7 @@ index = pos >> PAGE_CACHE_SHIFT; offset = pos & ((pgoff_t)PAGE_CACHE_SIZE - 1); bv_offs = bvec->bv_offset; -@@ -277,6 +316,15 @@ static int do_lo_send_aops(struct loop_d +@@ -272,6 +311,15 @@ static int do_lo_send_aops(struct loop_d page_cache_release(page); } ret = 0; @@ -90,7 +90,7 @@ out: mutex_unlock(&mapping->host->i_mutex); return ret; -@@ -758,6 +806,9 @@ static int loop_set_fd(struct loop_devic +@@ -753,6 +801,9 @@ static int loop_set_fd(struct loop_devic if (!(file->f_mode & FMODE_WRITE)) lo_flags |= LO_FLAGS_READ_ONLY; diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/patches.fixes/loop-barriers2 new/patches.fixes/loop-barriers2 --- old/patches.fixes/loop-barriers2 2007-01-09 01:56:04.000000000 +0100 +++ new/patches.fixes/loop-barriers2 2007-05-26 11:06:20.000000000 +0200 @@ -8,9 +8,9 @@ drivers/block/loop.c | 12 ++++++++++++ 1 files changed, 12 insertions(+) ---- linux-2.6.19.orig/drivers/block/loop.c -+++ linux-2.6.19/drivers/block/loop.c -@@ -519,12 +519,24 @@ static int do_bio_filebacked(struct loop +--- linux-2.6.21.orig/drivers/block/loop.c ++++ linux-2.6.21/drivers/block/loop.c +@@ -514,12 +514,24 @@ static int do_bio_filebacked(struct loop { loff_t pos; int ret; diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/patches.fixes/maybe_unused.patch new/patches.fixes/maybe_unused.patch --- old/patches.fixes/maybe_unused.patch 2007-05-23 11:44:04.000000000 +0200 +++ new/patches.fixes/maybe_unused.patch 1970-01-01 01:00:00.000000000 +0100 @@ -1,42 +0,0 @@ -commit 0d7ebbbc6eaa5539f78ab20ed6ff1725a4e332ef -Author: David Rientjes <rientjes(a)google.com> -Date: Wed May 9 02:35:27 2007 -0700 -Patch-mainline: 2.6.22 - - compiler: introduce __used and __maybe_unused - - __used is defined to be __attribute__((unused)) for all pre-3.3 gcc - compilers to suppress warnings for unused functions because perhaps they - are referenced only in inline assembly. It is defined to be - __attribute__((used)) for gcc 3.3 and later so that the code is still - emitted for such functions. - - __maybe_unused is defined to be __attribute__((unused)) for both function - and variable use if it could possibly be unreferenced due to the evaluation - of preprocessor macros. Function prototypes shall be marked with - __maybe_unused if the actual definition of the function is dependant on - preprocessor macros. - - No update to compiler-intel.h is necessary because ICC supports both - __attribute__((used)) and __attribute__((unused)) as specified by the gcc - manual. - - __attribute_used__ is deprecated and will be removed once all current - code is converted to using __used. - - Cc: Rusty Russell <rusty(a)rustcorp.com.au> - Cc: Adrian Bunk <bunk(a)stusta.de> - Signed-off-by: David Rientjes <rientjes(a)google.com> - Signed-off-by: Andrew Morton <akpm(a)linux-foundation.org> - Signed-off-by: Linus Torvalds <torvalds(a)linux-foundation.org> - -diff --git a/include/linux/compiler-gcc.h b/include/linux/compiler-gcc.h -index a9f7947..03ec231 100644 ---- a/include/linux/compiler-gcc.h -+++ b/include/linux/compiler-gcc.h -@@ -40,3 +40,4 @@ #define __printf(a,b) __attribute__((f - #define noinline __attribute__((noinline)) - #define __attribute_pure__ __attribute__((pure)) - #define __attribute_const__ __attribute__((__const__)) -+#define __maybe_unused __attribute__((unused)) - diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/patches.fixes/nfs-readdir-timestamp new/patches.fixes/nfs-readdir-timestamp --- old/patches.fixes/nfs-readdir-timestamp 2007-03-21 20:44:08.000000000 +0100 +++ new/patches.fixes/nfs-readdir-timestamp 1970-01-01 01:00:00.000000000 +0100 @@ -1,60 +0,0 @@ -From: NeilBrown <neilb(a)suse.de> -Subject: Set meaningful value for fattr->time_start in readdirplus results. -Patch-mainline: no -References: 244967 - - -The 'fattr' structure filled in by nfs3_decode_direct does not get a -value for ->time_start set. -Thus if an entry is for an inode that we already have in cache, -when nfs_readdir_lookup calls nfs_fhget, it will call nfs_refresh_inode -and may update the inode with out-of-date information. - -Directories are read a page at a time, so each page could have a -different timestamp that "should" be used to set the time_start for -the fattr for info in that page. However storing the timestamp per -page is awkward. (We could stick in the first 4 bytes and only read 4092 -bytes, but that is a bigger code change than I was interested it). - -This patch records the timestamp when the first page of a directory is -read and uses it to set the time_start for the fattr for each each -entry read from the directory. This if an inode has been updated more -recently than the directory was read, that information will not be -destroyed. - -Signed-off-by: Neil Brown <neilb(a)suse.de> - -### Diffstat output - fs/nfs/dir.c | 4 ++++ - 1 files changed, 4 insertions(+) - -Acked-by: - -diff .prev/fs/nfs/dir.c ./fs/nfs/dir.c ---- linux-2.6.20.orig/fs/nfs/dir.c -+++ linux-2.6.20/fs/nfs/dir.c -@@ -154,6 +154,7 @@ typedef struct { - decode_dirent_t decode; - int plus; - int error; -+ unsigned long timestamp; - } nfs_readdir_descriptor_t; - - /* Now we cache directories properly, by stuffing the dirent -@@ -207,6 +208,8 @@ int nfs_readdir_filler(nfs_readdir_descr - /* Should never happen */ - nfs_zap_mapping(inode, inode->i_mapping); - } -+ if (page->index == 0) -+ desc->timestamp = timestamp; - unlock_page(page); - return 0; - error: -@@ -1151,6 +1154,7 @@ static struct dentry *nfs_readdir_lookup - if (dentry == NULL) - return NULL; - dentry->d_op = NFS_PROTO(dir)->dentry_ops; -+ entry->fattr->time_start = desc->timestamp; - inode = nfs_fhget(dentry->d_sb, entry->fh, entry->fattr); - if (IS_ERR(inode)) { - dput(dentry); diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/patches.fixes/oom-warning new/patches.fixes/oom-warning --- old/patches.fixes/oom-warning 2007-03-21 20:44:08.000000000 +0100 +++ new/patches.fixes/oom-warning 2007-05-26 11:06:20.000000000 +0200 @@ -11,9 +11,9 @@ mm/page_alloc.c | 8 +++++++- 1 files changed, 7 insertions(+), 1 deletion(-) ---- linux-2.6.20.orig/mm/page_alloc.c -+++ linux-2.6.20/mm/page_alloc.c -@@ -1390,7 +1390,13 @@ nofail_alloc: +--- linux-2.6.21.orig/mm/page_alloc.c ++++ linux-2.6.21/mm/page_alloc.c +@@ -1363,7 +1363,13 @@ nofail_alloc: nopage: if (!(gfp_mask & __GFP_NOWARN) && printk_ratelimit()) { diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/patches.fixes/parport-mutex new/patches.fixes/parport-mutex --- old/patches.fixes/parport-mutex 2006-08-29 11:13:02.000000000 +0200 +++ new/patches.fixes/parport-mutex 2007-05-26 11:06:20.000000000 +0200 @@ -23,11 +23,9 @@ drivers/char/lp.c | 3 +++ 1 files changed, 3 insertions(+) -Index: build/drivers/char/lp.c -=================================================================== ---- build.orig/drivers/char/lp.c -+++ build/drivers/char/lp.c -@@ -616,9 +616,12 @@ static int lp_ioctl(struct inode *inode, +--- linux-2.6.21.orig/drivers/char/lp.c ++++ linux-2.6.21/drivers/char/lp.c +@@ -612,9 +612,12 @@ static int lp_ioctl(struct inode *inode, return -EFAULT; break; case LPGETSTATUS: diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/patches.fixes/remount-no-shrink-dcache new/patches.fixes/remount-no-shrink-dcache --- old/patches.fixes/remount-no-shrink-dcache 2007-01-12 20:45:20.000000000 +0100 +++ new/patches.fixes/remount-no-shrink-dcache 2007-05-26 11:06:20.000000000 +0200 @@ -12,9 +12,9 @@ fs/super.c | 36 +++++++++++++++++++++++------------- 1 files changed, 23 insertions(+), 13 deletions(-) ---- linux-2.6.19.orig/fs/super.c -+++ linux-2.6.19/fs/super.c -@@ -576,16 +576,10 @@ static void mark_files_ro(struct super_b +--- linux-2.6.21.orig/fs/super.c ++++ linux-2.6.21/fs/super.c +@@ -577,16 +577,10 @@ static void mark_files_ro(struct super_b file_list_unlock(); } @@ -35,7 +35,7 @@ { int retval; -@@ -595,13 +589,14 @@ int do_remount_sb(struct super_block *sb +@@ -596,13 +590,14 @@ int do_remount_sb(struct super_block *sb #endif if (flags & MS_RDONLY) acct_auto_close(sb); @@ -52,7 +52,7 @@ mark_files_ro(sb); else if (!fs_may_remount_ro(sb)) return -EBUSY; -@@ -618,6 +613,21 @@ int do_remount_sb(struct super_block *sb +@@ -619,6 +614,21 @@ int do_remount_sb(struct super_block *sb return 0; } @@ -74,7 +74,7 @@ static void do_emergency_remount(unsigned long foo) { struct super_block *sb; -@@ -861,7 +871,7 @@ int get_sb_single(struct file_system_typ +@@ -850,7 +860,7 @@ int get_sb_single(struct file_system_typ } s->s_flags |= MS_ACTIVE; } diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/patches.fixes/s2io-longlong new/patches.fixes/s2io-longlong --- old/patches.fixes/s2io-longlong 1970-01-01 01:00:00.000000000 +0100 +++ new/patches.fixes/s2io-longlong 2007-05-26 10:58:47.000000000 +0200 @@ -0,0 +1,36 @@ +From: schwab(a)suse.de +Subject: Avoid switch on long long +Patch-mainline: submitted + +A switch on long long causes gcc to generate a reference to __ucmpdi2 on +ppc32. Avoid that by casting to int, since the value is only a small +integer anyway. + +Signed-off-by: Andreas Schwab <schwab(a)suse.de> + +--- + drivers/net/s2io.c | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +Index: linux-2.6.21/drivers/net/s2io.c +=================================================================== +--- linux-2.6.21.orig/drivers/net/s2io.c 2007-05-26 10:52:42.000000000 +0200 ++++ linux-2.6.21/drivers/net/s2io.c 2007-05-26 10:53:09.000000000 +0200 +@@ -2898,7 +2898,7 @@ static void tx_intr_handler(struct fifo_ + + /* update t_code statistics */ + err >>= 48; +- switch(err) { ++ switch((int)err) { + case 2: + nic->mac_control.stats_info->sw_stat. + tx_buf_abort_cnt++; +@@ -6825,7 +6825,7 @@ static int rx_osm_handler(struct ring_in + sp->mac_control.stats_info->sw_stat.parity_err_cnt++; + } + err >>= 48; +- switch(err) { ++ switch((int)err) { + case 1: + sp->mac_control.stats_info->sw_stat. + rx_parity_err_cnt++; diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/patches.fixes/tiocgdev new/patches.fixes/tiocgdev --- old/patches.fixes/tiocgdev 2007-03-21 20:44:08.000000000 +0100 +++ new/patches.fixes/tiocgdev 2007-05-26 11:06:20.000000000 +0200 @@ -5,6 +5,7 @@ add tty ioctl to figure physical device of the console. drivers/char/tty_io.c | 15 +++++++++++++++ + fs/compat_ioctl.c | 1 + include/asm-alpha/ioctls.h | 1 + include/asm-arm/ioctls.h | 1 + include/asm-i386/ioctls.h | 1 + @@ -17,16 +18,16 @@ include/asm-sparc/ioctls.h | 1 + include/asm-sparc64/ioctls.h | 1 + include/asm-x86_64/ioctls.h | 1 + - include/linux/compat_ioctl.h | 1 + 14 files changed, 28 insertions(+) ---- linux-2.6.20.orig/drivers/char/tty_io.c -+++ linux-2.6.20/drivers/char/tty_io.c -@@ -3336,6 +3336,21 @@ int tty_ioctl(struct inode * inode, stru - case TIOCMBIC: - case TIOCMBIS: - return tty_tiocmset(tty, file, cmd, p); -+ /* +Index: linux-2.6.21/drivers/char/tty_io.c +=================================================================== +--- linux-2.6.21.orig/drivers/char/tty_io.c 2007-05-26 09:51:22.000000000 +0200 ++++ linux-2.6.21/drivers/char/tty_io.c 2007-05-26 09:52:01.000000000 +0200 +@@ -3347,6 +3347,21 @@ int tty_ioctl(struct inode * inode, stru + return tioclinux(tty, arg); + #endif + /* + * Without the real device to which /dev/console is connected, + * blogd can not work. + * blogd spawns a pty/tty pair, @@ -41,11 +42,26 @@ + return put_user(ret, (unsigned int __user *)p); + } + - } - if (tty->driver->ioctl) { - retval = (tty->driver->ioctl)(tty, file, cmd, arg); ---- linux-2.6.20.orig/include/asm-alpha/ioctls.h -+++ linux-2.6.20/include/asm-alpha/ioctls.h ++ /* + * Break handling + */ + case TIOCSBRK: /* Turn break on, unconditionally */ +Index: linux-2.6.21/fs/compat_ioctl.c +=================================================================== +--- linux-2.6.21.orig/fs/compat_ioctl.c 2007-05-26 09:51:29.000000000 +0200 ++++ linux-2.6.21/fs/compat_ioctl.c 2007-05-26 09:51:47.000000000 +0200 +@@ -2434,6 +2434,7 @@ COMPATIBLE_IOCTL(TCSETSW) + COMPATIBLE_IOCTL(TCSETSF) + COMPATIBLE_IOCTL(TIOCLINUX) + COMPATIBLE_IOCTL(TIOCSBRK) ++COMPATIBLE_IOCTL(TIOCGDEV) + COMPATIBLE_IOCTL(TIOCCBRK) + ULONG_IOCTL(TIOCMIWAIT) + COMPATIBLE_IOCTL(TIOCGICOUNT) +Index: linux-2.6.21/include/asm-alpha/ioctls.h +=================================================================== +--- linux-2.6.21.orig/include/asm-alpha/ioctls.h 2007-04-26 05:08:32.000000000 +0200 ++++ linux-2.6.21/include/asm-alpha/ioctls.h 2007-05-26 09:51:47.000000000 +0200 @@ -91,6 +91,7 @@ #define TIOCGSID 0x5429 /* Return the session ID of FD */ #define TIOCGPTN _IOR('T',0x30, unsigned int) /* Get Pty Number (of pty-mux device) */ @@ -54,8 +70,10 @@ #define TIOCSERCONFIG 0x5453 #define TIOCSERGWILD 0x5454 ---- linux-2.6.20.orig/include/asm-arm/ioctls.h -+++ linux-2.6.20/include/asm-arm/ioctls.h +Index: linux-2.6.21/include/asm-arm/ioctls.h +=================================================================== +--- linux-2.6.21.orig/include/asm-arm/ioctls.h 2007-04-26 05:08:32.000000000 +0200 ++++ linux-2.6.21/include/asm-arm/ioctls.h 2007-05-26 09:51:47.000000000 +0200 @@ -48,6 +48,7 @@ #define TIOCGSID 0x5429 /* Return the session ID of FD */ #define TIOCGPTN _IOR('T',0x30, unsigned int) /* Get Pty Number (of pty-mux device) */ @@ -64,18 +82,22 @@ #define FIONCLEX 0x5450 /* these numbers need to be adjusted. */ #define FIOCLEX 0x5451 ---- linux-2.6.20.orig/include/asm-i386/ioctls.h -+++ linux-2.6.20/include/asm-i386/ioctls.h -@@ -49,6 +49,7 @@ - #define TIOCGSID 0x5429 /* Return the session ID of FD */ +Index: linux-2.6.21/include/asm-i386/ioctls.h +=================================================================== +--- linux-2.6.21.orig/include/asm-i386/ioctls.h 2007-05-26 09:51:34.000000000 +0200 ++++ linux-2.6.21/include/asm-i386/ioctls.h 2007-05-26 09:51:47.000000000 +0200 +@@ -53,6 +53,7 @@ + #define TCSETSF2 _IOW('T',0x2D, struct termios2) #define TIOCGPTN _IOR('T',0x30, unsigned int) /* Get Pty Number (of pty-mux device) */ #define TIOCSPTLCK _IOW('T',0x31, int) /* Lock/unlock Pty */ +#define TIOCGDEV _IOR('T',0x32, unsigned int) /* Get real dev no below /dev/console */ #define FIONCLEX 0x5450 #define FIOCLEX 0x5451 ---- linux-2.6.20.orig/include/asm-ia64/ioctls.h -+++ linux-2.6.20/include/asm-ia64/ioctls.h +Index: linux-2.6.21/include/asm-ia64/ioctls.h +=================================================================== +--- linux-2.6.21.orig/include/asm-ia64/ioctls.h 2007-04-26 05:08:32.000000000 +0200 ++++ linux-2.6.21/include/asm-ia64/ioctls.h 2007-05-26 09:51:47.000000000 +0200 @@ -55,6 +55,7 @@ #define TIOCGSID 0x5429 /* Return the session ID of FD */ #define TIOCGPTN _IOR('T',0x30, unsigned int) /* Get Pty Number (of pty-mux device) */ @@ -84,8 +106,10 @@ #define FIONCLEX 0x5450 /* these numbers need to be adjusted. */ #define FIOCLEX 0x5451 ---- linux-2.6.20.orig/include/asm-m68k/ioctls.h -+++ linux-2.6.20/include/asm-m68k/ioctls.h +Index: linux-2.6.21/include/asm-m68k/ioctls.h +=================================================================== +--- linux-2.6.21.orig/include/asm-m68k/ioctls.h 2007-04-26 05:08:32.000000000 +0200 ++++ linux-2.6.21/include/asm-m68k/ioctls.h 2007-05-26 09:51:47.000000000 +0200 @@ -48,6 +48,7 @@ #define TIOCGSID 0x5429 /* Return the session ID of FD */ #define TIOCGPTN _IOR('T',0x30, unsigned int) /* Get Pty Number (of pty-mux device) */ @@ -94,8 +118,10 @@ #define FIONCLEX 0x5450 /* these numbers need to be adjusted. */ #define FIOCLEX 0x5451 ---- linux-2.6.20.orig/include/asm-mips/ioctls.h -+++ linux-2.6.20/include/asm-mips/ioctls.h +Index: linux-2.6.21/include/asm-mips/ioctls.h +=================================================================== +--- linux-2.6.21.orig/include/asm-mips/ioctls.h 2007-04-26 05:08:32.000000000 +0200 ++++ linux-2.6.21/include/asm-mips/ioctls.h 2007-05-26 09:51:47.000000000 +0200 @@ -79,6 +79,7 @@ #define TIOCGSID 0x7416 /* Return the session ID of FD */ #define TIOCGPTN _IOR('T',0x30, unsigned int) /* Get Pty Number (of pty-mux device) */ @@ -104,8 +130,10 @@ /* I hope the range from 0x5480 on is free ... */ #define TIOCSCTTY 0x5480 /* become controlling tty */ ---- linux-2.6.20.orig/include/asm-powerpc/ioctls.h -+++ linux-2.6.20/include/asm-powerpc/ioctls.h +Index: linux-2.6.21/include/asm-powerpc/ioctls.h +=================================================================== +--- linux-2.6.21.orig/include/asm-powerpc/ioctls.h 2007-04-26 05:08:32.000000000 +0200 ++++ linux-2.6.21/include/asm-powerpc/ioctls.h 2007-05-26 09:51:47.000000000 +0200 @@ -91,6 +91,7 @@ #define TIOCGSID 0x5429 /* Return the session ID of FD */ #define TIOCGPTN _IOR('T',0x30, unsigned int) /* Get Pty Number (of pty-mux device) */ @@ -114,8 +142,10 @@ #define TIOCSERCONFIG 0x5453 #define TIOCSERGWILD 0x5454 ---- linux-2.6.20.orig/include/asm-s390/ioctls.h -+++ linux-2.6.20/include/asm-s390/ioctls.h +Index: linux-2.6.21/include/asm-s390/ioctls.h +=================================================================== +--- linux-2.6.21.orig/include/asm-s390/ioctls.h 2007-04-26 05:08:32.000000000 +0200 ++++ linux-2.6.21/include/asm-s390/ioctls.h 2007-05-26 09:51:47.000000000 +0200 @@ -56,6 +56,7 @@ #define TIOCGSID 0x5429 /* Return the session ID of FD */ #define TIOCGPTN _IOR('T',0x30, unsigned int) /* Get Pty Number (of pty-mux device) */ @@ -124,8 +154,10 @@ #define FIONCLEX 0x5450 /* these numbers need to be adjusted. */ #define FIOCLEX 0x5451 ---- linux-2.6.20.orig/include/asm-sh/ioctls.h -+++ linux-2.6.20/include/asm-sh/ioctls.h +Index: linux-2.6.21/include/asm-sh/ioctls.h +=================================================================== +--- linux-2.6.21.orig/include/asm-sh/ioctls.h 2007-04-26 05:08:32.000000000 +0200 ++++ linux-2.6.21/include/asm-sh/ioctls.h 2007-05-26 09:51:47.000000000 +0200 @@ -80,6 +80,7 @@ #define TIOCGSID _IOR('T', 41, pid_t) /* 0x5429 */ /* Return the session ID of FD */ #define TIOCGPTN _IOR('T',0x30, unsigned int) /* Get Pty Number (of pty-mux device) */ @@ -134,8 +166,10 @@ #define TIOCSERCONFIG _IO('T', 83) /* 0x5453 */ #define TIOCSERGWILD _IOR('T', 84, int) /* 0x5454 */ ---- linux-2.6.20.orig/include/asm-sparc/ioctls.h -+++ linux-2.6.20/include/asm-sparc/ioctls.h +Index: linux-2.6.21/include/asm-sparc/ioctls.h +=================================================================== +--- linux-2.6.21.orig/include/asm-sparc/ioctls.h 2007-04-26 05:08:32.000000000 +0200 ++++ linux-2.6.21/include/asm-sparc/ioctls.h 2007-05-26 09:51:47.000000000 +0200 @@ -15,6 +15,7 @@ #define TCSETS _IOW('T', 9, struct termios) #define TCSETSW _IOW('T', 10, struct termios) @@ -144,8 +178,10 @@ /* Note that all the ioctls that are not available in Linux have a * double underscore on the front to: a) avoid some programs to ---- linux-2.6.20.orig/include/asm-sparc64/ioctls.h -+++ linux-2.6.20/include/asm-sparc64/ioctls.h +Index: linux-2.6.21/include/asm-sparc64/ioctls.h +=================================================================== +--- linux-2.6.21.orig/include/asm-sparc64/ioctls.h 2007-04-26 05:08:32.000000000 +0200 ++++ linux-2.6.21/include/asm-sparc64/ioctls.h 2007-05-26 09:51:47.000000000 +0200 @@ -16,6 +16,7 @@ #define TCSETS _IOW('T', 9, struct termios) #define TCSETSW _IOW('T', 10, struct termios) @@ -154,8 +190,10 @@ /* Note that all the ioctls that are not available in Linux have a * double underscore on the front to: a) avoid some programs to ---- linux-2.6.20.orig/include/asm-x86_64/ioctls.h -+++ linux-2.6.20/include/asm-x86_64/ioctls.h +Index: linux-2.6.21/include/asm-x86_64/ioctls.h +=================================================================== +--- linux-2.6.21.orig/include/asm-x86_64/ioctls.h 2007-04-26 05:08:32.000000000 +0200 ++++ linux-2.6.21/include/asm-x86_64/ioctls.h 2007-05-26 09:51:47.000000000 +0200 @@ -52,6 +52,7 @@ #define TCSETSF2 _IOW('T',0x2D, struct termios2) #define TIOCGPTN _IOR('T',0x30, unsigned int) /* Get Pty Number (of pty-mux device) */ @@ -164,13 +202,3 @@ #define FIONCLEX 0x5450 /* these numbers need to be adjusted. */ #define FIOCLEX 0x5451 ---- linux-2.6.20.orig/include/linux/compat_ioctl.h -+++ linux-2.6.20/include/linux/compat_ioctl.h -@@ -21,6 +21,7 @@ COMPATIBLE_IOCTL(TCSETSW) - COMPATIBLE_IOCTL(TCSETSF) - COMPATIBLE_IOCTL(TIOCLINUX) - COMPATIBLE_IOCTL(TIOCSBRK) -+COMPATIBLE_IOCTL(TIOCGDEV) - COMPATIBLE_IOCTL(TIOCCBRK) - ULONG_IOCTL(TIOCMIWAIT) - COMPATIBLE_IOCTL(TIOCGICOUNT) diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/patches.fixes/tulip-quad-NIC-ifdown new/patches.fixes/tulip-quad-NIC-ifdown --- old/patches.fixes/tulip-quad-NIC-ifdown 2007-01-12 20:45:20.000000000 +0100 +++ new/patches.fixes/tulip-quad-NIC-ifdown 2007-05-26 11:06:20.000000000 +0200 @@ -11,9 +11,9 @@ drivers/net/tulip/tulip_core.c | 4 ++++ 1 files changed, 4 insertions(+) ---- linux-2.6.19.orig/drivers/net/tulip/tulip_core.c -+++ linux-2.6.19/drivers/net/tulip/tulip_core.c -@@ -1798,6 +1798,10 @@ static void __devexit tulip_remove_one ( +--- linux-2.6.21.orig/drivers/net/tulip/tulip_core.c ++++ linux-2.6.21/drivers/net/tulip/tulip_core.c +@@ -1794,6 +1794,10 @@ static void __devexit tulip_remove_one ( return; tp = netdev_priv(dev); ++++++ patches.kernel.org.tar.bz2 ++++++ ++++ 1034563 lines of diff (skipped) ++++++ patches.rpmify.tar.bz2 ++++++ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/patches.rpmify/buildhost new/patches.rpmify/buildhost --- old/patches.rpmify/buildhost 2007-03-21 20:44:08.000000000 +0100 +++ new/patches.rpmify/buildhost 2007-05-26 11:06:26.000000000 +0200 @@ -9,12 +9,12 @@ scripts/mkcompile_h | 13 +++---------- 1 files changed, 3 insertions(+), 10 deletions(-) ---- linux-2.6.20.orig/scripts/mkcompile_h -+++ linux-2.6.20/scripts/mkcompile_h -@@ -47,16 +47,9 @@ UTS_TRUNCATE="sed -e s/\(.\{1,$UTS_LEN\} +--- linux-2.6.21.orig/scripts/mkcompile_h ++++ linux-2.6.21/scripts/mkcompile_h +@@ -60,16 +60,9 @@ UTS_TRUNCATE="sed -e s/\(.\{1,$UTS_LEN\} echo \#define UTS_VERSION \"`echo $UTS_VERSION | $UTS_TRUNCATE`\" - echo \#define LINUX_COMPILE_TIME \"`LC_ALL=C LANG=C date +%T`\" + echo \#define LINUX_COMPILE_TIME \"`date +%T`\" - echo \#define LINUX_COMPILE_BY \"`whoami`\" - echo \#define LINUX_COMPILE_HOST \"`hostname | $UTS_TRUNCATE`\" - @@ -29,5 +29,5 @@ + echo \#define LINUX_COMPILE_HOST \"buildhost\" + echo \#define LINUX_COMPILE_DOMAIN \"suse.de\" - echo \#define LINUX_COMPILER \"`LC_ALL=C LANG=C $CC -v 2>&1 | tail -n 1`\" + echo \#define LINUX_COMPILER \"`$CC -v 2>&1 | tail -n 1`\" ) > .tmpcompile diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/patches.rpmify/build-timestamp new/patches.rpmify/build-timestamp --- old/patches.rpmify/build-timestamp 2005-10-08 06:19:19.000000000 +0200 +++ new/patches.rpmify/build-timestamp 1970-01-01 01:00:00.000000000 +0100 @@ -1,25 +0,0 @@ -Subject: I have no idea, why is this not upstream? -From: someone(a)suse.de - - -mkcompile_h | 7 ++++++- - 1 files changed, 6 insertions(+), 1 deletion(-) - -Index: linux-2.6.13/scripts/mkcompile_h -=================================================================== ---- linux-2.6.13.orig/scripts/mkcompile_h 2005-10-07 21:01:22.000000000 -0700 -+++ linux-2.6.13/scripts/mkcompile_h 2005-10-07 21:03:10.000000000 -0700 -@@ -30,7 +30,12 @@ - CONFIG_FLAGS="" - if [ -n "$SMP" ] ; then CONFIG_FLAGS="SMP"; fi - if [ -n "$PREEMPT" ] ; then CONFIG_FLAGS="$CONFIG_FLAGS PREEMPT"; fi --UTS_VERSION="$UTS_VERSION $CONFIG_FLAGS `LC_ALL=C LANG=C date`" -+if [ -n "$BUILD_TIMESTAMP" ]; then -+ TIMESTAMP="`LC_ALL=C LANG=C date -d "$BUILD_TIMESTAMP"`" -+else -+ TIMESTAMP="`LC_ALL=C LANG=C date`" -+fi -+UTS_VERSION="$UTS_VERSION $CONFIG_FLAGS $TIMESTAMP" - - # Truncate to maximum length - diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/patches.rpmify/rpm-kernel-config new/patches.rpmify/rpm-kernel-config --- old/patches.rpmify/rpm-kernel-config 2007-01-09 01:56:04.000000000 +0100 +++ new/patches.rpmify/rpm-kernel-config 2007-05-26 11:06:26.000000000 +0200 @@ -10,11 +10,11 @@ init/Kconfig | 4 ++++ 1 files changed, 4 insertions(+) ---- linux-2.6.19.orig/init/Kconfig -+++ linux-2.6.19/init/Kconfig -@@ -91,6 +91,10 @@ config LOCALVERSION_AUTO - Note: This requires Perl, and a git repository, but not necessarily - the git or cogito tools to be installed. +--- linux-2.6.21.orig/init/Kconfig ++++ linux-2.6.21/init/Kconfig +@@ -95,6 +95,10 @@ config LOCALVERSION_AUTO + + which is done within the script "scripts/setlocalversion".) +config SUSE_KERNEL + bool ++++++ patches.suse.tar.bz2 ++++++ ++++ 4695 lines of diff (skipped) ++++++ patches.uml.tar.bz2 ++++++ ++++++ patches.xen.tar.bz2 ++++++ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/patches.xen/add-console-use-vt new/patches.xen/add-console-use-vt --- old/patches.xen/add-console-use-vt 2007-03-21 20:44:10.000000000 +0100 +++ new/patches.xen/add-console-use-vt 2007-05-26 11:06:27.000000000 +0200 @@ -9,8 +9,8 @@ include/linux/console.h | 1 + 2 files changed, 7 insertions(+), 1 deletion(-) ---- linux-2.6.20.orig/drivers/char/tty_io.c -+++ linux-2.6.20/drivers/char/tty_io.c +--- linux-2.6.21.orig/drivers/char/tty_io.c ++++ linux-2.6.21/drivers/char/tty_io.c @@ -133,6 +133,8 @@ LIST_HEAD(tty_drivers); /* linked list DEFINE_MUTEX(tty_mutex); EXPORT_SYMBOL(tty_mutex); @@ -20,7 +20,7 @@ #ifdef CONFIG_UNIX98_PTYS extern struct tty_driver *ptm_driver; /* Unix98 pty masters; for /dev/ptmx */ extern int pty_limit; /* Config limit on Unix98 ptys */ -@@ -2532,7 +2534,7 @@ retry_open: +@@ -2574,7 +2576,7 @@ retry_open: goto got_driver; } #ifdef CONFIG_VT @@ -29,7 +29,7 @@ extern struct tty_driver *console_driver; driver = console_driver; index = fg_console; -@@ -3974,6 +3976,8 @@ static int __init tty_init(void) +@@ -4041,6 +4043,8 @@ static int __init tty_init(void) #endif #ifdef CONFIG_VT @@ -38,7 +38,7 @@ cdev_init(&vc0_cdev, &console_fops); if (cdev_add(&vc0_cdev, MKDEV(TTY_MAJOR, 0), 1) || register_chrdev_region(MKDEV(TTY_MAJOR, 0), 1, "/dev/vc/0") < 0) -@@ -3981,6 +3985,7 @@ static int __init tty_init(void) +@@ -4048,6 +4052,7 @@ static int __init tty_init(void) device_create(tty_class, NULL, MKDEV(TTY_MAJOR, 0), "tty0"); vty_init(); @@ -46,8 +46,8 @@ #endif return 0; } ---- linux-2.6.20.orig/include/linux/console.h -+++ linux-2.6.20/include/linux/console.h +--- linux-2.6.21.orig/include/linux/console.h ++++ linux-2.6.21/include/linux/console.h @@ -63,6 +63,7 @@ extern const struct consw dummy_con; /* extern const struct consw vga_con; /* VGA text console */ extern const struct consw newport_con; /* SGI Newport console */ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/patches.xen/allow-i386-crash-kernels-to-handle-x86_64-dumps.patch new/patches.xen/allow-i386-crash-kernels-to-handle-x86_64-dumps.patch --- old/patches.xen/allow-i386-crash-kernels-to-handle-x86_64-dumps.patch 2007-04-30 10:41:28.000000000 +0200 +++ new/patches.xen/allow-i386-crash-kernels-to-handle-x86_64-dumps.patch 1970-01-01 01:00:00.000000000 +0100 @@ -1,66 +0,0 @@ -Subject: allow handling of x86-64 crash dumps on i386 -From: http://xenbits.xensource.com/xen-unstable.hg (tip 14960) -Acked-by: jbeulich(a)novell.com - -From: Ian Campbell <ian.campbell(a)xensource.com> - -The specific case I am encountering is kdump under Xen with a 64 bit -hypervisor and 32 bit kernel/userspace. The dump created is 64 bit due to -the hypervisor but the dump kernel is 32 bit for maximum compatibility. - -It's possibly less likely to be useful in a purely native scenario but I -see no reason to disallow it. - -Signed-off-by: Ian Campbell <ian.campbell(a)xensource.com> -Acked-by: Vivek Goyal <vgoyal(a)in.ibm.com> -Cc: Horms <horms(a)verge.net.au> -Cc: Magnus Damm <magnus.damm(a)gmail.com> -Cc: "Eric W. Biederman" <ebiederm(a)xmission.com> -Cc: Andi Kleen <ak(a)suse.de> -Signed-off-by: Andrew Morton <akpm(a)linux-foundation.org> - -Index: head-2007-04-27/fs/proc/vmcore.c -=================================================================== ---- head-2007-04-27.orig/fs/proc/vmcore.c 2007-04-26 05:08:32.000000000 +0200 -+++ head-2007-04-27/fs/proc/vmcore.c 2007-04-27 12:36:55.000000000 +0200 -@@ -514,7 +514,7 @@ static int __init parse_crash_elf64_head - /* Do some basic Verification. */ - if (memcmp(ehdr.e_ident, ELFMAG, SELFMAG) != 0 || - (ehdr.e_type != ET_CORE) || -- !elf_check_arch(&ehdr) || -+ !vmcore_elf_check_arch(&ehdr) || - ehdr.e_ident[EI_CLASS] != ELFCLASS64 || - ehdr.e_ident[EI_VERSION] != EV_CURRENT || - ehdr.e_version != EV_CURRENT || -Index: head-2007-04-27/include/asm-i386/kexec.h -=================================================================== ---- head-2007-04-27.orig/include/asm-i386/kexec.h 2007-04-27 12:34:30.000000000 +0200 -+++ head-2007-04-27/include/asm-i386/kexec.h 2007-04-27 12:36:55.000000000 +0200 -@@ -47,6 +47,9 @@ - /* The native architecture */ - #define KEXEC_ARCH KEXEC_ARCH_386 - -+/* We can also handle crash dumps from 64 bit kernel. */ -+#define vmcore_elf_check_arch_cross(x) ((x)->e_machine == EM_X86_64) -+ - #define MAX_NOTE_BYTES 1024 - - /* CPU does not save ss and esp on stack if execution is already -Index: head-2007-04-27/include/linux/crash_dump.h -=================================================================== ---- head-2007-04-27.orig/include/linux/crash_dump.h 2007-04-26 05:08:32.000000000 +0200 -+++ head-2007-04-27/include/linux/crash_dump.h 2007-04-27 12:36:55.000000000 +0200 -@@ -14,5 +14,13 @@ extern ssize_t copy_oldmem_page(unsigned - extern const struct file_operations proc_vmcore_operations; - extern struct proc_dir_entry *proc_vmcore; - -+/* Architecture code defines this if there are other possible ELF -+ * machine types, e.g. on bi-arch capable hardware. */ -+#ifndef vmcore_elf_check_arch_cross -+#define vmcore_elf_check_arch_cross(x) 0 -+#endif -+ -+#define vmcore_elf_check_arch(x) (elf_check_arch(x) || vmcore_elf_check_arch_cross(x)) -+ - #endif /* CONFIG_CRASH_DUMP */ - #endif /* LINUX_CRASHDUMP_H */ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/patches.xen/net-csum.patch new/patches.xen/net-csum.patch --- old/patches.xen/net-csum.patch 2007-03-23 09:16:58.000000000 +0100 +++ new/patches.xen/net-csum.patch 2007-05-26 11:06:27.000000000 +0200 @@ -4,11 +4,15 @@ This is only a guess, based on suggestions from Keir Fraser. -Index: head-2007-03-19/net/ipv4/netfilter/ip_nat_proto_tcp.c -=================================================================== ---- head-2007-03-19.orig/net/ipv4/netfilter/ip_nat_proto_tcp.c 2007-03-19 14:37:24.000000000 +0100 -+++ head-2007-03-19/net/ipv4/netfilter/ip_nat_proto_tcp.c 2007-03-19 14:38:33.000000000 +0100 -@@ -134,6 +134,9 @@ tcp_manip_pkt(struct sk_buff **pskb, +--- + net/ipv4/netfilter/nf_nat_proto_tcp.c | 3 +++ + net/ipv4/netfilter/nf_nat_proto_udp.c | 4 ++++ + net/ipv4/xfrm4_output.c | 4 ++++ + 3 files changed, 11 insertions(+) + +--- a/net/ipv4/netfilter/nf_nat_proto_tcp.c 2007-05-02 14:56:11.000000000 -0400 ++++ b/net/ipv4/netfilter/nf_nat_proto_tcp.c 2007-05-24 18:43:41.000000000 -0400 +@@ -132,6 +132,9 @@ tcp_manip_pkt(struct sk_buff **pskb, if (hdrsize < sizeof(*hdr)) return 1; @@ -18,25 +22,22 @@ nf_proto_csum_replace4(&hdr->check, *pskb, oldip, newip, 1); nf_proto_csum_replace2(&hdr->check, *pskb, oldport, newport, 0); return 1; -Index: head-2007-03-19/net/ipv4/netfilter/ip_nat_proto_udp.c -=================================================================== ---- head-2007-03-19.orig/net/ipv4/netfilter/ip_nat_proto_udp.c 2007-03-19 14:37:24.000000000 +0100 -+++ head-2007-03-19/net/ipv4/netfilter/ip_nat_proto_udp.c 2007-03-19 14:38:33.000000000 +0100 -@@ -119,6 +119,9 @@ udp_manip_pkt(struct sk_buff **pskb, +--- a/net/ipv4/netfilter/nf_nat_proto_udp.c 2007-05-02 14:56:11.000000000 -0400 ++++ b/net/ipv4/netfilter/nf_nat_proto_udp.c 2007-05-24 18:44:15.000000000 -0400 +@@ -116,6 +116,10 @@ udp_manip_pkt(struct sk_buff **pskb, + newport = tuple->dst.u.udp.port; portptr = &hdr->dest; } - ++ + if (skb_checksum_setup(*pskb)) + return 0; + if (hdr->check || (*pskb)->ip_summed == CHECKSUM_PARTIAL) { nf_proto_csum_replace4(&hdr->check, *pskb, oldip, newip, 1); - nf_proto_csum_replace2(&hdr->check, *pskb, *portptr, newport, 0); -Index: head-2007-03-19/net/ipv4/xfrm4_output.c -=================================================================== ---- head-2007-03-19.orig/net/ipv4/xfrm4_output.c 2007-03-19 14:37:24.000000000 +0100 -+++ head-2007-03-19/net/ipv4/xfrm4_output.c 2007-03-19 14:40:14.000000000 +0100 -@@ -48,6 +48,10 @@ static int xfrm4_output_one(struct sk_bu + nf_proto_csum_replace2(&hdr->check, *pskb, *portptr, newport, +--- a/net/ipv4/xfrm4_output.c 2007-05-24 18:41:08.000000000 -0400 ++++ b/net/ipv4/xfrm4_output.c 2007-05-24 18:43:41.000000000 -0400 +@@ -47,6 +47,10 @@ static int xfrm4_output_one(struct sk_bu struct xfrm_state *x = dst->xfrm; int err; diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/patches.xen/pmd-shared.patch new/patches.xen/pmd-shared.patch --- old/patches.xen/pmd-shared.patch 2007-03-23 09:16:58.000000000 +0100 +++ new/patches.xen/pmd-shared.patch 1970-01-01 01:00:00.000000000 +0100 @@ -1,17 +0,0 @@ -Subject: xen3 i386 shared kernel PMD -From: http://xenbits.xensource.com/xen-unstable.hg (tip 14422) -Acked-by: jbeulich(a)novell.com - -Index: head-2007-03-19/arch/i386/mm/pageattr.c -=================================================================== ---- head-2007-03-19.orig/arch/i386/mm/pageattr.c 2007-03-19 14:37:24.000000000 +0100 -+++ head-2007-03-19/arch/i386/mm/pageattr.c 2007-03-19 14:40:23.000000000 +0100 -@@ -91,7 +91,7 @@ static void set_pmd_pte(pte_t *kpte, uns - unsigned long flags; - - set_pte_atomic(kpte, pte); /* change init_mm */ -- if (PTRS_PER_PMD > 1) -+ if (HAVE_SHARED_KERNEL_PMD) - return; - - spin_lock_irqsave(&pgd_lock, flags); diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/patches.xen/softlockup-no-idle-hz.patch new/patches.xen/softlockup-no-idle-hz.patch --- old/patches.xen/softlockup-no-idle-hz.patch 2007-04-30 10:41:28.000000000 +0200 +++ new/patches.xen/softlockup-no-idle-hz.patch 2007-05-26 11:06:27.000000000 +0200 @@ -7,13 +7,13 @@ --- head-2007-04-27.orig/include/linux/sched.h 2007-04-27 12:34:34.000000000 +0200 +++ head-2007-04-27/include/linux/sched.h 2007-04-27 12:36:44.000000000 +0200 @@ -223,10 +223,15 @@ extern void update_process_times(int use - extern void scheduler_tick(void); #ifdef CONFIG_DETECT_SOFTLOCKUP +extern unsigned long softlockup_get_next_event(void); extern void softlockup_tick(void); extern void spawn_softlockup_task(void); extern void touch_softlockup_watchdog(void); + extern void touch_all_softlockup_watchdogs(void); #else +static inline unsigned long softlockup_get_next_event(void) +{ ++++++ series.conf ++++++ --- kernel-source/series.conf 2007-05-25 18:14:22.000000000 +0200 +++ /mounts/work_src_done/STABLE/kernel-source/series.conf 2007-05-27 18:39:59.000000000 +0200 @@ -20,6 +20,8 @@ # latest standard kernel patches # DO NOT MODIFY THEM! # Send separate patches upstream if you find a problem... + patches.kernel.org/patch-2.6.22-rc2 + patches.kernel.org/patch-2.6.22-rc2-git7 ######################################################## # @@ -33,7 +35,6 @@ patches.rpmify/rpm-kernel-config patches.rpmify/buildhost patches.rpmify/cloneconfig.diff - patches.rpmify/build-timestamp # every patch below is optional patches.suse/error-implicit-function-declaration.patch @@ -43,10 +44,6 @@ # workarounds - # #302001 - patches.suse/add-IV-generation-method-null-to-dm-crypt - patches.fixes/maybe_unused.patch - ######################################################## # # patches for certain architectures @@ -68,37 +65,24 @@ # numa mempolicy # suse ppc - patches.arch/ppc-generic-check_legacy_ioport.patch - patches.arch/ppc-pci-hostbridge-window.patch - patches.arch/ppc-of_device-modalias.patch patches.arch/ppc-vio-modalias.patch - patches.arch/ppc-macio-modalias.patch - patches.arch/ppc-pegasos-via-ide-irq-quirk.patch patches.arch/ppc-efika-modalias.patch patches.arch/ppc-efika-bestcomm-ethernet.patch patches.arch/ppc-efika-mpc52xx-ac97.patch patches.arch/ppc-efika-of_device-generic-uevent.patch patches.arch/ppc-efika-psc-console-autodetection.patch - patches.arch/ppc-ps3-generic-fbdev-updates.patch - patches.arch/ppc-ps3-linus.patch patches.arch/ppc-ps3-device-init.patch patches.arch/ppc-ps3-bt-event-filter.patch patches.arch/ppc-ps3-kexec-fixes.patch patches.arch/ppc-ps3-system-bus-rework.patch - patches.arch/ppc-ps3-allow-duplicate-lmb_reserve.diff - patches.arch/ppc-ps3-automatically-lmb_reserve-initrd.diff - patches.arch/ppc-ps3-ps3fb.patch patches.arch/ppc-ps3-hack-fbcon-shutdown.patch - patches.arch/ppc-spufs.patch - patches.arch/ppc-ps3-ps3-fix-slowdown-bug.patch patches.arch/ppc-ps3-cell-usb-workaround-ehci-iso.diff patches.arch/ppc-ps3-sys-manager-fix-reboot.patch patches.arch/ppc-ps3-vuart-as-module.patch patches.arch/ppc-ps3-gelic.patch patches.arch/ppc-ps3-gelic-device_symlink.patch patches.arch/ppc-ps3-gelic-module-link.patch - patches.arch/ppc-ps3-gelic_2621.patch patches.arch/spufs-clear-class-0-interrupt.patch patches.arch/spufs-wrap-master-run-bit.patch patches.arch/ppc-ps3-dma-mem-hack.patch @@ -116,6 +100,8 @@ patches.suse/suse-ppc-pmac_zilog-i8250-coexistance.patch patches.suse/suse-ppc32-mol.patch patches.suse/suse-ppc32-mol-kbuild.patch + patches.suse/suse-ppc32-mol-sheep + patches.suse/suse-ppc32-mol-find-devices # suse ppc64 patches.drivers/ppc64-adb @@ -140,7 +126,7 @@ # misc small fixes # ######################################################## - patches.suse/ams-silent-failure.patch + patches.fixes/s2io-longlong ######################################################## # @@ -148,13 +134,13 @@ # ######################################################## +trenn patches.suse/acpi_dsdt_ssdt_initrd_initramfs.patch ++trenn patches.fixes/acpi_execute_notify_threaded.patch # Specific support for vendor-specific features # adds sony and panasonic acpi modules: patches.suse/acpi-hotkeys-extra.diff patches.arch/acpi_asus_strict_model_check.patch patches.suse/acpi_sony_init_fixups.patch - patches.arch/acpi_ibm_notify.patch patches.arch/acpi_processor_exit_acpi_off @@ -177,8 +163,6 @@ # NFS ######################################################## - patches.fixes/nfs-readdir-timestamp - ######################################################## # lockd + statd # @@ -253,10 +237,8 @@ # Storage ######################################################## - patches.drivers/libata-add-waits-for-govault - patches.drivers/libata-hardreset-on-SERR_INTERNAL ++tejun patches.drivers/libata-add-waits-for-govault patches.drivers/libata-ata_piix-vmw-ign-DMA-err - patches.drivers/cciss-add-SG_IO patches.fixes/mptbase-vmware-fix # Remaining SCSI patches (garloff) @@ -277,7 +259,6 @@ ######################################################## # PCI and PCI hotplug ######################################################## - patches.drivers/ati-rs400_200-480-disable-msi ######################################################## # sysfs / driver core @@ -361,11 +342,10 @@ ########################################################## # AppArmor ########################################################## - patches.apparmor/proc_setattr.diff - patches.apparmor/proc_sys_setattr.diff patches.apparmor/security-create.diff patches.apparmor/remove_suid.diff patches.apparmor/vfs-notify_change.diff + patches.apparmor/remove_suid_new_case_in_2.6.22.diff patches.apparmor/security-setattr.diff patches.apparmor/vfs-mkdir.diff patches.apparmor/security-mkdir.diff @@ -441,7 +421,6 @@ patches.fixes/grab-swap-token-oops patches.arch/disable-apic-error - patches.fixes/dm_check_device_area.diff patches.suse/smtnice-disable @@ -481,63 +460,62 @@ # re-basing to a newer xen tree. # split out patches - patches.xen/linux-2.6.19-rc1-kexec-move_segment_code-i386.patch - patches.xen/linux-2.6.19-rc1-kexec-move_segment_code-x86_64.patch - patches.xen/blktap-aio-16_03_06.patch - patches.xen/fix-ide-cd-pio-mode.patch - patches.xen/i386-mach-io-check-nmi.patch - patches.xen/net-csum.patch - patches.xen/pmd-shared.patch - patches.xen/rename-TSS_sysenter_esp0-SYSENTER_stack_esp0.patch - patches.xen/xenoprof-generic.patch - patches.xen/softlockup-no-idle-hz.patch - patches.xen/allow-i386-crash-kernels-to-handle-x86_64-dumps.patch - - # bulk stuff, new files for xen - patches.xen/xen3-auto-xen-arch.diff - patches.xen/xen3-auto-xen-drivers.diff - patches.xen/xen3-auto-include-xen-interface.diff - - # kconfig bits for xen - patches.xen/xen3-auto-xen-kconfig.diff - - # common code changes - patches.xen/xen3-auto-common.diff - patches.xen/xen3-auto-arch-i386.diff -+empty patches.xen/xen3-auto-arch-um.diff - patches.xen/xen3-auto-arch-x86_64.diff - - # newer changeset backports - - # changes outside arch/{i386,x86_64}/xen - patches.xen/xen3-fixup-common - patches.xen/xen3-fixup-arch-i386 -+empty patches.xen/xen3-fixup-arch-um - patches.xen/xen3-fixup-arch-x86_64 - - # ports of other patches - patches.xen/xen3-patch-2.6.18 - patches.xen/xen3-patch-2.6.19 - patches.xen/xen3-patch-2.6.20 - patches.xen/xen3-patch-2.6.21 - patches.xen/xen3-sysfs-crash-debugging.patch -+andrea patches.xen/xen3-silent-stack-overflow - - # bugfixes and enhancements - patches.xen/xen-balloon-min - patches.xen/xen-modular-blktap - patches.xen/xen-x86-panic-no-reboot - patches.xen/xen-i386-panic-on-oops - patches.xen/xen-x86-kconfig-no-cpu_freq - patches.xen/xen-configurable-console - patches.xen/xen-x86_64-init-cleanup - patches.xen/xen-balloon-max-target - patches.xen/xen-x86-dcr-fallback - patches.xen/xen-x86-consistent-nmi - patches.xen/xen-x86-no-lapic - patches.xen/xen-no-video-select - patches.xen/xen-blkback-bimodal-suse - patches.xen/xen-console-default - patches.xen/xen-x86-panic-smp - patches.xen/xen-split-pt-lock - patches.xen/xen-blkif-protocol-fallback-hack ++xen patches.xen/linux-2.6.19-rc1-kexec-move_segment_code-i386.patch ++xen patches.xen/linux-2.6.19-rc1-kexec-move_segment_code-x86_64.patch ++xen patches.xen/blktap-aio-16_03_06.patch ++xen patches.xen/fix-ide-cd-pio-mode.patch ++xen patches.xen/i386-mach-io-check-nmi.patch ++xen patches.xen/net-csum.patch ++xen patches.xen/rename-TSS_sysenter_esp0-SYSENTER_stack_esp0.patch ++xen patches.xen/xenoprof-generic.patch ++xen patches.xen/softlockup-no-idle-hz.patch ++xen ++xen # bulk stuff, new files for xen ++xen patches.xen/xen3-auto-xen-arch.diff ++xen patches.xen/xen3-auto-xen-drivers.diff ++xen patches.xen/xen3-auto-include-xen-interface.diff ++xen ++xen # kconfig bits for xen ++xen patches.xen/xen3-auto-xen-kconfig.diff ++xen ++xen # common code changes ++xen patches.xen/xen3-auto-common.diff ++xen patches.xen/xen3-auto-arch-i386.diff ++xen+empty patches.xen/xen3-auto-arch-um.diff ++xen patches.xen/xen3-auto-arch-x86_64.diff ++xen ++xen # newer changeset backports ++xen ++xen # changes outside arch/{i386,x86_64}/xen ++xen patches.xen/xen3-fixup-common ++xen patches.xen/xen3-fixup-arch-i386 ++xen+empty patches.xen/xen3-fixup-arch-um ++xen patches.xen/xen3-fixup-arch-x86_64 ++xen ++xen # ports of other patches ++xen patches.xen/xen3-patch-2.6.18 ++xen patches.xen/xen3-patch-2.6.19 ++xen patches.xen/xen3-patch-2.6.20 ++xen patches.xen/xen3-patch-2.6.21 ++xen patches.xen/xen3-sysfs-crash-debugging.patch ++xen+andrea patches.xen/xen3-silent-stack-overflow ++xen ++xen ++xen # bugfixes and enhancements ++xen patches.xen/xen-balloon-min ++xen patches.xen/xen-modular-blktap ++xen patches.xen/xen-x86-panic-no-reboot ++xen patches.xen/xen-i386-panic-on-oops ++xen patches.xen/xen-x86-kconfig-no-cpu_freq ++xen patches.xen/xen-configurable-console ++xen patches.xen/xen-x86_64-init-cleanup ++xen patches.xen/xen-balloon-max-target ++xen patches.xen/xen-x86-dcr-fallback ++xen patches.xen/xen-x86-consistent-nmi ++xen patches.xen/xen-x86-no-lapic ++xen patches.xen/xen-no-video-select ++xen patches.xen/xen-blkback-bimodal-suse ++xen patches.xen/xen-console-default ++xen patches.xen/xen-x86-panic-smp ++xen patches.xen/xen-split-pt-lock ++xen patches.xen/xen-blkif-protocol-fallback-hack ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit yast2-storage
by root＠Hilbert.suse.de 31 May '07

31 May '07

Hello community, here is the log from the commit of package yast2-storage checked in at Thu May 31 21:19:44 CEST 2007. -------- --- yast2-storage/yast2-storage.changes 2007-05-24 12:22:45.000000000 +0200 +++ /mounts/work_src_done/STABLE/yast2-storage/yast2-storage.changes 2007-05-31 16:02:36.000000000 +0200 @@ -1,0 +2,18 @@ +Thu May 31 15:53:00 CEST 2007 - fehr(a)suse.de + +- automatically increase GPT before creating partitions (#236404) +- make help option in controller module work (#269888) +- version 2.15.14 + +------------------------------------------------------------------- +Tue May 29 16:20:34 CEST 2007 - aschnell(a)suse.de + +- fixed crash during detection (caused by empty key-value-pair) + (bug #278169) + +------------------------------------------------------------------- +Fri May 25 13:30:04 CEST 2007 - jsrain(a)suse.cz + +- removed outdated translations from .desktop-files (#271209) + +------------------------------------------------------------------- @@ -29 +47 @@ -- adapt to new parted version 1.8.7 ("linux-swap(new)" instead of +- adapt to new parted version 1.8.7 ("linux-swap(new)" instead of Old: ---- yast2-storage-2.15.13.tar.bz2 New: ---- yast2-storage-2.15.14.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-storage.spec ++++++ --- /var/tmp/diff_new_pack.R16870/_old 2007-05-31 21:19:04.000000000 +0200 +++ /var/tmp/diff_new_pack.R16870/_new 2007-05-31 21:19:04.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package yast2-storage (Version 2.15.13) +# spec file for package yast2-storage (Version 2.15.14) # # Copyright (c) 2007 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.15.13 +Version: 2.15.14 Release: 1 License: GNU General Public License (GPL) Group: System/YaST BuildRoot: %{_tmppath}/%{name}-%{version}-build -Source0: yast2-storage-2.15.13.tar.bz2 +Source0: yast2-storage-2.15.14.tar.bz2 prefix: /usr BuildRequires: blocxx-devel docbook-xsl-stylesheets doxygen evms evms-devel gcc-c++ libxcrypt-devel libxslt openssl-devel perl-XML-Writer sablot sgml-skel swig update-desktop-files yast2 yast2-core-devel yast2-devtools yast2-installation yast2-perl-bindings yast2-testsuite # Required only in inst-sys @@ -44,7 +44,7 @@ %prep -%setup -n yast2-storage-2.15.13 +%setup -n yast2-storage-2.15.14 %build %{prefix}/bin/y2tool y2autoconf @@ -169,6 +169,15 @@ %doc %{prefix}/share/doc/packages/yast2-storage/config.xml.description %changelog +* Thu May 31 2007 - fehr(a)suse.de +- automatically increase GPT before creating partitions (#236404) +- make help option in controller module work (#269888) +- version 2.15.14 +* Tue May 29 2007 - aschnell(a)suse.de +- fixed crash during detection (caused by empty key-value-pair) + (bug #278169) +* Fri May 25 2007 - jsrain(a)suse.cz +- removed outdated translations from .desktop-files (#271209) * Thu May 24 2007 - fehr(a)suse.de - add evms-devel to needforbuild - version 2.15.13 ++++++ yast2-storage-2.15.13.tar.bz2 -> yast2-storage-2.15.14.tar.bz2 ++++++ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-storage-2.15.13/controller/src/controller.desktop new/yast2-storage-2.15.14/controller/src/controller.desktop --- old/yast2-storage-2.15.13/controller/src/controller.desktop 2007-05-23 12:45:15.000000000 +0200 +++ new/yast2-storage-2.15.14/controller/src/controller.desktop 2007-05-29 16:14:30.000000000 +0200 @@ -21,36 +21,4 @@ Name=Disk Controller GenericName=Configure the disk controller -Name[cs]=Diskový řadič -GenericName[cs]=Správa diskového řadiče (načítání modulů a parametry) -Name[de]=Festplatten-Controller -GenericName[de]=Umgang mit dem Festplatten-Controller (Laden von Modulen und Parametern) -Name[es]=Controlador de disco -GenericName[es]=Manejo del controlador de disco (carga de módulos y parámetros) -Name[hu]=Lemezvezérlő -GenericName[hu]=Merevlemez vezérlő kezelése (modulok betöltése és annak paraméterei) -Name[it]=Controller di disco -GenericName[it]=Gestione del controller del disco (caricare moduli e parametri) -Name[ko]=디스크 컨트롤러 -GenericName[ko]=디스크 컨트롤러 제어(모듈 적재와 매개변수 지정) -Name[nl]=Disk controller -GenericName[nl]=Disk controller besturing (module laden en parameters) -Name[pt]=Controladora de Disco -GenericName[pt]=Gerenciamento de Controladora de Disco (carga de módulo e parâmetros) -Name[sk]=Radič disku -GenericName[sk]=Podpora radiča disku (načítanie modulu a jeho parametre) -Name[sv]=Diskstyrenhet -GenericName[sv]=Hantering av diskstyrenhet (modulladdning och parametrar) -Name[el]=Ελεγκτής Δίσκου -GenericName[el]=Χειρισμός Ελεγκτή Δίσκου (φόρτωση μονάδας και παραμέτρων) -Name[fr]=Contrôleur disque -GenericName[fr]=Administration du contrôleur disque (chargement du module et paramètres) -Name[ja]=ディスク・コントローラ -GenericName[ja]=ディスク・コントローラの設定 (モジュールのロードとモジュールの引数) -Name[lt]=Disko valdiklis -GenericName[lt]=Disko valdiklio valdymas (modulių įkėlimas ir parametrai) -Name[sl]=Krmilnik diska -GenericName[sl]=Upravljanje s krmilnikom diska (parametri in nalaganje modulov) -Name[tr]=Disk denetleyicisi -GenericName[tr]=Disk denetleyicisi kullanımı (modül yükleme ve parametreleri) X-KDE-SubstituteUID=true diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-storage-2.15.13/controller/src/controller.ycp new/yast2-storage-2.15.14/controller/src/controller.ycp --- old/yast2-storage-2.15.13/controller/src/controller.ycp 2007-05-23 12:45:15.000000000 +0200 +++ new/yast2-storage-2.15.14/controller/src/controller.ycp 2007-05-31 16:03:00.000000000 +0200 @@ -11,13 +11,14 @@ * Authors: * THomas Fehr <fehr(a)suse.de> * - * $Id: controller.ycp 27442 2006-01-30 14:53:09Z fehr $ + * $Id: controller.ycp 38225 2007-05-31 14:02:59Z fehr $ * */ { textdomain "storage"; +import "CommandLine"; import "Wizard"; import "Misc"; /*import "Bootloader";*/ @@ -245,6 +246,8 @@ } } +define any Sequence () + { Wizard::OpenAbortApplyFinishDialog(); list<map> dev = []; @@ -637,5 +640,19 @@ } while( ret != `abort && ret!=`cancel && ret != `finish ); UI::CloseDialog(); + } + +/* -- the command line description map -------------------------------------- */ +map cmdline = $[ + "id" : "controller", + // translators: command line help text for controller module + "help" : _("Enabling and Disabling of Disk Controller Modules"), + // custum help text (should replace default one) + "customhelp" : _("Command line interface for the disk controller module is not available"), + "guihandler" : Sequence + ]; + +CommandLine::Run (cmdline); +return true; } diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-storage-2.15.13/disk/src/disk.desktop new/yast2-storage-2.15.14/disk/src/disk.desktop --- old/yast2-storage-2.15.13/disk/src/disk.desktop 2007-05-23 12:45:15.000000000 +0200 +++ new/yast2-storage-2.15.14/disk/src/disk.desktop 2007-05-29 16:14:30.000000000 +0200 @@ -21,37 +21,4 @@ Name=Partitioner GenericName=Partition hard disks (including RAID, LVM, and encrypted file systems) -Name[cs]=Rozdělování disku -GenericName[cs]=Rozdělování pevných disků (včetně RAID, LVM, šifrovaných systémů ...) -Name[de]=Partitionieren -GenericName[de]=Festplattenpartitionierung (einschließlich RAID, LVM, verschlüsselte Dateisysteme...) -Name[es]=Particionador -GenericName[es]=Particionamiento del disco duro (incluyendo RAID, LVM, sistemas de archivos codificados) -Name[hu]=Particionálás -GenericName[hu]=Merevlemez particionálás (beleértve RAID-et, LVM-et, titkosított fájlrendszert) -Name[it]=Partizionatore -GenericName[it]=Partizionamento dischi rigidi (inclusi RAID, LVM e filesystem cifrati) -Name[ko]=파티션 도구 -GenericName[ko]=하드디스크 파티션( RAID, LVM, 암호화된 파일 시스템을 포함) -GenericName[nl]=Harddisk partitionering (inclusief RAID, LVM, versleutelde bestandssystemen) -Name[pt]=Particionador -GenericName[pt]=Particionamento de disco rígido (incluindo RAID, LVM, sistema de arquivos criptografado) -Name[sk]=Rozdelenie disku -GenericName[sk]=Rozdelenie disku (vrátane RAID, LVM, šifrovaných systémov súborov) -Name[sv]=Partitionerare -GenericName[sv]=Hårddiskpartitionering (inklusive RAID, LVM, krypterade filsystem) -GenericName[da]=Harddisk partitionering (inklusiv RAID, LVM, krypteret filsystem) -Name[el]=Κατατμητής -GenericName[el]=Κατάτμηση Σκληρού Δίσκου (περιλαμβάνει RAID, LVM, κρυπτογραφημένα συστήματα αρχείων) -Name[fr]=Partitionneur -GenericName[fr]=Partitionnement du disque dur (incluant RAID, LVM, systèmes de fichiers cryptés) -Name[ja]=ディスクの分割 -GenericName[ja]=ハードディスクの分割 (RAID、LVM、暗号ファイルシステム等) -Name[lt]=Skaidymo įrankis -GenericName[lt]=Kietojo disko skaidymas (įskaitant RAID, LVM, koduotas bylų sistemas) -Name[ru]=Разбиение -Name[sl]=Particioniranje -GenericName[sl]=Particioniranje trdih diskov (tudi RAID, LVM, kodirani datotečni sistemi) -Name[tr]=Disk bölümlendiricisi -GenericName[tr]=Sabit disk bölümlendirme işlemleri (RAID, LVM ve şifrelenmiş dosya sistemi dahil) X-KDE-SubstituteUID=true diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-storage-2.15.13/libstorage/src/AppUtil.cc new/yast2-storage-2.15.14/libstorage/src/AppUtil.cc --- old/yast2-storage-2.15.13/libstorage/src/AppUtil.cc 2007-05-23 12:45:15.000000000 +0200 +++ new/yast2-storage-2.15.14/libstorage/src/AppUtil.cc 2007-05-29 16:19:49.000000000 +0200 @@ -347,7 +347,9 @@ if( (pos=i->find_first_of( delim ))!=string::npos ) { k = i->substr( 0, pos ); - v = i->substr( i->find_first_not_of( delim, pos+1 ) ); + string::size_type pos2 = i->find_first_not_of( delim, pos+1 ); + if( pos2 != string::npos ) + v = i->substr( pos2 ); } if( !removeSur.empty() ) { @@ -360,7 +362,8 @@ if( !v.empty() && (pos=v.find_last_of(removeSur))==v.size()-1 ) v.erase( v.find_last_not_of(removeSur)+1 ); } - ret[k] = v; + if( !k.empty() && !v.empty() ) + ret[k] = v; } return( ret ); } diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-storage-2.15.13/libstorage/src/Disk.cc new/yast2-storage-2.15.14/libstorage/src/Disk.cc --- old/yast2-storage-2.15.13/libstorage/src/Disk.cc 2007-05-23 13:07:58.000000000 +0200 +++ new/yast2-storage-2.15.14/libstorage/src/Disk.cc 2007-05-31 15:41:27.000000000 +0200 @@ -21,7 +21,8 @@ #include "y2storage/AppUtil.h" #include "y2storage/SystemCmd.h" -#define PARTEDCMD "/usr/sbin/parted -s " // blank at end !! +#define PARTEDBIN "/usr/sbin/parted" +#define PARTEDCMD PARTEDBIN " -s " // blank at end !! using namespace std; using namespace storage; @@ -30,7 +31,7 @@ unsigned long long SizeK ) : Container(s,"",staticType()) { - init_disk = dmp_slave = iscsi = false; + init_disk = dmp_slave = iscsi = gpt_enlarge = false; nm = Name; undevDevice(nm); logfile_name = nm; @@ -52,7 +53,7 @@ y2milestone( "constructed disk %s nr %u sizeK:%llu", Name.c_str(), num, SizeK ); logfile_name = Name + decString(num); - init_disk = dmp_slave = iscsi = false; + init_disk = dmp_slave = iscsi = gpt_enlarge = false; ronly = true; size_k = SizeK; head = new_head = 16; @@ -71,7 +72,7 @@ Disk::Disk( Storage * const s, const string& fname ) : Container(s,"",staticType()) { - init_disk = dmp_slave = iscsi = false; + init_disk = dmp_slave = iscsi = gpt_enlarge = false; nm = fname.substr( fname.find_last_of( '/' )+1); if( nm.find("disk_")==0 ) nm.erase( 0, 5 ); @@ -417,7 +418,8 @@ byte_cyl = head * sector * 512; y2milestone( "byte_cyl:%lu", byte_cyl ); } - y2milestone( "Label:%s", dlabel.c_str() ); + gpt_enlarge = Cmd.select( "fix the GPT to use all" )>0; + y2milestone( "Label:%s gpt_enlarge:%d", dlabel.c_str(), gpt_enlarge ); if( dlabel!="loop" ) { setLabelData( dlabel ); @@ -1857,6 +1859,7 @@ getStorage()->waitForDevice(); redetectGeometry(); } + gpt_enlarge = false; y2milestone( "ret:%d", ret ); return( ret ); } @@ -2082,9 +2085,24 @@ return( ret ); } +void Disk::enlargeGpt() + { + y2mil( "gpt_enlarge:" << gpt_enlarge ); + if( gpt_enlarge ) + { + string cmd_line( "yes Fix | " PARTEDBIN ); + cmd_line += " ---pretend-input-tty "; + cmd_line += device(); + cmd_line += " print "; + SystemCmd cmd( cmd_line ); + gpt_enlarge = false; + } + } + static bool logicalCreated( const Partition& p ) { return( p.type()==LOGICAL && p.created() ); } + int Disk::doCreate( Volume* v ) { Partition * p = dynamic_cast<Partition *>(v); @@ -2109,6 +2127,10 @@ if( ret==0 ) detected_label = label; } + if( ret==0 && gpt_enlarge ) + { + enlargeGpt(); + } std::ostringstream cmd_line; if( ret==0 ) { @@ -2576,6 +2598,8 @@ s << " iSCSI"; if( d.dmp_slave ) s << " DmpSlave"; + if( d.gpt_enlarge ) + s << " GptEnlarge"; return( s ); } @@ -2670,7 +2694,7 @@ ext_possible==rhs.ext_possible && max_logical==rhs.max_logical && init_disk==rhs.init_disk && label==rhs.label && iscsi==rhs.iscsi && sysfs_dir==rhs.sysfs_dir && - dmp_slave==rhs.dmp_slave; + dmp_slave==rhs.dmp_slave && gpt_enlarge==rhs.gpt_enlarge; if( ret ) { ConstPartPair p = partPair(); @@ -2712,6 +2736,7 @@ logfile_name = rhs.logfile_name; sysfs_dir = rhs.sysfs_dir; dmp_slave = rhs.dmp_slave; + gpt_enlarge = rhs.gpt_enlarge; return( *this ); } diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-storage-2.15.13/libstorage/src/Disk.h new/yast2-storage-2.15.14/libstorage/src/Disk.h --- old/yast2-storage-2.15.13/libstorage/src/Disk.h 2007-05-23 12:45:15.000000000 +0200 +++ new/yast2-storage-2.15.14/libstorage/src/Disk.h 2007-05-31 15:20:31.000000000 +0200 @@ -187,6 +187,7 @@ unsigned long len, bool checkRelaxed ); void removePresentPartitions(); void removeFromMemory(); + void enlargeGpt(); static bool notDeleted( const Partition&d ) { return( !d.deleted() ); } static bool bootSpecial( const Partition&d ) { return( !d.deleted()&&(d.id()==0x41||d.id()==0x06) ); } @@ -225,6 +226,7 @@ bool init_disk; bool iscsi; bool dmp_slave; + bool gpt_enlarge; unsigned max_logical; unsigned long byte_cyl; unsigned long range; diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-storage-2.15.13/lvm/src/lvm_config.desktop new/yast2-storage-2.15.14/lvm/src/lvm_config.desktop --- old/yast2-storage-2.15.13/lvm/src/lvm_config.desktop 2007-05-23 12:45:16.000000000 +0200 +++ new/yast2-storage-2.15.14/lvm/src/lvm_config.desktop 2007-05-29 16:14:30.000000000 +0200 @@ -21,24 +21,4 @@ Name=LVM GenericName=Create and configure volume groups and physical and logical volumes -GenericName[cs]=Vytvořit a nastavit skupiny svazků (fyzické a logické) -GenericName[de]=Volume-Gruppen sowie Physical Volumes und Logical Volumes erzeugen und konfigurieren. -GenericName[es]=Crear y configurar grupos de volúmenes y volúmenes físicos y lógicos -Name[hu]=LVM beállítása -GenericName[hu]=Kötetcsoportok, fizikai és logikai kötetek létrehozása és beállítása -GenericName[it]=Crea e configura gruppi di volumi e volumi fisici o logici -Name[ko]=LVM(논리적 볼륨매니저) -GenericName[ko]=물리적 혹은 논리적 볼륨을 생성하고 환경설정합니다. -GenericName[nl]=Maak en configureer volume groepen en fysieke en logische volumes -GenericName[pt]=Criar e configurar grupos de volume e volumes lógicos e físicos -GenericName[sk]=Vytvára a nastavuje skupiny diskov a fyzické a logické disky -GenericName[sv]=Skapa och ställ in volymgrupper samt fysiska och logiska volymer -GenericName[da]=Opret og konfigurer volume grupper og fysiske og logiske volumer -GenericName[el]=Δημιουργία και ρύθμιση ομάδας τόμων και φυσικών και λογικών τόμων -Name[fr]=&Partitionnement -GenericName[fr]=Créer et configurer des groupes de volumes, des volumes physiques et logiques -GenericName[ja]=ボリューム・グループ、物理ボリューム、論理ボリュームの作成と設定。 -GenericName[lt]=Sukurti ir konfigūruoti tomų grupes ir fizinius bei loginius tomus -GenericName[sl]=Ustvari in nastavi skupine nosilcev in fizični in logični nosilci -GenericName[tr]=Yığın grupları, fiziksel ve mantıksal yığınlar oluşturur ve yapılandırır X-KDE-SubstituteUID=true diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-storage-2.15.13/VERSION new/yast2-storage-2.15.14/VERSION --- old/yast2-storage-2.15.13/VERSION 2007-05-23 13:07:58.000000000 +0200 +++ new/yast2-storage-2.15.14/VERSION 2007-05-31 16:02:44.000000000 +0200 @@ -1 +1 @@ -2.15.13 +2.15.14 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit yast2-network
by root＠Hilbert.suse.de 31 May '07

31 May '07

Hello community, here is the log from the commit of package yast2-network checked in at Thu May 31 21:18:54 CEST 2007. -------- --- yast2-network/yast2-network.changes 2007-05-30 11:36:05.000000000 +0200 +++ /mounts/work_src_done/STABLE/yast2-network/yast2-network.changes 2007-05-31 17:47:26.000000000 +0200 @@ -1,0 +2,6 @@ +Thu May 31 17:44:21 CEST 2007 - mzugec(a)suse.cz + +- merge code for select interfaces in InternetTest and Dsl (#117426) +- 2.15.38 + +------------------------------------------------------------------- Old: ---- yast2-network-2.15.37.tar.bz2 New: ---- yast2-network-2.15.38.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-network.spec ++++++ --- /var/tmp/diff_new_pack.U15564/_old 2007-05-31 21:18:49.000000000 +0200 +++ /var/tmp/diff_new_pack.U15564/_new 2007-05-31 21:18:49.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package yast2-network (Version 2.15.37) +# spec file for package yast2-network (Version 2.15.38) # # Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine @@ -11,12 +11,12 @@ # norootforbuild Name: yast2-network -Version: 2.15.37 +Version: 2.15.38 Release: 1 License: GNU General Public License (GPL) Group: System/YaST BuildRoot: %{_tmppath}/%{name}-%{version}-build -Source0: yast2-network-2.15.37.tar.bz2 +Source0: yast2-network-2.15.38.tar.bz2 prefix: /usr # should be required by devtools BuildRequires: perl-XML-Writer pkgconfig rpm @@ -52,7 +52,7 @@ Michal Svec <msvec(a)suse.cz> %prep -%setup -n yast2-network-2.15.37 +%setup -n yast2-network-2.15.38 %build %{prefix}/bin/y2tool y2autoconf @@ -108,6 +108,9 @@ /usr/share/YaST2/schema/autoyast/rnc/proxy.rnc %changelog +* Thu May 31 2007 - mzugec(a)suse.cz +- merge code for select interfaces in InternetTest and Dsl (#117426) +- 2.15.38 * Wed May 30 2007 - mzugec(a)suse.cz - fixed spec requirements * Tue May 29 2007 - mzugec(a)suse.cz ++++++ yast2-network-2.15.37.tar.bz2 -> yast2-network-2.15.38.tar.bz2 ++++++ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-network-2.15.37/src/dsl/dialogs.ycp new/yast2-network-2.15.38/src/dsl/dialogs.ycp --- old/yast2-network-2.15.37/src/dsl/dialogs.ycp 2007-05-30 11:34:28.000000000 +0200 +++ new/yast2-network-2.15.38/src/dsl/dialogs.ycp 2007-05-31 17:46:35.000000000 +0200 @@ -4,7 +4,7 @@ * Summary: Configuration dialogs for DSL * Authors: Michal Svec <msvec(a)suse.cz> * - * $Id: dialogs.ycp 38187 2007-05-30 09:34:28Z mzugec $ + * $Id: dialogs.ycp 38227 2007-05-31 15:46:34Z mzugec $ */ { @@ -106,33 +106,21 @@ /** */ - define void UpdateInterfaces() { - ifaces = NetworkDevices::List("eth"); - y2debug("ifaces=%1", ifaces); - ifaces = union(ifaces, NetworkDevices::List("eth-pcmcia")); - y2debug("ifaces=%1", ifaces); - ifaces = union(ifaces, NetworkDevices::List("eth-usb")); - ifaces = union(ifaces, NetworkDevices::List("wlan")); // #186102 - y2debug("ifaces=%1", ifaces); - + // define void UpdateInterfaces() { +list<string> items = getNetDeviceItems(); +if(size(items)>0 && interface=="") interface=items[0]:""; +y2internal("items %1", items); /* FIXME Why is not the current interface added? */ - if(false && /*interface != "" && */!contains(ifaces, interface)) - ifaces = add(ifaces, interface); +if(false && /*interface != "" && */!contains(ifaces, interface)) ifaces = add(ifaces, interface); - y2debug("ifaces=%1", ifaces); - y2internal("ifaces=%1", ifaces); - ifaces = maplist(string e, (list<string>) ifaces, { - return `item(`id(sformat("%1", e)), sformat("%1", e), e == interface); - }); - y2debug("ifaces=%1", ifaces); - } +//} - /* FIXME: #27137 */ - UpdateInterfaces(); - if(size(ifaces) < 1) { + /* FIXME: #suse27137 */ +// UpdateInterfaces(); + if(size(items) < 1) { NetworkDevices::Push(); if(Lan::Propose()) { - UpdateInterfaces(); +// UpdateInterfaces(); // list<term (term (string), string, boolean)> string i = ifaces[0, 0, 0]:""; y2milestone("i=%1", i); @@ -148,11 +136,18 @@ ["USERCONTROL", "STARTMODE",], widget_descr); + +// list<string> items = NetworkDevices::List(""); +// y2internal("network devices list %1", items); + +/* NetworkDevices::Read(); - map <string, string> device_descr = GetDeviceDescription(Internet::device); + map <string, string> device_descr = GetDeviceDescription(items[0]:""); y2internal("device_descr %1", device_descr); string connection_text = _("%1 - %2 (%3)"); +*/ +y2internal("interface %1", interface); /* DSL dialog contents */ term contents = `HBox( `HSpacing(6), @@ -167,23 +162,14 @@ /* TextEntry label */ `TextEntry(`id(`vpivci), _("&VPI/VCI"), vpivci), `VSpacing(0.2), + `Frame(_("&Ethernet Card"), `HBox( - /* ComboBox label */ -// `Left(`ReplacePoint(`id(`rp), `ComboBox(`id(`interface), _("&Ethernet Card"), ifaces))), /* RadioButton label */ - `Left(`ReplacePoint(`id(`rp), `Label(`id(`yes), sformat(connection_text, device_descr["name"]:"", device_descr["type"]:"", device_descr["ipaddr"]:_("No IP address assigned"))))), +// `Left(`ReplacePoint(`id(`rp), `Label(`id(`yes), sformat(connection_text, device_descr["name"]:"", device_descr["type"]:"", device_descr["ipaddr"]:_("No IP address assigned"))))), // push button label - `Right(`PushButton(`id(`net_expert), _("&Change Device"))) - /* TextEntry label */ - // `TextEntry(`id(`interface), _("&Ethernet Card"), interface), -// `HSpacing(1), -/* - `VBox( - `Label(""), - `PushButton(`id(`lan), _("&Configure Network Cards")) - ) -*/ - ), +getDeviceContens(interface) + )), + `PushButton(`id(`lan), _("&Configure Network Cards")), `VSpacing(0.2), /* TextEntry label */ `TextEntry(`id(`modemip), _("Modem &IP Address"), modemip) @@ -207,7 +193,7 @@ UI::ChangeWidget (`id ("STARTMODE"), `Value, startmode); UI::ChangeWidget(`id(`vpivci), `Enabled, pppmode == "pppoatm"); - UI::ChangeWidget(`id(`interface), `Enabled, pppmode == "pppoe"); + enableDevices(pppmode == "pppoe" || pppmode == "pptp"); UI::ChangeWidget(`id(`lan), `Enabled, pppmode == "pppoe" || pppmode == "pptp"); UI::ChangeWidget(`id(`modemip), `Enabled, pppmode == "pptp"); @@ -225,7 +211,7 @@ else if(ret == `next) { /* check_* */ pppmode = (string) UI::QueryWidget(`id(`pppmode), `Value); - interface = (string) UI::QueryWidget(`id(`interface), `Value); +// interface = (string) UI::QueryWidget(`id(`interface), `Value); vpivci = (string) UI::QueryWidget(`id(`vpivci), `Value); modemip = (string) UI::QueryWidget(`id(`modemip), `Value); if(pppmode == "pppoatm" && vpivci == "") { @@ -251,7 +237,8 @@ else if(ret == `pppmode) { pppmode = (string) UI::QueryWidget(`id(`pppmode), `Value); UI::ChangeWidget(`id(`vpivci), `Enabled, pppmode == "pppoatm"); - UI::ChangeWidget(`id(`interface), `Enabled, pppmode == "pppoe" || pppmode == "pptp"); + enableDevices(pppmode == "pppoe"|| pppmode == "pptp"); +// UI::ChangeWidget(`id(`interface), `Enabled, pppmode == "pppoe" || pppmode == "pptp"); UI::ChangeWidget(`id(`lan), `Enabled, pppmode == "pppoe" || pppmode == "pptp"); UI::ChangeWidget(`id(`modemip), `Enabled, pppmode == "pptp"); continue; @@ -261,11 +248,14 @@ NetworkDevices::Push(); Call::Function("lan_proposal", ["AskUser"]); NetworkDevices::Pop(); - interface = (string) UI::QueryWidget(`id(`interface), `Value); - UpdateInterfaces(); - UI::ReplaceWidget(`id(`rp), `ComboBox(`id(`interface), _("&Ethernet Card"), ifaces)); + items = getNetDeviceItems(); + refreshDevice(interface); +// interface = (string) UI::QueryWidget(`id(`interface), `Value); +// UpdateInterfaces(); +// UI::ReplaceWidget(`id(`rp), `ComboBox(`id(`interface), _("&Ethernet Card"), ifaces)); continue; } + else if (ret == `net_expert) interface = handleDevice (items, interface); else { y2error("Unexpected return code: %1", ret); continue; @@ -277,7 +267,7 @@ DSL::pppmode = pppmode; if(pppmode == "pppoe" || pppmode == "pptp") { - DSL::interface = (string) UI::QueryWidget(`id(`interface), `Value); + DSL::interface = interface;//(string) UI::QueryWidget(`id(`interface), `Value); // If firewall is active and interface in no zone, nothing // gets through (#47309) so add it to the external zone if (SuSEFirewall4Network::IsOn ()) diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-network-2.15.37/src/installation/dialogs.ycp new/yast2-network-2.15.38/src/installation/dialogs.ycp --- old/yast2-network-2.15.37/src/installation/dialogs.ycp 2007-05-30 10:36:14.000000000 +0200 +++ new/yast2-network-2.15.38/src/installation/dialogs.ycp 2007-05-31 17:46:35.000000000 +0200 @@ -5,7 +5,7 @@ * Authors: Michal Svec <msvec(a)suse.cz> * Arvin Schnell <arvin(a)suse.de> * - * $Id: dialogs.ycp 35386 2007-01-16 12:37:52Z kmachalkova $ + * $Id: dialogs.ycp 38227 2007-05-31 15:46:34Z mzugec $ */ { @@ -21,6 +21,7 @@ import "String"; import "Wizard"; include "network/routines.ycp"; +include "network/widgets.ycp"; /** * Ask for password if required @@ -57,37 +58,6 @@ return ret == `ok; } -define map <string, string> GetDeviceDescription(string device_id) { - - string device_name = NetworkDevices::GetValue(device_id,"NAME"); - - if ( (device_name == nil) || (device_name == "") ) { - //TRANSLATORS: Informs that device name is not known - device_name = _("Unknown device"); - } - //avoid too long device names - if (size(device_name) > 30) { - device_name = substring (device_name, 0, 27) + "..."; - } - - string ip_addr = (NetworkDevices::GetValue(device_id, "BOOTPROTO") == "dhcp" ? - // TRANSLATORS: Informs that the IP address is assigned via DHCP - _("DHCP address") : - NetworkDevices::GetValue(device_id, "IPADDR")); - if ( (ip_addr == nil) || (ip_addr == "")) { - //TRANSLATORS: Informs that no IP has been assigned to the device - ip_addr = _("No IP address assigned"); - } - - map <string, string> ret = $[ - - "type" : NetworkDevices::GetDeviceType(device_id), - "name" : device_name, - "ipaddr" : ip_addr, - ]; - - return ret; -} /** * Connection steps dialog @@ -126,24 +96,21 @@ activate the test procedure."), ]; - if(haskey(labels, Internet::type)) - label = labels[Internet::type]:""; + if(haskey(labels, Internet::type)) label = labels[Internet::type]:""; + +list<string> items = getEthernetItems(); boolean already_up = false; if(!Mode::test ()) already_up = Internet::Status(); - /* Label text - selected network device to network test */ - string connection_text = _("&Yes, Test Connection to the Internet\nvia %1 - %2 (%3)"); - map <string, string> device_descr = GetDeviceDescription(Internet::device); - +string current = Internet::device; /* Radiobuttons */ term buttons = `VBox( `VSpacing(1), /* RadioButton label */ - `Left(`ReplacePoint(`id(`rp), `RadioButton(`id(`yes), sformat(connection_text, device_descr["name"]:"", device_descr["type"]:"", device_descr["ipaddr"]:_("No IP address assigned")), Internet::do_test))), - // push button label - `Right(`PushButton(`id(`net_expert), _("&Change Device"))), + `Left(`RadioButton(`id(`yes), `opt(`notify), _("&Yes, Test Connection to the Internet via"), Internet::do_test)), + getDeviceContens(current), /* RadioButton label */ - `Left(`RadioButton(`id(`no), _("N&o, Skip This Test"), !Internet::do_test)), + `Left(`RadioButton(`id(`no), `opt(`notify), _("N&o, Skip This Test"), !Internet::do_test)), `VSpacing(1) ); @@ -190,55 +157,41 @@ Wizard::SetContents(caption, contents, help, true, true); Wizard::SetTitleIcon ("yast-network"); +initDevice(items); - list<string> items = NetworkDevices::List(""); - items = filter (string i, items, ``( i != "lo" )); - y2milestone("network devices list %1", items); - if (items == [] || items == ["lo"]) // #146167 - { - // no interesting ifcfgs, ask ip - items = Internet::GetDevices (); - } - //If only one device is present, disable "Change device" button - if (size(items) <= 1){ - UI::ChangeWidget(`id(`net_expert),`Enabled,false); - } - - any ret = nil; - - while(true) + symbol ret = nil; + boolean exit=false; + do { - ret = UI::UserInput(); - - if (ret == `net_expert) + ret = (symbol)UI::UserInput(); + switch( ret ) { - import "NetworkPopup"; - // popup dialog title - string via_device = NetworkPopup::ChooseItem(_("Network Device Select"), items, Internet::device); - if (via_device != nil) - { - map <string, string> device_descr = GetDeviceDescription(via_device); - Internet::SetDevice( via_device ); - UI::ReplaceWidget(`id(`rp), `RadioButton(`id(`yes), sformat(connection_text, device_descr["name"]:"", device_descr["type"]:"", device_descr["ipaddr"]:""), Internet::do_test)); - y2milestone("selected network device :%1", via_device); - } - } - else if (ret == `abort || ret == `cancel) - { - if (Popup::ConfirmAbort (`incomplete)) + case `net_expert : + current = handleDevice(items, current); break; - } - else if (ret == `next || ret == `back) - { + case `abort: + case `cancel: + if (Popup::ConfirmAbort (`incomplete)){ + exit=true; + break; + } + case `next: + case `back: + exit=true; break; + case `yes: + enableDevices(true); + break; + case `no: + enableDevices(false); + break; + default: + y2error("Unexpected return code:%1", ret); + } - else - { - y2error("Unexpected return code: %1", ret); - } - } + }while(!exit); Internet::do_test = UI::QueryWidget(`id(`rb), `CurrentButton) == `yes; y2debug("Internet::do_test=%1", Internet::do_test); diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-network-2.15.37/src/modules/Lan.ycp new/yast2-network-2.15.38/src/modules/Lan.ycp --- old/yast2-network-2.15.37/src/modules/Lan.ycp 2007-05-29 12:58:20.000000000 +0200 +++ new/yast2-network-2.15.38/src/modules/Lan.ycp 2007-05-31 17:46:35.000000000 +0200 @@ -4,7 +4,7 @@ * Summary: Network card data * Authors: Michal Svec <msvec(a)suse.cz> * - * $Id: Lan.ycp 38170 2007-05-29 10:58:19Z mzugec $ + * $Id: Lan.ycp 38227 2007-05-31 15:46:34Z mzugec $ * * Representation of the configuration of network cards. * Input and output routines. @@ -1712,10 +1712,11 @@ /* Some HW found -> use it for proposal */ if(size(Hardware) > 0) { - if (Arch::s390()){ +// if (Arch::s390()){ // tosel = FindMatchingDevice( $["device":sformat("%1-id-%2",InstallInf["module"]:"", InstallInf["hwaddr"]:"")] ); - } - else tosel = FindMatchingDevice($[]); +// } +// else + tosel = FindMatchingDevice($[]); } diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-network-2.15.37/src/routines/widgets.ycp new/yast2-network-2.15.38/src/routines/widgets.ycp --- old/yast2-network-2.15.37/src/routines/widgets.ycp 2007-04-12 15:59:08.000000000 +0200 +++ new/yast2-network-2.15.38/src/routines/widgets.ycp 2007-05-31 17:46:35.000000000 +0200 @@ -4,7 +4,7 @@ * Summary: Widgets for CWM * Authors: Martin Vidner <mvidner(a)suse.cz> * - * $Id: widgets.ycp 37406 2007-04-11 17:17:50Z kmachalkova $ + * $Id: widgets.ycp 38227 2007-05-31 15:46:34Z mzugec $ */ { @@ -16,6 +16,8 @@ // This is just a start. import "IP"; +import "NetworkPopup"; +import "NetworkDevices"; /** * Validator for IP adresses, no_popup @@ -78,26 +80,6 @@ "opt": [], "help": _("H"), ], -/* - "": $[ - "widget": `, - "label": _(""), - "opt": [], - "help": _("H"), - ], - "": $[ - "widget": `, - "label": _(""), - "opt": [], - "help": _("H"), - ], - "": $[ - "widget": `, - "label": _(""), - "opt": [], - "help": _("H"), - ], -*/ ]; /** @@ -200,5 +182,87 @@ return ret; } + +define string GetDeviceDescription(string device_id) { + string device_name = NetworkDevices::GetValue(device_id,"NAME"); + if ( (device_name == nil) || (device_name == "") ) { + //TRANSLATORS: Informs that device name is not known + device_name = _("Unknown device"); + } + //avoid too long device names + if (size(device_name) > 30) { + device_name = substring (device_name, 0, 27) + "..."; + } + string ip_addr = (NetworkDevices::GetValue(device_id, "BOOTPROTO") == "dhcp" ? + // TRANSLATORS: Informs that the IP address is assigned via DHCP + _("DHCP address") : + NetworkDevices::GetValue(device_id, "IPADDR")); + if ( (ip_addr == nil) || (ip_addr == "")) { + //TRANSLATORS: Informs that no IP has been assigned to the device + ip_addr = _("No IP address assigned"); + } + string output = sformat(_("%1 - %2 (%3)"), + device_name, NetworkDevices::GetDeviceType(device_id), ip_addr); + return output; +} + + + +list<string> getEthernetItems(){ + NetworkDevices::Read(); + list<string> items = NetworkDevices::List("eth"); + items = filter (string i, items, ``( i != "lo" )); + y2internal("network devices list %1", items); + return items; +} + +list<string> getNetDeviceItems(){ + NetworkDevices::Read(); + list<string> ifaces = NetworkDevices::List("eth"); + y2debug("ifaces=%1", ifaces); + ifaces = (list<string>)union((list)ifaces, (NetworkDevices::List("eth-pcmcia"))); + y2debug("ifaces=%1", ifaces); + ifaces = (list<string>)union((list)ifaces, NetworkDevices::List("eth-usb")); + ifaces = (list<string>)union((list)ifaces, NetworkDevices::List("wlan")); // #186102 + y2debug("ifaces=%1", ifaces); + return ifaces; +} + +term getDeviceContens(string selected){ +return `VBox( + `VSpacing(1), + `Left(`Label(`id(`net_device), GetDeviceDescription(selected))), + `Right(`PushButton(`id(`net_expert), _("&Change Device"))), + `VSpacing(1) + ); +} + + +void initDevice(list<string> items){ + //If only one device is present, disable "Change device" button + if (size(items) <= 1) UI::ChangeWidget(`id(`net_expert),`Enabled,false); +} + +void enableDevices(boolean enable){ + UI::ChangeWidget(`net_device, `Enabled, enable); + UI::ChangeWidget(`net_expert, `Enabled, enable); +} + +void refreshDevice(string via_device){ + UI::ChangeWidget(`net_device, `Value, GetDeviceDescription(via_device)); +} + +string handleDevice(list<string>items, string selected){ + // popup dialog title + string via_device = NetworkPopup::ChooseItem(_("Network Device Select"), items, selected); + if (via_device != nil) + { + UI::ChangeWidget(`net_device, `Value, GetDeviceDescription(via_device)); + y2milestone("selected network device :%1", via_device); + selected = via_device; + } + return selected; +} + /* EOF */ } diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-network-2.15.37/VERSION new/yast2-network-2.15.38/VERSION --- old/yast2-network-2.15.37/VERSION 2007-05-29 12:56:36.000000000 +0200 +++ new/yast2-network-2.15.38/VERSION 2007-05-31 17:44:18.000000000 +0200 @@ -1 +1 @@ -2.15.37 +2.15.38 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit yast2-mail
by root＠Hilbert.suse.de 31 May '07

31 May '07

Hello community, here is the log from the commit of package yast2-mail checked in at Thu May 31 21:18:32 CEST 2007. -------- --- yast2-mail/yast2-mail.changes 2007-05-08 17:48:31.000000000 +0200 +++ /mounts/work_src_done/STABLE/yast2-mail/yast2-mail.changes 2007-05-30 21:02:06.000000000 +0200 @@ -1,0 +2,12 @@ +Wed May 30 21:00:17 CEST 2007 - varkoly(a)suse.de + +- move sysconfig.mail from aaa_base +- include first version of the wizard to decide wich kind of + mail configuration will be done + +------------------------------------------------------------------- +Fri May 25 13:30:04 CEST 2007 - jsrain(a)suse.cz + +- removed outdated translations from .desktop-files (#271209) + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-mail.spec ++++++ --- /var/tmp/diff_new_pack.v12496/_old 2007-05-31 21:18:24.000000000 +0200 +++ /var/tmp/diff_new_pack.v12496/_new 2007-05-31 21:18:24.000000000 +0200 @@ -12,7 +12,7 @@ Name: yast2-mail Version: 2.15.9 -Release: 1 +Release: 12 License: GNU General Public License (GPL) Group: System/YaST BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -20,6 +20,7 @@ prefix: /usr BuildRequires: perl-XML-Writer update-desktop-files yast2 yast2-devtools yast2-testsuite BuildRequires: yast2-ldap-server yast2-network yast2-perl-bindings yast2-users +PreReq: %fillup_prereq # new firewall interface Requires: yast2 >= 2.11.11 Requires: yast2-users @@ -89,6 +90,9 @@ %clean rm -rf "$RPM_BUILD_ROOT" +%post +%{fillup_only -n mail} + %files %defattr(-,root,root) %dir /usr/share/YaST2/include/mail @@ -99,6 +103,7 @@ /usr/share/YaST2/modules/Mail.ybc /usr/share/YaST2/modules/MailServer.ybc /usr/share/YaST2/modules/MailServer.ycp +/usr/share/YaST2/modules/MailServerLDAP.pm /usr/share/YaST2/modules/Mail.ycp %dir /usr/share/YaST2/modules/YaPI /usr/share/YaST2/modules/YaPI/Mail* @@ -146,6 +151,7 @@ %dir /usr/lib/YaST2/servers_non_y2 /usr/lib/YaST2/servers_non_y2/ag_fetchmailrc /usr/lib/YaST2/servers_non_y2/ag_mailtable +/var/adm/fillup-templates/sysconfig.mail %files plugins %defattr(-,root,root) @@ -155,6 +161,12 @@ /usr/share/YaST2/clients/users* %changelog +* Wed May 30 2007 - varkoly(a)suse.de +- move sysconfig.mail from aaa_base +- include first version of the wizard to decide wich kind of + mail configuration will be done +* Fri May 25 2007 - jsrain(a)suse.cz +- removed outdated translations from .desktop-files (#271209) * Tue May 08 2007 - varkoly(a)suse.de - Move MailTableInclude.pm MailTable.pm to yast2. - 2.15.9 ++++++ yast2-mail-2.15.9.tar.bz2 ++++++ ++++ 9665 lines of diff (skipped) ++++ retrying with extended exclude list diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-mail-2.15.9/agents/Makefile.am new/yast2-mail-2.15.9/agents/Makefile.am --- old/yast2-mail-2.15.9/agents/Makefile.am 2007-04-12 15:16:27.000000000 +0200 +++ new/yast2-mail-2.15.9/agents/Makefile.am 2007-05-30 20:17:31.000000000 +0200 @@ -1,7 +1,7 @@ # # Makefile.am for y2c_mail/agents # -# $Id: Makefile.am 13709 2004-01-30 16:08:25Z mvidner $ +# $Id: Makefile.am 37610 2007-04-19 15:22:10Z varkoly $ # agent_SCRIPTS = ag_fetchmailrc \ @@ -37,6 +37,7 @@ mail_cyrusconf.scr \ cfg_fetchmail.scr +fillup_DATA = sysconfig.mail # ag_fetchmailrc is tested in testsuite dir TESTS = test-mailtable @@ -49,4 +50,4 @@ test-mailtable-4.in test-mailtable-4.out \ test-mailtable-18487.in test-mailtable-18487.out -EXTRA_DIST = $(agent_SCRIPTS) $(scrconf_DATA) $(TESTS) $(testdata) +EXTRA_DIST = $(agent_SCRIPTS) $(scrconf_DATA) $(TESTS) $(testdata) $(fillup_DATA) diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-mail-2.15.9/agents/sysconfig.mail new/yast2-mail-2.15.9/agents/sysconfig.mail --- old/yast2-mail-2.15.9/agents/sysconfig.mail 1970-01-01 01:00:00.000000000 +0100 +++ new/yast2-mail-2.15.9/agents/sysconfig.mail 2007-05-30 19:56:25.000000000 +0200 @@ -0,0 +1,49 @@ +## Path: Network/Mail/General +## Description: +## Type: string +## Default: "" +## Config: postfix +## ServiceReload: sendmail,postfix +# +# From:-Line in email and News postings +# (otherwise the FQDN is used) +# +FROM_HEADER="" + +## Path: Network/Mail/General +## Description: Basic general MTA configuration +## Type: yesno +## Default: yes +## Config: postfix,sendmail +# +# If you don't want to let SuSEconfig generate your +# configuration file, set this to no +# +MAIL_CREATE_CONFIG="yes" + +## Type: yesno +## Default: no +## Config: postfix +# +# Set this to "yes" if mail from remote should be accepted +# this is necessary for any mail server. +# If set to "no" or empty then only mail from localhost +# will be accepted. +# +SMTPD_LISTEN_REMOTE="yes" + +## Type: yesno +## Default: no +# +# Set this to "yes" if the yast2 mail module must not +# start with the with the vizard for asking the +# configuration type of the mail server. +# +MAIL_SKIP_ASK="no" + +## Type: string(standard,advanced,undef) +## Default: undef +# +# This variable contains the type of the mail server configuration. +# +MAIL_CONF_TYPE="undef" diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-mail-2.15.9/autodocs-ycp.ami new/yast2-mail-2.15.9/autodocs-ycp.ami --- old/yast2-mail-2.15.9/autodocs-ycp.ami 2007-05-03 14:59:06.000000000 +0200 +++ new/yast2-mail-2.15.9/autodocs-ycp.ami 2007-05-30 20:20:59.000000000 +0200 @@ -1,18 +1,27 @@ # -*- makefile -*- Automake include file -# $Id: autodocs-ycp.ami 23438 2005-05-17 16:31:21Z mvidner $ +# $Id: autodocs-ycp.ami 33394 2006-10-13 11:51:40Z mvidner $ # Builds source documentation for YCP sources # Uses ycpdoc # PARAMETERS: # AUTODOCS_YCP: Files that the ycp autodocs is built from # Optional - the default is $(srcdir)/../../src/*.ycp +# AUTODOCS_PM: Files that the perl autodocs is built from +# Optional - the default is $(srcdir)/../../src/*.pm htmldir = $(docdir)/autodocs html_DATA = index.html $(wildcard *.html) -CLEANFILES = $(html_DATA) +CLEANFILES = $(html_DATA) pod2htm*.tmp -AUTODOCS_YCP ?= $(srcdir)/../../src/*.ycp -index.html: $(AUTODOCS_YCP) - ${YCPDOC} -d. $^ +AUTODOCS_YCP ?= $(wildcard $(srcdir)/../../src/*.ycp) +AUTODOCS_PM ?= $(wildcard $(srcdir)/../../src/*.pm) +index.html: $(AUTODOCS_YCP) $(AUTODOCS_PM) +#including *.pm, for the index + ${YCPDOC} -d. $^ + for i in $(AUTODOCS_PM); do \ + b=`basename $$i`; b=$${b%.pm}; \ + pod2html --title=$$b --infile=$$i --outfile=$$b.html; \ + echo "<a href='$$b.html'>$$b</a>" > $$b.mod.html; \ + done diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-mail-2.15.9/configure.in new/yast2-mail-2.15.9/configure.in --- old/yast2-mail-2.15.9/configure.in 2007-05-03 14:59:06.000000000 +0200 +++ new/yast2-mail-2.15.9/configure.in 2007-05-30 20:20:59.000000000 +0200 @@ -1,9 +1,9 @@ dnl configure.in for yast2-mail dnl -dnl -- This file is generated by y2autoconf 2.13.18 - DO NOT EDIT! -- +dnl -- This file is generated by y2autoconf 2.15.0 - DO NOT EDIT! -- dnl (edit configure.in.in instead) -AC_INIT(yast2-mail, 2.15.7, http://bugs.opensuse.org/, yast2-mail) +AC_INIT(yast2-mail, 2.15.9, http://bugs.opensuse.org/, yast2-mail) 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.15.7" +VERSION="2.15.9" RPMNAME="yast2-mail" MAINTAINER="Peter Varkoly <varkoly(a)novell.com>" @@ -110,6 +110,8 @@ AC_MSG_ERROR(xgettext is missing; please install gettext-devel.) fi +Y2DEVTOOLS_PREFIX=`pkg-config --print-errors --variable=prefix yast2-devtools` +AC_SUBST(Y2DEVTOOLS_PREFIX) devtools_ybindir=`pkg-config --print-errors --variable=ybindir yast2-devtools` devtools_yast2dir=`pkg-config --print-errors --variable=yast2dir yast2-devtools` @@ -142,6 +144,9 @@ if test "$YCPC" = "false"; then AC_MSG_ERROR([ycpc is not installed]) fi +AC_CHECK_FILE($devtools_yast2dir/data/testsuite/Makefile.testsuite, [], [ + AC_MSG_WARN([yast2-testsuite.rpm is not installed]) +]) dnl Check packages expect and dejagnu AC_PATH_PROG(MYEXPECT, expect, false) diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-mail-2.15.9/Makefile.am new/yast2-mail-2.15.9/Makefile.am --- old/yast2-mail-2.15.9/Makefile.am 2007-05-03 14:59:06.000000000 +0200 +++ new/yast2-mail-2.15.9/Makefile.am 2007-05-30 20:20:59.000000000 +0200 @@ -7,8 +7,7 @@ # #where devtools are -PREFIX := $(shell pkg-config --print-errors --variable=prefix yast2-devtools) -Y2TOOL = $(PREFIX)/bin/y2tool +Y2TOOL = $(Y2DEVTOOLS_PREFIX)/bin/y2tool VERSION = $(shell cat $(srcdir)/VERSION) RPMNAME = $(shell cat $(srcdir)/RPMNAME) @@ -20,7 +19,7 @@ # do we do Makefile.am for devtools? It is a little special... IS_DEVTOOLS = $(findstring yast2-devtools,$(RPMNAME)) -DEVTOOLS_DIR = $(if $(IS_DEVTOOLS),$(srcdir)/devtools,$(PREFIX)/share/YaST2/data/devtools) +DEVTOOLS_DIR = $(if $(IS_DEVTOOLS),$(srcdir)/devtools,$(Y2DEVTOOLS_PREFIX)/share/YaST2/data/devtools) ALL_PACKAGES = $(DEVTOOLS_DIR)/admin/all-packages LEGALESE_DIR = $(if $(HAS_YAST_LICENSE),$(DEVTOOLS_DIR)/admin/copyright/yast,$(DEVTOOLS_DIR)/admin/copyright/gpl) @@ -34,7 +33,7 @@ AUTOMAKE_OPTIONS = foreign dist-bzip2 # where devtools instal m4 snippets # argh, executed literally -#ACLOCAL_AMFLAGS = -I $(PREFIX)/share/aclocal +#ACLOCAL_AMFLAGS = -I $(Y2DEVTOOLS_PREFIX)/share/aclocal ACLOCAL_AMFLAGS = -I `if test -d ./devtools/admin; then echo ./devtools/admin; else pkg-config --print-errors --variable=datadir yast2-devtools; fi`/aclocal Makefile.am.common: $(DEVTOOLS_DIR)/admin/Makefile.am.common @@ -67,7 +66,7 @@ # because the prerequisite is made here (not anymore!) # and we don't want any paths in y2autoconf # info '(autoconf)config.status Invocation' -$(RPMNAME).pc: $(RPMNAME).pc.in +$(RPMNAME).pc: $(RPMNAME).pc.in config.status ./config.status --file=$@:$< if CREATE_PKGCONFIG_NOARCH diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-mail-2.15.9/Makefile.am.common new/yast2-mail-2.15.9/Makefile.am.common --- old/yast2-mail-2.15.9/Makefile.am.common 2007-05-03 14:59:06.000000000 +0200 +++ new/yast2-mail-2.15.9/Makefile.am.common 2007-05-30 20:20:59.000000000 +0200 @@ -29,7 +29,19 @@ dist-hook: check-syntax +CHECK_SYNTAX = true check-syntax: $(client_DATA) $(ycpchook) - if test "$(client_DATA)"; then $(bindir)/ycpc -qE -M. -I. $(YCPCFLAGS) $(filter %.ycp,$^) || exit 1; fi + @if test "$(client_DATA)"; then \ + if $(CHECK_SYNTAX); then \ + TO_CHECK="$(filter %.ycp,$^)"; \ + echo "Checking syntax of $${TO_CHECK}"; \ + if ! $(YCPC) -qE -M. -I. $(YCPCFLAGS) $${TO_CHECK}; then \ + echo "Failed. Disable by 'make ... CHECK_SYNTAX=false' at your own risk"; \ + exit 1; \ + fi; \ + else \ + echo "Syntax check disabled"; \ + fi; \ + fi -include .dep diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-mail-2.15.9/missing new/yast2-mail-2.15.9/missing --- old/yast2-mail-2.15.9/missing 2007-05-03 14:59:10.000000000 +0200 +++ new/yast2-mail-2.15.9/missing 2007-05-30 20:26:13.000000000 +0200 @@ -1,9 +1,9 @@ #! /bin/sh # Common stub for a few missing GNU programs while installing. -scriptversion=2005-06-08.21 +scriptversion=2006-05-10.23 -# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004, 2005 +# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004, 2005, 2006 # Free Software Foundation, Inc. # Originally by Fran,cois Pinard <pinard(a)iro.umontreal.ca>, 1996. @@ -33,6 +33,8 @@ fi run=: +sed_output='s/.* --output[ =]$[^ ]*$.*/\1/p' +sed_minuso='s/.* -o $[^ ]*$.*/\1/p' # In the cases where this matters, `missing' is being run in the # srcdir already. @@ -44,7 +46,7 @@ msg="missing on your system" -case "$1" in +case $1 in --run) # Try to run requested program, and just exit if it succeeds. run= @@ -77,6 +79,7 @@ aclocal touch file \`aclocal.m4' autoconf touch file \`configure' autoheader touch file \`config.h.in' + autom4te touch the output file, or create a stub one automake touch all \`Makefile.in' files bison create \`y.tab.[ch]', if possible, from existing .[ch] flex create \`lex.yy.c', if possible, from existing .c @@ -106,7 +109,7 @@ # Now exit if we have it, but it failed. Also exit now if we # don't have it and --version was passed (most likely to detect # the program). -case "$1" in +case $1 in lex|yacc) # Not GNU programs, they don't have --version. ;; @@ -135,7 +138,7 @@ # If it does not exist, or fails to run (possibly an outdated version), # try to emulate it. -case "$1" in +case $1 in aclocal*) echo 1>&2 "\ WARNING: \`$1' is $msg. You should only need it if @@ -164,7 +167,7 @@ test -z "$files" && files="config.h" touch_files= for f in $files; do - case "$f" in + case $f in *:*) touch_files="$touch_files "`echo "$f" | sed -e 's/^[^:]*://' -e 's/:.*//'`;; *) touch_files="$touch_files $f.in";; @@ -192,8 +195,8 @@ You can get \`$1' as part of \`Autoconf' from any GNU archive site." - file=`echo "$*" | sed -n 's/.*--output[ =]*$[^ ]*$.*/\1/p'` - test -z "$file" && file=`echo "$*" | sed -n 's/.*-o[ ]*$[^ ]*$.*/\1/p'` + file=`echo "$*" | sed -n "$sed_output"` + test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"` if test -f "$file"; then touch $file else @@ -214,25 +217,25 @@ in order for those modifications to take effect. You can get \`Bison' from any GNU archive site." rm -f y.tab.c y.tab.h - if [ $# -ne 1 ]; then + if test $# -ne 1; then eval LASTARG="\${$#}" - case "$LASTARG" in + case $LASTARG in *.y) SRCFILE=`echo "$LASTARG" | sed 's/y$/c/'` - if [ -f "$SRCFILE" ]; then + if test -f "$SRCFILE"; then cp "$SRCFILE" y.tab.c fi SRCFILE=`echo "$LASTARG" | sed 's/y$/h/'` - if [ -f "$SRCFILE" ]; then + if test -f "$SRCFILE"; then cp "$SRCFILE" y.tab.h fi ;; esac fi - if [ ! -f y.tab.h ]; then + if test ! -f y.tab.h; then echo >y.tab.h fi - if [ ! -f y.tab.c ]; then + if test ! -f y.tab.c; then echo 'main() { return 0; }' >y.tab.c fi ;; @@ -244,18 +247,18 @@ in order for those modifications to take effect. You can get \`Flex' from any GNU archive site." rm -f lex.yy.c - if [ $# -ne 1 ]; then + if test $# -ne 1; then eval LASTARG="\${$#}" - case "$LASTARG" in + case $LASTARG in *.l) SRCFILE=`echo "$LASTARG" | sed 's/l$/c/'` - if [ -f "$SRCFILE" ]; then + if test -f "$SRCFILE"; then cp "$SRCFILE" lex.yy.c fi ;; esac fi - if [ ! -f lex.yy.c ]; then + if test ! -f lex.yy.c; then echo 'main() { return 0; }' >lex.yy.c fi ;; @@ -267,11 +270,9 @@ \`Help2man' package in order for those modifications to take effect. You can get \`Help2man' from any GNU archive site." - file=`echo "$*" | sed -n 's/.*-o $[^ ]*$.*/\1/p'` - if test -z "$file"; then - file=`echo "$*" | sed -n 's/.*--output=$[^ ]*$.*/\1/p'` - fi - if [ -f "$file" ]; then + file=`echo "$*" | sed -n "$sed_output"` + test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"` + if test -f "$file"; then touch $file else test -z "$file" || exec >$file @@ -289,11 +290,17 @@ DU, IRIX). You might want to install the \`Texinfo' package or the \`GNU make' package. Grab either from any GNU archive site." # The file to touch is that specified with -o ... - file=`echo "$*" | sed -n 's/.*-o $[^ ]*$.*/\1/p'` + file=`echo "$*" | sed -n "$sed_output"` + test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"` if test -z "$file"; then # ... or it is the one specified with @setfilename ... infile=`echo "$*" | sed 's/.* $[^ ]*$ *$/\1/'` - file=`sed -n '/^@setfilename/ { s/.* $[^ ]*$ *$/\1/; p; q; }' $infile` + file=`sed -n ' + /^@setfilename/{ + s/.* $[^ ]*$ *$/\1/ + p + q + }' $infile` # ... or it is derived from the source name (dir/f.texi becomes f.info) test -z "$file" && file=`echo "$infile" | sed 's,.*/,,;s,.[^.]*$,,'`.info fi @@ -317,13 +324,13 @@ fi firstarg="$1" if shift; then - case "$firstarg" in + case $firstarg in *o*) firstarg=`echo "$firstarg" | sed s/o//` tar "$firstarg" "$@" && exit 0 ;; esac - case "$firstarg" in + case $firstarg in *h*) firstarg=`echo "$firstarg" | sed s/h//` tar "$firstarg" "$@" && exit 0 diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-mail-2.15.9/src/mail-advanced.ycp new/yast2-mail-2.15.9/src/mail-advanced.ycp --- old/yast2-mail-2.15.9/src/mail-advanced.ycp 1970-01-01 01:00:00.000000000 +0100 +++ new/yast2-mail-2.15.9/src/mail-advanced.ycp 2007-05-30 19:54:14.000000000 +0200 @@ -0,0 +1,106 @@ +/** + * File: clients/mail-server.ycp + * Package: Configuration of mail-server + * Summary: Main file + * Authors: Peter Varkoly <varkoly(a)suse.de> + * + * $Id: mail-server.ycp 19955 2004-10-26 12:28:16Z varkoly $ + * + * Main file for mail-server configuration. Uses all other files. + */ + +{ + +/*** + * <h3>Configuration of mail-server</h3> + */ + +textdomain "MailServer"; + +/* The main () */ +y2milestone ("----------------------------------------"); +y2milestone ("MailServer module started"); + +import "Progress"; +import "Report"; +import "Summary"; +import "Popup"; +import "Label"; + +import "CommandLine"; +include "mail/mail-server_wizards.ycp"; + +map cmdline_description = $[ + "id" : "mail-server", + /* Command line help text for the mail-server module */ + "help" : _("Configuration of mail server"), + "guihandler" : MailServerSequence, + "initialize" : MailServer::Read, + "finish" : MailServer::Write, + "actions" : $[ + "setup" : $[ + "handler" : MailServerSequence, + "help" : _("Advanced Mail Server setup with LDAP backend"), + ], + ], + "options" : $[ + // FIXME TODO: fill the option descriptions here + ], + "mapping" : $[ + // FIXME TODO: fill the mappings of actions and options here + ] +]; + +/* analyze command line */ +boolean propose = false; +boolean setup = false; +list args = WFM::Args(); +if(size(args) > 0) { + if(is(WFM::Args(0), path) && WFM::Args(0) == .propose) { + y2milestone("Using PROPOSE mode"); + propose = true; + } + if(contains(args,"setup")) { + y2milestone("Using setup mode"); + setup = true; + } +} + +/* + after merging yast2-mail and yast2-mail-server we have to be + carefull not to corrupt the configuration of the other modul +*/ +if( !setup && SCR::Read (.sysconfig.mail.MAIL_CREATE_CONFIG)== "yes" ) +{ + if( + ! Popup::AnyQuestionRichText( + Label::WarningMsg(), + _("You have configured your MTA without LDAP support. ") + + _("This modul will configure your MTA with LDAP support. ") + + _("This will corrupt your actuall configuration."), + 80, 10, + Label::ContinueButton(), + Label::CancelButton(), + `focus_no + ) + ) + { + return nil; + } +} + +/* main ui function */ +any ret = nil; + +if(propose) ret = MailServerAutoSequence(); +else ret = CommandLine::Run(cmdline_description); +y2debug("ret=%1", ret); + +/* Finish */ +y2milestone("MailServer module finished"); +y2milestone("----------------------------------------"); + +return ret; + +/* EOF */ +} diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-mail-2.15.9/src/mail.desktop new/yast2-mail-2.15.9/src/mail.desktop --- old/yast2-mail-2.15.9/src/mail.desktop 2007-03-21 12:03:10.000000000 +0100 +++ new/yast2-mail-2.15.9/src/mail.desktop 2007-05-30 18:21:23.000000000 +0200 @@ -22,33 +22,4 @@ Name=Mail Transfer Agent GenericName=Configure mail -Name[cs]=Agent přenosu pošty (MTA) -GenericName[cs]=Konfigurovat poštu -GenericName[de]=Mailkonfiguration -Name[es]=Agente de transferencia de mensajes (MTA) -GenericName[es]=Configurar correo -Name[hu]=Levéltovábbító szerver (Mail Transfer Agent, MTA) -GenericName[hu]=Levelezés beállítása -GenericName[it]=Configurazione posta -Name[ko]=메일 전송 에이전트 -GenericName[ko]=메일 설정 -GenericName[nl]=Configureer mail -Name[pt]=Servidor de Correio - MTA -GenericName[pt]=Configurar correio -GenericName[sk]=Konfigurovať poštu -Name[sv]=Överföringsagent för e-post (MTA) -GenericName[sv]=Ställ in e-post -GenericName[da]=Indstil e-post -Name[el]=Πράκτορας Μεταφοράς Αλληλογραφίας -GenericName[el]=Ρύθμιση αλληλογραφίας -Name[fr]=Agent de transfert de mail -GenericName[fr]=Configurer le courrier -Name[ja]=メッセージ転送機能体 -GenericName[ja]=電子メールを設定する -Name[lt]=Pašto gabenimo agentas -GenericName[lt]=Konfigūruoti paštą -Name[sl]=Posrednik za prenos pošte -GenericName[sl]=Konfiguriraj pošto -Name[tr]=Posta transfer yöneticisi -GenericName[tr]=Posta yapılandırması düzenleyin X-KDE-SubstituteUID=true diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-mail-2.15.9/src/mail-server_dialogs.ycp new/yast2-mail-2.15.9/src/mail-server_dialogs.ycp --- old/yast2-mail-2.15.9/src/mail-server_dialogs.ycp 2007-04-19 17:13:24.000000000 +0200 +++ new/yast2-mail-2.15.9/src/mail-server_dialogs.ycp 2007-05-30 19:54:42.000000000 +0200 @@ -18,7 +18,6 @@ import "Service"; import "Users"; import "YaPI::MailServer"; -import "YaPI::LdapServer"; include "mail/helps.ycp"; @@ -29,11 +28,24 @@ */ define any AuthorizingDialog () { - string ERROR = ""; + string ERROR = _("You must configure LDAP to use the mail server."); Ldap::Read(); map LDAPSettings = Ldap::Export(); - if(LDAPSettings["base_config_dn"]:"" == "" ) { - ERROR = _("You must configure LDAP to use the mail server."); + if(LDAPSettings["ldap_server"]:"" == "" ) + { + ERROR = ERROR + "\n" + _("Now we will start the LDAP-Server setup vizard."); + if(Popup::YesNo(ERROR)) + { + return `ldapsetup; + } + else + { + return `abort; + } + Ldap::Read(); + } + if(LDAPSettings["base_config_dn"]:"" == "" ) + { ERROR = ERROR + "\n"; } Ldap::LDAPInit(); @@ -70,46 +82,7 @@ MailServer::CertExist = true; } - - string caption = _("Mail Server Administrator Authorization"); - term contents = `HBox( - `HStretch(), - `Password(`id(`password), _("&Enter the Password for LDAP Server:"), ""), - `HStretch() - ); - - Wizard::SetContentsButtons(caption, contents, HELPS["AuthorizingDialog"]:"", - Label::BackButton(), Label::NextButton()); - Wizard::SetDesktopIcon("mailserver"); - UI::WizardCommand(`SetBackButtonLabel( "" ) ); - UI::SetFocus (`id (`password)); - - any ret = nil; - while(true) { - - ret = UI::UserInput(); - - MailServer::AdminPassword = (string) UI::QueryWidget(`id(`password), `Value); - - /* abort? */ - if(ret == `abort || ret == `cancel) { - if(ReallyAbort()) break; - else continue; - } else if(ret == `next) { - MailServer::LDAPDefaults = (map<string,any>) YaPI::MailServer::ReadLDAPDefaults( - MailServer::AdminPassword); - if (MailServer::LDAPDefaults == nil) { - Popup::Error(_("Unable to Authorize the Administrator User")); - continue; - } - return ret; - } else { - y2error("unexpected retcode: %1", ret); - continue; - } - } - - return ret; + return Ldap::LDAPAskAndBind(false); } diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-mail-2.15.9/src/MailServerLDAP.pm new/yast2-mail-2.15.9/src/MailServerLDAP.pm --- old/yast2-mail-2.15.9/src/MailServerLDAP.pm 1970-01-01 01:00:00.000000000 +0100 +++ new/yast2-mail-2.15.9/src/MailServerLDAP.pm 2007-05-30 19:54:54.000000000 +0200 @@ -0,0 +1,97 @@ +=head1 NAME + +MailServerLDAP + +=head1 PREFACE + +This package is a part of the YaST2 mail modul. + +=head1 SYNOPSIS + +use MailServerLDAP + + +=head1 DESCRIPTION + +B<MailServerLDAP> provides a function ConfigureLDAPServer that makes the local +LDAP server able to store the tables of the mail server. + +=over 2 + +=cut + +package MailServerLDAP; + +use strict; + +use YaST::YCP; + +textdomain("MailServer"); + +our %TYPEINFO; + +YaST::YCP::Import ("Ldap"); +YaST::YCP::Import ("YaPI::LdapServer"); + + +sub ConfigureLDAPServer() +{ + # don't configure if using eDirectory server + Ldap->CheckNDS (); + if (! Ldap->nds()) + { + # Now we configure the LDAP-Server to be able store the mail server configuration + my $schemas = YaPI::LdapServer->ReadSchemaIncludeList(); + my $SCHEMA = join "",@{$schemas}; + if( $SCHEMA !~ /dnszone.schema/ ) + { + push @{$schemas},'/etc/openldap/schema/dnszone.schema'; + } + if( $SCHEMA !~ /suse-mailserver.schema/ ) + { + push @{$schemas},'/etc/openldap/schema/suse-mailserver.schema'; + YaPI::LdapServer->WriteSchemaIncludeList($schemas); + my $indices = YaPI::LdapServer->ReadIndex($ldapMap->{ldap_domain}); + my $SuSEMailClient = 0; + my $SuSEMailDomainMasquerading = 0; + my $suseTLSPerSitePeer= 0; + foreach my $index (@{$indices}) + { + if( $index->{attr} eq "SuSEMailClient,SUSEMailAcceptAddress,zoneName") + { + $SuSEMailClient = 1; + } + if( $index->{attr} eq "SuSEMailDomainMasquerading,relativeDomainName,suseMailDomainType") + { + $SuSEMailDomainMasquerading = 1; + } + if( $index->{attr} eq "suseTLSPerSitePeer,SuSEMailTransportDestination") + { + $suseTLSPerSitePeer = 1; + } + } + if(!$SuSEMailClient) + { + YaPI::LdapServer->AddIndex($ldapMap->{ldap_domain}, + { "attr" => "SuSEMailClient,SUSEMailAcceptAddress,zoneName", + "param" => "eq" } + ); + } + if(!$SuSEMailDomainMasquerading) + { + YaPI::LdapServer->AddIndex($ldapMap->{ldap_domain}, + { "attr" => "SuSEMailDomainMasquerading,relativeDomainName,suseMailDomainType", + "param" => "eq" } + ); + } + if(!$SuSEMailClient) + { + YaPI::LdapServer->AddIndex($ldapMap->{ldap_domain}, + { "attr" => "suseTLSPerSitePeer,SuSEMailTransportDestination", + "param" => "eq" } + ); + } + YaPI::LdapServer->RecreateIndex($ldapMap->{ldap_domain}); + } + } +} diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-mail-2.15.9/src/mail-server_wizards.ycp new/yast2-mail-2.15.9/src/mail-server_wizards.ycp --- old/yast2-mail-2.15.9/src/mail-server_wizards.ycp 2007-04-19 17:12:29.000000000 +0200 +++ new/yast2-mail-2.15.9/src/mail-server_wizards.ycp 2007-05-30 19:55:17.000000000 +0200 @@ -19,6 +19,31 @@ /** + * Workflow of the LDAP Server/Client setup + * @return sequence result + */ +any LdapSetupSequence() { + + /* FIXME: adapt to your needs */ + map aliases = $[ + "complex" : ``( ComplexDialog() ) + ]; + + /* FIXME: adapt to your needs */ + map sequence = $[ + "ws_start" : "complex", + "complex" : $[ + `abort : `abort, + `next : `next + ] + ]; + + any ret = Sequencer::Run(aliases, sequence); + + return ret; +} + +/** * Main workflow of the mail-server configuration * @return sequence result */ @@ -50,10 +75,11 @@ any MailServerSequence() { map aliases = $[ - "read" : [ ``( ReadDialog() ), true ], - "auth" : [ ``( AuthorizingDialog() ), true ], - "main" : ``( MainSequence() ), - "write" : [ ``( WriteDialog() ), true ] + "read" : [ ``( ReadDialog() ), true ], + "auth" : [ ``( AuthorizingDialog() ), true ], + "main" : ``( MainSequence() ), + "ldapsetup" : ``( LdapSetupSequence() ), + "write" : [ ``( WriteDialog() ), true ] ]; map sequence = $[ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-mail-2.15.9/src/mail-server.ycp new/yast2-mail-2.15.9/src/mail-server.ycp --- old/yast2-mail-2.15.9/src/mail-server.ycp 2007-04-20 21:56:40.000000000 +0200 +++ new/yast2-mail-2.15.9/src/mail-server.ycp 1970-01-01 01:00:00.000000000 +0100 @@ -1,98 +0,0 @@ -/** - * File: clients/mail-server.ycp - * Package: Configuration of mail-server - * Summary: Main file - * Authors: Peter Varkoly <varkoly(a)suse.de> - * - * $Id: mail-server.ycp 19955 2004-10-26 12:28:16Z varkoly $ - * - * Main file for mail-server configuration. Uses all other files. - */ - -{ - -/*** - * <h3>Configuration of mail-server</h3> - */ - -textdomain "MailServer"; - -/* The main () */ -y2milestone ("----------------------------------------"); -y2milestone ("MailServer module started"); - -import "Progress"; -import "Report"; -import "Summary"; -import "Popup"; -import "Label"; - -import "CommandLine"; -include "mail/mail-server_wizards.ycp"; - -map cmdline_description = $[ - "id" : "mail-server", - /* Command line help text for the mail-server module */ - "help" : _("Configuration of mail server"), - "guihandler" : MailServerSequence, - "initialize" : MailServer::Read, - "finish" : MailServer::Write, - "actions" : $[ - // FIXME TODO: fill the functionality description here - ], - "options" : $[ - // FIXME TODO: fill the option descriptions here - ], - "mapping" : $[ - // FIXME TODO: fill the mappings of actions and options here - ] -]; - -/* - after merging yast2-mail and yast2-mail-server we have to be - carefull not to corrupt the configuration of the other modul -*/ -if( SCR::Read (.sysconfig.mail.MAIL_CREATE_CONFIG)== "yes" ) -{ - if( - ! Popup::AnyQuestionRichText( - Label::WarningMsg(), - _("You have configured your MTA without LDAP support. ") + - _("This modul will configure your MTA with LDAP support. ") + - _("This will corrupt your actuall configuration."), - 80, 10, - Label::ContinueButton(), - Label::CancelButton(), - `focus_no - ) - ) - { - return nil; - } -} - -/* is this proposal or not? */ -boolean propose = false; -list args = WFM::Args(); -if(size(args) > 0) { - if(is(WFM::Args(0), path) && WFM::Args(0) == .propose) { - y2milestone("Using PROPOSE mode"); - propose = true; - } -} - -/* main ui function */ -any ret = nil; - -if(propose) ret = MailServerAutoSequence(); -else ret = CommandLine::Run(cmdline_description); -y2debug("ret=%1", ret); - -/* Finish */ -y2milestone("MailServer module finished"); -y2milestone("----------------------------------------"); - -return ret; - -/* EOF */ -} diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-mail-2.15.9/src/MailServer.ycp new/yast2-mail-2.15.9/src/MailServer.ycp --- old/yast2-mail-2.15.9/src/MailServer.ycp 2007-05-04 08:53:11.000000000 +0200 +++ new/yast2-mail-2.15.9/src/MailServer.ycp 2007-05-30 19:55:52.000000000 +0200 @@ -366,9 +366,6 @@ return false; } } - if( SCR::Read(.target.size, "/var/adm/yast2-mail-server-used") < 0) { - YaPI::MailServer::ResetMailServer(MailServer::AdminPassword,MailServer::LDAPDefaults); - } NetworkDevices::Read(); map<string,map> TMP = NetworkDevices::Export("modem"); diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-mail-2.15.9/src/mail-standard.ycp new/yast2-mail-2.15.9/src/mail-standard.ycp --- old/yast2-mail-2.15.9/src/mail-standard.ycp 1970-01-01 01:00:00.000000000 +0100 +++ new/yast2-mail-2.15.9/src/mail-standard.ycp 2007-05-30 19:56:04.000000000 +0200 @@ -0,0 +1,110 @@ +/** + * File: + * clients/mail.ycp + * + * Package: + * Configuration of mail + * + * Summary: + * Main file + * + * Authors: + * Martin Vidner <mvidner(a)suse.cz> + * Peter Varkoly <varkoly(a)novell.com> + * + * $Id: mail.ycp 37642 2007-04-20 19:06:52Z varkoly $ + * + * Main file for mail configuration. Uses all other files. + * + */ + +/** + * @param flag "permanent", "dialup", or "screenshots" + * <dl> + * <dt>permanent<dd>preselects permanent connnection + * <dt>dialup<dd>preselects dial-up connnection + * <dt>screenshots + * <dd>uses faked data (see Mail::Fake), enables running the module + * as non-root. (Uses Mode::screen_shot().) + * </dl> + */ +{ + /*** + * <h3>Configuration of the mail</h3> + */ + + textdomain "mail"; + + import "CommandLine"; + import "Mail"; + import "RichText"; + include "mail/ui.ycp"; + + /* The main () */ + y2milestone ("Mail standard module started"); + y2milestone ("----------------------------------------"); + + /* parse arguments */ + list args = WFM::Args (); + string first_arg = args[0]:""; + if (first_arg == "permanent") + { + preselect_connection_type = `permanent; + } + else if (first_arg == "dialup") + { + preselect_connection_type = `dialup; + } + + /** + * CLI action handler. + * Print summary in command line + * @param options command options + * @return false so that Write is not called in non-interactive mode + */ + define boolean MailSummaryHandler (map options) { + + CommandLine::Print (RichText::Rich2Plain (Mail::Summary ())); + return false; + } + + /** + * CLI initializer. + * @return whether successful + */ + define boolean MailRead () { + + block<boolean> callback = ``{ + return false; + }; + return Mail::Read (callback); + } + + + map cmdline_description = $[ + "id" : "mail", + /* Command line help text for the mail module */ + "help" : _("Configuration of mail"), + "guihandler" : MailSequence, + "initialize" : MailRead, + "finish" : Mail::Write, + "actions" : $[ + "summary" : $[ + "handler" : MailSummaryHandler, + // command line action help + "help" : _("Mail configuration summary"), + ], + ], + "mappings" : $[ + "summary" : [], + ] + ]; + /* main ui function */ + any ret = (preselect_connection_type == nil) ? + CommandLine::Run (cmdline_description) : MailSequence (); + y2debug ("ret == %1", ret); + + /* Finish */ + y2milestone ("Mail standard module finished"); + return ret; +} diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-mail-2.15.9/src/mail.ycp new/yast2-mail-2.15.9/src/mail.ycp --- old/yast2-mail-2.15.9/src/mail.ycp 2007-04-20 21:56:40.000000000 +0200 +++ new/yast2-mail-2.15.9/src/mail.ycp 2007-05-30 20:07:47.000000000 +0200 @@ -10,8 +10,9 @@ * * Authors: * Martin Vidner <mvidner(a)suse.cz> + * Peter Varkoly <varkoly(a)novell.com> * - * $Id: mail.ycp 37642 2007-04-20 19:06:52Z varkoly $ + * $Id: mail.ycp 38213 2007-05-30 18:07:53Z varkoly $ * * Main file for mail configuration. Uses all other files. * @@ -34,102 +35,167 @@ textdomain "mail"; - import "CommandLine"; - import "Mail"; - import "RichText"; + import "Wizard"; import "Popup"; import "Label"; - include "mail/ui.ycp"; /* The main () */ y2milestone ("Mail module started"); y2milestone ("----------------------------------------"); - /* parse arguments */ - list args = WFM::Args (); - string first_arg = args[0]:""; - if (first_arg == "permanent") + /* The maske to select the type of the configuration */ +define string StartDialogHelp () ``{ + return + // Translators: start dialog help, part 1 of 4 + _("Email Server Configuration ") + + // Translators: start dialog help, part 2 of 4 + _("This module will configure and start Postfix and if necessary the Cyrus IMAP Server.")+ + // Translators: start dialog help, part 3 of 4 + _("Be aware:\nMost home users can use the build-in +features of their email application to send and +get email. They do not need this module.")+ + // Translators: start dialog help, part 4 of 4 + _("You will need Postfix only if you want to store +the email on your local system, or in some other special cases."); +} + +define string StartDialog (string type) ``{ + + y2milestone ("Mail configuration type %1", type); + + Wizard::SetScreenShotName ("mail-0-start"); + string caption = _("Email Server Configuration"); + term tskip_ask = `Left(`CheckBox(`id(`skip_ask), _("Skip this page in the future"))); + string status = _("Mail Server is not configured. +Select configuration type according your personal needs"); + if( type == "standard" ) { - preselect_connection_type = `permanent; + status = _("The running Mail Server configuration is based on type “Standard”. +It's possible to change to “Advanced”, but this will overwrite all existing settings."); } - else if (first_arg == "dialup") + else if( type == "advanced" ) { - preselect_connection_type = `dialup; + status = _("The running Mail Server configuration is based on type “Advanced”. +It's possible to change to “Standard”, but this will overwrite all existing settings."); } - - /** - * CLI action handler. - * Print summary in command line - * @param options command options - * @return false so that Write is not called in non-interactive mode - */ - define boolean MailSummaryHandler (map options) { - - CommandLine::Print (RichText::Rich2Plain (Mail::Summary ())); - return false; + if( type != "standard" && type != "advanced" ) + { + tskip_ask = `VSpacing(1); + } + term contents = + `Frame( + "", + `VBox( + `Left(`Label(status)), + `RadioButtonGroup( `id( `conf_type ), + `VBox( + `VSpacing(1), + `Left(`RadioButton(`id("standard"),_("Standard"), type == "standard" )), + `VSpacing(1), + `Left(`RadioButton(`id("advanced"),_("Advanced"), type == "advanced" )), + `VSpacing(1) + ) + ), + tskip_ask, + `VSpacing(1) + ) + ); + Wizard::CreateDialog(); + Wizard::SetContentsButtons (caption, contents, StartDialogHelp (), Label::BackButton (), Label::NextButton ()); + + any ret = nil; + string sret = nil; + while (true) + { + ret = UI::UserInput (); + if (ret == `cancel) + { + ret = `abort; + } + + if (ret == `back || (ret == `abort )) + { + break; + } + + if (ret == `next ) + { + if( (boolean) UI::QueryWidget (`id (`skip_ask), `Value) ) + { + SCR::Write (.sysconfig.mail.SKIP_ASK, "yes"); + } + else + { + SCR::Write (.sysconfig.mail.SKIP_ASK, "no"); + } + sret = (string) UI::QueryWidget (`id (`conf_type), `CurrentButton); + if( sret == nil ) + { + Popup::Error(_("You have to select a configuration type")); + continue; + } + SCR::Write (.sysconfig.mail.CONFIG_TYPE, sret); + y2milestone ("Mail configuration type %1", sret); + break; + } } + UI::CloseDialog(); + return sret; - /** - * CLI initializer. - * @return whether successful - */ - define boolean MailRead () { +} + + /* parse arguments */ + list args = WFM::Args (); - block<boolean> callback = ``{ - return false; - }; - return Mail::Read (callback); - } - - map cmdline_description = $[ - "id" : "mail", - /* Command line help text for the mail module */ - "help" : _("Configuration of mail"), - "guihandler" : MailSequence, - "initialize" : MailRead, - "finish" : Mail::Write, - "actions" : $[ - "summary" : $[ - "handler" : MailSummaryHandler, - // command line action help - "help" : _("Mail configuration summary"), - ], - ], - "mappings" : $[ - "summary" : [], - ] - ]; - - /* - after merging yast2-mail and yast2-mail-server we have to be - carefull not to corrupt the configuration of the other modul - */ + /* we collect some informations from the system */ + any ret = nil; + string skip_ask = "no"; + string conf_type = "undef"; + skip_ask = (string) SCR::Read (.sysconfig.mail.SKIP_ASK); + conf_type = (string) SCR::Read (.sysconfig.mail.CONFIG_TYPE); + boolean first_start = false; map local_recipient_maps = (map) SCR::Read (.mail.ldaptable, "local_recipient_maps"); -y2milestone("local_recipient_maps: %1",local_recipient_maps); - if( local_recipient_maps != nil ) + + if( conf_type != "advanced" && conf_type != "standard" ) + { // First start of mail modul or update from < 10.3 + y2milestone ("Warum bin i here Mail configuration type %1", conf_type); + if( local_recipient_maps != nil ) + { // Postfix configured using LDAP + conf_type = "advanced"; + } + else + { + conf_type = "standard"; + } + first_start = true; + } + if( skip_ask == "no" || skip_ask == nil ) { - if( - ! Popup::AnyQuestionRichText( - Label::WarningMsg(), - _("You have configured your MTA with LDAP support. ") + - _("This modul will configure your MTA without LDAP support. ") + - _("This will corrupt your actuall configuration."), - 80, 10, - Label::ContinueButton(), - Label::CancelButton(), - `focus_no - ) - ) - { - return nil; - } - } - - /* main ui function */ - any ret = (preselect_connection_type == nil) ? - CommandLine::Run (cmdline_description) : MailSequence (); + string old_conf = conf_type; + conf_type = StartDialog(conf_type); + if( conf_type == nil ) + { + y2milestone("no mail server configuration type"); + return ret; + } + if( old_conf != conf_type ) + { + first_start = true; + } + } - y2debug ("ret == %1", ret); + if( conf_type == "advanced" ) + { + if( first_start ) + { + args[size(args)] = "setup"; + } + ret = WFM::CallFunction("mail-advanced",args); + } + else + { + ret = WFM::CallFunction("mail-standard",args); + } /* Finish */ y2milestone ("Mail module finished"); diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-mail-2.15.9/src/Makefile.am new/yast2-mail-2.15.9/src/Makefile.am --- old/yast2-mail-2.15.9/src/Makefile.am 2007-05-04 14:25:23.000000000 +0200 +++ new/yast2-mail-2.15.9/src/Makefile.am 2007-05-30 20:16:43.000000000 +0200 @@ -1,7 +1,7 @@ # # Makefile.am for y2c_mail/src # -# $Id: Makefile.am 37835 2007-05-04 12:25:20Z varkoly $ +# $Id: Makefile.am 38213 2007-05-30 18:07:53Z varkoly $ # SUBDIRS = YaPI @@ -12,8 +12,8 @@ client_DATA = \ mail.ycp \ mail_auto.ycp \ - \ - mail-server.ycp \ + mail-standard.ycp \ + mail-advanced.ycp \ mail-server_auto.ycp \ mail-server_proposal.ycp @@ -34,7 +34,8 @@ module_DATA = \ Mail.ycp \ - MailServer.ycp + MailServer.ycp \ + MailServerLDAP.pm ldapschema_DATA = suse-mailserver.schema diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-mail-2.15.9/src/YaPI/MailServer.pm new/yast2-mail-2.15.9/src/YaPI/MailServer.pm --- old/yast2-mail-2.15.9/src/YaPI/MailServer.pm 2007-04-19 16:39:13.000000000 +0200 +++ new/yast2-mail-2.15.9/src/YaPI/MailServer.pm 2007-05-30 19:56:38.000000000 +0200 @@ -43,13 +43,12 @@ our @CAPABILITIES = ( 'SLES10' ); -our $VERSION="1.1.0"; +our $VERSION="2.2.0"; YaST::YCP::Import ("SCR"); YaST::YCP::Import ("Service"); YaST::YCP::Import ("Ldap"); YaST::YCP::Import ("NetworkDevices"); -YaST::YCP::Import ("YaPI::LdapServer"); ## # @@ -2184,7 +2183,7 @@ The LDAP Base for the DNS Configuration The LDAP Base for the MAIL Configuration The LDAP Template for the MAIL Configuration -If the last two does not exist this will be created. +If the last there does not exist this will be created. The result is an hash of following structur: @@ -2575,65 +2574,6 @@ SCR->Write(".sysconfig.mail.MAIL_CREATE_CONFIG","no"); SCR->Write(".sysconfig.mail",undef); - # don't configure if using eDirectory server - Ldap->CheckNDS (); - if (! Ldap->nds()) - { - # Now we configure the LDAP-Server to be able store the mail server configuration - my $schemas = YaPI::LdapServer->ReadSchemaIncludeList(); - my $SCHEMA = join "",@{$schemas}; - if( $SCHEMA !~ /dnszone.schema/ ) - { - push @{$schemas},'/etc/openldap/schema/dnszone.schema'; - } - if( $SCHEMA !~ /suse-mailserver.schema/ ) - { - push @{$schemas},'/etc/openldap/schema/suse-mailserver.schema'; - YaPI::LdapServer->WriteSchemaIncludeList($schemas); - my $indices = YaPI::LdapServer->ReadIndex($ldapMap->{ldap_domain}); - my $SuSEMailClient = 0; - my $SuSEMailDomainMasquerading = 0; - my $suseTLSPerSitePeer= 0; - foreach my $index (@{$indices}) - { - if( $index->{attr} eq "SuSEMailClient,SUSEMailAcceptAddress,zoneName") - { - $SuSEMailClient = 1; - } - if( $index->{attr} eq "SuSEMailDomainMasquerading,relativeDomainName,suseMailDomainType") - { - $SuSEMailDomainMasquerading = 1; - } - if( $index->{attr} eq "suseTLSPerSitePeer,SuSEMailTransportDestination") - { - $suseTLSPerSitePeer = 1; - } - } - if(!$SuSEMailClient) - { - YaPI::LdapServer->AddIndex($ldapMap->{ldap_domain}, - { "attr" => "SuSEMailClient,SUSEMailAcceptAddress,zoneName", - "param" => "eq" } - ); - } - if(!$SuSEMailDomainMasquerading) - { - YaPI::LdapServer->AddIndex($ldapMap->{ldap_domain}, - { "attr" => "SuSEMailDomainMasquerading,relativeDomainName,suseMailDomainType", - "param" => "eq" } - ); - } - if(!$SuSEMailClient) - { - YaPI::LdapServer->AddIndex($ldapMap->{ldap_domain}, - { "attr" => "suseTLSPerSitePeer,SuSEMailTransportDestination", - "param" => "eq" } - ); - } - YaPI::LdapServer->RecreateIndex($ldapMap->{ldap_domain}); - } - } - #Put user postfix into the group mail system($check_postfix); ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit xorg-x11-libxcb
by root＠Hilbert.suse.de 31 May '07

31 May '07

Hello community, here is the log from the commit of package xorg-x11-libxcb checked in at Thu May 31 21:18:18 CEST 2007. -------- --- xorg-x11-libxcb/xorg-x11-libxcb.changes 2007-04-27 11:33:32.000000000 +0200 +++ /mounts/work_src_done/STABLE/xorg-x11-libxcb/xorg-x11-libxcb.changes 2007-05-29 15:22:16.601293000 +0200 @@ -1,0 +2,5 @@ +Tue May 29 15:21:21 CEST 2007 - sndirsch(a)suse.de + +- added "%post -p /sbin/ldconfig" to specfile to make rpmlint happy + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ xorg-x11-libxcb.spec ++++++ --- /var/tmp/diff_new_pack.c11648/_old 2007-05-31 21:18:10.000000000 +0200 +++ /var/tmp/diff_new_pack.c11648/_new 2007-05-31 21:18:10.000000000 +0200 @@ -15,7 +15,7 @@ BuildRequires: libxslt pkgconfig xorg-x11-libXau-devel xorg-x11-proto-devel Url: http://xorg.freedesktop.org/ Version: 7.2 -Release: 19 +Release: 25 License: X11/MIT BuildRoot: %{_tmppath}/%{name}-%{version}-build Group: System/Libraries @@ -71,6 +71,8 @@ %clean rm -rf "$RPM_BUILD_ROOT" +%post -p /sbin/ldconfig + %files %defattr(-,root,root) /usr/%{_lib}/*.so.* @@ -85,6 +87,8 @@ /usr/%{_lib}/pkgconfig/*.pc %changelog +* Tue May 29 2007 - sndirsch(a)suse.de +- added "%%post -p /sbin/ldconfig" to specfile to make rpmlint happy * Fri Apr 27 2007 - sndirsch(a)suse.de - bug-262309_xcb-xauthlocalhostname.diff: * add code, which checks for XAUTHLOCALHOSTNAME now also for ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit xfwm4
by root＠Hilbert.suse.de 31 May '07

31 May '07

Hello community, here is the log from the commit of package xfwm4 checked in at Thu May 31 21:17:21 CEST 2007. -------- --- xfwm4/xfwm4.changes 2007-04-18 16:09:52.000000000 +0200 +++ /mounts/work_src_done/STABLE/xfwm4/xfwm4.changes 2007-05-30 10:28:28.000000000 +0200 @@ -1,0 +2,6 @@ +Wed May 30 10:27:41 CEST 2007 - bwalle(a)suse.de + +- disable KDE systray support, it's broken for applications that + want to hide their application icon like the volume unmounter + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ xfwm4.spec ++++++ --- /var/tmp/diff_new_pack.mn9889/_old 2007-05-31 21:17:14.000000000 +0200 +++ /var/tmp/diff_new_pack.mn9889/_new 2007-05-31 21:17:14.000000000 +0200 @@ -16,7 +16,7 @@ BuildRequires: startup-notification startup-notification-devel Summary: Next generation window manager for xfce Version: 4.4.1 -Release: 2 +Release: 19 License: GNU General Public License (GPL) URL: http://www.xfce.org/ Source0: %{name}-%{version}.tar.bz2 @@ -42,9 +42,8 @@ %build export CFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing" -./configure --prefix=%{_prefix} --datadir=%{_datadir} --bindir=%{_bindir} \ - --libdir=%{_libdir} --mandir=%{_mandir} --sysconfdir=%{_sysconfdir} \ - --enable-compositor --enable-kde-systray +%configure \ + --enable-compositor make %{?jobs:-j%jobs} %install @@ -65,6 +64,9 @@ %{_datadir}/xf* %changelog +* Wed May 30 2007 - bwalle(a)suse.de +- disable KDE systray support, it's broken for applications that + want to hide their application icon like the volume unmounter * Wed Apr 18 2007 - prusnak(a)suse.cz - removed invalid line from spec file * Wed Apr 11 2007 - prusnak(a)suse.cz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit xemacs
by root＠Hilbert.suse.de 31 May '07

31 May '07

Hello community, here is the log from the commit of package xemacs checked in at Thu May 31 21:16:55 CEST 2007. -------- --- xemacs/xemacs.changes 2007-05-08 16:58:46.000000000 +0200 +++ /mounts/work_src_done/STABLE/xemacs/xemacs.changes 2007-05-31 15:07:20.000000000 +0200 @@ -1,0 +2,7 @@ +Thu May 31 14:18:19 CEST 2007 - mfabian(a)suse.de + +- update to 21.5.28. +- remove header files to stop RPMLINT complaining about + header files in non-devel packages. + +------------------------------------------------------------------- Old: ---- xemacs-21.5.27.20070507.tar.bz2 New: ---- xemacs-21.5.28.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ xemacs.spec ++++++ --- /var/tmp/diff_new_pack.bu6486/_old 2007-05-31 21:16:31.000000000 +0200 +++ /var/tmp/diff_new_pack.bu6486/_new 2007-05-31 21:16:31.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package xemacs (Version 21.5.27.20070507) +# spec file for package xemacs (Version 21.5.28) # # Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine @@ -30,8 +30,8 @@ Prereq: permissions Requires: xemacs-info xemacs-packages ctags Autoreqprov: on -Version: 21.5.27.20070507 -Release: 3 +Version: 21.5.28 +Release: 1 Summary: XEmacs BuildRoot: %{_tmppath}/%{name}-%{version}-build # Howto get the cvs tree of XEmacs: @@ -47,7 +47,7 @@ # cd .. # Now make a tar.bz2 file from the contents of the "packages" directory: # tar jcvf xemacs-<version>.tar.bz2 xemacs-<version>/ -Source0: ftp://ftp.xemacs.org/xemacs-21.5/xemacs-21.5.27.20070507.tar.bz2 +Source0: ftp://ftp.xemacs.org/xemacs-21.5/xemacs-21.5.28.tar.bz2 Source1: xe-list.el Source2: fix-load-history.el Patch0: xemacs.patch @@ -443,6 +443,9 @@ mv $RPM_BUILD_ROOT/usr/share/applications/xemacs.desktop.new $RPM_BUILD_ROOT/usr/share/applications/xemacs.desktop %endif ## +# do no include header files because RPMLINT complains about header files in non-devel +# packages: +rm -rf $RPM_BUILD_ROOT/usr/lib/xemacs/%{version}/*-suse-linux/include/ %post %run_permissions @@ -487,15 +490,6 @@ /usr/lib/xemacs/%{version}/*-suse-linux/gnuserv /usr/lib/xemacs/%{version}/*-suse-linux/gzip-el.sh /usr/lib/xemacs/%{version}/*-suse-linux/hexl -%dir /usr/lib/xemacs/%{version}/*-suse-linux/include/ -/usr/lib/xemacs/%{version}/*-suse-linux/include/*.h -%dir /usr/lib/xemacs/%{version}/*-suse-linux/include/m/ -%doc /usr/lib/xemacs/%{version}/*-suse-linux/include/m/README -/usr/lib/xemacs/%{version}/*-suse-linux/include/m/*.h -%dir /usr/lib/xemacs/%{version}/*-suse-linux/include/s/ -%doc /usr/lib/xemacs/%{version}/*-suse-linux/include/s/README -/usr/lib/xemacs/%{version}/*-suse-linux/include/s/*.h -/usr/lib/xemacs/%{version}/*-suse-linux/include/s/cygwin.sc /usr/lib/xemacs/%{version}/*-suse-linux/make-docfile /usr/lib/xemacs/%{version}/*-suse-linux/mmencode %dir /usr/lib/xemacs/%{version}/*-suse-linux/modules/ @@ -552,6 +546,10 @@ %dir /usr/share/xemacs/site-packages/lisp/term/ %changelog +* Thu May 31 2007 - mfabian(a)suse.de +- update to 21.5.28. +- remove header files to stop RPMLINT complaining about + header files in non-devel packages. * Tue May 08 2007 - schwab(a)suse.de - Repair ia64 configuration. * Mon May 07 2007 - mfabian(a)suse.de ++++++ xemacs-21.5.27.20070507.tar.bz2 -> xemacs-21.5.28.tar.bz2 ++++++ xemacs/xemacs-21.5.27.20070507.tar.bz2 /mounts/work_src_done/STABLE/xemacs/xemacs-21.5.28.tar.bz2 differ: byte 11, line 1 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit xaw3d
by root＠Hilbert.suse.de 31 May '07

31 May '07

Hello community, here is the log from the commit of package xaw3d checked in at Thu May 31 21:16:22 CEST 2007. -------- --- xaw3d/xaw3d.changes 2007-03-29 15:37:31.000000000 +0200 +++ /mounts/work_src_done/STABLE/xaw3d/xaw3d.changes 2007-05-29 15:26:10.837668000 +0200 @@ -1,0 +2,5 @@ +Tue May 29 15:25:45 CEST 2007 - werner(a)suse.de + +- Branch off xaw3d-devel to make RPMlint happy + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ xaw3d.spec ++++++ --- /var/tmp/diff_new_pack.se3742/_old 2007-05-31 21:16:15.000000000 +0200 +++ /var/tmp/diff_new_pack.se3742/_new 2007-05-31 21:16:15.000000000 +0200 @@ -17,7 +17,7 @@ Provides: Xaw3d Autoreqprov: on Version: 1.5E -Release: 279 +Release: 293 Summary: 3D Athena Widgets Url: http://www.visi.com/~hawkeyd/xaw3d.html Source: Xaw3d-1.5E.tar.bz2 @@ -67,8 +67,41 @@ Uri Blumenthal <uri(a)watson.ibm.com> Heiko Schroeder <heiko(a)pool.informatik.rwth-aachen.de> -Summary: 3D Athena Widgets +%package -n xaw3d-devel +Summary: Include Files and Libraries mandatory for Development +Group: Development/Libraries/X11 +Provides: xaw3d:/usr/include/X11/Xaw3d/Xaw3dP.h +Requires: xaw3d = %{version} +Autoreqprov: on + +%description -n xaw3d-devel +This package contains all necessary include files and libraries needed +to develop applications that require the xaw3d library. + + + +Authors: +-------- + Kaleb S. Keithley <kaleb(a)x.org> + Achille Hui <eillihca(a)drizzle.stanford.edu> + Robert Withrow <witr(a)rwwa.com> + Malcolm Strickland <chuck-strickland(a)orl.mmc.com> + David Flanagan <david(a)ora.com> + Jamie Zawinski <jwz(a)netscape.com> + Frank Terhaar-Yonkers <fty(a)bizarre.trpnc.epa.gov> + Mike Schulze <mike(a)cs.curtin.edu.au> + Gustaf Neumann <neumann(a)mohegan.wi-inf.uni-essen.de> + Jerry Whelan <guru(a)stasi.bradley.edu> + Mark Rawling <mwr(a)mel.dit.csiro.au> + Tim Theisen <tim(a)cs.wisc.edu> + Mitch Trachtenberg <mitch(a)mta.com> + Keith Packard <keithp(a)ncd.com> + Dimitri P. Bouras <dimitri(a)ee.ubc.ca> + Uri Blumenthal <uri(a)watson.ibm.com> + Heiko Schroeder <heiko(a)pool.informatik.rwth-aachen.de> + %package -n xaw3dd +Summary: 3D Athena Widgets as a Replacement for Athena Widgets Conflicts: axe Requires: xaw3d Summary: 3D Athena Widgets as a Replacement for Athena Widgets @@ -163,18 +196,21 @@ %files %defattr(-,root,root) -%dir %{_includedir}/X11/Xaw3d %dir %{_docdir}/xaw3d -%{_includedir}/Xaw3d -%{_includedir}/X11/Xaw3d/*.h -%{_libdir}/libXaw3d.a -%{_libdir}/libXaw3d.so %{_libdir}/libXaw3d.so.6 %{_libdir}/libXaw3d.so.6.1 %{_libdir}/libXaw3d.so.8 %{_libdir}/libXaw3d.so.8.0 %{_docdir}/xaw3d/README.XAW3D +%files -n xaw3d-devel +%defattr(-,root,root) +%dir %{_includedir}/X11/Xaw3d +%{_includedir}/X11/Xaw3d/*.h +%{_includedir}/Xaw3d +%{_libdir}/libXaw3d.a +%{_libdir}/libXaw3d.so + %files -n xaw3dd %defattr(-,root,root) %dir %{_libdir}/Xaw3d @@ -190,6 +226,8 @@ %{_docdir}/xaw3d/README.SuSE %changelog +* Tue May 29 2007 - werner(a)suse.de +- Branch off xaw3d-devel to make RPMlint happy * Thu Mar 29 2007 - coolo(a)suse.de - BuildRequire bison and flex * Wed Sep 13 2006 - werner(a)suse.de ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit wsndpref
by root＠Hilbert.suse.de 31 May '07

31 May '07

Hello community, here is the log from the commit of package wsndpref checked in at Thu May 31 21:16:08 CEST 2007. -------- --- wsndpref/wsndpref.changes 2006-08-21 17:43:55.000000000 +0200 +++ /mounts/work_src_done/STABLE/wsndpref/wsndpref.changes 2007-05-31 11:03:32.000000000 +0200 @@ -1,0 +2,5 @@ +Thu May 31 11:02:29 CEST 2007 - anosek(a)suse.cz + +- fixed incorrect string comparison (warnings.patch) + +------------------------------------------------------------------- New: ---- WSoundPrefs-1.1.1-warnings.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ wsndpref.spec ++++++ --- /var/tmp/diff_new_pack.QE2766/_old 2007-05-31 21:16:04.000000000 +0200 +++ /var/tmp/diff_new_pack.QE2766/_new 2007-05-31 21:16:04.000000000 +0200 @@ -1,7 +1,7 @@ # # spec file for package wsndpref (Version 1.1.1) # -# Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2007 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. # @@ -12,20 +12,21 @@ Name: wsndpref BuildRequires: WindowMaker-devel esound-devel freetype2-devel hermes-devel wsndsrv -License: Other License(s), see package +License: BSD License and BSD-like Group: System/GUI/Other URL: ftp://shadowmere.student.utwente.nl/pub/WindowMaker/ Provides: WSoundPrefs Autoreqprov: on Summary: A Setup Program for the WSoundServer Version: 1.1.1 -Release: 967 +Release: 1026 Source: WSoundPrefs-%{version}.tar.gz Patch1: WSoundPrefs-1.1.1-wstrappend.patch Patch2: WSoundPrefs-1.1.1-imake.patch Patch3: WSoundPrefs-1.1.1-IconImage.patch Patch4: WSoundPrefs-1.1.1-noPropList.patch Patch5: WSoundPrefs-1.1.1-compile.patch +Patch6: WSoundPrefs-1.1.1-warnings.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build %description @@ -44,6 +45,7 @@ %patch3 %patch4 -p 1 %patch5 +%patch6 # --------------------------------------------------------------------------- %build @@ -69,7 +71,9 @@ %doc ChangeLog %doc INSTALL -%changelog -n wsndpref +%changelog +* Thu May 31 2007 - anosek(a)suse.cz +- fixed incorrect string comparison (warnings.patch) * Mon Aug 21 2006 - anosek(a)suse.cz - changed prefix /usr/X11R6 -> /usr * Wed Jan 25 2006 - mls(a)suse.de ++++++ WSoundPrefs-1.1.1-warnings.patch ++++++ --- src/SoundEvents.c +++ src/SoundEvents.c @@ -321,7 +321,7 @@ newset = WMCreatePLDictionary(NULL,NULL,NULL); key = NULL; - for(i=0;eventkey[i]!="UserDefined";i++) { + for(i=0;strcmp(eventkey[i],"UserDefined");i++) { key = WMCreatePLString(eventkey[i]); val = WMGetFromPLDictionary(WMSoundDomain,key); if(val) WMPutInPLDictionary(newset,key,val); @@ -374,7 +374,7 @@ val = WMGetFromPLArray(array, i); path = wexpandpath(WMGetFromPLString(val)); - if ((path+strlen(path)-1) != "/") + if (*(path+strlen(path)-1) != '/') path = wstrappend(path, "/"); path = wstrappend(path, file); @@ -433,7 +433,7 @@ val = WMGetFromPLArray(array, i); path = wexpandpath(WMGetFromPLString(val)); - if ((path+strlen(path)-1) != "/") { + if (*(path+strlen(path)-1) != '/') { tmp = wstrappend(path, "/"); #if 0 if (path) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit vdr
by root＠Hilbert.suse.de 31 May '07

31 May '07

Hello community, here is the log from the commit of package vdr checked in at Thu May 31 21:15:58 CEST 2007. -------- --- vdr/vdr.changes 2007-05-13 12:35:25.000000000 +0200 +++ /mounts/work_src_done/STABLE/vdr/vdr.changes 2007-05-31 13:52:19.000000000 +0200 @@ -1,0 +2,5 @@ +Thu May 31 13:52:08 CEST 2007 - lnussel(a)suse.de + +- add rpmlint suppression for /usr/include/vdr + +------------------------------------------------------------------- New: ---- rpmlintrc ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ vdr.spec ++++++ --- /var/tmp/diff_new_pack.DQ1555/_old 2007-05-31 21:15:48.000000000 +0200 +++ /var/tmp/diff_new_pack.DQ1555/_new 2007-05-31 21:15:48.000000000 +0200 @@ -25,7 +25,7 @@ Requires: dvb Prereq: /usr/sbin/useradd Version: 1.4.7 -Release: 1 +Release: 5 Summary: Video Disk Recorder Source: ftp://ftp.cadsoft.de/vdr/Developer/vdr-%{version}.tar.bz2 Source1: rcvdr @@ -41,6 +41,7 @@ Source91: README.SuSE-vdr.html Source92: susebooks.css Source93: vdr-doc.desktop +Source99: rpmlintrc Patch12: vdr-1.3.45-dvbplayer-nosleep.diff Patch13: vdr-1.4.0-2-utf8-0.1.2-rc2.diff.gz Patch14: vdr-1.4.3-utf8-fix.diff @@ -254,6 +255,8 @@ /var/adm/fillup-templates/* %changelog +* Thu May 31 2007 - lnussel(a)suse.de +- add rpmlint suppression for /usr/include/vdr * Sun May 13 2007 - lnussel(a)suse.de - new version 1.4.7 * Fixed a busy loop in fast forward if the next video data file is ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit umtsmon
by root＠Hilbert.suse.de 31 May '07

31 May '07

Hello community, here is the log from the commit of package umtsmon checked in at Thu May 31 21:15:33 CEST 2007. -------- --- umtsmon/umtsmon.changes 2007-05-10 11:45:30.000000000 +0200 +++ /mounts/work_src_done/STABLE/umtsmon/umtsmon.changes 2007-05-31 13:00:05.602526000 +0200 @@ -1,0 +2,7 @@ +Thu May 31 12:59:19 CEST 2007 - seife(a)suse.de + +- update to version 0.6 + no real code changes, just restructuring of the GUI files and + some work on the unit test code + +------------------------------------------------------------------- Old: ---- umtsmon-0.5.20070510.tar.gz New: ---- umtsmon-0.6.src.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ umtsmon.spec ++++++ --- /var/tmp/diff_new_pack.WRY640/_old 2007-05-31 21:15:28.000000000 +0200 +++ /var/tmp/diff_new_pack.WRY640/_new 2007-05-31 21:15:28.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package umtsmon (Version 0.5.20070510) +# spec file for package umtsmon (Version 0.6) # # Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine @@ -11,15 +11,15 @@ Name: umtsmon BuildRequires: qt3-devel -Version: 0.5.20070510 +Version: 0.6 Release: 1 Summary: control/monitor your UMTS card -License: GNU General Public License (GPL) +License: GNU General Public License (GPL), GPL v2 explicitly. Not "all versions". Group: Hardware/Mobile BuildRoot: %{_tmppath}/%{name}-%{version}-build URL: http://sourceforge.net/projects/umtsmon/ Autoreqprov: on -Source0: %name-%version.tar.gz +Source0: %name-%version.src.tar.gz %description A program to control your UMTS (and GPRS/EDGE) card: enter SIM PIN @@ -33,7 +33,7 @@ Christofer Wesseling %prep -%setup0 -n %name +%setup0 %build qmake @@ -52,6 +52,10 @@ rm -rf %{buildroot} %changelog +* Thu May 31 2007 - seife(a)suse.de +- update to version 0.6 + no real code changes, just restructuring of the GUI files and + some work on the unit test code * Thu May 10 2007 - seife(a)suse.de - update to current CVS (==0.6RC2) - support more cards ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit ulogd
by root＠Hilbert.suse.de 31 May '07

31 May '07

Hello community, here is the log from the commit of package ulogd checked in at Thu May 31 21:15:21 CEST 2007. -------- --- ulogd/ulogd.changes 2007-01-10 11:20:05.000000000 +0100 +++ /mounts/work_src_done/STABLE/ulogd/ulogd.changes 2007-05-31 17:41:50.000000000 +0200 @@ -1,0 +2,26 @@ +Thu May 31 17:41:42 CEST 2007 - mt(a)suse.de + +- Updated to ulogd 1.24, providing several bugfixes, like and + off-by-one-column fix in sqlite3 plugin, pcap header fix for + some architectures, memory leak fix for postgresql plugin, + reconnect support for mysql plugin, ... +- Merged build related changes from into ulogd-1.24-build.dif. + Obsolete patches: ulogd-1.23.dif, ulogd-1.23-lib64.dif + New patch file: ulogd-1.24-build.dif +- Splitted ulogd-1.23-strfix.dif into separate files. + New patches: ulogd-1.24-fixes-{base,mysql,pgsql,sqlite3}.dif, +- Added sync option fix for the pcap plugin. + New patch: ulogd-1.24-fixes-pcap.dif +- Changed to compile with --with-*-log-ip-as-string, implemented + fallback support for old db formats. Prepared the psql,sqlite3 + sql scripts. New patches: ulogd-1.24-{pgsql,sqlite3}-table.dif +- Fixed mysql.table.ipaddr-as-string sql script; no default value + for id is allowed when also auto_increment is set. + New patch file: ulogd-1.24-mysql-table.dif +- Implemented an global "user" option allowing to set the user + to run as in the config file. Adopted spec, config and logrotate + file to run as ulogd user and store log in /var/log/ulogd/. + New patch file: ulogd-1.24-user-option.dif +- Added apparmor policy for ulogd - enabled by default. + +------------------------------------------------------------------- Old: ---- ulogd-1.23-cleanup.dif ulogd-1.23-config.dif ulogd-1.23.dif ulogd-1.23-lib64.dif ulogd-1.23-pgsql-table.dif ulogd-1.23-strfix.dif ulogd-1.23.tar.bz2 ulogd-1.23.tar.bz2.sig New: ---- ulogd-1.24-build.dif ulogd-1.24-config.dif ulogd-1.24-fixes-base.dif ulogd-1.24-fixes-mysql.dif ulogd-1.24-fixes-pcap.dif ulogd-1.24-fixes-pgsql.dif ulogd-1.24-fixes-sqlite3.dif ulogd-1.24-mysql-table.dif ulogd-1.24-pgsql-table.dif ulogd-1.24-sqlite3-table.dif ulogd-1.24.tar.bz2 ulogd-1.24.tar.bz2.sig ulogd-1.24-user-option.dif ulogd.apparmor ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ ulogd.spec ++++++ --- /var/tmp/diff_new_pack.l30839/_old 2007-05-31 21:14:45.000000000 +0200 +++ /var/tmp/diff_new_pack.l30839/_new 2007-05-31 21:14:45.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package ulogd (Version 1.23) +# spec file for package ulogd (Version 1.24) # # Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine @@ -12,27 +12,36 @@ Name: ulogd BuildRequires: libpcap mysql-devel postgresql-devel sqlite-devel -Version: 1.23 -Release: 41 +%define ulogd_user ulogd +%define ulogd_group ulogd +%define apparmor_policy_dir %{_sysconfdir}/apparmor.d +Version: 1.24 +Release: 1 License: GNU General Public License (GPL) Summary: ulogd - netfilter ULOG target log daemon Group: System/Daemons Autoreqprov: on #Requires: -URL: http://gnumonks.org/projects/ +URL: http://www.netfilter.org/projects/ulogd/ Source0: http://ftp.netfilter.org/pub/ulogd/%{name}-%{version}.tar.bz2 Source1: http://ftp.netfilter.org/pub/ulogd/%{name}-%{version}.tar.bz2.sig Source2: ulogd.a4.pdf Source3: ulogd.init Source4: ulogd.logrotate -Patch0: %{name}-%{version}.dif -Patch1: %{name}-%{version}-lib64.dif -Patch2: %{name}-%{version}-pgsql-table.dif -Patch3: %{name}-%{version}-strfix.dif -Patch4: %{name}-%{version}-cleanup.dif -Patch5: %{name}-%{version}-config.dif +Source5: ulogd.apparmor +Patch1: %{name}-%{version}-build.dif +Patch2: %{name}-%{version}-config.dif +Patch3: %{name}-%{version}-mysql-table.dif +Patch4: %{name}-%{version}-pgsql-table.dif +Patch5: %{name}-%{version}-sqlite3-table.dif +Patch6: %{name}-%{version}-fixes-base.dif +Patch7: %{name}-%{version}-fixes-mysql.dif +Patch8: %{name}-%{version}-fixes-pgsql.dif +Patch9: %{name}-%{version}-fixes-sqlite3.dif +Patch10: %{name}-%{version}-fixes-pcap.dif +Patch11: %{name}-%{version}-user-option.dif BuildRoot: %{_tmppath}/%{name}-%{version}-build -PreReq: %insserv_prereq %fillup_prereq +PreReq: %insserv_prereq %fillup_prereq /usr/sbin/useradd /usr/sbin/groupadd /usr/sbin/usermod %package sqlite Summary: SQLite output plugin for ulogd Requires: ulogd sqlite @@ -123,12 +132,19 @@ %prep %setup -q -%patch0 -p0 +cp -a doc/pgsql.table doc/pgsql.table.ipaddr-as-string +cp -a doc/sqlite3.table doc/sqlite3.table.ipaddr-as-string %patch1 -p0 %patch2 -p0 %patch3 -p0 %patch4 -p0 %patch5 -p0 +%patch6 -p0 +%patch7 -p0 +%patch8 -p0 +%patch9 -p0 +%patch10 -p0 +%patch11 -p0 %build autoconf @@ -137,7 +153,10 @@ %configure \ --with-sqlite3=%{_prefix} \ --with-mysql=%{_prefix} \ - --with-pgsql=%{_prefix} + --with-pgsql=%{_prefix} \ + --with-mysql-log-ip-as-string \ + --with-pgsql-log-ip-as-string \ + --with-sqlite3-log-ip-as-string make %install @@ -147,6 +166,9 @@ install -d -m0755 %{buildroot}/%{_includedir}/libipulog install -d -m0755 %{buildroot}/%{_sbindir}/sbin install -d -m0755 %{buildroot}/%{_libdir}/ulogd +install -d -m0755 %{buildroot}/%{_localstatedir}/lib/ulogd +install -d -m0755 %{buildroot}/%{_localstatedir}/log/ulogd +install -d -m0755 %{buildroot}/%{apparmor_policy_dir} make DESTDIR=%{buildroot} install # install -m0754 $RPM_SOURCE_DIR/ulogd.init \ @@ -159,10 +181,21 @@ %{buildroot}/%{_includedir}/libipulog/libipulog.h install -m0644 libipulog/libipulog.a \ %{buildroot}/%{_libdir}/libipulog.a +install -m0644 $RPM_SOURCE_DIR/ulogd.apparmor \ + %{buildroot}/%{apparmor_policy_dir}/usr.sbin.ulogd %clean rm -rf %{buildroot} +%pre +%if %{?ulogd_group:1}0 +/usr/sbin/groupadd -r %{ulogd_group} 2> /dev/null || : +%endif +%if %{?ulogd_user:1}0 +/usr/sbin/useradd -r %{?ulogd_group:-g %ulogd_group}%{!?ulogd_group:-g nogroup} -s /bin/false -c "ulog daemon" -d /var/lib/ulog %ulogd_user 2> /dev/null ||: +/usr/sbin/usermod -s /bin/false -d /var/lib/ulog %ulogd_user 2> /dev/null ||: +%endif + %post %{fillup_and_insserv -f ulogd} @@ -177,9 +210,18 @@ %defattr(-,root,root) %attr(0755,root,root) %{_sbindir}/ulogd %attr(0755,root,root) %{_sbindir}/rculogd -%config(noreplace) %{_sysconfdir}/ulogd.conf +%if %{?ulogd_user:1}0 +%if %{?ulogd_group:1}0 +%attr(0640,root,%ulogd_group) %config(noreplace) %{_sysconfdir}/ulogd.conf +%else +%attr(0640,%ulogd_user,root) %config(noreplace) %{_sysconfdir}/ulogd.conf +%endif +%else +%attr(0640,root,root) %config(noreplace) %{_sysconfdir}/ulogd.conf +%endif %config(noreplace) %{_sysconfdir}/logrotate.d/ulogd -%{_sysconfdir}/init.d/ulogd +%dir %{apparmor_policy_dir} +%config(noreplace) %{apparmor_policy_dir}/usr.sbin.ulogd %dir %{_libdir}/ulogd %{_libdir}/ulogd/ulogd_BASE.so %{_libdir}/ulogd/ulogd_LOCAL.so @@ -187,11 +229,21 @@ %{_libdir}/ulogd/ulogd_OPRINT.so %{_libdir}/ulogd/ulogd_PWSNIFF.so %{_libdir}/ulogd/ulogd_SYSLOG.so +%{_sysconfdir}/init.d/ulogd +%dir %{_localstatedir}/lib/ulogd +%if %{?ulogd_user:1}0 +%attr(0750,%{ulogd_user},%{?ulogd_group}%{!?ulogd_group:root}) %dir %{_localstatedir}/log/ulogd +%else +%dir %{_localstatedir}/log/ulogd +%endif %doc COPYING AUTHORS README ulogd.conf %doc doc/ulogd.txt $RPM_SOURCE_DIR/ulogd.a4.pdf doc/ulogd.html %doc doc/sqlite3.table %doc doc/mysql.table %doc doc/pgsql.table +%doc doc/sqlite3.table.ipaddr-as-string +%doc doc/mysql.table.ipaddr-as-string +%doc doc/pgsql.table.ipaddr-as-string %files sqlite %defattr(-,root,root) @@ -215,7 +267,30 @@ %{_libdir}/libipulog.a %{_includedir}/libipulog -%changelog -n ulogd +%changelog +* Thu May 31 2007 - mt(a)suse.de +- Updated to ulogd 1.24, providing several bugfixes, like and + off-by-one-column fix in sqlite3 plugin, pcap header fix for + some architectures, memory leak fix for postgresql plugin, + reconnect support for mysql plugin, ... +- Merged build related changes from into ulogd-1.24-build.dif. + Obsolete patches: ulogd-1.23.dif, ulogd-1.23-lib64.dif + New patch file: ulogd-1.24-build.dif +- Splitted ulogd-1.23-strfix.dif into separate files. + New patches: ulogd-1.24-fixes-{base,mysql,pgsql,sqlite3}.dif, +- Added sync option fix for the pcap plugin. + New patch: ulogd-1.24-fixes-pcap.dif +- Changed to compile with --with-*-log-ip-as-string, implemented + fallback support for old db formats. Prepared the psql,sqlite3 + sql scripts. New patches: ulogd-1.24-{pgsql,sqlite3}-table.dif +- Fixed mysql.table.ipaddr-as-string sql script; no default value + for id is allowed when also auto_increment is set. + New patch file: ulogd-1.24-mysql-table.dif +- Implemented an global "user" option allowing to set the user + to run as in the config file. Adopted spec, config and logrotate + file to run as ulogd user and store log in /var/log/ulogd/. + New patch file: ulogd-1.24-user-option.dif +- Added apparmor policy for ulogd - enabled by default. * Wed Jan 10 2007 - mt(a)suse.de - Bug #229970: fixed several string length calculations New patch file: ulogd-1.23-strfix.dif ++++++ ulogd-1.24-build.dif ++++++ --- configure.in +++ configure.in 2007/03/19 12:04:40 @@ -63,15 +63,10 @@ else MYSQLLIBS=`$d/mysql_config --libs` DATABASE_DIR="${DATABASE_DIR} mysql" - - MYSQL_LIB="${DATABASE_LIB} ${MYSQLLIBS} " - # no change to DATABASE_LIB_DIR, since --libs already includes -L - - DATABASE_DRIVERS="${DATABASE_DRIVERS} ../mysql/mysql_driver.o " + MYSQL_LIB="${MYSQLLIBS}" DB_DEF="${DB_DEF} -DHAVE_MYSQL " - AC_SUBST(MYSQLINCLUDES) AC_SUBST(MYSQL_LIB) @@ -81,18 +76,22 @@ else dnl Having a look in the libary itself should be more reliable than dnl parsing the output of mysql --version. - AC_MSG_CHECKING(for mysql_real_escape_string support) - - MYSQL_FUNCTION_TEST=`strings ${MYSQLLIBS}/libmysqlclient.so | grep mysql_real_escape_string` - - if test "x$MYSQL_FUNCTION_TEST" = x - then - EXTRA_MYSQL_DEF="-DOLD_MYSQL=1 " - AC_MSG_RESULT(found old MySQL) - else - AC_MSG_RESULT(found new MySQL) - fi - + dnl AC_MSG_CHECKING(for mysql_real_escape_string support) + dnl + dnl MYSQL_FUNCTION_TEST=`strings ${MYSQLLIBS}/libmysqlclient.so | grep mysql_real_escape_string` + dnl + dnl if test "x$MYSQL_FUNCTION_TEST" = x + dnl then + dnl EXTRA_MYSQL_DEF="-DOLD_MYSQL=1 " + dnl AC_MSG_RESULT(found old MySQL) + dnl else + dnl AC_MSG_RESULT(found new MySQL) + dnl fi + + OLDLIBS="$LIBS" + LIBS="$MYSQLLIBS" + AC_CHECK_FUNCS([mysql_real_escape_string], [], [EXTRA_MYSQL_DEF="-DOLD_MYSQL=1 "]) + LIBS="$OLDLIBS" fi ]) @@ -141,13 +140,12 @@ then AC_MSG_WARN(PGSQL backend not used) else AC_DEFINE(HAVE_PGSQL) - PGSQLINCLUDES=`$pgsqldir/pg_config --includedir` - PGSQLLIBS=`$pgsqldir/pg_config --libdir` + PGSQLINCLUDES=-I`$pgsqldir/pg_config --includedir` + PGSQLLIBS=-L`$pgsqldir/pg_config --libdir` DATABASE_DIR="${DATABASE_DIR} pgsql" - PGSQL_LIB="${DATABASE_LIB} -lpq " + PGSQL_LIB="${PGSQLLIBS} -lpq " - DATABASE_LIB_DIR="${DATABASE_LIB_DIR} -L${PGSQLLIBS} " DB_DEF="${DB_DEF} -DHAVE_PGSQL " AC_SUBST(PGSQLINCLUDES) @@ -179,34 +177,38 @@ then else dir="/usr/local" fi -mysqldir="" +sqlite3dir="" AC_MSG_CHECKING(for sqlite3 files) for d in $dir /usr /usr/local /usr/local/sqlite3 do - if test -f $d/lib/sqlite3/libsqlite3.so - then - AC_MSG_RESULT(found sqlite3 in $d) - sqlite3dir=$d - sqlite3dir_suffix=/sqlite3 - break - elif test -f $d/lib64/sqlite3/libsqlite3.so + if test -f $d/lib64/sqlite3/libsqlite3.so then AC_MSG_RESULT(found sqlite3 in $d) sqlite3dir=$d sqlite3dir_suffix=/sqlite3 + sqlite3dir_libdir=${sqlite3dir}/lib64 break - elif test -f $d/lib/libsqlite3.so + elif test -f $d/lib/sqlite3/libsqlite3.so then - AC_MSG_RESULT(found sqlite in $d) + AC_MSG_RESULT(found sqlite3 in $d) sqlite3dir=$d - sqlite3dir_suffix= + sqlite3dir_suffix=/sqlite3 + sqlite3dir_libdir=${sqlite3dir}/lib break elif test -f $d/lib64/libsqlite3.so then - AC_MSG_RESULT(found sqlite in $d) + AC_MSG_RESULT(found sqlite3 in $d) sqlite3dir=$d sqlite3dir_suffix= + sqlite3dir_libdir=${sqlite3dir}/lib64 break + elif test -f $d/lib/libsqlite3.so + then + AC_MSG_RESULT(found sqlite3 in $d) + sqlite3dir=$d + sqlite3dir_suffix= + sqlite3dir_libdir=${sqlite3dir}/lib + break fi done @@ -215,15 +217,11 @@ then AC_MSG_WARN(sqlite3 backend not used) else AC_DEFINE(HAVE_SQLITE3) - SQLITE3INCLUDES=${sqlite3dir}/include${sqlite3dir_suffix} - SQLITE3LIBS=${sqlite3dir}/lib${sqlite3dir_suffix} + SQLITE3INCLUDES=-I${sqlite3dir}/include${sqlite3dir_suffix} + SQLITE3LIBS=-L${sqlite3dir_libdir}${sqlite3dir_suffix} DATABASE_DIR="${DATABASE_DIR} sqlite3" - - SQLITE3_LIB="${DATABASE_LIB} -lsqlite3 " - DATABASE_LIB_DIR="${DATABASE_LIB_DIR} -L${SQLITE3LIBS} " - -dnl DATABASE_DRIVERS="${DATABASE_DRIVERS} ../sqlite3/mysql_driver.o " + SQLITE3_LIB="${SQLITE3LIBS} -lsqlite3 " DB_DEF="${DB_DEF} -DHAVE_SQLITE3 " --- Makefile.in +++ Makefile.in 2007/03/19 10:09:19 @@ -63,7 +63,7 @@ recurse: @for d in $(SUBDIRS); do if ! make -C $$d; then exit 1; fi; done ulogd: ulogd.c $(LIBIPULOG) include/ulogd/ulogd.h conffile/conffile.o $(LIBIPULOG)/libipulog.a ulogd.conf - $(CC) $(CFLAGS) -rdynamic $< conffile/conffile.o $(LIBIPULOG)/libipulog.a -o $@ $(LIBS) + $(CC) $(CFLAGS) $(LDFLAGS) -rdynamic $< conffile/conffile.o $(LIBIPULOG)/libipulog.a -o $@ $(LIBS) edit = sed -e 's,@libdir\@,$(ULOGD_LIB_PATH),g' --- Rules.make.in +++ Rules.make.in 2007/03/19 12:05:38 @@ -22,7 +22,7 @@ CFLAGS=@CFLAGS@ @CPPFLAGS@ -Wall CFLAGS+=-DULOGD_CONFIGFILE=\"$(ULOGD_CONFIGFILE)\" # doesn't work for subdirs #CFLAGS+=$(INCIPULOG) $(INCCONFFILE) -CFLAGS+=-I/lib/modules/`uname -r`/build/include +#CFLAGS+=-I/lib/modules/`uname -r`/build/include #CFLAGS+=@DEFS@ #CFLAGS+=-g -DDEBUG -DDEBUG_MYSQL -DDEBUG_PGSQL @@ -34,16 +34,16 @@ ULOGD_SL:=BASE OPRINT PWSNIFF LOGEMU LOC # mysql output support #ULOGD_SL+=MYSQL -MYSQL_CFLAGS=-I@MYSQLINCLUDES@ @EXTRA_MYSQL_DEF@ -MYSQL_LDFLAGS=@DATABASE_LIB_DIR@ @MYSQL_LIB@ +MYSQL_CFLAGS=@MYSQLINCLUDES@ @EXTRA_MYSQL_DEF@ +MYSQL_LDFLAGS=$(LDFLAGS) @MYSQL_LIB@ # postgreSQL output support #ULOGD_SL+=PGSQL -PGSQL_CFLAGS=-I@PGSQLINCLUDES@ @EXTRA_PGSQL_DEF@ -PGSQL_LDFLAGS=@DATABASE_LIB_DIR@ @PGSQL_LIB@ +PGSQL_CFLAGS=@PGSQLINCLUDES@ @EXTRA_PGSQL_DEF@ +PGSQL_LDFLAGS=$(LDFLAGS) @PGSQL_LIB@ # mysql output support #ULOGD_SL+=SQLITE3 -SQLITE3_CFLAGS=-I@SQLITE3INCLUDES@ @EXTRA_SQLITE3_DEF@ -SQLITE3_LDFLAGS=@DATABASE_LIB_DIR@ @SQLITE3_LIB@ +SQLITE3_CFLAGS=@SQLITE3INCLUDES@ @EXTRA_SQLITE3_DEF@ +SQLITE3_LDFLAGS=$(LDFLAGS) @SQLITE3_LIB@ ++++++ ulogd-1.23-config.dif -> ulogd-1.24-config.dif ++++++ --- ulogd/ulogd-1.23-config.dif 2007-01-09 12:14:55.000000000 +0100 +++ /mounts/work_src_done/STABLE/ulogd/ulogd-1.24-config.dif 2007-05-31 12:16:34.000000000 +0200 @@ -1,11 +1,38 @@ --- ulogd.conf.in -+++ ulogd.conf.in 2007/01/05 18:23:47 -@@ -73,7 +73,7 @@ host="localhost" ++++ ulogd.conf.in 2007/05/31 10:16:28 +@@ -11,7 +11,7 @@ + nlgroup=1 + + # logfile for status messages +-logfile="/var/log/ulogd.log" ++logfile="/var/log/ulogd/ulogd.log" + + # loglevel: debug(1), info(3), notice(5), error(7) or fatal(8) + loglevel=5 +@@ -50,11 +50,11 @@ plugin="@libdir@/ulogd_LOGEMU.so" + + + [LOGEMU] +-file="/var/log/ulogd.syslogemu" ++file="/var/log/ulogd/ulogd.syslogemu" + sync=1 + + [OPRINT] +-file="/var/log/ulogd.pktlog" ++file="/var/log/ulogd/ulogd.pktlog" + + [MYSQL] + table="ulog" +@@ -73,10 +73,10 @@ host="localhost" [SQLITE3] table="ulog" -db="/path/to/sqlite/db" -+db="/var/log/ulogd.sqlite3db" ++db="/var/log/ulogd/ulogd.sqlite3db" buffer=200 [PCAP] +-file="/var/log/ulogd.pcap" ++file="/var/log/ulogd/ulogd.pcap" + sync=1 + ++++++ ulogd-1.24-fixes-base.dif ++++++ --- ulogd.c +++ ulogd.c 2007/03/20 13:21:29 @@ -595,14 +595,15 @@ static void sigterm_handler(int signal) ipulog_destroy_handle(libulog_h); free(libulog_buf); - if (logfile != stdout && logfile != &syslog_dummy) - fclose(logfile); for (p = ulogd_outputs; p; p = p->next) { if (p->fini) (*p->fini)(); } + if (logfile != stdout && logfile != &syslog_dummy) + fclose(logfile); + exit(0); } --- extensions/printpkt.h +++ extensions/printpkt.h 2007/03/19 19:14:40 @@ -1,7 +1,7 @@ #ifndef _PRINTPKT_H #define _PRINTPKT_H -int printpkt_print(ulog_iret_t *res, char *buf, int prefix); +int printpkt_print(ulog_iret_t *res, char *buf, size_t buf_siz, int prefix); int printpkt_init(void); #endif --- extensions/printpkt.c +++ extensions/printpkt.c 2007/03/19 19:14:40 @@ -95,13 +95,22 @@ static struct intr_id intr_ids[INTR_IDS] #define GET_VALUE(x) ulogd_keyh[intr_ids[x].id].interp->result[ulogd_keyh[intr_ids[x].id].offset].value #define GET_FLAGS(x) ulogd_keyh[intr_ids[x].id].interp->result[ulogd_keyh[intr_ids[x].id].offset].flags -int printpkt_print(ulog_iret_t *res, char *buf, int prefix) +int printpkt_print(ulog_iret_t *res, char *buf, size_t buf_siz, int prefix) { char *timestr; char *tmp; time_t now; - char *buf_cur = buf; + if(buf_siz) + *buf = '\0'; + else + return 1; + +#define BUF_ADD(ptr, siz, fmt...) \ + do { \ + size_t len=strlen(ptr); \ + snprintf(((ptr)+(len)), ((siz) > (len) ? (siz)-(len) : 0), ##fmt); \ + } while(0) if (prefix) { now = (time_t) GET_VALUE(0).ui32; @@ -116,127 +125,129 @@ int printpkt_print(ulog_iret_t *res, cha *tmp = '\0'; /* print time and hostname */ - buf_cur += sprintf(buf_cur, "%.15s %s", timestr, hostname); + BUF_ADD(buf, buf_siz, "%.15s %s", timestr, hostname); } - if (*(char *) GET_VALUE(1).ptr) - buf_cur += sprintf(buf_cur, " %s", (char *) GET_VALUE(1).ptr); + if (*((char *) GET_VALUE(1).ptr)) + BUF_ADD(buf, buf_siz, " %s", (char *) GET_VALUE(1).ptr); - buf_cur += sprintf(buf_cur," IN=%s OUT=%s ", + BUF_ADD(buf, buf_siz, " IN=%s OUT=%s ", (char *) GET_VALUE(2).ptr, (char *) GET_VALUE(3).ptr); /* FIXME: configurable */ - buf_cur += sprintf(buf_cur, "MAC=%s ", + BUF_ADD(buf, buf_siz, "MAC=%s ", (GET_FLAGS(4) & ULOGD_RETF_VALID) ? (char *) GET_VALUE(4).ptr : ""); - buf_cur += sprintf(buf_cur, "SRC=%s ", + BUF_ADD(buf, buf_siz, "SRC=%s ", inet_ntoa((struct in_addr) {htonl(GET_VALUE(5).ui32)})); - buf_cur += sprintf(buf_cur, "DST=%s ", + BUF_ADD(buf, buf_siz, "DST=%s ", inet_ntoa((struct in_addr) {htonl(GET_VALUE(6).ui32)})); - buf_cur += sprintf(buf_cur,"LEN=%u TOS=%02X PREC=0x%02X TTL=%u ID=%u ", + BUF_ADD(buf, buf_siz, "LEN=%u TOS=%02X PREC=0x%02X TTL=%u ID=%u ", GET_VALUE(7).ui16, GET_VALUE(8).ui8 & IPTOS_TOS_MASK, GET_VALUE(8).ui8 & IPTOS_PREC_MASK, GET_VALUE(9).ui8, GET_VALUE(10).ui16); if (GET_VALUE(10).ui16 & IP_RF) - buf_cur += sprintf(buf_cur, "CE "); + BUF_ADD(buf, buf_siz, "CE "); if (GET_VALUE(11).ui16 & IP_DF) - buf_cur += sprintf(buf_cur, "DF "); + BUF_ADD(buf, buf_siz, "DF "); if (GET_VALUE(11).ui16 & IP_MF) - buf_cur += sprintf(buf_cur, "MF "); + BUF_ADD(buf, buf_siz, "MF "); if (GET_VALUE(11).ui16 & IP_OFFMASK) - buf_cur += sprintf(buf_cur, "FRAG:%u ", + BUF_ADD(buf, buf_siz, "FRAG:%u ", GET_VALUE(11).ui16 & IP_OFFMASK); switch (GET_VALUE(12).ui8) { case IPPROTO_TCP: - buf_cur += sprintf(buf_cur, "PROTO=TCP "); - buf_cur += sprintf(buf_cur, "SPT=%u DPT=%u ", + BUF_ADD(buf, buf_siz, "PROTO=TCP "); + BUF_ADD(buf, buf_siz, "SPT=%u DPT=%u ", GET_VALUE(13).ui16, GET_VALUE(14).ui16); /* FIXME: config */ - buf_cur += sprintf(buf_cur, "SEQ=%u ACK=%u ", + BUF_ADD(buf, buf_siz, "SEQ=%u ACK=%u ", GET_VALUE(15).ui32, GET_VALUE(16).ui32); - buf_cur += sprintf(buf_cur, "WINDOW=%u ", GET_VALUE(17).ui16); + BUF_ADD(buf, buf_siz, "WINDOW=%u ", GET_VALUE(17).ui16); -// buf_cur += sprintf(buf_cur, "RES=0x%02x ", +// BUF_ADD(buf, buf_siz, "RES=0x%02x ", if (GET_VALUE(18).b) - buf_cur += sprintf(buf_cur, "URG "); + BUF_ADD(buf, buf_siz, "URG "); if (GET_VALUE(19).b) - buf_cur += sprintf(buf_cur, "ACK "); + BUF_ADD(buf, buf_siz, "ACK "); if (GET_VALUE(20).b) - buf_cur += sprintf(buf_cur, "PSH "); + BUF_ADD(buf, buf_siz, "PSH "); if (GET_VALUE(21).b) - buf_cur += sprintf(buf_cur, "RST "); + BUF_ADD(buf, buf_siz, "RST "); if (GET_VALUE(22).b) - buf_cur += sprintf(buf_cur, "SYN "); + BUF_ADD(buf, buf_siz, "SYN "); if (GET_VALUE(23).b) - buf_cur += sprintf(buf_cur, "FIN "); + BUF_ADD(buf, buf_siz, "FIN "); - buf_cur += sprintf(buf_cur, "URGP=%u ", GET_VALUE(24).ui16); + BUF_ADD(buf, buf_siz, "URGP=%u ", GET_VALUE(24).ui16); break; case IPPROTO_UDP: - buf_cur += sprintf(buf_cur, "PROTO=UDP "); + BUF_ADD(buf, buf_siz, "PROTO=UDP "); - buf_cur += sprintf(buf_cur, "SPT=%u DPT=%u LEN=%u ", + BUF_ADD(buf, buf_siz, "SPT=%u DPT=%u LEN=%u ", GET_VALUE(25).ui16, GET_VALUE(26).ui16, GET_VALUE(27).ui16); break; case IPPROTO_ICMP: - buf_cur += sprintf(buf_cur, "PROTO=ICMP "); + BUF_ADD(buf, buf_siz, "PROTO=ICMP "); - buf_cur += sprintf(buf_cur, "TYPE=%u CODE=%u ", + BUF_ADD(buf, buf_siz, "TYPE=%u CODE=%u ", GET_VALUE(28).ui8, GET_VALUE(29).ui8); switch (GET_VALUE(28).ui8) { case ICMP_ECHO: case ICMP_ECHOREPLY: - buf_cur += sprintf(buf_cur, "ID=%u SEQ=%u ", + BUF_ADD(buf, buf_siz, "ID=%u SEQ=%u ", GET_VALUE(30).ui16, GET_VALUE(31).ui16); break; case ICMP_PARAMETERPROB: - buf_cur += sprintf(buf_cur, "PARAMETER=%u ", + BUF_ADD(buf, buf_siz, "PARAMETER=%u ", GET_VALUE(32).ui32 >> 24); break; case ICMP_REDIRECT: - buf_cur += sprintf(buf_cur, "GATEWAY=%s ", inet_ntoa((struct in_addr) {htonl(GET_VALUE(32).ui32)})); + BUF_ADD(buf, buf_siz, "GATEWAY=%s ", inet_ntoa((struct in_addr) {htonl(GET_VALUE(32).ui32)})); break; case ICMP_DEST_UNREACH: if (GET_VALUE(29).ui8 == ICMP_FRAG_NEEDED) - buf_cur += sprintf(buf_cur, "MTU=%u ", + BUF_ADD(buf, buf_siz, "MTU=%u ", GET_VALUE(33).ui16); break; } break; case IPPROTO_ESP: case IPPROTO_AH: - buf_cur += sprintf(buf_cur, "PROTO=%s ", GET_VALUE(12).ui8 == IPPROTO_ESP ? "ESP" : "AH"); + BUF_ADD(buf, buf_siz, "PROTO=%s ", GET_VALUE(12).ui8 == IPPROTO_ESP ? "ESP" : "AH"); /* FIXME: "INCOMPLETE [%u bytes]" in case of short pkt */ if (intr_ids[34].id > 0) { - buf_cur += sprintf(buf_cur, "SPI=0x%x ", GET_VALUE(34).ui32); + BUF_ADD(buf, buf_siz, "SPI=0x%x ", GET_VALUE(34).ui32); } break; default: - buf_cur += sprintf(buf_cur, "PROTO=%u ", GET_VALUE(12).ui8); + BUF_ADD(buf, buf_siz, "PROTO=%u ", GET_VALUE(12).ui8); } - strcat(buf_cur, "\n"); + BUF_ADD(buf, buf_siz, "\n"); + +#undef BUF_ADD return 0; } @@ -267,6 +278,7 @@ int printpkt_init(void) strerror(errno)); exit(2); } + hostname[sizeof(hostname)-1] = '\0'; if (get_ids()) return 1; --- extensions/ulogd_BASE.c +++ extensions/ulogd_BASE.c 2007/03/20 15:55:27 @@ -32,6 +32,7 @@ #include <stdio.h> #include <stdlib.h> +#include <string.h> #include <sys/socket.h> #include <netinet/ip.h> #include <netinet/in.h> @@ -63,11 +64,13 @@ static ulog_iret_t *_interp_raw(ulog_int { unsigned char *p; int i; - char *buf, *oldbuf = NULL; + char *buf, *ptr = NULL; ulog_iret_t *ret = ip->result; + size_t siz; if (pkt->mac_len) { - buf = (char *) malloc(3 * pkt->mac_len + 1); + siz = 3 * pkt->mac_len + 1; + buf = (char *) malloc(siz); if (!buf) { ulogd_log(ULOGD_ERROR, "OOM!!!\n"); return NULL; @@ -75,9 +78,11 @@ static ulog_iret_t *_interp_raw(ulog_int *buf = '\0'; p = pkt->mac; - oldbuf = buf; - for (i = 0; i < pkt->mac_len; i++, p++) - sprintf(buf, "%s%02x%c", oldbuf, *p, i==pkt->mac_len-1 ? ' ':':'); + ptr = buf; + for (i = 0; i < pkt->mac_len; i++, p++) { + snprintf(ptr, siz-(ptr-buf), "%02x%s", *p, i==pkt->mac_len-1 ? "":":"); + ptr = buf + strlen(buf); + } ret[0].value.ptr = buf; ret[0].flags |= ULOGD_RETF_VALID; } --- extensions/ulogd_LOCAL.c +++ extensions/ulogd_LOCAL.c 2007/03/20 15:33:09 @@ -93,6 +93,7 @@ void _init(void) strerror(errno)); exit(2); } + hostname[sizeof(hostname)-1] = '\0'; /* strip off everything after first '.' */ if ((tmp = strchr(hostname, '.'))) *tmp = '\0'; --- extensions/ulogd_LOGEMU.c +++ extensions/ulogd_LOGEMU.c 2007/03/20 15:36:29 @@ -67,7 +67,7 @@ static int _output_logemu(ulog_iret_t *r { static char buf[4096]; - printpkt_print(res, buf, 1); + printpkt_print(res, buf, sizeof(buf), 1); fprintf(of, "%s", buf); @@ -79,15 +79,18 @@ static int _output_logemu(ulog_iret_t *r static void signal_handler_logemu(int signal) { + FILE *old=of; + switch (signal) { case SIGHUP: ulogd_log(ULOGD_NOTICE, "syslogemu: reopening logfile\n"); - fclose(of); of = fopen(syslogf_ce.u.string, "a"); if (!of) { ulogd_log(ULOGD_FATAL, "can't open syslogemu: %s\n", strerror(errno)); - exit(2); + of=old; + } else { + fclose(old); } break; default: --- extensions/ulogd_OPRINT.c +++ extensions/ulogd_OPRINT.c 2007/03/20 15:36:04 @@ -48,7 +48,7 @@ static FILE *of = NULL; static int _output_print(ulog_iret_t *res) { ulog_iret_t *ret; - + fprintf(of, "===>PACKET BOUNDARY\n"); for (ret = res; ret; ret = ret->cur_next) { fprintf(of,"%s=", ret->key); @@ -72,7 +72,10 @@ static int _output_print(ulog_iret_t *re HIPQUAD(ret->value.ui32)); break; case ULOGD_RET_NONE: - fprintf(of, "<none>"); + fprintf(of, "<none>\n"); + break; + default: + fprintf(of, "\n"); break; } } @@ -88,16 +91,18 @@ static config_entry_t outf_ce = { static void sighup_handler_print(int signal) { + FILE *old=of; switch (signal) { case SIGHUP: ulogd_log(ULOGD_NOTICE, "PKTLOG: reopening logfile\n"); - fclose(of); of = fopen(outf_ce.u.string, "a"); if (!of) { ulogd_log(ULOGD_FATAL, "can't open PKTLOG: %s\n", strerror(errno)); - exit(2); + of=old; + } else { + fclose(old); } break; default: --- extensions/ulogd_PWSNIFF.c +++ extensions/ulogd_PWSNIFF.c 2007/03/19 19:14:40 @@ -116,7 +116,7 @@ static ulog_iret_t *_interp_pwsniff(ulog return NULL; } strncpy(ret[0].value.ptr, (char *)begp, len); - *((char *)ret[0].value.ptr + len + 1) = '\0'; + *((char *)ret[0].value.ptr + len) = '\0'; } if (pw_len) { ret[1].value.ptr = (char *) malloc(pw_len+1); @@ -126,7 +126,7 @@ static ulog_iret_t *_interp_pwsniff(ulog return NULL; } strncpy(ret[1].value.ptr, (char *)pw_begp, pw_len); - *((char *)ret[1].value.ptr + pw_len + 1) = '\0'; + *((char *)ret[1].value.ptr + pw_len) = '\0'; } return ret; --- extensions/ulogd_SYSLOG.c +++ extensions/ulogd_SYSLOG.c 2007/03/19 19:14:40 @@ -61,7 +61,7 @@ static int _output_syslog(ulog_iret_t *r { static char buf[4096]; - printpkt_print(res, buf, 0); + printpkt_print(res, buf, sizeof(buf), 0); syslog(syslog_level|syslog_facility, buf); return 0; ++++++ ulogd-1.24-fixes-mysql.dif ++++++ --- mysql/ulogd_MYSQL.c +++ mysql/ulogd_MYSQL.c 2007/05/30 12:59:54 @@ -43,6 +43,7 @@ #include <ulogd/ulogd.h> #include <ulogd/conffile.h> #include <mysql/mysql.h> +#include <inttypes.h> #ifdef DEBUG_MYSQL #define DEBUGP(x, args...) fprintf(stderr, x, ## args) @@ -53,6 +54,7 @@ struct _field { char name[ULOGD_MAX_KEYLEN]; unsigned int id; + unsigned int str; struct _field *next; }; @@ -68,6 +70,9 @@ static struct _field *fields; /* buffer for our insert statement */ static char *stmt; +/* size of our insert statement buffer */ +static size_t stmt_siz; + /* pointer to the beginning of the "VALUES" part */ static char *stmt_val; @@ -132,6 +137,13 @@ static config_entry_t connect_timeout_ce }; static int _mysql_init_db(ulog_iret_t *result); +static void _mysql_fini(void); + +#define STMT_ADD(pos,beg,siz,fmt...) \ + do { \ + if((pos) >= (beg) && (siz) > (pos) - (beg)) \ + snprintf((pos), (siz)-((pos)-(beg)), ##fmt); \ + } while(0) /* our main output function, called by ulogd */ static int mysql_output(ulog_iret_t *result) @@ -143,6 +155,11 @@ static int mysql_output(ulog_iret_t *res struct in_addr addr; #endif + if( stmt_val == NULL) { + _mysql_fini(); + return _mysql_init_db(result); + } + stmt_ins = stmt_val; for (f = fields; f; f = f->next) { @@ -155,71 +172,87 @@ static int mysql_output(ulog_iret_t *res if (!res || !IS_VALID((*res))) { /* no result, we have to fake something */ - sprintf(stmt_ins, "NULL,"); + STMT_ADD(stmt_ins,stmt,stmt_siz, "NULL,"); stmt_ins = stmt + strlen(stmt); continue; } switch (res->type) { case ULOGD_RET_INT8: - sprintf(stmt_ins, "%d,", res->value.i8); + STMT_ADD(stmt_ins,stmt,stmt_siz, "%d,", res->value.i8); break; case ULOGD_RET_INT16: - sprintf(stmt_ins, "%d,", res->value.i16); + STMT_ADD(stmt_ins,stmt,stmt_siz, "%d,", res->value.i16); break; case ULOGD_RET_INT32: - sprintf(stmt_ins, "%d,", res->value.i32); + STMT_ADD(stmt_ins,stmt,stmt_siz, "%d,", res->value.i32); break; case ULOGD_RET_INT64: - sprintf(stmt_ins, "%lld,", res->value.i64); + STMT_ADD(stmt_ins,stmt,stmt_siz, "%"PRId64",", res->value.i64); break; case ULOGD_RET_UINT8: - sprintf(stmt_ins, "%u,", res->value.ui8); + STMT_ADD(stmt_ins,stmt,stmt_siz, "%u,", res->value.ui8); break; case ULOGD_RET_UINT16: - sprintf(stmt_ins, "%u,", res->value.ui16); + STMT_ADD(stmt_ins,stmt,stmt_siz, "%u,", res->value.ui16); break; case ULOGD_RET_IPADDR: #ifdef IP_AS_STRING - memset(&addr, 0, sizeof(addr)); - addr.s_addr = ntohl(res->value.ui32); - *stmt_ins++ = '\''; - tmpstr = inet_ntoa(addr); + if(f->str) + { + memset(&addr, 0, sizeof(addr)); + addr.s_addr = ntohl(res->value.ui32); + tmpstr = inet_ntoa(addr); + if(stmt_siz > (stmt_ins-stmt)+(strlen(tmpstr)*2)+4) + { + *stmt_ins++ = '\''; #ifdef OLD_MYSQL - mysql_escape_string(stmt_ins, tmpstr, - strlen(tmpstr)); + mysql_escape_string(stmt_ins, tmpstr, + strlen(tmpstr)); #else - mysql_real_escape_string(dbh, stmt_ins, - tmpstr, - strlen(tmpstr)); + mysql_real_escape_string(dbh, stmt_ins, + tmpstr, + strlen(tmpstr)); #endif /* OLD_MYSQL */ - stmt_ins = stmt + strlen(stmt); - sprintf(stmt_ins, "',"); - break; + stmt_ins = stmt + strlen(stmt); + STMT_ADD(stmt_ins,stmt,stmt_siz, "',"); + } + else + { + STMT_ADD(stmt_ins,stmt,stmt_siz, "'',"); + } + break; + } #endif /* IP_AS_STRING */ /* EVIL: fallthrough when logging IP as * u_int32_t */ case ULOGD_RET_UINT32: - sprintf(stmt_ins, "%u,", res->value.ui32); + STMT_ADD(stmt_ins,stmt,stmt_siz, "%u,", res->value.ui32); break; case ULOGD_RET_UINT64: - sprintf(stmt_ins, "%llu,", res->value.ui64); + STMT_ADD(stmt_ins,stmt,stmt_siz, "%"PRIu64",", res->value.ui64); break; case ULOGD_RET_BOOL: - sprintf(stmt_ins, "'%d',", res->value.b); + STMT_ADD(stmt_ins,stmt,stmt_siz, "'%d',", res->value.b); break; case ULOGD_RET_STRING: - *stmt_ins++ = '\''; + if(stmt_siz > (stmt_ins-stmt)+(strlen(res->value.ptr)*2)+4) + { + *stmt_ins++ = '\''; #ifdef OLD_MYSQL - mysql_escape_string(stmt_ins, res->value.ptr, - strlen(res->value.ptr)); + mysql_escape_string(stmt_ins, res->value.ptr, + strlen(res->value.ptr)); #else - mysql_real_escape_string(dbh, stmt_ins, - res->value.ptr, strlen(res->value.ptr)); + mysql_real_escape_string(dbh, stmt_ins, + res->value.ptr, strlen(res->value.ptr)); #endif - stmt_ins = stmt + strlen(stmt); - sprintf(stmt_ins, "',"); - /* sprintf(stmt_ins, "'%s',", res->value.ptr); */ + stmt_ins = stmt + strlen(stmt); + STMT_ADD(stmt_ins,stmt,stmt_siz, "',"); + } + else + { + STMT_ADD(stmt_ins,stmt,stmt_siz, "'',"); + } break; case ULOGD_RET_RAW: ulogd_log(ULOGD_NOTICE, @@ -235,6 +268,8 @@ static int mysql_output(ulog_iret_t *res stmt_ins = stmt + strlen(stmt); } *(stmt_ins - 1) = ')'; + *stmt_ins = '\0'; + DEBUGP("stmt=#%s#\n", stmt); /* now we have created our statement, insert it */ @@ -242,6 +277,7 @@ static int mysql_output(ulog_iret_t *res if (mysql_real_query(dbh, stmt, strlen(stmt))) { ulogd_log(ULOGD_ERROR, "sql error during insert: %s\n", mysql_error(dbh)); + _mysql_fini(); return _mysql_init_db(result); } @@ -261,7 +297,6 @@ static int mysql_output_disabled(ulog_ir static int mysql_createstmt(void) { struct _field *f; - unsigned int size; char buf[ULOGD_MAX_KEYLEN]; char *underscore; @@ -269,36 +304,39 @@ static int mysql_createstmt(void) free(stmt); /* caclulate the size for the insert statement */ - size = strlen(MYSQL_INSERTTEMPL) + strlen(table_ce.u.string); + stmt_siz = strlen(MYSQL_INSERTTEMPL) + strlen(table_ce.u.string) + 1; for (f = fields; f; f = f->next) { /* we need space for the key and a comma, as well as * enough space for the values */ - size += strlen(f->name) + 1 + MYSQL_VALSIZE; + stmt_siz += strlen(f->name) + 1 + MYSQL_VALSIZE; } - ulogd_log(ULOGD_DEBUG, "allocating %u bytes for statement\n", size); + ulogd_log(ULOGD_DEBUG, "allocating %zu bytes for statement\n", stmt_siz); - stmt = (char *) malloc(size); + stmt = (char *) malloc(stmt_siz); if (!stmt) { + stmt_val = NULL; + stmt_siz = 0; ulogd_log(ULOGD_ERROR, "OOM!\n"); return -1; } - sprintf(stmt, "insert into %s (", table_ce.u.string); + snprintf(stmt, stmt_siz, "insert into %s (", table_ce.u.string); stmt_val = stmt + strlen(stmt); for (f = fields; f; f = f->next) { - strncpy(buf, f->name, ULOGD_MAX_KEYLEN); + strncpy(buf, f->name, ULOGD_MAX_KEYLEN-1); + buf[ULOGD_MAX_KEYLEN-1] = '\0'; while ((underscore = strchr(buf, '.'))) *underscore = '_'; - sprintf(stmt_val, "%s,", buf); + STMT_ADD(stmt_val,stmt,stmt_siz, "%s,", buf); stmt_val = stmt + strlen(stmt); } *(stmt_val - 1) = ')'; - sprintf(stmt_val, " values ("); + STMT_ADD(stmt_val,stmt,stmt_siz, " values ("); stmt_val = stmt + strlen(stmt); ulogd_log(ULOGD_DEBUG, "stmt='%s'\n", stmt); @@ -333,7 +371,9 @@ static int mysql_get_columns(const char while ((field = mysql_fetch_field(result))) { /* replace all underscores with dots */ - strncpy(buf, field->name, ULOGD_MAX_KEYLEN); + strncpy(buf, field->name, ULOGD_MAX_KEYLEN-1); + buf[ULOGD_MAX_KEYLEN-1] = '\0'; + while ((underscore = strchr(buf, '_'))) *underscore = '.'; @@ -352,8 +392,10 @@ static int mysql_get_columns(const char ulogd_log(ULOGD_ERROR, "OOM!\n"); return -1; } - strncpy(f->name, buf, ULOGD_MAX_KEYLEN); + strncpy(f->name, buf, ULOGD_MAX_KEYLEN-1); + f->name[ULOGD_MAX_KEYLEN-1] = '\0'; f->id = id; + f->str = !IS_NUM(field->type); f->next = fields; fields = f; } @@ -374,7 +416,10 @@ static int mysql_open_db(char *server, i mysql_options(dbh, MYSQL_OPT_CONNECT_TIMEOUT, (const char *) &connect_timeout_ce.u.value); if (!mysql_real_connect(dbh, server, user, pass, db, port, NULL, 0)) + { + _mysql_fini(); return -1; + } return 0; } @@ -413,10 +458,17 @@ static int _mysql_init_db(ulog_iret_t *r /* read the fieldnames to know which values to insert */ if (mysql_get_columns(table_ce.u.string)) { ulogd_log(ULOGD_ERROR, "unable to get mysql columns\n"); + _mysql_fini(); return init_reconnect(); } - mysql_createstmt(); - + + if (mysql_createstmt()) + { + ulogd_log(ULOGD_ERROR, "unable to create mysql statement\n"); + _mysql_fini(); + return init_reconnect(); + } + /* enable plugin */ mysql_plugin.output = &mysql_output; @@ -438,7 +490,10 @@ static int _mysql_init(void) static void _mysql_fini(void) { - mysql_close(dbh); + if( dbh) { + mysql_close(dbh); + dbh = NULL; + } } static ulog_output_t mysql_plugin = { ++++++ ulogd-1.24-fixes-pcap.dif ++++++ --- pcap/ulogd_PCAP.c +++ pcap/ulogd_PCAP.c 2007/05/31 11:55:30 @@ -158,7 +158,7 @@ static int pcap_output(ulog_iret_t *res) return 1; } - if (pcapf_ce.u.value) + if (pcapsync_ce.u.value) fflush(of); return 0; @@ -217,8 +217,8 @@ void append_create_outfile(void) { if (!exist) { of = fopen(pcapf_ce.u.string, "w"); if (!of) { - ulogd_log(ULOGD_FATAL, "can't open pcap file: %s\n", - strerror(errno)); + ulogd_log(ULOGD_FATAL, "can't open pcap file %s: %s\n", + pcapf_ce.u.string, strerror(errno)); exit(2); } if (!write_pcap_header()) { ++++++ ulogd-1.24-fixes-pgsql.dif ++++++ --- pgsql/ulogd_PGSQL.c +++ pgsql/ulogd_PGSQL.c 2007/05/30 15:27:23 @@ -16,7 +16,7 @@ #include <ulogd/ulogd.h> #include <ulogd/conffile.h> #include <libpq-fe.h> - +#include <inttypes.h> #ifdef DEBUG_PGSQL #define DEBUGP(x, args...) fprintf(stderr, x, ## args) @@ -27,6 +27,7 @@ struct _field { char name[ULOGD_MAX_KEYLEN]; unsigned int id; + unsigned int str; struct _field *next; }; @@ -39,6 +40,9 @@ static struct _field *fields; /* buffer for our insert statement */ static char *stmt; +/* size of our insert statement buffer */ +static size_t stmt_siz; + /* pointer to the beginning of the "VALUES" part */ static char *stmt_val; @@ -97,6 +101,12 @@ static config_entry_t port_ce = { static unsigned char pgsql_have_schemas; +#define STMT_ADD(pos,beg,siz,fmt...) \ + do { \ + if((pos) >= (beg) && (siz) > (pos) - (beg)) \ + snprintf((pos), (siz)-((pos)-(beg)), ##fmt); \ + } while(0) + /* our main output function, called by ulogd */ static int pgsql_output(ulog_iret_t *result) { @@ -108,6 +118,9 @@ static int pgsql_output(ulog_iret_t *res struct in_addr addr; #endif + if( stmt_val == NULL) + return 1; + stmt_ins = stmt_val; for (f = fields; f; f = f->next) { @@ -120,62 +133,80 @@ static int pgsql_output(ulog_iret_t *res if (!res || !IS_VALID((*res))) { /* no result, we have to fake something */ - sprintf(stmt_ins, "NULL,"); + STMT_ADD(stmt_ins,stmt,stmt_siz, "NULL,"); stmt_ins = stmt + strlen(stmt); continue; } switch (res->type) { case ULOGD_RET_INT8: - sprintf(stmt_ins, "%d,", res->value.i8); + STMT_ADD(stmt_ins,stmt,stmt_siz, "%d,", res->value.i8); break; case ULOGD_RET_INT16: - sprintf(stmt_ins, "%d,", res->value.i16); + STMT_ADD(stmt_ins,stmt,stmt_siz, "%d,", res->value.i16); break; case ULOGD_RET_INT32: - sprintf(stmt_ins, "%d,", res->value.i32); + STMT_ADD(stmt_ins,stmt,stmt_siz, "%d,", res->value.i32); break; case ULOGD_RET_INT64: - sprintf(stmt_ins, "%lld,", res->value.i64); + STMT_ADD(stmt_ins,stmt,stmt_siz, "%"PRId64",", res->value.i64); break; case ULOGD_RET_UINT8: - sprintf(stmt_ins, "%u,", res->value.ui8); + STMT_ADD(stmt_ins,stmt,stmt_siz, "%u,", res->value.ui8); break; case ULOGD_RET_UINT16: - sprintf(stmt_ins, "%u,", res->value.ui16); + STMT_ADD(stmt_ins,stmt,stmt_siz, "%u,", res->value.ui16); break; case ULOGD_RET_IPADDR: #ifdef IP_AS_STRING - *stmt_ins++ = '\''; - memset(&addr, 0, sizeof(addr)); - addr.s_addr = ntohl(res->value.ui32); - tmpstr = (char *)inet_ntoa(addr); - PQescapeString(stmt_ins,tmpstr,strlen(tmpstr)); - stmt_ins = stmt + strlen(stmt); - sprintf(stmt_ins, "',"); - break; + if(f->str) + { + memset(&addr, 0, sizeof(addr)); + addr.s_addr = ntohl(res->value.ui32); + tmpstr = (char *)inet_ntoa(addr); + + if(stmt_siz > (stmt_ins-stmt)+(strlen(tmpstr)*2)+4) + { + *stmt_ins++ = '\''; + PQescapeString(stmt_ins,tmpstr,strlen(tmpstr)); + stmt_ins = stmt + strlen(stmt); + STMT_ADD(stmt_ins,stmt,stmt_siz, "',"); + } + else + { + STMT_ADD(stmt_ins,stmt,stmt_siz, "'',"); + } + break; + } #endif /* IP_AS_STRING */ /* EVIL: fallthrough when logging IP as * u_int32_t */ case ULOGD_RET_UINT32: - sprintf(stmt_ins, "%u,", res->value.ui32); + STMT_ADD(stmt_ins,stmt,stmt_siz, "%u,", res->value.ui32); break; case ULOGD_RET_UINT64: - sprintf(stmt_ins, "%llu,", res->value.ui64); + STMT_ADD(stmt_ins,stmt,stmt_siz, "%"PRIu64",", res->value.ui64); break; case ULOGD_RET_BOOL: - sprintf(stmt_ins, "'%d',", res->value.b); + STMT_ADD(stmt_ins,stmt,stmt_siz, "'%d',", res->value.b); break; case ULOGD_RET_STRING: - *stmt_ins++ = '\''; - PQescapeString(stmt_ins,res->value.ptr,strlen(res->value.ptr)); - stmt_ins = stmt + strlen(stmt); - sprintf(stmt_ins, "',"); + if(stmt_siz > (stmt_ins-stmt)+(strlen(res->value.ptr)*2)+4) + { + *stmt_ins++ = '\''; + PQescapeString(stmt_ins,res->value.ptr,strlen(res->value.ptr)); + stmt_ins = stmt + strlen(stmt); + STMT_ADD(stmt_ins,stmt,stmt_siz, "',"); + } + else + { + STMT_ADD(stmt_ins,stmt,stmt_siz, "'',"); + } break; case ULOGD_RET_RAW: ulogd_log(ULOGD_NOTICE,"%s: pgsql doesn't support type RAW\n",res->key); - sprintf(stmt_ins, "NULL,"); + STMT_ADD(stmt_ins,stmt,stmt_siz, "NULL,"); break; default: ulogd_log(ULOGD_NOTICE, @@ -186,6 +217,7 @@ static int pgsql_output(ulog_iret_t *res stmt_ins = stmt + strlen(stmt); } *(stmt_ins - 1) = ')'; + DEBUGP("stmt=#%s#\n", stmt); /* now we have created our statement, insert it */ @@ -212,7 +244,7 @@ static int pgsql_namespace(void) { if (!dbh) return 1; - sprintf(pgbuf, PGSQL_HAVE_NAMESPACE_TEMPLATE, schema_ce.u.string); + snprintf(pgbuf, sizeof(pgbuf), PGSQL_HAVE_NAMESPACE_TEMPLATE, schema_ce.u.string); ulogd_log(ULOGD_DEBUG, "%s\n", pgbuf); result = PQexec(dbh, pgbuf); @@ -240,7 +272,6 @@ static int pgsql_namespace(void) { static int pgsql_createstmt(void) { struct _field *f; - unsigned int size; char buf[ULOGD_MAX_KEYLEN]; char *underscore; @@ -251,41 +282,43 @@ static int pgsql_createstmt(void) } /* caclulate the size for the insert statement */ - size = strlen(PGSQL_INSERTTEMPL) + strlen(table_ce.u.string) + strlen(schema_ce.u.string) + 1; + stmt_siz = strlen(PGSQL_INSERTTEMPL) + strlen(table_ce.u.string) + strlen(schema_ce.u.string) + 1; for (f = fields; f; f = f->next) { /* we need space for the key and a comma, as well as * enough space for the values */ - size += strlen(f->name) + 1 + PGSQL_VALSIZE; + stmt_siz += strlen(f->name) + 1 + PGSQL_VALSIZE; } - ulogd_log(ULOGD_DEBUG, "allocating %u bytes for statement\n", size); + ulogd_log(ULOGD_DEBUG, "allocating %u bytes for statement\n", stmt_siz); - stmt = (char *) malloc(size); + stmt = (char *) malloc(stmt_siz); if (!stmt) { + stmt_siz = 0; ulogd_log(ULOGD_ERROR, "OOM!\n"); return 1; } if (pgsql_have_schemas) { - sprintf(stmt, "insert into %s.%s (", schema_ce.u.string, table_ce.u.string); + snprintf(stmt, stmt_siz, "insert into %s.%s (", schema_ce.u.string, table_ce.u.string); } else { - sprintf(stmt, "insert into %s (", table_ce.u.string); + snprintf(stmt, stmt_siz, "insert into %s (", table_ce.u.string); } stmt_val = stmt + strlen(stmt); for (f = fields; f; f = f->next) { - strncpy(buf, f->name, ULOGD_MAX_KEYLEN); + strncpy(buf, f->name, ULOGD_MAX_KEYLEN-1); + buf[ULOGD_MAX_KEYLEN-1] = '\0'; while ((underscore = strchr(buf, '.'))) *underscore = '_'; - sprintf(stmt_val, "%s,", buf); + STMT_ADD(stmt_val,stmt,stmt_siz, "%s,", buf); stmt_val = stmt + strlen(stmt); } *(stmt_val - 1) = ')'; - sprintf(stmt_val, " values ("); + STMT_ADD(stmt_val,stmt,stmt_siz, " values ("); stmt_val = stmt + strlen(stmt); ulogd_log(ULOGD_DEBUG, "stmt='%s'\n", stmt); @@ -293,9 +326,9 @@ static int pgsql_createstmt(void) return 0; } -#define PGSQL_GETCOLUMN_TEMPLATE "SELECT a.attname FROM pg_class c, pg_attribute a WHERE c.relname ='%s' AND a.attnum>0 AND a.attrelid=c.oid ORDER BY a.attnum" +#define PGSQL_GETCOLUMN_TEMPLATE "SELECT a.attname,t.typname FROM pg_class c, pg_attribute a, pg_type t WHERE c.relname ='%s' AND a.attnum>0 AND a.attrelid=c.oid AND a.atttypid=t.oid ORDER BY a.attnum" -#define PGSQL_GETCOLUMN_TEMPLATE_SCHEMA "SELECT a.attname FROM pg_attribute a, pg_class c LEFT JOIN pg_namespace n ON c.relnamespace=n.oid WHERE c.relname ='%s' AND n.nspname='%s' AND a.attnum>0 AND a.attrelid=c.oid AND a.attisdropped=FALSE ORDER BY a.attnum" +#define PGSQL_GETCOLUMN_TEMPLATE_SCHEMA "SELECT a.attname,t.typname FROM pg_attribute a, pg_type t, pg_class c LEFT JOIN pg_namespace n ON c.relnamespace=n.oid WHERE c.relname ='%s' AND n.nspname='%s' AND a.attnum>0 AND a.attrelid=c.oid AND a.atttypid=t.oid AND a.attisdropped=FALSE ORDER BY a.attnum" /* find out which columns the table has */ static int pgsql_get_columns(const char *table) @@ -307,6 +340,7 @@ static int pgsql_get_columns(const char struct _field *f; int id; int intaux; + char *typename; if (!dbh) return 1; @@ -333,7 +367,8 @@ static int pgsql_get_columns(const char for (intaux=0; intaux<PQntuples(result); intaux++) { /* replace all underscores with dots */ - strncpy(buf, PQgetvalue(result, intaux, 0), ULOGD_MAX_KEYLEN); + strncpy(buf, PQgetvalue(result, intaux, 0), ULOGD_MAX_KEYLEN-1); + buf[ULOGD_MAX_KEYLEN-1] = '\0'; while ((underscore = strchr(buf, '_'))) *underscore = '.'; @@ -352,8 +387,16 @@ static int pgsql_get_columns(const char ulogd_log(ULOGD_ERROR, "OOM!\n"); return 1; } - strncpy(f->name, buf, ULOGD_MAX_KEYLEN); + strncpy(f->name, buf, ULOGD_MAX_KEYLEN-1); + f->name[ULOGD_MAX_KEYLEN-1] = '\0'; f->id = id; + f->str = 0; + if( (typename = PQgetvalue(result, intaux, 1)) != NULL) + { + if(strcmp(typename, "inet") == 0 || + strstr(typename, "char") != NULL) + f->str = 1; + } f->next = fields; fields = f; } @@ -386,34 +429,37 @@ static int pgsql_open_db(char *server, i if (port) len += 20; - connstr = (char *) malloc(len); + connstr = (char *) malloc(len+1); if (!connstr) return 1; + *connstr = '\0'; if (server) { - strcpy(connstr, " host="); - strcat(connstr, server); + strncat(connstr, " host=", len-strlen(connstr)); + strncat(connstr, server, len-strlen(connstr)); } if (port) { char portbuf[20]; snprintf(portbuf, sizeof(portbuf), " port=%u", port); - strcat(connstr, portbuf); + strncat(connstr, portbuf, len-strlen(connstr)); } - strcat(connstr, " dbname="); - strcat(connstr, db); - strcat(connstr, " user="); - strcat(connstr, user); + strncat(connstr, " dbname=", len-strlen(connstr)); + strncat(connstr, db, len-strlen(connstr)); + strncat(connstr, " user=", len-strlen(connstr)); + strncat(connstr, user, len-strlen(connstr)); if (pass) { - strcat(connstr, " password="); - strcat(connstr, pass); + strncat(connstr, " password=", len-strlen(connstr)); + strncat(connstr, pass, len-strlen(connstr)); } dbh = PQconnectdb(connstr); + free(connstr); if (PQstatus(dbh)!=CONNECTION_OK) { exit_nicely(dbh); + dbh = NULL; return 1; } @@ -432,23 +478,39 @@ static int pgsql_init(void) } if (pgsql_namespace()) { - return 1; + PQfinish(dbh); + dbh = NULL; ulogd_log(ULOGD_ERROR, "unable to test for pgsql schemas\n"); + return 1; } /* read the fieldnames to know which values to insert */ if (pgsql_get_columns(table_ce.u.string)) { + PQfinish(dbh); + dbh = NULL; ulogd_log(ULOGD_ERROR, "unable to get pgsql columns\n"); return 1; } - pgsql_createstmt(); + + if(pgsql_createstmt()) { + PQfinish(dbh); + dbh = NULL; + return 1; + } return 0; } static void pgsql_fini(void) { - PQfinish(dbh); + if(dbh) + PQfinish(dbh); + if(stmt) + { + free(stmt); + stmt = NULL; + stmt_val = NULL; + } } static ulog_output_t pgsql_plugin = { ++++++ ulogd-1.24-fixes-sqlite3.dif ++++++ --- sqlite3/ulogd_SQLITE3.c +++ sqlite3/ulogd_SQLITE3.c 2007/05/30 15:31:11 @@ -55,6 +55,9 @@ static struct _field *fields; /* buffer for our insert statement */ static char *stmt; +/* size of our insert statement buffer */ +static size_t stmt_siz; + /* pointer to the final prepared statement */ static sqlite3_stmt *p_stmt; @@ -85,6 +88,12 @@ static config_entry_t buffer_ce = { .options = CONFIG_OPT_MANDATORY, }; +#define STMT_ADD(pos,beg,siz,fmt...) \ + do { \ + if((pos) >= (beg) && (siz) > (pos) - (beg)) \ + snprintf((pos), (siz)-((pos)-(beg)), ##fmt); \ + } while(0) + /* our main output function, called by ulogd */ static int _sqlite3_output(ulog_iret_t *result) { @@ -96,6 +105,9 @@ static int _sqlite3_output(ulog_iret_t * struct in_addr addr; #endif + if (p_stmt == NULL || dbh == NULL) + return 1; + col_counter = 1; for (f = fields; f; f = f->next) { res = keyh_getres(f->id); @@ -194,7 +206,6 @@ static int _sqlite3_output(ulog_iret_t * static int _sqlite3_createstmt(void) { struct _field *f; - unsigned int size; char buf[ULOGD_MAX_KEYLEN]; char *underscore; char *stmt_pos; @@ -208,65 +219,68 @@ static int _sqlite3_createstmt(void) } /* caclulate the size for the insert statement */ - size = strlen(_SQLITE3_INSERTTEMPL) + strlen(table_ce.u.string); + stmt_siz = strlen(_SQLITE3_INSERTTEMPL) + strlen(table_ce.u.string); - DEBUGP("initial size: %u\n", size); + DEBUGP("initial size: %zu\n", stmt_siz); col_count = 0; for (f = fields; f; f = f->next) { /* we need space for the key and a comma, and a ? */ - size += strlen(f->name) + 3; - DEBUGP("size is now %u since adding %s\n",size,f->name); + stmt_siz += strlen(f->name) + 3; + DEBUGP("size is now %zu since adding %s\n",stmt_siz,f->name); col_count++; } DEBUGP("there were %d columns\n",col_count); - DEBUGP("after calc name length: %u\n",size); + DEBUGP("after calc name length: %zu\n",stmt_siz); - ulogd_log(ULOGD_DEBUG, "allocating %u bytes for statement\n", size); + ulogd_log(ULOGD_DEBUG, "allocating %zu bytes for statement\n", stmt_siz); - stmt = (char *) malloc(size); + stmt = (char *) malloc(stmt_siz); if (!stmt) { + stmt_siz = 0; ulogd_log(ULOGD_ERROR, "OOM!\n"); return 1; } - sprintf(stmt, "insert into %s (", table_ce.u.string); + snprintf(stmt, stmt_siz, "insert into %s (", table_ce.u.string); stmt_pos = stmt + strlen(stmt); for (f = fields; f; f = f->next) { - strncpy(buf, f->name, ULOGD_MAX_KEYLEN); + strncpy(buf, f->name, ULOGD_MAX_KEYLEN-1); + buf[ULOGD_MAX_KEYLEN-1] = '\0'; while ((underscore = strchr(buf, '.'))) *underscore = '_'; - sprintf(stmt_pos, "%s,", buf); + STMT_ADD(stmt_pos,stmt,stmt_siz, "%s,", buf); stmt_pos = stmt + strlen(stmt); } *(stmt_pos - 1) = ')'; - sprintf(stmt_pos, " values ("); + STMT_ADD(stmt_pos,stmt,stmt_siz, " values ("); stmt_pos = stmt + strlen(stmt); for (i = 0; i < col_count - 1; i++) { - sprintf(stmt_pos,"?,"); + STMT_ADD(stmt_pos,stmt,stmt_siz, "?,"); stmt_pos += 2; } - sprintf(stmt_pos, "?)"); + STMT_ADD(stmt_pos,stmt,stmt_siz, "?)"); ulogd_log(ULOGD_DEBUG, "stmt='%s'\n", stmt); DEBUGP("about to prepare statement.\n"); - sqlite3_prepare(dbh,stmt,-1,&p_stmt,0); - - DEBUGP("statement prepared.\n"); - - if (!p_stmt) { + if (sqlite3_prepare(dbh,stmt,-1,&p_stmt,0) != SQLITE_OK) { + p_stmt = NULL; + free( stmt); + stmt = stmt_pos = NULL; ulogd_log(ULOGD_ERROR,"unable to prepare statement"); return 1; } + DEBUGP("statement prepared.\n"); + return 0; } @@ -278,7 +292,7 @@ static int _sqlite3_createstmt(void) static int _sqlite3_get_columns(const char *table) { char buf[ULOGD_MAX_KEYLEN]; - char query[SQLITE_SELECT_LEN + CONFIG_VAL_STRING_LEN] = "select * from \0"; + char query[SQLITE_SELECT_LEN + CONFIG_VAL_STRING_LEN + 1] = "select * from \0"; char *underscore; struct _field *f; sqlite3_stmt *schema_stmt; @@ -289,7 +303,7 @@ static int _sqlite3_get_columns(const ch if (!dbh) return 1; - strncat(query,table,LINE_LEN); + strncat(query,table,sizeof(query)-strlen(query)-1); result = sqlite3_prepare(dbh,query,-1,&schema_stmt,0); @@ -298,7 +312,8 @@ static int _sqlite3_get_columns(const ch for (column = 0; column < sqlite3_column_count(schema_stmt); column++) { /* replace all underscores with dots */ - strncpy(buf, sqlite3_column_name(schema_stmt,column), ULOGD_MAX_KEYLEN); + strncpy(buf, sqlite3_column_name(schema_stmt,column), ULOGD_MAX_KEYLEN-1); + buf[ULOGD_MAX_KEYLEN-1] = '\0'; while ((underscore = strchr(buf, '_'))) *underscore = '.'; @@ -317,7 +332,8 @@ static int _sqlite3_get_columns(const ch ulogd_log(ULOGD_ERROR, "OOM!\n"); return 1; } - strncpy(f->name, buf, ULOGD_MAX_KEYLEN); + strncpy(f->name, buf, ULOGD_MAX_KEYLEN-1); + f->name[ULOGD_MAX_KEYLEN-1] = '\0'; f->id = id; f->next = fields; fields = f; @@ -357,6 +373,7 @@ static void _sqlite3_fini(void) ulogd_log(ULOGD_ERROR,"unable to commit remaining records to db."); sqlite3_close(dbh); + dbh = NULL; DEBUGP("database file closed\n"); } } @@ -379,6 +396,8 @@ static int _sqlite3_init(void) /* read the fieldnames to know which values to insert */ if (_sqlite3_get_columns(table_ce.u.string)) { + sqlite3_close(dbh); + dbh = NULL; ulogd_log(ULOGD_ERROR, "unable to get sqlite columns\n"); return 1; } @@ -393,7 +412,11 @@ static int _sqlite3_init(void) ulogd_log(ULOGD_ERROR,"can't create a new transaction\n"); /* create and prepare the actual insert statement */ - _sqlite3_createstmt(); + if(_sqlite3_createstmt()) { + sqlite3_close(dbh); + dbh = NULL; + return 1; + } return 0; } ++++++ ulogd-1.24-mysql-table.dif ++++++ --- doc/mysql.table.ipaddr-as-string +++ doc/mysql.table.ipaddr-as-string 2007/05/30 12:19:52 @@ -11,7 +11,7 @@ # Table structure for table 'ulog' # CREATE TABLE ulog ( - id int(10) unsigned DEFAULT '0' NOT NULL auto_increment, + id int(10) unsigned NOT NULL auto_increment, raw_mac varchar(80), oob_time_sec int(10) unsigned, oob_time_usec int(10) unsigned, ++++++ ulogd-1.23-pgsql-table.dif -> ulogd-1.24-pgsql-table.dif ++++++ --- ulogd/ulogd-1.23-pgsql-table.dif 2006-05-02 16:59:39.000000000 +0200 +++ /mounts/work_src_done/STABLE/ulogd/ulogd-1.24-pgsql-table.dif 2007-03-20 14:36:29.000000000 +0100 @@ -1,23 +1,23 @@ ---- doc/pgsql.table -+++ doc/pgsql.table 2006/03/08 14:51:05 +--- doc/pgsql.table.ipaddr-as-string ++++ doc/pgsql.table.ipaddr-as-string 2007/03/20 13:34:45 @@ -33,16 +33,16 @@ "ip_csum" integer, /* log IPs as unsigned int32 (default) */ ---- "ip_saddr" bigint, ---- "ip_daddr" bigint, -+ "ip_saddr" bigint, -+ "ip_daddr" bigint, +- "ip_saddr" bigint, +- "ip_daddr" bigint, ++-- "ip_saddr" bigint, ++-- "ip_daddr" bigint, /* log IPs as string (--with-pgsql-log-ip-as-string) */ -- "ip_saddr" character varying(40), -- "ip_daddr" character varying(40), /* log IPs as inet (--with-pgsql-log-ip-as-string) */ -- "ip_saddr" inet, -- "ip_daddr" inet, -+-- "ip_saddr" inet, -+-- "ip_daddr" inet, +--- "ip_saddr" inet, +--- "ip_daddr" inet, ++ "ip_saddr" inet, ++ "ip_daddr" inet, "tcp_sport" integer, ++++++ ulogd-1.24-sqlite3-table.dif ++++++ --- doc/sqlite3.table.ipaddr-as-string +++ doc/sqlite3.table.ipaddr-as-string 2007/03/16 12:36:00 @@ -2,8 +2,8 @@ CREATE TABLE ulog ( raw_mac VARCHAR(80), oob_time_sec INT UNSIGNED, oob_time_usec INT UNSIGNED, - ip_saddr INT UNSIGNED, - ip_daddr INT UNSIGNED, + ip_saddr VARCHAR(16), + ip_daddr VARCHAR(16), ip_protocol TINYINT UNSIGNED, ip_totlen SMALLINT UNSIGNED, tcp_sport SMALLINT UNSIGNED, ++++++ ulogd-1.23.tar.bz2 -> ulogd-1.24.tar.bz2 ++++++ ++++ 7462 lines of diff (skipped) ++++++ ulogd-1.24-user-option.dif ++++++ --- ulogd.c +++ ulogd.c 2007/05/31 11:51:19 @@ -87,6 +87,11 @@ #define ULOGD_CONFIGFILE "/etc/ulogd.conf" #endif +/* default user to run as or "" */ +#ifndef ULOGD_USER_DEFAULT +#define ULOGD_USER_DEFAULT "" +#endif + /* global variables */ static struct ipulog_handle *libulog_h; /* our libipulog handle */ static unsigned char* libulog_buf; /* the receive buffer */ @@ -545,7 +550,12 @@ static config_entry_t nlgroup_ce = { &pl static config_entry_t loglevel_ce = { &nlgroup_ce, "loglevel", CONFIG_TYPE_INT, CONFIG_OPT_NONE, 0, { value: ULOGD_NOTICE } }; -static config_entry_t rmem_ce = { &loglevel_ce, "rmem", CONFIG_TYPE_INT, + +static config_entry_t user_ce = { &loglevel_ce, "user", CONFIG_TYPE_STRING, + CONFIG_OPT_NONE, 0, + { string: ULOGD_USER_DEFAULT } }; + +static config_entry_t rmem_ce = { &user_ce, "rmem", CONFIG_TYPE_INT, CONFIG_OPT_NONE, 0, { value: ULOGD_RMEM_DEFAULT } }; @@ -694,14 +704,17 @@ int main(int argc, char* argv[]) case 'u': change_uid = 1; user = strdup(optarg); + setpwent(); pw = getpwnam(user); if (!pw) { printf("Unknown user %s.\n", user); + endpwent(); free(user); exit(1); } uid = pw->pw_uid; gid = pw->pw_gid; + endpwent(); break; } } @@ -739,7 +752,23 @@ int main(int argc, char* argv[]) exit(1); } - + /* if no -u cmd line option set, read the user option from config. */ + if (!change_uid && strlen(user_ce.u.string)) + { + change_uid = 1; + user = strdup(user_ce.u.string); + setpwent(); + pw = getpwnam(user); + if (!pw) { + printf("Unknown user %s.\n", user); + endpwent(); + free(user); + exit(1); + } + uid = pw->pw_uid; + gid = pw->pw_gid; + endpwent(); + } if (change_uid) { ulogd_log(ULOGD_NOTICE, "Changing UID / GID\n"); if (setgid(gid)) { --- ulogd.conf.in +++ ulogd.conf.in 2007/05/31 11:11:06 @@ -7,6 +7,9 @@ # GLOBAL OPTIONS ###################################################################### +# username to run as (runs as root if not set) +user=ulogd + # netlink multicast group (the same as the iptables --ulog-nlgroup param) nlgroup=1 ++++++ ulogd.init ++++++ --- ulogd/ulogd.init 2005-07-27 19:41:15.000000000 +0200 +++ /mounts/work_src_done/STABLE/ulogd/ulogd.init 2007-05-31 13:31:12.000000000 +0200 @@ -79,7 +79,8 @@ echo -n "Starting ulogd " ## Start daemon with startproc(8). If this fails ## the return value is set appropriately by startproc. - startproc $ULOGD_BIN + umask 0027 + startproc $ULOGD_BIN -d touch $ULOGD_LOCK # Remember status and be verbose ++++++ ulogd.logrotate ++++++ --- ulogd/ulogd.logrotate 2005-07-27 15:32:17.000000000 +0200 +++ /mounts/work_src_done/STABLE/ulogd/ulogd.logrotate 2007-05-31 17:32:43.000000000 +0200 @@ -1,3 +1,4 @@ +# old log file names /var/log/ulogd.log /var/log/ulogd.syslogemu /var/log/ulogd.pktlog /var/log/ulogd.pcap { compress dateext @@ -13,3 +14,19 @@ endscript } +# new log file names +/var/log/ulogd/ulogd.log /var/log/ulogd/ulogd.syslogemu /var/log/ulogd/ulogd.pktlog /var/log/ulogd/ulogd.pcap { + compress + dateext + maxage 365 + rotate 99 + missingok + notifempty + size +4096k + create 640 ulog ulog + sharedscripts + postrotate + /etc/init.d/ulogd reload + endscript +} + ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit syslog-ng
by root＠Hilbert.suse.de 31 May '07

31 May '07

Hello community, here is the log from the commit of package syslog-ng checked in at Thu May 31 21:14:37 CEST 2007. -------- --- syslog-ng/syslog-ng.changes 2007-05-14 13:39:13.000000000 +0200 +++ /mounts/work_src_done/STABLE/syslog-ng/syslog-ng.changes 2007-05-30 17:22:00.000000000 +0200 @@ -1,0 +2,13 @@ +Wed May 30 17:21:54 CEST 2007 - mt(a)suse.de + +- Updated to syslog-ng-1.6.12, fixing negation for the netmask() + filter, increasing hostname buffers to 256 characters, adding + so_rcvbuf option to adjust the afinet receive buffer, forcing + log_fifo_size to an minimum of 1000 elements +- Adopted update_own_hostname and afunix_dest_reconnect patches +- Bug #257101: Fix to log parse errors while reload (SIGHUP). + New patch file: syslog-ng-verbose_reload.dif +- Fixed console destination in default config to use pipe driver, + disabled permission and ownerships for console and xconsole. + +------------------------------------------------------------------- Old: ---- syslog-ng-1.6.11.tar.gz syslog-ng-1.6.11.tar.gz.asc New: ---- syslog-ng-1.6.12.tar.gz syslog-ng-1.6.12.tar.gz.asc syslog-ng-verbose_reload.dif ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ syslog-ng.spec ++++++ --- /var/tmp/diff_new_pack.w29081/_old 2007-05-31 21:14:10.000000000 +0200 +++ /var/tmp/diff_new_pack.w29081/_new 2007-05-31 21:14:10.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package syslog-ng (Version 1.6.11) +# spec file for package syslog-ng (Version 1.6.12) # # Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine @@ -11,12 +11,12 @@ # norootforbuild Name: syslog-ng -BuildRequires: flex gperf klogd libol-devel tcpd-devel -Version: 1.6.11 -Release: 43 +BuildRequires: bison flex gperf klogd libol-devel tcpd-devel +Version: 1.6.12 +Release: 1 License: GNU General Public License (GPL) Group: System/Daemons -Summary: new-generation syslog-daemon +Summary: The new-generation syslog-daemon URL: http://www.balabit.com/products/syslog_ng/ PreReq: %insserv_prereq %fillup_prereq klogd aaa_base Provides: syslog @@ -37,6 +37,7 @@ Patch5: syslog-ng-handle-line.diff Patch6: syslog-ng-filter_checks.dif Patch7: syslog-ng-sigaction.dif +Patch8: syslog-ng-verbose_reload.dif BuildRoot: %{_tmppath}/%{name}-%{version}-build %description @@ -75,6 +76,7 @@ %patch5 -p0 %patch6 -p0 %patch7 -p0 +%patch8 -p0 %{?suse_update_config:%{suse_update_config -f}} %build @@ -246,6 +248,16 @@ /var/adm/fillup-templates/sysconfig.syslog-ng %changelog +* Wed May 30 2007 - mt(a)suse.de +- Updated to syslog-ng-1.6.12, fixing negation for the netmask() + filter, increasing hostname buffers to 256 characters, adding + so_rcvbuf option to adjust the afinet receive buffer, forcing + log_fifo_size to an minimum of 1000 elements +- Adopted update_own_hostname and afunix_dest_reconnect patches +- Bug #257101: Fix to log parse errors while reload (SIGHUP). + New patch file: syslog-ng-verbose_reload.dif +- Fixed console destination in default config to use pipe driver, + disabled permission and ownerships for console and xconsole. * Mon May 14 2007 - mt(a)suse.de - Bug #256671: Added reset of the sysconfig SYSLOG_DAEMON variable to "" (autodetect daemon) in rpm postun script. ++++++ syslog-ng-1.6.11.tar.gz -> syslog-ng-1.6.12.tar.gz ++++++ ++++ 16078 lines of diff (skipped) ++++++ syslog-ng-afunix_dest_reconnect.dif ++++++ --- /var/tmp/diff_new_pack.w29081/_old 2007-05-31 21:14:10.000000000 +0200 +++ /var/tmp/diff_new_pack.w29081/_new 2007-05-31 21:14:10.000000000 +0200 @@ -1,10 +1,11 @@ --- src/afunix.c -+++ src/afunix.c 2006/05/29 16:54:31 -@@ -413,7 +413,16 @@ static int do_init_afunix_dest(struct lo ++++ src/afunix.c 2007/05/22 10:40:17 +@@ -412,8 +412,17 @@ static int do_init_afunix_dest(struct lo + else { CAST(unix_address_info, unix_addr, self->super.dest_addr); - close(fd); - werror("Error connecting to AF_UNIX(%S): %z\n", unix_addr->path, strerror(errno)); + close(fd); + if(self->cfg->time_reopen) { + io_callout(self->cfg->backend, + self->cfg->time_reopen, ++++++ syslog-ng.conf.default ++++++ --- syslog-ng/syslog-ng.conf.default 2007-03-03 15:34:21.000000000 +0100 +++ /mounts/work_src_done/STABLE/syslog-ng/syslog-ng.conf.default 2007-05-29 18:13:57.000000000 +0200 @@ -108,10 +108,10 @@ # # Most warning and errors on tty10 and on the xconsole pipe: # -destination console { file("/dev/tty10" group(tty) perm(0620)); }; +destination console { pipe("/dev/tty10" owner(-1) group(-1) perm(-1)); }; log { source(src); filter(f_console); destination(console); }; -destination xconsole { pipe("/dev/xconsole" group(tty) perm(0400)); }; +destination xconsole { pipe("/dev/xconsole" owner(-1) group(-1) perm(-1)); }; log { source(src); filter(f_console); destination(xconsole); }; # Enable this, if you want that root is informed immediately, ++++++ syslog-ng-update_own_hostname.dif ++++++ --- /var/tmp/diff_new_pack.w29081/_old 2007-05-31 21:14:11.000000000 +0200 +++ /var/tmp/diff_new_pack.w29081/_new 2007-05-31 21:14:11.000000000 +0200 @@ -1,5 +1,5 @@ --- src/main.c -+++ src/main.c 2006/02/08 19:06:51 ++++ src/main.c 2007/05/22 10:31:07 @@ -53,6 +53,7 @@ static char cfgfilename[128] = PATH_SYSLOG_NG_CONF; static char pidfilename[128] = PATH_PIDFILE; @@ -8,7 +8,7 @@ /* CLASS: (class -@@ -242,6 +243,7 @@ +@@ -242,6 +243,7 @@ int main_loop(struct syslog_backend *bac res_init(); #endif notice("SIGHUP received, restarting syslog-ng\n"); @@ -17,8 +17,8 @@ set_error_stream(2, 0); set_internal_cfg(NULL); --- src/sources.c -+++ src/sources.c 2006/02/08 19:06:55 -@@ -189,6 +189,11 @@ ++++ src/sources.c 2007/05/22 10:31:07 +@@ -197,6 +197,11 @@ make_log_reader(UINT32 dgram, } /* source_group */ @@ -30,7 +30,7 @@ static struct ol_string *get_source_hostname(struct address_info *a, int usedns, int usefqdn, struct nscache *cache) { -@@ -224,6 +229,12 @@ +@@ -232,6 +237,12 @@ static struct ol_string *get_source_host name = c_format_cstring("%z", hname); } else { @@ -41,5 +41,5 @@ + hostname = NULL; + } if (!hostname) { - char buf[128]; + char buf[256]; if (usefqdn) { ++++++ syslog-ng-verbose_reload.dif ++++++ --- src/cfgfile.c +++ src/cfgfile.c 2007/05/22 10:57:13 @@ -335,8 +335,9 @@ struct syslog_config *make_syslog_config res = yyparse(); fclose(cfg); if (!res) { + /* successfully parsed, verify it */ + linenum = -1; if( verify_filter_rules(self->filters) == 0) { - /* successfully parsed */ self->resources = empty_resource_list(); return self; } --- src/main.c +++ src/main.c 2007/05/22 11:07:00 @@ -209,8 +209,12 @@ int main_loop(struct syslog_backend *bac if (backend->newconfig) { add_socket_to_sources(backend->add_sockets, backend->newconfig->sources); - + io_callout_flush(&backend->super); + if (!debug_flag) { + set_error_stream(2, 0); + set_internal_cfg(NULL); + } s.timeout = backend->configuration->stats_freq; if (s.timeout > 0) @@ -221,7 +225,10 @@ int main_loop(struct syslog_backend *bac } else { backend->super.reloading = 0; - notice("Syntax error reading config file (line %i), using old configuration\n", linenum); + if(linenum == -1) + notice("Verify error reading config file, using old configuration\n"); + else + notice("Syntax error reading config file (line %i), using old configuration\n", linenum); } reload_config = 0; } @@ -247,10 +254,6 @@ int main_loop(struct syslog_backend *bac #endif notice("SIGHUP received, restarting syslog-ng\n"); update_source_hostname(); - if (!debug_flag) { - set_error_stream(2, 0); - set_internal_cfg(NULL); - } reload_config = 1; r.backend = backend; r.state = -1; @@ -502,7 +505,10 @@ int main(int argc, char **argv) backend->configuration = make_syslog_config(cfgfilename, &backend->super); if (!backend->configuration) { - werror("Parse error reading configuration file, exiting. (line %i)\n", linenum); + if(linenum == -1) + werror("Verify error reading configuration file, exiting.\n"); + else + werror("Parse error reading configuration file, exiting. (line %i)\n", linenum); return 1; } if (syntax_only) { ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit swig
by root＠Hilbert.suse.de 31 May '07

31 May '07

Hello community, here is the log from the commit of package swig checked in at Thu May 31 21:14:02 CEST 2007. -------- --- swig/swig.changes 2007-05-24 13:24:44.000000000 +0200 +++ /mounts/work_src_done/STABLE/swig/swig.changes 2007-05-29 11:14:41.000000000 +0200 @@ -1,0 +2,6 @@ +Tue May 29 11:13:24 CEST 2007 - mmarek(a)suse.cz + +- install examples in '%%_libdir/swig/examples' (not Examples) to + pass the devel-file-in-non-devel-package rpmlint check + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ swig.spec ++++++ --- /var/tmp/diff_new_pack.W27843/_old 2007-05-31 21:13:52.000000000 +0200 +++ /var/tmp/diff_new_pack.W27843/_new 2007-05-31 21:13:52.000000000 +0200 @@ -18,7 +18,7 @@ Autoreqprov: on Summary: Simplified Wrapper and Interface Generator Version: 1.3.31 -Release: 15 +Release: 18 Source: swig-%{version}.tar.bz2 Patch1: swig-testsuite.patch Patch2: swig-1.3.31-testsuite-warnings.patch @@ -117,7 +117,7 @@ cp -a FUTURE TODO NEW ANNOUNCE CHANGES* LICENSE README Doc/{Devel,Manual} \ $RPM_BUILD_ROOT%{_docdir}/%{name}/ install -d $RPM_BUILD_ROOT%{_libdir}/swig -cp -a Examples $RPM_BUILD_ROOT%_libdir/swig/ +cp -a Examples $RPM_BUILD_ROOT%_libdir/swig/examples # rm files that are not needed for runnig or rebuilding the examples find $RPM_BUILD_ROOT%_libdir/swig \ -name '*.dsp' -o -name '*.vcproj' -o -name '*.sln' -o \ @@ -126,7 +126,7 @@ chmod -x $RPM_BUILD_ROOT%_docdir/%name/Manual/* find $RPM_BUILD_ROOT%_libdir/swig -name '*.h' -perm +111 | \ xargs --no-run-if-empty chmod -x -ln -s %_libdir/swig/Examples $RPM_BUILD_ROOT%_docdir/%name/ +ln -s %_libdir/swig/examples $RPM_BUILD_ROOT%_docdir/%name/Examples %clean rm -rf $RPM_BUILD_ROOT @@ -149,6 +149,9 @@ %{_libdir}/swig %changelog +* Tue May 29 2007 - mmarek(a)suse.cz +- install examples in '%%_libdir/swig/examples' (not Examples) to + pass the devel-file-in-non-devel-package rpmlint check * Thu May 24 2007 - mmarek(a)suse.cz - fixed some rpmlint errors * Wed Apr 04 2007 - mmarek(a)suse.cz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit scons
by root＠Hilbert.suse.de 31 May '07

31 May '07

Hello community, here is the log from the commit of package scons checked in at Thu May 31 21:13:45 CEST 2007. -------- --- scons/scons.changes 2006-03-08 13:36:19.000000000 +0100 +++ /mounts/work_src_done/STABLE/scons/scons.changes 2007-05-30 15:22:55.000000000 +0200 @@ -1,0 +2,6 @@ +Wed May 30 15:22:18 CEST 2007 - ltinkl(a)suse.cz + +- update to stable release 0.97 +- fix man installation patch + +------------------------------------------------------------------- Old: ---- scons-0.96.91.tar.bz2 New: ---- scons-0.97.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ scons.spec ++++++ --- /var/tmp/diff_new_pack.g24836/_old 2007-05-31 21:12:19.000000000 +0200 +++ /var/tmp/diff_new_pack.g24836/_new 2007-05-31 21:12:19.000000000 +0200 @@ -1,7 +1,7 @@ # -# spec file for package scons (Version 0.96.91) +# spec file for package scons (Version 0.97) # -# Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2007 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. # @@ -12,9 +12,9 @@ Name: scons BuildRequires: python-devel -Summary: Replacement for Make -Version: 0.96.91 -Release: 7 +Summary: Replacement for make +Version: 0.97 +Release: 1 Source0: %{name}-%{version}.tar.bz2 Source1: scons-user.html Patch1: fix-install.patch @@ -26,9 +26,9 @@ %description SCons is a make replacement that provides a range of enhanced features, -such as automated dependency generation and built in compilation cache +such as automated dependency generation and built-in compilation cache support. SCons rule sets are Python scripts, so as well as the features -it provides itself SCons allows you to use the full power of Python to +it provides itself, SCons allows you to use the full power of Python to control compilation. @@ -72,7 +72,10 @@ %doc CHANGES.txt LICENSE.txt README.txt RELEASE.txt scons-user.html %doc /%{_mandir}/man1/* -%changelog -n scons +%changelog +* Wed May 30 2007 - ltinkl(a)suse.cz +- update to stable release 0.97 +- fix man installation patch * Wed Mar 08 2006 - ltinkl(a)suse.cz - add more documentation (#154045) * Tue Feb 28 2006 - jmatejek(a)suse.cz ++++++ fix-install.patch ++++++ --- /var/tmp/diff_new_pack.g24836/_old 2007-05-31 21:12:19.000000000 +0200 +++ /var/tmp/diff_new_pack.g24836/_new 2007-05-31 21:12:19.000000000 +0200 @@ -1,11 +1,20 @@ ---- setup.py -+++ setup.py -@@ -330,7 +330,7 @@ +--- setup.py 2007-05-17 18:36:40.000000000 +0200 ++++ setup.py 2007-05-30 15:20:13.000000000 +0200 +@@ -336,7 +336,7 @@ if is_win32: dir = 'Doc' else: - dir = os.path.join('man', 'man1') + dir = os.path.join('share', 'man', 'man1') - self.data_files = [(dir, ["scons.1", "sconsign.1"])] + self.data_files = [(dir, man_pages)] man_dir = os.path.join(self.install_dir, dir) msg = "Installed SCons man pages into %s" % man_dir +@@ -384,7 +384,7 @@ + "SCons.Sig", + "SCons.Tool"], + 'package_dir' : {'' : 'engine'}, +- 'data_files' : [('man/man1', man_pages)], ++ 'data_files' : [('share/man/man1', man_pages)], + 'scripts' : scripts, + 'cmdclass' : {'install' : install, + 'install_lib' : install_lib, ++++++ scons-0.96.91.tar.bz2 -> scons-0.97.tar.bz2 ++++++ ++++ 31463 lines of diff (skipped) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit rpm
by root＠Hilbert.suse.de 31 May '07

31 May '07

Hello community, here is the log from the commit of package rpm checked in at Thu May 31 21:11:56 CEST 2007. -------- --- rpm/rpm.changes 2007-05-25 16:40:34.000000000 +0200 +++ /mounts/work_src_done/STABLE/rpm/rpm.changes 2007-05-27 16:43:42.000000000 +0200 @@ -1,0 +2,5 @@ +Sun May 27 16:43:25 CEST 2007 - schwab(a)suse.de + +- Remove duplicate rpmpopt alias. + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ rpm-python.spec ++++++ --- /var/tmp/diff_new_pack.l21162/_old 2007-05-31 21:11:21.000000000 +0200 +++ /var/tmp/diff_new_pack.l21162/_new 2007-05-31 21:11:21.000000000 +0200 @@ -16,7 +16,7 @@ Group: System/Packages Summary: Python Bindings for Manipulating RPM Packages Version: 4.4.2 -Release: 122 +Release: 126 Requires: rpm = %{version} %py_requires ++++++ rpm.spec ++++++ --- /var/tmp/diff_new_pack.l21162/_old 2007-05-31 21:11:21.000000000 +0200 +++ /var/tmp/diff_new_pack.l21162/_new 2007-05-31 21:11:21.000000000 +0200 @@ -20,7 +20,7 @@ Autoreqprov: on Summary: The RPM Package Manager Version: 4.4.2 -Release: 110 +Release: 112 Source: rpm-%{version}.tar.bz2 Source1: RPM-HOWTO.tar.bz2 Source2: RPM-Tips.html.tar.bz2 @@ -325,7 +325,7 @@ License: GNU Library General Public License v. 2.0 and 2.1 (LGPL) Group: System/Libraries Version: 1.7 -Release: 338 +Release: 340 # %description -n popt @@ -348,7 +348,7 @@ License: GNU Library General Public License v. 2.0 and 2.1 (LGPL) Group: System/Libraries Version: 1.7 -Release: 338 +Release: 340 Requires: popt = 1.7 Requires: glibc-devel @@ -384,6 +384,8 @@ %doc %{_mandir}/man3/popt.3* %changelog +* Sun May 27 2007 - schwab(a)suse.de +- Remove duplicate rpmpopt alias. * Fri May 25 2007 - mls(a)suse.de - fix patch-rpm query - do not link convertdb1 statically [#274694] ++++++ rpmpopt.diff ++++++ --- /var/tmp/diff_new_pack.l21162/_old 2007-05-31 21:11:22.000000000 +0200 +++ /var/tmp/diff_new_pack.l21162/_new 2007-05-31 21:11:22.000000000 +0200 @@ -1,7 +1,11 @@ +--- + rpmpopt.in | 47 ++++++++++++++++++++++------------------------- + 1 file changed, 22 insertions(+), 25 deletions(-) + Index: rpmpopt.in =================================================================== ---- rpmpopt.in.orig -+++ rpmpopt.in +--- rpmpopt.in.orig 2007-05-27 16:41:29.000000000 +0200 ++++ rpmpopt.in 2007-05-27 16:42:42.000000000 +0200 @@ -86,7 +86,8 @@ Signature : %|DSAHEADER?{%{DSAHEADER:p %|PACKAGER?{Packager : %{PACKAGER}\n}|\ %|URL?{URL : %{URL}\n}|\ @@ -12,23 +16,20 @@ --POPTdesc=$"list descriptive information from package(s)" rpm alias --changelog --qf '[* %{CHANGELOGTIME:day} %{CHANGELOGNAME}\n%{CHANGELOGTEXT}\n\n]' \ -@@ -129,11 +130,11 @@ rpm alias --fileprovide --qf '[%{FILENAM +@@ -129,12 +130,6 @@ rpm alias --fileprovide --qf '[%{FILENAM rpm alias --filerequire --qf '[%{FILENAMES}\t%{FILEREQUIRE}\n]' \ --POPTdesc=$"list file names with requires" -rpm alias --redhatprovides -q --define '_dbpath /usr/lib/rpmdb/%{_arch}-%{_vendor}-%{_os}/redhat' --whatprovides \ - --POPTdesc=$"find package name that contains a provided capability (needs rpmdb-redhat package installed)" -+rpm alias --fileclass --qf '[%{FILENAMES}\t%{FILECLASS}\n]' \ -+ --POPTdesc=$"list file names with classes" - +- -rpm alias --redhatrequires -q --define '_dbpath /usr/lib/rpmdb/%{_arch}-%{_vendor}-%{_os}/redhat' --whatrequires \ - --POPTdesc=$"find package name that contains a required capability (needs rpmdb-redhat package installed)" -+rpm alias --filecolor --qf '[%{FILENAMES}\t%{FILECOLORS}\n]' \ -+ --POPTdesc=$"list file names with colors" - +- # colon separated i18n domains to use as PO catalogue lookaside for * retrieving header group/description/summary. -@@ -201,22 +202,22 @@ rpm alias --timecheck --define '_timeche + # +@@ -201,22 +196,22 @@ rpm alias --timecheck --define '_timeche #rpm exec --target rpmb --target #rpm exec --short-circuit rpmb --short-circuit @@ -67,7 +68,7 @@ #rpm exec -i rpmi -i #rpm exec --install rpmi --install -@@ -382,7 +383,8 @@ Signature : %|DSAHEADER?{%{DSAHEADER:p +@@ -382,7 +377,8 @@ Signature : %|DSAHEADER?{%{DSAHEADER:p %|PACKAGER?{Packager : %{PACKAGER}\n}|\ %|URL?{URL : %{URL}\n}|\ Summary : %{SUMMARY}\n\ @@ -77,7 +78,7 @@ --POPTdesc=$"list descriptive information from package(s)" rpmq alias --changelog --qf '[* %{CHANGELOGTIME:day} %{CHANGELOGNAME}\n%{CHANGELOGTEXT}\n\n]' \ -@@ -495,7 +497,8 @@ Size : %-27{SIZE}%|LICENSE?{ +@@ -495,7 +491,8 @@ Size : %-27{SIZE}%|LICENSE?{ %|PACKAGER?{Packager : %{PACKAGER}\n}|\ %|URL?{URL : %{URL}\n}|\ Summary : %{SUMMARY}\n\ ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit python-openssl
by root＠Hilbert.suse.de 31 May '07

31 May '07

Hello community, here is the log from the commit of package python-openssl checked in at Thu May 31 21:11:12 CEST 2007. -------- --- python-openssl/python-openssl.changes 2006-10-19 17:50:59.000000000 +0200 +++ /mounts/work_src_done/STABLE/python-openssl/python-openssl.changes 2007-05-30 13:57:55.000000000 +0200 @@ -1,0 +2,5 @@ +Wed May 30 13:57:24 CEST 2007 - jmatejek(a)suse.cz + +- removed documentation build tools from doc directory + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ python-openssl.spec ++++++ --- /var/tmp/diff_new_pack.t19441/_old 2007-05-31 21:10:38.000000000 +0200 +++ /var/tmp/diff_new_pack.t19441/_new 2007-05-31 21:10:38.000000000 +0200 @@ -1,7 +1,7 @@ # # spec file for package python-openssl (Version 0.6) # -# Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2007 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. # @@ -14,7 +14,7 @@ BuildRequires: openssl-devel python-devel Summary: Python wrapper module around the OpenSSL library Version: 0.6 -Release: 38 +Release: 71 Source: pyOpenSSL-%{version}.tar.bz2 Patch0: pyOpenSSL-0.6-ssize.patch License: GNU Library General Public License v. 2.0 and 2.1 (LGPL) @@ -22,7 +22,6 @@ URL: http://pyopenssl.sourceforge.net/ Requires: python BuildRoot: %{_tmppath}/%{name}-%{version}-build -Prefix: %{_prefix} %description High-level wrapper around a subset of the OpenSSL library, includes @@ -55,7 +54,8 @@ --root="$RPM_BUILD_ROOT" mkdir -p $RPM_BUILD_ROOT/%{_defaultdocdir}/%{name} cp -p COPYING INSTALL PKG-INFO TODO README $RPM_BUILD_ROOT/%{_defaultdocdir}/%{name}/ -cp -pr examples doc $RPM_BUILD_ROOT/%{_defaultdocdir}/%{name}/ +cp -pr examples doc/html $RPM_BUILD_ROOT/%{_defaultdocdir}/%{name}/ +cp -p doc/pyOpenSSL.* $RPM_BUILD_ROOT/%{_defaultdocdir}/%{name}/ %clean [ -n "$RPM_BUILD_ROOT" -a "$RPM_BUILD_ROOT" != / ] && rm -rf "$RPM_BUILD_ROOT" @@ -64,7 +64,9 @@ %defattr(-,root,root) %doc %{_defaultdocdir}/%{name} -%changelog -n python-openssl +%changelog +* Wed May 30 2007 - jmatejek(a)suse.cz +- removed documentation build tools from doc directory * Thu Oct 19 2006 - jmatejek(a)suse.cz - minor changes to improve 64bit compatibility with PEP353 * Tue Feb 28 2006 - jmatejek(a)suse.cz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit pidgin
by root＠Hilbert.suse.de 31 May '07

31 May '07

Hello community, here is the log from the commit of package pidgin checked in at Thu May 31 21:10:31 CEST 2007. -------- --- GNOME/pidgin/pidgin.changes 2007-05-28 16:08:40.000000000 +0200 +++ /mounts/work_src_done/STABLE/pidgin/pidgin.changes 2007-05-31 11:22:18.000000000 +0200 @@ -1,0 +2,6 @@ +Thu May 31 11:21:27 CEST 2007 - sbrabec(a)suse.cz + +- Updated to version 2.0.1: + * Over 100 bugs fixed. + +------------------------------------------------------------------- Old: ---- pidgin-2.0.0.tar.bz2 pidgin-undefined-operation.patch New: ---- pidgin-2.0.1.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ pidgin.spec ++++++ --- /var/tmp/diff_new_pack.Q18300/_old 2007-05-31 21:10:18.000000000 +0200 +++ /var/tmp/diff_new_pack.Q18300/_new 2007-05-31 21:10:18.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package pidgin (Version 2.0.0) +# spec file for package pidgin (Version 2.0.1) # # Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine @@ -12,8 +12,8 @@ Name: pidgin Summary: GTK+-Based Multiprotocol Instant Messaging Client -Version: 2.0.0 -Release: 7 +Version: 2.0.1 +Release: 1 License: GNU General Public License (GPL) Group: Productivity/Networking/AOLInstantMessenger URL: http://www.pidgin.im/ @@ -25,7 +25,6 @@ Patch3: pidgin-nonblock-common.patch Patch4: pidgin-nonblock-gwim.patch Patch5: pidgin-nonblock-common2.patch -Patch6: pidgin-undefined-operation.patch Patch7: pidgin-check.patch # Can use external libzephyr BuildRequires: cyrus-sasl-devel dbus-1-devel doxygen evolution-data-server-devel gnome-keyring-devel graphviz gtkspell-devel intltool libao-devel libbonobo-devel libgadu-devel libstdc++-devel libxml2-devel meanwhile-devel mono-devel mozilla-nspr-devel mozilla-nss-devel ncurses-devel perl-XML-Parser python sqlite-devel startup-notification-devel tk-devel update-desktop-files @@ -169,7 +168,7 @@ %package -n finch-devel Summary: Headers etc. for finch Stuffs Group: Productivity/Networking/AOLInstantMessenger -Requires: finch = %{version} glib2-devel glibc-devel libpurple-devel = %{version} +Requires: finch = %{version} glib2-devel glibc-devel libpurple-devel = %{version} ncurses-devel Requires: pkg-config Obsoletes: gaim-unstable-text-devel %package gaim-compat @@ -755,7 +754,6 @@ %patch3 -p1 %patch4 -p1 %patch5 -p1 -%patch6 %patch7 # Change Myanmar/Myanmar to Myanmar: rename my_MM my po/my_MM.* @@ -786,7 +784,7 @@ --with-tclconfig=/usr/%_lib\ --with-tkconfig=/usr/%_lib make -# Mono bindings 2.0.0 are not parallel build ready: +# Mono bindings 2.0.1 are not parallel build ready: #make %{?jobs:-j%jobs} %install @@ -846,6 +844,18 @@ %preun -f %{name}.schemas_preun +%post -n libpurple +%run_ldconfig + +%postun -n libpurple +%run_ldconfig + +%post -n finch +%run_ldconfig + +%postun -n finch +%run_ldconfig + %files -f %{name}.lst %defattr(-,root,root) %doc AUTHORS COPYING COPYRIGHT ChangeLog NEWS README README.MTN doc/the_penguin.txt @@ -924,6 +934,9 @@ %{_bindir}/gaim-text %changelog +* Thu May 31 2007 - sbrabec(a)suse.cz +- Updated to version 2.0.1: + * Over 100 bugs fixed. * Mon May 28 2007 - sbrabec(a)suse.cz - Fixed devel dependencies. * Tue May 15 2007 - sbrabec(a)suse.cz ++++++ pidgin-2.0.0.tar.bz2 -> pidgin-2.0.1.tar.bz2 ++++++ GNOME/pidgin/pidgin-2.0.0.tar.bz2 /mounts/work_src_done/STABLE/pidgin/pidgin-2.0.1.tar.bz2 differ: byte 11, line 1 ++++++ pidgin-nonblock-common.patch ++++++ --- /var/tmp/diff_new_pack.Q18300/_old 2007-05-31 21:10:19.000000000 +0200 +++ /var/tmp/diff_new_pack.Q18300/_new 2007-05-31 21:10:19.000000000 +0200 @@ -1,16 +1,15 @@ -diff -uprN gaim-1.5.0-old/libpurple/plugins/ssl/ssl-gnutls.c gaim-1.5.0-new/libpurple/plugins/ssl/ssl-gnutls.c ---- gaim-1.5.0-old/libpurple/plugins/ssl/ssl-gnutls.c 2004-09-03 16:34:16.000000000 -0500 -+++ gaim-1.5.0-new/libpurple/plugins/ssl/ssl-gnutls.c 2005-11-12 21:42:43.000000000 -0600 -@@ -131,8 +131,6 @@ ssl_gnutls_close(PurpleSslConnection *gsc) - if(!gnutls_data) - return; +--- pidgin-2.0.1/libpurple/plugins/ssl/ssl-gnutls.c ++++ pidgin-2.0.1/libpurple/plugins/ssl/ssl-gnutls.c +@@ -137,8 +137,6 @@ + if(gnutls_data->handshake_handler) + purple_input_remove(gnutls_data->handshake_handler); - gnutls_bye(gnutls_data->session, GNUTLS_SHUT_RDWR); - gnutls_deinit(gnutls_data->session); g_free(gnutls_data); -@@ -160,6 +158,22 @@ ssl_gnutls_read(PurpleSslConnection *gsc, +@@ -173,6 +171,22 @@ } static size_t @@ -33,7 +32,7 @@ ssl_gnutls_write(PurpleSslConnection *gsc, const void *data, size_t len) { PurpleSslGnutlsData *gnutls_data = PURPLE_SSL_GNUTLS_DATA(gsc); -@@ -171,6 +185,23 @@ ssl_gnutls_write(PurpleSslConnection *gsc, +@@ -201,6 +215,23 @@ return s; } @@ -57,21 +56,19 @@ static PurpleSslOps ssl_ops = { ssl_gnutls_init, -@@ -178,7 +209,9 @@ static PurpleSslOps ssl_ops = +@@ -208,7 +239,9 @@ ssl_gnutls_connect, ssl_gnutls_close, ssl_gnutls_read, -- ssl_gnutls_write, + ssl_gnutls_read_nonblock, -+ ssl_gnutls_write, + ssl_gnutls_write, + ssl_gnutls_write_nonblock, /* padding */ NULL, -diff -uprN gaim-1.5.0-old/libpurple/plugins/ssl/ssl-nss.c gaim-1.5.0-new/libpurple/plugins/ssl/ssl-nss.c ---- gaim-1.5.0-old/libpurple/plugins/ssl/ssl-nss.c 2005-01-16 18:32:26.000000000 -0600 -+++ gaim-1.5.0-new/libpurple/plugins/ssl/ssl-nss.c 2005-11-12 21:42:23.000000000 -0600 -@@ -269,6 +269,8 @@ static PurpleSslOps ssl_ops = +--- pidgin-2.0.1/libpurple/plugins/ssl/ssl-nss.c ++++ pidgin-2.0.1/libpurple/plugins/ssl/ssl-nss.c +@@ -359,6 +359,8 @@ ssl_nss_connect, ssl_nss_close, ssl_nss_read, @@ -80,9 +77,8 @@ ssl_nss_write, /* padding */ -diff -uprN gaim-1.5.0-old/libpurple/purple-fifo.c gaim-1.5.0-new/libpurple/purple-fifo.c ---- gaim-1.5.0-old/libpurple/purple-fifo.c 1969-12-31 18:00:00.000000000 -0600 -+++ gaim-1.5.0-new/libpurple/purple-fifo.c 2005-11-12 21:42:23.000000000 -0600 +--- pidgin-2.0.1/libpurple/purple-fifo.c ++++ pidgin-2.0.1/libpurple/purple-fifo.c @@ -0,0 +1,232 @@ +/* + * @file purple-fifo.c A FIFO byte queue. @@ -316,9 +312,8 @@ + + return TRUE; +} -diff -uprN gaim-1.5.0-old/libpurple/purple-fifo.h gaim-1.5.0-new/libpurple/purple-fifo.h ---- gaim-1.5.0-old/libpurple/purple-fifo.h 1969-12-31 18:00:00.000000000 -0600 -+++ gaim-1.5.0-new/libpurple/purple-fifo.h 2005-11-12 21:42:23.000000000 -0600 +--- pidgin-2.0.1/libpurple/purple-fifo.h ++++ pidgin-2.0.1/libpurple/purple-fifo.h @@ -0,0 +1,54 @@ +/** + * @file purple-fifo.h A FIFO byte queue. @@ -374,9 +369,8 @@ +G_END_DECLS + +#endif /* _purple_fifo_H_ */ -diff -uprN gaim-1.5.0-old/libpurple/purple-io.c gaim-1.5.0-new/libpurple/purple-io.c ---- gaim-1.5.0-old/libpurple/purple-io.c 1969-12-31 18:00:00.000000000 -0600 -+++ gaim-1.5.0-new/libpurple/purple-io.c 2005-11-12 21:42:23.000000000 -0600 +--- pidgin-2.0.1/libpurple/purple-io.c ++++ pidgin-2.0.1/libpurple/purple-io.c @@ -0,0 +1,391 @@ +/* + * @file purple-io.c Buffering I/O layer. @@ -769,9 +763,8 @@ +{ + return purple_fifo_get_used (io->write_fifo); +} -diff -uprN gaim-1.5.0-old/libpurple/purple-io.h gaim-1.5.0-new/libpurple/purple-io.h ---- gaim-1.5.0-old/libpurple/purple-io.h 1969-12-31 18:00:00.000000000 -0600 -+++ gaim-1.5.0-new/libpurple/purple-io.h 2005-11-12 21:42:23.000000000 -0600 +--- pidgin-2.0.1/libpurple/purple-io.h ++++ pidgin-2.0.1/libpurple/purple-io.h @@ -0,0 +1,87 @@ +/** + * @file purple-io.h Buffering I/O layer. @@ -860,10 +853,9 @@ +G_END_DECLS + +#endif /* _PURPLE_IO_H_ */ -diff -uprN gaim-1.5.0-old/libpurple/sslconn.c gaim-1.5.0-new/libpurple/sslconn.c ---- gaim-1.5.0-old/libpurple/sslconn.c 2004-01-09 22:04:56.000000000 -0600 -+++ gaim-1.5.0-new/libpurple/sslconn.c 2005-11-12 21:42:23.000000000 -0600 -@@ -209,6 +209,27 @@ purple_ssl_read(PurpleSslConnection *gsc, vo +--- pidgin-2.0.1/libpurple/sslconn.c ++++ pidgin-2.0.1/libpurple/sslconn.c +@@ -219,6 +219,27 @@ } size_t @@ -891,8 +883,8 @@ purple_ssl_write(PurpleSslConnection *gsc, const void *data, size_t len) { PurpleSslOps *ops; -@@ -225,6 +246,27 @@ purple_ssl_write(PurpleSslConnection *gsc, c - return 0; +@@ -231,6 +252,27 @@ + return (ops->write)(gsc, data, len); } +size_t @@ -919,10 +911,9 @@ void purple_ssl_set_ops(PurpleSslOps *ops) { -diff -uprN gaim-1.5.0-old/libpurple/sslconn.h gaim-1.5.0-new/libpurple/sslconn.h ---- gaim-1.5.0-old/libpurple/sslconn.h 2004-08-08 00:37:58.000000000 -0500 -+++ gaim-1.5.0-new/libpurple/sslconn.h 2005-11-12 21:42:23.000000000 -0600 -@@ -35,6 +35,12 @@ typedef enum +--- pidgin-2.0.1/libpurple/sslconn.h ++++ pidgin-2.0.1/libpurple/sslconn.h +@@ -35,6 +35,12 @@ PURPLE_SSL_CONNECT_FAILED = 2 } PurpleSslErrorType; @@ -935,17 +926,23 @@ typedef struct _PurpleSslConnection PurpleSslConnection; typedef void (*PurpleSslInputFunction)(gpointer, PurpleSslConnection *, -@@ -70,7 +76,9 @@ typedef struct - PurpleInputFunction connect_cb; - void (*close)(PurpleSslConnection *gsc); +@@ -100,6 +106,7 @@ + * @return Number of bytes actually written into the buffer, or <0 on error + */ size_t (*read)(PurpleSslConnection *gsc, void *data, size_t len); + size_t (*read_nonblock)(PurpleSslConnection *gsc, void *data, size_t len); + /** Writes data to a connection (like POSIX send()) + * @param gsc Connection context + * @param data Data buffer to send data from +@@ -107,6 +114,7 @@ + * @return The number of bytes written (may be less than len) or <0 on error + */ size_t (*write)(PurpleSslConnection *gsc, const void *data, size_t len); + size_t (*write_nonblock)(PurpleSslConnection *gsc, const void *data, size_t len); - } PurpleSslOps; - -@@ -152,6 +160,17 @@ void purple_ssl_close(PurpleSslConnection *g + void (*_purple_reserved1)(void); + void (*_purple_reserved2)(void); +@@ -197,6 +205,17 @@ size_t purple_ssl_read(PurpleSslConnection *gsc, void *buffer, size_t len); /** @@ -963,7 +960,7 @@ * Writes data to an SSL connection. * * @param gsc The SSL connection handle. -@@ -162,6 +181,17 @@ size_t purple_ssl_read(PurpleSslConnection * +@@ -207,6 +226,17 @@ */ size_t purple_ssl_write(PurpleSslConnection *gsc, const void *buffer, size_t len); ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit permissions
by root＠Hilbert.suse.de 31 May '07

31 May '07

Hello community, here is the log from the commit of package permissions checked in at Thu May 31 21:10:09 CEST 2007. -------- --- permissions/permissions.changes 2007-04-18 18:23:29.000000000 +0200 +++ /mounts/work_src_done/STABLE/permissions/permissions.changes 2007-05-30 10:48:20.000000000 +0200 @@ -1,0 +2,5 @@ +Wed May 30 10:47:52 CEST 2007 - lnussel(a)suse.de + +- add /usr/bin/kcheckpass and /usr/bin/kdesud (#276502) + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ permissions.spec ++++++ --- /var/tmp/diff_new_pack.I17028/_old 2007-05-31 21:10:03.000000000 +0200 +++ /var/tmp/diff_new_pack.I17028/_new 2007-05-31 21:10:03.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package permissions (Version 2007.4.18) +# spec file for package permissions (Version 2007.5.31) # # Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine @@ -14,7 +14,7 @@ License: GNU General Public License (GPL) Group: Productivity/Security Autoreqprov: on -Version: 2007.4.18 +Version: 2007.5.31 Release: 1 Provides: aaa_base:/etc/permissions Requires: /sbin/SuSEconfig @@ -77,6 +77,8 @@ /var/adm/fillup-templates/sysconfig.security %changelog +* Wed May 30 2007 - lnussel(a)suse.de +- add /usr/bin/kcheckpass and /usr/bin/kdesud (#276502) * Wed Apr 18 2007 - dmueller(a)suse.de - create debuginfo package (#265667) * Thu Feb 22 2007 - lnussel(a)suse.de ++++++ permissions.easy ++++++ --- permissions/permissions.easy 2007-02-22 16:50:42.000000000 +0100 +++ /mounts/work_src_done/STABLE/permissions/permissions.easy 2007-05-30 10:46:51.000000000 +0200 @@ -259,8 +259,10 @@ # needs setuid root when using shadow via NIS: # #66218 /opt/kde3/bin/kcheckpass root:shadow 4755 +/usr/bin/kcheckpass root:shadow 4755 # This has a meaning... hmm... /opt/kde3/bin/kdesud root:nogroup 2755 +/usr/bin/kdesud root:nogroup 2755 # used for getting proxy settings from dhcp /opt/kde3/bin/kpac_dhcp_helper root:root 4755 # used to distract the oom killer ++++++ permissions.paranoid ++++++ --- permissions/permissions.paranoid 2007-02-22 16:50:31.000000000 +0100 +++ /mounts/work_src_done/STABLE/permissions/permissions.paranoid 2007-05-30 10:47:50.000000000 +0200 @@ -272,8 +272,10 @@ # needs setuid root when using shadow via NIS: # #66218 /opt/kde3/bin/kcheckpass root:shadow 0755 +/usr/bin/kcheckpass root:shadow 0755 # This has a meaning... hmm... /opt/kde3/bin/kdesud root:nogroup 0755 +/usr/bin/kdesud root:nogroup 0755 # used for getting proxy settings from dhcp /opt/kde3/bin/kpac_dhcp_helper root:root 0755 # used to distract the oom killer ++++++ permissions.secure ++++++ --- permissions/permissions.secure 2007-02-22 16:51:01.000000000 +0100 +++ /mounts/work_src_done/STABLE/permissions/permissions.secure 2007-05-30 10:47:08.000000000 +0200 @@ -297,8 +297,10 @@ # needs setuid root when using shadow via NIS: # #66218 /opt/kde3/bin/kcheckpass root:shadow 4755 +/usr/bin/kcheckpass root:shadow 4755 # This has a meaning... hmm... /opt/kde3/bin/kdesud root:nogroup 2755 +/usr/bin/kdesud root:nogroup 2755 # used for getting proxy settings from dhcp /opt/kde3/bin/kpac_dhcp_helper root:root 0755 # used to distract the oom killer ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit perl-Bootloader
by root＠Hilbert.suse.de 31 May '07

31 May '07

Hello community, here is the log from the commit of package perl-Bootloader checked in at Thu May 31 21:09:52 CEST 2007. -------- --- perl-Bootloader/perl-Bootloader.changes 2007-04-25 19:13:32.000000000 +0200 +++ /mounts/work_src_done/STABLE/perl-Bootloader/perl-Bootloader.changes 2007-05-31 15:47:18.000000000 +0200 @@ -1,0 +2,23 @@ +Thu May 31 15:46:13 CEST 2007 - aosthof(a)suse.de + +- Fixed creation of failsafe sections in boot menu, this issue is + also related to bugs #272236, #272208 and #277405 +- Verion bump to 0.4.16 + +------------------------------------------------------------------- +Thu May 31 15:16:46 CEST 2007 - aosthof(a)suse.de + +- The last commit is also related to bugs #272236 and #272208 + +------------------------------------------------------------------- +Thu May 31 14:59:11 CEST 2007 - aosthof(a)suse.de + +- Fixed label naming scheme for boot entries so that debug or + vanilla kernel entries for instance get named correctly (#277405) + +------------------------------------------------------------------- +Thu Apr 26 13:41:38 CEST 2007 - aosthof(a)suse.de + +- Fixed failsafe parameters to boot in runlevel 3 instead of 5 + +------------------------------------------------------------------- Old: ---- perl-Bootloader-0.4.15.tar.bz2 New: ---- perl-Bootloader-0.4.16.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ perl-Bootloader.spec ++++++ --- /var/tmp/diff_new_pack.b15981/_old 2007-05-31 21:09:35.000000000 +0200 +++ /var/tmp/diff_new_pack.b15981/_new 2007-05-31 21:09:35.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package perl-Bootloader (Version 0.4.15) +# spec file for package perl-Bootloader (Version 0.4.16) # # Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine @@ -11,7 +11,7 @@ # norootforbuild Name: perl-Bootloader -Version: 0.4.15 +Version: 0.4.16 Release: 1 Requires: perl >= %{perl_version} Requires: perl-gettext @@ -34,6 +34,10 @@ Authors: -------- + Alexander Osthof <aosthof(a)novell.com> + Stefan Fent <sf(a)novell.com> + Joachim Plack <jplack(a)novell.com> + Olaf Dabrunz <od(a)novell.com> Jiri Srain <jsrain(a)suse.cz> %prep @@ -63,6 +67,17 @@ /usr/lib/bootloader %changelog +* Thu May 31 2007 - aosthof(a)suse.de +- Fixed creation of failsafe sections in boot menu, this issue is + also related to bugs #272236, #272208 and #277405 +- Verion bump to 0.4.16 +* Thu May 31 2007 - aosthof(a)suse.de +- The last commit is also related to bugs #272236 and #272208 +* Thu May 31 2007 - aosthof(a)suse.de +- Fixed label naming scheme for boot entries so that debug or + vanilla kernel entries for instance get named correctly (#277405) +* Thu Apr 26 2007 - aosthof(a)suse.de +- Fixed failsafe parameters to boot in runlevel 3 instead of 5 * Wed Apr 25 2007 - aosthof(a)suse.de - Fixed usage of md raids for ia64 (#233255) - Reverted EFI Bootloader Label code in ELILO.pm to display gui ++++++ perl-Bootloader-0.4.15.tar.bz2 -> perl-Bootloader-0.4.16.tar.bz2 ++++++ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/perl-Bootloader-0.4.15/lib/Bootloader/Tools.pm new/perl-Bootloader-0.4.16/lib/Bootloader/Tools.pm --- old/perl-Bootloader-0.4.15/lib/Bootloader/Tools.pm 2007-04-25 19:08:23.000000000 +0200 +++ new/perl-Bootloader-0.4.16/lib/Bootloader/Tools.pm 2007-04-26 13:42:51.000000000 +0200 @@ -1098,13 +1098,13 @@ chomp ($arch); if ($arch eq "i386") { - $new{"append"} = "showopts ide=nodma apm=off acpi=off noresume nosmp noapic maxcpus=0 edd=off"; + $new{"append"} = "showopts ide=nodma apm=off acpi=off noresume nosmp noapic maxcpus=0 edd=off 3"; } elsif ($arch eq "x86_64") { - $new{"append"} = "showopts ide=nodma apm=off acpi=off noresume edd=off"; + $new{"append"} = "showopts ide=nodma apm=off acpi=off noresume edd=off 3"; } elsif ($arch eq "ia64") { - $new{"append"} = "ide=nodma nohalt noresume"; + $new{"append"} = "ide=nodma nohalt noresume 3"; } else { print ("Architecture $arch does not support failsafe entries.\n"); ++++++ update-bootloader ++++++ --- perl-Bootloader/update-bootloader 2007-04-25 19:09:49.000000000 +0200 +++ /mounts/work_src_done/STABLE/perl-Bootloader/update-bootloader 2007-05-31 15:34:58.000000000 +0200 @@ -289,12 +289,14 @@ } # Naming scheme for all other kernels else { - if ($loader eq "grub") { - $opt_name = GetProduct() if $add_product; - } - else { - $opt_name = GetProduct() . " -- " . $opt_name if $add_product; - } + my $flavor = $opt_name; + $flavor =~ s/.*-(\w+)/\1/; + $flavor = ucfirst ($flavor); + + my $version = $opt_name; + $version =~ s/-[^-]*$//; + + $opt_name = $flavor . " -- " . GetProduct() . " - " . $opt_name; } } @@ -338,9 +340,16 @@ my $arch = `uname --hardware-platform`; chomp ($arch); - # Add a "Failsafe" section - if ((($arch eq "i386") || ($arch eq "x86_64") || ($arch eq "ia64")) - && $opt_xen != 1) { + # Add a "Failsafe" section, but only if the underlying architecture is + # one of i386, x86_84 or ia64 and the kernel flavor is either default, + # smp or bigsmp and not a xen kernel. + if ((($arch eq "i386") || + ($arch eq "x86_64") || + ($arch eq "ia64")) && + (($opt_image =~ /-default/) || + ($opt_image =~ /-smp/) || + ($opt_image =~ /-bigsmp/)) && + ($opt_xen != 1)) { AddSection($opt_failsafe, @params); } } ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit pcsc-ccid
by root＠Hilbert.suse.de 31 May '07

31 May '07

Hello community, here is the log from the commit of package pcsc-ccid checked in at Thu May 31 21:09:29 CEST 2007. -------- --- pcsc-ccid/pcsc-ccid.changes 2007-02-13 15:07:15.000000000 +0100 +++ /mounts/work_src_done/STABLE/pcsc-ccid/pcsc-ccid.changes 2007-05-31 10:28:28.000000000 +0200 @@ -1,0 +2,5 @@ +Thu May 31 10:28:16 CEST 2007 - sbrabec(a)suse.cz + +- Build requires libusb-devel. + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ pcsc-ccid.spec ++++++ --- /var/tmp/diff_new_pack.Y14984/_old 2007-05-31 21:09:20.000000000 +0200 +++ /var/tmp/diff_new_pack.Y14984/_new 2007-05-31 21:09:20.000000000 +0200 @@ -12,9 +12,9 @@ Name: pcsc-ccid %define _name ccid -BuildRequires: pcsc-lite-devel pkg-config +BuildRequires: libusb-devel pcsc-lite-devel pkg-config Version: 1.2.1 -Release: 1 +Release: 18 Provides: locale(MozillaFirefox:de_BE;en_BE;fr_BE;nl_BE;wa_BE) Group: System/Libraries License: GNU Library General Public License v. 2.0 and 2.1 (LGPL) @@ -70,7 +70,9 @@ %config (noreplace) %{_sysconfdir}/reader.conf.d/*.conf %{ifddir}/* -%changelog -n pcsc-ccid +%changelog +* Thu May 31 2007 - sbrabec(a)suse.cz +- Build requires libusb-devel. * Tue Feb 13 2007 - sbrabec(a)suse.cz - Updated to version 1.2.1: * Support for non CCID generic readers. ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit pcsc-acr38
by root＠Hilbert.suse.de 31 May '07

31 May '07

Hello community, here is the log from the commit of package pcsc-acr38 checked in at Thu May 31 21:09:14 CEST 2007. -------- --- pcsc-acr38/pcsc-acr38.changes 2007-05-25 11:53:29.000000000 +0200 +++ /mounts/work_src_done/STABLE/pcsc-acr38/pcsc-acr38.changes 2007-05-31 13:10:16.000000000 +0200 @@ -1,0 +2,7 @@ +Thu May 31 13:09:39 CEST 2007 - sbrabec(a)suse.cz + +- Fixed module path. +- Removed broken patch changing PCSCLITE_USB_PATH to /dev/bus/usb. + (#259973). + +------------------------------------------------------------------- Old: ---- ACR38_LINUX_100705_P-usb.diff ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ pcsc-acr38.spec ++++++ --- /var/tmp/diff_new_pack.I14084/_old 2007-05-31 21:09:07.000000000 +0200 +++ /var/tmp/diff_new_pack.I14084/_new 2007-05-31 21:09:07.000000000 +0200 @@ -13,16 +13,15 @@ Name: pcsc-acr38 BuildRequires: pcsc-lite-devel pkg-config Version: 1.7.9 -Release: 1 +Release: 3 %define _version 100709_P Provides: locale(MozillaFirefox:de_BE;en_BE;fr_BE;nl_BE;wa_BE) Group: System/Libraries -License: GNU General Public License (GPL) +License: GNU General Public License (GPL), individual distribution permission. URL: http://www.linuxnet.com/ Summary: PC/SC IFD Handler for the ACR38 Smart Card Reader Source0: ACR38_LINUX_%{_version}.tar.bz2 Patch1: ACR38_LINUX_100705_P-ucread.diff -Patch2: ACR38_LINUX_100705_P-usb.diff Patch3: ACR38_LINUX_100709-automake-cleanup.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build %define ifddir %(pkg-config libpcsclite --variable=usbdropdir) @@ -58,8 +57,8 @@ %prep %setup -q -n ACR38_LINUX_%{_version} +mv src/driver/Info.plist src/driver/Info.plist.in %patch1 -%patch2 %patch3 %build @@ -95,6 +94,10 @@ %{_libdir}/pkgconfig/*.pc %changelog +* Thu May 31 2007 - sbrabec(a)suse.cz +- Fixed module path. +- Removed broken patch changing PCSCLITE_USB_PATH to /dev/bus/usb. + (#259973). * Fri May 25 2007 - sbrabec(a)suse.cz - Updated to version 1.7.9: * Fixed an error in the target location of libacr38ucontrol.pc ++++++ ACR38_LINUX_100709-automake-cleanup.patch ++++++ --- /var/tmp/diff_new_pack.I14084/_old 2007-05-31 21:09:07.000000000 +0200 +++ /var/tmp/diff_new_pack.I14084/_new 2007-05-31 21:09:07.000000000 +0200 @@ -1,3 +1,11 @@ +--- Makefile.am ++++ Makefile.am +@@ -6,3 +6,5 @@ + + # -- Top-level Makefile.am -- + SUBDIRS = src/controllib src/driver ++ ++DISTCHECK_CONFIGURE_FLAGS = --enable-usbdropdir=$$dc_install_base/pcsc/drivers --- configure.ac +++ configure.ac @@ -2,7 +2,7 @@ @@ -95,6 +103,15 @@ # Select OS specific versions of source files. AC_SUBST(BUNDLE_HOST) AC_SUBST(DYN_LIB_EXT) +@@ -205,6 +151,7 @@ + AC_CONFIG_FILES([Makefile + src/driver/Makefile + src/controllib/Makefile +- src/controllib/libacr38ucontrol.pc]) ++ src/controllib/libacr38ucontrol.pc ++ src/driver/Info.plist]) + + AC_OUTPUT --- src/controllib/Makefile.am +++ src/controllib/Makefile.am @@ -4,9 +4,7 @@ @@ -119,9 +136,20 @@ -pc_DATA = libacr38ucontrol.pc +pkgconfigdir= $(libdir)/pkgconfig +pkgconfig_DATA = libacr38ucontrol.pc +--- src/driver/Info.plist.in ++++ src/driver/Info.plist.in +@@ -5,7 +5,7 @@ + <key>CFBundleDevelopmentRegion</key> + <string>English</string> + <key>CFBundleExecutable</key> +- <string>ACR38UDriver</string> ++ <string>ACR38UDriver.@DYN_LIB_EXT@</string> + <key>CFBundleInfoDictionaryVersion</key> + <string>6.0</string> + <key>CFBundlePackageType</key> --- src/driver/Makefile.am +++ src/driver/Makefile.am -@@ -5,15 +5,18 @@ +@@ -5,15 +5,16 @@ # Process this file with automake to produce a Makefile.in script. DRIVER_NAME = ACR38UDriver @@ -132,19 +160,18 @@ -AM_CPPFLAGS = `pkg-config libpcsclite --cflags` +driverdir=$(usbdropdir)/$(DRIVER_BUNDLE_DIR)/Contents/$(BUNDLE_HOST) - EXTRA_DIST = Info.plist +-EXTRA_DIST = Info.plist ++AM_CPPFLAGS = $(PCSCLITE_CFLAGS) -lib_LTLIBRARIES = libACR38UDriver.la -+AM_CPPFLAGS = $(PCSCLITE_CFLAGS) -+ +plistdir=$(usbdropdir)/$(DRIVER_BUNDLE_DIR)/Contents +plist_DATA=Info.plist + -+driver_LTLIBRARIES = libACR38UDriver.la ++driver_LTLIBRARIES = ACR38UDriver.la SRC_DRV = ACR38IOCtrl.h \ AdmHndlr.c \ -@@ -21,6 +24,7 @@ +@@ -21,6 +22,7 @@ ctapi.h \ MCU_ATR.c \ SysConfig.c \ @@ -152,10 +179,11 @@ usbserial_linux.c \ usbserial_linux.h \ AdmHndlr.h \ -@@ -38,13 +42,4 @@ +@@ -37,14 +39,6 @@ + SRC_USB = usblinux.c \ usblinux.h - libACR38UDriver_la_SOURCES = $(SRC_DRV) $(SRC_USB) +-libACR38UDriver_la_SOURCES = $(SRC_DRV) $(SRC_USB) -libACR38UDriver_la_LIBADD = @LIBPCSCLITE@ @COREFOUNDATION@ @IOKIT@ - -install: libACR38UDriver.la @@ -166,4 +194,6 @@ - -uninstall: - rm -rf $(usbdropdir)/$(DRIVER_BUNDLE_DIR) -+libACR38UDriver_la_LIBADD = $(PCSCLITE_LIBS) $(COREFOUNDATION) $(IOKIT) ++ACR38UDriver_la_SOURCES = $(SRC_DRV) $(SRC_USB) ++ACR38UDriver_la_LIBADD = $(PCSCLITE_LIBS) $(COREFOUNDATION) $(IOKIT) ++ACR38UDriver_la_LDFLAGS = -module -avoid-version ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit omnibook
by root＠Hilbert.suse.de 31 May '07

31 May '07

Hello community, here is the log from the commit of package omnibook checked in at Thu May 31 21:09:01 CEST 2007. -------- --- omnibook/omnibook.changes 2007-04-04 17:58:41.000000000 +0200 +++ /mounts/work_src_done/STABLE/omnibook/omnibook.changes 2007-05-30 20:13:37.000000000 +0200 @@ -1,0 +2,12 @@ +Wed May 30 19:22:52 CEST 2007 - danny(a)suse.de + +- update tpo current SVN trunk (20070530): + - Update for post 2.6.21 input handler API change + - Changing P25 to ectype 12 + - fix msecs_to_jiffies implicit declaration warning +- removed patch: + - omnibook-jiffies.patch +- added patch: + - omnibook-fix-cast.diff: fix cast of enum + +------------------------------------------------------------------- Old: ---- omnibook-2.20070404.tar.gz omnibook-jiffies.patch New: ---- omnibook-2.20070530.tar.bz2 omnibook-fix-cast.diff ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ omnibook.spec ++++++ --- /var/tmp/diff_new_pack.I11178/_old 2007-05-31 21:08:45.000000000 +0200 +++ /var/tmp/diff_new_pack.I11178/_new 2007-05-31 21:08:45.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package omnibook (Version 20070404) +# spec file for package omnibook (Version 20070530) # # Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine @@ -13,17 +13,17 @@ Name: omnibook BuildRequires: kernel-source kernel-syms module-init-tools -Summary: Kernel modules for Omnibooks from omke-project -Version: 20070404 +Summary: Kernel modules for Omnibooks +Version: 20070530 Release: 1 Group: Hardware/Other License: GNU General Public License (GPL) BuildRoot: %{_tmppath}/%{name}-%{version}-build URL: http://sourceforge.net/projects/omnibook Autoreqprov: on -Source: %{name}-2.%{version}.tar.gz +Source: %{name}-2.%{version}.tar.bz2 Source2: preamble -Patch: omnibook-jiffies.patch +Patch1: omnibook-fix-cast.diff ExclusiveArch: %ix86 x86_64 %suse_kernel_module_package -p %_sourcedir/preamble um %package -n omnibook-KMP @@ -58,7 +58,7 @@ %prep %setup -n %{name}-2.%{version} -%patch +%patch1 -p1 %build cd .. @@ -84,6 +84,15 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Wed May 30 2007 - danny(a)suse.de +- update tpo current SVN trunk (20070530): + - Update for post 2.6.21 input handler API change + - Changing P25 to ectype 12 + - fix msecs_to_jiffies implicit declaration warning +- removed patch: + - omnibook-jiffies.patch +- added patch: + - omnibook-fix-cast.diff: fix cast of enum * Wed Apr 04 2007 - dkukawka(a)suse.de - updated to current SVN HEAD to fix build problems/errors - added module-init-tools to BuildRequires ++++++ omnibook-fix-cast.diff ++++++ From: Danny Kukawka <dkukawka(a)suse.de> Subject: fix compiler warning for x86_64 fix compiler warning about 'cast from pointer to integer of different size' on x86_64 Signed-off-by: Danny Kukawka <dkukawka(a)suse.de> --- init.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) --- omnibook-2.20070530/init.c 2007-05-30 19:37:56.000000000 +0200 +++ omnibook-2.20070530/init.c 2007-05-30 19:38:29.000000000 +0200 @@ -134,7 +134,7 @@ static int __init dmi_matched(struct dmi_system_id *dmi) { - omnibook_ectype = (int)dmi->driver_data; + omnibook_ectype = (enum omnibook_ectype_t)dmi->driver_data; if (dmi->ident) laptop_model = (char *)dmi->ident; else ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit NX
by root＠Hilbert.suse.de 31 May '07

31 May '07

Hello community, here is the log from the commit of package NX checked in at Thu May 31 21:08:38 CEST 2007. -------- --- NX/NX.changes 2007-05-29 15:24:32.000000000 +0200 +++ /mounts/work_src_done/STABLE/NX/NX.changes 2007-05-31 15:01:18.000000000 +0200 @@ -1,0 +2,5 @@ +Thu May 31 15:01:07 CEST 2007 - sndirsch(a)suse.de + +- make rpmlint happy (spurious-executable-perm) + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ NX.spec ++++++ --- /var/tmp/diff_new_pack.jl9411/_old 2007-05-31 21:08:21.000000000 +0200 +++ /var/tmp/diff_new_pack.jl9411/_new 2007-05-31 21:08:21.000000000 +0200 @@ -21,11 +21,11 @@ %endif %endif ExcludeArch: ia64 ppc64 s390x x86_64 -License: GNU Library General Public License v. 2.0 and 2.1 (LGPL), Other uncritical OpenSource License +License: GNU Library General Public License v. 2.0 and 2.1 (LGPL), Other uncritical OpenSource License, nxwin: NoMachine NX products license, http://www.nomachine.com/licensing.html + The XFree86 Project license. URL: http://www.nomachine.com/sources.php Group: System/X11/Servers/XF86_4 Version: 2.1.0 -Release: 9 +Release: 10 Summary: Proxy System for X11 #Compression Libraries and Proxy Sources Source: nxproxy-%{version}-3.tar.gz @@ -191,10 +191,10 @@ rm -rf $RPM_BUILD_ROOT/usr/man popd # install scripts -mkdir -p $RPM_BUILD_ROOT/usr/share/doc/packages/NX +mkdir -p $RPM_BUILD_ROOT/usr/share/doc/packages/NX/examples # Bug #156308 chmod 755 nxscripts/{run-nxproxy-reversed,run-nxproxy-server} -cp -r nxscripts $RPM_BUILD_ROOT/usr/share/doc/packages/NX +cp -r nxscripts $RPM_BUILD_ROOT/usr/share/doc/packages/NX/examples # documentation and license tar xjf $RPM_SOURCE_DIR/docs.tar.bz2 -C $RPM_BUILD_ROOT/usr/share/doc/packages/NX install -m 644 nxcomp/LICENSE $RPM_BUILD_ROOT/usr/share/doc/packages/NX @@ -251,6 +251,8 @@ /usr/share/NX/keymaps-windows/ %changelog +* Thu May 31 2007 - sndirsch(a)suse.de +- make rpmlint happy (spurious-executable-perm) * Tue May 29 2007 - sndirsch(a)suse.de - added "%%post -p /sbin/ldconfig" to specfile to make rpmlint happy * Wed May 02 2007 - sndirsch(a)suse.de ++++++ docs.tar.bz2 ++++++ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/examples/samples/README new/examples/samples/README --- old/examples/samples/README 1970-01-01 01:00:00.000000000 +0100 +++ new/examples/samples/README 2004-07-26 16:08:32.000000000 +0200 @@ -0,0 +1,51 @@ +/* README */ + +Getting familiar with NX I used two scenarios: + +1) Server: nxproxy <--> Client: nxproxy + + server> run-nxproxy-server <client-address> + + In the output you can see the cookie, which is required for the + client script + + client> run-nxproxy-client <cookie> + + Use "run-nxapp" to run any xclient via NX connection: + + client> run-nxapp <xclient> [options] + + Expected results: Not faster than using ssh with compression as + only caching and compression is done. Roundtrips still happen. + +2) Server: nxproxy <--> Client: nxagent + + server> run-nxagent-server <client-address> + + In the output you can see the cookie, which is required for the + client script + + client> run-nxagent-client <cookie> + + Use "run-nxapp" to run any xclient via NX connection: + + client> run-nxapp <xclient> [options] + + Expected Results: Much faster than using ssh with compression as + now also the roundtrips don't happen any more. + + +NOTES: +------ + +For nxproxy/nxproxy (1) and nxproxy/nxagent (2) connections Xserver +tcp port needs to be open (set DISPLAYMANAGER_XSERVER_TCP_PORT_6000_OPEN +in /etc/sysconfig/displaymanager to "Yes"). Don't forget to call +"SuSEconfig" after this. You'll need to open TCP port 4009 (4000+9) +if you use a firewall. + +"server" is the machine with your desktop, you're sitting in front +of. "client" is the machine, on which you want to start xclients, +which you want to be displayed on your desktop. + +The mentioned scripts above are located as examples in this directory. diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/examples/samples/run-nxagent-client new/examples/samples/run-nxagent-client --- old/examples/samples/run-nxagent-client 1970-01-01 01:00:00.000000000 +0100 +++ new/examples/samples/run-nxagent-client 2007-05-02 12:11:22.000000000 +0200 @@ -0,0 +1,40 @@ +#!/bin/sh + +if [ $# -ne 1 ]; then + echo "$0 <cookie>" + exit 0 +fi + +COOKIE=$1 + +NX_PORT=9 +export NX_PORT + +NX_ROOT=${HOME}/.nx + +# Create directory for agent log. + +rm -rf ${NX_ROOT}/C-${NX_PORT} || exit +mkdir -p ${NX_ROOT}/C-${NX_PORT} || exit + +NX_HOST=nx/nx,link=33k,stream=9,nodelay=1,root=${NX_ROOT},stat=stats +export NX_HOST + +NX_DISPLAY=${NX_HOST}:${NX_PORT} +export NX_DISPLAY + +NX_AGENT=:${NX_PORT} +export NX_AGENT + +NX_IMAGEMASK=240,4,240,2 +export NX_IMAGEMASK + +xauth add ${HOSTNAME}/unix:${NX_PORT} MIT-MAGIC-COOKIE-1 ${COOKIE} +xauth add ${HOSTNAME}:${NX_PORT} MIT-MAGIC-COOKIE-1 ${COOKIE} + +# Run the agent without font server. +nxagent -display ${NX_HOST}:${NX_PORT} -class TrueColor -noreset -geometry 1024x768 -auth ${HOME}/.Xauthority -name 'NX' ${NX_AGENT} + +xauth remove ${HOSTNAME}/unix:${NX_PORT} +xauth remove ${HOSTNAME}:${NX_PORT} + diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/examples/samples/run-nxagent-server new/examples/samples/run-nxagent-server --- old/examples/samples/run-nxagent-server 1970-01-01 01:00:00.000000000 +0100 +++ new/examples/samples/run-nxagent-server 2006-09-04 16:17:44.000000000 +0200 @@ -0,0 +1,38 @@ +#!/bin/sh + +if [ $# -ne 1 ]; then + echo "$0 <client-address>" + exit 0 +fi + +CLIENT=$1 + +NX_PORT=9 +export NX_PORT + +NX_ROOT=${HOME}/.nx + +NX_HOST=nx/nx,connect=$CLIENT,root=${NX_ROOT},stat=stats +export NX_HOST + +NX_DISPLAY=${NX_HOST}:${NX_PORT} +export NX_DISPLAY + +rm -rf ${HOME}/.nx/S-${NX_PORT} || exit +mkdir -p ${HOME}/.nx/S-${NX_PORT} || exit + +COOKIE=`xauth list |grep ${HOSTNAME}/unix:0 | grep MIT | cut -f 5 -d ' '` +xauth add ${HOSTNAME}/unix:${NX_PORT} MIT-MAGIC-COOKIE-1 ${COOKIE} +xauth add ${HOSTNAME}:${NX_PORT} MIT-MAGIC-COOKIE-1 ${COOKIE} + +echo "*****************************************************************" +echo +echo " Cookie for run-nxagent-client: $COOKIE" +echo +echo "*****************************************************************" + +nxproxy -S ${NX_DISPLAY} + +xauth remove ${HOSTNAME}/unix:${NX_PORT} +xauth remove ${HOSTNAME}:${NX_PORT} + diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/examples/samples/run-nxapp new/examples/samples/run-nxapp --- old/examples/samples/run-nxapp 1970-01-01 01:00:00.000000000 +0100 +++ new/examples/samples/run-nxapp 2006-09-04 12:13:12.000000000 +0200 @@ -0,0 +1,17 @@ +#!/bin/sh + +if [ $# -lt 1 ]; then + echo "$0 <command>" + exit 0 +fi + +NX_PORT=9 + +COMMAND=$(basename $1) +shift + +export DISPLAY=:$NX_PORT + +export LD_LIBRARY_PATH=/usr/lib/NX/lib:$LD_LIBRARY_PATH +exec $COMMAND ${1+"$@"} + diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/examples/samples/run-nxproxy-client new/examples/samples/run-nxproxy-client --- old/examples/samples/run-nxproxy-client 1970-01-01 01:00:00.000000000 +0100 +++ new/examples/samples/run-nxproxy-client 2006-09-04 12:13:05.000000000 +0200 @@ -0,0 +1,17 @@ +#!/bin/sh + +if [ $# -ne 1 ]; then + echo "$0 <cookie>" + exit 0 +fi + +COOKIE=$1 +NX_PORT=9 + +xauth add ${HOSTNAME}/unix:${NX_PORT} MIT-MAGIC-COOKIE-1 ${COOKIE} +xauth add ${HOSTNAME}:${NX_PORT} MIT-MAGIC-COOKIE-1 ${COOKIE} + +nxproxy -C :9 + +xauth remove ${HOSTNAME}/unix:${NX_PORT} +xauth remove ${HOSTNAME}:${NX_PORT} diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/examples/samples/run-nxproxy-server new/examples/samples/run-nxproxy-server --- old/examples/samples/run-nxproxy-server 1970-01-01 01:00:00.000000000 +0100 +++ new/examples/samples/run-nxproxy-server 2006-09-04 12:12:59.000000000 +0200 @@ -0,0 +1,24 @@ +#!/bin/sh + +if [ $# -ne 1 ]; then + echo "$0 <client-address>" + exit 0 +fi + +CLIENT=$1 +NX_PORT=9 + +COOKIE=`xauth list |grep ${HOSTNAME}/unix:0 | grep MIT | cut -f 5 -d ' '` +xauth add ${HOSTNAME}/unix:${NX_PORT} MIT-MAGIC-COOKIE-1 ${COOKIE} +xauth add ${HOSTNAME}:${NX_PORT} MIT-MAGIC-COOKIE-1 ${COOKIE} + +echo "*****************************************************************" +echo +echo " Cookie for run-nxproxy-client: $COOKIE" +echo +echo "*****************************************************************" + +nxproxy -S $CLIENT:9 + +xauth remove ${HOSTNAME}/unix:${NX_PORT} +xauth remove ${HOSTNAME}:${NX_PORT} diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/README.SuSE new/README.SuSE --- old/README.SuSE 2005-09-30 10:08:57.000000000 +0200 +++ new/README.SuSE 2007-05-31 15:43:34.000000000 +0200 @@ -16,6 +16,6 @@ Documentation: -------------- -GUUG-Presentation-NX.pdf GUUG presentation (Kurt Pfeifle) -samples/ sample scripts by SuSE (consult README first!) -nxscripts/ original sample scripts by Nomachine +GUUG-Presentation-NX.pdf GUUG presentation (Kurt Pfeifle) +examples/samples/ sample scripts by SuSE (consult README first!) +examples/nxscripts/ original sample scripts by Nomachine diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/samples/README new/samples/README --- old/samples/README 2004-07-26 16:08:32.000000000 +0200 +++ new/samples/README 1970-01-01 01:00:00.000000000 +0100 @@ -1,51 +0,0 @@ -/* README */ - -Getting familiar with NX I used two scenarios: - -1) Server: nxproxy <--> Client: nxproxy - - server> run-nxproxy-server <client-address> - - In the output you can see the cookie, which is required for the - client script - - client> run-nxproxy-client <cookie> - - Use "run-nxapp" to run any xclient via NX connection: - - client> run-nxapp <xclient> [options] - - Expected results: Not faster than using ssh with compression as - only caching and compression is done. Roundtrips still happen. - -2) Server: nxproxy <--> Client: nxagent - - server> run-nxagent-server <client-address> - - In the output you can see the cookie, which is required for the - client script - - client> run-nxagent-client <cookie> - - Use "run-nxapp" to run any xclient via NX connection: - - client> run-nxapp <xclient> [options] - - Expected Results: Much faster than using ssh with compression as - now also the roundtrips don't happen any more. - - -NOTES: ------- - -For nxproxy/nxproxy (1) and nxproxy/nxagent (2) connections Xserver -tcp port needs to be open (set DISPLAYMANAGER_XSERVER_TCP_PORT_6000_OPEN -in /etc/sysconfig/displaymanager to "Yes"). Don't forget to call -"SuSEconfig" after this. You'll need to open TCP port 4009 (4000+9) -if you use a firewall. - -"server" is the machine with your desktop, you're sitting in front -of. "client" is the machine, on which you want to start xclients, -which you want to be displayed on your desktop. - -The mentioned scripts above are located as examples in this directory. diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/samples/run-nxagent-client new/samples/run-nxagent-client --- old/samples/run-nxagent-client 2007-05-02 12:11:22.000000000 +0200 +++ new/samples/run-nxagent-client 1970-01-01 01:00:00.000000000 +0100 @@ -1,40 +0,0 @@ -#!/bin/sh - -if [ $# -ne 1 ]; then - echo "$0 <cookie>" - exit 0 -fi - -COOKIE=$1 - -NX_PORT=9 -export NX_PORT - -NX_ROOT=${HOME}/.nx - -# Create directory for agent log. - -rm -rf ${NX_ROOT}/C-${NX_PORT} || exit -mkdir -p ${NX_ROOT}/C-${NX_PORT} || exit - -NX_HOST=nx/nx,link=33k,stream=9,nodelay=1,root=${NX_ROOT},stat=stats -export NX_HOST - -NX_DISPLAY=${NX_HOST}:${NX_PORT} -export NX_DISPLAY - -NX_AGENT=:${NX_PORT} -export NX_AGENT - -NX_IMAGEMASK=240,4,240,2 -export NX_IMAGEMASK - -xauth add ${HOSTNAME}/unix:${NX_PORT} MIT-MAGIC-COOKIE-1 ${COOKIE} -xauth add ${HOSTNAME}:${NX_PORT} MIT-MAGIC-COOKIE-1 ${COOKIE} - -# Run the agent without font server. -nxagent -display ${NX_HOST}:${NX_PORT} -class TrueColor -noreset -geometry 1024x768 -auth ${HOME}/.Xauthority -name 'NX' ${NX_AGENT} - -xauth remove ${HOSTNAME}/unix:${NX_PORT} -xauth remove ${HOSTNAME}:${NX_PORT} - diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/samples/run-nxagent-server new/samples/run-nxagent-server --- old/samples/run-nxagent-server 2006-09-04 16:17:44.000000000 +0200 +++ new/samples/run-nxagent-server 1970-01-01 01:00:00.000000000 +0100 @@ -1,38 +0,0 @@ -#!/bin/sh - -if [ $# -ne 1 ]; then - echo "$0 <client-address>" - exit 0 -fi - -CLIENT=$1 - -NX_PORT=9 -export NX_PORT - -NX_ROOT=${HOME}/.nx - -NX_HOST=nx/nx,connect=$CLIENT,root=${NX_ROOT},stat=stats -export NX_HOST - -NX_DISPLAY=${NX_HOST}:${NX_PORT} -export NX_DISPLAY - -rm -rf ${HOME}/.nx/S-${NX_PORT} || exit -mkdir -p ${HOME}/.nx/S-${NX_PORT} || exit - -COOKIE=`xauth list |grep ${HOSTNAME}/unix:0 | grep MIT | cut -f 5 -d ' '` -xauth add ${HOSTNAME}/unix:${NX_PORT} MIT-MAGIC-COOKIE-1 ${COOKIE} -xauth add ${HOSTNAME}:${NX_PORT} MIT-MAGIC-COOKIE-1 ${COOKIE} - -echo "*****************************************************************" -echo -echo " Cookie for run-nxagent-client: $COOKIE" -echo -echo "*****************************************************************" - -nxproxy -S ${NX_DISPLAY} - -xauth remove ${HOSTNAME}/unix:${NX_PORT} -xauth remove ${HOSTNAME}:${NX_PORT} - diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/samples/run-nxapp new/samples/run-nxapp --- old/samples/run-nxapp 2006-09-04 12:13:12.000000000 +0200 +++ new/samples/run-nxapp 1970-01-01 01:00:00.000000000 +0100 @@ -1,17 +0,0 @@ -#!/bin/sh - -if [ $# -lt 1 ]; then - echo "$0 <command>" - exit 0 -fi - -NX_PORT=9 - -COMMAND=$(basename $1) -shift - -export DISPLAY=:$NX_PORT - -export LD_LIBRARY_PATH=/usr/lib/NX/lib:$LD_LIBRARY_PATH -exec $COMMAND ${1+"$@"} - diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/samples/run-nxproxy-client new/samples/run-nxproxy-client --- old/samples/run-nxproxy-client 2006-09-04 12:13:05.000000000 +0200 +++ new/samples/run-nxproxy-client 1970-01-01 01:00:00.000000000 +0100 @@ -1,17 +0,0 @@ -#!/bin/sh - -if [ $# -ne 1 ]; then - echo "$0 <cookie>" - exit 0 -fi - -COOKIE=$1 -NX_PORT=9 - -xauth add ${HOSTNAME}/unix:${NX_PORT} MIT-MAGIC-COOKIE-1 ${COOKIE} -xauth add ${HOSTNAME}:${NX_PORT} MIT-MAGIC-COOKIE-1 ${COOKIE} - -nxproxy -C :9 - -xauth remove ${HOSTNAME}/unix:${NX_PORT} -xauth remove ${HOSTNAME}:${NX_PORT} diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/samples/run-nxproxy-server new/samples/run-nxproxy-server --- old/samples/run-nxproxy-server 2006-09-04 12:12:59.000000000 +0200 +++ new/samples/run-nxproxy-server 1970-01-01 01:00:00.000000000 +0100 @@ -1,24 +0,0 @@ -#!/bin/sh - -if [ $# -ne 1 ]; then - echo "$0 <client-address>" - exit 0 -fi - -CLIENT=$1 -NX_PORT=9 - -COOKIE=`xauth list |grep ${HOSTNAME}/unix:0 | grep MIT | cut -f 5 -d ' '` -xauth add ${HOSTNAME}/unix:${NX_PORT} MIT-MAGIC-COOKIE-1 ${COOKIE} -xauth add ${HOSTNAME}:${NX_PORT} MIT-MAGIC-COOKIE-1 ${COOKIE} - -echo "*****************************************************************" -echo -echo " Cookie for run-nxproxy-client: $COOKIE" -echo -echo "*****************************************************************" - -nxproxy -S $CLIENT:9 - -xauth remove ${HOSTNAME}/unix:${NX_PORT} -xauth remove ${HOSTNAME}:${NX_PORT} ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit nvu
by root＠Hilbert.suse.de 31 May '07

31 May '07

Hello community, here is the log from the commit of package nvu checked in at Thu May 31 21:08:13 CEST 2007. -------- --- nvu/nvu.changes 2007-05-10 23:50:09.000000000 +0200 +++ /mounts/work_src_done/STABLE/nvu/nvu.changes 2007-05-31 16:00:54.000000000 +0200 @@ -1,0 +2,6 @@ +Thu May 31 16:00:08 CEST 2007 - sbrabec(a)suse.cz + +- Fixed undefined behavior of code and undefined variables. +- Build everything with RPM_OPT_FLAGS. + +------------------------------------------------------------------- New: ---- nvu-undefined-operation.patch nvu-uninitialized-variable.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ nvu.spec ++++++ --- /var/tmp/diff_new_pack.St8032/_old 2007-05-31 21:08:01.000000000 +0200 +++ /var/tmp/diff_new_pack.St8032/_new 2007-05-31 21:08:01.000000000 +0200 @@ -15,7 +15,7 @@ %define NVU 1 License: GNU General Public License (GPL), GNU Library General Public License v. 2.0 and 2.1 (LGPL) Version: 1.0 -Release: 53 +Release: 54 Summary: Web Authoring System URL: http://www.nvu.com/ Group: Productivity/Publishing/HTML/Editors @@ -30,6 +30,9 @@ Patch5: gtk.patch Patch6: nvu-implicit_decl.patch Patch7: dumpstack.patch +Patch8: nvu-undefined-operation.patch +Patch9: nvu-uninitialized-variable.patch +%define _use_internal_dependency_generator 0 %define my_provides %{_builddir}/%{?buildsubdir}/my-provides %define my_requires %{_builddir}/%{?buildsubdir}/my-requires AutoReqProv: on @@ -80,10 +83,15 @@ %patch5 %patch6 %patch7 +%patch8 +%patch9 cp composer/config/mozconfig.linux .mozconfig echo "ac_add_options --with-system-nspr" >>.mozconfig echo "export CFLAGS=\"$RPM_OPT_FLAGS -fno-strict-aliasing\"" >>.mozconfig echo "export CXXFLAGS=\"$RPM_OPT_FLAGS -fno-strict-aliasing\"" >>.mozconfig +echo "export HOST_CFLAGS=\"$RPM_OPT_FLAGS -fno-strict-aliasing\"" >>.mozconfig +echo "export HOST_CXXFLAGS=\"$RPM_OPT_FLAGS -fno-strict-aliasing\"" >>.mozconfig +echo "ac_add_option --enable-optimize=\"$CFLAGS\"" >>.mozconfig %build export LDFLAGS=-L/usr/X11R6/%_lib @@ -92,6 +100,8 @@ # Work around make -j running ./configure twice make -f client.mk %_builddir/mozilla/Makefile make -f client.mk %_builddir/mozilla/config.status +export CFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing" +export CXXFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing" make -f client.mk build_all %{?jobs:-j%jobs} %install @@ -137,6 +147,9 @@ /usr/share/*/nvu.* %changelog +* Thu May 31 2007 - sbrabec(a)suse.cz +- Fixed undefined behavior of code and undefined variables. +- Build everything with RPM_OPT_FLAGS. * Thu May 10 2007 - ro(a)suse.de - added unzip to buildrequires * Mon Nov 13 2006 - sbrabec(a)suse.cz ++++++ nvu.desktop ++++++ --- nvu/nvu.desktop 2006-02-15 16:18:29.000000000 +0100 +++ /mounts/work_src_done/STABLE/nvu/nvu.desktop 2007-05-31 16:11:35.000000000 +0200 @@ -3,7 +3,7 @@ GenericName=Web Authoring System TryExec=nvu Exec=nvu %u -Icon=nvu.png +Icon=nvu Terminal=false MimeType=text/html;application/xhtml+xml Type=Application ++++++ nvu-undefined-operation.patch ++++++ --- layout/html/style/src/nsCSSRendering.cpp +++ layout/html/style/src/nsCSSRendering.cpp @@ -979,14 +979,14 @@ FillOrInvertRect(aContext, dashRect.x, borderOutside.y,dashRect.width, dashRect.height-adjust,isInvert); FillOrInvertRect(aContext,dashRect.x,(borderOutside.YMost()-(dashRect.height-adjust)),dashRect.width, dashRect.height-adjust,isInvert); currRect.y += (dashRect.height-adjust); - temp = temp-= (dashRect.height-adjust); + temp -= (dashRect.height-adjust); } else { adjust = (temp%dashRect.width)/2; // adjust a tad longer // draw in the left and right FillOrInvertRect(aContext, dashRect.x, borderOutside.y,dashRect.width, dashRect.height+adjust,isInvert); FillOrInvertRect(aContext, dashRect.x,(borderOutside.YMost()-(dashRect.height+adjust)),dashRect.width, dashRect.height+adjust,isInvert); currRect.y += (dashRect.height+adjust); - temp = temp-= (dashRect.height+adjust); + temp-= (dashRect.height+adjust); } if( temp > ywidth) @@ -1045,14 +1045,14 @@ FillOrInvertRect(aContext, borderOutside.x,dashRect.y,dashRect.width-adjust,dashRect.height,isInvert); FillOrInvertRect(aContext, (borderOutside.XMost()-(dashRect.width-adjust)),dashRect.y,dashRect.width-adjust,dashRect.height,isInvert); currRect.x += (dashRect.width-adjust); - temp = temp-= (dashRect.width-adjust); + temp-= (dashRect.width-adjust); } else { adjust = (temp%dashRect.width)/2; // draw in the left and right FillOrInvertRect(aContext, borderOutside.x,dashRect.y,dashRect.width+adjust,dashRect.height,isInvert); FillOrInvertRect(aContext, (borderOutside.XMost()-(dashRect.width+adjust)),dashRect.y,dashRect.width+adjust,dashRect.height,isInvert); currRect.x += (dashRect.width+adjust); - temp = temp-= (dashRect.width+adjust); + temp-= (dashRect.width+adjust); } --- netwerk/cache/src/nsDiskCacheMap.h +++ netwerk/cache/src/nsDiskCacheMap.h @@ -145,7 +145,7 @@ // set blockCount NS_ASSERTION( (blockCount>=1) && (blockCount<=4),"invalid block count"); - blockCount = --blockCount; + --blockCount; mDataLocation |= (blockCount << eExtraBlocksOffset) & eExtraBlocksMask; mDataLocation |= eLocationInitializedMask; @@ -214,7 +214,7 @@ // set blockCount NS_ASSERTION( (blockCount>=1) && (blockCount<=4),"invalid block count"); - blockCount = --blockCount; + --blockCount; mMetaLocation |= (blockCount << eExtraBlocksOffset) & eExtraBlocksMask; mMetaLocation |= eLocationInitializedMask; ++++++ nvu-uninitialized-variable.patch ++++++ --- js/src/fdlibm/e_rem_pio2.c +++ js/src/fdlibm/e_rem_pio2.c @@ -126,7 +126,8 @@ #endif { fd_twoints u, ux, uz; - double z,w,t,r,fn; + double z = 0; + double w,t,r,fn; double tx[3]; int e0,i,j,nx,n,ix,hx; --- js/src/fdlibm/k_cos.c +++ js/src/fdlibm/k_cos.c @@ -107,7 +107,8 @@ #endif { fd_twoints u; - double a,hz,z,r,qx; + double qx = 0; + double a,hz,z,r; int ix; u.d = x; ix = __HI(u)&0x7fffffff; /* ix = |x|'s high word*/ --- js/src/jsdtoa.c +++ js/src/jsdtoa.c @@ -989,7 +989,7 @@ static double ulp(double x) { register Long L; - double a; + double a = 0; L = (word0(x) & Exp_mask) - (P-1)*Exp_msk1; #ifndef Sudden_Underflow @@ -1020,7 +1020,7 @@ { ULong *xa, *xa0, w, y, z; int32 k; - double d; + double d = 0; #define d0 word0(d) #define d1 word1(d) #define set_d0(x) set_word0(d, x) @@ -1836,6 +1836,7 @@ } #ifdef Avoid_Underflow if (scale) { + rv0 = 0.; set_word0(rv0, Exp_1 - P*Exp_msk1); set_word1(rv0, 0); if ((word0(rv) & Exp_mask) <= P*Exp_msk1 --- layout/html/base/src/nsObjectFrame.cpp +++ layout/html/base/src/nsObjectFrame.cpp @@ -1969,7 +1969,7 @@ * problems with plugins implementing the new API. See bug 234470 and * bug 261589. */ - + rv = NULL; #else // Windows and non-UNIX, non-Mac(Classic) cases // we need the native printer device context to pass to plugin ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit mkinitrd
by root＠Hilbert.suse.de 31 May '07

31 May '07

Hello community, here is the log from the commit of package mkinitrd checked in at Thu May 31 21:06:44 CEST 2007. -------- --- mkinitrd/mkinitrd.changes 2007-05-29 17:33:35.000000000 +0200 +++ /mounts/work_src_done/STABLE/mkinitrd/mkinitrd.changes 2007-05-31 12:24:15.916727000 +0200 @@ -1,0 +2,11 @@ +Wed May 30 16:38:44 CEST 2007 - hare(a)suse.de + +- Simplify shared library detection +- Revamp module setup +- Fixup error paths +- Fix cciss detection +- Fix typo in lvm2 setup +- Fix module detection +- Build rpm from git repository + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ mkinitrd.spec ++++++ --- /var/tmp/diff_new_pack.sb1112/_old 2007-05-31 21:06:00.000000000 +0200 +++ /var/tmp/diff_new_pack.sb1112/_new 2007-05-31 21:06:00.000000000 +0200 @@ -18,7 +18,7 @@ Requires: coreutils modutils util-linux grep gzip sed gawk cpio udev pciutils sysvinit file Autoreqprov: on Version: 2.0 -Release: 12 +Release: 14 Summary: Creates an Initial RAM Disk Image for Preloading Modules BuildRoot: %{_tmppath}/%{name}-%{version}-build Source0: mkinitrd.tgz @@ -52,24 +52,18 @@ %setup %build -gcc $RPM_OPT_FLAGS -Wall -Os -o run-init run-init.c +gcc $RPM_OPT_FLAGS -Wall -Os -o lib/mkinitrd/bin/run-init src/run-init.c +sed -i "s/@BUILD_DAY@/`env LC_ALL=C date -ud yesterday '+%Y%m%d'`/" sbin/mkinitrd %install rm -rf $RPM_BUILD_ROOT mkdir -p $RPM_BUILD_ROOT/lib/mkinitrd/dev cp -a lib $RPM_BUILD_ROOT/ +make -C sbin DESTDIR=$RPM_BUILD_ROOT install chmod -R 755 $RPM_BUILD_ROOT/lib/mkinitrd -#chown -R root:root $RPM_BUILD_ROOT/lib/mkinitrd -install -D -m 755 run-init $RPM_BUILD_ROOT/lib/mkinitrd/bin/run-init -install -D -m 755 mkinitrd $RPM_BUILD_ROOT/sbin/mkinitrd -sed -i "s/@BUILD_DAY@/`env LC_ALL=C date -ud yesterday '+%Y%m%d'`/" $RPM_BUILD_ROOT/sbin/mkinitrd -#diff -u %{S:0} $RPM_BUILD_ROOT/sbin/mkinitrd || : -install -D -m 755 installkernel $RPM_BUILD_ROOT/sbin/installkernel -install -D -m 755 module_upgrade $RPM_BUILD_ROOT/sbin/module_upgrade install -D -m 755 hotplug.sh $RPM_BUILD_ROOT/usr/share/mkinitrd/hotplug.sh -install -D -m 755 ipconfig.sh $RPM_BUILD_ROOT/lib/mkinitrd/bin/ipconfig.sh +install -D -m 644 man/mkinitrd.8 $RPM_BUILD_ROOT/%{_mandir}/man8/mkinitrd.8 ln -s mkinitrd $RPM_BUILD_ROOT/sbin/mk_initrd -install -D -m 644 mkinitrd.8 $RPM_BUILD_ROOT/%{_mandir}/man8/mkinitrd.8 %files %defattr(-,root,root) @@ -82,16 +76,23 @@ /lib/mkinitrd/linuxrc /lib/mkinitrd/boot/* /lib/mkinitrd/setup/* -/lib/mkinitrd/bin/run-init -%config /lib/mkinitrd/bin/ipconfig.sh -%config /sbin/mkinitrd +/lib/mkinitrd/bin/* +/sbin/mkinitrd /sbin/mk_initrd /sbin/module_upgrade /sbin/installkernel -%config /usr/share/mkinitrd/hotplug.sh +/usr/share/mkinitrd/hotplug.sh %doc %{_mandir}/man8/mkinitrd.8.gz %changelog +* Wed May 30 2007 - hare(a)suse.de +- Simplify shared library detection +- Revamp module setup +- Fixup error paths +- Fix cciss detection +- Fix typo in lvm2 setup +- Fix module detection +- Build rpm from git repository * Tue May 29 2007 - agraf(a)suse.de - Include optional busybox support (activate with -f busybox) (#276555) ++++++ mkinitrd.tgz ++++++ ++++ 6269 lines of diff (skipped) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit lirc
by root＠Hilbert.suse.de 31 May '07

31 May '07

Hello community, here is the log from the commit of package lirc checked in at Thu May 31 21:05:22 CEST 2007. -------- --- lirc/lirc.changes 2007-04-23 15:12:00.000000000 +0200 +++ /mounts/work_src_done/STABLE/lirc/lirc.changes 2007-05-31 13:35:58.838823000 +0200 @@ -1,0 +2,12 @@ +Thu May 31 13:32:48 CEST 2007 - lnussel(a)suse.de + +- don't install useless contrib stuff +- add proper ldconfig and insserv calls +- make initscript to automatically install + linux-input-layer-lircd.conf if lircd.conf doesn't exist and + /dev/input/ir is used as device +- add /etc/lircd.conf as %ghost +- don't package /var/run/lirc/lircd +- don't package all remotes to save space + +------------------------------------------------------------------- Old: ---- lirc-0.8.0-k2.6.18.diff remotes.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ lirc-kernel.spec ++++++ --- /var/tmp/diff_new_pack.b28441/_old 2007-05-31 21:04:05.000000000 +0200 +++ /var/tmp/diff_new_pack.b28441/_new 2007-05-31 21:04:05.000000000 +0200 @@ -17,7 +17,7 @@ Group: System/Kernel Summary: LIRC kernel modules Version: 0.8.1 -Release: 7 +Release: 8 Source0: lirc-0.8.1.tar.bz2 Source1: Makefile.module Source2: Makefile.modsub ++++++ lirc.spec ++++++ --- /var/tmp/diff_new_pack.b28441/_old 2007-05-31 21:04:05.000000000 +0200 +++ /var/tmp/diff_new_pack.b28441/_new 2007-05-31 21:04:05.000000000 +0200 @@ -12,16 +12,18 @@ Name: lirc BuildRequires: alsa-devel xorg-x11-devel +%if %suse_version > 1020 +BuildRequires: fdupes +%endif URL: http://www.lirc.org/ License: GNU General Public License (GPL) Group: Hardware/Other Autoreqprov: on Version: 0.8.1 -Release: 16 +Release: 28 PreReq: %fillup_prereq Summary: Tools for Infrared Receivers Source0: lirc-0.8.1.tar.bz2 -Source1: remotes.tar.bz2 Source4: rc.lirc Source5: sysconfig.lirc Source6: fix-remote-keys.pl @@ -30,10 +32,10 @@ Source9: 51-lirc.rules #Patch0: lirc-hw.diff Patch1: lirc-sockets-in-var.diff -Patch2: lirc-0.8.0-k2.6.18.diff -Patch3: imon2_conf.patch +Patch2: imon2_conf.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build Requires: udev +Suggests: lirc-kmp %description LIRC is a package that supports receiving and sending IR signals with @@ -45,11 +47,10 @@ %prep -%setup -q -a 1 -q +%setup -q #%patch0 -p1 -b .hw %patch1 -p1 -b .var -#%patch2 -%patch3 -p1 +%patch2 -p1 cp %{SOURCE8} . #find . -type d -name CVS -print0 | xargs -0 -- rm -rf #find . -name .cvsignore -print0 | xargs -0 -- rm -rf @@ -86,7 +87,6 @@ cp -a %{SOURCE7} %{buildroot}/usr/share/lirc/remotes install -d -m 755 %{buildroot}/dev mkdir -p %{buildroot}/var/run/lirc -mkfifo %{buildroot}/var/run/lirc/lircd mkfifo %{buildroot}/var/run/lirc/lircm chmod 600 %{buildroot}/var/run/lirc/* # lircd init scripts @@ -106,6 +106,19 @@ install -d -m 755 %{buildroot}/sbin install -m 644 %{SOURCE9} %{buildroot}/etc/udev/rules.d find %{buildroot}/usr/share/lirc -perm +111 -type f -print0 | xargs -r -0 chmod a-x +# +# get rid of libtool file +rm -f %{buildroot}%{_libdir}/liblirc_client.la +# +# get rid of useless contrib stuff +rm contrib/lirc.* +%if %suse_version > 1020 + +%fdupes $RPM_BUILD_ROOT +%endif +# +# ghost file +install -D -m 644 /dev/null %{buildroot}/etc/lircd.conf %files %defattr (-,root,root) @@ -117,7 +130,6 @@ %{_libdir}/liblirc_client.* #%attr (600,root,root) %dev(c,61,0) /dev/lirc # => udev %dir /var/run/lirc -%attr(660,root,video) /var/run/lirc/lircd /var/run/lirc/lircm /usr/bin/* /usr/sbin/* @@ -129,11 +141,29 @@ /etc/udev/rules.d/51-lirc.rules %doc %_mandir/man1/* %doc %_mandir/man8/* +%ghost %verify(not md5 size mtime) %config(noreplace,missingok) /etc/lircd.conf %post -%{fillup_only} +%{fillup_and_insserv lirc} +/sbin/ldconfig + +%postun +%{insserv_cleanup} +/sbin/ldconfig + +%clean +rm -rf %{buildroot} %changelog +* Thu May 31 2007 - lnussel(a)suse.de +- don't install useless contrib stuff +- add proper ldconfig and insserv calls +- make initscript to automatically install + linux-input-layer-lircd.conf if lircd.conf doesn't exist and + /dev/input/ir is used as device +- add /etc/lircd.conf as %%ghost +- don't package /var/run/lirc/lircd +- don't package all remotes to save space * Mon Apr 23 2007 - hvogel(a)suse.de - Add config for imon2 driver with missing keys and pad2key addidtion from M. Brakemeier ++++++ rc.lirc ++++++ --- lirc/rc.lirc 2006-02-08 15:32:20.000000000 +0100 +++ /mounts/work_src_done/STABLE/lirc/rc.lirc 2007-05-31 12:21:23.000000000 +0200 @@ -113,12 +113,6 @@ case "$1" in start) echo -n "Starting lircd " - if [ ! -e /etc/lircd.conf ]; then - echo -n "Error: please create /etc/lircd.conf" - rc_failed 6 - rc_status -v - rc_exit - fi modinfo evdev > /dev/null 2>&1 && modprobe evdev || : if test "$LIRC_MODULE" != ""; then modprobe "$LIRC_MODULE" @@ -130,9 +124,19 @@ rc_status -v rc_exit fi + if [ ! -e /etc/lircd.conf ]; then + if [ "$LIRCD_DEVICE" = "/dev/input/ir" -a -e "$LIRCD_DEVICE" ]; then + install -m 644 /usr/share/lirc/remotes/linux-input-layer-lircd.conf /etc/lircd.conf + else + echo -n "Error: please create /etc/lircd.conf" + rc_failed 6 + rc_status -v + rc_exit + fi + fi [ -n "$LIRCD_DEVICE" ] && echo -n "($LIRCD_DEVICE)" + install -m "$LIRCD_DEV_PERMISSIONS" /dev/null /var/run/lirc/lircd chown "$LIRCD_DEV_OWNER" /var/run/lirc/lircd - chmod "$LIRCD_DEV_PERMISSIONS" /var/run/lirc/lircd if [ ! -L /dev/lircd ]; then rm -f /dev/lircd ln -s /var/run/lirc/lircd /dev/lircd ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit libxfcegui4
by root＠Hilbert.suse.de 31 May '07

31 May '07

Hello community, here is the log from the commit of package libxfcegui4 checked in at Thu May 31 21:02:11 CEST 2007. -------- --- libxfcegui4/libxfcegui4.changes 2007-04-12 23:11:01.000000000 +0200 +++ /mounts/work_src_done/STABLE/libxfcegui4/libxfcegui4.changes 2007-05-29 20:50:50.000000000 +0200 @@ -1,0 +2,8 @@ +Tue May 29 20:51:01 CEST 2007 - bwalle(a)suse.de + +- disabled KDE proxy since it breaks applications that want to + hide their application icon (and I only know one non-KDE, + Java application that actually needs it -- and that application + needs to be fixed anyway) + +------------------------------------------------------------------- @@ -25,5 +32,0 @@ -Thu Jan 18 17:35:43 CET 2007 - pnemec(a)suse.cz - -- remove selfprovides - -------------------------------------------------------------------- @@ -39,0 +43,5 @@ +Thu Jan 18 17:35:43 CET 2007 - pnemec(a)suse.cz + +- remove selfprovides + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libxfcegui4.spec ++++++ --- /var/tmp/diff_new_pack.G23215/_old 2007-05-31 21:01:41.000000000 +0200 +++ /var/tmp/diff_new_pack.G23215/_new 2007-05-31 21:01:41.000000000 +0200 @@ -15,7 +15,7 @@ BuildRequires: libxfce4util-devel >= 4.3 Summary: Various GTK Widgets for xfce4 Version: 4.4.1 -Release: 1 +Release: 18 License: GNU Library General Public License v. 2.0 and 2.1 (LGPL) URL: http://www.xfce.org/ Source0: %{name}-%{version}.tar.bz2 @@ -58,7 +58,7 @@ %build autoconf -export CFLAGS="$RPM_OPT_FLAGS -DENABLE_KDE_SYSTRAY_PROXY -fno-strict-aliasing" +export CFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing" %configure \ --enable-xinerama \ --enable-startup-notification \ @@ -97,6 +97,11 @@ %{_datadir}/gtk-doc/html/libxfcegui4 %changelog +* Tue May 29 2007 - bwalle(a)suse.de +- disabled KDE proxy since it breaks applications that want to + hide their application icon (and I only know one non-KDE, + Java application that actually needs it -- and that application + needs to be fixed anyway) * Tue Apr 10 2007 - bwalle(a)suse.de - update to 4.4.1 o Change 2 GPL headers to LGPL. ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit libwnck
by root＠Hilbert.suse.de 31 May '07

31 May '07

Hello community, here is the log from the commit of package libwnck checked in at Thu May 31 21:01:34 CEST 2007. -------- --- GNOME/libwnck/libwnck.changes 2007-03-23 23:57:21.000000000 +0100 +++ /mounts/work_src_done/STABLE/libwnck/libwnck.changes 2007-05-29 15:12:41.649948000 +0200 @@ -1,0 +2,6 @@ +Tue May 29 15:12:16 CEST 2007 - danw(a)suse.de + +- Add libwnck-216129-tasklist-crash.patch from upstream to fix a + panel crash. #216129 + +------------------------------------------------------------------- New: ---- libwnck-216129-tasklist-crash.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libwnck.spec ++++++ --- /var/tmp/diff_new_pack.v21410/_old 2007-05-31 21:01:30.000000000 +0200 +++ /var/tmp/diff_new_pack.v21410/_new 2007-05-31 21:01:30.000000000 +0200 @@ -16,7 +16,7 @@ Group: Development/Libraries/GNOME Autoreqprov: on Version: 2.18.0 -Release: 1 +Release: 21 Summary: Window Navigator Construction Kit (Library Package) Source: %{name}-%{version}.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -25,6 +25,7 @@ Patch9: libwnck-opacity-2.patch Patch10: libwnck-viewport-2.patch Patch11: libwnck-border_width-fix-2.patch +Patch12: libwnck-216129-tasklist-crash.patch %description The Window Navigator Construction Kit is a library that can be used to @@ -73,6 +74,7 @@ %patch9 %patch10 %patch11 +%patch12 %build autoreconf -f -i @@ -112,6 +114,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Tue May 29 2007 - danw(a)suse.de +- Add libwnck-216129-tasklist-crash.patch from upstream to fix a + panel crash. #216129 * Fri Mar 23 2007 - maw(a)suse.de - Update to version 2.18.0 - Minor changes: ++++++ libwnck-216129-tasklist-crash.patch ++++++ --- libwnck/tasklist.c 2007/05/19 22:00:42 1254 +++ libwnck/tasklist.c 2007/05/25 09:56:03 1258 @@ -1200,11 +1200,9 @@ val = n_cols * tasklist->priv->max_button_width; if (val >= lowest_range) { /* Overlaps old range */ + g_assert (array->len > 0); lowest_range = n_cols * grouping_limit; - if (array->len > 0) - g_array_index(array, int, array->len-1) = lowest_range; - else - g_array_insert_val (array, 0, lowest_range); + g_array_index(array, int, array->len-1) = lowest_range; } else { @@ -1228,6 +1226,7 @@ { val = 0; g_array_insert_val (array, 0, val); + g_array_insert_val (array, 0, val); } if (tasklist->priv->size_hints) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit libqt4
by root＠Hilbert.suse.de 31 May '07

31 May '07

Hello community, here is the log from the commit of package libqt4 checked in at Thu May 31 21:01:23 CEST 2007. -------- --- libqt4/libqt4.changes 2007-05-23 13:28:07.000000000 +0200 +++ /mounts/work_src_done/STABLE/libqt4/libqt4.changes 2007-05-28 23:42:42.000000000 +0200 @@ -1,0 +2,5 @@ +Mon May 28 22:09:25 CEST 2007 - dmueller(a)suse.de + +- update to 4.3.0-20070528 + +------------------------------------------------------------------- libqt4-devel-doc-data.changes: same change libqt4-sql-plugins.changes: same change Old: ---- 0174-fix-qdbus-crash.diff streaming-operators-fix.diff ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libqt4-devel-doc-data.spec ++++++ --- /var/tmp/diff_new_pack.F19793/_old 2007-05-31 21:00:51.000000000 +0200 +++ /var/tmp/diff_new_pack.F19793/_new 2007-05-31 21:00:51.000000000 +0200 @@ -26,7 +26,7 @@ # COMMON-BEGIN # COMMON-BEGIN Version: 4.2.91 -Release: 21 +Release: 26 %define x11_free -x11-opensource-src- %define rversion 4.3.0-20070507 Source: qt%x11_free%rversion.tar.bz2 @@ -44,9 +44,7 @@ Patch21: 0142-uic3-wordWrapAttribute.diff Patch24: qt4-pedantic-headers.diff Patch25: qtextedit-capitalization.diff -Patch26: streaming-operators-fix.diff Patch27: 0167-fix-group-reading.diff -Patch28: 0174-fix-qdbus-crash.diff BuildRoot: %{_tmppath}/%{name}-%{version}-build %define common_options -fast -no-separate-debug-info -shared -xkb -tablet -xrender -xrandr -xinerama -xshape -sm -no-nas-sound -no-rpath -system-libjpeg -system-libpng -accessibility -cups -stl -nis -system-zlib -qt-gif -prefix /usr -L %_libdir -libdir %_libdir -docdir %_docdir/libqt4 -examplesdir %_docdir/libqt4/examples -demosdir %_libdir/qt4/demos -plugindir %plugindir -translationdir /usr/share/qt4/translations -iconv -sysconfdir /etc/settings -datadir /usr/share/qt4/ -no-pch -reduce-relocations -no-exceptions -system-libtiff @@ -76,9 +74,7 @@ %patch21 %patch24 %patch25 -%patch26 %patch27 -%patch28 # be sure not to use them rm -rf src/3rdparty/{libjpeg,freetype,libpng,zlib,libtiff} # COMMON-END @@ -116,6 +112,8 @@ /usr/share/doc/packages/libqt4/examples %changelog +* Mon May 28 2007 - dmueller(a)suse.de +- update to 4.3.0-20070528 * Wed May 23 2007 - stbinner(a)suse.de - add %%post/postun dbus-1 ldconfig call - use %%fdupes ++++++ libqt4.spec ++++++ --- /var/tmp/diff_new_pack.F19793/_old 2007-05-31 21:00:51.000000000 +0200 +++ /var/tmp/diff_new_pack.F19793/_new 2007-05-31 21:00:51.000000000 +0200 @@ -31,7 +31,7 @@ Provides: qt # COMMON-BEGIN Version: 4.2.91 -Release: 21 +Release: 26 %define x11_free -x11-opensource-src- %define rversion 4.3.0-20070507 Source: qt%x11_free%rversion.tar.bz2 @@ -49,9 +49,7 @@ Patch21: 0142-uic3-wordWrapAttribute.diff Patch24: qt4-pedantic-headers.diff Patch25: qtextedit-capitalization.diff -Patch26: streaming-operators-fix.diff Patch27: 0167-fix-group-reading.diff -Patch28: 0174-fix-qdbus-crash.diff BuildRoot: %{_tmppath}/%{name}-%{version}-build %define common_options -fast -no-separate-debug-info -shared -xkb -tablet -xrender -xrandr -xinerama -xshape -sm -no-nas-sound -no-rpath -system-libjpeg -system-libpng -accessibility -cups -stl -nis -system-zlib -qt-gif -prefix /usr -L %_libdir -libdir %_libdir -docdir %_docdir/libqt4 -examplesdir %_docdir/libqt4/examples -demosdir %_libdir/qt4/demos -plugindir %plugindir -translationdir /usr/share/qt4/translations -iconv -sysconfdir /etc/settings -datadir /usr/share/qt4/ -no-pch -reduce-relocations -no-exceptions -system-libtiff @@ -82,9 +80,7 @@ %patch21 %patch24 %patch25 -%patch26 %patch27 -%patch28 # be sure not to use them rm -rf src/3rdparty/{libjpeg,freetype,libpng,zlib,libtiff} # COMMON-END @@ -401,6 +397,8 @@ %_libdir/libQtSql*.so.* %changelog +* Mon May 28 2007 - dmueller(a)suse.de +- update to 4.3.0-20070528 * Wed May 23 2007 - stbinner(a)suse.de - add %%post/postun dbus-1 ldconfig call - use %%fdupes ++++++ libqt4-sql-plugins.spec ++++++ --- /var/tmp/diff_new_pack.F19793/_old 2007-05-31 21:00:51.000000000 +0200 +++ /var/tmp/diff_new_pack.F19793/_new 2007-05-31 21:00:51.000000000 +0200 @@ -26,7 +26,7 @@ # COMMON-BEGIN # COMMON-BEGIN Version: 4.2.91 -Release: 9 +Release: 10 %define x11_free -x11-opensource-src- %define rversion 4.3.0-20070507 Source: qt%x11_free%rversion.tar.bz2 @@ -44,9 +44,7 @@ Patch21: 0142-uic3-wordWrapAttribute.diff Patch24: qt4-pedantic-headers.diff Patch25: qtextedit-capitalization.diff -Patch26: streaming-operators-fix.diff Patch27: 0167-fix-group-reading.diff -Patch28: 0174-fix-qdbus-crash.diff BuildRoot: %{_tmppath}/%{name}-%{version}-build %define common_options -fast -no-separate-debug-info -shared -xkb -tablet -xrender -xrandr -xinerama -xshape -sm -no-nas-sound -no-rpath -system-libjpeg -system-libpng -accessibility -cups -stl -nis -system-zlib -qt-gif -prefix /usr -L %_libdir -libdir %_libdir -docdir %_docdir/libqt4 -examplesdir %_docdir/libqt4/examples -demosdir %_libdir/qt4/demos -plugindir %plugindir -translationdir /usr/share/qt4/translations -iconv -sysconfdir /etc/settings -datadir /usr/share/qt4/ -no-pch -reduce-relocations -no-exceptions -system-libtiff @@ -75,9 +73,7 @@ %patch21 %patch24 %patch25 -%patch26 %patch27 -%patch28 # be sure not to use them rm -rf src/3rdparty/{libjpeg,freetype,libpng,zlib,libtiff} # COMMON-END @@ -215,6 +211,8 @@ %plugindir/sqldrivers/libqsqlmysql*.so %changelog +* Mon May 28 2007 - dmueller(a)suse.de +- update to 4.3.0-20070528 * Wed May 23 2007 - stbinner(a)suse.de - add %%post/postun dbus-1 ldconfig call - use %%fdupes ++++++ plastik-default.diff ++++++ --- /var/tmp/diff_new_pack.F19793/_old 2007-05-31 21:00:51.000000000 +0200 +++ /var/tmp/diff_new_pack.F19793/_new 2007-05-31 21:00:51.000000000 +0200 @@ -1,11 +1,20 @@ ---- src/gui/kernel/qapplication.cpp -+++ src/gui/kernel/qapplication.cpp -@@ -1143,7 +1143,7 @@ QStyle *QApplication::style() - #elif defined(Q_WS_X11) && defined(Q_OS_MAC) - style = QLatin1String("Plastique"); // default style for X11 on Darwin - #elif defined(Q_WS_X11) -- style = QLatin1String("Motif"); // default style for X11 -+ style = QLatin1String("Plastique"); // default style for X11 - #elif defined(Q_WS_MAC) - style = QLatin1String("Macintosh"); // default style for all Mac's - #elif defined(Q_WS_QWS) +--- src/gui/kernel/qapplication_x11.cpp ++++ src/gui/kernel/qapplication_x11.cpp +@@ -2027,6 +2027,7 @@ void QApplicationPrivate::x11_initialize_style() + return; + + switch(X11->desktopEnvironment) { ++ default: + case DE_KDE: + if (X11->use_xrender) + QApplicationPrivate::app_style = QStyleFactory::create(QLatin1String("plastique")); +@@ -2042,9 +2043,6 @@ void QApplicationPrivate::x11_initialize_style() + case DE_CDE: + QApplicationPrivate::app_style = QStyleFactory::create(QLatin1String("cde")); + break; +- default: +- // Don't do anything +- break; + } + } + ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit java-1_4_2-gcj-compat
by root＠Hilbert.suse.de 31 May '07

31 May '07

Hello community, here is the log from the commit of package java-1_4_2-gcj-compat checked in at Thu May 31 20:57:05 CEST 2007. -------- --- java-1_4_2-gcj-compat/java-1_4_2-gcj-compat.changes 2007-04-30 00:54:44.000000000 +0200 +++ /mounts/work_src_done/STABLE/java-1_4_2-gcj-compat/java-1_4_2-gcj-compat.changes 2007-05-30 11:40:58.000000000 +0200 @@ -1,0 +2,6 @@ +Wed May 30 11:40:25 CEST 2007 - dbornkessel(a)suse.de + +- deleted versionless j2sdk provide +- requirement for classpath-devel in devel package + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ java-1_4_2-gcj-compat.spec ++++++ --- /var/tmp/diff_new_pack.dZ6935/_old 2007-05-31 20:55:45.000000000 +0200 +++ /var/tmp/diff_new_pack.dZ6935/_new 2007-05-31 20:55:45.000000000 +0200 @@ -27,14 +27,14 @@ %define _jvmjardir %{_libdir}/jvm-exports %endif Version: 1.4.2.0 -Release: 96 +Release: 113 %define section free %define gccsuffix %{nil} %define origin gcj%{gccsuffix} %define priority 1419 %define javaver 1.4.2 %define buildver 0 -%define gccver 3.4 +%define gccver 4.1 %define jgcver 1.0.61 %define cname java-%{javaver}-%{origin} %define sdklnk java-%{javaver}-%{origin} @@ -61,9 +61,8 @@ #Requires: gcc%{gccsuffix}-java >= %{gccver} #PreReq: libgcj%{gccsuffix} >= %{gccver} #Requires: libgcj%{gccsuffix} >= %{gccver} -PreReq: libgcj >= %{gccver} -Requires: libgcj >= %{gccver} -Requires: gcc-gij +PreReq: gcc-gij +Requires: libgcj %if %{?!suse_version:1}0 %if %{?!mandriva_release:1}0 PreReq: chkconfig which @@ -133,8 +132,9 @@ Requires: gjdoc Requires: ecj-bootstrap Requires: fastjar +Requires: classpath-devel # See java-1_4_2-sun.spec: -Provides: j2sdk = %{javaver}, j2sdk +Provides: j2sdk = %{javaver} # Be able to check bytecode version Requires: unzip @@ -340,6 +340,9 @@ #%ghost %{_jvmdir}/%{cname}-%{version}/include/jni.h %changelog +* Wed May 30 2007 - dbornkessel(a)suse.de +- deleted versionless j2sdk provide +- requirement for classpath-devel in devel package * Mon Apr 30 2007 - ro(a)suse.de - added unzip to buildreq * Sun Apr 29 2007 - ro(a)suse.de ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit jadetex
by root＠Hilbert.suse.de 31 May '07

31 May '07

Hello community, here is the log from the commit of package jadetex checked in at Thu May 31 20:55:38 CEST 2007. -------- --- jadetex/jadetex.changes 2007-04-21 00:30:14.000000000 +0200 +++ /mounts/work_src_done/STABLE/jadetex/jadetex.changes 2007-05-30 19:00:59.000000000 +0200 @@ -1,0 +2,5 @@ +Wed May 30 19:00:37 CEST 2007 - sbrabec(a)suse.cz + +- Fixed to work with texlive. + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ jadetex.spec ++++++ --- /var/tmp/diff_new_pack.qm6219/_old 2007-05-31 20:55:21.000000000 +0200 +++ /var/tmp/diff_new_pack.qm6219/_new 2007-05-31 20:55:21.000000000 +0200 @@ -19,7 +19,7 @@ Autoreqprov: on Summary: TeX Processor for OpenJade Version: 3.13 -Release: 273 +Release: 288 Source0: http://prdownloads.sourceforge.net/jadetex/jadetex-%{version}.tar.gz # http://www.tug.org/applications/jadetex/jadetex-%{version}.zip # Source0: http://www.tug.org/applications/jadetex/jadetex.zip @@ -108,50 +108,37 @@ %else CPU=${RPM_ARCH} %endif -BINARY=$CPU-$OS -bindir=$RPM_BUILD_ROOT%{_bindir} -man1dir=$RPM_BUILD_ROOT%{_mandir}/man1 -tetex=$RPM_BUILD_ROOT/usr/lib/teTeX -test -d $tetex/texmf && texmf=$tetex/texmf -tex_bin_dir=$tetex/bin/i386-linux -tex_man1_dir=$tetex/man/man1 -texmf_web2c=$texmf/web2c -if test -d /usr/share/texmf ; then - texmf=$RPM_BUILD_ROOT/usr/share/texmf - tex_bin_dir=$texmf/bin/$BINARY - tex_man1_dir=$texmf/doc/man/man1 - texmf_web2c=$RPM_BUILD_ROOT/var/lib/texmf/web2c -fi -texmf_latex=$texmf/tex/latex -texmf_jadetex=$texmf_latex/jadetex -%{INSTALL_DIR} $bindir $man1dir $texmf_web2c $texmf_latex $texmf_jadetex -%{INSTALL_DIR} $tex_man1_dir $tex_bin_dir -%{INSTALL_DATA} *.sty $texmf_jadetex/ -%{INSTALL_DATA} jadetex.ini $texmf_jadetex/jadetex.ini -%{INSTALL_DATA} jadetex.ltx $texmf_jadetex/jadetex.ltx -%{INSTALL_DATA} dsssl.def $texmf_jadetex/dsssl.def -%{INSTALL_DATA} jadetex.fmt $texmf_web2c/jadetex.fmt -%{INSTALL_DATA} pdfjadetex.ini $texmf_jadetex/pdfjadetex.ini -%{INSTALL_DATA} pdfjadetex.fmt $texmf_web2c/pdfjadetex.fmt -pushd $tex_bin_dir -ln -s etex jadetex -ln -s pdfetex pdfjadetex -popd -%{INSTALL_DATA} jadetex.1 $tex_man1_dir/jadetex.1 -%{INSTALL_DATA} pdfjadetex.1 $tex_man1_dir/pdfjadetex.1 -gzip -f9 $tex_man1_dir/* +texmf_libexec=/usr/lib/texmf +texmf_data=/usr/share/texmf +tex_bin_dir=$texmf_libexec/bin/$CPU-$OS +tex_man1_dir=$texmf_data/doc/man/man1 +texmf_web2c=/var/lib/texmf/web2c +texmf_data_latex=$texmf_data/tex/latex +texmf_data_jadetex=$texmf_data_latex/jadetex +%{INSTALL_DIR} $RPM_BUILD_ROOT$texmf_web2c $RPM_BUILD_ROOT$texmf_data_latex $RPM_BUILD_ROOT$texmf_data_jadetex $RPM_BUILD_ROOT$tex_man1_dir $RPM_BUILD_ROOT%{_bindir} $RPM_BUILD_ROOT%{_mandir}/man1 +%{INSTALL_DIR} $RPM_BUILD_ROOT$tex_man1_dir $RPM_BUILD_ROOT$tex_bin_dir +%{INSTALL_DATA} *.sty $RPM_BUILD_ROOT$texmf_data_jadetex/ +%{INSTALL_DATA} jadetex.ini $RPM_BUILD_ROOT$texmf_data_jadetex/jadetex.ini +%{INSTALL_DATA} jadetex.ltx $RPM_BUILD_ROOT$texmf_data_jadetex/jadetex.ltx +%{INSTALL_DATA} dsssl.def $RPM_BUILD_ROOT$texmf_data_jadetex/dsssl.def +%{INSTALL_DATA} jadetex.fmt $RPM_BUILD_ROOT$texmf_web2c/jadetex.fmt +%{INSTALL_DATA} pdfjadetex.ini $RPM_BUILD_ROOT$texmf_data_jadetex/pdfjadetex.ini +%{INSTALL_DATA} pdfjadetex.fmt $RPM_BUILD_ROOT$texmf_web2c/pdfjadetex.fmt +ln -s etex $RPM_BUILD_ROOT$tex_bin_dir/jadetex +ln -s pdfetex $RPM_BUILD_ROOT$tex_bin_dir/pdfjadetex +%{INSTALL_DATA} jadetex.1 $RPM_BUILD_ROOT$tex_man1_dir/jadetex.1 +%{INSTALL_DATA} pdfjadetex.1 $RPM_BUILD_ROOT$tex_man1_dir/pdfjadetex.1 +gzip -f9 $RPM_BUILD_ROOT$tex_man1_dir/* rm -f filelist.new if test -d /usr/share/texmf ; then - # pushd $man1dir - ln -sf /usr/share/texmf/doc/man/man1/jadetex.1.gz $man1dir/jadetex.1.gz - ln -sf /usr/share/texmf/doc/man/man1/pdfjadetex.1.gz $man1dir/pdfjadetex.1.gz - # popd + ln -sf $tex_man1_dir/jadetex.1.gz $RPM_BUILD_ROOT%{_mandir}/man1/jadetex.1.gz + ln -sf $tex_man1_dir/pdfjadetex.1.gz $RPM_BUILD_ROOT%{_mandir}/man1/pdfjadetex.1.gz { echo %{_mandir}/man1/jadetex.1.gz echo %{_mandir}/man1/pdfjadetex.1.gz } >> filelist.new - ln -sf /usr/share/texmf/bin/$BINARY/jadetex $bindir/jadetex - ln -sf /usr/share/texmf/bin/$BINARY/pdfjadetex $bindir/pdfjadetex + ln -sf $tex_bin_dir/jadetex $RPM_BUILD_ROOT%{_bindir}/jadetex + ln -sf $tex_bin_dir/pdfjadetex $RPM_BUILD_ROOT%{_bindir}/pdfjadetex { echo /usr/bin/jadetex echo /usr/bin/pdfjadetex @@ -164,11 +151,11 @@ echo $texmf_web2c/jadetex.fmt echo $tex_bin_dir/pdfjadetex echo $texmf_web2c/pdfjadetex.fmt - for f in $texmf_jadetex/*.ini $texmf_jadetex/*.ltx $texmf_jadetex/*.sty ; do + for f in $RPM_BUILD_ROOT$texmf_data_jadetex/*.ini $RPM_BUILD_ROOT$texmf_data_jadetex/*.ltx $RPM_BUILD_ROOT$texmf_data_jadetex/*.sty ; do echo "$f" done - echo %dir $texmf_jadetex - echo "%config $texmf/tex/latex/jadetex/dsssl.def" + echo %dir $RPM_BUILD_ROOT$texmf_data_jadetex + echo "%config $RPM_BUILD_ROOT$texmf_data/tex/latex/jadetex/dsssl.def" } >> filelist.new if [ -n "$RPM_BUILD_ROOT" ] ; then echo "s:$RPM_BUILD_ROOT::" > filelist.sed @@ -192,6 +179,8 @@ %doc manual.ps.gz %changelog +* Wed May 30 2007 - sbrabec(a)suse.cz +- Fixed to work with texlive. * Sat Apr 21 2007 - ro(a)suse.de - build with and require texlive * Wed Jan 25 2006 - mls(a)suse.de ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit ispell
by root＠Hilbert.suse.de 31 May '07

31 May '07

Hello community, here is the log from the commit of package ispell checked in at Thu May 31 20:55:15 CEST 2007. -------- --- ispell/ispell.changes 2007-03-29 17:52:25.000000000 +0200 +++ /mounts/work_src_done/STABLE/ispell/ispell.changes 2007-05-31 16:02:56.807491000 +0200 @@ -1,0 +2,5 @@ +Thu May 31 16:02:11 CEST 2007 - werner(a)suse.de + +- Fix sq/unsq, hint from Thomas Rachel + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ ispell.spec ++++++ --- /var/tmp/diff_new_pack.Mn4539/_old 2007-05-31 20:54:41.000000000 +0200 +++ /var/tmp/diff_new_pack.Mn4539/_new 2007-05-31 20:54:41.000000000 +0200 @@ -20,7 +20,7 @@ Requires: words ispell_english_dictionary ispell_dictionary Autoreqprov: on Version: 3.2.06 -Release: 508 +Release: 519 BuildRoot: %{_tmppath}/%{name}-%{version}-build Summary: A Spell Checker Source: ispell-3.2.06.tar.bz2 @@ -206,6 +206,8 @@ /usr/lib/ispell/british.aff %changelog +* Thu May 31 2007 - werner(a)suse.de +- Fix sq/unsq, hint from Thomas Rachel * Thu Mar 29 2007 - rguenther(a)suse.de - Add bison and ncurses-devel BuildRequires. * Mon May 22 2006 - schwab(a)suse.de ++++++ ispell-3.2.06-sq.patch ++++++ --- /var/tmp/diff_new_pack.Mn4539/_old 2007-05-31 20:54:41.000000000 +0200 +++ /var/tmp/diff_new_pack.Mn4539/_new 2007-05-31 20:54:41.000000000 +0200 @@ -1,6 +1,6 @@ --- Makefile -+++ Makefile Thu Dec 13 14:44:12 2001 -@@ -213,7 +213,7 @@ ++++ Makefile 2001-12-13 14:44:12.000000000 +0100 +@@ -213,7 +213,7 @@ all: all-languages programs: buildhash findaffix tryaffix ispell programs: icombine ijoin munchlist @@ -9,7 +9,7 @@ deformatter-programs: cd deformatters; $(MAKE) all -@@ -267,7 +267,9 @@ +@@ -267,7 +267,9 @@ install-basic: @. ./config.sh; \ set -x; \ $$INSTALL ispell.1 $$MAN1DIR/ispell$$MAN1EXT; \ @@ -20,7 +20,7 @@ @. ./config.sh; \ set -x; \ cd $$MAN1DIR; \ -@@ -288,7 +290,7 @@ +@@ -288,7 +290,7 @@ install-dictbuild: rm -f $$LIBDIR/icombine @. ./config.sh; \ set -x; \ @@ -29,7 +29,7 @@ $$BINDIR @. ./config.sh; \ set -x; \ -@@ -299,9 +301,7 @@ +@@ -299,9 +301,7 @@ install-dictbuild: @. ./config.sh; \ set -x; \ [ -d $$MAN1DIR ] || (mkdir $$MAN1DIR; chmod 755 $$MAN1DIR); \ @@ -41,7 +41,7 @@ set -x; \ for m in buildhash munchlist findaffix tryaffix; do \ --- sq.1 -+++ sq.1 Thu Dec 13 14:44:12 2001 ++++ sq.1 2001-12-13 14:44:12.000000000 +0100 @@ -0,0 +1,82 @@ +.\" +.\" $Id: sq.1,v 1.6 1994/01/25 07:12:07 geoff Exp $ @@ -126,10 +126,10 @@ +.SH SEE ALSO +gzip(1), sort(1). --- sq.c -+++ sq.c Thu Dec 13 14:57:20 2001 ++++ sq.c 2007-05-31 15:53:21.574485913 +0200 @@ -0,0 +1,117 @@ +#ifndef lint -+static char Rcs_Id[] = ++static char Rcs_Id[] __attribute__ ((unused)) = + "$Id: sq.c,v 1.12 1994/01/25 07:12:09 geoff Exp $"; +#endif + @@ -188,7 +188,7 @@ +#endif /* __STDC__ */ + +int main P ((int argc, char * argv[])); -+static void trunc P ((char * word, char * prev)); ++static void sqtrunc P ((const char * word, char * prev)); + +/* + * The following table encodes prefix sizes as a single character. A @@ -205,7 +205,7 @@ + 'y', 'z' /* 60-61 */ + }; + -+#define MAX_PREFIX (sizeof (size_encodings) - 1) ++#define MAX_PREFIX ((sizeof(size_encodings)/sizeof(char)) - 1) +#define UNSEQBUFSIZE 257 + +int main (argc, argv) @@ -221,35 +221,35 @@ + *nl = '\0'; + else + word[UNSEQBUFSIZE - 1] = '\0'; -+ trunc (word, prev); ++ sqtrunc (word, prev); + } + return 0; + } + -+static void trunc (word, prev) -+ char * word; ++static void sqtrunc (word, prev) ++ const char * word; + char * prev; + { -+ register char * wordp; -+ register char * prevp; -+ register int same_count; ++ const register char * wordp; ++ const register char * prevp; ++ register int same_count; + + wordp = word; + prevp = prev; + for (same_count = 0; *wordp == *prevp++; ++wordp, ++same_count) -+ __asm__ __volatile__("": : :"memory"); ++ ; + if (same_count>MAX_PREFIX) + same_count = MAX_PREFIX; + (void) putchar (size_encodings[same_count]); -+ (void) puts (wordp); ++ (void) puts (&word[same_count]); + (void) strcpy (prev, word); + } + --- unsq.c -+++ unsq.c Thu Dec 13 14:44:12 2001 -@@ -0,0 +1,135 @@ ++++ unsq.c 2007-05-31 15:57:31.060946909 +0200 +@@ -0,0 +1,134 @@ +#ifndef lint -+static char Rcs_Id[] = ++static char Rcs_Id[] __attribute__ ((unused)) = + "$Id: unsq.c,v 1.14 1994/01/25 07:12:19 geoff Exp $"; +#endif + @@ -298,6 +298,7 @@ + * + */ + ++#include <stdlib.h> +#include <stdio.h> +#include <string.h> +#include "msgs.h" @@ -309,7 +310,7 @@ +#endif /* __STDC__ */ + +int main P ((int argc, char * argv[])); -+static int expand P ((char * word, char * prev)); ++static int sqexpand P ((char * word, char * prev)); + +/* + * The following table encodes prefix sizes as a single character. A @@ -326,11 +327,9 @@ + 'y', 'z' /* 60-61 */ + }; + -+#define MAX_PREFIX (sizeof (size_encodings) - 1) ++#define MAX_PREFIX ((sizeof(size_encodings)/sizeof(char)) - 1) +#define UNSEQBUFSIZE 257 + -+extern void exit P ((int status)); -+ +int main (argc, argv) + int argc; + char * argv[]; @@ -338,12 +337,12 @@ + char word[UNSEQBUFSIZE]; + static char prev[UNSEQBUFSIZE] = ""; + -+ while (!expand (word, prev)) ++ while (!sqexpand (word, prev)) + puts (word); + return 0; + } + -+static int expand (word, prev) ++static int sqexpand (word, prev) + char * word; + char * prev; + { @@ -352,16 +351,16 @@ + register char * nl; + register int same_count; + register int count_char; -+ register int size; ++ register off_t size; + + count_char = getchar (); + if (count_char == EOF) + return(1); + for (same_count = 0; -+ same_count < MAX_PREFIX && size_encodings[same_count] != count_char; ++ same_count <= MAX_PREFIX && size_encodings[same_count] != count_char; + same_count++) + ; -+ if (same_count == MAX_PREFIX) ++ if (same_count > MAX_PREFIX) + { + (void) fprintf (stderr, UNSQ_C_BAD_COUNT, (unsigned int) count_char); + exit (1); ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit gpa
by root＠Hilbert.suse.de 31 May '07

31 May '07

Hello community, here is the log from the commit of package gpa checked in at Thu May 31 20:53:34 CEST 2007. -------- --- gpa/gpa.changes 2007-05-14 14:05:29.000000000 +0200 +++ /mounts/work_src_done/STABLE/gpa/gpa.changes 2007-05-30 14:57:42.000000000 +0200 @@ -1,0 +2,8 @@ +Wed May 30 14:54:12 CEST 2007 - ltinkl(a)suse.cz + +- update to bugfix release 0.7.6 +- add gnupg to BuildRequires to fix compilation +- fix .desktop file English Name spelling +- fix rpmlint warning about %check section + +------------------------------------------------------------------- Old: ---- gpa-0.7.5.tar.bz2 New: ---- gpa-0.7.6.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ gpa.spec ++++++ --- /var/tmp/diff_new_pack.ACu986/_old 2007-05-31 20:53:11.000000000 +0200 +++ /var/tmp/diff_new_pack.ACu986/_new 2007-05-31 20:53:11.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package gpa (Version 0.7.5) +# spec file for package gpa (Version 0.7.6) # # Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine @@ -11,9 +11,9 @@ # norootforbuild Name: gpa -BuildRequires: gpgme-devel gtk-devel gtk2-devel update-desktop-files -Version: 0.7.5 -Release: 16 +BuildRequires: gnupg gpgme-devel gtk-devel gtk2-devel update-desktop-files +Version: 0.7.6 +Release: 1 License: GNU General Public License (GPL) Group: Productivity/Security Autoreqprov: on @@ -57,6 +57,8 @@ --localstatedir=/var \ %{_target_cpu}-suse-linux make + +%check make check %install @@ -79,6 +81,11 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Wed May 30 2007 - ltinkl(a)suse.cz +- update to bugfix release 0.7.6 +- add gnupg to BuildRequires to fix compilation +- fix .desktop file English Name spelling +- fix rpmlint warning about %%check section * Mon May 14 2007 - coolo(a)suse.de - fix desktop file * Wed Mar 14 2007 - ltinkl(a)suse.cz ++++++ gpa-0.7.5.tar.bz2 -> gpa-0.7.6.tar.bz2 ++++++ ++++ 17815 lines of diff (skipped) ++++++ gpa.desktop ++++++ --- gpa/gpa.desktop 2007-05-14 13:57:02.000000000 +0200 +++ /mounts/work_src_done/STABLE/gpa/gpa.desktop 2007-05-30 14:51:46.000000000 +0200 @@ -5,4 +5,4 @@ Type=Application Icon=gpa Categories=Gtk;Utility;Security; -GenericName=GNU Privacy Assistent +GenericName=GNU Privacy Assistant ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit ghostscript-library
by root＠Hilbert.suse.de 31 May '07

31 May '07

Hello community, here is the log from the commit of package ghostscript-library checked in at Thu May 31 20:52:57 CEST 2007. -------- --- ghostscript-library/ghostscript-library.changes 2007-05-24 01:41:23.000000000 +0200 +++ /mounts/work_src_done/STABLE/ghostscript-library/ghostscript-library.changes 2007-05-29 14:59:50.957627000 +0200 @@ -1,0 +2,8 @@ +Tue May 29 14:51:55 CEST 2007 - werner(a)suse.de + +- Remove not required devel files +- RPMlint: ignore omni .so files too because those are files are + required and loaded with dlopen by the omni library. +- RPMlint: Move some gimpprint devel files into libgimpprint-devel + +------------------------------------------------------------------- ghostscript-mini.changes: same change New: ---- rpmlintrc ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ ghostscript-library.spec ++++++ --- /var/tmp/diff_new_pack.m30693/_old 2007-05-31 20:52:35.000000000 +0200 +++ /var/tmp/diff_new_pack.m30693/_new 2007-05-31 20:52:35.000000000 +0200 @@ -45,8 +45,8 @@ Autoreqprov: on Summary: Necessary Files for Running Ghostscript Version: 8.15.3 -Release: 58 -License: GNU General Public License (GPL) +Release: 61 +License: GNU General Public License (GPL), Includes now the full implemented version of pdf_sec.ps BuildRoot: %{_tmppath}/%{name}-%{version}-build Source0: espgs-%{GSVER}.tar.bz2 Source1: jpegsrc.v%{JPEG}.tar.bz2 @@ -67,6 +67,7 @@ Source30: gs550j03.tar.bz2 Source40: fonts.scale.nimbus-sans-condensed Source50: glib-config +Source60: rpmlintrc Patch0: espgs-%{GSVER}.dif Patch1: espgs-8.15.2rc1-pdfrange.dif Patch2: espgs-8.15.2rc1-pdfsec.dif @@ -212,7 +213,7 @@ %package -n libgimpprint Version: 4.2.7 -Release: 135 +Release: 138 Summary: Gimp-Print libraries Group: Development/Libraries/C and C++ @@ -227,7 +228,7 @@ %package -n libgimpprint-devel Version: 4.2.7 -Release: 135 +Release: 138 Requires: %install_info_prereq Summary: Gimp-Print Include Files Group: Development/Libraries/C and C++ @@ -576,6 +577,10 @@ make -f unix.mak prefix=${RPM_BUILD_ROOT}/usr libdir=${RPM_BUILD_ROOT}%{_libdir} install cd ../ rm -f ${RPM_BUILD_ROOT}/usr/bin/ijs_client_example +chmod 0644 ${RPM_BUILD_ROOT}%{_libdir}/libijs.a +chmod 0644 ${RPM_BUILD_ROOT}/usr/include/ijs/ijs_server.h +chmod 0644 ${RPM_BUILD_ROOT}/usr/include/ijs/ijs_client.h +chmod 0644 ${RPM_BUILD_ROOT}/usr/include/ijs/ijs.h # # stp: # Do never add -j here! @@ -697,6 +702,11 @@ ln -sf ../../../ghostscript/8.15/doc/{CHANGES,LICENSE,README,COPYING} \ ${RPM_BUILD_ROOT}/usr/share/doc/packages/ghostscript-library/ %endif +# Remove oldish libraries and headers from ijs +rm -vf ${RPM_BUILD_ROOT}/usr/bin/ijs-config +rm -vf ${RPM_BUILD_ROOT}%{_libdir}/libijs.a +rm -vf ${RPM_BUILD_ROOT}%{_libdir}/libijs.so +rm -vrf ${RPM_BUILD_ROOT}/usr/include/ijs # ############################################################## # @@ -774,7 +784,7 @@ %config %attr(-,lp,sys) /etc/cups/pstoraster.convs /usr/bin/dumphint # /usr/bin/escputil -/usr/bin/ijs-config +# /usr/bin/ijs-config /usr/bin/ijsgimpprint /usr/bin/pcl3opts %endif # if not ghostscript-mini @@ -822,12 +832,12 @@ %if %libgs %{_libdir}/libgs.so* %endif -%{_libdir}/libijs.a -%{_libdir}/libijs.so -%dir /usr/include/ijs -/usr/include/ijs/ijs.h -/usr/include/ijs/ijs_client.h -/usr/include/ijs/ijs_server.h +# %{_libdir}/libijs.a +# %{_libdir}/libijs.so +# %dir /usr/include/ijs +# /usr/include/ijs/ijs.h +# /usr/include/ijs/ijs_client.h +# /usr/include/ijs/ijs_server.h %endif %dir /usr/share/ghostscript %dir /usr/share/ghostscript/%{GSMAIN} @@ -1105,18 +1115,26 @@ %files -n libgimpprint %defattr(-, root, root) /usr/bin/gimpprint-config -%{_libdir}/libgimpprint* +%{_libdir}/libgimpprint.so.* /usr/share/locale/*/LC_MESSAGES/gimp-print.mo %files -n libgimpprint-devel %defattr(-, root, root) /usr/share/aclocal/gimpprint.m4 /usr/include/gimp-print +%{_libdir}/libgimpprint.so +%{_libdir}/libgimpprint.la +%{_libdir}/libgimpprint.a %doc %{_mandir}/man*/gimpprint* %doc %{_infodir}/gimpprint.* %endif # if not ghostscript-mini %changelog +* Tue May 29 2007 - werner(a)suse.de +- Remove not required devel files +- RPMlint: ignore omni .so files too because those are files are + required and loaded with dlopen by the omni library. +- RPMlint: Move some gimpprint devel files into libgimpprint-devel * Thu May 24 2007 - ro(a)suse.de - added ldconfig to post scripts * Thu Mar 29 2007 - aj(a)suse.de ++++++ ghostscript-mini.spec ++++++ --- /var/tmp/diff_new_pack.m30693/_old 2007-05-31 20:52:35.000000000 +0200 +++ /var/tmp/diff_new_pack.m30693/_new 2007-05-31 20:52:35.000000000 +0200 @@ -45,8 +45,8 @@ Autoreqprov: on Summary: SuSE internal replacement for ghostscript-library and ghostscript-any (Ghostscript) Version: 8.15.3 -Release: 41 -License: GNU General Public License (GPL) +Release: 44 +License: GNU General Public License (GPL), Includes now the full implemented version of pdf_sec.ps BuildRoot: %{_tmppath}/%{name}-%{version}-build Source0: espgs-%{GSVER}.tar.bz2 Source1: jpegsrc.v%{JPEG}.tar.bz2 @@ -67,6 +67,7 @@ Source30: gs550j03.tar.bz2 Source40: fonts.scale.nimbus-sans-condensed Source50: glib-config +Source60: rpmlintrc Patch0: espgs-%{GSVER}.dif Patch1: espgs-8.15.2rc1-pdfrange.dif Patch2: espgs-8.15.2rc1-pdfsec.dif @@ -204,7 +205,7 @@ %package -n libgimpprint Version: 4.2.7 -Release: 135 +Release: 138 Summary: Gimp-Print libraries Group: Development/Libraries/C and C++ @@ -219,7 +220,7 @@ %package -n libgimpprint-devel Version: 4.2.7 -Release: 135 +Release: 138 Requires: %install_info_prereq Summary: Gimp-Print Include Files Group: Development/Libraries/C and C++ @@ -568,6 +569,10 @@ make -f unix.mak prefix=${RPM_BUILD_ROOT}/usr libdir=${RPM_BUILD_ROOT}%{_libdir} install cd ../ rm -f ${RPM_BUILD_ROOT}/usr/bin/ijs_client_example +chmod 0644 ${RPM_BUILD_ROOT}%{_libdir}/libijs.a +chmod 0644 ${RPM_BUILD_ROOT}/usr/include/ijs/ijs_server.h +chmod 0644 ${RPM_BUILD_ROOT}/usr/include/ijs/ijs_client.h +chmod 0644 ${RPM_BUILD_ROOT}/usr/include/ijs/ijs.h # # stp: # Do never add -j here! @@ -689,6 +694,11 @@ ln -sf ../../../ghostscript/8.15/doc/{CHANGES,LICENSE,README,COPYING} \ ${RPM_BUILD_ROOT}/usr/share/doc/packages/ghostscript-library/ %endif +# Remove oldish libraries and headers from ijs +rm -vf ${RPM_BUILD_ROOT}/usr/bin/ijs-config +rm -vf ${RPM_BUILD_ROOT}%{_libdir}/libijs.a +rm -vf ${RPM_BUILD_ROOT}%{_libdir}/libijs.so +rm -vrf ${RPM_BUILD_ROOT}/usr/include/ijs # ############################################################## # @@ -766,7 +776,7 @@ %config %attr(-,lp,sys) /etc/cups/pstoraster.convs /usr/bin/dumphint # /usr/bin/escputil -/usr/bin/ijs-config +# /usr/bin/ijs-config /usr/bin/ijsgimpprint /usr/bin/pcl3opts %endif # if not ghostscript-mini @@ -814,12 +824,12 @@ %if %libgs %{_libdir}/libgs.so* %endif -%{_libdir}/libijs.a -%{_libdir}/libijs.so -%dir /usr/include/ijs -/usr/include/ijs/ijs.h -/usr/include/ijs/ijs_client.h -/usr/include/ijs/ijs_server.h +# %{_libdir}/libijs.a +# %{_libdir}/libijs.so +# %dir /usr/include/ijs +# /usr/include/ijs/ijs.h +# /usr/include/ijs/ijs_client.h +# /usr/include/ijs/ijs_server.h %endif %dir /usr/share/ghostscript %dir /usr/share/ghostscript/%{GSMAIN} @@ -1097,18 +1107,26 @@ %files -n libgimpprint %defattr(-, root, root) /usr/bin/gimpprint-config -%{_libdir}/libgimpprint* +%{_libdir}/libgimpprint.so.* /usr/share/locale/*/LC_MESSAGES/gimp-print.mo %files -n libgimpprint-devel %defattr(-, root, root) /usr/share/aclocal/gimpprint.m4 /usr/include/gimp-print +%{_libdir}/libgimpprint.so +%{_libdir}/libgimpprint.la +%{_libdir}/libgimpprint.a %doc %{_mandir}/man*/gimpprint* %doc %{_infodir}/gimpprint.* %endif # if not ghostscript-mini %changelog +* Tue May 29 2007 - werner(a)suse.de +- Remove not required devel files +- RPMlint: ignore omni .so files too because those are files are + required and loaded with dlopen by the omni library. +- RPMlint: Move some gimpprint devel files into libgimpprint-devel * Tue Dec 05 2006 - werner(a)suse.de - Make sgirgb driver more robust on itanium (bug #209879) * Tue Nov 07 2006 - werner(a)suse.de ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit firmwarekit
by root＠Hilbert.suse.de 31 May '07

31 May '07

Hello community, here is the log from the commit of package firmwarekit checked in at Thu May 31 20:50:30 CEST 2007. -------- --- arch/i386/firmwarekit/firmwarekit.changes 2006-12-06 14:41:12.000000000 +0100 +++ /mounts/work_src_done/STABLE/firmwarekit/firmwarekit.changes 2007-05-30 15:26:43.339396000 +0200 @@ -1,0 +2,13 @@ +Wed May 30 15:11:14 CEST 2007 - trenn(a)suse.de + +- also build for ia64 +- use "$@" to pass args correctly from biostest.sh to biostest +- move from /usr/share to /usr/lib +- ripped out a lot patches that went mainline +- updated to release 2 +- there are still some bugs to fix, package is building and working + half way correctly (plugin specifc things to fix) now. I will + wait until next version with patches applied comes out to get out + of patch nightmare. + +------------------------------------------------------------------- Old: ---- busy_box_adjustment.patch compile_errors.patch firmwarekit-r1.102.tar.bz2 New: ---- acpi_compile_cleanup.patch chk_hpet_cleanup.patch cpufreq_cleanup.patch debug.patch ebda_cleanup.patch fan_cleanup.patch firmwarekit-2.tar.bz2 libstandalone_soname.patch maxreadreq_cleanup.patch suspend_cleanup.patch virt_cleanup.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ firmwarekit.spec ++++++ --- /var/tmp/diff_new_pack.n24763/_old 2007-05-31 20:50:14.000000000 +0200 +++ /var/tmp/diff_new_pack.n24763/_new 2007-05-31 20:50:14.000000000 +0200 @@ -1,7 +1,7 @@ # -# spec file for package firmwarekit (Version r1.102) +# spec file for package firmwarekit (Version 2) # -# Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2007 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. # @@ -14,8 +14,8 @@ BuildRequires: bash coreutils dhclient dhcp-client findutils gawk gdb glib2 glib2-devel glibc grep iproute2 libacl libattr module-init-tools ncurses newt newt-devel pciutils pcre perl pkgconfig pmtools sed sharutils slang slang-devel sysvinit termcap util-linux wget xorg-x11-util-devel URL: http://www.linuxfirmwarekit.org Summary: BIOS checker that validates ACPI and other parts for x86 and x86_64 machines -Version: r1.102 -Release: 9 +Version: 2 +Release: 1 License: GNU Library General Public License v. 2.0 and 2.1 (LGPL) Group: System/Boot Autoreqprov: on @@ -23,7 +23,7 @@ Requires: pmtools hwinfo util-linux Summary: BIOS checker that validates ACPI and other parts for x86 and x86_64 machines BuildRoot: %{_tmppath}/%{name}-%{version}-build -ExclusiveArch: %ix86 x86_64 +ExclusiveArch: %ix86 x86_64 ia64 Source0: %{name}-%{version}.tar.bz2 Patch0: adjust_paths.patch Patch1: biostest_sh.patch @@ -34,10 +34,17 @@ Patch6: use_external_pmtool_bins.patch Patch7: path_environment.patch Patch8: dmesg_adjust.patch -Patch9: compile_errors.patch -Patch10: colors.patch -Patch11: check_plugin_results.patch -Patch12: busy_box_adjustment.patch +Patch9: colors.patch +Patch10: libstandalone_soname.patch +Patch11: acpi_compile_cleanup.patch +Patch12: cpufreq_cleanup.patch +Patch13: chk_hpet_cleanup.patch +Patch14: fan_cleanup.patch +Patch15: suspend_cleanup.patch +Patch16: virt_cleanup.patch +Patch17: maxreadreq_cleanup.patch +Patch18: ebda_cleanup.patch +Patch19: debug.patch %description This tool, developed by Intel, is meant for vendors to validate and @@ -66,6 +73,15 @@ %patch10 -p1 %patch11 -p1 %patch12 -p1 +%patch13 -p1 +%patch14 -p1 +%patch15 -p1 +%patch16 -p1 +%patch17 -p1 +%patch18 -p1 +%patch19 -p1 +# This is arch specific stuff, put all in /usr/lib/firmwarekit +%define location /usr/lib/%{name} %build make -e CFLAGS="$RPM_OPT_FLAGS" @@ -75,30 +91,48 @@ install -d -m 755 %{buildroot}/var/log/%{name} install -D -m 644 initramfs/results.css %{buildroot}/var/log/%{name}/results.css install -D -m 644 initramfs/resources.css %{buildroot}/var/log/%{name}/resources.css -install -D -m 744 biostest %{buildroot}/usr/share/%{name}/biostest -install -D -m 755 shelltools/start_test %{buildroot}/usr/share/%{name}/bin/start_test -ln -s start_test %{buildroot}/usr/share/%{name}/bin/announce_resource -ln -s start_test %{buildroot}/usr/share/%{name}/bin/finish_test -ln -s start_test %{buildroot}/usr/share/%{name}/bin/report_result -ln -s start_test %{buildroot}/usr/share/%{name}/bin/report_testrun_progress -install -D -m 755 libstandalone.so %{buildroot}/%{_libdir}/libstandalone.so -cp -a plugins %{buildroot}/usr/share/%{name}/plugins +install -D -m 744 biostest %{buildroot}/%{location}/biostest +install -D -m 755 shelltools/start_test %{buildroot}/%{location}/bin/start_test +ln -s start_test %{buildroot}/%{location}/bin/announce_resource +ln -s start_test %{buildroot}/%{location}/bin/finish_test +ln -s start_test %{buildroot}/%{location}/bin/report_result +ln -s start_test %{buildroot}/%{location}/bin/report_testrun_progress +install -D -m 755 libstandalone.so %{buildroot}/%{_libdir}/libstandalone.so.%{version}.%{release} +ln -s libstandalone.so.%{version}.%{release} %{buildroot}/%{_libdir}/libstandalone.so.%{version} +cp -a plugins %{buildroot}/%{location}/plugins install -D -m 644 Documentation/QUICKSTART.txt %{buildroot}/%{_docdir}/%{name}/QUICKSTART.txt install -D -m 644 Documentation/USERGUIDE.txt %{buildroot}/%{_docdir}/%{name}/USERGUIDE.tx gzip biostest.1 install -D -m 644 biostest.1.gz %{buildroot}/%{_mandir}/man1/biostest.1.gz chmod 644 %{buildroot}/%{_mandir}/man1/biostest.1.gz +%post +%run_ldconfig + +%postun +%run_ldconfig + %files %defattr(-,root,root) /usr/sbin/biostest.sh -/usr/share/%{name} +%{location} /var/log/%{name} -/%{_libdir}/libstandalone.so +/%{_libdir}/libstandalone.so.%{version} +/%{_libdir}/libstandalone.so.%{version}.%{release} %{_docdir}/%{name} %{_mandir}/man1/biostest.1.gz -%changelog -n firmwarekit +%changelog +* Wed May 30 2007 - trenn(a)suse.de +- also build for ia64 +- use "$@" to pass args correctly from biostest.sh to biostest +- move from /usr/share to /usr/lib +- ripped out a lot patches that went mainline +- updated to release 2 +- there are still some bugs to fix, package is building and working + half way correctly (plugin specifc things to fix) now. I will + wait until next version with patches applied comes out to get out + of patch nightmare. * Wed Dec 06 2006 - dmueller(a)suse.de - don't build as root * Fri Nov 24 2006 - trenn(a)suse.de ++++++ acpi_compile_cleanup.patch ++++++ Index: firmwarekit/acpicompile/acpicompile.c =================================================================== --- firmwarekit.orig/acpicompile/acpicompile.c +++ firmwarekit/acpicompile/acpicompile.c @@ -35,6 +35,8 @@ static int current_ssdt; /* Which DSDT or SSDT table we're dealing with */ +extern void load_dsdt_ssdts(); + /* parses an iasl output line, returns the line no. that * the error or warning is referencing */ @@ -77,8 +79,6 @@ static void do_table(char *filename) { FILE *file; char line[4096]; - char output[8192]; - char uri[4096]; char command[4096]; int errlineno; ++++++ adjust_doc.patch ++++++ --- /var/tmp/diff_new_pack.n24763/_old 2007-05-31 20:50:14.000000000 +0200 +++ /var/tmp/diff_new_pack.n24763/_new 2007-05-31 20:50:14.000000000 +0200 @@ -3,50 +3,6 @@ biostest.1 | 85 +++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 102 insertions(+), 7 deletions(-) -Index: firmwarekit/Documentation/QUICKSTART.txt -=================================================================== ---- firmwarekit.orig/Documentation/QUICKSTART.txt -+++ firmwarekit/Documentation/QUICKSTART.txt -@@ -3,22 +3,32 @@ - QUICK START - ============================================ - --- STEP 1: Boot the Firmware Dev Kit CD from the cd-rom. -+- STEP 1: Either: -+ Boot the Firmware Dev Kit CD from the cd-rom -+ (Burn the bootable iso /usr/share/firmwarekit/firmwarekit.iso -+ included in the firmwarekit-iso package). - --- STEP 2: At black boot screen, press [ENTER] to start the automated tests. -+ or - --- STEP 3: After a 5 second welcome screen, the tests will start. When tests are complete, a test results page will show. -+ Start the biostest executable -+ (included in the firmwarekit base package) - --- STEP 4: Use up and down arrow keys and press [ENTER] on a line-item for more details on it. -+- STEP 2: At black boot screen, press [ENTER] to start the automated tests. - --- STEP 5: To save the test results on a USB key, insert a USB key and <tab> over to 'Save on USB' option, press [ENTER]. -+- STEP 3: After a 5 second welcome screen, the tests will start. When tests -+ are complete, a test results page will show. - --- STEP 6: To exit, <tab> over to 'Exit' and press [ENTER]. -+- STEP 4: Use up and down arrow keys and press [ENTER] on a line-item for -+ more details on it. - -+- STEP 5: To save the test results on a USB key, insert a USB key and -+ <tab> over to 'Save on USB' option, press [ENTER]. - --** For more detailed information on running the Firmware Dev Kit automated and manual tests, please see the USERGUIDE.txt for more information. -+- STEP 6: To exit, <tab> over to 'Exit' and press [ENTER]. - - -+** For more detailed information on running the Firmware Dev Kit automated and -+ manual tests, please see the USERGUIDE.txt for more information. - - Contributer: Rolla Selbak (rolla.n.selbak(a)intel.com) - Index: firmwarekit/biostest.1 =================================================================== --- /dev/null @@ -57,7 +13,7 @@ +.SH NAME +biostest.sh \- starts the linux firmwarekit which checks the BIOS for linux compatiblity +.SH SYNOPSIS -+.B biostest.sh [ do_not_block ] [ ssh_save=host:/dir ] [ console=ttySx,speed ] [ safemode ] ++.B biostest.sh [ noninteractive ] [ saveovernet=host:/dir ] [ console=ttySx,speed ] [ safemode ] +.SH DESCRIPTION +.BI biostest.sh +Biostest checks your firmware for linux compatibility. @@ -80,11 +36,11 @@ +\-. + +.TP -+.I do_not_block ++.I noninteractive +Biostest will exit after checks have been performed and results have been -+written ++written. +.TP -+.I ssh_save=host:/dir ++.I saveovernet=host:/dir +Specify a destinition in scp syntax to save the results to. This might break +a bit the ncurses/newt windows as scp requires a password from stdin. +If you want to automate the test you can use ssh keys (so that you don't have ++++++ adjust_paths.patch ++++++ --- /var/tmp/diff_new_pack.n24763/_old 2007-05-31 20:50:14.000000000 +0200 +++ /var/tmp/diff_new_pack.n24763/_new 2007-05-31 20:50:14.000000000 +0200 @@ -13,21 +13,33 @@ } - system("/bin/cp results/* /usbkey &> /dev/null"); + system("/bin/cp -rf /var/log/firmwarekit /usbkey &> /dev/null"); - system("/bin/cp acpidump /usbkey &> /dev/null"); + system("/bin/cp acpi.dump /usbkey &> /dev/null"); system("/bin/cp DSDT.* /usbkey &> /dev/null"); system("/bin/umount /usbkey &> /dev/null"); Index: firmwarekit/tests.c =================================================================== --- firmwarekit.orig/tests.c +++ firmwarekit/tests.c -@@ -199,8 +199,8 @@ void sort_results(void) +@@ -199,15 +199,17 @@ void sort_results(void) void dump_results(void) { - dump_xml(all_tests, "results/results.xml"); +- dump_text(all_tests, "results/results.txt"); - dump_xml_resources("results/resources.xml"); + dump_xml(all_tests, "/var/log/firmwarekit/results.xml"); + dump_xml_resources("/var/log/firmwarekit/resources.xml"); ++ dump_text(all_tests, "/var/log/firmwarekit/results.txt"); ++ dump_xml_resources("/var/log/firmwarekit/resources.xml"); ++ show_results_ui(all_tests); } + void dump_xml_results(void) + { +- dump_xml(all_tests, "results/results.xml"); +- dump_xml_resources("results/resources.xml"); ++ dump_xml(all_tests, "/var/log/firmwarekit/results.xml"); ++ dump_xml_resources("/var/log/firmwarekit/resources.xml"); + } + void show_results(void) ++++++ biostest_sh.patch ++++++ --- /var/tmp/diff_new_pack.n24763/_old 2007-05-31 20:50:14.000000000 +0200 +++ /var/tmp/diff_new_pack.n24763/_new 2007-05-31 20:50:14.000000000 +0200 @@ -9,7 +9,7 @@ @@ -0,0 +1,15 @@ +#!/bin/bash + -+DIR="/usr/share/firmwarekit" ++DIR="/usr/lib/firmwarekit" +OUTPUT_DIR="/var/log/firmwarekit" + +if [ ! -d "$DIR" ];then @@ -19,6 +19,6 @@ + + +pushd "$DIR" -+./biostest $* ++./biostest "$@" +popd + ++++++ chk_hpet_cleanup.patch ++++++ Index: firmwarekit/chk_hpet/chk_hpet.c =================================================================== --- firmwarekit.orig/chk_hpet/chk_hpet.c +++ firmwarekit/chk_hpet/chk_hpet.c @@ -151,8 +151,6 @@ int main(int argc, char ** argv) int fd, ret; int hpet_status; char uri[1024]; - GList *list; - char line[4096]; start_test("chk_hpet", "HPET configuration test", "This test checks the HPET PCI BAR for each timer block in the timer." ++++++ colors.patch ++++++ --- /var/tmp/diff_new_pack.n24763/_old 2007-05-31 20:50:14.000000000 +0200 +++ /var/tmp/diff_new_pack.n24763/_new 2007-05-31 20:50:14.000000000 +0200 @@ -22,7 +22,7 @@ + newtSetColors(newtDefaultColorPalette); newtInit(); newtCls(); - newtDrawRootText(0,0, " Linux-ready Firmware Developer Kit - Release 0 - (C) 2006 Intel Corporation"); + newtDrawRootText(0,0, " Linux-ready Firmware Developer Kit - Release 2 - (C) 2007 Intel Corporation"); Index: firmwarekit/colors.h =================================================================== --- /dev/null ++++++ cpufreq_cleanup.patch ++++++ Index: firmwarekit/cpufreq/cpufreq.c =================================================================== --- firmwarekit.orig/cpufreq/cpufreq.c +++ firmwarekit/cpufreq/cpufreq.c @@ -234,7 +234,7 @@ static char *HzToHuman(unsigned long hz) -static unsigned long long get_claimed_hz(int cpunr) +static unsigned long get_claimed_hz(int cpunr) { FILE *file; char path[PATH_MAX]; @@ -355,7 +355,7 @@ static void do_cpu(int cpunr) if (freqs[i].Hz > get_claimed_hz(cpunr) && !warned_PSS) { char outbuf[4096]; warned_PSS = 1; - sprintf(outbuf, "Frequency %i not achievable; _PSS limit of %i in effect?", freqs[i].Hz, get_claimed_hz(cpunr)); + sprintf(outbuf, "Frequency %lu not achievable; _PSS limit of %lu in effect?", freqs[i].Hz, get_claimed_hz(cpunr)); report_result("cpufreq", WARN, outbuf, NULL, NULL); } } ++++++ debug.patch ++++++ Index: firmwarekit/chk_hpet/chk_hpet.c =================================================================== --- firmwarekit.orig/chk_hpet/chk_hpet.c +++ firmwarekit/chk_hpet/chk_hpet.c @@ -44,7 +44,7 @@ #define VENDOR_ID_INTEL (0x8086) extern GList *boot_dmesg; -extern void load_boot_dmesg_buffer(); +extern void load_boot_dmesg_buffer(int announce); extern GList *ssdt[]; extern void load_dsdt_ssdts(); @@ -100,6 +100,8 @@ static void check_hpet_base(gpointer dat { char *line = (char *) data; char *val, *c; + printf("%s - %s", __FUNCTION__, line); + if ((val = strstr(line, "ACPI: HPET id:")) != NULL) { c= strstr(line, "base: "); if (c) @@ -160,7 +162,7 @@ int main(int argc, char ** argv) memset(uri, 0, 1024); - load_boot_dmesg_buffer(); + load_boot_dmesg_buffer(0); if (boot_dmesg != NULL) g_list_foreach(boot_dmesg, check_hpet_base, &hpet_status); else Index: firmwarekit/dmesg.c =================================================================== --- firmwarekit.orig/dmesg.c +++ firmwarekit/dmesg.c @@ -40,6 +40,7 @@ extern char *current_test; /* Obtains dmesg, cleans it up, and adds it to our resource list. * The boot_dmesg here is usually accessed by non-standalone tests * (i.e. *.so tests) */ +#ifdef XYZ void get_dmesg_buffer(void) { char *dmesg; @@ -66,6 +67,8 @@ void get_dmesg_buffer(void) in further calls... */ klogctl (5, NULL, 0); + fprintf (stderr, "Try to open file: %s\n", DMESG_FILE); + f_dmesg = fopen (DMESG_FILE, "r"); if (f_dmesg == NULL){ fprintf (stderr, "WARN: Could not open "DMESG_FILE); @@ -91,9 +94,12 @@ void get_dmesg_buffer(void) c2=c1; if (strlen(c1)>3 && c1[0]=='<' && c1[2]=='>'){ c2+=3; + fprintf (stderr, "Insert line: %s\n", c2); boot_dmesg = g_list_append(boot_dmesg, strdup(c2)); linecount ++; } + else + fprintf (stderr, "Do not insert line: %s\n", c1); } fclose(f_dmesg); @@ -101,6 +107,7 @@ void get_dmesg_buffer(void) free(dmesg); } +#endif /* check for common dmesg errors */ void dmesg_common_errors(char *line, char *suggested_uri) Index: firmwarekit/libstandalone.c =================================================================== --- firmwarekit.orig/libstandalone.c +++ firmwarekit/libstandalone.c @@ -30,7 +30,6 @@ #include "biostest.h" -GList *boot_dmesg = NULL; /* Holds dmesg info, accessed by standalone tests */ GList *ssdt[MAX_SSDTS]; /* Holds DSDT and SSDT tables, accessed by stndaln tests */ @@ -142,40 +141,6 @@ void announce_resource(char *uri, char * fflush(stdout); } - -/* Obtains the dmesg kernel buffer. The boot_dmesg here is usually - * accessed by standalone tests (i.e. *.exe) */ -void load_boot_dmesg_buffer(void) -{ - char line [4096]; - FILE *file; - - if(boot_dmesg != NULL) - return; - - memset(line, 0, 4096); - - /* First, try to access the tmp dmesg output that - * get_dmesg_buffer() created. If it doesn't exist, - * we're in standlone mode, and we should access - * the local dmesg file. */ - if (access(DMESG_FILE, R_OK)) - file = fopen(DMESG_LOCAL_FILE, "r"); - else - file = fopen(DMESG_FILE, "r"); - - if (!file) - return; - - while (!feof(file)) { - if (fgets(line, 4095, file)==NULL) - break; - boot_dmesg = g_list_append(boot_dmesg, strdup(line)); - } - - fclose(file); -} - void load_dsdt_ssdts(void) { int ret, i; @@ -197,7 +162,7 @@ void load_dsdt_ssdts(void) { sprintf(cmd_prefix, "plugins/"); /* create hex-dump format of all acpi tables in file 'acpi.dump' */ - sprintf(command, "%sacpidump > acpi.dump &> /dev/null", cmd_prefix); + sprintf(command, "%sacpidump > acpi.dump 2> /dev/null", cmd_prefix); system(command); if (access("acpi.dump", R_OK)) fprintf(stderr,"WARN (acpidump): failed to create acpi.dump.\n"); Index: firmwarekit/main.c =================================================================== --- firmwarekit.orig/main.c +++ firmwarekit/main.c @@ -220,7 +220,8 @@ int main(int argc, char **argv) /* get and parse demsg for useful info * (implemented in dmesg.c) */ - get_dmesg_buffer(); +// get_dmesg_buffer(); + load_boot_dmesg_buffer(1); /* obtain dsdt and ssdt acpi tables' resources */ get_dsdt_resources(); Index: firmwarekit/lib.c =================================================================== --- firmwarekit.orig/lib.c +++ firmwarekit/lib.c @@ -35,6 +35,57 @@ #include "biostest.h" +GList *boot_dmesg = NULL; /* Holds dmesg info, accessed by standalone tests */ + +/* Obtains the dmesg kernel buffer. The boot_dmesg here is usually + * accessed by standalone tests (i.e. *.exe) */ +void load_boot_dmesg_buffer(int announce) +{ + char line [4096]; + FILE *file; + + fprintf (stderr, "XXX boot_dmesg != NULL\n"); + if(boot_dmesg != NULL) + return; + + fprintf (stderr, "boot_dmesg != NULL\n"); + + memset(line, 0, 4096); + + /* First, try to access the tmp dmesg output that + * get_dmesg_buffer() created. If it doesn't exist, + * we're in standlone mode, and we should access + * the local dmesg file. */ + if (access(DMESG_FILE, R_OK)){ + file = fopen(DMESG_LOCAL_FILE, "r"); + fprintf(stderr, "%s is accessed\n", DMESG_LOCAL_FILE); + } + else{ + file = fopen(DMESG_FILE, "r"); + fprintf(stderr, "%s is accessed\n", DMESG_FILE); + } + + if (!file){ + fprintf(stderr, "ERRRR Could not access dmesg file\n", DMESG_LOCAL_FILE); + return; + } + + while (!feof(file)) { + if (fgets(line, 4095, file)==NULL) + break; + if (announce){ + fprintf(stderr, "Appening and announcing: %s\n", line); + announce_resource("dmesg://<3>", line, NULL); + } + else + fprintf(stderr, "Append: %s\n", line); + boot_dmesg = g_list_append(boot_dmesg, strdup(line)); + } + + fclose(file); +} + + char *scatprintf(char *buffer, const char *fmt, ...) { char *vasprintf_buffer; Index: firmwarekit/edd/edd.c =================================================================== --- firmwarekit.orig/edd/edd.c +++ firmwarekit/edd/edd.c @@ -37,7 +37,7 @@ #include <firmwarekit.h> -extern void load_boot_dmesg_buffer(); +extern void load_boot_dmesg_buffer(int announce); static int edd_abort; @@ -363,7 +363,7 @@ int main(int argc, char **argv) "(can) have multiple disks. Linux distributions increasingly depend on this info " "to find out on which device to install the bootloader."); - load_boot_dmesg_buffer(); + load_boot_dmesg_buffer(0); if(boot_dmesg != NULL) g_list_foreach(boot_dmesg, check_line, NULL); else Index: firmwarekit/mtrr/mtrr.c =================================================================== --- firmwarekit.orig/mtrr/mtrr.c +++ firmwarekit/mtrr/mtrr.c @@ -45,7 +45,7 @@ #define WRITETHROUGH 8 #define DEFAULT 16 -extern void load_boot_dmesg_buffer(); +extern void load_boot_dmesg_buffer(int announce); extern GList *boot_demsg; struct mtrr_entry { @@ -356,7 +356,7 @@ static void do_manual_mtrr_test(void) validate_iomem(); - load_boot_dmesg_buffer(); + load_boot_dmesg_buffer(0); if(boot_dmesg != NULL) g_list_foreach(boot_dmesg, check_line, NULL); else ++++++ dmesg_adjust.patch ++++++ --- /var/tmp/diff_new_pack.n24763/_old 2007-05-31 20:50:14.000000000 +0200 +++ /var/tmp/diff_new_pack.n24763/_new 2007-05-31 20:50:14.000000000 +0200 @@ -7,25 +7,18 @@ =================================================================== --- firmwarekit.orig/dmesg.c +++ firmwarekit/dmesg.c -@@ -67,22 +67,42 @@ static void check_this_line(gpointer dat - } - } - -+#define DMESG_FILE "/var/log/boot.msg" - /* obtains demsg, cleans it up, and adds it to our resource list */ - void get_dmesg_buffer(void) +@@ -44,17 +44,37 @@ void get_dmesg_buffer(void) { char *dmesg; char *c1, *c2; - int linecount = 0; -- dmesg = malloc(DMESG_SIZE); + int linecount = 0, ret; -+ dmesg = malloc(DMESG_SIZE); + dmesg = malloc(DMESG_SIZE); assert(dmesg!=NULL); + c1 = malloc(4096); + assert(dmesg!=NULL && c1!=NULL); -- system("/bin/dmesg -s 256000 > /tmp/boot_dmesg"); + system("/bin/dmesg -s 256000 > "DMESG_FILE); + FILE *f_dmesg; /* don't printk to the console; newt hates that */ @@ -54,7 +47,7 @@ /* Add to our resource list that we keep. The user * will have access to this when they look at the -@@ -90,43 +110,29 @@ void get_dmesg_buffer(void) +@@ -62,32 +82,22 @@ void get_dmesg_buffer(void) * see uri.c for implementation */ announce_resource("dmesg://", dmesg, NULL); @@ -95,51 +88,9 @@ + linecount ++; + } } -- + + fclose(f_dmesg); + free(c1); -+ free(dmesg); -+ - /* send boot_dmesg off to extract useful info */ - g_list_foreach(boot_dmesg, check_this_line, NULL); -- -- free(dmesg); - e820_register_resource(); -- - } - + free(dmesg); -- -- - void match_dmesg_string(char *line, char *suggested_uri) - { - char dmesg_uri[1024]; -Index: firmwarekit/libstandalone.c -=================================================================== ---- firmwarekit.orig/libstandalone.c -+++ firmwarekit/libstandalone.c -@@ -36,17 +36,22 @@ GList *boot_dmesg = NULL; - static void local_get_dmesg_buffer(void) - { - char line [4096]; -+ char *tmp; - FILE *file; - - memset(line, 0, 4096); - -- file = fopen("/tmp/boot_dmesg", "r"); -+ file = fopen("/var/log/boot.msg", "r"); - if (!file) - return; - while (!feof(file)) { - if (fgets(line, 4095, file)==NULL) - break; -- boot_dmesg = g_list_append(boot_dmesg, strdup(line)); -+ /* only add real kernel messages in <4>msg format */ -+ if (line[0] == '<' && line[2] == '>'){ -+ tmp = &line[3]; -+ boot_dmesg = g_list_append(boot_dmesg, strdup(line)); -+ } - } - fclose(file); } ++++++ ebda_cleanup.patch ++++++ Index: firmwarekit/ebda/Makefile =================================================================== --- firmwarekit.orig/ebda/Makefile +++ firmwarekit/ebda/Makefile @@ -1,4 +1,4 @@ -override CFLAGS = `pkg-config --cflags glib-2.0` -I.. +override CFLAGS += `pkg-config --cflags glib-2.0` -I.. -fPIC LDFLAGS = `pkg-config --libs glib-2.0` ++++++ fan_cleanup.patch ++++++ Index: firmwarekit/fan/fan.c =================================================================== --- firmwarekit.orig/fan/fan.c +++ firmwarekit/fan/fan.c @@ -42,7 +42,6 @@ static void do_fan(char *dir, char *name { FILE *file; char path[PATH_MAX]; /* fan's directory */ - char uri[1024]; char buffer[4096]; /* holds contents of fan's 'state' file */ char *state = NULL; /* current state of the fan */ ++++++ firmwarekit-r1.102.tar.bz2 -> firmwarekit-2.tar.bz2 ++++++ ++++ 9286 lines of diff (skipped) ++++++ libstandalone_soname.patch ++++++ Index: firmwarekit/Makefile =================================================================== --- firmwarekit.orig/Makefile +++ firmwarekit/Makefile @@ -33,7 +33,7 @@ biostest: $(LIBS) biostest.h .depend # cd initramfs ; sh create_initramfs.sh libstandalone.so: $(LIBS) biostest.h .depend libstandalone.o - gcc --shared libstandalone.o lib.o -o libstandalone.so + gcc --shared libstandalone.o lib.o -Wl,-soname=libstandalone.so -o libstandalone.so clean: rm -f biostest ++++++ maxreadreq_cleanup.patch ++++++ Index: firmwarekit/maxreadreq/maxreadreq.c =================================================================== --- firmwarekit.orig/maxreadreq/maxreadreq.c +++ firmwarekit/maxreadreq/maxreadreq.c @@ -91,7 +91,15 @@ int main(int argc, char **argv) break; if (line[0]!=' ' && line[0] != '\t' && strlen(line)>8) { - sprintf(current_device, "pci://00:%s", line, 511); + if (strlen(line) > 500){ + report_result("maxreadreq", WARN, "Too big pci" + "string would overflow" + "current_device buffer", + "Internal plugin, not a firmware" + " bug", current_device); + break; + } + sprintf(current_device, "pci://00:%s", line); current_device[16] = 0; strncpy(current_type, line+8, 511); c = strchr(current_type, ':'); ++++++ own_params.patch ++++++ --- /var/tmp/diff_new_pack.n24763/_old 2007-05-31 20:50:15.000000000 +0200 +++ /var/tmp/diff_new_pack.n24763/_new 2007-05-31 20:50:15.000000000 +0200 @@ -6,17 +6,7 @@ =================================================================== --- firmwarekit.orig/main.c +++ firmwarekit/main.c -@@ -37,6 +37,9 @@ int use_serial; - static unsigned long serial_speed; - static int tty; - -+static int do_not_block; -+char ssh_dest[MAX_SSH_DEST_LEN] = ""; -+ - int safe_mode; - int interactive_mode = 1; - -@@ -84,6 +87,32 @@ static void parse_kernel_param(const cha +@@ -76,6 +76,16 @@ static void parse_kernel_param(const cha use_serial=1; } @@ -24,33 +14,17 @@ + if (strstr(buffer, "install=exec:run_biostest")){ + } + -+ if (strstr(buffer, "ssh_save=")){ -+ ret = strlen(buffer) - strlen("ssh_save=") + 1; -+ if (ret > MAX_SSH_DEST_LEN){ -+ fprintf(stderr, "FATAL: ssh destination string to" -+ " long (%d > %d). Parameter ignored.\n", -+ ret, MAX_SSH_DEST_LEN); -+ } -+ else{ -+ ret = sscanf(buffer, "ssh_save=%s", ssh_dest); -+ fprintf(stdout, "ssh destination string set to: %s\n", -+ ssh_dest); -+ } -+ } -+ if (strstr(buffer, "do_not_block")) -+ do_not_block=1; -+ + if (strstr(buffer, "-h") || strstr(buffer, "--help")){ -+ fprintf(stdout, "biostest [ -h ] [ safemode ] [ noninteractive ] [ do_not_block ]" -+ " [ ssh_save=host:/dest ]\n"); ++ fprintf(stdout, "biostest [ -h ] [ safemode ] [ noninteractive ]" ++ " [ saveovernet=host:/dest ]\n"); + exit(EXIT_SUCCESS); + } + /* parse safemode boot param */ if (strstr(buffer, "safemode")) safe_mode=1; -@@ -174,8 +203,9 @@ int main(int argc, char **argv) - * serial. This can also be set by fucn() +@@ -173,8 +183,9 @@ int main(int argc, char **argv) + * serial. This can also be set by func() * parse_kernel_param if it's in the kernel * cmdline options */ - if (argc>1 && strstr(argv[1],"serial")) ++++++ path_environment.patch ++++++ --- /var/tmp/diff_new_pack.n24763/_old 2007-05-31 20:50:15.000000000 +0200 +++ /var/tmp/diff_new_pack.n24763/_new 2007-05-31 20:50:15.000000000 +0200 @@ -14,7 +14,7 @@ int use_serial; static unsigned long serial_speed; -@@ -194,6 +195,26 @@ static void parse_kernel_cmdline(void) +@@ -173,6 +174,26 @@ static void parse_kernel_cmdline(void) } } @@ -24,7 +24,7 @@ + char new_path_env[8192]; + path_env = getenv("PATH"); + ret = snprintf(new_path_env, 8192, "PATH=%s:" -+ "/usr/share/firmwarekit/bin", path_env); ++ "/usr/lib/firmwarekit/bin", path_env); + if (ret >= 8192){ + fprintf(stderr, "FATAL: PATH environment variable too big," + " increase string array -> that's a bug\n"); @@ -41,9 +41,9 @@ int main(int argc, char **argv) { int ret; -@@ -226,6 +247,8 @@ int main(int argc, char **argv) - * (implemented in dmesg.c) */ - get_dmesg_buffer(); +@@ -207,6 +228,8 @@ int main(int argc, char **argv) + /* register e820 resource */ + e820_register_resource(); + set_path_env(); + ++++++ rip_out_unneeded_stuff.patch ++++++ --- /var/tmp/diff_new_pack.n24763/_old 2007-05-31 20:50:15.000000000 +0200 +++ /var/tmp/diff_new_pack.n24763/_new 2007-05-31 20:50:15.000000000 +0200 @@ -20,30 +20,34 @@ =================================================================== --- firmwarekit.orig/Makefile +++ firmwarekit/Makefile -@@ -4,15 +4,15 @@ override CFLAGS += `pkg-config --cflags +@@ -3,16 +3,18 @@ override CFLAGS += `pkg-config --cflags + #LDFLAGS = -nodefaultlibs -Linitramfs/data/lib -Linitramfs/data/usr/lib -export-dynamic -lc -ldl `pkg-config --libs glib-2.0` -lnewt -lslang LDFLAGS = -nostdlibs -Linitramfs/data/lib -Linitramfs/data/usr/lib -export-dynamic -lc -ldl `pkg-config --libs glib-2.0` -lnewt -lslang - --SUBDIRS = acpiinfo pciresource acpicompile cpufreq ethernet edd battery msrpoke pcipoke usbports tonetest bashshell mcfg lmbench mtrr shelltools shelltests fan fadt chk_hpet suspend thermal_trip microcode dmi os2gap apicedge maxreadreq -+SUBDIRS = acpiinfo pciresource acpicompile cpufreq ethernet edd battery msrpoke pcipoke usbports tonetest bashshell mcfg mtrr shelltools shelltests fan fadt chk_hpet suspend thermal_trip microcode dmi os2gap apicedge maxreadreq - LIBS = dmesg.o main.o tests.o plugins.o ui.o uri.o dumpxml.o usb.o serial.o lib.o acpitable.o e820.o +- +-SUBDIRS = acpiinfo pciresource acpicompile cpufreq ethernet edd battery msrpoke pcipoke usbports tonetest bashshell mcfg lmbench mtrr shelltools fan fadt chk_hpet suspend thermal_trip microcode dmi os2gap apicedge maxreadreq virt ebda SUN ++# Rip out lmbench, our package is in no good shape... ++# Rip out ethernet, this might mess up network in a running system and needs more SUSE adjustance... ++SUBDIRS = acpiinfo pciresource acpicompile cpufreq edd battery msrpoke pcipoke usbports tonetest bashshell mcfg mtrr shelltools fan fadt chk_hpet suspend thermal_trip microcode dmi os2gap apicedge maxreadreq virt ebda SUN + LIBS = dmesg.o main.o tests.o plugins.o ui.o uri.o dumpxml.o usb.o serial.o lib.o acpitable.o dsdt.o e820.o ssh.o all: libstandalone.so biostest subdirs # if arch is i*86 (i386, i686, etc.) -ifeq ($(shell uname -m | cut -c1,3,4), i86) -LIBC = initramfs/data/usr/lib/libc.so --endif +-else +#ifeq ($(shell uname -m | cut -c1,3,4), i86) +#LIBC = initramfs/data/usr/lib/libc.so -+#endif ++#else ++ifeq ($(shell uname -m), ia64) + SUBDIRS += ia64_mce_inject + endif - .PHONY: subdirs $(SUBDIRS) +@@ -22,13 +24,13 @@ subdirs: $(SUBDIRS) -@@ -21,13 +21,13 @@ subdirs: $(SUBDIRS) $(SUBDIRS): $(MAKE) -C $@ - cd shelltests ; make install - cd initramfs/kernel ; make +# cd initramfs/kernel ; make ++++++ scp_save_results.patch ++++++ --- /var/tmp/diff_new_pack.n24763/_old 2007-05-31 20:50:15.000000000 +0200 +++ /var/tmp/diff_new_pack.n24763/_new 2007-05-31 20:50:15.000000000 +0200 @@ -2,207 +2,15 @@ Makefile | 2 biostest.h | 10 +++- main.c | 37 ++++++++++++++- - ssh.c | 150 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ tests.c | 7 ++ ui.c | 35 ++++++++++---- 6 files changed, 228 insertions(+), 13 deletions(-) -Index: firmwarekit/ssh.c -=================================================================== ---- /dev/null -+++ firmwarekit/ssh.c -@@ -0,0 +1,150 @@ -+ -+#include <stdio.h> -+#include <stdlib.h> -+#include <string.h> -+#include <unistd.h> -+#include <time.h> -+ -+#include <newt.h> -+ -+#include "biostest.h" -+ -+#define MAX_SSH_COMMAND_LEN MAX_SSH_DEST_LEN + 512 + HOST_NAME_MAX -+ -+void setup_result_dir(char *result_dir, size_t string_sz){ -+ -+ char host_name[HOST_NAME_MAX + 1]; -+ int ret; -+ -+ char date_str[128]; -+ const time_t cur_time = time(NULL); -+ -+ struct tm *loc_time = localtime(&cur_time); -+ -+ if (loc_time == NULL) -+ strcpy (date_str, ""); -+ else -+ sprintf(date_str, "%.2d%.2d%.2d%.2d%.2d", loc_time->tm_hour, -+ loc_time->tm_min, loc_time->tm_mday, loc_time->tm_mon + 1, -+ loc_time->tm_year % 100); -+ -+ ret = gethostname(host_name, HOST_NAME_MAX); -+ host_name[HOST_NAME_MAX] = '\0'; -+ -+ /* gethostname may return "(none)" and no error return value in -+ some cases? There might be other invalid fs character used as host -+ name? I don't care for that now... -+ -> handle it -+ */ -+ if (ret || strstr(host_name, "(") || strstr(host_name, ")")){ -+ snprintf(result_dir, string_sz-1, "results_%s", date_str); -+ result_dir[string_sz-1] = '\n'; -+ } -+ else{ -+ snprintf(result_dir, string_sz-1, "results_%s_%s", host_name, date_str); -+ result_dir[string_sz-1] = '\n'; -+ } -+ return; -+} -+ -+int copy_via_ssh(const char *dest, int verbose) -+{ -+ char command[4096]; -+ char result_dir[1024]; -+ int ret1, ret2; -+ setup_result_dir(result_dir, 1024); -+ -+ /* Check and create tmp dir */ -+ snprintf (command, 4095, "/var/log/firmwarekit/%s", result_dir); -+ if (access(command, W_OK)){ -+ ret1 = snprintf (command, 4095, "mkdir /var/log/firmwarekit/%s", -+ result_dir); -+ ret2 = system(command); -+ if (ret1 >= 4096 || ret2) -+ goto error; -+ } -+ -+ /* Copy results into tmp dir */ -+ ret1 = snprintf (command, 4096, "cp /var/log/firmwarekit/{results.css," -+ "results.xml,resources.css,resources.xml,hwinfo.txt}" -+ " /var/log/firmwarekit/%s", result_dir); -+ -+ ret2 = system(command); -+ if (ret1 >= 4096 || ret2) -+ goto error; -+ -+ /* secure copy stuff away */ -+ if (verbose){ -+ ret1 = snprintf (command, 4096, "scp -v -r -o CheckHostIP=no -o " -+ "StrictHostKeyChecking=no /var/log/firmwarekit/%s" -+ " %s", result_dir, dest); -+ } -+ else{ -+ ret1 = snprintf (command, 4096, "scp -r -o CheckHostIP=no -o " -+ "StrictHostKeyChecking=no /var/log/firmwarekit/%s" -+ " %s &>/dev/null", result_dir, dest); -+ } -+ -+ ret2 = system(command); -+ if (ret1 >= 4096 || ret2) -+ goto error; -+ return 0; -+ error: -+ fprintf (stderr, "WARN: ssh copying did not succeed. ret1: %d, " -+ "ret2: %d\n", ret1, ret2); -+ return 1; -+} -+ -+void save_via_ssh(void) -+{ -+ int myWin; -+ newtComponent myForm; -+ -+ newtComponent mySave, myBack, mySCPDest, resu; -+ -+ const char *destination; -+ int ret; -+ -+ int W,H; -+ -+ newtGetScreenSize(&W,&H); -+ -+ myWin = newtOpenWindow(1+(W-80)/2,1+(H-10)/2,80,10, "Provide" -+ "destination where to copy results" -+ " in scp syntax"); -+ myForm = newtForm(NULL,NULL,0); -+ -+ newtFormAddComponent(myForm, newtLabel(2,2, "Destination")); -+ /* ssh_dest may got passed via ssh_save= param */ -+ if (ssh_dest[0] != '\0') -+ mySCPDest = newtEntry(15, 2, "host:/target_dir", -+ MAX_SSH_DEST_LEN, &destination, 0); -+ else -+ mySCPDest = newtEntry(15, 2, ssh_dest, -+ MAX_SSH_DEST_LEN, &destination, 0); -+ -+ newtFormAddComponent(myForm, mySCPDest); -+ -+/* Password passing is not possible via scp... -+ mySCPDest = newtEntry(20, 4, "host:/target_dir", 20, &pass, NEWT_FLAG_HIDDEN); -+ newtFormAddComponent(myForm, mySCPDest); -+*/ -+ mySave = newtButton(2, 4, "Save"); -+ newtFormAddComponent(myForm, mySave); -+ -+ myBack = newtButton(27, 4, "Back"); -+ newtFormAddComponent(myForm, myBack); -+ -+ resu = newtRunForm(myForm); -+ if (resu == mySave) { -+ newtCls(); -+ ret = copy_via_ssh(destination, 0); -+ if (ret) -+ simple_ok_dialog("SCP result", "ERROR: scp command did" -+ " not succeed"); -+ else -+ simple_ok_dialog("SCP result", "Copying data was " -+ "successfull"); -+ } -+ newtPopWindow(); -+} -Index: firmwarekit/biostest.h -=================================================================== ---- firmwarekit.orig/biostest.h -+++ firmwarekit/biostest.h -@@ -82,7 +82,8 @@ extern void check_dmesg_updates(char *ur - - /* tests.c */ - --extern void dump_results(void); -+extern void dump_xml_results(void); -+extern void show_results(void); - extern void sort_results(void); - - extern void register_interactive_test(char *name, voidvoidfunc *func); -@@ -116,6 +117,13 @@ extern void dump_xml(GList *all_tests, c - /* usb.c */ - extern void save_on_usb(void); - -+/* ssh.c */ -+#define MAX_SSH_DEST_LEN 64 -+ -+extern void save_via_ssh(void); -+extern int copy_via_ssh(const char *dest, int verbose); -+extern char ssh_dest[MAX_SSH_DEST_LEN]; -+ - /* serial.c */ - - extern void init_serial(int enable, int tty, unsigned long speed); Index: firmwarekit/main.c =================================================================== --- firmwarekit.orig/main.c +++ firmwarekit/main.c -@@ -27,6 +27,7 @@ - - - #include <slang.h> -+#include <newt.h> - - #include <glib.h> - -@@ -195,6 +196,7 @@ static void parse_kernel_cmdline(void) +@@ -175,6 +175,7 @@ static void parse_kernel_cmdline(void) int main(int argc, char **argv) { @@ -210,7 +18,7 @@ /* initialisation of core support routines */ parse_kernel_cmdline(); -@@ -211,6 +213,12 @@ int main(int argc, char **argv) +@@ -191,6 +192,11 @@ int main(int argc, char **argv) * (implemented in serial.c) */ init_serial(use_serial, tty, serial_speed); @@ -219,160 +27,6 @@ + if (ret) + fprintf (stderr, "hwinfo did not succeed\n"); + -+ - /* obtain dsdt and ssdt acpi tables in binary format */ - extract_dsdt_ssdts(); - -@@ -228,7 +236,34 @@ int main(int argc, char **argv) - - finished_tests = 1; - -- dump_results(); -+ int ssh_ret; -+ if (do_not_block){ -+ dump_xml_results(); -+ newtRefresh(); -+ newtPopWindow(); -+ newtFinished(); -+ -+ if (ssh_dest[0] != '\0'){ -+ /* be more verbose in non_blocking mode, -+ windows do not matter, possiblity to track down -+ why secure copy might not work */ -+ ssh_ret = copy_via_ssh(ssh_dest, 1); -+ if (ssh_ret){ -+ /* print out error after newt stuff finished.*/ -+ fprintf(stderr, "ERROR: scp copy to %s did" -+ " not succeed\n", ssh_dest); -+ return EXIT_FAILURE; -+ } -+ else{ -+ fprintf(stdout, "Copying data to %s " -+ "successfull\n", ssh_dest); -+ } -+ } -+ } -+ else{ -+ dump_xml_results(); -+ show_results(); -+ } - - return EXIT_SUCCESS; - } -Index: firmwarekit/ui.c -=================================================================== ---- firmwarekit.orig/ui.c -+++ firmwarekit/ui.c -@@ -34,6 +34,19 @@ - static int myProgressWin=-1; - static newtComponent myProgressText, myProgressForm, myScales; - -+static GList *save_pokes; -+ -+static void register_save_poke(char *name, voidvoidfunc *func) -+{ -+ struct interactive_test *test; -+ test = malloc(sizeof(struct interactive_test)); -+ assert(test!=NULL); -+ memset(test, 0, sizeof(struct interactive_test)); -+ test->shortname = strdup(name); -+ test->execute = func; -+ save_pokes = g_list_append(save_pokes, test); -+} -+ - static int longest_string(char *str) - { - char *c; -@@ -501,6 +514,7 @@ static void int_poke_dialog(char *title, - } - - newtPopWindow(); -+ newtFormDestroy(myForm); - } - - static int nrtotal, nrpass, nrfail, nrwarn; -@@ -623,7 +637,7 @@ void show_results_ui(GList *all_tests) - int win; - newtComponent myForm; - newtComponent myOkButton; -- newtComponent myUSBButton; -+ newtComponent mySaveButton; - newtComponent myIntButton; - newtComponent myPokeButton; - newtComponent myHelpButton; -@@ -662,18 +676,23 @@ void show_results_ui(GList *all_tests) - myOkButton = newtButton(2,H-8, "Exit"); - newtFormAddComponent(myForm, myOkButton); - -- myUSBButton = newtButton(12,H-8, "Save to USB"); -- newtFormAddComponent(myForm, myUSBButton); -+ mySaveButton = newtButton(12,H-8, "Save"); -+ newtFormAddComponent(myForm, mySaveButton); -+ -+ /* Setup save options */ -+ -+ register_save_poke("Save to USB", save_on_usb); -+ register_save_poke("Save via SSH", save_via_ssh); - -- myIntButton = newtButton(29,H-8, "Manual Tests"); -+ myIntButton = newtButton(22,H-8, "Manual Tests"); - if (interactive_tests) - newtFormAddComponent(myForm, myIntButton); - -- myPokeButton = newtButton(47,H-8, "Poke HW"); -+ myPokeButton = newtButton(40,H-8, "Poke HW"); - if (hardware_pokes) - newtFormAddComponent(myForm, myPokeButton); - -- myHelpButton = newtButton(61,H-8, "Help"); -+ myHelpButton = newtButton(54,H-8, "Help"); - newtFormAddComponent(myForm, myHelpButton); - - if (!interactive_mode) { -@@ -688,8 +707,8 @@ void show_results_ui(GList *all_tests) - show_resource_info(result->devuri); - else - show_result(result); -- } else if (resu == myUSBButton) { -- save_on_usb(); -+ } else if (resu == mySaveButton) { -+ int_poke_dialog("Save results", save_pokes); - } else if (resu == myPokeButton) { - int_poke_dialog("Poke hardware", hardware_pokes); - } else if (resu == myIntButton) { -Index: firmwarekit/tests.c -=================================================================== ---- firmwarekit.orig/tests.c -+++ firmwarekit/tests.c -@@ -197,13 +197,16 @@ void sort_results(void) - } - - --void dump_results(void) -+void dump_xml_results(void) - { - dump_xml(all_tests, "/var/log/firmwarekit/results.xml"); - dump_xml_resources("/var/log/firmwarekit/resources.xml"); -- show_results_ui(all_tests); - } - -+void show_results(void) -+{ -+ show_results_ui(all_tests); -+} - - void register_hw_poke(char *name, voidvoidfunc *func) - { -Index: firmwarekit/Makefile -=================================================================== ---- firmwarekit.orig/Makefile -+++ firmwarekit/Makefile -@@ -5,7 +5,7 @@ LDFLAGS = -nostdlibs -Linitramfs/data/li - - - SUBDIRS = acpiinfo pciresource acpicompile cpufreq ethernet edd battery msrpoke pcipoke usbports tonetest bashshell mcfg mtrr shelltools shelltests fan fadt chk_hpet suspend thermal_trip microcode dmi os2gap apicedge maxreadreq --LIBS = dmesg.o main.o tests.o plugins.o ui.o uri.o dumpxml.o usb.o serial.o lib.o acpitable.o e820.o -+LIBS = dmesg.o main.o tests.o plugins.o ui.o uri.o dumpxml.o usb.o serial.o lib.o acpitable.o e820.o ssh.o - - all: libstandalone.so biostest subdirs - + /* get and parse demsg for useful info + * (implemented in dmesg.c) */ + get_dmesg_buffer(); ++++++ suspend_cleanup.patch ++++++ Index: firmwarekit/suspend/suspend.c =================================================================== --- firmwarekit.orig/suspend/suspend.c +++ firmwarekit/suspend/suspend.c @@ -30,19 +30,9 @@ static void do_test(void) { - FILE *file; start_test("suspend", "Suspend/resume testing", "This test checks if suspend-to-ram works"); -/* - file = fopen("/sys/power/state", "w"); - if (!file) { - report_result("suspend", FAIL, "S3 not supported", NULL, NULL); - return; - } - fprintf(file, "mem"); - fclose(file); -*/ system("/usr/sbin/pm-suspend"); finish_test("suspend"); ++++++ use_external_pmtool_bins.patch ++++++ --- /var/tmp/diff_new_pack.n24763/_old 2007-05-31 20:50:15.000000000 +0200 +++ /var/tmp/diff_new_pack.n24763/_new 2007-05-31 20:50:15.000000000 +0200 @@ -8,24 +8,52 @@ =================================================================== --- firmwarekit.orig/acpicompile/acpicompile.c +++ firmwarekit/acpicompile/acpicompile.c -@@ -339,7 +339,7 @@ static void do_table(char *filename) - char uri[4096]; - char command[4096]; +@@ -83,10 +83,14 @@ static void do_table(char *filename) + int errlineno; -- sprintf(command, "plugins/iasl -vi -vs -w3 %s", filename); + /* Compile the dsdt or ssdt .dsl with iasl */ ++/* + if (access("plugins", R_OK)) + sprintf(command, "../plugins/iasl -vi -vs -w3 %s", filename); + else + sprintf(command, "plugins/iasl -vi -vs -w3 %s", filename); ++*/ ++ + sprintf(command, "/usr/bin/iasl -vi -vs -w3 %s", filename); + - file = popen(command,"r"); - while (!feof(file)) { -@@ -465,19 +465,19 @@ static void do_test(void) - if (ret != EXIT_SUCCESS) - return; + /* analyse output of the iasl compiler */ +Index: firmwarekit/dsdt.c +=================================================================== +--- firmwarekit.orig/dsdt.c ++++ firmwarekit/dsdt.c +@@ -55,13 +55,13 @@ void extract_dsdt_ssdts() + int ret; + + /* create hex-dump format of all acpi tables in file 'acpidump' */ +- system("plugins/acpidump > acpi.dump &> /dev/null"); ++ system("/usr/sbin/acpidump > acpi.dump 2> /dev/null"); + if (access("acpi.dump", R_OK)) + fprintf(stderr,"WARN (acpidump): failed to create acpi.dump.\n"); + + /* use 'acpidump' file to extract dsdt and ssdt tables + * in binary format, creates DSDT.dat and SSDT*.dat */ +- system("plugins/acpixtract acpi.dump &> /dev/null"); ++ system("/usr/bin/acpixtract acpi.dump &> /dev/null"); + if (access("DSDT.dat", R_OK)) { + ret = system("cat /proc/acpi/dsdt > DSDT.dat"); + if (ret != EXIT_SUCCESS) { +@@ -71,21 +71,21 @@ void extract_dsdt_ssdts() } -- ret = system("plugins/iasl -d DSDT.dat &>/dev/null"); -+ ret = system("/usr/bin/iasl -d DSDT.dat &>/dev/null"); - if (ret) - printf("iasl returns %i \n", ret); + /* Disassemble DSDT.dat with iasl, will create DSDT.dsl */ +- system("plugins/iasl -d DSDT.dat &>/dev/null"); ++ system("/usr/bin/iasl -d DSDT.dat &>/dev/null"); + if (access("DSDT.dsl", R_OK)) + fprintf(stderr,"WARN (iasl): failed to create DSDT.dsl.\n"); + + /* Include ACPI table for external symbol resolution (if they exist) */ +- system("plugins/iasl -d -e DSDT.dat SSDT.dat &>/dev/null"); - system("plugins/iasl -d -e DSDT.dat SSDT1.dat &>/dev/null"); - system("plugins/iasl -d -e DSDT.dat SSDT2.dat &>/dev/null"); - system("plugins/iasl -d -e DSDT.dat SSDT3.dat &>/dev/null"); @@ -35,6 +63,7 @@ - system("plugins/iasl -d -e DSDT.dat SSDT7.dat &>/dev/null"); - system("plugins/iasl -d -e DSDT.dat SSDT8.dat &>/dev/null"); - system("plugins/iasl -d -e DSDT.dat SSDT9.dat &>/dev/null"); ++ system("/usr/bin/iasl -d -e DSDT.dat SSDT.dat &>/dev/null"); + system("/usr/bin/iasl -d -e DSDT.dat SSDT1.dat &>/dev/null"); + system("/usr/bin/iasl -d -e DSDT.dat SSDT2.dat &>/dev/null"); + system("/usr/bin/iasl -d -e DSDT.dat SSDT3.dat &>/dev/null"); @@ -47,34 +76,3 @@ /* current iasl has an issue with arugment counts in SSDT's, work around this */ system("sed -i -e \"s/^ACPI Error.*Argument count mismatch for method.*//g\" SSDT*.dsl &> /dev/null"); -Index: firmwarekit/main.c -=================================================================== ---- firmwarekit.orig/main.c -+++ firmwarekit/main.c -@@ -50,11 +50,11 @@ int finished_tests = 0; - static void extract_dsdt_ssdts() - { - /* create hex-dump format of all acpi tables in file 'acpidump' */ -- system("plugins/acpidump > acpidump &> /dev/null"); -+ system("/usr/sbin/acpidump > acpidump &> /dev/null"); - - /* use 'acpidump' file to extract dsdt and ssdt tables - * in binary format, creates DSDT.dat and SSDT.dat */ -- system("plugins/acpixtract acpidump &> /dev/null"); -+ system("/usr/bin/acpixtract acpidump &> /dev/null"); - } - - /* Parse the kernel parameter we got from func() parse_kernel_cmdline. -Index: firmwarekit/chk_hpet/chk_hpet.c -=================================================================== ---- firmwarekit.orig/chk_hpet/chk_hpet.c -+++ firmwarekit/chk_hpet/chk_hpet.c -@@ -159,7 +159,7 @@ int main(int argc, char ** argv) - ret = system("cat /proc/acpi/dsdt > DSDT.dat"); - if (ret != EXIT_SUCCESS) - return ret; -- ret = system("plugins/iasl -d DSDT.dat &>/dev/null"); -+ ret = system("/usr/bin/iasl -d DSDT.dat &>/dev/null"); - if (ret) - printf("iasl returns %i \n", ret); - report_testrun_progress(30); ++++++ virt_cleanup.patch ++++++ Index: firmwarekit/virt/virt.c =================================================================== --- firmwarekit.orig/virt/virt.c +++ firmwarekit/virt/virt.c @@ -101,7 +101,6 @@ static int vt_locked_by_bios(void) int main(int argc, char **argv) { - FILE *file; start_test("virt", "VT/VMX Virtualization extensions", "This test checks if VT/VMX is set up correctly"); ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit emacs-w3
by root＠Hilbert.suse.de 31 May '07

31 May '07

Hello community, here is the log from the commit of package emacs-w3 checked in at Thu May 31 20:49:39 CEST 2007. -------- --- emacs-w3/emacs-w3.changes 2006-09-19 19:26:31.000000000 +0200 +++ /mounts/work_src_done/STABLE/emacs-w3/emacs-w3.changes 2007-05-30 11:53:35.000000000 +0200 @@ -1,0 +2,6 @@ +Wed May 30 11:46:53 CEST 2007 - schwab(a)suse.de + +- The url package is now part of emacs. +- Fix spurious executable bits. + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ emacs-w3-cvs.spec ++++++ --- /var/tmp/diff_new_pack.L21630/_old 2007-05-31 20:48:58.000000000 +0200 +++ /var/tmp/diff_new_pack.L21630/_new 2007-05-31 20:48:58.000000000 +0200 @@ -1,7 +1,7 @@ # # spec file for package emacs-w3 (Version cvs) # -# Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2007 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. # @@ -11,17 +11,17 @@ # norootforbuild Name: emacs-w3 -BuildRequires: emacs-nox emacs-url +BuildRequires: emacs-nox %define short_name w3 -License: Other License(s), see package +License: GNU General Public License (GPL) Group: Productivity/Editors/Emacs Provides: w3 emacs_w3 Obsoletes: emacs_w3 -Requires: emacs emacs-url +Requires: emacs Autoreqprov: on Summary: Emacs/W3--a WWW Browser for Emacs Version: cvs -Release: 590 +Release: 637 # Original source: ftp://ftp.xemacs.org/pub/xemacs/emacs-w3/w3-4.0pre.46.tar.gz #+ Source: ftp://ftp.xemacs.org/pub/xemacs/emacs-w3/w3-%{version}.tar.bz2 # CVS: :pserver:anoncvs@subversions.gnu.org:/cvs @@ -94,9 +94,7 @@ '(princ (format "%s.%s" emacs-major-version emacs-minor-version)))') ./configure --prefix=%{_prefix} --infodir=%{_infodir} \ --with-lispdir=%{_prefix}/share/emacs/site-lisp/%{short_name} \ - --datadir=%{_prefix}/share/emacs/%{short_name} \ - --with-gnus=%{_prefix}/share/emacs/$EMACS_VERSION/lisp/gnus \ - --with-url=%{_prefix}/share/emacs/site-lisp/url + --datadir=%{_prefix}/share/emacs/%{short_name} rm -f lisp/*elc make @@ -127,7 +125,10 @@ %{_infodir}/%{short_name}* %{_prefix}/share/emacs/%{short_name} -%changelog -n emacs-w3 +%changelog +* Wed May 30 2007 - schwab(a)suse.de +- The url package is now part of emacs. +- Fix spurious executable bits. * Tue Sep 19 2006 - schwab(a)suse.de - Handle new url-retrieve callback interface in Emacs 22. * Wed Jan 25 2006 - mls(a)suse.de ++++++ emacs_w3.dif ++++++ --- /var/tmp/diff_new_pack.L21630/_old 2007-05-31 20:48:58.000000000 +0200 +++ /var/tmp/diff_new_pack.L21630/_new 2007-05-31 20:48:58.000000000 +0200 @@ -1,8 +1,60 @@ ---- w3-4.0pre.44/dot.emacs Thu Mar 5 00:46:33 1998 -+++ w3-4.0pre.44/dot.emacs Tue Jul 14 13:15:56 1998 +--- w3/dot.emacs ++++ w3/dot.emacs @@ -0,0 +1,5 @@ + +;;; Emacs/W3 Configuration -+(setq load-path (cons "/usr/share/emacs/site-lisp/w3" load-path)) -+(require 'w3-auto "w3-auto") ++(add-to-list 'load-path "/usr/share/emacs/site-lisp/w3") ++(require 'w3-auto) + +--- w3/etc/Makefile.in ++++ w3/etc/Makefile.in +@@ -5,6 +5,7 @@ + + EMACS = @EMACS@ + INSTALL = @INSTALL@ ++INSTALL_DATA = @INSTALL_DATA@ + RM = rm -f + + TARGETS = default.css +@@ -15,9 +16,9 @@ + ( if [ ! -d $(datadir) ]; then mkdir -p $(datadir); fi ) + for x in $(TARGETS); do \ + if [ -f $$x ]; then \ +- $(INSTALL) $$x $(datadir); \ ++ $(INSTALL_DATA) $$x $(datadir); \ + else \ +- $(INSTALL) $(srcdir)/$$x $(datadir); \ ++ $(INSTALL_DATA) $(srcdir)/$$x $(datadir); \ + fi \ + done + +--- w3/lisp/Makefile.in ++++ w3/lisp/Makefile.in +@@ -17,7 +17,7 @@ + INSTALL = @INSTALL@ + RM = rm -f + +-DEPS = -l $(srcdir)/docomp.el -l $(URLDIR)/url-vars.el -l $(srcdir)/w3-vars.el ++DEPS = -l $(srcdir)/docomp.el -l url-vars -l $(srcdir)/w3-vars.el + + # compile with noninteractive and relatively clean environment + BATCHFLAGS = -batch -q -no-site-file +--- w3/texi/Makefile.in ++++ w3/texi/Makefile.in +@@ -6,6 +6,7 @@ + VPATH = $(srcdir) + EMACS = @EMACS@ + INSTALL = @INSTALL@ ++INSTALL_DATA = @INSTALL_DATA@ + RM = rm -f + MAKEINFO = @MAKEINFO@ + TEXI2HTML = @TEXI2HTML@ +@@ -40,7 +41,7 @@ + + install: + ( if [ ! -d $(infodir) ]; then mkdir -p $(infodir); fi ) +- for x in *.info*; do $(INSTALL) $$x $(infodir); done ++ for x in *.info*; do $(INSTALL_DATA) $$x $(infodir); done + -for x in *.info; do $(INSTALLINFO) $$x $(infodir)/dir; done + + distclean: clean ++++++ suse-start-w3.el ++++++ --- emacs-w3/suse-start-w3.el 2003-02-18 20:14:51.000000000 +0100 +++ /mounts/work_src_done/STABLE/emacs-w3/suse-start-w3.el 2007-05-30 11:53:18.000000000 +0200 @@ -1,7 +1,7 @@ ;; /usr/share/emacs/site-lisp/suse-start-w3.el (add-to-list 'load-path "/usr/share/emacs/site-lisp/w3") -(require 'w3-auto "w3-auto") +(require 'w3-auto) ;; /usr/share/emacs/site-lisp/suse-start-w3.el ends here ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit dbxml
by root＠Hilbert.suse.de 31 May '07

31 May '07

Hello community, here is the log from the commit of package dbxml checked in at Thu May 31 20:48:51 CEST 2007. -------- --- dbxml/dbxml.changes 2007-01-17 08:46:58.000000000 +0100 +++ /mounts/work_src_done/STABLE/dbxml/dbxml.changes 2007-05-30 09:50:29.000000000 +0200 @@ -1,0 +2,5 @@ +Wed May 30 09:49:45 CEST 2007 - dbornkessel(a)suse.de + +- added patch for avoiding literal string comparison + +------------------------------------------------------------------- New: ---- comparison.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ dbxml.spec ++++++ --- /var/tmp/diff_new_pack.A19158/_old 2007-05-31 20:48:18.000000000 +0200 +++ /var/tmp/diff_new_pack.A19158/_new 2007-05-31 20:48:18.000000000 +0200 @@ -21,7 +21,7 @@ %define xerces_cvs_version 2_7_0 Summary: Berkeley DB XML Version: 2.2.13.patch4 -Release: 30 +Release: 57 Source0: dbxml-%{dbxml_version}.tar.bz2 Source1: db-%{db_version}.tar.bz2 Source2: xerces-c-src_%{xerces_cvs_version}.tar.bz2 @@ -32,6 +32,7 @@ Patch2: %{name}-%{dbxml_version}-uninitialized-variables.patch Patch3: %{name}-%{dbxml_version}-official-patches.patch Patch4: %{name}-%{dbxml_version}-rpath.patch +Patch5: comparison.patch Patch150: java150_build.patch # db patches Patch100: db-%{db_version}.dif @@ -43,7 +44,7 @@ #libpathan patches #Patch300: libpathan-1.2-conf.patch URL: http://www.sleepycat.com/products/xml.shtml -License: BSD License and BSD-like +License: BSD License and BSD-like, no advertise-clause. no name-useage-clause. Group: Development/Libraries/C and C++ BuildRoot: %{_tmppath}/%{name}-%{version}-build Requires: libpathan = %{pathan_version} @@ -106,9 +107,9 @@ %package -n db43-java Summary: Java Bindings for the Berkeley DB Version: 4.3.29 -Release: 14 +Release: 41 URL: http://www.sleepycat.com/products/xml.shtml -License: BSD License and BSD-like +License: BSD License and BSD-like, no advertise-clause. no name-useage-clause. Group: Productivity/Databases/Servers Requires: db43 = %{db_version} Requires: glibc-devel @@ -131,7 +132,7 @@ %package -n libpathan Summary: Pathan Provides an XPath Parsing and Evaluation API Version: 2_2.2.13.dbxml -Release: 52 +Release: 79 URL: http://software.decisionsoft.com/pathan1Info.html License: BSD License and BSD-like Group: Development/Languages/C and C++ @@ -153,7 +154,7 @@ %package -n libpathan-devel Summary: Include Files and Libraries mandatory for Development Version: 2_2.2.13.dbxml -Release: 52 +Release: 79 Group: Development/Languages/C and C++ Requires: Xerces-c-devel >= %{xerces_c_version} Requires: libpathan = 2_2.2.13.dbxml @@ -174,7 +175,7 @@ %package -n libxquery Summary: Library Conforming with XQuery Version: 1.2.0 -Release: 53 +Release: 80 Url: http://www.sleepycat.com/products/xml.shtml License: BSD License and BSD-like Group: Development/Libraries/C and C++ @@ -190,7 +191,7 @@ Summary: Library Conforming with XQuery Group: Development/Libraries/C and C++ Version: 1.2.0 -Release: 53 +Release: 80 Requires: libpathan-devel >= %{pathan_version} Requires: libpathan >= %{pathan_version} Requires: Xerces-c-devel >= %{xerces_c_version} @@ -213,6 +214,7 @@ %patch1 %patch2 %patch4 +%patch5 -p1 # go to db directory and apply patch pushd db-%{db_version} %patch100 @@ -638,7 +640,9 @@ #<<< changelog # vim:fdm=marker:foldmarker=#>>>,#<<<:foldcolumn=6: -%changelog -n dbxml +%changelog +* Wed May 30 2007 - dbornkessel(a)suse.de +- added patch for avoiding literal string comparison * Wed Jan 17 2007 - dbornkessel(a)suse.de - added RPM_OPT_FLAGS * Mon Nov 20 2006 - pmladek(a)suse.cz ++++++ comparison.patch ++++++ # compiler in beta does not like comparison of string literals Index: dbxml-2.2.13/pathan/src/utils/XPath2Utils.cpp =================================================================== --- dbxml-2.2.13.orig/pathan/src/utils/XPath2Utils.cpp +++ dbxml-2.2.13/pathan/src/utils/XPath2Utils.cpp @@ -300,7 +300,7 @@ int XPath2Utils::indexNode(const XERCES_ break; } default: - assert("n" == "Unhandled node type in XPath2Utils::indexNode"); + assert(0 == "Unhandled node type in XPath2Utils::indexNode"); DSLthrow(MiscException,X("XPath2Utils::indexNode"), X("Unhandled node type")); } ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit classpath
by root＠Hilbert.suse.de 31 May '07

31 May '07

Hello community, here is the log from the commit of package classpath checked in at Thu May 31 20:48:06 CEST 2007. -------- --- classpath/classpath.changes 2007-05-02 11:54:26.000000000 +0200 +++ /mounts/work_src_done/STABLE/classpath/classpath.changes 2007-05-30 11:38:37.000000000 +0200 @@ -1,0 +2,6 @@ +Wed May 30 11:38:17 CEST 2007 - dbornkessel(a)suse.de + +- deleted wrong requirements +- put development files in -devel packages + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ classpath.spec ++++++ --- /var/tmp/diff_new_pack.T17429/_old 2007-05-31 20:47:42.000000000 +0200 +++ /var/tmp/diff_new_pack.T17429/_new 2007-05-31 20:47:42.000000000 +0200 @@ -40,7 +40,7 @@ Group: Development/Libraries/Java Autoreqprov: on Version: 0.95 -Release: 6 +Release: 22 Summary: GNU implementation of the essential libraries for Java URL: http://www.gnu.org/software/classpath/ Source: %{name}-%{version}.tar.bz2 @@ -207,25 +207,6 @@ Summary: GNU implementation of the essential libraries for Java Group: Development/Libraries/Java Requires: %{name} = %{version} -Requires: gtk2 -Requires: gtk2-devel -Requires: atk-devel -Requires: pango-devel -Requires: cairo-devel -Requires: fontconfig-devel -Requires: glitz-devel -Requires: libpng-devel -Requires: xorg-x11-libXrender-devel -Requires: xorg-x11-libSM-devel -Requires: xorg-x11-libICE-devel -Requires: freetype2-devel -Requires: expat -Requires: zlib-devel -Requires: xorg-x11-libX11-devel -Requires: xorg-x11-libXau-devel -Requires: xorg-x11-libXdmcp-devel -Requires: glib2-devel -Requires: glibc-devel %if %suse_version < 1000 Requires: mozilla %endif @@ -458,9 +439,9 @@ %doc AUTHORS BUGS COPYING HACKING LICENSE NEWS README THANKYOU TODO %{_bindir}/* %_libdir/%{name} +%exclude %_libdir/%{name}/*.so %exclude %{_libdir}/%{name}/libgcjwebplugin.* %exclude %{_libdir}/%{name}/*.la -%_includedir/* #%dir %{_javadir} %{_javadir}/* %{_datadir}/info/* @@ -472,6 +453,8 @@ %defattr(-,root,root) %{_libdir}/%{name}/*.la %exclude %{_libdir}/%{name}/libgcjwebplugin.la +%_libdir/%{name}/*.so +%_includedir/* %files javadocs %defattr(-,root,root) @@ -493,6 +476,9 @@ %{_libdir}/%{name}/libgcjwebplugin.la %changelog +* Wed May 30 2007 - dbornkessel(a)suse.de +- deleted wrong requirements +- put development files in -devel packages * Wed May 02 2007 - dbornkessel(a)suse.de - added unzip to BuildRequires * Wed Apr 25 2007 - dbornkessel(a)suse.de ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit clamav
by root＠Hilbert.suse.de 31 May '07

31 May '07

Hello community, here is the log from the commit of package clamav checked in at Thu May 31 20:47:34 CEST 2007. -------- --- clamav/clamav.changes 2007-04-13 11:54:14.000000000 +0200 +++ /mounts/work_src_done/STABLE/clamav/clamav.changes 2007-05-31 16:46:29.000000000 +0200 @@ -1,0 +2,12 @@ +Thu May 31 16:45:25 CEST 2007 - max(a)suse.de + +- Security update: 0.90.3 (#279536) +- libclamav/unsp.c: fix end of buffer calculation (bb#464) +- libclamav/others.c: use strict permissions (0600) for temporary files + created in cli_gentempstream() (bb#517). +- libclamav/unrar/unrar.c: heap corruption causing DoS with corrupted + rar archive, better handle truncated files +- libclamav/phishcheck.c: isURL() regex execution hangs on Solaris +- libclamav/ole2_extract.c: detect block list loop (bb#466) + +------------------------------------------------------------------- Old: ---- clamav-0.90.2.tar.bz2 New: ---- clamav-0.90.3.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ clamav.spec ++++++ --- /var/tmp/diff_new_pack.I12978/_old 2007-05-31 20:46:31.000000000 +0200 +++ /var/tmp/diff_new_pack.I12978/_new 2007-05-31 20:46:31.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package clamav (Version 0.90.2) +# spec file for package clamav (Version 0.90.3) # # Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine @@ -18,7 +18,7 @@ BuildRequires: pwdutils %endif Summary: Antivirus Toolkit -Version: 0.90.2 +Version: 0.90.3 Release: 1 License: GNU General Public License (GPL) Group: Productivity/Security @@ -201,6 +201,15 @@ done %changelog +* Thu May 31 2007 - max(a)suse.de +- Security update: 0.90.3 (#279536) +- libclamav/unsp.c: fix end of buffer calculation (bb#464) +- libclamav/others.c: use strict permissions (0600) for temporary files + created in cli_gentempstream() (bb#517). +- libclamav/unrar/unrar.c: heap corruption causing DoS with corrupted + rar archive, better handle truncated files +- libclamav/phishcheck.c: isURL() regex execution hangs on Solaris +- libclamav/ole2_extract.c: detect block list loop (bb#466) * Fri Apr 13 2007 - max(a)suse.de - Security update: 0.90.2 (#264189) - CVE-2007-1997: CAB File Unstore Buffer Overflow Vulnerability ++++++ clamav-0.90.2.tar.bz2 -> clamav-0.90.3.tar.bz2 ++++++ clamav/clamav-0.90.2.tar.bz2 /mounts/work_src_done/STABLE/clamav/clamav-0.90.3.tar.bz2 differ: byte 11, line 1 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit bluez-libs
by root＠Hilbert.suse.de 31 May '07

31 May '07

Hello community, here is the log from the commit of package bluez-libs checked in at Thu May 31 20:46:05 CEST 2007. -------- --- bluez-libs/bluez-libs.changes 2007-05-25 12:19:22.000000000 +0200 +++ /mounts/work_src_done/STABLE/bluez-libs/bluez-libs.changes 2007-05-29 14:32:05.000000000 +0200 @@ -1,0 +2,5 @@ +Tue May 29 14:31:56 CEST 2007 - dmueller(a)suse.de + +- add patch to fix compilation with C++ applications + +------------------------------------------------------------------- New: ---- compound-literals-are-gnu-extension.diff ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ bluez-libs.spec ++++++ --- /var/tmp/diff_new_pack.G10894/_old 2007-05-31 20:45:53.000000000 +0200 +++ /var/tmp/diff_new_pack.G10894/_new 2007-05-31 20:45:53.000000000 +0200 @@ -13,12 +13,13 @@ Name: bluez-libs URL: http://bluez.sourceforge.net Version: 3.11 -Release: 1 +Release: 3 Summary: Bluetooth Libraries License: GNU General Public License (GPL) Group: Hardware/Mobile Autoreqprov: on Source: bluez-libs-%{version}.tar.gz +Patch1: compound-literals-are-gnu-extension.diff BuildRoot: %{_tmppath}/%{name}-%{version}-build %define prefix /usr @@ -35,6 +36,7 @@ %prep %setup -q +%patch1 %{?suse_update_config:%{suse_update_config -f . }} %build @@ -64,6 +66,8 @@ %doc AUTHORS COPYING INSTALL ChangeLog NEWS README %changelog +* Tue May 29 2007 - dmueller(a)suse.de +- add patch to fix compilation with C++ applications * Fri May 25 2007 - seife(a)suse.de - update to v3.11: * Fix URL data size handling. ++++++ compound-literals-are-gnu-extension.diff ++++++ --- include/bluetooth.h +++ include/bluetooth.h @@ -105,9 +105,9 @@ typedef struct { uint8_t b[6]; } __attribute__((packed)) bdaddr_t; -#define BDADDR_ANY (&(bdaddr_t) {{0, 0, 0, 0, 0, 0}}) -#define BDADDR_ALL (&(bdaddr_t) {{0xff, 0xff, 0xff, 0xff, 0xff, 0xff}}) -#define BDADDR_LOCAL (&(bdaddr_t) {{0, 0, 0, 0xff, 0xff, 0xff}}) +#define BDADDR_ANY __extension__ (&(bdaddr_t) {{0, 0, 0, 0, 0, 0}}) +#define BDADDR_ALL __extension__ (&(bdaddr_t) {{0xff, 0xff, 0xff, 0xff, 0xff, 0xff}}) +#define BDADDR_LOCAL __extension__ (&(bdaddr_t) {{0, 0, 0, 0xff, 0xff, 0xff}}) /* Copy, swap, convert BD Address */ static inline int bacmp(const bdaddr_t *ba1, const bdaddr_t *ba2) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit aaa_base
by root＠Hilbert.suse.de 31 May '07

31 May '07

Hello community, here is the log from the commit of package aaa_base checked in at Thu May 31 20:44:27 CEST 2007. -------- --- aaa_base/aaa_base.changes 2007-04-25 16:15:06.000000000 +0200 +++ /mounts/work_src_done/STABLE/aaa_base/aaa_base.changes 2007-05-30 21:04:08.561325000 +0200 @@ -1,0 +2,5 @@ +Wed May 30 21:04:56 CEST 2007 - varkoly(a)suse.de + +- move sysconfig.mail into yast2-mail + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ aaa_base.spec ++++++ --- /var/tmp/diff_new_pack.md3178/_old 2007-05-31 20:43:55.000000000 +0200 +++ /var/tmp/diff_new_pack.md3178/_new 2007-05-31 20:43:55.000000000 +0200 @@ -19,7 +19,7 @@ PreReq: /usr/bin/sed /usr/bin/grep /bin/mv /bin/cat /bin/date /usr/bin/cmp /bin/fillup /sbin/insserv net-tools Autoreqprov: on Version: 10.3 -Release: 27 +Release: 34 Summary: SUSE Linux Base Package BuildRoot: %{_tmppath}/%{name}-%{version}-build Source: aaa_base.tar.bz2 @@ -131,6 +131,8 @@ %defattr(-,root,root) %changelog +* Wed May 30 2007 - varkoly(a)suse.de +- move sysconfig.mail into yast2-mail * Wed Apr 25 2007 - werner(a)suse.de - Check for exported PS1 variable (bug #261203) * Tue Apr 24 2007 - lnussel(a)suse.de ++++++ aaa_base.post ++++++ --- aaa_base/aaa_base.post 2007-04-24 17:21:26.000000000 +0200 +++ /mounts/work_src_done/STABLE/aaa_base/aaa_base.post 2007-05-30 21:03:34.144185000 +0200 @@ -118,7 +118,7 @@ mv etc/rc.config.d/lang.rc.config etc/sysconfig/language fi for i in language backup boot kernel \ - suseconfig clock proxy windowmanager sysctl mail \ + suseconfig clock proxy windowmanager sysctl \ cron news shutdown sw_management ; do %{fillup_only -n $i} done ++++++ sysconfig_parts.tar.bz2 ++++++ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/sysconfig_parts/sysconfig.mail new/sysconfig_parts/sysconfig.mail --- old/sysconfig_parts/sysconfig.mail 2004-05-06 12:15:48.000000000 +0200 +++ new/sysconfig_parts/sysconfig.mail 1970-01-01 01:00:00.000000000 +0100 @@ -1,11 +0,0 @@ -## Path: Network/Mail/General -## Description: -## Type: string -## Default: "" -## Config: sendmail,postfix -## ServiceReload: sendmail,postfix -# -# From:-Line in email and News postings -# (otherwise the FQDN is used) -# -FROM_HEADER="" Files old/sysconfig_parts/.sysconfig.mail.swp and new/sysconfig_parts/.sysconfig.mail.swp differ ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit x11-input-wacom
by root＠Hilbert.suse.de 30 May '07

30 May '07

Hello community, here is the log from the commit of package x11-input-wacom checked in at Wed May 30 19:49:27 CEST 2007. -------- --- x11-input-wacom/x11-input-wacom.changes 2007-04-16 11:35:43.000000000 +0200 +++ /mounts/work_src_done/STABLE/x11-input-wacom/x11-input-wacom.changes 2007-05-30 13:20:53.628112000 +0200 @@ -1,0 +2,17 @@ +Wed May 30 13:06:26 CEST 2007 - dkukawka(a)suse.de + +- updated package to new version v0.7.7-10: + - Added 2 new xsetwacom potions (TVResolution0/1 and Screen_No) + - Added support for Bamboo + - Split wcmXCommand.c from xf86Wacom.c + - Added 2 new xsetwacom potions (Common DebugLevel and TwinView) + - Increased MAX_SUPPRESS from 20 to 100 + - Added new xsetwacom option to change suppress + - Fixed suppress bug (Allan Wind) + - Fixed a xsetwacom button and a relative wheel bug + - Prepared for toggling CoreEvent option + - Fixed bug 1698123 + - Incorporated patch 1680163 from Magnus Vigerloe + - Updated wacom man page, wacom.4x + +------------------------------------------------------------------- Old: ---- linuxwacom-0.7.7-7.tar.bz2 New: ---- linuxwacom-0.7.7-10.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ x11-input-wacom.spec ++++++ --- /var/tmp/diff_new_pack.j30247/_old 2007-05-30 19:37:47.000000000 +0200 +++ /var/tmp/diff_new_pack.j30247/_new 2007-05-30 19:37:47.000000000 +0200 @@ -19,10 +19,10 @@ URL: http://linuxwacom.sourceforge.net/ Group: System/X11/Utilities Version: 0.7.7 -Release: 9 +Release: 25 Summary: X11 input module for wacom tablet Provides: xorg-x11-server:/usr/X11R6/%{_lib}/modules/input/wacom_drv.o -Source: linuxwacom-%{version}-7.tar.bz2 +Source: linuxwacom-%{version}-10.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-build %description @@ -71,7 +71,7 @@ Ping Cheng <pingc(a)wacom.com> %prep -%setup -n linuxwacom-%{version}-7 +%setup -n linuxwacom-%{version}-10 %build export CFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing" @@ -146,6 +146,20 @@ /usr/%_lib/libwacomcfg.so %changelog +* Wed May 30 2007 - dkukawka(a)suse.de +- updated package to new version v0.7.7-10: + - Added 2 new xsetwacom potions (TVResolution0/1 and Screen_No) + - Added support for Bamboo + - Split wcmXCommand.c from xf86Wacom.c + - Added 2 new xsetwacom potions (Common DebugLevel and TwinView) + - Increased MAX_SUPPRESS from 20 to 100 + - Added new xsetwacom option to change suppress + - Fixed suppress bug (Allan Wind) + - Fixed a xsetwacom button and a relative wheel bug + - Prepared for toggling CoreEvent option + - Fixed bug 1698123 + - Incorporated patch 1680163 from Magnus Vigerloe + - Updated wacom man page, wacom.4x * Mon Apr 16 2007 - dkukawka(a)suse.de - update package to new version v0.7.7-7: - added --enable-wacdump ++++++ linuxwacom-0.7.7-7.tar.bz2 -> linuxwacom-0.7.7-10.tar.bz2 ++++++ ++++ 7483 lines of diff (skipped) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit eclipse-archdep
by root＠Hilbert.suse.de 30 May '07

30 May '07

Hello community, here is the log from the commit of package eclipse-archdep checked in at Wed May 30 19:37:22 CEST 2007. -------- New Changes file: --- /dev/null 2006-06-16 15:54:00.000000000 +0200 +++ /mounts/work_src_done/STABLE/eclipse-archdep/ecj-bootstrap.changes 2007-05-30 18:36:29.000000000 +0200 @@ -0,0 +1,29 @@ +------------------------------------------------------------------- +Wed May 30 18:34:54 CEST 2007 - dbornkessel(a)suse.de +- update to version 0.755 which is included in eclipse 3.3 + +------------------------------------------------------------------- +Fri Mar 30 15:34:03 CEST 2007 - rguenther(a)suse.de + +- add unzip BuildRequires + +------------------------------------------------------------------- +Wed Nov 15 13:35:03 CET 2006 - dbornkessel(a)suse.de + +- corrections in eclipse package only + +------------------------------------------------------------------- +Wed Oct 4 19:17:30 CEST 2006 - dbornkessel(a)suse.de + +- update of eclipse archive to 3.2.1 / ecj 0.670 + +------------------------------------------------------------------- +Thu Sep 28 00:27:39 CEST 2006 - ro(a)suse.de + +- added gcc-gij to BuildRequires + +------------------------------------------------------------------- +Mon Sep 18 11:23:19 CEST 2006 - dbornkessel(a)suse.de + +- first version of ecj-bootstrap package + New Changes file: --- /dev/null 2006-06-16 15:54:00.000000000 +0200 +++ /mounts/work_src_done/STABLE/eclipse-archdep/eclipse-archdep.changes 2007-05-30 18:45:24.000000000 +0200 @@ -0,0 +1,211 @@ +------------------------------------------------------------------- +Wed May 30 18:36:35 CEST 2007 - dbornkessel(a)suse.de +- renamed package and sub-packages to eclipse-archdep-*; the eclipse-* packages are now noarch packges +- split eclipse-platform in eclipse-archdep-platform and eclipse-archdep-platform-commons +- moved arch dependent files to %{_libdir}/eclipse +- update to 3.3RC2 (Europa) + +------------------------------------------------------------------- +Tue Nov 21 17:22:41 CET 2006 - dbornkessel(a)suse.de + +- adjusted x86_64 build to function with updated jpackage-utils package + +------------------------------------------------------------------- +Wed Nov 15 13:34:29 CET 2006 - dbornkessel(a)suse.de + +- correct wrong file lists (Bug #220245) + +------------------------------------------------------------------- +Sat Nov 11 18:52:53 CET 2006 - aj(a)suse.de + +- Fix permissions of doc files. + +------------------------------------------------------------------- +Thu Sep 28 09:45:31 CEST 2006 - dbornkessel(a)suse.de + +- update to version 3.2.1 +- delete redundant BuildRequires + +------------------------------------------------------------------- +Mon Sep 18 11:27:31 CEST 2006 - dbornkessel(a)suse.de + +- added ecj-bootstrap spec + +------------------------------------------------------------------- +Thu Jul 27 14:09:02 CEST 2006 - dbornkessel(a)suse.de + +- builds now on i386, ppc, x86_64 and ia64 + +------------------------------------------------------------------- +Wed Jul 5 18:32:10 CEST 2006 - dbornkessel(a)suse.de + +- enabled x86_64 and ia64 builds + +------------------------------------------------------------------- +Fri Mar 10 20:00:37 CET 2006 - dbornkessel(a)suse.de + +- enabled ppc build + +------------------------------------------------------------------- +Wed Jan 25 21:44:12 CET 2006 - mls(a)suse.de + +- converted neededforbuild to BuildRequires + +------------------------------------------------------------------- +Wed Jan 18 16:30:17 CET 2006 - dbornkessel(a)suse.de + +- update to 3.1.1 + +------------------------------------------------------------------- +Thu Sep 29 00:41:12 CEST 2005 - dmueller(a)suse.de + + - add norootforbuild + +------------------------------------------------------------------- +Tue Aug 23 16:43:34 CEST 2005 - skh(a)suse.de + +- let eclipse require eclipse-gtk2 so that there's never only + the README installed [#106699] + +------------------------------------------------------------------- +Tue Aug 9 13:28:18 CEST 2005 - hvogel(a)suse.de + +- make eclipse binary executeable again [Bug #102675] + +------------------------------------------------------------------- +Fri Aug 5 03:14:59 CEST 2005 - skh(a)suse.de + +- update to 3.1 final +- clean up specfile + +------------------------------------------------------------------- +Tue Apr 19 14:43:08 CEST 2005 - mmj(a)suse.de + +- NULL terminate functions that are supposed to be NULL terminated + +------------------------------------------------------------------- +Mon Feb 21 15:14:58 CET 2005 - skh(a)suse.de + +- update to version 3.0.1 + +------------------------------------------------------------------- +Tue Sep 28 15:38:15 CEST 2004 - skh(a)suse.de + +- Improved Provides: of eclipse-platform to enable update from old + eclipse package and fix #46308 + +------------------------------------------------------------------- +Mon Sep 20 15:05:58 CEST 2004 - ro(a)suse.de + +- added main package containing only a readme + +------------------------------------------------------------------- +Thu Sep 16 16:22:20 CEST 2004 - skh(a)suse.de + +- Remove bogus Requires: lucene + +------------------------------------------------------------------- +Sat Sep 11 01:36:01 CEST 2004 - skh(a)suse.de + +- update to 3.0 (i386 only for now) +- use JPackage package layout, splitting into the following + subpackages: + - eclipse-platform + - eclipse-gtk2 + - eclipse-jdt + - eclipse-source + - eclipse-pde + - eclipse-scripts + - libswt3-gtk2 + +------------------------------------------------------------------- +Thu Jul 8 16:46:21 CEST 2004 - skh(a)suse.de + +- Remove java2 and add BEAJava2 to neededforbuild to fix build + (#42849) +- source setJava from eclipse wrapper script if no java in $PATH + +------------------------------------------------------------------- +Thu May 13 15:07:36 CEST 2004 - skh(a)suse.de + +- update to version 2.1.3 + +------------------------------------------------------------------- +Fri Apr 23 16:16:42 CEST 2004 - skh(a)suse.de + +- Allow SWT to use deprecated gtk functions until a real fix is + available from the eclipse project. + +------------------------------------------------------------------- +Mon Mar 15 17:27:54 CET 2004 - skh(a)suse.de + +- Really fix #34496 (not only create the needed file, but also + install it...) +- Removed eclipse.desktop file from sources, all done automagically + now by the %suse_update_desktop_file macro. + +------------------------------------------------------------------- +Tue Feb 17 14:26:38 CET 2004 - skh(a)suse.de + +- use gnome2-devel-packages in neededforbuild +- Replace buggy wrapper script with a better one (#34496) +- Fixed problem with correct generation of local workspace + configuration ("Completing install..." only once now, not every + time eclipse is started, #34496) + +------------------------------------------------------------------- +Mon Feb 16 17:04:26 CET 2004 - skh(a)suse.de + +- update to version 2.1.2 + +------------------------------------------------------------------- +Thu Feb 12 12:28:05 CET 2004 - ro(a)suse.de + +- added gconf2 to neededforbuild + +------------------------------------------------------------------- +Sat Jan 10 15:32:32 CET 2004 - adrian(a)suse.de + +- build as user + +------------------------------------------------------------------- +Thu Oct 16 15:42:02 CEST 2003 - skh(a)suse.de + +- fix build (use libbonobo instead of bonobo-activation) + +------------------------------------------------------------------- +Tue Sep 2 12:18:21 CEST 2003 - skh(a)suse.de + +- fix LD_LIBRARY_PATH in wrapper script + +------------------------------------------------------------------- +Mon Sep 1 16:15:55 CEST 2003 - adrian(a)suse.de + +- add Categories + +------------------------------------------------------------------- +Mon Sep 1 13:38:43 CEST 2003 - skh(a)suse.de + +- added .desktop file and icon + +------------------------------------------------------------------- +Sat Aug 23 15:30:36 CEST 2003 - ro(a)suse.de + +- jakarta-ant was renamed to apache-ant + +------------------------------------------------------------------- +Mon Aug 18 14:31:56 CEST 2003 - skh(a)suse.de ++++ 14 more lines (skipped) ++++ between /dev/null ++++ and /mounts/work_src_done/STABLE/eclipse-archdep/eclipse-archdep.changes New Changes file: --- /dev/null 2006-06-16 15:54:00.000000000 +0200 +++ /mounts/work_src_done/STABLE/eclipse-archdep/eclipse.changes 2007-05-30 18:44:49.000000000 +0200 @@ -0,0 +1,13 @@ +------------------------------------------------------------------- +Wed May 30 18:40:01 CEST 2007 - dbornkessel(a)suse.de +- the original eclipse-* package and it's sub-packages are now renamed to eclipse-archdep-*; this is a noarch package now; in order to be complete, it needs the arch-dependent packages: + - eclipse-archdep-gtk2-<version>-<release>.<arch>.rpm + - eclipse-archdep-platform-<version>-<release>.<arch>.rpm + - libswt3-gtk2-<version>-<release>.<arch>.rpm + it creates the packges: + - eclipse-<version>-<release>.noarch.rpm + - eclipse-jdt-<version>-<release>.noarch.rpm + - eclipse-pde-<version>-<release>.noarch.rpm + - eclipse-platform-<version>-<release>.noarch.rpm + - eclipse-scripts-<version>-<release>.noarch.rpm + - eclipse-source-<version>-<release>.noarch.rpm New: ---- ecj-bootstrap.changes ecj-bootstrap.spec eclipse-32.png eclipse-archdep.changes eclipse-archdep.spec eclipse.changes eclipse.conf eclipse-gtk.install eclipse-jdt.install eclipse-pde.install eclipse-platform.install eclipse.script eclipse-sourceBuild-srcIncluded-3.3RC2.tar.bz2 eclipse-source.install eclipse.spec icon.xpm libswt3-gtk2.install manifest.ecj minmem README.subpacks ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ ecj-bootstrap.spec ++++++ # # spec file for package ecj-bootstrap (Version 0.755) # # Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine # package are under the same license as the package itself. # # Please submit bugfixes or comments via http://bugs.opensuse.org/ # # norootforbuild Name: ecj-bootstrap BuildRequires: fastjar gcc-gij gcc-java libgcj-devel unzip zip %define eclipse_version 3.3RC2 %define jarname eclipse-ecj License: Other uncritical OpenSource License Group: Development/Libraries/Java Autoreqprov: on Summary: Eclipse Java Compiler Version: 0.755 Release: 1 URL: http//www.eclipse.org Group: Development/Libraries/Java Source0: eclipse-sourceBuild-srcIncluded-%{eclipse_version}.tar.bz2 Source1: manifest.ecj #Source2: strange-mandriva-bug.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build #BuildArchitectures: noarch #ExclusiveArch: %ix86 BuildArch: noarch Provides: eclipse-ecj = %{eclipse_version} %description This is the Eclipse Java Compiler, which is used in the java-1_4_2-gcj-compat-devel package %prep #<<< package descriptions end #>>> %prep %setup -c -T ecj-bootstrap tar -jxf %{SOURCE0} jdtcoresrc/src #<<< #>>> %build %build #>>> some useful functions ... used throughout bootstrap packages TARGET_DIR=`pwd` CLASSPATH_ORIG="$CLASSPATH" LIB_GCJ="`ls %{_javadir}/libgcj-*.jar`" #>>> delete binary file and files not needed TARGET_DIR=`pwd` function delBinaryFiles() { set +x echo deleting binary files ... for file in `find . -name "*.class" -o -name "*.jar" -o -name "*DELETED-BY-PACKAGER*"` do rm -rf $file done set -x } #<<< #>>> make a string with all jar files found in target folder that can be used for a classpath string # string is saved in JAR_CLASSPATH function mkTargetClasspath() { set +x JAR_CLASSPATH="" for file in `find %{_javadir} -name "*.jar"` do JAR_CLASSPATH=$file:$JAR_CLASSPATH done set -x } #<<< #>>> compiles all *.java file in the current directory tree # uses mkTargetClasspath for CLASSPATH variable # uses LIB_GCJ for CLASSPATH function compileFiles() { mkTargetClasspath set +x COMPILE_CLASSPATH_PATH=.:${JAR_CLASSPATH} echo using: $COMPILER_COMMAND $COMPILE_CLASSPATH_PATH $$file export LANG=en_US find . -name "*.java" -exec $COMPILER_COMMAND $COMPILE_CLASSPATH_PATH {} + # for file in `find . -name "*.java"` # do # echo -e "$COMPILER_COMMAND $COMPILE_CLASSPATH_PATH $file ... \c" # $COMPILER_COMMAND $COMPILE_CLASSPATH_PATH $file # # check for errors # if [ $? != 0 ] # then # echo ERROR # exit 1; # fi # echo done # done set -x } #<<< #>>> make jar archive # PARAM#1: name of jar archive (without .jar suffix) # uses $TARGET_DIR to move created jar to function mkJar() { find -name "version.txt" -or -name "*.class" -or -name "*.properties" -or -name "*.rsc" -or -name "*manifest*" |\ xargs /usr/bin/fastjar -m manifest.* -cf ${1}.jar ; mv ${1}.jar $TARGET_DIR } #<<< COMPILER_COMMAND="gij -jar %{_javadir}/%{jarname}.jar -cp " #<<< end functions delBinaryFiles #>>> ecj compiler # we do this twice ... so let's create a function: function compileEcj() { pushd jdtcoresrc/src mkdir tmp cd tmp unzip ../ecj.zip # we have to delete the following class ... it needs ant to compile ... it will be left in later rm ./org/eclipse/jdt/core/JDTCompilerAdapter.java # copy the manifest ... cp %{SOURCE1} . # Mandriva does not compile without problems ... # /me ducks: # %if %{?mandriva_release:1}0 # if [ $1 = "stage1" ] # then # cat %{SOURCE2} | patch -p0 # fi # %endif compileFiles mkJar %{jarname} cd .. rm -r tmp popd } # compile with gcj COMPILER_COMMAND="gcj -Wno-deprecated -findirect-dispatch -Bsymbolic -C --classpath " compileEcj stage1 # compile with ecj COMPILER_COMMAND="gij -jar $TARGET_DIR/%{jarname}.jar -cp " compileEcj stage2 #>>> wrapper script # wrapper script to call ecj: # ecj script: mkdir -p $RPM_BUILD_ROOT/%{_bindir} cat >>$RPM_BUILD_ROOT/%{_bindir}/ecj<<EOF #!/bin/bash # remove double bootclasspath entries: BOOTCLASSPATH="" BOOTCLASSPATH=\$(find %{_javadir} -name "libgcj*.jar" -print | tr "\n" ":"):\$(find %{_javadir}/ -name "glibj*.jar" -print | tr "\n" ":") OPTIONS="" while [ \$# -gt 0 ] do if [ \$1 = "-bootclasspath" ] then BOOTCLASSPATH=\$2:\$BOOTCLASSPATH shift shift continue fi OPTIONS="\$OPTIONS \$1" shift done GIJ_EXECUTABLE=\$(ls /usr/bin/gij* | tail -n1) if [ -e /usr/bin/java ] then exec /usr/bin/java -jar %{_javadir}/%{jarname}.jar -bootclasspath \$BOOTCLASSPATH \$OPTIONS elif [ -e /usr/bin/cacao ] then exec /usr/bin/cacao -jar %{_javadir}/%{jarname}.jar -bootclasspath \$BOOTCLASSPATH \$OPTIONS elif [ -e ] then exec \$GIJ_EXECUTABLE -jar %{_javadir}/%{jarname}.jar -bootclasspath \$BOOTCLASSPATH \$OPTIONS else echo "no java vm found :(" exit -1 fi EOF #<<< wrapper script # build a jar with a correct manifest #mkdir manifest-tmp #pushd manifest-tmp #/usr/bin/fastjar -xf $TARGET_DIR/%{jarname}.jar #rm -r META-INF #/usr/bin/fastjar -m %{SOURCE1} -cf ../%{jarname}.jar * #popd # #<<< ecj compiler end #<<< #>>> install %install mkdir -p $RPM_BUILD_ROOT/%{_javadir} cp %{jarname}.jar $RPM_BUILD_ROOT/%{_javadir} ln -sf %{_javadir}/%{jarname}.jar $RPM_BUILD_ROOT/%{_javadir}/jdtcore.jar #<<< install end %clean rm -rf $RPM_BUILD_ROOT #>>> files %files %defattr(-,root,root) %{_javadir}/* %attr(0755,root,root) %{_bindir}/* #<<< # vim:fdm=marker:foldmarker=#>>>,#<<<:foldcolumn=6:foldlevel=42: %changelog * Wed May 30 2007 - dbornkessel(a)suse.de - update to version 0.755 which is included in eclipse 3.3 * Fri Mar 30 2007 - rguenther(a)suse.de - add unzip BuildRequires * Wed Nov 15 2006 - dbornkessel(a)suse.de - corrections in eclipse package only * Wed Oct 04 2006 - dbornkessel(a)suse.de - update of eclipse archive to 3.2.1 / ecj 0.670 * Thu Sep 28 2006 - ro(a)suse.de - added gcc-gij to BuildRequires * Mon Sep 18 2006 - dbornkessel(a)suse.de - first version of ecj-bootstrap package ++++++ eclipse-archdep.spec ++++++ ++++ 609 lines (skipped) ++++++ eclipse.spec ++++++ # # spec file for package eclipse (Version 3.3RC2) # # Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine # package are under the same license as the package itself. # # Please submit bugfixes or comments via http://bugs.opensuse.org/ # # norootforbuild # icecream 0 Name: eclipse %define archdepname %{name}-archdep # build requires are minimal for 3.2 ... checked it! BuildRequires: %{archdepname} %{archdepname}-jdt %{archdepname}-pde %{archdepname}-platform-commons %{archdepname}-scripts %{archdepname}-source fdupes libswt3-gtk2 unzip # Uncomment if you want to test eclipse in the chroot environment: #BuildRequires: agfa-fonts ant fontconfig fonts-config gcc-c++ ghostscript-fonts-other ghostscript-fonts-std gnutls-devel jakarta-commons-logging libglade2-devel libgnomeprintui-devel libgnomeui-devel libwnck-devel mDNSResponder-devel openmotif regexp servlet23 servletapi5 update-alternatives update-desktop-files xml-commons-apis xorg-x11 xorg-x11-fonts-100dpi xorg-x11-fonts-75dpi xorg-x11-fonts-scalable zip java-1_5_0-devel %define pkg_summary An open extensible IDE %define section free %define swt_version 3063 %define corelib_version 3.3RC2 %define eclipse_major 3 %define eclipse_minor 3RC2 %define eclipse_majmin %{eclipse_major}.%{eclipse_minor} %define eclipse_micro 1 %define libname libswt3 Summary: Eclipse Platform and Java IDE Version: 3.3RC2 Release: 1 License: Any permissive Group: Development/Tools/IDE URL: http://www.eclipse.org BuildRoot: %{_tmppath}/%{name}-%{version}-build Requires: %{archdepname}-gtk2 BuildArch: noarch %description The Eclipse Platform is designed for building integrated development environments (IDEs) that can be extended by custom plug-ins. The base distribution also contains a full-featured Java development environment. NOTE: Although it runs with the open source gcj Java, it is advisable to install SUN's, IBM's or BEA's Java (java-1_4_2-sun,java-1_5_0-sun,java-1_4_2-ibm, java-1_5_0-ibm or java-1_4_2-bea) due to performance reasons. Authors: -------- IBM %package platform Summary: Eclipse platform common files Group: Development/Tools/IDE Requires: ant, regexp >= 1.2 # xml-commons-apis disabled due to # http://developer.java.sun.com/developer/bugParade/bugs/4749727.html #Requires: xml-commons-apis Requires: jakarta-commons-logging Requires: servlet23 Provides: eclipse:/opt/eclipse/eclipse Obsoletes: %{name}-sdk Provides: %{name}-sdk Requires: %{archdepname}-platform %description platform The Eclipse Platform is designed for building integrated development environments (IDEs) which can be extended by custom plugins. This package contains the Eclipse platform common files. In addition to this, you'll need the startup scripts and a UI package (GTK2) to be able to run the IDE. Authors: -------- IBM %package jdt Summary: Eclipse Java development tools Group: Development/Tools/IDE Requires: %{name}-ui = %{version}, junit %description jdt The Eclipse Platform is designed for building integrated development environments (IDEs) which can be extended by custom plugins. This package contains the Eclipse Java development tools, a full-featured Java development environment. Authors: -------- IBM %package source Summary: Eclipse Source Group: Development/Tools/IDE %description source The Eclipse Platform is designed for building integrated development environments (IDEs) which can be extended by custom plugins. This package contains the sources for the Eclipse Platform and Java IDE. Authors: -------- IBM %package pde Summary: Eclipse Plugin Development Environment Group: Development/Tools/IDE Requires: %{name}-ui = %{version} Requires: %{name}-source = %{version} %description pde The Eclipse Platform is designed for building integrated development environments (IDEs) which can be extended by custom plugins. This package contains the Eclipse Plugin Development Environment. Authors: -------- IBM %package scripts Summary: Eclipse Platform and Java IDE startup scripts Group: Development/Tools/IDE Requires: %{name}-ui = %{version} Requires: /usr/bin/perl %description scripts The Eclipse Platform is designed for building integrated development environments (IDEs) which can be extended by custom plugins. This package contains the Eclipse startup scripts. Authors: -------- IBM %prep %build %install export NO_BRP_CHECK_BYTECODE_VERSION="true" mkdir -p $RPM_BUILD_ROOT/%{_datadir}/%{name} for rpm in %{archdepname} %{archdepname}-jdt %{archdepname}-pde %{archdepname}-platform-commons %{archdepname}-scripts %{archdepname}-source do FILES=$( echo $rpm | sed "s/%{archdepname}/eclipse/").files for file in $( rpm -q --list $rpm | sort ) do DESTDIR=$RPM_BUILD_ROOT/$(dirname $file) if [ -d $file ] then mkdir -p $DESTDIR/$file echo "%dir $file" >> $FILES continue fi if [ ! -e $DESTDIR ] then mkdir -p $DESTDIR fi echo $file >> $FILES cp $file $DESTDIR done done # hardlink duplicates: # add files that should not be hardlinked here: function hardlink_duplicates() { IFS=" " # get all duplicates: for dup in $(fdupes -r -n -1 .) do IFS=" "; # handle each duplicate-tuple for file in $dup do # the first file will be taken as the original file if [ -z "$ORIG_FILE" ] then ORIG_FILE=$file; else # test, whether file is on the ignore list: if [ -n "$IGNORE_FILENAMES" ] then for ignorefile in "$IGNORE_FILENAMES" do if echo "$ORIG_FILE" | grep "$ignorefile" || echo "$file" | grep "$ignorefile" then printf '%%-55s -> %s -- #IGNORED\n' $ORIG_FILE $file >> %{_builddir}/HARDLINKS.txt IGNORE=true fi break done fi if [ "$IGNORE" = false ] then # link file ln -f $ORIG_FILE $file; printf '%%-65s -> %s\n' $ORIG_FILE $file >> %{_builddir}/HARDLINKS.txt fi IGNORE=false fi; done; ORIG_FILE=""; IFS=" "; done IFS=" " } cd $RPM_BUILD_ROOT IGNORE_FILENAMES="" hardlink_duplicates %clean rm -rf $RPM_BUILD_ROOT %files -f eclipse.files %defattr(-,root,root,-) %files platform -f eclipse-platform-commons.files %defattr(-,root,root,-) %files jdt -f eclipse-jdt.files %defattr(-,root,root,-) %files source -f eclipse-source.files %defattr(-,root,root,-) %files pde -f eclipse-pde.files %defattr(-,root,root,-) %files scripts -f eclipse-scripts.files %defattr(-,root,root,-) %changelog * Wed May 30 2007 - dbornkessel(a)suse.de - the original eclipse-* package and it's sub-packages are now renamed to eclipse-archdep-*; this is a noarch package now; in order to be complete, it needs the arch-dependent packages: - eclipse-archdep-gtk2-<version>-<release>.<arch>.rpm - eclipse-archdep-platform-<version>-<release>.<arch>.rpm - libswt3-gtk2-<version>-<release>.<arch>.rpm it creates the packges: - eclipse-<version>-<release>.noarch.rpm - eclipse-jdt-<version>-<release>.noarch.rpm - eclipse-pde-<version>-<release>.noarch.rpm - eclipse-platform-<version>-<release>.noarch.rpm - eclipse-scripts-<version>-<release>.noarch.rpm - eclipse-source-<version>-<release>.noarch.rpm ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit inn
by root＠Hilbert.suse.de 30 May '07

30 May '07

Hello community, here is the log from the commit of package inn checked in at Wed May 30 19:33:31 CEST 2007. -------- --- inn/inn.changes 2007-04-02 11:49:57.000000000 +0200 +++ /mounts/work_src_done/STABLE/inn/inn.changes 2007-05-30 16:30:10.552156000 +0200 @@ -1,0 +2,6 @@ +Wed May 30 15:02:17 CEST 2007 - mls(a)suse.de + +- split devel package +- remove some file duplicates + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ inn.spec ++++++ --- /var/tmp/diff_new_pack.m21070/_old 2007-05-30 19:32:51.000000000 +0200 +++ /var/tmp/diff_new_pack.m21070/_new 2007-05-30 19:32:51.000000000 +0200 @@ -20,7 +20,7 @@ PreReq: perl %fillup_prereq %insserv_prereq permissions Autoreqprov: on Version: 2.4.2 -Release: 56 +Release: 70 %define PatchVersion -%{version} Source: inn%{PatchVersion}.tar.bz2 Source1: doc-inn.tar.bz2 @@ -44,6 +44,27 @@ Vince Skahan <vince(a)atc.boeing.com> Arjan de Vet <devet(a)adv.win.tue.nl> +%package devel +Requires: %name = %version +Summary: InterNetNews development files +License: GNU General Public License (GPL) +Group: Productivity/Networking/News/Servers + +%description devel +Rich Salz's InterNetNews news transport system. + +This package contains the files needed to develop software depending on +inn. + + + +Authors: +-------- + Rich Salz <rsalz(a)osf.org> + Andreas Klemm <andreas(a)knobel.gun.de> + Vince Skahan <vince(a)atc.boeing.com> + Arjan de Vet <devet(a)adv.win.tue.nl> + %package -n mininews Summary: Inews - Post News from an NNTP Client Group: Productivity/Networking/News/Utilities @@ -102,8 +123,12 @@ # make DESTDIR=%{buildroot} OWNER= ROWNER= install gzip -nf9 %{buildroot}%{_mandir}/*/* -chmod 444 %{buildroot}/usr/lib/news/lib/libinn.a -chmod 444 %{buildroot}/usr/lib/news/lib/libstorage.a +chmod 444 %{buildroot}/usr/lib/news/lib/*.a +# those just die("BerkeleyDB support not compiled"); +rm %{buildroot}/usr/lib/news/bin/ovdb_server +rm %{buildroot}/usr/lib/news/bin/ovdb_stat +ln %{buildroot}/usr/lib/news/bin/ovdb_init %{buildroot}/usr/lib/news/bin/ovdb_server +ln %{buildroot}/usr/lib/news/bin/ovdb_init %{buildroot}/usr/lib/news/bin/ovdb_stat # # # @@ -184,6 +209,8 @@ ' > %{filelist} find %{buildroot} ! -type d -printf "/%%P\n" | awk ' { pfx="" } +/^\/usr\/lib\/news\/include/ { next } +/^\/usr\/lib\/news\/lib\/.*\.a/ { next } $0 == "/etc/init.d/inn" { pfx="%attr(750,root,news) %config " } $0 == "/usr/lib/news/bin/inews" { pfx="%attr(2555,news,news) " } $0 == "/usr/lib/news/bin/rnews" { pfx="%attr(4550,news,uucp) " } @@ -243,9 +270,14 @@ %defattr(-,root,root) %dir /etc/slp.reg.d %config(noreplace) /etc/slp.reg.d/inn.reg -%doc CONTRIBUTORS LICENSE ChangeLog INSTALL NEWS README* +%doc ChangeLog NEWS INSTALL README* %doc doc-inn/* +%files devel +%defattr(-,root,root) +/usr/lib/news/include +/usr/lib/news/lib/*.a + %files -n mininews %defattr(-,root,root) %config(noreplace) /etc/news/inn.conf @@ -258,6 +290,9 @@ %doc %{_mandir}/*/[ri]news.* %changelog +* Wed May 30 2007 - mls(a)suse.de +- split devel package +- remove some file duplicates * Mon Apr 02 2007 - rguenther(a)suse.de - Add gdbm-devel BuildRequires. * Thu Mar 29 2007 - rguenther(a)suse.de ++++++ inn-2.4.2.dif ++++++ --- /var/tmp/diff_new_pack.m21070/_old 2007-05-30 19:32:51.000000000 +0200 +++ /var/tmp/diff_new_pack.m21070/_new 2007-05-30 19:32:51.000000000 +0200 @@ -599,18 +599,19 @@ +export PATH --- rc +++ rc -@@ -0,0 +1,67 @@ +@@ -0,0 +1,68 @@ +#! /bin/sh +# +# Copyright (c) 1998 Florian La Roche +# +### BEGIN INIT INFO +# Provides: -+# Required-Start: $network $named ++# Required-Start: $network $named +# Required-Stop: -+# Default-Start: 3 5 ++# Default-Start: 3 5 +# Default-Stop: -+# Description: Inter Net News Server (INN) ++# Short-Description: Inter Net News Server (INN) ++# Description: Inter Net News Server (INN) +### END INIT INFO + +. /etc/rc.status ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit gftp
by root＠Hilbert.suse.de 30 May '07

30 May '07

Hello community, here is the log from the commit of package gftp checked in at Wed May 30 19:15:29 CEST 2007. -------- --- GNOME/gftp/gftp.changes 2007-04-26 17:35:21.000000000 +0200 +++ /mounts/work_src_done/STABLE/gftp/gftp.changes 2007-05-30 19:01:38.000000000 +0200 @@ -1,0 +2,5 @@ +Wed May 30 19:01:29 CEST 2007 - sbrabec(a)suse.cz + +- Require jadetex for build. + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ gftp.spec ++++++ --- /var/tmp/diff_new_pack.C30498/_old 2007-05-30 19:15:07.000000000 +0200 +++ /var/tmp/diff_new_pack.C30498/_new 2007-05-30 19:15:07.000000000 +0200 @@ -11,12 +11,12 @@ # norootforbuild Name: gftp -BuildRequires: docbook-toys gtk2-devel indent openssl-devel readline-devel texlive update-desktop-files +BuildRequires: docbook-toys gtk2-devel indent jadetex openssl-devel readline-devel texlive update-desktop-files License: GNU General Public License (GPL) Group: Productivity/Networking/Ftp/Clients Autoreqprov: on Version: 2.0.18 -Release: 70 +Release: 82 Source0: %{name}-%{version}.tar.bz2 URL: http://gftp.seul.org/ BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -77,6 +77,8 @@ %doc %{_mandir}/man?/*.* %changelog +* Wed May 30 2007 - sbrabec(a)suse.cz +- Require jadetex for build. * Thu Apr 26 2007 - ro(a)suse.de - build with texlive * Mon Apr 23 2007 - sbrabec(a)suse.cz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit yast2-trans-ru
by root＠Hilbert.suse.de 30 May '07

30 May '07

Hello community, here is the log from the commit of package yast2-trans-ru checked in at Wed May 30 19:05:51 CEST 2007. -------- --- yast2-trans-ru/yast2-trans-ru.changes 2007-05-22 17:18:22.000000000 +0200 +++ /mounts/work_src_done/NOARCH/yast2-trans-ru/yast2-trans-ru.changes 2007-05-30 15:16:24.000000000 +0200 @@ -1,0 +2,5 @@ +Wed May 30 15:16:24 2007 - ke(a)suse.de + +- Update to version 2.15.5. + +------------------------------------------------------------------------ Old: ---- yast2-trans-ru-2.15.4.tar.bz2 New: ---- yast2-trans-ru-2.15.5.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-trans-ru.spec ++++++ --- /var/tmp/diff_new_pack.a30168/_old 2007-05-30 19:05:47.000000000 +0200 +++ /var/tmp/diff_new_pack.a30168/_new 2007-05-30 19:05:47.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package yast2-trans-ru (Version 2.15.4) +# spec file for package yast2-trans-ru (Version 2.15.5) # # Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine @@ -11,12 +11,12 @@ # norootforbuild Name: yast2-trans-ru -Version: 2.15.4 +Version: 2.15.5 Release: 1 License: GNU General Public License (GPL) Group: System/YaST BuildRoot: %{_tmppath}/%{name}-%{version}-build -Source0: yast2-trans-ru-2.15.4.tar.bz2 +Source0: yast2-trans-ru-2.15.5.tar.bz2 prefix: /usr Provides: locale(yast2:ru) BuildRequires: pkgconfig yast2-devtools @@ -31,7 +31,7 @@ YaST2 - Russian Translations %prep -%setup -n yast2-trans-ru-2.15.4 +%setup -n yast2-trans-ru-2.15.5 %build autoreconf --force --install @@ -63,6 +63,8 @@ /usr/share/YaST2/locale %changelog +* Wed May 30 2007 - ke(a)suse.de +- Update to version 2.15.5. * Tue May 22 2007 - ke(a)suse.de - Update to version 2.15.4. * Fri May 04 2007 - ke(a)suse.de ++++++ yast2-trans-ru-2.15.4.tar.bz2 -> yast2-trans-ru-2.15.5.tar.bz2 ++++++ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-trans-ru-2.15.4/configure new/yast2-trans-ru-2.15.5/configure --- old/yast2-trans-ru-2.15.4/configure 2007-05-22 17:18:33.000000000 +0200 +++ new/yast2-trans-ru-2.15.5/configure 2007-05-30 15:16:35.000000000 +0200 @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.60 for yast2-trans-ru 2.15.4. +# Generated by GNU Autoconf 2.60 for yast2-trans-ru 2.15.5. # # Report bugs to <http://bugs.opensuse.org/>. # @@ -559,8 +559,8 @@ # Identity of this package. PACKAGE_NAME='yast2-trans-ru' PACKAGE_TARNAME='yast2-trans-ru' -PACKAGE_VERSION='2.15.4' -PACKAGE_STRING='yast2-trans-ru 2.15.4' +PACKAGE_VERSION='2.15.5' +PACKAGE_STRING='yast2-trans-ru 2.15.5' PACKAGE_BUGREPORT='http://bugs.opensuse.org/' ac_unique_file="RPMNAME" @@ -1185,7 +1185,7 @@ # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures yast2-trans-ru 2.15.4 to adapt to many kinds of systems. +\`configure' configures yast2-trans-ru 2.15.5 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1256,7 +1256,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of yast2-trans-ru 2.15.4:";; + short | recursive ) echo "Configuration of yast2-trans-ru 2.15.5:";; esac cat <<\_ACEOF @@ -1336,7 +1336,7 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -yast2-trans-ru configure 2.15.4 +yast2-trans-ru configure 2.15.5 generated by GNU Autoconf 2.60 Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, @@ -1350,7 +1350,7 @@ This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by yast2-trans-ru $as_me 2.15.4, which was +It was created by yast2-trans-ru $as_me 2.15.5, which was generated by GNU Autoconf 2.60. Invocation command line was $ $0 $@ @@ -2151,7 +2151,7 @@ # Define the identity of the package. PACKAGE='yast2-trans-ru' - VERSION='2.15.4' + VERSION='2.15.5' cat >>confdefs.h <<_ACEOF @@ -2378,7 +2378,7 @@ -VERSION="2.15.4" +VERSION="2.15.5" RPMNAME="yast2-trans-ru" MAINTAINER="Karl Eichwalder <ke(a)suse.de>" @@ -3313,7 +3313,7 @@ # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by yast2-trans-ru $as_me 2.15.4, which was +This file was extended by yast2-trans-ru $as_me 2.15.5, which was generated by GNU Autoconf 2.60. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -3356,7 +3356,7 @@ _ACEOF cat >>$CONFIG_STATUS <<_ACEOF ac_cs_version="\\ -yast2-trans-ru config.status 2.15.4 +yast2-trans-ru config.status 2.15.5 configured by $0, generated by GNU Autoconf 2.60, with options \\"`echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\" diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-trans-ru-2.15.4/configure.in new/yast2-trans-ru-2.15.5/configure.in --- old/yast2-trans-ru-2.15.4/configure.in 2007-05-22 17:18:29.000000000 +0200 +++ new/yast2-trans-ru-2.15.5/configure.in 2007-05-30 15:16:31.000000000 +0200 @@ -3,7 +3,7 @@ dnl -- This file is generated by y2autoconf 2.14.0 - DO NOT EDIT! -- dnl (edit configure.in.in instead) -AC_INIT(yast2-trans-ru, 2.15.4, http://bugs.opensuse.org/, yast2-trans-ru) +AC_INIT(yast2-trans-ru, 2.15.5, http://bugs.opensuse.org/, yast2-trans-ru) 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.15.4" +VERSION="2.15.5" RPMNAME="yast2-trans-ru" MAINTAINER="Karl Eichwalder <ke(a)suse.de>" diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-trans-ru-2.15.4/po/ftp-server.ru.po new/yast2-trans-ru-2.15.5/po/ftp-server.ru.po --- old/yast2-trans-ru-2.15.4/po/ftp-server.ru.po 2007-05-22 16:29:56.000000000 +0200 +++ new/yast2-trans-ru-2.15.5/po/ftp-server.ru.po 2007-05-30 14:47:41.000000000 +0200 @@ -12,9 +12,9 @@ "Project-Id-Version: ftp-server.ru\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2007-04-16 15:38+0200\n" -"PO-Revision-Date: 2007-05-14 10:38+0400\n" +"PO-Revision-Date: 2007-05-28 21:59+0400\n" "Last-Translator: Aleksey Osipov <aliks-os(a)yandex.ru>\n" -"Language-Team: Russian <i18n(a)suse.org>\n" +"Language-Team: Russian <i18n(a)suse.de>\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" @@ -197,9 +197,8 @@ msgstr "p&ure-ftpd" #: src/dialogs.ycp:191 -#, fuzzy msgid "Switch the daemon" -msgstr "Переключится в ждущий режим" +msgstr "Переключить демон" #. TRANSLATORS: part of dialog caption #: src/dialogs.ycp:280 @@ -259,9 +258,8 @@ msgstr "Настройки Э&ксперта" #: src/ftp-server.ycp:42 -#, fuzzy msgid "Display Settings:" -msgstr "Настройки почты" +msgstr "Показать настройки:" #. start-up settings #. TRANSLATORS: CommandLine header @@ -271,23 +269,20 @@ msgstr "Запуск:" #: src/ftp-server.ycp:47 -#, fuzzy msgid "FTP daemon is started via xinetd" -msgstr "NTP демон отключен." +msgstr "FTP запущен через xinetd" # Translators: In autoinstallation mode: # The package name is stored in %1. This is Popup::ContinueCancel. #. TRANSLATORS: CommandLine informative text #: src/ftp-server.ycp:51 -#, fuzzy msgid "FTP daemon is enabled in the boot process" -msgstr "Брандмауэр включен в процессе загрузки" +msgstr "FTP демон включен в процессе загрузки системы" #. TRANSLATORS: CommandLine informative text #: src/ftp-server.ycp:54 -#, fuzzy msgid "FTP daemon needs manual starting" -msgstr "Брандмауэр нуждается в ручном запуске" +msgstr "FTP демон должен быть запущен вручную" #. logging settings #: src/ftp-server.ycp:58 @@ -348,7 +343,7 @@ #. port range #: src/ftp-server.ycp:123 msgid "Port Range: " -msgstr "Диапазон портов:" +msgstr "Диапазон портов: " #: src/ftp-server.ycp:126 src/ftp-server.ycp:447 msgid " - " @@ -417,15 +412,13 @@ # check box label - restore option #: src/ftp-server.ycp:192 -#, fuzzy msgid "Create Directories: ENABLED" -msgstr "Создать только&Дерево Каталогов" +msgstr "Создание каталогов: РАЗРЕШЕНО" # check box label - restore option #: src/ftp-server.ycp:194 -#, fuzzy msgid "Create Directories: DISABLED" -msgstr "Создать только&Дерево Каталогов" +msgstr "Создание каталогов: ЗАПРЕЩЕНО" #: src/ftp-server.ycp:199 msgid "Welcome message: " @@ -548,7 +541,7 @@ #: src/ftp-server.ycp:383 msgid "Anonymous directory:" -msgstr "Анонимный каталог:" +msgstr "Каталог для анонимных пользователей:" #: src/ftp-server.ycp:388 src/ftp-server.ycp:418 msgid "Option is empty." @@ -570,9 +563,8 @@ msgstr "Проверенные пользователи:" #: src/ftp-server.ycp:413 -#, fuzzy msgid "Authenticated directory:" -msgstr "аутентификация через eDirectory" +msgstr "Каталог для проверенных пользователей:" #: src/ftp-server.ycp:436 msgid "Port range:" @@ -834,12 +826,12 @@ #. TRANSLATORS: CommandLine help #: src/ftp-server.ycp:930 msgid "The port range for passive connection replies" -msgstr "" +msgstr "Диапазон портов для пассивных соединений" #. TRANSLATORS: CommandLine help #: src/ftp-server.ycp:939 msgid "The maximum Idle Time in minutes" -msgstr "Максимальное время ожидания в минутах." +msgstr "Максимальное время ожидания в минутах" #. TRANSLATORS: CommandLine help #: src/ftp-server.ycp:948 @@ -935,12 +927,12 @@ #. TRANSLATORS: CommandLine help #: src/ftp-server.ycp:1119 msgid "The minimum value for port range for passive connection replies." -msgstr "" +msgstr "Минимальное значение портов для пассивных соединений." #. TRANSLATORS: CommandLine help #: src/ftp-server.ycp:1125 msgid "The maximum value for port range for passive connection replies." -msgstr "" +msgstr "Максимальное значение портов для пассивных соединений." #. TRANSLATORS: CommandLine help #: src/ftp-server.ycp:1131 @@ -1189,6 +1181,8 @@ "Both \n" "If enabled authenticated users and anonymous are permitted.\n" msgstr "" +"Все \n" +"Если включено, то разрешены и проверенные и анонимные пользователи.\n" #. anonymous settings anonymous can't upload dialog help 5/6 #: src/helps.ycp:140 diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-trans-ru-2.15.4/po/kerberos-server.ru.po new/yast2-trans-ru-2.15.5/po/kerberos-server.ru.po --- old/yast2-trans-ru-2.15.4/po/kerberos-server.ru.po 2007-05-22 16:30:15.000000000 +0200 +++ new/yast2-trans-ru-2.15.5/po/kerberos-server.ru.po 2007-05-30 10:17:50.000000000 +0200 @@ -12,7 +12,7 @@ "Project-Id-Version: kerberos-server.ru\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2007-04-16 15:40+0200\n" -"PO-Revision-Date: 2007-05-08 12:31+0400\n" +"PO-Revision-Date: 2007-05-30 09:31+0400\n" "Last-Translator: Aleksey Osipov <aliks-os(a)yandex.ru>\n" "Language-Team: Russian <i18n(a)suse.org>\n" "MIME-Version: 1.0\n" @@ -201,16 +201,14 @@ #. Treeview list item #: src/advanced_items.ycp:662 src/advanced_items.ycp:693 #: src/advanced_items.ycp:878 src/advanced_items.ycp:990 -#, fuzzy msgid "Maximum Ticket Life Time" -msgstr "&Время действия мандата по умолчанию" +msgstr "Время действия мандата" #. Treeview list item #: src/advanced_items.ycp:664 src/advanced_items.ycp:695 #: src/advanced_items.ycp:895 src/advanced_items.ycp:1007 -#, fuzzy msgid "Maximum Ticket Renew Time" -msgstr "Максимальное время распределения: %1" +msgstr "Максимальное время обновления мандата" # frame label #. Treeview list item @@ -284,9 +282,8 @@ #. checkbox text in MultiSelectionBox #: src/advanced_items.ycp:772 src/advanced_items.ycp:1031 -#, fuzzy msgid "Allow forwardable" -msgstr "&Перенаправление" +msgstr "Разрешить перенаправление" #. checkbox text in MultiSelectionBox #: src/advanced_items.ycp:775 src/advanced_items.ycp:1034 diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-trans-ru-2.15.4/po/ldap-server.ru.po new/yast2-trans-ru-2.15.5/po/ldap-server.ru.po --- old/yast2-trans-ru-2.15.4/po/ldap-server.ru.po 2007-04-23 15:23:22.000000000 +0200 +++ new/yast2-trans-ru-2.15.5/po/ldap-server.ru.po 2007-05-30 10:17:51.000000000 +0200 @@ -12,7 +12,7 @@ "Project-Id-Version: ldap-server.ru\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2007-04-16 15:35+0200\n" -"PO-Revision-Date: 2007-04-22 20:48+0400\n" +"PO-Revision-Date: 2007-05-30 09:48+0400\n" "Last-Translator: Aleksey Osipov <aliks-os(a)yandex.ru>\n" "Language-Team: Russian <i18n(a)suse.org>\n" "MIME-Version: 1.0\n" @@ -69,18 +69,18 @@ #. Progress step 1/3 #: src/LdapServer.pm:443 msgid "Reading the database list..." -msgstr "Чтение списка баз данных..." +msgstr "Читается список баз данных..." #. Progress step 2/3 #: src/LdapServer.pm:445 msgid "Reading the databases..." -msgstr "Чтение баз данных ... " +msgstr "Читаются базы данных ... " # translators: progress step 1/4 #. Progress step 3/3 #: src/LdapServer.pm:447 msgid "Reading global options..." -msgstr "Читаются общих настроек..." +msgstr "Читаются общие настройки..." #. Progress finished #: src/LdapServer.pm:449 src/LdapServer.pm:572 src/LdapServer.pm:734 diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-trans-ru-2.15.4/po/samba-server.ru.po new/yast2-trans-ru-2.15.5/po/samba-server.ru.po --- old/yast2-trans-ru-2.15.4/po/samba-server.ru.po 2007-05-22 16:31:09.000000000 +0200 +++ new/yast2-trans-ru-2.15.5/po/samba-server.ru.po 2007-05-30 14:48:53.000000000 +0200 @@ -12,7 +12,7 @@ "Project-Id-Version: samba-server.ru\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2007-04-16 15:42+0200\n" -"PO-Revision-Date: 2007-05-05 12:21+0400\n" +"PO-Revision-Date: 2007-05-28 21:42+0400\n" "Last-Translator: Aleksey Osipov <aliks-os(a)yandex.ru>\n" "Language-Team: Russian <i18n(a)suse.org>\n" "MIME-Version: 1.0\n" @@ -768,7 +768,7 @@ #. dialog caption #: src/dialogs.ycp:1071 msgid "User Information Sources" -msgstr "Источники пользовательской информации" +msgstr "Место хранения информации о пользователях" #: src/dialogs.ycp:1114 msgid "" @@ -1627,7 +1627,7 @@ #. translators: command line help text for backend selection action #: src/samba-server.ycp:247 msgid "Set the back-end for storing user information" -msgstr "Задайте базу данных для хранения пользовательской информации" +msgstr "Задайте базу данных для хранения информации о пользователях" # translators: command line help text for service activation action #. translators: command line help text for service activation action @@ -1760,7 +1760,7 @@ #. translators: command line help text for smbpasswd option #: src/samba-server.ycp:348 msgid "Use the 'smbpasswd' file to store user information" -msgstr "Использовать файл 'smbpasswd' для хранения пользовательской информации" +msgstr "Использовать файл 'smbpasswd' для хранения информации о пользователях" # translators: command line help text for smbpasswd option #. translators: command line help text for tdbsam option @@ -1772,7 +1772,7 @@ #. translators: command line help text for ldapsam option #: src/samba-server.ycp:356 msgid "Use the LDAP server to store user information" -msgstr "Использовать LDAP сервер для хранения пользовательской информации" +msgstr "Использовать LDAP сервер для хранения информации о пользователях" # translators: command line help text for add option #. translators: command line help text for password option @@ -1795,7 +1795,7 @@ #. translators: command line help text for ldap_suffix option #: src/samba-server.ycp:374 msgid "The LDAP suffix DN for manipulating the user information on the LDAP server" -msgstr "LDAP добавляет DN для управления пользовательской информацией на LDAP сервере" +msgstr "LDAP добавляет DN для управления информацией о пользователях на LDAP сервере" # translators: command line help text for ldap_admin_dn option #. translators: command line help text for ldap_admin_dn option diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-trans-ru-2.15.4/po/status.txt new/yast2-trans-ru-2.15.5/po/status.txt --- old/yast2-trans-ru-2.15.4/po/status.txt 2007-05-22 16:31:47.000000000 +0200 +++ new/yast2-trans-ru-2.15.5/po/status.txt 2007-05-30 14:49:30.000000000 +0200 @@ -1,6 +1,6 @@ -Translated : 16845 -Fuzzy : 43 -Untranslated : 36 +Translated : 16860 +Fuzzy : 32 +Untranslated : 32 -------------------- All strings : 16924 100 % are translated diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-trans-ru-2.15.4/VERSION new/yast2-trans-ru-2.15.5/VERSION --- old/yast2-trans-ru-2.15.4/VERSION 2007-05-22 17:18:22.000000000 +0200 +++ new/yast2-trans-ru-2.15.5/VERSION 2007-05-30 15:16:24.000000000 +0200 @@ -1 +1 @@ -2.15.4 +2.15.5 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit yast2-trans-pt
by root＠Hilbert.suse.de 30 May '07

30 May '07

Hello community, here is the log from the commit of package yast2-trans-pt checked in at Wed May 30 19:05:41 CEST 2007. -------- --- yast2-trans-pt/yast2-trans-pt.changes 2007-05-22 17:22:12.000000000 +0200 +++ /mounts/work_src_done/NOARCH/yast2-trans-pt/yast2-trans-pt.changes 2007-05-30 15:25:18.000000000 +0200 @@ -1,0 +2,5 @@ +Wed May 30 15:25:18 2007 - ke(a)suse.de + +- Update to version 2.15.2. + +------------------------------------------------------------------------ Old: ---- yast2-trans-pt-2.15.1.tar.bz2 New: ---- yast2-trans-pt-2.15.2.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-trans-pt.spec ++++++ --- /var/tmp/diff_new_pack.j29050/_old 2007-05-30 19:05:36.000000000 +0200 +++ /var/tmp/diff_new_pack.j29050/_new 2007-05-30 19:05:36.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package yast2-trans-pt (Version 2.15.1) +# spec file for package yast2-trans-pt (Version 2.15.2) # # Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine @@ -11,12 +11,12 @@ # norootforbuild Name: yast2-trans-pt -Version: 2.15.1 +Version: 2.15.2 Release: 1 License: GNU General Public License (GPL) Group: System/YaST BuildRoot: %{_tmppath}/%{name}-%{version}-build -Source0: yast2-trans-pt-2.15.1.tar.bz2 +Source0: yast2-trans-pt-2.15.2.tar.bz2 prefix: /usr Provides: locale(yast2:pt) BuildRequires: pkgconfig yast2-devtools @@ -33,7 +33,7 @@ %prep -%setup -n yast2-trans-pt-2.15.1 +%setup -n yast2-trans-pt-2.15.2 %build autoreconf --force --install @@ -65,6 +65,8 @@ /usr/share/YaST2/locale %changelog +* Wed May 30 2007 - ke(a)suse.de +- Update to version 2.15.2. * Tue May 22 2007 - ke(a)suse.de - Update to version 2.15.1. * Thu Jan 25 2007 - ke(a)suse.de ++++++ yast2-trans-pt-2.15.1.tar.bz2 -> yast2-trans-pt-2.15.2.tar.bz2 ++++++ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-trans-pt-2.15.1/configure new/yast2-trans-pt-2.15.2/configure --- old/yast2-trans-pt-2.15.1/configure 2007-05-22 17:22:23.000000000 +0200 +++ new/yast2-trans-pt-2.15.2/configure 2007-05-30 15:25:28.000000000 +0200 @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.60 for yast2-trans-pt 2.15.1. +# Generated by GNU Autoconf 2.60 for yast2-trans-pt 2.15.2. # # Report bugs to <http://bugs.opensuse.org/>. # @@ -559,8 +559,8 @@ # Identity of this package. PACKAGE_NAME='yast2-trans-pt' PACKAGE_TARNAME='yast2-trans-pt' -PACKAGE_VERSION='2.15.1' -PACKAGE_STRING='yast2-trans-pt 2.15.1' +PACKAGE_VERSION='2.15.2' +PACKAGE_STRING='yast2-trans-pt 2.15.2' PACKAGE_BUGREPORT='http://bugs.opensuse.org/' ac_unique_file="RPMNAME" @@ -1185,7 +1185,7 @@ # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures yast2-trans-pt 2.15.1 to adapt to many kinds of systems. +\`configure' configures yast2-trans-pt 2.15.2 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1256,7 +1256,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of yast2-trans-pt 2.15.1:";; + short | recursive ) echo "Configuration of yast2-trans-pt 2.15.2:";; esac cat <<\_ACEOF @@ -1336,7 +1336,7 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -yast2-trans-pt configure 2.15.1 +yast2-trans-pt configure 2.15.2 generated by GNU Autoconf 2.60 Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, @@ -1350,7 +1350,7 @@ This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by yast2-trans-pt $as_me 2.15.1, which was +It was created by yast2-trans-pt $as_me 2.15.2, which was generated by GNU Autoconf 2.60. Invocation command line was $ $0 $@ @@ -2151,7 +2151,7 @@ # Define the identity of the package. PACKAGE='yast2-trans-pt' - VERSION='2.15.1' + VERSION='2.15.2' cat >>confdefs.h <<_ACEOF @@ -2378,7 +2378,7 @@ -VERSION="2.15.1" +VERSION="2.15.2" RPMNAME="yast2-trans-pt" MAINTAINER="Karl Eichwalder <ke(a)suse.de>" @@ -3313,7 +3313,7 @@ # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by yast2-trans-pt $as_me 2.15.1, which was +This file was extended by yast2-trans-pt $as_me 2.15.2, which was generated by GNU Autoconf 2.60. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -3356,7 +3356,7 @@ _ACEOF cat >>$CONFIG_STATUS <<_ACEOF ac_cs_version="\\ -yast2-trans-pt config.status 2.15.1 +yast2-trans-pt config.status 2.15.2 configured by $0, generated by GNU Autoconf 2.60, with options \\"`echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\" diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-trans-pt-2.15.1/configure.in new/yast2-trans-pt-2.15.2/configure.in --- old/yast2-trans-pt-2.15.1/configure.in 2007-05-22 17:22:18.000000000 +0200 +++ new/yast2-trans-pt-2.15.2/configure.in 2007-05-30 15:25:24.000000000 +0200 @@ -3,7 +3,7 @@ dnl -- This file is generated by y2autoconf 2.14.0 - DO NOT EDIT! -- dnl (edit configure.in.in instead) -AC_INIT(yast2-trans-pt, 2.15.1, http://bugs.opensuse.org/, yast2-trans-pt) +AC_INIT(yast2-trans-pt, 2.15.2, http://bugs.opensuse.org/, yast2-trans-pt) 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.15.1" +VERSION="2.15.2" RPMNAME="yast2-trans-pt" MAINTAINER="Karl Eichwalder <ke(a)suse.de>" diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-trans-pt-2.15.1/po/add-on.pt.po new/yast2-trans-pt-2.15.2/po/add-on.pt.po --- old/yast2-trans-pt-2.15.1/po/add-on.pt.po 2007-05-22 16:32:30.000000000 +0200 +++ new/yast2-trans-pt-2.15.2/po/add-on.pt.po 2007-05-30 14:55:19.000000000 +0200 @@ -12,7 +12,7 @@ "Project-Id-Version: add-on.pt\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2007-04-16 15:33+0200\n" -"PO-Revision-Date: 2007-05-13 15:00+0100\n" +"PO-Revision-Date: 2007-05-29 20:31+0100\n" "Last-Translator: Antonio Cardoso Martins <digiplan(a)netvisao.pt>\n" "Language-Team: pt <language(a)novell.com>\n" "MIME-Version: 1.0\n" @@ -329,7 +329,7 @@ #. TRANSLATORS: dialog content - a very simple label #: src/add-on.ycp:27 src/inst_language_add-on.ycp:116 msgid "Initializing..." -msgstr "Inicializando..." +msgstr "A inicializar..." #. help #. TRANSLATORS: help text diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-trans-pt-2.15.1/po/autofs.pt.po new/yast2-trans-pt-2.15.2/po/autofs.pt.po --- old/yast2-trans-pt-2.15.1/po/autofs.pt.po 2007-05-22 16:32:32.000000000 +0200 +++ new/yast2-trans-pt-2.15.2/po/autofs.pt.po 2007-05-30 14:55:20.000000000 +0200 @@ -12,7 +12,7 @@ "Project-Id-Version: autofs.pt\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2007-04-16 15:37+0200\n" -"PO-Revision-Date: 2007-05-16 22:33+0100\n" +"PO-Revision-Date: 2007-05-29 20:31+0100\n" "Last-Translator: Antonio Cardoso Martins <digiplan(a)netvisao.pt>\n" "Language-Team: pt <language(a)novell.com>\n" "MIME-Version: 1.0\n" @@ -377,4 +377,4 @@ #. Initialization dialog contents #: src/wizards.ycp:88 msgid "Initializing..." -msgstr "Inicializando..." +msgstr "A inicializar..." diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-trans-pt-2.15.1/po/autoinst.pt.po new/yast2-trans-pt-2.15.2/po/autoinst.pt.po --- old/yast2-trans-pt-2.15.1/po/autoinst.pt.po 2007-05-22 16:32:33.000000000 +0200 +++ new/yast2-trans-pt-2.15.2/po/autoinst.pt.po 2007-05-30 14:55:21.000000000 +0200 @@ -11,7 +11,7 @@ "Project-Id-Version: autoinst.pt\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2007-04-16 15:37+0200\n" -"PO-Revision-Date: 2007-05-13 16:25+0100\n" +"PO-Revision-Date: 2007-05-29 20:31+0100\n" "Last-Translator: Antonio Cardoso Martins <digiplan(a)netvisao.pt>\n" "Language-Team: pt <language(a)novell.com>\n" "MIME-Version: 1.0\n" @@ -625,7 +625,7 @@ #: src/dialogs/dialogs.ycp:267 src/dialogs/general_dialogs.ycp:145 #: src/include/wizards.ycp:86 msgid "Initializing ..." -msgstr "Inicializando..." +msgstr "A inicializar ..." #. progress stage #: src/dialogs/dialogs.ycp:276 diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-trans-pt-2.15.1/po/backup.pt.po new/yast2-trans-pt-2.15.2/po/backup.pt.po --- old/yast2-trans-pt-2.15.1/po/backup.pt.po 2007-05-22 16:32:34.000000000 +0200 +++ new/yast2-trans-pt-2.15.2/po/backup.pt.po 2007-05-30 14:55:23.000000000 +0200 @@ -13,9 +13,9 @@ "Project-Id-Version: backup.pt\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2007-04-16 15:37+0200\n" -"PO-Revision-Date: 2007-05-09 23:23+0100\n" +"PO-Revision-Date: 2007-05-29 20:19+0100\n" "Last-Translator: Antonio Cardoso Martins <digiplan(a)netvisao.pt>\n" -"Language-Team: pt <pt(a)li.org>\n" +"Language-Team: pt <language(a)novell.com>\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" @@ -451,8 +451,8 @@ msgstr "" "Se utiliza ACL's (Listas de controlo de acessos) para o acesso a ficheiros,\n" "e pretende guardá-los na sua cópia de segurança, seleccione o marcador de tipo sub-arquivo.\n" -"Para criar um arquivo multivolume, por exemplo para armazenamento num media com tamanho\n" -"fico, como por exemplo CDs, utilize Opçõespara configurar essas definições." +"Para criar um arquivo multivolume, por exemplo para armazenamento num suporte com tamanho\n" +"fixo, como por exemplo CDs, utilize Opçõespara configurar essas definições." #. For translators: help text in tar options dialog - part 1/3 #: src/help_texts.ycp:55 diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-trans-pt-2.15.1/po/base.pt.po new/yast2-trans-pt-2.15.2/po/base.pt.po --- old/yast2-trans-pt-2.15.1/po/base.pt.po 2007-05-22 16:32:36.000000000 +0200 +++ new/yast2-trans-pt-2.15.2/po/base.pt.po 2007-05-30 14:55:24.000000000 +0200 @@ -13,7 +13,7 @@ "Project-Id-Version: base.pt\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2007-04-16 15:29+0200\n" -"PO-Revision-Date: 2007-05-13 17:35+0100\n" +"PO-Revision-Date: 2007-05-29 20:31+0100\n" "Last-Translator: Antonio Cardoso Martins <digiplan(a)netvisao.pt>\n" "Language-Team: pt <language(a)novell.com>\n" "MIME-Version: 1.0\n" @@ -285,7 +285,7 @@ #. non-GUI handling #: library/commandline/src/CommandLine.ycp:1288 msgid "Initializing" -msgstr "Inicializando" +msgstr "A inicializar" # /usr/lib/YaST2/clients/adsl_custom.ycp:115 #. translators: Progress message - the command line interface is about to finish @@ -476,7 +476,7 @@ #. Frame label (stoping starting service) #: library/cwm/src/CWMServiceStart.ycp:530 msgid "Switch On and Off" -msgstr "Comutar Ligado e Desligado" +msgstr "Ligar e Desligar" #. Current status #: library/cwm/src/CWMServiceStart.ycp:534 diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-trans-pt-2.15.1/po/bluetooth.pt.po new/yast2-trans-pt-2.15.2/po/bluetooth.pt.po --- old/yast2-trans-pt-2.15.1/po/bluetooth.pt.po 2007-05-22 16:32:37.000000000 +0200 +++ new/yast2-trans-pt-2.15.2/po/bluetooth.pt.po 2007-05-30 14:55:25.000000000 +0200 @@ -13,7 +13,7 @@ "Project-Id-Version: bluetooth.pt\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2007-04-16 15:37+0200\n" -"PO-Revision-Date: 2007-05-13 14:12+0100\n" +"PO-Revision-Date: 2007-05-29 20:51+0100\n" "Last-Translator: Antonio Cardoso Martins <digiplan(a)netvisao.pt>\n" "Language-Team: pt <language(a)novell.com>\n" "MIME-Version: 1.0\n" @@ -46,7 +46,7 @@ #. Progress step 1/2 #: src/Bluetooth.ycp:246 msgid "Writing the settings..." -msgstr "A guardar as definições..." +msgstr "A escrever as definições..." #. Progress step 2/2 #: src/Bluetooth.ycp:248 @@ -220,11 +220,11 @@ #: src/dialogs.ycp:347 msgid "&Enable" -msgstr "&Activado" +msgstr "&Activar" #: src/dialogs.ycp:348 msgid "&Disable" -msgstr "&Desactivado" +msgstr "&Desactivar" #: src/dialogs.ycp:350 msgid "E&dit..." diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-trans-pt-2.15.1/po/CASA.pt.po new/yast2-trans-pt-2.15.2/po/CASA.pt.po --- old/yast2-trans-pt-2.15.1/po/CASA.pt.po 2006-11-02 08:24:07.000000000 +0100 +++ new/yast2-trans-pt-2.15.2/po/CASA.pt.po 2007-05-30 14:55:15.000000000 +0200 @@ -6,20 +6,20 @@ # # Bruno David Rodrigues <brunodavid(a)netc.pt>, 2000. # João Teles <teles(a)tecnolink.com>, 1999-2000. -# Antonio Cardoso Martins <digiplan(a)netvisao.pt>, 2006. +# Antonio Cardoso Martins <digiplan(a)netvisao.pt>, 2006, 2007. msgid "" msgstr "" "Project-Id-Version: CASA.pt\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2006-06-08 10:47-0600\n" -"PO-Revision-Date: 2006-09-28 22:55+0100\n" +"PO-Revision-Date: 2007-05-29 20:51+0100\n" "Last-Translator: Antonio Cardoso Martins <digiplan(a)netvisao.pt>\n" -"Language-Team: pt <pt(a)li.org>\n" +"Language-Team: pt <language(a)novell.com>\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -"X-Generator: KBabel 1.11.2\n" +"X-Generator: KBabel 1.11.4\n" #. Command line help text for the XCASA module #: src/CASA.ycp:53 @@ -115,7 +115,7 @@ #. Progress step 1/2 #: src/NovellCasa.pm:209 src/NovellCasa.ycp:202 msgid "Writing the settings..." -msgstr "A guardar as definições..." +msgstr "A escrever as definições..." #. Progress step 2/2 #: src/NovellCasa.pm:211 src/NovellCasa.ycp:204 @@ -336,4 +336,4 @@ #. Initialization dialog contents #: src/wizards.ycp:165 msgid "Initializing..." -msgstr "Inicializando..." +msgstr "A inicializar..." diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-trans-pt-2.15.1/po/cd-creator.pt.po new/yast2-trans-pt-2.15.2/po/cd-creator.pt.po --- old/yast2-trans-pt-2.15.1/po/cd-creator.pt.po 2007-05-22 16:32:42.000000000 +0200 +++ new/yast2-trans-pt-2.15.2/po/cd-creator.pt.po 2007-05-30 14:55:30.000000000 +0200 @@ -12,7 +12,7 @@ "Project-Id-Version: cd-creator.pt\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2007-04-16 15:38+0200\n" -"PO-Revision-Date: 2007-05-15 00:07+0100\n" +"PO-Revision-Date: 2007-05-29 20:51+0100\n" "Last-Translator: Antonio Cardoso Martins <digiplan(a)netvisao.pt>\n" "Language-Team: pt <language(a)novell.com>\n" "MIME-Version: 1.0\n" @@ -60,7 +60,7 @@ #. translators: progress step 1/1 #: src/CDCreator.ycp:239 msgid "Writing the settings..." -msgstr "A guardar as definições..." +msgstr "A escrever as definições..." #. translators: error message #: src/CDCreator.ycp:262 diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-trans-pt-2.15.1/po/country.pt.po new/yast2-trans-pt-2.15.2/po/country.pt.po --- old/yast2-trans-pt-2.15.1/po/country.pt.po 2007-04-17 16:50:41.000000000 +0200 +++ new/yast2-trans-pt-2.15.2/po/country.pt.po 2007-05-30 14:55:34.000000000 +0200 @@ -1,21 +1,21 @@ -# translation of country.po to Portuguese +# translation of country.pt.po to pt # translation of country.pt.po to # PORTUGUESE message file for YaST2 (keyboard). # Copyright (C) SuSE GmbH, 2000. # # Bruno David Rodrigues <brunodavid(a)netc.pt>, 2000. # João Teles <teles(a)tecnolink.com>, 1999-2000. -# Antonio Cardoso Martins <digiplan(a)netvisao.pt>, 2005, 2006. +# Antonio Cardoso Martins <digiplan(a)netvisao.pt>, 2005, 2006, 2007. # Elisio Andre Martins Catana <eacatana(a)netvisao.pt>, 2005. # Carlos Gonçalves <carlos(a)pinguix.com>, 2006. msgid "" msgstr "" -"Project-Id-Version: country\n" +"Project-Id-Version: country.pt\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2007-04-16 15:29+0200\n" -"PO-Revision-Date: 2006-10-08 16:53+0100\n" -"Last-Translator: Carlos Gonçalves <carlos(a)pinguix.com>\n" -"Language-Team: Portuguese\n" +"PO-Revision-Date: 2007-05-29 20:52+0100\n" +"Last-Translator: Antonio Cardoso Martins <digiplan(a)netvisao.pt>\n" +"Language-Team: pt <language(a)novell.com>\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" @@ -888,7 +888,7 @@ #. progress step #: language/src/language.ycp:53 msgid "Saving language and console settings..." -msgstr "A Guardar as definições da consola e do idioma..." +msgstr "A gravar as definições da consola e do idioma..." #. progress step #: language/src/language.ycp:55 @@ -1510,35 +1510,3 @@ #: timezone/src/timezone.ycp:175 msgid "New value for hardware clock" msgstr "Novo valor para o relógio de hardware" - -#~ msgid "" -#~ "\n" -#~ "Click Accept to proceed to the next dialog.\n" -#~ "\n" -#~ msgstr "" -#~ "\n" -#~ "Prima Aceitar para avançar para a próxima caixa de diálogo.\n" -#~ "\n" - -#~ msgid "German (Swiss)" -#~ msgstr "Alemão (Suíça)" - -#~ msgid "French (Canadian)" -#~ msgstr "Francês (Canadiano)" - -#~ msgid "Locale settings" -#~ msgstr "Definições regionais" - -#~ msgid "" -#~ "Here, change\n" -#~ "the system time and date.\n" -#~ msgstr "Altere aqui a data e hora do sistema.\n" - -#~ msgid "" -#~ "\n" -#~ "If the current time is not correct, use Change Time or Date to adjust it.\n" -#~ "" -#~ msgstr "" -#~ "\n" -#~ "A hora actual não está correcta, utilize Alterar Data ou Hora para ajustá-la.\n" -#~ "" diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-trans-pt-2.15.1/po/dns-server.pt.po new/yast2-trans-pt-2.15.2/po/dns-server.pt.po --- old/yast2-trans-pt-2.15.1/po/dns-server.pt.po 2007-04-17 16:50:46.000000000 +0200 +++ new/yast2-trans-pt-2.15.2/po/dns-server.pt.po 2007-05-30 14:55:36.000000000 +0200 @@ -1,4 +1,4 @@ -# translation of dns-server.pt.po to portuguese +# translation of dns-server.pt.po to pt # translation of dns-server.pt.po to # PORTUGUESE message file for YaST2 (@memory@). # Copyright (C) 2002 SuSE Linux AG. @@ -6,21 +6,21 @@ # # Bruno David Rodrigues <brunodavid(a)netc.pt>, 2000. # João Teles <teles(a)tecnolink.com>, 1999-2000. -# Antonio Cardoso Martins <digiplan(a)netvisao.pt>, 2005, 2006. +# Antonio Cardoso Martins <digiplan(a)netvisao.pt>, 2005, 2006, 2007. # Elisio Andre Martins Catana <eacatana(a)netvisao.pt>, 2005. msgid "" msgstr "" "Project-Id-Version: dns-server.pt\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2007-04-16 15:35+0200\n" -"PO-Revision-Date: 2006-11-04 15:35+0000\n" +"PO-Revision-Date: 2007-05-29 20:42+0100\n" "Last-Translator: Antonio Cardoso Martins <digiplan(a)netvisao.pt>\n" -"Language-Team: portuguese\n" +"Language-Team: pt <language(a)novell.com>\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -"X-Generator: KBabel 1.11.2\n" +"X-Generator: KBabel 1.11.4\n" #. error report #: src/DnsServer.pm:406 @@ -737,7 +737,7 @@ #: src/cmdline.ycp:748 msgid "Start-up settings" -msgstr "Opções de arranque" +msgstr "Definições de arranque" #. TRANSLATORS: commandline short help for command #: src/cmdline.ycp:757 diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-trans-pt-2.15.1/po/firewall.pt.po new/yast2-trans-pt-2.15.2/po/firewall.pt.po --- old/yast2-trans-pt-2.15.1/po/firewall.pt.po 2007-05-22 16:32:50.000000000 +0200 +++ new/yast2-trans-pt-2.15.2/po/firewall.pt.po 2007-05-30 14:55:38.000000000 +0200 @@ -11,7 +11,7 @@ "Project-Id-Version: firewall.pt\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2007-04-16 15:38+0200\n" -"PO-Revision-Date: 2007-05-13 17:52+0100\n" +"PO-Revision-Date: 2007-05-29 20:43+0100\n" "Last-Translator: Antonio Cardoso Martins <digiplan(a)netvisao.pt>\n" "Language-Team: pt <language(a)novell.com>\n" "MIME-Version: 1.0\n" @@ -419,7 +419,7 @@ #. TRANSLATORS: CommandLine help #: src/SuSEFirewallCMDLine.ycp:901 msgid "Start-up settings" -msgstr "Opções de arranque" +msgstr "Definições de arranque" #. TRANSLATORS: CommandLine help #: src/SuSEFirewallCMDLine.ycp:911 @@ -479,7 +479,7 @@ #. TRANSLATORS: CommandLine help #: src/SuSEFirewallCMDLine.ycp:989 msgid "List configured entries" -msgstr "Lista as entradas configuradas" +msgstr "Listar entradas configuradas" #. TRANSLATORS: CommandLine help #: src/SuSEFirewallCMDLine.ycp:994 diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-trans-pt-2.15.1/po/ftp-server.pt.po new/yast2-trans-pt-2.15.2/po/ftp-server.pt.po --- old/yast2-trans-pt-2.15.1/po/ftp-server.pt.po 2007-05-22 16:32:52.000000000 +0200 +++ new/yast2-trans-pt-2.15.2/po/ftp-server.pt.po 2007-05-30 14:55:41.000000000 +0200 @@ -12,7 +12,7 @@ "Project-Id-Version: ftp-server.pt\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2007-04-16 15:38+0200\n" -"PO-Revision-Date: 2007-05-20 21:44+0100\n" +"PO-Revision-Date: 2007-05-29 20:52+0100\n" "Last-Translator: Antonio Cardoso Martins <digiplan(a)netvisao.pt>\n" "Language-Team: pt <language(a)novell.com>\n" "MIME-Version: 1.0\n" @@ -51,7 +51,7 @@ #. Progress stage 2/2 #: src/FtpServer.ycp:569 msgid "Read the previous settings" -msgstr "Ler definições anteriores" +msgstr "Ler as definições anteriores" #. Progress stage 1/2 #: src/FtpServer.ycp:572 @@ -81,7 +81,7 @@ #. Progress step 1/1 #: src/FtpServer.ycp:614 msgid "Writing the settings..." -msgstr "A guardar as definições..." +msgstr "A escrever as definições..." #. write options to the config file #: src/FtpServer.ycp:624 diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-trans-pt-2.15.1/po/heartbeat.pt.po new/yast2-trans-pt-2.15.2/po/heartbeat.pt.po --- old/yast2-trans-pt-2.15.1/po/heartbeat.pt.po 2007-04-17 16:51:02.000000000 +0200 +++ new/yast2-trans-pt-2.15.2/po/heartbeat.pt.po 2007-05-30 14:55:42.000000000 +0200 @@ -1,4 +1,4 @@ -# translation of heartbeat.pt.po to portuguese +# translation of heartbeat.pt.po to pt # PORTUGUESE message file for YaST2 (@memory@). # Copyright (C) 2005 SUSE Linux Products GmbH. # Copyright (C) 2002 SuSE Linux AG. @@ -6,20 +6,20 @@ # # Bruno David Rodrigues <brunodavid(a)netc.pt>, 2000. # João Teles <teles(a)tecnolink.com>, 1999-2000. -# Antonio Cardoso Martins <digiplan(a)netvisao.pt>, 2006. +# Antonio Cardoso Martins <digiplan(a)netvisao.pt>, 2006, 2007. msgid "" msgstr "" "Project-Id-Version: heartbeat.pt\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2007-04-16 15:39+0200\n" -"PO-Revision-Date: 2006-11-04 15:48+0000\n" +"PO-Revision-Date: 2007-05-29 20:54+0100\n" "Last-Translator: Antonio Cardoso Martins <digiplan(a)netvisao.pt>\n" -"Language-Team: portuguese\n" +"Language-Team: pt <language(a)novell.com>\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -"X-Generator: KBabel 1.11.2\n" +"X-Generator: KBabel 1.11.4\n" #. Heartbeat read dialog caption #: src/Heartbeat.ycp:99 @@ -85,7 +85,7 @@ #: src/Heartbeat.ycp:238 msgid "Writing settings..." -msgstr "A guardar as definições..." +msgstr "A escrever definições..." #: src/Heartbeat.ycp:239 msgid "Writing resources..." @@ -139,7 +139,7 @@ #: src/common.ycp:40 msgid "Media Configuration" -msgstr "Configuração do Media" +msgstr "Configuração do Suporte" #: src/common.ycp:41 msgid "Authentication Keys" @@ -264,11 +264,11 @@ "that they are alive to other nodes in the cluster. For proper redundancy,\n" "you should specify more than one heartbeat medium if possible.\n" msgstr "" -"Configuração do Media Heartbeat permite-lhe\n" +"Configuração do Suporte Heartbeat permite-lhe\n" " especificar o método que o Heartbeat deve utilizar para a comunicação interna\n" "entre os nós do cluster. Isto fornece uma forma para os nós sinalizarem\n" -"que estão vivos aos outros nós do cluster. Por razões de redundancia,\n" -"deve especificar mais que um media heartbeat se for possível.\n" +"que estão vivos aos outros nós do cluster. Por razões de redundância,\n" +"deve especificar mais que um suporte heartbeat se for possível.\n" #: src/helps.ycp:61 msgid "" @@ -276,9 +276,9 @@ " two or more. After specifying a heartbeat medium, click Add to add\n" "that medium type to Heartbeat.\n" msgstr "" -"Escolha pelo menos um Media Heartbeat e, se possível,\n" -" dois ou mais. Depois de especificar o media heartbeat, prima Adicionar para adicionar\n" -"o media ao Heartbeat especificado.\n" +"Escolha pelo menos um Suporte Heartbeat e, se possível,\n" +" dois ou mais. Depois de especificar o suporte heartbeat, prima Adicionar para adicionar\n" +"o suporte ao Heartbeat especificado.\n" #: src/helps.ycp:66 msgid "" @@ -306,9 +306,9 @@ "segment, in which case you need to run each cluster on a different port\n" "number.\n" msgstr "" -"Porto UDP Port define qual o porto UDP deve ser utilizado\n" -"com media de difusão. Deixe definido o valor pré definido (694)\n" -"a menos que esteja a utilizar multiplos clusters de Heartbeat clusters no mesmo\n" +"Porto UDP Port define qual o porto UDP a ser utilizado\n" +"como suporte de difusão. Deixe definido o valor pré definido (694)\n" +"a menos que esteja a utilizar múltiplos clusters de Heartbeat clusters no mesmo\n" "segmento de rede, nesse caso necessita executar cada cluster num porto\n" "diferente.\n" @@ -691,11 +691,11 @@ #: src/media_conf.ycp:164 msgid "Heartbeat Medium" -msgstr "Media Heartbeat" +msgstr "Suporte Heartbeat" #: src/media_conf.ycp:174 msgid "Medium" -msgstr "Media" +msgstr "Suporte" #: src/media_conf.ycp:174 msgid "Options" @@ -703,7 +703,7 @@ #: src/media_conf.ycp:226 msgid "Specified media is already present." -msgstr "O media especificado já está presente." +msgstr "O suporte especificado já está presente." #: src/media_conf.ycp:286 msgid "Multicast group address must be class D (224.0.0.0 - 239.255.255.255)." @@ -775,7 +775,7 @@ #: src/startup_conf.ycp:33 msgid "Switch On and Off" -msgstr "Comutar Ligado e Desligado" +msgstr "Ligar e Desligar" #: src/startup_conf.ycp:38 msgid "Current Status: " @@ -850,4 +850,4 @@ #. Initialization dialog contents #: src/wizards.ycp:141 msgid "Initializing..." -msgstr "Inicializando..." +msgstr "A inicializar..." diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-trans-pt-2.15.1/po/installation.pt.po new/yast2-trans-pt-2.15.2/po/installation.pt.po --- old/yast2-trans-pt-2.15.1/po/installation.pt.po 2007-05-22 16:32:58.000000000 +0200 +++ new/yast2-trans-pt-2.15.2/po/installation.pt.po 2007-05-30 14:55:46.000000000 +0200 @@ -13,7 +13,7 @@ "Project-Id-Version: installation.pt\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2007-04-16 15:39+0200\n" -"PO-Revision-Date: 2007-05-13 14:20+0100\n" +"PO-Revision-Date: 2007-05-29 20:32+0100\n" "Last-Translator: Antonio Cardoso Martins <digiplan(a)netvisao.pt>\n" "Language-Team: pt <language(a)novell.com>\n" "MIME-Version: 1.0\n" @@ -1193,7 +1193,7 @@ #. dialog caption #: src/include/inst_inc_all.ycp:27 msgid "Initializing..." -msgstr "Inicializando..." +msgstr "A inicializar..." #. dialog content - busy message #: src/include/inst_inc_all.ycp:29 diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-trans-pt-2.15.1/po/ipsec.pt.po new/yast2-trans-pt-2.15.2/po/ipsec.pt.po --- old/yast2-trans-pt-2.15.1/po/ipsec.pt.po 2007-04-17 16:51:10.000000000 +0200 +++ new/yast2-trans-pt-2.15.2/po/ipsec.pt.po 2007-05-30 14:55:49.000000000 +0200 @@ -1,26 +1,26 @@ +# translation of ipsec.pt.po to pt # translation of ipsec.pt.po to -# translation of ipsec.pt.po to portuguese # PORTUGUESE message file for YaST2 (@memory@). # Copyright (C) 2002 SuSE Linux AG. # Copyright (C) 1999-2000, 2001 SuSE GmbH. +# # Bruno David Rodrigues <brunodavid(a)netc.pt>, 2000. # João Teles <teles(a)tecnolink.com>, 1999-2000. -# Antonio Cardoso Martins <digiplan(a)netvisao.pt>, 2005. +# Antonio Cardoso Martins <digiplan(a)netvisao.pt>, 2005, 2007. # Elisio Andre Martins Catana <eacatana(a)netvisao.pt>, 2005. -# msgid "" msgstr "" "Project-Id-Version: ipsec.pt\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2007-04-17 13:48+0200\n" -"PO-Revision-Date: 2006-01-13 21:13-0000\n" -"Last-Translator: Elísio André Martins Catana <eacatana(a)netvisao.pt>\n" -"Language-Team: <en(a)li.org>\n" +"PO-Revision-Date: 2007-05-29 20:32+0100\n" +"Last-Translator: Antonio Cardoso Martins <digiplan(a)netvisao.pt>\n" +"Language-Team: pt <language(a)novell.com>\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -"X-Generator: KBabel 1.10\n" +"X-Generator: KBabel 1.11.4\n" #: src/IPsec.ycp:219 msgid "Activate During Boot" @@ -1312,40 +1312,4 @@ #. Initialization dialog contents #: src/wizards.ycp:279 msgid "Initializing..." -msgstr "Inicializando..." - -#~ msgid "!textdomain" -#~ msgstr "!textdomain" - -#~ msgid "Wrong password." -#~ msgstr "Palavra passe errada." - -#~ msgid "RSA key password" -#~ msgstr "Palavra passe da chave RSA" - -#~ msgid "invalid arguments" -#~ msgstr "argumentos inválidos" - -#~ msgid "PKCS12 import password for %s" -#~ msgstr "Palavra passe PKCS12 de importação para %s" - -#~ msgid "Failed to save ipsec.conf:" -#~ msgstr "Não foi possível gravar o ipsec.conf:" - -#~ msgid "Failed to save ipsec.secrets:" -#~ msgstr "Não foi possível gravar o ipsec.secrets:" - -#~ msgid "Cannot write file %s: %s" -#~ msgstr "Não foi possível escrever o ficheiro %s: %s" - -#~ msgid "Connection name '%s' is a reserved or implicit name." -#~ msgstr "O nome da ligação '%s' é um nome reservado ou implícito." - -#~ msgid "A connection name can contain only a-z, 0-9, _, and - characters." -#~ msgstr "Um nome de ligação, pode apenas conter os caracteres a-z, 0-9, _, e - ." - -#~ msgid "Nothing found in %s." -#~ msgstr "Nada encontrado em %s." - -#~ msgid "Connection \"%s\" does not exist." -#~ msgstr "A ligação \"%s\" não existe." +msgstr "A inicializar..." diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-trans-pt-2.15.1/po/iscsi-client.pt.po new/yast2-trans-pt-2.15.2/po/iscsi-client.pt.po --- old/yast2-trans-pt-2.15.1/po/iscsi-client.pt.po 2007-05-22 16:33:03.000000000 +0200 +++ new/yast2-trans-pt-2.15.2/po/iscsi-client.pt.po 2007-05-30 14:55:51.000000000 +0200 @@ -12,7 +12,7 @@ "Project-Id-Version: iscsi-client.pt\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2007-04-16 15:39+0200\n" -"PO-Revision-Date: 2007-05-14 22:41+0100\n" +"PO-Revision-Date: 2007-05-29 20:57+0100\n" "Last-Translator: Antonio Cardoso Martins <digiplan(a)netvisao.pt>\n" "Language-Team: pt <language(a)novell.com>\n" "MIME-Version: 1.0\n" @@ -28,7 +28,7 @@ "If you want to use different initiatorname change it in BIOS." msgstr "" "InitiatorName do iBFT e de /etc/iscsi/initiatorname.iscsi são diferentes.\n" -"O initiatorname antigo será substituido por um valor de iBFT e criada uma cópia de segurança.\n" +"O initiatorname antigo será substituído por um valor de iBFT e criada uma cópia de segurança.\n" "Se pretende utilizar um outro initiatorname altere-o na BIOS." #: src/IscsiClient.ycp:304 @@ -38,7 +38,7 @@ #: src/IscsiClient.ycp:305 msgid "Install it now?" -msgstr "Pretende instalá-los agora?" +msgstr "Pretende instalá-lo agora?" #. IscsiClient read dialog caption #: src/IscsiClient.ycp:439 @@ -98,7 +98,7 @@ #. Progress step 1/2 #: src/IscsiClient.ycp:536 msgid "Writing the settings..." -msgstr "A guardar as definições..." +msgstr "A escrever as definições..." #. Progress step 2/2 #: src/IscsiClient.ycp:538 @@ -183,7 +183,7 @@ #: src/dialogs.ycp:128 src/dialogs.ycp:152 msgid "Incoming Authentication" -msgstr "Autenticação de Entrada" +msgstr "Autenticação de Chegada" #: src/dialogs.ycp:130 src/dialogs.ycp:135 src/dialogs.ycp:154 #: src/dialogs.ycp:159 @@ -197,7 +197,7 @@ #: src/dialogs.ycp:133 src/dialogs.ycp:157 msgid "Outgoing Authentication" -msgstr "Autenticação à Saida" +msgstr "Autenticação de Saída" #: src/dialogs.ycp:173 msgid "IP Address" diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-trans-pt-2.15.1/po/iscsi-server.pt.po new/yast2-trans-pt-2.15.2/po/iscsi-server.pt.po --- old/yast2-trans-pt-2.15.1/po/iscsi-server.pt.po 2007-05-22 16:33:05.000000000 +0200 +++ new/yast2-trans-pt-2.15.2/po/iscsi-server.pt.po 2007-05-30 14:55:52.000000000 +0200 @@ -13,7 +13,7 @@ "Project-Id-Version: iscsi-server.pt\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2007-04-16 15:39+0200\n" -"PO-Revision-Date: 2007-05-13 16:38+0100\n" +"PO-Revision-Date: 2007-05-29 20:54+0100\n" "Last-Translator: Antonio Cardoso Martins <digiplan(a)netvisao.pt>\n" "Language-Team: pt <language(a)novell.com>\n" "MIME-Version: 1.0\n" @@ -53,7 +53,7 @@ #. Progress stage 1/3 #: src/IscsiServer.ycp:263 msgid "Read the database" -msgstr "Ler base de dados" +msgstr "Ler a base de dados" #. Progress stage 2/3 #: src/IscsiServer.ycp:265 @@ -103,7 +103,7 @@ #. Progress step 1/2 #: src/IscsiServer.ycp:348 msgid "Writing the settings..." -msgstr "A guardar as definições..." +msgstr "A escrever as definições..." #. Progress step 2/2 #: src/IscsiServer.ycp:350 diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-trans-pt-2.15.1/po/kerberos.pt.po new/yast2-trans-pt-2.15.2/po/kerberos.pt.po --- old/yast2-trans-pt-2.15.1/po/kerberos.pt.po 2007-05-22 16:33:10.000000000 +0200 +++ new/yast2-trans-pt-2.15.2/po/kerberos.pt.po 2007-05-30 14:55:57.000000000 +0200 @@ -11,7 +11,7 @@ "Project-Id-Version: kerberos.pt\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2007-04-16 15:32+0200\n" -"PO-Revision-Date: 2007-05-13 14:25+0100\n" +"PO-Revision-Date: 2007-05-29 20:32+0100\n" "Last-Translator: Antonio Cardoso Martins <digiplan(a)netvisao.pt>\n" "Language-Team: pt <language(a)novell.com>\n" "MIME-Version: 1.0\n" @@ -476,4 +476,4 @@ #. label (init dialog) #: src/wizards.ycp:101 msgid "Initializing..." -msgstr "Inicializando..." +msgstr "A inicializar..." diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-trans-pt-2.15.1/po/kerberos-server.pt.po new/yast2-trans-pt-2.15.2/po/kerberos-server.pt.po --- old/yast2-trans-pt-2.15.1/po/kerberos-server.pt.po 2007-05-22 16:33:09.000000000 +0200 +++ new/yast2-trans-pt-2.15.2/po/kerberos-server.pt.po 2007-05-30 14:55:56.000000000 +0200 @@ -12,7 +12,7 @@ "Project-Id-Version: kerberos-server.pt\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2007-04-16 15:40+0200\n" -"PO-Revision-Date: 2007-05-19 21:25+0100\n" +"PO-Revision-Date: 2007-05-29 20:52+0100\n" "Last-Translator: Antonio Cardoso Martins <digiplan(a)netvisao.pt>\n" "Language-Team: pt <language(a)novell.com>\n" "MIME-Version: 1.0\n" @@ -72,7 +72,7 @@ #. Progress step 1/2 #: src/KerberosServer.pm:2184 msgid "Writing the settings..." -msgstr "A guardar as definições..." +msgstr "A escrever as definições..." #. Progress finished #: src/KerberosServer.pm:2186 diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-trans-pt-2.15.1/po/ldap-client.pt.po new/yast2-trans-pt-2.15.2/po/ldap-client.pt.po --- old/yast2-trans-pt-2.15.1/po/ldap-client.pt.po 2007-05-22 16:33:14.000000000 +0200 +++ new/yast2-trans-pt-2.15.2/po/ldap-client.pt.po 2007-05-30 14:56:01.000000000 +0200 @@ -13,7 +13,7 @@ "Project-Id-Version: ldap-client.pt\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2007-04-16 15:31+0200\n" -"PO-Revision-Date: 2007-05-17 23:22+0100\n" +"PO-Revision-Date: 2007-05-29 20:46+0100\n" "Last-Translator: Antonio Cardoso Martins <digiplan(a)netvisao.pt>\n" "Language-Team: pt <language(a)novell.com>\n" "MIME-Version: 1.0\n" @@ -238,7 +238,7 @@ #. progress step label #: src/Ldap.ycp:2069 msgid "Stopping services..." -msgstr "A parar os serviços..." +msgstr "A parar serviços..." #. progress step label #: src/Ldap.ycp:2071 @@ -248,7 +248,7 @@ #. progress step label #: src/Ldap.ycp:2073 msgid "Starting services..." -msgstr "A iniciar os serviços..." +msgstr "A iniciar serviços..." #. progress step label #: src/Ldap.ycp:2075 @@ -1374,4 +1374,4 @@ #. label (init dialog) #: src/wizards.ycp:75 msgid "Initializing..." -msgstr "Inicializando..." +msgstr "A inicializar..." diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-trans-pt-2.15.1/po/linux-user-mgmt.pt.po new/yast2-trans-pt-2.15.2/po/linux-user-mgmt.pt.po --- old/yast2-trans-pt-2.15.1/po/linux-user-mgmt.pt.po 2007-05-22 16:33:17.000000000 +0200 +++ new/yast2-trans-pt-2.15.2/po/linux-user-mgmt.pt.po 2007-05-30 14:56:04.000000000 +0200 @@ -12,7 +12,7 @@ "Project-Id-Version: linux-user-mgmt.pt\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2006-07-20 09:51+0200\n" -"PO-Revision-Date: 2007-05-16 22:41+0100\n" +"PO-Revision-Date: 2007-05-29 20:52+0100\n" "Last-Translator: Antonio Cardoso Martins <digiplan(a)netvisao.pt>\n" "Language-Team: pt <language(a)novell.com>\n" "MIME-Version: 1.0\n" @@ -93,7 +93,7 @@ #. Progress step 1/2 #: src/LinuxUserMgmt.ycp:278 msgid "Writing the settings..." -msgstr "A guardar as definições..." +msgstr "A escrever as definições..." #. Progress step 2/2 #: src/LinuxUserMgmt.ycp:280 @@ -609,4 +609,4 @@ #. Initialization dialog contents #: src/wizards.ycp:100 msgid "Initializing..." -msgstr "Inicializando..." +msgstr "A inicializar..." diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-trans-pt-2.15.1/po/MailServer.pt.po new/yast2-trans-pt-2.15.2/po/MailServer.pt.po --- old/yast2-trans-pt-2.15.1/po/MailServer.pt.po 2007-04-17 16:50:07.000000000 +0200 +++ new/yast2-trans-pt-2.15.2/po/MailServer.pt.po 2007-05-30 14:55:16.000000000 +0200 @@ -7,20 +7,20 @@ # # Bruno David Rodrigues <brunodavid(a)netc.pt>, 2000. # João Teles <teles(a)tecnolink.com>, 1999-2000, 2006. -# Antonio Cardoso Martins <digiplan(a)netvisao.pt>, 2006. +# Antonio Cardoso Martins <digiplan(a)netvisao.pt>, 2006, 2007. msgid "" msgstr "" "Project-Id-Version: MailServer.pt\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2007-04-16 15:40+0200\n" -"PO-Revision-Date: 2006-12-12 23:53+0000\n" +"PO-Revision-Date: 2007-05-29 20:32+0100\n" "Last-Translator: Antonio Cardoso Martins <digiplan(a)netvisao.pt>\n" -"Language-Team: pt <pt(a)li.org>\n" +"Language-Team: pt <language(a)novell.com>\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -"X-Generator: KBabel 1.11.2\n" +"X-Generator: KBabel 1.11.4\n" #. * #. * List of the Configuration Modules @@ -1114,7 +1114,7 @@ #. Initialization dialog contents #: src/wizards.ycp:98 msgid "Initializing..." -msgstr "Inicializando..." +msgstr "A inicializar..." #. plugin name #: users-plugin/UsersPluginMail.pm:108 @@ -1247,6 +1247,3 @@ #: users-plugin/users_plugin_mail_groups.ycp:283 msgid "Mail Settings for the group:" msgstr "Definições de Correio para o grupo:" - -#~ msgid "Remote User's Password" -#~ msgstr "Palavra Passe de Utilizador Remoto" diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-trans-pt-2.15.1/po/network.pt.po new/yast2-trans-pt-2.15.2/po/network.pt.po --- old/yast2-trans-pt-2.15.1/po/network.pt.po 2007-05-22 16:33:21.000000000 +0200 +++ new/yast2-trans-pt-2.15.2/po/network.pt.po 2007-05-30 14:56:08.000000000 +0200 @@ -14,7 +14,7 @@ "Project-Id-Version: network.pt\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2007-04-16 15:31+0200\n" -"PO-Revision-Date: 2007-05-14 23:59+0100\n" +"PO-Revision-Date: 2007-05-29 20:59+0100\n" "Last-Translator: Antonio Cardoso Martins <digiplan(a)netvisao.pt>\n" "Language-Team: pt <language(a)novell.com>\n" "MIME-Version: 1.0\n" @@ -1507,7 +1507,7 @@ #. Frame title #: src/isdn/interface.ycp:311 msgid "Connection Settings" -msgstr "Definições da ligação" +msgstr "Definições da Ligação" #. TextEntry label #: src/isdn/interface.ycp:317 diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-trans-pt-2.15.1/po/nfs.pt.po new/yast2-trans-pt-2.15.2/po/nfs.pt.po --- old/yast2-trans-pt-2.15.1/po/nfs.pt.po 2007-04-17 16:52:02.000000000 +0200 +++ new/yast2-trans-pt-2.15.2/po/nfs.pt.po 2007-05-30 14:56:10.000000000 +0200 @@ -1,28 +1,27 @@ +# translation of nfs.pt.po to pt # translation of nfs.pt.po to -# translation of nfs.pt.po to portuguese -# translation of nfs.pt.po to Portuguese # PORTUGUESE message file for YaST2 (lan). # Copyright (C) SuSE GmbH, 2000. +# # Bruno David Rodrigues <brunodavid(a)netc.pt>, 2000. # João Teles <teles(a)tecnolink.com>, 1999-2000. # Duarte Pessanha Santos <dpsantos(a)6mil.pt>, 2004. # Antje Faber <afaber(a)suse.de>, 2004. -# Antonio Cardoso Martins <digiplan(a)netvisao.pt>, 2005. +# Antonio Cardoso Martins <digiplan(a)netvisao.pt>, 2005, 2007. # Elisio Andre Martins Catana <eacatana(a)netvisao.pt>, 2005. -# msgid "" msgstr "" "Project-Id-Version: nfs.pt\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2007-04-16 15:35+0200\n" -"PO-Revision-Date: 2006-01-13 21:14-0000\n" -"Last-Translator: Elísio André Martins Catana <eacatana(a)netvisao.pt>\n" -"Language-Team: <en(a)li.org>\n" +"PO-Revision-Date: 2007-05-29 20:46+0100\n" +"Last-Translator: Antonio Cardoso Martins <digiplan(a)netvisao.pt>\n" +"Language-Team: pt <language(a)novell.com>\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -"X-Generator: KBabel 1.10\n" +"X-Generator: KBabel 1.11.4\n" #. error popup message #: src/Nfs.ycp:260 @@ -59,12 +58,12 @@ #. progress step label #: src/Nfs.ycp:315 msgid "Stopping services..." -msgstr "A Parar serviços..." +msgstr "A parar serviços..." #. progress step label #: src/Nfs.ycp:317 msgid "Starting services..." -msgstr "A Iniciar serviços..." +msgstr "A iniciar serviços..." #. final progress step label #: src/Nfs.ycp:319 @@ -386,12 +385,3 @@ #: src/ui.ycp:413 msgid "NFS Client Configuration" msgstr "Configuração de Cliente NFS" - -#~ msgid "A&dd" -#~ msgstr "Ad&icionar" - -#~ msgid "&Edit" -#~ msgstr "&Editar" - -#~ msgid "De&lete" -#~ msgstr "Apa&gar" diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-trans-pt-2.15.1/po/online-update.pt.po new/yast2-trans-pt-2.15.2/po/online-update.pt.po --- old/yast2-trans-pt-2.15.1/po/online-update.pt.po 2007-05-22 16:33:29.000000000 +0200 +++ new/yast2-trans-pt-2.15.2/po/online-update.pt.po 2007-05-30 14:56:16.000000000 +0200 @@ -10,7 +10,7 @@ "Project-Id-Version: online-update.pt\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2007-04-16 15:33+0200\n" -"PO-Revision-Date: 2007-05-13 15:06+0100\n" +"PO-Revision-Date: 2007-05-29 20:52+0100\n" "Last-Translator: Antonio Cardoso Martins <digiplan(a)netvisao.pt>\n" "Language-Team: pt <language(a)novell.com>\n" "MIME-Version: 1.0\n" @@ -265,7 +265,7 @@ #. busy popup text #: src/OnlineUpdateDialogs.ycp:261 msgid "Writing settings..." -msgstr "A guardar as definições..." +msgstr "A escrever as definições..." #: src/OnlineUpdateDialogs.ycp:284 msgid "No details available." diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-trans-pt-2.15.1/po/packager.pt.po new/yast2-trans-pt-2.15.2/po/packager.pt.po --- old/yast2-trans-pt-2.15.1/po/packager.pt.po 2007-05-22 16:33:32.000000000 +0200 +++ new/yast2-trans-pt-2.15.2/po/packager.pt.po 2007-05-30 14:56:19.000000000 +0200 @@ -13,7 +13,7 @@ "Project-Id-Version: packager.pt\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2007-04-16 15:30+0200\n" -"PO-Revision-Date: 2007-05-20 13:08+0100\n" +"PO-Revision-Date: 2007-05-29 20:32+0100\n" "Last-Translator: Antonio Cardoso Martins <digiplan(a)netvisao.pt>\n" "Language-Team: pt <language(a)novell.com>\n" "MIME-Version: 1.0\n" @@ -64,7 +64,7 @@ #: src/clients/inst_source.ycp:46 src/clients/sw_single.ycp:37 #: src/modules/AddOnProduct.ycp:226 msgid "Initializing..." -msgstr "Inicializando..." +msgstr "A inicializar..." #. progress bar item #: src/clients/dirinstall.ycp:37 diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-trans-pt-2.15.1/po/runlevel.pt.po new/yast2-trans-pt-2.15.2/po/runlevel.pt.po --- old/yast2-trans-pt-2.15.1/po/runlevel.pt.po 2007-05-22 16:33:51.000000000 +0200 +++ new/yast2-trans-pt-2.15.2/po/runlevel.pt.po 2007-05-30 14:56:37.000000000 +0200 @@ -12,9 +12,9 @@ "Project-Id-Version: runlevel.pt\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2007-04-16 15:42+0200\n" -"PO-Revision-Date: 2007-05-09 23:27+0100\n" +"PO-Revision-Date: 2007-05-29 20:37+0100\n" "Last-Translator: Antonio Cardoso Martins <digiplan(a)netvisao.pt>\n" -"Language-Team: pt <pt(a)li.org>\n" +"Language-Team: pt <language(a)novell.com>\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" @@ -802,7 +802,7 @@ #. Button label #: src/ui.ycp:1325 msgid "&Enable" -msgstr "&Activado" +msgstr "&Activar" #. Button label #: src/ui.ycp:1327 diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-trans-pt-2.15.1/po/s390.pt.po new/yast2-trans-pt-2.15.2/po/s390.pt.po --- old/yast2-trans-pt-2.15.1/po/s390.pt.po 2007-05-22 16:33:52.000000000 +0200 +++ new/yast2-trans-pt-2.15.2/po/s390.pt.po 2007-05-30 14:56:38.000000000 +0200 @@ -12,7 +12,7 @@ "Project-Id-Version: s390.pt\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2007-04-16 15:30+0200\n" -"PO-Revision-Date: 2007-05-14 22:20+0100\n" +"PO-Revision-Date: 2007-05-29 20:32+0100\n" "Last-Translator: Antonio Cardoso Martins <digiplan(a)netvisao.pt>\n" "Language-Team: pt <language(a)novell.com>\n" "MIME-Version: 1.0\n" @@ -61,7 +61,7 @@ #: src/clients/s390-disk-controller.ycp:71 src/dasd/wizards.ycp:92 #: src/zfcp/wizards.ycp:92 msgid "Initializing..." -msgstr "Inicializando..." +msgstr "A inicializar..." #. text for installation summary #: src/clients/zfcp_proposal.ycp:27 diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-trans-pt-2.15.1/po/samba-client.pt.po new/yast2-trans-pt-2.15.2/po/samba-client.pt.po --- old/yast2-trans-pt-2.15.1/po/samba-client.pt.po 2007-05-22 16:33:53.000000000 +0200 +++ new/yast2-trans-pt-2.15.2/po/samba-client.pt.po 2007-05-30 14:56:39.000000000 +0200 @@ -13,7 +13,7 @@ "Project-Id-Version: samba-client.pt\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2007-04-16 15:34+0200\n" -"PO-Revision-Date: 2007-05-13 16:29+0100\n" +"PO-Revision-Date: 2007-05-29 20:32+0100\n" "Last-Translator: Antonio Cardoso Martins <digiplan(a)netvisao.pt>\n" "Language-Team: pt <language(a)novell.com>\n" "MIME-Version: 1.0\n" @@ -775,4 +775,4 @@ #. translators: initialization dialog contents #: src/wizards.ycp:69 msgid "Initializing..." -msgstr "Inicializando..." +msgstr "A inicializar..." diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-trans-pt-2.15.1/po/samba-server.pt.po new/yast2-trans-pt-2.15.2/po/samba-server.pt.po --- old/yast2-trans-pt-2.15.1/po/samba-server.pt.po 2007-05-22 16:33:54.000000000 +0200 +++ new/yast2-trans-pt-2.15.2/po/samba-server.pt.po 2007-05-30 14:56:41.000000000 +0200 @@ -13,7 +13,7 @@ "Project-Id-Version: samba-server.pt\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2007-04-16 15:42+0200\n" -"PO-Revision-Date: 2007-05-14 22:31+0100\n" +"PO-Revision-Date: 2007-05-29 20:53+0100\n" "Last-Translator: Antonio Cardoso Martins <digiplan(a)netvisao.pt>\n" "Language-Team: pt <language(a)novell.com>\n" "MIME-Version: 1.0\n" @@ -205,12 +205,12 @@ #. translators: write progress step #: src/SambaServer.pm:227 msgid "Writing back-end settings..." -msgstr "A guardar as definições do back-end..." +msgstr "A escrever as definições do back-end..." #. translators: write progress step #: src/SambaServer.pm:229 msgid "Writing Samba accounts..." -msgstr "A guardar as contas Samba..." +msgstr "A escrever contas Samba..." #. translators: write progress step #: src/SambaServer.pm:231 diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-trans-pt-2.15.1/po/security.pt.po new/yast2-trans-pt-2.15.2/po/security.pt.po --- old/yast2-trans-pt-2.15.1/po/security.pt.po 2007-05-22 16:33:58.000000000 +0200 +++ new/yast2-trans-pt-2.15.2/po/security.pt.po 2007-05-30 14:56:45.000000000 +0200 @@ -12,7 +12,7 @@ "Project-Id-Version: security.pt\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2007-04-16 15:32+0200\n" -"PO-Revision-Date: 2007-05-13 14:05+0100\n" +"PO-Revision-Date: 2007-05-29 20:32+0100\n" "Last-Translator: Antonio Cardoso Martins <digiplan(a)netvisao.pt>\n" "Language-Team: pt <language(a)novell.com>\n" "MIME-Version: 1.0\n" @@ -942,4 +942,4 @@ #. Label #: src/wizards.ycp:117 msgid "Initializing..." -msgstr "Inicializando..." +msgstr "A inicializar..." diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-trans-pt-2.15.1/po/slp-server.pt.po new/yast2-trans-pt-2.15.2/po/slp-server.pt.po --- old/yast2-trans-pt-2.15.1/po/slp-server.pt.po 2007-04-17 16:52:53.000000000 +0200 +++ new/yast2-trans-pt-2.15.2/po/slp-server.pt.po 2007-05-30 14:56:46.000000000 +0200 @@ -12,9 +12,9 @@ "Project-Id-Version: slp-server.pt\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2007-04-16 15:43+0200\n" -"PO-Revision-Date: 2007-03-04 21:53+0000\n" +"PO-Revision-Date: 2007-05-29 20:53+0100\n" "Last-Translator: Antonio Cardoso Martins <digiplan(a)netvisao.pt>\n" -"Language-Team: pt <pt(a)li.org>\n" +"Language-Team: pt <language(a)novell.com>\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" @@ -92,7 +92,7 @@ #. Progress step 1/2 #: src/SlpServer.ycp:264 msgid "Writing the settings..." -msgstr "A guardar as definições..." +msgstr "A escrever as definições..." #. Progress step 2/2 #: src/SlpServer.ycp:266 diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-trans-pt-2.15.1/po/storage.pt.po new/yast2-trans-pt-2.15.2/po/storage.pt.po --- old/yast2-trans-pt-2.15.1/po/storage.pt.po 2007-05-22 16:34:05.000000000 +0200 +++ new/yast2-trans-pt-2.15.2/po/storage.pt.po 2007-05-30 14:56:51.000000000 +0200 @@ -12,7 +12,7 @@ "Project-Id-Version: storage.pt\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2007-04-16 15:31+0200\n" -"PO-Revision-Date: 2007-05-13 17:16+0100\n" +"PO-Revision-Date: 2007-05-29 20:32+0100\n" "Last-Translator: Antonio Cardoso Martins <digiplan(a)netvisao.pt>\n" "Language-Team: pt <language(a)novell.com>\n" "MIME-Version: 1.0\n" @@ -204,7 +204,7 @@ # /usr/lib/YaST2/clients/adsl.ycp:52 #: disk/src/disk.ycp:48 msgid "Initializing..." -msgstr "Inicializando..." +msgstr "A inicializar..." #: disk/src/disk.ycp:49 msgid "Please wait, while the storage is being initialized." diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-trans-pt-2.15.1/po/sudo.pt.po new/yast2-trans-pt-2.15.2/po/sudo.pt.po --- old/yast2-trans-pt-2.15.1/po/sudo.pt.po 2007-05-22 16:34:07.000000000 +0200 +++ new/yast2-trans-pt-2.15.2/po/sudo.pt.po 2007-05-30 14:56:53.000000000 +0200 @@ -12,7 +12,7 @@ "Project-Id-Version: sudo.pt\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2007-04-16 15:43+0200\n" -"PO-Revision-Date: 2007-05-18 00:27+0100\n" +"PO-Revision-Date: 2007-05-29 20:53+0100\n" "Last-Translator: Antonio Cardoso Martins <digiplan(a)netvisao.pt>\n" "Language-Team: pt <language(a)novell.com>\n" "MIME-Version: 1.0\n" @@ -88,7 +88,7 @@ #. Progress step 1/1 #: src/Sudo.ycp:538 msgid "Writing the settings..." -msgstr "A guardar as definições..." +msgstr "A escrever as definições..." #: src/Sudo.ycp:552 msgid "Cannot write settings." @@ -805,7 +805,7 @@ msgstr "" "Nota: O nome da alcunha não pode estar vazio. Cada alcunha deve ter pelo\n" "menos um membro.\n" -"\r" +"\t" #. Single Host Alias Help 1/4 #: src/helps.ycp:222 diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-trans-pt-2.15.1/po/tftp-server.pt.po new/yast2-trans-pt-2.15.2/po/tftp-server.pt.po --- old/yast2-trans-pt-2.15.1/po/tftp-server.pt.po 2007-04-17 16:53:13.000000000 +0200 +++ new/yast2-trans-pt-2.15.2/po/tftp-server.pt.po 2007-05-30 14:56:57.000000000 +0200 @@ -1,27 +1,27 @@ -# translation of tftp-server.pt.po to portuguese +# translation of tftp-server.pt.po to pt # translation of tftp-server.pt.po to # PORTUGUESE message file for YaST2 (@memory@). # Copyright (C) 2002 SuSE Linux AG. # Copyright (C) 1999-2000, 2001 SuSE GmbH. +# # Bruno David Rodrigues <brunodavid(a)netc.pt>, 2000. # João Teles <teles(a)tecnolink.com>, 1999-2000. # Duarte Pessanha Santos <dpsantos(a)6mil.pt>, 2004. # Elisio Andre Martins Catana <eacatana(a)netvisao.pt>, 2005. -# Antonio Cardoso Martins <digiplan(a)netvisao.pt>, 2005, 2006. -# +# Antonio Cardoso Martins <digiplan(a)netvisao.pt>, 2005, 2006, 2007. msgid "" msgstr "" "Project-Id-Version: tftp-server.pt\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2007-04-16 15:43+0200\n" -"PO-Revision-Date: 2006-02-09 21:51+0000\n" +"PO-Revision-Date: 2007-05-29 20:33+0100\n" "Last-Translator: Antonio Cardoso Martins <digiplan(a)netvisao.pt>\n" -"Language-Team: portuguese\n" +"Language-Team: pt <language(a)novell.com>\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -"X-Generator: KBabel 1.10.2\n" +"X-Generator: KBabel 1.11.4\n" #. error popup #. %1 is a command name (or a comma (, ) separated list of them) @@ -177,25 +177,10 @@ #. progress label #: src/wizards.ycp:58 msgid "Initializing..." -msgstr "Inicializando..." +msgstr "A inicializar..." # /usr/lib/YaST2/clients/adsl.ycp:52 #. progress label #: src/wizards.ycp:97 msgid "Initializing ..." msgstr "A Inicializar ..." - -#~ msgid "TFTP Server Enabled" -#~ msgstr "Servidor TFTP Activado" - -#~ msgid "Boot Image Directory" -#~ msgstr "Directório de Imagens de Arranque" - -#~ msgid "Here, a server for TFTP (Trivial File Transfer Protocol) can be enabled. It will be started using xinetd." -#~ msgstr "Pode activar aqui o servidor de TFTP (Trivial File Transfer Protocol). Este será iniciado utilizando o xinetd." - -#~ msgid "Specify the directory where served files are located. The usual value is <tt>/tftpboot</tt>. It will be created if it does not exist. The server will use it as its root directory (using the <tt>-s</tt> option)." -#~ msgstr "Especifique o directório onde estão localizados os ficheiros. Normalmente a localização é <tt>/tftpboot</tt>. O directório é criado se não existir. O servidor vai utilizá-lo como se fosse o directório de raiz (utilizando a opção <tt>-s</tt>)." - -#~ msgid "Bro&wse" -#~ msgstr "&Navegar" diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-trans-pt-2.15.1/po/tv.pt.po new/yast2-trans-pt-2.15.2/po/tv.pt.po --- old/yast2-trans-pt-2.15.1/po/tv.pt.po 2007-05-22 16:34:15.000000000 +0200 +++ new/yast2-trans-pt-2.15.2/po/tv.pt.po 2007-05-30 14:57:00.000000000 +0200 @@ -14,7 +14,7 @@ "Project-Id-Version: tv.pt\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2007-04-16 15:43+0200\n" -"PO-Revision-Date: 2007-05-13 14:09+0100\n" +"PO-Revision-Date: 2007-05-29 20:54+0100\n" "Last-Translator: Antonio Cardoso Martins <digiplan(a)netvisao.pt>\n" "Language-Team: pt <language(a)novell.com>\n" "MIME-Version: 1.0\n" @@ -338,7 +338,7 @@ #. Progress step #: src/Tv.ycp:3267 msgid "Writing IRC settings..." -msgstr "A guardar as definições de IRC..." +msgstr "A escrever definições de IRC..." #. Progress stage #: src/Tv.ycp:3270 @@ -642,7 +642,7 @@ # /usr/lib/YaST2/clients/adsl.ycp:52 #: src/irc_ui.ycp:99 src/tv_auto.ycp:53 src/ui.ycp:1933 msgid "Initializing..." -msgstr "Inicializando..." +msgstr "A inicializar..." #. error popup text #: src/irc_ui.ycp:106 diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-trans-pt-2.15.1/po/users.pt.po new/yast2-trans-pt-2.15.2/po/users.pt.po --- old/yast2-trans-pt-2.15.1/po/users.pt.po 2007-05-22 16:34:17.000000000 +0200 +++ new/yast2-trans-pt-2.15.2/po/users.pt.po 2007-05-30 14:57:03.000000000 +0200 @@ -14,7 +14,7 @@ "Project-Id-Version: users.pt\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2007-04-17 13:50+0200\n" -"PO-Revision-Date: 2007-05-16 01:00+0100\n" +"PO-Revision-Date: 2007-05-29 20:33+0100\n" "Last-Translator: Antonio Cardoso Martins <digiplan(a)netvisao.pt>\n" "Language-Team: pt <language(a)novell.com>\n" "MIME-Version: 1.0\n" @@ -3938,4 +3938,4 @@ #. label (during init dialog) #: src/wizards.ycp:279 src/wizards.ycp:310 msgid "Initializing..." -msgstr "Inicializando..." +msgstr "A inicializar..." diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-trans-pt-2.15.1/po/xpram.pt.po new/yast2-trans-pt-2.15.2/po/xpram.pt.po --- old/yast2-trans-pt-2.15.1/po/xpram.pt.po 2007-04-17 16:53:32.000000000 +0200 +++ new/yast2-trans-pt-2.15.2/po/xpram.pt.po 2007-05-30 14:57:08.000000000 +0200 @@ -1,4 +1,4 @@ -# translation of xpram.po to Portuguese +# translation of xpram.pt.po to pt # translation of xpram.po to # PORTUGUESE message file for YaST2 (@memory@). # Copyright (C) 2005 SUSE Linux Products GmbH. @@ -7,16 +7,16 @@ # # Bruno David Rodrigues <brunodavid(a)netc.pt>, 2000. # João Teles <teles(a)tecnolink.com>, 1999-2000. -# Antonio Cardoso Martins <digiplan(a)netvisao.pt>, 2006. +# Antonio Cardoso Martins <digiplan(a)netvisao.pt>, 2006, 2007. # Carlos Gonçalves <carlos(a)pinguix.com>, 2006. msgid "" msgstr "" -"Project-Id-Version: xpram\n" +"Project-Id-Version: xpram.pt\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2007-04-16 15:30+0200\n" -"PO-Revision-Date: 2006-10-04 21:05+0100\n" -"Last-Translator: Carlos Gonçalves <carlos(a)pinguix.com>\n" -"Language-Team: Portuguese\n" +"PO-Revision-Date: 2007-05-29 20:54+0100\n" +"Last-Translator: Antonio Cardoso Martins <digiplan(a)netvisao.pt>\n" +"Language-Team: pt <language(a)novell.com>\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" @@ -66,7 +66,7 @@ #. Progress step 1/2 #: src/modules/Xpram.ycp:107 msgid "Writing the settings..." -msgstr "A guardar as definições..." +msgstr "A escrever as definições..." #. Progress step 2/2 #: src/modules/Xpram.ycp:109 diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-trans-pt-2.15.1/po/you-server.pt.po new/yast2-trans-pt-2.15.2/po/you-server.pt.po --- old/yast2-trans-pt-2.15.1/po/you-server.pt.po 2007-04-17 16:53:35.000000000 +0200 +++ new/yast2-trans-pt-2.15.2/po/you-server.pt.po 2007-05-30 14:57:11.000000000 +0200 @@ -1,25 +1,25 @@ -# translation of you-server.pt.po to portuguese +# translation of you-server.pt.po to pt # PORTUGUESE message file for YaST2 (@memory@). # Copyright (C) 2005 SUSE Linux Products GmbH. # Copyright (C) 2002 SuSE Linux AG. # Copyright (C) 1999-2000, 2001 SuSE GmbH. +# # Bruno David Rodrigues <brunodavid(a)netc.pt>, 2000. # João Teles <teles(a)tecnolink.com>, 1999-2000. -# Antonio Cardoso Martins <digiplan(a)netvisao.pt>, 2006. -# +# Antonio Cardoso Martins <digiplan(a)netvisao.pt>, 2006, 2007. msgid "" msgstr "" "Project-Id-Version: you-server.pt\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2007-04-16 15:44+0200\n" -"PO-Revision-Date: 2006-03-24 01:05+0000\n" +"PO-Revision-Date: 2007-05-29 20:33+0100\n" "Last-Translator: Antonio Cardoso Martins <digiplan(a)netvisao.pt>\n" -"Language-Team: portuguese\n" +"Language-Team: pt <language(a)novell.com>\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -"X-Generator: KBabel 1.10.2\n" +"X-Generator: KBabel 1.11.4\n" #. default name for the server #: src/you_server.ycp:33 @@ -41,7 +41,7 @@ # /usr/lib/YaST2/clients/adsl.ycp:52 #: src/you_server.ycp:75 msgid "Initializing..." -msgstr "Inicializando..." +msgstr "A inicializar..." #: src/you_server.ycp:82 msgid "" diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-trans-pt-2.15.1/VERSION new/yast2-trans-pt-2.15.2/VERSION --- old/yast2-trans-pt-2.15.1/VERSION 2007-05-22 17:22:12.000000000 +0200 +++ new/yast2-trans-pt-2.15.2/VERSION 2007-05-30 15:25:18.000000000 +0200 @@ -1 +1 @@ -2.15.1 +2.15.2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit yast2-trans-km
by root＠Hilbert.suse.de 30 May '07

30 May '07

Hello community, here is the log from the commit of package yast2-trans-km checked in at Wed May 30 19:05:31 CEST 2007. -------- --- yast2-trans-km/yast2-trans-km.changes 2007-05-22 17:14:44.000000000 +0200 +++ /mounts/work_src_done/NOARCH/yast2-trans-km/yast2-trans-km.changes 2007-05-30 15:22:22.000000000 +0200 @@ -1,0 +2,5 @@ +Wed May 30 15:22:22 2007 - ke(a)suse.de + +- Update to version 2.15.2. + +------------------------------------------------------------------------ Old: ---- yast2-trans-km-2.15.1.tar.bz2 New: ---- yast2-trans-km-2.15.2.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-trans-km.spec ++++++ --- /var/tmp/diff_new_pack.d28266/_old 2007-05-30 19:05:25.000000000 +0200 +++ /var/tmp/diff_new_pack.d28266/_new 2007-05-30 19:05:25.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package yast2-trans-km (Version 2.15.1) +# spec file for package yast2-trans-km (Version 2.15.2) # # Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine @@ -11,12 +11,12 @@ # norootforbuild Name: yast2-trans-km -Version: 2.15.1 +Version: 2.15.2 Release: 1 License: GNU General Public License (GPL) Group: System/YaST BuildRoot: %{_tmppath}/%{name}-%{version}-build -Source0: yast2-trans-km-2.15.1.tar.bz2 +Source0: yast2-trans-km-2.15.2.tar.bz2 prefix: /usr Provides: locale(yast2:km) BuildRequires: pkgconfig yast2-devtools @@ -30,7 +30,7 @@ %prep -%setup -n yast2-trans-km-2.15.1 +%setup -n yast2-trans-km-2.15.2 %build autoreconf --force --install @@ -62,6 +62,8 @@ /usr/share/YaST2/locale %changelog +* Wed May 30 2007 - ke(a)suse.de +- Update to version 2.15.2. * Tue May 22 2007 - ke(a)suse.de - Update to version 2.15.1. * Thu Jan 25 2007 - ke(a)suse.de ++++++ yast2-trans-km-2.15.1.tar.bz2 -> yast2-trans-km-2.15.2.tar.bz2 ++++++ ++++ 13352 lines of diff (skipped) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit yast2-trans-hu
by root＠Hilbert.suse.de 30 May '07

30 May '07

Hello community, here is the log from the commit of package yast2-trans-hu checked in at Wed May 30 19:05:19 CEST 2007. -------- --- yast2-trans-hu/yast2-trans-hu.changes 2007-05-22 17:32:27.000000000 +0200 +++ /mounts/work_src_done/NOARCH/yast2-trans-hu/yast2-trans-hu.changes 2007-05-30 15:28:38.000000000 +0200 @@ -1,0 +2,5 @@ +Wed May 30 15:28:38 2007 - ke(a)suse.de + +- Update to version 2.15.4. + +------------------------------------------------------------------------ Old: ---- yast2-trans-hu-2.15.3.tar.bz2 New: ---- yast2-trans-hu-2.15.4.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-trans-hu.spec ++++++ --- /var/tmp/diff_new_pack.d26690/_old 2007-05-30 19:04:55.000000000 +0200 +++ /var/tmp/diff_new_pack.d26690/_new 2007-05-30 19:04:55.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package yast2-trans-hu (Version 2.15.3) +# spec file for package yast2-trans-hu (Version 2.15.4) # # Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine @@ -11,12 +11,12 @@ # norootforbuild Name: yast2-trans-hu -Version: 2.15.3 +Version: 2.15.4 Release: 1 License: GNU General Public License (GPL) Group: System/YaST BuildRoot: %{_tmppath}/%{name}-%{version}-build -Source0: yast2-trans-hu-2.15.3.tar.bz2 +Source0: yast2-trans-hu-2.15.4.tar.bz2 prefix: /usr Provides: locale(yast2:hu) BuildRequires: pkgconfig yast2-devtools @@ -33,7 +33,7 @@ %prep -%setup -n yast2-trans-hu-2.15.3 +%setup -n yast2-trans-hu-2.15.4 %build autoreconf --force --install @@ -65,6 +65,8 @@ /usr/share/YaST2/locale %changelog +* Wed May 30 2007 - ke(a)suse.de +- Update to version 2.15.4. * Tue May 22 2007 - ke(a)suse.de - Update to version 2.15.3. * Fri May 04 2007 - ke(a)suse.de ++++++ yast2-trans-hu-2.15.3.tar.bz2 -> yast2-trans-hu-2.15.4.tar.bz2 ++++++ ++++ 1974 lines of diff (skipped) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit yast2-trans-hr
by root＠Hilbert.suse.de 30 May '07

30 May '07

Hello community, here is the log from the commit of package yast2-trans-hr checked in at Wed May 30 19:04:48 CEST 2007. -------- --- yast2-trans-hr/yast2-trans-hr.changes 2007-05-22 17:34:14.000000000 +0200 +++ /mounts/work_src_done/NOARCH/yast2-trans-hr/yast2-trans-hr.changes 2007-05-30 15:30:02.000000000 +0200 @@ -1,0 +2,5 @@ +Wed May 30 15:30:02 2007 - ke(a)suse.de + +- Update to version 2.15.5. + +------------------------------------------------------------------------ Old: ---- yast2-trans-hr-2.15.4.tar.bz2 New: ---- yast2-trans-hr-2.15.5.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-trans-hr.spec ++++++ --- /var/tmp/diff_new_pack.k21992/_old 2007-05-30 19:03:48.000000000 +0200 +++ /var/tmp/diff_new_pack.k21992/_new 2007-05-30 19:03:48.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package yast2-trans-hr (Version 2.15.4) +# spec file for package yast2-trans-hr (Version 2.15.5) # # Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine @@ -11,12 +11,12 @@ # norootforbuild Name: yast2-trans-hr -Version: 2.15.4 +Version: 2.15.5 Release: 1 License: GNU General Public License (GPL) Group: System/YaST BuildRoot: %{_tmppath}/%{name}-%{version}-build -Source0: yast2-trans-hr-2.15.4.tar.bz2 +Source0: yast2-trans-hr-2.15.5.tar.bz2 prefix: /usr Provides: locale(yast2:hr) BuildRequires: pkgconfig yast2-devtools @@ -33,7 +33,7 @@ %prep -%setup -n yast2-trans-hr-2.15.4 +%setup -n yast2-trans-hr-2.15.5 %build autoreconf --force --install @@ -65,6 +65,8 @@ /usr/share/YaST2/locale %changelog +* Wed May 30 2007 - ke(a)suse.de +- Update to version 2.15.5. * Tue May 22 2007 - ke(a)suse.de - Update to version 2.15.4. * Fri May 04 2007 - ke(a)suse.de ++++++ yast2-trans-hr-2.15.4.tar.bz2 -> yast2-trans-hr-2.15.5.tar.bz2 ++++++ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-trans-hr-2.15.4/configure new/yast2-trans-hr-2.15.5/configure --- old/yast2-trans-hr-2.15.4/configure 2007-05-22 17:34:27.000000000 +0200 +++ new/yast2-trans-hr-2.15.5/configure 2007-05-30 15:30:13.000000000 +0200 @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.60 for yast2-trans-hr 2.15.4. +# Generated by GNU Autoconf 2.60 for yast2-trans-hr 2.15.5. # # Report bugs to <http://bugs.opensuse.org/>. # @@ -559,8 +559,8 @@ # Identity of this package. PACKAGE_NAME='yast2-trans-hr' PACKAGE_TARNAME='yast2-trans-hr' -PACKAGE_VERSION='2.15.4' -PACKAGE_STRING='yast2-trans-hr 2.15.4' +PACKAGE_VERSION='2.15.5' +PACKAGE_STRING='yast2-trans-hr 2.15.5' PACKAGE_BUGREPORT='http://bugs.opensuse.org/' ac_unique_file="RPMNAME" @@ -1185,7 +1185,7 @@ # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures yast2-trans-hr 2.15.4 to adapt to many kinds of systems. +\`configure' configures yast2-trans-hr 2.15.5 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1256,7 +1256,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of yast2-trans-hr 2.15.4:";; + short | recursive ) echo "Configuration of yast2-trans-hr 2.15.5:";; esac cat <<\_ACEOF @@ -1336,7 +1336,7 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -yast2-trans-hr configure 2.15.4 +yast2-trans-hr configure 2.15.5 generated by GNU Autoconf 2.60 Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, @@ -1350,7 +1350,7 @@ This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by yast2-trans-hr $as_me 2.15.4, which was +It was created by yast2-trans-hr $as_me 2.15.5, which was generated by GNU Autoconf 2.60. Invocation command line was $ $0 $@ @@ -2151,7 +2151,7 @@ # Define the identity of the package. PACKAGE='yast2-trans-hr' - VERSION='2.15.4' + VERSION='2.15.5' cat >>confdefs.h <<_ACEOF @@ -2378,7 +2378,7 @@ -VERSION="2.15.4" +VERSION="2.15.5" RPMNAME="yast2-trans-hr" MAINTAINER="Karl Eichwalder <ke(a)suse.de>" @@ -3313,7 +3313,7 @@ # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by yast2-trans-hr $as_me 2.15.4, which was +This file was extended by yast2-trans-hr $as_me 2.15.5, which was generated by GNU Autoconf 2.60. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -3356,7 +3356,7 @@ _ACEOF cat >>$CONFIG_STATUS <<_ACEOF ac_cs_version="\\ -yast2-trans-hr config.status 2.15.4 +yast2-trans-hr config.status 2.15.5 configured by $0, generated by GNU Autoconf 2.60, with options \\"`echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\" diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-trans-hr-2.15.4/configure.in new/yast2-trans-hr-2.15.5/configure.in --- old/yast2-trans-hr-2.15.4/configure.in 2007-05-22 17:34:22.000000000 +0200 +++ new/yast2-trans-hr-2.15.5/configure.in 2007-05-30 15:30:09.000000000 +0200 @@ -3,7 +3,7 @@ dnl -- This file is generated by y2autoconf 2.14.0 - DO NOT EDIT! -- dnl (edit configure.in.in instead) -AC_INIT(yast2-trans-hr, 2.15.4, http://bugs.opensuse.org/, yast2-trans-hr) +AC_INIT(yast2-trans-hr, 2.15.5, http://bugs.opensuse.org/, yast2-trans-hr) 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.15.4" +VERSION="2.15.5" RPMNAME="yast2-trans-hr" MAINTAINER="Karl Eichwalder <ke(a)suse.de>" diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-trans-hr-2.15.4/po/rpm-groups.hr.po new/yast2-trans-hr-2.15.5/po/rpm-groups.hr.po --- old/yast2-trans-hr-2.15.4/po/rpm-groups.hr.po 2007-05-22 16:40:59.000000000 +0200 +++ new/yast2-trans-hr-2.15.5/po/rpm-groups.hr.po 2007-05-30 15:01:06.000000000 +0200 @@ -281,7 +281,7 @@ msgstr "Joystick" msgid "KDE" -msgstr "" +msgstr "KDE" msgid "Kernel" msgstr "Kernel" diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-trans-hr-2.15.4/po/status.txt new/yast2-trans-hr-2.15.5/po/status.txt --- old/yast2-trans-hr-2.15.4/po/status.txt 2007-05-22 16:41:06.000000000 +0200 +++ new/yast2-trans-hr-2.15.5/po/status.txt 2007-05-30 15:01:15.000000000 +0200 @@ -1,6 +1,6 @@ -Translated : 4405 -Fuzzy : 6314 -Untranslated : 6205 +Translated : 4470 +Fuzzy : 6274 +Untranslated : 6180 -------------------- All strings : 16924 26 % are translated diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-trans-hr-2.15.4/po/storage.hr.po new/yast2-trans-hr-2.15.5/po/storage.hr.po --- old/yast2-trans-hr-2.15.4/po/storage.hr.po 2007-05-22 16:41:02.000000000 +0200 +++ new/yast2-trans-hr-2.15.5/po/storage.hr.po 2007-05-30 15:01:10.000000000 +0200 @@ -3799,7 +3799,7 @@ #: storage/src/include/evms_lib.ycp:943 #: storage/src/include/lvm_ui_dialogs.ycp:179 msgid "ma&x" -msgstr "" +msgstr "&maks" #. button text #: storage/src/include/evms_lib.ycp:948 diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-trans-hr-2.15.4/po/x11.hr.po new/yast2-trans-hr-2.15.5/po/x11.hr.po --- old/yast2-trans-hr-2.15.4/po/x11.hr.po 2007-04-17 15:56:27.000000000 +0200 +++ new/yast2-trans-hr-2.15.5/po/x11.hr.po 2007-05-30 15:01:13.000000000 +0200 @@ -1,188 +1,184 @@ -# translation of x11.po to Croatian +# translation of x11.hr.po to Hrvatski # Croatian message file for YaST2 (x11). # Copyright (C) 2001 SuSE GmbH. +# # Vlatko Kosturjak <kost(a)iname.com>, 2001. # Tihomir Badanjak <tihomir(a)dom-racunala.hr>, 2004. -# +# Krešimir Jozić <kjozic(a)gmail.com>, 2007. msgid "" msgstr "" -"Project-Id-Version: x11\n" +"Project-Id-Version: x11.hr\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2007-04-16 15:44+0200\n" -"PO-Revision-Date: 2004-06-01 16:24+0200\n" -"Last-Translator: Tihomir Badanjak <tihomir(a)dom-racunala.hr>\n" -"Language-Team: Croatian <suradnja(a)suse.com.hr>\n" +"PO-Revision-Date: 2007-05-23 22:22+0200\n" +"Last-Translator: Krešimir Jozić <kjozic(a)gmail.com>\n" +"Language-Team: Hrvatski\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n" -"X-Generator: KBabel 1.0.2\n" +"X-Generator: KBabel 1.11.4\n" #. ============================================= #. some packages required are missing #. --------------------------------------------- #: src/XMessages.ycp:35 -#, fuzzy, ycp-format +#, ycp-format msgid "" "\n" "The following packages are missing:\n" "%1\n" "Install them now?\n" -msgstr "Slijedeći paketi su instalirani sa greškom:\n" +msgstr "" +"\n" +"Slijedeći paketi nedostaju:\n" +"%1\n" +"Da li ih želite instalirati sada?\n" #. ============================================= #. help text for commandline mode #. --------------------------------------------- #: src/XMessages.ycp:44 -#, fuzzy msgid "" "\n" "X11 configuration module.\n" -msgstr "Modul postavki LDAP klijenta" +msgstr "" +"\n" +"Modul za X11 postavke.\n" #. ============================================= #. color key #. --------------------------------------------- #: src/XMessages.ycp:51 msgid "Colors" -msgstr "Boja" +msgstr "Boje" #. ============================================= #. graphics card #. --------------------------------------------- #: src/XMessages.ycp:56 msgid "Graphics card: " -msgstr "" +msgstr "Grafička kartica: " #. ============================================= #. monitor #. --------------------------------------------- #: src/XMessages.ycp:61 -#, fuzzy msgid "Monitor: " -msgstr "Konfiguriranje monitora" +msgstr "Monitor: " #. ============================================= #. colorDepth #. --------------------------------------------- #: src/XMessages.ycp:66 -#, fuzzy msgid "Colordepth: " -msgstr "&Boja:" +msgstr "Dubina boja: " #. ============================================= #. deactivated #. --------------------------------------------- #: src/XMessages.ycp:71 -#, fuzzy msgid "Deactivated" -msgstr "Da, Aktiviraj %1" +msgstr "Deaktiviran" #. ============================================= #. activated #. --------------------------------------------- #: src/XMessages.ycp:76 -#, fuzzy msgid "Activated" -msgstr "Da, Aktiviraj %1" +msgstr "Aktiviran" #. ============================================= #. 3D acceleration #. --------------------------------------------- #: src/XMessages.ycp:81 -#, fuzzy msgid "3D Acceleration: " -msgstr "3&D Akceleracija" +msgstr "3D ubrzanje: " #. ============================================= #. External VGA on NoteBooks #. --------------------------------------------- #: src/XMessages.ycp:86 msgid "Dual Head Mode: " -msgstr "" +msgstr "Dvostruki prikaz:" #. ============================================= #. selectColorDepth #. --------------------------------------------- #: src/XMessages.ycp:91 -#, fuzzy msgid "Select color depth:" -msgstr "&Boja:" +msgstr "Odaberite dubinu boja:" #. ============================================= #. selectResolution #. --------------------------------------------- #: src/XMessages.ycp:96 -#, fuzzy msgid "Select resolution:" -msgstr "Odaberi točku montiranja" +msgstr "Odaberite rezoluciju:" #. ============================================= #. selectMonitor #. --------------------------------------------- #: src/XMessages.ycp:101 msgid "Select Monitor Vendor and Model:" -msgstr "" +msgstr "Odaberite proizvođača monitora i model:" #. ============================================= #. selectLink #. --------------------------------------------- #: src/XMessages.ycp:106 msgid "Click the underlined setting to change." -msgstr "" +msgstr "Kliknite na podvučene postavke da ih promijenite." #. ============================================= #. Scale unit for display traversal #. --------------------------------------------- #: src/XMessages.ycp:111 msgid "Inches" -msgstr "" +msgstr "Inči" #. ============================================= #. Scale unit for display aspect #. --------------------------------------------- #: src/XMessages.ycp:116 msgid "Aspect" -msgstr "" +msgstr "Prikaz" #. ============================================= #. selectDisplaySize #. --------------------------------------------- #: src/XMessages.ycp:121 -#, fuzzy msgid "Traversal" -msgstr "Univerzalno" +msgstr "Dijagonalno" #: src/XMessages.ycp:122 msgid "Aspect Ratio:" -msgstr "" +msgstr "Omjer prikaza: " #. ============================================= #. proposal menu and title text #. --------------------------------------------- #: src/XMessages.ycp:127 msgid "Graphics Cards" -msgstr "" +msgstr "Grafičke kartice" #: src/XMessages.ycp:128 msgid "&Graphics Cards" -msgstr "" +msgstr "&Grafičke kartice" #. ============================================= #. selectTest #. --------------------------------------------- #: src/XMessages.ycp:133 -#, fuzzy msgid "Test the Configuration" -msgstr "&Resetiranje konfiguracije" +msgstr "Isprobajte postavke" #. ============================================= #. Unconfigured #. --------------------------------------------- #: src/XMessages.ycp:138 -#, fuzzy msgid "Unconfigured" -msgstr "&Konfiguriraj" +msgstr "Nije podešeno" #. ============================================= #. warnNoteBook @@ -192,6 +188,8 @@ "\n" "Dual head mode is not supported with this laptop.\n" msgstr "" +"\n" +"Dvostruki prikaz nije podržan na ovom prijenosnom računalu.\n" #. ============================================= #. warnInvalidColorResolution @@ -201,45 +199,44 @@ "\n" "The selected resolution and/or color settings are not supported by the graphics cards framebuffer.\n" msgstr "" +"\n" +"Odabrana rezolucija i/ili postavke boja nisu podržane od strane grafičke kartice.\n" #: src/autoyast/dialog/autoDialog.ycp:49 msgid "8 Bit / 256 Colors" -msgstr "8 Bitno / 256 Boja" +msgstr "8 bita / 256 boja" #: src/autoyast/dialog/autoDialog.ycp:53 msgid "15 Bit / 32 K Colors (PPC)" -msgstr "" +msgstr "15 bita / 32 K boja (PPC)" #: src/autoyast/dialog/autoDialog.ycp:57 src/autoyast/dialog/autoDialog.ycp:78 msgid "16 Bit / 64 K Colors" -msgstr "" +msgstr "16 bita / 64 K boja" #: src/autoyast/dialog/autoDialog.ycp:61 msgid "24 Bit / 16 M Colors" -msgstr "" +msgstr "24 bita / 16 M boja" #: src/autoyast/dialog/autoDialog.ycp:65 msgid "32 Bit / 16 M Colors" -msgstr "" +msgstr "32 bita / 16 M boja" #: src/autoyast/dialog/autoDialog.ycp:83 msgid "KDM" -msgstr "" +msgstr "KDM" #: src/autoyast/dialog/autoDialog.ycp:85 -#, fuzzy msgid "GDM" -msgstr "GMT" +msgstr "GDM" #: src/autoyast/dialog/autoDialog.ycp:87 -#, fuzzy msgid "XDM" -msgstr "GMT" +msgstr "XDM" #: src/autoyast/dialog/autoDialog.ycp:93 -#, fuzzy msgid "KDE" -msgstr "IDE" +msgstr "KDE" #: src/autoyast/dialog/autoDialog.ycp:95 msgid "GNOME" @@ -247,49 +244,43 @@ #: src/autoyast/dialog/autoDialog.ycp:97 msgid "TWM" -msgstr "" +msgstr "TWM" #: src/autoyast/dialog/autoDialog.ycp:99 msgid "FVWM" -msgstr "" +msgstr "FVWM" #: src/autoyast/dialog/autoDialog.ycp:105 msgid "&General Options:" -msgstr "" +msgstr "&Opće postavke:" #: src/autoyast/dialog/autoDialog.ycp:110 msgid "&Enable 3D Support if possible" -msgstr "" +msgstr "Omog&ući 3D podršku ako je moguće" #: src/autoyast/dialog/autoDialog.ycp:117 -#, fuzzy msgid "Co&lor Depth" -msgstr "&Boja:" +msgstr "&Dubina boja" #: src/autoyast/dialog/autoDialog.ycp:121 -#, fuzzy msgid "Resol&ution" -msgstr "Rezolucija" +msgstr "&Rezolucija" #: src/autoyast/dialog/autoDialog.ycp:128 -#, fuzzy msgid "Desktop:" -msgstr "KDE 2 okružje" +msgstr "Radna površina:" #: src/autoyast/dialog/autoDialog.ycp:131 -#, fuzzy msgid "&Display Manager" -msgstr "Upravitelji Prozorima" +msgstr "Upra&vitelj prikazom" #: src/autoyast/dialog/autoDialog.ycp:138 -#, fuzzy msgid "&Window Manager" -msgstr "Upravitelji Prozorima" +msgstr "Upravi&telj prozorima" #: src/autoyast/dialog/autoDialog.ycp:159 -#, fuzzy msgid "X11 Configuration" -msgstr "&Bez X11 konfiguracije" +msgstr "X11 postavke" #. x11 help 1/3 #: src/autoyast/dialog/autoDialog.ycp:164 @@ -297,6 +288,8 @@ "Use this dialog to configure the X11 system and the\n" "display attached to the computer to install.\n" msgstr "" +"Koristite ovaj prozor da postavite X11 sustav i zaslon\n" +"priključen na računalo koji treba instalirati.\n" #. x11 help 2/3 #: src/autoyast/dialog/autoDialog.ycp:168 @@ -304,18 +297,18 @@ "Additionally, configure if the X11 system should\n" "be started at boot time and what display manager should be used.\n" msgstr "" +"Dodatno, postavite da li X11 sustav treba biti pokrenut prilikom podizanja\n" +"sustava i koji upravitelj prozorima treba biti korišten.\n" #. Headline for monitor vendor selection box #: src/autoyast/dialog/autoDialog.ycp:221 -#, fuzzy msgid "&Vendor" -msgstr "Proizvođač" +msgstr "&Proizvođač" #. Headline for monitor model selection box #: src/autoyast/dialog/autoDialog.ycp:228 -#, fuzzy msgid "M&odel" -msgstr "Model" +msgstr "Mode&l" #. Frame title for horizontal frequency input fields #: src/autoyast/dialog/autoDialog.ycp:239 @@ -324,9 +317,8 @@ msgstr "Horizontalna frekvencija" #: src/autoyast/dialog/autoDialog.ycp:241 -#, fuzzy msgid "&min" -msgstr "min" +msgstr "&min" #. Separator between min and max frequency fields #: src/autoyast/dialog/autoDialog.ycp:244 @@ -335,9 +327,8 @@ msgstr "-" #: src/autoyast/dialog/autoDialog.ycp:245 -#, fuzzy msgid "m&ax" -msgstr "maks" +msgstr "m&aks" #. Unit for horizontal frequency #: src/autoyast/dialog/autoDialog.ycp:248 @@ -351,14 +342,12 @@ msgstr "Vertikalna frekvencija" #: src/autoyast/dialog/autoDialog.ycp:258 -#, fuzzy msgid "m&in" -msgstr "min" +msgstr "&min" #: src/autoyast/dialog/autoDialog.ycp:262 -#, fuzzy msgid "ma&x" -msgstr "maks" +msgstr "&maks" #. Unit for horizontal frequency #: src/autoyast/dialog/autoDialog.ycp:265 @@ -370,19 +359,17 @@ #. #. help part 1 of 8 #: src/autoyast/dialog/autoDialog.ycp:312 -#, fuzzy msgid "" "\n" "Please select your monitor's vendor and model.\n" "\n" msgstr "" "\n" -"Vaš tip monitora ne može biti određen automatski.\n" -"Molimo izaberite proizvođača i model monitora.\n" +"Molimo odaberite proizvođača monitora i model.\n" +"\n" #. help part 2 of 8 #: src/autoyast/dialog/autoDialog.ycp:318 -#, fuzzy msgid "" "\n" "If your monitor is not listed here, use VESA.\n" @@ -390,13 +377,12 @@ "\n" msgstr "" "\n" -"Ukoliko vaš monitor nije popisan ovdje, koristite VESA\n" -"- većina monitora poštuju taj standard.\n" +"Ako vaš monitor nije u listi, koristite VESA.\n" +"Većina monitora odgovara ovom standardu.\n" "\n" #. help part 5 of 8 #: src/autoyast/dialog/autoDialog.ycp:326 -#, fuzzy msgid "" "\n" "Modify the monitor's frequencies in the respective input\n" @@ -407,12 +393,12 @@ "\n" msgstr "" "\n" -"Možete promjeniti frekvenciju monitora u određenim unosnim\n" -"poljima ispod pravokutnih izbornika.\n" -"Pogledajte upute vašeg monitora za maksimalne frekvencije\n" -"monitora. Nemojte pretjerati sa vrijednostima određenim ovdje -\n" -"jer postoji ozbiljan rizik oštećivanja vašeg monitora.\n" -"" +"Promijenite frekvenciju monitora u poljima za unos\n" +"ispod polja za odabir.\n" +"Obratite se priručniku od monitora da biste saznali maksimalne frekvencije\n" +"vašeg monitora. Nemojte pretjerati s vrijednostima navedenim tamo.\n" +"Inače, postoji rizik da se vaš monitor ošteti.\n" +"\n" #. help part 6 of 8 #: src/autoyast/dialog/autoDialog.ycp:336 @@ -424,9 +410,9 @@ "\n" msgstr "" "\n" -"horizontalna frekvencija (u kHz) određuje koliko će puta\n" -"u sekundi monitor moći zapisati horizontalnu scan liniju. To je\n" -"hard limit monitora, nezavisni od zaslonske rezolucije.\n" +"Horizontalna frekvencija (u kHz) određuje koliko puta u sekundi\n" +"monitor može iscrtati horizontalnu crtu. To je ograničenje monitora,\n" +"neovisno o rezoluciji zaslona.\n" "\n" #. help part 7 of 8 @@ -473,614 +459,78 @@ #. monitor vendor not known #: src/autoyast/dialog/autoDialog.ycp:607 -#, fuzzy msgid "unknown vendor" -msgstr "Konfiguriranje monitora" +msgstr "nepoznat proizvođač" #. monitor model not known #: src/autoyast/dialog/autoDialog.ycp:614 -#, fuzzy msgid "unknown model" -msgstr "nepoznato" +msgstr "nepoznat model" #: src/autoyast/dialog/autoDialog.ycp:711 msgid "Configure Monitor" -msgstr "Konfiguriranje monitora" +msgstr "Postavke monitora" #. A frequency value is not of type numerical. User must correct this. #: src/autoyast/dialog/autoDialog.ycp:762 -#, fuzzy msgid "" "The minimum horizontal frequency is not a numerical value.\n" "Try again.\n" msgstr "" -"Maksimalna horizontalna frekvencija nije numerička vrijednost.\n" +"Minimalna horizontalna frekvencija nije numerička vrijednost.\n" "Molimo pokušajte ponovno.\n" #. A frequency value is not of type numerical. User must correct this. #: src/autoyast/dialog/autoDialog.ycp:773 -#, fuzzy msgid "" "Maximum horizontal frequency is not a numerical value.\n" "Please try again." msgstr "" "Maksimalna horizontalna frekvencija nije numerička vrijednost.\n" -"Molimo pokušajte ponovno.\n" +"Molimo pokušajte ponovno." #. A frequency value is not of type numerical. User must correct this. #: src/autoyast/dialog/autoDialog.ycp:782 -#, fuzzy msgid "" "The minimum vertical frequency is not a numerical value.\n" "Try again.\n" msgstr "" -"Maksimalna vertikalna frekvencija nije numerička vrijednost.\n" +"Minimalna vertikalna frekvencija nije numerička vrijednost.\n" "Molimo pokušajte ponovno.\n" #. A frequency value is not of type numerical. User must correct this. #: src/autoyast/dialog/autoDialog.ycp:793 -#, fuzzy msgid "" "Maximum vertical frequency is not a numerical value.\n" "Please try again." msgstr "" "Maksimalna vertikalna frekvencija nije numerička vrijednost.\n" -"Molimo pokušajte ponovno.\n" +"Molimo pokušajte ponovno." #: src/autoyast/modules/AutoinstX11.ycp:86 msgid "Enable 3D Support If Possible" -msgstr "" +msgstr "Omogući 3D podršku ako je moguće" #: src/autoyast/modules/AutoinstX11.ycp:88 -#, fuzzy msgid "Yes" -msgstr "&Da" +msgstr "Da" #: src/autoyast/modules/AutoinstX11.ycp:90 -#, fuzzy msgid "Color Depth" -msgstr "&Boja:" +msgstr "Dubina boja" #: src/autoyast/modules/AutoinstX11.ycp:92 msgid "Resolution" msgstr "Rezolucija" #: src/autoyast/modules/AutoinstX11.ycp:96 -#, fuzzy msgid "Display Manager" -msgstr "Upravitelji Prozorima" +msgstr "Upravitelj prikazom" #: src/autoyast/modules/AutoinstX11.ycp:100 msgid "Window Manager" -msgstr "Upravitelji Prozorima" +msgstr "Upravitelj prozorima" #: src/autoyast/modules/AutoinstX11.ycp:104 -#, fuzzy msgid "Monitor" -msgstr "Konfiguriranje monitora" - -#, fuzzy -#~ msgid "Deactived" -#~ msgstr "Da, Aktiviraj %1" - -#, fuzzy -#~ msgid "now" -#~ msgstr "ne" - -#, fuzzy -#~ msgid "&Configure the X Window System" -#~ msgstr "Osnovni X Window Sustav" - -#, fuzzy -#~ msgid "Configure X11" -#~ msgstr "Konfiguriranje monitora" - -#, fuzzy -#~ msgid "&Text mode only -- no graphical desktop" -#~ msgstr "&Tekst mod samo - bez grafičkog okružja" - -#~ msgid "&Graphical desktop environment" -#~ msgstr "&Grafičko okružje" - -#, fuzzy -#~ msgid "C&hange..." -#~ msgstr "&Promjeni..." - -#, fuzzy -#~ msgid "Not detected." -#~ msgstr "Nije pronađen pisač" - -#, fuzzy -#~ msgid "Display Environment:" -#~ msgstr "K Destop Environment" - -#~ msgid "Enabled" -#~ msgstr "Omogućeno" - -#~ msgid "Disabled" -#~ msgstr "Onemogučeno" - -#, fuzzy -#~ msgid "Unknown Monitor" -#~ msgstr "Konfiguriranje monitora" - -#, fuzzy -#~ msgid "Connected to Monitor:" -#~ msgstr "Konfiguriranje monitora" - -#, fuzzy -#~ msgid "Resolutions:" -#~ msgstr "&Rezoluacija:" - -#~ msgid "Desktop Settings" -#~ msgstr "Postavke okružja" - -#~ msgid "XFree86 4 module: %1" -#~ msgstr "XFree86 4 modul: %1" - -#~ msgid "XFree86 3 server: %1" -#~ msgstr "XFree86 3 poslužitelj: %1" - -#~ msgid "%1 " -#~ msgstr "%1 " - -#~ msgid "&No X11 configuration" -#~ msgstr "&Bez X11 konfiguracije" - -#~ msgid "&Write XF86Config" -#~ msgstr "&Zapiši XF86Config" - -#~ msgid "Please select" -#~ msgstr "Molimo izaberite" - -#, fuzzy -#~ msgid "" -#~ "\n" -#~ "Choose the X Window Desktop Settings.\n" -#~ "\n" -#~ msgstr "" -#~ "\n" -#~ "Molimo izaberite X-Windows Postavke radnog okružja\n" -#~ "\n" - -#~ msgid "" -#~ "\n" -#~ "The video card shown has automatically been detected.\n" -#~ "The appropriate X server for this video card has been chosen accordingly.\n" -#~ "" -#~ msgstr "" -#~ "\n" -#~ "Prikazana video kartica je automatski pronađena.\n" -#~ "Pripadajući X poslužitelj za ovu video karticu je izabran sukladno.\n" -#~ "" - -#~ msgid "" -#~ "\n" -#~ "Select No X11 configuration to skip X Window configuration.\n" -#~ "You can manually configure X11 later (using sax) if you wish.\n" -#~ "\n" -#~ msgstr "" -#~ "\n" -#~ "Izaberite Bez X11 konfiguracije za preskakanje X Window konfiguracije.\n" -#~ "Možete ručno konfigurirati X11 kasnije (koristeći sax ako želite).\n" -#~ "\n" - -#, fuzzy -#~ msgid "" -#~ "Choose one of the\n" -#~ "options to continue.\n" -#~ msgstr "" -#~ "Morate izabrati jednu od opcija\n" -#~ "u pravilu da nastavite." - -#, fuzzy -#~ msgid "Gnome" -#~ msgstr "ništa" - -#, fuzzy -#~ msgid "Configure graphics card and monitor" -#~ msgstr "Konfiguriranje monitora" - -#, fuzzy -#~ msgid "" -#~ "\n" -#~ "Please look at the current desktop settings for the X Window System.\n" -#~ "If you don't like them, you can Change the settings.\n" -#~ "" -#~ msgstr "" -#~ "\n" -#~ "Molimo pogledajte preporučene postavke okružja za X Window System.\n" -#~ "Ukoliko ih ne volite, možete Promjeniti postavke.\n" -#~ "" - -#~ msgid "" -#~ "\n" -#~ "You can select Text mode only to skip X Window configuration\n" -#~ "altogether. If you do that, you can always run SaX or SaX2\n" -#~ "later. \n" -#~ "\n" -#~ msgstr "" -#~ "\n" -#~ "Možete izabrati Tekst mod samo za preskakanje X Window konfiguracije\n" -#~ "zajedno. Ukoliko to napravite, uvijek možete pokrenuti SaX ili SaX2\n" -#~ "kasnije. \n" -#~ "\n" - -#, fuzzy -#~ msgid "" -#~ "\n" -#~ "If you choose Graphical desktop environment, the current settings will\n" -#~ "be tested when you select Next. Follow the instructions that appear.\n" -#~ "\n" -#~ msgstr "" -#~ "\n" -#~ "Ukoliko izaberete Grafičko okružje, predložene postavke će\n" -#~ "biti testirana jedanpit kada izaberete Slijedeće - tada, slijedite upute koje će se pojavljivati.\n" -#~ "\n" - -#~ msgid "&OK" -#~ msgstr "&U redu" - -#, fuzzy -#~ msgid "%1 %2%3" -#~ msgstr "%1 " - -#, fuzzy -#~ msgid "Current settings:" -#~ msgstr "Postavke okružja" - -#, fuzzy -#~ msgid "Refresh rate: " -#~ msgstr "&Vrijednost osvježavanja (Hz):" - -#, fuzzy -#~ msgid "Suggested settings:" -#~ msgstr "Postavke okružja" - -#, fuzzy -#~ msgid "" -#~ "\n" -#~ "The selected video mode will now be tested.\n" -#~ "\n" -#~ "If you do not see the test picture, press the\n" -#~ "ESC key to return to this screen immediately.\n" -#~ msgstr "" -#~ "Izabrani video mod sada će biti testiran.\n" -#~ "Ukoliko ne vidite testnu sliku, pritisnite\n" -#~ "ESC tipku za povratak na ovaj zaslon odmah." - -#, fuzzy -#~ msgid "Desktop Settings - Details" -#~ msgstr "Postavke okružja" - -#~ msgid "No X11" -#~ msgstr "Bez X11" - -#~ msgid "Please insert a monitor drivers floppy." -#~ msgstr "Molimo ubacite disketu sa upravljačkim programima za monitor" - -#~ msgid "Driver disk could not be mounted" -#~ msgstr "Disketa sa upravljačkim programom ne može biti montirana" - -#~ msgid "No monitor information file found on this disk" -#~ msgstr "Nisu pronađene informacije o monitoru na ovoj disketi" - -#~ msgid "" -#~ "Minimal horizontal frequency is not a numerical value.\n" -#~ "Please try again." -#~ msgstr "" -#~ "Minimalna horizontalna frekvencija nije numerička vrijednost.\n" -#~ "Molimo pokušajte ponovno." - -#~ msgid "" -#~ "Minimal vertical frequency is not a numerical value.\n" -#~ "Please try again." -#~ msgstr "" -#~ "Minimalna vertikalna frekvencija nije numerička vrijednost.\n" -#~ "Molimo pokušajte ponovno." - -#~ msgid "" -#~ "Error creating X11 configuration.\n" -#~ "Please use SaX (sax) to configure XFree86 V3 or SaX2 (sax2) for XFree86 V4 later." -#~ msgstr "" -#~ "Greška prilikom pravljenja X11 konfiguracije.\n" -#~ "Molimo koristite SaX (sax) za konfiguriranje XFree86 V3 ili SaX2 (sax2) za XFree86 V4." - -#~ msgid "Re&fresh Rate (Hz):" -#~ msgstr "&Vrijednost osvježavanja (Hz):" - -#, fuzzy -#~ msgid "&No X11" -#~ msgstr "Bez X11" - -#~ msgid "&Test" -#~ msgstr "&Testiraj" - -#~ msgid "Change &Monitor..." -#~ msgstr "Promjeni &Monitor..." - -#~ msgid "Graphics Card: %1" -#~ msgstr "Grafička kartica: %1" - -#~ msgid "X Server: %1" -#~ msgstr "X Poslužitelj: %1" - -#~ msgid "Monitor: %1" -#~ msgstr "Monitor: %1" - -#~ msgid "" -#~ "\n" -#~ "Please choose the desktop settings for the X Window System -\n" -#~ "Resolution, number of Colors, Refresh Rate and whether\n" -#~ "or not you want to use 3D Acceleration. Please note that not all combinations \n" -#~ "of those values may be valid, depending on your hardware.\n" -#~ "" -#~ msgstr "" -#~ "\n" -#~ "Molimo izaberite postavke okružja za X Window System -\n" -#~ "Rezoluciju, broj Boja, Vrijednost osvježavanja i da li\n" -#~ "želite koristiti 3D Akceleraciju. Molimo primjetite da nisu sve kombinacije \n" -#~ "ovih vrijednosti ispravne, u zavisnosti o vašem hardware-u.\n" -#~ "" - -#~ msgid "" -#~ "\n" -#~ "You can and should Test the current settings (follow the instructions\n" -#~ "that will appear). If you don't explicitly perform the test, it will\n" -#~ "automatically be started when you select Next. \n" -#~ "\n" -#~ msgstr "" -#~ "\n" -#~ "Možete i trebali biste Testirati trenutne postavke (slijedite upute\n" -#~ "koje će se pojaviti). Ukoliko ne želite eksplicitno izvršiti testiranje, ono\n" -#~ "će biti automatski pokrenuto kada odaberete Slijedeće. \n" - -#~ msgid "" -#~ "\n" -#~ "The Resolution indicates the number of pixels horizontally and vertically.\n" -#~ "" -#~ msgstr "" -#~ "\n" -#~ "Rezolucija određuje broj piksela horizontalno i vertikalno.\n" -#~ "" - -#~ msgid "" -#~ "\n" -#~ "Colors indicates how many colors can be displayed simultaneously on the\n" -#~ "screen. You might want to choose at least 16 Bit / 65535 colors if possible to\n" -#~ "avoid color flickering when switching from one window to another.\n" -#~ "" -#~ msgstr "" -#~ "\n" -#~ "Boje određuje koliko će boja biti prikazano istovremeno na \n" -#~ "zaslonu. Vjerojatno ćete željeti izabrati najmanje 16 Bit / 65535 boja ako je\n" -#~ "to moguće zbog izbjegavanja flicker-a boja kada mjenjate prozore iz jednog u drugog.\n" -#~ "" - -#~ msgid "" -#~ "\n" -#~ "The Refresh Rate is the number of times per second the image is\n" -#~ "refreshed. The higher you go here, the more flicker-free the display becomes\n" -#~ "- unless you have an LCD where this is irrelevant. Values of at least 72 Hz or\n" -#~ "more are recommended.\n" -#~ "\n" -#~ msgstr "" -#~ "\n" -#~ "Vrijednost osvježavanja je broj puta u sekundi koliko će slika biti\n" -#~ "osvježena. Što više stavite ovdje, manje će zaslon biti u flicker-ima\n" -#~ "- ukoliko imate LCD gdje je ovo nebitno. Vrijednosti od najmanje 72 Hz ili\n" -#~ "više su preporučene.\n" -#~ "\n" - -#~ msgid "" -#~ "\n" -#~ "If your graphics card supports this, you can enable or disable 3D\n" -#~ "Acceleration. \n" -#~ "" -#~ msgstr "" -#~ "\n" -#~ "Ukoliko vaša grafička kartica podržava ovo, možete uključiti ili isključiti\n" -#~ "3D Akceleraciju. \n" -#~ "" - -#~ msgid "" -#~ "\n" -#~ "The table to the right shows your Graphics Card as automatically detected.\n" -#~ "You cannot change this here, but of course you can always run SaX or\n" -#~ "SaX2 later if you need to.\n" -#~ "" -#~ msgstr "" -#~ "\n" -#~ "Tablika desno prikazuje vašu Grafičku karticu automatski pronađenu.\n" -#~ "Ne možete to promjeniti ovdje, ali naravno uvijek možete pokrenuti SaX ili\n" -#~ "SaX2 kasnije ako trebate.\n" -#~ "" - -#~ msgid "" -#~ "\n" -#~ "The matching X Server is automatically selected, depending on your\n" -#~ "hardware and the current settings. Please notice that this may change when you\n" -#~ "switch 3D Acceleration on or off.\n" -#~ "" -#~ msgstr "" -#~ "\n" -#~ "Odgovarajući X Poslužitelj je automatski odabran, u zavisnosti od vašeg\n" -#~ "hardware-a i trenutnih postavki. Molimo primjetite da se to može promjeniti kada\n" -#~ "promjenite 3D Akceleraciju u uključeno ili isključeno.\n" -#~ "" - -#~ msgid "" -#~ "\n" -#~ "The X Server is (very loosely spoken) the counterpart of what other\n" -#~ "operating systems call graphics driver - that part of the window system\n" -#~ "that deals with the underlying hardware.\n" -#~ "" -#~ msgstr "" -#~ "\n" -#~ "X Poslužitelj je (jako loše rečeno) dio koji drugi \n" -#~ "operativni sustavi zovu grafičkim upravljačkim programom - taj dio\n" -#~ "prozorskog sustava koji obavlja komunikaciju sa hardware-om.\n" -#~ "" - -#~ msgid "" -#~ "\n" -#~ "The Monitor is shown as manually selected or\n" -#~ "automatically detected. You can change this with Change Monitor.\n" -#~ "" -#~ msgstr "" -#~ "\n" -#~ "Monitor je prikazan kao ručno odabrani ili\n" -#~ "automatski pronađeni. Možete to promjeniti sa Promjeni Monitor.\n" -#~ "" - -#~ msgid "min" -#~ msgstr "min" - -#~ msgid "max" -#~ msgstr "maks" - -#, fuzzy -#~ msgid "&Driver disk" -#~ msgstr "Disketa sa upravljačkim programom" - -#~ msgid "" -#~ "\n" -#~ "You can use a monitor driver disk to import the monitor's\n" -#~ "technical data. Notice that you do not need a special Linux monitor\n" -#~ "driver disk; most common monitor driver disks will do. Just try the\n" -#~ "floppy that came with your monitor.\n" -#~ "" -#~ msgstr "" -#~ "\n" -#~ "Možete koristiti disketu sa upravljačkim programom od monitora za\n" -#~ "dobivanje informacije o tehničkim podacima monitora. Primjetite da ne\n" -#~ "trebate specijalnu disketu sa upravljačkim program za Linux; većina\n" -#~ "disketa sa upravljačkim programom za monitor će pomoći. Samo pokušajte\n" -#~ "sa disketu koja je došla sa vašim monitorom.\n" -#~ "" - -#~ msgid "" -#~ "\n" -#~ "If you do not wish to use the X Window System (X11), select\n" -#~ "no X11.\n" -#~ "" -#~ msgstr "" -#~ "\n" -#~ "Ukoliko ne želite koristiti X Window System (X11) izaberite\n" -#~ "bez X11.\n" -#~ "" - -#, fuzzy -#~ msgid "3D acceleration enabled" -#~ msgstr "3&D Akceleracija" - -#, fuzzy -#~ msgid "3D acceleration disabled" -#~ msgstr "3&D Akceleracija" - -#~ msgid "" -#~ "3D support for your graphics adapter is still in an experimental\n" -#~ "state and not recommended for mission critical machines.\n" -#~ "\n" -#~ "Please also notice that this driver is not OpenSource. Therefore, we\n" -#~ "can only offer very limited support in case of problems.\n" -#~ "\n" -#~ "If you do not need 3D acceleration, please disable it.\n" -#~ msgstr "" -#~ "3D podrška za vaš grafički adapter je još uvijek u eksperimentalnom\n" -#~ "stanju i nije preporučljiva za mission-critical računala.\n" -#~ "\n" -#~ "Molimo također primjetite da ovaj upravljački program nije OpenSource. Tako da\n" -#~ "možemo pružiti samo ograničenu podršku u slučaju problema.\n" -#~ "\n" -#~ "Ukoliko ne trebate 3D akceleraciju, molimo isključite ju.\n" - -#~ msgid "256 colors (8 bpp)" -#~ msgstr "256 boja (8 bpp)" - -#~ msgid "65K colors (16 bpp)" -#~ msgstr "65K boja (16 bpp)" - -#~ msgid "16.7M colors (24 bpp)" -#~ msgstr "16.7M boja (24 bpp)" - -#~ msgid "16.7M colors (32 bpp)" -#~ msgstr "16.7M boja (32 bpp)" - -#~ msgid "No &X11 configuration" -#~ msgstr "Bez &X11 konfiguracije" - -#~ msgid "Use &3D acceleration" -#~ msgstr "Koristi &3D akceleraciju" - -#~ msgid "" -#~ "\n" -#~ "Select one of the possible screen Resolutions from the box on\n" -#~ "the left side and one of the possible Color Depth settings from the\n" -#~ "box on the right side.\n" -#~ "\n" -#~ msgstr "" -#~ "\n" -#~ "Izaberite jednu of mogućih zaslonskih Rezolucija iz pravokutnika na\n" -#~ "lijevoj strani i jednu od mogućih postavki Dubina boje iz \n" -#~ "pravokutnika sa desne strane.\n" -#~ "\n" - -#~ msgid "" -#~ "\n" -#~ "Please notice that not all combinations of color depths and resolution may\n" -#~ "be valid with your video card; this depends on the amount of memory\n" -#~ "(shown above) on the card.\n" -#~ "The higher the resolution and the number of colors, the more memory is \n" -#~ "required.\n" -#~ "\n" -#~ msgstr "" -#~ "\n" -#~ "Molimo budite upozoreni da sve kombinacije dubine boja i rezolucija ne\n" -#~ "moraju biti ispravni sa vašom video karticom; to ovisi o veličini memorije\n" -#~ "(prikazanih gore) na kartici.\n" -#~ "Što je veća rezolucija i broj boja, više memorije je potrebno.\n" -#~ "\n" - -#~ msgid "" -#~ "\n" -#~ "Select Use 3D acceleration to enable 3D hardware acceleration.\n" -#~ "Not all video cards are capable of using this feature.\n" -#~ "\n" -#~ msgstr "" -#~ "\n" -#~ "Izaberite Koristi 3D akceleraciju za omogućivanje 3D hardware-ske\n" -#~ "akceleracije.\n" -#~ "Nisu sve video kartice u mogućnosti iskoristiti ovu značajku.\n" -#~ "\n" - -#~ msgid "" -#~ "\n" -#~ "When you are satisfied with your selections, make sure to select\n" -#~ "Test to check the settings.\n" -#~ "" -#~ msgstr "" -#~ "\n" -#~ "Kada ste zadovoljni sa vašim izborom, budite sigurni da izaberete\n" -#~ "Testiraj za provjeru postavki.\n" -#~ "" - -#~ msgid "" -#~ "\n" -#~ "Adjust the horizontal and vertical size and position\n" -#~ "of the screen image that is displayed when you press that button.\n" -#~ "\n" -#~ msgstr "" -#~ "\n" -#~ "Prilagođavanje horizontalne i vertikalne veličine i pozicije\n" -#~ "slike zaslona koja ja prikazana kada pritisnete gumb.\n" -#~ "\n" - -#~ msgid "Please test your selected video mode first." -#~ msgstr "Molimo istestirajte prvo vaš izabrani video mod." - -#~ msgid "C&ontinue" -#~ msgstr "&Nastavak" - -#~ msgid "&Cancel" -#~ msgstr "&Odustani" +msgstr "Monitor" diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-trans-hr-2.15.4/VERSION new/yast2-trans-hr-2.15.5/VERSION --- old/yast2-trans-hr-2.15.4/VERSION 2007-05-22 17:34:14.000000000 +0200 +++ new/yast2-trans-hr-2.15.5/VERSION 2007-05-30 15:30:02.000000000 +0200 @@ -1 +1 @@ -2.15.4 +2.15.5 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit yast2-trans-fi
by root＠Hilbert.suse.de 30 May '07

30 May '07

Hello community, here is the log from the commit of package yast2-trans-fi checked in at Wed May 30 19:03:41 CEST 2007. -------- --- yast2-trans-fi/yast2-trans-fi.changes 2007-05-22 17:38:24.000000000 +0200 +++ /mounts/work_src_done/NOARCH/yast2-trans-fi/yast2-trans-fi.changes 2007-05-30 15:19:24.000000000 +0200 @@ -1,0 +2,5 @@ +Wed May 30 15:19:24 2007 - ke(a)suse.de + +- Update to version 2.15.4. + +------------------------------------------------------------------------ Old: ---- yast2-trans-fi-2.15.3.tar.bz2 New: ---- yast2-trans-fi-2.15.4.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-trans-fi.spec ++++++ --- /var/tmp/diff_new_pack.H20072/_old 2007-05-30 19:03:21.000000000 +0200 +++ /var/tmp/diff_new_pack.H20072/_new 2007-05-30 19:03:21.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package yast2-trans-fi (Version 2.15.3) +# spec file for package yast2-trans-fi (Version 2.15.4) # # Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine @@ -11,12 +11,12 @@ # norootforbuild Name: yast2-trans-fi -Version: 2.15.3 +Version: 2.15.4 Release: 1 License: GNU General Public License (GPL) Group: System/YaST BuildRoot: %{_tmppath}/%{name}-%{version}-build -Source0: yast2-trans-fi-2.15.3.tar.bz2 +Source0: yast2-trans-fi-2.15.4.tar.bz2 prefix: /usr Provides: locale(yast2:fi) BuildRequires: pkgconfig yast2-devtools @@ -30,7 +30,7 @@ %prep -%setup -n yast2-trans-fi-2.15.3 +%setup -n yast2-trans-fi-2.15.4 %build autoreconf --force --install @@ -62,6 +62,8 @@ /usr/share/YaST2/locale %changelog +* Wed May 30 2007 - ke(a)suse.de +- Update to version 2.15.4. * Tue May 22 2007 - ke(a)suse.de - Update to version 2.15.3. * Fri May 04 2007 - ke(a)suse.de ++++++ yast2-trans-fi-2.15.3.tar.bz2 -> yast2-trans-fi-2.15.4.tar.bz2 ++++++ ++++ 3925 lines of diff (skipped) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit yast2-trans-de
by root＠Hilbert.suse.de 30 May '07

30 May '07

Hello community, here is the log from the commit of package yast2-trans-de checked in at Wed May 30 19:03:15 CEST 2007. -------- --- yast2-trans-de/yast2-trans-de.changes 2007-04-19 16:59:36.000000000 +0200 +++ /mounts/work_src_done/NOARCH/yast2-trans-de/yast2-trans-de.changes 2007-05-30 15:32:49.000000000 +0200 @@ -1,0 +2,5 @@ +Wed May 30 15:32:49 2007 - ke(a)suse.de + +- Update to version 2.15.3. + +------------------------------------------------------------------------ Old: ---- yast2-trans-de-2.15.2.tar.bz2 New: ---- yast2-trans-de-2.15.3.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-trans-de.spec ++++++ --- /var/tmp/diff_new_pack.V16600/_old 2007-05-30 19:02:48.000000000 +0200 +++ /var/tmp/diff_new_pack.V16600/_new 2007-05-30 19:02:48.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package yast2-trans-de (Version 2.15.2) +# spec file for package yast2-trans-de (Version 2.15.3) # # Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine @@ -11,12 +11,12 @@ # norootforbuild Name: yast2-trans-de -Version: 2.15.2 +Version: 2.15.3 Release: 1 License: GNU General Public License (GPL) Group: System/YaST BuildRoot: %{_tmppath}/%{name}-%{version}-build -Source0: yast2-trans-de-2.15.2.tar.bz2 +Source0: yast2-trans-de-2.15.3.tar.bz2 prefix: /usr Provides: locale(yast2:de) # Requires: yast2-config-XXpkgXX @@ -34,7 +34,7 @@ %prep -%setup -n yast2-trans-de-2.15.2 +%setup -n yast2-trans-de-2.15.3 %build autoreconf --force --install @@ -66,6 +66,8 @@ /usr/share/YaST2/locale %changelog +* Wed May 30 2007 - ke(a)suse.de +- Update to version 2.15.3. * Thu Apr 19 2007 - ke(a)suse.de - Update to version 2.15.2. * Mon Apr 02 2007 - ke(a)suse.de ++++++ yast2-trans-de-2.15.2.tar.bz2 -> yast2-trans-de-2.15.3.tar.bz2 ++++++ ++++ 1633 lines of diff (skipped) ++++ retrying with extended exclude list diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-trans-de-2.15.2/configure.in new/yast2-trans-de-2.15.3/configure.in --- old/yast2-trans-de-2.15.2/configure.in 2007-04-19 16:59:42.000000000 +0200 +++ new/yast2-trans-de-2.15.3/configure.in 2007-05-30 15:32:56.000000000 +0200 @@ -3,7 +3,7 @@ dnl -- This file is generated by y2autoconf 2.14.0 - DO NOT EDIT! -- dnl (edit configure.in.in instead) -AC_INIT(yast2-trans-de, 2.15.2, http://bugs.opensuse.org/, yast2-trans-de) +AC_INIT(yast2-trans-de, 2.15.3, http://bugs.opensuse.org/, yast2-trans-de) 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.15.2" +VERSION="2.15.3" RPMNAME="yast2-trans-de" MAINTAINER="Karl Eichwalder <ke(a)suse.de>" diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-trans-de-2.15.2/po/backup.de.po new/yast2-trans-de-2.15.3/po/backup.de.po --- old/yast2-trans-de-2.15.2/po/backup.de.po 2007-04-19 16:25:05.000000000 +0200 +++ new/yast2-trans-de-2.15.3/po/backup.de.po 2007-05-30 10:46:33.000000000 +0200 @@ -632,8 +632,8 @@ "profiles. A backup profile is used to name a group of different settings, \n" "such as the name of an archive and how to search for files." msgstr "" -"Dieser Dialog enthält eine Liste der aktuell gespeicherten Backup-\n" -"Profile. Ein Backup-Profil wird zum Bezeichnen einer Gruppe verschiedener Einstellungen verwendet, \n" +"Dieses Dialogfeld enthält eine Liste der zurzeit gespeicherten Backup-Profile.\n" +"Ein Backup-Profil wird zum Bezeichnen einer Gruppe verschiedener Einstellungen verwendet, \n" "z. B. der Name eines Archivs und der Suchvorgang für Dateien." #. For translators: help text in profile management dialog - part 3/4 diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-trans-de-2.15.2/po/base.de.po new/yast2-trans-de-2.15.3/po/base.de.po --- old/yast2-trans-de-2.15.2/po/base.de.po 2007-04-19 16:25:07.000000000 +0200 +++ new/yast2-trans-de-2.15.3/po/base.de.po 2007-05-30 15:01:47.000000000 +0200 @@ -1834,7 +1834,7 @@ "<big>Firewall-Einstellungen</big> \n" "Zum Öffnen der Firewall für den Zugriff von Diensten entfernter\n" "Rechner\n" -"drücken Sie %1. " +"aktivieren Sie %1. " #. help text for firewall port openning widget 2/3, optional #. %1 is push button label, eg. "Firewall &Details" (without quotes) @@ -1846,7 +1846,7 @@ "click %2. " msgstr "" "Zum Wählen von Schnittstellen, auf denen der Port geöffnet\n" -"werden soll, drücken Sie %2. " +"werden soll, klicken Sie auf %2. " #. help text for firewall settings widget 3/3, #: library/network/src/CWMFirewallInterfaces.ycp:938 diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-trans-de-2.15.2/po/bootloader.de.po new/yast2-trans-de-2.15.3/po/bootloader.de.po --- old/yast2-trans-de-2.15.2/po/bootloader.de.po 2007-04-19 16:25:10.000000000 +0200 +++ new/yast2-trans-de-2.15.3/po/bootloader.de.po 2007-05-30 10:46:38.000000000 +0200 @@ -205,7 +205,7 @@ #. proposal part - bootloader label #: src/clients/bootloader_proposal.ycp:188 msgid "Booting" -msgstr "Systemstart..." +msgstr "Systemstart" #. menubutton entry #: src/clients/bootloader_proposal.ycp:190 @@ -722,7 +722,7 @@ #. menubutton item, keep as short as possible #: src/modules/BootGRUB.ycp:853 msgid "Propose and &Merge with Existing GRUB Menus" -msgstr "Vorschlagen und mit vorhandenen GRUB-Menüs &mergen" +msgstr "Vorschlagen und mit vorhandenen GRUB-Menüs &zusammenführen" #. error report #: src/modules/BootZIPL.ycp:140 diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-trans-de-2.15.2/po/dhcp-server.de.po new/yast2-trans-de-2.15.3/po/dhcp-server.de.po --- old/yast2-trans-de-2.15.2/po/dhcp-server.de.po 2007-04-19 16:25:18.000000000 +0200 +++ new/yast2-trans-de-2.15.3/po/dhcp-server.de.po 2007-05-30 10:46:47.000000000 +0200 @@ -1879,7 +1879,7 @@ msgstr "" "<big>Firewall-Einstellungen</big> \n" "Zum Öffnen der Firewall für den Zugriff von Diensten entfernter\n" -"Rechner über die ausgewählte Schnittstelle, wählen Sie\n" +"Rechner über die ausgewählte Schnittstelle wählen Sie\n" "Firewall für gewählte Schnittstelle öffnen aus. \n" "Diese Option ist nur dann verfügbar, wenn die Firewall\n" "aktiviert ist." @@ -2160,8 +2160,8 @@ "offer these name servers to the DHCP clients.\n" "These values must be IP addresses." msgstr "" -"IP des primären Namenservers und IP des sekundären Namenservers \n" -"bieten den DHCP-Clients folgende Namenserver an.\n" +"IP des primären Nameservers und IP des sekundären Nameservers \n" +"bieten den DHCP-Clients folgende Nameserver an.\n" "Bei diesen Werten muss es sich um IP-Adressen handeln." #. Wizard Installation - Step 2 5/9 @@ -2170,7 +2170,7 @@ "Default Gateway inserts this\n" "value as the default route in the routing table of clients." msgstr "" -"MitStandard-Gateway wird dieser\n" +"Mit Standardgateway wird dieser\n" "Wert als Standardroute in die Routing-Tabelle der Clients eingefügt." #. Wizard Installation - Step 2 6/9 diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-trans-de-2.15.2/po/dns-server.de.po new/yast2-trans-de-2.15.3/po/dns-server.de.po --- old/yast2-trans-de-2.15.2/po/dns-server.de.po 2007-04-19 16:25:20.000000000 +0200 +++ new/yast2-trans-de-2.15.3/po/dns-server.de.po 2007-05-30 10:46:48.000000000 +0200 @@ -2121,7 +2121,7 @@ "<big>Forwarders</big> \n" "Forwarders sind DNS-Server, an die der DNS-Server Abfragen sendet, die er\n" "nicht bearbeiten kann.\n" -"Für Einwählverbindungen kann es hilfreich sein,\n" +"Für Einwahlverbindungen kann es hilfreich sein,\n" "nach dem Verbindungsaufbau eine Aktualisierung der Forwarder durch den PPP-Daemon\n" "zuzulassen. Wählen Sie hierzu PPP-Daemon legt Forwarders fest aus. Wenn die Forwarder nur\n" "manuell aktualisiert werden sollen, wählen Sie Forwarders manuell festlegen.\n" @@ -2138,10 +2138,10 @@ "To add a new forwarder, set its IP Address and click Add.\n" "To delete a configured forwarder, select it and click Delete." msgstr "" -"Zum Hinzufügen eines neuen Forwarders legen Sie seine IP-Adresse\n" -"fest und drücken Sie Hinzufügen.\n" -"Zum Löschen eines konfigurierten Forwarders wählen Sie diesen und\n" -"drücken Sie Löschen." +"Zum Hinzufügen eines neuen Forwarders geben Sie dessen IP-Adresse\n" +"an und klicken auf Hinzufügen.\n" +"Zum Löschen eines konfigurierten Forwarders wählen Sie diesen aus und\n" +"klicken auf Löschen." #. Expert Mode Configuration - Basic Options 1/2 #: src/helps.ycp:216 diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-trans-de-2.15.2/po/installation.de.po new/yast2-trans-de-2.15.3/po/installation.de.po --- old/yast2-trans-de-2.15.2/po/installation.de.po 2007-04-19 16:25:28.000000000 +0200 +++ new/yast2-trans-de-2.15.3/po/installation.de.po 2007-05-30 10:46:57.000000000 +0200 @@ -646,7 +646,7 @@ "\n" msgstr "" "\n" -"Zum Übernehmen der angezeigten Einstellungen wählen Sie Weiter.\n" +"Zum Übernehmen der angezeigten Einstellungen wählen Sie Übernehmen.\n" "\n" #. help text diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-trans-de-2.15.2/po/irda.de.po new/yast2-trans-de-2.15.3/po/irda.de.po --- old/yast2-trans-de-2.15.2/po/irda.de.po 2007-04-19 16:25:32.000000000 +0200 +++ new/yast2-trans-de-2.15.3/po/irda.de.po 2007-05-30 10:47:01.000000000 +0200 @@ -111,7 +111,7 @@ #. help text for IrDA 3/4 #: src/ui.ycp:196 msgid "To test if it works, put your IrDA device (phone, PDA, etc.) in range of your infrared port and push Test." -msgstr "Legen Sie zum Testen Ihr IrDA-Gerät (Telefon, PDA, etc.) in Reichweite Ihres Infrarot-Ports und wählen Sie Test." +msgstr "Legen Sie zum Testen Ihr IrDA-Gerät (Telefon, PDA etc.) in Reichweite Ihres Infrarot-Ports und wählen Sie Test." #. help text for IrDA 4/4 #: src/ui.ycp:199 diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-trans-de-2.15.2/po/kerberos.de.po new/yast2-trans-de-2.15.3/po/kerberos.de.po --- old/yast2-trans-de-2.15.2/po/kerberos.de.po 2007-04-19 16:25:39.000000000 +0200 +++ new/yast2-trans-de-2.15.3/po/kerberos.de.po 2007-05-30 10:47:09.000000000 +0200 @@ -157,7 +157,7 @@ msgstr "" "\n" "<big>Authentifizierung mit Kerberos</big> \n" -"Bei Kerberos-Client-Konfiguration werden die PAM-Einstellungen für die Aktivierung der Kerberos-Authentifizierung aktualisiert. Hierfür benötigt das System Zugriff auf einen Kerberos-Server im Netzwerk.\n" +"Bei der Kerberos-Client-Konfiguration werden die PAM-Einstellungen für die Aktivierung der Kerberos-Authentifizierung aktualisiert. Hierfür benötigt das System Zugriff auf einen Kerberos-Server im Netzwerk.\n" "\n" #. help text 2/5 @@ -179,13 +179,13 @@ "It is common practice to use the domain name in uppercase as your default realm name, but you can select freely. If the realm is not available on the server, you cannot log in. Ask your server administrator if you need more information.\n" msgstr "" "\n" -"Es ist allgemein üblich, für Ihren Standardbereichsnamen den Domänennamen in Großbuchstaben zu verwenden. Sie haben jedoch die freie Wahl. Wenn der Bereich auf dem Server nicht verfügbar ist, ist eine Anmeldung nicht möglich. Wenden Sie sich an Ihres Server-Administrator, wenn Sie weitere Informationen benötigen.\n" +"Es ist allgemein üblich, für Ihren Standardbereichsnamen den Domänennamen in Großbuchstaben zu verwenden. Sie haben jedoch die freie Wahl. Wenn der Realm auf dem Server nicht verfügbar ist, ist eine Anmeldung nicht möglich. Wenden Sie sich an Ihren Server-Administrator, wenn Sie weitere Informationen benötigen.\n" #. rwalter: the appearance order of this and 4/5 is reversed. Please fix. #. help text 5/5 #: src/dialogs.ycp:107 msgid "To configure more settings, click Advanced Settings." -msgstr "Zum Konfigurieren weiterer Optionen drücken Sie Erweiterte Einstellungen." +msgstr "Zum Konfigurieren weiterer Optionen klicken Sie auf Erweiterte Einstellungen." #. radio button label #: src/dialogs.ycp:119 @@ -205,7 +205,7 @@ #. textentry label #: src/dialogs.ycp:129 msgid "Default &Domain" -msgstr "Standard-&Domain" +msgstr "Standard&domäne" #. textentry label #: src/dialogs.ycp:131 diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-trans-de-2.15.2/po/ldap-client.de.po new/yast2-trans-de-2.15.3/po/ldap-client.de.po --- old/yast2-trans-de-2.15.2/po/ldap-client.de.po 2007-04-19 16:25:43.000000000 +0200 +++ new/yast2-trans-de-2.15.3/po/ldap-client.de.po 2007-05-30 10:47:13.000000000 +0200 @@ -794,7 +794,7 @@ "removed." msgstr "" "LDAP-Dienste lassen sich mit LDAP nicht verwenden deaktivieren.\n" -"Wenn Sie LDAP deaktivieren, wird der aktuelle LDAP-Eintrag für die passwd\n" +"Wenn Sie LDAP deaktivieren, wird der aktuelle LDAP-Eintrag für passwd\n" "aus /etc/nsswitch.conf entfernt. Die PAM-Konfiguration wird geändert und der\n" "LDAP-Eintrag wird entfernt." @@ -819,7 +819,7 @@ #. help text 5/9 #: src/ui.ycp:197 msgid "With Find, select the LDAP server from the list provided by the service location protocol (SLP). Using Fetch DN, read the base DN from server." -msgstr "Wählen Sie mit Suchen den LDAP-Server aus der vom Service Location Protocol (SLP) bereitgestellten Liste. Mit DN holen lesen Sie die Base DN vom Server." +msgstr "Wählen Sie mit Suchen den LDAP-Server aus der vom Service Location Protocol (SLP) bereitgestellten Liste. Mit DN holen lesen Sie den Basis-DN vom Server." #. help text 6/9 #: src/ui.ycp:200 @@ -1010,7 +1010,7 @@ "in /etc/ldap.conf file.\n" msgstr "" "Geben Sie die für die Suchbasen zu verwendenden speziellen Zuordnungen an (Benutzer, Passwörter und Gruppen), wenn Sie vom Basis-DN abweichen. Diese Werte werden\n" -"in der Datei /etc/ldap.conf auf die Attribute nss_base_passwd, nss_base_shadow,\n" +"in der Datei /etc/ldap.conf auf die Attribute nss_base_passwd, nss_base_shadow\n" "und nss_base_group gesetzt.\n" #. help text 2/3 @@ -1025,7 +1025,7 @@ "Set the type of LDAP groups to use.\n" "The default value for Group Member Attribute is %1.\n" msgstr "" -"Typ der zu verwendenden LDAP-Gruppen festlegen.\n" +"Legen Sie den Typ der zu verwendenden LDAP-Gruppen fest.\n" "Der Standardwert für Attribut für Gruppenmitglied lautet %1.\n" #. help text caption 2 diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-trans-de-2.15.2/po/linux-user-mgmt.de.po new/yast2-trans-de-2.15.3/po/linux-user-mgmt.de.po --- old/yast2-trans-de-2.15.2/po/linux-user-mgmt.de.po 2007-04-19 16:25:46.000000000 +0200 +++ new/yast2-trans-de-2.15.3/po/linux-user-mgmt.de.po 2007-05-30 10:47:16.000000000 +0200 @@ -273,7 +273,7 @@ #: src/NovellLDAPLUM.ycp:415 msgid "Admin password. Optional for Desktop." -msgstr "Admin-Kennwort. Optional für Desktop." +msgstr "Admin-Passwort. Optional für Desktop." #: src/NovellLDAPLUM.ycp:418 msgid "Port Details" diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-trans-de-2.15.2/po/network.de.po new/yast2-trans-de-2.15.3/po/network.de.po --- old/yast2-trans-de-2.15.2/po/network.de.po 2007-04-19 16:25:51.000000000 +0200 +++ new/yast2-trans-de-2.15.3/po/network.de.po 2007-05-30 10:47:21.000000000 +0200 @@ -491,7 +491,7 @@ "If you press Add, you can manually configure a DSL device." msgstr "" "<BIG>Hinzufügen eines DSL-Geräts:</BIG> \n" -"Mithilfe des Buttons Hinzufügen können Sie ein\n" +"Mithilfe der Schaltfläche Hinzufügen können Sie ein\n" "DSL-Gerät manuell konfigurieren." #. DSL overview dialog help 3/3 @@ -503,7 +503,7 @@ msgstr "" "<BIG>Bearbeiten oder löschen:</BIG> \n" "Wählen Sie ein DSL-Gerät, dessen Konfiguration Sie ändern oder löschen möchten.\n" -"Drücken Sie dann den entsprechenden Button: Bearbeiten oder Löschen." +"Klicken Sie dann auf die entsprechende Schaltfläche: Bearbeiten oder Löschen." #. Table header 4/4 #: src/dsl/complex.ycp:305 src/isdn/complex.ycp:365 src/modem/complex.ycp:325 @@ -1126,7 +1126,7 @@ "Press Add to configure an ISDN card manually.\n" msgstr "" "<BIG>Eine ISDN-Karte hinzufügen:</BIG> \n" -"Mithilfe des Buttons Hinzufügen können Sie eine\n" +"Mithilfe der Schaltfläche Hinzufügen können Sie eine\n" "ISDN-Karte manuell konfigurieren.\n" #. isdns overview dialog help 3/5 @@ -1137,7 +1137,7 @@ "selected card.\n" msgstr "" "<BIG>Konfiguration der ISDN-Karte testen:</BIG> \n" -"Nach Drücken des Buttons Test versucht das System, den\n" +"Nach dem Klicken auf die Schaltfläche Test versucht das System, den\n" "Treiber für die gewählte Karte zu laden.\n" #. isdns overview dialog help 4/5 @@ -1147,7 +1147,7 @@ "If you press Add, you can configure an ISDN dial-up connection.\n" msgstr "" "<BIG>Eine ISDN-Verbindung hinzufügen:</BIG> \n" -"Mithilfe des Buttons Hinzufügen können Sie eine\n" +"Mithilfe der Schaltfläche Hinzufügen können Sie eine\n" "ISDN-Einwahlverbindung konfigurieren.\n" #. isdns overview dialog help 5/5 @@ -1160,7 +1160,7 @@ "<BIG>Bearbeiten oder löschen:</BIG> \n" "Wählen Sie eine ISDN-Karte oder -Verbindung, deren Konfiguration Sie ändern\n" "oder löschen möchten.\n" -"Drücken Sie dann den entsprechenden Button: Bearbeiten oder Löschen.\n" +"Klicken Sie dann auf die entsprechende Schaltfläche: Bearbeiten oder Löschen.\n" #: src/isdn/complex.ycp:365 msgid "Hardware" @@ -2982,7 +2982,7 @@ "Press Add to configure a new network card manually.\n" msgstr "" "<big>Eine Netzwerkkarte hinzufügen:</big> \n" -"Mithilfe des Buttons Hinzufügen können Sie eine\n" +"Mithilfe der Schaltfläche Hinzufügen können Sie eine\n" "neue Netzwerkkarte manuell konfigurieren.\n" #: src/lan/help.ycp:50 @@ -2993,7 +2993,7 @@ msgstr "" "<big>Bearbeiten oder löschen:</big> \n" "Wählen Sie eine Netzwerkkarte, die Sie bearbeiten oder löschen möchten.\n" -"Drücken Sie dann den entsprechenden Button: Bearbeiten oder Löschen.\n" +"Klicken Sie dann auf die entsprechende Schaltfläche: Bearbeiten oder Löschen.\n" #. IPv6 help #: src/lan/help.ycp:57 @@ -3029,7 +3029,7 @@ #. Routing dialog help 2/2 #: src/lan/help.ycp:75 msgid "Enable IP Forwarding if the system is a router." -msgstr "Wenn das System als Router fungiert, sollten Sie IP-Weiterleitungaktivieren." +msgstr "Wenn das System als Router fungiert, sollten Sie IP-Weiterleitung aktivieren." #: src/lan/help.ycp:78 #, fuzzy @@ -3063,7 +3063,7 @@ "Enter the name servers and domain search list for resolving \n" "hostnames. Usually they can be obtained by DHCP.\n" msgstr "" -"Geben Sie die Namenserver und Domänensuchliste für die Auflösung von \n" +"Geben Sie die Nameserver und Domänensuchliste für die Auflösung von \n" "Hostnamen ein. Normalerweise können diese durch DHCP abgerufen werden.\n" #. resolver dialog help @@ -3073,7 +3073,7 @@ "IP addresses. This value must be entered as an IP address\n" "(for example, 192.168.0.42), not as a hostname.\n" msgstr "" -"Ein Namenserver ist ein Computer, der Hostnamen in\n" +"Ein Nameserver ist ein Computer, der Hostnamen in\n" "IP-Adressen übersetzt. Dieser Wert muss als eine IP-Adresse\n" " (z.B. 192.168.0.42) und nicht als Hostname angegeben werden.\n" @@ -3103,7 +3103,7 @@ #: src/lan/help.ycp:115 msgid "Optionally enter the name server list and domain search list." -msgstr "Geben Sie optional die Namenserverliste und Domänenserverliste ein." +msgstr "Geben Sie optional die Nameserverliste und Domänenserverliste ein." #: src/lan/help.ycp:116 msgid "" @@ -4115,7 +4115,7 @@ "If you press Add, you can manually configure a modem.\n" msgstr "" "<BIG>Ein Modem hinzufügen:</BIG> \n" -"Mithilfe des Buttons Hinzufügen können Sie ein\n" +"Mithilfe der Schaltfläche Hinzufügen können Sie ein\n" "Modem manuell konfigurieren.\n" #. modems overview dialog help 3/3 @@ -4127,7 +4127,7 @@ msgstr "" "<BIG>Bearbeiten oder löschen:</BIG> \n" "Wählen Sie ein Modem, dessen Konfiguration Sie ändern oder löschen möchten.\n" -"Drücken Sie dann den entsprechenden Button: Bearbeiten oder Löschen." +"Klicken Sie dann auf die entsprechende Schaltfläche: Bearbeiten oder Löschen." #. tab header #: src/modem/complex.ycp:343 @@ -4553,7 +4553,7 @@ #. stage 2/5 #: src/modules/ISDN.ycp:268 msgid "Read current device configuration" -msgstr "Aktuelle Geräte-Konfiguration einlesen" +msgstr "Aktuelle Gerätekonfiguration einlesen" #. stage 3/5 #: src/modules/ISDN.ycp:270 @@ -4570,7 +4570,7 @@ #. step 2 in reading current ISDN setup #: src/modules/ISDN.ycp:287 msgid "Reading current device configuration..." -msgstr "Aktuelle Geräte-Konfiguration wird eingelesen..." +msgstr "Aktuelle Gerätekonfiguration wird eingelesen..." #. step 3 in reading current ISDN setup #: src/modules/ISDN.ycp:294 @@ -4749,7 +4749,7 @@ #. Progress stage 3/9 - multiple devices may be present, really plural #: src/modules/Lan.ycp:372 msgid "Read device configuration" -msgstr "Geräte-Konfiguration einlesen" +msgstr "Gerätekonfiguration einlesen" #. Progress stage 4/9 #: src/modules/Lan.ycp:374 @@ -4789,7 +4789,7 @@ #. Progress step 3/9 - multiple devices may be present, really plural #: src/modules/Lan.ycp:410 msgid "Reading device configuration..." -msgstr "Geräte-Konfiguration wird eingelesen..." +msgstr "Gerätekonfiguration wird eingelesen..." #. Progress step 4/9 #: src/modules/Lan.ycp:417 @@ -4829,7 +4829,7 @@ #. Progress stage 3 - multiple devices may be present,really plural #: src/modules/Lan.ycp:523 msgid "Write device configuration" -msgstr "Geräte-Konfiguration schreiben" +msgstr "Gerätekonfiguration schreiben" #. Progress stage 4 #: src/modules/Lan.ycp:525 @@ -4854,7 +4854,7 @@ #. Progress step 3 - multiple devices may be present, really plural #: src/modules/Lan.ycp:560 msgid "Writing device configuration..." -msgstr "Geräte-Konfiguration wird geschrieben..." +msgstr "Gerätekonfiguration wird geschrieben..." #. Progress step 4 #: src/modules/Lan.ycp:567 @@ -5457,7 +5457,7 @@ "Press Add to configure a new provider manually.\n" msgstr "" "<big>Einen Provider hinzufügen:</big> \n" -"Mithilfe des Buttons Hinzufügen können Sie manuell\n" +"Mithilfe der Schaltfläche Hinzufügen können Sie manuell\n" "einen neuen Provider konfigurieren.\n" #. Provider overview dialog help 3/3 @@ -5469,7 +5469,7 @@ msgstr "" "<big>Bearbeiten oder löschen:</big> \n" "Wählen Sie einen Provider, den Sie bearbeiten oder löschen möchten.\n" -"Drücken Sie dann den entsprechenden Button: Bearbeiten oder Löschen.\n" +"Klicken Sie dann auf die entsprechende Schaltfläche: Bearbeiten oder Löschen.\n" #. Provider dialog help 1/3 #: src/provider/helps.ycp:75 @@ -5489,7 +5489,7 @@ #: src/provider/helps.ycp:82 msgid "Use New to add a provider not in the list." msgstr "" -"Verwenden Sie den Button Neu zum Hinzufügen eines Providers, \n" +"Verwenden Sie die Schaltfläche Neu zum Hinzufügen eines Providers, \n" "der nicht in der Liste erscheint." #. Provider type dialog help 1/1 @@ -6708,7 +6708,7 @@ #. textentry label #: src/services/dns.ycp:331 msgid "&Domain Name" -msgstr "&Domainname" +msgstr "&Domänenname" #: src/services/dns.ycp:333 msgid "The domain is especially important if this computer is a mail server." @@ -6776,7 +6776,7 @@ #. Frame label #: src/services/dns.ycp:435 msgid "Name Servers and Domain Search List" -msgstr "Nameserver und Domain-Suchliste" +msgstr "Nameserver und Domänensuchliste" #: src/services/dns.ycp:454 #, fuzzy @@ -6936,7 +6936,7 @@ "HTTP Proxy URL is the name of the proxy server for your access\n" "to the World Wide Web (WWW).\n" msgstr "" -"HTTP-Proxy-URL ist der Name des Proxy-Servers für Ihren Zugang\n" +"HTTP-Proxy-URL ist der Name des Proxyservers für Ihren Zugang\n" "zum World Wide Web (WWW).\n" #. Proxy dialog help 3/8 @@ -6945,7 +6945,7 @@ "HTTPS Proxy URL is the name of the proxy server for your secured access\n" "to the World Wide Web (WWW).\n" msgstr "" -"Die HTTPS-Proxy-URL gibt den Namen des Proxy-Servers für Ihren gesicherten Zugriff\n" +"Die HTTPS-Proxy-URL gibt den Namen des Proxyservers für Ihren gesicherten Zugriff\n" "auf das World Wide Web (WWW) an.\n" #. Proxy dialog help 3.5/8 @@ -6959,7 +6959,7 @@ "FTP Proxy URL is the name of the proxy server for your access\n" "to the file transfer services (FTP)." msgstr "" -"URL für FTP-Proxy ist der Name des Proxy-Servers für den Zugriff auf\n" +"URL für FTP-Proxy ist der Name des Proxyservers für den Zugriff auf\n" "die Dateiübertragungsdienste (File Transfer Protocol, kurz: FTP)." #. Proxy dialog help 5/8 @@ -6970,7 +6970,7 @@ "(HTTP, HTTPS and FTP)." msgstr "" "Wenn die Option Für alle Protokolle denselben Proxy verwenden aktiviert ist, genügt es,\n" -"den HTTP-Proxy-URL anzugeben, der anschließend für alle Protokolle verwendet wird\n" +"die HTTP-Proxy-URL anzugeben, die anschließend für alle Protokolle verwendet wird\n" "(HTTP, HTTPS und FTP)." #. Proxy dialog help 6/8 diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-trans-de-2.15.2/po/nfs.de.po new/yast2-trans-de-2.15.3/po/nfs.de.po --- old/yast2-trans-de-2.15.2/po/nfs.de.po 2007-04-19 16:25:52.000000000 +0200 +++ new/yast2-trans-de-2.15.3/po/nfs.de.po 2007-05-30 10:47:23.000000000 +0200 @@ -388,7 +388,7 @@ "For further information about fstab,\n" "refer to <tt>man fstab</tt>.\n" msgstr "" -"Weitere Informationen zu fstab,\n" +"Weitere Informationen zu fstab\n" "finden Sie unter <tt>man fstab</tt>.\n" #. dialog heading diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-trans-de-2.15.2/po/ntp-client.de.po new/yast2-trans-de-2.15.3/po/ntp-client.de.po --- old/yast2-trans-de-2.15.2/po/ntp-client.de.po 2007-04-19 16:25:58.000000000 +0200 +++ new/yast2-trans-de-2.15.3/po/ntp-client.de.po 2007-05-30 10:47:29.000000000 +0200 @@ -657,7 +657,7 @@ "<big>Chroot-Jail</big> \n" "Zum Ausführen des NTP-Daemons in Chroot Jail aktivieren Sie\n" "NTP-Daemon in Chroot-Jail ausführen. Das Ausführen eines Daemons in\n" -"Chroot-Jail ist sicherer und wird stark empfohlen." +"Chroot-Jail ist sicherer und wird dringend empfohlen." #. help text 3/5 #: src/helps.ycp:49 @@ -670,7 +670,7 @@ msgstr "" "<big>Konfiguration über DHCP</big> \n" "Wollen Sie die Informationen zu NTP-Servern über das DHCP-Protokoll\n" -"von Ihrem Netzwerk holen, statt sie manuell festzulegen,\n" +"von Ihrem Netzwerk abrufen, statt sie manuell festzulegen,\n" "müssen Sie NTP-Daemon über DHCP konfigurieren wählen.\n" "Fragen Sie Ihren Netzwerkadministrator, falls die Informationen zu NTP-Servern\n" "vom DHCP-Server bereitgestellt werden." @@ -687,8 +687,8 @@ "<big>Konfigurierte Server</big> \n" "Zum Einstellen von NTP-Servern, Peers, lokalen Uhren und NTP-Broadcasting\n" "wählen Sie die entsprechende Zeile und klicken Sie auf Bearbeiten. Zum Hinzufügen\n" -"eines neuen Synchronisations-Peers klicken Sie auf Hinzufügen. Wollen Sie einen\n" -"vorhandenen Synchronisations-Peer löschen, selektieren Sie diesen und klicken Sie auf\n" +"eines neuen Synchronisierungs-Peer klicken Sie auf Hinzufügen. Wollen Sie einen\n" +"vorhandenen Synchronisierungs-Peer löschen, selektieren Sie diesen und klicken Sie auf\n" "Löschen." #. help text 5/5 @@ -861,8 +861,8 @@ "<big>Synchronization Peer Type</big> \n" "Select the kind of synchronization peer to add here." msgstr "" -"<big>Synchronisations-Peer-Typ</big> \n" -"Wählen Sie den Typ für den hinzuzufügenden Synchronisations-Peer." +"<big>Synchronisierungs-Peer-Typ</big> \n" +"Wählen Sie den Typ für den hinzuzufügenden Synchronisierungs-Peer." #. help text 2/6 #: src/helps.ycp:141 @@ -879,7 +879,7 @@ "To add an NTP peer to synchronize mutually, select\n" "Peer." msgstr "" -"Um einen NTP-Peer zur gegenseitigen Synchronisation hinzuzufügen,\n" +"Um einen NTP-Peer zur gegenseitigen Synchronisierung hinzuzufügen,\n" "wählen Sie Peer." #. help text 4/6 diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-trans-de-2.15.2/po/packager.de.po new/yast2-trans-de-2.15.3/po/packager.de.po --- old/yast2-trans-de-2.15.2/po/packager.de.po 2007-04-19 16:26:02.000000000 +0200 +++ new/yast2-trans-de-2.15.3/po/packager.de.po 2007-05-30 10:47:33.000000000 +0200 @@ -831,7 +831,7 @@ msgstr "" "\n" "Mit Änderungen mit ZENworks synchronisieren wird <tt>rug</tt> aufgerufen,\n" -"um die Änderungen ebenfalls in dem Paketverwaltungssystem vorzunehmen." +"um die Änderungen im betreffenden Paketverwaltungssystem vorzunehmen." #. popup message part 1 #: src/clients/inst_source.ycp:463 @@ -2508,7 +2508,7 @@ "set the location of the first media of the set." msgstr "" "Wenn sich der Katalog auf mehreren Medien befindet,\n" -"legen Sie den Speicherort des ersten Mediums des Satzes fest." +"geben Sie den Speicherort des ersten Mediums des Satzes an." #. popup message #: src/modules/SourceDialogs.ycp:206 diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-trans-de-2.15.2/po/packages-qt.de.po new/yast2-trans-de-2.15.3/po/packages-qt.de.po --- old/yast2-trans-de-2.15.2/po/packages-qt.de.po 2007-04-19 16:26:03.000000000 +0200 +++ new/yast2-trans-de-2.15.3/po/packages-qt.de.po 2007-05-30 10:47:35.000000000 +0200 @@ -319,7 +319,7 @@ #: src/pkg/YQPackageSelector.cc:583 src/pkg/YQPatternSelector.cc:260 #: src/pkg/YQPkgTextDialog.cc:229 msgid "&Accept" -msgstr "&Akzeptieren" +msgstr "&Übernehmen" #: src/pkg/YQPackageSelector.cc:619 msgid "&File" @@ -1026,11 +1026,11 @@ #: src/pkg/YQPkgList.cc:53 src/pkg/YQPkgList.cc:400 msgid "Avail. Ver." -msgstr "Verfügb. Ver." +msgstr "Verfgb. Version" #: src/pkg/YQPkgList.cc:54 src/pkg/YQPkgList.cc:401 msgid "Inst. Ver." -msgstr "Inst. Ver." +msgstr "Inst. Version" #: src/pkg/YQPkgList.cc:58 src/pkg/YQPkgPatchList.cc:60 #: src/pkg/YQPkgProductList.cc:44 src/pkg/YQPkgVersionsView.cc:54 @@ -1249,7 +1249,7 @@ #. Search button #: src/pkg/YQPkgSearchFilterView.cc:77 msgid "&Search" -msgstr "&Suche" +msgstr "&Suchen" #. #. Where to search @@ -1292,7 +1292,7 @@ #: src/pkg/YQPkgSearchFilterView.cc:126 msgid "Use Wild Cards" -msgstr "Wildcards verwenden" +msgstr "Platzhalterzeichen verwenden" #: src/pkg/YQPkgSearchFilterView.cc:127 msgid "Use Regular Expression" @@ -1327,7 +1327,7 @@ #. #: src/pkg/YQPkgStatusFilterView.cc:62 msgid "Show packages with status" -msgstr "Pakete mit Status anzeigen" +msgstr "Pakete anzeigen mit Status" #. Refresh button #: src/pkg/YQPkgStatusFilterView.cc:91 diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-trans-de-2.15.2/po/power-management.de.po new/yast2-trans-de-2.15.3/po/power-management.de.po --- old/yast2-trans-de-2.15.2/po/power-management.de.po 2007-04-19 16:26:10.000000000 +0200 +++ new/yast2-trans-de-2.15.3/po/power-management.de.po 2007-05-30 10:47:43.000000000 +0200 @@ -157,7 +157,7 @@ #. header for commandline output #: src/commandline.ycp:69 msgid "Power Saving Schemes:\n" -msgstr "Schemata für das Energiesparen:\n" +msgstr "Schemes für das Energiesparen:\n" #. cmdline about power saving schemes, %1 is list of schemes, #: src/commandline.ycp:101 @@ -471,7 +471,7 @@ #: src/dialogs.ycp:251 src/dialogs.ycp:280 src/dialogs.ycp:309 #: src/dialogs.ycp:352 msgid "Power Management Scheme Setup" -msgstr "Konfiguration für Power-Management-Schema" +msgstr "Konfiguration für Power-Management-Scheme" #. Read dialog help 1/2 #: src/helps.ycp:20 @@ -644,7 +644,7 @@ "<big>Schemes für das Energiesparen</big> \n" "Verwenden Sie Wechselstromanschluss zum Anpassen des Energiespar-Schemes, das benutzt werden soll, wenn Ihr Rechner an Wechselstrom\n" "angeschlossen ist.\n" -" Verwenden Sie Batteriebetrieben zum Anpassen desEnergiespar-Schemes, das benutzt werden soll,\n" +" Verwenden Sie Batteriebetrieben zum Anpassen des Energiespar-Schemes, das benutzt werden soll,\n" "wenn Ihr Rechner batteriebetrieben ist." #. Main dialog help 2/5 @@ -709,8 +709,8 @@ "Add. To delete an existing scheme, select it and click \n" "Delete." msgstr "" -"Um ein neues Schema hinzuzufügen, wählen Sie ein zu klonendes Schema aus, und klicken Sie auf\n" -"Hinzufügen. Um ein bestehendes Schema zu löschen, wählen Sie es aus und klicken Sie auf \n" +"Um ein neues Scheme hinzuzufügen, wählen Sie ein zu klonendes Scheme aus und klicken Sie auf\n" +"Hinzufügen. Um ein bestehendes Scheme zu löschen, wählen Sie es aus und klicken Sie auf \n" "Löschen." #. Schemes list dialog 3/3 @@ -719,7 +719,7 @@ "In the main dialog, assign schemes to use when you \n" "work on battery or AC power." msgstr "" -"Weisen Sie im Hauptdialogfeld die Schemata zu, die bei der Arbeit\n" +"Weisen Sie im Hauptdialogfeld die Schemes zu, die bei der Arbeit\n" "mit Akku- bzw. Wechselstrom verwendet werden sollen." #. Scheme editation dialog 1 help 1/6 @@ -786,9 +786,9 @@ "presentations." msgstr "" "<big>Screensaver aktivieren</big> \n" -"Zum Aktivieren des Screensavers in diesem Schema, verwenden Sie\n" +"Zum Aktivieren des Screensavers in diesem Scheme, verwenden Sie\n" "Screensaver aktivieren.\n" -"Die Deaktivierung des Screensavers ist nützlich für verwendete Schemata, zum Beispiel für Präsentationen." +"Die Deaktivierung des Screensavers ist nützlich für verwendete Schemes, zum Beispiel für Präsentationen." #. Scheme editation dialog 3 help 2/2 #. Display is a substantive (screen) @@ -1001,7 +1001,7 @@ #. pop-up message #: src/widgets.ycp:722 msgid "The scheme name must not be longer than 32 characters." -msgstr "Der Name des Schemas darf nicht mehr als 32 Zeichen enthalten." +msgstr "Der Name des Schemes darf nicht mehr als 32 Zeichen enthalten." #. text entry #: src/widgets.ycp:769 diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-trans-de-2.15.2/po/printer.de.po new/yast2-trans-de-2.15.3/po/printer.de.po --- old/yast2-trans-de-2.15.2/po/printer.de.po 2007-04-19 16:26:12.000000000 +0200 +++ new/yast2-trans-de-2.15.3/po/printer.de.po 2007-05-30 10:47:45.000000000 +0200 @@ -20,6 +20,7 @@ "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" "X-Generator: KBabel 1.9\n" +"Grafikdruck\n" #. command line error report, %1 is queue name #: src/clients/printer.ycp:86 src/clients/printer.ycp:441 @@ -1067,7 +1068,7 @@ #. text entry #: src/common/dialogs.ycp:740 msgid "Name for &Printing" -msgstr "Name für den &Drucker" +msgstr "Name für den &Druckvorgang" #. text entry #: src/common/dialogs.ycp:744 @@ -1766,7 +1767,7 @@ "CUPS servers in your network. All broadcasted queues will be accessible \n" "on this computer." msgstr "" -"<BIG>CUPS - Broadcasting verwenden</BIG> \n" +"<BIG>CUPS mit Broadcasting</BIG> \n" "Konfigurieren Sie einen lokalen CUPS-Server, der die Broadcasts aller\n" "in Ihrem Netzwerk laufenden CUPS-Server überwacht. Der Rechner kann auf alle\n" "per Broadcast bekannt gegebenen Warteschlangen zugreifen." @@ -1778,7 +1779,7 @@ "Only the specified queue of the specified remote CUPS server will be accessible\n" "on this computer." msgstr "" -"<BIG>Entfernte IPP-Warteschlange:</BIG> \n" +"<BIG>Entfernte IPP-Warteschlange</BIG> \n" "Der Rechner kann nur auf die angegebene Warteschlange des festgelegten\n" "entfernten CUPS-Servers zugreifen." @@ -1904,7 +1905,7 @@ "use Test.\n" msgstr "" "<BIG>Verbindung testen</BIG> \n" -"Mit Test können Sie sicherstellen, dass der Drucker richtig\n" +"Mit Druckerverbindung testen können Sie sicherstellen, dass der Drucker richtig\n" "angeschlossen ist.\n" #. Help, text 4/5, paralel printer alternative @@ -1953,8 +1954,8 @@ "click Detect Devices.\n" msgstr "" "<big>Geräteerkennung<big> \n" -"Wollen Sie nach verfügbaren Bluetooth-Geräten suchen,\n" -"drücken Sie Geräteerkennung.\n" +"Zum Suchen nach verfügbaren Bluetooth-Geräten\n" +"klicken Sie auf Geräteerkennung.\n" #. help text 1/5 (present only for samba queues) #: src/common/helps-connection.ycp:296 @@ -1995,7 +1996,7 @@ "use Test." msgstr "" "Klicken Sie zum Überprüfen des Namens\n" -"auf Test." +"auf Testen." #. Help text 1/1 #: src/common/helps-connection.ycp:331 @@ -2288,7 +2289,7 @@ msgstr "" "<BIG>PPD-Datei wählen</BIG> \n" "Wollen Sie statt eines Druckerherstellers und -modells eine\n" -" PPD-Datei auswählen, drücken Sie PPD-Datei wählen.\n" +" PPD-Datei auswählen, klicken Sie auf PPD-Datei wählen.\n" #. help text #: src/common/helps.ycp:216 @@ -2307,7 +2308,7 @@ "<BIG>Name for Printing</BIG> \n" "To print with this configuration, use this name as the queue name.\n" msgstr "" -"<BIG>Name für den Druck</BIG> \n" +"<BIG>Name für den Druckvorgang</BIG> \n" "Wenn Sie mit dieser Konfiguration drucken möchten, verwenden Sie diesen Namen für die Warteschlange.\n" #. Help text 2/7, CUPS-class alternative @@ -2396,7 +2397,7 @@ msgstr "" "<BIG>Warteschlange testen</big> \n" "Falls Sie kein lokales Filtern durchführen, testen Sie das Drucken mit\n" -"Test.\n" +"Testdruck.\n" #. Help, 1 of 3 #: src/common/helps.ycp:292 @@ -2551,7 +2552,7 @@ "Adjust users who are allowed to print using this queue.\n" msgstr "" "<BIG>Einstellungen für Beschränkungen</BIG> \n" -"Hier geben Sie die Benutzer an, die über diese Warteschlange drücken dürfen.\n" +"Hier geben Sie die Benutzer an, die über diese Warteschlange drucken dürfen.\n" #. help text 6b/7 alt. 2 #: src/common/helps.ycp:402 @@ -3843,14 +3844,14 @@ #: src/modules/Printer.ycp:1893 #, ycp-format msgid "Listening to CUPS servers to provide access to remote queues %1" -msgstr "Auf CUPS-Server lauschen, um Zugriff auf entfernte Warteschlangen zu ermöglichen %1" +msgstr "Auf CUPS-Server überprüfen, um Zugriff auf entfernte Warteschlangen zu ermöglichen %1" #. part of summary #. %1 is link to change the firewall settings #: src/modules/Printer.ycp:1935 #, ycp-format msgid "Port for listening to remote CUPS servers is closed by firewall %1" -msgstr "Der Port zum Lauschen auf entfernte CUPS-Server ist durch die Firewall geschlossen %1" +msgstr "Der Port zum Überprüfen auf entfernte CUPS-Server ist durch die Firewall geschlossen %1" #. part of summary, %1 is list of interfaces #. %2 is link to change the firewall settings @@ -3986,7 +3987,7 @@ #. radiobutton #: src/modules/PrinterTest.ycp:238 msgid "Test Graphical Printing with &Photo" -msgstr "Grafisches Drucken mit Foto &testen" +msgstr "G&rafikdruck mit Foto testen" #. radiobutton #: src/modules/PrinterTest.ycp:243 diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-trans-de-2.15.2/po/profile-manager.de.po new/yast2-trans-de-2.15.3/po/profile-manager.de.po --- old/yast2-trans-de-2.15.2/po/profile-manager.de.po 2007-04-19 16:26:13.000000000 +0200 +++ new/yast2-trans-de-2.15.3/po/profile-manager.de.po 2007-05-30 10:47:46.000000000 +0200 @@ -570,7 +570,7 @@ #. main dialog help 3/9 #: src/helps.ycp:35 msgid "First, set the SCPM status to Enabled. If disabled later, none of the configuration data in the profiles will be lost. It just continues in the current configuration of your system and you cannot switch to any other profile until you enable it again." -msgstr "Setzen Sie als Erstes den SCPM-Status auf Aktiviert. Bei einer späteren Deaktivierung gehen keinerlei Konfigurationsdaten in den Profilen verloren. Es wird lediglich die aktuelle Konfiguration des Systems beibehalten und Sie können nicht auf ein anderes Profil wechseln, bis Sie es erneut aktivieren." +msgstr "Setzen Sie als Erstes den SCPM-Status auf Aktiviert. Bei einer späteren Deaktivierung gehen keinerlei Konfigurationsdaten in den Profilen verloren. Die Daten werden in der aktuellen Konfiguration des Systems beibehalten, und Sie können erst zu einem anderen Profil wechseln, wenn Sie sie erneut aktivieren." #. main dialog help - subsection heading #: src/helps.ycp:38 @@ -639,7 +639,7 @@ "geändert werden. In der SCPM-Terminologie heißen diese Dateien und\n" "Dienste \"Ressourcen\". Diese Ressourcen werden in logische Einheiten, so genannte\n" "Ressourcengruppen unterteilt. SCPM wird mit einem vordefinierten Satz\n" -"Gruppen ausgeliefert, die standardmäßig bearbeitet werden. Dies ist für die meisten Systeme ausreichend. \n" +"Gruppen für standardmäßige Bearbeitungen ausgeliefert. Dies ist für die meisten Systeme ausreichend. \n" "Wenn Sie eine detailliertere Ressourceneinrichtung wünschen, klicken Sie auf \n" "Ressourcen konfigurieren.\n" @@ -699,7 +699,7 @@ "Switch Only means the specified user may switch profiles, but nothing else. Everything means the user may perform any operation,\n" "including adding and removing profiles." msgstr "" -"Wenn Sie Benutzer Ihres Systems erlauben möchten, \n" +"Wenn Sie Benutzern Ihres Systems erlauben möchten, \n" "Profilverwaltungsvorgänge durchzuführen, fügen Sie sie hier hinzu. Es gibt zwei Berechtigungsstufen:\n" " Nur umschalten bedeutet, dass der angegebene Benutzer zwischen verschiedenen Profilen wechseln kann, sonst jedoch keine Vorgänge durchführen darf. Alles bedeutet, dass der Benutzer alle Vorgänge durchführen darf, \n" " also auch Profile hinzufügen und entfernen." diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-trans-de-2.15.2/po/restore.de.po new/yast2-trans-de-2.15.3/po/restore.de.po --- old/yast2-trans-de-2.15.2/po/restore.de.po 2007-04-19 16:26:19.000000000 +0200 +++ new/yast2-trans-de-2.15.3/po/restore.de.po 2007-05-30 10:47:52.000000000 +0200 @@ -194,7 +194,7 @@ "If you press Select, the device is mounted\n" "and you can select the file from a dialog.\n" msgstr "" -"Wenn Sie auf die Option zum Auswählen klicken, wird das Gerät (Medium) gemountet\n" +"Wenn Sie auf die Option zum Wählen klicken, wird das Gerät (Medium) gemountet\n" "und Sie die können die Datei in einem Dialogfeld auswählen.\n" #. For translators: archive selection dialog help (part 7) diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-trans-de-2.15.2/po/samba-client.de.po new/yast2-trans-de-2.15.3/po/samba-client.de.po --- old/yast2-trans-de-2.15.2/po/samba-client.de.po 2007-04-19 16:26:24.000000000 +0200 +++ new/yast2-trans-de-2.15.3/po/samba-client.de.po 2007-05-30 10:47:58.000000000 +0200 @@ -306,7 +306,7 @@ #. checkbox label #: src/dialogs.ycp:231 msgid "Off&line Authentication" -msgstr "Off&line-Beglaubigung" +msgstr "Off&line-Authentifizierung" #. button label #: src/dialogs.ycp:241 @@ -498,7 +498,7 @@ #. Samba membership dialog help (common part 2/4) #: src/helps.ycp:75 msgid "Offline Authentication enables the user to log in even if there is no connection to the domain controller. For this option to work, you must log in to your domain at least once. The user's credentials are then stored encrypted on your computer and are reused for a domain login when no connection to the domain controller can be established. This is especially useful for mobile users." -msgstr "Offline-Beglaubigung ermöglicht Benutzern die Anmeldung, selbst wenn keine Verbindung zum Domänencontroller besteht. Damit diese Option funktioniert, muss sich der Benutzer zumindest einmal bei seiner Domäne anmelden. Die Anmeldeinformationen des Benutzers werden dann verschlüsselt auf seinem Computer gespeichert und können von dort für eine Domänenanmeldung abgerufen werden, wenn keine Verbindung zum Domänencontroller hergestellt werden kann. Diese Funktion ist besonders für mobile Benutzer nützlich." +msgstr "Offline-Authentifizierung ermöglicht Benutzern die Anmeldung, selbst wenn keine Verbindung zum Domänencontroller besteht. Damit diese Option funktioniert, muss sich der Benutzer zumindest einmal bei seiner Domäne anmelden. Die Anmeldeinformationen des Benutzers werden dann verschlüsselt auf seinem Computer gespeichert und können von dort für eine Domänenanmeldung abgerufen werden, wenn keine Verbindung zum Domänencontroller hergestellt werden kann. Diese Funktion ist besonders für mobile Benutzer nützlich." #. Samba membership dialog - additional help for autoyast config #: src/helps.ycp:78 diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-trans-de-2.15.2/po/security.de.po new/yast2-trans-de-2.15.3/po/security.de.po --- old/yast2-trans-de-2.15.2/po/security.de.po 2007-04-19 16:26:30.000000000 +0200 +++ new/yast2-trans-de-2.15.3/po/security.de.po 2007-05-30 10:48:04.000000000 +0200 @@ -259,7 +259,7 @@ "jemand an der Konsole die Tastenkombination STRG + ALT + ENTF\n" "drückt. Normalerweise wird das System neu gebootet. Manchmal sollte\n" "dieses Ereignis nicht ignoriert werden, beispielsweise wenn das System sowohl als\n" -"Arbeitsstation als auch als Server dient." +"Arbeitplatzrechner als auch als Server dient." #. Boot dialog help 3/3 #: src/helps.ycp:53 @@ -292,7 +292,7 @@ "Home Workstation: For a home computer not connected to\n" "any type of a network." msgstr "" -"Heim-Arbeitsstation: Für einen Computer zu Hause, der mit keinerlei\n" +"Heim-Arbeitplatzrechner: Für einen Computer zu Hause, der mit keinerlei\n" "Netzwerk verbunden ist." #. Main dialog help 6/8 @@ -301,7 +301,7 @@ "Networked Workstation: For a computer connected\n" "to any type of network including the Internet." msgstr "" -"Vernetzte Arbeitsstation: Für einen Computer, der mit\n" +"Vernetzte Arbeitplatzrechner: Für einen Computer, der mit\n" "irgendeiner Form von Netzwerk (z. B. Internet) verbunden ist." #. Main dialog help 7/8 @@ -462,7 +462,7 @@ "assign passwords with fewer characters are rejected. A zero value\n" "suppresses this check." msgstr "" -"Minimale Länge für das Passwort:Die Mindestzahl der Zeichen in einem zulässigen Passwort. Versuche,\n" +"Minimale Länge für das Passwort: Die Mindestzahl der Zeichen in einem zulässigen Passwort. Versuche,\n" "Passwörter mit weniger Zeichen werden zurückgewiesen. Mit dem Wert 0\n" "wird diese Prüfung unterdrückt." @@ -472,7 +472,7 @@ "Password Age: Set the minimum and\n" "maximum number of days a password may be used." msgstr "" -"Passwortalter: Legen sie fest wie viele Tage ein Passwort minimal und maximal zu \n" +"Passwortalter: Legen sie fest, wie viele Tage ein Passwort minimal und maximal zu \n" "verwenden ist." # Shortened because of #19756 @@ -643,12 +643,12 @@ #. level name #: src/levels.ycp:36 msgid "Home Workstation" -msgstr "Heim-Arbeitsstation" +msgstr "Heim-Arbeitplatzrechner" #. level name #: src/levels.ycp:38 msgid "Networked Workstation" -msgstr "Vernetzte Arbeitsstation" +msgstr "Vernetzte Arbeitplatzrechner" #. level name #: src/levels.ycp:40 @@ -658,12 +658,12 @@ #. RadioButton label #: src/levels.ycp:45 msgid "&Home Workstation" -msgstr "&Heim-Arbeitsstation" +msgstr "&Heim-Arbeitplatzrechner" #. RadioButton label #: src/levels.ycp:47 msgid "N&etworked Workstation" -msgstr "V&ernetzte Arbeitsstation" +msgstr "V&ernetzte Arbeitplatzrechner" #. RadioButton label #: src/levels.ycp:49 diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-trans-de-2.15.2/po/sound.de.po new/yast2-trans-de-2.15.3/po/sound.de.po --- old/yast2-trans-de-2.15.2/po/sound.de.po 2007-04-19 16:26:35.000000000 +0200 +++ new/yast2-trans-de-2.15.3/po/sound.de.po 2007-05-30 10:48:08.000000000 +0200 @@ -1425,8 +1425,8 @@ "The sound device with index 0 is the default device used by system and applications.\n" "Use Other to set the selected sound device as the primary device." msgstr "" -"Das Sound-Gerät mit Index 0 ist das vom System und den Anwendungen verwendete Standardgerät.\n" -"Mit Weitere können Sie das ausgewählte Sound-Gerät als primäres Gerät festlegen." +"Das Soundgerät mit Index 0 ist das vom System und den Anwendungen verwendete Standardgerät.\n" +"Mit Andere können Sie das ausgewählte Soundgerät als primäres Gerät festlegen." #: sound/src/texts.ycp:285 msgid "" diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-trans-de-2.15.2/po/storage.de.po new/yast2-trans-de-2.15.3/po/storage.de.po --- old/yast2-trans-de-2.15.2/po/storage.de.po 2007-04-19 16:26:38.000000000 +0200 +++ new/yast2-trans-de-2.15.3/po/storage.de.po 2007-05-30 10:48:12.000000000 +0200 @@ -3221,7 +3221,7 @@ #. helptext expert partitioning. 1 #: storage/src/include/custom_part_helptexts.ycp:183 msgid " Partition your hard disks... " -msgstr "Partitionierung der Festplatte(n)..." +msgstr "Partitionierung von Festplatten" # add more info than available from the english text #. helptext expert partitioning. 2 @@ -3235,9 +3235,9 @@ "" msgstr "" "\n" -"Dieser Dialog ist für Experten gedacht.\n" +"Dieses Dialogfeld ist für Experten gedacht.\n" "Wenn Ihnen der Begriff \"Partition\"\n" -"nichts sagt, sollten Sie die automatische Installation bevorzugen.\n" +"nichts sagt, sollten Sie die automatische Installation verwenden.\n" "Klicken Sie in diesem Fall auf Zurück.\n" "" @@ -3272,7 +3272,7 @@ msgstr "" "\n" "Es wird nichts auf Ihre Festplatte geschrieben,\n" -"bis Sie nicht alle Änderungen mit dem Button \"Anwenden\"\n" +"bis Sie nicht alle Änderungen mit der Schaltfläche \"Anwenden\"\n" "bestätigt haben.\n" "Bis dahin können Sie gefahrlos abbrechen.\n" "\n" @@ -3306,7 +3306,7 @@ msgid "Hard disks are designated like this " msgstr "" "\n" -"Festplatten werden so bezeichnet:\n" +"Festplatten werden wie folgt bezeichnet:\n" "" #. help text diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-trans-de-2.15.2/po/support.de.po new/yast2-trans-de-2.15.3/po/support.de.po --- old/yast2-trans-de-2.15.2/po/support.de.po 2007-04-19 16:26:39.000000000 +0200 +++ new/yast2-trans-de-2.15.3/po/support.de.po 2007-05-30 10:48:13.000000000 +0200 @@ -289,9 +289,9 @@ "You may want to delete the file afterwards.\n" msgstr "" "Aus Sicherheitsgründen kann die Ausgabedatei nur von \n" -"root gelesen werden. Damit Sie die Datein in einem E-Mail-Programm anhängen können, das mit Ihrem\n" +"root gelesen werden. Damit Sie die Datei in einem E-Mail-Programm anhängen können, das mit Ihrem\n" "Benutzerkonto gestartet wurde, ändern Sie die Berechtigungen der Datei manuell. \n" -" Geben in einer Shell ein Kommando ein, das folgendem ähnelt: <tt>chmod 644 /var/log/support.txt</tt>. \n" +" Geben Sie in einer Shell ein Kommando ein, das folgendem ähnelt: <tt>chmod 644 /var/log/support.txt</tt>. \n" " Beachten Sie, dass die Datei jetzt für jeden Benutzer des Systems lesbar ist.\n" " Sie können die Datei anschließend löschen.\n" diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-trans-de-2.15.2/po/tune.de.po new/yast2-trans-de-2.15.3/po/tune.de.po --- old/yast2-trans-de-2.15.2/po/tune.de.po 2007-04-19 16:26:44.000000000 +0200 +++ new/yast2-trans-de-2.15.3/po/tune.de.po 2007-05-30 10:48:19.000000000 +0200 @@ -160,13 +160,13 @@ "The Hardware Information module displays the hardware\n" "details of your computer. Click any node for more information.\n" msgstr "" -"Das Modul zur Hardware-Informationen zeigt Details zur Hardware\n" +"Das Modul zu den Hardware-Informationen zeigt Details zur Hardware\n" "Ihres Computers an. Klicken Sie auf einen Eintrag, um weitere\n" "Informationen zu erhalten.\n" #: hwinfo/src/hwinfo.ycp:291 msgid "You can save hardware information to a file. Click Save to File and enter the filename." -msgstr "Hardware-Informationen können in eine Datei gespeichert werden. Klicken Sie auf In Datei speichern und geben Sie den Dateinamen ein." +msgstr "Hardware-Informationen können in einer Datei gespeichert werden. Klicken Sie auf In Datei speichern und geben Sie den Dateinamen ein." #. this is a heading #. tree node string @@ -408,7 +408,7 @@ #. PCI ID help text #: hwinfo/src/newid.ycp:369 msgid "Warning: This is an expert configuration. Only continue if you know what you are doing." -msgstr "Warnung: Dies ist eine Expertenkonfiguration. Fahren Sie nur fort, wenn Sie wissen, was Sie tun." +msgstr "Achtung: Dies ist eine Expertenkonfiguration. Fahren Sie nur fort, wenn Sie sich genau auskennen." #. tree node string #: hwinfo/src/routines.ycp:25 @@ -1174,7 +1174,7 @@ #: hwinfo/src/system_settings_dialogs.ycp:119 msgid "Enable &SysRq Keys" -msgstr "&SysRq-Taste aktivieren" +msgstr "&SysRq-Tasten aktivieren" #. TRANSLATORS: Help text - over taken from /etc/sysconfig/sysctl file #: hwinfo/src/system_settings_dialogs.ycp:123 @@ -1186,9 +1186,9 @@ "computer, dump kernel information). For further information, see\n" "<tt>/usr/src/linux/Documentation/sysrq.txt</tt> (package kernel-source)." msgstr "" -"<big>SysRq-Taste aktivieren</big> \n" -"Bei Aktivierung von SysRq-Taste haben Sie selbst bei einem Systemabsturz (beispielsweise während der \n" -"Kernel-Fehlerbehebung) noch einen gewissen Grad an Kontrolle über das System. Wenn sie nicht aktiviert sind, wird der entsprechende Befehl mit der Tastenkombination\n" +"<big>SysRq-Tasten aktivieren</big> \n" +"Bei Aktivierung von SysRq-Tasten haben Sie selbst bei einem Systemabsturz (beispielsweise während der \n" +"Kernel-Fehlerbehebung) noch einen gewissen Grad an Kontrolle über das System. Wenn die Option nicht aktiviert ist, wird der entsprechende Befehl mit der Tastenkombination\n" "Alt-SysRq-<command_key> gestartet (z.B. Neustarten des\n" "Computers, Dump der Kernel-Informationen). Weitere Informationen finden Sie unter\n" "<tt>/usr/src/linux/Documentation/sysrq.txt</tt> (Paket-Kernel-Quelle)." @@ -1463,8 +1463,8 @@ "\n" msgstr "" "<BIG>Hinweis:</BIG> \n" -"Wenn der DMA-Modus ausgeschaltet wird, verzögert sich der Zugriff auf das Gerät.\n" -"Einige Geräte funktionieren jedoch nicht einwandfrei, wenn DMA aktiviert ist.\n" +"Wenn der DMA-Modus ausgeschaltet wird, verzögert sich zwar der Zugrff auf das Gerät,\n" +"doch einige Geräte funktionieren eventuell nicht einwandfrei, wenn DMA aktiviert ist.\n" "\n" #. help text diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-trans-de-2.15.2/po/update.de.po new/yast2-trans-de-2.15.3/po/update.de.po --- old/yast2-trans-de-2.15.2/po/update.de.po 2007-04-19 16:26:47.000000000 +0200 +++ new/yast2-trans-de-2.15.3/po/update.de.po 2007-05-30 10:48:22.000000000 +0200 @@ -130,8 +130,8 @@ "/etc/sysconfig: This covers all configuration files that are part of the\n" "sysconfig mechanism, even those that are not replaced.\n" msgstr "" -"Erstellen einer kompletten Sicherungskopie von\n" -"/etc/sysconfig: Dies deckt alle Konfigurationsdateien ab, die Teil\n" +"Komplette Sicherungskopie von /etc/sysconfig\n" +"erstellen: Dies deckt alle Konfigurationsdateien ab, die Teil\n" "des sysconfig-Mechanismus sind, sogar diejenigen, die nicht ersetzt werden.\n" #. help text for backup dialog during update 6/7 @@ -212,8 +212,8 @@ "&Update with Installation of New Software and Features\n" "Based on the Selection:\n" msgstr "" -"&Update mit Installation neuer Software und neuer Features\n" -"Basierend auf der Selektion:\n" +"&Update mit Installation neuer Software und neuer Funktionen\n" +"auf Basis der Auswahl:\n" #. radio button label for update of already installed packages only #: src/clients/inst_update.ycp:107 @@ -232,7 +232,7 @@ "The update option differs between two modes. In\n" "either case, it is recommended to make a backup of your personal data.\n" msgstr "" -"Die Update-Option besitzt zwei Modi. In jedem Fall\n" +"Die Update-Option besitzt zwei Modi. In beiden Fällen\n" "wird eine Sicherungskopie Ihrer persönlichen Daten empfohlen.\n" #. help text for dialog "update options" 2/4, %1 is a product name @@ -257,10 +257,10 @@ "New software in the predefined software selection, such as new YaST modules, is\n" "not available after the update. You might miss advertised features.\n" msgstr "" -"Nur installierte Pakete: Diese Selektion\n" +"Nur installierte Pakete: Diese Auswahl\n" "aktualisiert nur die bereits auf Ihrem System installierten Pakete. Hinweis:\n" -"Neue Software in der Software-Vorauswahl, wie z. B. neue YaST-Module wird nach\n" -"dem Update nicht zur Verfügung stehen. Sie könnten beworbene Features vermissen.\n" +"Neue Software in der Software-Vorauswahl (z. B. neue YaST-Module) steht nach\n" +"dem Update nicht zur Verfügung. Möglicherweise fehlen einige angekündigte Funktionen.\n" #. help text for dialog "update options" 4/4 #: src/clients/inst_update.ycp:144 diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-trans-de-2.15.2/po/users.de.po new/yast2-trans-de-2.15.3/po/users.de.po --- old/yast2-trans-de-2.15.2/po/users.de.po 2007-04-19 16:26:49.000000000 +0200 +++ new/yast2-trans-de-2.15.3/po/users.de.po 2007-05-30 10:48:24.000000000 +0200 @@ -248,7 +248,7 @@ "" msgstr "" "\n" -"Verwenden Sie für das Kennwort nur Zeichen, die der englischen Tastaturbelegung\n" +"Verwenden Sie für das Passwort nur Zeichen, die der englischen Tastaturbelegung\n" "entsprechen. Bei einem Systemfehler muss die Anmeldung möglicherweise ohne lokalisierte Tastenbelegung\n" "erfolgen.\n" "" @@ -2240,7 +2240,7 @@ "\n" msgstr "" "\n" -"Geben Sie den vollständigen Namen des Benutzers, den Benutzernamen und dasPasswortein, die diesem Benutzerkonto zugewiesen werden sollen.\n" +"Geben Sie den vollständigen Namen des Benutzers, den Benutzernamen und das Passwortein, die diesem Benutzerkonto zugewiesen werden sollen.\n" "\n" #. help text 2/7 @@ -2316,7 +2316,7 @@ msgstr "" "\n" "Für weitere Informationen, wie z. B. das Home-Verzeichnis oder die \n" -"Benutzerkennung (ID), drücken Sie den Button Details.\n" +"Benutzerkennung (ID), klicken Sie auf die Schaltfläche Details.\n" "\n" #. alternative help text 5/7 @@ -2335,7 +2335,7 @@ "log in, check Disable User Login." msgstr "" "Wenn Sie diesem Benutzer die Anmeldung\n" -"untersagen möchten, aktivieren Sie Benutzername deaktivieren." +"untersagen möchten, aktivieren Sie Benutzernamen deaktivieren." #. help text 1/6 #: src/helps.ycp:279 @@ -2380,10 +2380,10 @@ "\n" msgstr "" "\n" -"Gruppenkennung (gid):\n" +"Gruppen-ID (gid):\n" "Zusätzlich zu einem Namen muss einer Gruppe eine numerische ID für die\n" "interne Darstellung zugewiesen werden. Diese Werte liegen zwischen 0 und\n" -"%1. Einige der IDs werden bereits bei der Installation zugewiesen. Wenn Sie versuchen, ein\n" +"%1. Einige der IDs werden bereits bei der Installation zugewiesen. Wenn Sie versuchen, eine\n" "bereits festgelegte ID zu verwenden, wird eine Warnung ausgegeben.\n" "\n" @@ -2403,7 +2403,7 @@ "Wenn sich Benutzer, die nicht Mitglied der Gruppe sind, beim Wechsel zu dieser\n" "Gruppe identifizieren sollen (ziehen Sie die man-Seite zu <tt>newgrp</tt> zurate), weisen Sie dieser Gruppe ein\n" "Passwort zu. Aus Sicherheitsgründen wird dieses Passwort hier nicht\n" -"angezeigt. Dieser Eintrag ist nicht erforderlich.\n" +"angezeigt. Diese Angabe ist optional.\n" "\n" #. help text 5/6 @@ -3687,7 +3687,7 @@ msgstr "" "\n" "Linux ist ein Mehrbenutzersystem. Verschiedene Benutzer können gleichzeitig beim\n" -"System angemeldet sein. Um Verwechslungen zu vermeiden muss jeder Benutzer über eine\n" +"System angemeldet sein. Um Verwechslungen zu vermeiden, muss jeder Benutzer über eine\n" "eindeutige Identität verfügen. Außerdem ist jeder Benutzer mindestens einer Gruppe zugehörig.\n" "\n" @@ -3710,7 +3710,7 @@ msgstr "" "\n" "Benutzer und Gruppen sind zu unterschiedlichen Sätzen zusammengefasst. Mit Filter festlegen kann in der Tabelle ein anderer Satz angezeigt werden.\n" -"Mit Benutzerdefinierte Filtereinstellungen können Sie die Ansicht individuell an Ihre Bedürfnisse anpassen.\n" +"Mit Benutzerdefinierte Filtereinstellung können Sie die Ansicht individuell an Ihre Bedürfnisse anpassen.\n" #. help text 2/3 #: src/widgets.ycp:1012 @@ -3725,7 +3725,7 @@ "Klicken Sie auf Optionen für Experten, um die verschiedenen Experteneinstellungen zu bearbeiten, beispielsweise\n" "Passwortverschlüsselungstyp, Benutzerauthentifizierungsmethode, Standardwerte für neue\n" "Benutzer oder Anmeldeeinstellungen. Mit Änderungen nun schreiben werden\n" -"alle bisher vorgenommenen Änderungen gespeichert, ohne dass Konfigurationsmodul zu beenden.\n" +"alle bisher vorgenommenen Änderungen gespeichert, ohne das Konfigurationsmodul zu beenden.\n" #. help text 3/3, %1 is translated button label #: src/widgets.ycp:1020 @@ -3764,7 +3764,7 @@ "\n" msgstr "" "\n" -"In den Gruppen-Dialog gelangen Sie über Gruppenverwaltung.\n" +"Wählen Sie Gruppen, um in das Gruppen-Dialogfeld zu wechseln.\n" "\n" #. help text 3/4 @@ -3790,7 +3790,7 @@ msgstr "" "\n" "Um einen bestehenden Benutzereintrag zu bearbeiten oder zu löschen, wählen Sie\n" -"einen Benutzer aus der Liste und drücken Sie dann auf Bearbeiten oder Löschen.\n" +"einen Benutzer aus der Liste und klicken Sie dann auf Bearbeiten oder Löschen.\n" "\n" #. help text 1/4 @@ -3814,7 +3814,7 @@ "\n" msgstr "" "\n" -"In den Benutzer-Dialog gelangen Sie über Benutzerverwaltung.\n" +"Wählen Sie Benutzer, um in das Benutzer-Dialogfeld zu wechseln.\n" "\n" #. help text 3/4 diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-trans-de-2.15.2/po/yast2-apparmor.de.po new/yast2-trans-de-2.15.3/po/yast2-apparmor.de.po --- old/yast2-trans-de-2.15.2/po/yast2-apparmor.de.po 2007-04-19 16:26:56.000000000 +0200 +++ new/yast2-trans-de-2.15.3/po/yast2-apparmor.de.po 2007-05-30 10:48:32.000000000 +0200 @@ -404,7 +404,7 @@ " \n" " Details zu Zugriffsmodi\n" " \n" -" Lesemodus \n" +" Lesemodus (r) \n" " Erlaubt dem Programm den Lesezugriff auf die\n" " Ressource. Lesezugriff ist für Shell-Skripte\n" " und andere interpretierbare Inhalte erforderlich und bestimmt, ob ein\n" @@ -413,25 +413,25 @@ " strace(1), ltrace(1) und gdb(1) verwendet.)\n" " \n" " \n" -" Schreibmodus \n" +" Schreibmodus (w) \n" " Erlaubt dem Programm den Schreibzugriff auf die\n" -" Ressource. Für Dateien, der Verknüpfung aufgehoben werden soll (die also entfernt werden sollen),\n" +" Ressource. Für Dateien, deren Link aufgehoben werden soll (die also entfernt werden sollen),\n" " ist diese Berechtigung erforderlich.)\n" " \n" " \n" -" PROT_EXEC-Mmap-Modus \n" +" PROT_EXEC-Mmap-Modus (m) \n" " Ermöglicht dem Programm den Aufruf von 'mmap' bei PROT_EXEC für die\n" " Ressource. \n" " \n" " \n" " \n" " \n" -" Uneingeschränkter Ausführmodus \n" +" Uneingeschränkter Ausführmodus (ux) \n" " \n" " Erlaubt es dem Programm, die Ressource auszuführen, ohne dass\n" " AppArmor-Profile auf die ausgeführte Ressource\n" " angewendet werden. In diesem Fall muss auch der Ausführmodus aufgelistet werden.\n" -" Ist nicht mit den Ausführeinträgen für 'Vererben' und das 'Diskretes Profil'\n" +" Ist nicht mit den Ausführeinträgen für 'Vererben' und 'Diskretes Profil'\n" " kompatibel.\n" " \n" " \n" @@ -442,29 +442,29 @@ " Einschränkungen umgangen werden, die für alle eingeschränkten Prozesse gelten.\n" " Weitere Informationen zu den Einschränkungen entnehmen Sie der\n" " subdomain(7)-Manualpage.\n" -" Diskreter Profilausführmodus \n" -" Für diesen Modus muss ein diskretes Sicherheitsprofile für eine\n" +" Diskreter Profilausführmodus (px) \n" +" Für diesen Modus muss ein diskretes Sicherheitsprofil für eine\n" " Ressource definiert werden, die bei einem AppArmor-Domänenübergang\n" " ausgeführt wird. Wenn kein Profil definiert ist, wird der\n" " Zugriff verweigert. Ist nicht mit den Ausführeinträgen für 'Vererben' und\n" " 'Uneingeschränkt' kompatibel.\n" " \n" " \n" -" Verknüpfmodus \n" +" Linkmodus (l) \n" " Erlaubt dem Programm das Erstellen und Entfernen eines\n" " Links mit diesem Namen (gilt auch für symlinks). Beim Erstellen eines\n" -" Links MUSS die Datei, die verknüpft wird,\n" +" Links MUSS die Datei, zu der ein Link hergestellt wird,\n" " dieselben Zugriffsberechtigungen wie der erstellte Link aufweisen\n" " (Ausnahme: Das Ziel muss nicht über\n" " Linkzugriff verfügen.) Linkzugriff ist für das\n" -" Aufheben der Verknüpfung einer Datei erforderlich.\n" +" Aufheben des Links einer Datei erforderlich.\n" " \n" " \n" " Globbing\n" " \n" " \n" " Dateiressourcen können mit einer Globbing-Syntax angegeben werden,\n" -" die mit der von beliebten Shells verwendeten vergleichbar sind, etwa csh(1),\n" +" die mit der von gängigen Shells verwendeten Syntax vergleichbar sind, etwa csh(1),\n" " bash(1), zsh(1).\n" " \n" " \n" @@ -488,7 +488,7 @@ " \n" " \n" " \n" -" Bereinigte Ausführung - für bereinigte Ausführung\n" +" Bereinigte Ausführung\n" " \n" " \n" " Die Option 'Bereinigte Ausführung' für das diskrete Profil sowie die Berechtigungen zur uneingeschränkten \n" @@ -716,7 +716,7 @@ " \n" " Details zu Zugriffsmodi\n" " \n" -" Lesemodus \n" +" Lesemodus (r) \n" " Erlaubt dem Programm den Lesezugriff auf die\n" " Ressource. Lesezugriff ist für Shell-Skripte\n" " und andere interpretierbare Inhalte erforderlich und bestimmt, ob ein\n" @@ -725,25 +725,25 @@ " strace(1), ltrace(1) und gdb(1) verwendet.)\n" " \n" " \n" -" Schreibmodus \n" +" Schreibmodus (w) \n" " Erlaubt dem Programm den Schreibzugriff auf die\n" -" Ressource. Für Dateien, der Verknüpfung aufgehoben werden soll (die also entfernt werden sollen),\n" +" Ressource. Für Dateien, deren Link aufgehoben werden soll (die also entfernt werden sollen),\n" " ist diese Berechtigung erforderlich.)\n" " \n" " \n" -" PROT_EXEC-Mmap-Modus \n" +" PROT_EXEC-Mmap-Modus (m) \n" " Ermöglicht dem Programm den Aufruf von 'mmap' bei PROT_EXEC für die\n" " Ressource. \n" " \n" " \n" " \n" " \n" -" Uneingeschränkter Ausführmodus \n" +" Uneingeschränkter Ausführmodus (ux) \n" " \n" " Erlaubt es dem Programm, die Ressource auszuführen, ohne dass\n" " AppArmor-Profile auf die ausgeführte Ressource\n" " angewendet werden. In diesem Fall muss auch der Ausführmodus aufgelistet werden.\n" -" Ist nicht mit den Ausführeinträgen für 'Vererben' und das 'Diskretes Profil'\n" +" Ist nicht mit den Ausführeinträgen für 'Vererben' und 'Diskretes Profil'\n" " kompatibel.\n" " \n" " \n" @@ -1169,7 +1169,7 @@ #: include/subdomain/event_notification_helptext.ycp:17 msgid "The Security Event Notification screen enables you to setup email alerts for security events. In the following steps, specify how often alerts are sent, who receives the alert, and how severe the security event must be to send an alert. Notification Types Terse Notification: Terse notification summarizes the total number of system events without providing details. For example: dhcp-101.up.wirex.com has had 10 security events since Tue Oct 12 11:10:00 2004 Summary Notification: The Summary notification displays the logged AppArmor security events, and lists the number of individual occurrences, including the date of the last occurrence. For example: SubDomain: PERMITTING access to capability 'setgid' (httpd2-prefork(6347) profile /usr/sbin/httpd2-prefork active /usr/sbin/httpd2-prefork) 2 times, the latest at Sat Oct 9 16:05:54 2004. Verbose Notification: The Verbose notification displays unmodified, logged AppArmor security events. It tells you every time an event occurs and writes a new line in the Verbose log. These security events include the date and time the event occurred, when the application profile permits access as well as rejects access, and the type of file permission access that is permitted or rejected. Verbose Notification also reports several messages that the logprof tool uses to interpret profiles. For example: Oct 9 15:40:31 SubDomain: PERMITTING r access to /etc/apache2/httpd.conf (httpd2-prefork(6068) profile /usr/sbin/httpd2-prefork active /usr/sbin/httpd2-prefork) <br <ol> <li> For each notification type that you would like enabled, select the frequency of notification that you would like. For example, if you select 1 day from the pull-down list, you will be sent daily notifications of security events, if they occur.</li> <li> Enter the email address of those who should receive the Terse, Summary, or Verbose notifications. </li> <li>Select the lowest severity level for which a notification should be sent. Security events will be logged and the notifications will be sent at the time indicated by the interval when events are equal or greater than the selected severity level. If the interval is 1 day, the notification will be sent daily, if security events occur. Severity Levels: These are numbered one through ten, ten being the most severe security incident. The severity.db file defines the severity level of potential security events. The severity levels are determined by the importance of different security events, such as certain resources accessed or services denied.</li> <li>Select Include unknown security events if you would like to include events that are not rated with a severity number.</li> </ol>" -msgstr "Im Fenster Sicherheitsereignisbenachrichtigung können Sie E-Mail-Warnungen für Sicherheitsereignisse einrichten. Legen Sie in den folgenden Schritten fest, wie oft Warnungen gesendet werden, wer sie erhalten soll und wie schwerwiegend das Sicherheitsereignis sein muss, damit eine Warnung gesendet wird. Benachrichtigungstypen Knappe Benachrichtigung: Knappe Benachrichtigung fasst die Gesamtanzahl an Systemereignissen ohne Einzelheiten zusammen. Ein Beispiel: dhcp-101.up.wirex.com has had 10 security events since Tue Oct 12 11:10:00 2004 Zusammenfassungsbenachrichtigung: Die Zusammenfassungsbenachrichtigung zeigt die protokollierten AppArmor-Sicherheitsereignisse und listet die Häufigkeit sowie das Datum des letzten Auftretens auf. Ein Beispiel: SubDomain: PERMITTING access to capability 'setgid' (httpd2-prefork(6347) profile /usr/sbin/httpd2-prefork active /usr/sbin/httpd2-prefork) 2 times, the latest at Sat Oct 9 16:05:54 2004. Ausführliche Benachrichtigung: Die ausführliche Benachrichtigung zeigt unveränderte, protokollierte AppArmor-Sicherheitsereignisse an. Sie werden bei jedem Auftreten eines Ereignisses informiert und es wird eine neue Zeile in das Protokoll für ausführliche Benachrichtigungen geschrieben. Diese Sicherheitsereignisse umfassen Datum und Uhrzeit des Ereignisses, wann das Anwendungsprofil den Zugriff erlaubt und abweist, sowie den Typ der Dateizugriffsberechtigung, die erlaubt oder abgewiesen wird. Die ausführliche Benachrichtigung teilt auch mehrere Meldungen mit, die das Werkzeug logprof für die Interpretation von Profilen benutzt. Ein Beispiel: Oct 9 15:40:31 SubDomain: PERMITTING r access to /etc/apache2/httpd.conf (httpd2-prefork(6068) profile /usr/sbin/httpd2-prefork active /usr/sbin/httpd2-prefork) <br <ol> <li> Wählen Sie die gewünschte Häufigkeit für jeden Benachrichtigungstyp, den Sie aktivieren möchten. Wenn Sie beispielsweise 1 Tag aus der Pulldown-Liste wählen, erhalten Sie täglich Benachrichtigungen über Sicherheitsereignisse, falls welche auftreten.</li> <li> Geben Sie die E-Mail-Adressen der Benutzer ein, die knappe, zusammenfassende oder ausführliche Benachrichtigungen erhalten sollen. </li> <li>Wählen Sie die niedrigste Sicherheitsstufe aus, für die eine Benachrichtigung gesendet werden soll. Sicherheitsereignisse werden protokolliert und die Benachrichtigungen werden im angegebenen Zeitintervall gesendet, wenn Ereignisse mit dem gewählten oder einem größeren Schweregrad eintreten. Wenn das Intervall 1 Tag ist, wird die Benachrichtigung täglich gesendet, falls Sicherheitsereignisse auftreten. Schweregrade: Sie werden von eins bis zehn nummeriert, wobei zehn den schwerwiegendsten Sicherheitsvorfall bezeichnet. Die Datei severity.db definiert den Schweregrad von potentiellen Sicherheitsereignissen. Die Schweregrade werden durch die Wichtigkeit von verschiedenen Sicherheitsereignissen bestimmt, z. B. bestimmte Ressourcen, auf die zugegriffen wird, oder abgelehnte Dienste.</li> <li>Wählen Sie Ereignisse mit unbekanntem Schweregrad aufnehmen, wenn Sie auch Ereignisse aufnehmen möchten, denen kein Schweregrad zugeordnet wurde.</li> </ol>" +msgstr "Im Fenster Sicherheitsereignisbenachrichtigung können Sie E-Mail-Warnungen für Sicherheitsereignisse einrichten. Legen Sie in den folgenden Schritten fest, wie oft Warnungen gesendet werden, wer sie erhalten soll und wie schwerwiegend das Sicherheitsereignis sein muss, damit eine Warnung gesendet wird. Benachrichtigungstypen Knappe Benachrichtigung: Knappe Benachrichtigung fasst die Gesamtanzahl an Systemereignissen ohne Einzelheiten zusammen. Ein Beispiel: dhcp-101.up.wirex.com has had 10 security events since Tue Oct 12 11:10:00 2004 Zusammenfassungsbenachrichtigung: Die Zusammenfassungsbenachrichtigung zeigt die protokollierten AppArmor-Sicherheitsereignisse und listet die Häufigkeit sowie das Datum des letzten Auftretens auf. Ein Beispiel: SubDomain: PERMITTING access to capability 'setgid' (httpd2-prefork(6347) profile /usr/sbin/httpd2-prefork active /usr/sbin/httpd2-prefork) 2 times, the latest at Sat Oct 9 16:05:54 2004. Ausführliche Benachrichtigung: Die ausführliche Benachrichtigung zeigt unveränderte, protokollierte AppArmor-Sicherheitsereignisse an. Sie werden bei jedem Auftreten eines Ereignisses informiert und es wird eine neue Zeile in das Protokoll für ausführliche Benachrichtigungen geschrieben. Diese Sicherheitsereignisse umfassen Datum und Uhrzeit des Ereignisses, wann das Anwendungsprofil den Zugriff erlaubt und abweist, sowie den Typ der Dateizugriffsberechtigung, die erlaubt oder abgewiesen wird. Die ausführliche Benachrichtigung teilt auch mehrere Meldungen mit, die das Werkzeug logprof für die Interpretation von Profilen benutzt. Ein Beispiel: Oct 9 15:40:31 SubDomain: PERMITTING r access to /etc/apache2/httpd.conf (httpd2-prefork(6068) profile /usr/sbin/httpd2-prefork active /usr/sbin/httpd2-prefork) <br <ol> <li> Wählen Sie das gewünschte Intervall für jeden Benachrichtigungstyp, den Sie aktivieren möchten. Wenn Sie beispielsweise 1 Tag aus der Pulldown-Liste wählen, erhalten Sie täglich Benachrichtigungen über Sicherheitsereignisse, falls welche auftreten.</li> <li> Geben Sie die E-Mail-Adressen der Benutzer ein, die knappe, zusammenfassende oder ausführliche Benachrichtigungen erhalten sollen. </li> <li>Wählen Sie die niedrigste Sicherheitsstufe aus, für die eine Benachrichtigung gesendet werden soll. Sicherheitsereignisse werden protokolliert und die Benachrichtigungen werden im angegebenen Zeitintervall gesendet, wenn Ereignisse mit dem gewählten oder einem größeren Schweregrad eintreten. Wenn das Intervall 1 Tag ist, wird die Benachrichtigung täglich gesendet, falls Sicherheitsereignisse auftreten. Schweregrade: Sie werden von eins bis zehn nummeriert, wobei zehn den schwerwiegendsten Sicherheitsvorfall bezeichnet. Die Datei severity.db definiert den Schweregrad von potentiellen Sicherheitsereignissen. Die Schweregrade werden durch die Wichtigkeit von verschiedenen Sicherheitsereignissen bestimmt, z. B. bestimmte Ressourcen, auf die zugegriffen wird, oder abgelehnte Dienste.</li> <li>Wählen Sie Ereignisse mit unbekanntem Schweregrad aufnehmen, wenn Sie auch Ereignisse aufnehmen möchten, denen kein Schweregrad zugeordnet wurde.</li> </ol>" #: include/subdomain/profile_dialogs.ycp:34 msgid "" @@ -1442,15 +1442,15 @@ #: include/subdomain/report_helptext.ycp:15 msgid "The Report Configuration dialog enables you to filter the archived report selected in the previous screen. To filter by Date Range: <ol> <li>Click Filter By Date Range. The fields become active. <li>Enter the start and end dates that delineate the scope of the report. <li>Enter other filtering parameters. See below for definitions of parameters. </ol> The following definitions help you to enter the filtering parameters in the Report Configuration Dialog: Program Name Pattern: When you enter a program name or pattern that matches the name of the binary executable of the program of interest, the report will display security events that have occurred for a specific program. Profile Name Pattern: When you enter the name of the profile, the report will display the security events that are generated for the specified profile. You can use this to see what is being confined by a specific profile. PID Number: Process ID number is a number that uniquely identifies one specific process or running program (this number is valid only during the lifetime of that process). Severity Level: Select the lowest severity level for security events that you would like to be included in the report. The selected severity level, and above, will be included in the reports. Detail: A source to which the profile has denied access. This includes capabilities and files. You can use this field to report the resources are not allowed to be accessed by profiles. Mode: The Mode is the permission that the profile grants to the program or process to which it is applied. The options are: r (read) w (write) l (link) x (execute) Access Type: The access type describes what is actually happening with the security event. The options are: PERMITTING, REJECTING, or AUDITING. CSV or HTML: Enables you to export a CSV (comma separated values) or html file. The CSV file separates pieces of data in the log entries with commas using a standard data format for importing into table-oriented applications. You can enter a pathname for your exported report by typing in the full pathname in the field provided." -msgstr "Im Dialogfeld 'Berichtskonfiguration' können Sie den im vorherigen Bildschirm ausgewählten archivierten Bericht filtern. So filtern Sie nach Zeitspanne: <ol> <li>Klicken Sie auf Nach Zeitspanne filtern. Die Felder werden aktiviert. <li>Geben Sie das Start- und das Enddatum ein, die den Berichtsumfang eingrenzen. <li>Geben Sie weitere Filterparameter ein. Die Definitionen der Parameter finden Sie weiter unten. </ol> Mithilfe der folgenden Definitionen können Sie die Filterparameter im Dialogfeld 'Berichtskonfiguration' eingeben: Programmnamensmuster: Wenn Sie einen Programmnamen oder ein Muster eingeben, das mit dem Namen der ausführbaren Binärdatei des relevanten Programms übereinstimmt, werden im Bericht Sicherheitsereignisse angezeigt, die für ein spezielles Programm aufgetreten sind. Profilnamensmuster: Wenn Sie den Namen des Profils eingeben, werden im Bericht die für das angegebenen Profil generierten Sicherheitsereignisse angezeigt. Hiermit können Sie die Einschränkungen eines speziellen Profils ermitteln. PID-Nummer: Bei der Prozess-ID-Nummer handelt es sich um eine Nummer, mit der ein spezieller Prozess oder ein laufendes Programm eindeutig identifiziert wird (diese Nummer ist nur während der Lebensdauer des Prozesses gültig). Schweregrad: Wählen Sie den geringsten Schweregrad für Sicherheitsereignisse aus, die in den Bericht aufgenommen werden sollen. Der ausgewählte Schweregrad und alle darüber liegenden werden in die Berichte aufgenommen. Detail: Eine Quelle, für das dem Profil der Zugriff verweigert wurde. Dies umfasst Funktionen und Dateien. Mit diesem Feld können Sie die Ressourcen im Bericht erfassen, auf die Profile nicht zugreifen dürfen. Modus: Der Modus ist die Berechtigung, die das Profil dem Programm oder dem Prozess erteilt, auf das bzw. den es angewendet wird. Wählen Sie eine der folgenden Optionen: r (lesen) w (schreiben) l (Link) x (ausführen) Zugriffstyp: Der Zugriffstyp gibt an, wie tatsächlich mit dem Sicherheitsereignis verfahren wird. Wählen Sie eine der folgenden Optionen: ZULASSEN, ABLEHNEN oder PRÜFEN. CSV oder HTML: Hiermit können Sie eine CSV- oder eine HTML-Datei exportieren. In der CSV-Datei werden Datenabschnitte in den Protokolleinträgen durch Kommata getrennt, um sie in Tabellenkalkulationsprogramme importieren zu können. Sie können einen Pfadnamen für den exportierten Bericht angeben, indem Sie den vollständigen Pfadnamen in das dafür vorgesehene Feld eingeben." +msgstr "Im Dialogfeld 'Berichtskonfiguration' können Sie den im vorherigen Bildschirm ausgewählten archivierten Bericht filtern. So filtern Sie nach Zeitspanne: <ol> <li>Klicken Sie auf Nach Zeitspanne filtern. Die Felder werden aktiviert. <li>Geben Sie das Start- und das Enddatum ein, die den Berichtsumfang eingrenzen. <li>Geben Sie weitere Filterparameter ein. Die Definitionen der Parameter finden Sie weiter unten. </ol> Mithilfe der folgenden Definitionen können Sie die Filterparameter im Dialogfeld 'Berichtskonfiguration' eingeben: Programmnamensmuster: Wenn Sie einen Programmnamen oder ein Muster eingeben, das mit dem Namen der ausführbaren Binärdatei des relevanten Programms übereinstimmt, werden im Bericht Sicherheitsereignisse angezeigt, die für ein spezielles Programm aufgetreten sind. Profilnamensmuster: Wenn Sie den Namen des Profils eingeben, werden im Bericht die für das angegebene Profil generierten Sicherheitsereignisse angezeigt. Hiermit können Sie die Einschränkungen eines speziellen Profils ermitteln. PID-Nummer: Bei der Prozess-ID-Nummer handelt es sich um eine Nummer, mit der ein spezieller Prozess oder ein laufendes Programm eindeutig identifiziert wird (diese Nummer ist nur während der Lebensdauer des Prozesses gültig). Schweregrad: Wählen Sie den geringsten Schweregrad für Sicherheitsereignisse aus, die in den Bericht aufgenommen werden sollen. Der ausgewählte Schweregrad und alle darüber liegenden werden in die Berichte aufgenommen. Detail: Eine Quelle, für die dem Profil der Zugriff verweigert wurde. Dies umfasst Funktionen und Dateien. Mit diesem Feld können Sie die Ressourcen im Bericht erfassen, auf die Profile nicht zugreifen dürfen. Modus: Der Modus ist die Berechtigung, die das Profil dem Programm oder dem Prozess erteilt, auf das bzw. den es angewendet wird. Wählen Sie eine der folgenden Optionen: r (lesen) w (schreiben) l (Link) x (ausführen) Zugriffstyp: Der Zugriffstyp gibt an, wie tatsächlich mit dem Sicherheitsereignis verfahren wird. Wählen Sie eine der folgenden Optionen: ZULASSEN (P), ABLEHNEN (R) oder PRÜFEN (A). CSV oder HTML: Hiermit können Sie eine CSV- oder eine HTML-Datei exportieren. In der CSV-Datei werden Datenabschnitte in den Protokolleinträgen durch Kommata getrennt, um sie in Tabellenkalkulationsprogramme importieren zu können. Sie können einen Pfadnamen für den exportierten Bericht angeben, indem Sie den vollständigen Pfadnamen in das dafür vorgesehene Feld eingeben." #: include/subdomain/report_helptext.ycp:18 msgid "The AppArmor On-Demand Report screen displays an instantly generated version of one of the following reports. Executive Security Summary: A combined report, consisting of one or more Security incident reports from one or more machines. This report provides a single view of security events on multiple machines. Applications Audit Report: An auditing tool that reports which application servers are running and whether the applications are confined by AppArmor. Application servers are applications that accept incoming network connections. Security Incident Report: A report that displays application security for a single host. It reports policy violations for locally confined applications during a specific time period. You can edit and customize this report, or add new versions." -msgstr "Im AppArmor-Bildschirm für On-Demand-Berichte wird eine direkt erstellte Version von einem der folgenden Berichte angezeigt. Zusammenfassung der Ausführungssicherheit: Ein aus einem oder mehreren Sicherheitsereignisberichten bestehender kombinierter Bericht für einen oder mehrere Computer. Dieser Bericht bietet eine Einzelansicht der Sicherheitsereignisse auf mehreren Computern. Anwendungsprüfbericht: Ein Prüfwerkzeug für Berichte zu den laufenden Anwendungsservern und zu den von AppArmor beschränkten Anwendungen. Anwendungsserver sind Anwendungen, die eingehende Netzwerkverbindungen annehmen. Sicherheitsereignisbericht: Ein Bericht, in dem die Anwendungssicherheit für einen einzelnen Host angezeigt wird. Hier werden die Richtlinienverstöße für lokal eingeschränkte Anwendungen in einem bestimmten Zeitraum angegeben. Sie können den Bericht bearbeiten, anpassen oder ihm neue Versionen hinzufügen." +msgstr "Im AppArmor-Bildschirm für On-Demand-Berichte wird eine direkt erstellte Version von einem der folgenden Berichte angezeigt. Zusammenfassung der Ausführungssicherheit: Ein aus einem oder mehreren Sicherheitsereignisberichten bestehender kombinierter Bericht für einen oder mehrere Computer. Dieser Bericht bietet eine Einzelansicht der Sicherheitsereignisse auf mehreren Computern. Anwendungsprüfbericht: Ein Prüfwerkzeug für Berichte zu den laufenden Anwendungsservern und zu den von AppArmor eingeschränkten Anwendungen. Anwendungsserver sind Anwendungen, die eingehende Netzwerkverbindungen annehmen. Sicherheitsereignisbericht: Ein Bericht, in dem die Anwendungssicherheit für einen einzelnen Host angezeigt wird. Hier werden die Richtlinienverstöße für lokal eingeschränkte Anwendungen in einem bestimmten Zeitraum angegeben. Sie können den Bericht bearbeiten, anpassen oder ihm neue Versionen hinzufügen." #: include/subdomain/report_helptext.ycp:20 msgid "The Report Configuration dialog enables you to filter the report selected in the previous screen. To filter by Date Range: <ol> <li>Click Filter By Date Range. The fields become active. <li>Enter the start and end dates that delineate the scope of the report. <li>Enter other filtering parameters. See below for definitions of parameters. </ol> The following definitions help you to enter the filtering parameters in the Report Configuration Dialog: Program Name Pattern: When you enter a program name or pattern that matches the name of the executable process of interest, the report will display security events that have occurred for a specific program. Profile Name Pattern: When you enter the name of the security profile that is applied to the rocess, the report will display the security events that are generated for the specified profile. You can use this to see what is being confined by a specific profile. PID Number: Process ID number is a number that uniquely identifies one specific process or running program (this number is valid only during the lifetime of that process). Severity Level: Select the lowest severity level for security events that you would like to be included in the report. The selected severity level, and above, will be included in the reports. Detail: A source to which the profile has denied access. This includes capabilities and files. You can use this field to report the resources are not allowed to be accessed by profiles. Mode: The Mode is the permission that the profile grants to the program or process to which it is applied. The options are: r (read) w (write) l (link) x (execute) Access Type: The access type describes what is actually happening with the security event. The options are: PERMITTING, REJECTING, or AUDITING. CSV or HTML: Enables you to export a CSV (comma separated values) or html file. The CSV file separates pieces of data in the log entries with commas using a standard data format for importing into table-oriented applications. You can enter a pathname for your exported report by typing in the full pathname in the field provided. " -msgstr "Im Dialogfeld 'Berichtskonfiguration' können Sie den im vorherigen Bildschirm ausgewählten Bericht filtern. So filtern Sie nach Zeitspanne: <ol> <li>Klicken Sie auf Nach Zeitspanne filtern. Die Felder werden aktiviert. <li>Geben Sie das Start- und das Enddatum ein, die den Berichtsumfang eingrenzen. <li>Geben Sie weitere Filterparameter ein. Die Definitionen der Parameter finden Sie weiter unten. </ol> Mithilfe der folgenden Definitionen können Sie die Filterparameter im Dialogfeld 'Berichtskonfiguration' eingeben: Programmnamensmuster: Wenn Sie einen Programmnamen oder ein Muster eingeben, das mit dem Namen des relevanten ausführbaren Prozesses übereinstimmt, werden im Bericht Sicherheitsereignisse angezeigt, die für ein spezielles Programm aufgetreten sind. Profilnamensmuster: Wenn Sie den Namen des Sicherheitsprofils eingeben, das auf den Prozess angewendet wird, werden im Bericht die für das angegebene Profil generierten Sicherheitsereignisse angezeigt. Hiermit können Sie die Einschränkungen eines speziellen Profils ermitteln. PID-Nummer: Bei der Prozess-ID-Nummer handelt es sich um eine Nummer, mit der ein spezieller Prozess oder ein laufendes Programm eindeutig identifiziert wird (diese Nummer ist nur während der Lebensdauer des Prozesses gültig). Schweregrad: Wählen Sie den geringsten Schweregrad für Sicherheitsereignisse aus, die in den Bericht aufgenommen werden sollen. Der ausgewählte Schweregrad und alle darüber liegenden werden in die Berichte aufgenommen. Detail: Eine Quelle, für das dem Profil der Zugriff verweigert wurde. Dies umfasst Funktionen und Dateien. Mit diesem Feld können Sie die Ressourcen im Bericht erfassen, auf die Profile nicht zugreifen dürfen. Modus: Der Modus ist die Berechtigung, die das Profil dem Programm oder dem Prozess erteilt, auf das bzw. den es angewendet wird. Wählen Sie eine der folgenden Optionen: r (lesen) w (schreiben) l (Link) x (ausführen) Zugriffstyp: Der Zugriffstyp gibt an, wie tatsächlich mit dem Sicherheitsereignis verfahren wird. Wählen Sie eine der folgenden Optionen: ZULASSEN, ABLEHNEN oder PRÜFEN. CSV oder HTML: Hiermit können Sie eine CSV- oder eine HTML-Datei exportieren. In der CSV-Datei werden Datenabschnitte in den Protokolleinträgen durch Kommata getrennt, um sie in Tabellenkalkulationsprogramme importieren zu können. Sie können einen Pfadnamen für den exportierten Bericht angeben, indem Sie den vollständigen Pfadnamen in das dafür vorgesehene Feld eingeben. " +msgstr "Im Dialogfeld 'Berichtskonfiguration' können Sie den im vorherigen Bildschirm ausgewählten Bericht filtern. So filtern Sie nach Zeitspanne: <ol> <li>Klicken Sie auf Nach Zeitspanne filtern. Die Felder werden aktiviert. <li>Geben Sie das Start- und das Enddatum ein, die den Berichtsumfang eingrenzen. <li>Geben Sie weitere Filterparameter ein. Die Definitionen der Parameter finden Sie weiter unten. </ol> Mithilfe der folgenden Definitionen können Sie die Filterparameter im Dialogfeld 'Berichtskonfiguration' eingeben: Programmnamensmuster: Wenn Sie einen Programmnamen oder ein Muster eingeben, das mit dem Namen des relevanten ausführbaren Prozesses übereinstimmt, werden im Bericht Sicherheitsereignisse angezeigt, die für ein spezielles Programm aufgetreten sind. Profilnamensmuster: Wenn Sie den Namen des Sicherheitsprofils eingeben, das auf den Prozess angewendet wird, werden im Bericht die für das angegebene Profil generierten Sicherheitsereignisse angezeigt. Hiermit können Sie die Einschränkungen eines speziellen Profils ermitteln. PID-Nummer: Bei der Prozess-ID-Nummer handelt es sich um eine Nummer, mit der ein spezieller Prozess oder ein laufendes Programm eindeutig identifiziert wird (diese Nummer ist nur während der Lebensdauer des Prozesses gültig). Schweregrad: Wählen Sie den geringsten Schweregrad für Sicherheitsereignisse aus, die in den Bericht aufgenommen werden sollen. Der ausgewählte Schweregrad und alle darüber liegenden werden in die Berichte aufgenommen. Detail: Eine Quelle, für die dem Profil der Zugriff verweigert wurde. Dies umfasst Funktionen und Dateien. Mit diesem Feld können Sie die Ressourcen im Bericht erfassen, auf die Profile nicht zugreifen dürfen. Modus: Der Modus ist die Berechtigung, die das Profil dem Programm oder dem Prozess erteilt, auf das bzw. den es angewendet wird. Wählen Sie eine der folgenden Optionen: r (lesen) w (schreiben) l (Link) x (ausführen) Zugriffstyp: Der Zugriffstyp gibt an, wie tatsächlich mit dem Sicherheitsereignis verfahren wird. Wählen Sie eine der folgenden Optionen: ZULASSEN (P), ABLEHNEN (R) oder PRÜFEN (A). CSV oder HTML: Hiermit können Sie eine CSV- oder eine HTML-Datei exportieren. In der CSV-Datei werden Datenabschnitte in den Protokolleinträgen durch Kommata getrennt, um sie in Tabellenkalkulationsprogramme importieren zu können. Sie können einen Pfadnamen für den exportierten Bericht angeben, indem Sie den vollständigen Pfadnamen in das dafür vorgesehene Feld eingeben. " #: include/subdomain/report_helptext.ycp:26 msgid "Generate Reports Help If there were, in fact, going to be any help for you (which, incidentally, there isn't going to be), then you would indeed find said help, here. Thank you for your time, and have a nice day." @@ -1458,11 +1458,11 @@ #: include/subdomain/report_helptext.ycp:31 msgid "The summary of scheduled reports page shows us when reports are scheduled to run. Reports can be set to run monthly, weekly, daily, or hourly. The default settings are daily at midnight. The reports can also be emailed, upon completion, to up to three email recipients. In the Set Schedule section, you can schedule the following three types of security reports: Executive Security Summary: A combined report, consisting of one or more Security incident reports from one or more machines. This report provides a single view of security events on multiple machines. Applications Audit Report: An auditing tool that reports which application servers are running and whether the applications are confined by AppArmor. Application servers are applications that accept incoming network connections. Security Incident Report: A report that displays application security for a single host. It reports policy violations for locally confined applications during a specific time period. You can edit and customize this report, or add new versions." -msgstr "Auf der Seite mit der Zusammenfassung der geplanten Berichte wird angegeben, wann die Ausführung der Berichte geplant ist. Die Ausführung der Berichte kann monatlich, wöchentlich, täglich oder stündlich erfolgen. Die Standardeinstellungen sind in der Regel täglich um Mitternacht. Die Berichte können nach Abschluss per Email an bis zu drei Empfänger gesendet werden. Im Abschnitt 'Zeitplan festlegen' können Sie die drei folgenden Arten von Sicherheitsberichten planen: Zusammenfassung der Ausführungssicherheit: Ein aus einem oder mehreren Sicherheitsereignisberichten bestehender kombinierter Bericht für einen oder mehrere Computer. Dieser Bericht bietet eine Einzelansicht der Sicherheitsereignisse auf mehreren Computern. Anwendungsprüfbericht: Ein Prüfwerkzeug für Berichte zu den laufenden Anwendungsservern und zu den von AppArmor beschränkten Anwendungen. Anwendungsserver sind Anwendungen, die eingehende Netzwerkverbindungen annehmen. Sicherheitsereignisbericht: Ein Bericht, in dem die Anwendungssicherheit für einen einzelnen Host angezeigt wird. Hier werden die Richtlinienverstöße für lokal eingeschränkte Anwendungen in einem bestimmten Zeitraum angegeben. Sie können den Bericht bearbeiten, anpassen oder ihm neue Versionen hinzufügen." +msgstr "Auf der Seite mit der Zusammenfassung der geplanten Berichte wird angegeben, wann die Ausführung der Berichte geplant ist. Die Ausführung der Berichte kann monatlich, wöchentlich, täglich oder stündlich erfolgen. Die Standardeinstellungen sind in der Regel täglich um Mitternacht. Die Berichte können nach Abschluss per E-Mail an bis zu drei Empfänger gesendet werden. Im Abschnitt 'Zeitplan festlegen' können Sie die drei folgenden Arten von Sicherheitsberichten planen: Zusammenfassung der Ausführungssicherheit: Ein aus einem oder mehreren Sicherheitsereignisberichten bestehender kombinierter Bericht für einen oder mehrere Computer. Dieser Bericht bietet eine Einzelansicht der Sicherheitsereignisse auf mehreren Computern. Anwendungsprüfbericht: Ein Prüfwerkzeug für Berichte zu den laufenden Anwendungsservern und zu den von AppArmor eingeschränkten Anwendungen. Anwendungsserver sind Anwendungen, die eingehende Netzwerkverbindungen annehmen. Sicherheitsereignisbericht: Ein Bericht, in dem die Anwendungssicherheit für einen einzelnen Host angezeigt wird. Hier werden die Richtlinienverstöße für lokal eingeschränkte Anwendungen in einem bestimmten Zeitraum angegeben. Sie können den Bericht bearbeiten, anpassen oder ihm neue Versionen hinzufügen." #: include/subdomain/report_helptext.ycp:34 msgid " The View Archive Reports form enables you to view previously generated reports, located in the /var/log/apparmor/reports-archived directory. The checkboxes at the top of the form enable you to narrow-down the category of reports shown in the list to the following: SIR Reports, AUD Reports, or ESS Reports. To see report details, select a report and click the View button. You can view reports from one or more systems if you move the reports to the /var/log/apparmor/reports-archived directory." -msgstr "Mit dem Formular 'Archivberichte anzeigen' können Sie zuvor erstellte Berichte im Verzeichnis /var/log/apparmor/reports-archived anzeigen. Mithilfe der Kontrollkästchen im oberen Bereich des Formulars können Sie die in der Liste angegebenen Berichtskategorien weiter wie folgt eingrenzen: SIR-Berichte, AUD-Berichte oder ESS-Berichte. Zum Anzeigen der Berichtsdetails wählen Sie einen Bericht aus und klicken Sie auf Anzeigen. Durch Verschieben der Berichte in das Verzeichnis /var/log/apparmor/reports-archived können Sie mehrere Berichte von einem oder mehreren Systemen anzeigen." +msgstr "Mit dem Formular 'Archivierte Berichte anzeigen' können Sie zuvor erstellte Berichte anzeigen, die im Verzeichnis /var/log/apparmor/reports-archived abgelegt sind. Mithilfe der Kontrollkästchen im oberen Bereich des Formulars können Sie die in der Liste angegebenen Berichtskategorien weiter wie folgt eingrenzen: SIR-Berichte, AUD-Berichte oder ESS-Berichte. Zum Anzeigen der Berichtsdetails wählen Sie einen Bericht aus und klicken Sie auf Anzeigen. Durch Verschieben der Berichte in das Verzeichnis /var/log/apparmor/reports-archived können Sie mehrere Berichte von einem oder mehreren Systemen anzeigen." #: include/subdomain/report_helptext.ycp:46 msgid "repConfHelp" @@ -1470,11 +1470,11 @@ #: include/subdomain/report_helptext.ycp:48 msgid "Security Incident Report (SIR): A report that displays security events of interest to an administrator. The SIR reports policy violations for locally confined applications during the specified time period. The SIR reports policy exceptions and policy engine state changes. These two types of security events are defined as follows: <ul> <li>Policy Exceptions: When an application requests a resource that's not defined within its profile, a security event is generated. <li>Policy Engine State Changes: Enforces policy for applications and maintains its own state, including when engines start or stop, when a policy is reloaded, and when global security feature are enabled or disabled. </ul> Select the report from the archive, then View to see the report details." -msgstr "Sicherheitsereignisbericht: (SIR): Ein Bericht, in dem die relevanten Sicherheitsereignisse für einen Administrator angezeigt werden. Im SIR werden die Richtlinienverstöße für lokal beschränkte Anwendungen in einem bestimmten Zeitraum angegeben. Im SIR werden Richtlinienausnahmen und Statusänderungen der Richtlinien-Engine angegeben. Diese beiden Arten von Sicherheitsereignissen werden wie folgt definiert: <ul> <li>Richtlinienausnahmen: Wenn eine Anwendung eine Ressource anfordert, die in ihrem Profil nicht definiert ist, wird ein Sicherheitsereignis generiert. <li>Statusänderungen der Richtlinien-Engine: Erzwingt die Richtlinie für Anwendungen und zeichnet den Zustand auf, beispielsweise das Starten oder Anhalten von Engines, das Neuladen einer Richtlinie oder das Aktivieren oder Deaktivieren einer globalen Sicherheitsfunktion. </ul> Wählen Sie den Bericht im Archiv aus und klicken Sie auf Anzeigen, um die Berichtsdetails einzublenden." +msgstr "Sicherheitsereignisbericht: (SIR): Ein Bericht, in dem die relevanten Sicherheitsereignisse für einen Administrator angezeigt werden. Im SIR werden die Richtlinienverstöße für lokal eingeschränkte Anwendungen in einem bestimmten Zeitraum angegeben. Im SIR werden Richtlinienausnahmen und Statusänderungen der Richtlinien-Engine angegeben. Diese beiden Arten von Sicherheitsereignissen werden wie folgt definiert: <ul> <li>Richtlinienausnahmen: Wenn eine Anwendung eine Ressource anfordert, die in ihrem Profil nicht definiert ist, wird ein Sicherheitsereignis generiert. <li>Statusänderungen der Richtlinien-Engine: Erzwingt die Richtlinie für Anwendungen und zeichnet den Zustand auf, beispielsweise das Starten oder Anhalten von Engines, das Neuladen einer Richtlinie oder das Aktivieren oder Deaktivieren einer globalen Sicherheitsfunktion. </ul> Wählen Sie den Bericht im Archiv aus und klicken Sie auf Anzeigen, um die Berichtsdetails einzublenden." #: include/subdomain/report_helptext.ycp:51 msgid "Applications Audit Report (AUD): An auditing tool that reports which application servers are running and whether they are confined by AppArmor. Application servers are applications that accept incoming network connections. This report provides the host machine's IP Address, the date the Applications Audit Report ran, the name and path of the unconfined program or application server, the suggested profile or a placeholder for a profile for an unconfined program, the process ID number, The state of the program (confined or unconfined), and the type of confinement that the profile is performing (enforce/complain). " -msgstr "Anwendungsprüfbericht (AUD): Ein Prüfwerkzeug für Berichte zu den laufenden Anwendungsservern und zu den durch AppArmor beschränkten Anwendungen. Anwendungsserver sind Anwendungen, die eingehende Netzwerkverbindungen annehmen. In diesem Bericht werden die IP-Adresse des Hostcomputers, das Datum, an dem der Anwendungsprüfbericht ausgeführt wurde, der Name und der Pfad des unbeschränkten Programms oder Anwendungsservers, das vorgeschlagene Profil oder ein Platzhalter für ein Profil eines unbeschränkten Programms, die Prozess-ID-Nummer, der Status des Programms (beschränkt oder unbeschränkt) und der Typ der Beschränkung angegeben, die das Profil ausführt (erzwingen/melden). " +msgstr "Anwendungsprüfbericht (AUD): Ein Prüfwerkzeug für Berichte zu den laufenden Anwendungsservern und zu den durch AppArmor eingeschränkten Anwendungen. Anwendungsserver sind Anwendungen, die eingehende Netzwerkverbindungen annehmen. In diesem Bericht werden die IP-Adresse des Hostcomputers, das Datum, an dem der Anwendungsprüfbericht ausgeführt wurde, der Name und der Pfad des unbeschränkten Programms oder Anwendungsservers, das vorgeschlagene Profil oder ein Platzhalter für ein Profil eines unbeschränkten Programms, die Prozess-ID-Nummer, der Status des Programms (beschränkt oder unbeschränkt) und der Typ der Beschränkung angegeben, die das Profil ausführt (erzwingen/melden). " #: include/subdomain/report_helptext.ycp:53 msgid "Executive Security Summary (ESS): A combined report, consisting of one or more high-level reports from one or more machines. This report can provide a single view of security events on multiple machines if each machine's data is copied to the reports archive directory, which is /var/log/apparmor/reports-archived. This report provides the host machine's IP address, the start and end dates of the polled events, total number of rejects, total number of events, average of severity levels reported, and the highest severity level reported. One line of the ESS report represents a range of SIR reports. " @@ -1482,7 +1482,7 @@ #: include/subdomain/reporting_archived_dialogs.ycp:46 msgid "Archived Security Incident Report - Page " -msgstr "Archivierter Sicherheitsereignisbericht - Seite" +msgstr "Archivierter Sicherheitsereignisbericht - Seite " #: include/subdomain/reporting_archived_dialogs.ycp:46 #: include/subdomain/reporting_dialogues.ycp:513 @@ -1940,7 +1940,7 @@ #: include/subdomain/reporting_dialogues.ycp:513 #: include/subdomain/reporting_dialogues.ycp:1129 msgid "On Demand Event Report - Page " -msgstr "On-Demand-Ereignisbericht - Seite" +msgstr "On-Demand-Ereignisbericht - Seite " #: include/subdomain/reporting_dialogues.ycp:533 #: include/subdomain/reporting_dialogues.ycp:1165 @@ -2077,7 +2077,7 @@ #: include/subdomain/reporting_dialogues.ycp:1132 msgid "Archived Event Report - Page " -msgstr "Archivierter Ereignisbericht - Seite" +msgstr "Archivierter Ereignisbericht - Seite " #: include/subdomain/reporting_dialogues.ycp:1135 #: include/subdomain/reporting_dialogues.ycp:1356 @@ -2223,17 +2223,17 @@ #: include/subdomain/reporting_dialogues.ycp:1742 #: include/subdomain/reporting_dialogues.ycp:2151 msgid "Email Target 1" -msgstr "Email-Ziel 1" +msgstr "E-Mail-Ziel 1" #: include/subdomain/reporting_dialogues.ycp:1743 #: include/subdomain/reporting_dialogues.ycp:2152 msgid "Email Target 2" -msgstr "Email-Ziel 2" +msgstr "E-Mail-Ziel 2" #: include/subdomain/reporting_dialogues.ycp:1744 #: include/subdomain/reporting_dialogues.ycp:2153 msgid "Email Target 3" -msgstr "Email-Ziel 3" +msgstr "E-Mail-Ziel 3" #: include/subdomain/reporting_dialogues.ycp:1798 #: include/subdomain/reporting_dialogues.ycp:1946 @@ -2487,12 +2487,12 @@ #: include/subdomain/sd-config.ycp:250 include/subdomain/sd-config.ycp:263 #: include/subdomain/sd-config.ycp:276 msgid "Frequency" -msgstr "Frequenz" +msgstr "Intervall" #: include/subdomain/sd-config.ycp:251 include/subdomain/sd-config.ycp:264 #: include/subdomain/sd-config.ycp:277 msgid "Email Address" -msgstr "Email-Adresse" +msgstr "E-Mail-Adresse" #: include/subdomain/sd-config.ycp:255 include/subdomain/sd-config.ycp:268 #: include/subdomain/sd-config.ycp:281 diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-trans-de-2.15.2/VERSION new/yast2-trans-de-2.15.3/VERSION --- old/yast2-trans-de-2.15.2/VERSION 2007-04-19 16:59:36.000000000 +0200 +++ new/yast2-trans-de-2.15.3/VERSION 2007-05-30 15:32:49.000000000 +0200 @@ -1 +1 @@ -2.15.2 +2.15.3 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit yast2-ftp-server
by root＠Hilbert.suse.de 30 May '07

30 May '07

Hello community, here is the log from the commit of package yast2-ftp-server checked in at Wed May 30 19:02:42 CEST 2007. -------- --- yast2-ftp-server/yast2-ftp-server.changes 2007-05-10 15:14:17.000000000 +0200 +++ /mounts/work_src_done/NOARCH/yast2-ftp-server/yast2-ftp-server.changes 2007-05-30 18:40:38.459544000 +0200 @@ -1,0 +2,7 @@ +Wed May 30 17:31:06 CEST 2007 - juhliarik(a)suse.cz + +- added patch for uploading anonymous users via vsftpd +- added creation "upload" subdirectory with writing permission +- V 2.15.5 + +------------------------------------------------------------------- Old: ---- yast2-ftp-server-2.15.4.tar.bz2 New: ---- yast2-ftp-server-2.15.5.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-ftp-server.spec ++++++ --- /var/tmp/diff_new_pack.H14695/_old 2007-05-30 19:02:28.000000000 +0200 +++ /var/tmp/diff_new_pack.H14695/_new 2007-05-30 19:02:28.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package yast2-ftp-server (Version 2.15.4) +# spec file for package yast2-ftp-server (Version 2.15.5) # # Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine @@ -11,12 +11,12 @@ # norootforbuild Name: yast2-ftp-server -Version: 2.15.4 +Version: 2.15.5 Release: 1 License: GNU General Public License (GPL) Group: System/YaST BuildRoot: %{_tmppath}/%{name}-%{version}-build -Source0: yast2-ftp-server-2.15.4.tar.bz2 +Source0: yast2-ftp-server-2.15.5.tar.bz2 prefix: /usr Requires: yast2 yast2-inetd BuildRequires: perl-XML-Writer update-desktop-files yast2 yast2-devtools yast2-inetd yast2-testsuite @@ -34,7 +34,7 @@ Jozef Uhliarik <juhliarik(a)suse.cz> %prep -%setup -n yast2-ftp-server-2.15.4 +%setup -n yast2-ftp-server-2.15.5 %build %{prefix}/bin/y2tool y2autoconf @@ -70,6 +70,10 @@ %doc %{prefix}/share/doc/packages/yast2-ftp-server %changelog +* Wed May 30 2007 - juhliarik(a)suse.cz +- added patch for uploading anonymous users via vsftpd +- added creation "upload" subdirectory with writing permission +- V 2.15.5 * Thu May 10 2007 - juhliarik(a)suse.cz - added corrections for starting daemon via "when booting" - added corrections for help text ++++++ yast2-ftp-server-2.15.4.tar.bz2 -> yast2-ftp-server-2.15.5.tar.bz2 ++++++ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-ftp-server-2.15.4/config/ftp-server.rnc new/yast2-ftp-server-2.15.5/config/ftp-server.rnc --- old/yast2-ftp-server-2.15.4/config/ftp-server.rnc 2007-05-04 11:02:59.000000000 +0200 +++ new/yast2-ftp-server-2.15.5/config/ftp-server.rnc 2007-05-30 17:22:13.000000000 +0200 @@ -23,7 +23,6 @@ element AnonCreatDirs { text }? & element Banner { text }? & element SSLEnable { text }? & - element SSLVersion { text }? & element TLS { text }? & element AntiWarez { text }? & element SSL { text }? & @@ -35,5 +34,7 @@ element CertFile { text }? & element VirtualUser { text }? & element FTPUser { text }? & - element GuestUser { text }? + element GuestUser { text }? & + element EnableUpload { text }? + } \ No newline at end of file diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-ftp-server-2.15.4/configure new/yast2-ftp-server-2.15.5/configure --- old/yast2-ftp-server-2.15.4/configure 2007-05-10 15:16:28.000000000 +0200 +++ new/yast2-ftp-server-2.15.5/configure 2007-05-30 18:44:26.000000000 +0200 @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.60 for yast2-ftp-server 2.15.4. +# Generated by GNU Autoconf 2.60 for yast2-ftp-server 2.15.5. # # Report bugs to <http://bugs.opensuse.org/>. # @@ -559,8 +559,8 @@ # Identity of this package. PACKAGE_NAME='yast2-ftp-server' PACKAGE_TARNAME='yast2-ftp-server' -PACKAGE_VERSION='2.15.4' -PACKAGE_STRING='yast2-ftp-server 2.15.4' +PACKAGE_VERSION='2.15.5' +PACKAGE_STRING='yast2-ftp-server 2.15.5' PACKAGE_BUGREPORT='http://bugs.opensuse.org/' ac_unique_file="RPMNAME" @@ -1181,7 +1181,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-ftp-server 2.15.4 to adapt to many kinds of systems. +\`configure' configures yast2-ftp-server 2.15.5 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1252,7 +1252,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of yast2-ftp-server 2.15.4:";; + short | recursive ) echo "Configuration of yast2-ftp-server 2.15.5:";; esac cat <<\_ACEOF @@ -1330,7 +1330,7 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -yast2-ftp-server configure 2.15.4 +yast2-ftp-server configure 2.15.5 generated by GNU Autoconf 2.60 Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, @@ -1344,7 +1344,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-ftp-server $as_me 2.15.4, which was +It was created by yast2-ftp-server $as_me 2.15.5, which was generated by GNU Autoconf 2.60. Invocation command line was $ $0 $@ @@ -2145,7 +2145,7 @@ # Define the identity of the package. PACKAGE='yast2-ftp-server' - VERSION='2.15.4' + VERSION='2.15.5' cat >>confdefs.h <<_ACEOF @@ -2372,7 +2372,7 @@ -VERSION="2.15.4" +VERSION="2.15.5" RPMNAME="yast2-ftp-server" MAINTAINER="Jozef Uhliarik <juhliarik(a)suse.cz>" @@ -3258,7 +3258,7 @@ # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by yast2-ftp-server $as_me 2.15.4, which was +This file was extended by yast2-ftp-server $as_me 2.15.5, which was generated by GNU Autoconf 2.60. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -3301,7 +3301,7 @@ _ACEOF cat >>$CONFIG_STATUS <<_ACEOF ac_cs_version="\\ -yast2-ftp-server config.status 2.15.4 +yast2-ftp-server config.status 2.15.5 configured by $0, generated by GNU Autoconf 2.60, with options \\"`echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\" diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-ftp-server-2.15.4/configure.in new/yast2-ftp-server-2.15.5/configure.in --- old/yast2-ftp-server-2.15.4/configure.in 2007-05-10 15:16:23.000000000 +0200 +++ new/yast2-ftp-server-2.15.5/configure.in 2007-05-30 18:44:21.000000000 +0200 @@ -3,7 +3,7 @@ dnl -- This file is generated by y2autoconf 2.14.0 - DO NOT EDIT! -- dnl (edit configure.in.in instead) -AC_INIT(yast2-ftp-server, 2.15.4, http://bugs.opensuse.org/, yast2-ftp-server) +AC_INIT(yast2-ftp-server, 2.15.5, http://bugs.opensuse.org/, yast2-ftp-server) 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.15.4" +VERSION="2.15.5" RPMNAME="yast2-ftp-server" MAINTAINER="Jozef Uhliarik <juhliarik(a)suse.cz>" diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-ftp-server-2.15.4/src/dialogs.ycp new/yast2-ftp-server-2.15.5/src/dialogs.ycp --- old/yast2-ftp-server-2.15.4/src/dialogs.ycp 2007-05-10 09:52:46.000000000 +0200 +++ new/yast2-ftp-server-2.15.5/src/dialogs.ycp 2007-05-29 16:07:36.000000000 +0200 @@ -223,11 +223,13 @@ result["custom_widget"] = `VBox(); result["init"] = InitAnonSettings; result["store"] = StoreAnonSettings; + result["handle"] = HandleAnonSettings; result["help"] = DialogHelpText("anon_settings"); return result; } + /** * Init function where are added UI hadle functions * Expert Settings widget (vsftpd) @@ -431,6 +433,28 @@ /** * Init function where are added UI hadle functions + * Anonymous Settings widget + * define for tabs_vsftpd/tabs_pureftpd necessary later in screens (CWNTree) + * + * @return map<string,any> map for Anonymous Settings widget + */ + +map<string,any> vsftpd_anon_settings () { + map<string,any> result = $[]; + + result["contents"] = `VBox ( + VsftpdAnonSettings() + ); + // TRANSLATORS: part of dialog caption + result["caption"] = _("FTP Anonymous Settings"); + // TRANSLATORS: tree menu item + result["tree_item_label"] = _("Authentication"); + result["widget_names"] = [ "DisBackButton", "AnonSettings"]; + + return result; +} +/** + * Init function where are added UI hadle functions * Expert Settings widget (vsftpd) * define for tabs_vsftpd necessary later in screens (CWNTree) * @@ -513,7 +537,7 @@ "VSFTPDAddSettings": VSFTPDSettings(), - "PUREFTPDAddSettings": PUREFTPDAddSettings (), + //"PUREFTPDAddSettings": PUREFTPDAddSettings (), "RBVsPureFTPd" : RBVsftpdPureftpd (), @@ -537,7 +561,7 @@ "perfor_settings" :perfor_settings (), - "anon_settings" : anon_settings (), + "anon_settings" : vsftpd_anon_settings (), "addit_settings" : addit_settings (), diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-ftp-server-2.15.4/src/FtpServer.ycp new/yast2-ftp-server-2.15.5/src/FtpServer.ycp --- old/yast2-ftp-server-2.15.4/src/FtpServer.ycp 2007-05-10 13:49:57.000000000 +0200 +++ new/yast2-ftp-server-2.15.5/src/FtpServer.ycp 2007-05-30 16:55:39.000000000 +0200 @@ -96,6 +96,24 @@ global boolean start_xinetd = false; /** + * variable signifies if it is create upload dir + * only for vsftpd and anonymous connections with allowed upload + * + * global boolean variable + */ + +global boolean create_upload_dir = false; + +/** + * variable signifies if upload dir has good permissions + * only for vsftpd and anonymous connections with allowed upload + * + * global boolean variable + */ + +global boolean upload_good_permission = false; + +/** * variable signifies home dir for anonymous user * * global string variable @@ -146,7 +164,7 @@ "UmaskAnon", "UmaskLocal", "PasMinPort", "PasMaxPort", "MaxIdleTime", "MaxClientsPerIP", "MaxClientsNumber", "LocalMaxRate", "AnonMaxRate", "AnonAuthen", "AnonReadOnly", "AnonCreatDirs", "Banner", "SSLEnable", "TLS", "AntiWarez", "SSL", "StartXinetd", -"PassiveMode", "CertFile", "SSLv2", "SSLv3", "VirtualUser", "FTPUser", "GuestUser"]; +"PassiveMode", "CertFile", "SSLv2", "SSLv3", "VirtualUser", "FTPUser", "GuestUser", "EnableUpload"]; /** * map of deafult values for options in UI @@ -186,6 +204,7 @@ "VirtualUser" : "NO", "FTPUser" : "ftp", "GuestUser" : "", + "EnableUpload" : "NO", ]; @@ -251,6 +270,48 @@ return true; } + +/** + * Read vsftpd configuration + * existing upload file and permissions + * + * @return boolean successfull + */ + + +boolean ReadVSFTPDUpload () { + boolean result = false; + string command = ""; + if (anon_homedir !="") + command = "ls -l "+anon_homedir+ " | grep upload"; + if (command != "") { + map options = (map)SCR::Execute (.target.bash_output, command); + y2milestone("[ftp-server] (ReadVSFTPDUpload) command for existing upload dir: %1 output: %2",command, options); + if (options["exit"]:nil == 0) + result = true; + else + result = false; + if (result) { + //Popup::Message("Work ReadVSFTPDUpload"); + create_upload_dir = true; + string permissions = substring (tostring(options["stdout"]:nil),0,10); + string w = filterchars (permissions, "w"); + string r = filterchars (permissions, "r"); + if ((size(w) <3) || (size(r) <3)) { + upload_good_permission = false; + //Popup::Message("good permissions"); + } else { + upload_good_permission = true; + //Popup::Message("wrong permissions"); + } + } + } + return result; +} + + + + /** * Remap current pure -FtpServer configuration * to temporary structure @@ -294,7 +355,7 @@ if ((Users::Read () == "") && (EDIT_SETTINGS["VirtualUser"]:nil == "NO")) { if ((vsftpd_edit) && (EDIT_SETTINGS["GuestUser"]:nil != "") && (EDIT_SETTINGS["FtpDirLocal"]:nil == "")) { - Popup::Message("if ((vsftpd_edit) && (EDIT_SETTINGS"); + //Popup::Message("if ((vsftpd_edit) && (EDIT_SETTINGS"); Users::SelectUserByName (EDIT_SETTINGS["GuestUser"]:nil); userinfo = Users::GetCurrentUser (); string guest_home_dir = (string) userinfo["homedirectory"]:nil; @@ -318,9 +379,10 @@ boolean progress_orig = Progress::set (false); SuSEFirewall::Read (); Progress::set (progress_orig); - - - + //read existing upload directory for vsftpd + if (vsftpd_edit) { + result = ReadVSFTPDUpload (); + } return result; } @@ -504,7 +566,49 @@ return result; } +/** + * Ask for creation upload directory + * It is necessary if user want to allow uploading for anonymous + * @return boolean result of function (true/false) + */ +boolean WriteUpload () { + boolean result = true; + string command =""; + integer authentication = tointeger(EDIT_SETTINGS["AnonAuthen"]:nil); + if ((vsftpd_edit) && (authentication == 0) && (create_upload_dir) && (upload_good_permission)) { + boolean write_enable = ((EDIT_SETTINGS["EnableUpload"]:nil == "YES") ? true:false); + boolean anon_upload = ((EDIT_SETTINGS["AnonReadOnly"]:nil == "NO") ? true:false); + boolean anon_create_dirs = ((EDIT_SETTINGS["AnonCreatDirs"]:nil == "YES") ? true:false); + if ((write_enable) && ((anon_upload) || (anon_create_dirs))) + command = "dir=`ls "; + command = command + anon_homedir; + command = command + " | grep upload`; if [ -z $dir ]; then mkdir "; + command = command + anon_homedir +"upload; chown "; + + if (EDIT_SETTINGS["GuestUser"]:nil !="") + command = command + EDIT_SETTINGS["GuestUser"]:nil +":"+EDIT_SETTINGS["GuestUser"]:nil; + else if (EDIT_SETTINGS["FTPUser"]:nil !="") + command = command + EDIT_SETTINGS["FTPUser"]:nil +":"+EDIT_SETTINGS["FTPUser"]:nil; + command = command + " " + anon_homedir +"upload; chmod 766 "; + command = command + anon_homedir +"upload; else chmod 766 " + anon_homedir +"upload; fi"; +/* +"dir=`ls /srv/ftp/ | grep upload`; if [ -z $dir ]; then echo $dir; mkdir /srv/ftp/upload; + chown ftp:ftp /srv/ftp/upload/; chmod 755 /srv/ftp/upload; else chmod 766 /srv/ftp/upload/; fi" +*/ + y2milestone("[ftp-server] (WriteUpload) bash command for creating upload dir : %1", command); + map options = (map)SCR::Execute (.target.bash_output, command); + if (options["exit"]:nil == 0) + result = true; + else + result = false; + //Popup::Message(command); + + } else { + result = true; + } + return result; +} /** * read value from PURE_EDIT_SETTINGS * @@ -666,7 +770,7 @@ /* FtpServer read dialog caption */ string caption = _("Saving FTP Configuration"); - integer steps = 2; + integer steps = 3; // We do not set help text here, because it was set outside Progress::New(caption, " ", @@ -696,6 +800,13 @@ if (!WriteXinetd ()) Report::Error (_("Cannot write settings for xinetd!")); sleep(sl); + if (PollAbort()) return false; + Progress::NextStage (); + // write settings for starting daemon + if (!WriteUpload ()) Report::Error (_("Cannot create upload direcotry for anonymous connections!")); + sleep(sl); + + if(PollAbort()) return false; /* Progress finished */ Progress::NextStage(); @@ -857,7 +968,6 @@ * @return table items */ global list Overview() { - // TODO FIXME: your code here... return []; } diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-ftp-server-2.15.4/src/helps.ycp new/yast2-ftp-server-2.15.5/src/helps.ycp --- old/yast2-ftp-server-2.15.4/src/helps.ycp 2007-05-10 09:12:00.000000000 +0200 +++ new/yast2-ftp-server-2.15.5/src/helps.ycp 2007-05-30 17:16:46.000000000 +0200 @@ -146,14 +146,26 @@ /* anonymous settings anonymous can't upload dialog help 5/6 */ _("Anonymous Can Upload -If enabled anonymous users will be permitted to upload. +If enabled anonymous users will be permitted to upload. +vsftpd only: If you want that anonymous users can upload you +need existing directory with allowed writing in home directory after login. ")+ /* anonymous settings anonymous can create dirs dialog help 6/6 */ _("Anonymous Can Create Dirs -If enabled anonymous users can create directories. +If enabled anonymous users can create directories. +vsftpd only: If you want that anonymous users can create directories you +need existing directory with allowed writing in home directory after login. +")+ + +/* anonymous settings anonymous can create dirs dialog help 6/6 */ +_("Enable Upload (vsftpd only) +If enable ftp users can upload. Anonymous users need to allow + \"Anonymous Can Upload\" for enabling upload. "), + + /* expert settings dialog help 1/6 */ "vsftpd_settings" : _("<big>Expert Settings Expert settings - security and firewall settings. diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-ftp-server-2.15.4/src/uiforms.ycp new/yast2-ftp-server-2.15.5/src/uiforms.ycp --- old/yast2-ftp-server-2.15.4/src/uiforms.ycp 2007-05-03 11:48:30.000000000 +0200 +++ new/yast2-ftp-server-2.15.5/src/uiforms.ycp 2007-05-30 10:46:23.000000000 +0200 @@ -94,6 +94,49 @@ } + + + + + + +term VsftpdAnonSettings() { + term dialog = `VBox ( + `Frame ( _("Enable/Disable Anonymous and Local Users"), + `RadioButtonGroup(`id("AnonAuthen"), + `HBox(`HSpacing(1),`VBox( + `Left(`RadioButton(`id(0), "Anonymo&us Only")), + `Left(`RadioButton(`id(1), "Aut&henticated Users Only", true)), + `Left(`RadioButton(`id(2), "&Both")) + )) + ) //end of `HBox(`HSpacing(1),`RadioButtonGroup(`id("AnonAuthen") + ), //end of `Frame ( _("Enable/Disable Anonymous and Local Users") + `VSpacing(1), + `Frame ( _("Uploading"), + `HBox(`HSpacing(1),`VBox ( + `Left(`CheckBox (`id("EnableUpload"), `opt(`notify), _("&Enable Upload"))), + `HBox(`HSpacing(2),`VBox( + `Left(`CheckBox (`id("AnonReadOnly"), `opt(`notify), _("Anon&ymous Can Upload"))), + `Left(`CheckBox (`id("AnonCreatDirs"),`opt(`notify), _("Anonymou&s Can Create Directories"))) + )) + )) + ), //end of `Frame ( _("Anonymous Settings") + `VStretch() + ); + return dialog; +} + + + + + + + + + + + + term FTPAnonSettings() { term dialog = `VBox ( `Frame ( _("Enable/Disable Anonymous and Local Users"), @@ -118,6 +161,11 @@ } + + + + + term VSFTPDAddSettings() { term dialog = `VBox ( `CheckBoxFrame ( `id("PassiveMode"), _("Pass&ive Mode"), true, diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-ftp-server-2.15.4/src/wid_functions.ycp new/yast2-ftp-server-2.15.5/src/wid_functions.ycp --- old/yast2-ftp-server-2.15.4/src/wid_functions.ycp 2007-05-03 14:48:42.000000000 +0200 +++ new/yast2-ftp-server-2.15.5/src/wid_functions.ycp 2007-05-30 17:25:21.000000000 +0200 @@ -25,6 +25,15 @@ include "ftp-server/uiforms.ycp"; + +/** + * variable signifies repeat asking about upload file + * only for vsftpd + * + * internal boolean variable + */ +boolean ask_again = true; + /** * CWMServiceStart function with no parameter returning boolean value * that says if the service is started. @@ -307,7 +316,7 @@ } /** - * Init function for performance settings + * Init function for anon settings * change ValidChars from textentry */ void InitAnonSettings(string key) { @@ -318,13 +327,19 @@ (FtpServer::ValueUIEdit("AnonReadOnly") == "NO")); UI::ChangeWidget(`id( "AnonCreatDirs" ), `Value, (FtpServer::ValueUIEdit("AnonCreatDirs") == "YES")); - - + if (FtpServer::vsftpd_edit) { + UI::ChangeWidget(`id( "EnableUpload" ), `Value, + (FtpServer::ValueUIEdit("EnableUpload") == "YES")); + if (!((boolean) UI::QueryWidget(`id("EnableUpload"), `Value))) { + UI::ChangeWidget(`id("AnonReadOnly"), `Enabled, false); + UI::ChangeWidget(`id( "AnonCreatDirs" ),`Enabled, false); + } + } } /** - * Store function for performance settings + * Store function for anon settings * save values to temporary structure */ void StoreAnonSettings (string key, map event) { @@ -334,9 +349,76 @@ }); FtpServer::WriteToEditMap("AnonReadOnly", (((boolean) UI::QueryWidget(`id("AnonReadOnly"), `Value) == true) ? "NO":"YES")); + if (FtpServer::vsftpd_edit) + FtpServer::WriteToEditMap("EnableUpload", (((boolean) UI::QueryWidget(`id("EnableUpload"), `Value) == true) ? "YES":"NO")); } +/** + * Handle function for anon settings + * save values to temporary structure + */ + +symbol HandleAnonSettings(string key, map event) { + if (FtpServer::vsftpd_edit) { + any button = event["ID"]:nil; + boolean anon_upload = false; + boolean anon_create_dirs = false; + string yesno_comment =""; + string yesno_question =""; + boolean check_upload = (boolean) UI::QueryWidget(`id("EnableUpload"), `Value); + if (button == "EnableUpload") { + if (check_upload) { + UI::ChangeWidget(`id("AnonReadOnly"), `Enabled, true); + UI::ChangeWidget(`id( "AnonCreatDirs" ),`Enabled, true); + } else { + UI::ChangeWidget(`id("AnonReadOnly"), `Enabled, false); + UI::ChangeWidget(`id( "AnonCreatDirs" ),`Enabled, false); + } + } // end of if (button == "EnableUpload") { + + anon_upload = (boolean) UI::QueryWidget(`id("AnonReadOnly"), `Value); + anon_create_dirs = (boolean) UI::QueryWidget(`id("AnonCreatDirs"), `Value); + + if (((button == "AnonReadOnly") || (anon_upload) && (check_upload)) && (ask_again)) { + if (!FtpServer::create_upload_dir) { + yesno_question ="Do you want to create directory\n" + FtpServer::anon_homedir +"upload with allowed writing?"; + yesno_comment = "If you want that \"anonymous\" users can upload\n you need to create directory with allowed writing.\n\n"; + yesno_comment = yesno_comment + FtpServer::anon_homedir + " is a home directory after login of \"anonymous\" users."; + FtpServer::create_upload_dir = Popup::YesNoHeadline(yesno_question, yesno_comment); + ask_again = FtpServer::create_upload_dir; + FtpServer::upload_good_permission = true; + } else if (!FtpServer::upload_good_permission) { + yesno_question ="Do you want to change permission\nfor" + FtpServer::anon_homedir +"upload (allow writing)?"; + yesno_comment = "If you want that \"anonymous\" users can upload\n you need directory with allowed writing.\n\n"; + yesno_comment = yesno_comment + FtpServer::anon_homedir + " is a home directory after login of \"anonymous\" users."; + FtpServer::upload_good_permission = Popup::YesNoHeadline(yesno_question, yesno_comment); + ask_again = FtpServer::upload_good_permission; + } + + } + + if (((button == "AnonCreatDirs") || (anon_create_dirs) && (check_upload)) && (ask_again)) { + if (!FtpServer::create_upload_dir) { + yesno_question ="Do you want to create directory\n" + FtpServer::anon_homedir +"upload with allowed writing?"; + yesno_comment = "If you want that \"anonymous\" users can create directories\n you need to create directory with allowed writing.\n\n"; + yesno_comment = yesno_comment + FtpServer::anon_homedir + " is a home directory after login of \"anonymous\" users."; + FtpServer::create_upload_dir = Popup::YesNoHeadline(yesno_question, yesno_comment); + ask_again = FtpServer::create_upload_dir; + FtpServer::upload_good_permission = true; + } else if (!FtpServer::upload_good_permission) { + yesno_question ="Do you want to change permission\nfor" + FtpServer::anon_homedir +"upload (allow writing)?"; + yesno_comment = "If you want that \"anonymous\" users can create directories\n you need directory with allowed writing.\n\n"; + yesno_comment = yesno_comment + FtpServer::anon_homedir + " is a home directory after login of \"anonymous\" users."; + FtpServer::upload_good_permission = Popup::YesNoHeadline(yesno_question, yesno_comment); + ask_again = FtpServer::upload_good_permission; + } + } + } // end of if (FtpServer::vsftpd_edit) { +} + + + /** diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-ftp-server-2.15.4/src/write_load.ycp new/yast2-ftp-server-2.15.5/src/write_load.ycp --- old/yast2-ftp-server-2.15.4/src/write_load.ycp 2007-05-10 12:07:04.000000000 +0200 +++ new/yast2-ftp-server-2.15.5/src/write_load.ycp 2007-05-29 17:24:16.000000000 +0200 @@ -703,10 +703,11 @@ if (FtpServer::vsftpd_edit) { if (write) { yes_no = FtpServer::EDIT_SETTINGS["AnonReadOnly"]:nil; - if (yes_no == "YES") + if (yes_no == "YES") { FtpServer::VS_SETTINGS["anon_upload_enable"] = "NO"; - else + } else { FtpServer::VS_SETTINGS["anon_upload_enable"] = "YES"; + } } else { if (haskey(FtpServer::VS_SETTINGS, "anon_upload_enable")) { yes_no = toupper(FtpServer::VS_SETTINGS["anon_upload_enable"]:nil); @@ -728,13 +729,11 @@ case("AnonCreatDirs"): if (vsftpd_edit) { if (write) { - FtpServer::VS_SETTINGS["anon_mkdir_write_enable"] = EDIT_SETTINGS["AnonCreatDirs"]:nil; + FtpServer::VS_SETTINGS["anon_mkdir_write_enable"] = FtpServer::EDIT_SETTINGS["AnonCreatDirs"]:nil; } else { return ((haskey(FtpServer::VS_SETTINGS, "anon_mkdir_write_enable") ? toupper(FtpServer::VS_SETTINGS["anon_mkdir_write_enable"]:nil) : FtpServer::DEFAULT_CONFIG["AnonCreatDirs"]:nil)); } - - } else { if (write) FtpServer::PURE_SETTINGS["AnonymousCanCreateDirs"] = FtpServer::EDIT_SETTINGS["AnonCreatDirs"]:nil; @@ -743,6 +742,25 @@ toupper(FtpServer::PURE_SETTINGS["AnonymousCanCreateDirs"]:nil):FtpServer::DEFAULT_CONFIG["AnonCreatDirs"]:nil)); } break; + //only vsftpd + case("EnableUpload"): + if (FtpServer::vsftpd_edit) { + if (write) { + if (FtpServer::EDIT_SETTINGS["EnableUpload"]:nil != "") + FtpServer::VS_SETTINGS["write_enable"] = FtpServer::EDIT_SETTINGS["EnableUpload"]:nil; + else + FtpServer::VS_SETTINGS["write_enable"] = nil; + } else { + return ((haskey(FtpServer::VS_SETTINGS, "write_enable") ? + FtpServer::VS_SETTINGS["write_enable"]:nil : FtpServer::DEFAULT_CONFIG["EnableUpload"]:nil)); + } + } else { + if (!write) + return FtpServer::DEFAULT_CONFIG["EnableUpload"]:nil; + else + return ""; + } + break; //only vsftpd case("Banner"): diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-ftp-server-2.15.4/VERSION new/yast2-ftp-server-2.15.5/VERSION --- old/yast2-ftp-server-2.15.4/VERSION 2007-05-10 13:54:12.000000000 +0200 +++ new/yast2-ftp-server-2.15.5/VERSION 2007-05-30 17:33:41.000000000 +0200 @@ -1 +1 @@ -2.15.4 +2.15.5 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit yast2-add-on-creator
by root＠Hilbert.suse.de 30 May '07

30 May '07

Hello community, here is the log from the commit of package yast2-add-on-creator checked in at Wed May 30 19:02:11 CEST 2007. -------- --- yast2-add-on-creator/yast2-add-on-creator.changes 2007-05-22 10:56:13.000000000 +0200 +++ /mounts/work_src_done/NOARCH/yast2-add-on-creator/yast2-add-on-creator.changes 2007-05-30 13:46:38.574889000 +0200 @@ -1,0 +2,6 @@ +Wed May 30 10:09:52 CEST 2007 - jsuchome(a)suse.cz + +- added support for source rpm's (#279004) +- 2.15.10 + +------------------------------------------------------------------- Old: ---- yast2-add-on-creator-2.15.9.tar.bz2 New: ---- yast2-add-on-creator-2.15.10.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-add-on-creator.spec ++++++ --- /var/tmp/diff_new_pack.B11779/_old 2007-05-30 19:01:40.000000000 +0200 +++ /var/tmp/diff_new_pack.B11779/_new 2007-05-30 19:01:40.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package yast2-add-on-creator (Version 2.15.9) +# spec file for package yast2-add-on-creator (Version 2.15.10) # # Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine @@ -11,12 +11,12 @@ # norootforbuild Name: yast2-add-on-creator -Version: 2.15.9 +Version: 2.15.10 Release: 1 License: GNU General Public License (GPL) Group: System/YaST BuildRoot: %{_tmppath}/%{name}-%{version}-build -Source0: yast2-add-on-creator-2.15.9.tar.bz2 +Source0: yast2-add-on-creator-2.15.10.tar.bz2 prefix: /usr Requires: yast2 BuildRequires: perl-XML-Writer update-desktop-files yast2 yast2-devtools yast2-testsuite @@ -33,7 +33,7 @@ Jiř� Suchomel <jsuchome(a)suse.cz> %prep -%setup -n yast2-add-on-creator-2.15.9 +%setup -n yast2-add-on-creator-2.15.10 %build %{prefix}/bin/y2tool y2autoconf @@ -69,6 +69,9 @@ %doc %{prefix}/share/doc/packages/yast2-add-on-creator %changelog +* Wed May 30 2007 - jsuchome(a)suse.cz +- added support for source rpm's (#279004) +- 2.15.10 * Tue May 22 2007 - jsuchome(a)suse.cz - enable rpm directory with .rpm extension (#276861) - 2.15.9 ++++++ yast2-add-on-creator-2.15.9.tar.bz2 -> yast2-add-on-creator-2.15.10.tar.bz2 ++++++ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-add-on-creator-2.15.9/src/add-on-creator.ycp new/yast2-add-on-creator-2.15.10/src/add-on-creator.ycp --- old/yast2-add-on-creator-2.15.9/src/add-on-creator.ycp 2007-05-22 10:42:23.000000000 +0200 +++ new/yast2-add-on-creator-2.15.10/src/add-on-creator.ycp 2007-05-22 10:54:03.000000000 +0200 @@ -24,7 +24,7 @@ * Summary: Main file * Authors: Jiri Suchomel <jsuchome(a)suse.cz> * - * $Id: add-on-creator.ycp 37394 2007-04-11 12:01:02Z jsuchome $ + * $Id: add-on-creator.ycp 38074 2007-05-22 08:56:08Z jsuchome $ * * Main file for add-on-creator configuration. Uses all other files. */ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-add-on-creator-2.15.9/src/AddOnCreator.ycp new/yast2-add-on-creator-2.15.10/src/AddOnCreator.ycp --- old/yast2-add-on-creator-2.15.9/src/AddOnCreator.ycp 2007-05-21 13:32:05.000000000 +0200 +++ new/yast2-add-on-creator-2.15.10/src/AddOnCreator.ycp 2007-05-30 10:09:45.000000000 +0200 @@ -592,6 +592,9 @@ // mapping of package name to full file name global map<string,string> package2filename = $[]; +// mapping of source package name to full file name +global map<string,string> srcpackage2filename = $[]; + // if we want only to sign existing product (and possibly create iso of it) global boolean only_sign_product = false; @@ -1004,17 +1007,23 @@ y2milestone ("asking the RPM's for ARCH and NAME..."); foreach (string f, splitstring (out["stdout"]:"", "\n"), { if (f == "") return; - out = (map) SCR::Execute (.target.bash_output, - sformat ("rpm -q -p %1 --qf \"%%{ARCH}\n%%{NAME}\"", f)); + sformat ("rpm -q -p %1 --qf \"%%{ARCH}\n%%{NAME}\n%%|SOURCERPM?{bin}:{src}|\"",f)); list lines = splitstring (out["stdout"]:"", "\n"); string arch = lines[0]:""; string name = lines[1]:""; + string sourcerpm = lines[2]:""; + // 'arch' is directory where to put final package + if (sourcerpm == "src") + arch = "src"; if (name != "" && arch != "") { available_packages[arch] = add ( available_packages[arch]:[], name); - package2filename[name] = f; + if (arch != "src") + package2filename[name] = f; + else + srcpackage2filename[name] = f; } }); y2milestone ("... done"); @@ -1437,13 +1446,20 @@ if (arch != "ZZZ_imported" && arch != "ZZZ_required" && FileUtils::Exists (out_dir)) { - if (size (package2filename) > 0) + if (size (package2filename) > 0 && arch != "src") { foreach (string p, (list<string>) pa, { SCR::Execute (.target.bash, sformat ( "/bin/cp %1 '%2/'", package2filename[p]:"", out_dir)); }); } + else if (size (srcpackage2filename) > 0 && arch == "src") + { + foreach (string p, (list<string>) pa, { + SCR::Execute (.target.bash, sformat ( + "/bin/cp %1 '%2/'", srcpackage2filename[p]:"", out_dir)); + }); + } else { foreach (string p, (list<string>) pa, { diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-add-on-creator-2.15.9/src/complex.ycp new/yast2-add-on-creator-2.15.10/src/complex.ycp --- old/yast2-add-on-creator-2.15.9/src/complex.ycp 2007-05-22 10:42:23.000000000 +0200 +++ new/yast2-add-on-creator-2.15.10/src/complex.ycp 2007-05-22 10:54:03.000000000 +0200 @@ -24,7 +24,7 @@ * Summary: Dialogs definitions * Authors: Jiri Suchomel <jsuchome(a)suse.cz> * - * $Id: complex.ycp 37583 2007-04-19 12:45:25Z jsuchome $ + * $Id: complex.ycp 38074 2007-05-22 08:56:08Z jsuchome $ */ { diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-add-on-creator-2.15.9/VERSION new/yast2-add-on-creator-2.15.10/VERSION --- old/yast2-add-on-creator-2.15.9/VERSION 2007-05-22 10:42:34.000000000 +0200 +++ new/yast2-add-on-creator-2.15.10/VERSION 2007-05-30 10:10:10.000000000 +0200 @@ -1 +1 @@ -2.15.9 +2.15.10 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit susehelp
by root＠Hilbert.suse.de 30 May '07

30 May '07

Hello community, here is the log from the commit of package susehelp checked in at Wed May 30 19:00:12 CEST 2007. -------- --- susehelp/susehelp.changes 2007-02-26 16:26:40.000000000 +0100 +++ /mounts/work_src_done/NOARCH/susehelp/susehelp.changes 2007-05-30 17:51:10.000000000 +0200 @@ -1,0 +2,7 @@ +Wed May 30 17:26:16 CEST 2007 - wstephenson(a)suse.de + +- Re-add SuSEconfig.susehelp in doc/susehelp/examples (#229201) +- Fix /opt/gnome references (#237125) +- Remove hard dependency on htdig (#273490) + +------------------------------------------------------------------- Old: ---- index_selection.patch no-susehelpconfig.patch susehelp-2006.06.20.tar.bz2 susehelp-ionice-SuSEconfig.patch New: ---- susehelp-2007.05.30.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ susehelp.spec ++++++ --- /var/tmp/diff_new_pack.Pu1977/_old 2007-05-30 18:58:42.000000000 +0200 +++ /var/tmp/diff_new_pack.Pu1977/_new 2007-05-30 18:58:42.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package susehelp (Version 2006.06.20) +# spec file for package susehelp (Version 2007.05.30) # # Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine @@ -16,16 +16,14 @@ Group: Documentation/SuSE Provides: manhtml susehilf dochost Obsoletes: susehilf dochost -Requires: susehelp_lang htdig recode wget info2html +Requires: susehelp_lang recode wget info2html +Suggests: htdig PreReq: %fillup_prereq Autoreqprov: on -Version: 2006.06.20 -Release: 34 +Version: 2007.05.30 +Release: 1 Summary: SuSE Help-System (base) Source: %{name}-%{version}.tar.bz2 -Patch0: susehelp-ionice-SuSEconfig.patch -Patch1: index_selection.patch -Patch2: no-susehelpconfig.patch BuildArchitectures: noarch BuildRoot: %{_tmppath}/%{name}-%{version}-build %package -n susehelp_en @@ -176,9 +174,6 @@ %define susehelpindexdir /var/cache/susehelp %prep %setup -n %{name} -%patch0 -%patch1 -%patch2 %build make @@ -198,15 +193,17 @@ popd install -d $RPM_BUILD_ROOT/usr/sbin install -m755 bin/susedig.sh $RPM_BUILD_ROOT/usr/sbin -# sysconfig +#sysconfig install -d $RPM_BUILD_ROOT/var/adm/fillup-templates install -m 644 conf/sysconfig.susehelp $RPM_BUILD_ROOT/var/adm/fillup-templates/ install -m 644 conf/sysconfig.apache2-susehelp $RPM_BUILD_ROOT/var/adm/fillup-templates/ install -d $RPM_BUILD_ROOT/%{susehelpvardir} install -m 775 -d $RPM_BUILD_ROOT/%{susehelpindexdir} touch $RPM_BUILD_ROOT/%{susehelpvardir}/dochost -mkdir -p $RPM_BUILD_ROOT/%{_defaultdocdir}/%{name} +# docs and examples SuSEconfig.susehelp script +mkdir -p $RPM_BUILD_ROOT/%{_defaultdocdir}/%{name}/examples cp README $RPM_BUILD_ROOT/%{_defaultdocdir}/%{name} +cp bin/SuSEconfig.susehelp $RPM_BUILD_ROOT/%{_defaultdocdir}/%{name}/examples #Disable broken script rm $RPM_BUILD_ROOT/%{cgibin}/pac* ./createfilelist.pl %{susehelpdir} @@ -287,6 +284,10 @@ %{susehelpdir}/docserver/index.html.cz %changelog +* Wed May 30 2007 - wstephenson(a)suse.de +- Re-add SuSEconfig.susehelp in doc/susehelp/examples (#229201) +- Fix /opt/gnome references (#237125) +- Remove hard dependency on htdig (#273490) * Mon Feb 26 2007 - lnussel(a)suse.de - remove not needed permissions file * Mon Oct 30 2006 - ltinkl(a)suse.cz ++++++ susehelp-2006.06.20.tar.bz2 -> susehelp-2007.05.30.tar.bz2 ++++++ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/susehelp/bin/SuSEconfig.susehelp.in new/susehelp/bin/SuSEconfig.susehelp.in --- old/susehelp/bin/SuSEconfig.susehelp.in 2006-04-26 12:25:29.000000000 +0200 +++ new/susehelp/bin/SuSEconfig.susehelp.in 2007-05-30 17:29:53.000000000 +0200 @@ -68,7 +68,9 @@ if [ -d $apacheconfdir ] ; then if [ "$DOC_SERVER" = yes ] ; then - cp $httpdconf_working $apacheconfdir/susehelp.conf + if [ "$OLD_ALLOW" != "$DOC_ALLOW" ] ; then + cp $httpdconf_working $apacheconfdir/susehelp.conf + fi else rm -f $apacheconfdir/susehelp.conf fi diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/susehelp/bin/susehelp-khelpcenter new/susehelp/bin/susehelp-khelpcenter --- old/susehelp/bin/susehelp-khelpcenter 2006-06-20 13:48:55.000000000 +0200 +++ new/susehelp/bin/susehelp-khelpcenter 2007-05-25 14:19:28.000000000 +0200 @@ -4,20 +4,20 @@ foreach $filename (@ARGV) { - if ($filename =~ s|^(g?help:)?/+opt/gnome/share/gnome/help/([^/]*)/([^/]*)/\2.xml((\?[^/]*)?)$|help:$2$4|) { + if ($filename =~ s|^(g?help:)?/+usr/share/gnome/help/([^/]*)/([^/]*)/\2.xml((\?[^/]*)?)$|help:$2$4|) { $base = $2; $lang = $3; $search = $4; $search =~ s/^\?//; if ($filename =~ m|^help:[^/]*\?[^/]*$|) { - $cache_file = "/opt/gnome/share/gnome/help/$base/$lang/$base.cache.bz2"; + $cache_file = "/usr/share/gnome/help/$base/$lang/$base.cache.bz2"; if (!-f $cache_file) { ($username) = getpwuid($<); - $cache_dir = "/var/tmp/kdecache-$username/opt/gnome/share/gnome/help/$base/$lang"; + $cache_dir = "/var/tmp/kdecache-$username/usr/share/gnome/help/$base/$lang"; $cache_file = "$cache_dir/$base.cache.bz2"; if (!-f $cache_file) { - $orig_file = "/opt/gnome/share/gnome/help/$base/$lang/$base.xml"; + $orig_file = "/usr/share/gnome/help/$base/$lang/$base.xml"; system ("mkdir -p $cache_dir"); system ("meinproc --cache $cache_file $orig_file > /dev/null"); } @@ -43,5 +43,5 @@ } } - system "kdeinit_wrapper khelpcenter $filename > /dev/null"; + system "kshell khelpcenter $filename > /dev/null"; } diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/susehelp/README new/susehelp/README --- old/susehelp/README 2005-01-24 15:49:14.000000000 +0100 +++ new/susehelp/README 2007-05-30 17:29:53.000000000 +0200 @@ -1,3 +1,7 @@ +*** NOTE: from openSUSE 10.2, you must setup the help server manually *** +*** to use in-browser help. khelpcenter and yelp help are unchanged *** +*** See 2.2 below *** + German version see below / Deutsche Version siehe unten. SUSE HELP SYSTEM @@ -20,9 +24,8 @@ 1.2 Webserver + browser Needed packages: e.g apache, netscape. You may use any other combination -of webserver and webbrowser. Apache is already preconfigured. Don't -forget to start your webserver. Additionally you have to install the -package inf2htm for Infopages. +of webserver and webbrowser. Don't forget to start your webserver. +Additionally you have to install the package inf2htm for Infopages. How to start: just point your browser to http://localhost/susehelp/ @@ -47,11 +50,16 @@ 2.1 Index generation -Either via KDE Control Center (->System->KHelpCenter) or from the -command line with the command susehelpindex. +From the command line with the command susehelpindex, or by setting +DOC_AUTOINDEX=yes in /etc/sysconfig/susehelp. 2.2 documentation server +Copy SuSEconfig.susehelp from /usr/share/doc/packages/susehelp/examples +to /sbin/conf.d. + +Ensure package 'htdig' is installed. + Please set the following variables in /etc/sysconfig/susehelp resp. /etc/sysconfig/apache2 @@ -136,11 +144,18 @@ 2.1. Index-Generierung -Entweder ueber das KDE-Kontrollcenter (->System, ->KHelpcenter) oder auf -der Kommandozeile mit dem Kommando susehelpindex. +Auf der Kommandozeile mit dem Kommando susehelpindex, oder automatisch mittels +SuSEconfig, wenn DOC_AUTOINDEX=yes in /etc/sysconfig/susehelp gesetzt ist. + 2.2 Dokumentationsserver +Kopieren Sie die Datei +/usr/share/doc/packages/susehelp/examples/SuSEconfig.susehelp in +/sbin/conf.d. + +Stellen Sie sicher, da� das Paket 'htdig' installiert ist. + In /etc/sysconfig/susehelp bzw. /etc/sysconfig/apache2 sind folgende Variablen zu setzen: diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/susehelp/share/susehelp-meta.xml new/susehelp/share/susehelp-meta.xml --- old/susehelp/share/susehelp-meta.xml 2005-12-01 18:25:21.000000000 +0100 +++ new/susehelp/share/susehelp-meta.xml 2007-05-30 17:37:36.000000000 +0200 @@ -396,7 +396,7 @@ <summary>IDE for GNOME/GTK programs </summary> <summary lang="hu">IDE GNOME/GTK programokhoz</summary> <summary lang="de">IDE für GNOME/GTK Programmierung </summary> - <docpath>/opt/gnome/share/gnome/help/anjuta/C/anjuta-manual/index.html</docpath> + <docpath>/usr/share/gnome/help/anjuta/C/anjuta-manual/index.html</docpath> </docentry> <docentry> <filename>ddd.desktop</filename> @@ -417,7 +417,7 @@ <summary lang="hu">Hexeditor GNOME-hoz</summary> <summary lang="fr">Editeur hexadécimal pour GNOME </summary> <summary lang="de">Ein Hexeditor für GNOME </summary> - <docpath>/opt/gnome/share/gnome/help/ghex/C/index.html</docpath> + <docpath>/usr/share/gnome/help/ghex/C/index.html</docpath> </docentry> <docentry> <filename>dejagnu.desktop</filename> @@ -458,7 +458,7 @@ <summary lang="es">Interfase para CVS </summary> <summary lang="fr">Frontal pour CVS </summary> <summary lang="de">Frontend für CVS </summary> - <docpath>/opt/gnome/share/gnome/help/pharmacy/C/index.html</docpath> + <docpath>/usr/share/gnome/help/pharmacy/C/index.html</docpath> </docentry> <docentry> <filename>xf.desktop</filename> @@ -480,7 +480,7 @@ <summary lang="es">Un constructor de interfases de usuario para Gtk+ y GNOME </summary> <summary lang="fr">Glade - Un constructeur d'interfaces pour GTK+ </summary> <summary lang="de">Ein Interface-Builder für GTK+ und GNOME </summary> - <docpath>/opt/gnome/share/gnome/help/glade/C/user-guide/index.html</docpath> + <docpath>/usr/share/gnome/help/glade/C/user-guide/index.html</docpath> </docentry> <docentry> <filename>netbeans.desktop</filename> @@ -499,7 +499,7 @@ <summary>Extensible Code Editor </summary> <summary lang="hu">Bővíthető kódszerkesztő</summary> <summary lang="de">Erweiterbarer Editor für Programmierer </summary> - <docpath>/opt/gnome/share/gnome/help/glimmer/C/index.html</docpath> + <docpath>/usr/share/gnome/help/glimmer/C/index.html</docpath> </docentry> <docentry> <filename>mbedit.de.desktop</filename> @@ -993,7 +993,7 @@ <summary lang="es">Librerías, etc. para desarrollar aplicaciones GNOME </summary> <summary lang="fr">Bibliothèques etc. pour applications GNOME </summary> <summary lang="de">Bibliotheken etc. für GNOME-Applikationen </summary> - <docpath>/opt/gnome/share/gnome/html/gnome.html</docpath> + <docpath>/usr/share/gnome/html/gnome.html</docpath> </docentry> <docentry> <filename>libxml2-devel.desktop</filename> @@ -1274,7 +1274,7 @@ <summary lang="es">Archivos de desarrollo para bonobo </summary> <summary lang="fr">fichiers de développement pour Bonobo </summary> <summary lang="de">Die Entwicklerdateien zu bonobo </summary> - <docpath>/opt/gnome/share/bonobo/html/bonobo/book1.html</docpath> + <docpath>/usr/share/bonobo/html/bonobo/book1.html</docpath> </docentry> <docentry> <filename>JTOpen-doc.desktop</filename> @@ -1585,7 +1585,7 @@ <summary lang="es">GdkPixBuf - Entorno de desarrollo </summary> <summary lang="fr">GdkPixBuf - Environnement de développement </summary> <summary lang="de">GdkPixBuf - Entwicklungsumgebung </summary> - <docpath>/opt/gnome/share/gnome/html/gdk-pixbuf/index.html</docpath> + <docpath>/usr/share/gnome/html/gdk-pixbuf/index.html</docpath> </docentry> <docentry> <filename>imlib-devel.desktop</filename> @@ -1751,7 +1751,7 @@ <summary lang="es">Librería libglade (desarrollo) </summary> <summary lang="fr">Bibliothèque libglade (développement) </summary> <summary lang="de">libglade Bibliothek (Entwicklung) </summary> - <docpath>/opt/gnome/share/gnome/html/libglade/libglade.html</docpath> + <docpath>/usr/share/gnome/html/libglade/libglade.html</docpath> </docentry> <docentry> <filename>SDLmm-devel.desktop</filename> @@ -2185,7 +2185,7 @@ <summary>gnome TV application </summary> <summary lang="hu">Nézzünk TV-t GNOME alatt</summary> <summary lang="de">Gnome-TV-Applikation </summary> - <docpath>/opt/gnome/share/gnome/help/zapping/C/index.html</docpath> + <docpath>/usr/share/gnome/help/zapping/C/index.html</docpath> </docentry> <docentry> <filename>lprng.desktop</filename> @@ -2239,7 +2239,7 @@ <summary lang="es">La GUI de fax de GNOME </summary> <summary lang="fr">Application pour télécopie </summary> <summary lang="de">Eine GNOME Anwendung zum Verarbeiten von Faxen </summary> - <docpath>/opt/gnome/share/gnome/help/gfax/C/gfax.html</docpath> + <docpath>/usr/share/gnome/help/gfax/C/gfax.html</docpath> </docentry> <docentry> <filename>gsmssend.desktop</filename> @@ -2249,7 +2249,7 @@ <summary lang="hu">GNOME felület SMS küldéséhez</summary> <summary lang="fr">Interface utilisateur GNOME pour SMS send </summary> <summary lang="de">GNOME-Benutzerschnittstelle für SMS Send </summary> - <docpath>/opt/gnome/share/gnome/help/gsmssend/C/index.html</docpath> + <docpath>/usr/share/gnome/help/gsmssend/C/index.html</docpath> </docentry> <docentry> <filename>clara.desktop</filename> @@ -2610,7 +2610,7 @@ <summary lang="es">Interfase GNOME para RPM </summary> <summary lang="fr">GnoRPM </summary> <summary lang="de">GnoRPM </summary> - <docpath>/opt/gnome/share/gnome/help/gnorpm/es/index.html</docpath> + <docpath>/usr/share/gnome/help/gnorpm/es/index.html</docpath> </docentry> <docentry> <filename>deb.desktop</filename> @@ -2631,7 +2631,7 @@ <summary lang="hu">Fejlett terminál emulátor GNOME-hoz</summary> <summary lang="fr">Emulation avancée d'un terminal pour GNOME</summary> <summary lang="de">Erweiterter Terminal Emulator für GNOME </summary> - <docpath>/opt/gnome/share/gnome/help/powershell/C/book1.htm</docpath> + <docpath>/usr/share/gnome/help/powershell/C/book1.htm</docpath> </docentry> <docentry> <filename>hfsplus.desktop</filename> @@ -2651,7 +2651,7 @@ <summary lang="es">Utilidad de informe de defectos de GNOME </summary> <summary lang="fr">Rapport d'erreurs GNOME </summary> <summary lang="de">GNOME-Bug-Report </summary> - <docpath>/opt/gnome/share/gnome/help/bug-buddy/C/index.html</docpath> + <docpath>/usr/share/gnome/help/bug-buddy/C/index.html</docpath> </docentry> <docentry> <filename>vmware.desktop</filename> @@ -2753,7 +2753,7 @@ <summary lang="es">Gestor de Pantalla Gnome </summary> <summary lang="fr">Gestionnaire d'affichage de GNOME </summary> <summary lang="de">GNOME Display Manager </summary> - <docpath>/opt/gnome/share/gnome/help/gdm/C/gdm.html</docpath> + <docpath>/usr/share/gnome/help/gdm/C/gdm.html</docpath> </docentry> <docentry> <filename>tse3.desktop</filename> @@ -2813,7 +2813,7 @@ <summary>The GNOME Transfer Manager </summary> <summary lang="en">GNOME letöltéskezelő</summary> <summary lang="de">Der GNOME Transfer-Manager </summary> - <docpath>/opt/gnome/share/gnome/help/gtm/C/index.html</docpath> + <docpath>/usr/share/gnome/help/gtm/C/index.html</docpath> </docentry> <docentry> <filename>cgmdraw.desktop</filename> @@ -2866,7 +2866,7 @@ <summary lang="es">Centro de Control GNOME </summary> <summary lang="fr">Centre de contrôle GNOME </summary> <summary lang="de">Das Kontrollzentrum für GNOME </summary> - <docpath>/opt/gnome/share/gnome/help/control-center/C/index.html</docpath> + <docpath>/usr/share/gnome/help/control-center/C/index.html</docpath> </docentry> <docentry> <filename>sitar.desktop</filename> @@ -2898,7 +2898,7 @@ <summary lang="es">Conjunto de interfases CORBA para la reutilización de componentes </summary> <summary lang="fr">Interfaces CORBA pour composants réutilisables dans GNOME. </summary> <summary lang="de">Das Komponentensystem von GNOME </summary> - <docpath>/opt/gnome/share/bonobo/html/bonobo/book1.html</docpath> + <docpath>/usr/share/bonobo/html/bonobo/book1.html</docpath> </docentry> <docentry> <filename>z1013emu.desktop</filename> @@ -3023,7 +3023,7 @@ <summary lang="es">Interfase GNOME para RPM </summary> <summary lang="fr">GnoRPM </summary> <summary lang="de">GnoRPM </summary> - <docpath>/opt/gnome/share/gnome/help/gnorpm/C/gnorpm.html</docpath> + <docpath>/usr/share/gnome/help/gnorpm/C/gnorpm.html</docpath> </docentry> <docentry> <filename>wterm.desktop</filename> @@ -3164,7 +3164,7 @@ <summary lang="es">Un clónico de WinZip(tm) y constructor de RPMs para GNOME </summary> <summary lang="fr">Un clone de Winzip pour gnome </summary> <summary lang="de">Ein WinZIP(tm) clone für GNOME </summary> - <docpath>/opt/gnome/share/gnome/help/lnxzip/C/index.html</docpath> + <docpath>/usr/share/gnome/help/lnxzip/C/index.html</docpath> </docentry> <docentry> <filename>nfs-utils.desktop</filename> @@ -3657,7 +3657,7 @@ <summary lang="hu">Sitecopy weboldal-szinkronizáló</summary> <summary lang="es">Utilidad de sincronización de copias de sitios Web (versión GNOME) </summary> <summary lang="fr">Version GNOME de Sitecopy </summary> - <docpath>/opt/gnome/share/gnome/help/xsitecopy/C/xsitecopy.html</docpath> + <docpath>/usr/share/gnome/help/xsitecopy/C/xsitecopy.html</docpath> </docentry> <docentry> <filename>muse.desktop</filename> @@ -3798,7 +3798,7 @@ <summary lang="es">Administrador de archivos GNOME </summary> <summary lang="fr">Gestionnaire de fichiers GNOME </summary> <summary lang="de">GNOME-Dateimanager </summary> - <docpath>/opt/gnome/share/gnome/help/gmc/C/index.html</docpath> + <docpath>/usr/share/gnome/help/gmc/C/index.html</docpath> </docentry> <docentry> <filename>mod_python.desktop</filename> @@ -3831,7 +3831,7 @@ <summary lang="es">Electric Eyes - un visor de imágenes genérico </summary> <summary lang="fr">Electric Eyes - un visualiseur d'images </summary> <summary lang="de">Electric Eyes - ein Bildbetrachter </summary> - <docpath>/opt/gnome/share/gnome/help/ee/C/index.html</docpath> + <docpath>/usr/share/gnome/help/ee/C/index.html</docpath> </docentry> <docentry> <filename>figurine.desktop</filename> @@ -4002,7 +4002,7 @@ <summary lang="es">El programa de hoja de cálculo de GNOME </summary> <summary lang="fr">Tableur du projet GNOME </summary> <summary lang="de">Tabellenkalkulation des GNOME Project </summary> - <docpath>/opt/gnome/share/gnome/help/gnumeric/C/index.html</docpath> + <docpath>/usr/share/gnome/help/gnumeric/C/index.html</docpath> </docentry> <docentry> <filename>addrbo.desktop</filename> @@ -4208,7 +4208,7 @@ <summary lang="hu">SNMP menedzser GNOME-hoz</summary> <summary lang="es">Gestor SNMP GNOME </summary> <summary lang="fr">Gestionnaire SNMP de GNOME </summary> - <docpath>/opt/gnome/share/gnome/help/gxsnmp/C/gxsnmp.html</docpath> + <docpath>/usr/share/gnome/help/gxsnmp/C/gxsnmp.html</docpath> </docentry> <docentry> <filename>dataplore.desktop</filename> @@ -4276,7 +4276,7 @@ <summary lang="es">Un clon de ICQ para el escritorio GNOME </summary> <summary lang="fr">Un programme ICQ pour GNOME </summary> <summary lang="de">Ein ICQ Programm für GNOME </summary> - <docpath>/opt/gnome/share/gnome/help/gnomeicu/C/index.html</docpath> + <docpath>/usr/share/gnome/help/gnomeicu/C/index.html</docpath> </docentry> <docentry> <filename>bzip.desktop</filename> @@ -4349,7 +4349,7 @@ <summary lang="es">Un programa para gestionar colecciones MP3 </summary> <summary lang="fr">YaMT - Un programme pour gérer ses MP3 </summary> <summary lang="de">Tool zum Verwalten von MP3-Sammlungen </summary> - <docpath>/opt/gnome/share/gnome/help/yamt/C/index.html</docpath> + <docpath>/usr/share/gnome/help/yamt/C/index.html</docpath> </docentry> <docentry> <filename>postgresql-docs.de.desktop</filename> @@ -4484,7 +4484,7 @@ <summary>The Gnome disk catalog </summary> <summary lang="hu">CD-katalógus GNOME-hoz</summary> <summary lang="de">Gnome CD-Katalog </summary> - <docpath>/opt/gnome/share/gnome/help/gtktalog/C/index.html</docpath> + <docpath>/usr/share/gnome/help/gtktalog/C/index.html</docpath> </docentry> <docentry> <filename>ncftp.desktop</filename> @@ -4502,7 +4502,7 @@ <path>/Manuals/Productivity</path> <name>scite</name> <summary>SciTE </summary> - <docpath>/opt/gnome/share/scite/SciTE.html</docpath> + <docpath>/usr/share/scite/SciTE.html</docpath> </docentry> <docentry> <filename>gjiten.desktop</filename> @@ -4512,7 +4512,7 @@ <summary lang="hu">Japán szótárböngésző GNOME-hoz</summary> <summary lang="es">Hojeador de diccionario japonés para GNOME/GTK+ </summary> <summary lang="de">Interface zu japanischen Wörterbüchern für GNOME/GTK+ </summary> - <docpath>/opt/gnome/share/gnome/help/gjiten/C/index.html</docpath> + <docpath>/usr/share/gnome/help/gjiten/C/index.html</docpath> </docentry> <docentry> <filename>mdomo.desktop</filename> @@ -4575,7 +4575,7 @@ <summary lang="es">Un editor de texto GNOME pequeño y útil </summary> <summary lang="fr">éditeur de texte facile à manier </summary> <summary lang="de">Ein handlicher GNOME Texteditor </summary> - <docpath>/opt/gnome/share/gnome/help/gnotepad+/C/index.html</docpath> + <docpath>/usr/share/gnome/help/gnotepad+/C/index.html</docpath> </docentry> <docentry> <filename>ungif.desktop</filename> @@ -4910,7 +4910,7 @@ <summary lang="hu">Diagramrajzoló GNOME-hoz</summary> <summary lang="fr">diagrammes statistiques sous GNOME </summary> <summary lang="de">Ein Plottool für Daten unter GNOME </summary> - <docpath>/opt/gnome/share/gnome/help/guppi/C/guppi.html</docpath> + <docpath>/usr/share/gnome/help/guppi/C/guppi.html</docpath> </docentry> <docentry> <filename>wget.desktop</filename> @@ -4941,7 +4941,7 @@ <summary>GNOME Ghostview </summary> <summary lang="hu">Ghostview GNOME-hoz</summary> <summary lang="es">Ghostview de GNOME </summary> - <docpath>/opt/gnome/share/gnome/help/ggv/C/index.html</docpath> + <docpath>/usr/share/gnome/help/ggv/C/index.html</docpath> </docentry> <docentry> <filename>xmgrace.desktop</filename> @@ -5021,7 +5021,7 @@ <summary lang="hu">Jabber kliens GNOME-hoz</summary> <summary lang="fr">Client Jabber pour Gnome </summary> <summary lang="de">GNOME Jabber Client </summary> - <docpath>/opt/gnome/share/gnome/help/gabber/C/index.html</docpath> + <docpath>/usr/share/gnome/help/gabber/C/index.html</docpath> </docentry> <docentry> <filename>abiword.desktop</filename> @@ -5343,7 +5343,7 @@ <summary lang="es">Una herramienta para bases de datos bibliográficas </summary> <summary lang="fr">Pybliographer pour bases de données bibliographiques </summary> <summary lang="de">Pybliographer für Bibliographie-Datenbanken </summary> - <docpath>/opt/gnome/share/gnome/help/pybliographic/C/reference.html</docpath> + <docpath>/usr/share/gnome/help/pybliographic/C/reference.html</docpath> </docentry> <docentry> <filename>qcad.desktop</filename> @@ -5365,7 +5365,7 @@ <summary lang="es">El programa de correo de GNOME </summary> <summary lang="fr">Outil de messagerie du projet GNOME </summary> <summary lang="de">Mailtool des GNOME-Projektes </summary> - <docpath>/opt/gnome/share/gnome/help/balsa/C/win-config-0.html</docpath> + <docpath>/usr/share/gnome/help/balsa/C/win-config-0.html</docpath> </docentry> <docentry> <filename>l2hhtml.desktop</filename> @@ -5597,7 +5597,7 @@ <summary lang="es">Un programa de creación de diagramas </summary> <summary lang="fr">Outil pour le traçage de diagrammes </summary> <summary lang="de">Ein Werkzeug zum Zeichnen von Diagrammen </summary> - <docpath>/opt/gnome/share/gnome/help/dia/en/index.html</docpath> + <docpath>/usr/share/gnome/help/dia/en/index.html</docpath> </docentry> <docentry> <filename>OpenOffice_it.desktop</filename> @@ -5673,7 +5673,7 @@ <summary lang="es">Gestor de finanzas personales </summary> <summary lang="fr">GnuCash -- Gestion personnelle de comptes </summary> <summary lang="de">Das persönliche Finanzverwaltungsprogramm </summary> - <docpath>/opt/gnome/share/gnucash/html/index.html</docpath> + <docpath>/usr/share/gnucash/html/index.html</docpath> </docentry> <docentry> <filename>w3m.desktop</filename> @@ -5738,7 +5738,7 @@ <summary lang="es">Editor GNOME </summary> <summary lang="fr">éditeur pour GNOME </summary> <summary lang="de">GNOME-Editor </summary> - <docpath>/opt/gnome/share/gnome/help/gedit/C/index.html</docpath> + <docpath>/usr/share/gnome/help/gedit/C/index.html</docpath> </docentry> <docentry> <filename>te_latex.desktop</filename> @@ -5893,7 +5893,7 @@ <name>xpenguins_applet</name> <summary>GNOME panel applet for xpenguins </summary> <summary lang="hu">GNOME panel applet az xpenguins-hez</summary> - <docpath>/opt/gnome/share/gnome/help/xpenguins_applet/C/index.html</docpath> + <docpath>/usr/share/gnome/help/xpenguins_applet/C/index.html</docpath> </docentry> <docentry> <filename>xboard.desktop</filename> @@ -5935,7 +5935,7 @@ <summary lang="hu">Bomberman-klón GNOME-hoz</summary> <summary lang="fr">Clone de Bomberman pour Gnome </summary> <summary lang="de">Bomberman-Clone für GNOME </summary> - <docpath>/opt/gnome/share/gnome/help/bombermaze/C/index.html</docpath> + <docpath>/usr/share/gnome/help/bombermaze/C/index.html</docpath> </docentry> <docentry> <filename>xqf.desktop</filename> @@ -6063,7 +6063,7 @@ <summary lang="hu">Logikai játék GNOME-hoz</summary> <summary lang="fr">Jeu de réflexion pour Gnome. </summary> <summary lang="de">Nettes Denkspiel für GNOME</summary> - <docpath>/opt/gnome/share/gnome/help/atomix/C/atomix.html</docpath> + <docpath>/usr/share/gnome/help/atomix/C/atomix.html</docpath> </docentry> <docentry> <filename>AlephOne.desktop</filename> @@ -6094,7 +6094,7 @@ <summary lang="es">Juego de billar Tulpas de GNOME </summary> <summary lang="fr">GNOME Tulpas Poolbillard </summary> <summary lang="de">GNOME Tulpas Poolbillard </summary> - <docpath>/opt/gnome/share/gnome/help/gtulpas/C/introduction.html</docpath> + <docpath>/usr/share/gnome/help/gtulpas/C/introduction.html</docpath> </docentry> <docentry> <filename>lbreakout.desktop</filename> ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit patterns-openSUSE
by root＠Hilbert.suse.de 30 May '07

30 May '07

Hello community, here is the log from the commit of package patterns-openSUSE checked in at Wed May 30 14:07:06 CEST 2007. -------- --- patterns-openSUSE/patterns-openSUSE.changes 2007-05-28 13:35:20.000000000 +0200 +++ /mounts/work_src_done/STABLE/patterns-openSUSE/patterns-openSUSE.changes 2007-05-30 14:06:16.361679000 +0200 @@ -1,0 +2,5 @@ +Wed May 30 14:06:05 CEST 2007 - lrupp(a)suse.de + +- remove dropped package kdepim3-networkstatus + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ patterns-openSUSE.spec ++++++ --- /var/tmp/diff_new_pack.S16769/_old 2007-05-30 14:06:58.000000000 +0200 +++ /var/tmp/diff_new_pack.S16769/_new 2007-05-30 14:06:58.000000000 +0200 @@ -17,7 +17,7 @@ Autoreqprov: on Summary: Patterns for Installation (full ftp tree) Version: 10.3 -Release: 51 +Release: 53 BuildRoot: %{_tmppath}/%{name}-%{version}-build Source: patterns-openSUSE-data.tar.bz2 Source1: preprocess @@ -176,6 +176,8 @@ /CD1/suse/setup/descr/non_oss*.pat %changelog +* Wed May 30 2007 - lrupp(a)suse.de +- remove dropped package kdepim3-networkstatus * Mon May 28 2007 - aj(a)suse.de - Add yast2-mcs-manager to XFCE pattern. * Tue May 15 2007 - aj(a)suse.de ++++++ patterns-openSUSE-data.tar.bz2 ++++++ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/patterns-openSUSE-data/data/KDE-BASIS new/patterns-openSUSE-data/data/KDE-BASIS --- old/patterns-openSUSE-data/data/KDE-BASIS 2007-05-24 08:26:25.000000000 +0200 +++ new/patterns-openSUSE-data/data/KDE-BASIS 2007-05-30 14:06:02.000000000 +0200 @@ -12,7 +12,6 @@ kdegraphics3-pdf kdelibs3 kdepim3 -kdepim3-networkstatus kdepim3-notes kdeutils3 kpowersave ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit yast2-network
by root＠Hilbert.suse.de 30 May '07

30 May '07

Hello community, here is the log from the commit of package yast2-network checked in at Wed May 30 12:00:12 CEST 2007. -------- --- yast2-network/yast2-network.changes 2007-05-22 14:55:36.000000000 +0200 +++ /mounts/work_src_done/STABLE/yast2-network/yast2-network.changes 2007-05-30 11:36:05.000000000 +0200 @@ -1,0 +2,35 @@ +Wed May 30 11:34:16 CEST 2007 - mzugec(a)suse.cz + +- fixed spec requirements + +------------------------------------------------------------------- +Tue May 29 12:56:38 CEST 2007 - mzugec(a)suse.cz + +- add Confirm::MustBeRoot to all network modules (#276478) +- 2.15.37 + +------------------------------------------------------------------- +Tue May 29 09:03:20 CEST 2007 - mzugec(a)suse.cz + +- improve add/edit device dialogs (device type) +- 2.15.36 + +------------------------------------------------------------------- +Mon May 28 17:07:40 CEST 2007 - mzugec(a)suse.cz + +- disable routing dialog when NetworkManager used (#178538) +- 2.15.35 + +------------------------------------------------------------------- +Mon May 28 10:20:08 CEST 2007 - mzugec(a)suse.cz + +- installation network changes: +http://lists.opensuse.org/yast-devel/2007-05/msg00025.html +- 2.15.34 + +------------------------------------------------------------------- +Fri May 25 13:30:04 CEST 2007 - jsrain(a)suse.cz + +- removed outdated translations from .desktop-files (#271209) + +------------------------------------------------------------------- Old: ---- yast2-network-2.15.33.tar.bz2 New: ---- yast2-network-2.15.37.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-network.spec ++++++ --- /var/tmp/diff_new_pack.M24941/_old 2007-05-30 11:57:58.000000000 +0200 +++ /var/tmp/diff_new_pack.M24941/_new 2007-05-30 11:57:58.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package yast2-network (Version 2.15.33) +# spec file for package yast2-network (Version 2.15.37) # # Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine @@ -11,18 +11,19 @@ # norootforbuild Name: yast2-network -Version: 2.15.33 +Version: 2.15.37 Release: 1 License: GNU General Public License (GPL) Group: System/YaST BuildRoot: %{_tmppath}/%{name}-%{version}-build -Source0: yast2-network-2.15.33.tar.bz2 +Source0: yast2-network-2.15.37.tar.bz2 prefix: /usr # should be required by devtools BuildRequires: perl-XML-Writer pkgconfig rpm BuildRequires: update-desktop-files BuildRequires: yast2 yast2-devtools yast2-testsuite -BuildRequires: yast2-country yast2-installation +BuildRequires: yast2-country +BuildRequires: yast2-installation >= 2.15.27 # String::Random # Linuxrc::display_ip # SuSEFirewall::IsInstalled @@ -51,7 +52,7 @@ Michal Svec <msvec(a)suse.cz> %prep -%setup -n yast2-network-2.15.33 +%setup -n yast2-network-2.15.37 %build %{prefix}/bin/y2tool y2autoconf @@ -107,6 +108,23 @@ /usr/share/YaST2/schema/autoyast/rnc/proxy.rnc %changelog +* Wed May 30 2007 - mzugec(a)suse.cz +- fixed spec requirements +* Tue May 29 2007 - mzugec(a)suse.cz +- add Confirm::MustBeRoot to all network modules (#276478) +- 2.15.37 +* Tue May 29 2007 - mzugec(a)suse.cz +- improve add/edit device dialogs (device type) +- 2.15.36 +* Mon May 28 2007 - mzugec(a)suse.cz +- disable routing dialog when NetworkManager used (#178538) +- 2.15.35 +* Mon May 28 2007 - mzugec(a)suse.cz +- installation network changes: + http://lists.opensuse.org/yast-devel/2007-05/msg00025.html +- 2.15.34 +* Fri May 25 2007 - jsrain(a)suse.cz +- removed outdated translations from .desktop-files (#271209) * Tue May 22 2007 - kmachalkova(a)suse.cz - Escape backslash characters in proxy auth credentials properly (#256360) ++++++ yast2-network-2.15.33.tar.bz2 -> yast2-network-2.15.37.tar.bz2 ++++++ ++++ 7793 lines of diff (skipped) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit yast2-installation
by root＠Hilbert.suse.de 30 May '07

30 May '07

Hello community, here is the log from the commit of package yast2-installation checked in at Wed May 30 11:57:49 CEST 2007. -------- --- yast2-installation/yast2-installation.changes 2007-05-22 11:08:53.000000000 +0200 +++ /mounts/work_src_done/NOARCH/yast2-installation/yast2-installation.changes 2007-05-30 11:35:30.000000000 +0200 @@ -1,0 +2,22 @@ +Wed May 30 11:33:52 CEST 2007 - mzugec(a)suse.cz + +- fixed spec requirements + +------------------------------------------------------------------- +Mon May 28 16:02:38 CEST 2007 - mzugec(a)suse.cz + +- removed netsetup item from control files + +------------------------------------------------------------------- +Mon May 28 13:33:08 CEST 2007 - mzugec(a)suse.cz + +- removed inst_netsetup item from control files + +------------------------------------------------------------------- +Sun May 27 14:49:37 CEST 2007 - mzugec(a)suse.de + +- installation network changes: +http://lists.opensuse.org/yast-devel/2007-05/msg00025.html +- 2.15.27 + +------------------------------------------------------------------- Old: ---- yast2-installation-2.15.26.tar.bz2 New: ---- yast2-installation-2.15.27.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-installation.spec ++++++ --- /var/tmp/diff_new_pack.X23706/_old 2007-05-30 11:57:38.000000000 +0200 +++ /var/tmp/diff_new_pack.X23706/_new 2007-05-30 11:57:38.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package yast2-installation (Version 2.15.26) +# spec file for package yast2-installation (Version 2.15.27) # # Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine @@ -11,12 +11,12 @@ # norootforbuild Name: yast2-installation -Version: 2.15.26 +Version: 2.15.27 Release: 1 License: GNU General Public License (GPL) Group: System/YaST BuildRoot: %{_tmppath}/%{name}-%{version}-build -Source0: yast2-installation-2.15.26.tar.bz2 +Source0: yast2-installation-2.15.27.tar.bz2 prefix: /usr BuildRequires: docbook-xsl-stylesheets doxygen libxslt perl-XML-Writer sgml-skel update-desktop-files yast2-core-devel yast2-country yast2-devtools yast2-testsuite BuildRequires: yast2 >= 2.15.22 @@ -28,7 +28,7 @@ Requires: yast2-bootloader # Language::selection_skipped, bugzilla #223258 Requires: yast2-country >= 2.15.0 -Requires: yast2-network +Requires: yast2-network >= 2.15.37 # PackagesUI::ConfirmLicenses, bugzilla #256627 Requires: yast2-packager >= 2.15.24 # Only in inst-sys @@ -83,7 +83,7 @@ Lukas Ocilka <locilka(a)suse.cz> %prep -%setup -n yast2-installation-2.15.26 +%setup -n yast2-installation-2.15.27 %build %{prefix}/bin/y2tool y2autoconf @@ -146,6 +146,16 @@ %endif %changelog +* Wed May 30 2007 - mzugec(a)suse.cz +- fixed spec requirements +* Mon May 28 2007 - mzugec(a)suse.cz +- removed netsetup item from control files +* Mon May 28 2007 - mzugec(a)suse.cz +- removed inst_netsetup item from control files +* Sun May 27 2007 - mzugec(a)suse.de +- installation network changes: + http://lists.opensuse.org/yast-devel/2007-05/msg00025.html +- 2.15.27 * Tue May 22 2007 - ug(a)suse.de - reactivate hardware detection during autoinstall - 2.15.26 ++++++ yast2-installation-2.15.26.tar.bz2 -> yast2-installation-2.15.27.tar.bz2 ++++++ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-installation-2.15.26/configure new/yast2-installation-2.15.27/configure --- old/yast2-installation-2.15.26/configure 2007-05-22 10:53:35.000000000 +0200 +++ new/yast2-installation-2.15.27/configure 2007-05-30 11:31:59.000000000 +0200 @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.60 for yast2-installation 2.15.26. +# Generated by GNU Autoconf 2.60 for yast2-installation 2.15.27. # # Report bugs to <http://bugs.opensuse.org/>. # @@ -559,8 +559,8 @@ # Identity of this package. PACKAGE_NAME='yast2-installation' PACKAGE_TARNAME='yast2-installation' -PACKAGE_VERSION='2.15.26' -PACKAGE_STRING='yast2-installation 2.15.26' +PACKAGE_VERSION='2.15.27' +PACKAGE_STRING='yast2-installation 2.15.27' PACKAGE_BUGREPORT='http://bugs.opensuse.org/' ac_unique_file="RPMNAME" @@ -1192,7 +1192,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-installation 2.15.26 to adapt to many kinds of systems. +\`configure' configures yast2-installation 2.15.27 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1263,7 +1263,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of yast2-installation 2.15.26:";; + short | recursive ) echo "Configuration of yast2-installation 2.15.27:";; esac cat <<\_ACEOF @@ -1341,7 +1341,7 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -yast2-installation configure 2.15.26 +yast2-installation configure 2.15.27 generated by GNU Autoconf 2.60 Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, @@ -1355,7 +1355,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-installation $as_me 2.15.26, which was +It was created by yast2-installation $as_me 2.15.27, which was generated by GNU Autoconf 2.60. Invocation command line was $ $0 $@ @@ -2156,7 +2156,7 @@ # Define the identity of the package. PACKAGE='yast2-installation' - VERSION='2.15.26' + VERSION='2.15.27' cat >>confdefs.h <<_ACEOF @@ -2383,7 +2383,7 @@ -VERSION="2.15.26" +VERSION="2.15.27" RPMNAME="yast2-installation" MAINTAINER="Lukas Ocilka <locilka(a)suse.cz>" @@ -3512,7 +3512,7 @@ # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by yast2-installation $as_me 2.15.26, which was +This file was extended by yast2-installation $as_me 2.15.27, which was generated by GNU Autoconf 2.60. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -3555,7 +3555,7 @@ _ACEOF cat >>$CONFIG_STATUS <<_ACEOF ac_cs_version="\\ -yast2-installation config.status 2.15.26 +yast2-installation config.status 2.15.27 configured by $0, generated by GNU Autoconf 2.60, with options \\"`echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\" diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-installation-2.15.26/configure.in new/yast2-installation-2.15.27/configure.in --- old/yast2-installation-2.15.26/configure.in 2007-05-22 10:53:28.000000000 +0200 +++ new/yast2-installation-2.15.27/configure.in 2007-05-30 11:31:54.000000000 +0200 @@ -3,7 +3,7 @@ dnl -- This file is generated by y2autoconf 2.14.0 - DO NOT EDIT! -- dnl (edit configure.in.in instead) -AC_INIT(yast2-installation, 2.15.26, http://bugs.opensuse.org/, yast2-installation) +AC_INIT(yast2-installation, 2.15.27, http://bugs.opensuse.org/, yast2-installation) dnl Check for presence of file 'RPMNAME' AC_CONFIG_SRCDIR([RPMNAME]) @@ -17,7 +17,7 @@ AM_INIT_AUTOMAKE(tar-ustar) dnl searches for some needed programs dnl Important YaST2 variables -VERSION="2.15.26" +VERSION="2.15.27" RPMNAME="yast2-installation" MAINTAINER="Lukas Ocilka <locilka(a)suse.cz>" diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-installation-2.15.26/control/control.xml new/yast2-installation-2.15.27/control/control.xml --- old/yast2-installation-2.15.26/control/control.xml 2007-05-21 12:30:24.000000000 +0200 +++ new/yast2-installation-2.15.27/control/control.xml 2007-05-26 23:45:40.000000000 +0200 @@ -501,10 +501,6 @@ <modules config:type="list"> <module> <label>Perform Update</label> - <name>netsetup</name> - </module> - <module> - <label>Perform Update</label> <name>rpmcopy</name> </module> <module> @@ -573,10 +569,6 @@ <modules config:type="list"> <module> <label>Perform Installation</label> - <name>netsetup</name> - </module> - <module> - <label>Perform Installation</label> <name>netprobe</name> </module> <module> @@ -732,10 +724,6 @@ <modules config:type="list"> <module> <label>Perform Installation</label> - <name>netsetup</name> - </module> - <module> - <label>Perform Installation</label> <name>netprobe</name> </module> <module> diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-installation-2.15.26/control/docs/control-doc.xml new/yast2-installation-2.15.27/control/docs/control-doc.xml --- old/yast2-installation-2.15.26/control/docs/control-doc.xml 2007-05-21 12:30:24.000000000 +0200 +++ new/yast2-installation-2.15.27/control/docs/control-doc.xml 2006-12-11 13:21:19.000000000 +0100 @@ -28,7 +28,7 @@ 0.1 </revnumber> <date> - $Date: 2004-10-27 16:25:24 +0200 (Mi, 27 Okt 2004) $ + $Date: 2004-10-27 16:25:24 +0200 (St, 27 okt 2004) $ </date> <revremark>Initial Release as PDF</revremark> </revision> diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-installation-2.15.26/src/clients/network_finish.ycp new/yast2-installation-2.15.27/src/clients/network_finish.ycp --- old/yast2-installation-2.15.26/src/clients/network_finish.ycp 2007-05-21 12:30:26.000000000 +0200 +++ new/yast2-installation-2.15.27/src/clients/network_finish.ycp 2007-05-28 10:16:02.000000000 +0200 @@ -8,7 +8,7 @@ * Authors: * Jiri Srain <jsrain(a)suse.cz> * - * $Id: network_finish.ycp 33360 2006-10-12 14:45:22Z locilka $ + * $Id: network_finish.ycp 38153 2007-05-28 08:16:01Z mzugec $ * */ @@ -48,19 +48,18 @@ } else if (func == "Write") { - if (Linuxrc::display_ip () || Linuxrc::vnc () || Linuxrc::usessh ()) + + // if network running, write network configuration + map output = (map)SCR::Execute(.target.bash_output, + "([ $(ip addr|grep -v '127.0.0.1'|grep -c inet) != '0' ] && echo 'network') || echo 'no net'"); + if (issubstring(output["stdout"]:"", "network")) { - y2milestone("Creating network interface"); - WFM::Execute (.local.bash, - "/sbin/create_interface '" + String::Quote (Installation::destdir) + "'"); + y2milestone("Save network configuration"); + WFM::CallFunction ("save_network"); ModulesConf::RunDepmod (false); + + } - // -------------------------------------------------------------- - // Copy DHCP client cache so that we can request the same IP (#43974). - WFM::Execute (.local.bash, sformat ( - "mkdir -p '%2%1'; /bin/cp -p %1/dhcpcd-*.cache '%2%1'", - "/var/lib/dhcpcd", - String::Quote (Installation::destdir))); } else { diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-installation-2.15.26/startup/Second-Stage/S07-medium new/yast2-installation-2.15.27/startup/Second-Stage/S07-medium --- old/yast2-installation-2.15.26/startup/Second-Stage/S07-medium 2007-05-21 12:30:29.000000000 +0200 +++ new/yast2-installation-2.15.27/startup/Second-Stage/S07-medium 2007-05-24 16:18:10.000000000 +0200 @@ -1,5 +1,5 @@ #!/bin/sh -log "Starting S08-medium..." +log "Starting S07-medium..." log "======================" #============================================= @@ -7,43 +7,36 @@ #--------------------------------------------- Y2_NETWORK_ACTIVE=0 Y2_SSH_ACTIVE=0 -USE_SSH=0 -VNC=0 log "\tChecking kernel commandline..." #============================================= # 11.1 start shell on second virtual console #--------------------------------------------- if ! got_install_param '^NoShell:.*1' ; then - log "\tGot kernel parameter <NoShell> -> start shell on tty2" - SPID=`/usr/lib/YaST2/bin/startshell /dev/tty2` + log "\tGot kernel parameter <NoShell> -> start shell on tty2" + SPID=`/usr/lib/YaST2/bin/startshell /dev/tty2` fi + #============================================= -# 11.2) prepare for VNC installation +# 11.1) activate network if counfiguration found #--------------------------------------------- -if got_install_param '^VNC:.*1' ; then - log "\tGot kernel parameter VNC -> export VNC variable" - export VNC=1 +if [ ! -z $(ls /etc/sysconfig/network/ifcfg-* |grep -v 'ifcfg-lo') ] ;then + log "\tnetwork configuration found -> activate network" + rcnetwork start && Y2_NETWORK_ACTIVE=1 + +# firewall is started by rcnetwork +# rcSuSEfirewall2 reload + + +# if nfs:// is used for install source or add-on (reminder /var/lib/YaST2/network_install_portmap), +# start rcportmap + +[ -f /var/lib/YaST2/network_install_portmap ] && rcportmap start + fi -#============================================= -# 11.3) prepare for SSH installation -#--------------------------------------------- if got_install_param '^UseSSH:.*1' ; then log "\tGot kernel parameter UseSSH -> export UseSSH variable" - export USE_SSH=1 -fi -#============================================= -# 11.4) activate network for SSH, VNC, or remote X11 inst. -#--------------------------------------------- -if [ $VNC -eq 1 ] || [ $USE_SSH -eq 1 ] || [ -n "$Display_IP" ] ;then - log "\tVNC/SSH/remote X11 installation used -> activate network" - rcnetwork start && Y2_NETWORK_ACTIVE=1 - rcSuSEfirewall2 reload -fi -if [ $USE_SSH -eq 1 ];then rcsshd start && Y2_SSH_ACTIVE=1 fi log "\tSummary for commandline checks:" log "\tY2_NETWORK_ACTIVE = $Y2_NETWORK_ACTIVE" log "\tY2_SSH_ACTIVE = $Y2_SSH_ACTIVE" -log "\tUSE_SSH = $USE_SSH" -log "\tVNC = $VNC" diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-installation-2.15.26/VERSION new/yast2-installation-2.15.27/VERSION --- old/yast2-installation-2.15.26/VERSION 2007-05-22 10:52:26.000000000 +0200 +++ new/yast2-installation-2.15.27/VERSION 2007-05-27 14:49:35.000000000 +0200 @@ -1 +1 @@ -2.15.26 +2.15.27 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit skelcd-control-openSUSE
by root＠Hilbert.suse.de 30 May '07

30 May '07

Hello community, here is the log from the commit of package skelcd-control-openSUSE checked in at Wed May 30 11:57:30 CEST 2007. -------- --- skelcd-control-openSUSE/skelcd-control-openSUSE.changes 2007-05-15 15:00:20.000000000 +0200 +++ /mounts/work_src_done/NOARCH/skelcd-control-openSUSE/skelcd-control-openSUSE.changes 2007-05-30 11:34:46.000000000 +0200 @@ -1,0 +2,5 @@ +Wed May 30 11:34:10 CEST 2007 - jsrain(a)suse.cz + +- removed inst_netsetup + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ skelcd-control-openSUSE.spec ++++++ --- /var/tmp/diff_new_pack.G21865/_old 2007-05-30 11:57:11.000000000 +0200 +++ /var/tmp/diff_new_pack.G21865/_new 2007-05-30 11:57:11.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package skelcd-control-openSUSE (Version 2007.5.15) +# spec file for package skelcd-control-openSUSE (Version 2007.5.30) # # Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine @@ -16,7 +16,7 @@ License: YaST License Group: SuSE internal Autoreqprov: off -Version: 2007.5.15 +Version: 2007.5.30 Release: 1 Summary: SuSE Linux Professional Control file BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -52,6 +52,8 @@ /CD1 %changelog +* Wed May 30 2007 - jsrain(a)suse.cz +- removed inst_netsetup * Tue May 15 2007 - locilka(a)suse.cz - Changed control file in partitioning/evms_config section from 'true' to 'false' (#274702). ++++++ control.xml ++++++ --- skelcd-control-openSUSE/control.xml 2007-05-15 14:13:21.000000000 +0200 +++ /mounts/work_src_done/NOARCH/skelcd-control-openSUSE/control.xml 2007-05-30 11:34:08.000000000 +0200 @@ -512,12 +512,6 @@ <modules config:type="list"> <module> <label>Perform Update</label> - <name>netsetup</name> - <enable_back>no</enable_back> - <enable_next>no</enable_next> - </module> - <module> - <label>Perform Update</label> <name>rpmcopy</name> <enable_back>no</enable_back> <enable_next>no</enable_next> @@ -596,12 +590,6 @@ </module> <module> <label>Check Installation</label> - <name>netsetup</name> - <enable_back>no</enable_back> - <enable_next>no</enable_next> - </module> - <module> - <label>Check Installation</label> <name>netprobe</name> <enable_back>no</enable_back> <enable_next>no</enable_next> @@ -754,10 +742,6 @@ <modules config:type="list"> <module> <label>Perform Installation</label> - <name>netsetup</name> - </module> - <module> - <label>Perform Installation</label> <name>netprobe</name> </module> <module> ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit linux-kernel-headers
by root＠Hilbert.suse.de 30 May '07

30 May '07

Hello community, here is the log from the commit of package linux-kernel-headers checked in at Wed May 30 11:56:25 CEST 2007. -------- --- linux-kernel-headers/linux-kernel-headers.changes 2007-03-02 15:20:13.000000000 +0100 +++ /mounts/work_src_done/STABLE/linux-kernel-headers/linux-kernel-headers.changes 2007-05-22 00:47:06.000000000 +0200 @@ -1,0 +2,5 @@ +Tue May 22 00:46:55 CEST 2007 - dmueller(a)suse.de + +- Update to match kernel 2.6.21 + +------------------------------------------------------------------- Old: ---- kernel-headers-2.6.20.tar.bz2 New: ---- kernel-headers-2.6.21.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ linux-kernel-headers.spec ++++++ --- /var/tmp/diff_new_pack.Q15340/_old 2007-05-30 11:55:32.000000000 +0200 +++ /var/tmp/diff_new_pack.Q15340/_new 2007-05-30 11:55:32.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package linux-kernel-headers (Version 2.6.20) +# spec file for package linux-kernel-headers (Version 2.6.21) # # Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine @@ -14,12 +14,12 @@ License: GNU General Public License (GPL) Summary: Linux Kernel Headers Group: Development/Libraries/C and C++ -Version: 2.6.20 +Version: 2.6.21 Release: 2 URL: http://www.kernel.org/ BuildRoot: %{_tmppath}/%{name}-%{version}-build Provides: kernel-headers -Source: kernel-headers-2.6.20.tar.bz2 +Source: kernel-headers-%{version}.tar.bz2 Source1: create_biarch_asm.sh Source2: version.h Patch0: kernel-headers.SuSE.diff @@ -120,6 +120,8 @@ %{_prefix}/include/* %changelog +* Tue May 22 2007 - dmueller(a)suse.de +- Update to match kernel 2.6.21 * Fri Mar 02 2007 - pbaudis(a)suse.cz - Fix in-tarball paths * Fri Mar 02 2007 - pbaudis(a)suse.cz ++++++ kernel-headers-2.6.20.tar.bz2 -> kernel-headers-2.6.21.tar.bz2 ++++++ ++++ 42235 lines of diff (skipped) ++++++ kernel-headers.diff ++++++ ++++ 1242 lines (skipped) ++++ between linux-kernel-headers/kernel-headers.diff ++++ and /mounts/work_src_done/STABLE/linux-kernel-headers/kernel-headers.diff ++++++ kernel-headers.SuSE.diff ++++++ --- /var/tmp/diff_new_pack.Q15340/_old 2007-05-30 11:55:40.000000000 +0200 +++ /var/tmp/diff_new_pack.Q15340/_new 2007-05-30 11:55:40.000000000 +0200 @@ -1,7 +1,5 @@ -This diff contains SUSE-specific changes and development. - --- asm-alpha/ioctls.h -+++ asm-alpha/ioctls.h 2006/03/10 12:34:07 ++++ asm-alpha/ioctls.h @@ -91,6 +91,7 @@ #define TIOCGSID 0x5429 /* Return the session ID of FD */ #define TIOCGPTN _IOR('T',0x30, unsigned int) /* Get Pty Number (of pty-mux device) */ @@ -11,7 +9,7 @@ #define TIOCSERCONFIG 0x5453 #define TIOCSERGWILD 0x5454 --- asm-alpha/socket.h -+++ asm-alpha/socket.h 2006/03/10 12:34:07 ++++ asm-alpha/socket.h @@ -36,7 +36,6 @@ /* linux-specific, might as well be the same as on i386 */ #define SO_NO_CHECK 11 @@ -21,7 +19,7 @@ #define SO_PASSCRED 17 #define SO_PEERCRED 18 --- asm-arm/ioctls.h -+++ asm-arm/ioctls.h 2006/03/10 12:34:07 ++++ asm-arm/ioctls.h @@ -48,6 +48,7 @@ #define TIOCGSID 0x5429 /* Return the session ID of FD */ #define TIOCGPTN _IOR('T',0x30, unsigned int) /* Get Pty Number (of pty-mux device) */ @@ -31,7 +29,7 @@ #define FIONCLEX 0x5450 /* these numbers need to be adjusted. */ #define FIOCLEX 0x5451 --- asm-arm/socket.h -+++ asm-arm/socket.h 2006/03/10 12:34:07 ++++ asm-arm/socket.h @@ -21,7 +21,6 @@ #define SO_NO_CHECK 11 #define SO_PRIORITY 12 @@ -41,7 +39,7 @@ #define SO_PASSCRED 16 #define SO_PEERCRED 17 --- asm-i386/ioctls.h -+++ asm-i386/ioctls.h 2006/03/10 12:34:07 ++++ asm-i386/ioctls.h @@ -49,6 +49,7 @@ #define TIOCGSID 0x5429 /* Return the session ID of FD */ #define TIOCGPTN _IOR('T',0x30, unsigned int) /* Get Pty Number (of pty-mux device) */ @@ -51,7 +49,7 @@ #define FIONCLEX 0x5450 #define FIOCLEX 0x5451 --- asm-i386/socket.h -+++ asm-i386/socket.h 2006/03/10 12:34:07 ++++ asm-i386/socket.h @@ -21,7 +21,6 @@ #define SO_NO_CHECK 11 #define SO_PRIORITY 12 @@ -61,7 +59,7 @@ #define SO_PASSCRED 16 #define SO_PEERCRED 17 --- asm-ia64/ioctls.h -+++ asm-ia64/ioctls.h 2006/03/10 12:34:07 ++++ asm-ia64/ioctls.h @@ -55,6 +55,7 @@ #define TIOCGSID 0x5429 /* Return the session ID of FD */ #define TIOCGPTN _IOR('T',0x30, unsigned int) /* Get Pty Number (of pty-mux device) */ @@ -71,7 +69,7 @@ #define FIONCLEX 0x5450 /* these numbers need to be adjusted. */ #define FIOCLEX 0x5451 --- asm-ia64/socket.h -+++ asm-ia64/socket.h 2006/03/10 12:34:07 ++++ asm-ia64/socket.h @@ -30,7 +30,6 @@ #define SO_NO_CHECK 11 #define SO_PRIORITY 12 @@ -81,7 +79,7 @@ #define SO_PASSCRED 16 #define SO_PEERCRED 17 --- asm-mips/ioctls.h -+++ asm-mips/ioctls.h 2006/03/10 12:34:07 ++++ asm-mips/ioctls.h @@ -79,6 +79,8 @@ #define TIOCGSID 0x7416 /* Return the session ID of FD */ #define TIOCGPTN _IOR('T',0x30, unsigned int) /* Get Pty Number (of pty-mux device) */ @@ -92,7 +90,7 @@ /* I hope the range from 0x5480 on is free ... */ #define TIOCSCTTY 0x5480 /* become controlling tty */ --- asm-mips/socket.h -+++ asm-mips/socket.h 2006/03/10 12:34:07 ++++ asm-mips/socket.h @@ -46,7 +46,6 @@ /* linux-specific, might as well be the same as on i386 */ #define SO_NO_CHECK 11 @@ -102,7 +100,7 @@ #define SO_PASSCRED 17 #define SO_PEERCRED 18 --- asm-parisc/ioctls.h -+++ asm-parisc/ioctls.h 2006/03/10 12:34:07 ++++ asm-parisc/ioctls.h @@ -48,6 +48,7 @@ #define TIOCGSID _IOR('T', 20, int) /* Return the session ID of FD */ #define TIOCGPTN _IOR('T',0x30, unsigned int) /* Get Pty Number (of pty-mux device) */ @@ -112,7 +110,7 @@ #define FIONCLEX 0x5450 /* these numbers need to be adjusted. */ #define FIOCLEX 0x5451 --- asm-parisc/socket.h -+++ asm-parisc/socket.h 2006/03/10 12:34:07 ++++ asm-parisc/socket.h @@ -28,7 +28,6 @@ #define SO_NO_CHECK 0x400b @@ -122,7 +120,7 @@ #define SO_PEERCRED 0x4011 #define SO_TIMESTAMP 0x4012 --- asm-powerpc/ioctls.h -+++ asm-powerpc/ioctls.h 2006/03/10 12:34:07 ++++ asm-powerpc/ioctls.h @@ -91,6 +91,7 @@ #define TIOCGSID 0x5429 /* Return the session ID of FD */ #define TIOCGPTN _IOR('T',0x30, unsigned int) /* Get Pty Number (of pty-mux device) */ @@ -132,7 +130,7 @@ #define TIOCSERCONFIG 0x5453 #define TIOCSERGWILD 0x5454 --- asm-powerpc/socket.h -+++ asm-powerpc/socket.h 2006/03/10 12:34:07 ++++ asm-powerpc/socket.h @@ -28,7 +28,7 @@ #define SO_NO_CHECK 11 #define SO_PRIORITY 12 @@ -143,7 +141,7 @@ #define SO_RCVLOWAT 16 #define SO_SNDLOWAT 17 --- asm-s390/ioctls.h -+++ asm-s390/ioctls.h 2006/03/10 12:34:07 ++++ asm-s390/ioctls.h @@ -56,6 +56,7 @@ #define TIOCGSID 0x5429 /* Return the session ID of FD */ #define TIOCGPTN _IOR('T',0x30, unsigned int) /* Get Pty Number (of pty-mux device) */ @@ -153,7 +151,7 @@ #define FIONCLEX 0x5450 /* these numbers need to be adjusted. */ #define FIOCLEX 0x5451 --- asm-s390/socket.h -+++ asm-s390/socket.h 2006/03/10 12:34:07 ++++ asm-s390/socket.h @@ -29,7 +29,6 @@ #define SO_NO_CHECK 11 #define SO_PRIORITY 12 @@ -163,9 +161,9 @@ #define SO_PASSCRED 16 #define SO_PEERCRED 17 --- asm-x86_64/ioctls.h -+++ asm-x86_64/ioctls.h 2006/03/10 12:34:07 -@@ -48,6 +48,8 @@ - #define TIOCGSID 0x5429 /* Return the session ID of FD */ ++++ asm-x86_64/ioctls.h +@@ -52,6 +52,8 @@ + #define TCSETSF2 _IOW('T',0x2D, struct termios2) #define TIOCGPTN _IOR('T',0x30, unsigned int) /* Get Pty Number (of pty-mux device) */ #define TIOCSPTLCK _IOW('T',0x31, int) /* Lock/unlock Pty */ +#define TIOCGDEV _IOR('T',0x32, unsigned int) /* Get real dev no below /d @@ -174,7 +172,7 @@ #define FIONCLEX 0x5450 /* these numbers need to be adjusted. */ #define FIOCLEX 0x5451 --- asm-x86_64/socket.h -+++ asm-x86_64/socket.h 2006/03/10 12:34:07 ++++ asm-x86_64/socket.h @@ -21,7 +21,6 @@ #define SO_NO_CHECK 11 #define SO_PRIORITY 12 @@ -183,4 +181,3 @@ /* To add :#define SO_REUSEPORT 15 */ #define SO_PASSCRED 16 #define SO_PEERCRED 17 - ++++++ version.h ++++++ --- linux-kernel-headers/version.h 2007-03-02 15:20:13.000000000 +0100 +++ /mounts/work_src_done/STABLE/linux-kernel-headers/version.h 2007-05-22 01:02:17.000000000 +0200 @@ -37,7 +37,7 @@ #error " Please adjust the Makefile accordingly." #error "=======================================================" #else -#define UTS_RELEASE "2.6.20" -#define LINUX_VERSION_CODE 132628 +#define UTS_RELEASE "2.6.21" +#define LINUX_VERSION_CODE 132641 #define KERNEL_VERSION(a,b,c) (((a) << 16) + ((b) << 8) + (c)) #endif ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit kinternet
by root＠Hilbert.suse.de 30 May '07

30 May '07

Hello community, here is the log from the commit of package kinternet checked in at Wed May 30 11:49:23 CEST 2007. -------- --- kinternet/kinternet.changes 2007-05-24 21:31:13.000000000 +0200 +++ /mounts/work_src_done/STABLE/kinternet/kinternet.changes 2007-05-30 10:39:53.000000000 +0200 @@ -1,0 +2,5 @@ +Wed May 30 10:39:41 CEST 2007 - wstephenson(a)suse.de + +- fix buildrequires + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kinternet.spec ++++++ --- /var/tmp/diff_new_pack.X26725/_old 2007-05-30 11:49:10.000000000 +0200 +++ /var/tmp/diff_new_pack.X26725/_new 2007-05-30 11:49:10.000000000 +0200 @@ -11,14 +11,14 @@ # norootforbuild Name: kinternet -BuildRequires: dbus-1-qt3-devel kdelibs3-devel kdepim3-devel kdepim3-networkstatus openslp-devel +BuildRequires: dbus-1-qt3-devel kdelibs3-devel kdepim3-devel openslp-devel License: GNU General Public License (GPL) Group: Productivity/Networking/PPP Summary: SUSE Internet Connect Tool Requires: smpppd Obsoletes: kinternet-soho Version: 0.75 -Release: 97 +Release: 101 Source0: kinternet-%{PACKAGE_VERSION}.tar.bz2 Patch: kinternet_switch_kde_networkstatus.diff BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -74,6 +74,8 @@ /opt/kde3/share/locale %changelog +* Wed May 30 2007 - wstephenson(a)suse.de +- fix buildrequires * Thu May 24 2007 - wstephenson(a)suse.de - Revised offline mode infrastructure (#237274) * Mon Mar 26 2007 - coolo(a)suse.de ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit yast2-pkg-bindings
by root＠Hilbert.suse.de 29 May '07

29 May '07

Hello community, here is the log from the commit of package yast2-pkg-bindings checked in at Wed May 30 01:19:25 CEST 2007. -------- --- yast2-pkg-bindings/yast2-pkg-bindings.changes 2007-05-17 15:49:18.000000000 +0200 +++ /mounts/work_src_done/STABLE/yast2-pkg-bindings/yast2-pkg-bindings.changes 2007-05-29 12:56:42.081947000 +0200 @@ -1,0 +2,6 @@ +Tue May 29 11:20:43 CEST 2007 - lslezak(a)suse.cz + +- updated GPG callbacks (#277117) +- 2.15.20 + +------------------------------------------------------------------- Old: ---- yast2-pkg-bindings-2.15.19.tar.bz2 New: ---- yast2-pkg-bindings-2.15.20.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-pkg-bindings.spec ++++++ --- /var/tmp/diff_new_pack.Na5759/_old 2007-05-30 01:19:11.000000000 +0200 +++ /var/tmp/diff_new_pack.Na5759/_new 2007-05-30 01:19:11.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package yast2-pkg-bindings (Version 2.15.19) +# spec file for package yast2-pkg-bindings (Version 2.15.20) # # Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine @@ -11,12 +11,12 @@ # norootforbuild Name: yast2-pkg-bindings -Version: 2.15.19 +Version: 2.15.20 Release: 1 License: GNU General Public License (GPL) Group: System/YaST BuildRoot: %{_tmppath}/%{name}-%{version}-build -Source0: yast2-pkg-bindings-2.15.19.tar.bz2 +Source0: yast2-pkg-bindings-2.15.20.tar.bz2 prefix: /usr BuildRequires: blocxx-devel boost boost-devel dbus-1-devel docbook-xsl-stylesheets doxygen gcc-c++ hal-devel libgcrypt-devel libxcrypt-devel libxslt perl-XML-Writer rpm-devel sgml-skel yast2-core-devel yast2-devtools BuildRequires: libzypp-devel >= 2.14.3 @@ -40,7 +40,7 @@ Stanislav Visnovsky <visnov(a)suse.cz> %prep -%setup -n yast2-pkg-bindings-2.15.19 +%setup -n yast2-pkg-bindings-2.15.20 %build %{prefix}/bin/y2tool y2autoconf @@ -71,6 +71,9 @@ %doc %{prefix}/share/doc/packages/yast2-pkg-bindings %changelog +* Tue May 29 2007 - lslezak(a)suse.cz +- updated GPG callbacks (#277117) +- 2.15.20 * Thu May 17 2007 - lslezak(a)suse.cz - Evaluate start/finish callbacks in Pkg::SourceRestore() and Pkg::SourceLoad() only when needed (removed the flashing popup ++++++ yast2-pkg-bindings-2.15.19.tar.bz2 -> yast2-pkg-bindings-2.15.20.tar.bz2 ++++++ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-pkg-bindings-2.15.19/configure new/yast2-pkg-bindings-2.15.20/configure --- old/yast2-pkg-bindings-2.15.19/configure 2007-05-17 15:44:21.000000000 +0200 +++ new/yast2-pkg-bindings-2.15.20/configure 2007-05-29 12:55:55.000000000 +0200 @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.60 for yast2-pkg-bindings 2.15.19. +# Generated by GNU Autoconf 2.60 for yast2-pkg-bindings 2.15.20. # # Report bugs to <http://bugs.opensuse.org/>. # @@ -713,8 +713,8 @@ # Identity of this package. PACKAGE_NAME='yast2-pkg-bindings' PACKAGE_TARNAME='yast2-pkg-bindings' -PACKAGE_VERSION='2.15.19' -PACKAGE_STRING='yast2-pkg-bindings 2.15.19' +PACKAGE_VERSION='2.15.20' +PACKAGE_STRING='yast2-pkg-bindings 2.15.20' PACKAGE_BUGREPORT='http://bugs.opensuse.org/' ac_unique_file="RPMNAME" @@ -1429,7 +1429,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-pkg-bindings 2.15.19 to adapt to many kinds of systems. +\`configure' configures yast2-pkg-bindings 2.15.20 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1500,7 +1500,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of yast2-pkg-bindings 2.15.19:";; + short | recursive ) echo "Configuration of yast2-pkg-bindings 2.15.20:";; esac cat <<\_ACEOF @@ -1608,7 +1608,7 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -yast2-pkg-bindings configure 2.15.19 +yast2-pkg-bindings configure 2.15.20 generated by GNU Autoconf 2.60 Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, @@ -1622,7 +1622,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-pkg-bindings $as_me 2.15.19, which was +It was created by yast2-pkg-bindings $as_me 2.15.20, which was generated by GNU Autoconf 2.60. Invocation command line was $ $0 $@ @@ -2423,7 +2423,7 @@ # Define the identity of the package. PACKAGE='yast2-pkg-bindings' - VERSION='2.15.19' + VERSION='2.15.20' cat >>confdefs.h <<_ACEOF @@ -2650,7 +2650,7 @@ -VERSION="2.15.19" +VERSION="2.15.20" RPMNAME="yast2-pkg-bindings" MAINTAINER="Ladislav Slezák <lslezak(a)suse.cz>" @@ -21612,7 +21612,7 @@ # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by yast2-pkg-bindings $as_me 2.15.19, which was +This file was extended by yast2-pkg-bindings $as_me 2.15.20, which was generated by GNU Autoconf 2.60. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -21665,7 +21665,7 @@ _ACEOF cat >>$CONFIG_STATUS <<_ACEOF ac_cs_version="\\ -yast2-pkg-bindings config.status 2.15.19 +yast2-pkg-bindings config.status 2.15.20 configured by $0, generated by GNU Autoconf 2.60, with options \\"`echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\" diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-pkg-bindings-2.15.19/configure.in new/yast2-pkg-bindings-2.15.20/configure.in --- old/yast2-pkg-bindings-2.15.19/configure.in 2007-05-17 15:44:03.000000000 +0200 +++ new/yast2-pkg-bindings-2.15.20/configure.in 2007-05-29 12:55:39.000000000 +0200 @@ -3,7 +3,7 @@ dnl -- This file is generated by y2autoconf 2.14.0 - DO NOT EDIT! -- dnl (edit configure.in.in instead) -AC_INIT(yast2-pkg-bindings, 2.15.19, http://bugs.opensuse.org/, yast2-pkg-bindings) +AC_INIT(yast2-pkg-bindings, 2.15.20, http://bugs.opensuse.org/, yast2-pkg-bindings) 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.15.19" +VERSION="2.15.20" RPMNAME="yast2-pkg-bindings" MAINTAINER="Ladislav Slezák <lslezak(a)suse.cz>" diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-pkg-bindings-2.15.19/pkg-bindings.pot new/yast2-pkg-bindings-2.15.20/pkg-bindings.pot --- old/yast2-pkg-bindings-2.15.19/pkg-bindings.pot 2006-11-10 12:37:51.000000000 +0100 +++ new/yast2-pkg-bindings-2.15.20/pkg-bindings.pot 1970-01-01 01:00:00.000000000 +0100 @@ -1,30 +0,0 @@ -# SOME DESCRIPTIVE TITLE. -# Copyright (C) YEAR SuSE Linux Products GmbH, Nuernberg -# This file is distributed under the same license as the PACKAGE package. -# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR. -# -#, fuzzy -msgid "" -msgstr "" -"Project-Id-Version: PACKAGE VERSION\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2006-11-10 12:37+0100\n" -"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" -"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" -"Language-Team: LANGUAGE <LL(a)li.org>\n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=CHARSET\n" -"Content-Transfer-Encoding: 8bit\n" - -#: src/Source.cc:138 src/Source.cc:172 src/Source.cc:752 src/Source.cc:794 -msgid "Downloading files..." -msgstr "" - -#: src/Source.cc:191 src/Source.cc:250 src/Source.cc:1256 src/Source.cc:1258 -#: src/Source.cc:1283 src/Source.cc:1285 -msgid "Parsing files..." -msgstr "" - -#: src/Source.cc:694 src/Source.cc:722 -msgid "Downloading file..." -msgstr "" diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-pkg-bindings-2.15.19/src/Callbacks.cc new/yast2-pkg-bindings-2.15.20/src/Callbacks.cc --- old/yast2-pkg-bindings-2.15.19/src/Callbacks.cc 2007-04-10 15:56:56.000000000 +0200 +++ new/yast2-pkg-bindings-2.15.20/src/Callbacks.cc 2007-05-29 11:20:29.000000000 +0200 @@ -1590,7 +1590,7 @@ { KeyRingSignal ( RecipientCtl & construct_r ) : Recipient( construct_r ) {} - virtual void trustedKeyAdded( const zypp::KeyRing &/*keyring*/, const zypp::PublicKey &key ) + virtual void trustedKeyAdded( const zypp::PublicKey &key ) { CB callback( ycpcb( YCPCallbacks::CB_TrustedKeyAdded) ); @@ -1602,7 +1602,7 @@ } } - virtual void trustedKeyRemoved( const zypp::KeyRing &/*keyring*/, const zypp::PublicKey &key ) + virtual void trustedKeyRemoved( const zypp::PublicKey &key ) { CB callback( ycpcb( YCPCallbacks::CB_TrustedKeyRemoved) ); diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-pkg-bindings-2.15.19/src/Selection.cc new/yast2-pkg-bindings-2.15.20/src/Selection.cc --- old/yast2-pkg-bindings-2.15.19/src/Selection.cc 2006-10-12 10:45:39.000000000 +0200 +++ new/yast2-pkg-bindings-2.15.20/src/Selection.cc 2007-05-29 11:39:09.000000000 +0200 @@ -117,7 +117,7 @@ } else { - y2warning (string ("Unknown status in Pkg::GetSelections(" + status + ", ...)").c_str()); + y2warning("Unknown status in Pkg::GetSelections(%s, ...)", status.c_str()); break; } @@ -218,7 +218,7 @@ } else { - y2warning (string ("Unknown status in Pkg::GetPatterns(" + status + ", ...)").c_str()); + y2warning("Unknown status in Pkg::GetPatterns(%s, ...)", status.c_str()); break; } diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-pkg-bindings-2.15.19/VERSION new/yast2-pkg-bindings-2.15.20/VERSION --- old/yast2-pkg-bindings-2.15.19/VERSION 2007-05-17 15:35:50.000000000 +0200 +++ new/yast2-pkg-bindings-2.15.20/VERSION 2007-05-29 11:22:45.000000000 +0200 @@ -1 +1 @@ -2.15.19 +2.15.20 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit yasm
by root＠Hilbert.suse.de 29 May '07

29 May '07

Hello community, here is the log from the commit of package yasm checked in at Wed May 30 01:19:05 CEST 2007. -------- --- yasm/yasm.changes 2006-01-25 21:43:33.000000000 +0100 +++ /mounts/work_src_done/STABLE/yasm/yasm.changes 2007-05-29 13:20:16.000000000 +0200 @@ -1,0 +2,5 @@ +Tue May 29 13:19:48 CEST 2007 - pth(a)suse.de + +- Split off headers and .so symlinks to -devel subpackage. + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yasm.spec ++++++ --- /var/tmp/diff_new_pack.fv4336/_old 2007-05-30 01:18:46.000000000 +0200 +++ /var/tmp/diff_new_pack.fv4336/_new 2007-05-30 01:18:46.000000000 +0200 @@ -1,22 +1,22 @@ # # spec file for package yasm (Version 0.4.0) # -# Copyright (c) 2005 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2007 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 Name: yasm URL: http://www.tortall.net/projects/yasm/ -License: BSD +License: BSD License and BSD-like Group: Development/Languages/Other Autoreqprov: on Version: 0.4.0 -Release: 6 +Release: 54 Summary: YASM is a complete rewrite of the NASM assembler Source: yasm-%{version}.tar.gz Patch0: yasm-genmacro.patch @@ -38,6 +38,22 @@ -------- Peter Johnson <peter(a)tortall.net> +%package devel +Summary: YASM development package +Group: Development/Languages/Other +Autoreqprov: on +Requires: %{name} = %{version} + +%description devel +This package includes everything needed to develop programs that use +libyasm. + + + +Authors: +-------- + Peter Johnson <peter(a)tortall.net> + %prep %setup -q %patch0 -p1 @@ -45,15 +61,15 @@ %patch2 %build -CFLAGS="$RPM_OPT_FLAGS" \ -./configure --libdir=%_libdir --prefix=/usr --mandir=%_mandir +export CFLAGS="%{optflags}" +%configure --prefix=/usr --disable-static make %{?jobs:-j%jobs} %install -make DESTDIR=$RPM_BUILD_ROOT install +make DESTDIR=%buildroot install %clean -rm -rf $RPM_BUILD_ROOT +rm -rf %buildroot %post %run_ldconfig @@ -65,14 +81,21 @@ %defattr(-,root,root) %doc ABOUT-NLS AUTHORS Artistic.txt BSD.txt COPYING ChangeLog GNU_GPL-2.0 %doc GNU_LGPL-2.0 INSTALL NEWS README -%_libdir/lib* +%_libdir/*.la +%_libdir/lib*.so.* %_libdir/yasm /usr/bin/* -/usr/include/* %_mandir/man7/* %_mandir/man1/* -%changelog -n yasm +%files devel +%defattr(-,root,root) +/usr/include/* +%_libdir/lib*.so + +%changelog +* Tue May 29 2007 - pth(a)suse.de +- Split off headers and .so symlinks to -devel subpackage. * Wed Jan 25 2006 - mls(a)suse.de - converted neededforbuild to BuildRequires * Mon Jul 04 2005 - sf(a)suse.de ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit yast2-ncurses
by root＠Hilbert.suse.de 29 May '07

29 May '07

Hello community, here is the log from the commit of package yast2-ncurses checked in at Wed May 30 01:19:04 CEST 2007. -------- --- yast2-ncurses/yast2-ncurses.changes 2007-05-10 10:23:28.000000000 +0200 +++ /mounts/work_src_done/STABLE/yast2-ncurses/yast2-ncurses.changes 2007-05-29 16:32:45.623038000 +0200 @@ -1,0 +2,26 @@ +Tue May 29 13:03:07 CEST 2007 - kmachalkova(a)suse.cz + +- Removed obsolete save/load selection stuff + related NCPkgPopupFile + class - replaced by save/load pkgs & patterns (FaTE #300729) +- Improved usability of cancel dialog in pkg manager (#274774) +- Fix disappearing 'Etc./All Packages List' submenu after unchecking + AutoDependency Check +- Place all popup dialogs in pkg manager to the centre of the screen + and calculate their size relatively to the screen size (if applicable) + (#275610) +- 2.15.17 + +------------------------------------------------------------------- +Wed May 23 13:54:16 CEST 2007 - gs(a)suse.de + +- Package Installation: check the partition size to prevent + division by zero during disk space calculation (bug #270836) + +------------------------------------------------------------------- +Wed May 16 13:15:56 CEST 2007 - gs(a)suse.de + +- Move all files related to package installation to subdir 'pkg' + and create a separate library libpy2ncurses_pkg (not yet loaded + as a plugin). + +------------------------------------------------------------------- Old: ---- yast2-ncurses-2.15.16.tar.bz2 New: ---- yast2-ncurses-2.15.17.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-ncurses.spec ++++++ --- /var/tmp/diff_new_pack.va4488/_old 2007-05-30 01:18:48.000000000 +0200 +++ /var/tmp/diff_new_pack.va4488/_new 2007-05-30 01:18:48.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package yast2-ncurses (Version 2.15.16) +# spec file for package yast2-ncurses (Version 2.15.17) # # Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine @@ -11,12 +11,12 @@ # norootforbuild Name: yast2-ncurses -Version: 2.15.16 +Version: 2.15.17 Release: 1 License: GNU General Public License (GPL) Group: System/YaST BuildRoot: %{_tmppath}/%{name}-%{version}-build -Source0: yast2-ncurses-2.15.16.tar.bz2 +Source0: yast2-ncurses-2.15.17.tar.bz2 prefix: /usr BuildRequires: doxygen gcc-c++ libzypp-devel yast2-core-devel yast2-devtools BuildRequires: blocxx-devel libxcrypt-devel ncurses-devel @@ -44,7 +44,7 @@ %prep -%setup -n yast2-ncurses-2.15.16 +%setup -n yast2-ncurses-2.15.17 %build %{prefix}/bin/y2tool y2autoconf @@ -64,6 +64,7 @@ %suse_update_desktop_file -d ycc_${d%.desktop} ${d%.desktop} done rm $RPM_BUILD_ROOT/%{_libdir}/YaST2/plugin/libpy2ncurses.la +rm $RPM_BUILD_ROOT/%{_libdir}/YaST2/plugin/libpy2ncurses_pkg.la %clean rm -rf "$RPM_BUILD_ROOT" @@ -72,11 +73,30 @@ %defattr (-, root, root) %{_libdir}/YaST2/plugin/libpy2ncurses.so.* %{_libdir}/YaST2/plugin/libpy2ncurses.so +%{_libdir}/YaST2/plugin/libpy2ncurses_pkg.so.* +%{_libdir}/YaST2/plugin/libpy2ncurses_pkg.so /usr/share/YaST2/data/pkg_layout.ycp /usr/share/YaST2/data/you_layout.ycp %doc %{prefix}/share/doc/packages/yast2-ncurses %changelog +* Tue May 29 2007 - kmachalkova(a)suse.cz +- Removed obsolete save/load selection stuff + related NCPkgPopupFile + class - replaced by save/load pkgs & patterns (FaTE #300729) +- Improved usability of cancel dialog in pkg manager (#274774) +- Fix disappearing 'Etc./All Packages List' submenu after unchecking + AutoDependency Check +- Place all popup dialogs in pkg manager to the centre of the screen + and calculate their size relatively to the screen size (if applicable) + (#275610) +- 2.15.17 +* Wed May 23 2007 - gs(a)suse.de +- Package Installation: check the partition size to prevent + division by zero during disk space calculation (bug #270836) +* Wed May 16 2007 - gs(a)suse.de +- Move all files related to package installation to subdir 'pkg' + and create a separate library libpy2ncurses_pkg (not yet loaded + as a plugin). * Thu May 10 2007 - kmachalkova(a)suse.cz - Replace &#xy; elements in richtext by their ascii character equivalents (#269919) ++++++ yast2-ncurses-2.15.16.tar.bz2 -> yast2-ncurses-2.15.17.tar.bz2 ++++++ ++++ 28902 lines of diff (skipped) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit xorg-x11-driver-video
by root＠Hilbert.suse.de 29 May '07

29 May '07

Hello community, here is the log from the commit of package xorg-x11-driver-video checked in at Wed May 30 01:18:39 CEST 2007. -------- --- xorg-x11-driver-video/xorg-x11-driver-video.changes 2007-05-23 23:04:27.000000000 +0200 +++ /mounts/work_src_done/STABLE/xorg-x11-driver-video/xorg-x11-driver-video.changes 2007-05-29 16:55:56.777747000 +0200 @@ -1,0 +2,6 @@ +Tue May 29 16:55:35 CEST 2007 - sndirsch(a)suse.de + +- xf86-video-ati-rs482-singledac.diff: + * rs480: only has single dac (Bug #276475) + +------------------------------------------------------------------- New: ---- xf86-video-ati-rs482-singledac.diff ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ xorg-x11-driver-video.spec ++++++ --- /var/tmp/diff_new_pack.as1275/_old 2007-05-30 01:18:18.000000000 +0200 +++ /var/tmp/diff_new_pack.as1275/_new 2007-05-30 01:18:18.000000000 +0200 @@ -15,7 +15,7 @@ BuildRequires: Mesa-devel libdrm-devel pkgconfig xorg-x11-proto-devel xorg-x11-server-sdk URL: http://xorg.freedesktop.org/ Version: 7.2 -Release: 106 +Release: 110 License: X11/MIT BuildRoot: %{_tmppath}/%{name}-%{version}-build Group: System/X11/Servers/XF86_4 @@ -84,6 +84,7 @@ Patch18: radeon-vbios-ppc.diff Patch27: xf86-video-ati-mergedfb-dpi.diff Patch28: xf86-video-ati.randr12.diff +Patch29: xf86-video-ati-rs482-singledac.diff Patch30: xf86-video-mga.randr12.diff Patch33: bug-263199_radeon-autocrt.diff @@ -113,6 +114,7 @@ %patch27 -p0 popd pushd xf86-video-ati-* +%patch29 -p1 %patch33 -p1 popd pushd xf86-video-nv-*/src @@ -261,6 +263,9 @@ %{_mandir}/man4/* %changelog +* Tue May 29 2007 - sndirsch(a)suse.de +- xf86-video-ati-rs482-singledac.diff: + * rs480: only has single dac (Bug #276475) * Wed May 23 2007 - sndirsch(a)suse.de - fixed rpmlint library-without-ldconfig-postin errors * Tue May 22 2007 - sndirsch(a)suse.de ++++++ xf86-video-ati-rs482-singledac.diff ++++++ diff-tree 5aa603bcabbb077dec169c48438c2e2ebe1195d7 (from c52322354fe64725733842b3356798c50e7735d5) Author: Dave Airlie <airlied(a)nx6125b.(none)> Date: Tue May 29 07:23:24 2007 +1000 rs480: only has single dac diff --git a/src/radeon_driver.c b/src/radeon_driver.c index a812195..b0e4037 100644 --- a/src/radeon_driver.c +++ b/src/radeon_driver.c @@ -1720,7 +1720,7 @@ static Bool RADEONPreInitChipType(ScrnIn case PCI_CHIP_RS482_5974: info->ChipFamily = CHIP_FAMILY_RS400; info->IsIGP = TRUE; - /*info->HasSingleDAC = TRUE;*/ /* ??? */ + info->HasSingleDAC = TRUE; break; case PCI_CHIP_RV410_564A: ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit util-linux-crypto
by root＠Hilbert.suse.de 29 May '07

29 May '07

Hello community, here is the log from the commit of package util-linux-crypto checked in at Wed May 30 01:18:01 CEST 2007. -------- --- util-linux-crypto/util-linux-crypto.changes 2007-05-09 14:52:45.000000000 +0200 +++ /mounts/work_src_done/STABLE/util-linux-crypto/util-linux-crypto.changes 2007-05-29 16:18:25.000000000 +0200 @@ -1,0 +2,8 @@ +Tue May 29 15:58:44 CEST 2007 - lnussel(a)suse.de + +- fix segfault when trying to open a non existing device +- fix gcc warnings +- add Short-Description to boot.crypto +- use %find_lang + +------------------------------------------------------------------- New: ---- cryptsetup-luks-implicit-declarations.diff cryptsetup-luks-uninitialized.diff cryptsetup-luks-warnings.diff ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ util-linux-crypto.spec ++++++ --- /var/tmp/diff_new_pack.p26554/_old 2007-05-30 01:17:38.000000000 +0200 +++ /var/tmp/diff_new_pack.p26554/_new 2007-05-30 01:17:38.000000000 +0200 @@ -22,7 +22,7 @@ Group: System/Base Autoreqprov: on Version: 2.12r -Release: 33 +Release: 39 Summary: A Collection of Basic File System Encryption Utilities Source: cryptsetup-luks-%csver.tar.bz2 Source1: hashalot-%haver.tar.bz2 @@ -35,7 +35,10 @@ # use this to create the tarball from svn Source99: cryptsetup-mktar Patch0: dmconvert-0.2-uninitialized.patch -Patch1: cryptsetup-luks-libnostderr.diff +Patch1: cryptsetup-luks-uninitialized.diff +Patch2: cryptsetup-luks-implicit-declarations.diff +Patch3: cryptsetup-luks-warnings.diff +Patch4: cryptsetup-luks-libnostderr.diff Patch10: hashalot-fixes.diff Patch11: hashalot-libgcrypt.diff Patch12: hashalot-ctrl-d.diff @@ -79,6 +82,9 @@ %patch0 cd cryptsetup-luks-%csver %patch1 -p1 +%patch2 -p1 +%patch3 -p1 +%patch4 -p1 cd .. %patch10 %patch11 @@ -142,6 +148,8 @@ # man page install -d -m755 %{buildroot}%{_mandir}/man5 install -m644 %{SOURCE92} %{buildroot}%{_mandir}/man5 +# +%find_lang %name --all-name %post /sbin/ldconfig @@ -153,7 +161,7 @@ %clean rm -rf $RPM_BUILD_ROOT -%files +%files -f %name.lang %defattr(-,root,root) %ghost %verify(not md5 size mtime) %config(noreplace,missingok) /etc/crypttab %ghost %verify(not md5 size mtime) %config(noreplace,missingok) /etc/cryptotab @@ -175,6 +183,11 @@ %{_libdir}/libcryptsetup.so %changelog +* Tue May 29 2007 - lnussel(a)suse.de +- fix segfault when trying to open a non existing device +- fix gcc warnings +- add Short-Description to boot.crypto +- use %%find_lang * Wed May 09 2007 - lnussel(a)suse.de - boot.crypto: implement 'status' - boot.crypto: accept argument to start/stop single devices ++++++ boot.crypto ++++++ --- util-linux-crypto/boot.crypto 2007-05-09 14:51:18.000000000 +0200 +++ /mounts/work_src_done/STABLE/util-linux-crypto/boot.crypto 2007-05-29 16:06:42.000000000 +0200 @@ -29,6 +29,7 @@ # Default-Start: B # Default-Stop: # Description: Enable crypto file systems before leaving boot phase +# Short-Description: Enable crypto file systems before leaving boot phase ### END INIT INFO # Determine the base and follow a runlevel link name. ++++++ cryptsetup-luks-implicit-declarations.diff ++++++ fix implicit function declarations Signed-off-by: Ludwig Nussel <ludwig.nussel(a)suse.de> Index: cryptsetup-luks-1.0.4_SVN30/lib/internal.h =================================================================== --- cryptsetup-luks-1.0.4_SVN30.orig/lib/internal.h +++ cryptsetup-luks-1.0.4_SVN30/lib/internal.h @@ -62,6 +62,9 @@ int hash(const char *backend_name, const struct setup_backend *get_setup_backend(const char *name); void put_setup_backend(struct setup_backend *backend); +void hexprint(char *d, int n); + +int sector_size_for_device(const char *device); ssize_t write_blockwise(int fd, const void *buf, size_t count); ssize_t read_blockwise(int fd, void *_buf, size_t count); ssize_t write_lseek_blockwise(int fd, const char *buf, size_t count, off_t offset); Index: cryptsetup-luks-1.0.4_SVN30/lib/libcryptsetup.h =================================================================== --- cryptsetup-luks-1.0.4_SVN30.orig/lib/libcryptsetup.h +++ cryptsetup-luks-1.0.4_SVN30/lib/libcryptsetup.h @@ -45,6 +45,8 @@ int crypt_luksDelKey(struct crypt_option int crypt_luksAddKey(struct crypt_options *options); int crypt_luksUUID(struct crypt_options *options); int crypt_isLuks(struct crypt_options *options); +int crypt_luksFormat(struct crypt_options *options); +int crypt_luksDump(struct crypt_options *options); void crypt_get_error(char *buf, size_t size); void crypt_put_options(struct crypt_options *options); Index: cryptsetup-luks-1.0.4_SVN30/lib/setup.c =================================================================== --- cryptsetup-luks-1.0.4_SVN30.orig/lib/setup.c +++ cryptsetup-luks-1.0.4_SVN30/lib/setup.c @@ -107,7 +107,7 @@ static int interactive_pass(const char * { struct termios orig, tmp; int failed = -1; - int infd, outfd; + int infd = STDIN_FILENO, outfd; if (maxlen < 1) goto out_err; Index: cryptsetup-luks-1.0.4_SVN30/lib/utils.c =================================================================== --- cryptsetup-luks-1.0.4_SVN30.orig/lib/utils.c +++ cryptsetup-luks-1.0.4_SVN30/lib/utils.c @@ -9,6 +9,7 @@ #include <unistd.h> #include <sys/types.h> #include <sys/stat.h> +#include <sys/ioctl.h> #include <fcntl.h> #include "libcryptsetup.h" Index: cryptsetup-luks-1.0.4_SVN30/luks/af.c =================================================================== --- cryptsetup-luks-1.0.4_SVN30.orig/luks/af.c +++ cryptsetup-luks-1.0.4_SVN30/luks/af.c @@ -30,6 +30,7 @@ #include <errno.h> #include "sha1.h" #include "XORblock.h" +#include "random.h" /* diffuse: Information spreading over the whole dataset with * the help of sha512. Index: cryptsetup-luks-1.0.4_SVN30/luks/keyencryption.c =================================================================== --- cryptsetup-luks-1.0.4_SVN30.orig/luks/keyencryption.c +++ cryptsetup-luks-1.0.4_SVN30/luks/keyencryption.c @@ -40,6 +40,9 @@ (__a - 1) / __b + 1; \ }) +static inline int round_up_modulo(int x, int m) { + return div_round_up(x, m) * m; +} static int setup_mapping(const char *cipher, const char *name, const char *device, unsigned int payloadOffset, Index: cryptsetup-luks-1.0.4_SVN30/luks/keymanage.c =================================================================== --- cryptsetup-luks-1.0.4_SVN30.orig/luks/keymanage.c +++ cryptsetup-luks-1.0.4_SVN30/luks/keymanage.c @@ -141,7 +141,7 @@ int LUKS_write_phdr(const char *device, return r; } -inline int round_up_modulo(int x, int m) { +static inline int round_up_modulo(int x, int m) { return div_round_up(x, m) * m; } Index: cryptsetup-luks-1.0.4_SVN30/src/cryptsetup.c =================================================================== --- cryptsetup-luks-1.0.4_SVN30.orig/src/cryptsetup.c +++ cryptsetup-luks-1.0.4_SVN30/src/cryptsetup.c @@ -4,6 +4,7 @@ #include <stdint.h> #include <inttypes.h> #include <errno.h> +#include <unistd.h> #include <assert.h> #include <libcryptsetup.h> @@ -13,6 +14,9 @@ #include "cryptsetup.h" +// XXX! +int LUKS_is_last_keyslot(const char *device, unsigned int keyIndex); + static int opt_verbose = 1; static char *opt_cipher = NULL; static char *opt_hash = DEFAULT_HASH; ++++++ cryptsetup-luks-libnostderr.diff ++++++ --- /var/tmp/diff_new_pack.p26554/_old 2007-05-30 01:17:38.000000000 +0200 +++ /var/tmp/diff_new_pack.p26554/_new 2007-05-30 01:17:38.000000000 +0200 @@ -2,11 +2,11 @@ Signed-off-by: Ludwig Nussel <ludwig.nussel(a)suse.de> -Index: cryptsetup-luks-1.0.4_SVN29/lib/setup.c +Index: cryptsetup-luks-1.0.4_SVN30/lib/setup.c =================================================================== ---- cryptsetup-luks-1.0.4_SVN29.orig/lib/setup.c -+++ cryptsetup-luks-1.0.4_SVN29/lib/setup.c -@@ -98,7 +98,7 @@ static int timed_read(int fd, char *pass +--- cryptsetup-luks-1.0.4_SVN30.orig/lib/setup.c ++++ cryptsetup-luks-1.0.4_SVN30/lib/setup.c +@@ -96,7 +96,7 @@ static int timed_read(int fd, char *pass if (select(fd+1, &fds, NULL, NULL, &t) > 0) failed = untimed_read(fd, pass, maxlen); else @@ -15,7 +15,7 @@ return failed; } -@@ -197,14 +197,16 @@ static int get_key(struct crypt_options +@@ -195,14 +195,16 @@ static int get_key(struct crypt_options pass = safe_alloc(512); if (!pass || (i = interactive_pass(prompt, pass, 512, options->timeout))) { @@ -34,7 +34,7 @@ goto out_err; } memset(pass_verify, 0, sizeof(pass_verify)); -@@ -385,7 +387,7 @@ static int parse_into_name_and_mode(cons +@@ -383,7 +385,7 @@ static int parse_into_name_and_mode(cons strncpy(mode,"cbc-plain",10); } else { @@ -43,7 +43,7 @@ return -EINVAL; } } -@@ -643,7 +645,6 @@ start: +@@ -642,7 +644,6 @@ start: r = -EINVAL; goto out; } if((r = LUKS_open_any_key(options->device, password, passwordLen, &hdr, &mk, backend)) < 0) { @@ -51,7 +51,7 @@ goto out1; } -@@ -718,7 +719,7 @@ static int __crypt_luks_add_key(int arg, +@@ -716,7 +717,7 @@ static int __crypt_luks_add_key(int arg, r = -EINVAL; goto out; } if(LUKS_open_any_key(device, password, passwordLen, &hdr, &mk, backend) < 0) { @@ -60,7 +60,7 @@ r = -EPERM; goto out; } safe_free(password); -@@ -761,7 +762,7 @@ static int __crypt_luks_del_key(int arg, +@@ -759,7 +760,7 @@ static int __crypt_luks_del_key(int arg, } openedIndex = LUKS_open_any_key(device, password, passwordLen, &hdr, &mk, backend); if(openedIndex < 0 || keyIndex == openedIndex) { @@ -69,10 +69,10 @@ r = -EPERM; goto out; } } -Index: cryptsetup-luks-1.0.4_SVN29/luks/keymanage.c +Index: cryptsetup-luks-1.0.4_SVN30/luks/keymanage.c =================================================================== ---- cryptsetup-luks-1.0.4_SVN29.orig/luks/keymanage.c -+++ cryptsetup-luks-1.0.4_SVN29/luks/keymanage.c +--- cryptsetup-luks-1.0.4_SVN30.orig/luks/keymanage.c ++++ cryptsetup-luks-1.0.4_SVN30/luks/keymanage.c @@ -76,20 +76,20 @@ int LUKS_read_phdr(const char *device, s devfd = open(device,O_RDONLY | O_DIRECT | O_SYNC); @@ -151,11 +151,11 @@ return -EINVAL; } -Index: cryptsetup-luks-1.0.4_SVN29/lib/utils.c +Index: cryptsetup-luks-1.0.4_SVN30/lib/utils.c =================================================================== ---- cryptsetup-luks-1.0.4_SVN29.orig/lib/utils.c -+++ cryptsetup-luks-1.0.4_SVN29/lib/utils.c -@@ -225,7 +225,7 @@ ssize_t read_blockwise(int fd, void *ori +--- cryptsetup-luks-1.0.4_SVN30.orig/lib/utils.c ++++ cryptsetup-luks-1.0.4_SVN30/lib/utils.c +@@ -226,7 +226,7 @@ ssize_t read_blockwise(int fd, void *ori while(count) { r = read(fd,padbuf,bsize); if(r < 0 || r != bsize) { @@ -164,11 +164,11 @@ goto out; } step = count<bsize?count:bsize; -Index: cryptsetup-luks-1.0.4_SVN29/luks/keyencryption.c +Index: cryptsetup-luks-1.0.4_SVN30/luks/keyencryption.c =================================================================== ---- cryptsetup-luks-1.0.4_SVN29.orig/luks/keyencryption.c -+++ cryptsetup-luks-1.0.4_SVN29/luks/keyencryption.c -@@ -58,7 +58,7 @@ static int setup_mapping(const char *cip +--- cryptsetup-luks-1.0.4_SVN30.orig/luks/keyencryption.c ++++ cryptsetup-luks-1.0.4_SVN30/luks/keyencryption.c +@@ -61,7 +61,7 @@ static int setup_mapping(const char *cip * device's sector size, otherwise the mapping will be refused. */ if(device_sector_size < 0) { @@ -177,7 +177,7 @@ return -EINVAL; } options->size = round_up_modulo(srcLength,device_sector_size)/SECTOR_SIZE; -@@ -118,7 +118,8 @@ static int LUKS_endec_template(char *src +@@ -121,7 +121,8 @@ static int LUKS_endec_template(char *src r = setup_mapping(dmCipherSpec,name,device,hdr->payloadOffset,key,keyLength,sector,srcLength,backend,mode); if(r < 0) { ++++++ cryptsetup-luks-uninitialized.diff ++++++ fix segfault when trying to open a non existing device Signed-off-by: Ludwig Nussel <ludwig.nussel(a)suse.de> Index: cryptsetup-luks-1.0.4_SVN30/lib/setup.c =================================================================== --- cryptsetup-luks-1.0.4_SVN30.orig/lib/setup.c +++ cryptsetup-luks-1.0.4_SVN30/lib/setup.c @@ -608,7 +608,7 @@ out: static int __crypt_luks_open(int arg, struct setup_backend *backend, struct crypt_options *options) { - struct luks_masterkey *mk; + struct luks_masterkey *mk=NULL; struct luks_phdr hdr; char *password; int passwordLen; struct device_infos infos; ++++++ cryptsetup-luks-warnings.diff ++++++ fix some gcc warnings Signed-off-by: Ludwig Nussel <ludwig.nussel(a)suse.de> Index: cryptsetup-luks-1.0.4_SVN30/lib/libdevmapper.c =================================================================== --- cryptsetup-luks-1.0.4_SVN30.orig/lib/libdevmapper.c +++ cryptsetup-luks-1.0.4_SVN30/lib/libdevmapper.c @@ -258,7 +258,7 @@ static int dm_query_device(int details, options->skip = 0; options->size = length; if (details) { - char *cipher, *key_, *device, *tmp; + char *cipher, *key_, *device; uint64_t val64; set_error("Invalid dm table"); Index: cryptsetup-luks-1.0.4_SVN30/lib/setup.c =================================================================== --- cryptsetup-luks-1.0.4_SVN30.orig/lib/setup.c +++ cryptsetup-luks-1.0.4_SVN30/lib/setup.c @@ -57,8 +57,6 @@ static int setup_enter(struct setup_back static int setup_leave(struct setup_backend *backend) { - const char *error; - if (backend) backend->exit(); Index: cryptsetup-luks-1.0.4_SVN30/lib/utils.c =================================================================== --- cryptsetup-luks-1.0.4_SVN30.orig/lib/utils.c +++ cryptsetup-luks-1.0.4_SVN30/lib/utils.c @@ -173,7 +173,7 @@ ssize_t write_blockwise(int fd, const vo { char *padbuf; char *padbuf_base; char *buf = (char *)orig_buf; - int r; + int r = 0; int hangover; int solid; int bsize; if ((bsize = sector_size(fd)) < 0) @@ -213,7 +213,7 @@ ssize_t write_blockwise(int fd, const vo ssize_t read_blockwise(int fd, void *orig_buf, size_t count) { char *padbuf; char *padbuf_base; char *buf = (char *)orig_buf; - int r; + int r = 0; int step; int bsize; Index: cryptsetup-luks-1.0.4_SVN30/luks/keymanage.c =================================================================== --- cryptsetup-luks-1.0.4_SVN30.orig/luks/keymanage.c +++ cryptsetup-luks-1.0.4_SVN30/luks/keymanage.c @@ -417,7 +417,7 @@ static int wipe(const char *device, unsi int LUKS_del_key(const char *device, unsigned int keyIndex) { struct luks_phdr hdr; - unsigned int i, startOffset, endOffset, stripesLen; + unsigned int startOffset, endOffset, stripesLen; int r; r = LUKS_read_phdr(device, &hdr); Index: cryptsetup-luks-1.0.4_SVN30/luks/random.c =================================================================== --- cryptsetup-luks-1.0.4_SVN30.orig/luks/random.c +++ cryptsetup-luks-1.0.4_SVN30/luks/random.c @@ -13,7 +13,7 @@ int getRandom(char *buf, size_t len) { - int randomfd, r = 0, index = 0; + int randomfd, r = 0; //FIXME Run a FIPS test for the random device or include // PRNG if urandom not avail. Index: cryptsetup-luks-1.0.4_SVN30/src/cryptsetup.c =================================================================== --- cryptsetup-luks-1.0.4_SVN30.orig/src/cryptsetup.c +++ cryptsetup-luks-1.0.4_SVN30/src/cryptsetup.c @@ -203,7 +203,8 @@ static int yesDialog(char *msg) size_t size=0; fprintf(stderr,"\nWARNING!\n========\n"); fprintf(stderr,"%s\n\nAre you sure? (Type uppercase yes): ",msg); - getline(&answer,&size,stdin); + if(getline(&answer,&size,stdin) == -1) + return 0; if(strcmp(answer,"YES\n") == 0) r = 1; free(answer); ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit rfb
by root＠Hilbert.suse.de 29 May '07

29 May '07

Hello community, here is the log from the commit of package rfb checked in at Wed May 30 01:17:17 CEST 2007. -------- --- rfb/rfb.changes 2006-12-13 09:04:47.000000000 +0100 +++ /mounts/work_src_done/STABLE/rfb/rfb.changes 2007-05-29 11:42:17.000000000 +0200 @@ -1,0 +2,5 @@ +Tue May 29 11:41:45 CEST 2007 - anosek(a)suse.cz + +- changed BuildRequires xclass -> xclass-devel + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ rfb.spec ++++++ --- /var/tmp/diff_new_pack.F21105/_old 2007-05-30 01:17:04.000000000 +0200 +++ /var/tmp/diff_new_pack.F21105/_new 2007-05-30 01:17:04.000000000 +0200 @@ -1,7 +1,7 @@ # # spec file for package rfb (Version 0.6.1) # -# Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2007 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. # @@ -11,13 +11,13 @@ # norootforbuild Name: rfb -BuildRequires: gcc-c++ xclass xorg-x11 xorg-x11-devel +BuildRequires: gcc-c++ xclass-devel xorg-x11 xorg-x11-devel License: GNU General Public License (GPL) Group: System/X11/Utilities Autoreqprov: on Requires: xclass Version: 0.6.1 -Release: 509 +Release: 540 URL: http://www.hexonet.de/software/rfb/ #Original source: http://www.hexonet.de/download/rfb-0.6.1.tar.gz Source0: http://www.hexonet.de/download/rfb-0.6.1.tar.bz2 @@ -68,7 +68,9 @@ %doc %{_mandir}/man1/*.1* /usr/bin/* -%changelog -n rfb +%changelog +* Tue May 29 2007 - anosek(a)suse.cz +- changed BuildRequires xclass -> xclass-devel * Wed Dec 13 2006 - anosek(a)suse.cz - changed prefix /usr/X11R6/bin -> /usr/bin * Wed Jan 25 2006 - mls(a)suse.de ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit pinfo
by root＠Hilbert.suse.de 29 May '07

29 May '07

Hello community, here is the log from the commit of package pinfo checked in at Wed May 30 01:16:57 CEST 2007. -------- --- pinfo/pinfo.changes 2007-03-29 17:07:08.000000000 +0200 +++ /mounts/work_src_done/STABLE/pinfo/pinfo.changes 2007-05-29 14:43:18.000000000 +0200 @@ -1,0 +2,26 @@ +Tue May 29 14:39:20 CEST 2007 - anosek(a)suse.cz + +- updated to version 0.6.9 + * Nodes containing a "." are now correctly found + * Non-ASCII man pages are displayed correctly + * Improved the history behavior of the search input line + * Broken tag tables are now automatically fixed + * Don't segfault when a broken regexp is entered + * Fixed a number of segfaults caused by using uninitialized + pointers and off-by-1 errors + * Fixed heap corruption caused by non-ascii chars in info pages + * Fixed a lot of patch searching issues + * Fixed text display on narrow terminals + * Fixed highlighting of searches + * The default pinforc now uses the terminal's default foreground + and background colors. Thanks to Rob Funk for a patch. + * Use libreadline by default; readline version 4 is now required + * Better cooperation between ncurses and readline + * Fixed some memory leaks + * Got rid of tempnam() calls + * Use utf8 in documentation files and fixed typoes +- fixed corrupted unicode characters in status line [#264229] + (ncursesw.patch) +- using %find_lang macro in spec file + +------------------------------------------------------------------- Old: ---- pinfo-0.6.8-nul-strings.patch pinfo-0.6.8.tar.bz2 New: ---- pinfo-0.6.9-ncursesw.patch pinfo-0.6.9-nul-strings.patch pinfo-0.6.9.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ pinfo.spec ++++++ --- /var/tmp/diff_new_pack.E13749/_old 2007-05-30 01:16:19.000000000 +0200 +++ /var/tmp/diff_new_pack.E13749/_new 2007-05-30 01:16:19.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package pinfo (Version 0.6.8) +# spec file for package pinfo (Version 0.6.9) # # Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine @@ -15,10 +15,11 @@ License: GNU General Public License (GPL) Group: Productivity/Publishing/Texinfo Autoreqprov: on -Version: 0.6.8 -Release: 44 +Version: 0.6.9 +Release: 1 Source: %{name}-%{version}.tar.bz2 Patch1: %{name}-%{version}-nul-strings.patch +Patch2: %{name}-%{version}-ncursesw.patch URL: http://dione.cc/~pborys/software/pinfo/ BuildRoot: %{_tmppath}/%{name}-%{version}-build Summary: Lynx-style Info Browser @@ -36,6 +37,7 @@ %prep %setup %patch1 +%patch2 %build %define sysconfdir /etc @@ -50,6 +52,7 @@ %install make DESTDIR=$RPM_BUILD_ROOT/ install +%find_lang %{name} %clean rm -rf $RPM_BUILD_ROOT @@ -60,16 +63,38 @@ %postun %install_info_delete --info-dir=%{_infodir} %{_infodir}/%{name}.info.gz -%files +%files -f %{name}.lang %defattr(-, root, root) %doc AUTHORS COPYING ChangeLog NEWS README %doc %{_mandir}/*/* %doc %{_infodir}/pinfo.info.gz %config /etc/pinforc %{_prefix}/bin/pinfo -%{_prefix}/share/locale/*/*/* %changelog +* Tue May 29 2007 - anosek(a)suse.cz +- updated to version 0.6.9 + * Nodes containing a "." are now correctly found + * Non-ASCII man pages are displayed correctly + * Improved the history behavior of the search input line + * Broken tag tables are now automatically fixed + * Don't segfault when a broken regexp is entered + * Fixed a number of segfaults caused by using uninitialized + pointers and off-by-1 errors + * Fixed heap corruption caused by non-ascii chars in info pages + * Fixed a lot of patch searching issues + * Fixed text display on narrow terminals + * Fixed highlighting of searches + * The default pinforc now uses the terminal's default foreground + and background colors. Thanks to Rob Funk for a patch. + * Use libreadline by default; readline version 4 is now required + * Better cooperation between ncurses and readline + * Fixed some memory leaks + * Got rid of tempnam() calls + * Use utf8 in documentation files and fixed typoes +- fixed corrupted unicode characters in status line [#264229] + (ncursesw.patch) +- using %%find_lang macro in spec file * Thu Mar 29 2007 - rguenther(a)suse.de - add ncurses-devel BuildRequires * Wed Jan 25 2006 - mls(a)suse.de ++++++ pinfo-0.6.9-ncursesw.patch ++++++ --- configure +++ configure @@ -9904,7 +9904,7 @@ echo "$as_me:$LINENO: result: $curses_location/include/ncurses/ncurses.h" >&5 echo "${ECHO_T}$curses_location/include/ncurses/ncurses.h" >&6 curses_h="ncurses/ncurses.h" - curses_libs="-L$curses_location/lib -lncurses" + curses_libs="-L$curses_location/lib -lncursesw" curses_includes="-I$curses_location/include " stop_searching=true found_curses_h=true @@ -9919,7 +9919,7 @@ echo "$as_me:$LINENO: result: $curses_location/include/ncurses.h" >&5 echo "${ECHO_T}$curses_location/include/ncurses.h" >&6 curses_h="ncurses.h" - curses_libs="-L$curses_location/lib -lncurses" + curses_libs="-L$curses_location/lib -lncursesw" curses_includes="-I$curses_location/include " stop_searching=true found_curses_h=true @@ -9934,7 +9934,7 @@ echo "$as_me:$LINENO: result: $curses_location/include/curses.h" >&5 echo "${ECHO_T}$curses_location/include/curses.h" >&6 curses_h="curses.h" - curses_libs="-L$curses_location/lib -lncurses" + curses_libs="-L$curses_location/lib -lncursesw" curses_includes="-I$curses_location/include " stop_searching=true found_curses_h=true @@ -10014,7 +10014,7 @@ echo "$as_me:$LINENO: result: /usr/local/include/ncurses.h" >&5 echo "${ECHO_T}/usr/local/include/ncurses.h" >&6 curses_h="ncurses.h" - curses_libs="-L/usr/local/lib -lncurses" + curses_libs="-L/usr/local/lib -lncursesw" curses_includes="-I/usr/local/include " stop_searching=true found_curses_h=true @@ -10029,7 +10029,7 @@ echo "$as_me:$LINENO: result: /usr/local/include/ncurses/ncurses.h" >&5 echo "${ECHO_T}/usr/local/include/ncurses/ncurses.h" >&6 curses_h="ncurses/ncurses.h" - curses_libs="-L/usr/local/lib -lncurses" + curses_libs="-L/usr/local/lib -lncursesw" curses_includes="-I/usr/local/include " stop_searching=true found_curses_h=true @@ -10045,7 +10045,7 @@ echo "$as_me:$LINENO: result: /usr/include/ncurses.h" >&5 echo "${ECHO_T}/usr/include/ncurses.h" >&6 curses_h="ncurses.h" - curses_libs="-L/usr/lib -lncurses" + curses_libs="-L/usr/lib -lncursesw" curses_includes="-I/usr/include " stop_searching=true found_curses_h=true @@ -10060,7 +10060,7 @@ echo "$as_me:$LINENO: result: /usr/include/ncurses/ncurses.h" >&5 echo "${ECHO_T}/usr/include/ncurses/ncurses.h" >&6 curses_h="ncurses/ncurses.h" - curses_libs="-L/usr/lib -lncurses" + curses_libs="-L/usr/lib -lncursesw" curses_includes="-I/usr/include " stop_searching=true found_curses_h=true @@ -10076,7 +10076,7 @@ echo "$as_me:$LINENO: result: /usr/local/include/curses.h" >&5 echo "${ECHO_T}/usr/local/include/curses.h" >&6 curses_h="curses.h" - curses_libs="-L/usr/local/lib -lncurses" + curses_libs="-L/usr/local/lib -lncursesw" curses_includes="-I/usr/local/include " stop_searching=true found_curses_h=true @@ -10091,7 +10091,7 @@ echo "$as_me:$LINENO: result: /usr/local/include/curses/curses.h" >&5 echo "${ECHO_T}/usr/local/include/curses/curses.h" >&6 curses_h="curses/curses.h" - curses_libs="-L/usr/local/lib -lncurses" + curses_libs="-L/usr/local/lib -lncursesw" curses_includes="-I/usr/local/include " stop_searching=true found_curses_h=true @@ -10107,7 +10107,7 @@ echo "$as_me:$LINENO: result: /usr/include/curses.h" >&5 echo "${ECHO_T}/usr/include/curses.h" >&6 curses_h="curses.h" - curses_libs="-L/usr/lib -lncurses" + curses_libs="-L/usr/lib -lncursesw" curses_includes="-I/usr/include " stop_searching=true found_curses_h=true @@ -10122,7 +10122,7 @@ echo "$as_me:$LINENO: result: /usr/include/curses/curses.h" >&5 echo "${ECHO_T}/usr/include/curses/curses.h" >&6 curses_h="curses/curses.h" - curses_libs="-L/usr/lib -lncurses" + curses_libs="-L/usr/lib -lncursesw" curses_includes="-I/usr/include " stop_searching=true found_curses_h=true --- macros/curses.m4 +++ macros/curses.m4 @@ -189,13 +189,13 @@ -L$curses_location/lib -lncursesw, -I$curses_location/include ) AC_SEARCH_CURSES_FILE($curses_location/include, ncurses/ncurses.h, - -L$curses_location/lib -lncurses, + -L$curses_location/lib -lncursesw, -I$curses_location/include ) AC_SEARCH_CURSES_FILE($curses_location/include, ncurses.h, - -L$curses_location/lib -lncurses, + -L$curses_location/lib -lncursesw, -I$curses_location/include ) AC_SEARCH_CURSES_FILE($curses_location/include, curses.h, - -L$curses_location/lib -lncurses, + -L$curses_location/lib -lncursesw, -I$curses_location/include ) else @@ -218,32 +218,32 @@ dnl after that, look for normal ncurses AC_SEARCH_CURSES_FILE(/usr/local/include, ncurses.h, - -L/usr/local/lib -lncurses, + -L/usr/local/lib -lncursesw, -I/usr/local/include ) AC_SEARCH_CURSES_FILE(/usr/local/include, ncurses/ncurses.h, - -L/usr/local/lib -lncurses, + -L/usr/local/lib -lncursesw, -I/usr/local/include ) AC_SEARCH_CURSES_FILE(/usr/include, ncurses.h, - -L/usr/lib -lncurses, + -L/usr/lib -lncursesw, -I/usr/include ) AC_SEARCH_CURSES_FILE(/usr/include, ncurses/ncurses.h, - -L/usr/lib -lncurses, + -L/usr/lib -lncursesw, -I/usr/include ) dnl after that, look for curses AC_SEARCH_CURSES_FILE(/usr/local/include, curses.h, - -L/usr/local/lib -lncurses, + -L/usr/local/lib -lncursesw, -I/usr/local/include ) AC_SEARCH_CURSES_FILE(/usr/local/include, curses/curses.h, - -L/usr/local/lib -lncurses, + -L/usr/local/lib -lncursesw, -I/usr/local/include ) AC_SEARCH_CURSES_FILE(/usr/include, curses.h, - -L/usr/lib -lncurses, + -L/usr/lib -lncursesw, -I/usr/include ) AC_SEARCH_CURSES_FILE(/usr/include, curses/curses.h, - -L/usr/lib -lncurses, + -L/usr/lib -lncursesw, -I/usr/include ) fi ++++++ pinfo-0.6.8-nul-strings.patch -> pinfo-0.6.9-nul-strings.patch ++++++ --- pinfo/pinfo-0.6.8-nul-strings.patch 2005-08-17 13:06:28.000000000 +0200 +++ /mounts/work_src_done/STABLE/pinfo/pinfo-0.6.9-nul-strings.patch 2007-05-29 14:14:34.000000000 +0200 @@ -1,29 +1,29 @@ --- src/filehandling_functions.c +++ src/filehandling_functions.c -@@ -237,6 +237,11 @@ - * with empty line. - */ - strcpy (Buf[Lines], "\n"); -+ if (!Buf[Lines][0]) { -+ /* skip those ^@^H[index lines (^@ = NUL) */ -+ xfree(Buf[Lines]); -+ Lines--; -+ } - } - while (Buf[Lines][0] != INFO_TAG); /* repeat until new node mark is found */ +@@ -311,6 +311,11 @@ + i--; + } + } ++ if (!Buf[Lines][0]) { ++ /* skip those ^@^H[index lines (^@ = NUL) */ ++ xfree(Buf[Lines]); ++ Lines--; ++ } + } + while (Buf[Lines][0] != INFO_TAG); /* repeat until new node mark is found */ --- src/video.c +++ src/video.c -@@ -67,6 +67,12 @@ - for (i = pos; (i < lines) && (i < pos + maxy - 2); i++) - { - int tmp = strlen (message[i]) - 1; -+ if (tmp < 0) { -+ fprintf(stderr, -+ "%s:%d: BUG: strlen(message[%d]) == 0; please report!\n", -+ __FILE__, __LINE__, i); -+ tmp = 0; -+ } - message[i][tmp] = 0; - if(tmp>column) - mvaddstr (i + 1 - pos, 0, message[i]+column); +@@ -91,6 +91,12 @@ + if (!message[i]) continue; + + int tmp = strlen(message[i]) - 1; ++ if (tmp < 0) { ++ fprintf(stderr, ++ "%s:%d: BUG: strlen(message[%d]) == 0; please report!\n", ++ __FILE__, __LINE__, i); ++ tmp = 0; ++ } + message[i][tmp] = 0; + if (tmp>column) + mvaddstr(i + 1 - pos, 0, message[i]+column); ++++++ pinfo-0.6.8.tar.bz2 -> pinfo-0.6.9.tar.bz2 ++++++ ++++ 106155 lines of diff (skipped) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit pulseaudio
by root＠Hilbert.suse.de 29 May '07

29 May '07

Hello community, here is the log from the commit of package pulseaudio checked in at Wed May 30 01:16:46 CEST 2007. -------- --- pulseaudio/pulseaudio.changes 2007-04-24 12:04:54.000000000 +0200 +++ /mounts/work_src_done/STABLE/pulseaudio/pulseaudio.changes 2007-05-29 19:24:46.000000000 +0200 @@ -1,0 +2,9 @@ +Tue May 29 19:22:56 CEST 2007 - tiwai(a)suse.de + +- fix possible remote DoS (#260326) +- fix wrong endian conversion of float data +- add a workaround for firefox with LD_PRELOAD wrapper +- add the missing support of ioctls for JavaSound +- increase ESD max samplesize + +------------------------------------------------------------------- New: ---- pulseaudio-0.9.5-dos-vulns-fix.diff pulseaudio-0.9.5-esd-max-samplesize.diff pulseaudio-0.9.5-firefox-workaround.diff pulseaudio-0.9.5-javasound-support.diff pulseaudio-0.9.5-wrong-endian-convert.diff ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ pulseaudio.spec ++++++ --- /var/tmp/diff_new_pack.R14132/_old 2007-05-30 01:16:21.000000000 +0200 +++ /var/tmp/diff_new_pack.R14132/_new 2007-05-30 01:16:21.000000000 +0200 @@ -14,7 +14,7 @@ BuildRequires: alsa-devel doxygen jack-devel liboil-devel libsamplerate-devel libsndfile-devel Summary: A Networked Sound Server Version: 0.9.5 -Release: 38 +Release: 53 License: GNU General Public License (GPL), GNU Library General Public License v. 2.0 and 2.1 (LGPL) Group: System/Sound Daemons Source: %{name}-%{version}.tar.bz2 @@ -22,6 +22,11 @@ Patch: pulseaudio-0.9.5-framesize.patch Patch1: pulseaudio-0.9.5-suspend.patch Patch2: pulseaudio-0.9.5-userconf.patch +Patch3: pulseaudio-0.9.5-dos-vulns-fix.diff +Patch4: pulseaudio-0.9.5-wrong-endian-convert.diff +Patch5: pulseaudio-0.9.5-firefox-workaround.diff +Patch6: pulseaudio-0.9.5-javasound-support.diff +Patch7: pulseaudio-0.9.5-esd-max-samplesize.diff URL: http://pulseaudio.org BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -69,10 +74,15 @@ Pierre Ossman %prep -%setup +%setup -q %patch %patch1 %patch2 -p2 +%patch3 -p1 +%patch4 -p1 +%patch5 -p1 +%patch6 -p1 +%patch7 -p1 cp /usr/share/gettext/config.rpath . %{?suse_update_config:%{suse_update_config -f}} autoreconf --force --install @@ -122,6 +132,12 @@ %{_includedir}/pulse* %changelog +* Tue May 29 2007 - tiwai(a)suse.de +- fix possible remote DoS (#260326) +- fix wrong endian conversion of float data +- add a workaround for firefox with LD_PRELOAD wrapper +- add the missing support of ioctls for JavaSound +- increase ESD max samplesize * Tue Apr 24 2007 - tiwai(a)suse.de - disable static library, don't use ltdl install - fix requires of devel package ++++++ pulseaudio-0.9.5-dos-vulns-fix.diff ++++++ Fix from Ubuntu: Include fixes for potential DoS vuln from http://pulseaudio.org/ticket/67 diff -urNad pulseaudio-0.9.5-7ubuntu1~/src/modules/module-volume-restore.c pulseaudio-0.9.5-7ubuntu1/src/modules/module-volume-restore.c --- pulseaudio-0.9.5-7ubuntu1~/src/modules/module-volume-restore.c 2007-05-08 06:39:31.000000000 -0400 +++ pulseaudio-0.9.5-7ubuntu1/src/modules/module-volume-restore.c 2007-05-25 01:22:16.000000000 -0400 @@ -435,6 +435,7 @@ u->modified = 0; m->userdata = u; + u->sink_input_hook_slot = u->source_output_hook_slot = NULL; if (load_rules(u) < 0) goto fail; diff -urNad pulseaudio-0.9.5-7ubuntu1~/src/modules/rtp/sap.c pulseaudio-0.9.5-7ubuntu1/src/modules/rtp/sap.c --- pulseaudio-0.9.5-7ubuntu1~/src/modules/rtp/sap.c 2007-05-08 06:39:32.000000000 -0400 +++ pulseaudio-0.9.5-7ubuntu1/src/modules/rtp/sap.c 2007-05-25 01:22:29.000000000 -0400 @@ -142,9 +142,6 @@ goto fail; } - if (!size) - return 0; - buf = pa_xnew(char, size+1); buf[size] = 0; diff -urNad pulseaudio-0.9.5-7ubuntu1~/src/pulsecore/protocol-native.c pulseaudio-0.9.5-7ubuntu1/src/pulsecore/protocol-native.c --- pulseaudio-0.9.5-7ubuntu1~/src/pulsecore/protocol-native.c 2007-05-08 06:39:33.000000000 -0400 +++ pulseaudio-0.9.5-7ubuntu1/src/pulsecore/protocol-native.c 2007-05-25 01:19:40.000000000 -0400 @@ -760,7 +760,8 @@ CHECK_VALIDITY(c->pstream, pa_cvolume_valid(&volume), tag, PA_ERR_INVALID); CHECK_VALIDITY(c->pstream, map.channels == ss.channels && volume.channels == ss.channels, tag, PA_ERR_INVALID); CHECK_VALIDITY(c->pstream, maxlength > 0 && maxlength <= MAX_MEMBLOCKQ_LENGTH, tag, PA_ERR_INVALID); - + CHECK_VALIDITY(c->pstream, maxlength >= pa_frame_size(&ss), tag, PA_ERR_INVALID); + if (sink_index != PA_INVALID_INDEX) { sink = pa_idxset_get_by_index(c->protocol->core->sinks, sink_index); CHECK_VALIDITY(c->pstream, sink, tag, PA_ERR_NOENTITY); diff -urNad pulseaudio-0.9.5-7ubuntu1~/src/pulsecore/pstream.c pulseaudio-0.9.5-7ubuntu1/src/pulsecore/pstream.c --- pulseaudio-0.9.5-7ubuntu1~/src/pulsecore/pstream.c 2007-05-08 06:39:33.000000000 -0400 +++ pulseaudio-0.9.5-7ubuntu1/src/pulsecore/pstream.c 2007-05-25 01:18:45.000000000 -0400 @@ -585,7 +585,7 @@ flags = ntohl(p->read.descriptor[PA_PSTREAM_DESCRIPTOR_FLAGS]); - if (!p->import && (flags & PA_FLAG_SHMMASK) != 0) { + if (!p->use_shm && (flags & PA_FLAG_SHMMASK) != 0) { pa_log_warn("Recieved SHM frame on a socket where SHM is disabled."); return -1; } @@ -615,7 +615,7 @@ length = ntohl(p->read.descriptor[PA_PSTREAM_DESCRIPTOR_LENGTH]); - if (length > FRAME_SIZE_MAX_ALLOW) { + if (length > FRAME_SIZE_MAX_ALLOW || length <= 0) { pa_log_warn("Recieved invalid frame size : %lu", (unsigned long) length); return -1; } diff -urNad pulseaudio-0.9.5-7ubuntu1~/src/pulsecore/sample-util.c pulseaudio-0.9.5-7ubuntu1/src/pulsecore/sample-util.c --- pulseaudio-0.9.5-7ubuntu1~/src/pulsecore/sample-util.c 2007-05-25 01:15:11.000000000 -0400 +++ pulseaudio-0.9.5-7ubuntu1/src/pulsecore/sample-util.c 2007-05-25 01:20:30.000000000 -0400 @@ -35,13 +35,25 @@ #include "sample-util.h" #include "endianmacros.h" +#define PA_SILENCE_MAX (1024*1024*1) + pa_memblock *pa_silence_memblock_new(pa_mempool *pool, const pa_sample_spec *spec, size_t length) { + size_t fs; assert(pool); assert(spec); if (length == 0) length = pa_bytes_per_second(spec)/20; /* 50 ms */ + if (length > PA_SILENCE_MAX) + length = PA_SILENCE_MAX; + + fs = pa_frame_size(spec); + length = ((PA_SILENCE_MAX+fs-1) / fs) * fs; + + if (length <= 0) + length = fs; + return pa_silence_memblock(pa_memblock_new(pool, length), spec); } ++++++ pulseaudio-0.9.5-esd-max-samplesize.diff ++++++ Increase cache size of esd diff -urNad pulseaudio-0.9.5~/src/pulsecore/protocol-esound.c pulseaudio-0.9.5/src/pulsecore/protocol-esound.c --- pulseaudio-0.9.5~/src/pulsecore/protocol-esound.c 2006-08-20 01:06:45.000000000 +0200 +++ pulseaudio-0.9.5/src/pulsecore/protocol-esound.c 2007-03-06 14:13:17.000000000 +0100 @@ -68,7 +68,7 @@ #define RECORD_BUFFER_SECONDS (5) #define RECORD_BUFFER_FRAGMENTS (100) -#define MAX_CACHE_SAMPLE_SIZE (1024000) +#define MAX_CACHE_SAMPLE_SIZE (2048000) #define SCACHE_PREFIX "esound." ++++++ pulseaudio-0.9.5-firefox-workaround.diff ++++++ work around bug in firefox which apparently misuses access() as NULL pointer test. diff -urNad pulseaudio~/src/utils/padsp.c pulseaudio/src/utils/padsp.c --- pulseaudio~/src/utils/padsp.c 2006-08-18 23:29:26.000000000 +0200 +++ pulseaudio/src/utils/padsp.c 2006-10-19 00:13:47.082198231 +0200 @@ -2121,6 +2121,13 @@ } int access(const char *pathname, int mode) { + + if (!pathname) { + /* Firefox needs this. See #27 */ + errno = EFAULT; + return -1; + } + debug(DEBUG_LEVEL_VERBOSE, __FILE__": access(%s)\n", pathname); if (strcmp(pathname, "/dev/dsp") != 0 && ++++++ pulseaudio-0.9.5-javasound-support.diff ++++++ implement a few more ioctl()s, including a subset of SNDCTL_DSP_GETOPTR. Just enough to make JavaSound work. @DPATCH@ diff -urNad pulseaudio~/src/utils/padsp.c pulseaudio/src/utils/padsp.c --- pulseaudio~/src/utils/padsp.c 2006-10-19 00:16:53.841869981 +0200 +++ pulseaudio/src/utils/padsp.c 2006-10-19 00:17:03.458470981 +0200 @@ -88,6 +88,8 @@ pa_cvolume sink_volume, source_volume; uint32_t sink_index, source_index; int volume_modify_count; + + int optr_n_blocks; PA_LLIST_FIELDS(fd_info); }; @@ -574,6 +576,7 @@ i->volume_modify_count = 0; i->sink_index = (uint32_t) -1; i->source_index = (uint32_t) -1; + i->optr_n_blocks = 0; PA_LLIST_INIT(fd_info, i); reset_params(i); @@ -1947,6 +1950,8 @@ free_streams(i); dsp_flush_socket(i); reset_params(i); + + i->optr_n_blocks = 0; pa_threaded_mainloop_unlock(i->mainloop); break; @@ -2035,14 +2040,76 @@ break; } + case SOUND_PCM_READ_RATE: + debug(DEBUG_LEVEL_NORMAL, __FILE__": SOUND_PCM_READ_RATE\n"); + + pa_threaded_mainloop_lock(i->mainloop); + *(int*) argp = i->sample_spec.rate; + pa_threaded_mainloop_unlock(i->mainloop); + break; + + case SOUND_PCM_READ_CHANNELS: + debug(DEBUG_LEVEL_NORMAL, __FILE__": SOUND_PCM_READ_CHANNELS\n"); + + pa_threaded_mainloop_lock(i->mainloop); + *(int*) argp = i->sample_spec.channels; + pa_threaded_mainloop_unlock(i->mainloop); + break; + + case SOUND_PCM_READ_BITS: + debug(DEBUG_LEVEL_NORMAL, __FILE__": SOUND_PCM_READ_BITS\n"); + + pa_threaded_mainloop_lock(i->mainloop); + *(int*) argp = pa_sample_size(&i->sample_spec)*8; + pa_threaded_mainloop_unlock(i->mainloop); + break; + + case SNDCTL_DSP_GETOPTR: { + count_info *info; + + debug(DEBUG_LEVEL_NORMAL, __FILE__": SNDCTL_DSP_GETODELAY\n"); + + info = (count_info*) argp; + memset(info, 0, sizeof(*info)); + + pa_threaded_mainloop_lock(i->mainloop); + + for (;;) { + pa_usec_t usec; + + PLAYBACK_STREAM_CHECK_DEAD_GOTO(i, exit_loop); + + if (pa_stream_get_time(i->play_stream, &usec) >= 0) { + size_t k = pa_usec_to_bytes(usec, &i->sample_spec); + int m; + + info->bytes = (int) k; + m = k / i->fragment_size; + info->blocks = m - i->optr_n_blocks; + i->optr_n_blocks = m; + + break; + } + + if (pa_context_errno(i->context) != PA_ERR_NODATA) { + debug(DEBUG_LEVEL_NORMAL, __FILE__": pa_stream_get_latency(): %s\n", pa_strerror(pa_context_errno(i->context))); + break; + } + + pa_threaded_mainloop_wait(i->mainloop); + } + + pa_threaded_mainloop_unlock(i->mainloop); + + debug(DEBUG_LEVEL_NORMAL, __FILE__": GETOPTR bytes=%i, blocks=%i, ptr=%i\n", info->bytes, info->blocks, info->ptr); + + break; + } + case SNDCTL_DSP_GETIPTR: debug(DEBUG_LEVEL_NORMAL, __FILE__": invalid ioctl SNDCTL_DSP_GETIPTR\n"); goto inval; - - case SNDCTL_DSP_GETOPTR: - debug(DEBUG_LEVEL_NORMAL, __FILE__": invalid ioctl SNDCTL_DSP_GETOPTR\n"); - goto inval; - + default: debug(DEBUG_LEVEL_NORMAL, __FILE__": unknown ioctl 0x%08lx\n", request); ++++++ pulseaudio-0.9.5-wrong-endian-convert.diff ++++++ Fix float32le <-> float32ne <-> float32be sample converters diff -urNad pulseaudio~/src/pulsecore/sample-util.c pulseaudio/src/pulsecore/sample-util.c --- pulseaudio~/src/pulsecore/sample-util.c 2006-08-18 23:38:49.000000000 +0200 +++ pulseaudio/src/pulsecore/sample-util.c 2006-10-19 00:19:56.233268731 +0200 @@ -68,6 +68,7 @@ case PA_SAMPLE_S16LE: case PA_SAMPLE_S16BE: case PA_SAMPLE_FLOAT32: + case PA_SAMPLE_FLOAT32RE: c = 0; break; case PA_SAMPLE_ALAW: diff -urNad pulseaudio~/src/pulsecore/sconv.c pulseaudio/src/pulsecore/sconv.c --- pulseaudio~/src/pulsecore/sconv.c 2006-08-18 23:29:25.000000000 +0200 +++ pulseaudio/src/pulsecore/sconv.c 2006-10-19 00:19:56.229268481 +0200 @@ -72,6 +72,22 @@ oil_memcpy(b, a, sizeof(float) * n); } +static void float32re_to_float32ne(unsigned n, const void *a, float *b) { + assert(a); + assert(b); + + while (n-- > 0) + ((uint32_t *)b)[n] = UINT32_SWAP (((uint32_t *)a)[n]); +} + +static void float32re_from_float32ne(unsigned n, const float *a, void *b) { + assert(a); + assert(b); + + while (n-- > 0) + ((uint32_t *)b)[n] = UINT32_SWAP (((uint32_t *)a)[n]); +} + static void ulaw_to_float32ne(unsigned n, const void *a, float *b) { const uint8_t *ca = a; @@ -140,6 +156,8 @@ return pa_sconv_s16be_to_float32ne; case PA_SAMPLE_FLOAT32NE: return float32ne_to_float32ne; + case PA_SAMPLE_FLOAT32RE: + return float32re_to_float32ne; case PA_SAMPLE_ALAW: return alaw_to_float32ne; case PA_SAMPLE_ULAW: @@ -159,6 +177,8 @@ return pa_sconv_s16be_from_float32ne; case PA_SAMPLE_FLOAT32NE: return float32ne_from_float32ne; + case PA_SAMPLE_FLOAT32RE: + return float32re_from_float32ne; case PA_SAMPLE_ALAW: return alaw_from_float32ne; case PA_SAMPLE_ULAW: ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit mysql
by root＠Hilbert.suse.de 29 May '07

29 May '07

Hello community, here is the log from the commit of package mysql checked in at Wed May 30 01:16:13 CEST 2007. -------- --- mysql/mysql.changes 2007-05-28 10:41:22.000000000 +0200 +++ /mounts/work_src_done/STABLE/mysql/mysql.changes 2007-05-29 13:12:06.901864000 +0200 @@ -1,0 +2,8 @@ +Tue May 29 12:58:35 CEST 2007 - mmarek(a)suse.de + +- run ldconfig in %%post of library packages +- don't copy example my.cnf files to /usr/share/doc (they're + already installed in /usr/share/mysql +- fixed libmysqlclient-devel dependencies + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ mysql.spec ++++++ --- /var/tmp/diff_new_pack.Ix8148/_old 2007-05-30 01:15:46.000000000 +0200 +++ /var/tmp/diff_new_pack.Ix8148/_new 2007-05-30 01:15:46.000000000 +0200 @@ -15,7 +15,7 @@ License: GNU General Public License (GPL) Group: Productivity/Databases/Servers Version: 5.0.41 -Release: 1 +Release: 3 # required by rcmysql Requires: mysql-client = %{version} Autoreqprov: on @@ -77,7 +77,7 @@ # mysql-devel was last used in openSUSE 10.2 Provides: mysql-devel = %{version}-%{release} Obsoletes: mysql-devel <= 5.0.26 -Requires: libmysqlclient = %{version} libmysqlclient_r = %{version} glibc-devel zlib-devel openssl-devel +Requires: libmysqlclient15 = %{version} libmysqlclient_r15 = %{version} glibc-devel zlib-devel openssl-devel License: GNU General Public License (GPL) Summary: MySQL Development Header Files and Libraries URL: http://www.mysql.com @@ -413,7 +413,7 @@ # Create directory structure DOCS=(COPYING README EXCEPTIONS-CLIENT %_sourcedir/README.{SUSE,debug}) DOCDIR=$RPM_BUILD_ROOT/%{_defaultdocdir}/%{name} -install -d -m 755 ${DOCDIR}/cnf +install -d -m 755 ${DOCDIR} install -d -m 755 $RPM_BUILD_ROOT/etc/logrotate.d install -d -m 755 $RPM_BUILD_ROOT/etc/init.d install -d -m 755 $RPM_BUILD_ROOT/var/lib/mysql @@ -421,7 +421,6 @@ install -m 660 _build/support-files/my-medium.cnf $RPM_BUILD_ROOT/etc/my.cnf install -m 640 scripts/mysqlaccess.conf $RPM_BUILD_ROOT/etc/mysqlaccess.conf install -m 644 "${DOCS[@]}" ${DOCDIR} -install -m 644 _build/support-files/my-*.cnf ${DOCDIR}/cnf install -m 755 %_sourcedir/rc.mysql $RPM_BUILD_ROOT/etc/init.d/mysql ln -sf ../../etc/init.d/mysql $RPM_BUILD_ROOT/usr/sbin/rcmysql install -m 755 -d $RPM_BUILD_ROOT/var/lib/mysql/.tmp @@ -475,6 +474,10 @@ %post Max touch /var/lib/mysql/.run-mysql_upgrade +%post -n libmysqlclient15 -p /sbin/ldconfig + +%post -n libmysqlclient_r15 -p /sbin/ldconfig + %preun %stop_on_removal mysql @@ -550,6 +553,11 @@ %files tools -f mysql-tools.files %changelog +* Tue May 29 2007 - mmarek(a)suse.de +- run ldconfig in %%post of library packages +- don't copy example my.cnf files to /usr/share/doc (they're + already installed in /usr/share/mysql +- fixed libmysqlclient-devel dependencies * Mon May 28 2007 - mmarek(a)suse.cz - updated to 5.0.41, for changes see http://dev.mysql.com/doc/refman/5.0/en/releasenotes-cs-5-0-37.html ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit NX
by root＠Hilbert.suse.de 29 May '07

29 May '07

Hello community, here is the log from the commit of package NX checked in at Wed May 30 01:15:57 CEST 2007. -------- --- NX/NX.changes 2007-05-02 12:16:00.000000000 +0200 +++ /mounts/work_src_done/STABLE/NX/NX.changes 2007-05-29 15:24:32.717750000 +0200 @@ -1,0 +2,5 @@ +Tue May 29 15:24:28 CEST 2007 - sndirsch(a)suse.de + +- added "%post -p /sbin/ldconfig" to specfile to make rpmlint happy + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ NX.spec ++++++ --- /var/tmp/diff_new_pack.mb8623/_old 2007-05-30 01:15:48.000000000 +0200 +++ /var/tmp/diff_new_pack.mb8623/_new 2007-05-30 01:15:48.000000000 +0200 @@ -25,7 +25,7 @@ URL: http://www.nomachine.com/sources.php Group: System/X11/Servers/XF86_4 Version: 2.1.0 -Release: 3 +Release: 9 Summary: Proxy System for X11 #Compression Libraries and Proxy Sources Source: nxproxy-%{version}-3.tar.gz @@ -225,6 +225,8 @@ rm -f %{my_provides} rm -f %{my_requires} +%post -p /sbin/ldconfig + %files %defattr(-,root,root) %doc /usr/share/doc/packages/NX @@ -249,6 +251,8 @@ /usr/share/NX/keymaps-windows/ %changelog +* Tue May 29 2007 - sndirsch(a)suse.de +- added "%%post -p /sbin/ldconfig" to specfile to make rpmlint happy * Wed May 02 2007 - sndirsch(a)suse.de - fixed run-nxagent-client in samples script (-nolimit option for nxagent no longer available) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit mkinitrd
by root＠Hilbert.suse.de 29 May '07

29 May '07

Hello community, here is the log from the commit of package mkinitrd checked in at Wed May 30 01:15:41 CEST 2007. -------- --- mkinitrd/mkinitrd.changes 2007-05-24 10:14:38.000000000 +0200 +++ /mounts/work_src_done/STABLE/mkinitrd/mkinitrd.changes 2007-05-29 17:33:35.055676000 +0200 @@ -1,0 +2,7 @@ +Tue May 29 17:33:51 CEST 2007 - agraf(a)suse.de + +- Include optional busybox support (activate with -f busybox) + (#276555) +- Suppress useless warnings in resume features + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ mkinitrd.spec ++++++ --- /var/tmp/diff_new_pack.Bu1777/_old 2007-05-30 01:15:10.000000000 +0200 +++ /var/tmp/diff_new_pack.Bu1777/_new 2007-05-30 01:15:10.000000000 +0200 @@ -18,7 +18,7 @@ Requires: coreutils modutils util-linux grep gzip sed gawk cpio udev pciutils sysvinit file Autoreqprov: on Version: 2.0 -Release: 9 +Release: 12 Summary: Creates an Initial RAM Disk Image for Preloading Modules BuildRoot: %{_tmppath}/%{name}-%{version}-build Source0: mkinitrd.tgz @@ -92,6 +92,10 @@ %doc %{_mandir}/man8/mkinitrd.8.gz %changelog +* Tue May 29 2007 - agraf(a)suse.de +- Include optional busybox support (activate with -f busybox) + (#276555) +- Suppress useless warnings in resume features * Thu May 24 2007 - agraf(a)suse.de - Resolve persistent device names for non-root-devices - Split resume into userspace and kernel resume ++++++ mkinitrd.tgz ++++++ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/mkinitrd-2.0/lib/mkinitrd/boot/18-resume.userspace.sh new/mkinitrd-2.0/lib/mkinitrd/boot/18-resume.userspace.sh --- old/mkinitrd-2.0/lib/mkinitrd/boot/18-resume.userspace.sh 2007-05-23 15:23:40.000000000 +0200 +++ new/mkinitrd-2.0/lib/mkinitrd/boot/18-resume.userspace.sh 2007-05-29 17:24:11.000000000 +0200 @@ -15,7 +15,7 @@ ## resume the device to resume from ## -[ "$(set -u; $noresume && echo 1)" = "1" ] && resume_mode=off +[ "$( ( set -u; echo $noresume >/dev/null; echo 1 ) 2>/dev/null )" = "1" ] && resume_mode=off # Verify manual resume mode if [ "$resume_mode" != "off" -a -n "$resumedev" ]; then diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/mkinitrd-2.0/lib/mkinitrd/boot/19-resume.kernel.sh new/mkinitrd-2.0/lib/mkinitrd/boot/19-resume.kernel.sh --- old/mkinitrd-2.0/lib/mkinitrd/boot/19-resume.kernel.sh 2007-05-23 15:25:18.000000000 +0200 +++ new/mkinitrd-2.0/lib/mkinitrd/boot/19-resume.kernel.sh 2007-05-29 17:24:21.000000000 +0200 @@ -14,7 +14,7 @@ ## resume the device to resume from ## -[ "$(set -u; $noresume && echo 1)" = "1" ] && resume_mode=off +[ "$( ( set -u; echo $noresume >/dev/null; echo 1 ) 2>/dev/null )" = "1" ] && resume_mode=off # Verify manual resume mode if [ "$resume_mode" != "off" -a -n "$resumedev" ]; then diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/mkinitrd-2.0/lib/mkinitrd/boot/52-busybox.sh new/mkinitrd-2.0/lib/mkinitrd/boot/52-busybox.sh --- old/mkinitrd-2.0/lib/mkinitrd/boot/52-busybox.sh 1970-01-01 01:00:00.000000000 +0100 +++ new/mkinitrd-2.0/lib/mkinitrd/boot/52-busybox.sh 2007-05-25 13:33:48.000000000 +0200 @@ -0,0 +1,5 @@ +#!/bin/bash +#%if: 1 = 2 +#%programs: busybox + +## this is only a dummy script so we see busybox as a feature in the list diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/mkinitrd-2.0/lib/mkinitrd/setup/52-busybox.sh new/mkinitrd-2.0/lib/mkinitrd/setup/52-busybox.sh --- old/mkinitrd-2.0/lib/mkinitrd/setup/52-busybox.sh 1970-01-01 01:00:00.000000000 +0100 +++ new/mkinitrd-2.0/lib/mkinitrd/setup/52-busybox.sh 2007-05-29 17:29:03.000000000 +0200 @@ -0,0 +1,27 @@ +#!/bin/bash + +if use_script busybox; then + if [ ! -x "/usr/bin/busybox" ]; then + echo "[BUSYBOX] No Busybox executable was found" + else + for i in `busybox | grep Curr -A 200 | grep -v "Currently defined f"`; do + DIR=bin + busyfile="${i/,/}" + # skip programs that do not work properly + case $busyfile in + modprobe|fsck|umount|mount) + continue + ;; + esac + if [ -e "bin/$busyfile" ]; then + verbose "[BUSYBOX] replacing $DIR/$busyfile" + rm -f bin/$busyfile + elif [ -e "sbin/$busyfile" ]; then + DIR=sbin + rm -f sbin/$busyfile + verbose "[BUSYBOX] replacing $DIR/$busyfile" + fi + ln -s ../bin/busybox "$DIR/$busyfile" + done + fi +fi ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit mingetty
by root＠Hilbert.suse.de 29 May '07

29 May '07

Hello community, here is the log from the commit of package mingetty checked in at Wed May 30 01:15:28 CEST 2007. -------- --- mingetty/mingetty.changes 2006-05-24 17:16:46.000000000 +0200 +++ /mounts/work_src_done/STABLE/mingetty/mingetty.changes 2007-05-29 17:26:14.174970000 +0200 @@ -1,0 +2,6 @@ +Tue May 29 16:55:52 CEST 2007 - werner(a)suse.de + +- Adopt autologin and other new feature of the other mingetty + at sourceforge. + +------------------------------------------------------------------- Old: ---- mingetty-0.9.6s.dif mingetty-0.9.6s.tar.bz2 New: ---- mingetty-1.0.7s.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ mingetty.spec ++++++ --- /var/tmp/diff_new_pack.r32719/_old 2007-05-30 01:14:57.000000000 +0200 +++ /var/tmp/diff_new_pack.r32719/_new 2007-05-30 01:14:57.000000000 +0200 @@ -1,7 +1,7 @@ # -# spec file for package mingetty (Version 0.9.6s) +# spec file for package mingetty (Version 1.0.7s) # -# Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2007 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. # @@ -11,16 +11,16 @@ # norootforbuild Name: mingetty -License: GPL +License: GNU General Public License (GPL) Group: System/Base Autoreqprov: on -Version: 0.9.6s -Release: 88 +Version: 1.0.7s +Release: 1 Summary: Minimal Getty for Virtual Consoles Only Provides: sysvinit:/sbin/mingetty BuildRoot: %{_tmppath}/%{name}-%{version}-build -Source: mingetty-0.9.6s.tar.bz2 -Patch: mingetty-0.9.6s.dif +Source: mingetty-1.0.7s.tar.bz2 +#Patch: mingetty-1.0.7s.dif %description The mingetty program is a lightweight, minimalist getty program for use @@ -37,10 +37,15 @@ %prep %setup -q -%patch +#%patch %build -make RPM_OPT_FLAGS="${RPM_OPT_FLAGS} -D_FILE_OFFSET_BITS=64" DEFTERM=linux +%ifarch s390 s390x +DEFTERM=dump +%else +DEFTERM=linux +%endif +make RPM_OPT_FLAGS="${RPM_OPT_FLAGS} -D_FILE_OFFSET_BITS=64" DEFTERM=${DEFTERM} %install mkdir -p ${RPM_BUILD_ROOT}{/sbin,%{_mandir}/man8} @@ -51,7 +56,10 @@ /sbin/mingetty %doc %{_mandir}/man8/mingetty.8.gz -%changelog -n mingetty +%changelog +* Tue May 29 2007 - werner(a)suse.de +- Adopt autologin and other new feature of the other mingetty + at sourceforge. * Wed May 24 2006 - schwab(a)suse.de - Don't strip binaries. * Wed Jan 25 2006 - mls(a)suse.de ++++++ mingetty-0.9.6s.tar.bz2 -> mingetty-1.0.7s.tar.bz2 ++++++ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/mingetty-0.9.6s/CHANGES new/mingetty-1.0.7s/CHANGES --- old/mingetty-0.9.6s/CHANGES 2002-11-13 18:14:17.000000000 +0100 +++ new/mingetty-1.0.7s/CHANGES 2007-05-29 17:23:36.000000000 +0200 @@ -30,3 +30,12 @@ Add an old option for avoiding vcs/vcsa hangup, terminal reset, and the usage of the glibc for updating wtmp. Cleanup the source and the manual page. + +* 04/03/30, Werner Fink <werner(a)suse.de> + More about UTF-8: enable the kernel to erease UTF-8 multi byte + characters. Therefore add workaround if glibc bits/termios.h + is missing the IUTF8 input flag. + +* 07/05/29, Werner Fink <werner(a)suse.de> + Adopt autologin and other new feature of the other mingetty + at sourceforge. diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/mingetty-0.9.6s/Makefile new/mingetty-1.0.7s/Makefile --- old/mingetty-0.9.6s/Makefile 2002-11-14 13:29:44.000000000 +0100 +++ new/mingetty-1.0.7s/Makefile 2007-05-29 16:49:01.000000000 +0200 @@ -2,23 +2,27 @@ # # DEFTERM = linux -VERSION = mingetty-0.9.6s +VERSION = mingetty-1.0.7s # DEFINES = -DRESET_TTY=1 -DDEFAULT_TERM=\"$(DEFTERM)\" -DVERSION=\"$(VERSION)\" -CFLAGS = -Wall -O2 -pipe -D_GNU_SOURCE -D_BSD_SOURCE $(DEFINES) +CFLAGS = -Wall $(RPM_OPT_FLAGS) -pipe -D_GNU_SOURCE -D_BSD_SOURCE $(DEFINES) # -LDFLAGS = -Wl,-warn-common -s +LDFLAGS = -Wl,-warn-common CC = gcc +DESTDIR = +MANDIR = /usr/share/man +SBINDIR = /sbin + all: mingetty size mingetty install: all - install -s mingetty /sbin/ - install -m 644 mingetty.8 /usr/share/man/man8/ + install mingetty $(DESTDIR)$(SBINDIR) + install -m 644 mingetty.8 $(DESTDIR)$(MANDIR)/man8/ -mingetty: mingetty.o sigfholder.o -mingetty.o: mingetty.c +mingetty: mingetty.o revoke.o +mingetty.o: mingetty.c revoke.c revoke.h clean: rm -f *.o mingetty diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/mingetty-0.9.6s/mingetty.8 new/mingetty-1.0.7s/mingetty.8 --- old/mingetty-0.9.6s/mingetty.8 2002-11-13 18:05:22.000000000 +0100 +++ new/mingetty-1.0.7s/mingetty.8 2007-05-29 17:14:24.000000000 +0200 @@ -1,12 +1,24 @@ .\" -.TH MINGETTY 8 "12 June 1999" "SuSE" "Linux Programmer's Manual" +.TH MINGETTY 8 "29 May 2007" "SuSE" "Linux Programmer's Manual" .SH NAME mingetty \- minimal getty for consoles .SH SYNOPSIS .B /sbin/mingetty -.RB [ \-\-noclear ]\ [ \-\-noreset ]\ [ \-\-long\-hostname ] -.RB [ \-\-no-hostname ]\ [ \-\-login\ \fIlogin_binary\fP ]\ [ \-\-old ] +.RB [ \-\-noclear ] +.RB [ \-\-nonewline ] +.RB [ \-\-noissue ] +.RB [ \-\-nohangup ] +.RB [ \-\-noreset ] +.RB [ \-\-no\-hostname ] +.RB [ \-\-long-hostname ] +.RB [ \-\-login\ \fIlogin_binary\fP ] .RB [ \-\-logopts\ \fI"login_options"\fP ] +.RB [ \-\-nice\ \fInumber\fP ] +.RB [ \-\-delay\ \fInumber\fP ] +.RB [ \-\-chdir\ \fI/home\fP ] +.RB [ \-\-chroot\ \fI/chroot\fP ] +.RB [ \-\-autologin\ \fIuser\fP ] +.RB [ \-\-old ] .I tty .RI [ term ] .PP @@ -17,7 +29,7 @@ .BR agetty (8), .B mingetty is not suitable for serial lines. -For this purpose the usage +For this purpose the usage of .BR mgetty (8) is recommend. .PP @@ -32,14 +44,24 @@ sane default values. With this option the terminal settings will not be changed. .TP -.B \-\-long\-hostname -By default the hostname is only printed until the first dot. -With this option enabled, the full text from gethostname() is shown. +.B \-\-nonewline +Do not print a newline before writing out /etc/issue. +.TP +.B \-\-noissue +Do not output /etc/issue. +.TP +.B \-\-nohangup +Do not call vhangup() to disable writing to this tty by +other applications. .TP .B \-\-no\-hostname By default the hostname will be printed. With this option enabled, no hostname at all will be shown. .TP +.B \-\-long\-hostname +By default the hostname is only printed until the first dot. +With this option enabled, the full text from gethostname() is shown. +.TP .B \-\-login \fIlogin_binary\fP Use the \fIlogin_binary\fP to log in instead of the default .IR /bin/login . @@ -52,6 +74,24 @@ .IR /bin/login . Please read the SECURITY NOTICE below if you want to use this. .TP +.B \-\-nice 10 +Change the priority by calling nice(). +.TP +.B \-\-delay 5 +Sleep this many seconds after startup of mingetty. +.TP +.B \-\-chdir /home +Change into this directory before calling the login prog. +.TP +.B \-\-chroot /chroot +Call chroot() with this directory name. +.TP +.B \-\-autologin username +Log the specified user automatically in without asking for +a login name and password. Check the \-f option from +.B /bin/login +for this. +.TP .B \-\-old Do not reset the terminal line to standard settings and do not hangup the diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/mingetty-0.9.6s/mingetty.c new/mingetty-1.0.7s/mingetty.c --- old/mingetty-0.9.6s/mingetty.c 2002-11-14 13:32:03.000000000 +0100 +++ new/mingetty-1.0.7s/mingetty.c 2007-05-29 17:06:50.000000000 +0200 @@ -65,78 +65,59 @@ * Add an old option for avoiding vcs/vcsa hangup, terminal * reset, and the usage of the glibc for updating wtmp. * Cleanup the source and the manual page. + * + * Tue Mar 30 13:53:48 CEST 2004 - werner(a)suse.de + * More about UTF-8: enable the kernel to erease UTF-8 multi byte + * characters. Therefore add workaround if glibc bits/termios.h + * is missing the IUTF8 input flag. + * + * Tue May 29 16:55:52 CEST 2007 - Werner Fink <werner(a)suse.de> + * Adopt autologin and other new feature of the other mingetty + * at sourceforge. */ #ifndef VERSION -# define VERSION "mingetty-0.9.6s" +# define VERSION "mingetty-1.0.7s" #endif #ifndef DEFAULT_TERM # define DEFAULT_TERM "linux" #endif -#ifndef DEBUG_THIS -# define DEBUG_THIS 0 -#endif - #include <stdio.h> #include <stdlib.h> #include <unistd.h> -#include <sys/syscall.h> -extern int sigfholder(const char *path, int sig); +#include <termios.h> #include <string.h> -#include <grp.h> #include <sys/ioctl.h> #include <errno.h> -#include <sys/types.h> #include <sys/stat.h> #include <sys/file.h> -#if defined __GLIBC__ && __GLIBC__ >= 2 -# include <signal.h> -#else -# include <sys/signal.h> -#endif +#include <signal.h> #include <fcntl.h> #include <stdarg.h> #include <ctype.h> #include <utmp.h> #include <getopt.h> - -#ifdef RESET_TTY -# if defined __GLIBC__ && __GLIBC__ >= 2 -# include <termios.h> -# else -# include <sys/termios.h> -# endif -# include <sys/ttydefaults.h> -#endif - -#if defined(_BSD_SOURCE) -# define strerror(errno) sys_errlist[(errno)] -#else -# define strerror(errno) strerror((errno)) -#endif - -#ifdef linux #include <sys/param.h> -#define USE_SYSLOG -#endif +#include <syslog.h> +#include <sys/utsname.h> +#include <time.h> +#include <sys/syscall.h> +#include <sys/types.h> +#include <grp.h> +#include <locale.h> +#include <iconv.h> +#include <wctype.h> +#include <sys/kd.h> +#include "revoke.h" - /* If USE_SYSLOG is undefined all diagnostics go directly to /dev/console. */ -#ifdef USE_SYSLOG -# if defined __GLIBC__ && __GLIBC__ >= 2 -# include <sys/syslog.h> -# else -# include <syslog.h> -# endif +#ifndef IUTF8 +# error IUTF8 input flag not defined #endif #define ISSUE "/etc/issue" /* displayed before the login prompt */ -#include <sys/utsname.h> -#include <time.h> - #define LOGIN "login: " /* login prompt */ - #ifndef _PATH_LOGIN #define _PATH_LOGIN "/bin/login" #endif @@ -150,58 +131,54 @@ static struct utsname uts; /* the hostname */ static char hn[MAXHOSTNAMELEN + 1]; -/* process ID of this program */ -static pid_t pid; -/* session ID of this program */ -static pid_t sid; -/* current time */ -static time_t cur_time; -/* do not send a reset string to the terminal ? */ +/* process and session ID of this program */ +static pid_t pid, sid; +/* login program invoked */ +static char *loginprog = _PATH_LOGIN; +/* Do not send a reset string to the terminal. */ static int noclear = 0; +/* Do not print a newline. */ +static int nonewline = 0; +/* Do not print /etc/issue. */ +static int noissue = 0; +/* Do not call vhangup() on the tty. */ +static int nohangup = 0; +/* Do not print any hostname. */ +static int nohostname = 0; /* Print the whole string of gethostname() instead of just until the next "." */ static int longhostname = 0; -/* Do not print the hostname at all */ -static int nohostname = 0; +/* time to wait, seconds */ +static int delay = 0; +/* chroot directory */ +static char *ch_root = NULL; +/* working directory to change into */ +static char *ch_dir = NULL; +/* 'nice' level of the program */ +static int priority = 0; +/* automatic login with this user */ +static char *autologin = NULL; /* do not reset the terminal ? */ static int noreset = 0; -/* login program */ -static char* loginprog; -/* use old behaviour */ +/* current time */ static int old = 0; +/* current time */ +static int mode = K_RAW; /* * output warn/error messages */ static void _vlogger (int priority, const char *fmt, va_list va_alist) { - char buf[256], *bp; -#ifndef USE_SYSLOG - int fd; -#endif + char buf[256] = {'\0'}, *bp = &buf[0]; -#ifdef USE_SYSLOG - buf[0] = '\0'; - bp = buf; -#else strncpy (buf, progname, sizeof(buf) - 4); buf[sizeof(buf) - 5] = '\0'; strcat (buf, ": "); bp = buf + strlen (buf); -#endif - vsnprintf (bp, sizeof(buf)-strlen(buf), fmt, va_alist); - -#ifdef USE_SYSLOG openlog (progname, LOG_PID, LOG_AUTH); syslog (priority, "%s", buf); closelog (); -#else - strcat (bp, "\r\n"); - if ((fd = open ("/dev/console", 1)) >= 0) { - write (fd, buf, strlen (buf)); - close (fd); - } -#endif } /* @@ -240,14 +217,6 @@ return; } -/* - * cry if wtmp can not be locked - */ -static void sigalrm_handler(int signum) -{ - alert("Lock failed on wtmp"); -} - static void sigquit_handler (int signum) { struct sigaction act; sigset_t set; @@ -269,128 +238,6 @@ abort(); } -#ifdef linux -/* - * - */ -static void vcshangup(const gid_t gid) -{ - struct stat st; - char buf[PATH_MAX+1]; - - if (!vcline) - goto skip; - - /* Set up new virtual console text capture devices */ - strncpy (buf, "/dev/vcs", PATH_MAX); - strncat (buf, vcline, PATH_MAX - strlen(buf)); - - if (stat(buf, &st) < 0) { - if (errno != ENOENT) - error ("%s: %s", buf, strerror(errno)); - goto skip; - } - if (chown (buf, 0, gid) || chmod (buf, (gid ? 0660 : 0600))) { - if (errno == EROFS) - warn("%s: %s", buf, strerror(errno)); - else - error ("%s: %s", buf, strerror(errno)); - } -# ifdef __NR_revoke - _syscall(int, revoke, const char*, buf); -# else - if (sigfholder(buf, SIGHUP)) { /* Be nice, send SIGHUP */ - sleep (2); - if (sigfholder(buf, SIGKILL)) /* Hey, go away */ - sigfholder(buf, SIGCONT); - } -# endif /* __NR_revoke */ - - /* Set up new virtual console text/attribute capture devices */ - strncpy (buf, "/dev/vcsa", PATH_MAX); - strncat (buf, vcline, PATH_MAX - strlen(buf)); - - if (stat(buf, &st) < 0) { - if (errno != ENOENT) - error ("%s: %s", buf, strerror(errno)); - goto skip; - } - if (chown (buf, 0, gid) || chmod (buf, (gid ? 0660 : 0600))) { - if (errno == EROFS) - warn("%s: %s", buf, strerror(errno)); - else - error ("%s: %s", buf, strerror(errno)); - } -# ifdef __NR_revoke - _syscall(int, revoke, const char*, buf); -# else - if (sigfholder(buf, SIGHUP)) { /* Be nice, send SIGHUP */ - sleep (2); - if (sigfholder(buf, SIGKILL)) /* Hey, go away */ - sigfholder(buf, SIGCONT); - } -# endif /* __NR_revoke */ -skip: - return; -} - -# ifdef RESET_TTY -static void reset_stdin() -{ - struct termios termios; - /* The above reset only puts the output things into a sane state. - * The input state is not reset. - */ - memset (&termios, 0, sizeof termios); - if (tcgetattr (0, &termios)) - warn ("tcgetattr problem: %s", strerror(errno)); - - /* Use defaults of <sys/ttydefaults.h> for base settings */ - termios.c_iflag |= TTYDEF_IFLAG; - termios.c_oflag |= TTYDEF_OFLAG; - termios.c_lflag |= TTYDEF_LFLAG; - termios.c_cflag |= (TTYDEF_SPEED | TTYDEF_CFLAG); - - /* Sane setting, allow eight bit characters, no carriage return delay - * the same result as `stty sane cr0 pass8' - */ - termios.c_iflag |= (BRKINT | ICRNL | IMAXBEL); - termios.c_iflag &= ~(IGNBRK | INLCR | IGNCR | IXOFF | IUCLC | IXANY | ISTRIP); - termios.c_oflag |= (OPOST | ONLCR | NL0 | CR0 | TAB0 | BS0 | VT0 | FF0); - termios.c_oflag &= ~(OLCUC | OCRNL | ONOCR | ONLRET | OFILL | OFDEL |\ - NLDLY|CRDLY|TABDLY|BSDLY|VTDLY|FFDLY); - termios.c_lflag |= (ISIG | ICANON | IEXTEN | ECHO|ECHOE|ECHOK|ECHOCTL|ECHOKE); - termios.c_lflag &= ~(ECHONL | NOFLSH | XCASE | TOSTOP | ECHOPRT); - termios.c_cflag |= (CREAD | CS8 | B38400); - termios.c_cflag &= ~(PARENB); - - /* VTIME and VMIN can overlap with VEOF and VEOL since they are - * only used for non-canonical mode. We just set the at the - * beginning, so nothing bad should happen. - */ - termios.c_cc[VTIME] = 0; - termios.c_cc[VMIN] = 1; - termios.c_cc[VINTR] = CINTR; - termios.c_cc[VQUIT] = CQUIT; - termios.c_cc[VERASE] = CERASE; /* ASCII DEL (0177) */ - termios.c_cc[VKILL] = CKILL; - termios.c_cc[VEOF] = CEOF; - termios.c_cc[VSWTC] = _POSIX_VDISABLE; - termios.c_cc[VSTART] = CSTART; - termios.c_cc[VSTOP] = CSTOP; - termios.c_cc[VSUSP] = CSUSP; - termios.c_cc[VEOL] = _POSIX_VDISABLE; - termios.c_cc[VREPRINT] = CREPRINT; - termios.c_cc[VDISCARD] = CDISCARD; - termios.c_cc[VWERASE] = CWERASE; - termios.c_cc[VLNEXT] = CLNEXT; - termios.c_cc[VEOL2] = _POSIX_VDISABLE; - if (tcsetattr (0, TCSADRAIN, &termios)) - warn ("tcsetattr problem: %s", strerror(errno)); -} -# endif /* RESET_TTY */ -#endif /* linux */ - /* * update_utmp - update our utmp entry * @@ -404,8 +251,8 @@ static void update_utmp (void) { struct utmp ut; - int ut_fd; struct utmp *utp; + time_t cur_time; utmpname (_PATH_UTMP); setutent (); @@ -417,7 +264,6 @@ memcpy (&ut, utp, sizeof (ut)); } else { /* some inits don't initialize utmp... */ - /* XXX we should print out a warning message */ memset (&ut, 0, sizeof (ut)); if (vcline) /* Standard virtual console devices */ @@ -432,55 +278,42 @@ strncpy (ut.ut_id, ptr, sizeof (ut.ut_id)); } } - endutent (); strncpy (ut.ut_user, "LOGIN", sizeof (ut.ut_user)); strncpy (ut.ut_line, tty, sizeof (ut.ut_line)); + + time (&cur_time); ut.ut_time = cur_time; ut.ut_type = LOGIN_PROCESS; ut.ut_pid = pid; ut.ut_session = sid; - setutent (); pututline (&ut); endutent (); - if (!old) { - /* Default case: Use glibc for updating /var/log/wtmp */ - updwtmp(_PATH_WTMP, &ut); - - } else if ((ut_fd = open (_PATH_WTMP, O_APPEND | O_WRONLY)) >= 0) { - /* Old behaviour */ - (void)signal(SIGALRM, sigalrm_handler); - (void)alarm(3); - flock (ut_fd, LOCK_EX); - (void)alarm(0); - (void)signal(SIGALRM, SIG_DFL); - write (ut_fd, &ut, sizeof (ut)); - flock (ut_fd, LOCK_UN); - close (ut_fd); - } + updwtmp (_PATH_WTMP, &ut); } /* open_tty - set up tty as standard { input, output, error } */ static void open_tty (void) { - struct sigaction sa; + struct sigaction sa, sa_old; sigset_t set; - /* Was `char buf[20];' but there is more than /dev/tty<number> */ char buf[PATH_MAX+1]; - int fd; + int fd, len; gid_t gid = 0; struct group *gr = NULL; - /* Use tty group is available */ + /* Use tty group if available */ if ((gr = getgrnam("tty"))) gid = gr->gr_gid; /* Set up new standard input. */ - if (snprintf(buf, sizeof(buf), "/dev/%s", tty) < 0) { + if (((len = snprintf(buf, sizeof(buf), "/dev/%s", tty)) >= sizeof(buf)) || (len < 0)) error ("%s: %s", buf, strerror(EOVERFLOW)); - } + + /* There is always a race between this reset and the call to + vhangup() that s.o. can use to get access to your tty. */ if (chown (buf, 0, gid) || chmod (buf, (gid ? 0660 : 0600))) { if (errno == EROFS) warn("%s: %s", buf, strerror(errno)); @@ -491,29 +324,31 @@ sa.sa_handler = SIG_IGN; sa.sa_flags = 0; sigemptyset (&sa.sa_mask); - sigaction (SIGHUP, &sa, NULL); + sigaction (SIGHUP, &sa, &sa_old); sa.sa_handler = sigquit_handler; sigaction (SIGQUIT, &sa, NULL); - /* vhangup() will replace all open file descriptors that point to our - controlling tty by a dummy that will deny further reading/writing - to our device. It will also reset the tty to sane defaults, so we - don't have to modify the tty device for sane settings. - We also get a SIGHUP/SIGCONT. + /* vhangup() will replace all open file descriptors in the kernel + that point to our controlling tty by a dummy that will deny + further reading/writing to our device. It will also reset the + tty to sane defaults, so we don't have to modify the tty device + for sane settings. We also get a SIGHUP/SIGCONT. */ if ((fd = open (buf, O_RDWR, 0)) < 0) error ("%s: cannot open tty: %s", buf, strerror(errno)); if (!isatty (fd)) error ("%s: not a tty", buf); - if (vhangup ()) - error ("vhangup() failed"); - /* Get rid of the present stdout/stderr. */ - close (2); - close (1); - close (0); - if (fd > 2) - close (fd); + if (nohangup == 0) { + if (vhangup ()) + error ("%s: vhangup() failed", tty); + /* Get rid of the present stdout/stderr. */ + close (2); + close (1); + close (0); + if (fd > 2) + close (fd); + } if ((fd = open (buf, O_RDWR, 0)) < 0) error ("%s: cannot open tty: %s", buf, strerror(errno)); @@ -532,42 +367,43 @@ if (fd > 2) close (fd); +#ifdef IUTF8 + /* Detect mode of current keyboard setup, e.g. for UTF-8 */ + if (ioctl(0, KDGKBMODE, &mode) < 0) + mode = K_RAW; +#endif + /* Write a reset string to the terminal. This is very linux-specific and should be checked for other systems. */ - if (!noclear) - write (0, "\033c", 2); + if (noclear == 0) + /* don't write a full reset (ESC c) because this leaves the + unicode mode again if the terminal was in unicode mode + and also undos the ESC sequences in CONSOLE_MAGIC which + are needed for some languages/console-fonts. + Just put the cursor to the home position (ESC [ H), + erase everything below the cursor (ESC [ J), and set the + scrolling region to the full window (ESC [ r) */ + write (0, "\033[r\033[H\033[J", 9); -#ifdef linux /* * Only for the standard virtual console devices */ if (!old && vcline) - vcshangup(gid); -#endif + vcshangup(gid, vcline); -#ifdef RESET_TTY /* * The above reset only puts the output things into a sane state. * The input state is not reset. */ if (!noreset && !old) - reset_stdin(); -#endif + reset_stdin(mode); - sa.sa_handler = SIG_DFL; - sa.sa_flags = 0; - sigemptyset (&sa.sa_mask); - sigaction (SIGHUP, &sa, NULL); + sigaction (SIGHUP, &sa_old, NULL); /* Unmask SIGHUP if inherited */ sigemptyset (&set); sigaddset (&set, SIGHUP); sigprocmask (SIG_UNBLOCK, &set, NULL); - -#if DEBUG_THIS - printf ("session=%d, pid=%d, pgid=%d\n", getsid (0), getpid (), - getpgid (0)); -#endif } static void output_special_char (unsigned char c) @@ -589,27 +425,22 @@ printf ("%s", uts.machine); break; case 'o': -#ifdef __USE_GNU printf ("%s", uts.domainname); -#else - printf ("%s", uts.__domainname); -#endif break; case 'd': case 't': { - time_t now; + time_t cur_time; struct tm *tm; - time (&now); - tm = localtime (&now); - if (c == 'd') - /* ISO 8601 */ + time (&cur_time); + tm = localtime (&cur_time); + if (c == 'd') /* ISO 8601 */ printf ("%d-%02d-%02d", 1900 + tm->tm_year, - tm->tm_mon+1, tm->tm_mday); - else - printf ("%02d:%02d:%02d", - tm->tm_hour, tm->tm_min, tm->tm_sec); + tm->tm_mon + 1, tm->tm_mday); + else + printf ("%02d:%02d:%02d", tm->tm_hour, + tm->tm_min, tm->tm_sec); break; } case 'l': @@ -636,72 +467,104 @@ } /* do_prompt - show login prompt, optionally preceded by /etc/issue contents */ -static void do_prompt (void) +static void do_prompt (int showlogin) { -#if ! OLD FILE *fd; -#else - int fd; -#endif int c; - write (1, "\n", 1); /* start a new line */ -#if ! OLD - if ((fd = fopen (ISSUE, "r"))) { + if (nonewline == 0) + putchar ('\n'); + if (noissue == 0 && (fd = fopen (ISSUE, "r"))) { while ((c = getc (fd)) != EOF) { if (c == '\\') - output_special_char (getc(fd)); + output_special_char (getc (fd)); else putchar (c); } - fflush (stdout); fclose (fd); } -#else - if ((fd = open (ISSUE, O_RDONLY)) >= 0) { - close (fd); - } -#endif - if (!nohostname) { - write (1, hn, strlen (hn)); - write (1, " ", 1); - } - write (1, LOGIN, sizeof (LOGIN) - 1); + if (nohostname == 0) + printf ("%s ", hn); + if (showlogin) + printf ("%s", LOGIN); + fflush (stdout); } /* get_logname - get user name, establish speed, erase, kill, eol */ static char *get_logname (void) { - static char logname[40]; + static char logname[4*UT_NAMESIZE]; char *bp; unsigned char c; + int ascii; + iconv_t ic; - /* flush pending input */ -#if defined __GLIBC__ && __GLIBC__ >= 2 - tcflush(0, TCIFLUSH); -#else - ioctl (0, TCFLSH, 0); + tcflush (0, TCIFLUSH); /* flush pending input */ + +#ifdef IUTF8 + /* Check for UTF-8 mode */ + switch(mode) { + case K_UNICODE: + ascii = 0; + setlocale(LC_CTYPE, "en_US.UTF-8"); + break; + case K_RAW: + case K_MEDIUMRAW: + case K_XLATE: + default: + ascii = 1; + setlocale(LC_CTYPE, "POSIX"); + break; + } #endif for (*logname = 0; *logname == 0;) { - do_prompt (); + do_prompt (1); for (bp = logname;;) { if (read (0, &c, 1) < 1) { - if (errno == EINTR || errno == EIO - || errno == ENOENT) - exit (0); - error ("%s: read: %s", tty, strerror(errno)); + if (errno == EINTR || errno == EAGAIN) { + usleep(1000); + continue; + } + if (errno == EIO || errno == ENOENT) + exit (EXIT_SUCCESS); + error ("%s: read: %s", tty, strerror (errno)); } + if (c == '\n' || c == '\r') { *bp = 0; break; - } else if (!isprint (c)) - error ("%s: invalid character for login name", - tty); - else if (bp - logname >= sizeof (logname) - 1) + } + + if (ascii && !isprint (c)) + error ("%s: invalid character 0x%x in login name", tty, c); + + if ((size_t)(bp - logname) >= sizeof (logname) - 1) error ("%s: too long login name", tty); - else - *bp++ = c; + + *bp++ = c; + } + } + + if (!ascii && (ic = iconv_open("WCHAR_T", "UTF-8"))) { + char tmpbuf[4*sizeof(logname)], *op, *lp; + size_t len = bp - logname; + size_t out = sizeof(tmpbuf) - 1; + size_t wcl; + wint_t *wcp; + + op = tmpbuf; + lp = logname; + if ((wcl = iconv(ic , &lp, &len, &op, &out)) == (size_t)-1) + error ("%s: invalid character conversion for login name", tty); + iconv_close(ic); + + wcp = (wint_t*)tmpbuf; + wcp[wcl] = (wint_t)0; + while (*wcp) { + const wint_t wc = *wcp++; + if (!iswprint(wc)) + error ("%s: invalid character 0x%x in login name", tty, wc); } } return logname; @@ -709,82 +572,35 @@ static void usage (void) { - error ("%s: usage: '%s [--noclear] [--noreset] [--long-hostname] [--no-hostname] [--login program] [--logopts \"loginprg opts\"] tty [term]' with e.g. tty=tty1", VERSION, progname); + error ("%s: usage: '%s [--noclear] [--nonewline] [--noissue]" + " [--nohangup] [--noreset] [--no-hostname] [--long-hostname]" + " [--login program] [--logopts \"loginprg opts\"] [--nice 10]" + " [--delay 10] [--chdir /home] [--chroot /chroot] [--autologin user]" + " [--old] tty [term]' with e.g. tty=tty1", VERSION, progname); } static struct option const long_options[] = { - { "noclear", no_argument, &noclear, 1}, - { "long-hostname", no_argument, &longhostname, 1}, - { "no-hostname", no_argument, &nohostname, 1}, - { "noreset", no_argument, &noreset, 1}, - { "login", required_argument, 0, 2}, - { "logopts", required_argument, 0, 3}, - { "old", no_argument, &old, 1}, + { "autologin", required_argument, NULL, 'a' }, + { "chdir", required_argument, NULL, 'w' }, + { "chroot", required_argument, NULL, 'r' }, + { "delay", required_argument, NULL, 'd' }, + { "noclear", no_argument, &noclear, 1 }, + { "nonewline", no_argument, &nonewline, 1 }, + { "noissue", no_argument, &noissue, 1 }, + { "nohangup", no_argument, &nohangup, 1 }, + { "noreset", no_argument, &noreset, 1 }, + { "no-hostname", no_argument, &nohostname, 1 }, + { "nohostname", no_argument, &nohostname, 1 }, /* compat option */ + { "login", required_argument, NULL, 'l' }, + { "loginprog", required_argument, NULL, 'l' }, /* compat option */ + { "loginopts", required_argument, NULL, 'o' }, + { "logopts", required_argument, NULL, 'o' }, + { "long-hostname", no_argument, &longhostname, 1 }, + { "nice", required_argument, NULL, 'n' }, + { "old", no_argument, &old, 1 }, { 0, 0, 0, 0 } }; -/* Don't allow the user to pass an option as a user name */ -/* To be more safe: Use -- to make sure the rest is interpreted - * as non-options by the program, if it supports it */ -static void checkname (char* nm) -{ - char *p = nm; - if (!nm) - goto err; - if (strlen (nm) > 42) - goto err; - while (isspace (*p)) - p++; - if (*p == '-') - goto err; - return; -err: - error ("checkname: %s", strerror(EPERM)); -} - -static void replacename (char** arr, char* nm) -{ - char *p, *tmp; - while ((p = *arr)) { - char *p1 = p; - while (*p1) { - if (memcmp (p1, "\\u", 2) == 0) - { - tmp = malloc (strlen (p) + strlen (nm)); - if (!tmp) - error ("replacename: %s", strerror(errno)); - if (p1 != p) - memcpy (tmp, p, (p1-p)); - *(tmp + (p1-p)) = 0; - strcat (tmp, nm); - strcat (tmp, p1+2); - *arr = tmp; - } - p1++; - } - arr++; - } -} - -#define ARRAY_SIZE_MAX 16 -static void mkarray (char** arr, char* str) -{ - char* p = str; char* start = p; - int i = 0; - while (*p && i < (ARRAY_SIZE_MAX - 2)) - { - if (isspace (*p)) - { - *p = 0; - while (isspace (*++p)); - if (*p) { arr[i++] = start; start = p; }; - } - else - p++; - }; - arr[i++] = start; arr[i++] = 0; -} - /* * main program */ @@ -795,40 +611,66 @@ char *logoptstr; char logcmd[NAME_MAX+1]; char *logarr[ARRAY_SIZE_MAX]; - loginprog = _PATH_LOGIN; logoptstr = "-- \\u"; progname = basename(argv[0]); + if (!progname) + progname = "mingetty"; + uname (&uts); gethostname (hn, MAXHOSTNAMELEN); + hn[MAXHOSTNAMELEN] = '\0'; pid = getpid (); sid = getsid (0); - time (&cur_time); - while ((c = getopt_long (argc, argv, "", long_options, (int *) 0)) + while ((c = getopt_long (argc, argv, "a:d:l:n:w:r:", long_options, (int *) 0)) != EOF) { switch (c) { - case 0: - break; - case 2: - loginprog = optarg; break; - case 3: - logoptstr = optarg; break; - default: - usage (); + case 0: + break; + case 'a': + if (!optarg) usage (); + autologin = optarg; + break; + case 'd': + if (!optarg) usage (); + delay = atoi (optarg); + break; + case 'l': + if (!optarg) usage (); + loginprog = optarg; + break; + case 'o': + if (!optarg) usage (); + logoptstr = optarg; + break; + case 'n': + if (!optarg) usage (); + priority = atoi (optarg); + break; + case 'r': + if (!optarg) usage (); + ch_root = optarg; + break; + case 'w': + if (!optarg) usage (); + ch_dir = optarg; + break; + default: + usage (); } } - if (!longhostname && (s = strchr(hn, '.'))) + if (longhostname == 0 && (s = strchr (hn, '.'))) *s = '\0'; tty = argv[optind++]; if (!tty) usage (); - /* Skip the "/dev/", we may add it later */ + /* Skip the "/dev/", we add it later */ if (strncmp (tty, "/dev/", 5) == 0) tty += 5; - /* On virtual console remeber the line which is used for */ + /* On virtual console remember the line which is used for */ if (strncmp(tty, "tty", 3) == 0 && strspn(tty + 3, "0123456789") == strlen(tty+3)) vcline = tty+3; @@ -839,30 +681,40 @@ setenv("TERM", DEFAULT_TERM, 1); update_utmp (); + if (delay) + sleep (delay); open_tty (); /* flush input and output queues, important for modems */ -#if defined __GLIBC__ && __GLIBC__ >= 2 tcflush(0, TCIOFLUSH); -#else - ioctl (0, TCFLSH, 2); -#endif - while ((logname = get_logname ()) == 0); + if (autologin) { + do_prompt (0); + printf ("%s%s (automatic login)\n", LOGIN, autologin); + logname = autologin; + logoptstr = "-f \\u"; + } else { + while ((logname = get_logname ()) == 0) + /* do nothing */ ; + } + strncpy (logcmd, loginprog, NAME_MAX); strncat (logcmd, " ", NAME_MAX - strlen(logcmd)); strncat (logcmd, logoptstr, NAME_MAX - strlen(logcmd)); - mkarray (logarr, logcmd); checkname (logname); + mkarray (logarr, logcmd); replacename (logarr, logname); -#if DEBUG_THIS - printf ("About to execute %s", logcmd); - c = 1; while (logarr[c]) printf (" `%s'", logarr[c++]); - printf ("\n"); sleep (1); -#endif + if (ch_root) + chroot (ch_root); + if (ch_dir) + chdir (ch_dir); + if (priority) + nice (priority); + execv (loginprog, logarr); - error ("%s: can't exec %s: %s", tty, loginprog, strerror(errno)); - sleep (1); exit (0); + error ("%s: can't exec %s: %s", tty, loginprog, strerror (errno)); + sleep (1); + exit (EXIT_FAILURE); } diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/mingetty-0.9.6s/revoke.c new/mingetty-1.0.7s/revoke.c --- old/mingetty-0.9.6s/revoke.c 1970-01-01 01:00:00.000000000 +0100 +++ new/mingetty-1.0.7s/revoke.c 2007-05-29 16:51:29.000000000 +0200 @@ -0,0 +1,310 @@ +#include <ctype.h> +#include <dirent.h> +#include <errno.h> +#include <fcntl.h> +#include <string.h> +#include <signal.h> +#include <stdlib.h> +#include <stdio.h> +#include <termios.h> +#include <unistd.h> +#include <sys/kd.h> +#include <sys/param.h> +#include <sys/stat.h> +#include <sys/syscall.h> +#include <sys/types.h> +#include "revoke.h" +static int sigfholder(const char *path, int sig); + +#ifdef TEST +#define error(fmt,args...) syslog(LOG_ERR,fmt,args);exit(1) +#define warn(fmt,args...) syslog(LOG_WARN,fmt,args) +#else +extern void error (const char *fmt, ...); +extern void warn (const char *fmt, ...); +#endif + +#ifndef IUTF8 +# error IUTF8 input flag not defined +#endif + +/* + * Hang up any vcs terminal line + */ +void vcshangup(const gid_t gid, const char * const vcline) +{ + struct stat st; + char buf[PATH_MAX+1]; + + if (!vcline) + goto skip; + + /* Set up new virtual console text capture devices */ + strncpy (buf, "/dev/vcs", PATH_MAX); + strncat (buf, vcline, PATH_MAX - strlen(buf)); + + if (stat(buf, &st) < 0) { + if (errno != ENOENT) + error ("%s: %s", buf, strerror(errno)); + goto skip; + } + if (chown (buf, 0, gid) || chmod (buf, (gid ? 0660 : 0600))) { + if (errno == EROFS) + warn("%s: %s", buf, strerror(errno)); + else + error ("%s: %s", buf, strerror(errno)); + } +# ifdef __NR_revoke + _syscall(int, revoke, const char*, buf); +# else + if (sigfholder(buf, SIGHUP)) { /* Be nice, send SIGHUP */ + sleep (2); + if (sigfholder(buf, SIGKILL)) /* Hey, go away */ + sigfholder(buf, SIGCONT); + } +# endif /* __NR_revoke */ + + /* Set up new virtual console text/attribute capture devices */ + strncpy (buf, "/dev/vcsa", PATH_MAX); + strncat (buf, vcline, PATH_MAX - strlen(buf)); + + if (stat(buf, &st) < 0) { + if (errno != ENOENT) + error ("%s: %s", buf, strerror(errno)); + goto skip; + } + if (chown (buf, 0, gid) || chmod (buf, (gid ? 0660 : 0600))) { + if (errno == EROFS) + warn("%s: %s", buf, strerror(errno)); + else + error ("%s: %s", buf, strerror(errno)); + } +# ifdef __NR_revoke + _syscall(int, revoke, const char*, buf); +# else + if (sigfholder(buf, SIGHUP)) { /* Be nice, send SIGHUP */ + sleep (2); + if (sigfholder(buf, SIGKILL)) /* Hey, go away */ + sigfholder(buf, SIGCONT); + } +# endif /* __NR_revoke */ +skip: + return; +} + +/* + * Reset terminal on stdin + */ +void reset_stdin(const int mode) +{ + struct termios termios; + /* The above reset only puts the output things into a sane state. + * The input state is not reset. + */ + memset (&termios, 0, sizeof termios); + if (tcgetattr (0, &termios)) + warn ("tcgetattr problem: %s", strerror(errno)); + + /* Use defaults of <sys/ttydefaults.h> for base settings */ + termios.c_iflag |= TTYDEF_IFLAG; + termios.c_oflag |= TTYDEF_OFLAG; + termios.c_lflag |= TTYDEF_LFLAG; + termios.c_cflag |= (TTYDEF_SPEED | TTYDEF_CFLAG); + + /* Sane setting, allow eight bit characters, no carriage return delay + * the same result as `stty sane cr0 pass8' + */ + termios.c_iflag |= (BRKINT | ICRNL | IMAXBEL); + termios.c_iflag &= ~(IGNBRK | INLCR | IGNCR | IXOFF | IUCLC | IXANY | ISTRIP); + termios.c_oflag |= (OPOST | ONLCR | NL0 | CR0 | TAB0 | BS0 | VT0 | FF0); + termios.c_oflag &= ~(OLCUC | OCRNL | ONOCR | ONLRET | OFILL | OFDEL |\ + NLDLY|CRDLY|TABDLY|BSDLY|VTDLY|FFDLY); + termios.c_lflag |= (ISIG | ICANON | IEXTEN | ECHO|ECHOE|ECHOK|ECHOCTL|ECHOKE); + termios.c_lflag &= ~(ECHONL | NOFLSH | XCASE | TOSTOP | ECHOPRT); + termios.c_cflag |= (CREAD | CS8 | B38400); + termios.c_cflag &= ~(PARENB); +#ifdef IUTF8 + /* Set UTF-8 input flag */ + switch(mode) { + case K_UNICODE: + termios.c_iflag |= IUTF8; + break; + case K_RAW: + case K_MEDIUMRAW: + case K_XLATE: + default: + termios.c_iflag &= ~IUTF8; + break; + } +#endif + /* VTIME and VMIN can overlap with VEOF and VEOL since they are + * only used for non-canonical mode. We just set the at the + * beginning, so nothing bad should happen. + */ + termios.c_cc[VTIME] = 0; + termios.c_cc[VMIN] = 1; + termios.c_cc[VINTR] = CINTR; + termios.c_cc[VQUIT] = CQUIT; + termios.c_cc[VERASE] = CERASE; /* ASCII DEL (0177) */ + termios.c_cc[VKILL] = CKILL; + termios.c_cc[VEOF] = CEOF; + termios.c_cc[VSWTC] = _POSIX_VDISABLE; + termios.c_cc[VSTART] = CSTART; + termios.c_cc[VSTOP] = CSTOP; + termios.c_cc[VSUSP] = CSUSP; + termios.c_cc[VEOL] = _POSIX_VDISABLE; + termios.c_cc[VREPRINT] = CREPRINT; + termios.c_cc[VDISCARD] = CDISCARD; + termios.c_cc[VWERASE] = CWERASE; + termios.c_cc[VLNEXT] = CLNEXT; + termios.c_cc[VEOL2] = _POSIX_VDISABLE; + if (tcsetattr (0, TCSADRAIN, &termios)) + warn ("tcsetattr problem: %s", strerror(errno)); +} + +/* + * Don't allow the user to pass an option as a user name + * To be more safe: Use -- to make sure the rest is interpreted + * as non-options by the program, if it supports it + */ +void checkname (const char* nm) +{ + const char *p = nm; + if (!nm) + goto err; + if (strlen (nm) > 42) + goto err; + while (isspace (*p)) + p++; + if (*p == '-') + goto err; + return; +err: + error ("checkname: %s", strerror(EPERM)); +} + +void replacename (char** arr, const char* nm) +{ + const char *p; + char *tmp; + while ((p = *arr)) { + const char *p1 = p; + while (*p1) { + if (memcmp (p1, "\\u", 2) == 0) { + tmp = malloc (strlen (p) + strlen (nm)); + if (!tmp) + error ("replacename: %s", strerror(errno)); + if (p1 != p) + memcpy (tmp, p, (p1-p)); + *(tmp + (p1-p)) = 0; + strcat (tmp, nm); + strcat (tmp, p1+2); + *arr = tmp; + } + p1++; + } + arr++; +} +} + +void mkarray (char** arr, char* str) +{ + char* p = str; + char* start = p; + int i = 0; + + while (*p && i < (ARRAY_SIZE_MAX - 2)) { + if (isspace (*p)) { + *p = 0; + while (isspace (*++p)) + ; + if (*p) { + arr[i++] = start; + start = p; + } + } else + p++; + } + arr[i++] = start; + arr[i++] = (char*)0; +} + +static int sigfholder(const char *path, int sig) +{ + char buf[MAXNAMLEN], *ptr; + pid_t pid; + DIR *proc, *fds; + struct dirent *task, *fd; + FILE *fp; + struct stat st, lnk; + int cnt = 0; + + if ((proc = opendir("/proc")) == (DIR *)0) { + error("cannot opendir(/proc): %s\n", strerror(errno)); + } + + if (stat(path, &st) < 0) { + error("cannot stat %s: %s\n", path, strerror(errno)); + } + + while((task = readdir(proc)) != (struct dirent *)0) { + pid = (pid_t)atoi(task->d_name); + + if (pid == 0 || pid == getpid() || pid == getppid()) + continue; + + (void) strcpy(buf,"/proc/"); + (void) strcat(strcat(buf, task->d_name), "/maps"); + if ((fp = fopen(buf,"r")) == (FILE*)0) { + if (errno != ENOENT) + warn("cannot open(%s): %s\n", buf, strerror(errno)); + continue; + } + while ((fgets(buf, MAXNAMLEN, fp))) { + ptr = strrchr(buf, ' '); + if (*(++ptr) == '/' && strncmp(path, ptr, strlen(ptr)-1) == 0) { + kill(pid, sig); + cnt++; + goto out_maps; + } + } + out_maps: + fclose(fp); + + (void) strcpy(buf,"/proc/"); + (void) strcat(strcat(buf, task->d_name), "/fd"); + if ((fds = opendir(buf)) == (DIR *)0) { + if (errno != ENOENT && errno != EPERM) + warn("cannot opendir(%s): %s\n", buf, strerror(errno)); + continue; + } + ptr = strcat(buf, "/"); + ptr = ptr + strlen(buf); + while ((fd = readdir(fds)) != (struct dirent *)0) { + if (*fd->d_name == '.') + continue; + (void) strcpy(ptr, fd->d_name); + if (stat(buf, &lnk) < 0) { + continue; + } + if (st.st_dev == lnk.st_dev && st.st_ino == lnk.st_ino) { + kill(pid, sig); + cnt++; + goto out_fds; + } + } + out_fds: + closedir(fds); + } + closedir(proc); + return cnt; +} + +#ifdef TEST +int main (int argc, char * argv[]) +{ + if (++argv && *argv && (*argv)[0] != '\0') + printf("%d\n", sigfholder(*argv, SIGHUP)); + return 0; +} +#endif diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/mingetty-0.9.6s/revoke.h new/mingetty-1.0.7s/revoke.h --- old/mingetty-0.9.6s/revoke.h 1970-01-01 01:00:00.000000000 +0100 +++ new/mingetty-1.0.7s/revoke.h 2007-05-29 16:51:10.000000000 +0200 @@ -0,0 +1,16 @@ +#ifndef _SIGFHOLDER_H +#define _SIGFHOLDER_H +extern void vcshangup(const gid_t gid, const char * const vcline); +extern void reset_stdin(const int mode); +extern void checkname (const char* nm); +extern void replacename (char** arr, const char* nm); +#define ARRAY_SIZE_MAX 16 +extern void mkarray (char** arr, char* str); +#ifndef IUTF8 +# ifndef ASM_IUTF8 +# error IUTF8 input flag not defined +# else +# define IUTF8 ASM_IUTF8 +# endif +#endif +#endif /* _SIGFHOLDER_H */ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/mingetty-0.9.6s/sigfholder.c new/mingetty-1.0.7s/sigfholder.c --- old/mingetty-0.9.6s/sigfholder.c 2002-03-27 10:57:06.000000000 +0100 +++ new/mingetty-1.0.7s/sigfholder.c 1970-01-01 01:00:00.000000000 +0100 @@ -1,103 +0,0 @@ -#include <sys/types.h> -#include <sys/stat.h> -#include <signal.h> -#include <dirent.h> -#include <syslog.h> -#include <errno.h> -#include <string.h> -#include <stdlib.h> -#include <stdio.h> -#include <unistd.h> -#include <fcntl.h> - -#ifdef TEST -#define error(fmt,args...) syslog(LOG_ERR,fmt,args);exit(1) -#define warn(fmt,args...) syslog(LOG_WARN,fmt,args) -#else -extern void error (const char *fmt, ...); -extern void warn (const char *fmt, ...); -#endif - -#ifdef TEST -static int sigfholder(const char *path, int sig) -#else -int sigfholder(const char *path, int sig) -#endif -{ - char buf[MAXNAMLEN], *ptr; - pid_t pid; - DIR *proc, *fds; - struct dirent *task, *fd; - FILE *fp; - struct stat st, lnk; - int cnt = 0; - - if ((proc = opendir("/proc")) == (DIR *)0) { - error("cannot opendir(/proc): %s\n", strerror(errno)); - } - - if (stat(path, &st) < 0) { - error("cannot stat %s: %s\n", path, strerror(errno)); - } - - while((task = readdir(proc)) != (struct dirent *)0) { - pid = (pid_t)atoi(task->d_name); - - if (pid == 0 || pid == getpid() || pid == getppid()) - continue; - - (void) strcpy(buf,"/proc/"); - (void) strcat(strcat(buf, task->d_name), "/maps"); - if ((fp = fopen(buf,"r")) == (FILE*)0) { - if (errno != ENOENT) - warn("cannot open(%s): %s\n", buf, strerror(errno)); - continue; - } - while ((fgets(buf, MAXNAMLEN, fp))) { - ptr = strrchr(buf, ' '); - if (*(++ptr) == '/' && strncmp(path, ptr, strlen(ptr)-1) == 0) { - kill(pid, sig); - cnt++; - goto out_maps; - } - } - out_maps: - fclose(fp); - - (void) strcpy(buf,"/proc/"); - (void) strcat(strcat(buf, task->d_name), "/fd"); - if ((fds = opendir(buf)) == (DIR *)0) { - if (errno != ENOENT && errno != EPERM) - warn("cannot opendir(%s): %s\n", buf, strerror(errno)); - continue; - } - ptr = strcat(buf, "/"); - ptr = ptr + strlen(buf); - while ((fd = readdir(fds)) != (struct dirent *)0) { - if (*fd->d_name == '.') - continue; - (void) strcpy(ptr, fd->d_name); - if (stat(buf, &lnk) < 0) { - continue; - } - if (st.st_dev == lnk.st_dev && st.st_ino == lnk.st_ino) { - kill(pid, sig); - cnt++; - goto out_fds; - } - } - out_fds: - closedir(fds); - } - closedir(proc); - return cnt; -} - -#ifdef TEST -int main (int argc, char * argv[]) -{ - if (++argv && *argv && (*argv)[0] != '\0') - printf("%d\n", sigfholder(*argv, SIGHUP)); - return 0; -} -#endif ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit kst
by root＠Hilbert.suse.de 29 May '07

29 May '07

Hello community, here is the log from the commit of package kst checked in at Wed May 30 01:14:45 CEST 2007. -------- --- KDE/kst/kst.changes 2007-05-23 12:55:19.000000000 +0200 +++ /mounts/work_src_done/STABLE/kst/kst.changes 2007-05-29 14:36:27.838014000 +0200 @@ -1,0 +2,5 @@ +Tue May 29 14:36:01 CEST 2007 - coolo(a)suse.de + +- fix translations handling + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kst.spec ++++++ --- /var/tmp/diff_new_pack.z25577/_old 2007-05-30 01:13:47.000000000 +0200 +++ /var/tmp/diff_new_pack.z25577/_new 2007-05-30 01:13:47.000000000 +0200 @@ -22,10 +22,11 @@ Group: Productivity/Scientific/Math Summary: Real-Time Data Viewing and Plotting Tool with Basic Data Analysis Functionality Version: 1.3.1 -Release: 55 +Release: 59 URL: http://extragear.kde.org/apps/kst/ BuildRoot: %{_tmppath}/%{name}-%{version}-build Source0: %name-%version.tar.gz +Requires: %{name}-lang = %{version} %description Kst is a data plotting and viewing program. Some of the features @@ -58,6 +59,45 @@ Andrew Walker <arwalker(a)sumusltd.com> Rick Chern <rchern(a)interchange.ubc.ca> +%if %suse_version > 1020 +%lang_package +%endif +%package devel +Summary: Real-Time Data Viewing and Plotting Tool with Basic Data Analysis Functionality +Group: Productivity/Scientific/Math +Requires: kst = %{version} + +%description devel +Kst is a data plotting and viewing program. Some of the features + include: - Robust plotting of live "streaming" data + +- Powerful keyboard and mouse plot manipulation + +- Powerful plug-in and extension support + +- Large selection of built-in plotting and data manipulation + functions, such as histograms, equations, and power spectra + +- Color mapping and contour mapping capabilities for + three-dimensional data + +- Monitoring of events and notification support + +- Built-in filtering and curve fitting capabilities + +- Convenient command line interface + +- Powerful graphical user interface + + + +Authors: +-------- + C. Barth Netterfield <kst(a)omega.astro.utoronto.ca> + George Staikos <staikos(a)kde.org> + Andrew Walker <arwalker(a)sumusltd.com> + Rick Chern <rchern(a)interchange.ubc.ca> + %prep %setup -q . /etc/opt/kde3/common_options @@ -77,6 +117,8 @@ %fdupes $RPM_BUILD_ROOT %endif +%find_lang %name +%find_lang kstplugineditor %name.lang %post %run_ldconfig @@ -86,8 +128,15 @@ %clean rm -rf ${RPM_BUILD_ROOT} +%if %suse_version > 1020 + +%files -f %name.lang lang %files +%else + +%files -f %name.lang +%endif %defattr(-,root,root) /opt/kde3/bin/d2asc /opt/kde3/bin/kst @@ -101,11 +150,9 @@ /opt/kde3/share/apps/kconf_update/kstautosave11.upd /opt/kde3/share/apps/kconf_update/kstrcmisc11.upd /opt/kde3/share/apps/kst -/opt/kde3/share/doc/HTML /opt/kde3/share/icons/*/*/*/addelogentry.* /opt/kde3/share/icons/*/*/*/kst* /opt/kde3/share/icons/*/*/*/launchelogbrowser.* -/opt/kde3/share/locale /opt/kde3/share/mimelnk/application/x-kst.desktop /opt/kde3/share/services/kst /opt/kde3/share/servicetypes/kst @@ -113,6 +160,8 @@ /opt/kde3/share/config/colors %changelog +* Tue May 29 2007 - coolo(a)suse.de +- fix translations handling * Wed May 23 2007 - stbinner(a)suse.de - use %%fupes - add missing ldconfig run calls ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit libreadline-java
by root＠Hilbert.suse.de 29 May '07

29 May '07

Hello community, here is the log from the commit of package libreadline-java checked in at Wed May 30 01:14:43 CEST 2007. -------- --- libreadline-java/libreadline-java.changes 2007-05-02 11:53:45.000000000 +0200 +++ /mounts/work_src_done/STABLE/libreadline-java/libreadline-java.changes 2007-05-29 18:41:08.000000000 +0200 @@ -1,0 +2,5 @@ +Tue May 29 18:40:54 CEST 2007 - dbornkessel(a)suse.de + +- added gjdoc and fastjar to BuildRequires + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libreadline-java.spec ++++++ --- /var/tmp/diff_new_pack.d26186/_old 2007-05-30 01:14:02.000000000 +0200 +++ /var/tmp/diff_new_pack.d26186/_new 2007-05-30 01:14:02.000000000 +0200 @@ -12,14 +12,14 @@ # icecream 0 Name: libreadline-java -BuildRequires: java-1_4_2-gcj-compat-devel readline-devel termcap unzip xerces-j2 +BuildRequires: fastjar gjdoc java-1_4_2-gcj-compat-devel readline-devel termcap unzip xerces-j2 %define name libreadline-java %define version 0.8.0 %define readline_ver 4.3 %define release 9jpp %define section free Version: 0.8.0 -Release: 72 +Release: 87 Summary: Java Wrapper for the GNU Readline Library License: GNU Library General Public License v. 2.0 and 2.1 (LGPL) Source0: http://download.sourceforge.net/java-readline/libreadline-java-0.8.0-src.ta… @@ -107,6 +107,8 @@ %{_javadocdir}/%{name}-%{version} %changelog +* Tue May 29 2007 - dbornkessel(a)suse.de +- added gjdoc and fastjar to BuildRequires * Wed May 02 2007 - dbornkessel(a)suse.de - added unzip to BuildRequires * Wed Feb 14 2007 - dbornkessel(a)suse.de ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit kcall
by root＠Hilbert.suse.de 29 May '07

29 May '07

Hello community, here is the log from the commit of package kcall checked in at Wed May 30 01:13:37 CEST 2007. -------- --- KDE/kcall/kcall.changes 2007-03-09 10:51:30.000000000 +0100 +++ /mounts/work_src_done/STABLE/kcall/kcall.changes 2007-05-29 15:24:06.000000000 +0200 @@ -1,0 +2,5 @@ +Tue May 29 15:23:52 CEST 2007 - dmueller(a)suse.de + +- remove deep copy of ilbc libraries (#273191) + +------------------------------------------------------------------- New: ---- system-gsm.diff system-ilbc.diff ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kcall.spec ++++++ --- /var/tmp/diff_new_pack.X23079/_old 2007-05-30 01:13:19.000000000 +0200 +++ /var/tmp/diff_new_pack.X23079/_new 2007-05-30 01:13:19.000000000 +0200 @@ -11,7 +11,7 @@ # norootforbuild Name: kcall -BuildRequires: kdelibs3-devel kdepim3-devel +BuildRequires: ilbc kdelibs3-devel kdepim3-devel libgsm-devel %if %suse_version < 1010 BuildRequires: openssl-devel %endif @@ -20,13 +20,15 @@ Group: Productivity/Telephony/SIP/Clients Summary: SIP (Voice over IP) Solution for KDE and Kontact Version: 0.5.2svn20060206 -Release: 71 +Release: 101 BuildRoot: %{_tmppath}/%{name}-%{version}-build Requires: kdelibs3 >= %( echo `rpm -q --queryformat '%{VERSION}' kdelibs3`) Source0: %name-%version.tar.bz2 Patch0: kcall_dont_kill_kontact.diff Patch1: fix-auth-request.diff Patch2: kontact-356-plugin.diff +Patch3: system-ilbc.diff +Patch4: system-gsm.diff %description KCall is the telephony application of Kontact. It supports computer @@ -46,6 +48,9 @@ %setup -q %patch0 %patch1 +%patch3 +# system gsm libs seem to be broken ATM +# %patch4 %if %suse_version > 1020 %patch2 %endif @@ -93,6 +98,8 @@ %endif %changelog +* Tue May 29 2007 - dmueller(a)suse.de +- remove deep copy of ilbc libraries (#273191) * Fri Mar 09 2007 - stbinner(a)suse.de - fix build (new icon location check) * Fri Feb 09 2007 - stbinner(a)suse.de ++++++ kontact-356-plugin.diff ++++++ --- /var/tmp/diff_new_pack.X23079/_old 2007-05-30 01:13:19.000000000 +0200 +++ /var/tmp/diff_new_pack.X23079/_new 2007-05-30 01:13:19.000000000 +0200 @@ -1,13 +1,13 @@ ---- kcall/kcall/src/Makefile.am 2007/02/01 12:29:45 1.1 -+++ kcall/kcall/src/Makefile.am 2007/02/01 12:30:00 +--- kcall/kcall/src/Makefile.am ++++ kcall/kcall/src/Makefile.am @@ -74,4 +74,4 @@ kcall_partiface_DIR = $(top_srcdir)/kcall/src servicedir = $(kde_servicesdir)/kontact -service_DATA = kcallplugin.desktop +service_DATA = kcallplugin.desktop kcallplugin356.desktop ---- kcall/kcall/src/kcallplugin356.desktop 2007/02/01 12:29:41 1.1 -+++ kcall/kcall/src/kcallplugin356.desktop 2007/02/01 12:30:13 +--- kcall/kcall/src/kcallplugin356.desktop ++++ kcall/kcall/src/kcallplugin356.desktop @@ -0,0 +1,48 @@ +[Desktop Entry] +Encoding=UTF-8 ++++++ system-gsm.diff ++++++ --- kcall/applet/Makefile.am +++ kcall/applet/Makefile.am @@ -1,3 +1,3 @@ #SUBDIRS = $(TOPSUBDIRS) -SUBDIRS= kcallsipsettings gsm dissipate2 audio kcall icons +SUBDIRS= kcallsipsettings dissipate2 audio kcall icons --- kcall/applet/audio/Makefile.am +++ kcall/applet/audio/Makefile.am @@ -8,4 +8,4 @@ libkcallaudio_la_SOURCES = audiobuffer.cpp audiobuffer.h callaudio.cpp callaudio dspaudioout.h dspout.cpp dspout.h dspoutoss.cpp dspoutoss.h\ dspoutrtp.cpp dspoutrtp.h dtmfgenerator.cpp dtmfgenerator.h g711.cpp\ g711.h kphoneconst.h rtpdataheader.h -libkcallaudio_la_LIBADD = ../gsm/libgsm.la -lilbc +libkcallaudio_la_LIBADD = -lgsm -lilbc --- kcall/applet/kcall/Makefile.am +++ kcall/applet/kcall/Makefile.am @@ -25,7 +25,7 @@ bin_PROGRAMS = kcallapplet kcallapplet_SOURCES = main.cpp kcall.cpp callmanager.cpp diallist.cpp kcallcore.cpp \ ksipauthentication.cpp incomingdialog.ui kcallcore.skel dialdialog.ui kcallapplet_LDFLAGS = $(KDE_RPATH) $(all_libraries) -kcallapplet_LDADD = ../kcallsipsettings/libkcallsipsettings.la -lilbc ../gsm/libgsm.la \ +kcallapplet_LDADD = ../kcallsipsettings/libkcallsipsettings.la -lilbc -lgsm \ ../dissipate2/libdissipate2.la ../audio/libkcallaudio.la $(LIB_DCOP) $(LIB_KIO) $(LIB_ARTS) \ $(LIB_KDEUI) ++++++ system-ilbc.diff ++++++ --- kcall/applet/Makefile.am +++ kcall/applet/Makefile.am @@ -1,3 +1,3 @@ #SUBDIRS = $(TOPSUBDIRS) -SUBDIRS= kcallsipsettings ilbc gsm dissipate2 audio kcall icons +SUBDIRS= kcallsipsettings gsm dissipate2 audio kcall icons --- kcall/applet/audio/Makefile.am +++ kcall/applet/audio/Makefile.am @@ -8,4 +8,4 @@ dspaudioout.h dspout.cpp dspout.h dspoutoss.cpp dspoutoss.h\ dspoutrtp.cpp dspoutrtp.h dtmfgenerator.cpp dtmfgenerator.h g711.cpp\ g711.h kphoneconst.h rtpdataheader.h -libkcallaudio_la_LIBADD = ../gsm/libgsm.la ../ilbc/libilbc.la +libkcallaudio_la_LIBADD = ../gsm/libgsm.la -lilbc --- kcall/applet/audio/dspoutrtp.h +++ kcall/applet/audio/dspoutrtp.h @@ -8,9 +8,11 @@ #include "../gsm/gsm.h" #include "../gsm/private.h" -#include "../ilbc/iLBC_define.h" -#include "../ilbc/iLBC_encode.h" -#include "../ilbc/iLBC_decode.h" +extern "C" { +#include <ilbc/iLBC_define.h> +#include <ilbc/iLBC_encode.h> +#include <ilbc/iLBC_decode.h> +} #include "../dissipate2/udpmessagesocket.h" #include "dspout.h" #include "callaudio.h" --- kcall/applet/kcall/Makefile.am +++ kcall/applet/kcall/Makefile.am @@ -2,7 +2,7 @@ INCLUDES = -I../kcallsipsettings -I$(srcdir)/../kcallsipsettings -I$(srcdir)/../audio \ -I$(srcdir)/../dissipate2 -I../gsm \ - -I../ilbc $(all_includes) + -I/usr/include/ilbc $(all_includes) # these are the headers for your project noinst_HEADERS = kcall.h callmanager.h diallist.h kcallcore.h \ @@ -25,7 +25,7 @@ kcallapplet_SOURCES = main.cpp kcall.cpp callmanager.cpp diallist.cpp kcallcore.cpp \ ksipauthentication.cpp incomingdialog.ui kcallcore.skel dialdialog.ui kcallapplet_LDFLAGS = $(KDE_RPATH) $(all_libraries) -kcallapplet_LDADD = ../kcallsipsettings/libkcallsipsettings.la ../ilbc/libilbc.la ../gsm/libgsm.la \ +kcallapplet_LDADD = ../kcallsipsettings/libkcallsipsettings.la -lilbc ../gsm/libgsm.la \ ../dissipate2/libdissipate2.la ../audio/libkcallaudio.la $(LIB_DCOP) $(LIB_KIO) $(LIB_ARTS) \ $(LIB_KDEUI) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit yast2-http-server
by root＠Hilbert.suse.de 29 May '07

29 May '07

Hello community, here is the log from the commit of package yast2-http-server checked in at Wed May 30 01:13:19 CEST 2007. -------- --- yast2-http-server/yast2-http-server.changes 2007-05-11 14:32:16.000000000 +0200 +++ /mounts/work_src_done/NOARCH/yast2-http-server/yast2-http-server.changes 2007-05-29 09:10:52.000000000 +0200 @@ -1,0 +2,6 @@ +Tue May 29 09:08:05 CEST 2007 - mzugec(a)suse.cz + +- improved workflow dialogs (host/hosts) +- 2.15.4 + +------------------------------------------------------------------- Old: ---- yast2-http-server-2.15.3.tar.bz2 New: ---- yast2-http-server-2.15.4.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-http-server.spec ++++++ --- /var/tmp/diff_new_pack.K14427/_old 2007-05-30 01:12:44.000000000 +0200 +++ /var/tmp/diff_new_pack.K14427/_new 2007-05-30 01:12:44.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package yast2-http-server (Version 2.15.3) +# spec file for package yast2-http-server (Version 2.15.4) # # Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine @@ -11,12 +11,12 @@ # norootforbuild Name: yast2-http-server -Version: 2.15.3 +Version: 2.15.4 Release: 1 License: GNU General Public License (GPL) Group: System/YaST BuildRoot: %{_tmppath}/%{name}-%{version}-build -Source0: yast2-http-server-2.15.3.tar.bz2 +Source0: yast2-http-server-2.15.4.tar.bz2 prefix: /usr BuildRequires: docbook-xsl-stylesheets doxygen libxslt libzio perl-XML-Writer popt-devel sgml-skel update-desktop-files yast2 yast2-devtools yast2-dns-server yast2-network yast2-packagemanager-devel yast2-perl-bindings yast2-testsuite Requires: yast2 yast2-network yast2-perl-bindings libzio yast2-dns-server @@ -35,7 +35,7 @@ Stanislav Visnovsky <visnov(a)suse.cz> %prep -%setup -n yast2-http-server-2.15.3 +%setup -n yast2-http-server-2.15.4 %build %{prefix}/bin/y2tool y2autoconf @@ -72,6 +72,9 @@ %doc %{prefix}/share/doc/packages/yast2-http-server %changelog +* Tue May 29 2007 - mzugec(a)suse.cz +- improved workflow dialogs (host/hosts) +- 2.15.4 * Fri May 11 2007 - mzugec(a)suse.cz - validation for VhostID when create new virtual host (#245155) - 2.15.3 ++++++ yast2-http-server-2.15.3.tar.bz2 -> yast2-http-server-2.15.4.tar.bz2 ++++++ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-http-server-2.15.3/configure new/yast2-http-server-2.15.4/configure --- old/yast2-http-server-2.15.3/configure 2007-05-11 14:25:59.000000000 +0200 +++ new/yast2-http-server-2.15.4/configure 2007-05-29 09:07:30.000000000 +0200 @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.60 for yast2-http-server 2.15.2. +# Generated by GNU Autoconf 2.60 for yast2-http-server 2.15.3. # # Report bugs to <http://bugs.opensuse.org/>. # @@ -559,8 +559,8 @@ # Identity of this package. PACKAGE_NAME='yast2-http-server' PACKAGE_TARNAME='yast2-http-server' -PACKAGE_VERSION='2.15.2' -PACKAGE_STRING='yast2-http-server 2.15.2' +PACKAGE_VERSION='2.15.3' +PACKAGE_STRING='yast2-http-server 2.15.3' PACKAGE_BUGREPORT='http://bugs.opensuse.org/' ac_unique_file="RPMNAME" @@ -1181,7 +1181,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-http-server 2.15.2 to adapt to many kinds of systems. +\`configure' configures yast2-http-server 2.15.3 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1252,7 +1252,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of yast2-http-server 2.15.2:";; + short | recursive ) echo "Configuration of yast2-http-server 2.15.3:";; esac cat <<\_ACEOF @@ -1330,7 +1330,7 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -yast2-http-server configure 2.15.2 +yast2-http-server configure 2.15.3 generated by GNU Autoconf 2.60 Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, @@ -1344,7 +1344,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-http-server $as_me 2.15.2, which was +It was created by yast2-http-server $as_me 2.15.3, which was generated by GNU Autoconf 2.60. Invocation command line was $ $0 $@ @@ -2145,7 +2145,7 @@ # Define the identity of the package. PACKAGE='yast2-http-server' - VERSION='2.15.2' + VERSION='2.15.3' cat >>confdefs.h <<_ACEOF @@ -2372,7 +2372,7 @@ -VERSION="2.15.2" +VERSION="2.15.3" RPMNAME="yast2-http-server" MAINTAINER="Michal Zugec <mzugec(a)suse.cz>" @@ -3258,7 +3258,7 @@ # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by yast2-http-server $as_me 2.15.2, which was +This file was extended by yast2-http-server $as_me 2.15.3, which was generated by GNU Autoconf 2.60. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -3301,7 +3301,7 @@ _ACEOF cat >>$CONFIG_STATUS <<_ACEOF ac_cs_version="\\ -yast2-http-server config.status 2.15.2 +yast2-http-server config.status 2.15.3 configured by $0, generated by GNU Autoconf 2.60, with options \\"`echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\" diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-http-server-2.15.3/configure.in new/yast2-http-server-2.15.4/configure.in --- old/yast2-http-server-2.15.3/configure.in 2007-05-11 14:25:55.000000000 +0200 +++ new/yast2-http-server-2.15.4/configure.in 2007-05-29 09:07:26.000000000 +0200 @@ -3,7 +3,7 @@ dnl -- This file is generated by y2autoconf 2.14.0 - DO NOT EDIT! -- dnl (edit configure.in.in instead) -AC_INIT(yast2-http-server, 2.15.2, http://bugs.opensuse.org/, yast2-http-server) +AC_INIT(yast2-http-server, 2.15.3, http://bugs.opensuse.org/, yast2-http-server) 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.15.2" +VERSION="2.15.3" RPMNAME="yast2-http-server" MAINTAINER="Michal Zugec <mzugec(a)suse.cz>" diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-http-server-2.15.3/src/dialogs.ycp new/yast2-http-server-2.15.4/src/dialogs.ycp --- old/yast2-http-server-2.15.3/src/dialogs.ycp 2007-02-22 16:19:43.000000000 +0100 +++ new/yast2-http-server-2.15.4/src/dialogs.ycp 2007-05-29 09:08:49.000000000 +0200 @@ -5,7 +5,7 @@ * Authors: Jiri Srain <jsrain(a)suse.cz> * Stanislav Visnovsky <visnov(a)suse.cz> * - * $Id: dialogs.ycp 36405 2007-02-22 15:17:37Z mzugec $ + * $Id: dialogs.ycp 38165 2007-05-29 07:08:50Z mzugec $ */ { @@ -257,7 +257,7 @@ // translators: dialog caption, %1 is the host name string caption = sformat( _("SSL Configuration for '%1'"), // translators: human-readable "default host" - HttpServerWidgets::currenthost == "defaulthost" ? _("Default Host") + HttpServerWidgets::currenthost == "main" ? _("Default Host") : HttpServerWidgets::get_host_value ( "ServerName" , YaST::HTTPDData::GetHost(HttpServerWidgets::currenthost), HttpServerWidgets::currenthost ) ); diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-http-server-2.15.3/src/HttpServerWidgets.ycp new/yast2-http-server-2.15.4/src/HttpServerWidgets.ycp --- old/yast2-http-server-2.15.3/src/HttpServerWidgets.ycp 2007-05-11 14:30:16.000000000 +0200 +++ new/yast2-http-server-2.15.4/src/HttpServerWidgets.ycp 2007-05-29 09:08:49.000000000 +0200 @@ -5,7 +5,7 @@ * Authors: Jiri Srain <jsrain(a)suse.cz> * Stanislav Visnovsky <visnov(a)suse.cz> * - * $Id: HttpServerWidgets.ycp 37934 2007-05-11 12:30:09Z mzugec $ + * $Id: HttpServerWidgets.ycp 38165 2007-05-29 07:08:50Z mzugec $ */ { @@ -202,7 +202,6 @@ // skip ourself also when this is main server if (( host == hostid ) || (hostid == "main")) continue; if (host == "main") continue; -// list< map<string,any> > desc = YaST::HTTPDData::GetHost (host); // find out the server name string value = (string)get_host_value ( "ServerName", YaST::HTTPDData::GetHost (host), nil ); if (value == servername) @@ -214,7 +213,6 @@ break; } -// value = (string)get_host_value ("HostIP", desc, nil); map<string, any> vhost = YaST::HTTPDData::GetVhostType(host); if (! FileUtils::CheckAndCreatePath( documentroot )){ @@ -319,12 +317,6 @@ ]); return nil; } -//symbol showAccessLogPopup (any key, map event); -//symbol showErrorLogPopup (any key, map event); - -//list <string> host_ids = nil; - -//void OverviewInit (string widget) { } /** * Handle overview (listen) widget @@ -636,8 +628,6 @@ global void storeServiceStatus (string key, map event); global void initAdaptFirewall (string key); global void storeAdaptFirewall (string opt_id, map event); -//global void DirectoryOptionInit (any key, string id); -//global void DirectoryOptionStore (any key, string id); // wizard widget functions global void initOpenPort (string key); @@ -647,10 +637,9 @@ global boolean validateListenInterfaces(string key, map event); global void initFwOpen (string key); global void storeFwOpen (string opt_id, map event); -//void initExpertConf (string key); global symbol handleExpertConf (string key, map event); void initScriptModules(string key); -void initSummaryText(string key); +void initSummaryText(string key); global symbol handleBooting (string key, map event); global map getHostOptions(boolean is_main_server); boolean getServiceAutoStart(); @@ -677,8 +666,6 @@ // table cell description "label" : _("Server Name"), "widget" : `textentry, -// "validate_type" : `function, -// "validate_function" : validate_servername, ], ], "DocumentRoot" : $[ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-http-server-2.15.3/src/wizards.ycp new/yast2-http-server-2.15.4/src/wizards.ycp --- old/yast2-http-server-2.15.3/src/wizards.ycp 2007-02-22 16:29:41.000000000 +0100 +++ new/yast2-http-server-2.15.4/src/wizards.ycp 2007-05-29 09:08:49.000000000 +0200 @@ -4,7 +4,7 @@ * Summary: Wizards definitions * Authors: Stanislav Visnovsky <visnov(a)suse.cz> * - * $Id: wizards.ycp 32565 2006-08-25 08:10:40Z mzugec $ + * $Id: wizards.ycp 38165 2007-05-29 07:08:50Z mzugec $ */ { @@ -20,45 +20,24 @@ include "http-server/dialogs.ycp"; include "http-server/wizard-dialog.ycp"; +define symbol MainSequence(); -/** - * Main workflow of the http-server configuration - * @return sequence result - */ -symbol MainSequence() { +symbol VirtualHostSequence(string action){ map aliases = $[ - "overview" : ``( OverviewDialog() ), "host" : ``( HostDialog() ), - "main-host" : ``( HostDialog() ), // different workflow "addhost" : ``( AddHost() ), "setvhost" : ``( SetVHostOptions() ), "ssl" : ``( SSLDialog () ), "dir" : ``( DirDialog () ), - "ssl-default" : ``( SSLDialog () ), ]; + string def = (action=="add")?"addhost":"host"; map sequence = $[ - "ws_start" : "overview", - "overview" : $[ - `abort : `abort, - `next : `next, - `default : "main-host", -// `hosts : "hosts", - `dir : "dir", - `ssl : "ssl-default", - `edit : "host", - `add : "addhost", - ], - "ssl-default" : $[ - `abort : `abort, - `next : "main-host", - `back : "main-host", - ], + "ws_start" : def, "host" : $[ `abort : `abort, - `next : "overview", -// `back : "hosts", + `next : `next, //"overview", `ssl : "ssl", `dir : "dir" ], @@ -66,11 +45,10 @@ "addhost": $[ `abort : `abort, `next : "setvhost", -// `back : "hosts", ], "setvhost": $[ `abort : `abort, - `next : "overview", + `next : `next, //"overview", `back : "addhost" ], "ssl": $[ @@ -85,6 +63,51 @@ ] ]; + return Sequencer::Run(aliases, sequence); +} + +/** + * Main workflow of the http-server configuration + * @return sequence result + */ +symbol MainSequence() { + + map aliases = $[ + "overview" : ``( OverviewDialog() ), + "addhost" : ``( AddHost() ), + "setvhost" : ``( SetVHostOptions() ), + "dir" : ``( DirDialog () ), + "add-vh" : [ ``( VirtualHostSequence("add")), true ], + "edit-vh" : [ ``( VirtualHostSequence("edit")), true ] + ]; + + map sequence = $[ + "ws_start" : "overview", + "overview" : $[ + `abort : `abort, + `next : `next, + `dir : "dir", + `edit : "edit-vh", + `add : "add-vh", + ], + "add-vh" : $[ + `next : "overview" //`next + ], + "edit-vh" : $[ + `next : "overview" //`next + ], + "setvhost": $[ + `abort : `abort, + `next : "overview", + `back : "addhost" + ], + "dir": $[ + `abort : `abort, + `next : "overview", + `back : "overview" + ] + ]; + symbol ret = Sequencer::Run(aliases, sequence); return ret; diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-http-server-2.15.3/VERSION new/yast2-http-server-2.15.4/VERSION --- old/yast2-http-server-2.15.3/VERSION 2007-05-11 14:26:44.000000000 +0200 +++ new/yast2-http-server-2.15.4/VERSION 2007-05-29 09:07:57.000000000 +0200 @@ -1 +1 @@ -2.15.3 +2.15.4 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit apparmor-profiles
by root＠Hilbert.suse.de 29 May '07

29 May '07

Hello community, here is the log from the commit of package apparmor-profiles checked in at Wed May 30 01:11:37 CEST 2007. -------- --- apparmor-profiles/apparmor-profiles.changes 2007-05-25 23:47:11.000000000 +0200 +++ /mounts/work_src_done/NOARCH/apparmor-profiles/apparmor-profiles.changes 2007-05-29 20:39:58.560940000 +0200 @@ -1,0 +2,5 @@ +Tue May 29 20:39:28 CEST 2007 - srarnold(a)suse.de + +- small update from Marius Tomaschewski for syslog-ng + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ apparmor-profiles.spec ++++++ --- /var/tmp/diff_new_pack.AN1199/_old 2007-05-30 01:11:31.000000000 +0200 +++ /var/tmp/diff_new_pack.AN1199/_new 2007-05-30 01:11:31.000000000 +0200 @@ -16,7 +16,7 @@ %endif Summary: AppArmor profiles that are loaded into the apparmor kernel module Version: 2.0.2 -Release: 13 +Release: 15 Group: Productivity/Security Source0: %{name}-%{version}-702.tar.gz License: GNU General Public License (GPL) @@ -76,6 +76,8 @@ %preun %changelog +* Tue May 29 2007 - srarnold(a)suse.de +- small update from Marius Tomaschewski for syslog-ng * Fri May 25 2007 - srarnold(a)suse.de - replace /proc/ with @{PROC} from sbeattie * Wed May 23 2007 - srarnold(a)suse.de ++++++ apparmor-profiles-2.0.2-702.tar.gz ++++++ ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit installation-images
by root＠Hilbert.suse.de 29 May '07

29 May '07

Hello community, here is the log from the commit of package installation-images checked in at Wed May 30 01:09:01 CEST 2007. -------- --- installation-images/installation-images.changes 2007-05-25 16:21:00.000000000 +0200 +++ /mounts/work_src_done/STABLE/installation-images/installation-images.changes 2007-05-29 16:57:15.000000000 +0200 @@ -1,0 +2,6 @@ +Tue May 29 16:57:12 CEST 2007 - snwint(a)suse.de + +- yast2-network added +- create_interface script removed + +------------------------------------------------------------------- Old: ---- installation-images-9.72.tar.bz2 New: ---- installation-images-9.73.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ installation-images.spec ++++++ --- /var/tmp/diff_new_pack.gX3289/_old 2007-05-30 01:08:00.000000000 +0200 +++ /var/tmp/diff_new_pack.gX3289/_new 2007-05-30 01:08:00.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package installation-images (Version 9.72) +# spec file for package installation-images (Version 9.73) # # Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine @@ -12,7 +12,7 @@ Name: installation-images BuildRequires: Crystalcursors IPAGothic KhmerOS-fonts adaptec-firmware ash autoyast2-installation baekmuk-ttf bc blueprint-cursor-theme bootsplash bootsplash-theme-SuSE bootsplash-theme-SuSE-SLES cifs-mount cron cups-libs ddrescue dhcpcd dmraid dump ed efont-unicode eject evms-gui fbiterm finger fonts-arabic fonts-config fonts-thai freefont gdb glibc-i18ndata hex icmpinfo indic-fonts initviocons iputils joe kdelibs3 krb5-devel libidn libjpeg-devel libpng-devel links linuxrc lvm2 mdadm mingetty mtools multipath-tools nasm netcat netpbm nfs-utils nscd ntfsprogs openslp-server openssh pcmciautils pcre-devel perl-Compress-Zlib popt-devel pothana2000 qlogic-firmware recode rsh rsync sbl screen scsi setserial smartmontools sysconfig syslogd tcpd-devel telnet telnet-server termcap terminfo ttf-founder-simplified usbutils wget xfsdump -BuildRequires: yast2-add-on yast2-mouse yast2-qt yast2-repair yast2-runlevel yast2-slp yast2-storage-evms yast2-trans-allpacks yast2-trans-stats yast2-tune yast2-update +BuildRequires: yast2-add-on yast2-mouse yast2-network yast2-qt yast2-repair yast2-runlevel yast2-slp yast2-storage-evms yast2-trans-allpacks yast2-trans-stats yast2-tune yast2-update BuildRequires: aaa_base audit-libs boost busybox checkmedia dejavu dmapi dosfstools ethtool evms fvwm2 hfsutils kernel-binary-packages libelf libicu libzypp open-iscsi openct pciutils pcsc-lite perl-HTML-Parser resmgr sqlite util-linux util-linux-crypto BuildRequires: bootsplash-theme-SuSE-NLD gpg jfsutils sax2-tools suse-build-key yast2-iscsi-client yast2-ncurses BuildRequires: tightvnc xkeyboard-config xmset xorg-x11 xorg-x11-Xnest xorg-x11-Xvfb xorg-x11-fonts xorg-x11-fonts-core xorg-x11-libICE xorg-x11-libSM xorg-x11-libX11 xorg-x11-libXau xorg-x11-libXdmcp xorg-x11-libXext xorg-x11-libXfixes xorg-x11-libXmu xorg-x11-libXp xorg-x11-libXpm xorg-x11-libXrender xorg-x11-libXt xorg-x11-libfontenc xorg-x11-libxcb xorg-x11-libxkbfile xterm @@ -66,9 +66,9 @@ Obsoletes: y2image Autoreqprov: off Summary: Installation Image Files -Version: 9.72 +Version: 9.73 Release: 1 -Source: installation-images-9.72.tar.bz2 +Source: installation-images-9.73.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-build %define _binary_payload w.ufdio @@ -322,6 +322,9 @@ /CD1 %changelog +* Tue May 29 2007 - snwint(a)suse.de +- yast2-network added +- create_interface script removed * Fri May 25 2007 - snwint(a)suse.de - MemYaSTText option no longer exists * Thu May 24 2007 - snwint(a)suse.de ++++++ installation-images-9.72.tar.bz2 -> installation-images-9.73.tar.bz2 ++++++ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/installation-images-9.72/Changelog new/installation-images-9.73/Changelog --- old/installation-images-9.72/Changelog 2007-05-25 16:19:12.000000000 +0200 +++ new/installation-images-9.73/Changelog 2007-05-29 16:56:24.000000000 +0200 @@ -1,3 +1,7 @@ +29/5/2007: v9.73 + - yast2-network added + - create_interface script removed + 25/5/2007: v9.72 - MemYaSTText option no longer exists diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/installation-images-9.72/data/rescue/rescue.file_list new/installation-images-9.73/data/rescue/rescue.file_list --- old/installation-images-9.72/data/rescue/rescue.file_list 2007-05-23 11:36:15.000000000 +0200 +++ new/installation-images-9.73/data/rescue/rescue.file_list 2007-05-29 16:29:50.000000000 +0200 @@ -344,7 +344,6 @@ portmap: postin /etc /sbin - /usr/sbin /var/adm/fillup-templates e postin diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/installation-images-9.72/data/root/root.file_list new/installation-images-9.73/data/root/root.file_list --- old/installation-images-9.72/data/root/root.file_list 2007-05-23 11:36:17.000000000 +0200 +++ new/installation-images-9.73/data/root/root.file_list 2007-05-29 16:23:20.000000000 +0200 @@ -368,8 +368,10 @@ / yast2-ncurses: / -# yast2-packagemanager: -# / + yast2-network: + # /usr/share/YaST2/include/network/install.ycp + # /usr/share/YaST2/modules/NetworkStorage.* + / yast2-packager: / yast2-perl-bindings: @@ -817,10 +819,8 @@ x /usr/lib/YaST/.Reh /usr/lib/YaST2 x etc/inst_setup /sbin/inst_setup -x etc/create_interface /sbin/create_interface x etc/adddir /sbin/adddir c 755 0 0 /sbin/inst_setup -c 755 0 0 /sbin/create_interface c 755 0 0 /sbin/adddir if root_i18n diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/installation-images-9.72/VERSION new/installation-images-9.73/VERSION --- old/installation-images-9.72/VERSION 2007-05-25 16:18:25.000000000 +0200 +++ new/installation-images-9.73/VERSION 2007-05-29 16:55:45.000000000 +0200 @@ -1 +1 @@ -9.72 +9.73 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit insserv
by root＠Hilbert.suse.de 29 May '07

29 May '07

Hello community, here is the log from the commit of package insserv checked in at Wed May 30 01:07:52 CEST 2007. -------- --- insserv/insserv.changes 2007-01-29 16:58:50.000000000 +0100 +++ /mounts/work_src_done/STABLE/insserv/insserv.changes 2007-05-29 17:45:32.041729000 +0200 @@ -1,0 +2,5 @@ +Tue May 29 17:45:06 CEST 2007 - werner(a)suse.de + +- Ignore rcs-files (bug #278520) + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ insserv.spec ++++++ --- /var/tmp/diff_new_pack.W29761/_old 2007-05-30 01:07:31.000000000 +0200 +++ /var/tmp/diff_new_pack.W29761/_new 2007-05-30 01:07:31.000000000 +0200 @@ -16,7 +16,7 @@ Provides: aaa_base:/sbin/insserv Autoreqprov: on Version: 1.09.0 -Release: 3 +Release: 19 Summary: A Program to Arrange Initialization Scripts Source0: insserv-%{version}.tar.bz2 Source1: insserv.conf @@ -53,7 +53,9 @@ /usr/lib/lsb/* %{_mandir}/man8/insserv.8.gz -%changelog -n insserv +%changelog +* Tue May 29 2007 - werner(a)suse.de +- Ignore rcs-files (bug #278520) * Mon Jan 29 2007 - werner(a)suse.de - Split insserv.conf off from source tar ball to avoid patching - Add boot.crypto to $local_fs ++++++ insserv-1.09.0.dif ++++++ --- /var/tmp/diff_new_pack.W29761/_old 2007-05-30 01:07:31.000000000 +0200 +++ /var/tmp/diff_new_pack.W29761/_new 2007-05-30 01:07:31.000000000 +0200 @@ -1,5 +1,5 @@ --- insserv.c -+++ insserv.c 2007-01-22 15:20:38.000000000 +0100 ++++ insserv.c 2007-05-29 17:43:38.421665572 +0200 @@ -57,12 +57,16 @@ static const int map_runlevel_to_seek(co /* The main regular search expressions */ #define PROVIDES COMM "provides" VALUE @@ -174,7 +174,21 @@ xreset(script_inf.default_start); xreset(script_inf.default_stop); xreset(script_inf.description); -@@ -1897,6 +1953,16 @@ int main (int argc, char *argv[]) +@@ -1389,6 +1445,13 @@ static int cfgfile_filter(const struct d + return 0; + } + } ++ if ((end = strrchr(d->d_name, ','))) { ++ end++; ++ if (!strcmp(end, "v")) /* rcs-files */ ++ { ++ return 0; ++ } ++ } + return 1; + } + +@@ -1897,6 +1960,16 @@ int main (int argc, char *argv[]) rememberreq(service, REQ_SHLD, script_inf.should_start); requiresv(token, script_inf.should_start); } @@ -191,7 +205,7 @@ #ifndef SUSE /* * required_stop and should_stop arn't used in SuSE Linux. -@@ -1911,6 +1977,16 @@ int main (int argc, char *argv[]) +@@ -1911,6 +1984,16 @@ int main (int argc, char *argv[]) rememberreq(service, REQ_SHLD, script_inf.should_stop); requiresv(token, script_inf.should_stop); } @@ -208,7 +222,7 @@ #endif /* not SUSE */ } /* -@@ -2082,6 +2158,8 @@ int main (int argc, char *argv[]) +@@ -2082,6 +2165,8 @@ int main (int argc, char *argv[]) xreset(script_inf.required_stop); xreset(script_inf.should_start); xreset(script_inf.should_stop); ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit gwget
by root＠Hilbert.suse.de 29 May '07

29 May '07

Hello community, here is the log from the commit of package gwget checked in at Wed May 30 01:07:25 CEST 2007. -------- --- GNOME/gwget/gwget.changes 2007-05-19 16:56:41.000000000 +0200 +++ /mounts/work_src_done/STABLE/gwget/gwget.changes 2007-05-29 14:47:08.999964000 +0200 @@ -1,0 +2,18 @@ +Tue May 29 11:53:49 CEST 2007 - lmichnovic(a)suse.cz + +- update to version 0.99 + * Support for Epiphany 2.17 and 2.18 obsoletes epiphany218.patch + * Check for MD5 Sum in the properties window + * Put a clear completed download toolbar icon + * Add -d or --destination-dir option for set the destination + directory of the url passed in the command line. + * Use of gtkstatusicon and libnotify for notificacion instead of + libegg. + Fixes: + * Download command line url even if it is the first instance + * Correct the use when gnome proxy settings is used + * Reduce the syncs with gconf. Useful with a large download list + * Provide a dbus service file. + * Preferences window could become innacesible. + +------------------------------------------------------------------- Old: ---- gwget-0.98.2.tar.bz2 gwget-epiphany218.patch New: ---- gwget-0.99.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ gwget.spec ++++++ --- /var/tmp/diff_new_pack.m22023/_old 2007-05-30 01:07:04.000000000 +0200 +++ /var/tmp/diff_new_pack.m22023/_new 2007-05-30 01:07:04.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package gwget (Version 0.98.2) +# spec file for package gwget (Version 0.99) # # Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine @@ -15,14 +15,13 @@ License: GNU General Public License (GPL) Group: Productivity/Networking/Web/Utilities Requires: wget -Version: 0.98.2 -Release: 45 +Version: 0.99 +Release: 1 Summary: Front-End for wget Written in GTK+ URL: http://gnome.org/projects/gwget/ PreReq: filesystem gconf2 Source: %{name}-%{version}.tar.bz2 Source1: %{name}.desktop -Patch1: %{name}-epiphany218.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build Autoreqprov: on @@ -40,7 +39,6 @@ %prep %setup -q -%patch1 cp %{S:1} . %build @@ -59,7 +57,7 @@ # Static libs are unusefull rm $RPM_BUILD_ROOT%{_libdir}/*/*/*/*.*a # No library is installed, don't install headers: -rm -r $RPM_BUILD_ROOT%{_includedir} +rm -rf $RPM_BUILD_ROOT%{_includedir} %clean rm -rf $RPM_BUILD_ROOT @@ -78,8 +76,24 @@ %{_datadir}/gwget %{_datadir}/pixmaps/%{name}*.* %{_libdir}/epiphany/*/*/*.* +/usr/share/dbus-1/services/org.gnome.gwget.service %changelog +* Tue May 29 2007 - lmichnovic(a)suse.cz +- update to version 0.99 + * Support for Epiphany 2.17 and 2.18 obsoletes epiphany218.patch + * Check for MD5 Sum in the properties window + * Put a clear completed download toolbar icon + * Add -d or --destination-dir option for set the destination + directory of the url passed in the command line. + * Use of gtkstatusicon and libnotify for notificacion instead of + libegg. + Fixes: + * Download command line url even if it is the first instance + * Correct the use when gnome proxy settings is used + * Reduce the syncs with gconf. Useful with a large download list + * Provide a dbus service file. + * Preferences window could become innacesible. * Sat May 19 2007 - coolo(a)suse.de - remove X-SuSE-translate from desktop file * Mon Apr 23 2007 - lmichnovic(a)suse.cz ++++++ gwget-0.98.2.tar.bz2 -> gwget-0.99.tar.bz2 ++++++ ++++ 18914 lines of diff (skipped) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit dx
by root＠Hilbert.suse.de 29 May '07

29 May '07

Hello community, here is the log from the commit of package dx checked in at Wed May 30 01:05:05 CEST 2007. -------- --- dx/dx.changes 2007-05-23 17:02:57.000000000 +0200 +++ /mounts/work_src_done/STABLE/dx/dx.changes 2007-05-29 19:20:04.000000000 +0200 @@ -1,0 +2,11 @@ +Tue May 29 19:18:32 CEST 2007 - lmichnovic(a)suse.cz + +- splitted off devel sub package +- fixed strange name of man page and installing to %_mandir + (manpage.patch) +- using Recommends tag for subpackages +- using fdupes +- defining includedir and libdir of X due to change of prefix in + X.org 7.x + +------------------------------------------------------------------- New: ---- dx-4.4.4-manpage.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ dx.spec ++++++ --- /var/tmp/diff_new_pack.P13267/_old 2007-05-30 01:01:56.000000000 +0200 +++ /var/tmp/diff_new_pack.P13267/_new 2007-05-30 01:01:56.000000000 +0200 @@ -16,8 +16,9 @@ %if %suse_version > 1000 BuildRequires: libdrm-devel %endif +BuildRequires: fdupes Version: 4.4.4 -Release: 57 +Release: 58 Summary: IBM Open Visualization Data Explorer License: IBM Public License Group: Productivity/Graphics/Visualization/Other @@ -35,10 +36,12 @@ Patch5: dx-%{version}-return_value.patch Patch6: dx-%{version}-increment.patch Patch7: dx-%{version}-undefined_code.patch +Patch8: dx-%{version}-manpage.patch Patch20: dxsamples-%{samplesversion}-java.patch Patch21: dxsamples-%{samplesversion}-DESTDIR.patch Patch22: dxsamples-%{samplesversion}-rights.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build +Recommends: dx-data=%{version}, dx-doc=%{version}, dx-devel=%{version} %description The Open Visualization Data Explorer is a visualization framework that @@ -57,7 +60,7 @@ Summary: Additional Package Documentation for dx Group: Productivity/Graphics/Visualization/Other Provides: dxdoc -Requires: dx +Requires: dx=%{version} Obsoletes: dxdoc %description doc @@ -74,9 +77,9 @@ Summary: Sample data for the IBM Open Visualization Data Explorer Group: Productivity/Graphics/Visualization/Other Provides: dxdata -Requires: dx +Requires: dx=%{version} Obsoletes: dxdata -Autoreqprov: no +Autoreqprov: on %description data This package contains some sample data for the IBM Open Visualization @@ -88,6 +91,22 @@ -------- (C) COPYRIGHT International Business Machines Corp. 1991-1997 +%package devel +Summary: Headers, static libs and source code files for the IBM Open Visualization Data Explorer +Group: Productivity/Graphics/Visualization/Other +Requires: dx=%{version} +Autoreqprov: on + +%description devel +This package contains header C files, static libraries and source code +files for the IBM Open Visualization Data Explorer. + + + +Authors: +-------- + (C) COPYRIGHT International Business Machines Corp. 1991-1997 + %prep %setup -q -b 1 %patch0 @@ -98,7 +117,12 @@ %patch5 %patch6 %patch7 -# +%patch8 +# gzip the man page and rename it correctly +# when doing this be sure patch8 (*manpage.patch) is applied +mv man/manl/dx.l man/manl/dx.1 +gzip -9 man/manl/dx.1 +# samples cd ../dxsamples-%{samplesversion} %patch20 %patch21 @@ -110,10 +134,17 @@ aclocal autoheader automake -a -i +# automake doing strange things in Makefile.in, fixing in install: autoconf +%if "%(xft-config --prefix)" == "/usr" CFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing -fsigned-char" \ CXXFLAGS="$RPM_OPT_FLAGS -fno-exceptions -fno-strict-aliasing -fsigned-char" \ -./configure --prefix=/opt --bindir=%{_prefix}/bin/ --libdir=%{_libdir} +./configure --prefix=/opt --x-includes=/usr/include --x-libraries=%{_libdir} +%else +CFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing -fsigned-char" \ +CXXFLAGS="$RPM_OPT_FLAGS -fno-exceptions -fno-strict-aliasing -fsigned-char" \ +./configure --prefix=/opt +%endif # don't use make %{?jobs:-j%jobs}, it will fail make # @@ -144,25 +175,36 @@ install -d $RPM_BUILD_ROOT/usr/bin ln -sf /opt/dx/bin/dx $RPM_BUILD_ROOT/usr/bin/dx rm -f $RPM_BUILD_ROOT/opt/bin/dx +# workaround for that strange renaming in Makefile.in made by autoconf +mv $RPM_BUILD_ROOT/usr/share/man/mang $RPM_BUILD_ROOT/usr/share/man/man1 %suse_update_desktop_file -i dx Education Science Math +%fdupes -s $RPM_BUILD_ROOT + %clean rm -rf $RPM_BUILD_ROOT %files %defattr(-,root,root,755) %doc AUTHORS COPYING ChangeLog LICENSE NEWS README* +%doc /usr/share/man/man1/dx.1.gz /usr/bin/dx /usr/share/applications/dx.desktop /opt/dx/bin/ /opt/dx/bin_linux/ /opt/dx/fonts/ /opt/dx/help/ -/opt/dx/include/ /opt/dx/java/ /opt/dx/lib/ /opt/dx/lib_linux/ +# .la files go into devel %exclude /opt/dx/lib_linux/*.la +# header files goes into devel +%exclude /opt/dx/include +# .la files go into devel +%exclude /opt/dx/lib_linux +# source code goes into devel +%exclude /opt/dx/lib/outboard.c /opt/dx/man/ /opt/dx/ui/ %dir /opt/dx/ @@ -175,8 +217,31 @@ %files data %defattr(-,root,root,755) /opt/dx/samples/ +# source code files goes into devel +%exclude /opt/dx/samples/*/*.c +%exclude /opt/dx/samples/*/*/*.c +%exclude /opt/dx/samples/*/*/*.h +%exclude /opt/dx/samples/*/*/*/*.c + +%files devel +%defattr(-,root,root,755) +/opt/dx/include +/opt/dx/lib_linux +/opt/dx/lib/outboard.c +/opt/dx/samples/*/*.c +/opt/dx/samples/*/*/*.c +/opt/dx/samples/*/*/*.h +/opt/dx/samples/*/*/*/*.c %changelog +* Tue May 29 2007 - lmichnovic(a)suse.cz +- splitted off devel sub package +- fixed strange name of man page and installing to %%_mandir + (manpage.patch) +- using Recommends tag for subpackages +- using fdupes +- defining includedir and libdir of X due to change of prefix in + X.org 7.x * Wed May 23 2007 - lmichnovic(a)suse.cz - installing to /opt (it is O.K. with FHS) * Fri Apr 27 2007 - lmichnovic(a)suse.cz ++++++ dx-4.4.4-manpage.patch ++++++ --- man/manl/Makefile.am +++ man/manl/Makefile.am @@ -1,6 +1,6 @@ ## Process this file with automake to produce Makefile.in -mandir = $(prefix)/dx/man +mandir = /usr/share/man -man_MANS = dx.l +man_MANS = dx.1.gz EXTRA_DIST = $(man_MANS) --- man/manl/Makefile.in +++ man/manl/Makefile.in @@ -197,7 +197,7 @@ sysconfdir = @sysconfdir@ target_alias = @target_alias@ yakker = @yakker@ -man_MANS = dx.l +man_MANS = dx.1.gz EXTRA_DIST = $(man_MANS) all: all-am ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit ddd
by root＠Hilbert.suse.de 29 May '07

29 May '07

Hello community, here is the log from the commit of package ddd checked in at Wed May 30 01:01:49 CEST 2007. -------- --- ddd/ddd.changes 2007-05-21 11:01:51.000000000 +0200 +++ /mounts/work_src_done/STABLE/ddd/ddd.changes 2007-05-29 10:49:41.000000000 +0200 @@ -1,0 +2,6 @@ +Tue May 29 10:48:11 CEST 2007 - anosek(a)suse.cz + +- added wrapper to workaround [#254472] +- updated README.SUSE + +------------------------------------------------------------------- New: ---- ddd.wrapper ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ ddd.spec ++++++ --- /var/tmp/diff_new_pack.Y12383/_old 2007-05-30 01:01:00.000000000 +0200 +++ /var/tmp/diff_new_pack.Y12383/_new 2007-05-30 01:01:00.000000000 +0200 @@ -19,13 +19,14 @@ Requires: gdb Autoreqprov: on Version: 3.3.11 -Release: 83 +Release: 89 Summary: Debugger with Graphical User Interface URL: http://www.gnu.org/software/ddd Source: ddd-%{version}.tar.bz2 Source1: ddd.png Source2: ddd.desktop Source3: README.SUSE +Source4: ddd.wrapper BuildRoot: %{_tmppath}/%{name}-%{version}-build PreReq: %install_info_prereq # NOTE: We don't want this dependency and desktop-data-SuSE is in all @@ -70,6 +71,8 @@ install -m 644 %{SOURCE1} $RPM_BUILD_ROOT/usr/share/pixmaps/ mkdir -p $RPM_BUILD_ROOT/usr/share/applications install -m 644 %{SOURCE2} $RPM_BUILD_ROOT/usr/share/applications/ +mv $RPM_BUILD_ROOT/usr/bin/ddd $RPM_BUILD_ROOT/usr/bin/ddd.org +install %{SOURCE4} $RPM_BUILD_ROOT/usr/bin/ddd %suse_update_desktop_file ddd %clean @@ -88,6 +91,7 @@ %doc AUTHORS COPYING COPYING.LIB INSTALL NEWS README TIPS TODO README.SUSE %doc doc/ddd-paper.ps doc/*.pdf doc/html %config /usr/share/X11/app-defaults/Ddd +%attr(755, root, root) /usr/bin/ddd.org %attr(755, root, root) /usr/bin/ddd %{_mandir}/man1/ddd.* %{_infodir}/ddd* @@ -96,6 +100,9 @@ /usr/share/pixmaps/ddd.png %changelog +* Tue May 29 2007 - anosek(a)suse.cz +- added wrapper to workaround [#254472] +- updated README.SUSE * Mon May 21 2007 - anosek(a)suse.cz - added README.SUSE explaning workaround for [#254472] * Fri Mar 30 2007 - dmueller(a)suse.de ++++++ README.SUSE ++++++ --- ddd/README.SUSE 2007-05-21 10:11:32.000000000 +0200 +++ /mounts/work_src_done/STABLE/ddd/README.SUSE 2007-05-29 10:17:31.000000000 +0200 @@ -4,10 +4,9 @@ ddd has problems when presenting UTF-8 strings with non-ascii characters. Unfortunately, locales in SUSE are set to use UFT-8 encoding by default. -If ddd doesn't display strings correctly, please set locales to not use UTF-8. - -For example, run ddd with this command: -LANG=en_US ddd +We use a wrapper script to workaround this issue. If you run ddd, the UTF-8 +locales will be switched off. To bypass the wrapper use: +ddd -x [parameters for ddd] Further information can be found at: bugzilla.novell.com, bug #254472 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit Source-Navigator
by root＠Hilbert.suse.de 29 May '07

29 May '07

Hello community, here is the log from the commit of package Source-Navigator checked in at Tue May 29 12:34:10 CEST 2007. -------- --- Source-Navigator/Source-Navigator.changes 2007-03-29 16:22:25.000000000 +0200 +++ /mounts/work_src_done/STABLE/Source-Navigator/Source-Navigator.changes 2007-05-29 10:43:46.000000000 +0200 @@ -1,0 +2,8 @@ +Tue May 29 10:37:56 CEST 2007 - pgajdos(a)suse.cz + +- fixed rpmlint errors + * splitted to Source-Navigator, Source-Navigator-devel, + Source-Navigator-examples + * some minor adjustments of spec file + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ Source-Navigator.spec ++++++ --- /var/tmp/diff_new_pack.m27135/_old 2007-05-29 12:30:22.000000000 +0200 +++ /var/tmp/diff_new_pack.m27135/_new 2007-05-29 12:30:22.000000000 +0200 @@ -17,7 +17,7 @@ Provides: SN snavig Autoreqprov: on Version: 5.1.4 -Release: 235 +Release: 249 Source: sourcenav-%{version}.tar.bz2 Source1: snavigator Patch: returnval.patch @@ -48,6 +48,42 @@ +%package devel +Summary: Cygnus Source-Navigator +Group: Development/Tools/IDE +Requires: %{name} = %{version} + +%description devel +Source-Navigator, the source code comprehension tool from Cygnus +Solutions, helps you analyze, reuse, and develop software in C/C++, +Java, Tcl, and FORTRAN. Source-Navigator dramatically reduces the time +required to understand existing code and assists with the restructuring +and reengineering of existing software. Source-Navigator, with its +intuitive graphical user interface, directs you through analysis, +change, build, and debug cycles. Its built-in database enables true +project scalability, even in projects exceeding one million lines of +code. + + + +%package examples +Summary: Cygnus Source-Navigator +Group: Development/Tools/IDE +Requires: %{name} = %{version} + +%description examples +Source-Navigator, the source code comprehension tool from Cygnus +Solutions, helps you analyze, reuse, and develop software in C/C++, +Java, Tcl, and FORTRAN. Source-Navigator dramatically reduces the time +required to understand existing code and assists with the restructuring +and reengineering of existing software. Source-Navigator, with its +intuitive graphical user interface, directs you through analysis, +change, build, and debug cycles. Its built-in database enables true +project scalability, even in projects exceeding one million lines of +code. + + + %define prefix /opt/snavigator %prep %setup -q -n sourcenav-%{version} @@ -105,9 +141,24 @@ # remove unpackaged files # we have tcl/tk/tix manpages elsewhere rm -Rf $RPM_BUILD_ROOT/usr/share/man +#fixes rpmlint errors: +gzip --recursive $RPM_BUILD_ROOT%{prefix}/man +chmod a-x $RPM_BUILD_ROOT%{prefix}/share/{sdk/api/tcl/database/examples/*,iwidgets3.0.1/demos/demo.html,iwidgets3.0.1/demos/iwidgets.gif} +chmod a-x $RPM_BUILD_ROOT%{prefix}/{lib/*.a,COPYING} +#chmod a+x $RPM_BUILD_ROOT%{prefix}/share/tix4.1/{pref/tixmkpref,bitmaps/mktransgif.tcl} +#chmod a+x $RPM_BUILD_ROOT%{prefix}/share/{tcl8.3/ldAix,/etc/navigato} +ln -f $RPM_BUILD_ROOT%{prefix}/lib/libtcl8.3.a $RPM_BUILD_ROOT%{prefix}/share/sdk/lib/libtcl8.3.a +ln -f $RPM_BUILD_ROOT%{prefix}/share/tix4.1/demos/bitmaps/drivea.xbm $RPM_BUILD_ROOT%{prefix}/share/tix4.1/demos/bitmaps/harddisk.xbm +ln -f $RPM_BUILD_ROOT%{prefix}/share/tix4.1/demos/bitmaps/network.xbm $RPM_BUILD_ROOT%{prefix}/share/tix4.1/demos/bitmaps/netw.xbm +ln -f $RPM_BUILD_ROOT%{prefix}/share/tix4.1/demos/bitmaps/harddisk.xpm $RPM_BUILD_ROOT%{prefix}/share/tix4.1/demos/bitmaps/drivea.xpm +ln -f $RPM_BUILD_ROOT%{prefix}/share/tix4.1/demos/bitmaps/network.xpm $RPM_BUILD_ROOT%{prefix}/share/tix4.1/demos/bitmaps/netw.xpm +ln -f $RPM_BUILD_ROOT%{prefix}/share/tk8.3/images/logo100.gif $RPM_BUILD_ROOT%{prefix}/share/tk8.3/demos/images/tcllogo.gif +ln -f $RPM_BUILD_ROOT%{prefix}/share/bitmaps/type_com.xpm $RPM_BUILD_ROOT%{prefix}/share/bitmaps/clsbr.xpm +ln -f $RPM_BUILD_ROOT%{prefix}/share/bitmaps/type_com.xpm $RPM_BUILD_ROOT%{prefix}/share/bitmaps/type_su.xpm +ln -f $RPM_BUILD_ROOT%{prefix}/share/bitmaps/type_com.xpm $RPM_BUILD_ROOT%{prefix}/share/bitmaps/type_cov.xpm %clean -rm -rf $RPM_BUILD_ROOT +#rm -rf $RPM_BUILD_ROOT %files %defattr(-,root,root) @@ -119,17 +170,41 @@ /opt/snavigator/INSTALL.TXT /opt/snavigator/README.TXT /opt/snavigator/bin/* -%dir /opt/snavigator/include -/opt/snavigator/include/* -%dir /opt/snavigator/lib -/opt/snavigator/lib/* %dir /opt/snavigator/man /opt/snavigator/man/* %dir /opt/snavigator/share -/opt/snavigator/share/* +/opt/snavigator/share/bitmaps +/opt/snavigator/share/etc +/opt/snavigator/share/itcl3.2 +/opt/snavigator/share/itk3.2 +/opt/snavigator/share/iwidgets3.0.1 +/opt/snavigator/share/redhat +/opt/snavigator/share/sourcenav +/opt/snavigator/share/tcl8.3 +/opt/snavigator/share/tix4.1 +/opt/snavigator/share/tk8.3 /usr/bin/snavigator +%files devel +%defattr(-,root,root) +%doc ChangeLog README.TXT +%dir /opt/snavigator/lib +/opt/snavigator/lib/* +%dir /opt/snavigator/include +/opt/snavigator/include/* +/opt/snavigator/share/sdk + +%files examples +%defattr(-,root,root) +%doc ChangeLog README.TXT +/opt/snavigator/share/demos + %changelog +* Tue May 29 2007 - pgajdos(a)suse.cz +- fixed rpmlint errors + * splitted to Source-Navigator, Source-Navigator-devel, + Source-Navigator-examples + * some minor adjustments of spec file * Thu Mar 29 2007 - lmichnovic(a)suse.cz - added bison into BuildRequires * Tue Dec 12 2006 - lmichnovic(a)suse.cz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit kdesdk3
by root＠Hilbert.suse.de 29 May '07

29 May '07

Hello community, here is the log from the commit of package kdesdk3 checked in at Tue May 29 12:30:16 CEST 2007. -------- --- KDE/kdesdk3/kdesdk3.changes 2007-05-23 11:54:55.000000000 +0200 +++ /mounts/work_src_done/STABLE/kdesdk3/kdesdk3.changes 2007-05-29 11:51:30.798164000 +0200 @@ -1,0 +2,5 @@ +Tue May 29 11:51:23 CEST 2007 - coolo(a)suse.de + +- build kcachegrind on all archs + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kdesdk3.spec ++++++ --- /var/tmp/diff_new_pack.F22909/_old 2007-05-29 12:29:50.000000000 +0200 +++ /var/tmp/diff_new_pack.F22909/_new 2007-05-29 12:29:50.000000000 +0200 @@ -30,7 +30,7 @@ Group: System/GUI/KDE Summary: The KDE Software Development Kit Version: 3.5.7 -Release: 2 +Release: 6 URL: http://www.kde.org/ Requires: kdelibs3 >= %( echo `rpm -q --queryformat '%{VERSION}' kdelibs3`) Requires: cvs @@ -71,7 +71,6 @@ -------- The KDE Team <kde(a)kde.org> -%ifarch %ix86 ppc x86_64 ppc64 %package profile # usesubdirs kcachegrind Summary: Profiling Tools @@ -91,7 +90,6 @@ -------- The KDE Team <kde(a)kde.org> -%endif %package translate # usesubdirs kbabel poxml Summary: Tools to Handle Translations @@ -164,9 +162,7 @@ %suse_update_desktop_file -u kbabeldict Development Translation %suse_update_desktop_file cervisia Development RevisionControl %suse_update_desktop_file kompare Development RevisionControl -%ifarch %ix86 ppc x86_64 ppc64 %suse_update_desktop_file kcachegrind Development Profiling -%endif %if %suse_version > 1020 %fdupes -s $RPM_BUILD_ROOT @@ -296,7 +292,6 @@ /opt/kde3/%_lib/kde3/kcal_bugzilla.* /opt/kde3/share/services/kresources/kcal/bugzilla.desktop %doc %lang(en) /opt/kde3/share/doc/HTML/en/kbugbuster -%ifarch %ix86 ppc x86_64 ppc64 %files profile %defattr(-,root,root) @@ -313,7 +308,6 @@ /opt/kde3/share/icons/*/*x*/*/kcachegrind.png /opt/kde3/share/mimelnk/application/x-kcachegrind.desktop %doc %lang(en) /opt/kde3/share/doc/HTML/en/kcachegrind -%endif %files translate %defattr(-,root,root) @@ -355,6 +349,8 @@ /opt/kde3/include/repository_stub.h %changelog +* Tue May 29 2007 - coolo(a)suse.de +- build kcachegrind on all archs * Wed May 23 2007 - stbinner(a)suse.de - use %%fdupes * Mon May 14 2007 - stbinner(a)suse.de ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit kdepim3
by root＠Hilbert.suse.de 29 May '07

29 May '07

Hello community, here is the log from the commit of package kdepim3 checked in at Tue May 29 12:29:41 CEST 2007. -------- --- KDE/kdepim3/kdepim3.changes 2007-05-25 13:20:14.000000000 +0200 +++ /mounts/work_src_done/STABLE/kdepim3/kdepim3.changes 2007-05-29 10:28:08.000000000 +0200 @@ -1,0 +2,5 @@ +Tue May 29 10:27:48 CEST 2007 - wstephenson(a)suse.de + +- Revised offline mode (#237274) + +------------------------------------------------------------------- Old: ---- kmail-networkstatus-support.diff slox-networkstatus-usage.diff New: ---- kdepim_networkstatus_branch.diff ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kdepim3.spec ++++++ --- /var/tmp/diff_new_pack.p21808/_old 2007-05-29 12:29:24.000000000 +0200 +++ /var/tmp/diff_new_pack.p21808/_new 2007-05-29 12:29:24.000000000 +0200 @@ -24,7 +24,7 @@ Group: System/GUI/KDE Summary: Personal Information Manager Software for KDE Version: 3.5.7 -Release: 2 +Release: 4 URL: http://www.kde.org/ Requires: kdelibs3 >= %( echo `rpm -q --queryformat '%{VERSION}' kdelibs3` ) Requires: kdebase3 >= %( echo `rpm -q --queryformat '%{VERSION}' kdelibs3` ) @@ -35,13 +35,11 @@ Source5: groupwarewizard.desktop #Patch0: 3_5_BRANCH.diff Patch1: install-headers.diff -Patch4: kmail-networkstatus-support.diff -Patch5: slox-networkstatus-usage.diff +Patch5: kdepim_networkstatus_branch.diff Patch7: fix-artwork.diff Patch10: start-kpilot-instead-complain.diff Patch16: fix_designer_path.diff Patch17: knode_threaded_crash.diff -#Patch18: networkstatus_glib_dbus.diff Patch20: no-final.diff Patch22: kmail_unread_new_important.diff Patch23: kmail-avoid-crash-on-startup.diff @@ -96,20 +94,6 @@ -------- The KDE Team <kde(a)kde.org> -%package networkstatus -Summary: Network Status Libraries and KDED Module -Group: System/GUI/KDE - -%description networkstatus -The library and kded module to switch KDE desktop functions offline or -to trigger dialins. - - - -Authors: --------- - The KDE Team <kde(a)kde.org> - %package mobile # usesubdirs kandy kmobile Provides: kdepim3:/opt/kde3/bin/kandy @@ -183,10 +167,9 @@ %setup -q -n kdepim-%{version} #%patch0 -E rm -rf ksync +rm -rf networkstatus %patch1 -%patch4 -#seems to be inside the branch, but some lines do still apply ... -#%patch5 +%patch5 %patch7 %patch10 %patch16 @@ -256,12 +239,6 @@ %run_ldconfig %endif -%post networkstatus -%run_ldconfig - -%postun networkstatus -%run_ldconfig - %files %defattr(-,root,root) %dir /opt/kde3/share/icons/hicolor/16x16 @@ -368,7 +345,6 @@ /opt/kde3/%_lib/libktnef.so.* /opt/kde3/%_lib/libmimelib.so.* /opt/kde3/%_lib/libkmailprivate.* -/opt/kde3/%_lib/libconnectionmanager.so.* /opt/kde3/%_lib/libkpimidentities.so.* /opt/kde3/%_lib/libgpgme++.so.* /opt/kde3/%_lib/libqgpgme.so.* @@ -572,13 +548,6 @@ /opt/kde3/share/services/kresources/knotes %doc %lang(en) /opt/kde3/share/doc/HTML/en/knotes -%files networkstatus -%defattr(-,root,root) -/opt/kde3/bin/networkstatustestservice -/opt/kde3/%_lib/kde3/kded_networkstatus.* -/opt/kde3/%_lib/libnetworkstatus.so.* -/opt/kde3/share/services/kded/networkstatus.desktop - %files mobile %defattr(-,root,root) /opt/kde3/bin/kandy* @@ -667,8 +636,6 @@ /opt/kde3/%_lib/kde3/plugins/designer/kdepimwidgets.* /opt/kde3/include/* /opt/kde3/%_lib/kde3/plugins/designer/kpartsdesignerplugin.* -/opt/kde3/%_lib/libconnectionmanager.la -/opt/kde3/%_lib/libconnectionmanager.so /opt/kde3/%_lib/libgpgme++.la /opt/kde3/%_lib/libgpgme++.so /opt/kde3/%_lib/libgwsoap.la @@ -749,12 +716,12 @@ /opt/kde3/%_lib/libkcal.so /opt/kde3/%_lib/libkcal_groupdav.la /opt/kde3/%_lib/libkcal_groupwise.la -/opt/kde3/%_lib/libnetworkstatus.so -/opt/kde3/%_lib/libnetworkstatus.la /opt/kde3/%_lib/libkpilot.la /opt/kde3/%_lib/libkpilot.so %changelog +* Tue May 29 2007 - wstephenson(a)suse.de +- Revised offline mode (#237274) * Fri May 25 2007 - dmueller(a)suse.de - split off -devel package * Mon May 21 2007 - stbinner(a)suse.de ++++++ install-headers.diff ++++++ --- /var/tmp/diff_new_pack.p21808/_old 2007-05-29 12:29:24.000000000 +0200 +++ /var/tmp/diff_new_pack.p21808/_new 2007-05-29 12:29:24.000000000 +0200 @@ -9,27 +9,4 @@ AM_CXXFLAGS = -DQT_PLUGIN kde_widget_LTLIBRARIES = kdepimwidgets.la ---- networkstatus/Makefile.am -+++ networkstatus/Makefile.am 2005/02/07 16:52:10 -@@ -3,7 +3,7 @@ - METASOURCES = AUTO - - kde_module_LTLIBRARIES = kded_networkstatus.la --noinst_LTLIBRARIES = libnetworkstatus.la libconnectionmanager.la -+lib_LTLIBRARIES = libnetworkstatus.la libconnectionmanager.la - - libnetworkstatus_la_LIBADD = $(LIB_KDECORE) - libnetworkstatus_la_LDFLAGS = $(all_libraries) -@@ -24,8 +24,10 @@ - servicesdir = $(kde_servicesdir)/kded - services_DATA = networkstatus.desktop - --noinst_HEADERS = serviceiface.h networkstatuscommon.h serviceifaceimpl.h \ -- network.h clientifaceimpl.h provideriface.h testservice.h connectionmanager.h -+noinst_HEADERS = serviceifaceimpl.h \ -+ network.h clientifaceimpl.h testservice.h connectionmanager.h -+ -+include_HEADERS = serviceiface.h provideriface.h networkstatuscommon.h - - bin_PROGRAMS = networkstatustestservice - + ++++++ kdepim_networkstatus_branch.diff ++++++ Index: kmail/kmmainwin.cpp =================================================================== --- kmail/kmmainwin.cpp (.../KDE/3.5/kdepim) (revision 667288) +++ kmail/kmmainwin.cpp (.../work/~wstephens/kdepim) (revision 667288) @@ -1,4 +1,5 @@ + #ifdef HAVE_CONFIG_H #include <config.h> #endif @@ -22,7 +23,7 @@ #include <kstringhandler.h> #include <kdebug.h> #include <ktip.h> - +#include <networkstatusindicator.h> #include "kmmainwin.moc" KMMainWin::KMMainWin(QWidget *) @@ -71,7 +72,7 @@ this, SLOT(slotConfigChanged())); connect(mKMMainWidget, SIGNAL(captionChangeRequest(const QString&)), - SLOT(setCaption(const QString&)) ); + SLOT(setCaption(const QString&)) ); // Enable mail checks again (see destructor) kmkernel->enableMailCheck(); @@ -176,6 +177,11 @@ statusBar()->insertItem(i18n(" Initializing..."), 1, 1 ); statusBar()->setItemAlignment( 1, AlignLeft | AlignVCenter ); mLittleProgress->show(); + + /* Indicator for desktop offline mode */ + StatusBarNetworkStatusIndicator * indicator = new StatusBarNetworkStatusIndicator( this, "netstatusindicator" ); + statusBar()->addWidget( indicator, 0, false ); + indicator->init(); } /** Read configuration options after widgets are created. */ @@ -216,4 +222,3 @@ KTipDialog::showTip( this ); } - Index: kmail/imapaccountbase.cpp =================================================================== --- kmail/imapaccountbase.cpp (.../KDE/3.5/kdepim) (revision 667288) +++ kmail/imapaccountbase.cpp (.../work/~wstephens/kdepim) (revision 667288) @@ -920,7 +920,10 @@ QString caption = i18n("Error"); if ( jobsKilled || errorCode == KIO::ERR_COULD_NOT_LOGIN ) { - if ( errorCode == KIO::ERR_SERVER_TIMEOUT || errorCode == KIO::ERR_CONNECTION_BROKEN ) { + if ( ( errorCode == KIO::ERR_SERVER_TIMEOUT || errorCode == KIO::ERR_CONNECTION_BROKEN ) && + /* suppress error messages about loss of connectivity whilst in offline mode */ + GlobalSettings::self()->networkState() != GlobalSettings::EnumNetworkState::Offline ) + { msg = i18n("The connection to the server %1 was unexpectedly closed or timed out. It will be re-established automatically if possible."). arg( name() ); KMessageBox::information( kapp->activeWindow(), msg, caption, "kmailConnectionBrokenErrorDialog" ); @@ -932,11 +935,13 @@ KPIM::BroadcastStatus::instance()->setStatusMsg( i18n( "The connection to account %1 timed out." ).arg( name() ) ); } else { - if ( !errors.isEmpty() ) + if ( !( errorCode == KIO::ERR_UNKNOWN_HOST && GlobalSettings::self()->networkState() == GlobalSettings::EnumNetworkState::Offline ) ) { + if ( !errors.isEmpty() ) KMessageBox::detailedError( kapp->activeWindow(), msg, errors.join("\n").prepend("<qt>"), caption ); - else + else KMessageBox::error( kapp->activeWindow(), msg, caption ); } + } } else { // i.e. we have a chance to continue, ask the user about it if ( errors.count() >= 3 ) { // there is no detailedWarningContinueCancel... (#86517) Index: kmail/kmkernel.cpp =================================================================== --- kmail/kmkernel.cpp (.../KDE/3.5/kdepim) (revision 667288) +++ kmail/kmkernel.cpp (.../work/~wstephens/kdepim) (revision 667288) @@ -28,6 +28,7 @@ #undef REALLY_WANT_KMSENDER #include "undostack.h" #include "accountmanager.h" +#include "networkaccount.h" using KMail::AccountManager; #include <libkdepim/kfileio.h> #include "kmversion.h" @@ -89,6 +90,7 @@ #include <fixx11h.h> #include <kcmdlineargs.h> #include <kstartupinfo.h> +#include <connectionmanager.h> KMKernel *KMKernel::mySelf = 0; @@ -1202,7 +1204,13 @@ return; GlobalSettings::setNetworkState( GlobalSettings::EnumNetworkState::Offline ); - BroadcastStatus::instance()->setStatusMsg( i18n("KMail is set to be offline; all network jobs are suspended")); + for ( KMAccount * cur = the_acctMgr->first(); cur; cur = the_acctMgr->next() ) { + KMail::NetworkAccount * netAccount = dynamic_cast<KMail::NetworkAccount *>( cur ); + if ( netAccount ) { + netAccount->killAllJobs( true ); + } + } + BroadcastStatus::instance()->setStatusMsg( i18n("KMail is now offline; all network operations cancelled")); emit onlineStatusChanged( (GlobalSettings::EnumNetworkState::type)GlobalSettings::networkState() ); } @@ -1212,7 +1220,7 @@ return; GlobalSettings::setNetworkState( GlobalSettings::EnumNetworkState::Online ); - BroadcastStatus::instance()->setStatusMsg( i18n("KMail is set to be online; all network jobs resumed")); + BroadcastStatus::instance()->setStatusMsg( i18n("KMail is now online; network operations resumed")); emit onlineStatusChanged( (GlobalSettings::EnumNetworkState::type)GlobalSettings::networkState() ); if ( kmkernel->msgSender()->sendImmediate() ) { @@ -1222,10 +1230,7 @@ bool KMKernel::isOffline() { - if ( GlobalSettings::self()->networkState() == GlobalSettings::EnumNetworkState::Offline ) - return true; - else - return false; + return ( GlobalSettings::self()->networkState() == GlobalSettings::EnumNetworkState::Offline ); } bool KMKernel::askToGoOnline() @@ -1474,6 +1479,8 @@ if (lsf) the_searchFolderMgr->remove( lsf ); + ConnectionManager::self()->registerConnectSlot( this, SLOT( resumeNetworkJobs() ) ); + ConnectionManager::self()->registerDisconnectSlot( this, SLOT( stopNetworkJobs() ) ); the_acctMgr = new AccountManager(); the_filterMgr = new KMFilterMgr(); the_popFilterMgr = new KMFilterMgr(true); @@ -1528,6 +1535,12 @@ #else mBackgroundTasksTimer->start( 5 * 60000, true ); // 5 minutes, singleshot #endif + + if ( ( ConnectionManager::self()->status() == NetworkStatus::Online || ConnectionManager::self()->status() == NetworkStatus::NoNetworks ) ) { + resumeNetworkJobs(); + } else { + stopNetworkJobs(); + } } void KMKernel::readConfig() Index: kmail/popaccount.cpp =================================================================== --- kmail/popaccount.cpp (.../KDE/3.5/kdepim) (revision 667288) +++ kmail/popaccount.cpp (.../work/~wstephens/kdepim) (revision 667288) @@ -1015,7 +1015,9 @@ } if (interactive) { - KMessageBox::error(kmkernel->mainWin(), KIO::buildErrorString(error, errorMsg)); + if ( ! ( ( error == KIO::ERR_CONNECTION_BROKEN || error == KIO::ERR_SERVER_TIMEOUT ) && + GlobalSettings::self()->networkState() != GlobalSettings::EnumNetworkState::Offline ) ) + KMessageBox::error(kmkernel->mainWin(), KIO::buildErrorString(error, errorMsg)); } Index: kmail/accountmanager.cpp =================================================================== --- kmail/accountmanager.cpp (.../KDE/3.5/kdepim) (revision 667288) +++ kmail/accountmanager.cpp (.../work/~wstephens/kdepim) (revision 667288) @@ -22,6 +22,7 @@ #include <kdebug.h> #include <kconfig.h> #include <kapplication.h> +#include <connectionmanager.h> #include <qregexp.h> #include <qvaluelist.h> @@ -183,6 +184,15 @@ return; } + if ( curAccount->type() == "imap" || curAccount->type() == "cachedimap" || curAccount->type() == "pop" ) + { + // Check with the network status daemon whether the network is available + if ( !( ConnectionManager::self()->status() == NetworkStatus::Online || ConnectionManager::self()->status() == NetworkStatus::NoNetworks ) ) { + emit checkedMail( false, mInteractive, mTotalNewInFolder ); + return; + } + + } connect( curAccount, SIGNAL( finishedCheck( bool, CheckStatus ) ), this, SLOT( processNextCheck( bool ) ) ); Index: kmail/kmkernel.h =================================================================== --- kmail/kmkernel.h (.../KDE/3.5/kdepim) (revision 667288) +++ kmail/kmkernel.h (.../work/~wstephens/kdepim) (revision 667288) @@ -202,18 +202,6 @@ */ virtual void resumeBackgroundJobs(); - /** - * Stops all network related jobs and enter offline mode - * New network jobs cannot be started. - */ - void stopNetworkJobs(); - - /** - * Resumes all network related jobs and enter online mode - * New network jobs can be started. - */ - void resumeNetworkJobs(); - /** A static helper function that asks the user * if they want to go online. * @return true if the user wants to go online @@ -406,6 +394,18 @@ void slotConfigChanged(); + /** + * Stops all network related jobs and enter offline mode + * New network jobs cannot be started. + */ + void stopNetworkJobs(); + + /** + * Resumes all network related jobs and enter online mode + * New network jobs can be started. + */ + void resumeNetworkJobs(); + protected slots: void slotDataReq(KIO::Job*,QByteArray&); void slotResult(KIO::Job*); Index: kmail/Makefile.am =================================================================== --- kmail/Makefile.am (revision 663156) +++ kmail/Makefile.am (working copy) @@ -31,6 +31,7 @@ libkmailprivate_la_LIBADD = \ ../libksieve/libksieve.la ../libemailfunctions/libemailfunctions.la \ ../certmanager/lib/libkleopatra.la $(INDEXLIB) \ ../libkcal/libkcal.la \ + -lconnectionmanager \ $(LIB_KHTML) $(LIB_KSPELL) $(LIB_KABC) kde_module_LTLIBRARIES = kcm_kmail.la libkmailpart.la libkmail_bodypartformatter_application_octetstream.la ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit mysql
by root＠Hilbert.suse.de 28 May '07

28 May '07

Hello community, here is the log from the commit of package mysql checked in at Mon May 28 23:46:17 CEST 2007. -------- --- mysql/mysql.changes 2007-03-29 13:57:40.000000000 +0200 +++ /mounts/work_src_done/STABLE/mysql/mysql.changes 2007-05-28 10:41:22.000000000 +0200 @@ -1,0 +2,14 @@ +Mon May 28 10:34:45 CEST 2007 - mmarek(a)suse.cz + +- updated to 5.0.41, for changes see + http://dev.mysql.com/doc/refman/5.0/en/releasenotes-cs-5-0-37.html + http://dev.mysql.com/doc/refman/5.0/en/releasenotes-cs-5-0-41.html +- fixed --with testsuite build [#252630] +- renamed subpackages according to library packaging policy: + mysql-shared -> libmysqlclient15, libmysqlclient_r15 + mysql-devel -> libmysqlclient-devel (pulls in both flavors) +- increased rcmysql start timeout to 30 seconds, don't return + failure if mysql doesn't start early enough (except for update + case) [#273938] + +------------------------------------------------------------------- Old: ---- minmem mysql-5.0.33.tar.bz2 mysql-5.0.33-vpath.patch New: ---- mysql-5.0.41.tar.bz2 mysql-vpath.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ mysql.spec ++++++ --- /var/tmp/diff_new_pack.M32360/_old 2007-05-28 23:45:54.000000000 +0200 +++ /var/tmp/diff_new_pack.M32360/_new 2007-05-28 23:45:54.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package mysql (Version 5.0.33) +# spec file for package mysql (Version 5.0.41) # # Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine @@ -14,8 +14,8 @@ BuildRequires: gcc-c++ ncurses-devel openssl-devel procps pwdutils readline-devel tcpd-devel zlib-devel License: GNU General Public License (GPL) Group: Productivity/Databases/Servers -Version: 5.0.33 -Release: 5 +Version: 5.0.41 +Release: 1 # required by rcmysql Requires: mysql-client = %{version} Autoreqprov: on @@ -39,7 +39,7 @@ Patch11: mysql-5.0.33-compiler-warnings.patch Patch12: mysql-5.0.33-mysql_upgrade.patch Patch13: mysql-5.0.33-defaults-extra-file.patch -Patch14: mysql-5.0.33-vpath.patch +Patch14: mysql-vpath.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build %description @@ -73,17 +73,18 @@ Michael Widenius <monty(a)mysql.com> David Axmark <davida(a)mysql.com> -%package devel -Obsoletes: mysqldev -Provides: mysqldev -Requires: mysql-shared = %{version} glibc-devel zlib-devel openssl-devel +%package -n libmysqlclient-devel +# mysql-devel was last used in openSUSE 10.2 +Provides: mysql-devel = %{version}-%{release} +Obsoletes: mysql-devel <= 5.0.26 +Requires: libmysqlclient = %{version} libmysqlclient_r = %{version} glibc-devel zlib-devel openssl-devel License: GNU General Public License (GPL) Summary: MySQL Development Header Files and Libraries URL: http://www.mysql.com Group: Development/Libraries/C and C++ Autoreqprov: on -%description devel +%description -n libmysqlclient-devel This package contains the development header files and libraries necessary to develop MySQL client applications. @@ -95,8 +96,6 @@ David Axmark <davida(a)mysql.com> %package client -Obsoletes: mysqclnt -Provides: mysqclnt License: GNU General Public License (GPL) Summary: MySQL Client URL: http://www.mysql.com @@ -114,8 +113,6 @@ David Axmark <davida(a)mysql.com> %package bench -Obsoletes: mysqbnch -Provides: mysqbnch Requires: mysql-client perl-DBD-mysql License: GNU Library General Public License v. 2.0 and 2.1 (LGPL) Summary: MySQL - Benchmarks @@ -136,16 +133,32 @@ Michael Widenius <monty(a)mysql.com> David Axmark <davida(a)mysql.com> -%package shared -Obsoletes: mysqllib -Provides: mysqllib +%package -n libmysqlclient15 Summary: MySQL Shared Libraries License: GNU General Public License (GPL) URL: http://www.mysql.com Group: Development/Libraries/Other Autoreqprov: on -%description shared +%description -n libmysqlclient15 +This package contains the shared libraries (.so) which certain +languages and applications need to dynamically load and use MySQL. + + + +Authors: +-------- + Michael Widenius <monty(a)mysql.com> + David Axmark <davida(a)mysql.com> + +%package -n libmysqlclient_r15 +Summary: MySQL Shared Libraries +License: GNU General Public License (GPL) +URL: http://www.mysql.com +Group: Development/Libraries/Other +Autoreqprov: on + +%description -n libmysqlclient_r15 This package contains the shared libraries (.so) which certain languages and applications need to dynamically load and use MySQL. @@ -240,7 +253,7 @@ %prep %setup -q cp %_sourcedir/suse-test-run . -%patch1 +#%patch1 %patch2 %patch3 %patch4 @@ -253,7 +266,8 @@ %patch13 %patch14 # remove unneeded man manpages -rm man/mysqlman.1 man/safe_mysqld.1 man/mysql.server.1 +rm man/mysqlman.1 man/safe_mysqld.1 man/mysql.server.1 man/make_win_*.1 +rm man/mysqlmanager-pwgen.1 man/mysqlmanagerc.1 %build autoreconf -f -i @@ -306,6 +320,12 @@ %endif make %{?jobs:-j%jobs} benchdir=$RPM_BUILD_ROOT/usr/share/sql-bench nm --numeric-sort sql/mysqld > sql/mysqld.sym + # needed for make check, which is not VPATH aware + # copy the files unconditionally so that manual 'make check' after + # the build works, too + cp -a ../mysql-test/* mysql-test/ + cp -a ../sql/share/{english,charsets} sql/share/ + cp -a ../scripts/*.sql scripts/ %if %{?_with_testsuite:1}0 make test %endif @@ -318,7 +338,7 @@ --with-innodb \ --with-embedded-server \ --with-extra-tools -# build mysqld-debug +# build mysqld-debug (speed up normal build by skipping tests/ and client/) BuildMySQL "-debug" --with-server-suffix=-debug \ --${BERKELEY}-berkeley-db \ --with-openssl \ @@ -326,9 +346,11 @@ --with-debug \ --without-extra-tools \ --without-embedded-server \ +%if %{?!_with_testsuite:1}0 + --without-mysqlmanager \ --without-client \ - --without-tests \ - --without-mysqlmanager + --without-tests +%endif # Now build the standard mysqld BuildMySQL "" \ --without-berkeley-db \ @@ -336,9 +358,11 @@ --with-innodb \ --without-extra-tools \ --without-embedded-server \ +%if %{?!_with_testsuite:1}0 + --without-mysqlmanager \ --without-client \ - --without-tests \ - --without-mysqlmanager + --without-tests +%endif %install # install client, extra tools, libraries and mysql-max @@ -380,8 +404,8 @@ } filelist innochecksum my_print_defaults myisam_ftdump myisamchk myisamlog myisampack mysql_create_system_tables mysql_fix_extensions mysql_fix_privilege_tables mysql_install_db mysql_secure_installation mysqlbug mysqld mysqld_multi mysqld_safe mysqlbinlog mysqldumpslow mysqlmanager resolve_stack_dump resolveip >mysql.files filelist mysql mysql_upgrade mysqladmin mysqlcheck mysqldump mysqlimport mysqlshow >mysql-client.files -filelist comp_err mysql_config >mysql-devel.files -filelist mysql_client_test mysql_client_test_embedded mysql_waitpid mysqltest mysqltest_embedded >mysql-test.files +filelist comp_err mysql_config >libmysqlclient-devel.files +filelist mysql_client_test mysql_client_test_embedded mysql_waitpid mysqltest mysqltest_embedded mysql-stress-test.pl mysql-test-run.pl >mysql-test.files # all binaries that don't need to be in a "default" install (mysql.rpm + # mysql-client.rpm) filelist msql2mysql mysql_convert_table_format mysql_explain_log mysql_find_rows mysql_setpermission mysql_tableinfo mysql_tzinfo_to_sql mysql_zap mysqlaccess mysqlhotcopy perror replace >mysql-tools.files @@ -481,7 +505,7 @@ %defattr(-, root, root) %config /etc/mysqlaccess.conf -%files devel -f mysql-devel.files +%files -n libmysqlclient-devel -f libmysqlclient-devel.files %defattr(-, root, root) /usr/include/mysql %dir %{_libdir}/mysql @@ -498,10 +522,15 @@ /usr/bin/mysqltestmanager-pwgen /usr/bin/mysqltestmanagerc -%files shared +%files -n libmysqlclient15 +%defattr(-, root, root) +%{_libdir}/libmysqlclient.so.* +%{_libdir}/mysql/libmysqlclient.so.* + +%files -n libmysqlclient_r15 %defattr(-, root, root) -%{_libdir}/*.so.* -%{_libdir}/mysql/*.so.* +%{_libdir}/libmysqlclient_r.so.* +%{_libdir}/mysql/libmysqlclient_r.so.* %files Max %defattr(-, root, root) @@ -521,6 +550,17 @@ %files tools -f mysql-tools.files %changelog +* Mon May 28 2007 - mmarek(a)suse.cz +- updated to 5.0.41, for changes see + http://dev.mysql.com/doc/refman/5.0/en/releasenotes-cs-5-0-37.html + http://dev.mysql.com/doc/refman/5.0/en/releasenotes-cs-5-0-41.html +- fixed --with testsuite build [#252630] +- renamed subpackages according to library packaging policy: + mysql-shared -> libmysqlclient15, libmysqlclient_r15 + mysql-devel -> libmysqlclient-devel (pulls in both flavors) +- increased rcmysql start timeout to 30 seconds, don't return + failure if mysql doesn't start early enough (except for update + case) [#273938] * Thu Mar 29 2007 - mmarek(a)suse.de - BuildRequires fixes: + ncurses-devel ++++++ mysql-5.0.33-mysql_upgrade.patch ++++++ --- /var/tmp/diff_new_pack.M32360/_old 2007-05-28 23:45:54.000000000 +0200 +++ /var/tmp/diff_new_pack.M32360/_new 2007-05-28 23:45:54.000000000 +0200 @@ -1,7 +1,7 @@ # reported as http://bugs.mysql.com/bug.php?id=26639 ---- client/mysql_upgrade.c +--- client/mysql_upgrade.c.orig +++ client/mysql_upgrade.c -@@ -584,6 +584,15 @@ int main(int argc, char **argv) +@@ -614,6 +614,15 @@ int main(int argc, char **argv) ret= system(cmdline.str); if (ret) { @@ -17,8 +17,8 @@ fprintf(stderr, "Error executing '%s'\n", cmdline.str); goto error; } -@@ -640,7 +649,14 @@ fix_priv_tables: - +@@ -694,7 +703,14 @@ fix_priv_tables: + DBUG_PRINT("info", ("Running: %s", cmdline.str)); ret= system(cmdline.str); if (ret) + { ++++++ mysql-5.0.33.tar.bz2 -> mysql-5.0.41.tar.bz2 ++++++ mysql/mysql-5.0.33.tar.bz2 /mounts/work_src_done/STABLE/mysql/mysql-5.0.41.tar.bz2 differ: byte 11, line 1 ++++++ mysql-coredump.patch ++++++ --- /var/tmp/diff_new_pack.M32360/_old 2007-05-28 23:45:54.000000000 +0200 +++ /var/tmp/diff_new_pack.M32360/_new 2007-05-28 23:45:54.000000000 +0200 @@ -1,8 +1,8 @@ # The kernel won't generate coredumps after setgid() and setuid() # unless prctl(PR_SET_DUMPABLE, 1) is called ---- sql/mysqld.cc +--- sql/mysqld.cc.orig +++ sql/mysqld.cc -@@ -132,6 +132,10 @@ extern "C" { // Because of SCO 3.2V4 +@@ -135,6 +135,10 @@ extern "C" { // Because of SCO 3.2V4 #include <sys/mman.h> #endif @@ -13,8 +13,8 @@ #ifdef __NETWARE__ #define zVOLSTATE_ACTIVE 6 #define zVOLSTATE_DEACTIVE 2 -@@ -1368,7 +1372,13 @@ static void set_user(const char *user, s - sql_perror("setuid"); +@@ -1411,7 +1415,13 @@ static void set_effective_user(struct pa + sql_perror("setreuid"); unireg_abort(1); } -#endif @@ -28,9 +28,9 @@ } ---- configure.in +--- configure.in.orig +++ configure.in -@@ -2226,6 +2226,19 @@ then +@@ -2266,6 +2266,19 @@ then fi AC_MSG_RESULT("$netinet_inc") ++++++ mysql-install_db-quiet.patch ++++++ --- /var/tmp/diff_new_pack.M32360/_old 2007-05-28 23:45:54.000000000 +0200 +++ /var/tmp/diff_new_pack.M32360/_new 2007-05-28 23:45:54.000000000 +0200 @@ -1,40 +1,18 @@ ---- scripts/mysql_install_db.sh +--- scripts/mysql_install_db.sh.orig +++ scripts/mysql_install_db.sh -@@ -246,13 +246,14 @@ then - echo "" +@@ -296,10 +296,11 @@ then fi fi -- if test "$in_rpm" = 0 -a "$windows" = 0 -- then -- echo "" -- echo "To start mysqld at boot time you have to copy support-files/mysql.server" -- echo "to the right place for your system" -- echo -- fi + +- s_echo "" +- s_echo "To start mysqld at boot time you have to copy" +- s_echo "support-files/mysql.server to the right place for your system" +- s_echo +# Output disabled, since the SUSE RPM comes with an init script installed -+# if test "$in_rpm" = 0 -a "$windows" = 0 -+# then -+# echo "" -+# echo "To start mysqld at boot time you have to copy support-files/mysql.server" -+# echo "to the right place for your system" -+# echo -+# fi ++# s_echo "" ++# s_echo "To start mysqld at boot time you have to copy" ++# s_echo "support-files/mysql.server to the right place for your system" ++# s_echo + if test "$windows" -eq 0 then - echo "PLEASE REMEMBER TO SET A PASSWORD FOR THE MySQL root USER !" -@@ -272,9 +273,12 @@ then - echo - if test "$in_rpm" = "0" - then -- echo "You can start the MySQL daemon with:" -- echo "cd @prefix@ ; $bindir/mysqld_safe &" -- echo -+# Disabled the following message, since it is recommended to use the init -+# script instead, which takes care using the correct user id etc. Start it -+# with "rcmysql start" instead. -+# echo "You can start the MySQL daemon with:" -+# echo "cd @prefix@ ; $bindir/mysqld_safe &" -+# echo - echo "You can test the MySQL daemon with the benchmarks in the 'sql-bench' directory:" - echo "cd sql-bench ; perl run-all-tests" - echo ++++++ mysql-vpath.patch ++++++ --- configure.in.orig +++ configure.in @@ -2494,7 +2494,7 @@ else MYSQL_CHECK_NEW_RL_INTERFACE MYSQL_CHECK_READLINE_DECLARES_HIST_ENTRY AC_LANG_RESTORE - if [test "$mysql_cv_new_rl_interface" = "yes"] && [test -d "./cmd-line-utils/readline"] + if [test "$mysql_cv_new_rl_interface" = "yes"] && [test -d "$srcdir/cmd-line-utils/readline"] then # Use the new readline interface, but only if the package includes a bundled libreadline # this way we avoid linking commercial source with GPL readline @@ -2511,7 +2511,7 @@ else fi # if there is no readline, but we want to build with readline, we fail -if [test "$want_to_use_readline" = "yes"] && [test ! -d "./cmd-line-utils/readline"] +if [test "$want_to_use_readline" = "yes"] && [test ! -d "$srcdir/cmd-line-utils/readline"] then AC_MSG_ERROR([This commercially licensed MySQL source package can't be built with libreadline. Please use --with-libedit to use ++++++ rc.mysql ++++++ --- mysql/rc.mysql 2007-02-26 13:54:54.000000000 +0100 +++ /mounts/work_src_done/STABLE/mysql/rc.mysql 2007-05-24 13:37:59.000000000 +0200 @@ -92,7 +92,7 @@ wait_for_socket() { local i - for((i=0; i<50; i++)); do + for((i=0; i<150; i++)); do sleep 0.2 test -S $1 && i='' && break done @@ -253,7 +253,8 @@ --datadir=$datadir &>/dev/null & wait_for_socket $socket || { - rc_failed; rc_status -v; rc_exit; + # let's not treat this as a fatal error + echo "warning: $socket didn't appear within 30 seconds" } # Rmember status and be verbose ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit kdenetwork4
by root＠Hilbert.suse.de 28 May '07

28 May '07

Hello community, here is the log from the commit of package kdenetwork4 checked in at Mon May 28 23:42:09 CEST 2007. -------- --- KDE/kdenetwork4/kdenetwork4.changes 2007-05-23 19:43:07.000000000 +0200 +++ /mounts/work_src_done/STABLE/kdenetwork4/kdenetwork4.changes 2007-05-28 23:19:26.000000000 +0200 @@ -1,0 +2,5 @@ +Mon May 28 23:19:19 CEST 2007 - dmueller(a)suse.de + +- update to 3.90.1.svn668119 + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kdenetwork4.spec ++++++ --- /var/tmp/diff_new_pack.j23482/_old 2007-05-28 23:40:55.000000000 +0200 +++ /var/tmp/diff_new_pack.j23482/_new 2007-05-28 23:40:55.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package kdenetwork4 (Version 3.90.1) +# spec file for package kdenetwork4 (Version 3.90.1.svn668132) # # Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine @@ -15,8 +15,8 @@ Group: Productivity/Networking/Other Summary: kdenetwork base package URL: http://www.kde.org -Version: 3.90.1 -Release: 5 +Version: 3.90.1.svn668132 +Release: 1 Source0: kdenetwork.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-build Requires: kdebase4-runtime @@ -45,7 +45,7 @@ The KDE Team <kde(a)kde.org> %prep -%setup -q -n kdenetwork-3.90.1 +%setup -q -n kdenetwork %patch %build @@ -543,7 +543,6 @@ /usr/bin/kget /usr/%_lib/kde4/khtml_kget.so /usr/%_lib/kde4/libkget_kiofactory.so -/usr/%_lib/kde4/libkget_metalinkfactory.so /usr/%_lib/kde4/libkget_multisegkiofactory.so /usr/%_lib/libkgetcore.so.* /usr/share/applications/kde4/kget.desktop @@ -557,7 +556,6 @@ /usr/share/icons/crystalsvg/*/apps/kget.* /usr/share/icons/crystalsvg/*/mimetypes/kget_list.* /usr/share/kde4/services/kget_kiofactory.desktop -/usr/share/kde4/services/kget_metalinkfactory.desktop /usr/share/kde4/services/kget_multisegkiofactory.desktop /usr/share/kde4/servicetypes/kget_plugin.desktop /usr/share/sounds/KGet_Added.ogg @@ -569,7 +567,6 @@ %files %defattr(-,root,root) %doc COPYING COPYING-DOCS README -%doc %lang(en) /usr/share/doc/HTML/en/kpf %package devel Group: Productivity/Networking/Other Summary: kdenetwork base package @@ -603,6 +600,8 @@ %_libdir/libiris_kopete.so %changelog +* Mon May 28 2007 - dmueller(a)suse.de +- update to 3.90.1.svn668119 * Wed May 23 2007 - dmueller(a)suse.de - add kdenetwork4-devel subpackage * Fri May 18 2007 - stbinner(a)suse.de ++++++ kdenetwork.tar.bz2 ++++++ KDE/kdenetwork4/kdenetwork.tar.bz2 /mounts/work_src_done/STABLE/kdenetwork4/kdenetwork.tar.bz2 differ: byte 11, line 1 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit kdetoys4
by root＠Hilbert.suse.de 28 May '07

28 May '07

Hello community, here is the log from the commit of package kdetoys4 checked in at Mon May 28 23:38:56 CEST 2007. -------- --- KDE/kdetoys4/kdetoys4.changes 2007-05-18 19:28:26.000000000 +0200 +++ /mounts/work_src_done/STABLE/kdetoys4/kdetoys4.changes 2007-05-28 23:32:56.000000000 +0200 @@ -1,0 +2,5 @@ +Mon May 28 23:32:52 CEST 2007 - dmueller(a)suse.de + +- update to 3.90.1.svn668135 + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kdetoys4.spec ++++++ --- /var/tmp/diff_new_pack.BEa680/_old 2007-05-28 23:38:50.000000000 +0200 +++ /var/tmp/diff_new_pack.BEa680/_new 2007-05-28 23:38:50.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package kdetoys4 (Version 3.90.1) +# spec file for package kdetoys4 (Version 3.90.1.svn668135) # # Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine @@ -11,11 +11,11 @@ Name: kdetoys4 BuildRequires: kdebase4-devel -License: No license agreement found in package +License: GNU General Public License (GPL), GNU Library General Public License v. 2.0 and 2.1 (LGPL) Group: System/GUI/KDE Summary: kdetoys base package URL: http://www.kde.org -Version: 3.90.1 +Version: 3.90.1.svn668135 Release: 1 Source0: kdetoys.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -41,7 +41,7 @@ The KDE Team <kde(a)kde.org> %prep -%setup -q -n kdetoys-3.90.1 +%setup -q -n kdetoys %patch %build @@ -293,5 +293,7 @@ %doc COPYING COPYING-DOCS README %changelog +* Mon May 28 2007 - dmueller(a)suse.de +- update to 3.90.1.svn668135 * Fri May 18 2007 - stbinner(a)suse.de - initial package in abuild ++++++ kdetoys.tar.bz2 ++++++ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdetoys-3.90.1/amor/amor.desktop new/kdetoys/amor/amor.desktop --- old/kdetoys-3.90.1/amor/amor.desktop 2007-05-03 10:36:11.000000000 +0200 +++ new/kdetoys/amor/amor.desktop 2007-05-13 08:03:07.000000000 +0200 @@ -3,7 +3,6 @@ Name=AMOR Name[af]=Amor Name[ar]=برنامج AMOR -Name[bg]=Amor Name[fi]=Amor Name[fr]=Amor Name[ko]=아모르 @@ -18,7 +17,6 @@ DocPath=amor/index.html GenericName=On-Screen Creature GenericName[be]=Экранная жывёла -GenericName[bg]=Усмивка за работното място GenericName[ca]=Criatura a la pantalla GenericName[cs]=Příšerka na obrazovce GenericName[cy]=Creadur Ar-Sgrin diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdetoys-3.90.1/amor/data/billyrc new/kdetoys/amor/data/billyrc --- old/kdetoys-3.90.1/amor/data/billyrc 2007-05-03 10:36:11.000000000 +0200 +++ new/kdetoys/amor/data/billyrc 2007-05-13 08:03:07.000000000 +0200 @@ -6,7 +6,6 @@ Description[af]=Klein Billy Description[ar]=بيل الصغير Description[be]=Маленькі Біллі -Description[bg]=Малкият Били Description[br]=Billy Bihan Description[ca]=Petit Guillem Description[cs]=Malý Billy @@ -56,7 +55,6 @@ About[af]=Statiese venster sitter\nGraphic van http://www.xbill.org/ About[ar]=قاعدة النوافذ الساكنة \nالرسوم من http://www.xbill.org About[be]=Статычны наглядчык вокнаў\nГрафіка з http://www.xbill.org/ -About[bg]=Неанимирано човече\nГрафиката е взета от http://www.xbill.org/ About[ca]=Model de finestra estàtica\nGràfic de http://www.xbill.org/ About[cs]=Statická ozdoba okna\nGrafika z http://www.xbill.org/ About[cy]=Gwarchodydd ffenest sefydlog\nGraffeg oddiwrth http://www.xbill.org/ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdetoys-3.90.1/amor/data/blobrc new/kdetoys/amor/data/blobrc --- old/kdetoys-3.90.1/amor/data/blobrc 2007-05-03 10:36:11.000000000 +0200 +++ new/kdetoys/amor/data/blobrc 2007-05-13 08:03:07.000000000 +0200 @@ -4,7 +4,6 @@ Description=Multi-Talented Spot Description[ar]=نقطة متعددة المواهب Description[be]=Таленавіты калабок -Description[bg]=Всезнайко Description[ca]=Anunci multi-dotat Description[cs]=Talentovaný chlapík Description[cy]=Smotyn Aml-Dalentog @@ -51,7 +50,6 @@ About[af]=Deur Martin R. Jones\nJet pak, straal en vuur animasie Deur Merk Toegestaan About[ar]=من مارتن ر. جونز\nJet pack, الضوء, و النار من تصميم مارك غرانت About[be]=Аўтары Martin R. Jones\nАнімацыі агню, палёту і луча - Mark Grant -About[bg]=Автор Мартин Р. Джоунс\nПодобрения и анимация от Марк Гранд About[ca]=Per Martin R. Jones\nPaquet jet, nau i animacions de foc per Mark Grant About[cs]=Autor Martin R. Jones\nAnimace: Mark Grant About[cy]=Gan Martin R. Jones\nAnimeiddiadau pecyn jet, pelydryn a tân gan Mark Grant diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdetoys-3.90.1/amor/data/bonhommerc new/kdetoys/amor/data/bonhommerc --- old/kdetoys-3.90.1/amor/data/bonhommerc 2007-05-03 10:36:11.000000000 +0200 +++ new/kdetoys/amor/data/bonhommerc 2007-05-13 08:03:07.000000000 +0200 @@ -7,7 +7,6 @@ PixmapPath=pics/animated/bonhomme Description=Bonhomme Description[be]=Пляшучыя чалавечкі -Description[bg]=Тао Description[cs]=Mužíček Description[et]=Kriipsu-Juku Description[km]=មនុស្សឆ្អឹង @@ -26,7 +25,6 @@ About[af]=Deur Jean-Claude Dumas About[ar]=من جان كلود دوماس About[be]=Аўтар Jean-Claude Dumas -About[bg]=Автор Жан Клод Дюма About[br]=Gant Jean-Claude Dumas About[ca]=Per Jean-Claude Dumas About[cs]=Autor Jean-Claude Dumas diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdetoys-3.90.1/amor/data/bsdrc new/kdetoys/amor/data/bsdrc --- old/kdetoys-3.90.1/amor/data/bsdrc 2007-05-03 10:36:11.000000000 +0200 +++ new/kdetoys/amor/data/bsdrc 2007-05-13 08:03:07.000000000 +0200 @@ -5,7 +5,6 @@ Description=FreeBSD Mascot Description[af]=Freebsd Gelukbringer Description[be]=Сімвал FreeBSD -Description[bg]=Талисман на FreeBSD Description[ca]=Mascota de FreeBSD Description[cs]=Maskot FreeBSD Description[cy]=Masgot FreeBSD @@ -55,7 +54,6 @@ About[af]=Statiese venster sitter About[ar]=قاعد النوافذ الساكنة About[be]=Статычны наглядчык вокнаў -About[bg]=Неанимирано дяволче About[ca]=Model estàtic de finestra About[cs]=Statická ozdoba okna About[cy]=Gwarchodydd ffenest sefydlog diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdetoys-3.90.1/amor/data/eyesrc new/kdetoys/amor/data/eyesrc --- old/kdetoys-3.90.1/amor/data/eyesrc 2007-05-03 10:36:11.000000000 +0200 +++ new/kdetoys/amor/data/eyesrc 2007-05-13 08:03:07.000000000 +0200 @@ -7,7 +7,6 @@ Description[af]=Mal Oë Description[ar]=عيون مجنونة Description[be]=Вочы -Description[bg]=Луди очички Description[br]=Daoulagad foll Description[ca]=Ulls bojos Description[cs]=Voči šílený @@ -57,7 +56,6 @@ About[af]=Deur Jean-Claude Dumas About[ar]=من جان كلود دوماس About[be]=Аўтар Jean-Claude Dumas -About[bg]=Автор Жан Клод Дюма About[br]=Gant Jean-Claude Dumas About[ca]=Per Jean-Claude Dumas About[cs]=Autor Jean-Claude Dumas diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdetoys-3.90.1/amor/data/ghostrc new/kdetoys/amor/data/ghostrc --- old/kdetoys-3.90.1/amor/data/ghostrc 2007-05-03 10:36:11.000000000 +0200 +++ new/kdetoys/amor/data/ghostrc 2007-05-13 08:03:07.000000000 +0200 @@ -4,7 +4,6 @@ Description=Spooky Ghost Description[af]=Onheilspellende Spook Description[be]=Страшны прывід -Description[bg]=Призрачен Дух Description[br]=Tasmant Description[ca]=Fantasma misteriós Description[cs]=Strašidelný duch @@ -53,7 +52,6 @@ About[af]=Deur Martin R. Jones\nBased op 'n ikoon Deur die Kde kunstenaar span. About[ar]=من مارتن ر. جونز\nمبنية على أيقونة من فريق رسامي KDE About[be]=Аўтар Martin R. Jones\nЗроблена на базе значак ад каманды художнікаў KDE. -About[bg]=Автор Мартин Р. Джоунс\nБазирано на икона от KDE About[br]=Gant Martin R. Jones\nDiazezet war un arlun skipail arzour KDE. About[ca]=Per Martin R. Jones\nBasat en una icona del equip artístic de KDE. About[cs]=Autor Martin R. Jones\nNa základě ikony z KDE diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdetoys-3.90.1/amor/data/nekorc new/kdetoys/amor/data/nekorc --- old/kdetoys-3.90.1/amor/data/nekorc 2007-05-03 10:36:11.000000000 +0200 +++ new/kdetoys/amor/data/nekorc 2007-05-13 08:03:07.000000000 +0200 @@ -5,7 +5,6 @@ [Config] PixmapPath=pics/animated/neko Description=Neko -Description[bg]=Неко Description[et]=Hiirepüüdja Description[km]=នេកូ Description[ru]=Неко @@ -18,7 +17,6 @@ About[af]=Kunswerk van oneko deur Masayuki Koba\Namor'd deur Chris Spiegel About[ar]=عمل فني من أونيكو و من تصميم ماياسوكي كوبا\n نقلت الى Amor عن طريق كريس شبيغل About[be]=Малюнкі з oneko (аўтар Masayuki Koba)\n перанос ў AMOR - Chris Spiegel -About[bg]=Автор Масияки Коба\nАдаптация от Крис Шпигел About[ca]=Treball gràfic de oneko per Masayuki Koba\nAMOR per Chris Spiegel About[cs]=Grafika z programu oneko, Masayuki Koba\nPřevod: Chris Spiegel About[cy]=Gwaith arlunio oddiwrth oneko gan Masayuki Koba\nWedi ei AMORio gan Chris Spiegel diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdetoys-3.90.1/amor/data/pingurc new/kdetoys/amor/data/pingurc --- old/kdetoys-3.90.1/amor/data/pingurc 2007-05-03 10:36:11.000000000 +0200 +++ new/kdetoys/amor/data/pingurc 2007-05-13 08:03:07.000000000 +0200 @@ -3,7 +3,6 @@ PixmapPath=pics/animated/pingu Description=Tux Description[be]=Tукс -Description[bg]=Тюкс Description[eo]=Tuĉjo Description[he]=טקס Description[lv]=Tuksis @@ -18,7 +17,6 @@ About[af]=Deur Frank Pieczynski\nBased op grafieka van die speletjie "pingus". About[ar]=من فرانك بيسزينسكي\nمبنية على رسومات لعبة "pingus". About[be]=Аўтар Frank Pieczynski\nЗаснавана на графіцы з гульні "pingus". -About[bg]=Автор Франк Пижински\nБазирано на графика от играта pingus About[br]=Gant Frank Pieczynski\nDiazezet war ur skeudenn c'hoari « pingus ». About[ca]=Per Frank Pieczynski\nBasat en els gràfics del joc "pingus". About[cs]=Autor Frank Pieczynski\nNa základě grafiky hry "pingus". diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdetoys-3.90.1/amor/data/taorc new/kdetoys/amor/data/taorc --- old/kdetoys-3.90.1/amor/data/taorc 2007-05-03 10:36:11.000000000 +0200 +++ new/kdetoys/amor/data/taorc 2007-05-13 08:03:07.000000000 +0200 @@ -3,7 +3,6 @@ PixmapPath=pics/animated/tao Description=Tao Description[be]=Дао -Description[bg]=Тао Description[he]=טאו Description[mk]=Тао Description[ru]=Дао @@ -15,7 +14,6 @@ About[af]=Deur Daniel Pfeiffer <occitan(a)esperanto.org>\nYin Yang simbool geïnspireer Deur my Tai Chi oefening. About[ar]=تأليف Daniel Pfeiffer <occitan(a)esperanto.org>\nرموز الين و اليان من ممارستي للتاي شي. About[be]=Аўтар Daniel Pfeiffer <occitan(a)esperanto.org>\nYin Yang symbol inspired by my Tai Chi practice. -About[bg]=Автор Даниел Пфайфар <occitan(a)esperanto.org>\nИдеята за символа идва от хобито на автора About[br]=Gant Daniel Pfeiffer <occitan(a)esperanto.org>\nArouez Yin Yang a zo awenet gant pleustr Tai Chi. About[ca]=Per Daniel Pfeiffer <occitan(a)esperanto.org>\nEl símbol del Yin Yang s'ha inspirat en la meva pràctica del Tai Chi. About[cs]=Autor Daniel Pfeiffer <occitan(a)esperanto.org>\nYin Yang symbol inspirován mým cvičením Taiči diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdetoys-3.90.1/amor/data/tuxrc new/kdetoys/amor/data/tuxrc --- old/kdetoys-3.90.1/amor/data/tuxrc 2007-05-03 10:36:11.000000000 +0200 +++ new/kdetoys/amor/data/tuxrc 2007-05-13 08:03:07.000000000 +0200 @@ -6,7 +6,6 @@ Description[af]=Ongeanimeerde Tux Description[ar]=Tux غير متحرك Description[be]=Неанімаваны Тукс -Description[bg]=Неанимиран Тюкс Description[ca]=Tux sense animació Description[cs]=Neanimovaný Tux Description[cy]=Tux heb ei animeddio @@ -56,7 +55,6 @@ About[af]=Statiese venster sitter About[ar]=قاعد النوافذ الساكنة About[be]=Статычны наглядчык вокнаў -About[bg]=Неанимирано дяволче About[ca]=Model estàtic de finestra About[cs]=Statická ozdoba okna About[cy]=Gwarchodydd ffenest sefydlog diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdetoys-3.90.1/amor/data/wormrc new/kdetoys/amor/data/wormrc --- old/kdetoys-3.90.1/amor/data/wormrc 2007-05-03 10:36:11.000000000 +0200 +++ new/kdetoys/amor/data/wormrc 2007-05-13 08:03:07.000000000 +0200 @@ -5,7 +5,6 @@ Description[af]=Klein Wurm Description[ar]=دودة صغيرة Description[be]=Маленькі чарвячок -Description[bg]=Малкото Червейче Description[br]=Buzugig Description[ca]=Cuquet Description[cs]=Červík @@ -56,7 +55,6 @@ About[af]=Deur Bartosz Trudnowski\nMade vir my vrou About[ar]=من Bartosz Trudnowski\nصنعته لزوجتي About[be]=Аўтар Bartosz Trudnowski\nЗрабіў для жонкі -About[bg]=Автор Бартоз Трудновски\nПосвещава се на съпругата на автора About[br]=Gant Bartosz Trudnowski\nGraet evit ma wreg About[ca]=Per Bartosz Trudnowski\nFet per a la meva dona About[cs]=Autor Bartosz Trudnowski\nPro mou manželku Files old/kdetoys-3.90.1/doc/amor/index.cache.bz2 and new/kdetoys/doc/amor/index.cache.bz2 differ Files old/kdetoys-3.90.1/doc/kmoon/index.cache.bz2 and new/kdetoys/doc/kmoon/index.cache.bz2 differ Files old/kdetoys-3.90.1/doc/kodo/index.cache.bz2 and new/kdetoys/doc/kodo/index.cache.bz2 differ Files old/kdetoys-3.90.1/doc/kteatime/index.cache.bz2 and new/kdetoys/doc/kteatime/index.cache.bz2 differ Files old/kdetoys-3.90.1/doc/kweather/index.cache.bz2 and new/kdetoys/doc/kweather/index.cache.bz2 differ Files old/kdetoys-3.90.1/doc/kworldclock/index.cache.bz2 and new/kdetoys/doc/kworldclock/index.cache.bz2 differ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdetoys-3.90.1/eyesapplet/eyesapplet.desktop new/kdetoys/eyesapplet/eyesapplet.desktop --- old/kdetoys-3.90.1/eyesapplet/eyesapplet.desktop 2007-05-03 10:36:17.000000000 +0200 +++ new/kdetoys/eyesapplet/eyesapplet.desktop 2007-05-13 08:03:07.000000000 +0200 @@ -5,7 +5,6 @@ Name[af]=Oë Name[ar]=عيون Name[be]=Вочы -Name[bg]=Очички Name[br]=Daoulagad Name[ca]=Ulls Name[cs]=Oči diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdetoys-3.90.1/fifteenapplet/kfifteenapplet.desktop new/kdetoys/fifteenapplet/kfifteenapplet.desktop --- old/kdetoys-3.90.1/fifteenapplet/kfifteenapplet.desktop 2007-05-03 10:36:10.000000000 +0200 +++ new/kdetoys/fifteenapplet/kfifteenapplet.desktop 2007-05-13 08:03:07.000000000 +0200 @@ -5,7 +5,6 @@ Name[af]=Vyftien Dele Name[ar]=خمسة عشرة قطعة Name[be]=Пятнаццаць чарапкоў -Name[bg]=Пъзел от 15 части Name[ca]=Quinze peces Name[cs]=Patnáct Name[cy]=Pymtheg Darn @@ -55,7 +54,6 @@ Comment=A little game with fifteen pieces Comment[ar]= لعبة صغيرة مع خمسة عشرة قطعة Comment[be]=Маленькая гульня з пятнаццацю чарапкамі -Comment[bg]=Малък пъзел от 15 части Comment[ca]=Una joguina amb quinze peces Comment[cs]=Malá hra s patnácti kameny Comment[cy]=Gêm fach efo pymtheg darn diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdetoys-3.90.1/kteatime/CMakeLists.txt new/kdetoys/kteatime/CMakeLists.txt --- old/kdetoys-3.90.1/kteatime/CMakeLists.txt 2007-05-03 10:36:11.000000000 +0200 +++ new/kdetoys/kteatime/CMakeLists.txt 2007-05-14 19:19:03.000000000 +0200 @@ -14,7 +14,7 @@ kde4_add_executable(kteatime ${kteatime_SRCS}) -target_link_libraries(kteatime ${KDE4_KIO_LIBS} ${KDE4_KNOTIFYCONFIG_LIBS} ) +target_link_libraries(kteatime ${KDE4_KIO_LIBS} ${KDE4_KNOTIFYCONFIG_LIBS} ${QT_QT3SUPPORT_LIBRARY}) install(TARGETS kteatime DESTINATION ${BIN_INSTALL_DIR} ) diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdetoys-3.90.1/kteatime/kteatime.desktop new/kdetoys/kteatime/kteatime.desktop --- old/kdetoys-3.90.1/kteatime/kteatime.desktop 2007-05-03 10:36:11.000000000 +0200 +++ new/kdetoys/kteatime/kteatime.desktop 2007-05-13 08:03:07.000000000 +0200 @@ -10,7 +10,6 @@ Name[x-test]=xxKTeaTimexx GenericName=Tea Cooker GenericName[be]=Прыгатаўленне гарбаты -GenericName[bg]=Приготвяне на чай GenericName[br]=Ar pod te GenericName[ca]=El cuiner de te GenericName[cs]=Vařič čaje diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdetoys-3.90.1/ktux/CMakeLists.txt new/kdetoys/ktux/CMakeLists.txt --- old/kdetoys-3.90.1/ktux/CMakeLists.txt 2007-05-03 10:36:10.000000000 +0200 +++ new/kdetoys/ktux/CMakeLists.txt 2007-05-15 10:14:39.000000000 +0200 @@ -13,7 +13,7 @@ kde4_add_executable(ktux ${ktux_SRCS}) -target_link_libraries(ktux ${KDE4_KDEUI_LIBS} kscreensaver ) +target_link_libraries(ktux ${KDE4_KDEUI_LIBS} ${QT_QT3SUPPORT_LIBRARY} kscreensaver ) install(TARGETS ktux DESTINATION ${BIN_INSTALL_DIR} ) diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdetoys-3.90.1/ktux/ktux.desktop new/kdetoys/ktux/ktux.desktop --- old/kdetoys-3.90.1/ktux/ktux.desktop 2007-05-03 10:36:10.000000000 +0200 +++ new/kdetoys/ktux/ktux.desktop 2007-05-13 08:03:07.000000000 +0200 @@ -2,7 +2,6 @@ Encoding=UTF-8 Name=KTux Name[af]=Ktux -Name[bg]=Тюкс Name[eo]=Tuĉjo Name[ko]=K턱스 Name[ta]= KTux @@ -22,7 +21,6 @@ Name[af]=Opstelling... Name[ar]=اعداد... Name[be]=Настаўленні... -Name[bg]=Конфигуриране... Name[br]=Kefluniadur ... Name[ca]=Configuració... Name[cs]=Nastavení... @@ -79,7 +77,6 @@ Exec=ktux -window-id %w Name=Display in Specified Window Name[be]=Паказваць у зададзеным вакне -Name[bg]=Стартиране в избран прозорец Name[br]=Diskwel er prenestr spisaet Name[ca]=Mostra a la finestra especificada Name[cs]=Zobrazit v určeném okně @@ -130,7 +127,6 @@ Exec=ktux -root Name=Display in Root Window Name[be]=Паказваць у фанавым вакне -Name[bg]=Стартиране в главния прозорец Name[br]=Diskwel er prenestr gwrizienn Name[ca]=Mostra a la finestra arrel Name[cs]=Zobrazit na pozadí plochy diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdetoys-3.90.1/kweather/CMakeLists.txt new/kdetoys/kweather/CMakeLists.txt --- old/kdetoys-3.90.1/kweather/CMakeLists.txt 2007-05-03 10:36:17.000000000 +0200 +++ new/kdetoys/kweather/CMakeLists.txt 2007-05-14 19:19:03.000000000 +0200 @@ -57,7 +57,7 @@ kde4_add_executable(kweatherservice ${kweatherservice_SRCS}) -target_link_libraries(kweatherservice ${KDE4_KIO_LIBS} ) +target_link_libraries(kweatherservice ${KDE4_KIO_LIBS} ${QT_QT3SUPPORT_LIBRARY}) install(TARGETS kweatherservice DESTINATION ${BIN_INSTALL_DIR} ) @@ -92,7 +92,7 @@ kde4_add_plugin(weather_panelapplet ${weather_panelapplet_PART_SRCS}) -target_link_libraries(weather_panelapplet ${KDE4_KDE3SUPPORT_LIBS} ${KDE4_KHTML_LIBS} kickermain ) +target_link_libraries(weather_panelapplet ${KDE4_KDE3SUPPORT_LIBS} ${KDE4_KHTML_LIBS} kickermain ${KDE4_KUTILS_LIBS} ) install(TARGETS weather_panelapplet DESTINATION ${PLUGIN_INSTALL_DIR}) diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdetoys-3.90.1/kweather/kcmweather.desktop new/kdetoys/kweather/kcmweather.desktop --- old/kdetoys-3.90.1/kweather/kcmweather.desktop 2007-05-03 10:36:17.000000000 +0200 +++ new/kdetoys/kweather/kcmweather.desktop 2007-05-13 08:03:07.000000000 +0200 @@ -13,7 +13,6 @@ Name=Display Name[ar]=الشاشة Name[be]=Паказваць -Name[bg]=Показване Name[br]=Diskwel Name[ca]=Pantalla Name[cs]=Zobrazení @@ -62,7 +61,6 @@ Comment=Display Setup Comment[ar]=تعيين الشاشة Comment[be]=Настаўленне паказу -Comment[bg]=Настройки на показването Comment[br]=Kefluniadur an Diskwel Comment[ca]=Configuració de pantalla Comment[cs]=Nastavení zobrazení @@ -110,7 +108,6 @@ Comment[zh_TW]=顯示設定 Keywords=kweather, weather, configure, settings, display Keywords[ar]=kweather برنامج, الطقس, تهيئة, إعدادات, شاشة -Keywords[bg]=време, метеорологично, метеорология, показване, състояние, доклад, kweather, weather, configure, settings, display Keywords[br]=kweather, amzer, kefluniañ, dibarzhoù, diskwel Keywords[ca]=kweather, temps, configuració, paràmetres, pantalla Keywords[cs]=kweather,počasí,nastavení,zobrazení diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdetoys-3.90.1/kweather/kcmweatherservice.desktop new/kdetoys/kweather/kcmweatherservice.desktop --- old/kdetoys-3.90.1/kweather/kcmweatherservice.desktop 2007-05-03 10:36:17.000000000 +0200 +++ new/kdetoys/kweather/kcmweatherservice.desktop 2007-05-13 08:03:07.000000000 +0200 @@ -14,7 +14,6 @@ Name=Weather Service Name[ar]=خدمة الأرصاد الجوية Name[be]=Сервіс надвор'я -Name[bg]=Сървър Name[br]=Servij an amzer Name[ca]=Servei meteorològic Name[cs]=Služba počasí @@ -63,7 +62,6 @@ Name[zh_TW]=氣象服務 Comment=Weather Service Setup Comment[be]=Настаўленне сервісу надвор'я -Comment[bg]=Настройки на метеорологичния сървър Comment[br]=Kefluniadur servij an amzer Comment[ca]=Configuració del servei meteorològic Comment[cs]=Nastavení služby počasí @@ -110,7 +108,6 @@ Comment[zh_TW]=氣象服務設定 Keywords=kweather, weather service, configure, settings Keywords[ar]=kweather برنامج, خدمة الأرصاد الجوية والطقس, تهيئة, إعدادات, شاشة -Keywords[bg]=време, метеорологично, метеорология, показване, състояние, доклад, kweather, weather service, configure, settings Keywords[ca]=kweather, servei meteorològic, configuració, paràmetres Keywords[cs]=kweather,služba počasí,nastavení Keywords[cy]=kweather, ktywydd, tywydd, ffurfweddu, gosodiadau diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdetoys-3.90.1/kweather/kweather.desktop new/kdetoys/kweather/kweather.desktop --- old/kdetoys-3.90.1/kweather/kweather.desktop 2007-05-03 10:36:17.000000000 +0200 +++ new/kdetoys/kweather/kweather.desktop 2007-05-13 08:03:07.000000000 +0200 @@ -11,7 +11,6 @@ Name=Weather Report Name[ar]=تقرير الطقس Name[be]=Прагноз надвор'я -Name[bg]=Метеорологично време Name[ca]=Informació del temps Name[cs]=Zpráva o počasí Name[cy]=Adroddiad Tywydd diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdetoys-3.90.1/kweather/weatherbar_add.desktop new/kdetoys/kweather/weatherbar_add.desktop --- old/kdetoys-3.90.1/kweather/weatherbar_add.desktop 2007-05-03 10:36:17.000000000 +0200 +++ new/kdetoys/kweather/weatherbar_add.desktop 2007-05-13 08:03:07.000000000 +0200 @@ -6,7 +6,6 @@ Name=Sidebar Weather Report Name[ar]=تقرير الطقس على الشريط الجانبي Name[be]=Бакавы прагноз надвор'я -Name[bg]=Метеорологично време Name[ca]=Barra d'informació del temps Name[cs]=Zpráva o počasí pro postranní lištu Name[cy]=Adroddiad Tywydd i'r Bar Ochr diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdetoys-3.90.1/kweather/weatherbar.desktop new/kdetoys/kweather/weatherbar.desktop --- old/kdetoys-3.90.1/kweather/weatherbar.desktop 2007-05-03 10:36:17.000000000 +0200 +++ new/kdetoys/kweather/weatherbar.desktop 2007-05-13 08:03:07.000000000 +0200 @@ -6,7 +6,6 @@ Name=Sidebar Weather Report Name[ar]=تقرير الطقس على الشريط الجانبي Name[be]=Бакавы прагноз надвор'я -Name[bg]=Метеорологично време Name[ca]=Barra d'informació del temps Name[cs]=Zpráva o počasí pro postranní lištu Name[cy]=Adroddiad Tywydd i'r Bar Ochr diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdetoys-3.90.1/kworldwatch/applet.cpp new/kdetoys/kworldwatch/applet.cpp --- old/kdetoys-3.90.1/kworldwatch/applet.cpp 2007-05-03 10:36:10.000000000 +0200 +++ new/kdetoys/kworldwatch/applet.cpp 2007-05-07 22:26:59.000000000 +0200 @@ -123,6 +123,6 @@ if (clicked && e->button() == Qt::LeftButton) { - KRun::run("kworldclock", KUrl::List()); + KRun::run("kworldclock", KUrl::List(),this); } } diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdetoys-3.90.1/kworldwatch/kdeworld.desktop new/kdetoys/kworldwatch/kdeworld.desktop --- old/kdetoys-3.90.1/kworldwatch/kdeworld.desktop 2007-05-03 10:36:10.000000000 +0200 +++ new/kdetoys/kworldwatch/kdeworld.desktop 2007-05-13 08:03:07.000000000 +0200 @@ -3,7 +3,6 @@ Comment[af]=Kde Wêreld horlosie deur Matthias Hoelzer-kluepfel Comment[ar]=ساعة عالمية لKDE من ماتياس هولتسر-كلوبفل Comment[be]=Сусветны гадзіннік KDE (аўтар Matthias Hoelzer-Kluepfel) -Comment[bg]=Часовник, който показва часа в различни точки на света Comment[br]=Eurier bedel KDE gant Matthias Hoelzer-Kluepfel Comment[ca]=Rellotge mundial KDE per Matthias Hoelzer-Kluepfel Comment[cs]=KDE WorldClock od Matthiase Hoelzer-Kluepfela diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdetoys-3.90.1/kworldwatch/kworldclock.desktop new/kdetoys/kworldwatch/kworldclock.desktop --- old/kdetoys-3.90.1/kworldwatch/kworldclock.desktop 2007-05-03 10:36:10.000000000 +0200 +++ new/kdetoys/kworldwatch/kworldclock.desktop 2007-05-13 08:03:07.000000000 +0200 @@ -18,7 +18,6 @@ Name[x-test]=xxKWorldClockxx GenericName=World Clock GenericName[be]=Сусветны гадзіннік -GenericName[bg]=Световен часовник GenericName[br]=Eurier bedel GenericName[ca]=Rellotge mundial GenericName[cs]=Světové hodiny diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdetoys-3.90.1/kworldwatch/kwwapplet.desktop new/kdetoys/kworldwatch/kwwapplet.desktop --- old/kdetoys-3.90.1/kworldwatch/kwwapplet.desktop 2007-05-03 10:36:10.000000000 +0200 +++ new/kdetoys/kworldwatch/kwwapplet.desktop 2007-05-13 08:03:07.000000000 +0200 @@ -5,7 +5,6 @@ Name=World Wide Watch Name[af]=Wêreld Wye Waarneem Name[be]=Сусветны гадзіннік -Name[bg]=Световен часовник Name[br]=Eurier bedel Name[ca]=Rellotge de tot el món mundial Name[cs]=Světové hodiny @@ -50,7 +49,6 @@ Comment=Displays time and sunshine on a world map Comment[ar]=يعرض الوقت و وقت شروق الشمس على خريطة عالمية Comment[be]=Паказвае час і сонечны свет на карце свету -Comment[bg]=Показване на часа и времето от денонощието на световната карта Comment[ca]=Mostra l'hora i la llum del sol a un mapa del món Comment[cs]=Zobrazuje čas a sluneční svit na světové mapě Comment[cy]=Dangos amser ac heulwen ar fap y byd diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdetoys-3.90.1/kworldwatch/maploader.cpp new/kdetoys/kworldwatch/maploader.cpp --- old/kdetoys-3.90.1/kworldwatch/maploader.cpp 2007-05-03 10:36:10.000000000 +0200 +++ new/kdetoys/kworldwatch/maploader.cpp 2007-05-08 17:13:53.000000000 +0200 @@ -51,8 +51,9 @@ QStringList files = KGlobal::dirs()->findAllResources("data", "kworldclock/maps/*/*.desktop"); for (QStringList::Iterator it=files.begin(); it != files.end(); ++it) { - KDesktopFile conf(*it); - result.append(new MapTheme(conf.readName(), conf.group("Theme").readEntry("Theme"))); + KConfig conf(*it); + KConfigGroup group = conf.group("Theme"); + result.append(new MapTheme(group.readEntry("Name"), group.readEntry("Theme"))); } return result; diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdetoys-3.90.1/kworldwatch/maploader.h new/kdetoys/kworldwatch/maploader.h --- old/kdetoys-3.90.1/kworldwatch/maploader.h 2007-05-03 10:36:10.000000000 +0200 +++ new/kdetoys/kworldwatch/maploader.h 2007-05-08 17:14:14.000000000 +0200 @@ -39,11 +39,11 @@ MapTheme() : _name(""), _tag(""), _id(0) {} MapTheme(const QString &name, const QString &tag) : _name(name), _tag(tag), _id(0) {} - QString tag() { return _tag; } - QString name() { return _name; } + QString tag() const { return _tag; } + QString name() const { return _name; } void setID(int i) { _id = i; } - int ID() { return _id; } + int ID() const { return _id; } private: diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdetoys-3.90.1/kworldwatch/maps/depths/depths.desktop new/kdetoys/kworldwatch/maps/depths/depths.desktop --- old/kdetoys-3.90.1/kworldwatch/maps/depths/depths.desktop 2007-05-03 10:36:10.000000000 +0200 +++ new/kdetoys/kworldwatch/maps/depths/depths.desktop 2007-05-13 08:03:07.000000000 +0200 @@ -3,7 +3,6 @@ Name[af]=Oppervlakte Diepte Name[ar]=عمق السطح Name[be]=Глыбіня паверхні -Name[bg]=Релеф на земната повърхност Name[br]=Krogad en egor Name[ca]=Extensió de la superfície Name[cs]=Plocha do hloubky diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdetoys-3.90.1/kworldwatch/maps/flatworld/flatworld.desktop new/kdetoys/kworldwatch/maps/flatworld/flatworld.desktop --- old/kdetoys-3.90.1/kworldwatch/maps/flatworld/flatworld.desktop 2007-05-03 10:36:10.000000000 +0200 +++ new/kdetoys/kworldwatch/maps/flatworld/flatworld.desktop 2007-05-13 08:03:07.000000000 +0200 @@ -1,7 +1,6 @@ [Theme] Name=Flat World Name[be]=Плоскі свет -Name[bg]=Без релеф на земната повърхност Name[br]=Bed kompez Name[cs]=Plochý svět Name[cy]=Byd Gwastad ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit kdegraphics4
by root＠Hilbert.suse.de 28 May '07

28 May '07

Hello community, here is the log from the commit of package kdegraphics4 checked in at Mon May 28 23:38:42 CEST 2007. -------- --- KDE/kdegraphics4/kdegraphics4.changes 2007-05-25 14:08:39.000000000 +0200 +++ /mounts/work_src_done/STABLE/kdegraphics4/kdegraphics4.changes 2007-05-28 23:17:27.000000000 +0200 @@ -1,0 +2,5 @@ +Mon May 28 23:17:21 CEST 2007 - dmueller(a)suse.de + +- update to 3.90.1.svn668119 + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kdegraphics4.spec ++++++ --- /var/tmp/diff_new_pack.p29713/_old 2007-05-28 23:38:31.000000000 +0200 +++ /var/tmp/diff_new_pack.p29713/_new 2007-05-28 23:38:31.000000000 +0200 @@ -27,7 +27,7 @@ Summary: kdegraphics base package URL: http://www.kde.org Version: 3.90.1 -Release: 6 +Release: 9 Source0: kdegraphics.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-build Requires: kdebase4-runtime @@ -59,7 +59,7 @@ The KDE Team <kde(a)kde.org> %prep -%setup -q -n kdegraphics-3.90.1 +%setup -q -n kdegraphics %patch %build @@ -613,6 +613,8 @@ /usr/share/kde4/services/scanservice.desktop %changelog +* Mon May 28 2007 - dmueller(a)suse.de +- update to 3.90.1.svn668119 * Fri May 25 2007 - stbinner(a)suse.de - split off -devel package * Fri May 18 2007 - stbinner(a)suse.de ++++++ kdegraphics.tar.bz2 ++++++ ++++ 8356 lines of diff (skipped) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit kdegames4
by root＠Hilbert.suse.de 28 May '07

28 May '07

Hello community, here is the log from the commit of package kdegames4 checked in at Mon May 28 23:38:33 CEST 2007. -------- --- KDE/kdegames4/kdegames4-carddecks.changes 2007-05-07 14:38:50.000000000 +0200 +++ /mounts/work_src_done/STABLE/kdegames4/kdegames4-carddecks.changes 2007-05-28 23:38:17.634347000 +0200 @@ -1,0 +2,5 @@ +Mon May 28 23:15:38 CEST 2007 - dmueller(a)suse.de + +- update to 3.90.1.svn668119 + +------------------------------------------------------------------- kdegames4.changes: same change ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kdegames4-carddecks.spec ++++++ --- /var/tmp/diff_new_pack.U28986/_old 2007-05-28 23:38:25.000000000 +0200 +++ /var/tmp/diff_new_pack.U28986/_new 2007-05-28 23:38:25.000000000 +0200 @@ -16,7 +16,7 @@ Summary: Default Card Decks for KDE Games URL: http://www.kde.org Version: 3.90.1 -Release: 1 +Release: 2 Source0: kdegames.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildArch: noarch @@ -93,6 +93,8 @@ /usr/share/apps/carddecks/svg-nicu-ornamental %changelog +* Mon May 28 2007 - dmueller(a)suse.de +- update to 3.90.1.svn668119 * Mon May 07 2007 - stbinner(a)suse.de - update to new SVN snapshot (roughly KDE 4.0 Alpha) * Fri Apr 27 2007 - stbinner(a)suse.de ++++++ kdegames4.spec ++++++ --- /var/tmp/diff_new_pack.U28986/_old 2007-05-28 23:38:25.000000000 +0200 +++ /var/tmp/diff_new_pack.U28986/_new 2007-05-28 23:38:25.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package kdegames4 (Version 3.90.1.svn661144) +# spec file for package kdegames4 (Version 3.90.1.svn668121) # # Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine @@ -18,7 +18,7 @@ Group: System/GUI/KDE Summary: General Data for KDE Games URL: http://www.kde.org -Version: 3.90.1.svn661144 +Version: 3.90.1.svn668121 Release: 1 Source0: kdegames.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -47,7 +47,6 @@ Suggests: kde4-lskat Suggests: kde4-squares Suggests: kde4-kiriki -%define prefix /usr Patch: desktop-files.diff %description @@ -68,12 +67,9 @@ export CXXFLAGS="$CFLAGS" mkdir build cd build - %ifarch x86_64 ppc64 s390x mips64 sparc64 - cmake -DCMAKE_INSTALL_PREFIX=%prefix -DCMAKE_BUILD_TYPE=debugfull ../ -DLIB_INSTALL_DIR=%prefix/lib64 - %else - cmake -DCMAKE_INSTALL_PREFIX=%prefix -DCMAKE_BUILD_TYPE=debugfull ../ - %endif - make + cmake -DCMAKE_INSTALL_PREFIX=%{_prefix} -DCMAKE_BUILD_TYPE=release \ + -DLIB_INSTALL_DIR=%{_libdir} -DLIB_SUFFIX=$(echo %_lib | cut -b -f3-) .. + make %{?jobs:-j %jobs} %install cd build @@ -183,7 +179,6 @@ /usr/include/KDE/KHighscore /usr/include/KDE/KScoreDialog /usr/include/KDE/KStandardGameAction -/usr/include/KDE/KZoomMainWindow /usr/include/kcarddialog.h /usr/include/kgamesvgdocument.h /usr/include/kchat.h @@ -202,10 +197,14 @@ /usr/include/khighscore.h /usr/include/kscoredialog.h /usr/include/kstandardgameaction.h -/usr/include/kzoommainwindow.h /usr/include/libkdegames_export.h +/usr/include/libksirtet +/usr/include/KDE/KGameTheme +/usr/include/kgametheme.h +/usr/include/kgamethemeselector.h /usr/share/apps/cmake/modules/FindLibKDEGames.cmake /usr/share/apps/cmake/modules/GGZ.cmake +/usr/share/apps/cmake/modules/FindLibKSirtet.cmake %package -n kde4-katomic Group: Amusements/Games/Board/Puzzle Summary: Sokoban-like logic game @@ -491,6 +490,7 @@ /usr/share/apps/kmines %doc %lang(en) /usr/share/doc/HTML/en/kmines /usr/share/icons/hicolor/*/apps/kmines.* +/usr/share/config/kmines.knsrc %package -n kde4-knetwalk Group: Amusements/Games/Board/Puzzle Summary: Puzzle game @@ -939,9 +939,10 @@ %doc COPYING COPYING-DOCS COPYING.LIB README /usr/share/apps/kdegames /usr/share/icons/oxygen/*/actions/endturn.* -/usr/share/icons/oxygen/*/actions/highscore.* %changelog +* Mon May 28 2007 - dmueller(a)suse.de +- update to 3.90.1.svn668119 * Mon May 07 2007 - stbinner(a)suse.de - update to new SVN snapshot (roughly KDE 4.0 Alpha) * Fri Apr 27 2007 - stbinner(a)suse.de ++++++ kdegames.tar.bz2 ++++++ KDE/kdegames4/kdegames.tar.bz2 /mounts/work_src_done/STABLE/kdegames4/kdegames.tar.bz2 differ: byte 11, line 1 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit ufraw
by root＠Hilbert.suse.de 28 May '07

28 May '07

Hello community, here is the log from the commit of package ufraw checked in at Mon May 28 23:38:14 CEST 2007. -------- --- ufraw/ufraw.changes 2007-03-13 00:40:26.000000000 +0100 +++ /mounts/work_src_done/STABLE/ufraw/ufraw.changes 2007-05-28 19:31:46.000000000 +0200 @@ -1,0 +2,5 @@ +Mon May 28 19:31:25 CEST 2007 - schwab(a)suse.de + +- Fix writing beyond array bounds. + +------------------------------------------------------------------- New: ---- ufraw-boundary.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ ufraw.spec ++++++ --- /var/tmp/diff_new_pack.t27747/_old 2007-05-28 23:38:10.000000000 +0200 +++ /var/tmp/diff_new_pack.t27747/_new 2007-05-28 23:38:10.000000000 +0200 @@ -19,12 +19,13 @@ Group: Productivity/Graphics/Other Autoreqprov: on Version: 0.11 -Release: 1 +Release: 27 %define vversion 0.11 Summary: The Unidentified Flying Raw Source: %{name}-%{version}.tar.bz2 Patch: %{name}-desktop.patch Patch2: %{name}-gcc.patch +Patch3: %{name}-boundary.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build %description @@ -67,6 +68,7 @@ %setup -q -n %{name}-%{vversion} %patch %patch2 +%patch3 %build %{suse_update_config -f} @@ -107,6 +109,8 @@ %_gimpplugindir/plug-ins/ %changelog +* Mon May 28 2007 - schwab(a)suse.de +- Fix writing beyond array bounds. * Fri Mar 09 2007 - postadal(a)suse.cz - updated to version 0.11 * option to restore highlights, relevant when applying negative ++++++ ufraw-boundary.patch ++++++ --- dcraw.cc +++ dcraw.cc @@ -5868,9 +5868,9 @@ if (!strncmp (make,"KODAK",5)) make[16] = model[16] = 0; cp = make + strlen(make); /* Remove trailing spaces */ - while (*--cp == ' ') *cp = 0; + while (cp > make && *--cp == ' ') *cp = 0; cp = model + strlen(model); - while (*--cp == ' ') *cp = 0; + while (cp > model && *--cp == ' ') *cp = 0; i = strlen(make); /* Remove make from model */ if (!strncmp (model, make, i) && model[i++] == ' ') memmove (model, model+i, 64-i); ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit slang
by root＠Hilbert.suse.de 28 May '07

28 May '07

Hello community, here is the log from the commit of package slang checked in at Mon May 28 23:38:04 CEST 2007. -------- --- slang/slang.changes 2006-01-31 10:23:06.000000000 +0100 +++ /mounts/work_src_done/STABLE/slang/slang.changes 2007-05-28 17:22:46.000000000 +0200 @@ -1,0 +2,5 @@ +Mon May 28 17:22:16 CEST 2007 - nadvornik(a)suse.cz + +- do not package binaries in documentation directory + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ slang.spec ++++++ --- /var/tmp/diff_new_pack.q26970/_old 2007-05-28 23:37:55.000000000 +0200 +++ /var/tmp/diff_new_pack.q26970/_new 2007-05-28 23:37:55.000000000 +0200 @@ -1,20 +1,20 @@ # # spec file for package slang (Version 2.0.5) # -# Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine # package are under the same license as the package itself. # -# Please submit bugfixes or comments via http://bugs.opensuse.org +# Please submit bugfixes or comments via http://bugs.opensuse.org/ # # norootforbuild Name: slang -License: GPL, Artistic License +License: Artistic License, GNU General Public License (GPL) Group: System/Libraries Version: 2.0.5 -Release: 3 +Release: 50 Provides: slang%{version} Autoreqprov: on Summary: A Library for Display Control @@ -92,6 +92,10 @@ #make runtests cd doc ln -s slangdoc.html index.html +cd ../modules +make clean +cd ../slsh +make clean rm -rf $RPM_BUILD_ROOT/usr/share/doc/slang rm -f /doc/tm/tools/{solarisobjs,i686objs} @@ -121,7 +125,9 @@ %clean rm -rf "$RPM_BUILD_ROOT" -%changelog -n slang +%changelog +* Mon May 28 2007 - nadvornik(a)suse.cz +- do not package binaries in documentation directory * Tue Jan 31 2006 - nadvornik(a)suse.cz - fixed typo in locale code [#146603] * Wed Jan 25 2006 - mls(a)suse.de ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0