May 2006 - openSUSE Commits - openSUSE Mailing Lists

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

31 May '06

Hello community, here is the log from the commit of package yast2-ncurses checked in at Wed May 31 02:58:57 CEST 2006. -------- --- yast2-ncurses/yast2-ncurses.changes 2006-05-22 11:55:58.000000000 +0200 +++ yast2-ncurses/yast2-ncurses.changes 2006-05-30 11:59:02.000000000 +0200 @@ -1,0 +2,6 @@ +Tue May 30 11:57:06 CEST 2006 - gs(a)suse.de + +- Added support for licenses for patches (bug #174476) +- 2.13.35 + +------------------------------------------------------------------- Old: ---- yast2-ncurses-2.13.34.tar.bz2 New: ---- yast2-ncurses-2.13.35.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-ncurses.spec ++++++ --- /var/tmp/diff_new_pack.R0Vw68/_old 2006-05-31 02:58:39.000000000 +0200 +++ /var/tmp/diff_new_pack.R0Vw68/_new 2006-05-31 02:58:39.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package yast2-ncurses (Version 2.13.34) +# spec file for package yast2-ncurses (Version 2.13.35) # # Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine @@ -11,12 +11,12 @@ # norootforbuild Name: yast2-ncurses -Version: 2.13.34 +Version: 2.13.35 Release: 1 License: GPL Group: System/YaST BuildRoot: %{_tmppath}/%{name}-%{version}-build -Source0: yast2-ncurses-2.13.34.tar.bz2 +Source0: yast2-ncurses-2.13.35.tar.bz2 prefix: /usr BuildRequires: doxygen gcc-c++ libzypp-devel yast2-core-devel yast2-devtools BuildRequires: blocxx-devel libxcrypt-devel @@ -41,7 +41,7 @@ %prep -%setup -n yast2-ncurses-2.13.34 +%setup -n yast2-ncurses-2.13.35 %build %{prefix}/bin/y2tool y2autoconf @@ -74,6 +74,9 @@ %doc %{prefix}/share/doc/packages/yast2-ncurses %changelog -n yast2-ncurses +* Tue May 30 2006 - gs(a)suse.de +- Added support for licenses for patches (bug #174476) +- 2.13.35 * Mon May 22 2006 - gs(a)suse.de - Check whether the window pointer is valid in ::wCreate to prevent a segfault if the terminal is too small ++++++ yast2-ncurses-2.13.34.tar.bz2 -> yast2-ncurses-2.13.35.tar.bz2 ++++++ ++++ 7982 lines of diff (skipped) ++++ retrying with extended exclude list diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-ncurses-2.13.34/VERSION new/yast2-ncurses-2.13.35/VERSION --- old/yast2-ncurses-2.13.34/VERSION 2006-05-22 11:56:07.000000000 +0200 +++ new/yast2-ncurses-2.13.35/VERSION 2006-05-30 11:59:09.000000000 +0200 @@ -1 +1 @@ -2.13.34 +2.13.35 diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-ncurses-2.13.34/configure.in new/yast2-ncurses-2.13.35/configure.in --- old/yast2-ncurses-2.13.34/configure.in 2006-05-16 22:44:11.000000000 +0200 +++ new/yast2-ncurses-2.13.35/configure.in 2006-05-30 09:51:28.000000000 +0200 @@ -3,7 +3,7 @@ dnl -- This file is generated by y2autoconf 2.13.19 - DO NOT EDIT! -- dnl (edit configure.in.in instead) -AC_INIT(yast2-ncurses, 2.13.30, http://bugs.opensuse.org/, yast2-ncurses) +AC_INIT(yast2-ncurses, 2.13.34, http://bugs.opensuse.org/, yast2-ncurses) dnl Check for presence of file 'RPMNAME' AC_CONFIG_SRCDIR([RPMNAME]) @@ -17,7 +17,7 @@ AM_INIT_AUTOMAKE(tar-ustar) dnl searches for some needed programs dnl Important YaST2 variables -VERSION="2.13.30" +VERSION="2.13.34" RPMNAME="yast2-ncurses" MAINTAINER="Martin Lazar <mlazar(a)suse.cz>" diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-ncurses-2.13.34/src/NCPkgTable.cc new/yast2-ncurses-2.13.35/src/NCPkgTable.cc --- old/yast2-ncurses-2.13.34/src/NCPkgTable.cc 2006-05-16 18:58:02.000000000 +0200 +++ new/yast2-ncurses-2.13.35/src/NCPkgTable.cc 2006-05-30 09:20:11.000000000 +0200 @@ -239,27 +239,14 @@ notify = objPtr->insnotify(); NCDBG << "NOTIFY message: " << notify << endl; header = YCPString(PkgNames::NotifyLabel()); - - // get license (available for packages only) - pkgPtr = tryCastToZyppPkg (objPtr); - if ( pkgPtr ) - { - license = pkgPtr->licenseToConfirm(); - license_confirmed = slbPtr->hasLicenceConfirmed(); - } } - break; case S_AutoInstall: case S_AutoUpdate: if ( objPtr ) { - // check license in case of S_AutoInstall/Update, too - pkgPtr = tryCastToZyppPkg (objPtr); - if ( pkgPtr ) - { - license = pkgPtr->licenseToConfirm(); - license_confirmed = slbPtr->hasLicenceConfirmed(); - } + // check license of packages and patches in case of S_Install/S_Update/S_AutoInstall/S_AutoUpdate + license = objPtr->licenseToConfirm(); + license_confirmed = slbPtr->hasLicenceConfirmed(); } break; @@ -270,12 +257,14 @@ if ( !license.empty() ) { - if (!license_confirmed) { + if (!license_confirmed) + { NCPopupInfo info( wpos( 1, 1), - YCPString(_("End User License Agreement") ), - YCPString( "" + pkgName + " " + packager->createDescrText( license ) ), - PkgNames::AcceptLabel(), - PkgNames::CancelLabel() ); + PkgNames::NotifyLabel(), + //YCPString(_("End User License Agreement") ), + YCPString( "" + pkgName + " " + packager->createDescrText( license ) ), + PkgNames::AcceptLabel(), + PkgNames::CancelLabel() ); license_confirmed = info.showInfoPopup( ) != NCursesEvent::cancel; } @@ -300,6 +289,7 @@ ok = false; } else { + NCMIL << "User confirmed license agreement for " << pkgName << endl; slbPtr->setLicenceConfirmed (true); } } @@ -354,51 +344,6 @@ return ok; } -bool NCPkgTable::showLicenseAgreement( ZyppSel & slbPtr , string licenseText ) -{ - if ( !packager || !slbPtr ) - return false; - - bool license_confirmed = true; - bool ok = true; - string pkgName = slbPtr->name(); - - NCPopupInfo info( wpos( 1, 1), - YCPString(_("End User License Agreement") ), - YCPString( "" + pkgName + " " + packager->createDescrText( licenseText ) ), - PkgNames::AcceptLabel(), - PkgNames::CancelLabel() ); - license_confirmed = info.showInfoPopup( ) != NCursesEvent::cancel; - - - if ( !license_confirmed ) - { - // make sure the package won't be installed - switch ( slbPtr->status() ) - { - case S_Install: - case S_AutoInstall: - slbPtr->set_status( S_Taboo ); - break; - - case S_Update: - case S_AutoUpdate: - slbPtr->set_status( S_Protected ); - break; - - default: - break; - } - - ok = false; - } else { - slbPtr->setLicenceConfirmed (true); - ok = true; - } - - return ok; -} - /////////////////////////////////////////////////////////////////// // // diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-ncurses-2.13.34/src/NCPkgTable.h new/yast2-ncurses-2.13.35/src/NCPkgTable.h --- old/yast2-ncurses-2.13.34/src/NCPkgTable.h 2006-05-16 11:08:53.000000000 +0200 +++ new/yast2-ncurses-2.13.35/src/NCPkgTable.h 2006-05-30 09:06:39.000000000 +0200 @@ -316,11 +316,7 @@ */ bool showInformation ( ); - /** - * Show popup with license. - * @return bool - */ - bool showLicenseAgreement( ZyppSel & slbPtr , string licenseText ); + }; /////////////////////////////////////////////////////////////////// diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-ncurses-2.13.34/src/PackageSelector.cc new/yast2-ncurses-2.13.35/src/PackageSelector.cc --- old/yast2-ncurses-2.13.34/src/PackageSelector.cc 2006-05-19 12:33:10.000000000 +0200 +++ new/yast2-ncurses-2.13.35/src/PackageSelector.cc 2006-05-30 11:46:33.000000000 +0200 @@ -1889,7 +1889,7 @@ bool closeDialog = true; bool confirmedAllLicenses = false; - // check/show dependencies and automatic changes also if youMode == true + // check/show dependencies also if youMode == true do { // show the dependency popup @@ -1965,20 +1965,25 @@ } } - bool PackageSelector::showPendingLicenseAgreements() { + bool allConfirmed = true; + + if ( youMode ) + allConfirmed = showPendingLicenseAgreements( zyppPatchesBegin(), zyppPatchesEnd() ); + + allConfirmed = showPendingLicenseAgreements( zyppPkgBegin(), zyppPkgEnd() ) && allConfirmed; + + return allConfirmed; +} + +bool PackageSelector::showPendingLicenseAgreements( ZyppPoolIterator begin, ZyppPoolIterator end ) +{ y2milestone( "Showing all pending license agreements" ); bool allConfirmed = true; - NCPkgTable * packageList = getPackageList(); - if ( !packageList ) - return false; - - for ( ZyppPoolIterator it = zyppPkgBegin(); - it != zyppPkgEnd(); - ++it ) + for ( ZyppPoolIterator it = begin; it != end; ++it ) { ZyppSel sel = (*it); @@ -1991,25 +1996,19 @@ if ( sel->candidateObj() ) { - ZyppPkg pkg = tryCastToZyppPkg( sel->candidateObj() ); + string licenseText = sel->candidateObj()->licenseToConfirm(); - if ( pkg ) + if ( ! licenseText.empty() ) { - string licenseText = pkg->licenseToConfirm(); + y2milestone( "Package/Patch %s has a license agreement", sel->name().c_str() ); - if ( ! licenseText.empty() ) + if( ! sel->hasLicenceConfirmed() ) { - y2milestone( "Pkg %s has a license agreement", sel->name().c_str() ); - - if( ! sel->hasLicenceConfirmed() ) - { - y2debug( "Showing license agreement for pkg %s", sel->name().c_str() ); - allConfirmed = packageList->showLicenseAgreement( sel, licenseText ) && allConfirmed; - } - else - { - y2milestone( "Pkg %s's license is already confirmed", sel->name().c_str() ); - } + allConfirmed = showLicenseAgreement( sel, licenseText ) && allConfirmed; + } + else + { + y2milestone( "Package/Patch %s's license is already confirmed", sel->name().c_str() ); } } } @@ -2023,6 +2022,51 @@ return allConfirmed; } +bool PackageSelector::showLicenseAgreement( ZyppSel & slbPtr , string licenseText ) +{ + if ( !slbPtr ) + return false; + + bool license_confirmed = true; + bool ok = true; + string pkgName = slbPtr->name(); + + NCPopupInfo info( wpos( 1, 1), + PkgNames::NotifyLabel(), + YCPString( "" + pkgName + " " + createDescrText( licenseText ) ), + PkgNames::AcceptLabel(), + PkgNames::CancelLabel() ); + license_confirmed = info.showInfoPopup( ) != NCursesEvent::cancel; + + + if ( !license_confirmed ) + { + // make sure the package won't be installed + switch ( slbPtr->status() ) + { + case S_Install: + case S_AutoInstall: + slbPtr->set_status( S_Taboo ); + break; + + case S_Update: + case S_AutoUpdate: + slbPtr->set_status( S_Protected ); + break; + + default: + break; + } + + ok = false; + } else { + NCMIL << "User confirmed license agreement for " << pkgName << endl; + slbPtr->setLicenceConfirmed (true); + ok = true; + } + + return ok; +} /////////////////////////////////////////////////////////////////// diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-ncurses-2.13.34/src/PackageSelector.h new/yast2-ncurses-2.13.35/src/PackageSelector.h --- old/yast2-ncurses-2.13.34/src/PackageSelector.h 2006-05-17 12:44:48.000000000 +0200 +++ new/yast2-ncurses-2.13.35/src/PackageSelector.h 2006-05-30 09:06:38.000000000 +0200 @@ -406,8 +406,15 @@ /** * Check for license */ - bool showPendingLicenseAgreements(); + bool showPendingLicenseAgreements(); + bool showPendingLicenseAgreements( ZyppPoolIterator begin, ZyppPoolIterator end ); + /** + * Show popup with license. + * @return bool + */ + bool showLicenseAgreement( ZyppSel & slbPtr , string licenseText ); + void createFilterMenu(); }; ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun...

1 0

commit yast2-packager
by root＠suse.de 31 May '06

31 May '06

Hello community, here is the log from the commit of package yast2-packager checked in at Wed May 31 02:58:56 CEST 2006. -------- --- yast2-packager/yast2-packager.changes 2006-05-25 17:50:20.000000000 +0200 +++ yast2-packager/yast2-packager.changes 2006-05-30 16:31:26.000000000 +0200 @@ -1,0 +2,15 @@ +Tue May 30 16:07:38 CEST 2006 - jsrain(a)suse.cz + +- fixed installation into directory (preselect patterns, don't ask + about base selection if pattern-based installation) (#177917) +- 2.13.122 + +------------------------------------------------------------------- +Tue May 30 08:46:50 CEST 2006 - locilka(a)suse.cz + +- Reimplementing the "Do Not Show Again" popups to store this flag + permanently. It stores URL + dialog type + default return + value (#175845). +- 2.13.121 + +------------------------------------------------------------------- Old: ---- yast2-packager-2.13.120.tar.bz2 New: ---- yast2-packager-2.13.122.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-packager.spec ++++++ --- /var/tmp/diff_new_pack.JB1JkU/_old 2006-05-31 02:58:46.000000000 +0200 +++ /var/tmp/diff_new_pack.JB1JkU/_new 2006-05-31 02:58:46.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package yast2-packager (Version 2.13.120) +# spec file for package yast2-packager (Version 2.13.122) # # Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine @@ -11,12 +11,12 @@ # norootforbuild Name: yast2-packager -Version: 2.13.120 +Version: 2.13.122 Release: 1 License: GPL Group: System/YaST BuildRoot: %{_tmppath}/%{name}-%{version}-build -Source0: yast2-packager-2.13.120.tar.bz2 +Source0: yast2-packager-2.13.122.tar.bz2 prefix: /usr BuildRequires: docbook-xsl-stylesheets doxygen gcc-c++ libxcrypt-devel libxslt perl-XML-Writer sgml-skel update-desktop-files yast2 yast2-country yast2-devtools yast2-installation yast2-testsuite yast2-xml Requires: yast2 yast2-installation checkmedia yast2-country @@ -43,7 +43,7 @@ Arvin Schnell <arvin(a)suse.de> %prep -%setup -n yast2-packager-2.13.120 +%setup -n yast2-packager-2.13.122 %build %{prefix}/bin/y2tool y2autoconf @@ -80,6 +80,15 @@ %doc %{prefix}/share/doc/packages/yast2-packager %changelog -n yast2-packager +* Tue May 30 2006 - jsrain(a)suse.cz +- fixed installation into directory (preselect patterns, don't ask + about base selection if pattern-based installation) (#177917) +- 2.13.122 +* Tue May 30 2006 - locilka(a)suse.cz +- Reimplementing the "Do Not Show Again" popups to store this flag + permanently. It stores URL + dialog type + default return + value (#175845). +- 2.13.121 * Thu May 25 2006 - mvidner(a)suse.cz - Use Pkg::SourceSaveAll which always saves even if no sources are enabled (#176013). ++++++ yast2-packager-2.13.120.tar.bz2 -> yast2-packager-2.13.122.tar.bz2 ++++++ ++++ 6814 lines of diff (skipped) ++++ retrying with extended exclude list diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-packager-2.13.120/VERSION new/yast2-packager-2.13.122/VERSION --- old/yast2-packager-2.13.120/VERSION 2006-05-25 17:49:19.000000000 +0200 +++ new/yast2-packager-2.13.122/VERSION 2006-05-30 16:14:24.000000000 +0200 @@ -1 +1 @@ -2.13.120 +2.13.122 diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-packager-2.13.120/configure.in new/yast2-packager-2.13.122/configure.in --- old/yast2-packager-2.13.120/configure.in 2006-05-25 18:10:32.000000000 +0200 +++ new/yast2-packager-2.13.122/configure.in 2006-05-30 16:30:08.000000000 +0200 @@ -1,9 +1,9 @@ dnl configure.in for yast2-packager dnl -dnl -- This file is generated by y2autoconf 2.13.17 - DO NOT EDIT! -- +dnl -- This file is generated by y2autoconf 2.13.18 - DO NOT EDIT! -- dnl (edit configure.in.in instead) -AC_INIT(yast2-packager, 2.13.120, http://bugs.opensuse.org/, yast2-packager) +AC_INIT(yast2-packager, 2.13.122, http://bugs.opensuse.org/, yast2-packager) dnl Check for presence of file 'RPMNAME' AC_CONFIG_SRCDIR([RPMNAME]) @@ -17,7 +17,7 @@ AM_INIT_AUTOMAKE(tar-ustar) dnl searches for some needed programs dnl Important YaST2 variables -VERSION="2.13.120" +VERSION="2.13.122" RPMNAME="yast2-packager" MAINTAINER="Jiri Srain <jsrain(a)suse.cz>" diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-packager-2.13.120/src/clients/dirinstall.ycp new/yast2-packager-2.13.122/src/clients/dirinstall.ycp --- old/yast2-packager-2.13.120/src/clients/dirinstall.ycp 2006-04-19 12:59:38.000000000 +0200 +++ new/yast2-packager-2.13.122/src/clients/dirinstall.ycp 2006-05-30 15:52:52.000000000 +0200 @@ -9,7 +9,13 @@ { textdomain "packager"; + import "DirInstall"; import "PackageLock"; + import "Product"; + import "Report"; + + include "dirinstall/ui.ycp"; + // check whether having the packager for ourselves if (! PackageLock::Check ()) return `abort; @@ -19,14 +25,84 @@ PackageCallbacksInit::InitPackageCallbacks(); // initializa the package manager + integer old_src = -1; + integer new_src = -1; + boolean using_patterns = false; + Pkg::TargetFinish (); Pkg::SourceStartManager(true); + boolean have_patterns + = size (Pkg::ResolvableProperties ("", `pattern, "")) > 0; + boolean have_selections + = size (Pkg::GetSelections (`available, "base")) > 0; + have_patterns = have_patterns && ! have_selections; + if (have_patterns) + { + y2milestone ("Host system is using patterns"); + Pkg::TargetInit ("/", false); + list<map<string,any> > prods = Pkg::ResolvableProperties ("", `product, ""); + list<map<string,any> > base_l = filter (map<string,any> p, prods, { + return p["category"]:"" == "base"; + }); + map<string,any> base = base_l[0]:$[]; + if (size (base_l) == 0) + { + y2warning ("No base product found, using first found product"); + base = prods[0]:$[]; + } + y2milestone ("Found base product: %1", base); + prods = Pkg::ResolvableProperties (base["name"]:"", `product, ""); + y2milestone ("Found appropriate base products in sources: %1", prods); + if (size (prods) == 0) + { + // error report + Report::Error (_("Could not read package information.")); + return `abort; + } + map<string,any> prod = prods[0]:$[]; + integer source = prod["source"]:-1; + map src_data = Pkg::SourceGeneralData (source); + Pkg::SourceSetEnabled (source, false); + string url = src_data["url"]:""; + string dir = src_data["product_dir"]:"/"; + if (substring (url, 0, 3) == "cd:" || substring (url, 0, 4) == "dvd:") + { + if (! Popup::ContinueCancel (sformat (_("Insert %1 CD 1"), base["summary"]:""))) + return `back; + } + new_src = Pkg::SourceCreateBase (url, dir); + old_src = source; + using_patterns = true; - import "DirInstall"; - include "dirinstall/ui.ycp"; + string content_file = Pkg::SourceProvideFile (new_src, 1, "/content"); + SCR::RegisterAgent (.media.content, `ag_ini( + `IniAgent( content_file, + $[ + "options" : [ "read_only", "global_values", "flat" ], + "comments" : [ "^#.*", "^[ \t]*$", ], + "params" : [ + $[ "match" : [ "^[ \t]*([a-zA-Z0-9_\.]+)[ \t]*(.*)[ \t]*$", "%s %s" ] ] + ] + ] + ))); + any tmp1 = SCR::Read (.media.content.PATTERNS); + if (tmp1 != nil) + Product::patterns = splitstring ((string)tmp1, " "); + y2milestone ("***Patterns: %1", Product::patterns); + Pkg::TargetFinish (); + } + else + { + y2milestone ("Host system is using selections"); + } symbol ret = Run (); y2milestone ("Sequence returned %1", ret); DirInstall::UmountFilesystems (); + if (using_patterns) + { + Pkg::SourceDelete (new_src); + Pkg::SourceSetEnabled (old_src, true); + } DirInstall::FinishPackageManager (); return ret; } diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-packager-2.13.120/src/clients/inst_dirinstall_finish.ycp new/yast2-packager-2.13.122/src/clients/inst_dirinstall_finish.ycp --- old/yast2-packager-2.13.120/src/clients/inst_dirinstall_finish.ycp 2006-04-27 16:45:08.000000000 +0200 +++ new/yast2-packager-2.13.122/src/clients/inst_dirinstall_finish.ycp 2006-05-30 16:12:59.000000000 +0200 @@ -8,7 +8,7 @@ * Authors: * Anas Nashif <nashif(a)suse.de> * - * $Id: inst_dirinstall_finish.ycp 30518 2006-04-27 06:24:33Z lslezak $ + * $Id: inst_dirinstall_finish.ycp 31191 2006-05-30 14:12:50Z jsrain $ * */ { @@ -106,6 +106,8 @@ } ); + // Stop SCR on target + WFM::SCRClose (Installation::scr_handle); // umount /proc and /sys before creating image (otherwise tar may fail) DirInstall::UmountFilesystems (); @@ -123,9 +125,6 @@ WFM::Execute(.local.bash, cmd); } - // Stop SCR on target - WFM::SCRClose (Installation::scr_handle); - Progress::Finish(); return `next; } diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-packager-2.13.120/src/clients/software_proposal.ycp new/yast2-packager-2.13.122/src/clients/software_proposal.ycp --- old/yast2-packager-2.13.120/src/clients/software_proposal.ycp 2006-03-14 17:25:53.000000000 +0100 +++ new/yast2-packager-2.13.122/src/clients/software_proposal.ycp 2006-05-30 09:42:43.000000000 +0200 @@ -96,7 +96,9 @@ else { symbol result = `again; - string client_to_call = Stage::initial () + string client_to_call = (Stage::initial () + || (size (Pkg::ResolvableProperties ("", `pattern, "")) > 0 + && size (Pkg::GetSelections (`available, "base")) == 0)) ? "inst_sw_select" : "inst_sw_selection_select"; diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-packager-2.13.120/src/modules/DontShowAgain.ycp new/yast2-packager-2.13.122/src/modules/DontShowAgain.ycp --- old/yast2-packager-2.13.120/src/modules/DontShowAgain.ycp 1970-01-01 01:00:00.000000000 +0100 +++ new/yast2-packager-2.13.122/src/modules/DontShowAgain.ycp 2006-05-30 16:29:57.000000000 +0200 @@ -0,0 +1,326 @@ +/** + * File: modules/DontShowAgain.ycp + * Authors: Lukas Ocilka <locilka(a)suse.cz> + * Summary: Handling "Don Not Show This Dialog Again" + * + * $Id: DontShowAgain.ycp 11111 2006-05-29 12:27:15Z locilka $ + */ +{ + module "DontShowAgain"; + textdomain "packager"; + + import "Directory"; + import "FileUtils"; + + /** + * Module for that stores and returns the information for + * "Don't Show This Dialog/Question Again" + */ + + /* File with the current configuration */ + string conf_file = Directory::vardir + "/dont_show_again.conf"; + + /** + * Current configuration map + * + * @struct $[ + * // question type + * "inst-source" : $[ + * // question identification (MD5sum of the question in the future?) + * "-question-ident-" : $[ + * // url of the file or directory + * "ftp://abc.xyz/rtf" : $[ + * // show the dialog again + * "show_again" : false, + * // additional question return + * "return" : true, + * ] + * ] + * ] + * ] + */ + map <string, map <string, map <string, any> > > current_configuration = $[]; + + /* Configuration has already been read */ + global boolean already_read = false; + + /** + * Function that reads the current configuration if it hasn't been + * read already. It must be called before every Get or Set command. + */ + void LazyLoadCurrentConf () { + if (! already_read) { + if (FileUtils::Exists(conf_file) && FileUtils::IsFile(conf_file)) { + y2milestone("Reading %1 file", conf_file); + // Read and evaluate the current configuration + map <string, map <string, map <string, any> > > read_conf = (map <string, map <string, map <string, any> > >) + SCR::Read(.target.ycp, conf_file); + if (read_conf != nil) { + current_configuration = read_conf; + } + } else { + y2milestone("Configuration file %1 doesn't exist, there's no current configuration.", + conf_file + ); + } + + // Configuration mustn't be read again + already_read = true; + } + } + + /** + * Saves the current configuration into the configuration file + */ + boolean SaveCurrentConfiguration () { + LazyLoadCurrentConf(); + + return SCR::Write(.target.ycp, conf_file, current_configuration); + } + + /** + * Returns whether the question should be shown again + * + * @param map <string, string> of params + * @see current_configuration + * @return boolean it should be shown + */ + global boolean GetShowQuestionAgain (map <string, string> params) { + LazyLoadCurrentConf(); + string q_type = params["q_type"]:nil; + + // <--- Installation Sources ---> + /* + * Parameters, $[ + * "q_type" : "inst-source", // mandatory + * "q_ident" : "Question Identification", // mandatory + * "q_url" : "URL" // optional + * ]; + */ + if (q_type == "inst-source") { + string q_ident = params["q_ident"]:nil; + string q_url = params["q_url"]:nil; + + if (q_ident == nil) { + y2error("'q_ident' is a mandatory parameter"); + return nil; + } + + if (current_configuration[q_type]:nil == nil + || current_configuration[q_type, q_ident]:nil == nil + || current_configuration[q_type, q_ident, q_url]:nil == nil + || current_configuration[q_type, q_ident, q_url, "show_again"]:nil == nil) { + return nil; + } + + return (boolean) current_configuration[q_type, q_ident, q_url, "show_again"]:nil; + // <--- Installation Sources ---> + + // Add another types here... + } else { + y2error("'%1' is an unknown type", q_type); + return nil; + } + } + + /** + * Sets and stores whether the question should be shown again. + * If it should be, the result is not stored since the 'show again' + * is the default value. + * + * @param map <string, string> of params + * @see current_configuration + * @param boolean show again + * @return boolean if success + */ + global boolean SetShowQuestionAgain (map <string, string> params, boolean new_value) { + LazyLoadCurrentConf(); + string q_type = params["q_type"]:nil; + // Always set to 'true' if the configuration is changed + boolean conf_changed = false; + + // <--- Installation Sources ---> + /* + * Parameters, $[ + * "q_type" : "inst-source", // mandatory + * "q_ident" : "Question Identification", // mandatory + * "q_url" : "URL" // optional + * ]; + */ + if (q_type == "inst-source") { + string q_ident = params["q_ident"]:nil; + string q_url = params["q_url"]:nil; + + if (q_ident == nil) { + y2error("'q_ident' is a mandatory parameter"); + return nil; + } + + // building the configuration map + if (current_configuration[q_type]:nil == nil) { + current_configuration[q_type] = $[]; + } + if (current_configuration[q_type, q_ident]:nil == nil) { + current_configuration[q_type, q_ident] = $[]; + } + if (current_configuration[q_type, q_ident, q_url]:nil == nil) { + current_configuration[q_type, q_ident, q_url] = $[]; + } + + // save the new value into the configuration + conf_changed = true; + current_configuration[q_type, q_ident, q_url, "show_again"] = new_value; + // <--- Installation Sources ---> + + // Add another types here... + } else { + y2error("'%1' is an unknown type", q_type); + return nil; + } + + if (conf_changed) return SaveCurrentConfiguration(); + else return nil; + } + + /** + * Return the default return value for question that should not + * be shown again + * + * @param map <string, string> of params + * @see current_configuration + * @return any default return value + */ + global any GetDefaultReturn (map <string, string> params) { + LazyLoadCurrentConf(); + string q_type = params["q_type"]:nil; + + // <--- Installation Sources ---> + /* + * Parameters, $[ + * "q_type" : "inst-source", // mandatory + * "q_ident" : "Question Identification", // mandatory + * "q_url" : "URL" // optional + * ]; + */ + // <--- Installation Sources ---> + if (q_type == "inst-source") { + string q_ident = params["q_ident"]:nil; + string q_url = params["q_url"]:nil; + + if (current_configuration[q_type]:nil == nil + || current_configuration[q_type, q_ident]:nil == nil + || current_configuration[q_type, q_ident, q_url]:nil == nil + || current_configuration[q_type, q_ident, q_url, "return"]:nil == nil) { + return nil; + } + + return current_configuration[q_type, q_ident, q_url, "return"]:nil; + + // Add another types here... + } else { + y2error("'%1' is an unknown type", q_type); + return nil; + } + // <--- Installation Sources ---> + } + + /** + * Sets the default return value for the question that should not be shown + * + * @param map <string, string> of params + * @param any default return + * @see current_configuration + * @return boolean if success + */ + global boolean SetDefaultReturn (map <string, string> params, any default_return) { + LazyLoadCurrentConf(); + string q_type = params["q_type"]:nil; + // Always set to 'true' if the configuration is changed + boolean conf_changed = false; + + // <--- Installation Sources ---> + /* + * Parameters, $[ + * "q_type" : "inst-source", // mandatory + * "q_ident" : "Question Identification", // mandatory + * "q_url" : "URL" // optional + * ]; + */ + if (q_type == "inst-source") { + string q_ident = params["q_ident"]:nil; + string q_url = params["q_url"]:nil; + + if (q_ident == nil) { + y2error("'q_ident' is a mandatory parameter"); + return nil; + } + + // building the configuration map + if (current_configuration[q_type]:nil == nil) { + current_configuration[q_type] = $[]; + } + if (current_configuration[q_type, q_ident]:nil == nil) { + current_configuration[q_type, q_ident] = $[]; + } + if (current_configuration[q_type, q_ident, q_url]:nil == nil) { + current_configuration[q_type, q_ident, q_url] = $[]; + } + + // save the new value into the configuration + conf_changed = true; + current_configuration[q_type, q_ident, q_url, "return"] = default_return; + // <--- Installation Sources ---> + + // Add another types here... + } else { + y2error("'%1' is an unknown type", q_type); + return nil; + } + + if (conf_changed) return SaveCurrentConfiguration(); + else return nil; + } + + /** + * Returns the current configuration map + * + * @return map <string, map <string, map <string, any> > > with the current configuration + * @see current_configuration + */ + global map <string, map <string, map <string, any> > > GetCurrentConfigurationMap () { + LazyLoadCurrentConf(); + return current_configuration; + } + + /** + * Removes one entry defined with map params + * + * @param map <string, string> of params + * @see current_configuration + * @return boolean if success + */ + global boolean RemoveShowQuestionAgain (map <string, string> params) { + LazyLoadCurrentConf(); + string q_type = params["q_type"]:nil; + + if (q_type == "inst-source") { + string q_ident = params["q_ident"]:nil; + string q_url = params["q_url"]:nil; + + if (current_configuration[q_type]:nil != nil + && current_configuration[q_type, q_ident]:nil != nil + && current_configuration[q_type, q_ident, q_url]:nil != nil) { + + current_configuration[q_type, q_ident, q_url] = nil; + SaveCurrentConfiguration(); + } + + return (current_configuration[q_type]:nil != nil + && current_configuration[q_type, q_ident]:nil != nil + && current_configuration[q_type, q_ident, q_url]:nil != nil); + } else { + y2error("'%1' is an unknown type", q_type); + return false; + } + } +} diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-packager-2.13.120/src/modules/Packages.ycp new/yast2-packager-2.13.122/src/modules/Packages.ycp --- old/yast2-packager-2.13.120/src/modules/Packages.ycp 2006-05-25 17:42:43.000000000 +0200 +++ new/yast2-packager-2.13.122/src/modules/Packages.ycp 2006-05-30 16:12:59.000000000 +0200 @@ -3,7 +3,7 @@ * Package: Package selections * Authors: Anas Nashif <nashif(a)suse.de> * - * $Id: Packages.ycp 31125 2006-05-24 10:55:12Z jsrain $ + * $Id: Packages.ycp 31191 2006-05-30 14:12:50Z jsrain $ */ { @@ -483,6 +483,7 @@ string current_base_selection = base_selections[0]:""; if (current_base_selection != "") { + Reset ([`product]); Pkg::ClearSelection (current_base_selection); } Pkg::SetSelection (basename); diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-packager-2.13.120/src/modules/SignatureCheckCallbacks.ycp new/yast2-packager-2.13.122/src/modules/SignatureCheckCallbacks.ycp --- old/yast2-packager-2.13.120/src/modules/SignatureCheckCallbacks.ycp 2006-04-25 17:07:59.000000000 +0200 +++ new/yast2-packager-2.13.122/src/modules/SignatureCheckCallbacks.ycp 2006-05-30 09:22:17.000000000 +0200 @@ -31,11 +31,11 @@ string dont_show_dialog_ident = "-AcceptUnsignedFile-"; // Show the popup? - if (SignatureCheckDialogs::GetShowThisPopup(dont_show_dialog_ident)) { + if (SignatureCheckDialogs::GetShowThisPopup(dont_show_dialog_ident, filename)) { return SignatureCheckDialogs::UseUnsignedItem(`file, filename, dont_show_dialog_ident); // Return the default value entered by user } else { - return SignatureCheckDialogs::GetDefaultDialogReturn(dont_show_dialog_ident); + return SignatureCheckDialogs::GetDefaultDialogReturn(dont_show_dialog_ident, filename); } } @@ -53,11 +53,11 @@ string dont_show_dialog_ident = "-AcceptFileWithoutChecksum-"; // Show the popup? - if (SignatureCheckDialogs::GetShowThisPopup(dont_show_dialog_ident)) { + if (SignatureCheckDialogs::GetShowThisPopup(dont_show_dialog_ident, filename)) { return SignatureCheckDialogs::UseItemWithNoChecksum(`file, filename, dont_show_dialog_ident); // Return the default value entered by user } else { - return SignatureCheckDialogs::GetDefaultDialogReturn(dont_show_dialog_ident); + return SignatureCheckDialogs::GetDefaultDialogReturn(dont_show_dialog_ident, filename); } } @@ -75,12 +75,12 @@ string dont_show_dialog_ident = "-AcceptUnknownGpgKey-"; // Show the popup? - if (SignatureCheckDialogs::GetShowThisPopup(dont_show_dialog_ident)) { + if (SignatureCheckDialogs::GetShowThisPopup(dont_show_dialog_ident, filename)) { // Unknown keyname == "Unknown Key" return SignatureCheckDialogs::ItemSignedWithUnknownSignature(`file, filename, keyid, fingerprint, dont_show_dialog_ident); // Return the default value entered by user } else { - return SignatureCheckDialogs::GetDefaultDialogReturn(dont_show_dialog_ident); + return SignatureCheckDialogs::GetDefaultDialogReturn(dont_show_dialog_ident, filename); } } diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-packager-2.13.120/src/modules/SignatureCheckDialogs.ycp new/yast2-packager-2.13.122/src/modules/SignatureCheckDialogs.ycp --- old/yast2-packager-2.13.120/src/modules/SignatureCheckDialogs.ycp 2006-04-25 17:07:59.000000000 +0200 +++ new/yast2-packager-2.13.122/src/modules/SignatureCheckDialogs.ycp 2006-05-30 09:22:17.000000000 +0200 @@ -15,29 +15,34 @@ import "Label"; import "Popup"; import "Message"; + import "DontShowAgain"; /* --------------------------- Don't show this dialog again Magic --------------------------- */ - map <string, boolean> show_popup = $[]; - map <string, boolean> popup_ret = $[]; - /** * Functions sets whether user want's to show the dialog again * * @param string popup_type dialog type * @param boolean show again + * @param string popup_url */ - global void SetShowThisPopup (string popup_type, boolean show_it) { + global void SetShowThisPopup (string popup_type, boolean show_it, string popup_url) { if (popup_type == nil || show_it == nil) { y2error("Neither popup_type %1 nor show_it %2 can be nil!", popup_type, show_it); return; } + + // it's the default if (show_it) { y2debug("User decision to show dialog '%1' again is '%2'", popup_type, show_it); + // store only "don't show" } else { - y2milestone("User decision to show dialog '%1' again is '%2'", popup_type, show_it); + y2milestone("User decision to show dialog '%1' for '%2' again is '%3'", popup_type, popup_url, show_it); + // Show again -> false, so, store it + DontShowAgain::SetShowQuestionAgain($[ + "q_type" : "inst-source", "q_ident" : popup_type, "q_url" : popup_url + ], show_it); } - show_popup[popup_type] = show_it; } /** @@ -45,15 +50,26 @@ * true is the default if nothing is set. * * @param string popup_type dialog type + * @param string popup_url if any * @return boolean show the dialog */ - global boolean GetShowThisPopup (string popup_type) { + global boolean GetShowThisPopup (string popup_type, string popup_url) { if (popup_type == nil) { y2error("popup_type %1 mustn't be nil!", popup_type); return true; } - // default (if not defined) is 'true' - return show_popup[popup_type]:true; + + // Read the current configuration from system configuration + boolean stored = DontShowAgain::GetShowQuestionAgain($[ + "q_type" : "inst-source", "q_ident" : popup_type, "q_url" : popup_url + ]); + + // Stored in the configuration + if (stored != nil) + return stored; + // Unknown status, return default + else + return true; } /** @@ -63,14 +79,16 @@ * @param string popup_type dialog type * @param boolean default_return */ - global void SetDefaultDialogReturn (string popup_type, boolean default_return) { + global void SetDefaultDialogReturn (string popup_type, boolean default_return, string popup_url) { if (popup_type == nil || default_return == nil) { y2error("Neither popup_type %1 nor default_return %2 can be nil!", popup_type, default_return); return; } - y2milestone("User decision in default return for '%1' is '%2'", - popup_type, default_return); - popup_ret[popup_type] = default_return; + y2milestone("User decision in default return for '%1' for '%2' is '%3'", + popup_type, popup_url, default_return); + DontShowAgain::SetDefaultReturn($[ + "q_type" : "inst-source", "q_ident" : popup_type, "q_url" : popup_url, + ], default_return); } /** @@ -80,17 +98,22 @@ * @param string popup_type dialog type * @boolean boolean default dialog return */ - global boolean GetDefaultDialogReturn (string popup_type) { + global boolean GetDefaultDialogReturn (string popup_type, string popup_url) { if (popup_type == nil) { y2error("popup_type %1 mustn't be nil!", popup_type); return false; } + + boolean stored_return = (boolean) DontShowAgain::GetDefaultReturn($[ + "q_type" : "inst-source", "q_ident" : popup_type, "q_url" : popup_url, + ]); + y2milestone("User decided not to show popup for '%1' again, returning user-decision '%2'", - popup_type, popup_ret[popup_type]:false); - return popup_ret[popup_type]:false; + popup_type, stored_return); + return stored_return; } - void HandleDoNotShowDialogAgain (boolean default_return, string dont_show_dialog_ident, symbol dont_show_dialog_checkboxid) { + void HandleDoNotShowDialogAgain (boolean default_return, string dont_show_dialog_ident, symbol dont_show_dialog_checkboxid, string dont_show_url) { boolean dont_show_status = (boolean) UI::QueryWidget(`id(dont_show_dialog_checkboxid), `Value); // Widget doesn't exist if (dont_show_status == nil) { @@ -99,11 +122,11 @@ } else if (dont_show_status == true) { y2debug("User decision -- don't show the dialog %1 again, setting default return %2", dont_show_dialog_ident, default_return); - SetShowThisPopup(dont_show_dialog_ident, false); - SetDefaultDialogReturn(dont_show_dialog_ident, default_return); + SetShowThisPopup(dont_show_dialog_ident, false, dont_show_url); + SetDefaultDialogReturn(dont_show_dialog_ident, default_return, dont_show_url); // Checkbox not selected -> Show again } else { - SetShowThisPopup(dont_show_dialog_ident, true); + SetShowThisPopup(dont_show_dialog_ident, true, dont_show_url); } } @@ -302,7 +325,7 @@ `MarginBox(0.5, 0.5, `Label(description_text)), `Left(`MarginBox(0, 1.2, `CheckBox(`id(`dont_show_again), Message::DoNotShowMessageAgain(), - (GetShowThisPopup(dont_show_dialog_ident) ? false:true) + (GetShowThisPopup(dont_show_dialog_ident, item_name) ? false:true) ))), YesNoButtons(`no) ) @@ -313,7 +336,7 @@ if (ret == nil) ret = false; // Store the don't show value, store the default return value - HandleDoNotShowDialogAgain(ret, dont_show_dialog_ident, `dont_show_again); + HandleDoNotShowDialogAgain(ret, dont_show_dialog_ident, `dont_show_again, item_name); UI::CloseDialog(); return ret; @@ -359,7 +382,7 @@ `MarginBox(0.5, 0.5, `Label(description_text)), `Left(`MarginBox(0, 1.2, `CheckBox(`id(`dont_show_again), Message::DoNotShowMessageAgain(), - (GetShowThisPopup(dont_show_dialog_ident) ? false:true) + (GetShowThisPopup(dont_show_dialog_ident, item_name) ? false:true) ))), YesNoButtons(`no) ) @@ -370,7 +393,7 @@ if (ret == nil) ret = false; // Store the don't show value, store the default return value - HandleDoNotShowDialogAgain(ret, dont_show_dialog_ident, `dont_show_again); + HandleDoNotShowDialogAgain(ret, dont_show_dialog_ident, `dont_show_again, item_name); UI::CloseDialog(); return ret; @@ -494,7 +517,7 @@ `MarginBox(0.5, 0.5, `Label(description_text)), `Left(`MarginBox(0, 1.2, `CheckBox(`id(`dont_show_again), Message::DoNotShowMessageAgain(), - (GetShowThisPopup(dont_show_dialog_ident) ? false:true) + (GetShowThisPopup(dont_show_dialog_ident, item_name) ? false:true) ))), YesNoButtons(`no) ) @@ -508,7 +531,7 @@ if (ret == nil) ret = false; // Store the don't show value, store the default return value - HandleDoNotShowDialogAgain(ret, dont_show_dialog_ident, `dont_show_again); + HandleDoNotShowDialogAgain(ret, dont_show_dialog_ident, `dont_show_again, item_name); UI::CloseDialog(); return ret; ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun...

1 0

commit xorg-x11
by root＠suse.de 31 May '06

31 May '06

Hello community, here is the log from the commit of package xorg-x11 checked in at Wed May 31 02:58:05 CEST 2006. -------- --- xorg-x11/xorg-x11.changes 2006-05-29 14:05:19.000000000 +0200 +++ xorg-x11/xorg-x11.changes 2006-05-30 15:26:11.000000000 +0200 @@ -1,0 +2,6 @@ +Tue May 30 15:24:35 CEST 2006 - sndirsch(a)suse.de + +- fixed check for empty /usr/X11R6/lib/X11/fonts/misc/fonts.dir + (Bug #178315) + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ xorg-x11.spec ++++++ --- /var/tmp/diff_new_pack.X5Qvdg/_old 2006-05-31 02:57:30.000000000 +0200 +++ /var/tmp/diff_new_pack.X5Qvdg/_new 2006-05-31 02:57:30.000000000 +0200 @@ -40,7 +40,7 @@ %endif Autoreqprov: on Version: 6.9.0 -Release: 54 +Release: 55 Summary: The basic X Window System package Source: xorg-6.9.0.tar.bz2 Source1: xdm.tar.gz @@ -1726,7 +1726,7 @@ make install.man DESTDIR=$RPM_BUILD_ROOT make install.sdk DESTDIR=$RPM_BUILD_ROOT # make sure that fonts.dir is not empty (Bug #178315) -test -s $RPM_BUILD_ROOT/usr/X11R6/lib/X11/fonts/misc/fonts.dir +head -n 1 $RPM_BUILD_ROOT/usr/X11R6/lib/X11/fonts/misc/fonts.dir | grep "^0" && exit 1 # build libxf86config also for s390/s390x (Bug #145823) %ifarch s390 s390x make -C programs/Xserver/hw/xfree86/parser install DESTDIR=$RPM_BUILD_ROOT @@ -2718,6 +2718,9 @@ %clean %changelog -n xorg-x11 +* Tue May 30 2006 - sndirsch(a)suse.de +- fixed check for empty /usr/X11R6/lib/X11/fonts/misc/fonts.dir + (Bug #178315) * Mon May 29 2006 - sndirsch(a)suse.de - p_xlib_skip_select_substructure_redirect.diff: * fool java swing apps that no WM is running (Bug #151836) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun...

1 0

commit xorg-x11-driver-video
by root＠suse.de 31 May '06

31 May '06

Hello community, here is the log from the commit of package xorg-x11-driver-video checked in at Wed May 31 02:57:58 CEST 2006. -------- --- xorg-x11-driver-video/xorg-x11-driver-video.changes 2006-05-23 10:01:39.000000000 +0200 +++ xorg-x11-driver-video/xorg-x11-driver-video.changes 2006-05-30 11:11:04.000000000 +0200 @@ -1,0 +2,5 @@ +Tue May 30 11:10:45 CEST 2006 - sndirsch(a)suse.de + +- added alternative i810 driver (Bug #179773) + +------------------------------------------------------------------- New: ---- randrstr.h xf86-video-i810-X11R7.1-1.6.0.diff xf86-video-i810-X11R7.1-1.6.0.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ xorg-x11-driver-video.spec ++++++ --- /var/tmp/diff_new_pack.B6LM4B/_old 2006-05-31 02:57:34.000000000 +0200 +++ /var/tmp/diff_new_pack.B6LM4B/_new 2006-05-31 02:57:34.000000000 +0200 @@ -20,7 +20,7 @@ Group: System/X11/Servers/XF86_4 Autoreqprov: on Version: 6.9.0 -Release: 47 +Release: 48 Summary: Various X.Org video drivers Requires: xorg-x11-server Provides: xorg-x11-server:/usr/X11R6/%{_lib}/modules/drivers/sis_drv.o @@ -35,6 +35,8 @@ Source8: xorg-x11-sis-6.9.0.tar.bz2 Source9: xorg-x11-ati-6.8.2suse100.tar.bz2 Source10: xorg-x11-ati-1_0_branch-060425.tar.bz2 +Source11: xf86-video-i810-X11R7.1-1.6.0.tar.bz2 +Source12: randrstr.h Patch: ps_nv.diff Patch1: p_64bit-clean.diff Patch2: p_radeon-memmap.diff @@ -58,6 +60,7 @@ Patch20: nv-060426.diff Patch21: radeon_bios.diff Patch22: rn50_disable-render-accel.diff +Patch23: xf86-video-i810-X11R7.1-1.6.0.diff BuildRoot: %{_tmppath}/%{name}-%{version}-build %define BUILD_ALL 1 %define ATI_SUSE100 1 @@ -152,7 +155,7 @@ %endif %prep %if %ATI_SUSE100 -%setup -n xc/programs/Xserver/hw/xfree86/drivers -b3 -b4 -b5 -b6 -b7 -b8 -b9 +%setup -n xc/programs/Xserver/hw/xfree86/drivers -b3 -b4 -b5 -b6 -b7 -b8 -b9 -a11 pushd ati-6.8.2suse100 %patch3 popd @@ -210,14 +213,22 @@ %patch20 popd %endif +pushd xf86-video-i810-X11R7.1-1.6.0/src + cp ../../i810/Imakefile . + cp $RPM_SOURCE_DIR/randrstr.h . + patch -p0 < $RPM_SOURCE_DIR/xf86-video-i810-X11R7.1-1.6.0.diff +popd %build %ifnarch s390 s390x %if %BUILD_ALL -for dir in $(ls); do +for dir in xf86-video-i810-X11R7.1-1.6.0/src $(ls|grep -v xf86-video-i810-X11R7.1-1.6.0); do %else for dir in $(ls|grep ast); do %endif +%ifarch ppc64 + test "$dir" == "xf86-video-i810-X11R7.1-1.6.0/src" && continue +%endif pushd $dir xmkmf make CDEBUGFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing -I/usr/X11R6/%{_lib}/Server/include -I/usr/X11R6/%{_lib}/Server/include/extensions -I/usr/X11R6/%{_lib}/Server/drivers/ati -I/usr/include/drm" PREPROCESSMANPAGES="true" @@ -228,10 +239,13 @@ %install %ifnarch s390 s390x %if %BUILD_ALL -for dir in $(ls); do +for dir in xf86-video-i810-X11R7.1-1.6.0/src $(ls|grep -v xf86-video-i810-X11R7.1-1.6.0); do %else for dir in $(ls|grep ast); do %endif +%ifarch ppc64 + test "$dir" == "xf86-video-i810-X11R7.1-1.6.0/src" && continue +%endif pushd $dir make install DESTDIR=$RPM_BUILD_ROOT make install.man DESTDIR=$RPM_BUILD_ROOT @@ -269,6 +283,9 @@ /usr/X11R6/%{_lib}/modules/drivers/ati_drv.so /usr/X11R6/%{_lib}/modules/drivers/atimisc_drv.so /usr/X11R6/%{_lib}/modules/drivers/i810_drv.so +%ifnarch ppc64 +/usr/X11R6/%{_lib}/modules/drivers/i810xorg71_drv.so +%endif /usr/X11R6/%{_lib}/modules/drivers/mga_drv.so %ifarch %ix86 /usr/X11R6/%{_lib}/modules/drivers/mga_hal_drv.so @@ -304,6 +321,8 @@ %endif %changelog -n xorg-x11-driver-video +* Tue May 30 2006 - sndirsch(a)suse.de +- added alternative i810 driver (Bug #179773) * Tue May 23 2006 - sndirsch(a)suse.de - no longer remove NVIDIA driver in %%pre of xorg-x11-driver-video-nvidia; it no longer conflicts with NVIDIA ++++++ xf86-video-i810-X11R7.1-1.6.0.diff ++++++ diff -u -r ../src.orig/Imakefile ./Imakefile --- ../src.orig/Imakefile 2006-05-29 20:04:27.000000000 +0000 +++ ./Imakefile 2006-05-29 20:03:54.000000000 +0000 @@ -42,9 +42,9 @@ i810_video.o i810_io.o i830_modes.o #endif I830SRCS = i830_driver.c i830_memory.c i830_cursor.c i830_accel.c i830_io.c \ - i830_dga.c i830_shadow.c $(I830SRCS1) $(I830SRCS2) + i830_dga.c i830_randr.c i830_rotate.c $(I830SRCS1) $(I830SRCS2) I830OBJS = i830_driver.o i830_memory.o i830_cursor.o i830_accel.o i830_io.o \ - i830_dga.o i830_shadow.o $(I830OBJS1) $(I830OBJS2) + i830_dga.o i830_randr.o i830_rotate.o $(I830OBJS1) $(I830OBJS2) SRCS = i810_driver.c \ $(I810SRCS) $(I830SRCS) $(DRISRCS) @@ -86,13 +86,9 @@ ModuleObjectRule() -ObjectModuleTarget(i810,$(OBJS)) +ObjectModuleTarget(i810xorg71,$(OBJS)) -InstallVideoObjectModule(i810,$(MODULEDIR)) - -#if !defined(XF86DriverSDK) -InstallModuleManPage(i810) -#endif +InstallVideoObjectModule(i810xorg71,$(MODULEDIR)) DependTarget() @@ -121,7 +117,8 @@ InstallDriverSDKNonExecFile(i830_dri.h,$(DRIVERSDKDIR)/drivers/i810) InstallDriverSDKNonExecFile(i830_driver.c,$(DRIVERSDKDIR)/drivers/i810) InstallDriverSDKNonExecFile(i830_memory.c,$(DRIVERSDKDIR)/drivers/i810) -InstallDriverSDKNonExecFile(i830_shadow.c,$(DRIVERSDKDIR)/drivers/i810) +InstallDriverSDKNonExecFile(i830_randr.c,$(DRIVERSDKDIR)/drivers/i810) +InstallDriverSDKNonExecFile(i830_rotate.c,$(DRIVERSDKDIR)/drivers/i810) InstallDriverSDKNonExecFile(i830_video.c,$(DRIVERSDKDIR)/drivers/i810) InstallDriverSDKObjectModule(i810,$(DRIVERSDKMODULEDIR),drivers) diff -u -r ../src.orig/i810.h ./i810.h --- ../src.orig/i810.h 2006-05-29 20:00:09.000000000 +0000 +++ ./i810.h 2006-05-29 20:07:46.000000000 +0000 @@ -62,8 +62,8 @@ #include "common.h" #define I810_VERSION 4000 -#define I810_NAME "I810" -#define I810_DRIVER_NAME "i810" +#define I810_NAME "I810XORG71" +#define I810_DRIVER_NAME "i810xorg71" #define I810_MAJOR_VERSION 1 #define I810_MINOR_VERSION 6 #define I810_PATCHLEVEL 0 diff -u -r ../src.orig/i810_driver.c ./i810_driver.c --- ../src.orig/i810_driver.c 2006-05-29 20:00:09.000000000 +0000 +++ ./i810_driver.c 2006-05-29 20:06:34.000000000 +0000 @@ -367,7 +367,7 @@ static MODULESETUPPROTO(i810Setup); static XF86ModuleVersionInfo i810VersRec = { - "i810", + "i810xorg71", MODULEVENDORSTRING, MODINFOSTRING1, MODINFOSTRING2, @@ -379,7 +379,7 @@ {0, 0, 0, 0} }; -_X_EXPORT XF86ModuleData i810ModuleData = { &i810VersRec, i810Setup, 0 }; +_X_EXPORT XF86ModuleData i810xorg71ModuleData = { &i810VersRec, i810Setup, 0 }; static pointer i810Setup(pointer module, pointer opts, int *errmaj, int *errmin) --- i830_rotate.c.orig 2006-05-29 20:32:24.000000000 +0000 +++ i830_rotate.c 2006-05-29 20:34:35.000000000 +0000 @@ -199,7 +199,7 @@ I830Ptr pI830 = I830PTR(pScrn); ScrnInfoPtr pScrn1 = pScrn; I830Ptr pI8301 = NULL; - RegionPtr damage = shadowDamage(pBuf); + RegionPtr damage = (RegionPtr) shadowDamage(pBuf); int nbox = REGION_NUM_RECTS (damage); BoxPtr pbox = REGION_RECTS (damage); int box_x1, box_x2, box_y1, box_y2; @@ -431,7 +431,7 @@ I830Ptr pI830 = I830PTR(pScrn); I830Ptr pI8301 = NULL; ScrnInfoPtr pScrn1 = pScrn; - RegionPtr damage = shadowDamage(pBuf); + RegionPtr damage = (RegionPtr) shadowDamage(pBuf); int nbox = REGION_NUM_RECTS (damage); BoxPtr pbox = REGION_RECTS (damage); int box_x1, box_x2, box_y1, box_y2; ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun...

1 0

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

31 May '06

Hello community, here is the log from the commit of package xgl checked in at Wed May 31 02:57:29 CEST 2006. -------- --- xgl/xgl.changes 2006-05-26 11:58:06.000000000 +0200 +++ xgl/xgl.changes 2006-05-30 01:22:10.000000000 +0200 @@ -1,0 +2,5 @@ +Tue May 30 01:20:14 CEST 2006 - dreveman(a)suse.de + +- Fix typo in xglFillSegment. (bnc #178234) + +------------------------------------------------------------------- Old: ---- 178234.diff New: ---- 178234-2.diff ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ xgl.spec ++++++ --- /var/tmp/diff_new_pack.5IAKqZ/_old 2006-05-31 02:57:08.000000000 +0200 +++ /var/tmp/diff_new_pack.5IAKqZ/_new 2006-05-31 02:57:08.000000000 +0200 @@ -24,7 +24,7 @@ Requires: xgl-hardware-list Autoreqprov: on Version: cvs_060522 -Release: 2 +Release: 3 Summary: Xserver that uses OpenGL for its drawing operations. BuildRoot: %{_tmppath}/%{name}-%{version}-build ExclusiveArch: %ix86 x86_64 ppc ppc64 ia64 @@ -43,7 +43,7 @@ Patch2: xgl-xpstubs-link-hack.diff Patch3: xgl-maprules-tolower-fix.diff Patch4: 178214.diff -Patch5: 178234.diff +Patch5: 178234-2.diff %description Xgl is an Xserver that uses OpenGL for its drawing operations. Some @@ -82,7 +82,7 @@ patch -d xorg-* -p0 < $RPM_SOURCE_DIR/xgl-xpstubs-link-hack.diff || exit 1 patch -d xorg-* -p0 < $RPM_SOURCE_DIR/xgl-maprules-tolower-fix.diff || exit 1 patch -d xorg-* -p0 < $RPM_SOURCE_DIR/178214.diff || exit 1 -patch -d xorg-* -p0 < $RPM_SOURCE_DIR/178234.diff || exit 1 +patch -d xorg-* -p0 < $RPM_SOURCE_DIR/178234-2.diff || exit 1 %build PREFIX=$RPM_BUILD_ROOT/usr/X11R6/lib/xgl @@ -145,6 +145,8 @@ /var/adm/fillup-templates/sysconfig.displaymanager-%name %changelog -n xgl +* Tue May 30 2006 - dreveman(a)suse.de +- Fix typo in xglFillSegment. (bnc #178234) * Fri May 26 2006 - dreveman(a)suse.de - Adjust for capStyle correctly in xglFillSegment. (bnc #178234) - Add info logging. (bnc #178214) ++++++ 178234-2.diff ++++++ --- hw/xgl/xglfill.c 18 Jan 2006 07:15:54 -0000 1.9 +++ hw/xgl/xglfill.c 26 May 2006 08:24:30 -0000 @@ -585,15 +585,19 @@ { full.x1 = pSegInit->x1; full.x2 = pSegInit->x2; + if (pGC->capStyle != CapNotLast) + full.x2++; } else { full.x1 = pSegInit->x2; - full.x2 = pSegInit->x1; + full.x2 = pSegInit->x1 + 1; + if (pGC->capStyle == CapNotLast) + full.x1++; } full.x1 += pDrawable->x; - full.x2 += pDrawable->x + 1; + full.x2 += pDrawable->x; full.y1 = pSegInit->y1 + pDrawable->y; full.y2 = full.y1 + 1; } @@ -603,15 +607,19 @@ { full.y1 = pSegInit->y1; full.y2 = pSegInit->y2; + if (pGC->capStyle != CapNotLast) + full.y2++; } else { full.y1 = pSegInit->y2; - full.y2 = pSegInit->y1; + full.y2 = pSegInit->y1 + 1; + if (pGC->capStyle == CapNotLast) + full.y1++; } full.y1 += pDrawable->y; - full.y2 += pDrawable->y + 1; + full.y2 += pDrawable->y; full.x1 = pSegInit->x1 + pDrawable->x; full.x2 = full.x1 + 1; } ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun...

1 0

commit vdr13
by root＠suse.de 31 May '06

31 May '06

Hello community, here is the log from the commit of package vdr13 checked in at Wed May 31 02:57:11 CEST 2006. -------- --- vdr13/vdr13.changes 2006-05-02 14:03:08.000000000 +0200 +++ vdr13/vdr13.changes 2006-05-30 08:50:43.000000000 +0200 @@ -1,0 +2,5 @@ +Tue May 30 08:50:23 CEST 2006 - lnussel(a)suse.de + +- add maintenance patches 1 and 2 + +------------------------------------------------------------------- New: ---- vdr-1.4.0-1_norunvdr.diff vdr-1.4.0-2_norunvdr.diff ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ vdr13.spec ++++++ --- /var/tmp/diff_new_pack.AxQCs2/_old 2006-05-31 02:57:05.000000000 +0200 +++ /var/tmp/diff_new_pack.AxQCs2/_new 2006-05-31 02:57:05.000000000 +0200 @@ -11,7 +11,12 @@ # norootforbuild Name: vdr13 -BuildRequires: dvb freetype2-devel gcc-c++ libcap-devel libjpeg-devel +BuildRequires: dvb freetype2-devel gcc-c++ libjpeg-devel +%if %suse_version > 1000 +BuildRequires: libcap-devel +%else +BuildRequires: libcap +%endif %define with_freetype %{?_with_freetype:1}%{!?_with_freetype:0} URL: http://www.cadsoft.de/people/kls/vdr/ License: GPL @@ -19,7 +24,7 @@ Requires: dvb Prereq: /usr/sbin/useradd Version: 1.4.0 -Release: 2 +Release: 4 Summary: Video Disk Recorder Source: ftp://ftp.cadsoft.de/vdr/Developer/vdr-%{version}.tar.bz2 Source1: rcvdr @@ -32,7 +37,8 @@ Source8: channels.conf Source9: remote.conf Patch0: vdr13-scripts.diff -#Patch10: vdr-1.3.30-su.diff +Patch1: vdr-1.4.0-1_norunvdr.diff +Patch2: vdr-1.4.0-2_norunvdr.diff Patch12: vdr-1.3.45-dvbplayer-nosleep.diff Patch13: vdr-1.3.25-utf8-0.0.3.patch Patch14: vdr-1.3.23-utf8-fonts.diff @@ -109,7 +115,8 @@ fi # qpatch %PATCH0 -#qpatch %PATCH10 +qpatch %PATCH1 +qpatch %PATCH2 qpatch %PATCH12 #qpatch %PATCH11 %if %with_freetype @@ -221,6 +228,8 @@ /var/adm/fillup-templates/* %changelog -n vdr13 +* Tue May 30 2006 - lnussel(a)suse.de +- add maintenance patches 1 and 2 * Tue May 02 2006 - lnussel(a)suse.de - new version 1.4.0 - fix runvdr script not working with plugins that have a dash in the ++++++ vdr-1.4.0-1_norunvdr.diff ++++++ ++++ 663 lines (skipped) ++++++ vdr-1.4.0-2_norunvdr.diff ++++++ ++++ 1116 lines (skipped) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun...

1 0

commit valgrind
by root＠suse.de 31 May '06

31 May '06

Hello community, here is the log from the commit of package valgrind checked in at Wed May 31 02:57:03 CEST 2006. -------- --- valgrind/valgrind.changes 2006-03-16 10:31:09.000000000 +0100 +++ valgrind/valgrind.changes 2006-05-30 16:23:36.000000000 +0200 @@ -1,0 +2,9 @@ +Tue May 30 16:23:03 CEST 2006 - dmueller(a)suse.de + +- update to 3.2.0 rc1: + * ppc64 support + * callgrind now integrated part + * massive performance improvements + * lots of emulation fixlets + +------------------------------------------------------------------- Old: ---- valgrind-3.1.1.tar.bz2 New: ---- valgrind-3.2.0rc1.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ valgrind.spec ++++++ --- /var/tmp/diff_new_pack.r5qZCs/_old 2006-05-31 02:56:52.000000000 +0200 +++ /var/tmp/diff_new_pack.r5qZCs/_new 2006-05-31 02:56:52.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package valgrind (Version 3.1.1) +# spec file for package valgrind (Version 3.2.0) # # Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine @@ -17,14 +17,16 @@ Group: Development/Tools/Debuggers Summary: Memory Management Debugger BuildRoot: %{_tmppath}/%{name}-%{version}-build -Version: 3.1.1 +Version: 3.2.0 Release: 1 -Source0: %{name}-%{version}.tar.bz2 +Source0: %{name}-3.2.0rc1.tar.bz2 # svn di svn://svn.valgrind.org/valgrind/tags/VALGRIND_3_1_0 svn://svn.valgrind.org/valgrind/branches/VALGRIND_3_1_BRANCH > 3_1_BRANCH.diff # svn di svn://svn.valgrind.org/vex/tags/VEX_3_1_0 svn://svn.valgrind.org/vex/branches/VEX_3_1_BRANCH > VEX_3_1_BRANCH.diff #Patch0: 3_1_BRANCH.diff #Patch1: VEX_3_1_BRANCH.diff -ExclusiveArch: %ix86 x86_64 ppc +Provides: callgrind +Obsoletes: callgrind +ExclusiveArch: %ix86 x86_64 ppc ppc64 %description Valgrind checks all memory operations in an application, like read, @@ -60,7 +62,7 @@ Robert Walsh %prep -%setup -q -n %{name}-%{version} +%setup -q -n %{name}-3.2.0rc1 #%patch cd VEX #%patch1 @@ -84,11 +86,18 @@ %doc README* NEWS ACKNOWLEDGEMENTS AUTHORS COPYING /usr/bin/* /usr/include/valgrind +/usr/include/callgrind /usr/%_lib/pkgconfig/valgrind.pc %_libdir/valgrind %doc %_mandir/*/* %changelog -n valgrind +* Tue May 30 2006 - dmueller(a)suse.de +- update to 3.2.0 rc1: + * ppc64 support + * callgrind now integrated part + * massive performance improvements + * lots of emulation fixlets * Thu Mar 16 2006 - dmueller(a)suse.de - update to 3.1.1 (FATE #300493) * Mon Mar 06 2006 - dmueller(a)suse.de ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun...

1 0

commit tomboy
by root＠suse.de 31 May '06

31 May '06

Hello community, here is the log from the commit of package tomboy checked in at Wed May 31 02:56:52 CEST 2006. -------- --- GNOME/tomboy/tomboy.changes 2006-05-20 00:12:50.000000000 +0200 +++ tomboy/tomboy.changes 2006-05-30 22:27:42.000000000 +0200 @@ -1,0 +2,5 @@ +Tue May 30 22:27:20 CEST 2006 - gekker(a)suse.de + +- Add translations for fi, zh_TW, update translations for hu + +------------------------------------------------------------------- New: ---- tomboy-i18n.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ tomboy.spec ++++++ --- /var/tmp/diff_new_pack.NYRKml/_old 2006-05-31 02:56:44.000000000 +0200 +++ /var/tmp/diff_new_pack.NYRKml/_new 2006-05-31 02:56:44.000000000 +0200 @@ -19,7 +19,7 @@ Autoreqprov: on Requires: mono Version: 0.3.3 -Release: 46 +Release: 49 Summary: GNOME note taking application. URL: http://www.beatniksoftware.com/tomboy/ Source: %{name}-%{version}.tar.bz2 @@ -43,6 +43,7 @@ Patch10: tomboy-null-match-175872.patch Patch11: tomboy-dnd-crash-176704.patch Patch12: tomboy-always-handle-args-177298.patch +Patch13: tomboy-i18n.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build Requires: mono-core Requires: dbus-1 dbus-1-x11 @@ -81,6 +82,7 @@ %patch10 %patch11 %patch12 +%patch13 cp %SOURCE1 data/images/tomboy.png cp %SOURCE1 data/images/tomboy-48.png cp %SOURCE2 data/images/tomboy-24.png @@ -144,6 +146,8 @@ %{prefix}/%_lib/dbus-1.0/services/com.beatniksoftware.Tomboy.service %changelog -n tomboy +* Tue May 30 2006 - gekker(a)suse.de +- Add translations for fi, zh_TW, update translations for hu * Sat May 20 2006 - gekker(a)suse.de - Update translations for pt_BR, fr, it, de, zh_CN * Fri May 19 2006 - joeshaw(a)suse.de ++++++ tomboy-i18n.patch ++++++ --- configure.in~ 2005-08-09 18:36:30.000000000 -0600 +++ configure.in 2006-05-30 14:23:22.000000000 -0600 @@ -16,7 +16,7 @@ AM_PROG_LIBTOOL # # Setup GETTEXT # -ALL_LINGUAS="bg ca cs da de en_CA en_GB es eu fr hu is it ja ko lt nb nl no pa pl pt_BR rw sq sv tr uk zh_CN" +ALL_LINGUAS="bg ca cs da de en_CA en_GB es eu fi fr hu is it ja ko lt nb nl no pa pl pt_BR rw sq sv tr uk zh_CN zh_TW" GETTEXT_PACKAGE=tomboy AC_SUBST(GETTEXT_PACKAGE) AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE, "$GETTEXT_PACKAGE", [Gettext package]) ++++++ tomboy-po.tar.bz2 ++++++ Binary files old/po/bg.gmo and new/po/bg.gmo differ Binary files old/po/ca.gmo and new/po/ca.gmo differ Binary files old/po/cs.gmo and new/po/cs.gmo differ Binary files old/po/da.gmo and new/po/da.gmo differ Binary files old/po/de.gmo and new/po/de.gmo differ Binary files old/po/en_CA.gmo and new/po/en_CA.gmo differ Binary files old/po/en_GB.gmo and new/po/en_GB.gmo differ Binary files old/po/es.gmo and new/po/es.gmo differ Binary files old/po/eu.gmo and new/po/eu.gmo differ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/po/fi.po new/po/fi.po --- old/po/fi.po 1970-01-01 01:00:00.000000000 +0100 +++ new/po/fi.po 2006-05-30 22:20:45.000000000 +0200 @@ -0,0 +1,732 @@ +# translation of tomboy.po to Suomi +# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER +# This file is distributed under the same license as the PACKAGE package. +# +# Jyri Palokangas <jmp(a)netti.fi>, 2006. +msgid "" +msgstr "" +"Project-Id-Version: tomboy\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2006-04-25 22:01+0200\n" +"PO-Revision-Date: 2006-05-16 09:11+0300\n" +"Last-Translator: Jyri Palokangas <jmp(a)netti.fi>\n" +"Language-Team: Suomi <yast-trans-fi(a)kotoistaminen.novell.fi>\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=2; plural=n != 1;\n" +"X-Generator: KBabel 1.11.2\n" + +#: ../data/DefaultPlugins.desktop.in.in.h:1 +msgid "Default Plugins" +msgstr "Oletusliitännäiset" + +#: ../data/DefaultPlugins.desktop.in.in.h:2 +msgid "Directory containing system-installed Plugins" +msgstr "Järjestelmään asennettujen liitännäisten hakemisto" + +#: ../data/GNOME_TomboyApplet.server.in.in.h:1 +msgid "Accessories" +msgstr "Apuohjelmat" + +#: ../data/GNOME_TomboyApplet.server.in.in.h:2 +msgid "Simple and easy to use note-taking" +msgstr "Yksinkertainen ja helppokäyttöinen muistiinpanosovelma" + +#: ../data/GNOME_TomboyApplet.server.in.in.h:3 +msgid "Tomboy Applet Factory" +msgstr "Tomboy-sovelman tehdas" + +#: ../data/GNOME_TomboyApplet.server.in.in.h:4 ../data/tomboy.desktop.in.h:3 +#: ../Tomboy/Applet.cs:134 ../Tomboy/Tray.cs:38 +msgid "Tomboy Notes" +msgstr "Tomboy -muistilaput" + +#: ../data/GNOME_TomboyApplet.xml.h:1 +msgid "_About Tomboy..." +msgstr "_Tietoja Tomboysta" + +#: ../data/GNOME_TomboyApplet.xml.h:2 ../Tomboy/Applet.cs:175 +#: ../Tomboy/NoteWindow.cs:547 +msgid "_Open Plugins Folder" +msgstr "_Avaa liitännäisten kansio" + +#: ../data/GNOME_TomboyApplet.xml.h:3 ../Tomboy/Applet.cs:170 +msgid "_Preferences..." +msgstr "_Asetukset..." + +#: ../data/tomboy.desktop.in.h:1 +msgid "Note-taker" +msgstr "Muistilaput" + +#: ../data/tomboy.desktop.in.h:2 +msgid "Quick and handy note-taker" +msgstr "Nopea ja näppärä muistilappu" + +#: ../data/tomboy.schemas.in.h:1 +msgid "Create a new Note" +msgstr "Luo uusi muistilappu" + +#: ../data/tomboy.schemas.in.h:2 +msgid "Custom Font Face" +msgstr "Oma kirjasin" + +#: ../data/tomboy.schemas.in.h:3 +msgid "Enable WikiWord highlighting" +msgstr "Käytä WikiSanat-korostusta" + +#: ../data/tomboy.schemas.in.h:4 +msgid "Enable custom font" +msgstr "Käytä omaa kirjasinta" + +#: ../data/tomboy.schemas.in.h:5 +msgid "Enable global keybindings" +msgstr "Käytä yhteisiä näppäinoikoteitä" + +#: ../data/tomboy.schemas.in.h:6 +msgid "Enable spellchecking" +msgstr "Tarkista oikeinkirjoitus" + +#: ../data/tomboy.schemas.in.h:7 +msgid "" +"Enable this option to highlight words ThatLookLikeThis. Clicking the word " +"will create a note with that name." +msgstr "" +"Käytä toimintoa, joka korostaa sanat JotkaNäyttävätTältä. Sanan kohdalta " +"napsauttaminen luo uuden muistilapun tällä nimellä." + +#: ../data/tomboy.schemas.in.h:8 +msgid "HTML Export Last Directory" +msgstr "Vie HTML-muodossa viimeisin hakemisto" + +#: ../data/tomboy.schemas.in.h:9 +msgid "HTML Export Linked Notes" +msgstr "Vie HTML-muodossa linkitetyt muistilaput" + +#: ../data/tomboy.schemas.in.h:10 +msgid "" +"If enable_custom_font is true, the font name set here will be used as the " +"font when displaying notes." +msgstr "" +"Jos oma kirjasin on käytössä, käytetään muistilappuja näytettäessä tässä " +"määriteltyä kirjasinta." + +#: ../data/tomboy.schemas.in.h:11 +msgid "" +"If true, misspellings will be underlined in red, and correct spelling " +"suggestions shown in the right-click menu." +msgstr "" +"Jos käytössä, alleviivataan väärin kirjoitukset punaisella ja samalla " +"näytetään ehdotus oikeaksi kirjoitusasuksi ponnahdusvalikossa." + +#: ../data/tomboy.schemas.in.h:12 +msgid "" +"If true, the desktop-global keybindings set in /apps/tomboy/" +"global_keybindings will be enabled, allowing for useful Tomboy actions to be " +"available from any application." +msgstr "" +"Jos tosi, otetaan käyttöön työpöydän laajuiset näppäinoikotiet, jotka on " +"asetettu kohdassa /apps/tomboy/global_keybindings. Nämä mahdollistavat " +"hyödyllisiä Tomboyn toimintoja mistä tahansa sovelluksesta." + +#: ../data/tomboy.schemas.in.h:13 +msgid "" +"If true, the font name set in custom_font_face will be used as the font when " +"displaying notes. Otherwise the desktop default font will be used." +msgstr "" +"Jos tosi, käytetään kohdassa custom_font_face määriteltyä kirjasinta, kun " +"muistilappuja näytetään. Muussa tapauksessa käytetään työpöydän " +"oletuskirjasinta." + +#: ../data/tomboy.schemas.in.h:14 +msgid "Open Recent Changes" +msgstr "Avaa viimeiset muutokset" + +#: ../data/tomboy.schemas.in.h:15 +msgid "Open Search Dialog" +msgstr "Avaa hakuikkuna" + +#: ../data/tomboy.schemas.in.h:16 +msgid "Open Start Here" +msgstr "Avaa Käynnistä tästä" + +#: ../data/tomboy.schemas.in.h:17 +msgid "Show applet menu" +msgstr "Näytä sovelman valikko" + +#: ../data/tomboy.schemas.in.h:18 +msgid "" +"The global keybinding for creating and displaying a new Note. The format " +"looks like \"<Control>a\" or \"<Shift><Alt>F1\". The " +"parser is fairly liberal and allows lower or upper case, and also " +"abbreviations such as \"<Ctl>\" and \"<Ctrl>\". If you set the " +"option to the special string \"disabled\", then there will be no keybinding " +"for this action." +msgstr "" +"Työpöydän laajuinen pikanäppäin uuden muistilapun tekemiseksi. Muoto on " +"esimerkiksi \"<Control>a\" tai \"<Shift><Alt>F1\". " +"Merkkijonon tulkinta on melko vapaata ja sallii pienet ja suuret kirjaimet " +"sekä tietyt lyhenteet, kuten \"<Ctl>\" ja \"<Ctrl>\". Jos asetat " +"merkkijonon erikoisarvoon \"disabled\", ei tälle toiminnolle ole " +"pikanäppäintä." + +#: ../data/tomboy.schemas.in.h:19 +msgid "" +"The global keybinding for opening the \"Start Here\" note. The format looks " +"like \"<Control>a\" or \"<Shift><Alt>F1\". The parser is " +"fairly liberal and allows lower or upper case, and also abbreviations such " +"as \"<Ctl>\" and \"<Ctrl>\". If you set the option to the " +"special string \"disabled\", then there will be no keybinding for this " +"action." +msgstr "" +"Työpöydän laajuinen pikanäppäin uuden \"Aloita Tästä\"-muistilapun " +"avaamiseksi. Muoto on esimerkiksi \"<Control>a\" tai \"<Shift>" +"<Alt>F1\". Merkkijonon tulkinta on melko vapaata ja sallii pienet ja " +"suuret kirjaimet sekä tietyt lyhenteet, kuten \"<Ctl>\" ja \"<" +"Ctrl>\". Jos asetat merkkijonon erikoisarvoon \"disabled\", ei tälle " +"toiminnolle ole pikanäppäintä." + +#: ../data/tomboy.schemas.in.h:20 +msgid "" +"The global keybinding for opening the Note Search dialog. The format looks " +"like \"<Control>a\" or \"<Shift><Alt>F1\". The parser is " +"fairly liberal and allows lower or upper case, and also abbreviations such " +"as \"<Ctl>\" and \"<Ctrl>\". If you set the option to the " +"special string \"disabled\", then there will be no keybinding for this " +"action." +msgstr "" +"Työpöydän laajuinen pikanäppäin uuden \"Etsi muistilapuista\"-" +"ikkunalleavaamiseksi. Muoto on esimerkiksi \"<Control>a\" tai \"<" +"Shift><Alt>F1\". Merkkijonon tulkinta on melko vapaata ja sallii " +"pienet ja suuret kirjaimet sekä tietyt lyhenteet, kuten \"<Ctl>\" ja " +"\"<Ctrl>\". Jos asetat merkkijonon erikoisarvoon \"disabled\", ei " +"tälle toiminnolle ole pikanäppäintä." + +#: ../data/tomboy.schemas.in.h:21 +msgid "" +"The global keybinding for opening the Recent Changes dialog. The format " +"looks like \"<Control>a\" or \"<Shift><Alt>F1\". The " +"parser is fairly liberal and allows lower or upper case, and also " +"abbreviations such as \"<Ctl>\" and \"<Ctrl>\". If you set the " +"option to the special string \"disabled\", then there will be no keybinding " +"for this action." +msgstr "" +"Työpöydän laajuinen pikanäppäin viimeaikaisten muutosten avaamiseen." +"avaamiseksi. Muoto on esimerkiksi \"<Control>a\" tai \"<Shift>" +"<Alt>F1\". Merkkijonon tulkinta on melko vapaata ja sallii pienet ja " +"suuret kirjaimet sekä tietyt lyhenteet, kuten \"<Ctl>\" ja \"<" +"Ctrl>\". Jos asetat merkkijonon erikoisarvoon \"disabled\", ei tälle " +"toiminnolle ole pikanäppäintä." + +#: ../data/tomboy.schemas.in.h:22 +msgid "" +"The global keybinding for showing the Tomboy applet's menu. The format looks " +"like \"<Control>a\" or \"<Shift><Alt>F1\". The parser is " +"fairly liberal and allows lower or upper case, and also abbreviations such " +"as \"<Ctl>\" and \"<Ctrl>\". If you set the option to the " +"special string \"disabled\", then there will be no keybinding for this " +"action." +msgstr "" +"Työpöydän laajuinen pikanäppäin Tomboy-sovelman valikon näyttämiseksi.Muoto " +"on esimerkiksi \"<Control>a\" tai \"<Shift><Alt>F1\". " +"Merkkijonon tulkinta on melko vapaata ja sallii pienet ja suuret kirjaimet " +"sekä tietyt lyhenteet, kuten \"<Ctl>\" ja \"<Ctrl>\". Jos asetat " +"merkkijonon erikoisarvoon \"disabled\", ei tälle toiminnolle ole " +"pikanäppäintä." + +#: ../data/tomboy.schemas.in.h:23 +msgid "" +"The last directory a note was exported to using the Export To HTML plugin." +msgstr "" +"Viimeisin hakemisto, johon \"Vie HTML-tiedostona\"-liitännäisellä " +"tallennettiin tiedosto." + +#: ../data/tomboy.schemas.in.h:24 +msgid "" +"The last setting for the 'Export linked notes' checkbox in the Export to " +"HTML plugin." +msgstr "" +"Viimeisin asetus \"Vie linkitetyt muistilaput\"-ruudulle liitännäisessä " +"\"Vie HTML-tiedostoon\"." + +#: ../libtomboy/gedit-print.c:144 ../Tomboy/Plugins/PrintNotes.cs:15 +msgid "Print" +msgstr "Tulosta" + +#: ../libtomboy/gedit-print.c:243 +msgid "Preparing pages..." +msgstr "Valmistellaan sivuja..." + +#: ../libtomboy/gedit-print.c:270 +#, c-format +msgid "Rendering page %d of %d..." +msgstr "Piirretään sivua %d/%d" + +#: ../libtomboy/gedit-print.c:272 +#, c-format +msgid "Printing page %d of %d..." +msgstr "Tulostetaan sivua %d/%d" + +#: ../libtomboy/gedit-print.c:294 +msgid "Print preview" +msgstr "Tulostuksen esikatselu" + +#: ../libtomboy/gedit-print.c:446 +msgid "Page %N of %Q" +msgstr "Sivu %N/%Q" + +#: ../libtomboy/gedit-print.c:448 +msgid "%A %D, %I:%M %p" +msgstr "%A %D, %I:%M %p" + +#: ../Tomboy/Applet.cs:180 +msgid "_About Tomboy" +msgstr "_Tietoja Tomboysta" + +#: ../Tomboy/Applet.cs:187 +msgid "_Quit" +msgstr "_Lopeta" + +#. Open the Start Here note +#: ../Tomboy/Note.cs:393 ../Tomboy/NoteManager.cs:89 +#: ../Tomboy/NoteManager.cs:96 ../Tomboy/Tomboy.cs:210 ../Tomboy/Tray.cs:112 +#: ../Tomboy/Tray.cs:278 ../Tomboy/XKeybinder.cs:259 +msgid "Start Here" +msgstr "Aloita tästä" + +#: ../Tomboy/NoteManager.cs:90 +msgid "Welcome to Tomboy!" +msgstr "Tervetuloa Tomboyhin!" + +#: ../Tomboy/NoteManager.cs:91 +msgid "" +"Use this page as a Start Page for organizing your notes and keeping " +"unorganized ideas around." +msgstr "" +"Käytä tätä sivua aloitussivuna, josta järjestelet muistilappujasi ja jolla " +"voit pitää luokittelemattomia ajatuksia." + +#: ../Tomboy/NoteManager.cs:153 +#, csharp-format +msgid "New Note {0}" +msgstr "Uusi muistilappu {0}" + +#: ../Tomboy/NoteManager.cs:170 +msgid "Describe your new note here." +msgstr "Kirjoita tähän uuden muistilapun kuvaus." + +#: ../Tomboy/NoteWindow.cs:313 +msgid "Really delete this note?" +msgstr "Poistetaanko tämä muistilappu?" + +#: ../Tomboy/NoteWindow.cs:314 +msgid "If you delete a note it is permanently lost." +msgstr "Jos poistat, hukataan muistilappu pysyvästi." + +#: ../Tomboy/NoteWindow.cs:398 +msgid "_Link to New Note" +msgstr "_Linkki uuteen muistilappuun" + +#: ../Tomboy/NoteWindow.cs:411 +msgid "Te_xt" +msgstr "Te_ksti" + +#: ../Tomboy/NoteWindow.cs:419 +msgid "_Search" +msgstr "_Etsi" + +#: ../Tomboy/NoteWindow.cs:433 +msgid "Clos_e All Notes" +msgstr "Sulj_e kaikki muistilaput" + +#: ../Tomboy/NoteWindow.cs:443 +msgid "_Close" +msgstr "_Sulje" + +#: ../Tomboy/NoteWindow.cs:471 +msgid "Search" +msgstr "Etsi" + +#: ../Tomboy/NoteWindow.cs:472 +msgid "Search your notes" +msgstr "Etsi muistilapuistasi" + +#: ../Tomboy/NoteWindow.cs:484 +msgid "Link" +msgstr "Linkki" + +#: ../Tomboy/NoteWindow.cs:485 +msgid "Link selected text to a new note" +msgstr "Linkitä valittu teksti uuteen muistilappuun" + +#: ../Tomboy/NoteWindow.cs:499 +msgid "_Text" +msgstr "_Teksti" + +#: ../Tomboy/NoteWindow.cs:504 +msgid "Set properties of text" +msgstr "Aseta tekstin ominaisuudet" + +#: ../Tomboy/NoteWindow.cs:510 +msgid "_Plugins" +msgstr "_Liitännäiset" + +#: ../Tomboy/NoteWindow.cs:514 +msgid "Run Plugin actions" +msgstr "Suorita liitännäisten tehtävät" + +#: ../Tomboy/NoteWindow.cs:521 +msgid "Delete" +msgstr "Poista" + +#: ../Tomboy/NoteWindow.cs:522 +msgid "Delete this note" +msgstr "Poista tämä muistilappu" + +#: ../Tomboy/NoteWindow.cs:579 +msgid "_Search..." +msgstr "_Etsi..." + +#: ../Tomboy/NoteWindow.cs:590 ../Tomboy/Search.cs:176 +msgid "Find _Next" +msgstr "Etsi _seuraava" + +#: ../Tomboy/NoteWindow.cs:603 +msgid "Find _Previous" +msgstr "Etsi _edellinen" + +#: ../Tomboy/NoteWindow.cs:762 +msgid "_Bold" +msgstr "_Voimakas" + +#: ../Tomboy/NoteWindow.cs:774 +msgid "_Italic" +msgstr "_Kursiivi" + +#: ../Tomboy/NoteWindow.cs:786 +msgid "_Strikeout" +msgstr "_Yliviivattu" + +#: ../Tomboy/NoteWindow.cs:798 +msgid "_Highlight" +msgstr "_Korostus" + +#: ../Tomboy/NoteWindow.cs:811 +msgid "Font Size" +msgstr "Kirjasimen koko" + +#: ../Tomboy/NoteWindow.cs:814 +msgid "_Normal" +msgstr "_Tavallinen" + +#: ../Tomboy/NoteWindow.cs:821 +msgid "Hu_ge" +msgstr "_Valtava" + +#: ../Tomboy/NoteWindow.cs:829 +msgid "_Large" +msgstr "_Suuri" + +#: ../Tomboy/NoteWindow.cs:837 +msgid "S_mall" +msgstr "_Pieni" + +#: ../Tomboy/Preferences.cs:127 +msgid "Tomboy Preferences" +msgstr "Tomboyn asetukset" + +#: ../Tomboy/Preferences.cs:141 +msgid "Editing" +msgstr "Muokkaus" + +#: ../Tomboy/Preferences.cs:144 +msgid "Hotkeys" +msgstr "Pikanäppäimet" + +#. Spellchecking... +#: ../Tomboy/Preferences.cs:184 +msgid "_Spellcheck While Typing" +msgstr "_Oikoluku kirjoitettaessa" + +#: ../Tomboy/Preferences.cs:191 +msgid "" +"Misspellings will be underlined in red, and correct spelling suggestions " +"shown in the right-click menu." +msgstr "" +"Väärin kirjoitetut alleviivataan punaisella ja oikeaa kirjoitusasua " +"ehdotetaan ponnahdusvalikossa." + +#. WikiWords... +#: ../Tomboy/Preferences.cs:200 +msgid "Highlight _WikiWords" +msgstr "Korosta _WikiSanat" + +#: ../Tomboy/Preferences.cs:207 +msgid "" +"Enable this option to highlight words ThatLookLikeThis. Clicking the " +"word will create a note with that name." +msgstr "" +"Käytä tätä asetusta korostamaan sanat, jotka NäyttävätSamalta. Sanaa " +"napsauttamalla saat luotua uuden muistilapun sanan nimellä." + +#. Custom font... +#: ../Tomboy/Preferences.cs:216 +msgid "Use Custom _Font" +msgstr "Käytä omaa _kirjasinta" + +#. Hotkeys... +#: ../Tomboy/Preferences.cs:286 +msgid "Listen for _Hotkeys" +msgstr "Käytä _pikanäppäimiä" + +#: ../Tomboy/Preferences.cs:294 +msgid "" +"Hotkeys allow you to quickly access your notes from anywhere with a " +"keypress. Example Hotkeys: <Control><Shift>F11, <" +"Alt>N" +msgstr "" +"Pikanäppäinten avulla pääset nopeasti käsiksi muistilappuihin yhdellä " +"näppäinyhdistelmällä. Esimerkkejä pikanäppämistä ovat <Control><" +"Shift>F11 ja <Alt>N" + +#. Show notes menu keybinding... +#: ../Tomboy/Preferences.cs:314 +msgid "Show notes _menu" +msgstr "Näytä muistilaput _valikossa" + +#. Open Start Here keybinding... +#: ../Tomboy/Preferences.cs:330 +msgid "Open \"_Start Here\"" +msgstr "Avaa \"_Aloita tästä\"" + +#. Create new note keybinding... +#: ../Tomboy/Preferences.cs:346 +msgid "Create _new note" +msgstr "Luo _uusi muistilappu" + +#. Search dialog keybinding... +#: ../Tomboy/Preferences.cs:362 +msgid "S_earch notes" +msgstr "_Etsi muistilapuista" + +#: ../Tomboy/Preferences.cs:424 +msgid "Choose Note Font" +msgstr "Valitse muistilapun kirjasin" + +#: ../Tomboy/RecentChanges.cs:31 +msgid "Recent Changes" +msgstr "Viimeisimmät muutokset" + +#: ../Tomboy/RecentChanges.cs:45 +msgid "" +"Recent Changes lists your notes in the order they were last changed. " +"Double click to open a note." +msgstr "" +"Viimeisimmät muutokset luetteloi muistilappusi siinä järjestyksessä " +"jossa niitä viimeksi muutettiin. Kaksoisnapauta avataksesi muistilappu." + +#: ../Tomboy/RecentChanges.cs:171 +msgid "Last Changed" +msgstr "Viimeksi muutettu" + +#: ../Tomboy/RecentChanges.cs:234 +#, csharp-format +msgid "Today, {0}" +msgstr "Tänään, {0}" + +#: ../Tomboy/RecentChanges.cs:237 +#, csharp-format +msgid "Yesterday, {0}" +msgstr "Eilen, {0}" + +#: ../Tomboy/RecentChanges.cs:240 +#, csharp-format +msgid "{0} days ago, {1}" +msgstr "{0} päivää sitten, {1}" + +#: ../Tomboy/RecentChanges.cs:244 +msgid "MMMM d, h:mm tt" +msgstr "MMMM dd, hh::mm tt" + +#: ../Tomboy/RecentChanges.cs:246 +msgid "MMMM d yyyy, h:mm tt" +msgstr "MMMM dd vuosi, hh:mm:tt" + +#: ../Tomboy/Search.cs:87 ../Tomboy/Search.cs:488 +msgid "Search All Notes" +msgstr "Etsi kaikista muistilapuista" + +#: ../Tomboy/Search.cs:88 ../Tomboy/Search.cs:492 +msgid "Search Note" +msgstr "Etsi muistilapusta" + +#: ../Tomboy/Search.cs:109 +msgid "_Find:" +msgstr "_Etsi:" + +#: ../Tomboy/Search.cs:113 +msgid "Search _All Notes" +msgstr "Etsi _kaikista muistilapuista" + +#: ../Tomboy/Search.cs:119 +msgid "Case _Sensitive" +msgstr "Erottele _kirjainkoko" + +#: ../Tomboy/Search.cs:164 +msgid "_Previous" +msgstr "_Edellinen" + +#: ../Tomboy/Search.cs:252 +msgid "Search _Results" +msgstr "Haun _tulokset" + +#: ../Tomboy/Search.cs:746 +#, csharp-format +msgid "({0} match)" +msgid_plural "({0} matches)" +msgstr[0] "({0} osuma)" +msgstr[1] "({0} osumaa)" + +#. title +#: ../Tomboy/Search.cs:764 +msgid "No notes found" +msgstr "Muistilappuja ei löytynyt" + +#: ../Tomboy/Tomboy.cs:138 +msgid "" +"Tomboy: A simple, easy to use desktop note-taking application.\n" +"Copyright (C) 2004, 2005 Alex Graveley <alex(a)beatniksoftware.com>\n" +"\n" +msgstr "" +"Tomboy: Yksinkertainen ja helppokäyttöinen muistilappusovellus.\n" +"Copyright (C) 2004, 2005 Alex Graveley <alex(a)beatniksoftware.com>\n" +"\n" + +#: ../Tomboy/Tomboy.cs:149 +msgid "" +"Usage:\n" +" --new-note\t\t\tCreate and display a new note.\n" +" --new-note [title]\t\tCreate and display a new note, with a title.\n" +" --open-note [title/url]\tDisplay the existing note matching title.\n" +" --start-here\t\t\tDisplay the 'Start Here' note.\n" +" --highlight-search [text]\tSearch and highlight text in the opened note.\n" +" --version\t\t\tPrint version information.\n" +" --help\t\t\tPrint this usage message.\n" +msgstr "" +"Käyttö:\n" +" --new-note\t\t\tLuo ja näytä uusi muistilappu.\n" +" --new-note [nimi]\t\t Luo ja näytä uusi muistilappu annetulla nimiellä.\n" +" --open-note [nimi/url\tNäytä olemassaoleva, vastaava muistilapu.\n" +" --start-here\t\t\tNäytä muistilappu \"Aloita tästä\".\n" +" --highlight-search [teksti]\tEtsi ja korosta teksti avatussa " +"muistilapussa.\n" +" --version\t\t\tNäytä versiotiedot.\n" +" --help\t\t\tNäytä tämä ohje.\n" + +#: ../Tomboy/Tomboy.cs:161 +msgid "" +"Usage:\n" +" --version\t\t\tPrint version information.\n" +" --help\t\t\tPrint this usage message.\n" +"\n" +"D-BUS remote control disabled." +msgstr "" +"Käyttö:\n" +" --version\t\t\tNäytä versiotiedot.\n" +" --help\t\t\tNäytä tämä ohje.\n" +"\n" +"D-BUS-etäohjaus poistettu käytöstä." + +#: ../Tomboy/Tomboy.cs:172 +#, csharp-format +msgid "Version {0}" +msgstr "Versio {0}" + +#: ../Tomboy/Tomboy.cs:229 +#, csharp-format +msgid "" +"Tomboy: unsupported option '{0}'\n" +"Try 'tomboy --help' for more information.\n" +"D-BUS remote control disabled." +msgstr "" +"Tomboy: tuntematon valitsin \"{0}\"\n" +"Katso lisätietoja komennolla \"tomboy --help\".\n" +"D-BUS-etähallinta poissa käytöstä." + +#: ../Tomboy/Tray.cs:77 +msgid "Create _New Note" +msgstr "Luo _uusi muistilappu" + +#: ../Tomboy/Tray.cs:125 +msgid "_Recent Changes" +msgstr "_Viimeisimmät muutokset" + +#: ../Tomboy/Tray.cs:135 +msgid "_Search Notes..." +msgstr "_Etsi muistilapuista..." + +#: ../Tomboy/Tray.cs:153 +msgid " (new)" +msgstr " (uusi)" + +#: ../Tomboy/Tray.cs:230 +msgid "translator-credits" +msgstr "" +"Ilkka Tuohela, 2005\n" +"\n" +"http://www.gnome.fi/" + +#: ../Tomboy/Tray.cs:236 +msgid "Copyright © 2004, 2005 Alex Graveley" +msgstr "Copyright © 2004, 2005 Alex Graveley" + +#: ../Tomboy/Tray.cs:237 +msgid "A simple and easy to use desktop note-taking application." +msgstr "Yksinkertainen ja helppokäyttöinen muistilappusovellus." + +#. initial newline +#: ../Tomboy/Tray.cs:286 +msgid "dddd, MMMM d, h:mm tt" +msgstr "dddd, MMMM d, hh:mm tt" + +#: ../Tomboy/Watchers.cs:138 +#, csharp-format +msgid "(Untitled {0})" +msgstr "(Nimeämätön {0})" + +#: ../Tomboy/Watchers.cs:166 +#, csharp-format +msgid "" +"A note with the title {0} already exists. Please choose another name " +"for this note before continuing." +msgstr "" +"Muistilappu nimellä {0} on jo olemassa. Valitse tällä muistilapulle " +"toinen nimi ennen kuin jatkat." + +#: ../Tomboy/Watchers.cs:178 +msgid "Note title taken" +msgstr "Muistilapun nimi käytössä" + +#: ../Tomboy/Watchers.cs:428 +msgid "Cannot open location" +msgstr "Sijaintia ei voi avata" + +#: ../Tomboy/Watchers.cs:536 +msgid "_Copy Link Address" +msgstr "_Kopioi linkin osoite" + +#: ../Tomboy/Watchers.cs:541 +msgid "_Open Link" +msgstr "_Avaa linkki" + +#: ../Tomboy/Plugins/ExportToHTML.cs:46 +msgid "Export to HTML" +msgstr "Vie HTML-tiedostoon" + +#: ../Tomboy/Plugins/ExportToHTML.cs:164 +msgid "Destination for HTML Export" +msgstr "HTML-viennin kohde" + +#: ../Tomboy/Plugins/ExportToHTML.cs:169 +msgid "Export linked notes" +msgstr "Vie linkitetyt muistilaput" Binary files old/po/fr.gmo and new/po/fr.gmo differ Binary files old/po/hu.gmo and new/po/hu.gmo differ Binary files old/po/is.gmo and new/po/is.gmo differ Binary files old/po/it.gmo and new/po/it.gmo differ Binary files old/po/ja.gmo and new/po/ja.gmo differ Binary files old/po/ko.gmo and new/po/ko.gmo differ Binary files old/po/lt.gmo and new/po/lt.gmo differ Binary files old/po/messages.mo and new/po/messages.mo differ Binary files old/po/nb.gmo and new/po/nb.gmo differ Binary files old/po/nl.gmo and new/po/nl.gmo differ Binary files old/po/no.gmo and new/po/no.gmo differ Binary files old/po/pa.gmo and new/po/pa.gmo differ Binary files old/po/pl.gmo and new/po/pl.gmo differ Binary files old/po/pt_BR.gmo and new/po/pt_BR.gmo differ Binary files old/po/rw.gmo and new/po/rw.gmo differ Binary files old/po/sq.gmo and new/po/sq.gmo differ Binary files old/po/sv.gmo and new/po/sv.gmo differ Binary files old/po/tr.gmo and new/po/tr.gmo differ Binary files old/po/uk.gmo and new/po/uk.gmo differ Binary files old/po/zh_CN.gmo and new/po/zh_CN.gmo differ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/po/zh_TW.po new/po/zh_TW.po --- old/po/zh_TW.po 1970-01-01 01:00:00.000000000 +0100 +++ new/po/zh_TW.po 2006-05-30 22:20:46.000000000 +0200 @@ -0,0 +1,712 @@ +# SOME DESCRIPTIVE TITLE. +# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER +# This file is distributed under the same license as the PACKAGE package. +# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR. +# +msgid "" +msgstr "" +"Project-Id-Version: tomboy\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2006-04-25 22:01+0200\n" +"PO-Revision-Date: 2006-05-17 17:14\n" +"Last-Translator: Novell Language <language(a)novell.com>\n" +"Language-Team: Novell Language <language(a)novell.com>\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=2; plural=(n != 1);\n" + +#: ../data/DefaultPlugins.desktop.in.in.h:1 +msgid "Default Plugins" +msgstr "預設的外掛程式" + +#: ../data/DefaultPlugins.desktop.in.in.h:2 +msgid "Directory containing system-installed Plugins" +msgstr "包含系統安裝外掛程式的目錄" + +#: ../data/GNOME_TomboyApplet.server.in.in.h:1 +msgid "Accessories" +msgstr "附屬程式" + +#: ../data/GNOME_TomboyApplet.server.in.in.h:2 +msgid "Simple and easy to use note-taking" +msgstr "簡單且方便地操作記事工作" + +#: ../data/GNOME_TomboyApplet.server.in.in.h:3 +msgid "Tomboy Applet Factory" +msgstr "Tomboy Applet Factory" + +#: ../data/GNOME_TomboyApplet.server.in.in.h:4 ../data/tomboy.desktop.in.h:3 +#: ../Tomboy/Applet.cs:134 ../Tomboy/Tray.cs:38 +msgid "Tomboy Notes" +msgstr "Tomboy 記事" + +#: ../data/GNOME_TomboyApplet.xml.h:1 +msgid "_About Tomboy..." +msgstr "關於 Tomboy(_A)..." + +#: ../data/GNOME_TomboyApplet.xml.h:2 ../Tomboy/Applet.cs:175 +#: ../Tomboy/NoteWindow.cs:547 +msgid "_Open Plugins Folder" +msgstr "開啟外掛程式資料夾(_O)" + +#: ../data/GNOME_TomboyApplet.xml.h:3 ../Tomboy/Applet.cs:170 +msgid "_Preferences..." +msgstr "優先設定(_P)?" + +#: ../data/tomboy.desktop.in.h:1 +msgid "Note-taker" +msgstr "記事程式" + +#: ../data/tomboy.desktop.in.h:2 +msgid "Quick and handy note-taker" +msgstr "隨時可快速使用的記事程式" + +#: ../data/tomboy.schemas.in.h:1 +msgid "Create a new Note" +msgstr "建立新記事" + +#: ../data/tomboy.schemas.in.h:2 +msgid "Custom Font Face" +msgstr "自訂字型屬性" + +#: ../data/tomboy.schemas.in.h:3 +msgid "Enable WikiWord highlighting" +msgstr "啟用 WikiWord 反白功能" + +#: ../data/tomboy.schemas.in.h:4 +msgid "Enable custom font" +msgstr "啟用自訂字型" + +#: ../data/tomboy.schemas.in.h:5 +msgid "Enable global keybindings" +msgstr "啟用全域按鍵關聯" + +#: ../data/tomboy.schemas.in.h:6 +msgid "Enable spellchecking" +msgstr "啟用拼字檢查功能" + +#: ../data/tomboy.schemas.in.h:7 +msgid "" +"Enable this option to highlight words ThatLookLikeThis. Clicking the word " +"will create a note with that name." +msgstr "" +"啟用這個選項來反白選取 ThatLookLikeThis 單字。按一下這個單字就會建立使用該名" +"稱的記事。" + +#: ../data/tomboy.schemas.in.h:8 +msgid "HTML Export Last Directory" +msgstr "上次 HTML 匯出目錄" + +#: ../data/tomboy.schemas.in.h:9 +msgid "HTML Export Linked Notes" +msgstr "已連結 HTML 匯出記事" + +#: ../data/tomboy.schemas.in.h:10 +msgid "" +"If enable_custom_font is true, the font name set here will be used as the " +"font when displaying notes." +msgstr "" +"如果 enable_custom_font 是 True，記事顯示時所使用的字型就會是此處的字型名稱設" +"定。" + +#: ../data/tomboy.schemas.in.h:11 +msgid "" +"If true, misspellings will be underlined in red, and correct spelling " +"suggestions shown in the right-click menu." +msgstr "" +"如果是 True，拼錯的單字就會加上紅色底線，而且在按一下右鍵所出現的功能表中顯示" +"正確的拼字建議。" + +#: ../data/tomboy.schemas.in.h:12 +msgid "" +"If true, the desktop-global keybindings set in /apps/tomboy/" +"global_keybindings will be enabled, allowing for useful Tomboy actions to be " +"available from any application." +msgstr "" +"如果是 True，桌面就會啟用 /apps/tomboy/global_keybindings 中的桌面全域按鍵關" +"聯設定，允許使用者從任何應用程式使用有效的 Tomboy 動作。" + +#: ../data/tomboy.schemas.in.h:13 +msgid "" +"If true, the font name set in custom_font_face will be used as the font when " +"displaying notes. Otherwise the desktop default font will be used." +msgstr "" +"如果是 True，顯示記事時的字型就會使用 custom_font_face 中的字型名稱設定。否" +"則，將會使用桌面的預設字型。" + +#: ../data/tomboy.schemas.in.h:14 +msgid "Open Recent Changes" +msgstr "開啟最近的變更" + +#: ../data/tomboy.schemas.in.h:15 +msgid "Open Search Dialog" +msgstr "開啟搜尋對話方塊" + +#: ../data/tomboy.schemas.in.h:16 +msgid "Open Start Here" +msgstr "開啟從這裡開始" + +#: ../data/tomboy.schemas.in.h:17 +msgid "Show applet menu" +msgstr "顯示 Applet 功能表 " + +#: ../data/tomboy.schemas.in.h:18 +msgid "" +"The global keybinding for creating and displaying a new Note. The format " +"looks like \"<Control>a\" or \"<Shift><Alt>F1\". The " +"parser is fairly liberal and allows lower or upper case, and also " +"abbreviations such as \"<Ctl>\" and \"<Ctrl>\". If you set the " +"option to the special string \"disabled\", then there will be no keybinding " +"for this action." +msgstr "" +"可用來建立和顯示新記事的全域按鍵關聯。這個格式看起來很像 \"<Control>a" +"\" 或 \"<Shift><Alt>F1\"。此剖析器相當開放，其允許使用小寫或大寫" +"的字母，同時也可以使用類似 \"<Ctl>\" 和 \"<Ctrl>\" 的縮寫。當您將" +"此選項設定為特殊字串「停用 (disabled)」，這個動作就不會提供任何按鍵關聯。" + +#: ../data/tomboy.schemas.in.h:19 +msgid "" +"The global keybinding for opening the \"Start Here\" note. The format looks " +"like \"<Control>a\" or \"<Shift><Alt>F1\". The parser is " +"fairly liberal and allows lower or upper case, and also abbreviations such " +"as \"<Ctl>\" and \"<Ctrl>\". If you set the option to the " +"special string \"disabled\", then there will be no keybinding for this " +"action." +msgstr "" +"可用來開啟「從這裡開始」記事的全域按鍵關聯。這個格式看起來很像 \"<" +"Control>a\" 或 \"<Shift><Alt>F1\"。此剖析器相當開放，其允許使" +"用小寫或大寫的字母，同時也可以使用類似 \"<Ctl>\" 和 \"<Ctrl>\" 的" +"縮寫。當您將此選項設定為特殊字串「停用 (disabled)」，這個動作就不會提供任何按" +"鍵關聯。" + +#: ../data/tomboy.schemas.in.h:20 +msgid "" +"The global keybinding for opening the Note Search dialog. The format looks " +"like \"<Control>a\" or \"<Shift><Alt>F1\". The parser is " +"fairly liberal and allows lower or upper case, and also abbreviations such " +"as \"<Ctl>\" and \"<Ctrl>\". If you set the option to the " +"special string \"disabled\", then there will be no keybinding for this " +"action." +msgstr "" +"可用來開啟「記事搜尋」對話方塊的全域按鍵關聯。這個格式看起來很像 \"<" +"Control>a\" 或 \"<Shift><Alt>F1\"。此剖析器相當開放，其允許使" +"用小寫或大寫的字母，同時也可以使用類似 \"<Ctl>\" 和 \"<Ctrl>\" 的" +"縮寫。當您將此選項設定為特殊字串「停用 (disabled)」，這個動作就不會提供任何按" +"鍵關聯。" + +#: ../data/tomboy.schemas.in.h:21 +msgid "" +"The global keybinding for opening the Recent Changes dialog. The format " +"looks like \"<Control>a\" or \"<Shift><Alt>F1\". The " +"parser is fairly liberal and allows lower or upper case, and also " +"abbreviations such as \"<Ctl>\" and \"<Ctrl>\". If you set the " +"option to the special string \"disabled\", then there will be no keybinding " +"for this action." +msgstr "" +"可用來開啟「最近的變更」對話方塊的全域按鍵關聯。這個格式看起來很像 \"<" +"Control>a\" 或 \"<Shift><Alt>F1\"。此剖析器相當開放，其允許使" +"用小寫或大寫的字母，同時也可以使用類似 \"<Ctl>\" 和 \"<Ctrl>\" 的" +"縮寫。當您將此選項設定為特殊字串「停用 (disabled)」，這個動作就不會提供任何按" +"鍵關聯。" + +#: ../data/tomboy.schemas.in.h:22 +msgid "" +"The global keybinding for showing the Tomboy applet's menu. The format looks " +"like \"<Control>a\" or \"<Shift><Alt>F1\". The parser is " +"fairly liberal and allows lower or upper case, and also abbreviations such " +"as \"<Ctl>\" and \"<Ctrl>\". If you set the option to the " +"special string \"disabled\", then there will be no keybinding for this " +"action." +msgstr "" +"可用來顯示 Tomboy Applet 功能表的全域按鍵關聯。這個格式看起來很像 \"<" +"Control>a\" 或 \"<Shift><Alt>F1\"。此剖析器相當開放，其允許使" +"用小寫或大寫的字母，同時也可以使用類似 \"<Ctl>\" 和 \"<Ctrl>\" 的" +"縮寫。當您將此選項設定為特殊字串「停用 (disabled)」，這個動作就不會提供任何按" +"鍵關聯。" + +#: ../data/tomboy.schemas.in.h:23 +msgid "" +"The last directory a note was exported to using the Export To HTML plugin." +msgstr "上一次使用「匯出成 HTML」外掛程式將記事匯入其中的目錄。" + +#: ../data/tomboy.schemas.in.h:24 +msgid "" +"The last setting for the 'Export linked notes' checkbox in the Export to " +"HTML plugin." +msgstr "在「匯出成 HTML」外掛程式中上一次「已連結匯出記事」核取方塊的設定。" + +#: ../libtomboy/gedit-print.c:144 ../Tomboy/Plugins/PrintNotes.cs:15 +msgid "Print" +msgstr "Print" + +#: ../libtomboy/gedit-print.c:243 +msgid "Preparing pages..." +msgstr "正在準備頁面..." + +#: ../libtomboy/gedit-print.c:270 +#, c-format +msgid "Rendering page %d of %d..." +msgstr "正在轉換頁面 %d (共 %d 頁)..." + +#: ../libtomboy/gedit-print.c:272 +#, c-format +msgid "Printing page %d of %d..." +msgstr "正在列印頁面 %d (共 %d 頁)..." + +#: ../libtomboy/gedit-print.c:294 +msgid "Print preview" +msgstr "列印預覽" + +#: ../libtomboy/gedit-print.c:446 +msgid "Page %N of %Q" +msgstr "第 %N 頁 (共 %Q 頁)" + +#: ../libtomboy/gedit-print.c:448 +msgid "%A %D, %I:%M %p" +msgstr "%A %D、%I:%M %p" + +#: ../Tomboy/Applet.cs:180 +msgid "_About Tomboy" +msgstr "關於 Tomboy(_A)" + +#: ../Tomboy/Applet.cs:187 +msgid "_Quit" +msgstr "結束(_Q)" + +#. Open the Start Here note +#: ../Tomboy/Note.cs:393 ../Tomboy/NoteManager.cs:89 +#: ../Tomboy/NoteManager.cs:96 ../Tomboy/Tomboy.cs:210 ../Tomboy/Tray.cs:112 +#: ../Tomboy/Tray.cs:278 ../Tomboy/XKeybinder.cs:259 +msgid "Start Here" +msgstr "從這裡開始" + +#: ../Tomboy/NoteManager.cs:90 +msgid "Welcome to Tomboy!" +msgstr "歡迎使用 Tomboy！" + +#: ../Tomboy/NoteManager.cs:91 +msgid "" +"Use this page as a Start Page for organizing your notes and keeping " +"unorganized ideas around." +msgstr "使用這個頁面作為「起始頁面」來管理記事，並將尚未組織的想法安排在周圍。" + +#: ../Tomboy/NoteManager.cs:153 +#, csharp-format +msgid "New Note {0}" +msgstr "新增記事 {0}" + +#: ../Tomboy/NoteManager.cs:170 +msgid "Describe your new note here." +msgstr "在這裡描述新記事。" + +#: ../Tomboy/NoteWindow.cs:313 +msgid "Really delete this note?" +msgstr "確實要刪除這份記事嗎?" + +#: ../Tomboy/NoteWindow.cs:314 +msgid "If you delete a note it is permanently lost." +msgstr "刪除記事之後將會永久遺失。" + +#: ../Tomboy/NoteWindow.cs:398 +msgid "_Link to New Note" +msgstr "連結到新記事(_L)" + +#: ../Tomboy/NoteWindow.cs:411 +msgid "Te_xt" +msgstr "文字(_X)" + +#: ../Tomboy/NoteWindow.cs:419 +msgid "_Search" +msgstr "搜尋(_S)" + +#: ../Tomboy/NoteWindow.cs:433 +msgid "Clos_e All Notes" +msgstr "關閉所有記事(_E)" + +#: ../Tomboy/NoteWindow.cs:443 +msgid "_Close" +msgstr "關閉(_C)" + +#: ../Tomboy/NoteWindow.cs:471 +msgid "Search" +msgstr "搜尋" + +#: ../Tomboy/NoteWindow.cs:472 +msgid "Search your notes" +msgstr "搜尋您的記事" + +#: ../Tomboy/NoteWindow.cs:484 +msgid "Link" +msgstr "連結" + +#: ../Tomboy/NoteWindow.cs:485 +msgid "Link selected text to a new note" +msgstr "連結選定文字到新記事" + +#: ../Tomboy/NoteWindow.cs:499 +msgid "_Text" +msgstr "文字(_T)" + +#: ../Tomboy/NoteWindow.cs:504 +msgid "Set properties of text" +msgstr "設定文字的內容" + +#: ../Tomboy/NoteWindow.cs:510 +msgid "_Plugins" +msgstr "外掛程式(_P)" + +#: ../Tomboy/NoteWindow.cs:514 +msgid "Run Plugin actions" +msgstr "執行外掛程式動作" + +#: ../Tomboy/NoteWindow.cs:521 +msgid "Delete" +msgstr "刪除(D)" + +#: ../Tomboy/NoteWindow.cs:522 +msgid "Delete this note" +msgstr "刪除這份記事" + +#: ../Tomboy/NoteWindow.cs:579 +msgid "_Search..." +msgstr "搜尋(_S)..." + +#: ../Tomboy/NoteWindow.cs:590 ../Tomboy/Search.cs:176 +msgid "Find _Next" +msgstr "尋找下一個(_N)" + +#: ../Tomboy/NoteWindow.cs:603 +msgid "Find _Previous" +msgstr "尋找上一個(_P)" + +#: ../Tomboy/NoteWindow.cs:762 +msgid "_Bold" +msgstr "粗體(_B)" + +#: ../Tomboy/NoteWindow.cs:774 +msgid "_Italic" +msgstr "斜體(_I)" + +#: ../Tomboy/NoteWindow.cs:786 +msgid "_Strikeout" +msgstr "刪除線(_S)" + +#: ../Tomboy/NoteWindow.cs:798 +msgid "_Highlight" +msgstr "反白(_H)" + +#: ../Tomboy/NoteWindow.cs:811 +msgid "Font Size" +msgstr "字型大小" + +#: ../Tomboy/NoteWindow.cs:814 +msgid "_Normal" +msgstr "一般(_N)" + +#: ../Tomboy/NoteWindow.cs:821 +msgid "Hu_ge" +msgstr "超大(_G)" + +#: ../Tomboy/NoteWindow.cs:829 +msgid "_Large" +msgstr "大(_L)" + +#: ../Tomboy/NoteWindow.cs:837 +msgid "S_mall" +msgstr "小(_M)" + +#: ../Tomboy/Preferences.cs:127 +msgid "Tomboy Preferences" +msgstr "Tomboy 優先設定" + +#: ../Tomboy/Preferences.cs:141 +msgid "Editing" +msgstr "編輯" + +#: ../Tomboy/Preferences.cs:144 +msgid "Hotkeys" +msgstr "熱鍵" + +#. Spellchecking... +#: ../Tomboy/Preferences.cs:184 +msgid "_Spellcheck While Typing" +msgstr "輸入時執行拼字檢查" + +#: ../Tomboy/Preferences.cs:191 +msgid "" +"Misspellings will be underlined in red, and correct spelling suggestions " +"shown in the right-click menu." +msgstr "" +"拼錯的單字就會加上紅色底線，而且在按一下右鍵所出現的功能表中顯示正確的拼字建" +"議。" + +#. WikiWords... +#: ../Tomboy/Preferences.cs:200 +msgid "Highlight _WikiWords" +msgstr "反白 WikiWords(_W)" + +#: ../Tomboy/Preferences.cs:207 +msgid "" +"Enable this option to highlight words ThatLookLikeThis. Clicking the " +"word will create a note with that name." +msgstr "" +"啟用這個選項來反白選取 ThatLookLikeThis 單字。按一下這個單字就會建立使" +"用該名稱的記事。" + +#. Custom font... +#: ../Tomboy/Preferences.cs:216 +msgid "Use Custom _Font" +msgstr "使用自訂字型(_F)" + +#. Hotkeys... +#: ../Tomboy/Preferences.cs:286 +msgid "Listen for _Hotkeys" +msgstr "接聽熱鍵(_H)" + +#: ../Tomboy/Preferences.cs:294 +msgid "" +"Hotkeys allow you to quickly access your notes from anywhere with a " +"keypress. Example Hotkeys: <Control><Shift>F11, <" +"Alt>N" +msgstr "" +"您可以應用熱鍵，從任何位置按一下按鍵來快速存取您的記事。範例熱鍵：<" +"Control><Shift>F11、<Alt>N" + +#. Show notes menu keybinding... +#: ../Tomboy/Preferences.cs:314 +msgid "Show notes _menu" +msgstr "顯示記事功能表(_M)" + +#. Open Start Here keybinding... +#: ../Tomboy/Preferences.cs:330 +msgid "Open \"_Start Here\"" +msgstr "開啟「從這裡開始」" + +#. Create new note keybinding... +#: ../Tomboy/Preferences.cs:346 +msgid "Create _new note" +msgstr "建立新記事(_N)" + +#. Search dialog keybinding... +#: ../Tomboy/Preferences.cs:362 +msgid "S_earch notes" +msgstr "搜尋記事(_E)" + +#: ../Tomboy/Preferences.cs:424 +msgid "Choose Note Font" +msgstr "選擇記事字型" + +#: ../Tomboy/RecentChanges.cs:31 +msgid "Recent Changes" +msgstr "最近的變更" + +#: ../Tomboy/RecentChanges.cs:45 +msgid "" +"Recent Changes lists your notes in the order they were last changed. " +"Double click to open a note." +msgstr "" +"「最近的變更」會依據記事上次的變更日期依序列出。按兩下滑鼠便可開啟記" +"事。" + +#: ../Tomboy/RecentChanges.cs:171 +msgid "Last Changed" +msgstr "上次變更" + +#: ../Tomboy/RecentChanges.cs:234 +#, csharp-format +msgid "Today, {0}" +msgstr "今天，{0}" + +#: ../Tomboy/RecentChanges.cs:237 +#, csharp-format +msgid "Yesterday, {0}" +msgstr "昨天，{0}" + +#: ../Tomboy/RecentChanges.cs:240 +#, csharp-format +msgid "{0} days ago, {1}" +msgstr "{0} 天以前，{1}" + +#: ../Tomboy/RecentChanges.cs:244 +msgid "MMMM d, h:mm tt" +msgstr "MMMM d, h:mm tt" + +#: ../Tomboy/RecentChanges.cs:246 +msgid "MMMM d yyyy, h:mm tt" +msgstr "MMMM d yyyy, h:mm tt" + +#: ../Tomboy/Search.cs:87 ../Tomboy/Search.cs:488 +msgid "Search All Notes" +msgstr "搜尋全部記事" + +#: ../Tomboy/Search.cs:88 ../Tomboy/Search.cs:492 +msgid "Search Note" +msgstr "搜尋記事" + +#: ../Tomboy/Search.cs:109 +msgid "_Find:" +msgstr "尋找(_F)：" + +#: ../Tomboy/Search.cs:113 +msgid "Search _All Notes" +msgstr "搜尋全部記事(_A)" + +#: ../Tomboy/Search.cs:119 +msgid "Case _Sensitive" +msgstr "區分大小寫(_S)" + +#: ../Tomboy/Search.cs:164 +msgid "_Previous" +msgstr "上一個(_P)" + +#: ../Tomboy/Search.cs:252 +msgid "Search _Results" +msgstr "搜尋結果(_R)" + +#: ../Tomboy/Search.cs:746 +#, csharp-format +msgid "({0} match)" +msgid_plural "({0} matches)" +msgstr[0] "({0} 個符合)" +msgstr[1] "({0} 個符合)" + +#. title +#: ../Tomboy/Search.cs:764 +msgid "No notes found" +msgstr "找不到任何記事" + +#: ../Tomboy/Tomboy.cs:138 +msgid "" +"Tomboy: A simple, easy to use desktop note-taking application.\n" +"Copyright (C) 2004, 2005 Alex Graveley <alex(a)beatniksoftware.com>\n" +"\n" +msgstr "" +"Tomboy：簡單又方便操作的桌面記事應用程式。\n" +"Copyright (C) 2004, 2005 Alex Graveley <alex(a)beatniksoftware.com>\n" +"\n" + +#: ../Tomboy/Tomboy.cs:149 +msgid "" +"Usage:\n" +" --new-note\t\t\tCreate and display a new note.\n" +" --new-note [title]\t\tCreate and display a new note, with a title.\n" +" --open-note [title/url]\tDisplay the existing note matching title.\n" +" --start-here\t\t\tDisplay the 'Start Here' note.\n" +" --highlight-search [text]\tSearch and highlight text in the opened note.\n" +" --version\t\t\tPrint version information.\n" +" --help\t\t\tPrint this usage message.\n" +msgstr "" +"使用方式：\n" +" --new-note\t\t\t建立並顯示新記事。\n" +" --new-note [標題]\t\t在提供標題情況下建立並顯示新記事。\n" +" --open-note [標題/url]\t顯示符合標題的現有記事。\n" +" --start-here\t\t\t顯示「從這裡開始」記事。\n" +" --highlight-search [文字]\t在開啟的記事中，搜尋並反白選取特定文字。\n" +" --version\t\t\t列印版本資訊。\n" +" --help\t\t\t列印這份使用方式訊息。\n" + +#: ../Tomboy/Tomboy.cs:161 +msgid "" +"Usage:\n" +" --version\t\t\tPrint version information.\n" +" --help\t\t\tPrint this usage message.\n" +"\n" +"D-BUS remote control disabled." +msgstr "" +"使用方式：\n" +" --version\t\t\t列印版本資訊。\n" +" --help\t\t\t列印這份使用方式訊息。\n" +"\n" +"D-BUS 遠端控制功能已停用。" + +#: ../Tomboy/Tomboy.cs:172 +#, csharp-format +msgid "Version {0}" +msgstr "版本 {0}" + +#: ../Tomboy/Tomboy.cs:229 +#, csharp-format +msgid "" +"Tomboy: unsupported option '{0}'\n" +"Try 'tomboy --help' for more information.\n" +"D-BUS remote control disabled." +msgstr "" +"Tomboy：不支援的選項 '{0}'\n" +"請嘗試 'tomboy --help' 取得更多詳細資訊。\n" +"D-BUS 遠端控制功能已停用。" + +#: ../Tomboy/Tray.cs:77 +msgid "Create _New Note" +msgstr "建立新記事(_N)" + +#: ../Tomboy/Tray.cs:125 +msgid "_Recent Changes" +msgstr "最近的變更(_R)" + +#: ../Tomboy/Tray.cs:135 +msgid "_Search Notes..." +msgstr "搜尋記事(_S)..." + +#: ../Tomboy/Tray.cs:153 +msgid " (new)" +msgstr " (新)" + +#: ../Tomboy/Tray.cs:230 +msgid "translator-credits" +msgstr "translator-credits" + +#: ../Tomboy/Tray.cs:236 +#, fuzzy +msgid "Copyright © 2004, 2005 Alex Graveley" +msgstr "Copyright (c) 2004, 2005 Alex Graveley" + +#: ../Tomboy/Tray.cs:237 +msgid "A simple and easy to use desktop note-taking application." +msgstr "簡單又方便操作的桌面記事應用程式。" + +#. initial newline +#: ../Tomboy/Tray.cs:286 +msgid "dddd, MMMM d, h:mm tt" +msgstr "dddd, MMMM d, h:mm tt" + +#: ../Tomboy/Watchers.cs:138 +#, csharp-format +msgid "(Untitled {0})" +msgstr "(無標題 {0})" + +#: ../Tomboy/Watchers.cs:166 +#, csharp-format +msgid "" +"A note with the title {0} already exists. Please choose another name " +"for this note before continuing." +msgstr "" +"已經存在包含標題 {0} 的記事。請先為這份記事選擇其他名稱，再繼續進行。" + +#: ../Tomboy/Watchers.cs:178 +msgid "Note title taken" +msgstr "已記錄的記事標題" + +#: ../Tomboy/Watchers.cs:428 +msgid "Cannot open location" +msgstr "無法開啟位置" + +#: ../Tomboy/Watchers.cs:536 +msgid "_Copy Link Address" +msgstr "複製連結位址(_C)" + +#: ../Tomboy/Watchers.cs:541 +msgid "_Open Link" +msgstr "開啟連結(_O)" + +#: ../Tomboy/Plugins/ExportToHTML.cs:46 +msgid "Export to HTML" +msgstr "匯出成 HTML" + +#: ../Tomboy/Plugins/ExportToHTML.cs:164 +msgid "Destination for HTML Export" +msgstr "HTML 匯出目的地" + +#: ../Tomboy/Plugins/ExportToHTML.cs:169 +msgid "Export linked notes" +msgstr "已連結匯出記事" ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun...

1 0

commit thinkeramik
by root＠suse.de 31 May '06

31 May '06

Hello community, here is the log from the commit of package thinkeramik checked in at Wed May 31 02:56:45 CEST 2006. -------- --- KDE/thinkeramik/thinkeramik.changes 2006-01-27 15:33:52.000000000 +0100 +++ thinkeramik/thinkeramik.changes 2006-05-30 07:37:47.000000000 +0200 @@ -1,0 +2,5 @@ +Tue May 30 07:37:42 CEST 2006 - adrian(a)suse.de + +- fix build for < 10.1 + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ thinkeramik.spec ++++++ --- /var/tmp/diff_new_pack.qUu2ei/_old 2006-05-31 02:56:38.000000000 +0200 +++ /var/tmp/diff_new_pack.qUu2ei/_new 2006-05-31 02:56:38.000000000 +0200 @@ -5,19 +5,22 @@ # This file and all modifications and additions to the pristine # package are under the same license as the package itself. # -# Please submit bugfixes or comments via http://bugs.opensuse.org +# Please submit bugfixes or comments via http://bugs.opensuse.org/ # # norootforbuild Name: thinkeramik BuildRequires: kdebase3-devel +%if %suse_version < 1010 +BuildRequires: update-desktop-files +%endif URL: http://prefsx1.hp.infoseek.co.jp/tk040429/index.html License: GPL Group: System/GUI/KDE -Summary: Thin Keramik style for Qt/KDE +Summary: Thin Keramik style for KDE Version: 3.2.1 -Release: 9 +Release: 23 BuildRoot: %{_tmppath}/%{name}-%{version}-build Requires: thinkeramik-style Source0: %{name}-%{version}.tar.bz2 @@ -42,7 +45,7 @@ %package style Group: System/GUI/KDE -Summary: Thin Keramik style for Qt/KDE +Summary: Thin Keramik style for Qt %description style This is a plain-looking modification of the Keramik style. @@ -109,6 +112,8 @@ /usr/lib/qt3/plugins/styles %changelog -n thinkeramik +* Tue May 30 2006 - adrian(a)suse.de +- fix build for < 10.1 * Fri Jan 27 2006 - dmueller(a)suse.de - fix sequence point warnings (#137753) * Wed Jan 25 2006 - mls(a)suse.de ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun...

1 0

commit tellico
by root＠suse.de 31 May '06

31 May '06

Hello community, here is the log from the commit of package tellico checked in at Wed May 31 02:56:37 CEST 2006. -------- --- KDE/tellico/tellico.changes 2006-05-16 12:00:31.000000000 +0200 +++ tellico/tellico.changes 2006-05-30 07:17:51.000000000 +0200 @@ -1,0 +2,5 @@ +Tue May 30 07:17:46 CEST 2006 - adrian(a)suse.de + +- fix build for < 10.1 + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ tellico.spec ++++++ --- /var/tmp/diff_new_pack.AJsb14/_old 2006-05-31 02:56:29.000000000 +0200 +++ /var/tmp/diff_new_pack.AJsb14/_new 2006-05-31 02:56:29.000000000 +0200 @@ -12,9 +12,12 @@ Name: tellico BuildRequires: kdemultimedia3-CD kdemultimedia3-devel libyaz-devel taglib-devel tcpd-devel +%if %suse_version < 1010 +BuildRequires: libgcrypt-devel openssl-devel update-desktop-files +%endif Summary: A book collection manager Version: 1.1.6 -Release: 2 +Release: 4 License: GPL Group: Productivity/Other Source: %{name}-%{version}.tar.gz @@ -69,6 +72,8 @@ %defattr(-,root,root,0755) %changelog -n tellico +* Tue May 30 2006 - adrian(a)suse.de +- fix build for < 10.1 * Fri May 12 2006 - stbinner(a)suse.de - Update to version 1.1.6 * Fixed bug that prevented images from being saved in certain ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun...

1 0

commit tcpd
by root＠suse.de 31 May '06

31 May '06

Hello community, here is the log from the commit of package tcpd checked in at Wed May 31 02:56:23 CEST 2006. -------- --- tcpd/tcpd.changes 2006-03-31 15:58:57.000000000 +0200 +++ tcpd/tcpd.changes 2006-05-30 17:01:01.000000000 +0200 @@ -1,0 +2,5 @@ +Tue May 30 16:59:21 CEST 2006 - lmichnovic(a)suse.cz + +- fixed uninitilized filepointer (uninitialized.diff) [#178636] + +------------------------------------------------------------------- New: ---- tcp_wrappers_7.6-uninitialized.diff ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ tcpd.spec ++++++ --- /var/tmp/diff_new_pack.CtWFk8/_old 2006-05-31 02:56:09.000000000 +0200 +++ /var/tmp/diff_new_pack.CtWFk8/_new 2006-05-31 02:56:09.000000000 +0200 @@ -17,7 +17,7 @@ Provides: nkitb:/usr/sbin/tcpd Autoreqprov: on Version: 7.6 -Release: 725 +Release: 731 Summary: A security wrapper for TCP daemons Source: tcp_wrappers_%{version}.tar.bz2 Patch: tcp_wrappers_%{version}.dif @@ -34,6 +34,7 @@ Patch11: tcp_wrappers_7.6-nonvoid.diff Patch12: tcp_wrappers_7.6-prototypes.diff Patch13: tcp_wrappers_7.6-hosts_ctl.diff +Patch14: tcp_wrappers_7.6-uninitialized.diff BuildRoot: %{_tmppath}/%{name}-%{version}-build %description @@ -76,6 +77,7 @@ %patch11 %patch12 -p1 %patch13 +%patch14 %build #RPM_OPT_FLAGS="$RPM_OPT_FLAGS -fPIE -Wformat=2" @@ -122,6 +124,8 @@ %{_libdir}/libwrap.so %changelog -n tcpd +* Tue May 30 2006 - lmichnovic(a)suse.cz +- fixed uninitilized filepointer (uninitialized.diff) [#178636] * Fri Mar 31 2006 - lmichnovic(a)suse.cz - fixed missing definition of hosts_ctl() in tcpd.h (hosts_ctl.diff) [#162303] ++++++ tcp_wrappers_7.6-uninitialized.diff ++++++ --- inetcf.c +++ inetcf.c @@ -61,7 +61,7 @@ char *conf; { char buf[BUFSIZ]; - FILE *fp; + FILE *fp = NULL; char *service; char *protocol; char *user; ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun...

1 0

commit rsibreak
by root＠suse.de 31 May '06

31 May '06

Hello community, here is the log from the commit of package rsibreak checked in at Wed May 31 02:56:01 CEST 2006. -------- --- KDE/rsibreak/rsibreak.changes 2006-04-11 08:44:58.000000000 +0200 +++ rsibreak/rsibreak.changes 2006-05-30 07:26:38.000000000 +0200 @@ -1,0 +2,5 @@ +Tue May 30 07:26:33 CEST 2006 - adrian(a)suse.de + +- fix build for < 10.1 + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ rsibreak.spec ++++++ --- /var/tmp/diff_new_pack.f9oaOz/_old 2006-05-31 02:55:53.000000000 +0200 +++ /var/tmp/diff_new_pack.f9oaOz/_new 2006-05-31 02:55:53.000000000 +0200 @@ -18,7 +18,7 @@ Summary: Assists in the Recovery and Prevention of Repetitive Strain Injury BuildRoot: %{_tmppath}/%{name}-%{version}-build Version: 0.6.0 -Release: 2 +Release: 3 Source: Rsibreak-%{version}.tar.bz2 %description @@ -46,7 +46,11 @@ %install . /etc/opt/kde3/common_options make DESTDIR=$RPM_BUILD_ROOT $INSTALL_TARGET +%if %suse_version < 1010 +%suse_update_desktop_file %name TimeUtility +%else %suse_update_desktop_file -G "RSI Prevention" %name TimeUtility +%endif %find_lang %name %files -f %name.lang @@ -58,6 +62,8 @@ %dir /opt/kde3/share/doc/HTML/en/rsibreak-%version-apidocs %changelog -n rsibreak +* Tue May 30 2006 - adrian(a)suse.de +- fix build for < 10.1 * Tue Apr 11 2006 - stbinner(a)suse.de - Update to version 0.6 * Wed Apr 05 2006 - stbinner(a)suse.de ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun...

1 0

commit qemu
by root＠suse.de 31 May '06

31 May '06

Hello community, here is the log from the commit of package qemu checked in at Wed May 31 02:56:00 CEST 2006. -------- --- qemu/qemu.changes 2006-05-29 13:39:39.000000000 +0200 +++ qemu/qemu.changes 2006-05-30 11:58:37.000000000 +0200 @@ -1,0 +2,5 @@ +Tue May 30 11:57:16 CEST 2006 - uli(a)suse.de + +- fixed to build on PPC with new glibc + +------------------------------------------------------------------- New: ---- gcc-3.3.5.dif ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ qemu.spec ++++++ --- /var/tmp/diff_new_pack.P9jfHE/_old 2006-05-31 02:55:21.000000000 +0200 +++ /var/tmp/diff_new_pack.P9jfHE/_new 2006-05-31 02:55:21.000000000 +0200 @@ -17,7 +17,7 @@ Group: System/Emulators/Other Summary: Universal CPU emulator Version: 0.8.0 -Release: 14 +Release: 15 Source: %name-%version.tar.bz2 Patch1: qemu-0.7.0-binfmt.patch Patch5: qemu-0.7.0-sigaltstackhack.patch @@ -69,6 +69,7 @@ Patch663: gcc-ppc-nostartfileprefix.patch Patch664: gcc-ppc-nof.patch Patch700: gcc-abuildappease.patch +Patch701: gcc-3.3.5.dif BuildRoot: %{_tmppath}/%{name}-%{version}-build ExclusiveArch: %ix86 ppc sparc x86_64 ia64 @@ -132,6 +133,7 @@ #%patch6063 -p1 #%endif %patch700 -p1 +%patch701 cd .. %build @@ -263,6 +265,8 @@ %endif %changelog -n qemu +* Tue May 30 2006 - uli(a)suse.de +- fixed to build on PPC with new glibc * Mon May 29 2006 - uli(a)suse.de - fixed to build with new kernel headers * Wed Mar 08 2006 - uli(a)suse.de ++++++ gcc-3.3.5.dif ++++++ --- gcc/config/rs6000/darwin-ldouble.c +++ gcc/config/rs6000/darwin-ldouble.c 2006/05/29 14:30:45 @@ -1,4 +1,208 @@ /* 128-bit long double support routines for Darwin. + Copyright (C) 1993, 2003, 2004, 2005, 2006 + Free Software Foundation, Inc. + +This file is part of GCC. + +GCC is free software; you can redistribute it and/or modify it under +the terms of the GNU General Public License as published by the Free +Software Foundation; either version 2, or (at your option) any later +version. + +In addition to the permissions in the GNU General Public License, the +Free Software Foundation gives you unlimited permission to link the +compiled version of this file into combinations with other programs, +and to distribute those combinations without any restriction coming +from the use of this file. (The General Public License restrictions +do apply in other respects; for example, they cover modification of +the file, and distribution when not linked into a combine +executable.) + +GCC is distributed in the hope that it will be useful, but WITHOUT ANY +WARRANTY; without even the implied warranty of MERCHANTABILITY or +FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License +for more details. + +You should have received a copy of the GNU General Public License +along with GCC; see the file COPYING. If not, write to the Free +Software Foundation, 51 Franklin Street, Fifth Floor, Boston, MA +02110-1301, USA. */ + +/* Implementations of floating-point long double basic arithmetic + functions called by the IBM C compiler when generating code for + PowerPC platforms. In particular, the following functions are + implemented: __gcc_qadd, __gcc_qsub, __gcc_qmul, and __gcc_qdiv. + Double-double algorithms are based on the paper "Doubled-Precision + IEEE Standard 754 Floating-Point Arithmetic" by W. Kahan, February 26, + 1987. An alternative published reference is "Software for + Doubled-Precision Floating-Point Computations", by Seppo Linnainmaa, + ACM TOMS vol 7 no 3, September 1981, pages 272-283. */ + +/* Each long double is made up of two IEEE doubles. The value of the + long double is the sum of the values of the two parts. The most + significant part is required to be the value of the long double + rounded to the nearest double, as specified by IEEE. For Inf + values, the least significant part is required to be one of +0.0 or + -0.0. No other requirements are made; so, for example, 1.0 may be + represented as (1.0, +0.0) or (1.0, -0.0), and the low part of a + NaN is don't-care. + + This code currently assumes big-endian. */ + +#if (!defined (__NO_FPRS__) && !defined (__LITTLE_ENDIAN__) \ + && (defined (__MACH__) || defined (__powerpc__) || defined (_AIX))) + +#define fabs(x) __builtin_fabs(x) +#define isless(x, y) __builtin_isless (x, y) +#define inf() __builtin_inf() + +#define unlikely(x) __builtin_expect ((x), 0) + +#define nonfinite(a) unlikely (! isless (fabs (a), inf ())) + +/* All these routines actually take two long doubles as parameters, + but GCC currently generates poor code when a union is used to turn + a long double into a pair of doubles. */ + +extern long double __gcc_qadd (double, double, double, double); +extern long double __gcc_qsub (double, double, double, double); +extern long double __gcc_qmul (double, double, double, double); +extern long double __gcc_qdiv (double, double, double, double); + +#if defined __ELF__ && defined SHARED \ + && (defined __powerpc64__ || !(defined __linux__ || defined __gnu_hurd__)) +/* Provide definitions of the old symbol names to satisfy apps and + shared libs built against an older libgcc. To access the _xlq + symbols an explicit version reference is needed, so these won't + satisfy an unadorned reference like _xlqadd. If dot symbols are + not needed, the assembler will remove the aliases from the symbol + table. */ +__asm__ (".symver __gcc_qadd,_xlqadd(a)GCC_3.4\n\t" + ".symver __gcc_qsub,_xlqsub(a)GCC_3.4\n\t" + ".symver __gcc_qmul,_xlqmul(a)GCC_3.4\n\t" + ".symver __gcc_qdiv,_xlqdiv(a)GCC_3.4\n\t" + ".symver .__gcc_qadd,._xlqadd(a)GCC_3.4\n\t" + ".symver .__gcc_qsub,._xlqsub(a)GCC_3.4\n\t" + ".symver .__gcc_qmul,._xlqmul(a)GCC_3.4\n\t" + ".symver .__gcc_qdiv,._xlqdiv(a)GCC_3.4"); +#endif + +typedef union +{ + long double ldval; + double dval[2]; +} longDblUnion; + +/* Add two 'long double' values and return the result. */ +long double +__gcc_qadd (double a, double aa, double c, double cc) +{ + longDblUnion x; + double z, q, zz, xh; + + z = a + c; + + if (nonfinite (z)) + { + z = cc + aa + c + a; + if (nonfinite (z)) + return z; + x.dval[0] = z; /* Will always be DBL_MAX. */ + zz = aa + cc; + if (fabs(a) > fabs(c)) + x.dval[1] = a - z + c + zz; + else + x.dval[1] = c - z + a + zz; + } + else + { + q = a - z; + zz = q + c + (a - (q + z)) + aa + cc; + + /* Keep -0 result. */ + if (zz == 0.0) + return z; + + xh = z + zz; + if (nonfinite (xh)) + return xh; + + x.dval[0] = xh; + x.dval[1] = z - xh + zz; + } + return x.ldval; +} + +long double +__gcc_qsub (double a, double b, double c, double d) +{ + return __gcc_qadd (a, b, -c, -d); +} + +long double +__gcc_qmul (double a, double b, double c, double d) +{ + longDblUnion z; + double t, tau, u, v, w; + + t = a * c; /* Highest order double term. */ + + if (unlikely (t == 0) /* Preserve -0. */ + || nonfinite (t)) + return t; + + /* Sum terms of two highest orders. */ + + /* Use fused multiply-add to get low part of a * c. */ + asm ("fmsub %0,%1,%2,%3" : "=f"(tau) : "f"(a), "f"(c), "f"(t)); + v = a*d; + w = b*c; + tau += v + w; /* Add in other second-order terms. */ + u = t + tau; + + /* Construct long double result. */ + if (nonfinite (u)) + return u; + z.dval[0] = u; + z.dval[1] = (t - u) + tau; + return z.ldval; +} + +long double +__gcc_qdiv (double a, double b, double c, double d) +{ + longDblUnion z; + double s, sigma, t, tau, u, v, w; + + t = a / c; /* highest order double term */ + + if (unlikely (t == 0) /* Preserve -0. */ + || nonfinite (t)) + return t; + + /* Finite nonzero result requires corrections to the highest order term. */ + + s = c * t; /* (s,sigma) = c*t exactly. */ + w = -(-b + d * t); /* Written to get fnmsub for speed, but not + numerically necessary. */ + + /* Use fused multiply-add to get low part of c * t. */ + asm ("fmsub %0,%1,%2,%3" : "=f"(sigma) : "f"(c), "f"(t), "f"(s)); + v = a - s; + + tau = ((v-sigma)+w)/c; /* Correction to t. */ + u = t + tau; + + /* Construct long double result. */ + if (nonfinite (u)) + return u; + z.dval[0] = u; + z.dval[1] = (t - u) + tau; + return z.ldval; +} + +#endif +/* 128-bit long double support routines for Darwin. Copyright (C) 1993, 2003, 2004 Free Software Foundation, Inc. This file is part of GCC. --- gcc/config/rs6000/t-newas +++ gcc/config/rs6000/t-newas 2006/05/29 14:30:45 @@ -42,6 +42,9 @@ LIBGCC = stmp-multilib INSTALL_LIBGCC = install-multilib +# GCC 128-bit long double support routines. +LIB2FUNCS_EXTRA = $(srcdir)/config/rs6000/darwin-ldouble.c + # Aix 3.2.x needs milli.exp for -mcpu=common EXTRA_PARTS = milli.exp milli.exp: $(srcdir)/config/rs6000/milli.exp --- gcc/config/rs6000/t-ppccomm +++ gcc/config/rs6000/t-ppccomm 2006/05/29 14:30:45 @@ -1,6 +1,6 @@ # Common support for PowerPC ELF targets (both EABI and SVR4). -LIB2FUNCS_EXTRA = tramp.S +LIB2FUNCS_EXTRA = tramp.S $(srcdir)/config/rs6000/darwin-ldouble.c # This one can't end up in shared libgcc LIB2FUNCS_STATIC_EXTRA = eabi.S ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun...

1 0

commit pam
by root＠suse.de 31 May '06

31 May '06

Hello community, here is the log from the commit of package pam checked in at Wed May 31 02:55:48 CEST 2006. -------- --- pam/pam.changes 2006-05-17 14:46:10.000000000 +0200 +++ pam/pam.changes 2006-05-30 15:28:37.000000000 +0200 @@ -1,0 +2,5 @@ +Tue May 30 15:28:21 CEST 2006 - kukuk(a)suse.de + +- Update to Linux-PAM 0.99.4.0 (merge all patches and translations) + +------------------------------------------------------------------- Old: ---- Linux-PAM-0.99.3.0-docs.tar.bz2 Linux-PAM-0.99.3.0.tar.bz2 configure.diff cs.po de.po dlopen.sh fi.po fr.po hu.po km.po libpam.pam_item.diff manpages.tar.bz2 nl.po pam_lastlog.diff pam_listfile.diff pam_tally-large-uid.diff pl.po pt.po tr.po uk.po New: ---- Linux-PAM-0.99.4.0-docs.tar.bz2 Linux-PAM-0.99.4.0.tar.bz2 Linux-PAM-CVS.diff ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ pam.spec ++++++ --- /var/tmp/diff_new_pack.cZw7j6/_old 2006-05-31 02:54:24.000000000 +0200 +++ /var/tmp/diff_new_pack.cZw7j6/_new 2006-05-31 02:54:24.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package pam (Version 0.99.3.0) +# spec file for package pam (Version 0.99.4.0) # # Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine @@ -12,14 +12,14 @@ Name: pam BuildRequires: cracklib-devel db-devel -%define libpam_so_version 0.81.2 +%define libpam_so_version 0.81.4 %define libpam_misc_so_version 0.81.2 %define libpamc_so_version 0.81.0 License: GPL, distributable Group: System/Libraries Autoreqprov: on -Version: 0.99.3.0 -Release: 29 +Version: 0.99.4.0 +Release: 2 Summary: A security tool that provides authentication for applications Obsoletes: pam-laus Source: Linux-PAM-%{version}.tar.bz2 @@ -31,24 +31,7 @@ Source6: common-password.pamd Source7: common-session.pamd Source8: etc.environment -Source9: manpages.tar.bz2 -Source20: dlopen.sh -Source30: nl.po -Source31: pt.po -Source32: de.po -Source33: fi.po -Source34: km.po -Source35: pl.po -Source36: tr.po -Source37: hu.po -Source38: cs.po -Source39: fr.po -Source40: uk.po -Patch: configure.diff -Patch1: pam_listfile.diff -Patch2: pam_lastlog.diff -Patch3: libpam.pam_item.diff -Patch4: pam_tally-large-uid.diff +Patch: Linux-PAM-CVS.diff BuildRoot: %{_tmppath}/%{name}-%{version}-build %description @@ -75,20 +58,13 @@ %prep -%setup -q -n Linux-PAM-%{version} -a 9 +%setup -q -n Linux-PAM-%{version} %patch -%patch1 -%patch2 -%patch3 -%patch4 # # Install docu # cd doc tar xf %SOURCE1 -cd .. -# Update translation -cp -pv $RPM_SOURCE_DIR/??.po po/ %build autoreconf @@ -101,7 +77,7 @@ --enable-docdir=%{_docdir}/pam \ --enable-securedir=/%{_lib}/security make -make -C po update-po +make check %install install -d -m 755 $RPM_BUILD_ROOT/etc/pam.d @@ -111,15 +87,6 @@ install -d -m 755 $RPM_BUILD_ROOT%{_libdir} make DESTDIR=$RPM_BUILD_ROOT install /sbin/ldconfig -n $RPM_BUILD_ROOT/%{_lib} -# Check for module problems. Specifically, check that every module we just -# installed can actually be loaded by a minimal PAM-aware application. -export LD_LIBRARY_PATH="$RPM_BUILD_ROOT/%_lib" -for module in $RPM_BUILD_ROOT/%{_lib}/security/pam*.so ; do - if ! $RPM_SOURCE_DIR/dlopen.sh -L$RPM_BUILD_ROOT/%_lib -lpam -ldl ${module} ; then - exit 1 - fi -done -export -n LD_LIBRARY_PATH # Install documentation make -C doc install DESTDIR=$RPM_BUILD_ROOT # install /etc/environment @@ -167,14 +134,7 @@ install -m 644 CHANGELOG Copyright README $DOC cp -a doc/{pdf,txts,html} $DOC/ mv $DOC/txts $DOC/txt -# -# Install updated manual pages -# -for i in 3 5 8 ; do - cp -pv manpages/*.$i $RPM_BUILD_ROOT%{_mandir}/man$i/ -done # SELinux is not part of SL: -rm $RPM_BUILD_ROOT%{_mandir}/man8/pam_selinux.8* rm $DOC/modules/README.pam_selinux # Create filelist with translatins %{find_lang} Linux-PAM @@ -227,6 +187,8 @@ %{_libdir}/libpam_misc.so %changelog -n pam +* Tue May 30 2006 - kukuk(a)suse.de +- Update to Linux-PAM 0.99.4.0 (merge all patches and translations) * Wed May 17 2006 - schwab(a)suse.de - Don't strip binaries. * Fri May 05 2006 - kukuk(a)suse.de ++++++ Linux-PAM-0.99.3.0-docs.tar.bz2 -> Linux-PAM-0.99.4.0-docs.tar.bz2 ++++++ ++++ 15205 lines of diff (skipped) ++++++ Linux-PAM-0.99.3.0-docs.tar.bz2 -> Linux-PAM-0.99.4.0.tar.bz2 ++++++ ++++ 196120 lines of diff (skipped) ++++++ Linux-PAM-CVS.diff ++++++ ++++ 1375 lines (skipped) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun...

1 0

commit licq
by root＠suse.de 31 May '06

31 May '06

Hello community, here is the log from the commit of package licq checked in at Wed May 31 02:52:19 CEST 2006. -------- --- KDE/licq/licq.changes 2006-05-25 16:38:39.000000000 +0200 +++ licq/licq.changes 2006-05-30 07:21:23.000000000 +0200 @@ -1,0 +2,5 @@ +Tue May 30 07:21:19 CEST 2006 - adrian(a)suse.de + +- fix build for < 10.1 + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ licq.spec ++++++ --- /var/tmp/diff_new_pack.ZqcN7B/_old 2006-05-31 02:51:53.000000000 +0200 +++ /var/tmp/diff_new_pack.ZqcN7B/_new 2006-05-31 02:51:53.000000000 +0200 @@ -11,12 +11,17 @@ # norootforbuild Name: licq -BuildRequires: cdk-devel gcc-c++ gpgme-devel gtk-devel kdelibs3-devel qt3-devel-tools xosd-devel +BuildRequires: cdk-devel gtk-devel kdelibs3-devel qt3-devel-tools xosd-devel +%if %suse_version > 1000 +BuildRequires: gpgme-devel +%else +BuildRequires: openssl-devel +%endif License: GPL Group: Productivity/Networking/ICQ Autoreqprov: on Version: 20060522 -Release: 1 +Release: 3 Summary: Linux ICQ Client Source: %{name}-20060522.tar.bz2 Patch1: %{name}-config-fix.patch @@ -181,7 +186,11 @@ #rm -rf doc/CVS install -m 644 doc/* $RPM_BUILD_ROOT%{_prefix}/share/doc/packages/licq chmod 755 `find $RPM_BUILD_ROOT%{_prefix}/share/licq -type d` +%if %suse_version < 1010 +%suse_update_desktop_file -i licq Network InstantMessaging +%else %suse_update_desktop_file -i -G "ICQ Client" licq Network InstantMessaging +%endif %clean #rm -rf $RPM_BUILD_ROOT @@ -205,6 +214,8 @@ %exclude %{_libdir}/licq/*.*a %changelog -n licq +* Tue May 30 2006 - adrian(a)suse.de +- fix build for < 10.1 * Thu May 25 2006 - lmichnovic(a)suse.cz - update to version 20060522 from svn with new features: - switching trough tabs with mousewheel ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun...

1 0

commit ltrace
by root＠suse.de 31 May '06

31 May '06

Hello community, here is the log from the commit of package ltrace checked in at Wed May 31 02:52:16 CEST 2006. -------- --- ltrace/ltrace.changes 2006-05-18 13:03:26.000000000 +0200 +++ ltrace/ltrace.changes 2006-05-30 23:16:02.000000000 +0200 @@ -1,0 +2,5 @@ +Tue May 30 19:12:11 CEST 2006 - bk(a)suse.de + +- fix crash of every process traced with -p on ltrace exit (138568) + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ ltrace.spec ++++++ --- /var/tmp/diff_new_pack.vVQTdC/_old 2006-05-31 02:51:58.000000000 +0200 +++ /var/tmp/diff_new_pack.vVQTdC/_new 2006-05-31 02:51:58.000000000 +0200 @@ -17,7 +17,7 @@ Autoreqprov: on Summary: Trace the Library and System Calls a Program Makes Version: 0.3.36 -Release: 21 +Release: 22 BuildRoot: %{_tmppath}/%{name}-%{version}-build Source: ftp://ftp.debian.org/debian/pool/main/l/ltrace/%{name}_%{version}.orig.tar.… Source1: ltrace-acl+xattr.conf @@ -70,7 +70,15 @@ %patch7 -p1 %patch8 -p1 %patch9 -p1 +# ltrace-fix_-p_bug.diff has a side effect which causes a regression +# for non-ppc archs. What it addresses works on all other archs +# and ltrace mainline does things better than this patch. This patch +# is only a kludge which only helps on ppc/ppc64, and even there, +# it's not getting it done as it should, and it hurts all others. +# See the header of the patch and bug 138568 for more information: +%ifarch ppc ppc64 %patch10 -p1 +%endif %patch11 %patch12 -p1 %patch13 @@ -105,6 +113,8 @@ %config /etc/ltrace.conf %changelog -n ltrace +* Tue May 30 2006 - bk(a)suse.de +- fix crash of every process traced with -p on ltrace exit (138568) * Thu May 18 2006 - olh(a)suse.de - update man page to ltrace 0.4 version (176209 - LTC23913) * Tue May 02 2006 - olh(a)suse.de ++++++ ltrace-fix_-p_bug.diff ++++++ --- /var/tmp/diff_new_pack.vVQTdC/_old 2006-05-31 02:51:58.000000000 +0200 +++ /var/tmp/diff_new_pack.vVQTdC/_new 2006-05-31 02:51:58.000000000 +0200 @@ -1,6 +1,49 @@ +An anonymous coward wrote: + This patch fixes a couple of problems with the '-p' option: break-points where not being inserted after attaching to the process. Now they are. +--- +Indeed they were, but the above it only true for ppc/ppc64. On all +other architecture, it was already done right and this patch caused +ltrace -p to crash other programs to which it attached with it +detaches after a Ctrl-C from this user. + +See https://bugzilla.novell.com/show_bug.cgi?id=138568 for more info. + +Detailed description follows: + +Unfortunately, with this patch as it was, breakpoints were enabled +twice. So when the user presses Ctrl-C or kills ltrace with SIGTERM, +not the original program code was restored at the breakpoint addresses, +but the saved breakpoint code from the last round of enabling breakpoints +was restored which means that the program was still breakpointed after +ltrace detached and this led to the program to crash as soon as it hit +a breakpoint. + +Also, enabling breakpoints this early has a bad side effect, +which causes that the SIGSTOPs which ltrace uses to modify +the process are shown: + +--- SIGSTOP (Stopped (signal)) --- +--- SIGSTOP (Stopped (signal)) --- + +This may also mean that the program may still be running when +ltrace enables the breakpoints, which does not follow the orignal +design of stopping the program while modifying it to be safe from +crashes because of doing things on-the-fly. + +To fix the crash after detach, you must correctly set +proc->breakpoints_enabled to 1 (breakpoints are now enabled) +and not keep it set at -1 which means that they should be still +enabled after they aready are. + +So this change makes this patch for ltrace -p work on ppc/ppc64 +work as it should, but I am not applying this on other architectures +because there, ltrace -p works fine without this patch and without +the side effect introduced by it. + +Bernhard Kaindl, bk(a)suse.de - 31 May 2006 ================================================================================ --- ltrace-0.3.36/ltrace.c @@ -51,5 +94,5 @@ - proc = open_program(filename); - proc->pid = pid; + proc = open_program(filename,pid); -+ proc->breakpoints_enabled = -1; ++ proc->breakpoints_enabled = 1; } ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun...

1 0

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

31 May '06

Hello community, here is the log from the commit of package libzypp-zmd-backend checked in at Wed May 31 02:51:54 CEST 2006. -------- --- libzypp-zmd-backend/libzypp-zmd-backend.changes 2006-05-23 10:27:01.000000000 +0200 +++ libzypp-zmd-backend/libzypp-zmd-backend.changes 2006-05-30 12:45:12.000000000 +0200 @@ -1,0 +2,8 @@ +Tue May 30 12:42:24 CEST 2006 - kkaempf(a)suse.de + +- re-enable callback (r3398, r3425) based on environment variable + "KEYRING_CALLBACK" set by ZMD (#173920) +- output error heading to stdout instead of stderr (#177746) +- rev 3453 + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libzypp-zmd-backend.spec ++++++ --- /var/tmp/diff_new_pack.Q8an61/_old 2006-05-31 02:51:44.000000000 +0200 +++ /var/tmp/diff_new_pack.Q8an61/_new 2006-05-31 02:51:44.000000000 +0200 @@ -22,7 +22,7 @@ Obsoletes: zmd-librc-backend Summary: ZMD backend for Package, Patch, Pattern, and Product Management Version: 7.1.1.0 -Release: 47 +Release: 48 Source: zmd-backend-%{version}.tar.bz2 Prefix: /usr @@ -68,6 +68,11 @@ /etc/logrotate.d/zmd-backend %changelog -n libzypp-zmd-backend +* Tue May 30 2006 - kkaempf(a)suse.de +- re-enable callback (r3398, r3425) based on environment variable + "KEYRING_CALLBACK" set by ZMD (#173920) +- output error heading to stdout instead of stderr (#177746) +- rev 3453 * Tue May 23 2006 - mvidner(a)suse.cz - Disabled callbacks (r3398) because zmd is not ready yet. - rev 3425 ++++++ zmd-backend-7.1.1.0.tar.bz2 ++++++ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/zmd-backend-7.1.1.0/src/KeyRingCallbacks.h new/zmd-backend-7.1.1.0/src/KeyRingCallbacks.h --- old/zmd-backend-7.1.1.0/src/KeyRingCallbacks.h 2006-05-23 09:58:56.000000000 +0200 +++ new/zmd-backend-7.1.1.0/src/KeyRingCallbacks.h 2006-05-30 12:36:16.000000000 +0200 @@ -13,6 +13,7 @@ #ifndef ZMD_BACKEND_KEYRINGCALLBACKS_H #define ZMD_BACKEND_KEYRINGCALLBACKS_H +#include <stdlib.h> #include <iostream> #include <zypp/base/Logger.h> @@ -33,9 +34,9 @@ static bool readCallbackAnswer() { - return true; -//FIXME zmd is not ready yet!, #173920 -#if 0 + if (getenv( "KEYRING_CALLBACK" ) == NULL) + return true; + char c; bool result = false; while (std::cin.get( c )) { @@ -45,7 +46,7 @@ result = true; } return result; -#endif + } /////////////////////////////////////////////////////////////////// diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/zmd-backend-7.1.1.0/src/resolve-dependencies.cc new/zmd-backend-7.1.1.0/src/resolve-dependencies.cc --- old/zmd-backend-7.1.1.0/src/resolve-dependencies.cc 2006-05-04 11:00:45.000000000 +0200 +++ new/zmd-backend-7.1.1.0/src/resolve-dependencies.cc 2006-05-30 12:30:19.000000000 +0200 @@ -132,11 +132,11 @@ success = write_transactions( God->pool(), db.db(), context ); } else { - cerr << "Unresolved dependencies:" << endl; + cout << "Unresolved dependencies:" << endl; context->foreachInfo( PoolItem_Ref(), -1, append_dep_info, NULL ); - cerr.flush(); + cout.flush(); } } ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun...

1 0

commit libxflaim
by root＠suse.de 31 May '06

31 May '06

Hello community, here is the log from the commit of package libxflaim checked in at Wed May 31 02:51:47 CEST 2006. -------- --- libxflaim/libxflaim.changes 2006-03-01 00:38:15.000000000 +0100 +++ libxflaim/libxflaim.changes 2006-05-30 23:51:10.000000000 +0200 @@ -1,0 +2,20 @@ +Tue May 30 11:37:12 MST 2006 - dsanders(a)novell.com + +- Added JNI support. +- Added password parameter to the backup method. +- Modified to use a common toolkit layer for various functions that are common to FLAIM and XFLAIM +- Added support for Sparc Linux and OpenSuse 10.1 +- Various Makefile changes for HP-UX, OS X, and Solaris +- Various code cleanups to support a common toolkit +- Got rid of timeouts for internal transactions. +- Fixed defect where partial blocks were being written at the end of database files +- Fixed race condition that was causing memory to be double-freed. +- Added better support for atomic operations on various Unix and Linux platforms. +- Allow application to exceed hardcoded cache limits when setting a hard cache limit. +- Changed all RCODE values so they are different from those in toolkit. +- Fixed various compiler issues for solaris platform +- Added support for Netware +- Added support for building Windows binaries with Visual Studio 8. +- Modified slab manager on Solaris to use regular malloc calls instead of mmap. + +------------------------------------------------------------------- Old: ---- libxflaim-5.0.125.tar.gz New: ---- libxflaim-5.0.477.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libxflaim.spec ++++++ --- /var/tmp/diff_new_pack.rpL7OC/_old 2006-05-31 02:51:18.000000000 +0200 +++ /var/tmp/diff_new_pack.rpL7OC/_new 2006-05-31 02:51:18.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package libxflaim (Version 5.0.125) +# spec file for package libxflaim (Version 5.0.477) # # Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine @@ -11,14 +11,14 @@ Name: libxflaim %define prefix /usr -BuildRequires: gcc-c++ libstdc++ libstdc++-devel +BuildRequires: gcc-c++ java2-devel-packages libstdc++ libstdc++-devel Summary: Embeddable XML Database Engine URL: http://forge.novell.com/modules/xfmod/project/?flaim -Version: 5.0.125 +Version: 5.0.477 Release: 1 License: GPL Group: Development/Libraries/C and C++ -Source: libxflaim-5.0.125.tar.gz +Source: libxflaim-5.0.477.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-build %description @@ -60,7 +60,6 @@ %install make rpm_build_root=$RPM_BUILD_ROOT install_prefix=%{prefix} lib_dir_name=%{_lib} install -rm -rf build %clean rm -rf $RPM_BUILD_ROOT @@ -68,14 +67,32 @@ %files %defattr(-,root,root) %doc COPYING VERSION -%{prefix}/%{_lib}/libxflaim.so* +%{prefix}/%{_lib}/libxflaim*.so.2* %files devel %{prefix}/%{_lib}/libxflaim.a %{prefix}/%{_lib}/pkgconfig/libxflaim.pc %{prefix}/include/xflaim.h +%{prefix}/include/xflaimtk.h %changelog -n libxflaim +* Tue May 30 2006 - dsanders(a)novell.com +- Added JNI support. +- Added password parameter to the backup method. +- Modified to use a common toolkit layer for various functions that are common to FLAIM and XFLAIM +- Added support for Sparc Linux and OpenSuse 10.1 +- Various Makefile changes for HP-UX, OS X, and Solaris +- Various code cleanups to support a common toolkit +- Got rid of timeouts for internal transactions. +- Fixed defect where partial blocks were being written at the end of database files +- Fixed race condition that was causing memory to be double-freed. +- Added better support for atomic operations on various Unix and Linux platforms. +- Allow application to exceed hardcoded cache limits when setting a hard cache limit. +- Changed all RCODE values so they are different from those in toolkit. +- Fixed various compiler issues for solaris platform +- Added support for Netware +- Added support for building Windows binaries with Visual Studio 8. +- Modified slab manager on Solaris to use regular malloc calls instead of mmap. * Tue Feb 28 2006 - dsanders(a)novell.com - Added support for Intel MAC platform and __sparc49 (64 bit solaris). * Mon Feb 13 2006 - dsanders(a)novell.com ++++++ libxflaim-5.0.125.tar.gz -> libxflaim-5.0.477.tar.gz ++++++ ++++ 285658 lines of diff (skipped) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun...

1 0

commit libwnck
by root＠suse.de 31 May '06

31 May '06

Hello community, here is the log from the commit of package libwnck checked in at Wed May 31 02:51:40 CEST 2006. -------- --- GNOME/libwnck/libwnck.changes 2006-05-24 15:42:09.000000000 +0200 +++ libwnck/libwnck.changes 2006-05-30 16:26:35.000000000 +0200 @@ -1,0 +2,7 @@ +Tue May 30 16:25:53 CEST 2006 - danw(a)suse.de + +- Patch in a new method from libwnck HEAD to allow compiz to know + when a window has a real name (as opposed to a fallback name like + "untitled window"). #173059 + +------------------------------------------------------------------- New: ---- libwnck-has-name.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libwnck.spec ++++++ --- /var/tmp/diff_new_pack.ugZ2Re/_old 2006-05-31 02:50:38.000000000 +0200 +++ /var/tmp/diff_new_pack.ugZ2Re/_new 2006-05-31 02:50:38.000000000 +0200 @@ -17,7 +17,7 @@ Group: Development/Libraries/GNOME Autoreqprov: on Version: 2.12.2 -Release: 29 +Release: 31 Summary: Window Navigator Construction Kit (Library Package) Source: libwnck-%{version}.tar.bz2 Patch: %{name}-uninitialized.patch @@ -32,6 +32,7 @@ Patch9: libwnck-opacity-2.patch Patch10: libwnck-2.12.2-viewport-1.patch Patch11: libwnck-border_width-fix-1.patch +Patch12: libwnck-has-name.patch %description The Window Navigator Construction Kit is a library that can be used to @@ -77,6 +78,7 @@ %patch9 %patch10 %patch11 +%patch12 %build rename no nb po/no.* @@ -123,6 +125,10 @@ rm -rf $RPM_BUILD_ROOT %changelog -n libwnck +* Tue May 30 2006 - danw(a)suse.de +- Patch in a new method from libwnck HEAD to allow compiz to know + when a window has a real name (as opposed to a fallback name like + "untitled window"). #173059 * Fri May 12 2006 - dreveman(a)suse.de - Fix so that correct geometry is returned when border width is greater than 0. (bnc 178222) ++++++ libwnck-has-name.patch ++++++ Index: libwnck/window.c ================================================================================ --- libwnck/window.c +++ libwnck/window.c @@ -216,7 +216,7 @@ { window->priv = g_new0 (WnckWindowPrivate, 1); - window->priv->name = g_strdup (FALLBACK_NAME); + window->priv->name = NULL; window->priv->icon_name = NULL; window->priv->workspace = ALL_WORKSPACES; @@ -447,12 +447,35 @@ } /** + * wnck_window_has_name: + * @window: a #WnckWindow + * + * Checks whether or not @window has a name. wnck_window_get_name() + * will always return some value, even if the window hasn't set a + * name; wnck_window_has_name() can be used to tell if that name is + * real or not. + * + * For icons titles, use wnck_window_has_icon_name() instead. + * + * Return value: %TRUE if wnck_window_get_name() returns the window's + * real name, %FALSE if it returns a fallback name. + **/ +gboolean +wnck_window_has_name (WnckWindow *window) +{ + g_return_val_if_fail (WNCK_IS_WINDOW (window), FALSE); + + return window->priv->name != NULL; +} + +/** * wnck_window_get_name: * @window: a #WnckWindow * * Gets the name of the window, as it should be displayed in a pager * or tasklist. Always returns some value, even if the window - * hasn't set a name. + * hasn't set a name; use wnck_window_has_name() if you need to know + * whether the returned name is "real" or not. * * For icons titles, use wnck_window_get_icon_name() instead. * @@ -463,17 +486,47 @@ { g_return_val_if_fail (WNCK_IS_WINDOW (window), NULL); - return window->priv->name; + if (window->priv->name) + return window->priv->name; + else + return FALLBACK_NAME; +} + +/** + * wnck_window_has_icon_name: + * @window: a #WnckWindow + * + * Checks whether or not @window has an icon name. + * wnck_window_get_icon_name() will always return some value, even if + * the window hasn't set an icon name; wnck_window_has_icon_name() can + * be used to tell if that name is real or not. + * + * (Note that if wnck_window_has_icon_name() returns %FALSE, but + * wnck_window_has_name() returns %TRUE, then the name returned by + * wnck_window_get_icon_name() is the window name. Only when both + * methods return %FALSE does wnck_window_get_icon_name() return a + * generic fallback name.) + * + * Return value: %TRUE if wnck_window_get_icon_name() returns the + * window's real icon name, %FALSE if it returns a fallback name. + **/ +gboolean +wnck_window_has_icon_name (WnckWindow *window) +{ + g_return_val_if_fail (WNCK_IS_WINDOW (window), FALSE); + + return window->priv->icon_name != NULL; } /** * wnck_window_get_icon_name: * @window: a #WnckWindow * - * Gets the name of the window, as it should be displayed for an - * icon. Always returns some value, even if the window hasn't set a - * name. Contrast with wnck_window_get_name(), which returns the - * window title, not the icon title. + * Gets the name of the window, as it should be displayed for an icon. + * Always returns some value, even if the window hasn't set a name; + * use wnck_window_has_icon_name() if you need to know if the name is + * "real" or not. Contrast with wnck_window_get_name(), which returns + * the window title, not the icon title. * * Return value: name of the window **/ @@ -484,8 +537,10 @@ if (window->priv->icon_name) return window->priv->icon_name; - else + else if (window->priv->name) return window->priv->name; + else + return FALLBACK_NAME; } WnckApplication* @@ -1950,9 +2005,6 @@ window->priv->need_update_name = FALSE; window->priv->name = _wnck_get_name (window->priv->xwindow); - - if (window->priv->name == NULL) - window->priv->name = g_strdup (FALLBACK_NAME); } static void @@ -2297,32 +2349,43 @@ * and we have to fix that before we emit any other signals */ - old_name = window->priv->name; - window->priv->name = NULL; + if (window->priv->need_update_name) + { + old_name = window->priv->name; + window->priv->name = NULL; - update_name (window); + update_name (window); - if (window->priv->name == NULL) - window->priv->name = old_name; - else - { - if (strcmp (window->priv->name, old_name) != 0) - do_emit_name_changed = TRUE; + if (old_name == NULL || window->priv->name == NULL) + { + if (old_name != window->priv->name) + do_emit_name_changed = TRUE; + } + else + { + if (strcmp (window->priv->name, old_name) != 0) + do_emit_name_changed = TRUE; + } g_free (old_name); } - old_icon_name = window->priv->icon_name; - window->priv->icon_name = NULL; + if (window->priv->need_update_icon_name) + { + old_icon_name = window->priv->icon_name; + window->priv->icon_name = NULL; - update_icon_name (window); + update_icon_name (window); - if (window->priv->icon_name == NULL) - window->priv->icon_name = old_icon_name; - else - { - if (old_icon_name == NULL || - strcmp (window->priv->icon_name, old_icon_name) != 0) - do_emit_name_changed = TRUE; + if (old_icon_name == NULL || window->priv->icon_name == NULL) + { + if (old_icon_name != window->priv->icon_name) + do_emit_name_changed = TRUE; + } + else + { + if (strcmp (window->priv->icon_name, old_icon_name) != 0) + do_emit_name_changed = TRUE; + } g_free (old_icon_name); } --- libwnck/window.h +++ libwnck/window.h @@ -136,7 +136,9 @@ WnckScreen* wnck_window_get_screen (WnckWindow *window); +gboolean wnck_window_has_name (WnckWindow *window); const char* wnck_window_get_name (WnckWindow *window); +gboolean wnck_window_has_icon_name (WnckWindow *window); const char* wnck_window_get_icon_name (WnckWindow *window); WnckApplication* wnck_window_get_application (WnckWindow *window); ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun...

1 0

commit libflaim
by root＠suse.de 31 May '06

31 May '06

Hello community, here is the log from the commit of package libflaim checked in at Wed May 31 02:51:14 CEST 2006. -------- --- libflaim/libflaim.changes 2006-03-01 00:37:33.000000000 +0100 +++ libflaim/libflaim.changes 2006-05-30 20:27:12.000000000 +0200 @@ -1,0 +2,22 @@ +Tue May 30 11:37:12 MST 2006 - dsanders(a)novell.com + +- Added support for Sparc Linux and OpenSuse 10.1 +- Various Makefile changes for HP-UX, OS X, and Solaris +- Various code cleanups to support a common toolkit +- Got rid of timeouts for internal transactions. +- Removed some unused methods from the FlmRecord class. +- Fixed defect where partial blocks were being written at the end of database files +- Fixed race condition that was causing memory to be double-freed. +- Added better support for atomic operations on various Unix and Linux platforms. +- Allow application to exceed hardcoded cache limits when setting a hard cache limit. +- Changed RCODE to be an enumerated type - for easier documentation in doxygen. +- Fixed various compiler issues for solaris platform +- Added support for large binary and text fields (up to 4 GB) +- Added async and direct I/O support for Linux and Solaris +- Added new field table for level one fields inside FlmRecords to speed up searches. +- Added support for Netware +- Fixed double mutex lock issue. +- Added support for building Windows binaries with Visual Studio 8. +- Modified slab manager on Solaris to use regular malloc calls instead of mmap. + +------------------------------------------------------------------- Old: ---- libflaim-4.8.125.tar.gz New: ---- libflaim-4.8.473.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libflaim.spec ++++++ --- /var/tmp/diff_new_pack.2ilrFV/_old 2006-05-31 02:50:34.000000000 +0200 +++ /var/tmp/diff_new_pack.2ilrFV/_new 2006-05-31 02:50:34.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package libflaim (Version 4.8.125) +# spec file for package libflaim (Version 4.8.473) # # Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine @@ -14,11 +14,11 @@ BuildRequires: gcc-c++ libstdc++ libstdc++-devel Summary: Embeddable cross-platform database engine URL: http://forge.novell.com/modules/xfmod/project/?flaim -Version: 4.8.125 +Version: 4.8.473 Release: 1 License: GPL Group: Development/Libraries/C and C++ -Source: libflaim-4.8.125.tar.gz +Source: libflaim-4.8.473.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-build %description @@ -62,7 +62,6 @@ %install make rpm_build_root=$RPM_BUILD_ROOT install_prefix=%{prefix} lib_dir_name=%{_lib} install -rm -rf build %clean rm -rf $RPM_BUILD_ROOT @@ -70,7 +69,7 @@ %files %defattr(-,root,root) %doc COPYING VERSION -%{prefix}/%{_lib}/libflaim.so* +%{prefix}/%{_lib}/libflaim*.so.2.0.1* %files devel %{prefix}/%{_lib}/libflaim.a @@ -78,6 +77,25 @@ %{prefix}/include/flaim.h %changelog -n libflaim +* Tue May 30 2006 - dsanders(a)novell.com +- Added support for Sparc Linux and OpenSuse 10.1 +- Various Makefile changes for HP-UX, OS X, and Solaris +- Various code cleanups to support a common toolkit +- Got rid of timeouts for internal transactions. +- Removed some unused methods from the FlmRecord class. +- Fixed defect where partial blocks were being written at the end of database files +- Fixed race condition that was causing memory to be double-freed. +- Added better support for atomic operations on various Unix and Linux platforms. +- Allow application to exceed hardcoded cache limits when setting a hard cache limit. +- Changed RCODE to be an enumerated type - for easier documentation in doxygen. +- Fixed various compiler issues for solaris platform +- Added support for large binary and text fields (up to 4 GB) +- Added async and direct I/O support for Linux and Solaris +- Added new field table for level one fields inside FlmRecords to speed up searches. +- Added support for Netware +- Fixed double mutex lock issue. +- Added support for building Windows binaries with Visual Studio 8. +- Modified slab manager on Solaris to use regular malloc calls instead of mmap. * Tue Feb 28 2006 - dsanders(a)novell.com - Added support for Intel MAC and __sparc49 (64 bit) platforms - Initialized variables to quiet compiler warnings ++++++ libflaim-4.8.125.tar.gz -> libflaim-4.8.473.tar.gz ++++++ ++++ 274124 lines of diff (skipped) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun...

1 0

commit kxmleditor
by root＠suse.de 31 May '06

31 May '06

Hello community, here is the log from the commit of package kxmleditor checked in at Wed May 31 02:50:30 CEST 2006. -------- --- KDE/kxmleditor/kxmleditor.changes 2006-02-17 12:02:49.000000000 +0100 +++ kxmleditor/kxmleditor.changes 2006-05-30 07:30:50.000000000 +0200 @@ -1,0 +2,5 @@ +Tue May 30 07:30:46 CEST 2006 - adrian(a)suse.de + +- fix build for < 10.1 + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kxmleditor.spec ++++++ --- /var/tmp/diff_new_pack.KbeJVQ/_old 2006-05-31 02:49:52.000000000 +0200 +++ /var/tmp/diff_new_pack.KbeJVQ/_new 2006-05-31 02:49:52.000000000 +0200 @@ -12,9 +12,12 @@ Name: kxmleditor BuildRequires: kdebase3-devel +%if %suse_version < 1010 +BuildRequires: update-desktop-files +%endif Summary: A Tool for Browsing and Editing XML Documents Version: 1.1.4 -Release: 8 +Release: 21 License: GPL URL: http://kxmleditor.sourceforge.net/ Group: Productivity/Publishing/XML @@ -46,7 +49,11 @@ %install . /etc/opt/kde3/common_options make $INSTALL_TARGET DESTDIR=$RPM_BUILD_ROOT +%if %suse_version < 1010 +%suse_update_desktop_file -r %name Utility Editor +%else %suse_update_desktop_file -G "XML Editor" -r %name Utility Editor +%endif cd $RPM_BUILD_ROOT find . -type d | sed '1,2d;s,^\.,\%attr(-\,root\,root) \%dir ,' > $RPM_BUILD_DIR/file.list.kxmleditor find . -type f | sed 's,^\.,\%attr(-\,root\,root) ,' >> $RPM_BUILD_DIR/file.list.kxmleditor @@ -60,6 +67,8 @@ %files -f ../file.list.kxmleditor %changelog -n kxmleditor +* Tue May 30 2006 - adrian(a)suse.de +- fix build for < 10.1 * Fri Feb 17 2006 - coolo(a)suse.de - don't configure in %%setup * Wed Feb 15 2006 - stbinner(a)suse.de ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun...

1 0

commit libapr-util1
by root＠suse.de 31 May '06

31 May '06

Hello community, here is the log from the commit of package libapr-util1 checked in at Wed May 31 02:50:28 CEST 2006. -------- --- libapr-util1/libapr-util1.changes 2006-01-25 21:37:22.000000000 +0100 +++ libapr-util1/libapr-util1.changes 2006-05-30 14:35:59.000000000 +0200 @@ -1,0 +2,19 @@ +Tue May 30 14:35:24 CEST 2006 - poeml(a)suse.de + +- fix BuildRequires for Fedora Core +- ditch krb5 from BuildRequires, since it doesn't seem to be needed +- use --with-berkeley-db + +------------------------------------------------------------------- +Tue Apr 25 13:04:38 CEST 2006 - poeml(a)suse.de + +- upstream 1.2.7. relevant changes: + *) Fix apr_dbd_init to be safe to call multiple times + *) Stop trying to link against Berkeley DB by default. + (use --with-berkeley-db) + *) Stop trying to link against GDBM by default. (use --with-gdbm) + *) Fix the escape implementations for the sqlite2 and sqlite3 dbd + back ends. + *) Add support for Berkeley DB 4.4 to the configure scripts. + +------------------------------------------------------------------- Old: ---- apr-util-1.2.2.tar.bz2 New: ---- apr-util-1.2.7.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libapr-util1.spec ++++++ --- /var/tmp/diff_new_pack.0ouXwe/_old 2006-05-31 02:49:55.000000000 +0200 +++ /var/tmp/diff_new_pack.0ouXwe/_new 2006-05-31 02:49:55.000000000 +0200 @@ -1,22 +1,30 @@ # -# spec file for package libapr-util1 (Version 1.2.2) +# spec file for package libapr-util1 (Version 1.2.7) # -# Copyright (c) 2005 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine # package are under the same license as the package itself. # -# Please submit bugfixes or comments via http://www.suse.de/feedback/ +# Please submit bugfixes or comments via http://bugs.opensuse.org/ # # norootforbuild Name: libapr-util1 -BuildRequires: db-devel doxygen expat krb5 libapr1-devel openldap2 openldap2-devel +BuildRequires: libapr1-devel +# +BuildRequires: db-devel expat openldap2 openldap2-devel +%if %{?suse_version:1}0 +BuildRequires: doxygen +%else +BuildRequires: expat-devel +%endif +# URL: http://apr.apache.org/ License: Other uncritical OpenSource License, Apache Group: Development/Libraries/Other Autoreqprov: on -Version: 1.2.2 +Version: 1.2.7 Release: 1 Summary: Apache Portable Runtime (APR) Library Source: http://www.apache.org/dist/apr/apr-util-%{version}.tar.bz2 @@ -60,15 +68,20 @@ --includedir=%{includedir} \ --with-apr=/usr/bin/apr-1-config \ --with-ldap \ + --with-berkeley-db \ --without-gdbm make make check +%if %{?suse_version:1}0 make dox +%endif %install rm -rf $RPM_BUILD_ROOT make install DESTDIR=$RPM_BUILD_ROOT +%if %{?suse_version:1}0 mv docs/dox/html html +%endif rm -f $RPM_BUILD_ROOT/%{_libdir}/aprutil.exp %clean @@ -89,7 +102,9 @@ %files devel %defattr(-,root,root) +%if %{?suse_version:1}0 %doc --parents html +%endif %dir %{includedir} %{includedir}/*.h %{_libdir}/libaprutil-%{apuver}.a @@ -99,6 +114,19 @@ %{_libdir}/pkgconfig/apr-util-%{apuver}.pc %changelog -n libapr-util1 +* Tue May 30 2006 - poeml(a)suse.de +- fix BuildRequires for Fedora Core +- ditch krb5 from BuildRequires, since it doesn't seem to be needed +- use --with-berkeley-db +* Tue Apr 25 2006 - poeml(a)suse.de +- upstream 1.2.7. relevant changes: + *) Fix apr_dbd_init to be safe to call multiple times + *) Stop trying to link against Berkeley DB by default. + (use --with-berkeley-db) + *) Stop trying to link against GDBM by default. (use --with-gdbm) + *) Fix the escape implementations for the sqlite2 and sqlite3 dbd + back ends. + *) Add support for Berkeley DB 4.4 to the configure scripts. * Wed Jan 25 2006 - mls(a)suse.de - converted neededforbuild to BuildRequires * Wed Oct 12 2005 - poeml(a)suse.de ++++++ apr-util-1.2.2.tar.bz2 -> apr-util-1.2.7.tar.bz2 ++++++ ++++ 16092 lines of diff (skipped) ++++ retrying with extended exclude list diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/apr-util-1.2.2/CHANGES new/apr-util-1.2.7/CHANGES --- old/apr-util-1.2.2/CHANGES 2005-09-20 00:47:05.000000000 +0200 +++ new/apr-util-1.2.7/CHANGES 2006-04-09 21:37:11.000000000 +0200 @@ -1,5 +1,45 @@ +Changes with APR-util 1.2.7 + + *) Fix apr_dbd_init to be safe to call multiple times + [Bojan Smojver <bojan rexursive com>, Nick Kew] + + *) Win32 / Netware - add missing apu_version.c for apu_version_string() + to the Windows and Netware specific builds. Unix platforms supported + this API since 0.9.1. [William Rowe, Brad Nicholes]. + +Changes with APR-util 1.2.6 + + *) Stop trying to link against Berkeley DB by default. To enable use + of Berkeley DB users must now explicitly pass --with-berkeley-db to + configure, since Berkeley DB is released under a viral license that + requires distribution of source code for any program that uses it. + [Garrett Rooney] + + *) Stop trying to link against GDBM by default. To enable use of GDBM + users must now explicitly pass --with-gdbm to configure, since GDBM + is licensed under the GPL. + [Garrett Rooney] + + *) Fix VPATH builds, and symlink builds where apr and apr-util + reside in parallel as symlinks to directories with more explicit + names, e.g. apr-1.x and apr-util-1.x. This solves various breakage + on Solaris in particular with ./buildconf and ./configure. Also + eliminated the nested ../apr-iconv/buildconf, given that apr-util + didn't bother with ../apr/buildconf, and this was inconsistant. + [William Rowe] + + *) Fix the escape implementations for the sqlite2 and sqlite3 dbd + back ends. + [Ronen Mizrahi <ronen tversity.com>, Garrett Rooney] + + *) Add support for Berkeley DB 4.4 to the configure scripts. + [Garrett Rooney] + + *) Fix bug in test suite that cause testbuckets to write 8GB file + on Mac OS X. [Justin Erenkrantz] + Changes with APR-util 1.2.2 - + *) Teach configure how to find the Novell LDAP SDK. [Graham Leggett] *) Fix usage of ldapssl_init/ldap_sslinit on platforms that support diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/apr-util-1.2.2/INSTALL.MySQL new/apr-util-1.2.7/INSTALL.MySQL --- old/apr-util-1.2.2/INSTALL.MySQL 2005-02-25 20:49:02.000000000 +0100 +++ new/apr-util-1.2.7/INSTALL.MySQL 2006-01-26 06:11:08.000000000 +0100 @@ -2,7 +2,8 @@ If you wish to build the driver, download apr_dbd_mysql.c from http://apache.webthing.com/database/ -and copy it into the dbd directory before running configure. +and copy it into the dbd directory. +Now run buildconf, followed by configure. It is distributed under the GPL to conform with MySQL License terms This means it cannot be distributed from apache.org, as that would diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/apr-util-1.2.2/apr-util.spec new/apr-util-1.2.7/apr-util.spec --- old/apr-util-1.2.2/apr-util.spec 2005-09-27 01:28:53.000000000 +0200 +++ new/apr-util-1.2.7/apr-util.spec 2006-04-09 22:37:43.000000000 +0200 @@ -3,7 +3,7 @@ Summary: Apache Portable Runtime Utility library Name: apr-util -Version: 1.2.2 +Version: 1.2.7 Release: 1 License: Apache Software License Group: System Environment/Libraries diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/apr-util-1.2.2/aprutil.dsp new/apr-util-1.2.7/aprutil.dsp --- old/apr-util-1.2.2/aprutil.dsp 2005-07-08 11:44:00.000000000 +0200 +++ new/apr-util-1.2.7/aprutil.dsp 2006-04-03 03:47:32.000000000 +0200 @@ -64,8 +64,8 @@ # PROP Intermediate_Dir "LibD" # PROP Ignore_Export_Lib 0 # PROP Target_Dir "" -# ADD BASE CPP /nologo /MDd /W3 /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /FD /c -# ADD CPP /nologo /MDd /W3 /GX /Zi /Od /I "./include" /I "../apr/include" /I "./include/private" /I "../apr-iconv/include" /I "./dbm/sdbm" /I "./xml/expat/lib" /D "_DEBUG" /D "APR_DECLARE_STATIC" /D "APU_DECLARE_STATIC" /D "API_DECLARE_STATIC" /D "APU_USE_SDBM" /D "WIN32" /D "_WINDOWS" /Fd"LibD\aprutil_src" /FD /c +# ADD BASE CPP /nologo /MDd /W3 /EHsc /Zi /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /FD /c +# ADD CPP /nologo /MDd /W3 /EHsc /Zi /Od /I "./include" /I "../apr/include" /I "./include/private" /I "../apr-iconv/include" /I "./dbm/sdbm" /I "./xml/expat/lib" /D "_DEBUG" /D "APR_DECLARE_STATIC" /D "APU_DECLARE_STATIC" /D "API_DECLARE_STATIC" /D "APU_USE_SDBM" /D "WIN32" /D "_WINDOWS" /Fd"LibD\aprutil_src" /FD /c # ADD BASE RSC /l 0x409 /d "_DEBUG" # ADD RSC /l 0x409 /d "_DEBUG" BSC32=bscmake.exe @@ -254,6 +254,10 @@ SOURCE=.\misc\apr_rmm.c # End Source File +# Begin Source File + +SOURCE=.\misc\apu_version.c +# End Source File # End Group # Begin Group "sdbm" @@ -490,33 +494,6 @@ !ENDIF # End Source File -# Begin Source File - -SOURCE=.\uri\gen_uri_delims.exe - -!IF "$(CFG)" == "aprutil - Win32 Release" - -# Begin Custom Build - Generating uri_delims.h -InputPath=.\uri\gen_uri_delims.exe - -".\uri\uri_delims.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" - .\uri\gen_uri_delims.exe >.\uri\uri_delims.h - -# End Custom Build - -!ELSEIF "$(CFG)" == "aprutil - Win32 Debug" - -# Begin Custom Build - Generating uri_delims.h -InputPath=.\uri\gen_uri_delims.exe - -".\uri\uri_delims.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" - .\uri\gen_uri_delims.exe >.\uri\uri_delims.h - -# End Custom Build - -!ENDIF - -# End Source File # End Group # Begin Group "Public Header Files" diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/apr-util-1.2.2/aprutil.dsw new/apr-util-1.2.7/aprutil.dsw --- old/apr-util-1.2.2/aprutil.dsw 2004-11-25 00:41:24.000000000 +0100 +++ new/apr-util-1.2.7/aprutil.dsw 2006-03-09 21:32:49.000000000 +0100 @@ -42,9 +42,6 @@ Project_Dep_Name apr End Project Dependency Begin Project Dependency - Project_Dep_Name gen_uri_delims - End Project Dependency - Begin Project Dependency Project_Dep_Name xml End Project Dependency Begin Project Dependency @@ -129,9 +126,6 @@ Project_Dep_Name libapr End Project Dependency Begin Project Dependency - Project_Dep_Name gen_uri_delims - End Project Dependency - Begin Project Dependency Project_Dep_Name xml End Project Dependency Begin Project Dependency @@ -141,18 +135,6 @@ ############################################################################### -Project: "gen_uri_delims"=".\uri\gen_uri_delims.dsp" - Package Owner=<4> - -Package=<5> -{{{ -}}} - -Package=<4> -{{{ -}}} - -############################################################################### - Project: "xml"=".\xml\expat\lib\xml.dsp" - Package Owner=<4> Package=<5> diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/apr-util-1.2.2/build/apr_common.m4 new/apr-util-1.2.7/build/apr_common.m4 --- old/apr-util-1.2.2/build/apr_common.m4 2005-09-27 01:28:39.000000000 +0200 +++ new/apr-util-1.2.7/build/apr_common.m4 2006-01-31 16:44:46.000000000 +0100 @@ -471,40 +471,29 @@ dnl dnl APR_TRY_COMPILE_NO_WARNING(INCLUDES, FUNCTION-BODY, -dnl [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND]]) +dnl [ACTIONS-IF-NO-WARNINGS], [ACTIONS-IF-WARNINGS]) dnl dnl Tries a compile test with warnings activated so that the result -dnl is false if the code doesn't compile cleanly. -dnl -AC_DEFUN(APR_TRY_COMPILE_NO_WARNING, -[if test "x$CFLAGS_WARN" = "x"; then - apr_tcnw_flags="" -else - apr_tcnw_flags=$CFLAGS_WARN -fi -if test "$ac_cv_prog_gcc" = "yes"; then - apr_tcnw_flags="$apr_tcnw_flags -Werror" -fi -changequote(', ') -cat > conftest.$ac_ext <<EOTEST -#include "confdefs.h" -'$1' -int main(int argc, const char * const argv[]) { -'$2' -; return 0; } -EOTEST -changequote([, ]) -if ${CC-cc} -c $CFLAGS $CPPFLAGS $apr_tcnw_flags conftest.$ac_ext 2>&AC_FD_CC ; then - ifelse([$3], , :, [rm -rf conftest* - $3]) -else - echo "configure: failed or warning program:" >&AC_FD_CC - cat conftest.$ac_ext >&AC_FD_CC - ifelse([$4], , , [rm -rf conftest* - $4]) -fi -rm -f conftest* -])dnl +dnl is false if the code doesn't compile cleanly. For compilers +dnl where it is not known how to activate a "fail-on-error" mode, +dnl it is undefined which of the sets of actions will be run. +dnl +AC_DEFUN([APR_TRY_COMPILE_NO_WARNING], +[apr_save_CFLAGS=$CFLAGS + CFLAGS="$CFLAGS $CFLAGS_WARN" + if test "$ac_cv_prog_gcc" = "yes"; then + CFLAGS="$CFLAGS -Werror" + fi + AC_COMPILE_IFELSE( + [#include "confdefs.h" + ] + [[$1]] + [int main(int argc, const char *const *argv) {] + [[$2]] + [ return 0; }], + [$3], [$4]) + CFLAGS=$apr_save_CFLAGS +]) dnl dnl APR_CHECK_STRERROR_R_RC @@ -731,6 +720,13 @@ echo "** Error: Cannot use undefined layout '$LAYOUT'" exit 1 fi + # Catch layout names including a slash which will otherwise + # confuse the heck out of the sed script. + case $2 in + */*) + echo "** Error: $2 is not a valid layout name" + exit 1 ;; + esac pldconf=./config.pld changequote({,}) sed -e "1s/[ ]*<[lL]ayout[ ]*$2[ ]*>[ ]*//;1t" \ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/apr-util-1.2.2/build/apu-conf.m4 new/apr-util-1.2.7/build/apu-conf.m4 --- old/apr-util-1.2.2/build/apu-conf.m4 2005-09-20 15:27:50.000000000 +0200 +++ new/apr-util-1.2.7/build/apu-conf.m4 2006-02-04 03:24:20.000000000 +0100 @@ -142,11 +142,17 @@ AC_DEFUN([APU_FIND_EXPAT], [ AC_ARG_WITH([expat], -[ --with-expat=DIR specify Expat location], [ +[ --with-expat=DIR specify Expat location or 'builtin'], [ if test "$withval" = "yes"; then AC_MSG_ERROR([a directory must be specified for --with-expat]) elif test "$withval" = "no"; then AC_MSG_ERROR([Expat cannot be disabled (at this time)]) + elif test "$withval" = "builtin"; then + abs_expatdir="`cd $srcdir/xml/expat && pwd`" + if test -d $abs_expatdir/. -a ! -d xml/expat/.; then + $mkdir_p xml/expat + fi + APU_TEST_EXPAT($abs_expatdir, xml/expat) else abs_expatdir="`cd $withval && pwd`" APU_TEST_EXPAT($abs_expatdir, $withval) diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/apr-util-1.2.2/build/dbm.m4 new/apr-util-1.2.7/build/dbm.m4 --- old/apr-util-1.2.2/build/dbm.m4 2005-02-24 11:23:34.000000000 +0100 +++ new/apr-util-1.2.7/build/dbm.m4 2006-02-09 05:17:38.000000000 +0100 @@ -445,6 +445,25 @@ apu_db_version=4 fi ]) +dnl +dnl APU_CHECK_DB44: is DB4.4 present? +dnl +dnl if present: sets apu_db_header, apu_db_lib, and apu_db_version +dnl +AC_DEFUN([APU_CHECK_DB44], [ + places=$1 + if test -z "$places"; then + places="std /usr/local/BerkeleyDB.4.4 /boot/home/config" + fi + APU_CHECK_BERKELEY_DB("4", "4", "-1", + "$places", + "db44/db.h db4/db.h db.h", + "db-4.4 db4-4.4 db44 db4 db" + ) + if test "$apu_have_db" = "1"; then + apu_db_version=4 + fi +]) AC_DEFUN([APU_CHECK_DB], [ @@ -506,6 +525,12 @@ AC_MSG_ERROR(Berkeley db4 not found) fi ;; + db44) + APU_CHECK_DB44("$check_places") + if test "$apu_db_version" != "4"; then + AC_MSG_ERROR(Berkeley db4 not found) + fi + ;; default) APU_CHECK_DB_ALL("$check_places") ;; @@ -518,21 +543,24 @@ AC_DEFUN([APU_CHECK_DB_ALL], [ all_places=$1 - APU_CHECK_DB43("$all_places") + APU_CHECK_DB44("$all_places") if test "$apu_db_version" != "4"; then - APU_CHECK_DB42("$all_places") + APU_CHECK_DB43("$all_places") if test "$apu_db_version" != "4"; then - APU_CHECK_DB41("$all_places") + APU_CHECK_DB42("$all_places") if test "$apu_db_version" != "4"; then - APU_CHECK_DB4("$all_places") + APU_CHECK_DB41("$all_places") if test "$apu_db_version" != "4"; then - APU_CHECK_DB3("$all_places") - if test "$apu_db_version" != "3"; then - APU_CHECK_DB2("$all_places") - if test "$apu_db_version" != "2"; then - APU_CHECK_DB1("$all_places") - if test "$apu_db_version" != "1"; then - APU_CHECK_DB185("$all_places") + APU_CHECK_DB4("$all_places") + if test "$apu_db_version" != "4"; then + APU_CHECK_DB3("$all_places") + if test "$apu_db_version" != "3"; then + APU_CHECK_DB2("$all_places") + if test "$apu_db_version" != "2"; then + APU_CHECK_DB1("$all_places") + if test "$apu_db_version" != "1"; then + APU_CHECK_DB185("$all_places") + fi fi fi fi @@ -568,17 +596,18 @@ AC_ARG_WITH(dbm, [ --with-dbm=DBM choose the DBM type to use. - DBM={sdbm,gdbm,ndbm,db,db1,db185,db2,db3,db4,db41,db42,db43} + DBM={sdbm,gdbm,ndbm,db,db1,db185,db2,db3,db4,db41,db42,db43,db44} ], [ if test "$withval" = "yes"; then AC_MSG_ERROR([--with-dbm needs to specify a DBM type to use. - One of: sdbm, gdbm, ndbm, db, db1, db185, db2, db3, db4, db41, db42, db43]) + One of: sdbm, gdbm, ndbm, db, db1, db185, db2, db3, db4, db41, db42, db43, db44]) fi requested="$withval" ], [ requested=default ]) + dnl We don't pull in GDBM unless the user asks for it, since it's GPL AC_ARG_WITH([gdbm], [ --with-gdbm=DIR specify GDBM location ], [ @@ -598,9 +627,6 @@ APR_ADDTO(APRUTIL_INCLUDES, [-I$withval/include]) fi fi - ], [ - apu_have_gdbm=0 - AC_CHECK_HEADER(gdbm.h, AC_CHECK_LIB(gdbm, gdbm_open, [apu_have_gdbm=1])) ]) AC_ARG_WITH([ndbm], [ @@ -673,6 +699,10 @@ fi dnl We're going to try to find the highest version of Berkeley DB supported. + dnl + dnl Note that we only do this if the user requested it, since the Sleepycat + dnl license is viral and requires distribution of source along with programs + dnl that use it. AC_ARG_WITH([berkeley-db], [ --with-berkeley-db=PATH Find the Berkeley DB header and library in \`PATH/include' and @@ -697,8 +727,6 @@ AC_ERROR(Berkeley DB not found.) fi fi - ],[ - APU_CHECK_DB($requested, "") ]) if test -n "$apu_db_xtra_libs"; then @@ -754,6 +782,10 @@ apu_use_db=1 apu_default_dbm=db4 ;; + db44) + apu_use_db=1 + apu_default_dbm=db4 + ;; default) dnl ### use more sophisticated DBMs for the default? apu_default_dbm="sdbm (default)" @@ -761,7 +793,7 @@ ;; *) AC_MSG_ERROR([--with-dbm=$look_for is an unknown DBM type. - Use one of: sdbm, gdbm, ndbm, db, db1, db185, db2, db3, db4, db41, db42]) + Use one of: sdbm, gdbm, ndbm, db, db1, db185, db2, db3, db4, db41, db42, db43, db44]) ;; esac diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/apr-util-1.2.2/build/get-version.sh new/apr-util-1.2.7/build/get-version.sh --- old/apr-util-1.2.2/build/get-version.sh 2004-11-25 00:41:24.000000000 +0100 +++ new/apr-util-1.2.7/build/get-version.sh 2004-11-25 00:07:58.000000000 +0100 @@ -12,14 +12,14 @@ # if test $# != 3; then - echo "USAGE: $0 CMD INCLUDEDIR PREFIX" - echo " where CMD is one of: all, major" + echo "USAGE: $0 CMD VERSION_HEADER PREFIX" + echo " where CMD is one of: all, major, libtool" exit 1 fi -major_sed="/#define.*$3_MAJOR_VERSION/s/^.*$[0-9][0-9]*$.*$/\1/p" -minor_sed="/#define.*$3_MINOR_VERSION/s/^.*$[0-9][0-9]*$.*$/\1/p" -patch_sed="/#define.*$3_PATCH_VERSION/s/^.*$[0-9][0-9]*$.*$/\1/p" +major_sed="/#define.*$3_MAJOR_VERSION/s/^[^0-9]*$[0-9]*$.*$/\1/p" +minor_sed="/#define.*$3_MINOR_VERSION/s/^[^0-9]*$[0-9]*$.*$/\1/p" +patch_sed="/#define.*$3_PATCH_VERSION/s/^[^0-9]*$[0-9]*$.*$/\1/p" major="`sed -n $major_sed $2`" minor="`sed -n $minor_sed $2`" patch="`sed -n $patch_sed $2`" diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/apr-util-1.2.2/buildconf new/apr-util-1.2.7/buildconf --- old/apr-util-1.2.2/buildconf 2005-06-14 16:15:16.000000000 +0200 +++ new/apr-util-1.2.7/buildconf 2006-03-25 21:30:07.000000000 +0100 @@ -38,8 +38,8 @@ shift done -if test -d "$apr_src_dir" -then +if [ -f "$apr_src_dir/build/apr_common.m4" ]; then + apr_src_dir=`cd $apr_src_dir; pwd` echo "" echo "Looking for apr source in $apr_src_dir" else @@ -54,10 +54,11 @@ # Remove some files, then copy them from apr source tree rm -f build/apr_common.m4 build/find_apr.m4 build/install.sh \ - build/config.guess build/config.sub -cp $apr_src_dir/build/apr_common.m4 $apr_src_dir/build/find_apr.m4 \ - $apr_src_dir/build/install.sh $apr_src_dir/build/config.guess \ - $apr_src_dir/build/config.sub build + build/config.guess build/config.sub build/get-version.sh +cp -p $apr_src_dir/build/apr_common.m4 $apr_src_dir/build/find_apr.m4 \ + $apr_src_dir/build/install.sh $apr_src_dir/build/config.guess \ + $apr_src_dir/build/config.sub $apr_src_dir/build/get-version.sh \ + build/ # Remove aclocal.m4 as it'll break some builds... rm -rf aclocal.m4 autom4te*.cache @@ -84,17 +85,9 @@ $apr_src_dir/build/gen-build.py make # -# If apr-iconv, then go and configure it. -# -if test -d ../apr-iconv; then - echo "Invoking ../apr-iconv/buildconf.sh ..." - (cd ../apr-iconv; ./buildconf) -fi - -# # If Expat has been bundled, then go and configure the thing # -if test -d xml/expat; then +if [ -f xml/expat/buildconf.sh ]; then echo "Invoking xml/expat/buildconf.sh ..." (cd xml/expat; ./buildconf.sh) fi diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/apr-util-1.2.2/dbd/apr_dbd.c new/apr-util-1.2.7/dbd/apr_dbd.c --- old/apr-util-1.2.2/dbd/apr_dbd.c 2005-08-11 16:06:26.000000000 +0200 +++ new/apr-util-1.2.7/dbd/apr_dbd.c 2006-04-09 21:37:11.000000000 +0200 @@ -27,6 +27,7 @@ static apr_hash_t *drivers = NULL; +#define CLEANUP_CAST (apr_status_t (*)(void*)) /* Once the autofoo supports building it for dynamic load, we can use * #define APR_DSO_BUILD APR_HAS_DSO @@ -47,21 +48,36 @@ } #endif +static apr_status_t apr_dbd_term(void *ptr) +{ + /* set drivers to NULL so init can work again */ + drivers = NULL; + + /* Everything else we need is handled by cleanups registered + * when we created mutexes and loaded DSOs + */ + return APR_SUCCESS; +} + APU_DECLARE(apr_status_t) apr_dbd_init(apr_pool_t *pool) { - apr_status_t ret; + apr_status_t ret = APR_SUCCESS; + + if (drivers != NULL) { + return APR_SUCCESS; + } drivers = apr_hash_make(pool); + apr_pool_cleanup_register(pool, NULL, apr_dbd_term, + apr_pool_cleanup_null); #if APR_DSO_BUILD #if APR_HAS_THREADS ret = apr_thread_mutex_create(&mutex, APR_THREAD_MUTEX_DEFAULT, pool); - apr_pool_cleanup_register(pool, mutex, (void*)apr_thread_mutex_destroy, - apr_pool_cleanup_null); + /* This already registers a pool cleanup */ #endif #else - ret = APR_SUCCESS; #if APU_HAVE_MYSQL DRIVER_LOAD("mysql", apr_dbd_mysql_driver, pool); @@ -143,12 +159,13 @@ apr_pool_t *pool, const char *params, apr_dbd_t **handle) { - + apr_status_t rv; *handle = driver->open(pool, params); if (*handle == NULL) { return APR_EGENERAL; } - if (apr_dbd_check_conn(driver, pool, *handle) != APR_SUCCESS) { + rv = apr_dbd_check_conn(driver, pool, *handle); + if ((rv != APR_SUCCESS) && (rv != APR_ENOTIMPL)) { apr_dbd_close(driver, *handle); return APR_EGENERAL; } @@ -160,7 +177,8 @@ { int ret = driver->start_transaction(pool, handle, trans); if (*trans) { - apr_pool_cleanup_register(pool, *trans, (void*)driver->end_transaction, + apr_pool_cleanup_register(pool, *trans, + CLEANUP_CAST driver->end_transaction, apr_pool_cleanup_null); } return ret; @@ -169,7 +187,7 @@ apr_pool_t *pool, apr_dbd_transaction_t *trans) { - apr_pool_cleanup_kill(pool, trans, (void*)driver->end_transaction); + apr_pool_cleanup_kill(pool, trans, CLEANUP_CAST driver->end_transaction); return driver->end_transaction(trans); } diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/apr-util-1.2.2/dbd/apr_dbd_pgsql.c new/apr-util-1.2.7/dbd/apr_dbd_pgsql.c --- old/apr-util-1.2.2/dbd/apr_dbd_pgsql.c 2005-08-11 10:51:16.000000000 +0200 +++ new/apr-util-1.2.7/dbd/apr_dbd_pgsql.c 2006-01-26 06:08:39.000000000 +0100 @@ -247,8 +247,13 @@ } /* Translate from apr_dbd to native query format */ for (sqlptr = (char*)query; *sqlptr; ++sqlptr) { - if ((sqlptr[0] == '%') && isalpha(sqlptr[1])) { - ++nargs; + if (sqlptr[0] == '%') { + if (isalpha(sqlptr[1])) { + ++nargs; + } + else if (sqlptr[1] == '%') { + ++sqlptr; + } } } length = strlen(query) + 1; diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/apr-util-1.2.2/dbd/apr_dbd_sqlite2.c new/apr-util-1.2.7/dbd/apr_dbd_sqlite2.c --- old/apr-util-1.2.2/dbd/apr_dbd_sqlite2.c 2005-08-11 10:51:16.000000000 +0200 +++ new/apr-util-1.2.7/dbd/apr_dbd_sqlite2.c 2006-03-15 07:04:54.000000000 +0100 @@ -168,6 +168,10 @@ static const char *dbd_sqlite_get_entry(const apr_dbd_row_t * row, int n) { + if ((n < 0) || (n >= row->res->sz)) { + return NULL; + } + return row->data[n]; } @@ -211,7 +215,7 @@ static const char *dbd_sqlite_escape(apr_pool_t * pool, const char *arg, apr_dbd_t * sql) { - char *ret = sqlite_mprintf(arg); + char *ret = sqlite_mprintf("%q", arg); apr_pool_cleanup_register(pool, ret, (void *) sqlite_freemem, apr_pool_cleanup_null); return ret; @@ -308,7 +312,7 @@ perm = strstr(params, ":"); if (perm) { - *(perm++) = '\x00'; // split the filename and permissions + *(perm++) = '\x00'; /* split the filename and permissions */ if (strlen(perm) > 0) iperms = atoi(perm); diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/apr-util-1.2.2/dbd/apr_dbd_sqlite3.c new/apr-util-1.2.7/dbd/apr_dbd_sqlite3.c --- old/apr-util-1.2.2/dbd/apr_dbd_sqlite3.c 2005-08-11 10:51:16.000000000 +0200 +++ new/apr-util-1.2.7/dbd/apr_dbd_sqlite3.c 2006-03-15 07:04:54.000000000 +0100 @@ -65,6 +65,7 @@ apr_dbd_row_t *next_row; size_t sz; int tuples; + char **col_names; }; struct apr_dbd_prepared_t { @@ -109,6 +110,8 @@ (*results)->random = seek; (*results)->next_row = 0; (*results)->tuples = 0; + (*results)->col_names = apr_pcalloc(pool, + column_count * sizeof(char *)); do { ret = sqlite3_step((*results)->stmt); if (ret == SQLITE_BUSY) { @@ -117,6 +120,7 @@ } else { apr_thread_mutex_unlock(sql->mutex); apr_sleep(MAX_RETRY_SLEEP); + apr_thread_mutex_lock(sql->mutex); } } else if (ret == SQLITE_ROW) { int length; @@ -131,13 +135,18 @@ for (i = 0; i < (*results)->sz; i++) { column = apr_palloc(pool, sizeof(apr_dbd_column_t)); row->columns[i] = column; - column->name = (char *) sqlite3_column_name((*results)->stmt, i); + /* copy column name once only */ + if ((*results)->col_names[i] == NULL) { + (*results)->col_names[i] = + apr_pstrdup(pool, + sqlite3_column_name((*results)->stmt, i)); + } + column->name = (*results)->col_names[i]; column->size = sqlite3_column_bytes((*results)->stmt, i); column->type = sqlite3_column_type((*results)->stmt, i); + column->value = NULL; switch (column->type) { - case SQLITE_FLOAT: - break; case SQLITE_INTEGER: case SQLITE_TEXT: hold = NULL; @@ -209,7 +218,7 @@ { apr_dbd_column_t *column; const char *value; - if ((n + 1) > row->columnCount) { + if ((n < 0) || (n >= row->columnCount)) { return NULL; } column = row->columns[n]; @@ -226,19 +235,12 @@ { sqlite3_stmt *stmt = NULL; const char *tail = NULL; - int ret, length = 0; - apr_status_t res; - apr_pool_t *pool; + int ret = -1, length = 0; if (sql->trans && sql->trans->errnum) { return sql->trans->errnum; } - res = apr_pool_create(&pool, sql->pool); - if (res != APR_SUCCESS) { - sql->trans->errnum = res; - return SQLITE_ERROR; - } length = strlen(query); apr_thread_mutex_lock(sql->mutex); @@ -248,7 +250,6 @@ sqlite3_finalize(stmt); break; } - ret = sqlite3_step(stmt); *nrows = sqlite3_changes(sql->conn); sqlite3_finalize(stmt); @@ -257,20 +258,19 @@ } while (length > 0); if (dbd_sqlite3_is_success(ret)) { - res = 0; + ret = 0; } apr_thread_mutex_unlock(sql->mutex); - apr_pool_destroy(pool); if (sql->trans) { - sql->trans->errnum = res; + sql->trans->errnum = ret; } - return res; + return ret; } static const char *dbd_sqlite3_escape(apr_pool_t *pool, const char *arg, apr_dbd_t *sql) { - char *ret = sqlite3_mprintf(arg); + char *ret = sqlite3_mprintf("%q", arg); apr_pool_cleanup_register(pool, ret, (void *) sqlite3_free, apr_pool_cleanup_null); return ret; diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/apr-util-1.2.2/include/apr_dbd.h new/apr-util-1.2.7/include/apr_dbd.h --- old/apr-util-1.2.2/include/apr_dbd.h 2005-08-11 16:06:26.000000000 +0200 +++ new/apr-util-1.2.7/include/apr_dbd.h 2006-02-10 19:57:22.000000000 +0100 @@ -25,6 +25,16 @@ extern "C" { #endif +/** + * @file apr_dbd.h + * @brief APR-UTIL DBD library + */ +/** + * @defgroup APR_Util_DBD DBD routines + * @ingroup APR_Util + * @{ + */ + /* These are opaque structs. Instantiation is up to each backend */ typedef struct apr_dbd_driver_t apr_dbd_driver_t; typedef struct apr_dbd_t apr_dbd_t; @@ -314,6 +324,8 @@ apr_dbd_prepared_t *statement, int random, ...); +/** @} */ + #ifdef __cplusplus } #endif diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/apr-util-1.2.2/include/apr_uri.h new/apr-util-1.2.7/include/apr_uri.h --- old/apr-util-1.2.2/include/apr_uri.h 2005-05-25 07:54:58.000000000 +0200 +++ new/apr-util-1.2.7/include/apr_uri.h 2006-01-26 06:10:16.000000000 +0100 @@ -154,21 +154,21 @@ * @param p The pool to allocate out of * @param uri The uri to parse * @param uptr The apr_uri_t to fill out - * @return 0 for success or error code + * @return APR_SUCCESS for success or error code */ -APU_DECLARE(int) apr_uri_parse(apr_pool_t *p, const char *uri, - apr_uri_t *uptr); +APU_DECLARE(apr_status_t) apr_uri_parse(apr_pool_t *p, const char *uri, + apr_uri_t *uptr); /** * Special case for CONNECT parsing: it comes with the hostinfo part only * @param p The pool to allocate out of * @param hostinfo The hostinfo string to parse * @param uptr The apr_uri_t to fill out - * @return 0 for success or error code + * @return APR_SUCCESS for success or error code */ -APU_DECLARE(int) apr_uri_parse_hostinfo(apr_pool_t *p, - const char *hostinfo, - apr_uri_t *uptr); +APU_DECLARE(apr_status_t) apr_uri_parse_hostinfo(apr_pool_t *p, + const char *hostinfo, + apr_uri_t *uptr); /** @} */ #ifdef __cplusplus diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/apr-util-1.2.2/include/apu_version.h new/apr-util-1.2.7/include/apu_version.h --- old/apr-util-1.2.2/include/apu_version.h 2005-09-27 01:24:03.000000000 +0200 +++ new/apr-util-1.2.7/include/apu_version.h 2006-04-09 21:50:49.000000000 +0200 @@ -59,14 +59,14 @@ * The Patch Level never includes API changes, simply bug fixes. * Reset to 0 when upgrading APR_MINOR_VERSION */ -#define APU_PATCH_VERSION 2 +#define APU_PATCH_VERSION 7 /** * The symbol APU_IS_DEV_VERSION is only defined for internal, * "development" copies of APU. It is undefined for released versions * of APU. */ -/* #define APU_IS_DEV_VERSION */ +#undef APU_IS_DEV_VERSION #if defined(APU_IS_DEV_VERSION) || defined(DOXYGEN) diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/apr-util-1.2.2/libaprutil.dsp new/apr-util-1.2.7/libaprutil.dsp --- old/apr-util-1.2.2/libaprutil.dsp 2005-07-08 11:44:00.000000000 +0200 +++ new/apr-util-1.2.7/libaprutil.dsp 2006-04-03 03:47:32.000000000 +0200 @@ -68,8 +68,8 @@ # PROP Intermediate_Dir "Debug" # PROP Ignore_Export_Lib 0 # PROP Target_Dir "" -# ADD BASE CPP /nologo /MDd /W3 /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /FD /c -# ADD CPP /nologo /MDd /W3 /GX /Zi /Od /I "./include" /I "../apr/include" /I "./include/private" /I "../apr-iconv/include" /I "./dbm/sdbm" /I "./xml/expat/lib" /D "_DEBUG" /D "APU_DECLARE_EXPORT" /D "APU_USE_SDBM" /D "WIN32" /D "_WINDOWS" /Fd"Debug\libaprutil_src" /FD /c +# ADD BASE CPP /nologo /MDd /W3 /EHsc /Zi /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /FD /c +# ADD CPP /nologo /MDd /W3 /EHsc /Zi /Od /I "./include" /I "../apr/include" /I "./include/private" /I "../apr-iconv/include" /I "./dbm/sdbm" /I "./xml/expat/lib" /D "_DEBUG" /D "APU_DECLARE_EXPORT" /D "APU_USE_SDBM" /D "WIN32" /D "_WINDOWS" /Fd"Debug\libaprutil_src" /FD /c # ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o /win32 "NUL" # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o /win32 "NUL" # ADD BASE RSC /l 0x409 /d "_DEBUG" @@ -260,6 +260,10 @@ SOURCE=.\misc\apr_rmm.c # End Source File +# Begin Source File + +SOURCE=.\misc\apu_version.c +# End Source File # End Group # Begin Group "sdbm" @@ -496,33 +500,6 @@ !ENDIF # End Source File -# Begin Source File - -SOURCE=.\uri\gen_uri_delims.exe - -!IF "$(CFG)" == "libaprutil - Win32 Release" - -# Begin Custom Build - Generating uri_delims.h -InputPath=.\uri\gen_uri_delims.exe - -".\uri\uri_delims.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" - .\uri\gen_uri_delims.exe >.\uri\uri_delims.h - -# End Custom Build - -!ELSEIF "$(CFG)" == "libaprutil - Win32 Debug" - -# Begin Custom Build - Generating uri_delims.h -InputPath=.\uri\gen_uri_delims.exe - -".\uri\uri_delims.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" - .\uri\gen_uri_delims.exe >.\uri\uri_delims.h - -# End Custom Build - -!ENDIF - -# End Source File # End Group # Begin Group "Public Header Files" diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/apr-util-1.2.2/libaprutil.rc new/apr-util-1.2.7/libaprutil.rc --- old/apr-util-1.2.2/libaprutil.rc 2005-03-16 05:23:10.000000000 +0100 +++ new/apr-util-1.2.7/libaprutil.rc 2005-12-02 14:51:58.000000000 +0100 @@ -1,54 +1,54 @@ -#include "apu_version.h" - -#define APU_COPYRIGHT "Copyright 2000-2005 The Apache Software " \ - "Foundation or its licensors, as applicable." - -#define APU_LICENSE "Licensed under the Apache License, Version 2.0 " \ - "(the ""License""); you may not use this file except " \ - "in compliance with the License. You may obtain a " \ - "copy of the License at\r\n\r\n" \ - "http://www.apache.org/licenses/LICENSE-2.0\r\n\r\n" \ - "Unless required by applicable law or agreed to in " \ - "writing, software distributed under the License is " \ - "distributed on an ""AS IS"" BASIS, WITHOUT " \ - "WARRANTIES OR CONDITIONS OF ANY KIND, either " \ - "express or implied. See the License for the " \ - "specific language governing permissions and " \ - "limitations under the License." - -#define APU_DLL_BASENAME "libaprutil-" APU_STRINGIFY(APU_MAJOR_VERSION) - - -1 VERSIONINFO - FILEVERSION APU_VERSION_STRING_CSV,0 - PRODUCTVERSION APU_VERSION_STRING_CSV,0 - FILEFLAGSMASK 0x3fL -#if defined(_DEBUG) - FILEFLAGS 0x01L -#else - FILEFLAGS 0x00L -#endif - FILEOS 0x40004L - FILETYPE 0x1L - FILESUBTYPE 0x0L -BEGIN - BLOCK "StringFileInfo" - BEGIN - BLOCK "040904b0" - BEGIN - VALUE "Comments", APU_LICENSE "\0" - VALUE "CompanyName", "Apache Software Foundation\0" - VALUE "FileDescription", "Apache Portable Runtime Library\0" - VALUE "FileVersion", APU_VERSION_STRING "\0" - VALUE "InternalName", APU_DLL_BASENAME "\0" - VALUE "LegalCopyright", APU_COPYRIGHT "\0" - VALUE "OriginalFilename", APU_DLL_BASENAME ".dll\0" - VALUE "ProductName", "Apache Portable Runtime Project\0" - VALUE "ProductVersion", APU_VERSION_STRING "\0" - END - END - BLOCK "VarFileInfo" - BEGIN - VALUE "Translation", 0x409, 1200 - END -END +#include "apu_version.h" + +#define APU_COPYRIGHT "Copyright 2000-2005 The Apache Software " \ + "Foundation or its licensors, as applicable." + +#define APU_LICENSE "Licensed under the Apache License, Version 2.0 " \ + "(the ""License""); you may not use this file except " \ + "in compliance with the License. You may obtain a " \ + "copy of the License at\r\n\r\n" \ + "http://www.apache.org/licenses/LICENSE-2.0\r\n\r\n" \ + "Unless required by applicable law or agreed to in " \ + "writing, software distributed under the License is " \ + "distributed on an ""AS IS"" BASIS, WITHOUT " \ + "WARRANTIES OR CONDITIONS OF ANY KIND, either " \ + "express or implied. See the License for the " \ + "specific language governing permissions and " \ + "limitations under the License." + +#define APU_DLL_BASENAME "libaprutil-" APU_STRINGIFY(APU_MAJOR_VERSION) + + +1 VERSIONINFO + FILEVERSION APU_VERSION_STRING_CSV,0 + PRODUCTVERSION APU_VERSION_STRING_CSV,0 + FILEFLAGSMASK 0x3fL +#if defined(_DEBUG) + FILEFLAGS 0x01L +#else + FILEFLAGS 0x00L +#endif + FILEOS 0x40004L + FILETYPE 0x1L + FILESUBTYPE 0x0L +BEGIN + BLOCK "StringFileInfo" + BEGIN + BLOCK "040904b0" + BEGIN + VALUE "Comments", APU_LICENSE "\0" + VALUE "CompanyName", "Apache Software Foundation\0" + VALUE "FileDescription", "Apache Portable Runtime Library\0" + VALUE "FileVersion", APU_VERSION_STRING "\0" + VALUE "InternalName", APU_DLL_BASENAME "\0" + VALUE "LegalCopyright", APU_COPYRIGHT "\0" + VALUE "OriginalFilename", APU_DLL_BASENAME ".dll\0" + VALUE "ProductName", "Apache Portable Runtime Project\0" + VALUE "ProductVersion", APU_VERSION_STRING "\0" + END + END + BLOCK "VarFileInfo" + BEGIN + VALUE "Translation", 0x409, 1200 + END +END diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/apr-util-1.2.2/test/testbuckets.c new/apr-util-1.2.7/test/testbuckets.c --- old/apr-util-1.2.2/test/testbuckets.c 2005-09-21 12:53:18.000000000 +0200 +++ new/apr-util-1.2.7/test/testbuckets.c 2006-01-26 06:04:09.000000000 +0100 @@ -344,8 +344,16 @@ } ABTS_ASSERT(tc, "total size of buckets incorrect", count == bignum); - + apr_brigade_destroy(bb); + + /* Truncate the file to zero size before close() so that we don't + * actually write out the large file if we are on a non-sparse file + * system - like Mac OS X's HFS. Otherwise, pity the poor user who + * has to wait for the 8GB file to be written to disk. + */ + apr_file_trunc(f, 0); + apr_file_close(f); apr_bucket_alloc_destroy(ba); apr_file_remove(TIF_FNAME, p); diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/apr-util-1.2.2/test/testdbd.c new/apr-util-1.2.7/test/testdbd.c --- old/apr-util-1.2.2/test/testdbd.c 2005-09-21 15:47:15.000000000 +0200 +++ new/apr-util-1.2.7/test/testdbd.c 2006-01-27 05:30:56.000000000 +0100 @@ -136,6 +136,14 @@ ABTS_ASSERT(tc, "If we overseek, get_row should return -1", rv == -1); } +static void test_escape(abts_case *tc, apr_dbd_t *handle, + const apr_dbd_driver_t *driver) +{ + const char *escaped = apr_dbd_escape(driver, p, "foo'bar", handle); + + ABTS_STR_EQUAL(tc, "foo''bar", escaped); +} + static void test_dbd_generic(abts_case *tc, apr_dbd_t* handle, const apr_dbd_driver_t* driver) { @@ -156,6 +164,8 @@ select_rows(tc, handle, driver, 0); drop_table(tc, handle, driver); + test_escape(tc, handle, driver); + rv = apr_dbd_close(driver, handle); ABTS_ASSERT(tc, "failed to close database", rv == APR_SUCCESS); } diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/apr-util-1.2.2/uri/apr_uri.c new/apr-util-1.2.7/uri/apr_uri.c --- old/apr-util-1.2.2/uri/apr_uri.c 2005-02-04 21:45:35.000000000 +0100 +++ new/apr-util-1.2.7/uri/apr_uri.c 2006-01-26 06:10:16.000000000 +0100 @@ -253,8 +253,8 @@ * - fills in fields of uri_components *uptr * - none on any of the r->* fields */ -APU_DECLARE(int) apr_uri_parse(apr_pool_t *p, const char *uri, - apr_uri_t *uptr) +APU_DECLARE(apr_status_t) apr_uri_parse(apr_pool_t *p, const char *uri, + apr_uri_t *uptr) { const char *s; const char *s1; @@ -413,9 +413,9 @@ * currently at http://www.mcom.com/newsref/std/tunneling_ssl.html * for the format of the "CONNECT host:port HTTP/1.0" request */ -APU_DECLARE(int) apr_uri_parse_hostinfo(apr_pool_t *p, - const char *hostinfo, - apr_uri_t *uptr) +APU_DECLARE(apr_status_t) apr_uri_parse_hostinfo(apr_pool_t *p, + const char *hostinfo, + apr_uri_t *uptr) { const char *s; char *endstr; diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/apr-util-1.2.2/uri/gen_uri_delims.c new/apr-util-1.2.7/uri/gen_uri_delims.c --- old/apr-util-1.2.2/uri/gen_uri_delims.c 2005-02-04 21:45:35.000000000 +0100 +++ new/apr-util-1.2.7/uri/gen_uri_delims.c 1970-01-01 01:00:00.000000000 +0100 @@ -1,47 +0,0 @@ -/* Copyright 2000-2005 The Apache Software Foundation or its licensors, as - * applicable. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -#include <stdio.h> - -/* generate a apr_table_t of 256 values, where certain characters are - * marked "interesting"... for the uri parsing process. - */ - -int main(int argc, char *argv[]) -{ - int i; - char *value; - - printf("/* this file is automatically generated by " - "gen_uri_delims, do not edit */\n"); - printf("static const unsigned char uri_delims[256] = {"); - for (i = 0; i < 256; ++i) { - if (i % 20 == 0) - printf("\n "); - switch (i) { - case ':': value = "T_COLON"; break; - case '/': value = "T_SLASH"; break; - case '?': value = "T_QUESTION"; break; - case '#': value = "T_HASH"; break; - case '\0': value = "T_NUL"; break; - default: value = "0"; break; - } - printf("%s%c", value, (i < 255) ? ',' : ' '); - } - printf("\n};\n"); - - return 0; -} diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/apr-util-1.2.2/uri/gen_uri_delims.dsp new/apr-util-1.2.7/uri/gen_uri_delims.dsp --- old/apr-util-1.2.2/uri/gen_uri_delims.dsp 2004-11-25 00:41:24.000000000 +0100 +++ new/apr-util-1.2.7/uri/gen_uri_delims.dsp 1970-01-01 01:00:00.000000000 +0100 @@ -1,94 +0,0 @@ -# Microsoft Developer Studio Project File - Name="gen_uri_delims" - Package Owner=<4> -# Microsoft Developer Studio Generated Build File, Format Version 6.00 -# ** DO NOT EDIT ** - -# TARGTYPE "Win32 (x86) Console Application" 0x0103 - -CFG=gen_uri_delims - Win32 Debug -!MESSAGE This is not a valid makefile. To build this project using NMAKE, -!MESSAGE use the Export Makefile command and run -!MESSAGE -!MESSAGE NMAKE /f "gen_uri_delims.mak". -!MESSAGE -!MESSAGE You can specify a configuration when running NMAKE -!MESSAGE by defining the macro CFG on the command line. For example: -!MESSAGE -!MESSAGE NMAKE /f "gen_uri_delims.mak" CFG="gen_uri_delims - Win32 Debug" -!MESSAGE -!MESSAGE Possible choices for configuration are: -!MESSAGE -!MESSAGE "gen_uri_delims - Win32 Release" (based on "Win32 (x86) Console Application") -!MESSAGE "gen_uri_delims - Win32 Debug" (based on "Win32 (x86) Console Application") -!MESSAGE - -# Begin Project -# PROP AllowPerConfigDependencies 0 -# PROP Scc_ProjName "" -# PROP Scc_LocalPath "" -CPP=cl.exe -RSC=rc.exe - -!IF "$(CFG)" == "gen_uri_delims - Win32 Release" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 0 -# PROP BASE Output_Dir "" -# PROP BASE Intermediate_Dir "Release" -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 0 -# PROP Output_Dir "" -# PROP Intermediate_Dir "Release" -# PROP Ignore_Export_Lib 0 -# PROP Target_Dir "" -# ADD BASE CPP /nologo /MD /W3 /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /FD /c -# ADD CPP /nologo /MD /W3 /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /Fd"Release\gen_uri_delims" /FD /c -# ADD BASE RSC /l 0x809 /d "NDEBUG" -# ADD RSC /l 0x809 /d "NDEBUG" -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo -LINK32=link.exe -# ADD BASE LINK32 kernel32.lib /nologo /subsystem:console /pdb:"Release\gen_uri_delims.pdb" /machine:I386 -# SUBTRACT BASE LINK32 /pdb:none -# ADD LINK32 kernel32.lib /nologo /subsystem:console /pdb:"Release\gen_uri_delims.pdb" /machine:I386 -# SUBTRACT LINK32 /pdb:none - -!ELSEIF "$(CFG)" == "gen_uri_delims - Win32 Debug" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 1 -# PROP BASE Output_Dir "" -# PROP BASE Intermediate_Dir "Debug" -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 1 -# PROP Output_Dir "" -# PROP Intermediate_Dir "Debug" -# PROP Ignore_Export_Lib 0 -# PROP Target_Dir "" -# ADD BASE CPP /nologo /MDd /W3 /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FD /c -# ADD CPP /nologo /MDd /W3 /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /Fd"Debug\gen_uri_delims" /FD /c -# ADD BASE RSC /l 0x809 /d "_DEBUG" -# ADD RSC /l 0x809 /d "_DEBUG" -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo -LINK32=link.exe -# ADD BASE LINK32 kernel32.lib /nologo /subsystem:console /incremental:no /pdb:"Debug\gen_uri_delims.pdb" /debug /machine:I386 -# SUBTRACT BASE LINK32 /pdb:none -# ADD LINK32 kernel32.lib /nologo /subsystem:console /incremental:no /pdb:"Debug\gen_uri_delims.pdb" /debug /machine:I386 -# SUBTRACT LINK32 /pdb:none - -!ENDIF - -# Begin Target - -# Name "gen_uri_delims - Win32 Release" -# Name "gen_uri_delims - Win32 Debug" -# Begin Source File - -SOURCE=.\gen_uri_delims.c -# End Source File -# End Target -# End Project diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/apr-util-1.2.2/xml/expat/README new/apr-util-1.2.7/xml/expat/README --- old/apr-util-1.2.2/xml/expat/README 2004-11-25 00:41:24.000000000 +0100 +++ new/apr-util-1.2.7/xml/expat/README 2006-03-22 06:43:53.000000000 +0100 @@ -1,64 +1,72 @@ - Expat, Release 1.95.1 + Expat, Release 1.95.2 -This is expat, the C library for parsing XML, written by James Clark. Expat -is a stream oriented XML parser. This means that you register handlers with -the parser prior to starting the parse. These handlers are called when -the parser discovers the associated structures in the document being parsed. -A start tag is an example of the kind of structures for which you may -register handlers. - -Expat is free software. You may copy, distribute, and modify it under the -terms of the License contained in the file, COPYING, distributed with this -package. This license is the same as the MIT/X Consortium license. - -Versions of expat that have an odd minor version (the middle number in the -release above), are development releases and should be considered as -beta software. Releases with even minor version numbers are intended to be -production grade software. +This is expat, a C library for parsing XML, written by James Clark. +Expat is a stream-oriented XML parser. This means that you register +handlers with the parser before starting the parse. These handlers +are called when the parser discovers the associated structures in the +document being parsed. A start tag is an example of the kind of +structures for which you may register handlers. + +Windows users should use the expat_win32bin package, which includes +both precompiled libraries and executalbes, and source code for +developers. + +Expat is free software. You may copy, distribute, and modify it under +the terms of the License contained in the file COPYING distributed +with this package. This license is the same as the MIT/X Consortium +license. + +Versions of expat that have an odd minor version (the middle number in +the release above), are development releases and should be considered +as beta software. Releases with even minor version numbers are +intended to be production grade software. -To build expat, you first run the configuration shell script in the top -level distribution directory: +To build expat, you first run the configuration shell script in the +top level distribution directory: ./configure -There are many options which you may provide to configure (which you can -discover by running configure with the --help option.) But the one of most -interest is the one that sets the installation directory. By default, -the configure script will set things up to install libexpat into -/usr/local/lib and expat.h into /usr/local/include. If, for example, you'd -prefer to install into /home/me/mystuff/lib and /home/me/mystuff/include, -you can tell configure about that with: +There are many options which you may provide to configure (which you +can discover by running configure with the --help option). But the +one of most interest is the one that sets the installation directory. +By default, the configure script will set things up to install +libexpat into /usr/local/lib, expat.h into /usr/local/include, and +xmlwf into /usr/local/bin. If, for example, you'd prefer to install +into /home/me/mystuff/lib, /home/me/mystuff/include, and +/home/me/mystuff/bin, you can tell configure about that with: ./configure --prefix=/home/me/mystuff -After running the configure script, the "make" command will build things and -"make install" will install things into their proper location. Note that -you need to have write permission into the directories into which things -will be installed. +After running the configure script, the "make" command will build +things and "make install" will install things into their proper +location. Note that you need to have write permission into the +directories into which things will be installed. + +When building for use with C++, you may need to add additional +compiler flags to support proper interaction with exceptions. This +can be done by setting the CFLAGS environment variable. For example, +when using GCC, you can use: + + CFLAGS=-fexceptions ./configure Note for Solaris users: The "ar" command is usually located in "/usr/ccs/bin", which is not in the default PATH. You will need to -add this to your path for the "make" command. If you're using ksh or -bash, use this command to build: +add this to your path for the "make" command, and probably also switch +to GNU make (the "make" found in /usr/ccs/bin does not seem to work +properly -- appearantly it does not understand .PHONY directives). If +you're using ksh or bash, use this command to build: PATH=/usr/ccs/bin:$PATH make -Alternatively, on Win32 systems with Microsoft's Developer's Studio installed, -you can simply double-click on lib/expat.dsp from Windows Explorer and build -and install in the usual way from with DevStudio. - -As a third alternative you may choose to download expat_win32bin which has -a pre-compiled dll in it. - -A reference manual is available in the doc/reference.html in this +A reference manual is available in the file doc/reference.html in this distribution. -The homepage for this project is http://expat.sourceforge.net. There are -links there to connect you to the bug reports page. If you need to report -a bug when you don't have access to a browser, you may also send a bug -report by email to expat-bugs(a)lists.sourceforge.net. - -Discussion related to the direction of future expat development takes place -on expat-discuss(a)lists.sourceforge.net. Archives of this list may be found -at http://www.geocrawler.com/redir-sf.php3?list=expat-discuss. +The homepage for this project is http://expat.sourceforge.net/. There +are links there to connect you to the bug reports page. If you need +to report a bug when you don't have access to a browser, you may also +send a bug report by email to expat-bugs(a)lists.sourceforge.net. + +Discussion related to the direction of future expat development takes +place on expat-discuss(a)lists.sourceforge.net. Archives of this list +may be found at http://www.geocrawler.com/redir-sf.php3?list=expat-discuss. diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/apr-util-1.2.2/xml/expat/buildconf.sh new/apr-util-1.2.7/xml/expat/buildconf.sh --- old/apr-util-1.2.2/xml/expat/buildconf.sh 2004-11-25 00:41:24.000000000 +0100 +++ new/apr-util-1.2.7/xml/expat/buildconf.sh 2006-03-25 22:09:43.000000000 +0100 @@ -19,10 +19,11 @@ # want to ensure is used. echo "Copying libtool helper files ..." -# Remove any libtool files so one can switch between libtool 1.3 -# and libtool 1.4 by simply rerunning the buildconf script. +# Remove any m4 cache and libtool files so one can switch between +# autoconf and libtool versions by simply rerunning the buildconf script. +# (cd conftools ; rm -f ltconfig ltmain.sh) -rm -f aclocal.m4 libtool.m4 ltsugar.m4 +rm -rf aclocal.m4 libtool.m4 ltsugar.m4 autom4te*.cache $libtoolize --copy --automake diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/apr-util-1.2.2/xml/expat/lib/expat.dsp new/apr-util-1.2.7/xml/expat/lib/expat.dsp --- old/apr-util-1.2.2/xml/expat/lib/expat.dsp 2004-11-25 00:41:24.000000000 +0100 +++ new/apr-util-1.2.7/xml/expat/lib/expat.dsp 2006-03-22 07:55:04.000000000 +0100 @@ -41,8 +41,8 @@ # PROP Output_Dir "Release" # PROP Intermediate_Dir "Release" # PROP Target_Dir "" -# ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "EXPAT_EXPORTS" /Yu"stdafx.h" /FD /c -# ADD CPP /nologo /MT /W3 /GX /O2 /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "EXPAT_EXPORTS" /D "COMPILED_FROM_DSP" /Yu"stdafx.h" /FD /c +# ADD BASE CPP /nologo /MT /W3 /EHsc /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "EXPAT_EXPORTS" /Yu"stdafx.h" /FD /c +# ADD CPP /nologo /MT /W3 /EHsc /O2 /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "EXPAT_EXPORTS" /D "COMPILED_FROM_DSP" /Yu"stdafx.h" /FD /c # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32 # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32 # ADD BASE RSC /l 0x409 /d "NDEBUG" @@ -67,8 +67,8 @@ # PROP Intermediate_Dir "Debug" # PROP Ignore_Export_Lib 0 # PROP Target_Dir "" -# ADD BASE CPP /nologo /MTd /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "EXPAT_EXPORTS" /Yu"stdafx.h" /FD /GZ /c -# ADD CPP /nologo /MTd /W3 /GX /Zi /Od /D "_DEBUG" /D "COMPILED_FROM_DSP" /D "WIN32" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "EXPAT_EXPORTS" /FD /GZ /c +# ADD BASE CPP /nologo /MTd /W3 /Gm /EHsc /Zi /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "EXPAT_EXPORTS" /Yu"stdafx.h" /FD /GZ /c +# ADD CPP /nologo /MTd /W3 /EHsc /Zi /Od /D "_DEBUG" /D "COMPILED_FROM_DSP" /D "WIN32" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "EXPAT_EXPORTS" /FD /GZ /c # ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32 # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32 # ADD BASE RSC /l 0x409 /d "_DEBUG" @@ -95,11 +95,11 @@ !IF "$(CFG)" == "expat - Win32 Release" -# ADD CPP /D VERSION=\"expat_1.95.1\" +# ADD CPP /D VERSION=\"expat_1.95.2\" !ELSEIF "$(CFG)" == "expat - Win32 Debug" -# ADD CPP /GX- /Od /D VERSION=\"expat_1.95.1\" +# ADD CPP /GX- /Od /D VERSION=\"expat_1.95.2\" !ENDIF @@ -110,11 +110,11 @@ !IF "$(CFG)" == "expat - Win32 Release" -# ADD CPP /D VERSION=\"expat_1.95.1\" +# ADD CPP /D VERSION=\"expat_1.95.2\" !ELSEIF "$(CFG)" == "expat - Win32 Debug" -# ADD CPP /D VERSION=\"expat_1.95.1\" +# ADD CPP /D VERSION=\"expat_1.95.2\" !ENDIF @@ -125,11 +125,11 @@ !IF "$(CFG)" == "expat - Win32 Release" -# ADD CPP /D VERSION=\"expat_1.95.1\" +# ADD CPP /D VERSION=\"expat_1.95.2\" !ELSEIF "$(CFG)" == "expat - Win32 Debug" -# ADD CPP /D VERSION=\"expat_1.95.1\" +# ADD CPP /D VERSION=\"expat_1.95.2\" !ENDIF @@ -140,12 +140,12 @@ !IF "$(CFG)" == "expat - Win32 Release" -# ADD CPP /D VERSION=\"expat_1.95.1\" +# ADD CPP /D VERSION=\"expat_1.95.2\" !ELSEIF "$(CFG)" == "expat - Win32 Debug" # PROP Exclude_From_Build 1 -# ADD CPP /D VERSION=\"expat_1.95.1\" +# ADD CPP /D VERSION=\"expat_1.95.2\" !ENDIF @@ -156,12 +156,12 @@ !IF "$(CFG)" == "expat - Win32 Release" -# ADD CPP /D VERSION=\"expat_1.95.1\" +# ADD CPP /D VERSION=\"expat_1.95.2\" !ELSEIF "$(CFG)" == "expat - Win32 Debug" # PROP Exclude_From_Build 1 -# ADD CPP /D VERSION=\"expat_1.95.1\" +# ADD CPP /D VERSION=\"expat_1.95.2\" !ENDIF diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/apr-util-1.2.2/xml/expat/lib/expat.h.in new/apr-util-1.2.7/xml/expat/lib/expat.h.in --- old/apr-util-1.2.2/xml/expat/lib/expat.h.in 2004-11-25 00:41:24.000000000 +0100 +++ new/apr-util-1.2.7/xml/expat/lib/expat.h.in 2006-03-22 07:55:04.000000000 +0100 @@ -726,13 +726,13 @@ XML_ExpatVersionInfo(void); #ifndef XML_MAJOR_VERSION -#define XML_MAJOR_VERSION @EXPAT_MAJOR_VERSION@ +#define XML_MAJOR_VERSION 1 #endif #ifndef XML_MINOR_VERSION -#define XML_MINOR_VERSION @EXPAT_MINOR_VERSION@ +#define XML_MINOR_VERSION 95 #endif #ifndef XML_MICRO_VERSION -#define XML_MICRO_VERSION @EXPAT_EDIT@ +#define XML_MICRO_VERSION 2 #endif #ifdef __cplusplus diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/apr-util-1.2.2/xml/expat/lib/xml.dsp new/apr-util-1.2.7/xml/expat/lib/xml.dsp --- old/apr-util-1.2.2/xml/expat/lib/xml.dsp 2005-05-16 14:50:51.000000000 +0200 +++ new/apr-util-1.2.7/xml/expat/lib/xml.dsp 2006-03-22 07:55:04.000000000 +0100 @@ -41,7 +41,7 @@ # PROP Intermediate_Dir "LibR" # PROP Target_Dir "" # ADD BASE CPP /nologo /MD /W3 /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /FD /c -# ADD CPP /nologo /MD /W3 /O2 /Oy- /Zi /I "." /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D VERSION=\"expat_1.95.1\" /D XML_MAJOR_VERSION=1 /D XML_MINOR_VERSION=95 /D XML_MICRO_VERSION=1 /Fd"LibR\xml_src" /FD /c +# ADD CPP /nologo /MD /W3 /O2 /Oy- /Zi /I "." /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D VERSION=\"expat_1.95.2\" /Fd"LibR\xml_src" /FD /c # ADD BASE RSC /l 0x409 # ADD RSC /l 0x409 BSC32=bscmake.exe @@ -64,8 +64,8 @@ # PROP Intermediate_Dir "LibD" # PROP Ignore_Export_Lib 0 # PROP Target_Dir "" -# ADD BASE CPP /nologo /MDd /W3 /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /FD /c -# ADD CPP /nologo /MDd /W3 /GX /Zi /Od /I "." /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D VERSION=\"expat_1.95.1\" /D XML_MAJOR_VERSION=1 /D XML_MINOR_VERSION=95 /D XML_MICRO_VERSION=1 /Fd"LibD\xml_src" /FD /c +# ADD BASE CPP /nologo /MDd /W3 /EHsc /Zi /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /FD /c +# ADD CPP /nologo /MDd /W3 /EHsc /Zi /Od /I "." /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D VERSION=\"expat_1.95.2\" /Fd"LibD\xml_src" /FD /c # ADD BASE RSC /l 0x409 # ADD RSC /l 0x409 BSC32=bscmake.exe ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun...

1 0

commit yast2-http-server
by root＠suse.de 31 May '06

31 May '06

Hello community, here is the log from the commit of package yast2-http-server checked in at Wed May 31 02:49:50 CEST 2006. -------- --- yast2-http-server/yast2-http-server.changes 2006-05-15 11:30:04.000000000 +0200 +++ yast2-http-server/yast2-http-server.changes 2006-05-30 10:14:01.000000000 +0200 @@ -1,0 +2,10 @@ +Tue May 30 10:15:19 CEST 2006 - mzugec(a)suse.cz + +- fixed #176722 - assigned loopback for firewall + +------------------------------------------------------------------- +Tue May 30 09:02:51 CEST 2006 - mzugec(a)suse.cz + +- fixed #177797 - in wizard mode open/close firewall only for assigned zones + +------------------------------------------------------------------- Old: ---- yast2-http-server-2.13.15.tar.bz2 New: ---- yast2-http-server-2.13.16.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-http-server.spec ++++++ --- /var/tmp/diff_new_pack.Opm9Kh/_old 2006-05-31 02:45:05.000000000 +0200 +++ /var/tmp/diff_new_pack.Opm9Kh/_new 2006-05-31 02:45:05.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package yast2-http-server (Version 2.13.15) +# spec file for package yast2-http-server (Version 2.13.16) # # Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine @@ -11,12 +11,12 @@ # norootforbuild Name: yast2-http-server -Version: 2.13.15 +Version: 2.13.16 Release: 1 License: GPL Group: System/YaST BuildRoot: %{_tmppath}/%{name}-%{version}-build -Source0: yast2-http-server-2.13.15.tar.bz2 +Source0: yast2-http-server-2.13.16.tar.bz2 prefix: /usr BuildRequires: docbook-xsl-stylesheets doxygen libxslt perl-XML-Writer popt-devel sgml-skel update-desktop-files yast2 yast2-devtools yast2-dns-server yast2-network yast2-packagemanager-devel yast2-perl-bindings yast2-testsuite Requires: yast2 yast2-network yast2-firewall yast2-perl-bindings libzio @@ -34,7 +34,7 @@ Stanislav Visnovsky <visnov(a)suse.cz> %prep -%setup -n yast2-http-server-2.13.15 +%setup -n yast2-http-server-2.13.16 %build %{prefix}/bin/y2tool y2autoconf @@ -70,6 +70,10 @@ %doc %{prefix}/share/doc/packages/yast2-http-server %changelog -n yast2-http-server +* Tue May 30 2006 - mzugec(a)suse.cz +- fixed #176722 - assigned loopback for firewall +* Tue May 30 2006 - mzugec(a)suse.cz +- fixed #177797 - in wizard mode open/close firewall only for assigned zones * Mon May 15 2006 - mzugec(a)suse.cz - fixed #175516 - open firewall on selected ports checkbox is always checked by default * Tue May 09 2006 - mzugec(a)suse.cz ++++++ yast2-http-server-2.13.15.tar.bz2 -> yast2-http-server-2.13.16.tar.bz2 ++++++ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-http-server-2.13.15/VERSION new/yast2-http-server-2.13.16/VERSION --- old/yast2-http-server-2.13.15/VERSION 2006-05-15 11:27:24.000000000 +0200 +++ new/yast2-http-server-2.13.16/VERSION 2006-05-30 09:02:41.000000000 +0200 @@ -1 +1 @@ -2.13.15 +2.13.16 diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-http-server-2.13.15/configure new/yast2-http-server-2.13.16/configure --- old/yast2-http-server-2.13.15/configure 2006-05-15 11:22:40.000000000 +0200 +++ new/yast2-http-server-2.13.16/configure 2006-05-30 10:13:24.000000000 +0200 @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.59 for yast2-http-server 2.13.14. +# Generated by GNU Autoconf 2.59 for yast2-http-server 2.13.16. # # Report bugs to <http://bugs.opensuse.org/>. # @@ -269,8 +269,8 @@ # Identity of this package. PACKAGE_NAME='yast2-http-server' PACKAGE_TARNAME='yast2-http-server' -PACKAGE_VERSION='2.13.14' -PACKAGE_STRING='yast2-http-server 2.13.14' +PACKAGE_VERSION='2.13.16' +PACKAGE_STRING='yast2-http-server 2.13.16' PACKAGE_BUGREPORT='http://bugs.opensuse.org/' ac_unique_file="RPMNAME" @@ -728,7 +728,7 @@ # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures yast2-http-server 2.13.14 to adapt to many kinds of systems. +\`configure' configures yast2-http-server 2.13.16 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -795,7 +795,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of yast2-http-server 2.13.14:";; + short | recursive ) echo "Configuration of yast2-http-server 2.13.16:";; esac cat <<\_ACEOF @@ -908,7 +908,7 @@ test -n "$ac_init_help" && exit 0 if $ac_init_version; then cat <<\_ACEOF -yast2-http-server configure 2.13.14 +yast2-http-server configure 2.13.16 generated by GNU Autoconf 2.59 Copyright (C) 2003 Free Software Foundation, Inc. @@ -922,7 +922,7 @@ This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by yast2-http-server $as_me 2.13.14, which was +It was created by yast2-http-server $as_me 2.13.16, which was generated by GNU Autoconf 2.59. Invocation command line was $ $0 $@ @@ -1652,7 +1652,7 @@ # Define the identity of the package. PACKAGE='yast2-http-server' - VERSION='2.13.14' + VERSION='2.13.16' cat >>confdefs.h <<_ACEOF @@ -1863,7 +1863,7 @@ -VERSION="2.13.14" +VERSION="2.13.16" RPMNAME="yast2-http-server" MAINTAINER="Michal Zugec <mzugec(a)suse.cz>" @@ -2693,7 +2693,7 @@ } >&5 cat >&5 <<_CSEOF -This file was extended by yast2-http-server $as_me 2.13.14, which was +This file was extended by yast2-http-server $as_me 2.13.16, which was generated by GNU Autoconf 2.59. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -2748,7 +2748,7 @@ cat >>$CONFIG_STATUS <<_ACEOF ac_cs_version="\\ -yast2-http-server config.status 2.13.14 +yast2-http-server config.status 2.13.16 configured by $0, generated by GNU Autoconf 2.59, with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\" diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-http-server-2.13.15/configure.in new/yast2-http-server-2.13.16/configure.in --- old/yast2-http-server-2.13.15/configure.in 2006-05-15 11:22:34.000000000 +0200 +++ new/yast2-http-server-2.13.16/configure.in 2006-05-30 10:13:20.000000000 +0200 @@ -3,7 +3,7 @@ dnl -- This file is generated by y2autoconf 2.13.18 - DO NOT EDIT! -- dnl (edit configure.in.in instead) -AC_INIT(yast2-http-server, 2.13.14, http://bugs.opensuse.org/, yast2-http-server) +AC_INIT(yast2-http-server, 2.13.16, http://bugs.opensuse.org/, yast2-http-server) dnl Check for presence of file 'RPMNAME' AC_CONFIG_SRCDIR([RPMNAME]) @@ -17,7 +17,7 @@ AM_INIT_AUTOMAKE(tar-ustar) dnl searches for some needed programs dnl Important YaST2 variables -VERSION="2.13.14" +VERSION="2.13.16" RPMNAME="yast2-http-server" MAINTAINER="Michal Zugec <mzugec(a)suse.cz>" diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-http-server-2.13.15/src/HttpServer.ycp new/yast2-http-server-2.13.16/src/HttpServer.ycp --- old/yast2-http-server-2.13.15/src/HttpServer.ycp 2006-05-15 11:28:19.000000000 +0200 +++ new/yast2-http-server-2.13.16/src/HttpServer.ycp 2006-05-30 10:15:37.000000000 +0200 @@ -4,7 +4,7 @@ * Summary: Data for configuration of http-server, input and output functions. * Authors: Stanislav Visnovsky <visnov(a)suse.cz> * - * $Id: HttpServer.ycp 30910 2006-05-15 09:27:55Z mzugec $ + * $Id: HttpServer.ycp 31186 2006-05-30 08:13:09Z mzugec $ * * Representation of the configuration of http-server. * Input and output routines. @@ -276,7 +276,6 @@ // now, check the firewall status to set up the original status correctly firewall = true; - foreach (map<string,any> listen, YaST::HTTPDData::GetCurrentListen (), { // find out the port and host @@ -376,22 +375,35 @@ // the ones from deleted Listen statements were closed in WriteListen if (firewall_first) { +list<string> zones = []; +foreach(map<string, any> ifc, SuSEFirewall::GetAllKnownInterfaces(), { + if (!contains(zones, ifc["zone"]:"")) zones = add(zones, ifc["zone"]:""); +}); +y2milestone("Firewall zones %1", zones); + foreach (map<string,any> listen, YaST::HTTPDData::GetCurrentListen (), { // find out the port and host string port = listen["PORT"]:""; string ip = listen["ADDRESS"]:""; - + // fixed #176722 - assigned loopback for firewall + if(ip == "127.0.0.1") continue; if (!firewall) { y2milestone ("Removing service %1:%2", ip, port); - SuSEFirewall::RemoveService ( port, "TCP", ip2device[ip]:"all"); + if (ip2device[ip]:""=="") foreach(string zone, zones, { + SuSEFirewall::RemoveService ( port, "TCP", zone); + }); + else SuSEFirewall::RemoveService ( port, "TCP", ip2device[ip]:"all"); } else { y2milestone ("Adding service %1:%2", ip, port); - SuSEFirewall::AddService ( port, "TCP", ip2device[ip]:"all"); + if (ip2device[ip]:""=="") foreach(string zone, zones, { + SuSEFirewall::AddService ( port, "TCP", zone); + }); + else SuSEFirewall::AddService ( port, "TCP", ip2device[ip]:"all"); } }); } ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun...

1 0

commit kvpnc
by root＠suse.de 31 May '06

31 May '06

Hello community, here is the log from the commit of package kvpnc checked in at Wed May 31 02:49:47 CEST 2006. -------- --- KDE/kvpnc/kvpnc.changes 2006-05-22 09:49:38.000000000 +0200 +++ kvpnc/kvpnc.changes 2006-05-30 07:53:36.000000000 +0200 @@ -1,0 +2,5 @@ +Tue May 30 07:53:33 CEST 2006 - adrian(a)suse.de + +- fix build for < 10.1 + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kvpnc.spec ++++++ --- /var/tmp/diff_new_pack.aIiwxt/_old 2006-05-31 02:46:24.000000000 +0200 +++ /var/tmp/diff_new_pack.aIiwxt/_new 2006-05-31 02:46:24.000000000 +0200 @@ -12,11 +12,14 @@ Name: kvpnc BuildRequires: kdelibs3-devel +%if %suse_version < 1010 +BuildRequires: libgcrypt-devel +%endif License: GPL Group: Productivity/Networking/System Summary: GUI Front-End for openswan and vpnc Version: 0.8.5.1 -Release: 1 +Release: 3 URL: http://home.gna.org/kvpnc/ BuildRoot: %{_tmppath}/%{name}-%{version}-build Source0: %name-%{version}.tar.bz2 @@ -60,6 +63,8 @@ /opt/kde3/share/icons/*/*/*/kvpnc*.png %changelog -n kvpnc +* Tue May 30 2006 - adrian(a)suse.de +- fix build for < 10.1 * Mon May 22 2006 - stbinner(a)suse.de - update to version 0.8.5.1 * loading mppe module now handles other special case ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun...

1 0

commit kssh
by root＠suse.de 31 May '06

31 May '06

Hello community, here is the log from the commit of package kssh checked in at Wed May 31 02:46:17 CEST 2006. -------- --- KDE/kssh/kssh.changes 2006-02-15 11:41:50.000000000 +0100 +++ kssh/kssh.changes 2006-05-30 07:42:34.000000000 +0200 @@ -1,0 +2,5 @@ +Tue May 30 07:42:29 CEST 2006 - adrian(a)suse.de + +- fix build for < 10.1 + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kssh.spec ++++++ --- /var/tmp/diff_new_pack.PqGbDy/_old 2006-05-31 02:44:46.000000000 +0200 +++ /var/tmp/diff_new_pack.PqGbDy/_new 2006-05-31 02:44:46.000000000 +0200 @@ -18,7 +18,7 @@ Summary: A KDE Front-End for SSH (Secure Shell) BuildRoot: %{_tmppath}/%{name}-%{version}-build Version: 0.7 -Release: 778 +Release: 790 URL: http://kssh.sourceforge.net/ Source0: %name-%version.tar.bz2 Patch0: %name.diff @@ -47,7 +47,11 @@ %install . /etc/opt/kde3/common_options make DESTDIR=$RPM_BUILD_ROOT $INSTALL_TARGET +%if %suse_version < 1010 +%suse_update_desktop_file kssh System RemoteAccess +%else %suse_update_desktop_file -G "Secure Shell Frontend" kssh System RemoteAccess +%endif %find_lang %name %files -f %name.lang @@ -59,6 +63,8 @@ /opt/kde3/share/icons/* %changelog -n kssh +* Tue May 30 2006 - adrian(a)suse.de +- fix build for < 10.1 * Wed Feb 15 2006 - stbinner(a)suse.de - add GenericName to .desktop file * Wed Jan 25 2006 - mls(a)suse.de ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun...

1 0