May 2006 - openSUSE Commits - openSUSE Mailing Lists

commit man-pages
by root＠suse.de 17 May '06

17 May '06

Hello community, here is the log from the commit of package man-pages checked in at Wed May 17 19:06:51 CEST 2006. -------- --- AUTO/noarch/man-pages/man-pages.changes 2006-04-24 11:26:21.000000000 +0200 +++ man-pages/man-pages.changes 2006-05-17 11:29:16.000000000 +0200 @@ -1,0 +2,7 @@ +Wed May 17 11:28:49 CEST 2006 - kukuk(a)suse.de + +- Update to version 2.32 + - document all *at() functions + - lot of small corrections about error handling in various places + +------------------------------------------------------------------- Old: ---- man-pages-2.29.tar.bz2 New: ---- man-pages-2.32.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ man-pages.spec ++++++ --- /var/tmp/diff_new_pack.u1nFmf/_old 2006-05-17 19:06:28.000000000 +0200 +++ /var/tmp/diff_new_pack.u1nFmf/_new 2006-05-17 19:06:28.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package man-pages (Version 2.25) +# spec file for package man-pages (Version 2.32) # # Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine @@ -15,7 +15,7 @@ License: BSD, GPL Group: Documentation/Man Autoreqprov: on -Version: 2.29 +Version: 2.32 Release: 1 Summary: Linux and POSIX Manual Pages BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -91,6 +91,16 @@ %doc man-pages-*.lsm %changelog -n man-pages +* 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 +* Mon Apr 24 2006 - kukuk(a)suse.de +- Auto-Update to version 2.29 +* Sat Mar 25 2006 - autobuild(a)suse.de +- Auto-Update to version 2.27 +* Tue Mar 21 2006 - autobuild(a)suse.de +- 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 ++++++ man-pages-2.29.tar.bz2 -> man-pages-2.32.tar.bz2 ++++++ ++++ 9269 lines of diff (skipped) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun...

1 0

commit snd
by root＠suse.de 17 May '06

17 May '06

Hello community, here is the log from the commit of package snd checked in at Wed May 17 19:06:26 CEST 2006. -------- --- snd/snd.changes 2006-01-25 21:41:42.000000000 +0100 +++ snd/snd.changes 2006-05-17 18:08:48.000000000 +0200 @@ -1,0 +2,10 @@ +Wed May 17 18:07:25 CEST 2006 - tiwai(a)suse.de + +- updated to version 8.1: + * many new scm and pd files + * improved alsa support + * see HISTORY.Snd for details +- Use gtk2 as GUI. +- Add gsl support. + +------------------------------------------------------------------- Old: ---- snd-7.18.tar.bz2 snd-audio-fix.diff snd-sentinel.patch New: ---- snd-8.1.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ snd.spec ++++++ --- /var/tmp/diff_new_pack.t94mQJ/_old 2006-05-17 19:05:55.000000000 +0200 +++ /var/tmp/diff_new_pack.t94mQJ/_new 2006-05-17 19:05:55.000000000 +0200 @@ -1,19 +1,19 @@ # -# spec file for package snd (Version 7.18) +# spec file for package snd (Version 8.1) # # Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine # package are under the same license as the package itself. # -# Please submit bugfixes or comments via http://bugs.opensuse.org +# Please submit bugfixes or comments via http://bugs.opensuse.org/ # # norootforbuild Name: snd -BuildRequires: alsa-devel fftw3-devel freeglut-devel guile jack-devel ladspa libdrm-devel libsamplerate-devel openmotif openmotif-devel update-desktop-files +BuildRequires: alsa-devel fftw3-devel freeglut-devel gsl gsl-devel gtk2-devel guile jack-devel ladspa libdrm-devel libsamplerate-devel update-desktop-files Summary: Powerful Sound File Editor -Version: 7.18 +Version: 8.1 Release: 1 License: distributable, Other License(s), see package Group: Productivity/Multimedia/Sound/Editors and Convertors @@ -21,8 +21,6 @@ Source: snd-%{version}.tar.bz2 Source1: snd.desktop Source2: snd.png -Patch1: snd-audio-fix.diff -Patch2: snd-sentinel.patch URL: http://ccrma-www.stanford.edu/CCRMA/Software/snd/snd.html BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -39,9 +37,7 @@ Bill Schottstaedt <bil(a)ccrma.stanford.edu> %prep -%setup -n snd-7 -# %patch1 -%patch2 +%setup -n snd-8 %{?suse_update_config:%{suse_update_config -f}} find -name "*~" -type f | xargs -r rm -v @@ -51,7 +47,7 @@ CFLAGS="$RPM_OPT_FLAGS $CFLAGS -fno-strict-aliasing" \ CXXFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing" \ ./configure --prefix=%{_prefix} \ - --with-motif \ + --with-gtk \ --with-alsa \ --with-jack \ --with-ladspa \ @@ -92,6 +88,13 @@ %{_datadir}/pixmaps/*.png %changelog -n snd +* Wed May 17 2006 - tiwai(a)suse.de +- updated to version 8.1: + * many new scm and pd files + * improved alsa support + * see HISTORY.Snd for details +- Use gtk2 as GUI. +- Add gsl support. * Wed Jan 25 2006 - mls(a)suse.de - converted neededforbuild to BuildRequires * Mon Jan 16 2006 - tiwai(a)suse.de ++++++ snd-7.18.tar.bz2 -> snd-8.1.tar.bz2 ++++++ ++++ 130646 lines of diff (skipped) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun...

1 0

commit nautilus
by root＠suse.de 17 May '06

17 May '06

