April 2007 - openSUSE Commits - openSUSE Mailing Lists

commit cmake
by root＠Hilbert.suse.de 27 Apr '07

27 Apr '07

Hello community, here is the log from the commit of package cmake checked in at Fri Apr 27 16:43:44 CEST 2007. -------- --- cmake/cmake.changes 2007-03-29 11:50:29.000000000 +0200 +++ /mounts/work_src_done/STABLE/cmake/cmake.changes 2007-04-27 15:43:13.000000000 +0200 @@ -1,0 +2,5 @@ +Fri Apr 27 15:43:07 CEST 2007 - dmueller(a)suse.de + +- expat -> libexpat-devel + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ cmake.spec ++++++ --- /var/tmp/diff_new_pack.o18639/_old 2007-04-27 16:43:41.000000000 +0200 +++ /var/tmp/diff_new_pack.o18639/_new 2007-04-27 16:43:41.000000000 +0200 @@ -12,12 +12,17 @@ Name: cmake Version: 2.4.6 -Release: 8 +Release: 12 # License: Other License(s), see package Group: Development/Tools/Building # BuildRoot: %{_tmppath}/%{name}-%{version}-build +%if %suse_version > 1020 +BuildRequires: libexpat-devel +%else +BuildRequires: expat +%endif BuildRequires: curl-devel expat gcc-c++ libstdc++-devel ncurses-devel # URL: http://www.cmake.org/ @@ -69,6 +74,8 @@ /usr/share/man/man1/ctest.1.gz %changelog +* Fri Apr 27 2007 - dmueller(a)suse.de +- expat -> libexpat-devel * Thu Mar 29 2007 - dmueller(a)suse.de - add ncurses-devel buildrequires * Thu Jan 11 2007 - dmueller(a)suse.de ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit desktop-file-utils
by root＠Hilbert.suse.de 27 Apr '07

27 Apr '07

