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