Hello community, here is the log from the commit of package nautilus checked in at Wed May 17 19:05:49 CEST 2006. -------- --- GNOME/nautilus/nautilus.changes 2006-05-17 01:02:04.000000000 +0200 +++ nautilus/nautilus.changes 2006-05-17 19:02:10.000000000 +0200 @@ -1,0 +2,7 @@ +Wed May 17 18:46:25 CEST 2006 - sbrabec(a)suse.cz + +- Fixed I18N problems: + * untranslatable Search string (#173448) + * uninitialized locale (#173448#c3) + +------------------------------------------------------------------- New: ---- nautilus-i18n.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ nautilus.spec ++++++ --- /var/tmp/diff_new_pack.OlX4kD/_old 2006-05-17 19:05:41.000000000 +0200 +++ /var/tmp/diff_new_pack.OlX4kD/_new 2006-05-17 19:05:41.000000000 +0200 @@ -18,7 +18,7 @@ Group: Productivity/File utilities Autoreqprov: on Version: 2.12.2 -Release: 67 +Release: 68 Summary: The GNOME 2.x Desktop File Manager Source: ftp://ftp.gnome.org/pub/gnome/sources/nautilus/2.11/%{name}-%{version}.tar.… URL: http://www.gnome.org @@ -51,6 +51,7 @@ Patch45: nautilus-66073-update-progress-dialog.diff Patch46: nautilus-142860-vfs-drive-for-extensions.diff Patch47: nautilus-158279-add-location-toggle-button.diff +Patch48: nautilus-i18n.patch PreReq: filesystem gconf2 Requires: gnome2-user-docs Provides: nautilus2 @@ -107,6 +108,7 @@ %patch45 -p1 %patch46 -p1 %patch47 -p1 +%patch48 # FIXME: this code updates translation for upstreamed patches. cd po intltool-update --pot @@ -191,6 +193,10 @@ %{prefix}/%_lib/pkgconfig/*.pc %changelog -n nautilus +* Wed May 17 2006 - sbrabec(a)suse.cz +- Fixed I18N problems: + * untranslatable Search string (#173448) + * uninitialized locale (#173448#c3) * Wed May 17 2006 - federico(a)novell.com - Updated nautilus-158158-ignore-foreign-desktop-files.diff to fix https://bugzilla.novell.com/show_bug.cgi?id=176123. The ++++++ nautilus-i18n.patch ++++++ --- src/nautilus-main.c +++ src/nautilus-main.c @@ -265,6 +265,8 @@ options[i++].arg = &kill_shell; options[i++].arg = &restart_shell; + setlocale (LC_ALL, ""); + if (g_getenv ("NAUTILUS_DEBUG") != NULL) { eel_make_warnings_and_criticals_stop_in_debugger (); } ++++++ nautilus-search-20060510.patch ++++++ --- /var/tmp/diff_new_pack.OlX4kD/_old 2006-05-17 19:05:42.000000000 +0200 +++ /var/tmp/diff_new_pack.OlX4kD/_new 2006-05-17 19:05:42.000000000 +0200 @@ -3969,7 +3969,7 @@ + gtk_container_add (GTK_CONTAINER (alignment), hbox); + + label = gtk_label_new (""); -+ gtk_label_set_markup (GTK_LABEL (label), "Search:"); ++ gtk_label_set_markup (GTK_LABEL (label), _("Search:")); + gtk_widget_show (label); + + gtk_box_pack_start (GTK_BOX (hbox), label, FALSE, FALSE, 0); ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun...

1 0

commit zen-updater
by root＠suse.de 17 May '06

17 May '06

Hello community, here is the log from the commit of package zen-updater checked in at Wed May 17 19:05:46 CEST 2006. -------- --- zen-updater/zen-updater.changes 2006-05-01 18:01:56.000000000 +0200 +++ zen-updater/zen-updater.changes 2006-05-16 23:25:30.000000000 +0200 @@ -1,0 +2,9 @@ +Tue May 16 23:24:14 CEST 2006 - maw(a)suse.de + +- New source drop (r28496) which: +- Shows the resolvable status in the details section +- Fixes a few UI bugs +- Shows a message while catalogs are loading +- Allows the updater to be closed/opened during transactions. + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ zen-updater.spec ++++++ --- /var/tmp/diff_new_pack.LHb9wf/_old 2006-05-17 19:05:29.000000000 +0200 +++ /var/tmp/diff_new_pack.LHb9wf/_new 2006-05-17 19:05:29.000000000 +0200 @@ -14,7 +14,7 @@ BuildRequires: glib-sharp2 gtk-sharp2 gtk2-devel log4net mono-basic mono-data-sqlite mono-devel perl-XML-Parser update-desktop-files zmd-devel URL: http://novell.com/ Version: 7.1.0 -Release: 49 +Release: 51 License: LGPL BuildRoot: %{_tmppath}/%{name}-%{version}-build Source0: %name-%version.tar.bz2 @@ -70,6 +70,12 @@ %{_mandir}/*/* %changelog -n zen-updater +* Tue May 16 2006 - maw(a)suse.de +- New source drop (r28496) which: +- Shows the resolvable status in the details section +- Fixes a few UI bugs +- Shows a message while catalogs are loading +- Allows the updater to be closed/opened during transactions. * Mon May 01 2006 - maw(a)suse.de - New source drop (r27697) which: - Cleans the catalog UI ++++++ zen-updater-7.1.0.tar.bz2 ++++++ ++++ 35157 lines of diff (skipped) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun...

1 0

commit yast2-vm
by root＠suse.de 17 May '06

17 May '06

Hello community, here is the log from the commit of package yast2-vm checked in at Wed May 17 19:05:29 CEST 2006. -------- --- yast2-vm/yast2-vm.changes 2006-05-16 00:53:32.000000000 +0200 +++ yast2-vm/yast2-vm.changes 2006-05-17 10:33:54.000000000 +0200 @@ -1,0 +2,18 @@ +Wed May 17 09:59:07 CEST 2006 - lslezak(a)suse.cz + +- check whether the package management is available at start + of the yast module (#175148) +- 2.13.49 + +------------------------------------------------------------------- +Tue May 16 11:23:17 MDT 2006 - mgfritch(a)novell.com + +- Re-generate the proposed MAC address for the default network + settings when VM_XEN::resetNetworkConfig() is called. (#175955) +- Don't display mounted disk partitions in dom0 as physical disk + partitions available for use in domU. (#173433) +- Select the correct disk partition containing the xenpae kernel + or the NetWare viX kernel. (#175426, #175729) +- 2.13.48 + +------------------------------------------------------------------- Old: ---- yast2-vm-2.13.47.tar.bz2 New: ---- yast2-vm-2.13.49.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-vm.spec ++++++ --- /var/tmp/diff_new_pack.K2G9Fp/_old 2006-05-17 19:05:12.000000000 +0200 +++ /var/tmp/diff_new_pack.K2G9Fp/_new 2006-05-17 19:05:12.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package yast2-vm (Version 2.13.47) +# spec file for package yast2-vm (Version 2.13.49) # # Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine @@ -11,12 +11,12 @@ # norootforbuild Name: yast2-vm -Version: 2.13.47 +Version: 2.13.49 Release: 1 License: GPL Group: System/YaST BuildRoot: %{_tmppath}/%{name}-%{version}-build -Source0: yast2-vm-2.13.47.tar.bz2 +Source0: yast2-vm-2.13.49.tar.bz2 prefix: /usr BuildRequires: perl-XML-Writer update-desktop-files yast2 yast2-devtools yast2-testsuite Requires: yast2 yast2-installation @@ -32,7 +32,7 @@ Ladislav Slezak <lslezak(a)suse.cz> %prep -%setup -n yast2-vm-2.13.47 +%setup -n yast2-vm-2.13.49 %build %{prefix}/bin/y2tool y2autoconf @@ -73,6 +73,18 @@ %doc %{prefix}/share/doc/packages/yast2-vm %changelog -n yast2-vm +* Wed May 17 2006 - lslezak(a)suse.cz +- check whether the package management is available at start + of the yast module (#175148) +- 2.13.49 +* Tue May 16 2006 - mgfritch(a)novell.com +- Re-generate the proposed MAC address for the default network + settings when VM_XEN::resetNetworkConfig() is called. (#175955) +- Don't display mounted disk partitions in dom0 as physical disk + partitions available for use in domU. (#173433) +- Select the correct disk partition containing the xenpae kernel + or the NetWare viX kernel. (#175426, #175729) +- 2.13.48 * Thu May 11 2006 - mgfritch(a)novell.com - Always write out the 'cdrom=' entry to the vm config file if full virtualization and proposal_mode != 'existing'. ++++++ yast2-vm-2.13.47.tar.bz2 -> yast2-vm-2.13.49.tar.bz2 ++++++ ++++ 3677 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-vm-2.13.47/Makefile.am new/yast2-vm-2.13.49/Makefile.am --- old/yast2-vm-2.13.47/Makefile.am 2006-05-16 00:39:14.000000000 +0200 +++ new/yast2-vm-2.13.49/Makefile.am 2006-05-17 10:28:56.000000000 +0200 @@ -6,7 +6,9 @@ # (Edit ./SUBDIRS instead) # -PREFIX = /usr +#where devtools are +PREFIX := $(shell pkg-config --print-errors --variable=prefix yast2-devtools) +Y2TOOL = $(PREFIX)/bin/y2tool VERSION = $(shell cat $(srcdir)/VERSION) RPMNAME = $(shell cat $(srcdir)/RPMNAME) @@ -30,6 +32,10 @@ extra_COPYRIGHT_files = $(if $(HAS_YAST_LICENSE), $(COPYRIGHT_files_yast), $(COPYRIGHT_files_gpl)) AUTOMAKE_OPTIONS = foreign dist-bzip2 +# where devtools instal m4 snippets +# argh, executed literally +#ACLOCAL_AMFLAGS = -I $(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 cmp -s $< $@ || cp -f $< $@ @@ -57,12 +63,8 @@ # info '(automake)Conditionals' if CREATE_PKGCONFIG -# pkg-config -# if a package does not have its own pc, copy the generic one -$(RPMNAME).pc.in: $(DEVTOOLS_DIR)/admin/generic.pc.in - test -f $@ || cp -p $< $@ # create the file here instead of by configure -# because the prerequisite is made here +# 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 @@ -94,7 +96,7 @@ done pot: - y2tool y2makepot -s $(srcdir) + $(Y2TOOL) y2makepot -s $(srcdir) install-pot: pot @POT_DST=`find -type d -name testsuite -prune , \ @@ -115,7 +117,7 @@ fi spellcheck: pot - y2tool pot-spellcheck + $(Y2TOOL) pot-spellcheck # all-local: $(if $(IS_DEVTOOLS),,$(POT_DST)) @@ -142,20 +144,20 @@ rm -f package/*.bak rm -f package/*.auto mv $(RPMNAME)-$(VERSION).tar.bz2 package/ - if ! test -x $(PREFIX)/bin/y2tool; then \ - echo "$(PREFIX)/bin/y2tool: not found."; \ + if ! test -x $(Y2TOOL); then \ + echo "$(Y2TOOL): not found."; \ echo "You have to install yast2-devtools to making a package"; \ false; \ fi here=`pwd`; \ cd $(srcdir) && for i in $(RPMNAME)*.spec.in; do \ newname="`echo "$$i" | sed "s/\.in$$//g"`"; \ - $(PREFIX)/bin/y2tool create-spec < $$i > $$here/package/$${newname} ; \ + $(Y2TOOL) create-spec < $$i > $$here/package/$${newname} ; \ done -package: check-up-to-date check-tagversion check-all-packages package-local +package: check-up-to-date check-tagversion check-all-packages check-textdomain package-local -TAGVERSION = $(PREFIX)/bin/y2tool tagversion +TAGVERSION = $(Y2TOOL) tagversion check-up-to-date check-cvs-up-to-date check-svn-up-to-date: if [ -d $(srcdir)/CVS ]; then \ @@ -198,10 +200,13 @@ false; \ fi +check-textdomain: + $(Y2TOOL) check-textdomain $(srcdir) + stable: checkin-stable checkin-stable: package - $(PREFIX)/bin/y2tool checkin-stable + $(Y2TOOL) checkin-stable # For po/ modules @@ -210,4 +215,4 @@ # test ! -d $(srcdir)/po \ # || { $(MAKE) -C po checkpo && $(MAKE) -C po make-pox; } # No ./SUBDIRS file found - assuming default: All direct subdirs with Makefile.am -SUBDIRS = agents control doc src +SUBDIRS = agents control doc src testsuite 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-vm-2.13.47/Makefile.am.common new/yast2-vm-2.13.49/Makefile.am.common --- old/yast2-vm-2.13.47/Makefile.am.common 2006-05-16 00:39:14.000000000 +0200 +++ new/yast2-vm-2.13.49/Makefile.am.common 2006-05-17 10:28:56.000000000 +0200 @@ -9,7 +9,7 @@ # suffix mapping: info '(make)Static Usage' # apply only to our modules, not external ones ${ybcfiles}: %.ybc: %.ycp $(ycpchook) - Y2DIR=$(YCPC_Y2DIR) LD_LIBRARY_PATH=$(YCPC_LD_LIBRARY_PATH) $(bindir)/ycpc -c -M. -I. -q $(YCPCFLAGS) $< + Y2DIR=$(YCPC_Y2DIR) LD_LIBRARY_PATH=$(YCPC_LD_LIBRARY_PATH) ${YCPC} -c -M. -I. -q $(YCPCFLAGS) $< # files to clean CLEANFILES = ${ybcfiles} 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-vm-2.13.47/VERSION new/yast2-vm-2.13.49/VERSION --- old/yast2-vm-2.13.47/VERSION 2006-05-12 00:19:41.000000000 +0200 +++ new/yast2-vm-2.13.49/VERSION 2006-05-17 09:59:02.000000000 +0200 @@ -1 +1 @@ -2.13.47 +2.13.49 diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-vm-2.13.47/configure.in new/yast2-vm-2.13.49/configure.in --- old/yast2-vm-2.13.47/configure.in 2006-05-16 00:39:14.000000000 +0200 +++ new/yast2-vm-2.13.49/configure.in 2006-05-17 10:28:56.000000000 +0200 @@ -1,9 +1,9 @@ dnl configure.in for yast2-vm dnl -dnl -- This file is generated by y2autoconf - DO NOT EDIT! -- +dnl -- This file is generated by y2autoconf 2.13.18 - DO NOT EDIT! -- dnl (edit configure.in.in instead) -AC_INIT(yast2-vm, 2.13.47, http://www.suse.de/feedback, yast2-vm) +AC_INIT(yast2-vm, 2.13.49, http://bugs.opensuse.org/, yast2-vm) dnl Check for presence of file 'RPMNAME' AC_CONFIG_SRCDIR([RPMNAME]) @@ -17,7 +17,7 @@ AM_INIT_AUTOMAKE(tar-ustar) dnl searches for some needed programs dnl Important YaST2 variables -VERSION="2.13.47" +VERSION="2.13.49" RPMNAME="yast2-vm" MAINTAINER="Ladislav Slezak <lslezak(a)suse.cz>" @@ -110,8 +110,8 @@ AC_MSG_ERROR(xgettext is missing; please install gettext-devel.) fi -devtools_ybindir=`pkg-config --variable=ybindir yast2-devtools` -devtools_yast2dir=`pkg-config --variable=yast2dir yast2-devtools` +devtools_ybindir=`pkg-config --print-errors --variable=ybindir yast2-devtools` +devtools_yast2dir=`pkg-config --print-errors --variable=yast2dir yast2-devtools` dnl producing pkg-config for others? AM_CONDITIONAL(CREATE_PKGCONFIG, test "x${CREATE_PKGCONFIG}" != x) @@ -138,6 +138,10 @@ if test "$YCPMAKEDEP" = "false"; then AC_MSG_ERROR([ycpmakedep is not installed]) fi +AC_PATH_PROG(YCPC, ycpc, false, $PATH:$bindir) +if test "$YCPC" = "false"; then + AC_MSG_ERROR([ycpc is not installed]) +fi ( cd control; @@ -151,7 +155,8 @@ control/Makefile doc/autodocs/Makefile doc/Makefile -src/Makefile) +src/Makefile +testsuite/Makefile) AC_OUTPUT 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-vm-2.13.47/src/VM_XEN.ycp new/yast2-vm-2.13.49/src/VM_XEN.ycp --- old/yast2-vm-2.13.47/src/VM_XEN.ycp 2006-05-16 00:52:06.000000000 +0200 +++ new/yast2-vm-2.13.49/src/VM_XEN.ycp 2006-05-17 09:01:38.000000000 +0200 @@ -3,7 +3,7 @@ * Package: XEN specific functions and values * Authors: Ladislav Slezak <lslezak(a)suse.cz> * Michael G. Fritch <mgfritch(a)novell.com> - * $Id: VM_XEN.ycp 30923 2006-05-15 22:51:58Z mgfritch $ + * $Id: VM_XEN.ycp 30952 2006-05-17 04:21:58Z mgfritch $ */ { module "VM_XEN"; @@ -462,6 +462,53 @@ return used_devices; } + global define string getDiskTarget(list<map<string,any> > disks_list, string source) { + y2milestone("getDiskTarget(%1, %2)", disks_list, source); + string target = nil; + foreach(map<string,any> m, disks_list, ``{ + string s = m["source"]:""; + if (m["prefix"]:nil != nil && m["prefix"]:"" != "") { + string prefix = m["prefix"]:img_prefix; + if (findlastof(prefix, "/") < size(prefix)-1) { // no ending / + prefix = sformat("%1/%2/", m["prefix"]:img_prefix, VM_Common::config_name); + } + else { + prefix = sformat("%1%2/", m["prefix"]:img_prefix, VM_Common::config_name); + } + s = prefix + m["source"]:""; + } + if (s == source) { + target = m["target"]:""; + break; + } + }); + y2milestone("getDiskTarget returned: %1", target); + return target; + } + + global define string getDiskSource(list<map<string,any> > disks_list, string target) { + y2milestone("getDiskSource(%1, %2)", disks_list, target); + string source = nil; + foreach(map<string,any> m, disks_list, ``{ + if (m["target"]:"" == target) { + string s = m["source"]:""; + if (m["prefix"]:nil != nil && m["prefix"]:"" != "") { + string prefix = m["prefix"]:img_prefix; + if (findlastof(prefix, "/") < size(prefix)-1) { // no ending / + prefix = sformat("%1/%2/", m["prefix"]:img_prefix, VM_Common::config_name); + } + else { + prefix = sformat("%1%2/", m["prefix"]:img_prefix, VM_Common::config_name); + } + s = prefix + m["source"]:""; + } + source = s; + } + }); + y2milestone("getDiskSource returned: %1", source); + return source; + } + /** * Returns a list of disk sources that are already defined in the disk overview table * @param list<map<string,any> > disk configuartion @@ -498,6 +545,12 @@ } + define list <map <string,string> > create_default_network_config() + { + return [ $[ "mac" : VM_Common::Propose_MAC_address(""), "bridge": ""] ]; + } + + global define boolean setNetworkConfig(list<map<string,string> > net) { VM_Common::SetModified(net != network); @@ -510,9 +563,15 @@ } global define boolean resetNetworkConfig() { + + // create default network config (requires proposed config name) + default_network = create_default_network_config(); // re-create the mac addresses. See bugzilla (#175955) + network = default_network; + VM_Common::use_dhcp = VM_Common::default_use_dhcp; VM_Common::use_static = VM_Common::default_use_static; + return true; } @@ -770,6 +829,27 @@ return $["cdrom_image":cdrom_image, "boot_device":boot_device]; } + global define boolean isPAEKernel() { + // check is we're running on 32 bit pae. + y2milestone("Checking for PAE kernel..."); + boolean isPAE = false; + string cmd = "uname -r"; + y2milestone("Executing: %1", cmd); + map retmap = (map) SCR::Execute(.target.bash_output, cmd); + retmap["stdout"] = deletechars(retmap["stdout"]:"", "\n\t "); // remove whitespace + y2milestone("retmap=%1", retmap); + if (retmap["stdout"]:"" != nil && retmap["stdout"]:"" != "") { + if (regexpmatch(retmap["stdout"]:"", ".*xenpae$")) // check for kernel-xenpae + isPAE = true; + else if (regexpmatch(retmap["stdout"]:"", ".*bigsmp$")) // check for kernel-bigsmp + isPAE = true; + else + isPAE = false; + } + y2milestone("isPAE=%1", isPAE); + return isPAE; + } + define list<string> PartitionsInfo(string image) { string cmd = sformat("sfdisk -d -uS -- '%1'", image); @@ -779,7 +859,7 @@ list<string> ret = []; - if (outputstring != nil && outputstring != "") + if (outputmap["exit"]:-1 == 0 && outputstring != nil && outputstring != "") { ret = splitstring(outputstring, "\n"); // remove empty lines @@ -868,12 +948,12 @@ string filename = dir + "/" + location[0]:""; string target_dir = img_prefix + VM_Common::config_name; - if (file == "fstab") +/* if (file == "fstab") { // parse fstab file and set root device name VM_Common::root_device = VM_Common::ParseFstab(filename); } - else if (file == "vmlinuz-*-xen") + else */if (file == "vmlinuz-*-xen") { // copy kernel VM_Common::CopyFile(filename, target_dir); @@ -896,14 +976,17 @@ } } - define void ReadDiskImage(string diskimage) + define boolean ReadDiskImage(string diskimage) { + boolean ret = false; + y2milestone("ReadDiskImage(%1)", diskimage); + list<string> pinfo = PartitionsInfo(diskimage); list<map<string,string> > partitions = ParsePartitionInfo(pinfo); - // leave only Linux partitions - partitions = filter(map<string,string> partition, partitions, {return partition["id"]:"" == "83";}); - y2milestone("Linux partitions: %1", partitions); + // leave only Linux native partitions or FAT16 (NetWare) partitions + partitions = filter(map<string,string> partition, partitions, { return ( (partition["id"]:"" == "83") || (partition["id"]:"" == "6") ); }); + y2milestone("Partitions: %1", partitions); // create mountpoint directory @@ -925,18 +1008,64 @@ if (mounted) { + // search for the kernel/initrd contained in the proposal. + // search for files map<string,list<string> > srch = $[ - "vmlinuz-*-xen" : [ "/boot/", "/" ], - "initrd-*-xen" : [ "/boot/", "/" ], - "fstab" : [ "/etc/", "/" ] + "initrd-xen" : [ "/boot/", "/" ], + "initrd-xenpae" : [ "/boot/", "/" ], + "vmlinuz-xen" : [ "/boot/", "/" ], + "vmlinuz-xenpae" : [ "/boot/", "/" ], + "xnloader.sys" : [ "/nwserver/" ], ]; map<string,list<string> > found = SearchFiles(srch, mountpoint); - y2milestone("Search result: %1", found); - ProcessFoundFile(found, mountpoint); + //ProcessFoundFile(found, mountpoint); // FIXME: is this needed anymore? + + + if (found != nil && size(found) > 0) { + + // see if we are running on a PAE kernel or if the user seleceted a PAE kernel + string kernel_str = deletechars(VM_Common::GetKernelImage(), "\n\t "); // remove whitespace + string kernel_ext = "xen"; + if (isPAEKernel() || regexpmatch(kernel_str, ".*xenpae$")) { + y2milestone("Found PAE kernel"); + kernel_ext = "xenpae"; + } + + foreach(string file, list<string> locations, found, { + if (regexpmatch(file, "initrd-.*")) { + // set the default initrd + initrd_path = locations[0]:sformat("/boot/initrd-%1", kernel_ext); + VM_Common::SetInitrdImage(initrd_path); + } + else { // assume we found a kernel + // set the default kernel + kernel_path = locations[0]:sformat("/boot/vmlinuz-%1", kernel_ext); + VM_Common::SetKernelImage(kernel_path); + ret = true; + } + }); + + y2milestone("kernel='%1'", VM_Common::GetKernelImage()); + y2milestone("initrd='%1'", VM_Common::GetInitrdImage()); + + + string partition_name = String::CutBlanks(partition["name"]:""); + string source = regexpsub(partition_name, "(.*)[[0123456789]]*$", "\\1"); // remove the partition number + string partition_num = regexpsub(partition_name, ".*([[0123456789]]*$)", "\\1"); // save the partition number + y2milestone("partition_name='%1'", partition_name); + y2milestone("source='%1'", source); + y2milestone("partition_num='%1'", partition_num); + string new_target = getDiskTarget(disks, source); + if (new_target != nil && new_target != "") { + // set the root device to the partition that contains the sepecified kernel (i.e. /dev/hda2) + VM_Common::root_device = new_target + partition_num; + y2milestone("root_device='%1'", VM_Common::root_device); + } + } // unmount the image SCR::Execute(.target.umount, mountpoint); @@ -944,19 +1073,34 @@ } }); + return ret; } - define boolean ReadDiskImages(string prefix) { - boolean ret = true; + define boolean ReadDiskImages() { + boolean ret = false; foreach(map<string,any> disk, disks, { - string target = disk["target"]:"hda"; - // TODO use prefix only for created images - ret = ret && ReadDiskImage(prefix + "/" + target); + if ((disk["type"]:"" == "loop-create") || (disk["type"]:"" == "loop-use")) { // FIXME: should support for phys devices be added? + string source = getDiskSource(disks, disk["target"]:""); + if (source != nil && source != "") { + ret = ret || ReadDiskImage(source); + } + } } ); + // don't default VM_Common::root_device if the disk search doesn't find a kernel + if (ret == false) { + VM_Common::root_device = ""; + } + + // remove the initrd default if we defaulted to the NetWare kernel + if (VM_Common::IsNetWareKernel(VM_Common::GetKernelImage())) { + initrd_path = ""; + VM_Common::SetInitrdImage(initrd_path); + } + return ret; } @@ -1101,27 +1245,6 @@ return ret; } - global define boolean isPAEKernel() { - // check is we're running on 32 bit pae. - y2milestone("Checking for PAE kernel..."); - boolean isPAE = false; - string cmd = "uname -r"; - y2milestone("Executing: %1", cmd); - map retmap = (map) SCR::Execute(.target.bash_output, cmd); - retmap["stdout"] = deletechars(retmap["stdout"]:"", "\n\t "); // remove whitespace - y2milestone("retmap=%1", retmap); - if (retmap["stdout"]:"" != nil && retmap["stdout"]:"" != "") { - if (regexpmatch(retmap["stdout"]:"", ".*xenpae$")) // check for kernel-xenpae - isPAE = true; - else if (regexpmatch(retmap["stdout"]:"", ".*bigsmp$")) // check for kernel-bigsmp - isPAE = true; - else - isPAE = false; - } - y2milestone("isPAE=%1", isPAE); - return isPAE; - } - global define boolean resetSourceConfig() { if (VM_Common::GetVirtualizationType() == "full") { return ResetFullOptions(); @@ -1165,13 +1288,14 @@ } VM_Common::SetKernelImage("/boot/vmlinuz-" + kernel_ext); VM_Common::SetInitrdImage("/boot/initrd-" + kernel_ext); - - // Search each disk for the existance of the Xen Linux kernel and initrd. - // If one is found then set VM_Common::root_device to that disk partition. - ReadDiskImages(img_prefix + VM_Common::config_name); } - y2milestone("KernelImage: %1", VM_Common::GetKernelImage); - y2milestone("InitrdImage: %1", VM_Common::GetInitrdImage); + + // Search each disk for the existance of the Xen kernel (Linux or NetWare) + // If one is found then set VM_Common::root_device to that disk partition. + ReadDiskImages(); + + y2milestone("KernelImage: %1", VM_Common::GetKernelImage()); + y2milestone("InitrdImage: %1", VM_Common::GetInitrdImage()); VM_Common::SetCustomKernel(true); } } @@ -1718,6 +1842,11 @@ } } + if (VM_Common::IsNetWareKernel(kernel_path) && VM_Common::proposal_type == "boot") { + // remove the NetWare installation source + updateDiskConfig(VM_Common::custom_source, "", ""); + } + ret = ret && WriteOption(configpath, "disk", formatDiskConfig(disks, VM_Common::GetVirtualizationType() == "full")); // create disk image file(s) @@ -1736,15 +1865,13 @@ // flush the changes ret = ret && SCR::Write(.etc.xen, nil); } - -// return ret; } else { // para virtualized ret = ret && WriteStringOption(configpath, "bootloader", "/usr/lib/xen/boot/domUloader.py"); if (VM_Common::root_device == nil || VM_Common::root_device == "") { - ReadDiskImages(img_prefix + VM_Common::config_name); + ReadDiskImages(); } // upadate config - root device, set default runlevel, remove install= option @@ -1793,7 +1920,6 @@ { string url = VM_Common::custom_source; if (VM_Common::inst_type == `cdrom) { - //url = sformat("hd://?device=/dev/%1 & filesystem=iso9660", VM_Common::custom_source); // FIXME: this is not correct! What is the correct URL for specifiing a specific device (cdrom or dvd) url = sformat("cd:///?devices=%1", VM_Common::custom_source); } else if (VM_Common::inst_type == `iso) { @@ -1807,9 +1933,9 @@ // Add a new installation source new_src = Pkg::SourceCreate(url, ""); - // FIXME: this if statement and following code must be removed when the correct URL for `cdrom inst_types is fixed. + // FIXME: this 'if' statement and the containing code must be removed when the correct URL for `cdrom inst_types is fixed. if ((new_src == nil || new_src < 0) && VM_Common::inst_type == `cdrom) { - url = sformat("dvd:///?devices=%1", VM_Common::custom_source); + url = sformat("dvd:///?devices=%1", VM_Common::custom_source); // try dvd:/// if cd:/// fails... new_src = Pkg::SourceCreate(url, ""); } @@ -2083,40 +2209,6 @@ } -/* - global define boolean Start(boolean background) { - // FIXME: maybe this method should be merged into StartVirtualMachine() - integer start_time = time(); - - string cmd = ""; - Pkg::SourceReleaseAll(); - if (VM_Common::GetVirtualizationType() == "full") - cmd = sformat("%1 create %2%3", xm, conf_path, VM_Common::config_name); - else { - boolean isNetWare = false; - if (VM_Common::GetCustomKernel()) { - isNetWare = VM_Common::IsNetWareKernel(VM_Common::GetKernelImage()); - } - - cmd = sformat("%1 create %2%3 && /usr/bin/xterm -geometry 80x%4 -T \"Xen - %3\" -e %1 console %3", - xm, conf_path, VM_Common::config_name, isNetWare ? 25 : 24); - } - y2milestone("xm create command: %1", cmd); - - path bash_path = (background) ? .target.bash_background : .target.bash; - integer out = (integer)SCR::Execute(bash_path, cmd); - boolean success = (out == 0); - - if (! success) - { - // It is possible for "xm create" to claim failure, yet leave a zombie VM. - TerminateVirtualMachine(VM_Common::config_name, false); - } - - return success; - } -*/ - global define boolean InstallPackages() { return VM_Common::InstallPackages(["xterm", "xorg-x11", "xen-tools"]); } @@ -2129,11 +2221,6 @@ VM_Common::SetModified(modif); } - define list <map <string,string> > create_default_network_config() - { - return [ $[ "mac" : VM_Common::Propose_MAC_address(""), "bridge": ""] ]; - } - global define string GetImgPrefix() { return img_prefix; 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-vm-2.13.47/src/inst_vm_disks.ycp new/yast2-vm-2.13.49/src/inst_vm_disks.ycp --- old/yast2-vm-2.13.47/src/inst_vm_disks.ycp 2006-05-06 01:00:06.000000000 +0200 +++ new/yast2-vm-2.13.49/src/inst_vm_disks.ycp 2006-05-17 09:01:39.000000000 +0200 @@ -6,7 +6,7 @@ * * Purpose: Ask the user for virtual disks configuration. * - * $Id: inst_vm_disks.ycp 30722 2006-05-05 22:59:43Z mgfritch $ + * $Id: inst_vm_disks.ycp 30952 2006-05-17 04:21:58Z mgfritch $ * */ { @@ -379,6 +379,43 @@ list<map> devmap = (list<map>)SCR::Read(.proc.partitions); y2milestone("current partitions (/proc/partitions): %1", devmap); + list<map> mounted = (list<map>) SCR::Read(.proc.mounts); + y2milestone("mounted partitions (/proc/mounts): %1", mounted); + list<map> swaps = (list<map>) SCR::Read(.proc.swaps); + y2milestone("swap partitions (/proc/swaps): %1", swaps); + + + // Remove currently mounted partitions from the list of available physical devices. See bugzilla #173433. + foreach(map m, mounted, { + // remove the partition from the list of devices (i.e. hda1, hda2, hdb1, etc.) + devmap = filter(map d, devmap, { + return (m["spec"]:"" != sformat("/dev/%1", d["name"]:"")); + }); + // remove the entire device from the list of devices (i.e. hda, hdb, etc.) + devmap = filter(map d, devmap, { + return (regexpsub(m["spec"]:"", "(.*)[[0123456789]]*$", "\\1") != sformat("/dev/%1", d["name"]:"")); + }); + }); + + // Remove any dom0 swap partitions from the list of available physical devices. + foreach(map m, swaps, { + // remove the partition from the list of devices (i.e. hda1, hda2, hdb1, etc.) + devmap = filter(map d, devmap, { + return (m["file"]:"" != sformat("/dev/%1", d["name"]:"")); + }); + // remove the entire device from the list of devices (i.e. hda, hdb, etc.) + devmap = filter(map d, devmap, { + return (regexpsub(m["file"]:"", "(.*)[[0123456789]]*$", "\\1") != sformat("/dev/%1", d["name"]:"")); + }); + }); + + // Remove all loopback devices from the list of avaliable physical devices. + devmap = filter(map d, devmap, { + return (regexpmatch(d["name"]:"", ".*loop.*") != true); // don't include device names that contain the string 'loop' + }); + + + y2milestone("list of available partitions: %1", devmap); list<string> valid_phys_devices = []; list<term> valid_phys_devices_term = []; @@ -389,8 +426,19 @@ string name = d["name"]:""; if (name != nil && name != "") { name = "/dev/" + name; - valid_phys_devices_term = add(valid_phys_devices_term, `item(`id(name), name)); - valid_phys_devices = add(valid_phys_devices, name); + // Don't add currently mounted partitions to the list of available physical devices. See bugzilla #173433. + boolean isMounted = false; + foreach(map m, mounted, { + if (m["spec"]:"" == name) { + isMounted = true; + break; + } + }); + + if (isMounted == false) { + valid_phys_devices_term = add(valid_phys_devices_term, `item(`id(name), name)); + valid_phys_devices = add(valid_phys_devices, name); + } } }); } @@ -820,5 +868,11 @@ Wizard::CloseDialog(); + if (ret == `next || ret == `finish) { + if (VM_Common::proposal_type != "install") { + VM::ResetSource(); + } + } + 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-vm-2.13.47/src/xen.ycp new/yast2-vm-2.13.49/src/xen.ycp --- old/yast2-vm-2.13.47/src/xen.ycp 2006-03-31 17:23:01.000000000 +0200 +++ new/yast2-vm-2.13.49/src/xen.ycp 2006-05-17 09:53:00.000000000 +0200 @@ -16,6 +16,7 @@ import "Popup"; import "Label"; import "Package"; + import "PackageLock"; import "Mode"; include "vm/cmdline.ycp"; @@ -73,6 +74,14 @@ return `abort; } + // abort if the package manager is not available + // note: Check() displays an error popup + boolean manager_available = PackageLock::Check(); + if (!manager_available) + { + return `abort; + } + // initialize the target system Pkg::TargetInit("/", 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-vm-2.13.47/testsuite/Makefile.am new/yast2-vm-2.13.49/testsuite/Makefile.am --- old/yast2-vm-2.13.47/testsuite/Makefile.am 1970-01-01 01:00:00.000000000 +0100 +++ new/yast2-vm-2.13.49/testsuite/Makefile.am 2005-01-21 18:45:40.000000000 +0100 @@ -0,0 +1,21 @@ +# +# Makefile.am for .../testsuite +# +# Do not edit this file (Makefile.am) as it will be overwritten! +# + +AUTOMAKE_OPTIONS = dejagnu +EXTRA_DIST = $(wildcard tests/*.out) $(wildcard tests/*.err) $(wildcard tests/*.ycp) $(wildcard tests/*.yh) + +testsuite_prepare = @ydatadir@/testsuite/Makefile.testsuite + +all-local: $(testsuite_prepare) + make -f $(testsuite_prepare) RPMNAME=$(RPMNAME) srcdir=$(srcdir) + +clean-local: $(testsuite_prepare) + make -f $(testsuite_prepare) RPMNAME=$(RPMNAME) srcdir=$(srcdir) clean + +check-local: $(testsuite_prepare) + make -f $(testsuite_prepare) RPMNAME=$(RPMNAME) srcdir=$(srcdir) check + +# EOF ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun...

1 0

commit ypbind
by root＠suse.de 17 May '06

17 May '06

Hello community, here is the log from the commit of package ypbind checked in at Wed May 17 19:05:23 CEST 2006. -------- --- ypbind/ypbind.changes 2006-01-25 21:43:42.000000000 +0100 +++ ypbind/ypbind.changes 2006-05-17 18:48:48.000000000 +0200 @@ -1,0 +2,5 @@ +Wed May 17 18:48:40 CEST 2006 - seife(a)suse.de + +- Add README.NetworkManager [#175935] + +------------------------------------------------------------------- New: ---- README.NetworkManager ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ ypbind.spec ++++++ --- /var/tmp/diff_new_pack.xKr6xJ/_old 2006-05-17 19:05:16.000000000 +0200 +++ /var/tmp/diff_new_pack.xKr6xJ/_new 2006-05-17 19:05:16.000000000 +0200 @@ -1,11 +1,11 @@ # # spec file for package ypbind (Version 1.19.1) # -# Copyright (c) 2005 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine # package are under the same license as the package itself. # -# Please submit bugfixes or comments via http://www.suse.de/feedback/ +# Please submit bugfixes or comments via http://bugs.opensuse.org/ # # norootforbuild @@ -21,12 +21,13 @@ PreReq: %insserv_prereq %fillup_prereq BuildRoot: %{_tmppath}/%{name}-%{version}-build Version: 1.19.1 -Release: 1 +Release: 14 URL: http://www.linux-nis.org/nis/ypbind-mt Summary: NIS client daemon Source: ftp://ftp.kernel.org/pub/linux/utils/net/NIS/ypbind-mt-%{version}.tar.bz2 Source1: sysconfig.ypbind Source2: HOWTO.SuSE +Source3: README.NetworkManager #Patch: ypbind-mt-%{version}.dif %description @@ -89,7 +90,7 @@ %files -f ypbind-mt.lang %defattr(-,root,root) -%doc AUTHORS ChangeLog COPYING NEWS README THANKS TODO $RPM_SOURCE_DIR/HOWTO.SuSE +%doc AUTHORS ChangeLog COPYING NEWS README THANKS TODO $RPM_SOURCE_DIR/HOWTO.SuSE $RPM_SOURCE_DIR/README.NetworkManager %ghost %config(noreplace) /etc/yp.conf %config /etc/init.d/ypbind /var/adm/fillup-templates/sysconfig.ypbind @@ -104,6 +105,8 @@ %dir /var/yp/binding %changelog -n ypbind +* Wed May 17 2006 - seife(a)suse.de +- Add README.NetworkManager [#175935] * Wed Jan 25 2006 - mls(a)suse.de - converted neededforbuild to BuildRequires * Tue Jul 05 2005 - kukuk(a)suse.de ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun...

1 0

commit yast2-ncurses
by root＠suse.de 17 May '06

17 May '06

Hello community, here is the log from the commit of package yast2-ncurses checked in at Wed May 17 19:05:10 CEST 2006. -------- --- yast2-ncurses/yast2-ncurses.changes 2006-05-10 14:25:56.000000000 +0200 +++ yast2-ncurses/yast2-ncurses.changes 2006-05-17 17:58:39.000000000 +0200 @@ -1,0 +2,9 @@ +Wed May 17 17:51:48 CEST 2006 - gs(a)suse.de + +- Package Installation/Online Update: Install correct package if the user + requests a certain package version, i.e. changing the "candidate". + Add view 'Versions' to Online Update 'Information' menu. + (bug #164487) +- 2.13.31 + +------------------------------------------------------------------- Old: ---- yast2-ncurses-2.13.30.tar.bz2 New: ---- yast2-ncurses-2.13.31.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-ncurses.spec ++++++ --- /var/tmp/diff_new_pack.kgt6wm/_old 2006-05-17 19:04:58.000000000 +0200 +++ /var/tmp/diff_new_pack.kgt6wm/_new 2006-05-17 19:04:58.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package yast2-ncurses (Version 2.13.30) +# spec file for package yast2-ncurses (Version 2.13.31) # # Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine @@ -11,12 +11,12 @@ # norootforbuild Name: yast2-ncurses -Version: 2.13.30 -Release: 2 +Version: 2.13.31 +Release: 1 License: GPL Group: System/YaST BuildRoot: %{_tmppath}/%{name}-%{version}-build -Source0: yast2-ncurses-2.13.30.tar.bz2 +Source0: yast2-ncurses-2.13.31.tar.bz2 prefix: /usr BuildRequires: doxygen gcc-c++ libzypp-devel yast2-core-devel yast2-devtools BuildRequires: blocxx-devel libxcrypt-devel @@ -40,7 +40,7 @@ %prep -%setup -n yast2-ncurses-2.13.30 +%setup -n yast2-ncurses-2.13.31 %build %{prefix}/bin/y2tool y2autoconf @@ -73,6 +73,12 @@ %doc %{prefix}/share/doc/packages/yast2-ncurses %changelog -n yast2-ncurses +* Wed May 17 2006 - gs(a)suse.de +- Package Installation/Online Update: Install correct package if the user + requests a certain package version, i.e. changing the "candidate". + Add view 'Versions' to Online Update 'Information' menu. + (bug #164487) +- 2.13.31 * Wed May 10 2006 - gs(a)suse.de - Package Installation dialag: Create appropriate 'Filter' menu with 'Patterns' or 'Selections' (bug #171024, bug #173885) ++++++ yast2-ncurses-2.13.30.tar.bz2 -> yast2-ncurses-2.13.31.tar.bz2 ++++++ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-ncurses-2.13.30/Makefile.am new/yast2-ncurses-2.13.31/Makefile.am --- old/yast2-ncurses-2.13.30/Makefile.am 2006-05-09 09:34:45.000000000 +0200 +++ new/yast2-ncurses-2.13.31/Makefile.am 2006-05-16 22:44:11.000000000 +0200 @@ -8,6 +8,7 @@ #where devtools are PREFIX := $(shell pkg-config --print-errors --variable=prefix yast2-devtools) +Y2TOOL = $(PREFIX)/bin/y2tool VERSION = $(shell cat $(srcdir)/VERSION) RPMNAME = $(shell cat $(srcdir)/RPMNAME) @@ -95,7 +96,7 @@ done pot: - y2tool y2makepot -s $(srcdir) + $(Y2TOOL) y2makepot -s $(srcdir) install-pot: pot @POT_DST=`find -type d -name testsuite -prune , \ @@ -116,7 +117,7 @@ fi spellcheck: pot - y2tool pot-spellcheck + $(Y2TOOL) pot-spellcheck # all-local: $(if $(IS_DEVTOOLS),,$(POT_DST)) @@ -143,20 +144,20 @@ rm -f package/*.bak rm -f package/*.auto mv $(RPMNAME)-$(VERSION).tar.bz2 package/ - if ! test -x $(PREFIX)/bin/y2tool; then \ - echo "$(PREFIX)/bin/y2tool: not found."; \ + if ! test -x $(Y2TOOL); then \ + echo "$(Y2TOOL): not found."; \ echo "You have to install yast2-devtools to making a package"; \ false; \ fi here=`pwd`; \ cd $(srcdir) && for i in $(RPMNAME)*.spec.in; do \ newname="`echo "$$i" | sed "s/\.in$$//g"`"; \ - $(PREFIX)/bin/y2tool create-spec < $$i > $$here/package/$${newname} ; \ + $(Y2TOOL) create-spec < $$i > $$here/package/$${newname} ; \ done package: check-up-to-date check-tagversion check-all-packages check-textdomain package-local -TAGVERSION = $(PREFIX)/bin/y2tool tagversion +TAGVERSION = $(Y2TOOL) tagversion check-up-to-date check-cvs-up-to-date check-svn-up-to-date: if [ -d $(srcdir)/CVS ]; then \ @@ -200,12 +201,12 @@ fi check-textdomain: - $(PREFIX)/bin/y2tool check-textdomain $(srcdir) + $(Y2TOOL) check-textdomain $(srcdir) stable: checkin-stable checkin-stable: package - $(PREFIX)/bin/y2tool checkin-stable + $(Y2TOOL) checkin-stable # For po/ modules diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-ncurses-2.13.30/Makefile.in new/yast2-ncurses-2.13.31/Makefile.in --- old/yast2-ncurses-2.13.30/Makefile.in 2006-05-09 09:35:22.000000000 +0200 +++ new/yast2-ncurses-2.13.31/Makefile.in 2006-05-16 22:44:33.000000000 +0200 @@ -237,6 +237,7 @@ #where devtools are PREFIX := $(shell pkg-config --print-errors --variable=prefix yast2-devtools) +Y2TOOL = $(PREFIX)/bin/y2tool SUBDIRS_FILE = $(shell test -e $(srcdir)/SUBDIRS && echo SUBDIRS) ACINCLUDE_FILE = $(shell test -e $(srcdir)/acinclude.m4 && echo acinclude.m4) HAS_YAST_LICENSE = $(shell test -e $(srcdir)/YAST_LICENSE && echo YAST_LICENSE) @@ -266,7 +267,7 @@ $(IS_DEVTOOLS),Makefile.am.common,$(POT_DST)) $(am__append_1) @CREATE_PKGCONFIG_NOARCH_TRUE@@CREATE_PKGCONFIG_TRUE@pkgconfigdata_DATA = $(RPMNAME).pc @CREATE_PKGCONFIG_NOARCH_FALSE@@CREATE_PKGCONFIG_TRUE@pkgconfig_DATA = $(RPMNAME).pc -TAGVERSION = $(PREFIX)/bin/y2tool tagversion +TAGVERSION = $(Y2TOOL) tagversion # test ! -d $(srcdir)/po \ # || { $(MAKE) -C po checkpo && $(MAKE) -C po make-pox; } # Contents of ./SUBDIRS @@ -792,7 +793,7 @@ done pot: - y2tool y2makepot -s $(srcdir) + $(Y2TOOL) y2makepot -s $(srcdir) install-pot: pot @POT_DST=`find -type d -name testsuite -prune , \ @@ -813,7 +814,7 @@ fi spellcheck: pot - y2tool pot-spellcheck + $(Y2TOOL) pot-spellcheck # all-local: $(if $(IS_DEVTOOLS),,$(POT_DST)) @@ -840,15 +841,15 @@ rm -f package/*.bak rm -f package/*.auto mv $(RPMNAME)-$(VERSION).tar.bz2 package/ - if ! test -x $(PREFIX)/bin/y2tool; then \ - echo "$(PREFIX)/bin/y2tool: not found."; \ + if ! test -x $(Y2TOOL); then \ + echo "$(Y2TOOL): not found."; \ echo "You have to install yast2-devtools to making a package"; \ false; \ fi here=`pwd`; \ cd $(srcdir) && for i in $(RPMNAME)*.spec.in; do \ newname="`echo "$$i" | sed "s/\.in$$//g"`"; \ - $(PREFIX)/bin/y2tool create-spec < $$i > $$here/package/$${newname} ; \ + $(Y2TOOL) create-spec < $$i > $$here/package/$${newname} ; \ done package: check-up-to-date check-tagversion check-all-packages check-textdomain package-local @@ -895,12 +896,12 @@ fi check-textdomain: - $(PREFIX)/bin/y2tool check-textdomain $(srcdir) + $(Y2TOOL) check-textdomain $(srcdir) stable: checkin-stable checkin-stable: package - $(PREFIX)/bin/y2tool checkin-stable + $(Y2TOOL) checkin-stable # For po/ modules checkpo: diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-ncurses-2.13.30/VERSION new/yast2-ncurses-2.13.31/VERSION --- old/yast2-ncurses-2.13.30/VERSION 2006-05-10 14:26:11.000000000 +0200 +++ new/yast2-ncurses-2.13.31/VERSION 2006-05-17 17:51:35.000000000 +0200 @@ -1 +1 @@ -2.13.30 +2.13.31 diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-ncurses-2.13.30/configure new/yast2-ncurses-2.13.31/configure --- old/yast2-ncurses-2.13.30/configure 2006-05-09 09:35:11.000000000 +0200 +++ new/yast2-ncurses-2.13.31/configure 2006-05-16 22:44:25.000000000 +0200 @@ -1,8 +1,8 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.59 for yast2-ncurses 2.13.28. +# Generated by GNU Autoconf 2.59 for yast2-ncurses 2.13.30. # -# Report bugs to <http://www.suse.de/feedback>. +# Report bugs to <http://bugs.opensuse.org/>. # # Copyright (C) 2003 Free Software Foundation, Inc. # This configure script is free software; the Free Software Foundation @@ -423,9 +423,9 @@ # Identity of this package. PACKAGE_NAME='yast2-ncurses' PACKAGE_TARNAME='yast2-ncurses' -PACKAGE_VERSION='2.13.28' -PACKAGE_STRING='yast2-ncurses 2.13.28' -PACKAGE_BUGREPORT='http://www.suse.de/feedback' +PACKAGE_VERSION='2.13.30' +PACKAGE_STRING='yast2-ncurses 2.13.30' +PACKAGE_BUGREPORT='http://bugs.opensuse.org/' ac_unique_file="RPMNAME" ac_default_prefix=/usr @@ -971,7 +971,7 @@ # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures yast2-ncurses 2.13.28 to adapt to many kinds of systems. +\`configure' configures yast2-ncurses 2.13.30 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1038,7 +1038,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of yast2-ncurses 2.13.28:";; + short | recursive ) echo "Configuration of yast2-ncurses 2.13.30:";; esac cat <<\_ACEOF @@ -1088,7 +1088,7 @@ Use these variables to override the choices made by `configure' or to help it to find libraries and programs with nonstandard names/locations. -Report bugs to <http://www.suse.de/feedback>. +Report bugs to <http://bugs.opensuse.org/>. _ACEOF fi @@ -1184,7 +1184,7 @@ test -n "$ac_init_help" && exit 0 if $ac_init_version; then cat <<\_ACEOF -yast2-ncurses configure 2.13.28 +yast2-ncurses configure 2.13.30 generated by GNU Autoconf 2.59 Copyright (C) 2003 Free Software Foundation, Inc. @@ -1198,7 +1198,7 @@ This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by yast2-ncurses $as_me 2.13.28, which was +It was created by yast2-ncurses $as_me 2.13.30, which was generated by GNU Autoconf 2.59. Invocation command line was $ $0 $@ @@ -1928,7 +1928,7 @@ # Define the identity of the package. PACKAGE='yast2-ncurses' - VERSION='2.13.28' + VERSION='2.13.30' cat >>confdefs.h <<_ACEOF @@ -2139,7 +2139,7 @@ -VERSION="2.13.28" +VERSION="2.13.30" RPMNAME="yast2-ncurses" MAINTAINER="Martin Lazar <mlazar(a)suse.cz>" @@ -5416,9 +5416,9 @@ echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;} ( cat <<\_ASBOX -## ------------------------------------------ ## -## Report this to http://www.suse.de/feedback ## -## ------------------------------------------ ## +## ---------------------------------------- ## +## Report this to http://bugs.opensuse.org/ ## +## ---------------------------------------- ## _ASBOX ) | sed "s/^/$as_me: WARNING: /" >&2 @@ -20160,7 +20160,7 @@ } >&5 cat >&5 <<_CSEOF -This file was extended by yast2-ncurses $as_me 2.13.28, which was +This file was extended by yast2-ncurses $as_me 2.13.30, which was generated by GNU Autoconf 2.59. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -20223,7 +20223,7 @@ cat >>$CONFIG_STATUS <<_ACEOF ac_cs_version="\\ -yast2-ncurses config.status 2.13.28 +yast2-ncurses config.status 2.13.30 configured by $0, generated by GNU Autoconf 2.59, with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\" diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-ncurses-2.13.30/configure.in new/yast2-ncurses-2.13.31/configure.in --- old/yast2-ncurses-2.13.30/configure.in 2006-05-09 09:34:45.000000000 +0200 +++ new/yast2-ncurses-2.13.31/configure.in 2006-05-16 22:44:11.000000000 +0200 @@ -1,9 +1,9 @@ dnl configure.in for yast2-ncurses dnl -dnl -- This file is generated by y2autoconf - DO NOT EDIT! -- +dnl -- This file is generated by y2autoconf 2.13.19 - DO NOT EDIT! -- dnl (edit configure.in.in instead) -AC_INIT(yast2-ncurses, 2.13.28, http://www.suse.de/feedback, yast2-ncurses) +AC_INIT(yast2-ncurses, 2.13.30, http://bugs.opensuse.org/, yast2-ncurses) dnl Check for presence of file 'RPMNAME' AC_CONFIG_SRCDIR([RPMNAME]) @@ -17,7 +17,7 @@ AM_INIT_AUTOMAKE(tar-ustar) dnl searches for some needed programs dnl Important YaST2 variables -VERSION="2.13.28" +VERSION="2.13.30" RPMNAME="yast2-ncurses" MAINTAINER="Martin Lazar <mlazar(a)suse.cz>" diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-ncurses-2.13.30/packages.pot new/yast2-ncurses-2.13.31/packages.pot --- old/yast2-ncurses-2.13.30/packages.pot 2006-05-10 13:06:06.000000000 +0200 +++ new/yast2-ncurses-2.13.31/packages.pot 2006-05-10 14:41:51.000000000 +0200 @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2006-05-10 13:06+0200\n" +"POT-Creation-Date: 2006-05-10 14:41+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL(a)li.org>\n" diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-ncurses-2.13.30/src/NCPkgTable.cc new/yast2-ncurses-2.13.31/src/NCPkgTable.cc --- old/yast2-ncurses-2.13.30/src/NCPkgTable.cc 2006-05-10 12:16:24.000000000 +0200 +++ new/yast2-ncurses-2.13.31/src/NCPkgTable.cc 2006-05-16 18:58:02.000000000 +0200 @@ -438,13 +438,25 @@ ZyppStatus newstatus = S_NoInst; if ( slbPtr && objPtr) { - // get the new status - use particular strategy - newstatus = statusStrategy->getPackageStatus( slbPtr, objPtr ); - } - // set new status (if status has changed) - if ( getStatus(index) != newstatus ) - { - cc->setStatus( newstatus ); + if ( tableType == T_Availables ) + { + string isCandidate = " "; + if ( objPtr == slbPtr->candidateObj() ) + isCandidate = " x "; + + cl->AddCol( 2, new NCTableCol( isCandidate ) ); + } + else + { + // get the new status and replace old status + newstatus = statusStrategy->getPackageStatus( slbPtr, objPtr ); + + // set new status (if status has changed) + if ( getStatus(index) != newstatus ) + { + cc->setStatus( newstatus ); + } + } } index++; } @@ -456,17 +468,6 @@ /////////////////////////////////////////////////////////////////// // -// get status of a certain package in list of available packages -// -ZyppStatus NCPkgTable::getAvailableStatus ( const ZyppSel & slbPtr, - const ZyppObj & objPtr ) -{ - return ( statusStrategy->getPackageStatus( slbPtr, objPtr) ); -}; - - -/////////////////////////////////////////////////////////////////// -// // fillDefaultList // // Fills the package table with the list of default rpm group @@ -600,6 +601,7 @@ header.reserve(6); header.push_back( "L" + PkgNames::PkgStatus() ); header.push_back( "L" + PkgNames::PkgName() ); + header.push_back( "L" + PkgNames::PkgStatus() ); header.push_back( "L" + PkgNames::PkgVersion() ); header.push_back( "L" + PkgNames::PkgInstSource() ); header.push_back( "L" + PkgNames::PkgSize() ); @@ -625,7 +627,7 @@ bool NCPkgTable::createListEntry ( ZyppPkg pkgPtr, ZyppSel slbPtr ) { vector<string> pkgLine; - pkgLine.reserve(5); + pkgLine.reserve(6); if ( !pkgPtr || !slbPtr ) { @@ -668,12 +670,26 @@ break; } case T_Availables: { + string isCandidate = " "; + if ( pkgPtr == slbPtr->candidateObj() ) + isCandidate = " x "; + pkgLine.push_back( isCandidate ); + version = pkgPtr->edition().asString(); pkgLine.push_back( version ); // is alias the right string? id? pkgLine.push_back( pkgPtr->source().alias() ); // show the installation source - status = getAvailableStatus( slbPtr, pkgPtr ); // the status of this certain package + // set package status either to S_NoInst or S_KeepInstalled + status = S_NoInst; + if ( slbPtr->hasInstalledObj() ) + { + if ( pkgPtr->edition() == slbPtr->installedObj()->edition() && + pkgPtr->arch() == slbPtr->installedObj()->arch() ) + { + status = S_KeepInstalled; + } + } zypp::ByteCount size = pkgPtr->size(); // installed size pkgLine.push_back( size.asString( 8 ) ); // format size diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-ncurses-2.13.30/src/NCPkgTable.h new/yast2-ncurses-2.13.31/src/NCPkgTable.h --- old/yast2-ncurses-2.13.30/src/NCPkgTable.h 2006-05-10 12:12:34.000000000 +0200 +++ new/yast2-ncurses-2.13.31/src/NCPkgTable.h 2006-05-16 11:08:53.000000000 +0200 @@ -228,14 +228,6 @@ */ ZyppStatus getStatus( int index ); - /** - * Gets the package status of an available package. - * @param objPtr The certain package - * @return ZyppStatus - */ - ZyppStatus getAvailableStatus( const ZyppSel & slbPtr, - const ZyppObj & objPtr ); - #ifdef FIXME /** * Toggles the installation of the source package. diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-ncurses-2.13.30/src/ObjectStatStrategy.cc new/yast2-ncurses-2.13.31/src/ObjectStatStrategy.cc --- old/yast2-ncurses-2.13.30/src/ObjectStatStrategy.cc 2006-04-25 14:12:58.000000000 +0200 +++ new/yast2-ncurses-2.13.31/src/ObjectStatStrategy.cc 2006-05-17 17:30:52.000000000 +0200 @@ -546,87 +546,57 @@ return false; } -#ifdef OLD_CODE -// ok = slbPtr->set_status( newstatus ); - ok = slbPtr->set_status( S_Update ); // FIXME only works for installed - if ( ok ) - { - // this package is the candidate now - bool ret = slbPtr->setCandidate( objPtr ); - // the new candidate can have a different one - slbPtr->setLicenceConfirmed (false); - NCMIL << "Set user candidate returns: " << (ret?"true":"false") << endl; - } -#endif - - // this package is the candidate now - ok = slbPtr->setCandidate( objPtr ); - NCMIL << "Set user candidate returns: " << (ok?"true":"false") << endl; + ZyppObj newCandidate = objPtr; - if ( ok ) + if ( newCandidate != slbPtr->candidateObj() ) { - // set new package status - ok = slbPtr->set_status( newstatus ); + NCMIL << "CANDIDATE changed" << endl; - // the new candidate can have a different one - slbPtr->setLicenceConfirmed (false); - } - - NCMIL << "Set status of: " << slbPtr->name() << " to: " - << newstatus << " returns: " << (ok?"true":"false") << endl; - - return ok; -} + // Change status of selectable + ZyppStatus status = slbPtr->status(); + if ( slbPtr->installedObj() && + slbPtr->installedObj()->edition() == newCandidate->edition() ) + { + // Switch back to the original instance - + // the version that was previously installed + status = S_KeepInstalled; + } + else + { + switch ( status ) + { + case S_KeepInstalled: + case S_Protected: + case S_AutoDel: + case S_AutoUpdate: + case S_Del: + case S_Update: + + status = S_Update; + break; + + case S_NoInst: + case S_Taboo: + case S_Install: + case S_AutoInstall: + status = S_Install; + break; + } + } + + // Set status + ok = slbPtr->set_status( status ); + NCMIL << "Set status of: " << slbPtr->name() << " to: " + << status << " returns: " << (ok?"true":"false") << endl; + + // Set candidate + ok = slbPtr->setCandidate( newCandidate ); + NCMIL << "Set user candidate returns: " << (ok?"true":"false") << endl; -/////////////////////////////////////////////////////////////////// -// -// AvailableStatStrategy::getStatus -// -// Returns the status of the certain package -// -ZyppStatus AvailableStatStrategy::getPackageStatus( ZyppSel slbPtr, - ZyppObj objPtr ) -{ - ZyppStatus retStatus = S_NoInst; - - if ( !slbPtr || ! objPtr ) - { - return retStatus; } -#ifdef OLD_CODE - // ZyppStatus status = slbPtr->status(); - - if (objPtr == slbPtr->candidateObj()) - retStatus = S_KeepInstalled; - else if (slbPtr->hasInstalledObj() && - slbPtr->installedObj()->edition() == objPtr->edition() ) - retStatus = S_Del; -#endif - - ZyppStatus status = slbPtr->status(); - NCDBG << "STATUS of " << slbPtr->name() << ": " << slbPtr->status() << endl; - - if (slbPtr->hasInstalledObj() && - slbPtr->installedObj()->edition() == objPtr->edition() && - slbPtr->installedObj()->arch() == objPtr->arch() ) - { - // installed package: show status S_KeepInstalled or S_Delete - if ( status == S_KeepInstalled - || status == S_Del ) - retStatus = status; - - } - else if ( objPtr == slbPtr->candidateObj() ) - { - if ( status != S_KeepInstalled - && status != S_Del ) - retStatus = status; - } - // else show S_NoInst - - return retStatus; + return ok; } //------------------------------------------------------------ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-ncurses-2.13.30/src/ObjectStatStrategy.h new/yast2-ncurses-2.13.31/src/ObjectStatStrategy.h --- old/yast2-ncurses-2.13.30/src/ObjectStatStrategy.h 2006-04-10 09:59:25.000000000 +0200 +++ new/yast2-ncurses-2.13.31/src/ObjectStatStrategy.h 2006-05-16 11:11:57.000000000 +0200 @@ -228,15 +228,6 @@ virtual ~AvailableStatStrategy() {} /** - * Gets the status information from the package manager - and - * returns the status for a certain package. - * @param slbPtr The package whose status to calculate. - * @return UI_Status The new status of the given package - * - **/ - virtual ZyppStatus getPackageStatus ( ZyppSel slbPtr, ZyppObj objPtr ); - - /** * Informs the package manager about the new status and * additionally sets the candidate object to the user chosen object. * @param newStatus The new package status diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-ncurses-2.13.30/src/PackageSelector.cc new/yast2-ncurses-2.13.31/src/PackageSelector.cc --- old/yast2-ncurses-2.13.30/src/PackageSelector.cc 2006-05-10 14:00:50.000000000 +0200 +++ new/yast2-ncurses-2.13.31/src/PackageSelector.cc 2006-05-17 17:29:23.000000000 +0200 @@ -134,7 +134,8 @@ // YOU information eventHandlerMap[ PkgNames::PatchDescr()->toString() ] = &PackageSelector::InformationHandler; eventHandlerMap[ PkgNames::PatchPackages()->toString() ] = &PackageSelector::InformationHandler; - + eventHandlerMap[ PkgNames::PatchPackagesVersions()->toString() ] = &PackageSelector::InformationHandler; + // Action menu eventHandlerMap[ PkgNames::Toggle()->toString() ] = &PackageSelector::StatusHandler; eventHandlerMap[ PkgNames::Select()->toString() ] = &PackageSelector::StatusHandler; @@ -317,8 +318,8 @@ if ( patterns && !selections ) { // ReplaceWidget and show menu entry Patterns instead of Selections - char menu[1200]; - sprintf ( menu, + char menu[4000]; + snprintf ( menu, sizeof(menu) - 1, "`MenuButton( `opt(`key_F4), \"%s\", " "[`item( `id(\"groups\"), \"%s\" ), `item( `id(\"patterns\"), \"%s\" ), " " `item( `id(\"search\"), \"%s\" ), `item( `id(\"installed\"), \"%s\" ), " @@ -337,15 +338,15 @@ YCPValue layout = YCPNull (); if (parsed_code != NULL) layout = parsed_code->evaluate(); - - y2ui->evaluateReplaceWidget( YCPSymbol("replacefilter"), layout->asTerm() ); + if ( !layout.isNull() ) + y2ui->evaluateReplaceWidget( YCPSymbol("replacefilter"), layout->asTerm() ); } else if ( patterns && selections ) { // ReplaceWidget and show menu entries Patterns AND Selections - char menu[1200]; - sprintf ( menu, + char menu[4000]; + snprintf ( menu, sizeof(menu) - 1, "`MenuButton(`opt(`key_F4), \"%s\", " "[`item( `id(\"groups\"), \"%s\" ), `item( `id(\"patterns\"), \"%s\" ), " " `item( `id(\"selections\"), \"%s\" ), " @@ -366,8 +367,8 @@ YCPValue layout = YCPNull (); if (parsed_code != NULL) layout = parsed_code->evaluate(); - - y2ui->evaluateReplaceWidget( YCPSymbol("replacefilter"), layout->asTerm() ); + if ( !layout.isNull() ) + y2ui->evaluateReplaceWidget( YCPSymbol("replacefilter"), layout->asTerm() ); } } @@ -847,7 +848,7 @@ // fillPatchPackages // // -bool PackageSelector::fillPatchPackages ( NCPkgTable * pkgTable, ZyppObj objPtr ) +bool PackageSelector::fillPatchPackages ( NCPkgTable * pkgTable, ZyppObj objPtr, bool versions ) { if ( !pkgTable ) return false; @@ -888,7 +889,23 @@ else { patchSelectables.insert( sel ); - pkgTable->createListEntry( pkg, sel ); + + if ( versions ) + { + // show all availables + zypp::ui::Selectable::available_iterator + b = sel->availableBegin (), + e = sel->availableEnd (), + it; + for (it = b; it != e; ++it) + { + pkgTable->createListEntry( tryCastToZyppPkg (*it), sel ); + } + } + else + { + pkgTable->createListEntry( pkg, sel ); + } } } @@ -1251,8 +1268,8 @@ YCPValue layout = YCPNull (); if (parsed_code != NULL) layout = parsed_code->evaluate(); - - y2ui->evaluateReplaceWidget( YCPSymbol("replaceinfo"), layout->asTerm() ); + if (!layout.isNull() ) + y2ui->evaluateReplaceWidget( YCPSymbol("replaceinfo"), layout->asTerm() ); NCPkgTable * pkgAvail = dynamic_cast<NCPkgTable *>(y2ui->widgetWithId(PkgNames::AvailPkgs(), true)); @@ -1278,8 +1295,8 @@ YCPValue layout = YCPNull (); if (parsed_code != NULL) layout = parsed_code->evaluate(); - - y2ui->evaluateReplaceWidget( YCPSymbol ("replaceinfo"), layout->asTerm() ); + if (!layout.isNull()) + y2ui->evaluateReplaceWidget( YCPSymbol ("replaceinfo"), layout->asTerm() ); NCPkgTable * patchPkgs = dynamic_cast<NCPkgTable *>(y2ui->widgetWithId(PkgNames::PatchPkgs(), true)); @@ -1295,6 +1312,32 @@ fillPatchPackages( patchPkgs, packageList->getDataPointer( packageList->getCurrentItem() ) ); } } + else if ( visibleInfo->compare( PkgNames::PatchPackagesVersions() ) == YO_EQUAL ) + { + // show the package table + const char * tableLayout = "`PkgSpecial( `id(\"pkgsversions\"), `opt(`notify), \"pkgTable\" )"; + Parser parser( tableLayout ); + YCodePtr parsed_code = parser.parse (); + YCPValue layout = YCPNull (); + if (parsed_code != NULL) + layout = parsed_code->evaluate(); + if (!layout.isNull()) + y2ui->evaluateReplaceWidget( YCPSymbol ("replaceinfo"), layout->asTerm() ); + + NCPkgTable * patchPkgsVersions = dynamic_cast<NCPkgTable *>(y2ui->widgetWithId(PkgNames::PatchPkgsVersions(), true)); + + if ( patchPkgsVersions ) + { + // set the connection to the PackageSelector !!!! + patchPkgsVersions->setPackager( this ); + // set status strategy + ObjectStatStrategy * strategy = new AvailableStatStrategy(); + patchPkgsVersions->setTableType( NCPkgTable::T_Availables, strategy ); + + patchPkgsVersions->fillHeader( ); + fillPatchPackages( patchPkgsVersions, packageList->getDataPointer( packageList->getCurrentItem() ), true ); + } + } else { // show the rich text widget @@ -1304,8 +1347,8 @@ YCPValue layout = YCPNull (); if (parsed_code != NULL) layout = parsed_code->evaluate (); - - y2ui->evaluateReplaceWidget( YCPSymbol ("replaceinfo"), layout->asTerm() ); + if (!layout.isNull()) + y2ui->evaluateReplaceWidget( YCPSymbol ("replaceinfo"), layout->asTerm() ); packageList->showInformation( ); } @@ -1338,11 +1381,11 @@ } else if ( event.selection->compare( PkgNames::AutoDeps() ) == YO_EQUAL ) { - char menu[600]; + char menu[2000]; if ( autoCheck ) { - sprintf ( menu, + snprintf ( menu, sizeof(menu) - 1, "`MenuButton( \"%s\", [" "`menu( \"%s\", [`item( `id(\"showdeps\"), \"%s\" ), `item( `id(\"autodeps\"), \"%s\" ) ] )" #ifdef FIXME @@ -1378,7 +1421,7 @@ } else { - sprintf ( menu, + snprintf ( menu, sizeof(menu) - 1, "`MenuButton( \"%s\", [" "`menu( \"%s\", [`item( `id(\"showdeps\"), \"%s\" ), `item( `id(\"autodeps\"), \"%s\" ) ] )" #ifdef FIXME @@ -2034,7 +2077,15 @@ fillPatchPackages ( patchPkgList, objPtr); } } - + else if ( visibleInfo->compare( PkgNames::PatchPackagesVersions() ) == YO_EQUAL ) + { + NCPkgTable *patchPkgsVersions = dynamic_cast<NCPkgTable *>(y2ui->widgetWithId(PkgNames::PatchPkgsVersions(), true)); + if ( patchPkgsVersions ) + { + fillPatchPackages ( patchPkgsVersions, objPtr, true); + } + } + return true; } @@ -2052,6 +2103,7 @@ if ( depsPopup && (doit || autoCheck) ) { + NCMIL << "Checking dependencies" << endl; cancel = depsPopup->showDependencies( ); } diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-ncurses-2.13.30/src/PackageSelector.h new/yast2-ncurses-2.13.31/src/PackageSelector.h --- old/yast2-ncurses-2.13.30/src/PackageSelector.h 2006-05-10 11:08:55.000000000 +0200 +++ new/yast2-ncurses-2.13.31/src/PackageSelector.h 2006-05-17 12:44:48.000000000 +0200 @@ -162,10 +162,11 @@ /** * Fills the list of packages belonging to the youPatch * @param pkgTable The table widget - * @param youPatch Show all packages belonging to the patch + * @param youPatch Show all packages belonging to the patch + * @param versions Show all versions of all packages belonging to the patch * @return bool */ - bool fillPatchPackages ( NCPkgTable * pkgTable, ZyppObj youPatch ); + bool fillPatchPackages ( NCPkgTable * pkgTable, ZyppObj youPatch, bool versions = false ); /** * Fills the package table with packages matching the search expression diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-ncurses-2.13.30/src/PkgNames.cc new/yast2-ncurses-2.13.31/src/PkgNames.cc --- old/yast2-ncurses-2.13.30/src/PkgNames.cc 2006-05-10 09:53:58.000000000 +0200 +++ new/yast2-ncurses-2.13.31/src/PkgNames.cc 2006-05-17 13:00:05.000000000 +0200 @@ -66,6 +66,12 @@ return value; } +const YCPValue& PkgNames::PatchPkgsVersions () +{ + static const YCPValue value = createIdValue ( "pkgsversions" ); + return value; +} + // the description section ( shown on bottom of the selection dialog ) const YCPValue& PkgNames::Description () { @@ -488,6 +494,12 @@ return value; } +const YCPValue& PkgNames::PatchPackagesVersions() +{ + static const YCPValue value = createIdValue ( "packagesversions" ); + return value; +} + // id information directory list const YCPValue& PkgNames::DirList () { diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-ncurses-2.13.30/src/PkgNames.h new/yast2-ncurses-2.13.31/src/PkgNames.h --- old/yast2-ncurses-2.13.30/src/PkgNames.h 2006-05-10 09:53:36.000000000 +0200 +++ new/yast2-ncurses-2.13.31/src/PkgNames.h 2006-05-17 12:52:33.000000000 +0200 @@ -49,6 +49,11 @@ static const YCPValue& PatchPkgs (); /** + * Widget id of the list of patch packages verions + */ + static const YCPValue& PatchPkgsVersions (); + + /** * Widget id of the description section ( shown on bottom of the selection dialog ) */ static const YCPValue& Description (); @@ -336,6 +341,11 @@ */ static const YCPValue& PatchPackages (); + /** + * Widget id information patch packages versions + */ + static const YCPValue& PatchPackagesVersions (); + /** * Widget id of the directory list */ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-ncurses-2.13.30/src/you_layout.ycp new/yast2-ncurses-2.13.31/src/you_layout.ycp --- old/yast2-ncurses-2.13.30/src/you_layout.ycp 2006-05-08 09:30:00.000000000 +0200 +++ new/yast2-ncurses-2.13.31/src/you_layout.ycp 2006-05-17 17:51:22.000000000 +0200 @@ -7,7 +7,7 @@ * * ncurses layout for YOU * - * $Id: you_layout.ycp 30693 2006-05-04 12:23:02Z locilka $ + * $Id: you_layout.ycp 30983 2006-05-17 15:49:41Z gs $ */ { textdomain "packages"; @@ -43,7 +43,8 @@ `Left(`MenuButton( `opt(`key_F6), _( "&Information" ), // menu items [`item( `id("patchdescr"), _( "&Long Description" ) ), - `item( `id("patchpackages"), _( "&Package List" ) ) + `item( `id("patchpackages"), _( "&Package List" ) ), + `item( `id("packagesversions"), _("&Versions") ) ] )), `HStretch() ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun...

1 0

commit yast2-bootloader
by root＠suse.de 17 May '06

17 May '06

Hello community, here is the log from the commit of package yast2-bootloader checked in at Wed May 17 19:04:54 CEST 2006. -------- --- yast2-bootloader/yast2-bootloader.changes 2006-05-12 16:04:49.000000000 +0200 +++ yast2-bootloader/yast2-bootloader.changes 2006-05-17 16:53:32.000000000 +0200 @@ -1,0 +2,9 @@ +Wed May 17 16:52:30 CEST 2006 - od(a)suse.de + +- added bootloader device conversion for mount by ID, UUID etc. to + BootPOWERLILO (#174349) +- added debug messages to Dev2MountByDev() +- changed 2x y2milestone() -> y2debug() in MountByDev2Dev() +- 2.13.62 + +------------------------------------------------------------------- Old: ---- yast2-bootloader-2.13.61.tar.bz2 New: ---- yast2-bootloader-2.13.62.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-bootloader.spec ++++++ --- /var/tmp/diff_new_pack.iRaO4G/_old 2006-05-17 19:04:47.000000000 +0200 +++ /var/tmp/diff_new_pack.iRaO4G/_new 2006-05-17 19:04:47.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package yast2-bootloader (Version 2.13.61) +# spec file for package yast2-bootloader (Version 2.13.62) # # Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine @@ -11,12 +11,12 @@ # norootforbuild Name: yast2-bootloader -Version: 2.13.61 +Version: 2.13.62 Release: 1 License: GPL Group: System/YaST BuildRoot: %{_tmppath}/%{name}-%{version}-build -Source0: yast2-bootloader-2.13.61.tar.bz2 +Source0: yast2-bootloader-2.13.62.tar.bz2 prefix: /usr BuildRequires: docbook-xsl-stylesheets doxygen gcc-c++ libxslt limal-bootloader limal-devel perl-XML-Writer perl-gettext sgml-skel swig update-alternatives update-desktop-files yast2-devel yast2-devtools yast2-installation yast2-perl-bindings yast2-testsuite PreReq: /bin/sed %fillup_prereq @@ -60,7 +60,7 @@ Dan Meszaros %prep -%setup -n yast2-bootloader-2.13.61 +%setup -n yast2-bootloader-2.13.62 %build %{prefix}/bin/y2tool y2autoconf @@ -111,6 +111,12 @@ /usr/share/YaST2/clients/bootfloppy.ycp %changelog -n yast2-bootloader +* Wed May 17 2006 - od(a)suse.de +- added bootloader device conversion for mount by ID, UUID etc. to + BootPOWERLILO (#174349) +- added debug messages to Dev2MountByDev() +- changed 2x y2milestone() -> y2debug() in MountByDev2Dev() +- 2.13.62 * Fri May 12 2006 - od(a)suse.de - during installation/update on ppc iseries, unconditionally install the ISERIES64 file from the installation media as rescue ++++++ yast2-bootloader-2.13.61.tar.bz2 -> yast2-bootloader-2.13.62.tar.bz2 ++++++ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-bootloader-2.13.61/VERSION new/yast2-bootloader-2.13.62/VERSION --- old/yast2-bootloader-2.13.61/VERSION 2006-05-12 16:02:26.000000000 +0200 +++ new/yast2-bootloader-2.13.62/VERSION 2006-05-17 16:52:07.000000000 +0200 @@ -1 +1 @@ -2.13.61 +2.13.62 diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-bootloader-2.13.61/src/modules/BootPOWERLILO.ycp new/yast2-bootloader-2.13.62/src/modules/BootPOWERLILO.ycp --- old/yast2-bootloader-2.13.61/src/modules/BootPOWERLILO.ycp 2006-05-12 16:02:17.000000000 +0200 +++ new/yast2-bootloader-2.13.62/src/modules/BootPOWERLILO.ycp 2006-05-17 16:52:00.000000000 +0200 @@ -14,7 +14,7 @@ * Joachim Plack <jplack(a)suse.de> * Olaf Dabrunz <od(a)suse.de> * - * $Id: BootPOWERLILO.ycp 30894 2006-05-12 14:02:14Z odabrunz $ + * $Id: BootPOWERLILO.ycp 30978 2006-05-17 14:51:57Z odabrunz $ * */ @@ -681,6 +681,13 @@ filter (string k, any v, s, { return is (v, string); }); }); + // convert root device names in sections to the device names indicated by + // "mountby" + sects = maplist (map<string,string> s, sects, { + s["root"] = BootCommon::Dev2MountByDev(s["root"]:""); + return s; + }); + // FIXME: remove all mountpoints of type 'boot/boot' through some Storage::<func> // FIXME: set one mountpoint 'boot/boot' for every boot target means all diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-bootloader-2.13.61/src/routines/misc.ycp new/yast2-bootloader-2.13.62/src/routines/misc.ycp --- old/yast2-bootloader-2.13.61/src/routines/misc.ycp 2006-05-02 18:00:56.000000000 +0200 +++ new/yast2-bootloader-2.13.62/src/routines/misc.ycp 2006-05-17 16:52:01.000000000 +0200 @@ -12,7 +12,7 @@ * Jiri Srain <jsrain(a)suse.cz> * Olaf Dabrunz <od(a)suse.de> * - * $Id: misc.ycp 30614 2006-05-02 16:00:53Z odabrunz $ + * $Id: misc.ycp 30978 2006-05-17 14:51:57Z odabrunz $ * * WARNING: * To be included to BootCommon.ycp only, requires function @@ -261,11 +261,11 @@ } }); }); - y2milestone ("MountByDev2Dev: partitions %1", partitions); + y2debug ("MountByDev2Dev: partitions %1", partitions); // ident is "id/<id>", "path/<path>", "uuid/<uuid>" or "label/<label>" string ident = regexpsub(dev, "^/dev/disk/by-(.*)", "\\1"); - y2milestone ("MountByDev2Dev: ident %1", ident); + y2debug ("MountByDev2Dev: ident %1", ident); // if exists, get the kernel name, otherwise leave unchanged string ret = partitions[ident, "device"]:dev; @@ -292,7 +292,7 @@ partitions[p["device"]:""] = p; }); }); -// y2milestone ("Dev2MountByDev: partitions %1", partitions); + y2debug ("Dev2MountByDev: partitions %1", partitions); string ret = dev; ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun...

1 0

commit yast2-iscsi-server
by root＠suse.de 17 May '06

17 May '06

Hello community, here is the log from the commit of package yast2-iscsi-server checked in at Wed May 17 19:04:51 CEST 2006. -------- --- yast2-iscsi-server/yast2-iscsi-server.changes 2006-05-09 11:20:27.000000000 +0200 +++ yast2-iscsi-server/yast2-iscsi-server.changes 2006-05-17 17:53:43.000000000 +0200 @@ -1,0 +2,5 @@ +Wed May 17 17:48:38 CEST 2006 - mzugec(a)suse.cz + +- fixed #176186 - service status after YaST2 exit + +------------------------------------------------------------------- Old: ---- yast2-iscsi-server-2.13.18.tar.bz2 New: ---- yast2-iscsi-server-2.13.19.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-iscsi-server.spec ++++++ --- /var/tmp/diff_new_pack.EDMISJ/_old 2006-05-17 19:04:45.000000000 +0200 +++ /var/tmp/diff_new_pack.EDMISJ/_new 2006-05-17 19:04:45.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package yast2-iscsi-server (Version 2.13.18) +# spec file for package yast2-iscsi-server (Version 2.13.19) # # Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine @@ -11,12 +11,12 @@ # norootforbuild Name: yast2-iscsi-server -Version: 2.13.18 -Release: 2 +Version: 2.13.19 +Release: 1 License: GPL Group: System/YaST BuildRoot: %{_tmppath}/%{name}-%{version}-build -Source0: yast2-iscsi-server-2.13.18.tar.bz2 +Source0: yast2-iscsi-server-2.13.19.tar.bz2 prefix: /usr BuildRequires: docbook-xsl-stylesheets doxygen libxslt perl-XML-Writer popt-devel sgml-skel update-desktop-files yast2 yast2-devtools yast2-packagemanager-devel yast2-perl-bindings yast2-testsuite Requires: yast2 @@ -29,7 +29,7 @@ %prep -%setup -n yast2-iscsi-server-2.13.18 +%setup -n yast2-iscsi-server-2.13.19 %build %{prefix}/bin/y2tool y2autoconf @@ -64,6 +64,8 @@ %doc %{prefix}/share/doc/packages/yast2-iscsi-server %changelog -n yast2-iscsi-server +* Wed May 17 2006 - mzugec(a)suse.cz +- fixed #176186 - service status after YaST2 exit * Tue May 09 2006 - mzugec(a)suse.cz - fixed #173818 - support for autoyast * Mon Apr 24 2006 - mzugec(a)suse.cz ++++++ yast2-iscsi-server-2.13.18.tar.bz2 -> yast2-iscsi-server-2.13.19.tar.bz2 ++++++ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-iscsi-server-2.13.18/Makefile.am new/yast2-iscsi-server-2.13.19/Makefile.am --- old/yast2-iscsi-server-2.13.18/Makefile.am 2006-05-09 11:14:55.000000000 +0200 +++ new/yast2-iscsi-server-2.13.19/Makefile.am 2006-05-17 17:42:40.000000000 +0200 @@ -8,6 +8,7 @@ #where devtools are PREFIX := $(shell pkg-config --print-errors --variable=prefix yast2-devtools) +Y2TOOL = $(PREFIX)/bin/y2tool VERSION = $(shell cat $(srcdir)/VERSION) RPMNAME = $(shell cat $(srcdir)/RPMNAME) @@ -95,7 +96,7 @@ done pot: - y2tool y2makepot -s $(srcdir) + $(Y2TOOL) y2makepot -s $(srcdir) install-pot: pot @POT_DST=`find -type d -name testsuite -prune , \ @@ -116,7 +117,7 @@ fi spellcheck: pot - y2tool pot-spellcheck + $(Y2TOOL) pot-spellcheck # all-local: $(if $(IS_DEVTOOLS),,$(POT_DST)) @@ -143,20 +144,20 @@ rm -f package/*.bak rm -f package/*.auto mv $(RPMNAME)-$(VERSION).tar.bz2 package/ - if ! test -x $(PREFIX)/bin/y2tool; then \ - echo "$(PREFIX)/bin/y2tool: not found."; \ + if ! test -x $(Y2TOOL); then \ + echo "$(Y2TOOL): not found."; \ echo "You have to install yast2-devtools to making a package"; \ false; \ fi here=`pwd`; \ cd $(srcdir) && for i in $(RPMNAME)*.spec.in; do \ newname="`echo "$$i" | sed "s/\.in$$//g"`"; \ - $(PREFIX)/bin/y2tool create-spec < $$i > $$here/package/$${newname} ; \ + $(Y2TOOL) create-spec < $$i > $$here/package/$${newname} ; \ done package: check-up-to-date check-tagversion check-all-packages check-textdomain package-local -TAGVERSION = $(PREFIX)/bin/y2tool tagversion +TAGVERSION = $(Y2TOOL) tagversion check-up-to-date check-cvs-up-to-date check-svn-up-to-date: if [ -d $(srcdir)/CVS ]; then \ @@ -200,12 +201,12 @@ fi check-textdomain: - $(PREFIX)/bin/y2tool check-textdomain $(srcdir) + $(Y2TOOL) check-textdomain $(srcdir) stable: checkin-stable checkin-stable: package - $(PREFIX)/bin/y2tool checkin-stable + $(Y2TOOL) checkin-stable # For po/ modules diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-iscsi-server-2.13.18/Makefile.in new/yast2-iscsi-server-2.13.19/Makefile.in --- old/yast2-iscsi-server-2.13.18/Makefile.in 2006-05-09 11:15:03.000000000 +0200 +++ new/yast2-iscsi-server-2.13.19/Makefile.in 2006-05-17 17:42:49.000000000 +0200 @@ -198,6 +198,7 @@ #where devtools are PREFIX := $(shell pkg-config --print-errors --variable=prefix yast2-devtools) +Y2TOOL = $(PREFIX)/bin/y2tool SUBDIRS_FILE = $(shell test -e $(srcdir)/SUBDIRS && echo SUBDIRS) ACINCLUDE_FILE = $(shell test -e $(srcdir)/acinclude.m4 && echo acinclude.m4) HAS_YAST_LICENSE = $(shell test -e $(srcdir)/YAST_LICENSE && echo YAST_LICENSE) @@ -227,7 +228,7 @@ $(IS_DEVTOOLS),Makefile.am.common,$(POT_DST)) $(am__append_1) @CREATE_PKGCONFIG_NOARCH_TRUE@@CREATE_PKGCONFIG_TRUE@pkgconfigdata_DATA = $(RPMNAME).pc @CREATE_PKGCONFIG_NOARCH_FALSE@@CREATE_PKGCONFIG_TRUE@pkgconfig_DATA = $(RPMNAME).pc -TAGVERSION = $(PREFIX)/bin/y2tool tagversion +TAGVERSION = $(Y2TOOL) tagversion # test ! -d $(srcdir)/po \ # || { $(MAKE) -C po checkpo && $(MAKE) -C po make-pox; } # No ./SUBDIRS file found - assuming default: All direct subdirs with Makefile.am @@ -724,7 +725,7 @@ done pot: - y2tool y2makepot -s $(srcdir) + $(Y2TOOL) y2makepot -s $(srcdir) install-pot: pot @POT_DST=`find -type d -name testsuite -prune , \ @@ -745,7 +746,7 @@ fi spellcheck: pot - y2tool pot-spellcheck + $(Y2TOOL) pot-spellcheck # all-local: $(if $(IS_DEVTOOLS),,$(POT_DST)) @@ -772,15 +773,15 @@ rm -f package/*.bak rm -f package/*.auto mv $(RPMNAME)-$(VERSION).tar.bz2 package/ - if ! test -x $(PREFIX)/bin/y2tool; then \ - echo "$(PREFIX)/bin/y2tool: not found."; \ + if ! test -x $(Y2TOOL); then \ + echo "$(Y2TOOL): not found."; \ echo "You have to install yast2-devtools to making a package"; \ false; \ fi here=`pwd`; \ cd $(srcdir) && for i in $(RPMNAME)*.spec.in; do \ newname="`echo "$$i" | sed "s/\.in$$//g"`"; \ - $(PREFIX)/bin/y2tool create-spec < $$i > $$here/package/$${newname} ; \ + $(Y2TOOL) create-spec < $$i > $$here/package/$${newname} ; \ done package: check-up-to-date check-tagversion check-all-packages check-textdomain package-local @@ -827,12 +828,12 @@ fi check-textdomain: - $(PREFIX)/bin/y2tool check-textdomain $(srcdir) + $(Y2TOOL) check-textdomain $(srcdir) stable: checkin-stable checkin-stable: package - $(PREFIX)/bin/y2tool checkin-stable + $(Y2TOOL) checkin-stable # For po/ modules checkpo: diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-iscsi-server-2.13.18/VERSION new/yast2-iscsi-server-2.13.19/VERSION --- old/yast2-iscsi-server-2.13.18/VERSION 2006-05-09 11:18:01.000000000 +0200 +++ new/yast2-iscsi-server-2.13.19/VERSION 2006-05-17 17:48:30.000000000 +0200 @@ -1 +1 @@ -2.13.18 +2.13.19 diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-iscsi-server-2.13.18/configure new/yast2-iscsi-server-2.13.19/configure --- old/yast2-iscsi-server-2.13.18/configure 2006-05-09 11:15:00.000000000 +0200 +++ new/yast2-iscsi-server-2.13.19/configure 2006-05-17 17:42:46.000000000 +0200 @@ -1,8 +1,8 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.59 for yast2-iscsi-server 2.13.17. +# Generated by GNU Autoconf 2.59 for yast2-iscsi-server 2.13.18. # -# Report bugs to <http://www.suse.de/feedback>. +# Report bugs to <http://bugs.opensuse.org/>. # # Copyright (C) 2003 Free Software Foundation, Inc. # This configure script is free software; the Free Software Foundation @@ -269,9 +269,9 @@ # Identity of this package. PACKAGE_NAME='yast2-iscsi-server' PACKAGE_TARNAME='yast2-iscsi-server' -PACKAGE_VERSION='2.13.17' -PACKAGE_STRING='yast2-iscsi-server 2.13.17' -PACKAGE_BUGREPORT='http://www.suse.de/feedback' +PACKAGE_VERSION='2.13.18' +PACKAGE_STRING='yast2-iscsi-server 2.13.18' +PACKAGE_BUGREPORT='http://bugs.opensuse.org/' ac_unique_file="RPMNAME" ac_default_prefix=/usr @@ -728,7 +728,7 @@ # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures yast2-iscsi-server 2.13.17 to adapt to many kinds of systems. +\`configure' configures yast2-iscsi-server 2.13.18 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -795,7 +795,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of yast2-iscsi-server 2.13.17:";; + short | recursive ) echo "Configuration of yast2-iscsi-server 2.13.18:";; esac cat <<\_ACEOF @@ -812,7 +812,7 @@ Use these variables to override the choices made by `configure' or to help it to find libraries and programs with nonstandard names/locations. -Report bugs to <http://www.suse.de/feedback>. +Report bugs to <http://bugs.opensuse.org/>. _ACEOF fi @@ -908,7 +908,7 @@ test -n "$ac_init_help" && exit 0 if $ac_init_version; then cat <<\_ACEOF -yast2-iscsi-server configure 2.13.17 +yast2-iscsi-server configure 2.13.18 generated by GNU Autoconf 2.59 Copyright (C) 2003 Free Software Foundation, Inc. @@ -922,7 +922,7 @@ This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by yast2-iscsi-server $as_me 2.13.17, which was +It was created by yast2-iscsi-server $as_me 2.13.18, which was generated by GNU Autoconf 2.59. Invocation command line was $ $0 $@ @@ -1652,7 +1652,7 @@ # Define the identity of the package. PACKAGE='yast2-iscsi-server' - VERSION='2.13.17' + VERSION='2.13.18' cat >>confdefs.h <<_ACEOF @@ -1863,7 +1863,7 @@ -VERSION="2.13.17" +VERSION="2.13.18" RPMNAME="yast2-iscsi-server" MAINTAINER="Michal Zugec <mzugec(a)suse.cz>" @@ -2693,7 +2693,7 @@ } >&5 cat >&5 <<_CSEOF -This file was extended by yast2-iscsi-server $as_me 2.13.17, which was +This file was extended by yast2-iscsi-server $as_me 2.13.18, which was generated by GNU Autoconf 2.59. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -2748,7 +2748,7 @@ cat >>$CONFIG_STATUS <<_ACEOF ac_cs_version="\\ -yast2-iscsi-server config.status 2.13.17 +yast2-iscsi-server config.status 2.13.18 configured by $0, generated by GNU Autoconf 2.59, with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\" diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-iscsi-server-2.13.18/configure.in new/yast2-iscsi-server-2.13.19/configure.in --- old/yast2-iscsi-server-2.13.18/configure.in 2006-05-09 11:14:54.000000000 +0200 +++ new/yast2-iscsi-server-2.13.19/configure.in 2006-05-17 17:42:40.000000000 +0200 @@ -1,9 +1,9 @@ dnl configure.in for yast2-iscsi-server dnl -dnl -- This file is generated by y2autoconf - DO NOT EDIT! -- +dnl -- This file is generated by y2autoconf 2.13.18 - DO NOT EDIT! -- dnl (edit configure.in.in instead) -AC_INIT(yast2-iscsi-server, 2.13.17, http://www.suse.de/feedback, yast2-iscsi-server) +AC_INIT(yast2-iscsi-server, 2.13.18, http://bugs.opensuse.org/, yast2-iscsi-server) dnl Check for presence of file 'RPMNAME' AC_CONFIG_SRCDIR([RPMNAME]) @@ -17,7 +17,7 @@ AM_INIT_AUTOMAKE(tar-ustar) dnl searches for some needed programs dnl Important YaST2 variables -VERSION="2.13.17" +VERSION="2.13.18" RPMNAME="yast2-iscsi-server" MAINTAINER="Michal Zugec <mzugec(a)suse.cz>" diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-iscsi-server-2.13.18/src/IscsiServer.ycp new/yast2-iscsi-server-2.13.19/src/IscsiServer.ycp --- old/yast2-iscsi-server-2.13.18/src/IscsiServer.ycp 2006-05-09 11:19:19.000000000 +0200 +++ new/yast2-iscsi-server-2.13.19/src/IscsiServer.ycp 2006-05-17 17:52:30.000000000 +0200 @@ -4,7 +4,7 @@ * Summary: IscsiServer settings, input and output functions * Authors: Michal Zugec <mzugec(a)suse.cz> * - * $Id: IscsiServer.ycp 30747 2006-05-09 09:19:14Z mzugec $ + * $Id: IscsiServer.ycp 30984 2006-05-17 15:51:56Z mzugec $ * * Representation of the configuration of iscsi-server. * Input and output routines. @@ -25,8 +25,10 @@ import "SuSEFirewall"; import "Confirm"; import "IscsiServerFunctions"; +import "Mode"; boolean serviceStatus = false; +boolean statusOnStart = false; /** * Prototypes @@ -137,18 +139,28 @@ // if not enabled, start it manually boolean getServiceStatus(){ boolean ret = true; - if (Service::Status("iscsitarget") == 0) serviceStatus=true; -y2milestone("Service status = %1", serviceStatus); - if (!serviceStatus) Service::Start("iscsitarget"); + if (Service::Status("iscsitarget") == 0) { + statusOnStart=true; + serviceStatus=true; + } +y2milestone("Service status = %1", statusOnStart); + if (!statusOnStart) Service::Start("iscsitarget"); return ret; } // set service status boolean setServiceStatus(){ - if (!serviceStatus) { + boolean start=true; + if (!serviceStatus) start = statusOnStart; + + if (!start) { y2milestone("Stop iscsitarget service"); Service::Stop("iscsitarget"); - } + } else { + y2milestone("Start iscsitarget service"); + serviceStatus=true; + Service::Start("iscsitarget"); + } return true; } @@ -351,12 +363,14 @@ if(Abort()) return false; Progress::NextStage (); // ask user whether reload or restart server and do it - if(!reloadServer()) return false; + if ( (serviceStatus) || (statusOnStart) ) + if (!reloadServer()) return false; sleep(sl); if(Abort()) return false; Progress::NextStage(); sleep(sl); + // set iscsitarget initscript status if(!setServiceStatus()) return false; return true; ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun...

1 0

commit xine-lib
by root＠suse.de 17 May '06

17 May '06

Hello community, here is the log from the commit of package xine-lib checked in at Wed May 17 19:04:39 CEST 2006. -------- --- xine-lib/xine-lib.changes 2006-05-14 20:12:28.000000000 +0200 +++ xine-lib/xine-lib.changes 2006-05-17 13:51:51.000000000 +0200 @@ -1,0 +2,5 @@ +Wed May 17 13:51:45 CEST 2006 - schwab(a)suse.de + +- Fix unaligned access. + +------------------------------------------------------------------- New: ---- xine-lib-unaligned.diff ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ xine-lib.spec ++++++ --- /var/tmp/diff_new_pack.HADgcL/_old 2006-05-17 19:04:24.000000000 +0200 +++ /var/tmp/diff_new_pack.HADgcL/_new 2006-05-17 19:04:24.000000000 +0200 @@ -15,7 +15,7 @@ %define DISTRIBUTABLE 1 Summary: Video Player with Plug-Ins Version: 1.1.1 -Release: 24 +Release: 25 %define libversion 1.1.1 %define uiversion 0.99.4 Obsoletes: xine @@ -45,6 +45,7 @@ Patch17: xine-lib-demuxcheckfor_mad_ffmpeg.diff Patch18: xine-lib-demux_avi_indx_buffer.diff Patch19: xine-lib-used-constants.diff +Patch20: xine-lib-unaligned.diff Patch100: xine-ui.diff Patch102: vdr-xine-ui-0.7.6.diff Patch103: xine-ui-fix-gcc-warnings.diff @@ -54,10 +55,6 @@ Patch107: xine-ui-sprintf.diff URL: http://xine.sourceforge.net BuildRoot: %{_tmppath}/%{name}-%{version}-build -%if %DISTRIBUTABLE -# MPEG4 and AC3 code inside. is this legal ? I do not know ... -NoSource: 0 -%endif %description Xine is a video player with a graphical front-end that supports a large @@ -114,7 +111,7 @@ Group: Productivity/Multimedia/Video/Players Provides: xine:/usr/bin/xine Version: 0.99.4 -Release: 32 +Release: 33 Autoreqprov: on %description -n xine-ui @@ -185,6 +182,7 @@ %patch17 %patch18 %patch19 +%patch20 (cd ../xine-ui-%{uiversion} %patch100 %patch102 -p1 @@ -516,6 +514,8 @@ /usr/include/xine.h %changelog -n xine-lib +* Wed May 17 2006 - schwab(a)suse.de +- Fix unaligned access. * Sun May 14 2006 - schwab(a)suse.de - Fix undefined symbol [#173413]. - Fix misuses of sprintf. ++++++ xine-lib-unaligned.diff ++++++ --- src/xine-engine/input_cache.c +++ src/xine-engine/input_cache.c @@ -73,7 +73,7 @@ if (len <= (this->buf_len - this->buf_pos)) { /* all bytes are in the buffer */ switch (len) { -#if !(defined(sparc) || defined(__sparc__)) +#if !(defined(sparc) || defined(__sparc__) || defined __ia64__) case 8: *((uint64_t *)buf) = *(uint64_t *)(&(this->buf[this->buf_pos])); break; ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun...

1 0

commit xgl
by root＠suse.de 17 May '06

17 May '06

Hello community, here is the log from the commit of package xgl checked in at Wed May 17 19:04:37 CEST 2006. -------- --- xgl/xgl.changes 2006-05-12 15:57:43.000000000 +0200 +++ xgl/xgl.changes 2006-05-17 14:09:20.000000000 +0200 @@ -1,0 +2,10 @@ +Wed May 17 14:08:32 CEST 2006 - dreveman(a)suse.de + +- exa.h randrstr.h are no longer installed by mistake. + +------------------------------------------------------------------- +Wed May 17 13:44:38 CEST 2006 - dreveman(a)suse.de + +- Fix a crash in the Sync extension. + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ xgl.spec ++++++ --- /var/tmp/diff_new_pack.u38VUD/_old 2006-05-17 19:04:01.000000000 +0200 +++ /var/tmp/diff_new_pack.u38VUD/_new 2006-05-17 19:04:01.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package xgl (Version cvs_060512) +# spec file for package xgl (Version cvs_060517) # # Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine @@ -23,7 +23,7 @@ PreReq: %fillup_prereq Requires: xgl-hardware-list Autoreqprov: on -Version: cvs_060512 +Version: cvs_060517 Release: 1 Summary: Xserver that uses OpenGL for its drawing operations. BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -122,8 +122,6 @@ rm $RPM_BUILD_ROOT/usr/X11R6/share/aclocal/xorg-server.m4 rm $RPM_BUILD_ROOT/etc/X11/xserver/SecurityPolicy rm $RPM_BUILD_ROOT/etc/X11/xkb/compiled/README.compiled -rm $RPM_BUILD_ROOT/exa.h -rm $RPM_BUILD_ROOT/randrstr.h %post %{fillup_only -an displaymanager} @@ -143,6 +141,10 @@ /var/adm/fillup-templates/sysconfig.displaymanager-%name %changelog -n xgl +* Wed May 17 2006 - dreveman(a)suse.de +- exa.h randrstr.h are no longer installed by mistake. +* Wed May 17 2006 - dreveman(a)suse.de +- Fix a crash in the Sync extension. * Fri May 12 2006 - dreveman(a)suse.de - Fix issue with gradients that could crash the server. - Fix so that XVideo works when dimensions are not multiple of 8. ++++++ xorg-server-1.1.99.1.tar.bz2 ++++++ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/xorg-server-1.1.99.1/Xext/sync.c new/xorg-server-1.1.99.1/Xext/sync.c --- old/xorg-server-1.1.99.1/Xext/sync.c 2006-04-13 17:51:48.000000000 +0200 +++ new/xorg-server-1.1.99.1/Xext/sync.c 2006-05-13 01:31:10.000000000 +0200 @@ -302,22 +302,33 @@ SyncTrigger *pTrigger; { SyncTriggerList *pCur; + SyncTriggerList *pPrev; /* pCounter needs to be stored in pTrigger before calling here. */ if (!pTrigger->pCounter) return; - for (pCur = pTrigger->pCounter->pTriglist; pCur; pCur = pCur->next) + pPrev = NULL; + pCur = pTrigger->pCounter->pTriglist; + + while (pCur) { if (pCur->pTrigger == pTrigger) { - pTrigger->pCounter->pTriglist = pCur->next; + if (pPrev) + pPrev->next = pCur->next; + else + pTrigger->pCounter->pTriglist = pCur->next; + xfree(pCur); break; } + + pPrev = pCur; + pCur = pCur->next; } - + if (IsSystemCounter(pTrigger->pCounter)) SyncComputeBracketValues(pTrigger->pCounter, /*startOver*/ TRUE); } diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/xorg-server-1.1.99.1/exa/Makefile.am new/xorg-server-1.1.99.1/exa/Makefile.am --- old/xorg-server-1.1.99.1/exa/Makefile.am 2006-03-30 18:38:16.000000000 +0200 +++ new/xorg-server-1.1.99.1/exa/Makefile.am 2006-05-17 11:29:42.000000000 +0200 @@ -1,6 +1,8 @@ noinst_LTLIBRARIES = libexa.la +if XORG sdk_HEADERS = exa.h +endif INCLUDES = \ $(XORG_INCS) \ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/xorg-server-1.1.99.1/exa/Makefile.in new/xorg-server-1.1.99.1/exa/Makefile.in --- old/xorg-server-1.1.99.1/exa/Makefile.in 2006-05-02 01:28:17.000000000 +0200 +++ new/xorg-server-1.1.99.1/exa/Makefile.in 2006-05-17 11:38:17.000000000 +0200 @@ -38,7 +38,7 @@ build_triplet = @build@ host_triplet = @host@ subdir = exa -DIST_COMMON = $(sdk_HEADERS) $(srcdir)/Makefile.am \ +DIST_COMMON = $(am__sdk_HEADERS_DIST) $(srcdir)/Makefile.am \ $(srcdir)/Makefile.in ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \ @@ -73,6 +73,7 @@ $(AM_LDFLAGS) $(LDFLAGS) -o $@ SOURCES = $(libexa_la_SOURCES) DIST_SOURCES = $(libexa_la_SOURCES) +am__sdk_HEADERS_DIST = exa.h am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; am__vpath_adj = case $$p in \ $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ @@ -533,7 +534,7 @@ xglmoduledir = @xglmoduledir@ xpconfigdir = @xpconfigdir@ noinst_LTLIBRARIES = libexa.la -sdk_HEADERS = exa.h +@XORG_TRUE@sdk_HEADERS = exa.h INCLUDES = \ $(XORG_INCS) \ -I$(srcdir)/../miext/cw diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/xorg-server-1.1.99.1/randr/Makefile.am new/xorg-server-1.1.99.1/randr/Makefile.am --- old/xorg-server-1.1.99.1/randr/Makefile.am 2006-03-30 18:39:29.000000000 +0200 +++ new/xorg-server-1.1.99.1/randr/Makefile.am 2006-05-17 11:29:42.000000000 +0200 @@ -2,7 +2,9 @@ AM_CFLAGS = $(DIX_CFLAGS) @SERVER_DEFINES@ @LOADER_DEFINES@ +if XORG sdk_HEADERS = randrstr.h +endif librandr_la_SOURCES = \ mirandr.c \ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/xorg-server-1.1.99.1/randr/Makefile.in new/xorg-server-1.1.99.1/randr/Makefile.in --- old/xorg-server-1.1.99.1/randr/Makefile.in 2006-05-02 01:29:02.000000000 +0200 +++ new/xorg-server-1.1.99.1/randr/Makefile.in 2006-05-17 11:38:15.000000000 +0200 @@ -38,7 +38,7 @@ build_triplet = @build@ host_triplet = @host@ subdir = randr -DIST_COMMON = $(sdk_HEADERS) $(srcdir)/Makefile.am \ +DIST_COMMON = $(am__sdk_HEADERS_DIST) $(srcdir)/Makefile.am \ $(srcdir)/Makefile.in ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \ @@ -72,6 +72,7 @@ $(AM_LDFLAGS) $(LDFLAGS) -o $@ SOURCES = $(librandr_la_SOURCES) DIST_SOURCES = $(librandr_la_SOURCES) +am__sdk_HEADERS_DIST = randrstr.h am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; am__vpath_adj = case $$p in \ $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ @@ -533,7 +534,7 @@ xpconfigdir = @xpconfigdir@ noinst_LTLIBRARIES = librandr.la AM_CFLAGS = $(DIX_CFLAGS) @SERVER_DEFINES@ @LOADER_DEFINES@ -sdk_HEADERS = randrstr.h +@XORG_TRUE@sdk_HEADERS = randrstr.h librandr_la_SOURCES = \ mirandr.c \ randr.c \ ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun...

1 0

commit xen
by root＠suse.de 17 May '06

17 May '06

Hello community, here is the log from the commit of package xen checked in at Wed May 17 19:04:14 CEST 2006. -------- --- arch/i386/xen/xen.changes 2006-05-10 01:18:52.000000000 +0200 +++ xen/xen.changes 2006-05-16 23:25:01.000000000 +0200 @@ -1,0 +2,45 @@ +Tue May 16 11:11:12 MDT 2006 - ccoffing(a)novell.com + +- Include Gerd's fix for HVM emulation of REP MOVS when the copy + spans a page. If the direction flag was set, the emulation code + broke. This caused the VM to freeze when configuring firewall + (#165448). +- Include KY's fix to default to reserving 16M of lowmem for PAE, + to avoid hitting kernel BUG() during boot (#175124). +- Don Dugger's (Intel) fix for HVM screen corruption (#164573). +- Increase maximum time auto-ballooning will wait for domain 0 to + respond, otherwise large VMs will fail to start from yast + (#175805). + +------------------------------------------------------------------- +Mon May 15 13:18:14 MDT 2006 - ccoffing(a)novell.com + +- Update memory size calculations when auto-ballooning for HVM + to make more stable (#149179). + +------------------------------------------------------------------- +Fri May 12 10:42:37 MDT 2006 - ccoffing(a)novell.com + +- Include select patches from xen-3.0-testing: + + 9674: xc_ptrace: Fix reversed conditional, which broke single- + stepping. + + 9675: xc_ptrace: Fix out-of-bounds memory-access for FPU state. + + 9678: Fix the performance issues of 2-level paging HVM guests + on the PAE Xen. +- Update man pages. + +------------------------------------------------------------------- +Wed May 10 12:38:14 MDT 2006 - brogers(a)novell.com + +- Fix loading of binary images which either require PAE or + dynamically support running on both PAE hypervisor and non-PAE + hypervisors. (#174080) + +------------------------------------------------------------------- +Wed May 10 12:36:23 MDT 2006 - carnold(a)novell.com + +- Handle memory failure when staring fully virtualized + guests to prevent reboot of the box (AMD) or + hanging the box (VT) (#149179). + +------------------------------------------------------------------- New: ---- xen-9674-ptrace-fpu.diff xen-9675-ptrace-bounds.diff xen-9678-hvm-pae-performance.diff xen-hvm-memory-check.diff xen-hvm-rep-movs.diff xen-load-pae-bin-kernel.diff xen-lowmem-emergency-pool.diff xen-paths.diff ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ xen.spec ++++++ --- /var/tmp/diff_new_pack.8t1Ysm/_old 2006-05-17 19:03:57.000000000 +0200 +++ /var/tmp/diff_new_pack.8t1Ysm/_new 2006-05-17 19:03:57.000000000 +0200 @@ -19,7 +19,7 @@ %define with_pygrub 1 %define xen_build_dir xen-3.0-testing Version: 3.0.2_09668 -Release: 2 +Release: 3 License: GPL Group: System/Kernel Autoreqprov: on @@ -71,6 +71,11 @@ Patch31: xen-lost-mouse.diff Patch32: xen-removable-media.diff Patch33: xen-cirrus-corruption.diff +Patch34: xen-hvm-memory-check.diff +Patch35: xen-load-pae-bin-kernel.diff +Patch36: xen-paths.diff +Patch37: xen-hvm-rep-movs.diff +Patch38: xen-lowmem-emergency-pool.diff Patch49: xen-enable-hvm-debug.diff Patch50: xen-enable-debug Patch99: xen-poweroff.diff @@ -83,6 +88,9 @@ Patch106: xen-9665-sxp-compat.diff Patch107: xen-9666-hvm-guest-faults.diff Patch108: xen-9667-vmx-gp-fault.diff +Patch109: xen-9674-ptrace-fpu.diff +Patch110: xen-9675-ptrace-bounds.diff +Patch111: xen-9678-hvm-pae-performance.diff URL: http://www.cl.cam.ac.uk/Research/SRG/netos/xen/ Prefix: /usr BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -435,6 +443,9 @@ %patch106 -p1 %patch107 -p1 %patch108 -p1 +%patch109 -p1 +%patch110 -p1 +%patch111 -p1 # Now our patches... %patch1 -p1 %patch2 -p1 @@ -471,6 +482,11 @@ %patch31 -p1 %patch32 -p1 %patch33 -p1 +%patch34 -p1 +%patch35 -p1 +%patch36 -p1 +%patch37 -p1 +%patch38 -p1 #%patch49 -p1 XEN_EXTRAVERSION=%version-%release XEN_EXTRAVERSION=${XEN_EXTRAVERSION#%{xvers}} @@ -777,6 +793,36 @@ %{insserv_cleanup} %changelog -n xen +* Tue May 16 2006 - ccoffing(a)novell.com +- Include Gerd's fix for HVM emulation of REP MOVS when the copy + spans a page. If the direction flag was set, the emulation code + broke. This caused the VM to freeze when configuring firewall + (#165448). +- Include KY's fix to default to reserving 16M of lowmem for PAE, + to avoid hitting kernel BUG() during boot (#175124). +- Don Dugger's (Intel) fix for HVM screen corruption (#164573). +- Increase maximum time auto-ballooning will wait for domain 0 to + respond, otherwise large VMs will fail to start from yast + (#175805). +* Mon May 15 2006 - ccoffing(a)novell.com +- Update memory size calculations when auto-ballooning for HVM + to make more stable (#149179). +* Fri May 12 2006 - ccoffing(a)novell.com +- Include select patches from xen-3.0-testing: + + 9674: xc_ptrace: Fix reversed conditional, which broke single- + stepping. + + 9675: xc_ptrace: Fix out-of-bounds memory-access for FPU state. + + 9678: Fix the performance issues of 2-level paging HVM guests + on the PAE Xen. +- Update man pages. +* Wed May 10 2006 - brogers(a)novell.com +- Fix loading of binary images which either require PAE or + dynamically support running on both PAE hypervisor and non-PAE + hypervisors. (#174080) +* Wed May 10 2006 - carnold(a)novell.com +- Handle memory failure when staring fully virtualized + guests to prevent reboot of the box (AMD) or + hanging the box (VT) (#149179). * Tue May 09 2006 - ccoffing(a)novell.com - Include select patches from xen-3.0-testing: + 9665: Fix pciif parsing for compatibility variable. ++++++ xen-9674-ptrace-fpu.diff ++++++ # HG changeset patch # User kaf24(a)firebug.cl.cam.ac.uk # Date Thu May 11 10:34:34 2006 # Node ID be5a6188cd9f00d045328b6b045f85992f2fbe10 # parent: 09dbe36de14491f51f33b33ff7c7c8ea04937355 Fix a typo in xc_ptrace() and fix single-stepping when attached to a live guest. Signed-off-by: Keir Fraser <keir(a)xensource.com> xen-unstable changeset: 9973:e96f98f9c289ca23b0b3ff7e5d897290ef2b142f xen-unstable date: Thu May 11 11:33:07 2006 +0100 --- a/tools/libxc/xc_ptrace.c Wed May 10 16:32:22 2006 +++ b/tools/libxc/xc_ptrace.c Thu May 11 10:34:34 2006 @@ -518,7 +518,7 @@ case PTRACE_SETREGS: if (current_isfile) - goto out_unspported; /* XXX not yet supported */ + goto out_unsupported; /* XXX not yet supported */ SET_XC_REGS(((struct gdb_regs *)data), ctxt[cpu].user_regs); if ((retval = xc_vcpu_setcontext(xc_handle, current_domid, cpu, &ctxt[cpu]))) @@ -526,8 +526,8 @@ break; case PTRACE_SINGLESTEP: - if (!current_isfile) - goto out_unspported; /* XXX not yet supported */ + if (current_isfile) + goto out_unsupported; /* XXX not yet supported */ /* XXX we can still have problems if the user switches threads * during single-stepping - but that just seems retarded */ @@ -540,7 +540,7 @@ case PTRACE_CONT: case PTRACE_DETACH: if (current_isfile) - goto out_unspported; /* XXX not yet supported */ + goto out_unsupported; /* XXX not yet supported */ if ( request != PTRACE_SINGLESTEP ) { FOREACH_CPU(cpumap, index) { @@ -603,7 +603,7 @@ case PTRACE_POKEUSER: case PTRACE_SYSCALL: case PTRACE_KILL: - goto out_unspported; /* XXX not yet supported */ + goto out_unsupported; /* XXX not yet supported */ case PTRACE_TRACEME: printf("PTRACE_TRACEME is an invalid request under Xen\n"); @@ -618,7 +618,7 @@ errno = EINVAL; return retval; - out_unspported: + out_unsupported: #ifdef DEBUG printf("unsupported xc_ptrace request %s\n", ptrace_names[request]); #endif ++++++ xen-9675-ptrace-bounds.diff ++++++ # HG changeset patch # User kaf24(a)firebug.cl.cam.ac.uk # Date Fri May 12 14:49:11 2006 # Node ID b54bba73936d4c0c6a279108da05b4221cdf58a9 # parent: be5a6188cd9f00d045328b6b045f85992f2fbe10 Fix an out-of-bounds memory access in xc_ptrace.c. Currently, Xen always copies the entire 512 byte extended FPU state (fxsave) even if only the "regular" FPU state was requested. This breaks since the memory buffer allocated in linux-xen-low.c:regsets_fetch_inferior_registers() is only large enough to hold the "plain" FPU registers. Signed-Off-By: Simon Kagstrom <simon.kagstrom(a)bth.se> xen-unstable changeset: 9987:8e6835fa7c4bf262a02fe63418eee1ae3fd16516 xen-unstable date: Fri May 12 15:47:25 2006 +0100 --- a/tools/libxc/xc_ptrace.c Thu May 11 10:34:34 2006 +++ b/tools/libxc/xc_ptrace.c Fri May 12 14:49:11 2006 @@ -510,6 +510,11 @@ break; case PTRACE_GETFPREGS: + if (!current_isfile && fetch_regs(xc_handle, cpu, NULL)) + goto out_error; + memcpy(data, &ctxt[cpu].fpu_ctxt, sizeof (elf_fpregset_t)); + break; + case PTRACE_GETFPXREGS: if (!current_isfile && fetch_regs(xc_handle, cpu, NULL)) goto out_error; ++++++ xen-9678-hvm-pae-performance.diff ++++++ # HG changeset patch # User kaf24(a)firebug.cl.cam.ac.uk # Date Mon May 15 06:49:08 2006 # Node ID 36f1129ae67da44ae7e9c0e32646afdade5973bb # parent: d69b243b1ca16c4512f8f51392d27eab3e01106a Fix the performance issues of 2-level paging HVM guests on the PAE Xen. With this, the performance will be basically same as 2-on-2. Signed-off-by: Jun Nakajima <jun.nakajima(a)intel.com> xen-unstable changeset: 9991:d20a2a971103e4c9cd09d9284707437cd1c28b77 xen-unstable date: Mon May 15 07:46:57 2006 +0100 --- a/xen/arch/x86/shadow.c Fri May 12 21:35:11 2006 +++ b/xen/arch/x86/shadow.c Mon May 15 06:49:08 2006 @@ -347,6 +347,13 @@ d->arch.shadow_page_count++; if ( PGT_l4_page_table == PGT_root_page_table ) pin = 1; +#if CONFIG_PAGING_LEVELS == 3 & defined (GUEST_PGENTRY_32) + /* + * We use PGT_l4_shadow for 2-level paging guests on PAE + */ + if ( d->arch.ops->guest_paging_levels == PAGING_L2 ) + pin = 1; +#endif break; #if CONFIG_PAGING_LEVELS >= 4 @@ -2379,6 +2386,17 @@ /* * arch.shadow_table */ +#if CONFIG_PAGING_LEVELS == 3 & defined (GUEST_PGENTRY_32) + /* + * We use PGT_l4_shadow for 2-level paging guests on PAE + */ + if ( d->arch.ops->guest_paging_levels == PAGING_L2 ) + { + if ( unlikely(!(smfn = __shadow_status(d, gpfn, PGT_l4_shadow))) ) + smfn = shadow_l3_table(v, gpfn, gmfn); + } + else +#endif if ( unlikely(!(smfn = __shadow_status(d, gpfn, PGT_base_page_table))) ) { #if CONFIG_PAGING_LEVELS == 2 ++++++ xen-balloon.diff ++++++ --- /var/tmp/diff_new_pack.8t1Ysm/_old 2006-05-17 19:03:58.000000000 +0200 +++ /var/tmp/diff_new_pack.8t1Ysm/_new 2006-05-17 19:03:58.000000000 +0200 @@ -2,24 +2,51 @@ =================================================================== --- xen-3.0-testing.orig/tools/python/xen/xend/balloon.py +++ xen-3.0-testing/tools/python/xen/xend/balloon.py -@@ -127,7 +127,7 @@ def free(required): +@@ -31,7 +31,11 @@ PROC_XEN_BALLOON = '/proc/xen/balloon' + + BALLOON_OUT_SLACK = 1 # MiB. We need this because the physinfo details are + # rounded. +-RETRY_LIMIT = 10 ++RETURN_OVERSHOOT = 16 # MiB. Overshooting the target free memory by less ++ # than this amount is okay; more than this is returned ++ # to domain 0 (other domains may have died, freeing mem.) ++ ++RETRY_LIMIT = 20 + ## + # The time to sleep between retries grows linearly, using this value (in + # seconds). When the system is lightly loaded, memory should be scrubbed and +@@ -127,26 +131,36 @@ def free(required): retries = 0 sleep_time = SLEEP_TIME_GROWTH - last_new_alloc = None + last_new_alloc = float('inf') ++ last_dom0_alloc = None ++ times_unchanged = 0 while retries < RETRY_LIMIT: free_mem = xc.physinfo()['free_memory'] ++ dom0_alloc = get_dom0_current_alloc() ++ if dom0_alloc == last_dom0_alloc: ++ times_unchanged += 1 ++ else: ++ times_unchanged = 0 ++ last_dom0_alloc = dom0_alloc -@@ -136,15 +136,14 @@ def free(required): - need_mem) ++ log.debug("Balloon #%d: free %d; need %d", retries, free_mem, need_mem) + if free_mem >= need_mem: +- log.debug("Balloon: free %d; need %d; done.", free_mem, +- need_mem) return - if retries == 0: - log.debug("Balloon: free %d; need %d.", free_mem, need_mem) -- ++ # This gives it at least 2.1 seconds to respond any, yet prevents ++ # us from waiting the full time if nothing is going to happen. ++ if times_unchanged > 4: ++ break + if dom0_min_mem > 0: - dom0_alloc = get_dom0_current_alloc() +- dom0_alloc = get_dom0_current_alloc() - new_alloc = dom0_alloc - (need_mem - free_mem) + log.debug("Balloon #%d: dom0_alloc %d; free %d; need %d.", + retries, dom0_alloc, free_mem, need_mem) @@ -27,7 +54,20 @@ + new_alloc = dom0_alloc - (need_mem - free_mem) if (new_alloc >= dom0_min_mem and - new_alloc != last_new_alloc): -+ new_alloc < last_new_alloc): - log.debug("Balloon: setting dom0 target to %d.", - new_alloc) +- log.debug("Balloon: setting dom0 target to %d.", +- new_alloc) ++ (new_alloc < last_new_alloc or ++ new_alloc > last_new_alloc + RETURN_OVERSHOOT)): ++ log.debug("Balloon: setting dom0 target to %d.", new_alloc) dom0 = XendDomain.instance().privilegedDomain() + dom0.setMemoryTarget(new_alloc) + last_new_alloc = new_alloc +@@ -157,7 +171,7 @@ def free(required): + sleep_time += SLEEP_TIME_GROWTH + + # Not enough memory; diagnose the problem. +- if dom0_min_mem == 0: ++ if dom0_min_mem <= 0: + raise VmError(('Not enough free memory and dom0_min_mem is 0, so ' + 'I cannot release any more. I need %d MiB but ' + 'only have %d.') % ++++++ xen-cirrus-corruption.diff ++++++ --- /var/tmp/diff_new_pack.8t1Ysm/_old 2006-05-17 19:03:58.000000000 +0200 +++ /var/tmp/diff_new_pack.8t1Ysm/_new 2006-05-17 19:03:58.000000000 +0200 @@ -1,32 +1,71 @@ -diff -r b6c5920e5d99 tools/ioemu/hw/cirrus_vga.c ---- a/tools/ioemu/hw/cirrus_vga.c Thu Apr 6 18:58:39 2006 +0100 -+++ b/tools/ioemu/hw/cirrus_vga.c Thu May 4 10:59:06 2006 -0600 -@@ -1187,6 +1187,17 @@ cirrus_hook_write_sr(CirrusVGAState * s, - s->hw_cursor_y = (reg_value << 3) | (reg_index >> 5); - break; - case 0x07: // Extended Sequencer Mode -+ /* Win2K seems to assume that the VRAM is set to 0xff -+ * whenever VGA/SVGA mode changes -+ */ -+ if ((s->sr[0x07] ^ reg_value) & CIRRUS_SR7_BPP_SVGA) -+ memset(s->vram_ptr, 0xff, s->real_vram_size); -+ s->sr[0x07] = reg_value; -+#ifdef DEBUG_CIRRUS -+ printf("cirrus: handled outport sr_index %02x, sr_value %02x\n", -+ reg_index, reg_value); -+#endif -+ break; - case 0x08: // EEPROM Control - case 0x09: // Scratch Register 0 - case 0x0a: // Scratch Register 1 -@@ -3021,10 +3032,6 @@ static void cirrus_init_common(CirrusVGA - } - s->cr[0x27] = device_id; +Index: xen-3.0-testing/tools/firmware/vgabios/clext.c +=================================================================== +--- xen-3.0-testing.orig/tools/firmware/vgabios/clext.c ++++ xen-3.0-testing/tools/firmware/vgabios/clext.c +@@ -525,6 +525,13 @@ cirrus_debug_dump: + cirrus_set_video_mode_extended: + call cirrus_switch_mode + pop ax ;; mode ++ test al, #0x80 ++ jnz cirrus_set_video_mode_extended_1 ++ push ax ++ mov ax, #0xffff ; set to 0xff to keep win 2K happy ++ call cirrus_clear_vram ++ pop ax ++cirrus_set_video_mode_extended_1: + and al, #0x7f -- /* Win2K seems to assume that the pattern buffer is at 0xff -- initially ! */ -- memset(s->vram_ptr, 0xff, s->real_vram_size); -- - s->cirrus_hidden_dac_lockindex = 5; - s->cirrus_hidden_dac_data = 0; + push ds +@@ -992,6 +999,13 @@ cirrus_vesa_02h_1: + jnz cirrus_vesa_02h_3 + call cirrus_enable_16k_granularity + cirrus_vesa_02h_3: ++ test bx, #0x8000 ;; no clear ++ jnz cirrus_vesa_02h_4 ++ push ax ++ xor ax,ax ++ call cirrus_clear_vram ++ pop ax ++cirrus_vesa_02h_4: + pop ax + push ds + #ifdef CIRRUS_VESA3_PMINFO +@@ -1460,6 +1474,38 @@ cirrus_get_start_addr: + pop bx + ret ++cirrus_clear_vram: ++ pusha ++ push es ++ mov si, ax ++ ++ call cirrus_enable_16k_granularity ++ call cirrus_extbios_85h ++ shl al, #2 ++ mov bl, al ++ xor ah,ah ++cirrus_clear_vram_1: ++ mov al, #0x09 ++ mov dx, #0x3ce ++ out dx, ax ++ push ax ++ mov cx, #0xa000 ++ mov es, cx ++ xor di, di ++ mov ax, si ++ mov cx, #8192 ++ cld ++ rep ++ stosw ++ pop ax ++ inc ah ++ cmp ah, bl ++ jne cirrus_clear_vram_1 ++ ++ pop es ++ popa ++ ret ++ + cirrus_extbios_handlers: + ;; 80h + dw cirrus_extbios_80h ++++++ xen-destdir.diff ++++++ --- /var/tmp/diff_new_pack.8t1Ysm/_old 2006-05-17 19:03:58.000000000 +0200 +++ /var/tmp/diff_new_pack.8t1Ysm/_new 2006-05-17 19:03:58.000000000 +0200 @@ -202,19 +202,6 @@ endif else all: -Index: xen-3.0-testing/tools/python/xen/xm/create.py -=================================================================== ---- xen-3.0-testing.orig/tools/python/xen/xm/create.py -+++ xen-3.0-testing/tools/python/xen/xm/create.py -@@ -65,7 +65,7 @@ gopts.opt('quiet', short='q', - use="Quiet.") - - gopts.opt('path', val='PATH', -- fn=set_value, default='.:/etc/xen', -+ fn=set_value, default='.:/etc/xen/vm', - use="""Search path for configuration scripts. - The value of PATH is a colon-separated directory list.""") - Index: xen-3.0-testing/tools/pygrub/Makefile =================================================================== --- xen-3.0-testing.orig/tools/pygrub/Makefile ++++++ xen-hvm-auto-balloon.diff ++++++ --- /var/tmp/diff_new_pack.8t1Ysm/_old 2006-05-17 19:03:59.000000000 +0200 +++ /var/tmp/diff_new_pack.8t1Ysm/_new 2006-05-17 19:03:59.000000000 +0200 @@ -10,7 +10,7 @@ import xen.lowlevel.xc from xen.xend import sxp -@@ -379,15 +380,19 @@ class HVMImageHandler(ImageHandler): +@@ -379,15 +380,17 @@ class HVMImageHandler(ImageHandler): os.waitpid(self.pid, 0) self.pid = 0 @@ -26,9 +26,7 @@ - return mem + extra_pages * page_kb + else: + page_kb = 4 -+ # This was derived emperically: -+ # 2.4 MB overhead per 1024 MB RAM + 16 MB constant (+ 4 as a buffer to avoid hypervisor crashes) -+ extra_mb = (2.4/1024) * (mem_kb/1024.0) + 20; ++ extra_mb = 48 + extra_pages = int( math.ceil( extra_mb*1024 / page_kb )) + return mem_kb + extra_pages * page_kb ++++++ xen-hvm-memory-check.diff ++++++ Index: xen-3.0-testing/xen/arch/x86/hvm/hvm.c =================================================================== --- xen-3.0-testing.orig/xen/arch/x86/hvm/hvm.c +++ xen-3.0-testing/xen/arch/x86/hvm/hvm.c @@ -185,11 +185,16 @@ static void hvm_get_info(struct domain * void hvm_setup_platform(struct domain* d) { struct hvm_domain *platform; + int rc; if ( !hvm_guest(current) || (current->vcpu_id != 0) ) return; - shadow_direct_map_init(d); + rc = shadow_direct_map_init(d); + if ( rc == 0 ) { + printk("Insufficient memory to start domain.\n"); + domain_crash_synchronous(); + } hvm_map_io_shared_page(d); hvm_get_info(d); Index: xen-3.0-testing/xen/arch/x86/hvm/svm/svm.c =================================================================== --- xen-3.0-testing.orig/xen/arch/x86/hvm/svm/svm.c +++ xen-3.0-testing/xen/arch/x86/hvm/svm/svm.c @@ -451,6 +451,9 @@ int start_svm(void) if (!(test_bit(X86_FEATURE_SVME, &boot_cpu_data.x86_capability))) return 0; + host_save_area[ cpu ] = alloc_host_save_area(); + if (! host_save_area[ cpu ]) + return 0; rdmsr(MSR_EFER, eax, edx); eax |= EFER_SVME; @@ -459,7 +462,6 @@ int start_svm(void) printk("AMD SVM Extension is enabled for cpu %d.\n", cpu ); /* Initialize the HSA for this core */ - host_save_area[ cpu ] = alloc_host_save_area(); phys_hsa = (u64) virt_to_maddr( host_save_area[ cpu ] ); phys_hsa_lo = (u32) phys_hsa; phys_hsa_hi = (u32) (phys_hsa >> 32); Index: xen-3.0-testing/xen/arch/x86/hvm/svm/vmcb.c =================================================================== --- xen-3.0-testing.orig/xen/arch/x86/hvm/svm/vmcb.c +++ xen-3.0-testing/xen/arch/x86/hvm/svm/vmcb.c @@ -143,18 +143,19 @@ static int construct_vmcb_controls(struc /* The following is for I/O and MSR permision map */ iopm = alloc_xenheap_pages(get_order_from_bytes(IOPM_SIZE)); - - ASSERT(iopm); - memset(iopm, 0xff, IOPM_SIZE); + if (iopm) + memset(iopm, 0xff, IOPM_SIZE); clear_bit(PC_DEBUG_PORT, iopm); msrpm = alloc_xenheap_pages(get_order_from_bytes(MSRPM_SIZE)); - - ASSERT(msrpm); - memset(msrpm, 0xff, MSRPM_SIZE); + if (msrpm) + memset(msrpm, 0xff, MSRPM_SIZE); arch_svm->iopm = iopm; arch_svm->msrpm = msrpm; + if (! iopm || ! msrpm) + return 1; + vmcb->iopm_base_pa = (u64) virt_to_maddr(iopm); vmcb->msrpm_base_pa = (u64) virt_to_maddr(msrpm); ++++++ xen-hvm-rep-movs.diff ++++++ Index: xen-3.0-testing/xen/arch/x86/hvm/platform.c =================================================================== --- xen-3.0-testing.orig/xen/arch/x86/hvm/platform.c +++ xen-3.0-testing/xen/arch/x86/hvm/platform.c @@ -865,7 +865,7 @@ void handle_mmio(unsigned long va, unsig * copy ourself. After this copy succeeds, "rep movs" is executed * again. */ - if ((addr & PAGE_MASK) != ((addr + size - 1) & PAGE_MASK)) { + if ((addr & PAGE_MASK) != ((addr + sign * (size - 1)) & PAGE_MASK)) { unsigned long value = 0; mmio_opp->flags |= OVERLAP; @@ -876,7 +876,7 @@ void handle_mmio(unsigned long va, unsig hvm_copy(&value, addr, size, HVM_COPY_IN); send_mmio_req(IOREQ_TYPE_COPY, gpa, 1, size, value, dir, 0); } else { - if ((addr & PAGE_MASK) != ((addr + count * size - 1) & PAGE_MASK)) { + if ((addr & PAGE_MASK) != ((addr + sign * (count * size - 1)) & PAGE_MASK)) { regs->eip -= inst_len; /* do not advance %eip */ if (sign > 0) ++++++ xen-load-pae-bin-kernel.diff ++++++ Index: xen-3.0-testing/tools/libxc/xg_private.h =================================================================== --- xen-3.0-testing.orig/tools/libxc/xg_private.h +++ xen-3.0-testing/tools/libxc/xg_private.h @@ -127,7 +127,7 @@ do { errno = __saved_errno; \ } while (0) - +enum pae_mode {NON_PAE_KERNEL32, PAE_KERNEL32, PAE_KERNEL64, BIMODAL_KERNEL32}; struct domain_setup_info { unsigned long v_start; @@ -137,7 +137,7 @@ struct domain_setup_info unsigned long v_kernentry; unsigned int load_symtab; - unsigned int pae_kernel; + enum pae_mode kernel_pae_mode; unsigned long symtab_addr; unsigned long symtab_len; Index: xen-3.0-testing/tools/libxc/xc_load_elf.c =================================================================== --- xen-3.0-testing.orig/tools/libxc/xc_load_elf.c +++ xen-3.0-testing/tools/libxc/xc_load_elf.c @@ -132,7 +132,13 @@ static int parseelfimage(const char *ima return -EINVAL; } if ( (strstr(guestinfo, "PAE=yes") != NULL) ) - dsi->pae_kernel = 1; +#if defined(__i386__) + dsi->kernel_pae_mode = PAE_KERNEL32; +#elif defined(__x86_64__) + dsi->kernel_pae_mode = PAE_KERNEL64; +#endif + else + dsi->kernel_pae_mode = NON_PAE_KERNEL32; break; } Index: xen-3.0-testing/tools/libxc/xc_load_bin.c =================================================================== --- xen-3.0-testing.orig/tools/libxc/xc_load_bin.c +++ xen-3.0-testing/tools/libxc/xc_load_bin.c @@ -29,6 +29,9 @@ * that memory info should be passed to the image) * bit 2: reserved, must be 0 (the multiboot spec uses this bit to indicate * that the bootloader should pass video mode info to the image) + * bits 14-15: contains the paging and cpu mode requirements of the image + * 0 = Non-PAE 32 bit, 1 = PAE 32 bit, 2 = PAE 64 bit, 3 = image + * detects current mode and adapts accordingly * bit 16: reserved, must be 1 (the multiboot spec uses this bit to indicate * that the values in the fields header_addr - entry_addr are * valid) @@ -92,10 +95,14 @@ struct xen_bin_image_table #define XEN_REACTOS_FLAG_ALIGN4K 0x00000001 #define XEN_REACTOS_FLAG_NEEDMEMINFO 0x00000002 #define XEN_REACTOS_FLAG_NEEDVIDINFO 0x00000004 +#define XEN_REACTOS_FLAG_PAE_MASK 0x0000C000 #define XEN_REACTOS_FLAG_ADDRSVALID 0x00010000 +#define XEN_REACTOS_FLAG_PAE_SHIFT 14 + /* Flags we test for */ -#define FLAGS_MASK ((~ 0) & (~ XEN_REACTOS_FLAG_ALIGN4K)) +#define FLAGS_MASK ((~ 0) & (~ XEN_REACTOS_FLAG_ALIGN4K) & \ + (~ XEN_REACTOS_FLAG_PAE_MASK)) #define FLAGS_REQUIRED XEN_REACTOS_FLAG_ADDRSVALID static struct xen_bin_image_table * @@ -228,6 +235,8 @@ static int parsebinimage(const char *ima dsi->v_kernend = dsi->v_end; dsi->v_kernentry = image_info->entry_addr; dsi->xen_guest_string = ""; + dsi->kernel_pae_mode = (image_info->flags & XEN_REACTOS_FLAG_PAE_MASK) >> + XEN_REACTOS_FLAG_PAE_SHIFT; return 0; } Index: xen-3.0-testing/tools/libxc/xc_linux_build.c =================================================================== --- xen-3.0-testing.orig/tools/libxc/xc_linux_build.c +++ xen-3.0-testing/tools/libxc/xc_linux_build.c @@ -328,6 +328,13 @@ static int setup_pg_tables_pae(int xc_ha } vl1e++; } + + /* Xen requires an entry mapping 0xC0000000 region */ + if ((vl3tab[3] & _PAGE_PRESENT) == 0) + { + alloc_pt(l2tab, vl2tab, pl2tab); + vl3tab[3] = l2tab | L3_PROT; + } munmap(vl1tab, PAGE_SIZE); munmap(vl2tab, PAGE_SIZE); @@ -591,11 +598,15 @@ static int compat_check(int xc_handle, s } if (strstr(xen_caps, "xen-3.0-x86_32p")) { - if (!dsi->pae_kernel) { + if (dsi->kernel_pae_mode == BIMODAL_KERNEL32) + dsi->kernel_pae_mode = PAE_KERNEL32; + else if (dsi->kernel_pae_mode != PAE_KERNEL32) { ERROR("Non PAE-kernel on PAE host."); return 0; } - } else if (dsi->pae_kernel) { + } else if (dsi->kernel_pae_mode == BIMODAL_KERNEL32) + dsi->kernel_pae_mode = NON_PAE_KERNEL32; + else if (dsi->kernel_pae_mode != NON_PAE_KERNEL32) { ERROR("PAE-kernel on non-PAE host."); return 0; } @@ -728,11 +739,12 @@ static int setup_guest(int xc_handle, if ( (v_end - vstack_end) < (512UL << 10) ) v_end += 1UL << 22; /* Add extra 4MB to get >= 512kB padding. */ #if defined(__i386__) - if ( dsi.pae_kernel ) + if ( dsi.kernel_pae_mode == PAE_KERNEL32 ) { - /* FIXME: assumes one L2 pgtable @ 0xc0000000 */ + /* Add 1 more page if 0xC0000000 region not otherwise reached */ if ( (((v_end - dsi.v_start + ((1<<L2_PAGETABLE_SHIFT_PAE)-1)) >> - L2_PAGETABLE_SHIFT_PAE) + 2) <= nr_pt_pages ) + L2_PAGETABLE_SHIFT_PAE) + 2 + (v_end <= 0xC0000000)) + <= nr_pt_pages ) break; } else @@ -804,7 +816,7 @@ static int setup_guest(int xc_handle, /* setup page tables */ #if defined(__i386__) - if (dsi.pae_kernel) + if (dsi.kernel_pae_mode == PAE_KERNEL32) rc = setup_pg_tables_pae(xc_handle, dom, ctxt, dsi.v_start, v_end, page_array, vpt_start, vpt_end, @@ -831,7 +843,7 @@ static int setup_guest(int xc_handle, */ if ( !shadow_mode_enabled ) { - if ( dsi.pae_kernel ) + if ( dsi.kernel_pae_mode == PAE_KERNEL32 ) { if ( pin_table(xc_handle, MMUEXT_PIN_L3_TABLE, ctxt->ctrlreg[3] >> PAGE_SHIFT, dom) ) @@ -965,7 +977,7 @@ static int setup_guest(int xc_handle, rc = xc_version(xc_handle, XENVER_version, NULL); sprintf(start_info->magic, "xen-%i.%i-x86_%d%s", rc >> 16, rc & (0xFFFF), (unsigned int)sizeof(long)*8, - dsi.pae_kernel ? "p" : ""); + dsi.kernel_pae_mode == PAE_KERNEL32 ? "p" : ""); start_info->nr_pages = nr_pages; start_info->shared_info = guest_shared_info_mfn << PAGE_SHIFT; start_info->flags = flags; ++++++ xen-lowmem-emergency-pool.diff ++++++ Index: xen-3.0-testing/xen/common/page_alloc.c =================================================================== --- xen-3.0-testing.orig/xen/common/page_alloc.c +++ xen-3.0-testing/xen/common/page_alloc.c @@ -273,6 +273,15 @@ void end_boot_allocator(void) if ( curr_free ) free_heap_pages(pfn_dom_zone_type(i), mfn_to_page(i), 0); } + + if (lowmem_emergency_pool_pages == 0) + { + /* Size the lowmem_emergency_pool based on the total memory on the box */ + if ((total_pages > (1000 * 1000) && (total_pages <= (2000*1000)))) + lowmem_emergency_pool_pages = 4000; + else if ((total_pages > (2000 * 1000) && (total_pages < (4*1000*1000)))) + lowmem_emergency_pool_pages = 8000; + } } /* Hand the specified arbitrary page range to the specified heap zone. */ ++++++ xen-messages.diff ++++++ --- /var/tmp/diff_new_pack.8t1Ysm/_old 2006-05-17 19:03:59.000000000 +0200 +++ /var/tmp/diff_new_pack.8t1Ysm/_new 2006-05-17 19:03:59.000000000 +0200 @@ -18,3 +18,116 @@ def check_user(): """Check that the effective user id is 0 (root). +Index: xen-3.0-testing/docs/man/xend-config.sxp.pod.5 +=================================================================== +--- xen-3.0-testing.orig/docs/man/xend-config.sxp.pod.5 ++++ xen-3.0-testing/docs/man/xend-config.sxp.pod.5 +@@ -107,7 +107,7 @@ If the value is 0, all available CPUs wi + =item I<enable-dump> + + A boolean value that tells xend whether or not core dumps of guest +-domains should be saved when a crash occurrs. Defaults to I<no>. ++domains should be saved when a crash occurs. Defaults to I<no>. + + =back + +Index: xen-3.0-testing/docs/man/xm.pod.1 +=================================================================== +--- xen-3.0-testing.orig/docs/man/xm.pod.1 ++++ xen-3.0-testing/docs/man/xm.pod.1 +@@ -27,12 +27,12 @@ each of those sub commands. + + =head1 NOTES + +-All B<xm> opperations rely upon the Xen control daemon, aka B<xend>. ++All B<xm> operations rely upon the Xen control daemon, aka B<xend>. + For any xm commands to run xend must also be running. For this reason + you should start xend as a service when your system first boots using + xen. + +-Most B<xm> commands require root privledges to run due to the ++Most B<xm> commands require root privileges to run due to the + communications channels used to talk to the hypervisor. Running as + non root will return an error. + +@@ -169,7 +169,7 @@ The domain is currently running on a CPU + + =item B + +-The domain is blocked, and not running or runable. This can be caused ++The domain is blocked, and not running or runnable. This can be caused + because the domain is waiting on IO (a traditional wait state) or has + gone to sleep because there was nothing else for it to do. + +@@ -248,7 +248,7 @@ careful when using this command on runni + + Migrate a domain to another Host machine. B<Xend> must be running on + other host machine, it must be running the same version of xen, it +-must have the migration tcp port open and accepting connections from ++must have the migration TCP port open and accepting connections from + the source host, and there must be sufficient resources for the domain + to run (memory, disk, etc). + +@@ -325,7 +325,7 @@ severed upon restore, as TCP timeouts ma + =item B<shutdown> I<[options]> I<domain-id> + + Gracefully shuts down a domain. This coordinates with the domain OS +-to perform graceful shutdown, so there is no guaruntee that it will ++to perform graceful shutdown, so there is no guarantee that it will + succeed, and may take a variable length of time depending on what + services must be shutdown in the domain. The command returns + immediately after signally the domain unless that I<-w> flag is used. +@@ -561,11 +561,11 @@ B<PARAMETERS> + + =item I<period> + +-The normal EDF scheduling usage in nanosecs ++The normal EDF scheduling usage in nanoseconds + + =item I<slice> + +-The normal EDF scheduling usage in nanosecs ++The normal EDF scheduling usage in nanoseconds + + FIXME: these are lame, should explain more. + +@@ -714,7 +714,7 @@ circumstances this should actually work. + + =item I<mac=macaddr> + +-The MAC address that the domain will see on its ethernet device. If ++The MAC address that the domain will see on its Ethernet device. If + the device is not specified it will be randomly generated with the + 00:16:3e vendor id prefix. + +@@ -756,7 +756,7 @@ formatted as a list or as an S-Expressio + + The Virtual Network interfaces for Xen. + +-FIXME: This needs a lot more explaination, or it needs to be ripped ++FIXME: This needs a lot more explanation, or it needs to be ripped + out entirely. + + =over 4 +Index: xen-3.0-testing/docs/man/xmdomain.cfg.pod.5 +=================================================================== +--- xen-3.0-testing.orig/docs/man/xmdomain.cfg.pod.5 ++++ xen-3.0-testing/docs/man/xmdomain.cfg.pod.5 +@@ -80,7 +80,7 @@ An array of block device stanzas, in the + + disk = [ "stanza1", "stanza2", ... ] + +-Each stanza has 3 terms, seperated by commas, ++Each stanza has 3 terms, separated by commas, + "backend-dev,frontend-dev,mode". + + =over 4 +@@ -112,7 +112,7 @@ I<r> (read-only), I<w> (read/write). + + =item B<vif> + +-An arrray of virtual interface stanzas in the form: ++An array of virtual interface stanzas in the form: + + vif = [ "stanza1", "stanza2", ... ] + ++++++ xen-paths.diff ++++++ Index: xen-3.0-testing/tools/python/xen/xm/create.py =================================================================== --- xen-3.0-testing.orig/tools/python/xen/xm/create.py +++ xen-3.0-testing/tools/python/xen/xm/create.py @@ -65,7 +65,7 @@ gopts.opt('quiet', short='q', use="Quiet.") gopts.opt('path', val='PATH', - fn=set_value, default='.:/etc/xen', + fn=set_value, default='.:/etc/xen/vm', use="""Search path for configuration scripts. The value of PATH is a colon-separated directory list.""") Index: xen-3.0-testing/docs/man/xm.pod.1 =================================================================== --- xen-3.0-testing.orig/docs/man/xm.pod.1 +++ xen-3.0-testing/docs/man/xm.pod.1 @@ -72,7 +72,7 @@ format, and possible options used in eit Name=Value combinations. Configfile can either be an absolute path to a file, or a relative -path to a file located in /etc/xen. +path to a file located in /etc/xen/vm. Create will return B<as soon> as the domain is started. This B<does not> mean the guest OS in the domain has actually booted, or is @@ -97,7 +97,7 @@ B<EXAMPLES> xm create Fedora4 -This creates a domain with the file /etc/xen/Fedora4, and returns as +This creates a domain with the file /etc/xen/vm/Fedora4, and returns as soon as it is run. =item I<without config file> Index: xen-3.0-testing/docs/man/xmdomain.cfg.pod.5 =================================================================== --- xen-3.0-testing.orig/docs/man/xmdomain.cfg.pod.5 +++ xen-3.0-testing/docs/man/xmdomain.cfg.pod.5 @@ -4,9 +4,9 @@ xmdomain.cfg - xm domain config file for =head1 SYNOPSIS - /etc/xen/myxendomain - /etc/xen/myxendomain2 - /etc/xen/auto/myxenautostarted + /etc/xen/auto/ + /etc/xen/examples/ + /etc/xen/vm/ =head1 DESCRIPTION @@ -14,14 +14,14 @@ The B<xm>(1) program uses python executa domains to create from scratch. Each of these config files needs to contain a number of required options, and may specify many more. -Domain configuration files live in /etc/xen by default, if you store +Domain configuration files live in /etc/xen/vm by default. If you store config files anywhere else the full path to the config file must be specified in the I<xm create> command. /etc/xen/auto is a special case. Domain config files in that directory will be started automatically at system boot if the xendomain init script is enabled. The contents of /etc/xen/auto -should be symlinks to files in /etc/xen to allow I<xm create> to be +should be symlinks to files in /etc/xen/vm to allow I<xm create> to be used without full paths. Options are specified by I<name = value> statements in the ++++++ xen-xmexample.diff ++++++ --- /var/tmp/diff_new_pack.8t1Ysm/_old 2006-05-17 19:03:59.000000000 +0200 +++ /var/tmp/diff_new_pack.8t1Ysm/_new 2006-05-17 19:03:59.000000000 +0200 @@ -107,3 +107,57 @@ #----------------------------------------------------------------------------- # write to temporary files instead of disk image files #snapshot=1 +Index: xen-3.0-testing/docs/man/xmdomain.cfg.pod.5 +=================================================================== +--- xen-3.0-testing.orig/docs/man/xmdomain.cfg.pod.5 ++++ xen-3.0-testing/docs/man/xmdomain.cfg.pod.5 +@@ -38,13 +38,13 @@ file. + + The kernel image for the domain. The format of the parameter is the + fully qualified path to the kernel image file, +-i.e. I</boot/vmlinuz-2.6.12-xenU>. ++i.e. I</boot/vmlinuz-xen>. + + + =item B<ramdisk> + + The initial ramdisk for the domain. The format of the parameter is +-the fully qualified path to the initrd, i.e. I</boot/initrd.gz>. On ++the fully qualified path to the initrd, i.e. I</boot/initrd-xen>. On + many Linux distros you will not need a ramdisk if using the default + xen kernel. + +@@ -258,14 +258,14 @@ configured. They should not be consider + + =item I<A Loopback File as Root> + +- kernel = "/boot/vmlinuz-2.6-xenU" ++ kernel = "/boot/vmlinuz-xen" + memory = 128 + name = "MyLinux" +- root = "/dev/hda1 ro" +- disk = [ "file:/var/xen/mylinux.img,hda1,w" ] ++ root = "/dev/hda1" ++ disk = [ "file:/var/lib/xen/images/MyLinux/hda1,hda1,w" ] + + This creates a domain called MyLinux with 128 MB of memory using a +-default xen kernel, and the file /var/xen/mylinux.img loopback mounted ++default xen kernel, and the file hda1 loopback mounted + at hda1, which is the root filesystem. + + =item I<NFS Root> +Index: xen-3.0-testing/docs/man/xm.pod.1 +=================================================================== +--- xen-3.0-testing.orig/docs/man/xm.pod.1 ++++ xen-3.0-testing/docs/man/xm.pod.1 +@@ -102,8 +102,8 @@ soon as it is run. + + =item I<without config file> + +- xm create /dev/null ramdisk=initrd.img \ +- kernel=/boot/vmlinuz-2.6.12.6-xenU \ ++ xm create /dev/null ramdisk=initrd-xen \ ++ kernel=/boot/vmlinuz-xen \ + name=ramdisk nics=0 vcpus=1 \ + memory=64 root=/dev/ram0 + ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun...

1 0

commit wireless-tools
by root＠suse.de 17 May '06

17 May '06

Hello community, here is the log from the commit of package wireless-tools checked in at Wed May 17 19:03:55 CEST 2006. -------- --- wireless-tools/wireless-tools.changes 2006-02-10 13:17:07.000000000 +0100 +++ wireless-tools/wireless-tools.changes 2006-05-17 16:30:15.000000000 +0200 @@ -1,0 +2,6 @@ +Wed May 17 16:16:48 CEST 2006 - jg(a)suse.de + +- install_intersil_firmware: fixed URL of PrismGT firmware + package (bug 173875) + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ wireless-tools.spec ++++++ --- /var/tmp/diff_new_pack.Qfj8eu/_old 2006-05-17 19:03:48.000000000 +0200 +++ /var/tmp/diff_new_pack.Qfj8eu/_new 2006-05-17 19:03:48.000000000 +0200 @@ -14,7 +14,7 @@ BuildRequires: openssl-devel Summary: Tools for a wireless LAN Version: 28pre13 -Release: 10 +Release: 22 %define wlanng_version 0.2.2 Group: Hardware/Other License: LGPL, Unknown @@ -112,6 +112,9 @@ %doc CHANGELOG.h INSTALL PCMCIA.txt README* ../wlan-ng %changelog -n wireless-tools +* Wed May 17 2006 - jg(a)suse.de +- install_intersil_firmware: fixed URL of PrismGT firmware + package (bug 173875) * Fri Feb 10 2006 - jg(a)suse.de - split off wlan drivers in their own package - removed dependency on kernel-source ++++++ suse-files.tar.gz ++++++ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/install_intersil_firmware new/install_intersil_firmware --- old/install_intersil_firmware 2005-03-07 14:48:19.000000000 +0100 +++ new/install_intersil_firmware 2006-05-17 15:49:17.000000000 +0200 @@ -4,6 +4,8 @@ # # This script tries to download and install the firmware needed to run # WLAN cards using Intersil's PrismGT chip. +URL=http://www.funkwerk-ec.com/portal/downloadcenter/dateien/artem_clientcards/11g +FWFILE=CC-54g_v1017.zip die() { @@ -22,9 +24,9 @@ pushd `pwd` >/dev/null cd $TMPDIR echo "Downloading firmware" -curl -# -o CC-54g_v1017.zip http://www.artem.de/content/artem/artem000221/CC-54g_v1017.zip || die +curl -# -o $FWFILE $URL/$FWFILE || die echo -n "Installing firmware" -unzip CC-54g_v1017.zip >/dev/null || die +unzip $FWFILE >/dev/null || die mv ComCard\ 54g/Win2k/WLANDCB.arm /lib/firmware/isl3890 || die echo echo "Firmware successfully installed." ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun...

1 0

commit sshfs
by root＠suse.de 17 May '06

17 May '06

Hello community, here is the log from the commit of package sshfs checked in at Wed May 17 19:03:46 CEST 2006. -------- --- sshfs/sshfs.changes 2006-05-16 16:36:11.000000000 +0200 +++ sshfs/sshfs.changes 2006-05-17 18:48:35.000000000 +0200 @@ -1,0 +2,5 @@ +Wed May 17 18:48:28 CEST 2006 - schwab(a)suse.de + +- Don't strip binaries. + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ sshfs.spec ++++++ --- /var/tmp/diff_new_pack.HlbBSg/_old 2006-05-17 19:03:41.000000000 +0200 +++ /var/tmp/diff_new_pack.HlbBSg/_new 2006-05-17 19:03:41.000000000 +0200 @@ -14,7 +14,7 @@ BuildRequires: fuse-devel glib2-devel Summary: Filesystem client based on SSH file transfer protocol Version: 1.6 -Release: 1 +Release: 2 License: GPL Group: System/Filesystems Source: %{name}-fuse-%{version}.tar.bz2 @@ -59,6 +59,8 @@ %{_libdir}/sshnodelay.so %changelog -n sshfs +* Wed May 17 2006 - schwab(a)suse.de +- Don't strip binaries. * Tue May 16 2006 - tiwai(a)suse.de - updated to version 1.6 * Fix segfault if remote host is down and reconnection is ++++++ sshfs-fuse-1.6.diff ++++++ --- /var/tmp/diff_new_pack.HlbBSg/_old 2006-05-17 19:03:41.000000000 +0200 +++ /var/tmp/diff_new_pack.HlbBSg/_new 2006-05-17 19:03:41.000000000 +0200 @@ -1,8 +1,8 @@ ---- Makefile.am-dist 2006-03-09 20:19:36.000000000 +0100 -+++ Makefile.am 2006-05-16 16:33:49.000000000 +0200 +--- Makefile.am ++++ Makefile.am @@ -24,4 +24,4 @@ rm -f "$(DESTDIR)$(libdir)/sshnodelay.so" sshnodelay.so: - $(CC) -Wall -W -s --shared -fPIC $(sshnodelay_libs) sshnodelay.c -o sshnodelay.so -+ $(CC) $(CFLAGS) -Wall -W -s --shared -fPIC $(sshnodelay_libs) sshnodelay.c -o sshnodelay.so ++ $(CC) $(CFLAGS) -Wall -W --shared -fPIC $(sshnodelay_libs) sshnodelay.c -o sshnodelay.so ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun...

1 0

commit su-wrapper
by root＠suse.de 17 May '06

17 May '06

Hello community, here is the log from the commit of package su-wrapper checked in at Wed May 17 19:02:15 CEST 2006. -------- --- su-wrapper/su-wrapper.changes 2006-01-25 21:41:51.000000000 +0100 +++ su-wrapper/su-wrapper.changes 2006-05-17 11:49:05.000000000 +0200 @@ -1,0 +2,6 @@ +Wed May 17 11:48:52 CEST 2006 - schwab(a)suse.de + +- Don't strip binaries. +- Don't build as root. + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ su-wrapper.spec ++++++ --- /var/tmp/diff_new_pack.LptHW7/_old 2006-05-17 19:02:08.000000000 +0200 +++ /var/tmp/diff_new_pack.LptHW7/_new 2006-05-17 19:02:09.000000000 +0200 @@ -1,17 +1,18 @@ # # spec file for package su-wrapper (Version 1.2.0) # -# Copyright (c) 2004 SUSE LINUX AG, Nuernberg, Germany. +# Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine # package are under the same license as the package itself. # -# Please submit bugfixes or comments via http://www.suse.de/feedback/ +# Please submit bugfixes or comments via http://bugs.opensuse.org/ # +# norootforbuild Name: su-wrapper Version: 1.2.0 -Release: 336 +Release: 350 Summary: su-wrapper, run programs as other user and group License: GPL Group: System/Base @@ -59,14 +60,18 @@ %run_permissions %verifyscript -%verify_permissions +%verify_permissions -e /usr/sbin/su-wrapper %files +%defattr(-, root, root) %doc doc/COPYING doc/README doc/TODO doc/VERSION %config /etc/su-wrapper.conf %verify(not mode) /usr/sbin/su-wrapper %changelog -n su-wrapper +* Wed May 17 2006 - schwab(a)suse.de +- Don't strip binaries. +- Don't build as root. * Wed Jan 25 2006 - mls(a)suse.de - converted neededforbuild to BuildRequires * Fri Nov 12 2004 - ro(a)suse.de ++++++ su-wrapper-1.2.0.dif ++++++ --- /var/tmp/diff_new_pack.LptHW7/_old 2006-05-17 19:02:09.000000000 +0200 +++ /var/tmp/diff_new_pack.LptHW7/_new 2006-05-17 19:02:09.000000000 +0200 @@ -35,7 +35,7 @@ install: su-wrapper - install -s -o root -g root -m 4711 su-wrapper /usr/sbin/ -+ install -s -o root -g root -m 4711 su-wrapper $(DESTDIR)/usr/sbin/ ++ install su-wrapper $(DESTDIR)/usr/sbin/ clean: rm -f su-wrapper su-wrapper.o ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun...

1 0

commit sabayon
by root＠suse.de 17 May '06

17 May '06

Hello community, here is the log from the commit of package sabayon checked in at Wed May 17 19:02:02 CEST 2006. -------- --- GNOME/sabayon/sabayon.changes 2006-05-15 19:58:24.000000000 +0200 +++ sabayon/sabayon.changes 2006-05-17 08:30:49.000000000 +0200 @@ -1,0 +2,7 @@ +Wed May 17 08:30:32 CEST 2006 - hpj(a)suse.de + +- Added patch to reset Sabayon's GConf key overrides before + (optinally) applying a profile and logging the user in. Fixes + Novell bug #173929. + +------------------------------------------------------------------- New: ---- sabayon-2.12.3-reset-gconf-keys.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ sabayon.spec ++++++ --- /var/tmp/diff_new_pack.JsRCec/_old 2006-05-17 19:01:57.000000000 +0200 +++ /var/tmp/diff_new_pack.JsRCec/_new 2006-05-17 19:01:57.000000000 +0200 @@ -12,7 +12,7 @@ Name: sabayon Version: 2.12.3 -Release: 21 +Release: 22 Summary: Tool to maintain user profiles in a GNOME desktop Group: System/GUI/GNOME License: GPL @@ -47,6 +47,7 @@ Patch6: sabayon-2.12.3-desktop-file.patch Patch7: sabayon-2.12.3-ooo-support.patch Patch8: sabayon-2.12.3-gnomevfs-monitoring.patch +Patch9: sabayon-2.12.3-reset-gconf-keys.patch %description Sabayon is a tool to help system administrators and users change and @@ -89,6 +90,7 @@ %patch6 -p1 %patch7 -p1 %patch8 -p1 +%patch9 -p1 %build rename no nb po/no.* @@ -229,6 +231,10 @@ %{python_sitelib}/%{name}/lockdown %changelog -n sabayon +* Wed May 17 2006 - hpj(a)suse.de +- Added patch to reset Sabayon's GConf key overrides before + (optinally) applying a profile and logging the user in. Fixes + Novell bug #173929. * Mon May 15 2006 - sbrabec(a)suse.cz - Do not own gconf files reserved for sysadmin (#167282). * Wed May 03 2006 - hpj(a)suse.de ++++++ sabayon-2.12.3-reset-gconf-keys.patch ++++++ diff -Nurp sabayon-2.12.3-pre/admin-tool/sabayon-apply sabayon-2.12.3-work/admin-tool/sabayon-apply --- sabayon-2.12.3-pre/admin-tool/sabayon-apply 2005-10-27 08:06:58.000000000 -0500 +++ sabayon-2.12.3-work/admin-tool/sabayon-apply 2006-05-17 01:14:13.000000000 -0500 @@ -19,7 +19,9 @@ # if __name__ == '__main__': + import os import sys + import shutil from sabayon import util from sabayon import userdb @@ -32,8 +34,18 @@ if __name__ == '__main__': is_sabayon_session = True sys.argv = sys.argv[:1] + sys.argv[2:] + user_name = util.get_user_name () + + if userdb.get_database().is_sabayon_controlled (user_name): + try: + shutil.rmtree (os.path.join (util.get_home_dir (), ".gconf.xml.defaults")) + shutil.rmtree (os.path.join (util.get_home_dir (), ".gconf.xml.mandatory")) + os.mkdir (os.path.join (util.get_home_dir (), ".gconf.xml.defaults")) + os.mkdir (os.path.join (util.get_home_dir (), ".gconf.xml.mandatory")) + except: + pass + if len (sys.argv) == 1: - user_name = util.get_user_name () profile_name = userdb.get_database().get_profile (user_name) if not profile_name: sys.stderr.write (_("No profile for user '%s' found\n") % user_name) diff -Nurp sabayon-2.12.3-pre/lib/userdb.py sabayon-2.12.3-work/lib/userdb.py --- sabayon-2.12.3-pre/lib/userdb.py 2005-11-10 11:03:50.000000000 -0600 +++ sabayon-2.12.3-work/lib/userdb.py 2006-05-17 01:16:34.000000000 -0500 @@ -437,6 +437,26 @@ class UserDatabase: # TODO: also list remote profiles as found in self.doc return list + def is_sabayon_controlled (self, username): + """Return True if user's configuration was ever under Sabayon's + control. + """ + profile = self.__ldap_query ("profilemap", {"u":username, "h":socket.getfqdn()}) + + if profile: + return True + + try: + query = "/profiles/user[@name='%s']" % username + user = self.doc.xpathEval(query)[0] + except: + return False + + if user: + return True + + return False + def get_users (self): """Return the list of users on the system. These should be real users - i.e. should not include system users ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun...

1 0

commit rug
by root＠suse.de 17 May '06

17 May '06

Hello community, here is the log from the commit of package rug checked in at Wed May 17 19:01:55 CEST 2006. -------- --- rug/rug.changes 2006-05-03 07:38:03.000000000 +0200 +++ rug/rug.changes 2006-05-16 23:23:11.000000000 +0200 @@ -1,0 +2,8 @@ +Tue May 16 23:22:33 CEST 2006 - maw(a)suse.de + +- New source drop (r28427) which: +- Handles zypp atoms correctly +- Adds a better error message if QueryFile fails +- Finds catalogs by acronyms. + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ rug.spec ++++++ --- /var/tmp/diff_new_pack.LPhHGU/_old 2006-05-17 19:01:41.000000000 +0200 +++ /var/tmp/diff_new_pack.LPhHGU/_new 2006-05-17 19:01:41.000000000 +0200 @@ -14,7 +14,7 @@ BuildRequires: gtkdoc mono-basic mono-data-sqlite mono-devel zmd-devel URL: http://www.novell.com Version: 7.1.1.0 -Release: 17 +Release: 18 License: GPL BuildRoot: %{_tmppath}/%{name}-%{version}-build Summary: Command Line Client for zmd @@ -78,6 +78,11 @@ %_mandir/*/*/*.gz %changelog -n rug +* Tue May 16 2006 - maw(a)suse.de +- New source drop (r28427) which: +- Handles zypp atoms correctly +- Adds a better error message if QueryFile fails +- Finds catalogs by acronyms. * Wed May 03 2006 - maw(a)suse.de - New source drop (r?????) which: - Fixes up the status of patches if there is an exact match ++++++ rug-7.1.1.0.tar.bz2 ++++++ ++++ 8093 lines of diff (skipped) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun...

1 0

commit resample
by root＠suse.de 17 May '06

17 May '06

Hello community, here is the log from the commit of package resample checked in at Wed May 17 19:01:37 CEST 2006. -------- --- resample/resample.changes 2006-03-13 14:41:35.000000000 +0100 +++ resample/resample.changes 2006-05-17 13:08:24.000000000 +0200 @@ -1,0 +2,6 @@ +Wed May 17 13:08:06 CEST 2006 - schwab(a)suse.de + +- Use RPM_OPT_FLAGS. +- Don't strip binaries. + +------------------------------------------------------------------- New: ---- resample-makefile.diff ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ resample.spec ++++++ --- /var/tmp/diff_new_pack.gFmaXR/_old 2006-05-17 19:01:31.000000000 +0200 +++ /var/tmp/diff_new_pack.gFmaXR/_new 2006-05-17 19:01:31.000000000 +0200 @@ -13,11 +13,12 @@ Name: resample Summary: Sampling-rate conversion program Version: 1.7 -Release: 119 +Release: 127 URL: http://www-ccrma.stanford.edu/~jos/resample Source0: %{name}-%{version}.tar.bz2 Patch: resample-fix.dif Patch1: resample-var-init-fix.diff +Patch2: resample-makefile.diff License: LGPL Group: Productivity/Multimedia/Video/Editors and Convertors BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -38,12 +39,12 @@ %setup -q %patch %patch1 +%patch2 %build make %install -# [ "$RPM_BUILD_ROOT" != "/" ] && rm -rf $RPM_BUILD_ROOT make INSTALLDIR=$RPM_BUILD_ROOT%{_bindir} \ MANDIR=$RPM_BUILD_ROOT%{_mandir}/man1 install @@ -57,6 +58,9 @@ %{_mandir}/man1/* %changelog -n resample +* Wed May 17 2006 - schwab(a)suse.de +- Use RPM_OPT_FLAGS. +- Don't strip binaries. * Mon Mar 13 2006 - tiwai(a)suse.de - fix uninitialized variable (#157411) * Wed Jan 25 2006 - mls(a)suse.de ++++++ resample-makefile.diff ++++++ --- Makefile +++ Makefile @@ -31,7 +31,7 @@ SRCS = $(CFILES1) $(CFILES2) $(HFILES) $(MANPAGES) $(FILTERS) BASE_CFLAGS = -I. -Wall $(arch_flags) -CFLAGS = $(BASE_CFLAGS) -O3 +CFLAGS = $(BASE_CFLAGS) $(RPM_OPT_FLAGS) DEBUG_CFLAGS = $(BASE_CFLAGS) -g -DDEBUG all: $(PRODUCTS) @@ -63,7 +63,7 @@ # creates products and installs them. Installs man pages also. install: $(INSTALLDIR) $(MANDIR) $(BINARIES) - install -s -m 755 $(BINARIES) $(INSTALLDIR) + install -m 755 $(BINARIES) $(INSTALLDIR) install -m 644 $(MANPAGES) $(MANDIR) # Tests INSTALLED version only ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun...

1 0

commit permissions
by root＠suse.de 17 May '06

17 May '06

Hello community, here is the log from the commit of package permissions checked in at Wed May 17 19:01:25 CEST 2006. -------- --- permissions/permissions.changes 2006-02-23 18:48:01.000000000 +0100 +++ permissions/permissions.changes 2006-05-17 11:43:00.000000000 +0200 @@ -1,0 +2,5 @@ +Wed May 17 11:42:30 CEST 2006 - lnussel(a)suse.de + +- add setuid bit to gnomesu-pam-backend in level secure (#175616) + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ permissions.spec ++++++ --- /var/tmp/diff_new_pack.tBAiKG/_old 2006-05-17 19:01:14.000000000 +0200 +++ /var/tmp/diff_new_pack.tBAiKG/_new 2006-05-17 19:01:14.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package permissions (Version 2006.2.24) +# spec file for package permissions (Version 2006.5.17) # # Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine @@ -14,7 +14,7 @@ License: GPL Group: Productivity/Security Autoreqprov: on -Version: 2006.2.24 +Version: 2006.5.17 Release: 1 Provides: aaa_base:/etc/permissions Requires: /sbin/SuSEconfig @@ -76,6 +76,8 @@ /var/adm/fillup-templates/sysconfig.security %changelog -n permissions +* Wed May 17 2006 - lnussel(a)suse.de +- add setuid bit to gnomesu-pam-backend in level secure (#175616) * Thu Feb 23 2006 - schwab(a)suse.de - /usr/lib/ia32el/suid_libia32x.so renamed to suid_ia32x_loader. * Wed Jan 25 2006 - mls(a)suse.de ++++++ permissions.easy ++++++ --- permissions/permissions.easy 2006-02-23 18:48:01.000000000 +0100 +++ permissions/permissions.easy 2006-05-17 11:42:18.000000000 +0200 @@ -190,7 +190,7 @@ /usr/lib/mailman/cgi-bin/rmlist root:mailman 2755 /usr/lib/mailman/mail/mailman root:mailman 2755 -# libgnomesu (#75823) +# libgnomesu (#75823, #175616) /opt/gnome/lib/libgnomesu/gnomesu-pam-backend root:root 4755 # control-center2 (#104993) ++++++ permissions.paranoid ++++++ --- permissions/permissions.paranoid 2006-02-23 18:48:01.000000000 +0100 +++ permissions/permissions.paranoid 2006-05-17 11:42:27.000000000 +0200 @@ -210,7 +210,7 @@ /usr/lib/mailman/cgi-bin/rmlist root:mailman 0755 /usr/lib/mailman/mail/mailman root:mailman 0755 -# libgnomesu (#75823) +# libgnomesu (#75823, #175616) /opt/gnome/lib/libgnomesu/gnomesu-pam-backend root:root 0755 # control-center2 (#104993) ++++++ permissions.secure ++++++ --- permissions/permissions.secure 2006-02-23 18:48:01.000000000 +0100 +++ permissions/permissions.secure 2006-05-17 11:42:12.000000000 +0200 @@ -231,8 +231,8 @@ /usr/lib/mailman/cgi-bin/rmlist root:mailman 2755 /usr/lib/mailman/mail/mailman root:mailman 2755 -# libgnomesu (#75823) -/opt/gnome/lib/libgnomesu/gnomesu-pam-backend root:root 0755 +# libgnomesu (#75823, #175616) +/opt/gnome/lib/libgnomesu/gnomesu-pam-backend root:root 4755 # control-center2 (#104993) /opt/gnome/sbin/change-passwd root:root 4755 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun...

1 0

commit net-tools
by root＠suse.de 17 May '06

17 May '06

Hello community, here is the log from the commit of package net-tools checked in at Wed May 17 19:00:47 CEST 2006. -------- --- net-tools/net-tools.changes 2006-03-21 12:29:15.000000000 +0100 +++ net-tools/net-tools.changes 2006-05-17 15:05:38.000000000 +0200 @@ -1,0 +2,6 @@ +Wed May 17 15:01:39 CEST 2006 - ms(a)suse.de + +- added patch from Olaf Kirch. Do not display SCTP sockets + if /proc/net/sctp/eps couldn't be opened (#159686) + +------------------------------------------------------------------- New: ---- net-tools-1.60-sctp-quiet ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ net-tools.spec ++++++ --- /var/tmp/diff_new_pack.wbijDg/_old 2006-05-17 19:00:26.000000000 +0200 +++ /var/tmp/diff_new_pack.wbijDg/_new 2006-05-17 19:00:26.000000000 +0200 @@ -20,7 +20,7 @@ Obsoletes: traceroute net_tool Autoreqprov: on Version: 1.60 -Release: 576 +Release: 583 Summary: Important Programs for Networking BuildRoot: %{_tmppath}/%{name}-%{version}-build Source: net-tools-%{version}.tar.bz2 @@ -51,6 +51,7 @@ Patch23: net-tools-1.60-netstat-output.patch Patch24: net-tools-1.60-netstat-p.patch Patch25: net-tools-1.60-sctp.patch +Patch26: net-tools-1.60-sctp-quiet %description This package contains essential programs for network administration and @@ -95,6 +96,7 @@ %patch23 -p1 %patch24 -p1 %patch25 -p1 +%patch26 -p1 %build make config @@ -146,6 +148,9 @@ %lang(pt_BR) %doc %_mandir/pt_BR/man*/* %changelog -n net-tools +* Wed May 17 2006 - ms(a)suse.de +- added patch from Olaf Kirch. Do not display SCTP sockets + if /proc/net/sctp/eps couldn't be opened (#159686) * Tue Mar 21 2006 - okir(a)suse.de - Display SCTP sockets correctly [#159686 - LTC22492] * Mon Mar 20 2006 - hvogel(a)suse.de ++++++ net-tools-1.60-sctp-quiet ++++++ Index: net-tools-1.60/netstat.c =================================================================== --- net-tools-1.60.orig/netstat.c +++ net-tools-1.60/netstat.c @@ -2140,7 +2140,7 @@ int main usage(); if ((flag_inet || flag_inet6 || flag_sta) && !(flag_tcp || flag_udp || flag_sctp || flag_raw)) - flag_tcp = flag_udp = flag_sctp = flag_raw = 1; + flag_tcp = flag_udp = flag_raw = 1; if ((flag_tcp || flag_udp || flag_sctp || flag_raw || flag_igmp) && !(flag_inet || flag_inet6)) flag_inet = flag_inet6 = 1; ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun...

1 0

commit mxml
by root＠suse.de 17 May '06

17 May '06

Hello community, here is the log from the commit of package mxml checked in at Wed May 17 19:00:21 CEST 2006. -------- --- mxml/mxml.changes 2006-01-25 21:38:29.000000000 +0100 +++ mxml/mxml.changes 2006-05-17 14:48:27.000000000 +0200 @@ -1,0 +2,5 @@ +Wed May 17 14:48:22 CEST 2006 - schwab(a)suse.de + +- Don't strip binaries. + +------------------------------------------------------------------- New: ---- mxml-2.2.2.diff ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ mxml.spec ++++++ --- /var/tmp/diff_new_pack.bTErgz/_old 2006-05-17 18:59:56.000000000 +0200 +++ /var/tmp/diff_new_pack.bTErgz/_new 2006-05-17 18:59:56.000000000 +0200 @@ -5,7 +5,7 @@ # This file and all modifications and additions to the pristine # package are under the same license as the package itself. # -# Please submit bugfixes or comments via http://bugs.opensuse.org +# Please submit bugfixes or comments via http://bugs.opensuse.org/ # # norootforbuild @@ -19,15 +19,16 @@ License: GPL Group: Development/Libraries/Other Version: 2.2.2 -Release: 1 +Release: 12 Summary: Small XML Parsing Library Source: %{name}-%{version}.tar.bz2 +Patch: %{name}-%{version}.diff BuildRoot: %{_tmppath}/%{name}-%{version}-build %description Mini-XML is a small XML parsing library that you can use to read XML and XML-like data files in your application without requiring large -non-standard libraries. +nonstandard libraries. @@ -37,6 +38,7 @@ %prep %setup +%patch %build %configure --with-docdir=%{_docdir}/%{name} @@ -67,6 +69,8 @@ %doc doc/*.html doc/*.png doc/*.xsd %changelog -n mxml +* Wed May 17 2006 - schwab(a)suse.de +- Don't strip binaries. * Wed Jan 25 2006 - mls(a)suse.de - converted neededforbuild to BuildRequires * Mon Jan 16 2006 - mrueckert(a)suse.de ++++++ mxml-2.2.2.diff ++++++ --- Makefile.in +++ Makefile.in @@ -67,7 +67,7 @@ # Install commands... # -INSTALL_BIN = $(LIBTOOL) $(INSTALL) -m 755 -s +INSTALL_BIN = $(LIBTOOL) $(INSTALL) -m 755 INSTALL_DATA = $(INSTALL) -m 644 INSTALL_DIR = $(INSTALL) -d INSTALL_LIB = $(LIBTOOL) $(INSTALL) -m 755 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun...

1 0

commit mined
by root＠suse.de 17 May '06

17 May '06

Hello community, here is the log from the commit of package mined checked in at Wed May 17 18:59:50 CEST 2006. -------- --- mined/mined.changes 2006-01-25 21:38:18.000000000 +0100 +++ mined/mined.changes 2006-05-17 16:56:31.000000000 +0200 @@ -1,0 +2,5 @@ +Wed May 17 16:56:21 CEST 2006 - schwab(a)suse.de + +- Don't strip binaries. + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ mined.spec ++++++ --- /var/tmp/diff_new_pack.hS8ujY/_old 2006-05-17 18:59:36.000000000 +0200 +++ /var/tmp/diff_new_pack.hS8ujY/_new 2006-05-17 18:59:36.000000000 +0200 @@ -1,11 +1,11 @@ # # spec file for package mined (Version 2000.11) # -# Copyright (c) 2005 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine # package are under the same license as the package itself. # -# Please submit bugfixes or comments via http://www.suse.de/feedback/ +# Please submit bugfixes or comments via http://bugs.opensuse.org/ # # norootforbuild @@ -16,7 +16,7 @@ Group: Productivity/Editors/Other Autoreqprov: on Version: 2000.11 -Release: 1 +Release: 13 URL: http://towo.net/mined/ Source0: http://towo.net/mined/mined-2000.11.tar.bz2 Patch1: mined.desktop.patch @@ -24,19 +24,19 @@ Patch3: do-not-return-random-data-in-function.patch Patch10: mined2000-termio.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build -Summary: Powerful text editor with extensive Unicode and CJK support. +Summary: Powerful Text Editor with Extensive Unicode and CJK Support %description Mined is a powerful text editor with a comprehensive and easy-to-use -user interface and fast, small-footprint behaviour. +user interface and fast, small-footprint behavior. It was the first editor that provided Unicode support in a plain-text terminal. It now has both extensive Unicode and CJK support offering many specific features and covering special cases that other editors -are not aware of (like auto-detection features and automatic handling -of terminal variations, or Han character information). And basically, -it is an editor tailored to efficient editing of plain text documents -and programs, with features and interactive behaviour designed for this +are not aware of (like autodetection features and automatic handling of +terminal variations or Han character information). Basically, it is an +editor tailored to efficient editing of plain text documents and +programs with features and interactive behavior designed for this purpose. Mined Overview @@ -44,8 +44,8 @@ Good interactive features * Intuitive user interface * Logical and consistent concept of navigating and editing text - (without ancient line-end handling limitations or insert/append - confusion) + (without ancient line-end handling limitations or insert or + append confusion) * Supports various control styles: Editing with command control, function key control, or menu control Navigation by cursor keys, @@ -57,8 +57,8 @@ can be most easily reached and remembered by intuitively amplifying the associated function -* Immediate adjustment if the window size is changed, in any state - of interaction +* Immediate adjustment if the window size is changed in any state of + interaction Versatile character encoding support * Extensive Unicode support, including double-width and combining characters, script @@ -72,7 +72,7 @@ (including GB18030 and full EUC-JP with combining characters) in either Unicode terminal or CJK terminal -* Support for a variety of 8 bit encodings (mapped to Unicode) (with +* Support for a variety of 8-bit encodings (mapped to Unicode) (with combining characters for Vietnamese and Thai) * Support of CJK input methods by enhanced keyboard mapping @@ -82,26 +82,25 @@ * Han character information with description and pronunciation -* Auto-detection of text character encoding, edits files with mixed - character encoding sections (e.g. mailboxes), transparent +* Autodetection of text character encoding, edit of files with mixed + character encoding sections (such as mailboxes), transparent handling of UTF-16 encoded files -* Auto-detection of UTF-8 / CJK terminal mode and detailed features +* Autodetection of UTF-8 and CJK terminal mode and detailed features (like different Unicode width and combining data versions) * Encoding support tested with: xterm, mlterm, hanterm, cxterm, rxvt, linux console Many useful text editing capabilities * Many text editing features, - e.g. paragraph wrapping, auto-indentation and back-tab, smart - quotes (with quotation marks style selection and auto-detection) + such as paragraph wrapping, autoindentation and back-tab, smart + quotes (with quotation marks style selection and autodetection), and smart dashes * Search and replacement patterns can have multiple lines -* Cross-session paste buffer (copy/paste between multiple - -- even subsequent or remote - invocations of mined) +* Cross-session paste buffer (copy and paste between multiple--even + subsequent or remote--invocations of mined) * Marker stack for quick return to previous text positions @@ -111,7 +110,7 @@ identifier and function definition search, also across files; structure input support -* Text and program layout features; auto-indentation and undent +* Text and program layout features; autoindentation and undent function (back-tab), numbered item justification * Systematic text and file handling safety, avoiding loss of data @@ -121,7 +120,7 @@ displayed in the current mode) * Full binary transparent editing with visible indications (illegal - UTF-8 or CJK, mixed line end types, NUL characters, ...) + UTF-8 or CJK, mixed line end types, NUL characters, etc.) * Print function that works in all text encodings @@ -180,6 +179,8 @@ %endif %changelog -n mined +* Wed May 17 2006 - schwab(a)suse.de +- Don't strip binaries. * Wed Jan 25 2006 - mls(a)suse.de - converted neededforbuild to BuildRequires * Fri Aug 05 2005 - mfabian(a)suse.de ++++++ build.patch ++++++ --- /var/tmp/diff_new_pack.hS8ujY/_old 2006-05-17 18:59:37.000000000 +0200 +++ /var/tmp/diff_new_pack.hS8ujY/_new 2006-05-17 18:59:37.000000000 +0200 @@ -1,6 +1,5 @@ -diff -ru mined-2000.11.orig/src/mkinclud.mak mined-2000.11/src/mkinclud.mak ---- mined-2000.11.orig/src/mkinclud.mak 2005-06-23 00:00:00.000000000 +0200 -+++ mined-2000.11/src/mkinclud.mak 2005-08-05 17:28:34.000000000 +0200 +--- mined-2000.11/src/mkinclud.mak ++++ mined-2000.11/src/mkinclud.mak @@ -226,7 +226,7 @@ # generate makefile to deal with variable list of targets, # invoke it to generate and compile character mapping tables: @@ -19,9 +18,16 @@ ############################################################################# -diff -ru mined-2000.11.orig/src/mkmakchr mined-2000.11/src/mkmakchr ---- mined-2000.11.orig/src/mkmakchr 2005-06-02 00:00:00.000000000 +0200 -+++ mined-2000.11/src/mkmakchr 2005-08-05 16:11:22.000000000 +0200 +@@ -339,7 +339,6 @@ + + # Installation: + install: mined help man ${INSTALLTARGET} +- strip mined + mkdir -p $(bindir) + $(INSTALL) mined $(bindir) + mkdir -p $(rundir) +--- mined-2000.11/src/mkmakchr ++++ mined-2000.11/src/mkmakchr @@ -15,6 +15,6 @@ for map in charmaps/*.map ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun...

1 0

commit lynx
by root＠suse.de 17 May '06

17 May '06

Hello community, here is the log from the commit of package lynx checked in at Wed May 17 18:59:49 CEST 2006. -------- --- lynx/lynx.changes 2006-01-25 21:38:06.000000000 +0100 +++ lynx/lynx.changes 2006-05-17 14:31:36.000000000 +0200 @@ -1,0 +2,5 @@ +Wed May 17 14:31:28 CEST 2006 - schwab(a)suse.de + +- Don't strip binaries. + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ lynx.spec ++++++ --- /var/tmp/diff_new_pack.xph1z6/_old 2006-05-17 18:59:32.000000000 +0200 +++ /var/tmp/diff_new_pack.xph1z6/_new 2006-05-17 18:59:32.000000000 +0200 @@ -5,7 +5,7 @@ # This file and all modifications and additions to the pristine # package are under the same license as the package itself. # -# Please submit bugfixes or comments via http://bugs.opensuse.org +# Please submit bugfixes or comments via http://bugs.opensuse.org/ # # norootforbuild @@ -20,9 +20,9 @@ Requires: xli Autoreqprov: on Version: 2.8.5 -Release: 39 +Release: 51 URL: http://lynx.isc.org -Summary: A text-based WWW browser +Summary: A Text-Based WWW Browser Source: http://lynx.isc.org/lynx2.8.5/lynx2.8.5.tar.bz2 # Source1: po.tar.bz2 Patch1: http://lynx.isc.org/lynx2.8.5/patches/2.8.5rel.2.patch.gz @@ -37,7 +37,7 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-build %description -Lynx is an easy to use browser for HTML documents and other internet +Lynx is an easy-to-use browser for HTML documents and other Internet services like FTP, telnet, and news. Lynx is fast. It is purely text based and therefore makes it possible to use WWW resources on text terminals. @@ -79,12 +79,11 @@ make %install -rm -rf $RPM_BUILD_ROOT make DESTDIR=$RPM_BUILD_ROOT install make clean make EXTRAA="-DSHOW_COLOR=TRUE" mkdir -p $RPM_BUILD_ROOT -install -s lynx $RPM_BUILD_ROOT/usr/bin/lynx-color +install lynx $RPM_BUILD_ROOT/usr/bin/lynx-color %find_lang %name %files -f %name.lang @@ -96,6 +95,8 @@ %doc %{_mandir}/man1/lynx.1.gz %changelog -n lynx +* Wed May 17 2006 - schwab(a)suse.de +- Don't strip binaries. * Wed Jan 25 2006 - mls(a)suse.de - converted neededforbuild to BuildRequires * Wed Jan 11 2006 - kssingvo(a)suse.de ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun...

1 0

commit libzypp-zmd-backend
by root＠suse.de 17 May '06

17 May '06

Hello community, here is the log from the commit of package libzypp-zmd-backend checked in at Wed May 17 18:59:30 CEST 2006. -------- --- libzypp-zmd-backend/libzypp-zmd-backend.changes 2006-05-16 11:50:42.000000000 +0200 +++ libzypp-zmd-backend/libzypp-zmd-backend.changes 2006-05-17 10:07:46.000000000 +0200 @@ -1,0 +2,6 @@ +Wed May 17 09:52:47 CEST 2006 - kkaempf(a)suse.de + +- adapt to and require libzypp >= 1.0.0 +- rev 3391 + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libzypp-zmd-backend.spec ++++++ --- /var/tmp/diff_new_pack.hcVzNj/_old 2006-05-17 18:58:35.000000000 +0200 +++ /var/tmp/diff_new_pack.hcVzNj/_new 2006-05-17 18:58:35.000000000 +0200 @@ -16,13 +16,13 @@ Group: System/Management BuildRoot: %{_tmppath}/%{name}-%{version}-build Autoreqprov: on -Requires: libzypp +Requires: libzypp >= 1.0.0 Provides: zmd-backend Provides: zmd-librc-backend Obsoletes: zmd-librc-backend Summary: ZMD backend for Package, Patch, Pattern, and Product Management Version: 7.1.1.0 -Release: 43 +Release: 44 Source: zmd-backend-%{version}.tar.bz2 Prefix: /usr @@ -68,6 +68,9 @@ /etc/logrotate.d/zmd-backend %changelog -n libzypp-zmd-backend +* Wed May 17 2006 - kkaempf(a)suse.de +- adapt to and require libzypp >= 1.0.0 +- rev 3391 * Tue May 16 2006 - kkaempf(a)suse.de - fix large file support detection. - treat '@local' as zmd owned source (#170246) ++++++ zmd-backend-7.1.1.0.tar.bz2 ++++++ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/zmd-backend-7.1.1.0/src/dbsource/DbAccess.cc new/zmd-backend-7.1.1.0/src/dbsource/DbAccess.cc --- old/zmd-backend-7.1.1.0/src/dbsource/DbAccess.cc 2006-05-16 11:17:10.000000000 +0200 +++ new/zmd-backend-7.1.1.0/src/dbsource/DbAccess.cc 2006-05-17 10:03:18.000000000 +0200 @@ -637,7 +637,7 @@ sqlite3_bind_text( handle, 7, NULL, -1, SQLITE_STATIC ); // signature_filename sqlite3_bind_int( handle, 8, pkg->size() ); sqlite3_bind_int( handle, 9, pkg->installOnly() ? 1 : 0 ); - sqlite3_bind_int( handle, 10, pkg->mediaId() ); + sqlite3_bind_int( handle, 10, pkg->sourceMediaNr() ); rc = sqlite3_step( handle); sqlite3_reset( handle); diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/zmd-backend-7.1.1.0/src/dbsource/DbPackageImpl.cc new/zmd-backend-7.1.1.0/src/dbsource/DbPackageImpl.cc --- old/zmd-backend-7.1.1.0/src/dbsource/DbPackageImpl.cc 2006-05-12 12:13:25.000000000 +0200 +++ new/zmd-backend-7.1.1.0/src/dbsource/DbPackageImpl.cc 2006-05-17 10:03:18.000000000 +0200 @@ -116,7 +116,7 @@ bool DbPackageImpl::installOnly() const { return _install_only; } -unsigned DbPackageImpl::mediaId() const +unsigned DbPackageImpl::sourceMediaNr() const { return _media_nr; } Vendor DbPackageImpl::vendor() const diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/zmd-backend-7.1.1.0/src/dbsource/DbPackageImpl.h new/zmd-backend-7.1.1.0/src/dbsource/DbPackageImpl.h --- old/zmd-backend-7.1.1.0/src/dbsource/DbPackageImpl.h 2006-05-12 12:13:25.000000000 +0200 +++ new/zmd-backend-7.1.1.0/src/dbsource/DbPackageImpl.h 2006-05-17 10:03:18.000000000 +0200 @@ -53,7 +53,7 @@ /** */ virtual ZmdId zmdid() const; /** */ - virtual unsigned mediaId() const; + virtual unsigned sourceMediaNr() const; virtual Vendor vendor() const; ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun...

1 0

commit kdepim3
by root＠suse.de 17 May '06

17 May '06

Hello community, here is the log from the commit of package kdepim3 checked in at Wed May 17 18:59:26 CEST 2006. -------- --- KDE/kdepim3/kdepim3.changes 2006-05-16 21:20:02.000000000 +0200 +++ kdepim3/kdepim3.changes 2006-05-17 10:52:03.000000000 +0200 @@ -1,0 +2,5 @@ +Wed May 17 10:51:08 CEST 2006 - wstephenson(a)suse.de + +- Fix #163295 - Crash in KOrganizer when viewing user settings + +------------------------------------------------------------------- New: ---- 3_5_BRANCH-r541753.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kdepim3.spec ++++++ --- /var/tmp/diff_new_pack.s7lMN3/_old 2006-05-17 18:58:11.000000000 +0200 +++ /var/tmp/diff_new_pack.s7lMN3/_new 2006-05-17 18:58:11.000000000 +0200 @@ -16,7 +16,7 @@ Group: System/GUI/KDE Summary: Personal Information Manager Software for KDE Version: 3.5.1 -Release: 41 +Release: 42 URL: http://www.kde.org/ Requires: kdelibs3 >= %( echo `rpm -q --queryformat '%{VERSION}' kdelibs3` ) Requires: kdebase3 >= %( echo `rpm -q --queryformat '%{VERSION}' kdelibs3` ) @@ -51,6 +51,7 @@ Patch29: gw701_schemas.diff Patch30: gw701_resource.diff Patch31: 3_5_BRANCH-r541603.patch +Patch32: 3_5_BRANCH-r541753.patch Provides: cryptplug Obsoletes: cryptplug Provides: kdepim @@ -209,6 +210,7 @@ %patch29 %patch30 %patch31 +%patch32 . /etc/opt/kde3/common_options update_admin @@ -713,6 +715,8 @@ /opt/kde3/%_lib/kde3/plugins/designer/kpartsdesignerplugin.* %changelog -n kdepim3 +* Wed May 17 2006 - wstephenson(a)suse.de +- Fix #163295 - Crash in KOrganizer when viewing user settings * Tue May 16 2006 - wstephenson(a)suse.de - Fix #159533 - Distribution lists in KMail didn't work when the members are not already in the address book. ++++++ 3_5_BRANCH-r541753.patch ++++++ Index: kresources/groupwise/kcal_resourcegroupwiseconfig.cpp =================================================================== --- kresources/groupwise/kcal_resourcegroupwiseconfig.cpp (revision 541752) +++ kresources/groupwise/kcal_resourcegroupwiseconfig.cpp (revision 541753) @@ -72,7 +72,8 @@ mSaveConfig = new KCal::ResourceCachedSaveConfig( this ); mainLayout->addMultiCellWidget( mSaveConfig, 6, 6, 0, 1 ); - connect( settingsButton, SIGNAL( clicked() ), SLOT( slotViewUserSettings() ) ); + settingsButton->hide(); + // connect( settingsButton, SIGNAL( clicked() ), SLOT( slotViewUserSettings() ) ); } ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun...

1 0