Hello community, here is the log from the commit of package desktop-file-utils checked in at Fri Apr 27 16:43:41 CEST 2007. -------- --- desktop-file-utils/desktop-file-utils.changes 2007-04-19 12:04:16.000000000 +0200 +++ /mounts/work_src_done/STABLE/desktop-file-utils/desktop-file-utils.changes 2007-04-27 15:58:17.000000000 +0200 @@ -1,0 +2,5 @@ +Fri Apr 27 15:56:11 CEST 2007 - sbrabec(a)suse.cz + +- Fixed invalid error for missing "Encoding" (Freedesktop#10093). + +------------------------------------------------------------------- New: ---- desktop-file-utils-0.11-encoding.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ desktop-file-utils.spec ++++++ --- /var/tmp/diff_new_pack.L15254/_old 2007-04-27 16:43:17.000000000 +0200 +++ /var/tmp/diff_new_pack.L15254/_new 2007-04-27 16:43:17.000000000 +0200 @@ -16,9 +16,10 @@ Group: Development/Tools/Other Autoreqprov: on Version: 0.12 -Release: 8 +Release: 11 Source: %{name}-%{version}.tar.bz2 Source1: SuSEconfig.desktop-file-utils +Patch: desktop-file-utils-0.11-encoding.patch PreReq: /bin/rm /bin/rmdir Requires: /etc/profile.d/xdg-enviroment.sh URL: http://www.freedesktop.org/wiki/Software_2fdesktop_2dfile_2dutils @@ -41,6 +42,7 @@ %prep %setup +%patch -p1 %build %configure\ @@ -90,6 +92,8 @@ %ghost /opt/kde3/share/applications/mimeinfo.cache %changelog +* Fri Apr 27 2007 - sbrabec(a)suse.cz +- Fixed invalid error for missing "Encoding" (Freedesktop#10093). * Thu Apr 19 2007 - sbrabec(a)suse.cz - Correctly initialize XDG_DATA_DIRS in SuSEconfig (#240603). * Fri Feb 23 2007 - sbrabec(a)suse.cz ++++++ desktop-file-utils-0.11-encoding.patch ++++++ https://bugs.freedesktop.org/show_bug.cgi?id=10093 ================================================================================ --- desktop-file-utils-0.11/src/validate.c.encoding 2006-07-31 16:34:44.000000000 +0200 +++ desktop-file-utils-0.11/src/validate.c 2006-07-31 16:35:12.000000000 +0200 @@ -719,10 +719,6 @@ strcmp (val, "Legacy-Mixed") != 0) print_fatal (filename, "unknown Encoding type \"%s\", should be one of \"UTF-8\", \"Legacy-Mixed\"\n", val); } - else - { - print_fatal (filename, "required key \"Encoding\" not found\n"); - } if (!gnome_desktop_file_get_raw (df, section, "Name", ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit ekiga
by root＠Hilbert.suse.de 27 Apr '07

27 Apr '07

Hello community, here is the log from the commit of package ekiga checked in at Fri Apr 27 16:43:40 CEST 2007. -------- --- ekiga/ekiga.changes 2007-04-24 17:20:23.000000000 +0200 +++ /mounts/work_src_done/STABLE/ekiga/ekiga.changes 2007-04-27 12:32:12.000000000 +0200 @@ -1,0 +2,5 @@ +Fri Apr 27 12:32:12 CEST 2007 - sbrabec(a)suse.cz + +- Do not call meinproc (#227624). + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ ekiga.spec ++++++ --- /var/tmp/diff_new_pack.A17623/_old 2007-04-27 16:43:25.000000000 +0200 +++ /var/tmp/diff_new_pack.A17623/_new 2007-04-27 16:43:25.000000000 +0200 @@ -11,12 +11,11 @@ # norootforbuild Name: ekiga -BuildRequires: SDL-devel avahi-devel avahi-glib db-devel docbook_4 esound-devel evolution-data-server-devel gcc-c++ gnome-common gnome-doc-utils-devel intltool kdelibs3-doc libavc1394-devel libdc1394-devel libdv libgnomeui-devel mDNSResponder-devel mozilla-nss-devel opal-devel openldap2 perl-XML-Parser pwlib-devel scrollkeeper speex-devel update-desktop-files +BuildRequires: SDL-devel avahi-devel avahi-glib db-devel docbook_4 esound-devel evolution-data-server-devel gcc-c++ gnome-common gnome-doc-utils-devel intltool libavc1394-devel libdc1394-devel libdv libgnomeui-devel mDNSResponder-devel mozilla-nss-devel opal-devel openldap2 perl-XML-Parser pwlib-devel scrollkeeper speex-devel update-desktop-files License: GNU General Public License (GPL) Group: Productivity/Telephony/H323/Clients -Autoreqprov: on Version: 2.0.9 -Release: 1 +Release: 4 Summary: A Gnome based SIP/H323 teleconferencing application Source: %{name}-%{version}.tar.bz2 Patch: %{name}-%{version}.diff @@ -25,7 +24,6 @@ PreReq: filesystem /usr/bin/touch gconf2 Provides: gnomemeeting Obsoletes: gnomemeeting -Autoreqprov: on %gconf_schemas_prereq @@ -62,12 +60,7 @@ make %{?jobs:-j %jobs} %install -make install DESTDIR=$RPM_BUILD_ROOT -for xml in $RPM_BUILD_ROOT%{_prefix}/share/gnome/help/*/*/*.xml; do - if echo $xml | egrep 'share/gnome/help/([^/]*)/[^/]*/\1\.xml$' > /dev/null; then - meinproc --cache `echo $xml | sed 's/xml$/cache.bz2/'` $xml || : - fi -done +%makeinstall %find_gconf_schemas %find_lang %{name} cat %{name}.schemas_list %{name}.lang >%{name}.lst @@ -100,6 +93,8 @@ /usr/share/dbus-1/services/*.service %changelog +* Fri Apr 27 2007 - sbrabec(a)suse.cz +- Do not call meinproc (#227624). * Tue Apr 24 2007 - maw(a)suse.de - Update to version 2.0.9 - Requires recent versions of opal and pwlib ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit expat
by root＠Hilbert.suse.de 27 Apr '07

27 Apr '07

Hello community, here is the log from the commit of package expat checked in at Fri Apr 27 16:43:18 CEST 2007. -------- --- expat/expat.changes 2006-10-19 12:37:12.000000000 +0200 +++ /mounts/work_src_done/STABLE/expat/expat.changes 2007-04-17 18:48:13.311666000 +0200 @@ -1,0 +2,5 @@ +Tue Apr 17 18:49:10 CEST 2007 - prusnak(a)suse.cz + +- split libexpat1 and libexpat-devel subpackages [#260214] + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ expat.spec ++++++ --- /var/tmp/diff_new_pack.W12742/_old 2007-04-27 16:42:57.000000000 +0200 +++ /var/tmp/diff_new_pack.W12742/_new 2007-04-27 16:42:57.000000000 +0200 @@ -1,7 +1,7 @@ # # spec file for package expat (Version 2.0.0) # -# Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine # package are under the same license as the package itself. # @@ -12,7 +12,7 @@ Name: expat Version: 2.0.0 -Release: 22 +Release: 47 Group: Development/Libraries/C and C++ License: MOZILLA PUBLIC LICENSE (MPL/NPL) URL: http://expat.sourceforge.net/ @@ -51,19 +51,79 @@ -------- James Clark <jjc(a)jclark.com> +%package -n libexpat1 +Summary: XML Parser Toolkit +Group: Development/Libraries/C and C++ + +%description -n libexpat1 +Expat is an XML 1.0 parser written in C. It aims to be fully +conformant. It is currently not a validating XML processor. The current +production version of expat can be downloaded from +ftp://ftp.jclark.com/pub/xml/expat.zip. The directory xmltok contains a +low-level library for tokenizing XML. The interface is documented in +xmltok/xmltok.h. The directory xmlparse contains an XML parser library +that is built on top of the xmltok library. The interface is documented +in xmlparse/xmlparse.h. The directory sample contains a simple example +program using this interface. The directory sample/build.bat is a batch +file to build the example using Visual C++. The directory xmlwf +contains the xmlwf application, which uses the xmlparse library. The +arguments to xmlwf are one or more files to check for well-formedness. +An option -d dir can be specified. For each well-formed input file, the +corresponding canonical XML is written to dir/f, where f is the +filename (without any path) of the input file. A -x option causes +references to external general entities to be processed. A -s option +makes documents that are not stand-alone cause an error (a document is +considered stand-alone if it is intrinsically stand-alone because it +has no external subset and no references to parameter entities in the +internal subset or it is declared as stand-alone in the XML +declaration). + + + +Authors: +-------- + James Clark <jjc(a)jclark.com> + +%package -n libexpat-devel +Summary: XML Parser Toolkit +Group: Development/Libraries/C and C++ +Requires: libexpat1 = %{version} + +%description -n libexpat-devel +Expat is an XML 1.0 parser written in C. It aims to be fully +conformant. It is currently not a validating XML processor. The current +production version of expat can be downloaded from +ftp://ftp.jclark.com/pub/xml/expat.zip. The directory xmltok contains a +low-level library for tokenizing XML. The interface is documented in +xmltok/xmltok.h. The directory xmlparse contains an XML parser library +that is built on top of the xmltok library. The interface is documented +in xmlparse/xmlparse.h. The directory sample contains a simple example +program using this interface. The directory sample/build.bat is a batch +file to build the example using Visual C++. The directory xmlwf +contains the xmlwf application, which uses the xmlparse library. The +arguments to xmlwf are one or more files to check for well-formedness. +An option -d dir can be specified. For each well-formed input file, the +corresponding canonical XML is written to dir/f, where f is the +filename (without any path) of the input file. A -x option causes +references to external general entities to be processed. A -s option +makes documents that are not stand-alone cause an error (a document is +considered stand-alone if it is intrinsically stand-alone because it +has no external subset and no references to parameter entities in the +internal subset or it is declared as stand-alone in the XML +declaration). + + + +Authors: +-------- + James Clark <jjc(a)jclark.com> + %prep %setup -q cp %{S:1} . %build -CFLAGS="$RPM_OPT_FLAGS" \ - ./configure \ - --prefix=%{_prefix} \ - --libdir=%{_libdir} \ - --mandir=%{_mandir} \ - --infodir=%{_infodir} \ - --sysconfdir=%{_sysconfdir} \ - --target=%{_target_cpu}-suse-linux-gnu +%configure make %install @@ -76,13 +136,24 @@ %files %defattr(-, root, root) -%doc COPYING Changes README examples expatfaq.html doc/* +%doc COPYING Changes README examples expatfaq.html +%doc doc/expat.png doc/reference.html doc/style.css doc/valid-xhtml10.png %doc %{_mandir}/man?/* -%{_bindir}/* -%{_libdir}/lib* +%{_bindir}/xmlwf + +%files -n libexpat1 +%defattr(-, root, root) +%{_libdir}/libexpat.so.* + +%files -n libexpat-devel +%defattr(-, root, root) %{_includedir}/* +%{_libdir}/libexpat.a +%{_libdir}/libexpat.so -%changelog -n expat +%changelog +* Tue Apr 17 2007 - prusnak(a)suse.cz +- split libexpat1 and libexpat-devel subpackages [#260214] * Thu Oct 19 2006 - dmueller(a)suse.de - strip .la file * Wed Jan 25 2006 - mls(a)suse.de ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit ddiwrapper
by root＠Hilbert.suse.de 27 Apr '07

27 Apr '07

Hello community, here is the log from the commit of package ddiwrapper checked in at Fri Apr 27 16:43:16 CEST 2007. -------- --- arch/i386/ddiwrapper/ddiwrapper.changes 2007-03-22 11:40:12.000000000 +0100 +++ /mounts/work_src_done/STABLE/ddiwrapper/ddiwrapper.changes 2007-04-27 14:48:38.000000000 +0200 @@ -1,0 +2,6 @@ +Fri Apr 27 14:47:14 CEST 2007 - uli(a)suse.de + +- does not work with recent WINEs any more; added custom + minimal WINE build + +------------------------------------------------------------------- New: ---- ddiwrapper-winepath.patch README.SuSE stdole32.tlb wine-20050524.diff wine-20050524.tar.bz2 wine-alsa.patch wine-a_ptr.patch wine-CLK_TCK.patch wine-HZ.patch wine-winebuild_off_by_one.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ ddiwrapper.spec ++++++ --- /var/tmp/diff_new_pack.Ow8720/_old 2007-04-27 16:41:43.000000000 +0200 +++ /var/tmp/diff_new_pack.Ow8720/_new 2007-04-27 16:41:43.000000000 +0200 @@ -8,19 +8,31 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # +# needsrootforbuild Name: ddiwrapper -BuildRequires: e2fsprogs-devel wine wine-devel +BuildRequires: bison e2fsprogs-devel flex joe valgrind xorg-x11-devel License: GNU General Public License (GPL), Public Domain, Freeware Group: Hardware/Printing Autoreqprov: on Version: 0.2 -Release: 60 +Release: 67 Summary: Support for Windows Printer Drivers under Linux Source: %name-%version.tar.gz -Patch: ddiwrapper-newwine.patch +Source1: wine-20050524.tar.bz2 +Source3: README.SuSE +Source4: stdole32.tlb +Patch1: wine-20050524.diff +Patch2: wine-CLK_TCK.patch +Patch3: wine-winebuild_off_by_one.patch +Patch4: wine-alsa.patch +Patch5: wine-a_ptr.patch +Patch6: wine-HZ.patch +# not used ATM, needed for more recent WINEs +Patch42: ddiwrapper-newwine.patch +Patch: ddiwrapper-winepath.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build -Requires: wine cabextract recode unzip lha psutils +Requires: cabextract recode unzip lha psutils %description ddiwrapper is able to load Windows 2000 or XP printer drivers (limited @@ -39,11 +51,36 @@ Ulrich Hecht <uli(a)suse.de> %prep -%setup -n %name -%patch0 -p1 +%setup -n %name -a 1 +%patch0 +cd wine-* +%patch1 -p1 +%patch2 -p1 +%patch3 -p1 +%patch4 +%patch5 -p1 +%patch6 -p1 +mv LICENSE LICENSE.wine +sed s,yystr,xxyystr,g <tools/wrc/parser.l >p.l && mv p.l tools/wrc/parser.l +cp %SOURCE3 . %build -make CFLAGS="$RPM_OPT_FLAGS" +cd wine-* +rm -f ./config.cache +autoconf +CFLAGS="${RPM_OPT_FLAGS} -U_FORTIFY_SOURCE -fno-stack-protector" \ +ac_cv_lib_freetype_FT_Init_FreeType=no \ +./configure --prefix=%_libdir/ddiwrapper/wine +make %{?jobs:-j%jobs} depend +make %{?jobs:-j%jobs} all +make install +cd .. +LD_LIBRARY_PATH=%_libdir/ddiwrapper/wine/lib make CFLAGS="$RPM_OPT_FLAGS" \ +CC=%_libdir/ddiwrapper/wine/bin/winegcc \ +CXX=%_libdir/ddiwrapper/wine/bin/wineg++ \ +RC=%_libdir/ddiwrapper/wine/bin/wrc \ +"INCLUDE_PATH=-I. -I./include -I../include -I%_libdir/ddiwrapper/wine/include/wine" \ +WINEBUILD=%_libdir/ddiwrapper/wine/bin/winebuild %install install -d -m 755 $RPM_BUILD_ROOT/usr/bin @@ -51,10 +88,27 @@ make install DESTDIR=$RPM_BUILD_ROOT install -d -m 755 $RPM_BUILD_ROOT/usr/share/cups/model gzip <doc/ddiwrapper.ppd >$RPM_BUILD_ROOT/usr/share/cups/model/ddiwrapper.ppd.gz +cd wine-* +make install prefix=$RPM_BUILD_ROOT%_libdir/ddiwrapper/wine +# ddiwrapper only needs a small subset of wine +find $RPM_BUILD_ROOT%_libdir/ddiwrapper/wine -type f -or -type l|while read file +do + if ! echo "$file" | egrep "(bin/wine-preloader|bin/wine-.thread|bin/wine$|bin/wineserver|libwine_unicode.so.1|libwine.so.1|ntdll.dll.so|advapi32.dll.so|kernel32.dll.so|msvcrt.dll.so)" + then + rm "$file" + fi +done +find $RPM_BUILD_ROOT%_libdir/ddiwrapper/wine -type d|while read dir +do + rmdir "$dir" || true +done + +%clean +rm -fr $RPM_BUILD_ROOT %files %defattr(-,root,root) -%doc doc/* LICENSE COPYING README Changelog +%doc doc/* LICENSE COPYING README Changelog wine-*/LICENSE.wine /usr/bin/ddiwrapper* /usr/bin/msexpand /usr/bin/ps2ddi @@ -67,8 +121,13 @@ %dir /usr/share/cups %dir /usr/share/cups/model /usr/share/cups/model/ddiwrapper.ppd.gz +%dir %_libdir/ddiwrapper +%_libdir/ddiwrapper/wine %changelog +* Fri Apr 27 2007 - uli(a)suse.de +- does not work with recent WINEs any more; added custom + minimal WINE build * Thu Mar 22 2007 - ssommer(a)suse.de - remove some type definitions now present in WINE itself * Thu Feb 08 2007 - ro(a)suse.de ++++++ ddiwrapper-winepath.patch ++++++ --- tools/ddiwrapper +++ tools/ddiwrapper @@ -11,6 +11,7 @@ /usr/share/ddiwrapper/createwineconf # run the ddiwrapper binary +LD_LIBRARY_PATH=/usr/lib/ddiwrapper/wine/lib \ WINEDLLPATH=/usr/share/ddiwrapper/dlls \ WINEPREFIX=$HOME/.ddiwrapper \ -wine /usr/bin/ddiwrapper.exe.so "$@" +/usr/lib/ddiwrapper/wine/bin/wine /usr/bin/ddiwrapper.exe.so "$@" ++++++ wine-20050524.diff ++++++ diff -ruN -x CVS wine-20050524/dlls/gdi/freetype.c marcus-wine-20050524/dlls/gdi/freetype.c --- wine-20050524/dlls/gdi/freetype.c 2005-05-25 08:33:24.741276519 +0200 +++ marcus-wine-20050524/dlls/gdi/freetype.c 2005-05-25 08:48:28.907849415 +0200 @@ -420,9 +420,17 @@ #endif int i, bitmap_num; + /* ethiopian font which says it is regular, but it isn't. */ + if (strstr(file,"GohaTibebZemen.ttf")) + return FALSE; + /* koffice-wordprocessing brings esstix* which appear as symbol/greek fonts */ + if (strstr(file,"esstix")) + return FALSE; + do { char *family_name = fake_family; + TRACE("Loading font file %s index %ld\n", debugstr_a(file), face_index); if((err = pFT_New_Face(library, file, face_index, &ft_face)) != 0) { WARN("Unable to load font file %s err = %x\n", debugstr_a(file), err); @@ -812,7 +820,8 @@ dir = opendir(dirname); if(!dir) { - ERR("Can't open directory %s\n", debugstr_a(dirname)); + /* might just be a long list of possible directories, so not ERR */ + WARN("Can't open directory %s\n", debugstr_a(dirname)); return FALSE; } while((dent = readdir(dir)) != NULL) { Files wine-20050524/dlls/winsock/.socket.c.swp and marcus-wine-20050524/dlls/winsock/.socket.c.swp differ diff -ruN -x CVS wine-20050524/documentation/samples/config marcus-wine-20050524/documentation/samples/config --- wine-20050524/documentation/samples/config 2005-05-25 08:33:40.628492405 +0200 +++ marcus-wine-20050524/documentation/samples/config 2005-05-25 08:48:42.588452144 +0200 @@ -108,10 +108,9 @@ ; the TrueType font dirs you want to make accessible to wine [FontDirs] -;"dir1" = "/usr/X11R6/lib/X11/fonts/TrueType" -;"dir2" = "/usr/share/fonts/truetype" -;"dir3" = "/usr/X11R6/lib/X11/fonts/TT" -;"dir4" = "/usr/share/fonts/TT" +"dir1" = "/usr/X11R6/lib/X11/fonts/truetype" +"dir2" = "/usr/X11R6/lib/X11/fonts/TrueType" +"dir3" = "/usr/X11R6/lib/X11/fonts/TT" [ppdev] ;; key: io-base of the emulated port @@ -186,6 +185,9 @@ ;; HKEY_LOCAL_MACHINE\System\CurrentControlSet\Control\ComputerName\ComputerName, too. ;"UseDnsComputerName" = "N" +[ppd] +"generic" = "/usr/share/wine/generic.ppd" + ;; sample AppDefaults entries ; 3 InstallShield versions who like to put their full screen window in front, diff -ruN -x CVS wine-20050524/libs/wine/mmap.c marcus-wine-20050524/libs/wine/mmap.c --- wine-20050524/libs/wine/mmap.c 2004-12-17 09:23:36.000000000 +0100 +++ marcus-wine-20050524/libs/wine/mmap.c 2004-12-17 09:24:05.000000000 +0100 @@ -276,6 +276,7 @@ } } +#if 0 if (stack_ptr >= user_space_limit) { char *base = stack_ptr - ((unsigned int)stack_ptr & granularity_mask) - (granularity_mask + 1); @@ -289,6 +290,7 @@ reserve_area( base, 0 ); } else reserve_area( user_space_limit, 0 ); +#endif #endif /* __i386__ */ /* reserve the DOS area if not already done */ Files wine-20050524/loader/wine-preloader and marcus-wine-20050524/loader/wine-preloader differ diff -ruN -x CVS wine-20050524/programs/Makefile.in marcus-wine-20050524/programs/Makefile.in --- wine-20050524/programs/Makefile.in 2005-05-25 08:33:43.060066292 +0200 +++ marcus-wine-20050524/programs/Makefile.in 2005-05-25 08:48:44.724077916 +0200 @@ -75,6 +75,7 @@ progman \ regedit \ regsvr32 \ + rundll32 \ uninstaller \ wcmd \ wineboot \ @@ -83,8 +84,10 @@ wineconsole \ winedbg \ winefile \ + winemenubuilder \ winemine \ winepath \ + winevdm \ winhelp # Symlinks to apps that we want to run from inside the source tree diff -ruN -x CVS wine-20050524/server/registry.c marcus-wine-20050524/server/registry.c --- wine-20050524/server/registry.c 2005-05-25 08:33:46.373485643 +0200 +++ marcus-wine-20050524/server/registry.c 2005-05-25 08:48:47.269631857 +0200 @@ -1590,7 +1590,7 @@ for (;;) { sprintf( p, "reg%lx%04x.tmp", (long) getpid(), count++ ); - if ((fd = open( tmp, O_CREAT | O_EXCL | O_WRONLY, 0666 )) != -1) break; + if ((fd = open( tmp, O_CREAT | O_EXCL | O_WRONLY, 0600 )) != -1) break; if (errno != EEXIST) goto done; close( fd ); } diff -ruN -x CVS wine-20050524/tools/wineprefixcreate.in marcus-wine-20050524/tools/wineprefixcreate.in --- wine-20050524/tools/wineprefixcreate.in 2005-05-25 08:33:47.201340569 +0200 +++ marcus-wine-20050524/tools/wineprefixcreate.in 2005-05-25 08:48:47.646565807 +0200 @@ -112,6 +112,10 @@ exit 1 fi +if [ ! -f "$WINEPREFIX/config" ]; then + cp $dlldir/config "$WINEPREFIX/config" +fi + WINEPREFIX=`cd "$WINEPREFIX" && pwd` # Create the drive symlinks @@ -122,6 +126,32 @@ [ -d "$WINEPREFIX/drive_c" ] || mkdir "$WINEPREFIX/drive_c" ln -s "../drive_c" "$WINEPREFIX/dosdevices/c:" ln -s "/" "$WINEPREFIX/dosdevices/z:" + ln -s "/tmp" "$WINEPREFIX/dosdevices/x:" + if [ -d "$HOME" ]; then + ln -s "$HOME" "$WINEPREFIX/dosdevices/y:" + if [ ! -f "$HOME/.windows-label" ]; then + echo "HOME" > "$HOME/.windows-label" + fi + fi + # autodetect CD-ROMS on SUSE. + drive=D + for i in /media/* ; do + bn=`basename $i` + if [ "$i" = "/media/floppy" ]; then + ln -s /media/floppy "$WINEPREFIX/dosdevices/a:" + ln -s /dev/fd0 "$WINEPREFIX/dosdevices/a::" + fi + if echo $bn| grep -E -v "^(sd|usb-storage|floppy)" >/dev/null; then + ln -s /media/$bn "$WINEPREFIX/dosdevices/"`echo $drive|tr "[A-Z]" "[a-z]"`: + ln -s /dev/$bn "$WINEPREFIX/dosdevices/"`echo $drive|tr "[A-Z]" "[a-z]"`:: + drive=`echo $drive|tr "D-L" "E-M"` + fi + done + ln -s /dev/ttyS0 "$WINEPREFIX/dosdevices/com1" + ln -s /dev/ttyS1 "$WINEPREFIX/dosdevices/com2" + ln -s /dev/ttyS2 "$WINEPREFIX/dosdevices/com3" + ln -s /dev/ttyS3 "$WINEPREFIX/dosdevices/com4" + ln -s /dev/lp0 "$WINEPREFIX/dosdevices/lpt1" fi CROOT="$WINEPREFIX/dosdevices/c:" @@ -176,6 +206,10 @@ link_app winhelp "$CROOT/windows/winhlp32.exe" link_app winebrowser "$CROOT/windows/winebrowser.exe" +if [ -f $dlldir/stdole32.tlb ]; then + cp $dlldir/stdole32.tlb "$CROOT/windows/system" +fi + # Copy the .inf script and run it cp "$datadir/wine.inf" "$CROOT/windows/inf/wine.inf" ++++++ wine-alsa.patch ++++++ --- dlls/winmm/winealsa/alsa.h +++ dlls/winmm/winealsa/alsa.h @@ -18,7 +18,9 @@ #ifndef __WINE_CONFIG_H # error You must include config.h to use this header #endif - +#ifdef interface +#undef interface +#endif #ifdef HAVE_ALSA_ASOUNDLIB_H #include <alsa/asoundlib.h> #elif defined(HAVE_SYS_ASOUNDLIB_H) ++++++ wine-a_ptr.patch ++++++ --- wine-20050524/loader/preloader.c +++ wine-20050524/loader/preloader.c @@ -860,8 +860,8 @@ { for (i = 0; preload_info[i].size; i++) { - if ((char *)av->a_un.a_ptr >= (char *)preload_info[i].addr && - (char *)av->a_un.a_ptr < (char *)preload_info[i].addr + preload_info[i].size) + if ((char *)av->a_un.a_val >= (char *)preload_info[i].addr && + (char *)av->a_un.a_val < (char *)preload_info[i].addr + preload_info[i].size) return 1; } } ++++++ wine-CLK_TCK.patch ++++++ --- wine-20050628/dlls/kernel/time.c +++ wine-20050628/dlls/kernel/time.c @@ -18,6 +18,7 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ +# define CLK_TCK CLOCKS_PER_SEC #include "config.h" #include <string.h> --- wine-20050628/dlls/kernel/windebug.c +++ wine-20050628/dlls/kernel/windebug.c @@ -24,6 +24,7 @@ #include "windef.h" #include "winbase.h" #include "wine/debug.h" +#include <time.h> WINE_DEFAULT_DEBUG_CHANNEL(dll); ++++++ wine-HZ.patch ++++++ --- wine-20050524/dlls/ntdll/cdrom.c +++ wine-20050524/dlls/ntdll/cdrom.c @@ -1427,7 +1427,7 @@ cmd.buflen = pPacket->DataTransferLength; cmd.sense = &sense; cmd.quiet = 0; - cmd.timeout = pPacket->TimeOutValue*HZ; + cmd.timeout = pPacket->TimeOutValue*1000; switch (pPacket->DataIn) { @@ -1558,7 +1558,7 @@ cmd.buflen = pPacket->DataTransferLength; cmd.sense = &sense; cmd.quiet = 0; - cmd.timeout = pPacket->TimeOutValue*HZ; + cmd.timeout = pPacket->TimeOutValue*1000; switch (pPacket->DataIn) { ++++++ wine-winebuild_off_by_one.patch ++++++ --- wine-20050628/tools/winebuild/spec16.c +++ wine-20050628/tools/winebuild/spec16.c @@ -77,7 +77,7 @@ unsigned char *pstr, *buffer; unsigned char *bundle = NULL; - buffer = xmalloc( spec->limit * 5 ); /* we use at most 5 bytes per entry-point */ + buffer = xmalloc( spec->limit * 5 + 1); /* we use at most 5 bytes per entry-point */ pstr = buffer; for (i = 1; i <= spec->limit; i++) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit dasher
by root＠Hilbert.suse.de 27 Apr '07

27 Apr '07

Hello community, here is the log from the commit of package dasher checked in at Fri Apr 27 16:43:11 CEST 2007. -------- --- GNOME/dasher/dasher.changes 2007-04-11 18:57:19.000000000 +0200 +++ /mounts/work_src_done/STABLE/dasher/dasher.changes 2007-04-27 12:32:12.000000000 +0200 @@ -1,0 +2,5 @@ +Fri Apr 27 12:32:12 CEST 2007 - sbrabec(a)suse.cz + +- Do not call meinproc (#227624). + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ dasher.spec ++++++ --- /var/tmp/diff_new_pack.RW8105/_old 2007-04-27 16:41:29.000000000 +0200 +++ /var/tmp/diff_new_pack.RW8105/_new 2007-04-27 16:41:29.000000000 +0200 @@ -11,16 +11,15 @@ # norootforbuild Name: dasher -BuildRequires: at-spi-devel cairo-devel docbook_4 gcc-c++ gnome-doc-utils-devel gnome-icon-theme gnome-speech-devel kdelibs3-doc libglade2-devel libgnomeui-devel libstdc++ libwnck-devel perl-XML-Parser scrollkeeper update-desktop-files +BuildRequires: at-spi-devel cairo-devel docbook_4 gcc-c++ gnome-doc-utils-devel gnome-icon-theme gnome-speech-devel libglade2-devel libgnomeui-devel libstdc++ libwnck-devel perl-XML-Parser scrollkeeper update-desktop-files Version: 4.4.1 -Release: 1 +Release: 5 URL: http://www.inference.phy.cam.ac.uk/dasher/ Group: System/GUI/GNOME License: GNU General Public License (GPL) Summary: Zooming Predictive Text Entry System Source: ftp://ftp.gnome.org/pub/GNOME/sources/%{name}/4.2/%{name}-%{version}.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-build -Autoreqprov: on %gconf_schemas_prereq @@ -53,13 +52,10 @@ make %{?jobs:-j%jobs} %install -make DESTDIR=$RPM_BUILD_ROOT install +%makeinstall mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/gconf/schemas cp Data/dasher.schemas $RPM_BUILD_ROOT%{_sysconfdir}/gconf/schemas echo DocPath=dasher >> $RPM_BUILD_ROOT%{_datadir}/applications/dasher.desktop -for xml in $RPM_BUILD_ROOT%{_datadir}/gnome/help/dasher/*/dasher.xml; do - meinproc --cache `echo $xml | sed 's/xml$/cache.bz2/'` $xml || : -done %suse_update_desktop_file -G "Text Entry Tool" %name GNOME %find_lang %{name} %find_gconf_schemas @@ -86,6 +82,8 @@ %doc %{_mandir}/man?/*.* %changelog +* Fri Apr 27 2007 - sbrabec(a)suse.cz +- Do not call meinproc (#227624). * Wed Apr 11 2007 - maw(a)suse.de - Update to version 4.4.1 which as minor bugfixes and translation updates. ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit bug-buddy
by root＠Hilbert.suse.de 27 Apr '07

27 Apr '07

Hello community, here is the log from the commit of package bug-buddy checked in at Fri Apr 27 16:41:22 CEST 2007. -------- --- GNOME/bug-buddy/bug-buddy.changes 2007-04-12 19:32:04.000000000 +0200 +++ /mounts/work_src_done/STABLE/bug-buddy/bug-buddy.changes 2007-04-27 12:32:12.000000000 +0200 @@ -1,0 +2,5 @@ +Fri Apr 27 12:32:12 CEST 2007 - sbrabec(a)suse.cz + +- Do not call meinproc (#227624). + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ bug-buddy.spec ++++++ --- /var/tmp/diff_new_pack.aS7017/_old 2007-04-27 16:41:05.000000000 +0200 +++ /var/tmp/diff_new_pack.aS7017/_new 2007-04-27 16:41:05.000000000 +0200 @@ -11,11 +11,11 @@ # norootforbuild Name: bug-buddy -BuildRequires: evolution-data-server-devel gnome-common gnome-desktop-devel gnome-doc-utils-devel gnome-icon-theme gnome-menus-devel gnutls-devel intltool kdelibs3-doc libglade2-devel libgtop-devel libsoup-devel perl-XML-Parser scrollkeeper update-desktop-files +BuildRequires: evolution-data-server-devel gnome-common gnome-desktop-devel gnome-doc-utils-devel gnome-icon-theme gnome-menus-devel gnutls-devel intltool libglade2-devel libgtop-devel libsoup-devel perl-XML-Parser scrollkeeper update-desktop-files License: GNU General Public License (GPL) Group: System/GUI/GNOME Version: 2.18.1 -Release: 1 +Release: 5 Summary: The GNOME Desktop Bug Reporting Tool Source: ftp://ftp.gnome.org/pub/gnome/sources/bug-buddy/2.16/%{name}-%{version}.tar… Patch1: kde-menus.diff @@ -25,7 +25,6 @@ Requires: gdb Provides: bug-buddy2 Obsoletes: bug-buddy2 -Autoreqprov: on %gconf_schemas_prereq @@ -51,11 +50,8 @@ make %{?jobs:-j%jobs} %install -make install DESTDIR=$RPM_BUILD_ROOT +%makeinstall %suse_update_desktop_file -N "Bug Buddy" -G "Bug Report Tool" -r bug-buddy System Feedback GNOME -for xml in $RPM_BUILD_ROOT%{_datadir}/gnome/help/bug-buddy/*/bug-buddy.xml; do - meinproc --check --cache `echo $xml | sed 's/xml$/cache.bz2/'` $xml || : -done %find_lang %{name} %find_gconf_schemas cat %{name}.lang %{name}.schemas_list >%{name}.lst @@ -78,6 +74,8 @@ %{_datadir}/icons/hicolor/48x48/apps/bug-buddy.png %changelog +* Fri Apr 27 2007 - sbrabec(a)suse.cz +- Do not call meinproc (#227624). * Thu Apr 12 2007 - maw(a)suse.de - Update to version 2.18.1 - Corrected .desktop files ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit sqlite
by root＠Hilbert.suse.de 27 Apr '07

27 Apr '07

Hello community, here is the log from the commit of package sqlite checked in at Fri Apr 27 09:50:13 CEST 2007. -------- --- sqlite/sqlite.changes 2007-04-19 12:04:55.000000000 +0200 +++ sqlite/sqlite.changes 2007-04-27 09:38:57.000000000 +0200 @@ -1,0 +2,6 @@ +Fri Apr 27 09:38:04 CEST 2007 - adrian(a)suse.de + +- update to version 3.3.17 + * bug fix in forwards-compatibility logic of SQLite + +------------------------------------------------------------------- @@ -5 +11 @@ - * speed improvements where not enabled in .15 by accident + * speed improvements were not enabled in .15 by accident Old: ---- sqlite-3.3.16.tar.bz2 New: ---- sqlite-3.3.17.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ sqlite.spec ++++++ --- /var/tmp/diff_new_pack.vM2043/_old 2007-04-27 09:49:22.000000000 +0200 +++ /var/tmp/diff_new_pack.vM2043/_new 2007-04-27 09:49:22.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package sqlite (Version 3.3.16) +# spec file for package sqlite (Version 3.3.17) # # Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine @@ -19,7 +19,7 @@ Group: Productivity/Databases/Servers Summary: Embeddable SQL Database Engine URL: http://www.sqlite.org/ -Version: 3.3.16 +Version: 3.3.17 Release: 1 Source0: http://www.sqlite.org/%name-%version.tar.bz2 Source1: sqlite.desktop @@ -177,9 +177,12 @@ %_libdir/pkgconfig/sqlite3.pc %changelog +* Fri Apr 27 2007 - adrian(a)suse.de +- update to version 3.3.17 + * bug fix in forwards-compatibility logic of SQLite * Thu Apr 19 2007 - adrian(a)suse.de - update to version 3.3.16 - * speed improvements where not enabled in .15 by accident + * speed improvements were not enabled in .15 by accident * Mon Apr 16 2007 - adrian(a)suse.de - update to version 3.3.15 * speed improvements ++++++ sqlite-3.3.16.tar.bz2 -> sqlite-3.3.17.tar.bz2 ++++++ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/sqlite-3.3.16/ext/fts2/fts2.c new/sqlite-3.3.17/ext/fts2/fts2.c --- old/sqlite-3.3.16/ext/fts2/fts2.c 2007-04-12 23:24:09.000000000 +0200 +++ new/sqlite-3.3.17/ext/fts2/fts2.c 2007-04-21 18:36:56.000000000 +0200 @@ -1374,10 +1374,16 @@ dlwInit(&writer, DL_DOCIDS, pOut); while( !dlrAtEnd(&left) || !dlrAtEnd(&right) ){ - if( dlrAtEnd(&right) || dlrDocid(&left)<dlrDocid(&right) ){ + if( dlrAtEnd(&right) ){ + dlwAdd(&writer, dlrDocid(&left)); + dlrStep(&left); + }else if( dlrAtEnd(&left) ){ + dlwAdd(&writer, dlrDocid(&right)); + dlrStep(&right); + }else if( dlrDocid(&left)<dlrDocid(&right) ){ dlwAdd(&writer, dlrDocid(&left)); dlrStep(&left); - }else if( dlrAtEnd(&left) || dlrDocid(&right)<dlrDocid(&left) ){ + }else if( dlrDocid(&right)<dlrDocid(&left) ){ dlwAdd(&writer, dlrDocid(&right)); dlrStep(&right); }else{ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/sqlite-3.3.16/ext/fts2/fts2.h new/sqlite-3.3.17/ext/fts2/fts2.h --- old/sqlite-3.3.16/ext/fts2/fts2.h 2006-10-10 19:37:14.000000000 +0200 +++ new/sqlite-3.3.17/ext/fts2/fts2.h 2007-04-21 18:24:16.000000000 +0200 @@ -1,3 +1,7 @@ +/* +** This header file is used by programs that want to link against the +** FTS2 library. All it does is declare the sqlite3Fts2Init() interface. +*/ #include "sqlite3.h" #ifdef __cplusplus diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/sqlite-3.3.16/ext/fts2/fts2_porter.c new/sqlite-3.3.17/ext/fts2/fts2_porter.c --- old/sqlite-3.3.16/ext/fts2/fts2_porter.c 2007-03-16 19:30:55.000000000 +0100 +++ new/sqlite-3.3.17/ext/fts2/fts2_porter.c 2007-04-21 18:29:40.000000000 +0200 @@ -564,7 +564,7 @@ ** part of a token. In other words, delimiters all must have ** values of 0x7f or lower. */ -static const char isIdChar[] = { +static const char porterIdChar[] = { /* x0 x1 x2 x3 x4 x5 x6 x7 x8 x9 xA xB xC xD xE xF */ 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0, 0, 0, 0, 0, 0, /* 3x */ 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, /* 4x */ @@ -572,8 +572,7 @@ 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, /* 6x */ 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0, 0, 0, 0, 0, /* 7x */ }; -#define idChar(C) (((ch=C)&0x80)!=0 || (ch>0x2f && isIdChar[ch-0x30])) -#define isDelim(C) (((ch=C)&0x80)==0 && (ch<0x30 || !isIdChar[ch-0x30])) +#define isDelim(C) (((ch=C)&0x80)==0 && (ch<0x30 || !porterIdChar[ch-0x30])) /* ** Extract the next token from a tokenization cursor. The cursor must diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/sqlite-3.3.16/ext/fts2/fts2_tokenizer1.c new/sqlite-3.3.17/ext/fts2/fts2_tokenizer1.c --- old/sqlite-3.3.16/ext/fts2/fts2_tokenizer1.c 2007-03-16 19:30:55.000000000 +0100 +++ new/sqlite-3.3.17/ext/fts2/fts2_tokenizer1.c 2007-04-21 18:29:36.000000000 +0200 @@ -48,7 +48,7 @@ /* Forward declaration */ static const sqlite3_tokenizer_module simpleTokenizerModule; -static int isDelim(simple_tokenizer *t, unsigned char c){ +static int simpleDelim(simple_tokenizer *t, unsigned char c){ return c<0x80 && t->delim[c]; } @@ -164,13 +164,13 @@ int iStartOffset; /* Scan past delimiter characters */ - while( c->iOffset<c->nBytes && isDelim(t, p[c->iOffset]) ){ + while( c->iOffset<c->nBytes && simpleDelim(t, p[c->iOffset]) ){ c->iOffset++; } /* Count non-delimiter characters. */ iStartOffset = c->iOffset; - while( c->iOffset<c->nBytes && !isDelim(t, p[c->iOffset]) ){ + while( c->iOffset<c->nBytes && !simpleDelim(t, p[c->iOffset]) ){ c->iOffset++; } diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/sqlite-3.3.16/ext/fts2/mkfts2amal.tcl new/sqlite-3.3.17/ext/fts2/mkfts2amal.tcl --- old/sqlite-3.3.16/ext/fts2/mkfts2amal.tcl 1970-01-01 01:00:00.000000000 +0100 +++ new/sqlite-3.3.17/ext/fts2/mkfts2amal.tcl 2007-04-21 18:36:43.000000000 +0200 @@ -0,0 +1,114 @@ +#!/usr/bin/tclsh +# +# This script builds a single C code file holding all of FTS2 code. +# The name of the output file is fts2amal.c. To build this file, +# first do: +# +# make target_source +# +# The make target above moves all of the source code files into +# a subdirectory named "tsrc". (This script expects to find the files +# there and will not work if they are not found.) +# +# After the "tsrc" directory has been created and populated, run +# this script: +# +# tclsh mkfts2amal.tcl +# +# The amalgamated FTS2 code will be written into fts2amal.c +# + +# Open the output file and write a header comment at the beginning +# of the file. +# +set out [open fts2amal.c w] +set today [clock format [clock seconds] -format "%Y-%m-%d %H:%M:%S UTC" -gmt 1] +puts $out [subst \ +{/****************************************************************************** +** This file is an amalgamation of separate C source files from the SQLite +** Full Text Search extension 2 (fts2). By combining all the individual C +** code files into this single large file, the entire code can be compiled +** as a one translation unit. This allows many compilers to do optimizations +** that would not be possible if the files were compiled separately. It also +** makes the code easier to import into other projects. +** +** This amalgamation was generated on $today. +*/}] + +# These are the header files used by FTS2. The first time any of these +# files are seen in a #include statement in the C code, include the complete +# text of the file in-line. The file only needs to be included once. +# +foreach hdr { + fts2.h + fts2_hash.h + fts2_tokenizer.h + sqlite3.h + sqlite3ext.h +} { + set available_hdr($hdr) 1 +} + +# 78 stars used for comment formatting. +set s78 \ +{*****************************************************************************} + +# Insert a comment into the code +# +proc section_comment {text} { + global out s78 + set n [string length $text] + set nstar [expr {60 - $n}] + set stars [string range $s78 0 $nstar] + puts $out "/************** $text $stars/" +} + +# Read the source file named $filename and write it into the +# sqlite3.c output file. If any #include statements are seen, +# process them approprately. +# +proc copy_file {filename} { + global seen_hdr available_hdr out + set tail [file tail $filename] + section_comment "Begin file $tail" + set in [open $filename r] + while {![eof $in]} { + set line [gets $in] + if {[regexp {^#\s*include\s+["<]([^">]+)[">]} $line all hdr]} { + if {[info exists available_hdr($hdr)]} { + if {$available_hdr($hdr)} { + section_comment "Include $hdr in the middle of $tail" + copy_file tsrc/$hdr + section_comment "Continuing where we left off in $tail" + } + } elseif {![info exists seen_hdr($hdr)]} { + set seen_hdr($hdr) 1 + puts $out $line + } + } elseif {[regexp {^#ifdef __cplusplus} $line]} { + puts $out "#if 0" + } elseif {[regexp {^#line} $line]} { + # Skip #line directives. + } else { + puts $out $line + } + } + close $in + section_comment "End of $tail" +} + + +# Process the source files. Process files containing commonly +# used subroutines first in order to help the compiler find +# inlining opportunities. +# +foreach file { + fts2.c + fts2_hash.c + fts2_porter.c + fts2_tokenizer1.c +} { + copy_file tsrc/$file +} + +close $out diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/sqlite-3.3.16/src/btree.c new/sqlite-3.3.17/src/btree.c --- old/sqlite-3.3.16/src/btree.c 2007-04-13 05:12:32.000000000 +0200 +++ new/sqlite-3.3.17/src/btree.c 2007-04-24 19:35:59.000000000 +0200 @@ -9,7 +9,7 @@ ** May you share freely, never taking more than you give. ** ************************************************************************* -** $Id: btree.c,v 1.355 2007/04/13 02:14:30 drh Exp $ +** $Id: btree.c,v 1.358 2007/04/24 17:35:59 drh Exp $ ** ** This file implements a external (disk-based) database using BTrees. ** For a detailed discussion of BTrees, refer to @@ -1870,7 +1870,10 @@ if( memcmp(page1, zMagicHeader, 16)!=0 ){ goto page1_init_failed; } - if( page1[18]>1 || page1[19]>1 ){ + if( page1[18]>1 ){ + pBt->readOnly = 1; + } + if( page1[19]>1 ){ goto page1_init_failed; } pageSize = get2byte(&page1[16]); @@ -2068,11 +2071,15 @@ if( pBt->pPage1==0 ){ rc = lockBtree(pBt); } - + if( rc==SQLITE_OK && wrflag ){ - rc = sqlite3PagerBegin(pBt->pPage1->pDbPage, wrflag>1); - if( rc==SQLITE_OK ){ - rc = newDatabase(pBt); + if( pBt->readOnly ){ + rc = SQLITE_READONLY; + }else{ + rc = sqlite3PagerBegin(pBt->pPage1->pDbPage, wrflag>1); + if( rc==SQLITE_OK ){ + rc = newDatabase(pBt); + } } } @@ -2782,6 +2789,9 @@ if( rc!=SQLITE_OK ){ return rc; } + if( pBt->readOnly && wrFlag ){ + return SQLITE_READONLY; + } } pCur = sqliteMalloc( sizeof(*pCur) ); if( pCur==0 ){ @@ -3519,26 +3529,22 @@ int rc; MemPage *pPage; -#ifndef SQLITE_OMIT_SHARED_CACHE rc = restoreOrClearCursorPosition(pCur); if( rc!=SQLITE_OK ){ return rc; } -#endif assert( pRes!=0 ); pPage = pCur->pPage; if( CURSOR_INVALID==pCur->eState ){ *pRes = 1; return SQLITE_OK; } -#ifndef SQLITE_OMIT_SHARED_CACHE if( pCur->skip>0 ){ pCur->skip = 0; *pRes = 0; return SQLITE_OK; } pCur->skip = 0; -#endif assert( pPage->isInit ); assert( pCur->idx<pPage->nCell ); @@ -3589,24 +3595,20 @@ Pgno pgno; MemPage *pPage; -#ifndef SQLITE_OMIT_SHARED_CACHE rc = restoreOrClearCursorPosition(pCur); if( rc!=SQLITE_OK ){ return rc; } -#endif if( CURSOR_INVALID==pCur->eState ){ *pRes = 1; return SQLITE_OK; } -#ifndef SQLITE_OMIT_SHARED_CACHE if( pCur->skip<0 ){ pCur->skip = 0; *pRes = 0; return SQLITE_OK; } pCur->skip = 0; -#endif pPage = pCur->pPage; assert( pPage->isInit ); diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/sqlite-3.3.16/src/expr.c new/sqlite-3.3.17/src/expr.c --- old/sqlite-3.3.16/src/expr.c 2007-04-13 18:06:33.000000000 +0200 +++ new/sqlite-3.3.17/src/expr.c 2007-04-18 19:07:58.000000000 +0200 @@ -12,7 +12,7 @@ ** This file contains routines used for analyzing expressions and ** for generating VDBE code that evaluates expressions in SQLite. ** -** $Id: expr.c,v 1.284 2007/04/13 16:06:33 drh Exp $ +** $Id: expr.c,v 1.285 2007/04/18 17:07:58 drh Exp $ */ #include "sqliteInt.h" #include <ctype.h> @@ -237,12 +237,12 @@ }else if( pLeft ){ if( pRight ){ sqlite3ExprSpan(pNew, &pLeft->span, &pRight->span); - if( pRight->flags && EP_ExpCollate ){ + if( pRight->flags & EP_ExpCollate ){ pNew->flags |= EP_ExpCollate; pNew->pColl = pRight->pColl; } } - if( pLeft->flags && EP_ExpCollate ){ + if( pLeft->flags & EP_ExpCollate ){ pNew->flags |= EP_ExpCollate; pNew->pColl = pLeft->pColl; } diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/sqlite-3.3.16/src/legacy.c new/sqlite-3.3.17/src/legacy.c --- old/sqlite-3.3.16/src/legacy.c 2007-03-29 20:39:32.000000000 +0200 +++ new/sqlite-3.3.17/src/legacy.c 2007-04-25 13:28:17.000000000 +0200 @@ -14,7 +14,7 @@ ** other files are for internal use by SQLite and should not be ** accessed by users of the library. ** -** $Id: legacy.c,v 1.16 2006/09/15 07:28:50 drh Exp $ +** $Id: legacy.c,v 1.17 2007/04/25 11:28:17 drh Exp $ */ #include "sqliteInt.h" @@ -44,7 +44,6 @@ char **azCols = 0; int nRetry = 0; - int nChange = 0; int nCallback; if( zSql==0 ) return SQLITE_OK; @@ -64,7 +63,6 @@ continue; } - db->nChange += nChange; nCallback = 0; nCol = sqlite3_column_count(pStmt); @@ -101,9 +99,6 @@ if( rc!=SQLITE_ROW ){ rc = sqlite3_finalize(pStmt); pStmt = 0; - if( db->pVdbe==0 ){ - nChange = db->nChange; - } if( rc!=SQLITE_SCHEMA ){ nRetry = 0; zSql = zLeftover; diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/sqlite-3.3.16/src/loadext.c new/sqlite-3.3.17/src/loadext.c --- old/sqlite-3.3.16/src/loadext.c 2007-03-29 20:44:44.000000000 +0200 +++ new/sqlite-3.3.17/src/loadext.c 2007-04-24 01:04:23.000000000 +0200 @@ -37,28 +37,32 @@ #endif #ifdef SQLITE_OMIT_AUTHORIZATION -# define sqlite3_set_authorizer 0 +# define sqlite3_set_authorizer 0 #endif #ifdef SQLITE_OMIT_UTF16 -# define sqlite3_bind_text16 0 -# define sqlite3_collation_needed16 0 -# define sqlite3_column_decltype16 0 -# define sqlite3_column_name16 0 -# define sqlite3_column_text16 0 -# define sqlite3_complete16 0 -# define sqlite3_create_collation16 0 -# define sqlite3_create_function16 0 -# define sqlite3_errmsg16 0 -# define sqlite3_open16 0 -# define sqlite3_prepare16 0 -# define sqlite3_result_error16 0 -# define sqlite3_result_text16 0 -# define sqlite3_result_text16be 0 -# define sqlite3_result_text16le 0 -# define sqlite3_value_text16 0 -# define sqlite3_value_text16be 0 -# define sqlite3_value_text16le 0 +# define sqlite3_bind_text16 0 +# define sqlite3_collation_needed16 0 +# define sqlite3_column_decltype16 0 +# define sqlite3_column_name16 0 +# define sqlite3_column_text16 0 +# define sqlite3_complete16 0 +# define sqlite3_create_collation16 0 +# define sqlite3_create_function16 0 +# define sqlite3_errmsg16 0 +# define sqlite3_open16 0 +# define sqlite3_prepare16 0 +# define sqlite3_prepare16_v2 0 +# define sqlite3_result_error16 0 +# define sqlite3_result_text16 0 +# define sqlite3_result_text16be 0 +# define sqlite3_result_text16le 0 +# define sqlite3_value_text16 0 +# define sqlite3_value_text16be 0 +# define sqlite3_value_text16le 0 +# define sqlite3_column_database_name16 0 +# define sqlite3_column_table_name16 0 +# define sqlite3_column_origin_name16 0 #endif #ifdef SQLITE_OMIT_COMPLETE diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/sqlite-3.3.16/src/prepare.c new/sqlite-3.3.17/src/prepare.c --- old/sqlite-3.3.16/src/prepare.c 2007-03-29 20:39:32.000000000 +0200 +++ new/sqlite-3.3.17/src/prepare.c 2007-04-24 01:07:27.000000000 +0200 @@ -13,7 +13,7 @@ ** interface, and routines that contribute to loading the database schema ** from disk. ** -** $Id: prepare.c,v 1.45 2007/03/26 22:05:02 drh Exp $ +** $Id: prepare.c,v 1.46 2007/04/19 11:09:01 danielk1977 Exp $ */ #include "sqliteInt.h" #include "os.h" @@ -537,13 +537,15 @@ if( sqlite3SafetyOff(db) ){ rc = SQLITE_MISUSE; } - if( rc==SQLITE_OK ){ - if( saveSqlFlag ){ - sqlite3VdbeSetSql(sParse.pVdbe, zSql, sParse.zTail - zSql); - } - *ppStmt = (sqlite3_stmt*)sParse.pVdbe; - }else if( sParse.pVdbe ){ + + if( saveSqlFlag ){ + sqlite3VdbeSetSql(sParse.pVdbe, zSql, sParse.zTail - zSql); + } + if( rc!=SQLITE_OK || sqlite3MallocFailed() ){ sqlite3_finalize((sqlite3_stmt*)sParse.pVdbe); + assert(!(*ppStmt)); + }else{ + *ppStmt = (sqlite3_stmt*)sParse.pVdbe; } if( zErrMsg ){ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/sqlite-3.3.16/src/test1.c new/sqlite-3.3.17/src/test1.c --- old/sqlite-3.3.16/src/test1.c 2007-04-13 04:14:30.000000000 +0200 +++ new/sqlite-3.3.17/src/test1.c 2007-04-24 01:56:31.000000000 +0200 @@ -13,7 +13,7 @@ ** is not included in the SQLite library. It is used for automated ** testing of the SQLite library. ** -** $Id: test1.c,v 1.237 2007/04/13 02:14:30 drh Exp $ +** $Id: test1.c,v 1.239 2007/04/23 23:56:31 drh Exp $ */ #include "sqliteInt.h" #include "tcl.h" @@ -580,6 +580,7 @@ zBuf[i*2] = 0; sqlite3_result_text(p, (char*)zBuf, -1, SQLITE_TRANSIENT); } +#ifndef SQLITE_OMIT_UTF16 static void hex16Func(sqlite3_context *p, int argc, sqlite3_value **argv){ const unsigned short int *z; int i; @@ -591,6 +592,7 @@ zBuf[i*4] = 0; sqlite3_result_text(p, (char*)zBuf, -1, SQLITE_TRANSIENT); } +#endif /* ** A structure into which to accumulate text. @@ -742,10 +744,12 @@ rc = sqlite3_create_function(db, "hex8", 1, SQLITE_ANY, 0, hex8Func, 0, 0); } +#ifndef SQLITE_OMIT_UTF16 if( rc==SQLITE_OK ){ rc = sqlite3_create_function(db, "hex16", 1, SQLITE_ANY, 0, hex16Func, 0, 0); } +#endif if( rc==SQLITE_OK ){ rc = sqlite3_create_function(db, "tkt2213func", 1, SQLITE_ANY, 0, tkt2213Function, 0, 0); @@ -2748,6 +2752,7 @@ if( Tcl_GetIntFromObj(interp, objv[3], &bytes) ) return TCL_ERROR; rc = sqlite3_prepare_v2(db, zSql, bytes, &pStmt, &zTail); + assert(rc==SQLITE_OK || pStmt==0); if( sqlite3TestErrCode(interp, db, rc) ) return TCL_ERROR; if( zTail ){ if( bytes>=0 ){ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/sqlite-3.3.16/src/test8.c new/sqlite-3.3.17/src/test8.c --- old/sqlite-3.3.16/src/test8.c 2007-03-30 17:47:07.000000000 +0200 +++ new/sqlite-3.3.17/src/test8.c 2007-04-18 19:40:31.000000000 +0200 @@ -13,7 +13,7 @@ ** is not included in the SQLite library. It is used for automated ** testing of the SQLite library. ** -** $Id: test8.c,v 1.45 2007/03/30 14:56:35 danielk1977 Exp $ +** $Id: test8.c,v 1.46 2007/04/18 17:04:01 danielk1977 Exp $ */ #include "sqliteInt.h" #include "tcl.h" @@ -269,9 +269,13 @@ -1, &pStmt, 0); sqlite3_bind_text(pStmt, 1, argv[3], -1, 0); if( sqlite3_step(pStmt)==SQLITE_ROW ){ + int rc2; const char *zCreateTable = (const char *)sqlite3_column_text(pStmt, 0); - sqlite3_declare_vtab(db, zCreateTable); - rc = sqlite3_finalize(pStmt); + rc = sqlite3_declare_vtab(db, zCreateTable); + rc2 = sqlite3_finalize(pStmt); + if( rc==SQLITE_OK ){ + rc = rc2; + } } else { rc = sqlite3_finalize(pStmt); if( rc==SQLITE_OK ){ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/sqlite-3.3.16/src/test9.c new/sqlite-3.3.17/src/test9.c --- old/sqlite-3.3.16/src/test9.c 2007-03-29 19:28:15.000000000 +0200 +++ new/sqlite-3.3.17/src/test9.c 2007-04-24 01:56:32.000000000 +0200 @@ -14,7 +14,7 @@ ** for completeness. Test code is written in C for these cases ** as there is not much point in binding to Tcl. ** -** $Id: test9.c,v 1.2 2007/03/29 17:28:15 danielk1977 Exp $ +** $Id: test9.c,v 1.3 2007/04/23 23:56:32 drh Exp $ */ #include "sqliteInt.h" #include "tcl.h" @@ -132,11 +132,13 @@ } sqlite3_close(db); +#ifndef SQLITE_OMIT_UTF16 rc = sqlite3_collation_needed16(db, 0, 0); if( rc!=SQLITE_MISUSE ){ zErrFunction = "sqlite3_collation_needed16"; goto error_out; } +#endif rc = sqlite3_collation_needed(db, 0, 0); if( rc!=SQLITE_MISUSE ){ @@ -168,11 +170,13 @@ goto error_out; } +#ifndef SQLITE_OMIT_UTF16 rc = sqlite3_prepare16(db, 0, 0, 0, 0); if( rc!=SQLITE_MISUSE ){ zErrFunction = "sqlite3_prepare16"; goto error_out; } +#endif return TCL_OK; @@ -202,4 +206,3 @@ } return TCL_OK; } - diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/sqlite-3.3.16/src/vdbe.c new/sqlite-3.3.17/src/vdbe.c --- old/sqlite-3.3.16/src/vdbe.c 2007-04-17 23:25:30.000000000 +0200 +++ new/sqlite-3.3.17/src/vdbe.c 2007-04-18 18:45:24.000000000 +0200 @@ -43,7 +43,7 @@ ** in this file for details. If in doubt, do not deviate from existing ** commenting and indentation practices when changing or adding code. ** -** $Id: vdbe.c,v 1.600 2007/04/17 08:32:34 danielk1977 Exp $ +** $Id: vdbe.c,v 1.601 2007/04/18 16:45:24 drh Exp $ */ #include "sqliteInt.h" #include "os.h" @@ -2369,7 +2369,11 @@ return SQLITE_BUSY; } } - return SQLITE_DONE; + if( p->rc==SQLITE_OK ){ + return SQLITE_DONE; + }else{ + return SQLITE_ERROR; + } }else{ sqlite3SetString(&p->zErrMsg, (!i)?"cannot start a transaction within a transaction":( diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/sqlite-3.3.16/src/vtab.c new/sqlite-3.3.17/src/vtab.c --- old/sqlite-3.3.16/src/vtab.c 2007-04-18 16:34:25.000000000 +0200 +++ new/sqlite-3.3.17/src/vtab.c 2007-04-24 01:07:30.000000000 +0200 @@ -11,7 +11,7 @@ ************************************************************************* ** This file contains code used to help implement virtual tables. ** -** $Id: vtab.c,v 1.42 2007/04/18 14:24:34 danielk1977 Exp $ +** $Id: vtab.c,v 1.45 2007/04/19 14:48:37 danielk1977 Exp $ */ #ifndef SQLITE_OMIT_VIRTUALTABLE #include "sqliteInt.h" @@ -132,10 +132,12 @@ int iDb; /* The database the table is being created in */ Table *pTable; /* The new virtual table */ +#ifndef SQLITE_OMIT_SHARED_CACHE if( sqlite3ThreadDataReadOnly()->useSharedData ){ sqlite3ErrorMsg(pParse, "Cannot use virtual tables in shared-cache mode"); return; } +#endif sqlite3StartTable(pParse, pName1, pName2, 0, 0, 1, 0); pTable = pParse->pNewTable; @@ -531,16 +533,18 @@ */ static void callFinaliser(sqlite3 *db, int offset){ int i; - for(i=0; i<db->nVTrans && db->aVTrans[i]; i++){ - sqlite3_vtab *pVtab = db->aVTrans[i]; - int (*x)(sqlite3_vtab *); - x = *(int (**)(sqlite3_vtab *))((char *)pVtab->pModule + offset); - if( x ) x(pVtab); - sqlite3VtabUnlock(db, pVtab); + if( db->aVTrans ){ + for(i=0; i<db->nVTrans && db->aVTrans[i]; i++){ + sqlite3_vtab *pVtab = db->aVTrans[i]; + int (*x)(sqlite3_vtab *); + x = *(int (**)(sqlite3_vtab *))((char *)pVtab->pModule + offset); + if( x ) x(pVtab); + sqlite3VtabUnlock(db, pVtab); + } + sqliteFree(db->aVTrans); + db->nVTrans = 0; + db->aVTrans = 0; } - sqliteFree(db->aVTrans); - db->nVTrans = 0; - db->aVTrans = 0; } /* diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/sqlite-3.3.16/src/where.c new/sqlite-3.3.17/src/where.c --- old/sqlite-3.3.16/src/where.c 2007-04-06 03:04:40.000000000 +0200 +++ new/sqlite-3.3.17/src/where.c 2007-04-20 14:22:02.000000000 +0200 @@ -16,7 +16,7 @@ ** so is applicable. Because this module is responsible for selecting ** indices, you might also think of this module as the "query optimizer". ** -** $Id: where.c,v 1.246 2007/04/06 01:04:40 drh Exp $ +** $Id: where.c,v 1.247 2007/04/20 12:22:02 drh Exp $ */ #include "sqliteInt.h" @@ -26,11 +26,6 @@ #define BMS (sizeof(Bitmask)*8) /* -** Determine the number of elements in an array. -*/ -#define ARRAYSIZE(X) (sizeof(X)/sizeof(X[0])) - -/* ** Trace output macros */ #if defined(SQLITE_TEST) || defined(SQLITE_DEBUG) @@ -195,7 +190,7 @@ pWC->pParse = pParse; pWC->pMaskSet = pMaskSet; pWC->nTerm = 0; - pWC->nSlot = ARRAYSIZE(pWC->aStatic); + pWC->nSlot = ArraySize(pWC->aStatic); pWC->a = pWC->aStatic; } @@ -310,7 +305,7 @@ ** array will never overflow. */ static void createMask(ExprMaskSet *pMaskSet, int iCursor){ - assert( pMaskSet->n < ARRAYSIZE(pMaskSet->ix) ); + assert( pMaskSet->n < ArraySize(pMaskSet->ix) ); pMaskSet->ix[pMaskSet->n++] = iCursor; } diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/sqlite-3.3.16/test/exclusive2.test new/sqlite-3.3.17/test/exclusive2.test --- old/sqlite-3.3.16/test/exclusive2.test 2007-04-16 17:02:20.000000000 +0200 +++ new/sqlite-3.3.17/test/exclusive2.test 2007-04-25 14:06:59.000000000 +0200 @@ -10,7 +10,7 @@ #*********************************************************************** # This file implements regression tests for SQLite library. # -# $Id: exclusive2.test,v 1.4 2007/04/16 15:02:20 drh Exp $ +# $Id: exclusive2.test,v 1.5 2007/04/25 12:06:59 drh Exp $ set testdir [file dirname $argv0] source $testdir/tester.tcl @@ -161,6 +161,7 @@ seek $fd 1024 puts -nonewline $fd [string repeat [binary format c 0] 10000] flush $fd + close $fd t1sig } $::sig diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/sqlite-3.3.16/test/fts2g.test new/sqlite-3.3.17/test/fts2g.test --- old/sqlite-3.3.16/test/fts2g.test 2006-10-25 22:27:40.000000000 +0200 +++ new/sqlite-3.3.17/test/fts2g.test 2007-04-24 01:07:30.000000000 +0200 @@ -7,7 +7,7 @@ # of this script is testing handling of edge cases for various doclist # merging functions in the FTS2 module query logic. # -# $Id: fts2g.test,v 1.1 2006/10/25 20:27:40 shess Exp $ +# $Id: fts2g.test,v 1.2 2007/04/19 18:36:32 shess Exp $ # set testdir [file dirname $argv0] @@ -22,6 +22,7 @@ db eval { CREATE VIRTUAL TABLE t1 USING fts2(content); INSERT INTO t1 (rowid, content) VALUES(1, 'this is a test'); + INSERT INTO t1 (rowid, content) VALUES(2, 'also a test'); } # No hits at all. Returns empty doclists from termSelect(). @@ -74,4 +75,13 @@ catchsql {SELECT rowid FROM t1 WHERE t1 MATCH '-this -something'} } {1 {SQL logic error or missing database}} +# Test that docListOrMerge() correctly handles reaching the end of one +# doclist before it reaches the end of the other. +do_test fts2g-1.11 { + execsql {SELECT rowid FROM t1 WHERE t1 MATCH 'this OR also'} +} {1 2} +do_test fts2g-1.12 { + execsql {SELECT rowid FROM t1 WHERE t1 MATCH 'also OR this'} +} {1 2} + finish_test diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/sqlite-3.3.16/test/laststmtchanges.test new/sqlite-3.3.17/test/laststmtchanges.test --- old/sqlite-3.3.16/test/laststmtchanges.test 2007-03-27 16:43:05.000000000 +0200 +++ new/sqlite-3.3.17/test/laststmtchanges.test 2007-04-25 13:27:22.000000000 +0200 @@ -50,8 +50,19 @@ } } {0 {5 13}} +# There was some goofy change-counting logic in sqlite3_exec() that +# appears to have been left over from SQLite version 2. This test +# makes sure it has been removed. +# +do_test laststmtchanges-1.2.1 { + db cache flush + sqlite3_exec_printf db {update t0 set x=4 where x=3; select 1;} {} + execsql {select changes()} +} {5} + # changes() unchanged within an update statement do_test laststmtchanges-1.3 { + execsql {update t0 set x=3 where x=4} catchsql { update t0 set x=x+changes() where x=3; select count() from t0 where x=8; diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/sqlite-3.3.16/test/malloc.test new/sqlite-3.3.17/test/malloc.test --- old/sqlite-3.3.16/test/malloc.test 2007-03-30 13:11:18.000000000 +0200 +++ new/sqlite-3.3.17/test/malloc.test 2007-04-24 01:07:30.000000000 +0200 @@ -14,7 +14,7 @@ # special feature is used to see what happens in the library if a malloc # were to really fail due to an out-of-memory situation. # -# $Id: malloc.test,v 1.40 2007/03/30 07:10:52 danielk1977 Exp $ +# $Id: malloc.test,v 1.41 2007/04/19 11:09:02 danielk1977 Exp $ set testdir [file dirname $argv0] source $testdir/tester.tcl @@ -552,6 +552,23 @@ CREATE TABLE abc(a, b, c, FOREIGN KEY(a) REFERENCES abc(b)) } +# Test malloc failure in an sqlite3_prepare_v2() call. +# +do_malloc_test 22 -tclbody { + set ::STMT "" + set r [catch { + set ::STMT [ + sqlite3_prepare_v2 $::DB "SELECT * FROM sqlite_master" -1 DUMMY + ] + } msg] + if {$r} {error [string range $msg 4 end]} +} -cleanup { + if {$::STMT ne ""} { + sqlite3_finalize $::STMT + set ::STMT "" + } +} + # Ensure that no file descriptors were leaked. do_test malloc-99.X { catch {db close} diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/sqlite-3.3.16/test/misc6.test new/sqlite-3.3.17/test/misc6.test --- old/sqlite-3.3.16/test/misc6.test 2006-09-04 20:54:14.000000000 +0200 +++ new/sqlite-3.3.17/test/misc6.test 2007-04-24 01:56:32.000000000 +0200 @@ -13,7 +13,7 @@ # This file implements tests to make sure sqlite3_value_text() # always returns a null-terminated string. # -# $Id: misc6.test,v 1.2 2006/09/04 18:54:14 drh Exp $ +# $Id: misc6.test,v 1.3 2007/04/23 23:56:32 drh Exp $ set testdir [file dirname $argv0] source $testdir/tester.tcl @@ -30,17 +30,19 @@ do_test misc6-1.2 { sqlite3_column_text $STMT 0 } {3031323334} -do_test misc6-1.3 { - sqlite3_finalize $STMT - set STMT [sqlite3_prepare $DB {SELECT hex16(?)} -1 DUMMY] - set sqlite_static_bind_value {0123456789} - set sqlite_static_bind_nbyte 5 - sqlite_bind $STMT 1 {} static-nbytes - sqlite3_step $STMT -} SQLITE_ROW -do_test misc6-1.4 { - sqlite3_column_text $STMT 0 -} {00300031003200330034} +ifcapable utf16 { + do_test misc6-1.3 { + sqlite3_finalize $STMT + set STMT [sqlite3_prepare $DB {SELECT hex16(?)} -1 DUMMY] + set sqlite_static_bind_value {0123456789} + set sqlite_static_bind_nbyte 5 + sqlite_bind $STMT 1 {} static-nbytes + sqlite3_step $STMT + } SQLITE_ROW + do_test misc6-1.4 { + sqlite3_column_text $STMT 0 + } {00300031003200330034} +} sqlite3_finalize $STMT finish_test diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/sqlite-3.3.16/test/quote.test new/sqlite-3.3.17/test/quote.test --- old/sqlite-3.3.16/test/quote.test 2007-03-27 16:43:06.000000000 +0200 +++ new/sqlite-3.3.17/test/quote.test 2007-04-25 13:32:30.000000000 +0200 @@ -12,7 +12,7 @@ # focus of this file is the ability to specify table and column names # as quoted strings. # -# $Id: quote.test,v 1.6 2005/11/01 15:48:25 drh Exp $ +# $Id: quote.test,v 1.7 2007/04/25 11:32:30 drh Exp $ set testdir [file dirname $argv0] source $testdir/tester.tcl @@ -57,7 +57,7 @@ SELECT [!pqr], `#xyz`+5 FROM '@abc' } } {0 {hello 10}} -do_test quote-1.3 { +do_test quote-1.3.4 { set r [catch { execsql {SELECT '@abc'.'!pqr', '@abc'.'#xyz'+5 FROM '@abc'} } msg ] diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/sqlite-3.3.16/test/rdonly.test new/sqlite-3.3.17/test/rdonly.test --- old/sqlite-3.3.16/test/rdonly.test 1970-01-01 01:00:00.000000000 +0100 +++ new/sqlite-3.3.17/test/rdonly.test 2007-04-24 19:27:52.000000000 +0200 @@ -0,0 +1,65 @@ +# 2007 April 24 +# +# The author disclaims copyright to this source code. In place of +# a legal notice, here is a blessing: +# +# May you do good and not evil. +# May you find forgiveness for yourself and forgive others. +# May you share freely, never taking more than you give. +# +#*********************************************************************** +# This file implements regression tests for SQLite library. +# +# This file implements tests to make sure SQLite treats a database +# as readonly if its write version is set to high. +# +# $Id: rdonly.test,v 1.1 2007/04/24 17:27:52 drh Exp $ + +set testdir [file dirname $argv0] +source $testdir/tester.tcl + + +# Create a database. +# +do_test rdonly-1.1 { + execsql { + CREATE TABLE t1(x); + INSERT INTO t1 VALUES(1); + SELECT * FROM t1; + } +} {1} + +# Changes the write version from 1 to 2. Verify that the database +# can be read but not written. +# +do_test rdonly-1.2 { + db close + hexio_get_int [hexio_read test.db 18 1] +} 1 +do_test rdonly-1.3 { + hexio_write test.db 18 02 + sqlite3 db test.db + execsql { + SELECT * FROM t1; + } +} {1} +do_test rdonly-1.4 { + catchsql { + INSERT INTO t1 VALUES(2) + } +} {1 {attempt to write a readonly database}} + +# Change the write version back to 1. Verify that the database +# is read-write again. +# +do_test rdonly-1.5 { + db close + hexio_write test.db 18 01 + sqlite3 db test.db + catchsql { + INSERT INTO t1 VALUES(2); + SELECT * FROM t1; + } +} {0 {1 2}} + +finish_test diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/sqlite-3.3.16/test/rowid.test new/sqlite-3.3.17/test/rowid.test --- old/sqlite-3.3.16/test/rowid.test 2007-03-27 16:43:06.000000000 +0200 +++ new/sqlite-3.3.17/test/rowid.test 2007-04-25 13:32:30.000000000 +0200 @@ -12,7 +12,7 @@ # focus of this file is testing the magic ROWID column that is # found on all tables. # -# $Id: rowid.test,v 1.18 2005/01/21 03:12:16 danielk1977 Exp $ +# $Id: rowid.test,v 1.19 2007/04/25 11:32:30 drh Exp $ set testdir [file dirname $argv0] source $testdir/tester.tcl @@ -80,7 +80,7 @@ set v2 [list 1 $x2rowid(1) 3 $x2rowid(3)] expr {$v==$v2} } {1} -do_test rowid-1.9 { +do_test rowid-1.10 { global x2rowid set v [execsql {SELECT x, _rowid_ FROM t1 order by x}] set v2 [list 1 $x2rowid(1) 3 $x2rowid(3)] diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/sqlite-3.3.16/test/tester.tcl new/sqlite-3.3.17/test/tester.tcl --- old/sqlite-3.3.16/test/tester.tcl 2007-04-16 18:34:56.000000000 +0200 +++ new/sqlite-3.3.17/test/tester.tcl 2007-04-19 14:30:54.000000000 +0200 @@ -11,7 +11,7 @@ # This file implements some common TCL routines used for regression # testing the SQLite library # -# $Id: tester.tcl,v 1.78 2007/04/13 03:23:21 drh Exp $ +# $Id: tester.tcl,v 1.79 2007/04/19 12:30:54 drh Exp $ # Make sure tclsqlite3 was compiled correctly. Abort now with an # error message if not. @@ -453,26 +453,33 @@ # a result of the script, the Nth will fail. do_test $testname.$n.3 { set r [catch $::ioerrorbody msg] - # puts rc=[sqlite3_errcode $::DB] set rc [sqlite3_errcode $::DB] if {$::ioerropts(-erc)} { - # In extended result mode, all IOERRs are qualified + # If we are in extended result code mode, make sure all of the + # IOERRs we get back really do have their extended code values. + # If an extended result code is returned, the sqlite3_errcode + # TCLcommand will return a string of the form: SQLITE_IOERR+nnnn + # where nnnn is a number if {[regexp {^SQLITE_IOERR} $rc] && ![regexp {IOERR\+\d} $rc]} { return $rc } } else { - # Not in extended result mode, no errors are qualified + # If we are not in extended result code mode, make sure no + # extended error codes are returned. if {[regexp {\+\d} $rc]} { return $rc } } + # The test repeats as long as $::go is true. set ::go [expr {$::sqlite_io_error_pending<=0}] set s [expr $::sqlite_io_error_hit==0] set ::sqlite_io_error_hit 0 - # puts "$::sqlite_io_error_pending $r $msg" - # puts "r=$r s=$s go=$::go msg=\"$msg\"" + + # One of two things must have happened. either + # 1. We never hit the IO error and the SQL returned OK + # 2. An IO error was hit and the SQL failed + # expr { ($s && !$r && !$::go) || (!$s && $r && $::go) } - # expr {$::sqlite_io_error_pending>0 || $r!=0} } {1} # If an IO error occured, then the checksum of the database should diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/sqlite-3.3.16/test/vtab_err.test new/sqlite-3.3.17/test/vtab_err.test --- old/sqlite-3.3.16/test/vtab_err.test 2007-01-02 19:41:58.000000000 +0100 +++ new/sqlite-3.3.17/test/vtab_err.test 2007-04-24 01:07:30.000000000 +0200 @@ -9,7 +9,7 @@ # #*********************************************************************** # -# $Id: vtab_err.test,v 1.4 2007/01/02 18:41:58 drh Exp $ +# $Id: vtab_err.test,v 1.5 2007/04/19 11:09:02 danielk1977 Exp $ set testdir [file dirname $argv0] source $testdir/tester.tcl @@ -146,7 +146,6 @@ COMMIT; } - do_malloc_test vtab_err-2 -tclprep { register_echo_module [sqlite3_connection_pointer db] } -sqlbody { diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/sqlite-3.3.16/VERSION new/sqlite-3.3.17/VERSION --- old/sqlite-3.3.16/VERSION 2007-04-18 15:12:06.000000000 +0200 +++ new/sqlite-3.3.17/VERSION 2007-04-25 13:34:16.000000000 +0200 @@ -1 +1 @@ -3.3.16 +3.3.17 diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/sqlite-3.3.16/www/changes.tcl new/sqlite-3.3.17/www/changes.tcl --- old/sqlite-3.3.16/www/changes.tcl 2007-04-18 15:19:11.000000000 +0200 +++ new/sqlite-3.3.17/www/changes.tcl 2007-04-25 13:34:05.000000000 +0200 @@ -25,6 +25,13 @@ puts "<DD><P><UL>$desc</UL></P></DD>" } +chng {2007 April 25 (3.3.17)} { +<li>When the "write_version" value of the database header is larger than + what the library understands, make the database read-only instead of + unreadable.</li> +<li>Other minor bug fixes</li> +} + chng {2007 April 18 (3.3.16)} { <li>Fix a bug that caused VACUUM to fail if NULLs appeared in a UNIQUE column.</li> diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/sqlite-3.3.16/www/index.tcl new/sqlite-3.3.17/www/index.tcl --- old/sqlite-3.3.16/www/index.tcl 2007-04-18 15:49:37.000000000 +0200 +++ new/sqlite-3.3.17/www/index.tcl 2007-04-25 13:42:33.000000000 +0200 @@ -73,6 +73,14 @@ puts "<hr width=\"50%\">" } +newsitem {2007-Apr-25} {Version 3.3.17} { + This version fixes a bug in the forwards-compatibility logic of SQLite + that was causing a database to become unreadable when it should have + been read-only. Upgrade from 3.3.16 only if you plan to deploy into + a product that might need to be upgraded in the future. For day to day + use, it probably does not matter. +} + newsitem {2007-Apr-18} {Version 3.3.16} { Performance improvements added in 3.3.14 but mistakenly turned off in 3.3.15 have been reinstated. A bug has been fixed that prevented @@ -114,4 +122,4 @@ <p align="right"><a href="oldnews.html">Old news...</a></p> </td></tr></table> } -footer {$Id: index.tcl,v 1.153 2007/04/18 13:49:37 drh Exp $} +footer {$Id: index.tcl,v 1.154 2007/04/25 11:42:33 drh Exp $} ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit autofs
by root＠Hilbert.suse.de 27 Apr '07

27 Apr '07

Hello community, here is the log from the commit of package autofs checked in at Fri Apr 27 09:47:58 CEST 2007. -------- --- autofs/autofs.changes 2007-03-06 12:12:21.000000000 +0100 +++ autofs/autofs.changes 2007-04-27 09:35:43.000000000 +0200 @@ -1,0 +2,15 @@ +Thu Apr 26 17:21:12 CEST 2007 - mkoenig(a)suse.de + +- update to version 5.0.1: + * autofs5 is a major rewrite + * many new features to be more compliant with industry standard: + + improved direct mount map support + + '+' map inclusion + + added nsswitch map source support + + rewrote multi-mount map code + + added LDAP encryption and authentication support + + improved shutdown and restart + + a "hosts" map module has been added +- add gssd dependencies in init script [#249779] + +------------------------------------------------------------------- Old: ---- autofs-4.1.0-auto-master.patch autofs-4.1.0-hesiod-bind.patch autofs-4.1.3-optflags.patch autofs-4.1.3-uninit-vars.patch autofs-4.1.4-buffer_overflow.patch autofs-4.1.4-configurable-locking.patch autofs-4.1.4-dont_create_remote_dirs.patch autofs-4.1.4-fix_contained_check.patch autofs-4.1.4-multi_parse_fix.patch autofs-4.1.4-strip.patch autofs-4.1.4.tar.bz2 autofs4-e2fsck-error-handling.diff autofs4-init.diff autofs4-nfs-retry.diff autofsbuild.patch autofsstrip.patch README.NetworkManager New: ---- autofs-5.0.1-fix_contained_check.patch autofs-5.0.1-mount_xdr_no_strict_aliasing.patch autofs-5.0.1.tar.bz2 autofs-suse-autofs_init.patch autofs-suse-auto_master_default.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ autofs.spec ++++++ --- /var/tmp/diff_new_pack.H27324/_old 2007-04-27 09:45:40.000000000 +0200 +++ /var/tmp/diff_new_pack.H27324/_new 2007-04-27 09:45:40.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package autofs (Version 4.1.4) +# spec file for package autofs (Version 5.0.1) # # Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine @@ -11,41 +11,28 @@ # norootforbuild Name: autofs -BuildRequires: nfs-utils openldap2-devel -Provides: autofs4 -Obsoletes: autofs4 +BuildRequires: bison flex module-init-tools nfs-utils openldap2-devel License: GNU General Public License (GPL) Group: System/Daemons Autoreqprov: on -Requires: sed grep -Version: 4.1.4 -Release: 66 +Requires: grep +Version: 5.0.1 +Release: 1 Summary: A Kernel-Based Automounter BuildRoot: %{_tmppath}/%{name}-%{version}-build -Source: ftp://ftp.kernel.org/pub/linux/daemons/autofs/v4/autofs-%{version}.tar.bz2 +Source: ftp://ftp.kernel.org/pub/linux/daemons/autofs/v5/%{name}-%{version}.tar.bz2 Source1: sysconfig.autofs Source3: autofs.schema Source4: README.SuSE.ldap Source5: README.SuSE -Source6: README.NetworkManager +# Obsolete? referenced file does not exist anymore in NetworkManager package +#Source6: README.NetworkManager Source7: NetworkManager-autofs -Patch1: autofs-4.1.0-hesiod-bind.patch -Patch2: autofs-4.1.0-auto-master.patch -Patch3: autofs4-init.diff -Patch4: autofsbuild.patch -Patch5: autofsstrip.patch -Patch6: autofs-4.1.3-uninit-vars.patch -Patch7: autofs-4.1.3-optflags.patch -Patch8: autofs-4.1.4-strip.patch -Patch9: autofs-4.1.4-configurable-locking.patch -Patch11: autofs4-e2fsck-error-handling.diff -Patch12: autofs4-nfs-retry.diff -Patch13: autofs-4.1.4-buffer_overflow.patch -Patch14: autofs-4.1.4-multi_parse_fix.patch -Patch15: autofs-4.1.4-dont_create_remote_dirs.patch -Patch16: autofs-4.1.4-fix_contained_check.patch +Patch0: autofs-suse-auto_master_default.patch +Patch1: autofs-suse-autofs_init.patch +Patch2: autofs-5.0.1-fix_contained_check.patch +Patch3: autofs-5.0.1-mount_xdr_no_strict_aliasing.patch PreReq: %fillup_prereq %insserv_prereq -PreReq: /usr/bin/sed /usr/bin/grep /bin/mv %description Autofs is a kernel-based automounter for Linux. It is still under @@ -59,34 +46,29 @@ Authors: -------- H. Peter Anvin <hpa(a)transmeta.com> + Ian Kent <raven(a)themaw.net> %prep -%setup -n autofs-%{PACKAGE_VERSION} +%setup cp %{SOURCE3} . cp %{SOURCE4} . cp %{SOURCE5} . -cp %{SOURCE6} . -%patch1 -p1 -b .hesiod-bind -%patch2 -p1 -b .auto-master -%patch3 -%patch4 -p1 -%patch5 -p1 -%patch6 -%patch7 -%patch8 -%patch9 -p1 -%patch11 -p1 -%patch12 -p1 -%patch13 -%patch14 -p1 -%patch15 -p1 -%patch16 -p1 +#cp %{SOURCE6} . +# +%patch0 -p1 +%patch1 -p1 +%patch2 -p1 +%patch3 -p1 %build -autoconf -./configure --libdir=%{_libdir} --mandir=%{_mandir} %{_target_cpu}-suse-linux \ - --disable-mount-locking -make all OPTFLAGS="$RPM_OPT_FLAGS -DLDAP_DEPRECATED" STRIP=: +autoconf -f +./configure %{_target_cpu}-suse-linux \ + --libdir=%{_libdir} --mandir=%{_mandir} \ + --disable-mount-locking \ + --enable-forced-shutdown \ + --with-hesiod=no \ + CFLAGS="$RPM_OPT_FLAGS" +make all STRIP=: %install mkdir -p $RPM_BUILD_ROOT/etc @@ -98,25 +80,16 @@ mkdir -p $RPM_BUILD_ROOT/var/adm/fillup-templates mkdir -p $RPM_BUILD_ROOT/etc/NetworkManager/dispatcher.d make install INSTALLROOT=$RPM_BUILD_ROOT -make install_samples INSTALLROOT=$RPM_BUILD_ROOT -chmod 755 $RPM_BUILD_ROOT/%{_libdir}/autofs/*.so -install -m 744 samples/rc.autofs $RPM_BUILD_ROOT/etc/init.d/autofs ln -s ../../etc/init.d/autofs $RPM_BUILD_ROOT/usr/sbin/rcautofs install -m 644 %{S:1} $RPM_BUILD_ROOT/var/adm/fillup-templates/sysconfig.autofs install -m 755 %{S:7} $RPM_BUILD_ROOT/etc/NetworkManager/dispatcher.d/autofs -SHOWMOUNT=/usr/sbin/showmount -test -x /usr/sbin/kshowmount && SHOWMOUNT=/usr/sbin/kshowmount -install -m 755 $SHOWMOUNT $RPM_BUILD_ROOT/usr/lib/autofs/showmount -rm -f $RPM_BUILD_ROOT/etc/auto.net.old -rm -f $RPM_BUILD_ROOT/etc/auto.smb.old -# workaround for x86_64 - mv executable autofs-ldap-auto-master from /usr/lib64/autofs to /usr/lib/autofs -test %{_libdir} = "/usr/lib64" && test -f %{buildroot}/%{_libdir}/autofs/autofs-ldap-auto-master && mv %{buildroot}/%{_libdir}/autofs/autofs-ldap-auto-master %{buildroot}/usr/lib/autofs/autofs-ldap-auto-master +rm -f $RPM_BUILD_ROOT/etc/sysconfig/autofs %clean rm -rf %{buildroot} %post -if /sbin/chkconfig -c autofs4 3 || /sbin/chkconfig -c autofs 3; then +if /sbin/chkconfig -c autofs 3; then %{insserv_force_if_yast autofs} fi %{fillup_only -n autofs} @@ -135,18 +108,28 @@ %dir /etc/NetworkManager %dir /etc/NetworkManager/dispatcher.d /etc/NetworkManager/dispatcher.d/autofs +/etc/autofs_ldap_auth.conf /usr/sbin/rcautofs -%doc COPYING COPYRIGHT README README.changer README.options README.smbfs -%doc autofs.schema README.SuSE.ldap README.SuSE README.NetworkManager +%doc COPYRIGHT README README.changer README.smbfs README.SuSE +%doc autofs.schema README.SuSE.ldap README.v5.release %{_libdir}/autofs/ -%if "%_libdir" == "/usr/lib64" -/usr/lib/autofs -%endif %{_mandir}/man5/* %{_mandir}/man8/* /usr/sbin/automount %changelog +* Thu Apr 26 2007 - mkoenig(a)suse.de +- update to version 5.0.1: + * autofs5 is a major rewrite + * many new features to be more compliant with industry standard: + + improved direct mount map support + + '+' map inclusion + + added nsswitch map source support + + rewrote multi-mount map code + + added LDAP encryption and authentication support + + improved shutdown and restart + + a "hosts" map module has been added +- add gssd dependencies in init script [#249779] * Tue Mar 06 2007 - mkoenig(a)suse.de - Fix last upstream patch which introduced a problem for filesystems defined in fstab by LABEL or UUID [#244945] ++++++ autofs-4.1.4-fix_contained_check.patch -> autofs-5.0.1-fix_contained_check.patch ++++++ --- autofs/autofs-4.1.4-fix_contained_check.patch 2007-02-27 13:16:37.000000000 +0100 +++ autofs/autofs-5.0.1-fix_contained_check.patch 2007-03-01 18:09:10.000000000 +0100 @@ -1,8 +1,8 @@ -Index: autofs-4.1.4/lib/mounts.c +Index: autofs-5.0.1/lib/mounts.c =================================================================== ---- autofs-4.1.4.orig/lib/mounts.c -+++ autofs-4.1.4/lib/mounts.c -@@ -315,7 +315,9 @@ int contained_in_local_fs(const char *pa +--- autofs-5.0.1.orig/lib/mounts.c ++++ autofs-5.0.1/lib/mounts.c +@@ -371,7 +371,9 @@ int contained_in_local_fs(const char *pa ret = 1; } else ret = 1; ++++++ autofs-5.0.1-mount_xdr_no_strict_aliasing.patch ++++++ Index: autofs-5.0.1/lib/Makefile =================================================================== --- autofs-5.0.1.orig/lib/Makefile +++ autofs-5.0.1/lib/Makefile @@ -47,7 +47,7 @@ mount_xdr.c: mount.h $(RPCGEN) -c -o mount_xdr.c mount.x mount_xdr.o: mount_xdr.c - $(CC) $(CFLAGS) -Wno-unused-variable -o mount_xdr.o -c mount_xdr.c + $(CC) $(CFLAGS) -fno-strict-aliasing -Wno-unused-variable -o mount_xdr.o -c mount_xdr.c $(STRIP) mount_xdr.o master_tok.c: master_tok.l ++++++ autofs-4.1.4.tar.bz2 -> autofs-5.0.1.tar.bz2 ++++++ ++++ 82006 lines of diff (skipped) ++++++ autofs-suse-autofs_init.patch ++++++ Index: autofs-5.0.1/samples/rc.autofs.in =================================================================== --- autofs-5.0.1.orig/samples/rc.autofs.in +++ autofs-5.0.1/samples/rc.autofs.in @@ -4,9 +4,17 @@ # # rc file for automount using a Sun-style "master map". # -# On most distributions, this file should be called: -# /etc/rc.d/init.d/autofs or /etc/init.d/autofs or /etc/rc.d/rc.autofs -# + +### BEGIN INIT INFO +# Provides: autofs +# Required-Start: $network $syslog $remote_fs +# Should-Start: ypbind keyserv ldap gssd +# Required-Stop: +# Should-Stop: gssd +# Default-Start: 3 5 +# Default-Stop: +# Description: Start the autofs daemon for automatic mounting of filesystems. +### END INIT INFO # # Location of the automount daemon and the init directory @@ -16,104 +24,116 @@ prog=`basename $DAEMON` MODULE="autofs4" confdir=@@autofsconfdir@@ -test -e $DAEMON || exit 0 +test -x $DAEMON || exit 5 PATH=/sbin:/usr/sbin:/bin:/usr/bin export PATH +. /etc/rc.status + # # load customized configuation settings # if [ -r $confdir/autofs ]; then - . $confdir/autofs + . $confdir/autofs fi function start() { - echo -n "Starting $prog: " - # Make sure autofs4 module is loaded - if ! grep -q autofs /proc/filesystems - then - # Try load the autofs4 module fail if we can't - modprobe $MODULE >/dev/null 2>&1 - if [ $? -eq 1 ] - then - echo "Error: failed to load autofs4 module." - return 1 - fi - elif ([ -f /proc/modules ] && lsmod) | grep -q autofs[^4] - then - # wrong autofs filesystem module loaded - echo - echo "Error: autofs kernel module is loaded, autofs4 required" - return 1 + if ! grep -q autofs /proc/filesystems; then + # Try load the autofs4 module fail if we can't + modprobe $MODULE >/dev/null 2>&1 + if [ $? -eq 1 ]; then + echo "Error: failed to load autofs4 module." + return 1 fi + elif ([ -f /proc/modules ] && lsmod) | grep -q autofs[^4]; then + # wrong autofs filesystem module loaded + echo + echo "Error: autofs kernel module is loaded, autofs4 required" + return 1 + fi - $prog $OPTIONS - RETVAL=$? - if [ $RETVAL -eq 0 ] ; then - echo "done." - else - echo "failed." - fi - return $RETVAL + /sbin/startproc $DAEMON $AUTOFS_OPTIONS + + return $? } function stop() { - echo -n $"Stopping $prog: " - count=0 - while [ -n "`pidof $DAEMON`" -a $count -lt 15 ] ; do - killall -TERM $prog >& /dev/null - RETVAL=$? - [ $RETVAL = 0 -a -z "`pidof $DAEMON`" ] || sleep 3 - count=`expr $count + 1` - done - if [ -n "`pidof $DAEMON`" ] ; then - echo "done." - else - echo "failed." - fi - return $RETVAL -} + count=0 + while [ -n "`pidof $DAEMON`" -a $count -lt 15 ] ; do + /sbin/killproc -TERM $DAEMON + RETVAL=$? + [ $RETVAL = 0 -a -z "`pidof $DAEMON`" ] || sleep 3 + count=`expr $count + 1` + done -function restart() { - stop - start + return $RETVAL } -function reload() { - pid=`pidof $DAEMON` - if [ -z $pid ]; then - echo $"$prog not running" - RETVAL=1 - else - kill -HUP $pid 2> /dev/null - echo $"Reloading maps" - RETVAL=0 - fi - return $RETVAL -} RETVAL=0 case "$1" in - start) - start - ;; - stop) - stop - ;; - restart) - restart - ;; - reload) - reload - ;; - *) - echo $"Usage: $0 {start|stop|restart|reload}" - exit 1; - ;; -esac + start) + echo -n "Starting $prog " + # Check if already running + if ! /sbin/checkproc $DAEMON; then + start + fi -exit $? + rc_status -v + ;; + stop) + echo -n "Shutting down $prog " + stop + rc_status -v + ;; + try-restart|condrestart) + ## Do a restart only if the service was active before. + ## Note: try-restart is now part of LSB (as of 1.9). + ## RH has a similar command named condrestart. + if test "$1" = "condrestart"; then + echo "${attn} Use try-restart ${done}(LSB)${attn} rather than condrestart ${warn}(RH)${norm}" + fi + $0 status + if test $? = 0; then + $0 restart + else + rc_reset # Not running is not a failure. + fi + # Remember status and be quiet + rc_status + ;; + restart) + $0 stop + $0 start + + rc_status + ;; + force-reload) + echo -n "Reload service $prog " + /sbin/killproc -HUP $DAEMON + rc_status -v + + ;; + reload) + echo -n "Reload service $prog " + /sbin/killproc -HUP $DAEMON + rc_status -v + + ;; + status) + echo -n "Checking for service $prog " + /sbin/checkproc $DAEMON + # NOTE: rc_status knows that we called this init script with + # "status" option and adapts its messages accordingly. + rc_status -v + ;; + *) + echo "Usage: $0 {start|stop|status|try-restart|restart|force-reload|reload}" + exit 1 + ;; +esac +rc_exit ++++++ autofs-suse-auto_master_default.patch ++++++ Index: autofs-5.0.1/samples/auto.master =================================================================== --- autofs-5.0.1.orig/samples/auto.master +++ autofs-5.0.1/samples/auto.master @@ -6,8 +6,8 @@ # key [ -mount-options-separated-by-comma ] location # For details of the format look at autofs(5). # -/misc /etc/auto.misc -/net -hosts +#/misc /etc/auto.misc +#/net -hosts # # Include central master map if it can be found using # nsswitch sources. ++++++ README.SuSE ++++++ --- autofs/README.SuSE 2006-02-28 15:32:03.000000000 +0100 +++ autofs/README.SuSE 2007-03-19 17:14:56.000000000 +0100 @@ -1,16 +1,48 @@ +autofs5 is a major update with lots of code changes and new features. +Most of the changes enhance the functionality to be more compliant +with current industry standards. + +Here is a list of the most important changes: + +Differences v4 vs. v5 +--------------------- +- Master map is now read and parsed by the `automount' daemon +- The master map default is "auto.master" and nsswitch is used to + locate it. The line "+auto.master" has been added to the default + installed "/etc/auto.master" to ensure that those using NIS will + still find their master map. This is in line with other industry + automount implementations. +- The `automount' daemon is now a multi-threaded application +- `autofs' filesystem mounts only appear in /proc/mounts and not + /etc/mtab. +- `autofs' version 5.0.0 will refuse to run if it cannot find an + autofs4 kernel module that supports protocol version 5.00 or above. +- mount options present in the master map are now overridden by mount + options in map entries instead of being accumulated. This behaviour + is in line with other industry automount implementations. + +New features in v5 +------------------ +- improved direct mount map support +- `+' map inclusion +- added nsswitch map source support +- rewrote multi-mount map code +- added LDAP encryption and authentication support +- improved shutdown and restart +- a "hosts" map module has been added + +Update hints +============ +Since autofs now uses nsswitch to locate the master map, the +sysconfig variable NISMASTERMAP is obsolete. +Also the UNDERSCORETODOT parameter is not support anymore. +Some new sysconfig parameters are available, please take +a look to /etc/sysconfig/autofs. +Note also, that the old Suse config syntax style is not +supported anymore. If you had a configuration like -The start script for autofs supports three different map types in -the file auto.master. +/mnt yp auto.home [options] -1. File Maps (/etc/auto.misc must not be executable): - - /mnt /etc/auto.misc [options] - -2. Program Maps (/etc/auto.net must be executable): - - /mnt /etc/auto.net [options] - -3. YP et. al. Maps: - - /mnt yp auto.home [options] +you'll have to change this to +/mnt yp:auto.home [options] ++++++ sysconfig.autofs ++++++ --- autofs/sysconfig.autofs 2006-09-12 14:41:02.000000000 +0200 +++ autofs/sysconfig.autofs 2007-03-19 17:03:14.000000000 +0100 @@ -1,30 +1,65 @@ ## Path: System/File systems/Autofs -## Description: Additional options for the autofs daemon. +## Description: General global options. ## Type: string ## Default: "" ## ServiceReload: autofs # -# autofs daemon options (e.g. --timeout 60) -# AUTOFS_OPTIONS="" -## Path: System/File systems/Autofs -## Description: Main nis map providing the nis map for mounts +## Description: Default map name for the master map. ## Type: string ## Default: "auto.master" -## ServiceReload: autofs # -# _Main_ nis map providing the nis map for mounts, usually "auto.master" +DEFAULT_MASTER_MAP_NAME="auto.master" + +## Description: Set the default mount timeout (default 600). +## Type: integer(0:) +## Default: 600 # -NISMASTERMAP="auto.master" +DEFAULT_TIMEOUT=600 -## Path: System/File systems/Autofs -## Description: map underscore to dot for nis mount map name -## Type: yesno +## Description: maps are browsable by default. +## Type: string ## Default: "yes" -## ServiceReload: autofs # -# map underscore to dot for nis mount map name +DEFAULT_BROWSE_MODE="yes" + +## Description: Set default log level. +## Type: string +## Default: "none" # -UNDERSCORETODOT="yes" +# "none", "verbose" or "debug" +# +DEFAULT_LOGGING="none" + +## Description: Define the default LDAP schema to use for lookups. +## Type: string +## Default: "auto.master" +# +# System default +# +DEFAULT_MAP_OBJECT_CLASS="nisMap" +DEFAULT_ENTRY_OBJECT_CLASS="nisObject" +DEFAULT_MAP_ATTRIBUTE="nisMapName" +DEFAULT_ENTRY_ATTRIBUTE="cn" +DEFAULT_VALUE_ATTRIBUTE="nisMapEntry" +# +# Other common LDAP nameing +# +#DEFAULT_MAP_OBJECT_CLASS="automountMap" +#DEFAULT_ENTRY_OBJECT_CLASS="automount" +#DEFAULT_MAP_ATTRIBUTE="ou" +#DEFAULT_ENTRY_ATTRIBUTE="cn" +#DEFAULT_VALUE_ATTRIBUTE="automountInformation" +# +#DEFAULT_MAP_OBJECT_CLASS="automountMap" +#DEFAULT_ENTRY_OBJECT_CLASS="automount" +#DEFAULT_MAP_ATTRIBUTE="automountMapName" +#DEFAULT_ENTRY_ATTRIBUTE="automountKey" +#DEFAULT_VALUE_ATTRIBUTE="automountInformation" +## Description: set the default location for the SASL authentication configuration file. +## Type: string +## Default: "/etc/autofs_ldap_auth.conf" +# +DEFAULT_AUTH_CONF_FILE="etc/autofs_ldap_auth.conf" ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit xorg-x11-driver-video
by root＠Hilbert.suse.de 27 Apr '07

27 Apr '07

Hello community, here is the log from the commit of package xorg-x11-driver-video checked in at Fri Apr 27 08:34:57 CEST 2007. -------- --- xorg-x11-driver-video/xorg-x11-driver-video.changes 2007-04-21 11:21:38.000000000 +0200 +++ xorg-x11-driver-video/xorg-x11-driver-video.changes 2007-04-27 07:59:00.853157000 +0200 @@ -1,0 +2,13 @@ +Fri Apr 27 03:50:06 CEST 2007 - sndirsch(a)suse.de + +- xf86-video-nv-20070425.tar.bz2 + * Merge branch 'randr-1.2' + * G80: EXA infrastructure. + * EXA: Add solid, copy, and UTS hooks. + * Get EXA resizing working and document it. + * Remove some old stuff from README.G80. +- obsoletes xf86-video-nv-G84_G86.diff +- obsoletes xf86-video-nv.randr12-20070421.tar.bz2 +- obsoletes xf86-video-nv.randr12.diff + +------------------------------------------------------------------- Old: ---- xf86-video-nv-2.0.2.tar.bz2 xf86-video-nv-G84_G86.diff xf86-video-nv.randr12-20070421.tar.bz2 xf86-video-nv.randr12.diff New: ---- xf86-video-nv-20070425.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ xorg-x11-driver-video.spec ++++++ --- /var/tmp/diff_new_pack.D31802/_old 2007-04-27 08:33:09.000000000 +0200 +++ /var/tmp/diff_new_pack.D31802/_new 2007-04-27 08:33:09.000000000 +0200 @@ -14,7 +14,7 @@ BuildRequires: Mesa-devel libdrm-devel pkgconfig xorg-x11-proto-devel xorg-x11-server-sdk URL: http://xorg.freedesktop.org/ Version: 7.2 -Release: 84 +Release: 88 License: X11/MIT BuildRoot: %{_tmppath}/%{name}-%{version}-build Group: System/X11/Servers/XF86_4 @@ -39,7 +39,7 @@ Source15: xf86-video-neomagic-X11R7.1-1.1.1.tar.bz2 Source16: xf86-video-newport-0.2.1.tar.bz2 Source17: xf86-video-nsc-2.8.2.tar.bz2 -Source18: xf86-video-nv-2.0.2.tar.bz2 +Source18: xf86-video-nv-20070425.tar.bz2 Source19: xf86-video-rendition-4.1.3.tar.bz2 Source20: xf86-video-s3-0.5.0.tar.bz2 Source21: xf86-video-s3virge-X11R7.1-1.9.1.tar.bz2 @@ -68,13 +68,11 @@ Source44: HALlib-4.1.tar.gz Source45: xf86-video-intel-2.0.0.tar.bz2 Source46: xf86-video-ati.randr12-20070318.tar.bz2 -Source47: xf86-video-nv.randr12-20070421.tar.bz2 Source48: xf86-video-mga.randr12-20070417.tar.bz2 Patch: xf86-video-intel.diff Patch1: radeon-xrandr-dotclock.diff Patch2: radeon_dell.diff Patch3: ps_nv.diff -Patch4: xf86-video-nv-G84_G86.diff Patch5: mga-g200se_pci-fix.diff Patch9: xf86-video-sunffb.diff Patch10: xf86-video-tdfx.diff @@ -85,7 +83,6 @@ Patch18: radeon-vbios-ppc.diff Patch27: xf86-video-ati-mergedfb-dpi.diff Patch28: xf86-video-ati.randr12.diff -Patch29: xf86-video-nv.randr12.diff Patch30: xf86-video-mga.randr12.diff Patch31: xf86-video-ati-6.6.191.diff Patch32: bug-263199_radeon-mergedfb-crash.diff @@ -102,10 +99,8 @@ ln -snf ati.man xf86-video-ati.randr12/man/atirandr12.man ln -snf r128.man xf86-video-ati.randr12/man/r128randr12.man ln -snf radeon.man xf86-video-ati.randr12/man/radeonrandr12.man -ln -snf nv.man xf86-video-nv.randr12/man/nvrandr12.man ln -snf mga.man xf86-video-mga.randr12/man/mgarandr12.man %patch28 -%patch29 %patch30 pushd xf86-video-intel-* %patch -p0 @@ -126,9 +121,6 @@ pushd xf86-video-nv-*/src %patch3 -p6 popd -pushd xf86-video-nv-* -%patch4 -p1 -popd pushd xf86-video-mga-*/src tar xzf %{SOURCE44} %patch5 -p1 @@ -164,6 +156,7 @@ case $dir in xf86-video-mga-* | \ xf86-video-intel-* | \ + xf86-video-nv-20070425 | \ *.randr12 | \ xf86-video-nsc-*) autoreconf -fi ;; *) ;; @@ -266,6 +259,16 @@ %{_mandir}/man4/* %changelog +* Fri Apr 27 2007 - sndirsch(a)suse.de +- xf86-video-nv-20070425.tar.bz2 + * Merge branch 'randr-1.2' + * G80: EXA infrastructure. + * EXA: Add solid, copy, and UTS hooks. + * Get EXA resizing working and document it. + * Remove some old stuff from README.G80. +- obsoletes xf86-video-nv-G84_G86.diff +- obsoletes xf86-video-nv.randr12-20070421.tar.bz2 +- obsoletes xf86-video-nv.randr12.diff * Sat Apr 21 2007 - sndirsch(a)suse.de - xf86-video-nv-G84_G86.diff: * GeForce 8300 GS and GeForce 8400 GS. ++++++ xf86-video-nv-2.0.2.tar.bz2 -> xf86-video-nv-20070425.tar.bz2 ++++++ ++++ 47883 lines of diff (skipped) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0