May 2009 - openSUSE Commits - openSUSE Mailing Lists

commit kdelibs4 for openSUSE:Factory
by root＠Hilbert.suse.de 19 May '09

19 May '09

Hello community, here is the log from the commit of package kdelibs4 for openSUSE:Factory checked in at Tue May 19 23:55:45 CEST 2009. -------- --- KDE/kdelibs4/kdelibs4.changes 2009-04-30 21:04:55.000000000 +0200 +++ kdelibs4/kdelibs4.changes 2009-05-14 19:31:37.000000000 +0200 @@ -1,0 +2,10 @@ +Thu May 14 19:31:22 CEST 2009 - dmueller(a)suse.de + +- update to 4.2.85 (KDE 4.3 Beta1) + +------------------------------------------------------------------- +Tue May 12 19:25:52 CEST 2009 - beineri(a)opensuse.org + +- bump to 4.2.3.1 to help solver with libqt4 update (bnc#502984) + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- 4_2_BRANCH.diff kdelibs-4.2.3.tar.bz2 runtime_initialise_qt45_locale.diff _upstream New: ---- 4_3_BRANCH.diff kdelibs-4.2.85.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kdelibs4.spec ++++++ --- /var/tmp/diff_new_pack.E16564/_old 2009-05-19 23:54:11.000000000 +0200 +++ /var/tmp/diff_new_pack.E16564/_new 2009-05-19 23:54:11.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package kdelibs4 (Version 4.2.3) +# spec file for package kdelibs4 (Version 4.2.85) # # Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -23,6 +23,12 @@ BuildRequires: libsoprano-devel pcre-devel phonon-devel shared-mime-info BuildRequires: kde4-filesystem strigi strigi-devel update-desktop-files BuildRequires: OpenEXR-devel automoc4 enchant-devel fam-devel libacl-devel utempter +%if %suse_version > 1110 +BuildRequires: xz-devel +%endif +%if %suse_version > 1030 +BuildRequires: libgssglue-devel +%endif %if %suse_version > 1020 BuildRequires: avahi-compat-mDNSResponder-devel fdupes libjasper-devel %else @@ -32,7 +38,7 @@ Group: System/GUI/KDE Summary: KDE Base Libraries Url: http://www.kde.org -Version: 4.2.3 +Version: 4.2.85 Release: 1 %if %suse_version > 1010 Requires: libqt4-x11 >= %( echo `rpm -q --queryformat '%{VERSION}' libqt4-x11`) @@ -46,11 +52,10 @@ Requires: libkde4 = %version Requires: shared-mime-info >= %( echo `rpm -q --queryformat '%{VERSION}' shared-mime-info`) Source0: kdelibs-%version.tar.bz2 -Source1: _upstream Source2: hidden.desktop Source3: ycp.xml Source4: kde4rc -Patch0: 4_2_BRANCH.diff +Patch0: 4_3_BRANCH.diff Patch1: kde3-applications.diff Patch2: default-useragent.diff Patch3: add-suse-translations.diff @@ -65,7 +70,6 @@ Patch13: kjs-mark-register-stack.diff Patch17: flash-player-non-oss.diff Patch18: plasma-libs.diff -Patch19: runtime_initialise_qt45_locale.diff BuildRoot: %{_tmppath}/%{name}-%{version}-build %if 0%{?opensuse_bs} %define debug_package_requires %name = %version-%release libqt4-debuginfo @@ -101,7 +105,6 @@ %patch13 %patch17 %patch18 -%patch19 # # define KDE version exactly # @@ -211,6 +214,7 @@ Group: System/GUI/KDE Summary: KDE Base Libraries Requires: kde4-filesystem >= %_kde_platform_version +%requires_ge libqt4 Requires: libkdecore4 = %version %description -n kdelibs4-core @@ -416,6 +420,10 @@ /usr/share/mime/packages/kde.xml %changelog +* Thu May 14 2009 dmueller(a)suse.de +- update to 4.2.85 (KDE 4.3 Beta1) +* Tue May 12 2009 beineri(a)opensuse.org +- bump to 4.2.3.1 to help solver with libqt4 update (bnc#502984) * Thu Apr 30 2009 dmueller(a)suse.de - update to 4.2.3 * see http://kde.org/announcements/changelogs/changelog4_2_2to4_2_3.php ++++++ 4_2_BRANCH.diff -> 4_3_BRANCH.diff ++++++ ++++ 8839 lines (skipped) ++++ between KDE/kdelibs4/4_2_BRANCH.diff ++++ and kdelibs4/4_3_BRANCH.diff ++++++ add-suse-translations.diff ++++++ --- /var/tmp/diff_new_pack.E16564/_old 2009-05-19 23:54:11.000000000 +0200 +++ /var/tmp/diff_new_pack.E16564/_new 2009-05-19 23:54:11.000000000 +0200 @@ -2,9 +2,11 @@ Summary: add suse provided translations Patch-Upstream: never ---- kdecore/localization/klocale.cpp +Index: kdecore/localization/klocale.cpp +=================================================================== +--- kdecore/localization/klocale.cpp.orig +++ kdecore/localization/klocale.cpp -@@ -265,11 +265,14 @@ void KLocalePrivate::initMainCatalogs(const QString & catalog) +@@ -325,11 +325,14 @@ void KLocalePrivate::initMainCatalogs(co catalogNames.append(KCatalogName(mainCatalog)); // application catalog // catalogs from which each application can draw translations @@ -17,6 +19,6 @@ + catalogNames.append(KCatalogName("desktop_translations")); + catalogNames.append(KCatalogName("kde4-openSUSE")); + catalogNames.append(KCatalogName("kde4-SLE")); - + updateCatalogs(); // evaluate this for all languages } ++++++ clever-menu.diff ++++++ --- /var/tmp/diff_new_pack.E16564/_old 2009-05-19 23:54:12.000000000 +0200 +++ /var/tmp/diff_new_pack.E16564/_new 2009-05-19 23:54:12.000000000 +0200 @@ -1,6 +1,8 @@ ---- kdecore/services/kservice.cpp +Index: kdecore/services/kservice.cpp +=================================================================== +--- kdecore/services/kservice.cpp.orig +++ kdecore/services/kservice.cpp -@@ -672,6 +672,12 @@ +@@ -702,6 +702,12 @@ QString KService::untranslatedGenericNam return v.isValid() ? v.toString() : QString(); } @@ -13,10 +15,11 @@ QString KService::parentApp() const { Q_D(const KService); QMap<QString,QVariant>::ConstIterator it = d->m_mapProps.find( "X-KDE-ParentApp" ); -Nur in b/kdelibs-4.1.87/kdecore/services: kservice.cpp.orig. ---- kdecore/services/kservicegroup.cpp +Index: kdecore/services/kservicegroup.cpp +=================================================================== +--- kdecore/services/kservicegroup.cpp.orig +++ kdecore/services/kservicegroup.cpp -@@ -30,7 +30,7 @@ +@@ -29,7 +29,7 @@ #include <ksortablelist.h> #include <kdesktopfile.h> #include <kconfiggroup.h> @@ -25,7 +28,7 @@ KServiceGroup::KServiceGroup( const QString & name ) : KSycocaEntry(*new KServiceGroupPrivate(name)) -@@ -62,6 +62,11 @@ +@@ -61,6 +61,11 @@ void KServiceGroupPrivate::load(const QS m_strComment = config.readEntry( "Comment" ); deleted = config.readEntry("Hidden", false ); m_bNoDisplay = desktopFile.noDisplay(); @@ -37,7 +40,7 @@ m_strBaseGroupName = config.readEntry( "X-KDE-BaseGroup" ); suppressGenericNames = config.readEntry( "X-KDE-SuppressGenericNames", QStringList() ); // d->sortOrder = config.readEntry("SortOrder", QStringList()); -@@ -125,6 +130,10 @@ +@@ -124,6 +129,10 @@ int KServiceGroupPrivate::childCount() c { if (m_childCount == -1) { @@ -48,7 +51,7 @@ m_childCount = 0; for( KServiceGroup::List::ConstIterator it = m_serviceList.begin(); -@@ -135,7 +144,8 @@ +@@ -134,7 +143,8 @@ int KServiceGroupPrivate::childCount() c { KService::Ptr service = KService::Ptr::staticCast( p ); if (!service->noDisplay()) @@ -58,7 +61,7 @@ } else if (p->isType(KST_KServiceGroup)) { -@@ -220,6 +230,18 @@ +@@ -219,6 +229,18 @@ QStringList KServiceGroup::suppressGener return d->suppressGenericNames; } @@ -77,7 +80,7 @@ void KServiceGroupPrivate::load( QDataStream& s ) { QStringList groupList; -@@ -228,16 +250,21 @@ +@@ -227,16 +249,21 @@ void KServiceGroupPrivate::load( QDataSt qint8 inlineHeader; qint8 _inlineAlias; qint8 _allowInline; @@ -100,7 +103,7 @@ if (m_bDeep) { -@@ -297,10 +324,12 @@ +@@ -296,10 +323,12 @@ void KServiceGroupPrivate::save( QDataSt qint8 inlineHeader = m_bShowInlineHeader ? 1 : 0; qint8 _inlineAlias = m_bInlineAlias ? 1 : 0; qint8 _allowInline = m_bAllowInline ? 1 : 0; @@ -114,7 +117,7 @@ } QList<KServiceGroup::Ptr> KServiceGroup::groupEntries(EntriesOptions options) -@@ -360,6 +389,13 @@ +@@ -359,6 +388,13 @@ KServiceGroup::entries(bool sort, bool e return d->entries(this, sort, excludeNoDisplay, allowSeparators, sortByGenericName); } @@ -128,7 +131,7 @@ static void addItem(KServiceGroup::List &sorted, const KSycocaEntry::Ptr &p, bool &addSeparator) { if (addSeparator && !sorted.isEmpty()) -@@ -371,6 +407,12 @@ +@@ -370,6 +406,12 @@ static void addItem(KServiceGroup::List KServiceGroup::List KServiceGroupPrivate::entries(KServiceGroup *group, bool sort, bool excludeNoDisplay, bool allowSeparators, bool sortByGenericName) { @@ -141,7 +144,7 @@ KServiceGroup::Ptr grp; // If the entries haven't been loaded yet, we have to reload ourselves -@@ -396,11 +438,20 @@ +@@ -395,11 +437,20 @@ KServiceGroupPrivate::entries(KServiceGr KSortableList<KServiceGroup::SPtr,QByteArray> glist; Q_FOREACH (KSycocaEntry::Ptr p, group->d_func()->m_serviceList) { @@ -162,7 +165,7 @@ // Choose the right list KSortableList<KServiceGroup::SPtr,QByteArray> & list = p->isType(KST_KServiceGroup) ? glist : slist; QString name; -@@ -433,6 +484,12 @@ +@@ -435,6 +486,12 @@ KServiceGroupPrivate::entries(KServiceGr } list.insert(key,KServiceGroup::SPtr(p)); } @@ -175,7 +178,7 @@ // Now sort slist.sort(); glist.sort(); -@@ -473,6 +530,8 @@ +@@ -475,6 +532,8 @@ KServiceGroupPrivate::entries(KServiceGr // TODO: This prevents duplicates for(KSortableList<KServiceGroup::SPtr,QByteArray>::Iterator it2 = slist.begin(); it2 != slist.end(); ++it2) { @@ -184,8 +187,9 @@ const KService::Ptr service = KService::Ptr::staticCast( (*it2).value() ); if (service->menuId() == item) { -Nur in b/kdelibs-4.1.87/kdecore/services: kservicegroup.cpp.orig. ---- kdecore/services/kservicegroup.h +Index: kdecore/services/kservicegroup.h +=================================================================== +--- kdecore/services/kservicegroup.h.orig +++ kdecore/services/kservicegroup.h @@ -22,6 +22,7 @@ #include <kdecore_export.h> @@ -195,7 +199,7 @@ class KBuildServiceGroupFactory; -@@ -173,6 +174,12 @@ +@@ -174,6 +175,12 @@ public: void setLayoutInfo(const QStringList &layout); /** @@ -208,7 +212,7 @@ * @internal * Returns information related to the layout of services in this group. */ -@@ -199,6 +206,12 @@ +@@ -200,6 +207,12 @@ public: List entries(bool sorted = false); /** @@ -221,9 +225,11 @@ * options for groupEntries and serviceEntries */ enum EntriesOption ---- kdecore/services/kservicegroup_p.h +Index: kdecore/services/kservicegroup_p.h +=================================================================== +--- kdecore/services/kservicegroup_p.h.orig +++ kdecore/services/kservicegroup_p.h -@@ -31,7 +31,8 @@ +@@ -31,7 +31,8 @@ public: KServiceGroupPrivate(const QString &path) : KSycocaEntryPrivate(path), @@ -233,7 +239,7 @@ m_bAllowInline(false), m_inlineValue(4), m_bDeep(false), m_childCount(-1) { } -@@ -58,6 +59,13 @@ +@@ -58,6 +59,13 @@ public: KServiceGroup::List entries(KServiceGroup *group, bool sort, bool excludeNoDisplay, bool allowSeparators, bool sortByGenericName); @@ -247,7 +253,7 @@ /** * This function parse attributes into menu */ -@@ -65,6 +73,8 @@ +@@ -65,6 +73,8 @@ public: bool m_bNoDisplay : 1; @@ -256,9 +262,11 @@ bool m_bShowEmptyMenu : 1; bool m_bShowInlineHeader : 1; bool m_bInlineAlias : 1; ---- kdecore/services/kservice.h +Index: kdecore/services/kservice.h +=================================================================== +--- kdecore/services/kservice.h.orig +++ kdecore/services/kservice.h -@@ -331,6 +331,12 @@ +@@ -330,6 +330,12 @@ public: bool noDisplay() const; /** ++++++ default-useragent.diff ++++++ --- /var/tmp/diff_new_pack.E16564/_old 2009-05-19 23:54:12.000000000 +0200 +++ /var/tmp/diff_new_pack.E16564/_new 2009-05-19 23:54:12.000000000 +0200 @@ -1,6 +1,8 @@ ---- kio/kio/kprotocolmanager.cpp 2007/12/16 19:19:43 1.1 -+++ kio/kio/kprotocolmanager.cpp 2007/12/16 19:20:14 -@@ -73,7 +73,7 @@ +Index: kio/kio/kprotocolmanager.cpp +=================================================================== +--- kio/kio/kprotocolmanager.cpp.orig ++++ kio/kio/kprotocolmanager.cpp +@@ -77,7 +77,7 @@ KProtocolManagerPrivate::~KProtocolManag // DEFAULT USERAGENT STRING #define CFG_DEFAULT_UAGENT(X) \ ++++++ desktop-translations.diff ++++++ --- /var/tmp/diff_new_pack.E16564/_old 2009-05-19 23:54:12.000000000 +0200 +++ /var/tmp/diff_new_pack.E16564/_new 2009-05-19 23:54:12.000000000 +0200 @@ -4,9 +4,11 @@ Patch-upstream: no Relates: kdelibs3/desktop-translations.diff ---- kdecore/services/kservicegroup.cpp.sav 2008-09-15 14:43:32.000000000 +0200 -+++ kdecore/services/kservicegroup.cpp 2008-09-15 15:03:12.000000000 +0200 -@@ -57,9 +57,9 @@ void KServiceGroupPrivate::load(const QS +Index: kdecore/services/kservicegroup.cpp +=================================================================== +--- kdecore/services/kservicegroup.cpp.orig ++++ kdecore/services/kservicegroup.cpp +@@ -56,9 +56,9 @@ void KServiceGroupPrivate::load(const QS const KConfigGroup config = desktopFile.desktopGroup(); @@ -18,10 +20,12 @@ + m_strComment = desktopFile.readComment(); deleted = config.readEntry("Hidden", false ); m_bNoDisplay = desktopFile.noDisplay(); - m_strBaseGroupName = config.readEntry( "X-KDE-BaseGroup" ); ---- kdecore/config/kconfigdata.h.sav 2008-09-15 14:43:32.000000000 +0200 -+++ kdecore/config/kconfigdata.h 2008-09-15 15:03:12.000000000 +0200 -@@ -174,6 +174,19 @@ class KEntryMap : public QMap<KEntryKey, + if (directoryEntryPath.startsWith(QDir::homePath())) +Index: kdecore/config/kconfigdata.h +=================================================================== +--- kdecore/config/kconfigdata.h.orig ++++ kdecore/config/kconfigdata.h +@@ -175,6 +175,19 @@ class KEntryMap : public QMap<KEntryKey, return find(theKey); } @@ -41,9 +45,11 @@ Iterator findEntry(const QByteArray& group, const QByteArray& key = QByteArray(), SearchFlags flags = SearchFlags()) { ---- kdecore/config/kdesktopfile.cpp.sav 2008-09-15 14:43:32.000000000 +0200 -+++ kdecore/config/kdesktopfile.cpp 2008-09-15 15:03:12.000000000 +0200 -@@ -34,6 +34,8 @@ +Index: kdecore/config/kdesktopfile.cpp +=================================================================== +--- kdecore/config/kdesktopfile.cpp.orig ++++ kdecore/config/kdesktopfile.cpp +@@ -35,6 +35,8 @@ #include "kstandarddirs.h" #include "kconfigini_p.h" #include "kde_file.h" @@ -52,7 +58,7 @@ class KDesktopFilePrivate : public KConfigPrivate { -@@ -162,6 +164,29 @@ bool KDesktopFile::isAuthorizedDesktopFi +@@ -179,6 +181,29 @@ bool KDesktopFile::isAuthorizedDesktopFi return false; } @@ -82,7 +88,7 @@ QString KDesktopFile::readType() const { Q_D(const KDesktopFile); -@@ -176,20 +201,17 @@ QString KDesktopFile::readIcon() const +@@ -193,20 +218,17 @@ QString KDesktopFile::readIcon() const QString KDesktopFile::readName() const { @@ -106,9 +112,11 @@ } QString KDesktopFile::readPath() const ---- kdecore/config/kdesktopfile.h.sav 2008-09-15 14:43:32.000000000 +0200 -+++ kdecore/config/kdesktopfile.h 2008-09-15 15:03:12.000000000 +0200 -@@ -243,6 +243,8 @@ protected: +Index: kdecore/config/kdesktopfile.h +=================================================================== +--- kdecore/config/kdesktopfile.h.orig ++++ kdecore/config/kdesktopfile.h +@@ -250,6 +250,8 @@ protected: // virtual void virtual_hook( int id, void* data ); private: @@ -117,9 +125,11 @@ Q_DISABLE_COPY(KDesktopFile) Q_DECLARE_PRIVATE(KDesktopFile) ---- kdecore/config/kconfiggroup.h.sav 2008-09-15 14:43:32.000000000 +0200 -+++ kdecore/config/kconfiggroup.h 2008-09-15 15:05:54.000000000 +0200 -@@ -558,6 +558,11 @@ public: +Index: kdecore/config/kconfiggroup.h +=================================================================== +--- kdecore/config/kconfiggroup.h.orig ++++ kdecore/config/kconfiggroup.h +@@ -617,6 +617,11 @@ public: */ QMap<QString, QString> entryMap() const; @@ -131,9 +141,11 @@ protected: bool hasGroupImpl(const QByteArray &group) const; KConfigGroup groupImpl(const QByteArray &b); ---- kdecore/config/kconfig.cpp.sav 2008-09-15 14:43:32.000000000 +0200 -+++ kdecore/config/kconfig.cpp 2008-09-15 15:03:12.000000000 +0200 -@@ -732,6 +732,17 @@ QString KConfigPrivate::lookupData(const +Index: kdecore/config/kconfig.cpp +=================================================================== +--- kdecore/config/kconfig.cpp.orig ++++ kdecore/config/kconfig.cpp +@@ -749,6 +749,17 @@ QString KConfigPrivate::lookupData(const return entryMap.getEntry(group, key, QString(), flags, expand); } @@ -151,8 +163,10 @@ void KConfig::virtual_hook(int /*id*/, void* /*data*/) { /* nothing */ ---- kdecore/config/kconfig_p.h.sav 2008-09-15 14:43:32.000000000 +0200 -+++ kdecore/config/kconfig_p.h 2008-09-15 15:03:12.000000000 +0200 +Index: kdecore/config/kconfig_p.h +=================================================================== +--- kdecore/config/kconfig_p.h.orig ++++ kdecore/config/kconfig_p.h @@ -53,6 +53,7 @@ public: QString lookupData(const QByteArray& group, const char* key, KEntryMap::SearchFlags flags, bool* expand) const; @@ -161,9 +175,11 @@ void putData(const QByteArray& group, const char* key, const QByteArray& value, KConfigBase::WriteConfigFlags flags, bool expand=false); ---- kdecore/config/kconfiggroup.cpp.sav 2008-09-15 14:43:32.000000000 +0200 -+++ kdecore/config/kconfiggroup.cpp 2008-09-15 15:03:12.000000000 +0200 -@@ -1236,6 +1236,16 @@ bool KConfigGroup::hasKey(const char *ke +Index: kdecore/config/kconfiggroup.cpp +=================================================================== +--- kdecore/config/kconfiggroup.cpp.orig ++++ kdecore/config/kconfiggroup.cpp +@@ -1239,6 +1239,16 @@ bool KConfigGroup::hasKey(const char *ke return !config()->d_func()->lookupData(d->fullName(), key, flags).isNull(); } ++++++ display-key-support.diff ++++++ --- /var/tmp/diff_new_pack.E16564/_old 2009-05-19 23:54:12.000000000 +0200 +++ /var/tmp/diff_new_pack.E16564/_new 2009-05-19 23:54:12.000000000 +0200 @@ -4,20 +4,22 @@ Patch-upstream: no (maybe todo) Relates: libqt4/display-key-support.diff, kdebase4/randr12.diff ---- kdeui/util/kkeyserver_x11.cpp.sav 2007-10-30 11:11:39.000000000 +0100 -+++ kdeui/util/kkeyserver_x11.cpp 2008-09-12 14:33:03.000000000 +0200 -@@ -245,6 +245,7 @@ static const TransKey g_rgQtToSymX[] = - #define XF86XK_LaunchD 0x1008FF4D - #define XF86XK_LaunchE 0x1008FF4E - #define XF86XK_LaunchF 0x1008FF4F +Index: kdeui/util/kkeyserver_x11.cpp +=================================================================== +--- kdeui/util/kkeyserver_x11.cpp.orig ++++ kdeui/util/kkeyserver_x11.cpp +@@ -240,6 +240,7 @@ static const TransKey g_rgQtToSymX[] = + #define XF86XK_LaunchD 0x1008FF4D + #define XF86XK_LaunchE 0x1008FF4E + #define XF86XK_LaunchF 0x1008FF4F +#define XF86XK_Display 0x1008FF59 /* Output switch key */ // end of XF86keysyms.h , - { Qt::Key_Standby, XF86XK_Standby }, -@@ -282,6 +283,7 @@ static const TransKey g_rgQtToSymX[] = - { Qt::Key_LaunchD, XF86XK_LaunchB }, - { Qt::Key_LaunchE, XF86XK_LaunchC }, - { Qt::Key_LaunchF, XF86XK_LaunchD }, + { Qt::Key_Standby, XF86XK_Standby }, +@@ -277,6 +278,7 @@ static const TransKey g_rgQtToSymX[] = + { Qt::Key_LaunchD, XF86XK_LaunchB }, + { Qt::Key_LaunchE, XF86XK_LaunchC }, + { Qt::Key_LaunchF, XF86XK_LaunchD }, + { Qt::Key_Display, XF86XK_Display }, }; ++++++ flash-player-non-oss.diff ++++++ --- /var/tmp/diff_new_pack.E16564/_old 2009-05-19 23:54:12.000000000 +0200 +++ /var/tmp/diff_new_pack.E16564/_new 2009-05-19 23:54:12.000000000 +0200 @@ -1,6 +1,8 @@ ---- khtml/html/html_objectimpl.cpp.orig 2009-01-01 23:50:23.000000000 +0000 -+++ khtml/html/html_objectimpl.cpp 2009-01-02 00:16:50.000000000 +0000 -@@ -573,14 +573,32 @@ +Index: khtml/html/html_objectimpl.cpp +=================================================================== +--- khtml/html/html_objectimpl.cpp.orig ++++ khtml/html/html_objectimpl.cpp +@@ -590,14 +590,32 @@ void HTMLObjectBaseElementImpl::slotPart // Prepare the URL to show in the question (host only if http, to make it short) KUrl pluginPageURL(embed->pluginPage); QString shortURL = pluginPageURL.protocol() == "http" ? pluginPageURL.host() : pluginPageURL.prettyUrl(); ++++++ hotplug-kde3.diff ++++++ --- /var/tmp/diff_new_pack.E16564/_old 2009-05-19 23:54:12.000000000 +0200 +++ /var/tmp/diff_new_pack.E16564/_new 2009-05-19 23:54:12.000000000 +0200 @@ -4,9 +4,11 @@ Patch-upstream: never Relates: kdebase4-runtime/hotplug-kde3.diff, kdebase4-workspace/hotplug-kde3.diff ---- ./kdecore/services/kservice.cpp.sav 2008-05-13 13:49:58.000000000 +0200 -+++ ./kdecore/services/kservice.cpp 2008-05-14 11:44:14.000000000 +0200 -@@ -95,6 +95,8 @@ void KServicePrivate::init( const KDeskt +Index: kdecore/services/kservice.cpp +=================================================================== +--- kdecore/services/kservice.cpp.orig ++++ kdecore/services/kservice.cpp +@@ -99,6 +99,8 @@ void KServicePrivate::init( const KDeskt m_bValid = false; return;*/ m_strType = "Application"; ++++++ kde3-applications.diff ++++++ --- /var/tmp/diff_new_pack.E16564/_old 2009-05-19 23:54:12.000000000 +0200 +++ /var/tmp/diff_new_pack.E16564/_new 2009-05-19 23:54:12.000000000 +0200 @@ -1,6 +1,8 @@ ---- kdecore/services/kservice.cpp +Index: kdecore/services/kservice.cpp +=================================================================== +--- kdecore/services/kservice.cpp.orig +++ kdecore/services/kservice.cpp -@@ -57,6 +57,8 @@ +@@ -57,6 +57,8 @@ void KServicePrivate::init( const KDeskt { const QString entryPath = q->entryPath(); bool absPath = !QDir::isRelativePath(entryPath); @@ -9,7 +11,7 @@ // TODO: it makes sense to have a KConstConfigGroup I guess const KConfigGroup desktopGroup = const_cast<KDesktopFile*>(config)->desktopGroup(); -@@ -84,6 +86,8 @@ +@@ -84,6 +86,8 @@ void KServicePrivate::init( const KDeskt if (i != -1) m_strName = m_strName.left(i); } @@ -18,7 +20,7 @@ m_strType = config->readType(); entryMap.remove("Type"); -@@ -107,6 +111,18 @@ +@@ -107,6 +111,18 @@ void KServicePrivate::init( const KDeskt // NOT readPathEntry, it is not XDG-compliant. Path entries written by // KDE4 will be still treated as such, though. m_strExec = desktopGroup.readEntry( "Exec", QString() ); @@ -37,7 +39,7 @@ entryMap.remove("Exec"); if ( m_strType == "Application" ) { -@@ -203,6 +219,9 @@ +@@ -210,6 +226,9 @@ void KServicePrivate::init( const KDeskt m_initialPreference = desktopGroup.readEntry( "InitialPreference", 1 ); entryMap.remove("InitialPreference"); @@ -47,7 +49,7 @@ // Assign the "initial preference" to each mimetype/servicetype // (and to set such preferences in memory from kbuildsycoca) m_serviceTypes.reserve(lstServiceTypes.size()); -@@ -243,6 +262,8 @@ +@@ -250,6 +269,8 @@ void KServicePrivate::init( const KDeskt m_DBUSStartusType = KService::DBusNone; m_strDesktopEntryName = _name.toLower(); @@ -56,7 +58,7 @@ m_bAllowAsDefault = desktopGroup.readEntry("AllowDefault", true); entryMap.remove("AllowDefault"); -@@ -262,7 +283,9 @@ +@@ -269,7 +290,9 @@ void KServicePrivate::init( const KDeskt // qDebug("Path = %s", entryPath.toLatin1().constData()); QMap<QString,QString>::ConstIterator it = entryMap.constBegin(); for( ; it != entryMap.constEnd();++it) { ++++++ kde3-autostart.diff ++++++ --- /var/tmp/diff_new_pack.E16564/_old 2009-05-19 23:54:12.000000000 +0200 +++ /var/tmp/diff_new_pack.E16564/_new 2009-05-19 23:54:12.000000000 +0200 @@ -1,8 +1,46 @@ ---- kinit/autostart.cpp +Index: kdecore/kernel/kautostart.cpp +=================================================================== +--- kdecore/kernel/kautostart.cpp.orig ++++ kdecore/kernel/kautostart.cpp +@@ -22,6 +22,7 @@ + + #include "kaboutdata.h" + #include "kglobal.h" ++#include "kshell.h" + #include "kcomponentdata.h" + #include "kdesktopfile.h" + #include "kstandarddirs.h" +@@ -30,6 +31,8 @@ + #include <QtCore/QFile> + #include <QStringList> + ++#include <stdlib.h> ++ + class KAutostart::Private + { + public: +@@ -117,6 +120,14 @@ bool KAutostart::checkStartCondition() c + if (list[0].isEmpty() || list[2].isEmpty()) + return true; + ++ if( d->name.startsWith( "/etc/opt/kde3/" ) || d->name.startsWith( "/opt/kde3/" )) ++ { ++ QString cmd = QString( "/opt/kde3/bin/kreadconfig --file %1 --group %2 --key %3 --default %4 --type bool" ) ++ .arg( KShell::quoteArg( list[0] ), KShell::quoteArg( list[1] ), KShell::quoteArg( list[2] ), ++ KShell::quoteArg( list[3] )); ++ return system( cmd.toLocal8Bit()) == 0; ++ } ++ + KConfig config(list[0], KConfig::NoGlobals); + KConfigGroup cg(&config, list[1]); + +Index: kinit/autostart.cpp +=================================================================== +--- kinit/autostart.cpp.orig +++ kinit/autostart.cpp -@@ -23,7 +23,10 @@ - #include <kconfiggroup.h> - #include <kdesktopfile.h> +@@ -22,7 +22,10 @@ + + #include <kautostart.h> #include <kglobal.h> +#include <kshell.h> #include <kstandarddirs.h> @@ -11,49 +49,19 @@ class AutoStartItem { -@@ -76,7 +79,7 @@ - return path; - } - --static bool startCondition(const QString &condition) -+static bool startCondition(const QString &condition, const QString& file) - { - if (condition.isEmpty()) - return true; -@@ -87,6 +90,13 @@ - if (list[0].isEmpty() || list[2].isEmpty()) - return true; - -+ if( file.startsWith( "/etc/opt/kde3/" ) || file.startsWith( "/opt/kde3/" )) -+ { -+ QString cmd = QString( "/opt/kde3/bin/kreadconfig --file %1 --group %2 --key %3 --default %4 --type bool" ) -+ .arg( KShell::quoteArg( list[0] ), KShell::quoteArg( list[1] ), KShell::quoteArg( list[2] ), -+ KShell::quoteArg( list[3] )); -+ return system( cmd.toLocal8Bit()) == 0; -+ } - KConfig config(list[0], KConfig::NoGlobals); - KConfigGroup cg(&config, list[1]); - -@@ -98,7 +108,8 @@ +@@ -78,9 +81,10 @@ static QString extractName(QString path) void AutoStart::loadAutoStartList() { -- const QStringList files = KGlobal::dirs()->findAllResources("autostart", "*.desktop", KStandardDirs::NoDuplicates); -+ QStringList files = KGlobal::dirs()->findAllResources("autostart", "*.desktop", KStandardDirs::NoDuplicates); +- const QStringList files = KGlobal::dirs()->findAllResources("autostart", ++ QStringList files = KGlobal::dirs()->findAllResources("autostart", + QString::fromLatin1("*.desktop"), + KStandardDirs::NoDuplicates); + files = mergeKDE3Autostart( files ); for(QStringList::ConstIterator it = files.begin(); it != files.end(); -@@ -106,7 +117,7 @@ - { - KDesktopFile config(*it); - const KConfigGroup grp = config.desktopGroup(); -- if (!startCondition(grp.readEntry("X-KDE-autostart-condition"))) -+ if (!startCondition(grp.readEntry("X-KDE-autostart-condition"), *it)) - continue; - if (!config.tryExec()) - continue; -@@ -126,6 +137,30 @@ +@@ -101,6 +105,30 @@ AutoStart::loadAutoStartList() } } @@ -67,14 +75,14 @@ +{ + QStringList dupecheck; + foreach( QString file, autostart ) -+ dupecheck.append( QString( file ).mid( file.lastIndexOf( '/' ) + 1 )); -+ foreach( QString prefix, QStringList() << "/etc/opt/kde3/" << "/opt/kde3" ) ++ dupecheck.append( QString( file ).mid( file.lastIndexOf( QLatin1Char('/') ) + 1 )); ++ foreach( QString prefix, QStringList() << QString::fromLatin1("/etc/opt/kde3/") << QString::fromLatin1("/opt/kde3") ) + { -+ foreach( QString name, QDir( prefix + "/share/autostart/" ).entryList( QStringList() << "*.desktop", QDir::Files )) ++ foreach( QString name, QDir( prefix + QString::fromLatin1("/share/autostart/") ).entryList( QStringList() << QString::fromLatin1("*.desktop"), QDir::Files )) + { + if( dupecheck.contains( name )) + continue; -+ autostart.append( prefix + "/share/autostart/" + name ); // add it to the list ++ autostart.append( prefix + QString::fromLatin1("/share/autostart/") + name ); // add it to the list + dupecheck.append( name ); + } + } @@ -84,11 +92,11 @@ QString AutoStart::startService() { -Nur in b/kdelibs-4.1.87/kinit: autostart.cpp.orig. -Nur in b/kdelibs-4.1.87/kinit: autostart.cpp.rej. ---- kinit/autostart.h +Index: kinit/autostart.h +=================================================================== +--- kinit/autostart.h.orig +++ kinit/autostart.h -@@ -39,6 +39,7 @@ +@@ -39,6 +39,7 @@ public: bool phaseDone() const { return m_phasedone; } private: ++++++ kdebug-areas-update.diff ++++++ --- /var/tmp/diff_new_pack.E16564/_old 2009-05-19 23:54:12.000000000 +0200 +++ /var/tmp/diff_new_pack.E16564/_new 2009-05-19 23:54:12.000000000 +0200 @@ -1,6 +1,8 @@ ---- kdecore/kdebug.areas +Index: kdecore/kdebug.areas +=================================================================== +--- kdecore/kdebug.areas.orig +++ kdecore/kdebug.areas -@@ -687,6 +687,8 @@ +@@ -723,6 +723,8 @@ 100200 kfs ++++++ kdelibs-4.2.3.tar.bz2 -> kdelibs-4.2.85.tar.bz2 ++++++ KDE/kdelibs4/kdelibs-4.2.3.tar.bz2 kdelibs4/kdelibs-4.2.85.tar.bz2 differ: byte 11, line 1 ++++++ kdesu-settings.diff ++++++ --- /var/tmp/diff_new_pack.E16564/_old 2009-05-19 23:54:12.000000000 +0200 +++ /var/tmp/diff_new_pack.E16564/_new 2009-05-19 23:54:12.000000000 +0200 @@ -9,14 +9,13 @@ Update: Change the timeout back to 2 hours (bnc#404521). ---- kdesu/defaults.h +Index: kdesu/defaults.h +=================================================================== +--- kdesu/defaults.h.orig +++ kdesu/defaults.h -@@ -13,9 +13,9 @@ +@@ -15,7 +15,7 @@ namespace KDESu { - namespace KDESu { - --const int defTimeout = 120*60; -+const int defTimeout = 120*60; + const int defTimeout = 120*60; const int defEchoMode = 0; -const bool defKeep = false; +const bool defKeep = true; ++++++ kjs-mark-register-stack.diff ++++++ --- /var/tmp/diff_new_pack.E16564/_old 2009-05-19 23:54:12.000000000 +0200 +++ /var/tmp/diff_new_pack.E16564/_new 2009-05-19 23:54:12.000000000 +0200 @@ -1,4 +1,6 @@ ---- kjs/collector.cpp +Index: kjs/collector.cpp +=================================================================== +--- kjs/collector.cpp.orig +++ kjs/collector.cpp @@ -528,6 +528,9 @@ static inline void* currentThreadStackBa return stackBase; ++++++ plasma-libs.diff ++++++ --- /var/tmp/diff_new_pack.E16564/_old 2009-05-19 23:54:12.000000000 +0200 +++ /var/tmp/diff_new_pack.E16564/_new 2009-05-19 23:54:12.000000000 +0200 @@ -1,13 +1,13 @@ Index: plasma/corona.cpp =================================================================== ---- plasma/corona.cpp (revision 920623) -+++ plasma/corona.cpp (working copy) -@@ -127,7 +127,9 @@ +--- plasma/corona.cpp.orig ++++ plasma/corona.cpp +@@ -185,7 +185,9 @@ public: if (pluginName.isEmpty()) { // default to the desktop containment - pluginName = "desktop"; -+ KSharedConfigPtr defaultconfig = KSharedConfig::openConfig("plasmarc"); ++ KSharedConfigPtr defaultconfig = KSharedConfig::openConfig("plasma-desktoprc"); + KConfigGroup group = KConfigGroup(defaultconfig, "Defaults"); + pluginName = group.readEntry("containment", "desktop"); } @@ -15,9 +15,9 @@ if (pluginName != "null") { Index: plasma/private/containment_p.h =================================================================== ---- plasma/private/containment_p.h (revision 920623) -+++ plasma/private/containment_p.h (working copy) -@@ -48,7 +48,8 @@ +--- plasma/private/containment_p.h.orig ++++ plasma/private/containment_p.h +@@ -48,7 +48,8 @@ public: toolBox(0), con(0), type(Containment::NoContainmentType), @@ -27,7 +27,7 @@ { } -@@ -121,6 +122,7 @@ +@@ -126,6 +127,7 @@ public: Containment::Type type; static bool s_positioning; bool drawWallpaper; @@ -37,9 +37,9 @@ } // Plasma namespace Index: plasma/containment.h =================================================================== ---- plasma/containment.h (revision 920623) -+++ plasma/containment.h (working copy) -@@ -123,6 +123,8 @@ +--- plasma/containment.h.orig ++++ plasma/containment.h +@@ -123,6 +123,8 @@ class PLASMA_EXPORT Containment : public */ Containment(QObject *parent, const QVariantList &args); @@ -50,10 +50,10 @@ /** Index: plasma/containment.cpp =================================================================== ---- plasma/containment.cpp (revision 920623) -+++ plasma/containment.cpp (working copy) -@@ -109,6 +109,17 @@ - setBackgroundHints(NoBackground); +--- plasma/containment.cpp.orig ++++ plasma/containment.cpp +@@ -113,6 +113,18 @@ Containment::Containment(QObject *parent + setHasConfigurationInterface(false); } +Containment::Containment(QObject *parent, const QVariantList &args, bool showToolBox) @@ -64,26 +64,27 @@ + // that requires a scene, which is not available at this point + setPos(0, 0); + setBackgroundHints(NoBackground); ++ setHasConfigurationInterface(false); + d->showToolBox=showToolBox; +} + Containment::~Containment() { - if (Applet::d->transient) { -@@ -392,7 +403,7 @@ + delete d; +@@ -409,7 +421,7 @@ void Containment::setContainmentType(Con return; } -- if ((type == DesktopContainment || type == PanelContainment)) { +- if (type == DesktopContainment || type == PanelContainment) { + if ((type == DesktopContainment || type == PanelContainment) && d->showToolBox) { d->createToolBox(); } Index: plasma/theme.cpp =================================================================== ---- plasma/theme.cpp (revision 946103) -+++ plasma/theme.cpp (working copy) -@@ -55,7 +55,6 @@ +--- plasma/theme.cpp.orig ++++ plasma/theme.cpp +@@ -56,7 +56,6 @@ public: : q(theme), colorScheme(QPalette::Active, KColorScheme::Window, KSharedConfigPtr(0)), buttonColorScheme(QPalette::Active, KColorScheme::Button, KSharedConfigPtr(0)), @@ -91,30 +92,30 @@ defaultWallpaperSuffix(DEFAULT_WALLPAPER_SUFFIX), defaultWallpaperWidth(DEFAULT_WALLPAPER_WIDTH), defaultWallpaperHeight(DEFAULT_WALLPAPER_HEIGHT), -@@ -69,6 +68,10 @@ +@@ -70,6 +69,10 @@ public: + { generalFont = QApplication::font(); - KConfigGroup cg(KGlobal::config(), "CachePolicies"); - cacheTheme = cg.readEntry("CacheTheme", true); + cacheTheme = cacheConfig().readEntry("CacheTheme", true); + -+ KSharedConfigPtr defaultconfig = KSharedConfig::openConfig("plasmarc"); ++ KSharedConfigPtr defaultconfig = KSharedConfig::openConfig("plasma-desktoprc"); + KConfigGroup group = KConfigGroup(defaultconfig, "Defaults"); + defaultWallpaperTheme = group.readEntry("wallpaper", DEFAULT_WALLPAPER_THEME); } ~ThemePrivate() -@@ -332,7 +335,10 @@ - cg = d->config(); +@@ -360,7 +363,10 @@ void ThemePrivate::setThemeName(const QS + cg = config(); } -- d->defaultWallpaperTheme = cg.readEntry("defaultWallpaperTheme", DEFAULT_WALLPAPER_THEME); -+ KSharedConfigPtr defaultconfig = KSharedConfig::openConfig("plasmarc"); +- defaultWallpaperTheme = cg.readEntry("defaultWallpaperTheme", DEFAULT_WALLPAPER_THEME); ++ KSharedConfigPtr defaultconfig = KSharedConfig::openConfig("plasma-desktoprc"); + KConfigGroup group = KConfigGroup(defaultconfig, "Defaults"); -+ d->defaultWallpaperTheme = cg.readEntry("defaultWallpaperTheme", group.readEntry("wallpaper", DEFAULT_WALLPAPER_THEME)); ++ defaultWallpaperTheme = cg.readEntry("defaultWallpaperTheme", group.readEntry("wallpaper", DEFAULT_WALLPAPER_THEME)); + - d->defaultWallpaperSuffix = cg.readEntry("defaultFileSuffix", DEFAULT_WALLPAPER_SUFFIX); - d->defaultWallpaperWidth = cg.readEntry("defaultWidth", DEFAULT_WALLPAPER_WIDTH); - d->defaultWallpaperHeight = cg.readEntry("defaultHeight", DEFAULT_WALLPAPER_HEIGHT); -@@ -463,6 +469,10 @@ + defaultWallpaperSuffix = cg.readEntry("defaultFileSuffix", DEFAULT_WALLPAPER_SUFFIX); + defaultWallpaperWidth = cg.readEntry("defaultWidth", DEFAULT_WALLPAPER_WIDTH); + defaultWallpaperHeight = cg.readEntry("defaultHeight", DEFAULT_WALLPAPER_HEIGHT); +@@ -494,6 +500,10 @@ QString Theme::wallpaperPath(const QSize } } ++++++ windeco-color.diff ++++++ --- /var/tmp/diff_new_pack.E16564/_old 2009-05-19 23:54:12.000000000 +0200 +++ /var/tmp/diff_new_pack.E16564/_new 2009-05-19 23:54:12.000000000 +0200 @@ -1,8 +1,8 @@ Index: kdeui/kernel/kglobalsettings.cpp =================================================================== ---- kdeui/kernel/kglobalsettings.cpp (revision 808006) -+++ kdeui/kernel/kglobalsettings.cpp (working copy) -@@ -273,7 +273,7 @@ +--- kdeui/kernel/kglobalsettings.cpp.orig ++++ kdeui/kernel/kglobalsettings.cpp +@@ -319,7 +319,7 @@ QColor KGlobalSettings::activeTitleColor return qt_colorref2qrgb(GetSysColor(COLOR_ACTIVECAPTION)); #else KConfigGroup g( KGlobal::config(), "WM" ); ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit phonon for openSUSE:Factory
by root＠Hilbert.suse.de 19 May '09

19 May '09

Hello community, here is the log from the commit of package phonon for openSUSE:Factory checked in at Tue May 19 23:53:56 CEST 2009. -------- --- KDE/phonon/phonon.changes 2009-02-27 17:28:33.000000000 +0100 +++ phonon/phonon.changes 2009-05-14 01:00:28.000000000 +0200 @@ -1,0 +2,5 @@ +Thu May 14 01:00:12 CEST 2009 - dmueller(a)suse.de + +- add versioned dependencies + +------------------------------------------------------------------- calling whatdependson for head-i586 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ phonon.spec ++++++ --- /var/tmp/diff_new_pack.cF8980/_old 2009-05-19 23:53:27.000000000 +0200 +++ /var/tmp/diff_new_pack.cF8980/_new 2009-05-19 23:53:27.000000000 +0200 @@ -33,7 +33,7 @@ BuildRequires: fdupes %endif Version: 4.3.1 -Release: 1 +Release: 2 License: LGPL v2.0 or later Url: http://phonon.kde.org/ BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -83,6 +83,7 @@ License: LGPL v2.0 or later Summary: Phonon Multimedia Platform Abstraction Group: Development/Libraries/KDE +%requires_ge libqt4-x11 %description -n libphonon4 Phonon is a cross-platform portable Multimedia Support Abstraction, @@ -199,6 +200,8 @@ %endif %changelog +* Thu May 14 2009 dmueller(a)suse.de +- add versioned dependencies * Fri Feb 27 2009 dmueller(a)suse.de - update to 4.3.1: * sync with the version in Qt 4.5.0, various bugfixes ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit strigi for openSUSE:Factory
by root＠Hilbert.suse.de 19 May '09

19 May '09

Hello community, here is the log from the commit of package strigi for openSUSE:Factory checked in at Tue May 19 23:53:15 CEST 2009. -------- --- strigi/strigi.changes 2009-02-02 13:35:09.000000000 +0100 +++ strigi/strigi.changes 2009-05-17 22:18:45.000000000 +0200 @@ -1,0 +2,16 @@ +Sun May 17 22:05:33 CEST 2009 - beineri(a)opensuse.org + +- update to 0.6.5: + * now allows path that start with protocol:/* like 'file:///' + * Add a new function AnalysisResult::child(). + * Adjust to the new library naming scheme in iconv-1.12 + * Implemented missing addTriplet method + * Rewrite the implementation of ArchiveReader. The new implemen- + tation is more effient in listing contents of directories. + +------------------------------------------------------------------- +Thu May 14 00:49:19 CEST 2009 - dmueller(a)suse.de + +- add versioned dependency + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- strigi-0.6.4.tar.bz2 New: ---- strigi-0.6.5.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ strigi.spec ++++++ --- /var/tmp/diff_new_pack.e21106/_old 2009-05-19 23:41:10.000000000 +0200 +++ /var/tmp/diff_new_pack.e21106/_new 2009-05-19 23:41:10.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package strigi (Version 0.6.4) +# spec file for package strigi (Version 0.6.5) # # Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -31,9 +31,9 @@ Summary: Lightweight and fast desktop search engine BuildRoot: %{_tmppath}/%{name}-%{version}-build Url: http://www.vandenoever.info/software/strigi/ -Version: 0.6.4 +Version: 0.6.5 Release: 1 -%define tar_version 0.6.4 +%define tar_version 0.6.5 Source: strigi-%{tar_version}.tar.bz2 Provides: strigi-ui = 0.5.7 Obsoletes: strigi-ui <= 0.5.7 @@ -73,6 +73,7 @@ License: GPL v2 or later; LGPL v2.1 or later Group: Productivity/Other Summary: Lightweight and fast desktop search engine +%requires_ge libqt4 %description -n libstrigi0 strigi is a very fast crawling, very small memory footprint, no @@ -156,6 +157,16 @@ %_libdir/strigi/StrigiConfig.cmake %changelog +* Sun May 17 2009 beineri(a)opensuse.org +- update to 0.6.5: + * now allows path that start with protocol:/* like 'file:///' + * Add a new function AnalysisResult::child(). + * Adjust to the new library naming scheme in iconv-1.12 + * Implemented missing addTriplet method + * Rewrite the implementation of ArchiveReader. The new implemen- + tation is more effient in listing contents of directories. +* Thu May 14 2009 dmueller(a)suse.de +- add versioned dependency * Mon Feb 02 2009 stbinner(a)suse.de - update to 0.6.4: - Path fixes to the build system the benefit of windows users @@ -213,7 +224,7 @@ on the maximum length of stream we read - Log parse errors in the analysisresult. - Several bugfixes -* Sun Jun 22 2008 dmueller(a)suse.de +* Mon Jun 23 2008 dmueller(a)suse.de - update to 0.5.10: * Improved Xesam support. strigidaemon can now be queried with the client from the Xesam test suite. @@ -277,7 +288,7 @@ - update to current SVN: * fixes an include bug by rearranging the way the strigiconfig.h include is installed -* Thu Aug 02 2007 dmueller(a)suse.de +* Fri Aug 03 2007 dmueller(a)suse.de - fix build against gcc 4.3 * Thu Jul 26 2007 dmueller(a)suse.de - update to 0.5.4: ++++++ strigi-0.6.4.tar.bz2 -> strigi-0.6.5.tar.bz2 ++++++ ++++ 2561 lines of diff (skipped) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit soprano for openSUSE:Factory
by root＠Hilbert.suse.de 19 May '09

19 May '09

Hello community, here is the log from the commit of package soprano for openSUSE:Factory checked in at Tue May 19 23:36:06 CEST 2009. -------- --- soprano/soprano-backend-sesame.changes 2009-02-27 11:19:44.000000000 +0100 +++ soprano/soprano-backend-sesame.changes 2009-05-11 16:10:24.000000000 +0200 @@ -1,0 +2,16 @@ +Mon May 11 16:02:06 CEST 2009 - llunak(a)suse.cz + +- build the Virtuoso backend separately + +------------------------------------------------------------------- +Mon May 11 14:40:53 CEST 2009 - llunak(a)suse.cz + +- build also Virtuoso backend + +------------------------------------------------------------------- +Mon May 11 14:36:52 CEST 2009 - llunak(a)suse.cz + +- update to 2.2.67: + * new backend Virtuoso + +------------------------------------------------------------------- New Changes file: --- /dev/null 2009-04-14 11:58:14.000000000 +0200 +++ soprano/soprano-backend-virtuoso.changes 2009-05-11 16:10:24.000000000 +0200 @@ -0,0 +1,292 @@ +------------------------------------------------------------------- +Mon May 11 16:02:06 CEST 2009 - llunak(a)suse.cz + +- build the Virtuoso backend separately + +------------------------------------------------------------------- +Mon May 11 14:40:53 CEST 2009 - llunak(a)suse.cz + +- build also Virtuoso backend + +------------------------------------------------------------------- +Mon May 11 14:36:52 CEST 2009 - llunak(a)suse.cz + +- update to 2.2.67: + * new backend Virtuoso + +------------------------------------------------------------------- +Fri Feb 27 11:19:15 CET 2009 - dmueller(a)suse.de + +- update to 2.2.2: + * Properly clear the error in the SparqlModel + * Made all D-Bus dependant parts optional for successful compilation on Windows. + * Redland include dir fix. + * New cmake options to manually disable all optional components: + o Redland backend + o Sesame2 backend + o Raptor parser/serializer + o CLucene full text index + o D-Bus integration + o Apidox generation + * Less use of dynamic_cast + +------------------------------------------------------------------- +Thu Jan 22 09:26:02 CET 2009 - dmueller(a)suse.de + +- update to 2.1.67: + * New class Soprano::Client::SparqlModel which provides a client to http Sparql endpoints. + * Added method Node::toN3 to easily build SPARQL queries without having to encode nodes all the time. + * New convinience method QueryResultIterator::iterateStatementsFromBindings + * Added convinience methods to handle BackendSettings. + * Added operator[] to QueryResultIterator to easily access bindings + * Added parameters influencing the visibility to onto2vocabularyclass + * Soprano::Node now comes with definitions of qHash for both Node and QUrl + * Sesame2 updated to 2.1.4 + * The IndexFilterModel can now optionally index specific URIs (IndexFilterModel::setForceIndexPredicates) + * Added method IndexFilterModel::optimizeIndex which optimizes the clucene index on disk + * Added method IndexFilterModel::encodeUriForLuceneQuery which encodes/escapes a URI so it can be used + as a field in a clucene query. + * SPARQL endpoint query support in sopranocmd + +------------------------------------------------------------------- +Fri Jan 9 11:28:04 CET 2009 - dmueller(a)suse.de + +- update to 2.1.64: + * updated bindings for KDE 4.2 + +------------------------------------------------------------------- +Tue Oct 21 02:47:39 CEST 2008 - dmueller(a)suse.de + +- fix build for Qt 4.5 snapshots + +------------------------------------------------------------------- +Tue Oct 14 11:42:57 CEST 2008 - dmueller(a)suse.de + +- correct spec file splitting again, was ordered incorrect + +------------------------------------------------------------------- +Mon Oct 13 22:21:26 CEST 2008 - dmueller(a)suse.de + +- fix include handling for jni includes to fix ppc build + +------------------------------------------------------------------- +Mon Sep 29 10:25:29 CEST 2008 - dmueller(a)suse.de + +- split sesame backend into seperate spec file to reduce build + dependencies + +------------------------------------------------------------------- +Tue Sep 9 01:30:45 CEST 2008 - dmueller(a)suse.de + +- fix build for old distros + +------------------------------------------------------------------- +Thu Aug 28 16:09:31 CEST 2008 - dmueller(a)suse.de + +- add missing runtime dependency + +------------------------------------------------------------------- +Wed Aug 27 16:53:47 CEST 2008 - dmueller(a)suse.de + +- update to 2.1.1: + * http://soprano.sourceforge.net/node/26 + +------------------------------------------------------------------- +Wed Aug 27 16:45:05 CEST 2008 - dmueller(a)suse.de + +- need rpath for sesame2 backend + +------------------------------------------------------------------- +Wed Jul 23 10:30:51 CEST 2008 - dmueller(a)suse.de + +- update to 2.1: + * http://soprano.sourceforge.net/node/25 + +------------------------------------------------------------------- +Tue Jul 22 11:44:48 CEST 2008 - dmueller(a)suse.de + +- fix requires again + +------------------------------------------------------------------- +Mon Jul 21 13:18:31 CEST 2008 - dmueller(a)suse.de + +- split backends into separate packages + +------------------------------------------------------------------- +Sat Jul 19 12:48:04 CEST 2008 - dmueller(a)suse.de + +- compile for older distros + +------------------------------------------------------------------- +Fri Jul 18 01:43:11 CEST 2008 - dmueller(a)suse.de + +- enable sesame2 backend + +------------------------------------------------------------------- +Thu Apr 24 22:03:30 CEST 2008 - dmueller(a)suse.de + +- update to final 2.0.98 (alpha1) release + +------------------------------------------------------------------- +Wed Apr 16 14:16:22 CEST 2008 - dmueller(a)suse.de + +- update to 2.0.98 to fix the communication issues + +------------------------------------------------------------------- +Thu Apr 10 12:54:45 CEST 2008 - ro(a)suse.de + +- added baselibs.conf file to build xxbit packages + for multilib support + +------------------------------------------------------------------- +Mon Mar 31 14:52:40 CEST 2008 - dmueller(a)suse.de + +- update from SVN + +------------------------------------------------------------------- +Tue Mar 25 16:59:07 CET 2008 - dmueller(a)suse.de + +- update to 2.0.97: + * new dbus interface + +------------------------------------------------------------------- +Tue Mar 11 21:09:23 CET 2008 - dmueller(a)suse.de + +- update to 2.0.3: + * Fixed a string caching bug in LiteralValue which resulted in + invalid string representations when assigning a QDate, QTime, + QDateTime, or QByteArray via operator= + * Use the CLucene StandardAnalyser by default instead of the + SimpleAnalyser. This fixes indexing of numbers. + +------------------------------------------------------------------- +Mon Feb 18 17:48:43 CET 2008 - dmueller(a)suse.de + +- update to 2.0.2: + * MutexModel in ReadWriteMultiThreading mode now allows multiple + read operations from the same thread at the same time even if a + write operation is waiting. This fixes a deadlock in the Nepomuk + Strigi backend from KDE. + * Fixed method statementCount in Sesame2 backend + * Redland backend: Always encode strings as xls:string rather + than rdfs:Literal values to match the Soprano guidelines. + * Always set a dummy base URI in the raptor serializer + * Fixed formatting of dateTime values. + * Fixed NRL namespace + * Fixed NAO namespace + * Fixed plugin loading on MAC OS/X + +------------------------------------------------------------------- +Thu Feb 14 00:25:02 CET 2008 - dmueller(a)suse.de + +- fix devel package requires + +------------------------------------------------------------------- +Mon Jan 14 12:13:35 CET 2008 - dmueller(a)suse.de + +- fix lockfile generation + +------------------------------------------------------------------- +Sat Jan 12 23:43:45 CET 2008 - stbinner(a)suse.de + +- add version dependency on libsoprano4 (#353512) + +------------------------------------------------------------------- +Mon Jan 7 16:34:46 CET 2008 - dmueller(a)suse.de + +- update to 2.0.0 final: ++++ 95 more lines (skipped) ++++ between /dev/null ++++ and soprano/soprano-backend-virtuoso.changes --- soprano/soprano.changes 2009-02-27 11:19:44.000000000 +0100 +++ soprano/soprano.changes 2009-05-11 16:10:24.000000000 +0200 @@ -1,0 +2,16 @@ +Mon May 11 16:02:06 CEST 2009 - llunak(a)suse.cz + +- build the Virtuoso backend separately + +------------------------------------------------------------------- +Mon May 11 14:40:53 CEST 2009 - llunak(a)suse.cz + +- build also Virtuoso backend + +------------------------------------------------------------------- +Mon May 11 14:36:52 CEST 2009 - llunak(a)suse.cz + +- update to 2.2.67: + * new backend Virtuoso + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- soprano-2.2.2.tar.bz2 New: ---- soprano-2.2.67.tar.bz2 soprano-backend-virtuoso.changes soprano-backend-virtuoso.spec soprano-backend-virtuoso.spec.in ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ soprano-backend-sesame.spec ++++++ --- /var/tmp/diff_new_pack.oL6403/_old 2009-05-19 23:23:21.000000000 +0200 +++ /var/tmp/diff_new_pack.oL6403/_new 2009-05-19 23:23:21.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package soprano-backend-sesame (Version 2.2.2) +# spec file for package soprano-backend-sesame (Version 2.2.67) # # Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -19,7 +19,7 @@ Name: soprano-backend-sesame Url: http://soprano.sourceforge.net/ -BuildRequires: fdupes java-devel libsoprano-devel soprano-backend-redland +BuildRequires: fdupes java-devel libsoprano-devel License: LGPL v2.1 or later Group: Development/Libraries/C and C++ Summary: C++/Qt based interface library for RDF - Sesame backend @@ -29,7 +29,7 @@ # COMMON1-BEGIN BuildRequires: cmake kde4-filesystem libqt4-devel libraptor-devel libredland-devel BuildRequires: clucene-core-devel doxygen raptor -Version: 2.2.2 +Version: 2.2.67 Release: 1 Source: soprano-%{version}.tar.bz2 Patch0: jni-include-fix.diff @@ -64,14 +64,14 @@ %install cd build + # this uses the cmake (mis)feature of 'make' building also the dependencies outside + # the directory and its subdirectories, 'make install' not installing them + cd backends/sesame2 %makeinstall %if %suse_version > 1020 %fdupes -s $RPM_BUILD_ROOT/usr/include %endif cd .. -for f in $(rpm -ql soprano) $(rpm -ql libsoprano-devel) $(rpm -ql libsoprano4) $(rpm -ql soprano-backend-redland); do - test -f $RPM_BUILD_ROOT/$f && rm $RPM_BUILD_ROOT/$f -done %files %defattr(-,root,root) @@ -80,6 +80,13 @@ /usr/share/soprano/plugins/sesame2backend.desktop %changelog +* Mon May 11 2009 llunak(a)suse.cz +- build the Virtuoso backend separately +* Mon May 11 2009 llunak(a)suse.cz +- build also Virtuoso backend +* Mon May 11 2009 llunak(a)suse.cz +- update to 2.2.67: + * new backend Virtuoso * Fri Feb 27 2009 dmueller(a)suse.de - update to 2.2.2: * Properly clear the error in the SparqlModel @@ -177,7 +184,7 @@ - fix devel package requires * Mon Jan 14 2008 dmueller(a)suse.de - fix lockfile generation -* Sat Jan 12 2008 stbinner(a)suse.de +* Sun Jan 13 2008 stbinner(a)suse.de - add version dependency on libsoprano4 (#353512) * Mon Jan 07 2008 dmueller(a)suse.de - update to 2.0.0 final: @@ -191,7 +198,7 @@ * API additions for better performance * Tue Dec 18 2007 stbinner(a)suse.de - fix plugin loading on 64bit architectures -* Sun Dec 16 2007 stbinner(a)suse.de +* Mon Dec 17 2007 stbinner(a)suse.de - readd redland as build requirement * Mon Dec 10 2007 dmueller(a)suse.de - update to 1.99 (rc2): @@ -205,7 +212,7 @@ - enable cluclene based indexing backend * Tue Oct 16 2007 dmueller(a)suse.de - remove fdupes for older distributions -* Tue Oct 09 2007 dmueller(a)suse.de +* Wed Oct 10 2007 dmueller(a)suse.de - rename library package * Tue Oct 09 2007 dmueller(a)suse.de - update to 1.95.0-beta2: ++++++ soprano-backend-virtuoso.spec ++++++ # # spec file for package soprano-backend-virtuoso (Version 2.2.67) # # Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed # upon. The license for this file, and modifications and additions to the # file, is the same license as for the pristine package itself (unless the # license for the pristine package is not an Open Source License, in which # case the license is the MIT License). An "Open Source License" is a # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. # Please submit bugfixes or comments via http://bugs.opensuse.org/ # Name: soprano-backend-virtuoso Url: http://soprano.sourceforge.net/ BuildRequires: fdupes java-devel libsoprano-devel License: LGPL v2.1 or later Group: Development/Libraries/C and C++ Summary: C++/Qt based interface library for RDF BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: libiodbc-devel # COMMON1-BEGIN # COMMON1-BEGIN BuildRequires: cmake kde4-filesystem libqt4-devel libraptor-devel libredland-devel BuildRequires: clucene-core-devel doxygen raptor Version: 2.2.67 Release: 1 Source: soprano-%{version}.tar.bz2 Patch0: jni-include-fix.diff # COMMON1-END # COMMON1-END Provides: soprano_backend = %version Provides: backend-virtuso = %version Requires: libsoprano4 = %version %description Soprano is a RDF QT/C++ interface library using redland as a backend Authors: -------- Daniele Galdi <daniele.galdi(a)gmail.com> Sebastian Trueg <trueg(a)kde.org> %prep # COMMON2-BEGIN # COMMON2-BEGIN %setup -q -n soprano-%version #%patch0 # COMMON2-END # COMMON2-END %build %cmake_kde4 -d build -- -DCMAKE_SKIP_RPATH=OFF %make_jobs %install cd build # this uses the cmake (mis)feature of 'make' building also the dependencies outside # the directory and its subdirectories, 'make install' not installing them cd backends/virtuoso %makeinstall %if %suse_version > 1020 %fdupes -s $RPM_BUILD_ROOT/usr/include %endif cd .. %files %defattr(-,root,root) %_libdir/soprano/libsoprano_virtuosobackend.so /usr/share/soprano/plugins/virtuosobackend.desktop %changelog * Mon May 11 2009 llunak(a)suse.cz - build the Virtuoso backend separately * Mon May 11 2009 llunak(a)suse.cz - build also Virtuoso backend * Mon May 11 2009 llunak(a)suse.cz - update to 2.2.67: * new backend Virtuoso * Fri Feb 27 2009 dmueller(a)suse.de - update to 2.2.2: * Properly clear the error in the SparqlModel * Made all D-Bus dependant parts optional for successful compilation on Windows. * Redland include dir fix. * New cmake options to manually disable all optional components: o Redland backend o Sesame2 backend o Raptor parser/serializer o CLucene full text index o D-Bus integration o Apidox generation * Less use of dynamic_cast * Thu Jan 22 2009 dmueller(a)suse.de - update to 2.1.67: * New class Soprano::Client::SparqlModel which provides a client to http Sparql endpoints. * Added method Node::toN3 to easily build SPARQL queries without having to encode nodes all the time. * New convinience method QueryResultIterator::iterateStatementsFromBindings * Added convinience methods to handle BackendSettings. * Added operator[] to QueryResultIterator to easily access bindings * Added parameters influencing the visibility to onto2vocabularyclass * Soprano::Node now comes with definitions of qHash for both Node and QUrl * Sesame2 updated to 2.1.4 * The IndexFilterModel can now optionally index specific URIs (IndexFilterModel::setForceIndexPredicates) * Added method IndexFilterModel::optimizeIndex which optimizes the clucene index on disk * Added method IndexFilterModel::encodeUriForLuceneQuery which encodes/escapes a URI so it can be used as a field in a clucene query. * SPARQL endpoint query support in sopranocmd * Fri Jan 09 2009 dmueller(a)suse.de - update to 2.1.64: * updated bindings for KDE 4.2 * Tue Oct 21 2008 dmueller(a)suse.de - fix build for Qt 4.5 snapshots * Tue Oct 14 2008 dmueller(a)suse.de - correct spec file splitting again, was ordered incorrect * Mon Oct 13 2008 dmueller(a)suse.de - fix include handling for jni includes to fix ppc build * Mon Sep 29 2008 dmueller(a)suse.de - split sesame backend into seperate spec file to reduce build dependencies * Tue Sep 09 2008 dmueller(a)suse.de - fix build for old distros * Thu Aug 28 2008 dmueller(a)suse.de - add missing runtime dependency * Wed Aug 27 2008 dmueller(a)suse.de - update to 2.1.1: * http://soprano.sourceforge.net/node/26 * Wed Aug 27 2008 dmueller(a)suse.de - need rpath for sesame2 backend * Wed Jul 23 2008 dmueller(a)suse.de - update to 2.1: * http://soprano.sourceforge.net/node/25 * Tue Jul 22 2008 dmueller(a)suse.de - fix requires again * Mon Jul 21 2008 dmueller(a)suse.de - split backends into separate packages * Sat Jul 19 2008 dmueller(a)suse.de - compile for older distros * Fri Jul 18 2008 dmueller(a)suse.de - enable sesame2 backend * Thu Apr 24 2008 dmueller(a)suse.de - update to final 2.0.98 (alpha1) release * Wed Apr 16 2008 dmueller(a)suse.de - update to 2.0.98 to fix the communication issues * Thu Apr 10 2008 ro(a)suse.de - added baselibs.conf file to build xxbit packages for multilib support * Mon Mar 31 2008 dmueller(a)suse.de - update from SVN * Tue Mar 25 2008 dmueller(a)suse.de - update to 2.0.97: * new dbus interface * Tue Mar 11 2008 dmueller(a)suse.de - update to 2.0.3: * Fixed a string caching bug in LiteralValue which resulted in invalid string representations when assigning a QDate, QTime, QDateTime, or QByteArray via operator= * Use the CLucene StandardAnalyser by default instead of the SimpleAnalyser. This fixes indexing of numbers. * Mon Feb 18 2008 dmueller(a)suse.de - update to 2.0.2: * MutexModel in ReadWriteMultiThreading mode now allows multiple read operations from the same thread at the same time even if a write operation is waiting. This fixes a deadlock in the Nepomuk Strigi backend from KDE. * Fixed method statementCount in Sesame2 backend * Redland backend: Always encode strings as xls:string rather than rdfs:Literal values to match the Soprano guidelines. * Always set a dummy base URI in the raptor serializer * Fixed formatting of dateTime values. * Fixed NRL namespace * Fixed NAO namespace * Fixed plugin loading on MAC OS/X * Thu Feb 14 2008 dmueller(a)suse.de - fix devel package requires * Mon Jan 14 2008 dmueller(a)suse.de - fix lockfile generation * Sun Jan 13 2008 stbinner(a)suse.de - add version dependency on libsoprano4 (#353512) * Mon Jan 07 2008 dmueller(a)suse.de - update to 2.0.0 final: * Parser and serializer plugins for: - raptor (rdf+xml, turtle, trig, nTriples) - nQuads * Hierarchical architecture which allows to stack multiple filter models on top of an RDF storage. * Thu Dec 20 2007 dmueller(a)suse.de - update to svn750895: * API additions for better performance * Tue Dec 18 2007 stbinner(a)suse.de - fix plugin loading on 64bit architectures * Mon Dec 17 2007 stbinner(a)suse.de - readd redland as build requirement * Mon Dec 10 2007 dmueller(a)suse.de - update to 1.99 (rc2): * xesam interface, new ontology interface * Tue Nov 06 2007 dmueller(a)suse.de - update to 1.97.1 (beta4): * small API cleanup, more installed CamelCased headers * Tue Nov 06 2007 dmueller(a)suse.de - fix installation of index headers * Tue Oct 30 2007 dmueller(a)suse.de - enable cluclene based indexing backend * Tue Oct 16 2007 dmueller(a)suse.de - remove fdupes for older distributions * Wed Oct 10 2007 dmueller(a)suse.de - rename library package * Tue Oct 09 2007 dmueller(a)suse.de - update to 1.95.0-beta2: * removes redland dependency, uses raptor now directly * new query API * Mon Sep 03 2007 schwab(a)suse.de - Fix broken compiler flags. * Fri Jun 01 2007 dmueller(a)suse.de - update to 0.9.0: * crash fix * Fri May 11 2007 dmueller(a)suse.de - update to current SVN: * small API change * Fri May 04 2007 dmueller(a)suse.de - update to 3.90.1: * no actual code change - fix packaging to match Library Policy * Fri May 04 2007 dmueller(a)suse.de - adapt libredland-devel rename * Wed May 02 2007 dmueller(a)suse.de - Initial package (trunk SVN) ++++++ soprano.spec ++++++ --- /var/tmp/diff_new_pack.oL6403/_old 2009-05-19 23:23:21.000000000 +0200 +++ /var/tmp/diff_new_pack.oL6403/_new 2009-05-19 23:23:21.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package soprano (Version 2.2.2) +# spec file for package soprano (Version 2.2.67) # # Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -28,7 +28,7 @@ # COMMON1-BEGIN BuildRequires: cmake kde4-filesystem libqt4-devel libraptor-devel libredland-devel BuildRequires: clucene-core-devel doxygen raptor -Version: 2.2.2 +Version: 2.2.67 Release: 1 Source: soprano-%{version}.tar.bz2 Patch0: jni-include-fix.diff @@ -86,6 +86,7 @@ License: LGPL v2.1 or later Group: Development/Libraries/C and C++ Summary: C++/Qt based interface library for RDF +%requires_ge libqt4 %description -n libsoprano4 Soprano is an open and pluggable RDF resource framework which is build @@ -161,13 +162,13 @@ %files -n libsoprano4 %defattr(-,root,root) %_libdir/libsopranoclient.so.1 -%_libdir/libsopranoclient.so.1.0.0 +%_libdir/libsopranoclient.so.1.1.0 %_libdir/libsopranoserver.so.1 %_libdir/libsopranoserver.so.1.0.0 %_libdir/libsoprano.so.4 -%_libdir/libsoprano.so.4.1.0 +%_libdir/libsoprano.so.4.2.0 %_libdir/libsopranoindex.so.1 -%_libdir/libsopranoindex.so.1.0.0 +%_libdir/libsopranoindex.so.1.1.0 %files -n libsoprano-devel %defattr(-,root,root) @@ -185,6 +186,13 @@ /usr/share/soprano/plugins/redlandbackend.desktop %changelog +* Mon May 11 2009 llunak(a)suse.cz +- build the Virtuoso backend separately +* Mon May 11 2009 llunak(a)suse.cz +- build also Virtuoso backend +* Mon May 11 2009 llunak(a)suse.cz +- update to 2.2.67: + * new backend Virtuoso * Fri Feb 27 2009 dmueller(a)suse.de - update to 2.2.2: * Properly clear the error in the SparqlModel @@ -282,7 +290,7 @@ - fix devel package requires * Mon Jan 14 2008 dmueller(a)suse.de - fix lockfile generation -* Sat Jan 12 2008 stbinner(a)suse.de +* Sun Jan 13 2008 stbinner(a)suse.de - add version dependency on libsoprano4 (#353512) * Mon Jan 07 2008 dmueller(a)suse.de - update to 2.0.0 final: @@ -296,7 +304,7 @@ * API additions for better performance * Tue Dec 18 2007 stbinner(a)suse.de - fix plugin loading on 64bit architectures -* Sun Dec 16 2007 stbinner(a)suse.de +* Mon Dec 17 2007 stbinner(a)suse.de - readd redland as build requirement * Mon Dec 10 2007 dmueller(a)suse.de - update to 1.99 (rc2): @@ -310,7 +318,7 @@ - enable cluclene based indexing backend * Tue Oct 16 2007 dmueller(a)suse.de - remove fdupes for older distributions -* Tue Oct 09 2007 dmueller(a)suse.de +* Wed Oct 10 2007 dmueller(a)suse.de - rename library package * Tue Oct 09 2007 dmueller(a)suse.de - update to 1.95.0-beta2: ++++++ pre_checkin.sh ++++++ --- /var/tmp/diff_new_pack.oL6403/_old 2009-05-19 23:23:21.000000000 +0200 +++ /var/tmp/diff_new_pack.oL6403/_new 2009-05-19 23:23:21.000000000 +0200 @@ -2,8 +2,9 @@ # This script is called automatically during autobuild checkin. ln -f soprano.changes soprano-backend-sesame.changes +ln -f soprano.changes soprano-backend-virtuoso.changes -for spec in soprano-backend-sesame.spec; do +for spec in soprano-backend-sesame.spec soprano-backend-virtuoso.spec; do cp -f $spec.in $spec for n in $(seq 1 10); do grep -q "COMMON$n-BEGIN" soprano.spec || continue ++++++ soprano-2.2.2.tar.bz2 -> soprano-2.2.67.tar.bz2 ++++++ ++++ 10513 lines of diff (skipped) ++++++ soprano-backend-sesame.spec.in ++++++ --- /var/tmp/diff_new_pack.oL6403/_old 2009-05-19 23:23:24.000000000 +0200 +++ /var/tmp/diff_new_pack.oL6403/_new 2009-05-19 23:23:24.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package soprano (Version 2.1.1) +# spec file for package soprano-backend-sesame (Version 2.2.67) # # Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -19,7 +19,7 @@ Name: soprano-backend-sesame Url: http://soprano.sourceforge.net/ -BuildRequires: java-devel fdupes libsoprano-devel soprano-backend-redland +BuildRequires: java-devel fdupes libsoprano-devel License: GPL v2 or later; LGPL v2.1 or later Group: Development/Libraries/C and C++ Summary: C++/Qt based interface library for RDF @@ -46,17 +46,15 @@ %install cd build + # this uses the cmake (mis)feature of 'make' building also the dependencies outside + # the directory and its subdirectories, 'make install' not installing them + cd backends/sesame2 %makeinstall %if %suse_version > 1020 %fdupes -s $RPM_BUILD_ROOT/usr/include %endif cd .. -for f in $(rpm -ql soprano) $(rpm -ql libsoprano-devel) $(rpm -ql libsoprano4) $(rpm -ql soprano-backend-redland); do - test -f $RPM_BUILD_ROOT/$f && rm $RPM_BUILD_ROOT/$f -done - - %files %defattr(-,root,root) ++++++ soprano-backend-virtuoso.spec.in ++++++ # # spec file for package soprano-backend-virtuoso (Version 2.2.67) # # Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed # upon. The license for this file, and modifications and additions to the # file, is the same license as for the pristine package itself (unless the # license for the pristine package is not an Open Source License, in which # case the license is the MIT License). An "Open Source License" is a # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. # Please submit bugfixes or comments via http://bugs.opensuse.org/ # Name: soprano-backend-virtuoso Url: http://soprano.sourceforge.net/ BuildRequires: java-devel fdupes libsoprano-devel License: GPL v2 or later; LGPL v2.1 or later Group: Development/Libraries/C and C++ Summary: C++/Qt based interface library for RDF BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: libiodbc-devel # COMMON1-BEGIN # COMMON1-END Provides: soprano_backend = %version Provides: backend-virtuso = %version Requires: libsoprano4 = %version %description bla %prep # COMMON2-BEGIN # COMMON2-END %build %cmake_kde4 -d build -- -DCMAKE_SKIP_RPATH=OFF %make_jobs %install cd build # this uses the cmake (mis)feature of 'make' building also the dependencies outside # the directory and its subdirectories, 'make install' not installing them cd backends/virtuoso %makeinstall %if %suse_version > 1020 %fdupes -s $RPM_BUILD_ROOT/usr/include %endif cd .. %files %defattr(-,root,root) %_libdir/soprano/libsoprano_virtuosobackend.so /usr/share/soprano/plugins/virtuosobackend.desktop %changelog * Tue Sep 09 2008 dmueller(a)suse.de - fix build for old distros * Thu Aug 28 2008 dmueller(a)suse.de - add missing runtime dependency * Wed Aug 27 2008 dmueller(a)suse.de - update to 2.1.1: * http://soprano.sourceforge.net/node/26 * Wed Aug 27 2008 dmueller(a)suse.de - need rpath for sesame2 backend * Wed Jul 23 2008 dmueller(a)suse.de - update to 2.1: * http://soprano.sourceforge.net/node/25 * Tue Jul 22 2008 dmueller(a)suse.de - fix requires again * Mon Jul 21 2008 dmueller(a)suse.de - split backends into separate packages * Sat Jul 19 2008 dmueller(a)suse.de - compile for older distros * Fri Jul 18 2008 dmueller(a)suse.de - enable sesame2 backend * Fri Apr 25 2008 dmueller(a)suse.de - update to final 2.0.98 (alpha1) release * Wed Apr 16 2008 dmueller(a)suse.de - update to 2.0.98 to fix the communication issues * Thu Apr 10 2008 ro(a)suse.de - added baselibs.conf file to build xxbit packages for multilib support * Mon Mar 31 2008 dmueller(a)suse.de - update from SVN * Tue Mar 25 2008 dmueller(a)suse.de - update to 2.0.97: * new dbus interface * Tue Mar 11 2008 dmueller(a)suse.de - update to 2.0.3: * Fixed a string caching bug in LiteralValue which resulted in invalid string representations when assigning a QDate, QTime, QDateTime, or QByteArray via operator= * Use the CLucene StandardAnalyser by default instead of the SimpleAnalyser. This fixes indexing of numbers. * Mon Feb 18 2008 dmueller(a)suse.de - update to 2.0.2: * MutexModel in ReadWriteMultiThreading mode now allows multiple read operations from the same thread at the same time even if a write operation is waiting. This fixes a deadlock in the Nepomuk Strigi backend from KDE. * Fixed method statementCount in Sesame2 backend * Redland backend: Always encode strings as xls:string rather than rdfs:Literal values to match the Soprano guidelines. * Always set a dummy base URI in the raptor serializer * Fixed formatting of dateTime values. * Fixed NRL namespace * Fixed NAO namespace * Fixed plugin loading on MAC OS/X * Thu Feb 14 2008 dmueller(a)suse.de - fix devel package requires * Mon Jan 14 2008 dmueller(a)suse.de - fix lockfile generation * Sun Jan 13 2008 stbinner(a)suse.de - add version dependency on libsoprano4 (#353512) * Mon Jan 07 2008 dmueller(a)suse.de - update to 2.0.0 final: * Parser and serializer plugins for: - raptor (rdf+xml, turtle, trig, nTriples) - nQuads * Hierarchical architecture which allows to stack multiple filter models on top of an RDF storage. * Thu Dec 20 2007 dmueller(a)suse.de - update to svn750895: * API additions for better performance * Tue Dec 18 2007 stbinner(a)suse.de - fix plugin loading on 64bit architectures * Mon Dec 17 2007 stbinner(a)suse.de - readd redland as build requirement * Mon Dec 10 2007 dmueller(a)suse.de - update to 1.99 (rc2): * xesam interface, new ontology interface * Tue Nov 06 2007 dmueller(a)suse.de - update to 1.97.1 (beta4): * small API cleanup, more installed CamelCased headers * Tue Nov 06 2007 dmueller(a)suse.de - fix installation of index headers * Tue Oct 30 2007 dmueller(a)suse.de - enable cluclene based indexing backend * Tue Oct 16 2007 dmueller(a)suse.de - remove fdupes for older distributions * Wed Oct 10 2007 dmueller(a)suse.de - rename library package * Wed Oct 10 2007 dmueller(a)suse.de - update to 1.95.0-beta2: * removes redland dependency, uses raptor now directly * new query API * Mon Sep 03 2007 schwab(a)suse.de - Fix broken compiler flags. * Sat Jun 02 2007 dmueller(a)suse.de - update to 0.9.0: * crash fix * Fri May 11 2007 dmueller(a)suse.de - update to current SVN: * small API change * Fri May 04 2007 dmueller(a)suse.de - update to 3.90.1: * no actual code change - fix packaging to match Library Policy * Fri May 04 2007 dmueller(a)suse.de - adapt libredland-devel rename * Thu May 03 2007 dmueller(a)suse.de - Initial package (trunk SVN) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit curl for openSUSE:Factory
by root＠Hilbert.suse.de 19 May '09

19 May '09

Hello community, here is the log from the commit of package curl for openSUSE:Factory checked in at Tue May 19 23:14:46 CEST 2009. -------- --- curl/curl.changes 2009-03-05 11:16:33.000000000 +0100 +++ curl/curl.changes 2009-05-19 15:04:51.000000000 +0200 @@ -1,0 +2,21 @@ +Tue May 19 15:03:25 CEST 2009 - mmarek(a)suse.cz + +- remove the Obsoletes: curl-ca-bundle, it breaks parallel + installation of older libcurl packages (bnc#484044). + +------------------------------------------------------------------- +Tue May 19 15:00:02 CEST 2009 - mmarek(a)suse.cz + +- updated to 7.19.5 + * libcurl now closes all dead connections whenever you attempt to + open a new connection + * libssh2's version number can now be figured out run-time + instead of using the build-time fixed number + * CURLOPT_SEEKFUNCTION may now return CURL_SEEKFUNC_CANTSEEK + * curl can now upload with resume even when reading from a pipe + * a build-time configured curl_socklen_t is now used instead of + socklen_t +- by default, don't abort if the testsuite fails. + + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- curl-7.19.4.tar.bz2 New: ---- curl-7.19.5.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ curl.spec ++++++ --- /var/tmp/diff_new_pack.c13161/_old 2009-05-19 23:09:05.000000000 +0200 +++ /var/tmp/diff_new_pack.c13161/_new 2009-05-19 23:09:05.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package curl (Version 7.19.4) +# spec file for package curl (Version 7.19.5) # # Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -33,8 +33,8 @@ BuildRequires: stunnel %endif #define cvs_suffix -20090302 -Version: 7.19.4 -Release: 2 +Version: 7.19.5 +Release: 1 AutoReqProv: on # bug437293 %ifarch ppc64 @@ -64,10 +64,6 @@ License: BSD 3-Clause; X11/MIT Summary: cURL shared library version 4 Group: Productivity/Networking/Web/Utilities -# curl-ca-bundle doesn't exist since openSUSE 11.0, remove it on update -# XXX: nothing actually provides curl-ca-bundle anymore -#Provides: curl-ca-bundle -Obsoletes: curl-ca-bundle %description -n libcurl4 cURL shared library version 4. @@ -137,10 +133,10 @@ fi base=$((8990 + $BUILD_INCARNATION * 20)) perl ./runtests.pl -a -b$base || { -%if 0%{?curl_testsuite_nonfatal:1} - echo "WARNING: runtests.pl failed with code $?, continuing nevertheless" -%else +%if 0%{?curl_testsuite_fatal:1} exit +%else + echo "WARNING: runtests.pl failed with code $?, continuing nevertheless" %endif } @@ -181,6 +177,20 @@ %doc docs/libcurl/symbols-in-versions %changelog +* Tue May 19 2009 mmarek(a)suse.cz +- remove the Obsoletes: curl-ca-bundle, it breaks parallel + installation of older libcurl packages (bnc#484044). +* Tue May 19 2009 mmarek(a)suse.cz +- updated to 7.19.5 + * libcurl now closes all dead connections whenever you attempt to + open a new connection + * libssh2's version number can now be figured out run-time + instead of using the build-time fixed number + * CURLOPT_SEEKFUNCTION may now return CURL_SEEKFUNC_CANTSEEK + * curl can now upload with resume even when reading from a pipe + * a build-time configured curl_socklen_t is now used instead of + socklen_t +- by default, don't abort if the testsuite fails. * Thu Mar 05 2009 mmarek(a)suse.cz - don't run autoreconf -fi as it breaks on older distros and upstream uses recent autotools already. ++++++ curl-7.19.4.tar.bz2 -> curl-7.19.5.tar.bz2 ++++++ ++++ 75874 lines of diff (skipped) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit snipl for openSUSE:Factory
by root＠Hilbert.suse.de 19 May '09

19 May '09

Hello community, here is the log from the commit of package snipl for openSUSE:Factory checked in at Tue May 19 02:59:07 CEST 2009. -------- --- snipl/snipl.changes 2009-02-17 13:53:31.000000000 +0100 +++ snipl/snipl.changes 2009-05-14 12:41:12.000000000 +0200 @@ -1,0 +2,5 @@ +Thu May 14 12:29:56 CEST 2009 - uli(a)suse.de + +- added missing license file (bnc#498414) + +------------------------------------------------------------------- calling whatdependson for head-i586 New: ---- SUSE_NonWarranted_hwmcaapi_tool_License-2007-04-21.txt ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ snipl.spec ++++++ --- /var/tmp/diff_new_pack.xI6867/_old 2009-05-19 02:58:16.000000000 +0200 +++ /var/tmp/diff_new_pack.xI6867/_new 2009-05-19 02:58:16.000000000 +0200 @@ -26,12 +26,13 @@ ExclusiveArch: s390 s390x AutoReqProv: on Version: 0.2.1.5 -Release: 2 +Release: 4 Summary: Simple Network IPL Source: %name-%{version}.tar.bz2 Source1: hwmcaapi-2.10.1-76.s390x.rpm Source2: hwmcaapi-devel-2.10.1-76.s390x.rpm Source3: dmsvsma.x +Source4: SUSE_NonWarranted_hwmcaapi_tool_License-2007-04-21.txt Patch1: snipl-0.2.1.2-hwmcaapidir.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -45,7 +46,7 @@ %prep %setup %patch1 -cp -p %SOURCE3 . +cp -p %SOURCE3 %SOURCE4 . mkdir hwmcaapi cd hwmcaapi rpm2cpio %SOURCE1 | cpio -id @@ -67,13 +68,15 @@ %files %defattr(-,root,root) -%doc LICENSE README.snipl +%doc LICENSE README.snipl SUSE_NonWarranted_hwmcaapi_tool_License-2007-04-21.txt %_libdir/*.so* %_libdir/stonith/plugins/stonith2/*.so /usr/bin/snipl %doc %_mandir/man8/snipl.8.gz %changelog +* Thu May 14 2009 uli(a)suse.de +- added missing license file (bnc#498414) * Tue Feb 17 2009 uli(a)suse.de - update snipl -> 0.2.1.5, hwmcaapi -> 2.10.1-76 (bnc#467547) - snipl stonith plugin: ignore some vmsmapi command reply complains - not ++++++ SUSE_NonWarranted_hwmcaapi_tool_License-2007-04-21.txt ++++++ [Applies to /usr/lib64/libhwmcaapi.so] International License Agreement for Non-Warranted Programs The IBM hwmcaapi library tool (Program) is licensed under the following terms and conditions. Part 1 - General Terms BY DOWNLOADING, INSTALLING, COPYING, ACCESSING, OR USING THE PROGRAM YOU AGREE TO THE TERMS OF THIS AGREEMENT. IF YOU ARE ACCEPTING THESE TERMS ON BEHALF OF ANOTHER PERSON OR A COMPANY OR OTHER LEGAL ENTITY, YOU REPRESENT AND WARRANT THAT YOU HAVE FULL AUTHORITY TO BIND THAT PERSON, COMPANY, OR LEGAL ENTITY TO THESE TERMS. IF YOU DO NOT AGREE TO THESE TERMS, - DO NOT DOWNLOAD, INSTALL, COPY, ACCESS, OR USE THE PROGRAM; AND - PROMPTLY RETURN THE PROGRAM AND PROOF OF ENTITLEMENT TO THE PARTY FROM WHOM YOU ACQUIRED IT TO OBTAIN A REFUND OF THE AMOUNT YOU PAID. IF YOU DOWNLOADED THE PROGRAM, CONTACT THE PARTY FROM WHOM YOU ACQUIRED IT. "IBM" is International Business Machines Corporation or one of its subsidiaries. "Program" is the following, including the original and all whole or partial copies: 1) machine-readable instructions and data, 2) components, 3) audio-visual content (such as images, text, recordings, or pictures), 4) related licensed materials, and 5) license use documents or keys, and documentation. "You" and "Your" refer either to an individual person or to a single legal entity. This Agreement includes is the complete agreement between You and IBM regarding the use of the Program. It replaces any prior oral or written communications concerning Your use of the Program. 1. License The Program is owned by IBM or an IBM supplier, and is copyrighted and licensed, not sold. IBM grants You a nonexclusive license to use the Program when You lawfully acquire it. You may make and install a backup copy, to support such use. The terms of this license apply to the copy You make. You will reproduce all copyright notices and all other legends of ownership on each copy, or partial copy, of the Program. You will ensure that anyone who uses the Program (accessed either locally or remotely) does so only for Your authorized use and complies with the terms of this Agreement. You may not 1) use, copy, modify, or distribute the Program except as provided in this Agreement; 2) reverse assemble, reverse compile, or otherwise translate the Program except as specifically permitted by law without the possibility of contractual waiver; or 3) sublicense, rent, or lease the Program. IBM may terminate Your license if You fail to comply with the terms of this Agreement. If IBM does so, You must destroy all copies of the Program. Program Transfer You may transfer a Program and all of Your license rights and obligations to another party only if that party agrees to the terms of this Agreement. When You transfer the Program, You must also transfer a copy of this Agreement. After the transfer, You may not use the Program. 2. Charges If any authority imposes a duty, tax, levy or fee, excluding those based on IBM's net income, upon the Program, then You agree to pay the amount specified or supply exemption documentation. You are responsible for any personal property taxes for the Program from the date that You acquire it. 3. No Warranty SUBJECT TO ANY STATUTORY WARRANTIES WHICH CAN NOT BE EXCLUDED, IBM MAKES NO WARRANTIES OR CONDITIONS EITHER EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OR CONDITIONS OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE, AND NON-INFRINGEMENT, REGARDING THE PROGRAM OR TECHNICAL SUPPORT, IF ANY. The exclusion also applies to any of IBM's Program developers and suppliers. Manufacturers, suppliers, or publishers of non-IBM Programs may provide their own warranties. IBM does not provide technical support, unless IBM specifies otherwise. 4. Limitation of Liability Circumstances may arise where, because of a default on IBM's part or other liability, You are entitled to recover damages from IBM. In each such instance, regardless of the basis on which You may be entitled to claim damages from IBM, (including fundamental breach, negligence, misrepresentation, or other contract or tort claim), IBM is liable for no more than 1) damages for bodily injury (including death) and damage to real property and tangible personal property and 2) the amount of any other actual direct damages up to the charges for the Program that is the subject of the claim. This limitation of liability also applies to IBM's Program developers and suppliers. It is the maximum for which they and IBM are collectively responsible. UNDER NO CIRCUMSTANCES IS IBM, ITS PROGRAM DEVELOPERS OR SUPPLIERS LIABLE FOR ANY OF THE FOLLOWING, EVEN IF INFORMED OF THEIR POSSIBILITY: 1. LOSS OF, OR DAMAGE TO, DATA; 2. SPECIAL, INCIDENTAL, OR INDIRECT DAMAGES, OR FOR ANY ECONOMIC CONSEQUENTIAL DAMAGES; OR 3. LOST PROFITS, BUSINESS, REVENUE, GOODWILL, OR ANTICIPATED SAVINGS. SOME JURISDICTIONS DO NOT ALLOW THE EXCLUSION OR LIMITATION OF INCIDENTAL OR CONSEQUENTIAL DAMAGES, SO THE ABOVE LIMITATION OR EXCLUSION MAY NOT APPLY TO YOU. 5. General 1. Nothing in this Agreement affects any statutory rights of consumers that cannot be waived or limited by contract. 2. In the event that any provision of this Agreement is held to be invalid or unenforceable, the remaining provisions of this Agreement remain in full force and effect. 3. You agree to comply with all applicable export and import laws and regulations. 4. You agree to allow IBM to store and use Your contact information, including names, phone numbers, and e-mail addresses, anywhere they do business. Such information will be processed and used in connection with our business relationship, and may be provided to contractors, Business Partners, and assignees of IBM for uses consistent with their collective business activities, including communicating with You (for example, for processing orders, for promotions, and for market research). 5. Neither You nor IBM will bring a legal action under this Agreement more than two years after the cause of action arose unless otherwise provided by local law without the possibility of contractual waiver or limitation. 6. Neither You nor IBM is responsible for failure to fulfill any obligations due to causes beyond its control. 7. This Agreement will not create any right or cause of action for any third party, nor will IBM be responsible for any third party claims against You except, as permitted by the Limitation of Liability section above, for bodily injury (including death) or damage to real or tangible personal property for which IBM is legally liable. 6. Governing Law, Jurisdiction, and Arbitration Governing Law Both You and IBM consent to the application of the laws of the country in which You acquired the Program license to govern, interpret, and enforce all of Your and IBM's rights, duties, and obligations arising from, or relating in any manner to, the subject matter of this Agreement, without regard to conflict of law principles. The United Nations Convention on Contracts for the International Sale of Goods does not apply. Jurisdiction All of our rights, duties, and obligations are subject to the courts of the country in which You acquired the Program license. Part 2 - Country-unique Terms AMERICAS ARGENTINA: Governing Law, Jurisdiction, and Arbitration (Section 6): The following exception is added to this section: Any litigation arising from this Agreement will be settled exclusively by the Ordinary Commercial Court of the city of Buenos Aires. BRAZIL: Governing Law, Jurisdiction, and Arbitration (Section 6): The following exception is added to this section: Any litigation arising from this Agreement will be settled exclusively by the court of Rio de Janeiro, RJ. CANADA: General (Section 5): The following replaces item 7: 7. This Agreement will not create any right or cause of action for any third party, nor will IBM be responsible for any third party claims against You except as permitted by the Limitation of Liability section above for bodily injury (including death) or physical harm to real or tangible personal property caused by IBM's negligence for which IBM is legally liable." Governing Law, Jurisdiction, and Arbitration (Section 6): The phrase "the laws of the country in which You acquired the Program license" in the Governing Law subsection is replaced by the following: the laws in the Province of Ontario" PERU: Limitation of Liability (Section 4): The following is added at the end of this section: In accordance with Article 1328 of the Peruvian Civil Code, the limitations and exclusions specified in this section will not apply to damages caused by IBM's willful misconduct ("dolo") or gross negligence ("culpa inexcusable"). UNITED STATES OF AMERICA: General (Section 5): The following is added to this section: U.S. Government Users Restricted Rights - Use, duplication or disclosure restricted by the GSA ADP Schedule Contract with the IBM Corporation. Governing Law, Jurisdiction, and Arbitration (Section 6): The phrase "the laws of the country in which You acquired the Program license" in the Governing Law subsection is replaced by the following: the laws of the State of New York, United States of America ASIA PACIFIC AUSTRALIA: No Warranty (Section 3): The following is added: Although IBM specifies that there are no warranties, You may have certain rights under the Trade Practices Act 1974 or other legislation and are only limited to the extent permitted by the applicable legislation. Limitation of Liability (Section 4): The following is added: Where IBM is in breach of a condition or warranty implied by the Trade Practices Act 1974, IBM's liability is limited to the repair or replacement of the goods, or the supply of equivalent goods. Where that condition or warranty relates to right to sell, quiet possession or clear title, or the goods are of a kind ordinarily acquired for personal, domestic or household use or consumption, then none of the limitations in this paragraph apply. Governing Law, Jurisdiction, and Arbitration (Section 6): The phrase "the laws of the country in which You acquired the Program license" in the Governing Law subsection is replaced by the following: the laws of the State or Territory in which You acquired the Program license CAMBODIA, LAOS, and VIETNAM: Governing Law, Jurisdiction, and Arbitration (Section 6): The phrase "the laws of the country in which You acquired the Program license" in the Governing Law subsection is replaced by the following: the laws of the State of New York, United States of America The following is added to this section: Arbitration Disputes arising out of or in connection with this Agreement shall be finally settled by arbitration which shall be held in Singapore in accordance with the Arbitration Rules of Singapore International Arbitration Center ("SIAC Rules") then in effect. The arbitration award shall be final and binding for the parties without appeal and shall be in writing and set forth the findings of fact and the conclusions of law. The number of arbitrators shall be three, with each side to the dispute being entitled to appoint one arbitrator. The two arbitrators appointed by the parties shall appoint a third arbitrator who shall act as chairman of the proceedings. Vacancies in the post of chairman shall be filled by the president of the SIAC. Other vacancies shall be filled by the respective nominating party. Proceedings shall continue from the stage they were at when the vacancy occurred. If one of the parties refuses or otherwise fails to appoint an arbitrator within 30 days of the date the other party appoints its, the first appointed arbitrator shall be the sole arbitrator, provided that the arbitrator was validly and properly appointed. All proceedings shall be conducted, including all documents presented in such proceedings, in the English language. The English language version of this Agreement prevails over any other language version. HONG KONG S.A.R. and MACAU S.A.R. of China: Governing Law, Jurisdiction, and Arbitration (Section 6): The phrase "the laws of the country in which You acquired the Program license" in the Governing Law subsection is replaced by the following: the laws of Hong Kong Special Administrative Region of China INDIA: Limitation of Liability (Section 4): The following replaces the terms of items 1 and 2 of the first paragraph: 1) liability for bodily injury (including death) or damage to real property and tangible personal property will be limited to that caused by IBM's negligence; and 2) as to any other actual damage arising in any situation involving nonperformance by IBM pursuant to, or in any way related to the subject of this Agreement, IBM's liability will be limited to the charge paid by You for the individual Program that is the subject of the claim. General (Section 5): The following replaces the terms of item 5: If no suit or other legal action is brought, within three years after the cause of action arose, in respect of any claim that either party may have against the other, the rights of the concerned party in respect of such claim will be forfeited and the other party will stand released from its obligations in respect of such claim. Governing Law, Jurisdiction, and Arbitration (Section 6): The following is added to this section: Arbitration Disputes arising out of or in connection with this Agreement shall be finally settled by arbitration which shall be held in Bangalore, India in accordance with the laws of India then in effect. The arbitration award shall be final and binding for the parties without appeal and shall be in writing and set forth the findings of fact and the conclusions of law. The number of arbitrators shall be three, with each side to the dispute being entitled to appoint one arbitrator. The two arbitrators appointed by the parties shall appoint a third arbitrator who shall act as chairman of the proceedings. Vacancies in the post of chairman shall be filled by the president of the Bar Council of India. Other vacancies shall be filled by the respective nominating party. Proceedings shall continue from the stage they were at when the vacancy occurred. If one of the parties refuses or otherwise fails to appoint an arbitrator within 30 days of the date the other party appoints its, the first appointed arbitrator shall be the sole arbitrator, provided that the arbitrator was validly and properly appointed. All proceedings shall be conducted, including all documents presented in such proceedings, in the English language. The English language version of this Agreement prevails over any other language version. JAPAN: General (Section 5): The following is inserted after item 5: Any doubts concerning this Agreement will be initially resolved between us in good faith and in accordance with the principle of mutual trust. MALAYSIA: Limitation of Liability (Section 4): The word "SPECIAL" in item 2 of the third paragraph is deleted: NEW ZEALAND: No Warranty (Section 3): The following is added: Although IBM specifies that there are no warranties, You may have certain rights under the Consumer Guarantees Act 1993 or other legislation which cannot be excluded or limited. The Consumer Guarantees Act 1993 will not apply in respect of any goods which IBM provides, if You require the goods for the purposes of a business as defined in that Act. Limitation of Liability (Section 4): The following is added: Where Programs are not acquired for the purposes of a business as defined in the Consumer Guarantees Act 1993, the limitations in this Section are subject to the limitations in that Act. PEOPLE'S REPUBLIC OF CHINA: Charges (Section 2): The following is added: All banking charges incurred in the People's Republic of China will be borne by You and those incurred outside the People's Republic of China will be borne by IBM. Governing Law, Jurisdiction, and Arbitration (Section 6): The phrase "the laws of the country in which You acquired the Program license" in the Governing Law subsection is replaced by the following: the laws of the State of New York, United States of America (except when local law requires otherwise) PHILIPPINES: Limitation of Liability (Section 4): The following replaces the terms of item 2 of the third paragraph: 2. special (including nominal and exemplary damages), moral, incidental, or indirect damages or for any economic consequential damages; or Governing Law, Jurisdiction, and Arbitration (Section 6): The following is added to this section: Arbitration Disputes arising out of or in connection with this Agreement shall be finally settled by arbitration which shall be held in Metro Manila, Philippines in accordance with the laws of the Philippines then in effect. The arbitration award shall be final and binding for the parties without appeal and shall be in writing and set forth the findings of fact and the conclusions of law. The number of arbitrators shall be three, with each side to the dispute being entitled to appoint one arbitrator. The two arbitrators appointed by the parties shall appoint a third arbitrator who shall act as chairman of the proceedings. Vacancies in the post of chairman shall be filled by the president of the Philippine Dispute Resolution Center, Inc. Other vacancies shall be filled by the respective nominating party. Proceedings shall continue from the stage they were at when the vacancy occurred. If one of the parties refuses or otherwise fails to appoint an arbitrator within 30 days of the date the other party appoints its, the first appointed arbitrator shall be the sole arbitrator, provided that the arbitrator was validly and properly appointed. All proceedings shall be conducted, including all documents presented in such proceedings, in the English language. The English language version of this Agreement prevails over any other language version. SINGAPORE: Limitation of Liability (Section 4): The words "SPECIAL" and "ECONOMIC" are deleted from item 2 of the third paragraph. General (Section 5): The following replaces the terms of item 7: Subject to the rights provided to IBM's suppliers and Program developers as provided in Section 4 above (Limitation of Liability), a person who is not a party to this Agreement shall have no right under the Contracts (Right of Third Parties) Act to enforce any of its terms. EUROPE, MIDDLE EAST, AFRICA (EMEA) No Warranty (Section 3): In the European Union, the following is added at the beginning of this section: In the European Union, consumers have legal rights under applicable national legislation governing the sale of consumer goods. Such rights are not affected by the provisions of this Section 3. Limitation of Liability (Section 4): In Austria, Denmark, Finland, Greece, Italy, Netherlands, Norway, Portugal, Spain, Sweden and Switzerland, the following replaces the terms of this section in its entirety: Except as otherwise provided by mandatory law: 1. IBM's liability for any damages and losses that may arise as a consequence of the fulfillment of its obligations under or in connection with this agreement or due to any other cause related to this agreement is limited to the compensation of only those damages and losses proved and actually arising as an immediate and direct consequence of the non-fulfillment of such obligations (if IBM is at fault) or of such cause, for a maximum amount equal to the charges You paid for the Program. The above limitation shall not apply to damages for bodily injuries (including death) and damages to real property and tangible personal property for which IBM is legally liable. 2. UNDER NO CIRCUMSTANCES IS IBM, OR ANY OF ITS PROGRAM DEVELOPERS, LIABLE FOR ANY OF THE FOLLOWING, EVEN IF INFORMED OF THEIR POSSIBILITY: 1) LOSS OF, OR DAMAGE TO, DATA; 2) INCIDENTAL OR INDIRECT DAMAGES, OR FOR ANY ECONOMIC CONSEQUENTIAL DAMAGES; 3) LOST PROFITS, EVEN IF THEY ARISE AS AN IMMEDIATE CONSEQUENCE OF THE EVENT THAT GENERATED THE DAMAGES; OR 4) LOSS OF BUSINESS, REVENUE, GOODWILL, OR ANTICIPATED SAVINGS. 3. The limitation and exclusion of liability herein agreed applies not only to the activities performed by IBM but also to the activities performed by its suppliers and Program developers, and represents the maximum amount for which IBM as well as its suppliers and Program developers, are collectively responsible. Limitation of Liability (Section 4): In France and Belgium, the following replaces the terms of this section in its entirety: Except as otherwise provided by mandatory law: 1. IBM's liability for any damages and losses that may arise as a consequence of the fulfillment of its obligations under or in connection with this agreement is limited to the compensation of only those damages and losses proved and actually arising as an immediate and direct consequence of the non-fulfillment of such obligations (if IBM is at fault), for a maximum amount equal to the charges You paid for the Program that has caused the damages. The above limitation shall not apply to damages for bodily injuries (including death) and damages to real property and tangible personal property for which IBM is legally liable. 2. UNDER NO CIRCUMSTANCES IS IBM, OR ANY OF ITS PROGRAM DEVELOPERS, LIABLE FOR ANY OF THE FOLLOWING, EVEN IF INFORMED OF THEIR POSSIBILITY: 1) LOSS OF, OR DAMAGE TO, DATA; 2) INCIDENTAL OR INDIRECT DAMAGES, OR FOR ANY ECONOMIC CONSEQUENTIAL DAMAGES; 3) LOST PROFITS, EVEN IF THEY ARISE AS AN IMMEDIATE CONSEQUENCE OF THE EVENT THAT GENERATED THE DAMAGES; OR 4) LOSS OF BUSINESS, REVENUE, GOODWILL, OR ANTICIPATED SAVINGS. 3. The limitation and exclusion of liability herein agreed applies not only to the activities performed by IBM but also to the activities performed by its suppliers and Program developers, and represents the maximum amount for which IBM as well as its suppliers and Program developers, are collectively responsible. Governing Law, Jurisdiction, and Arbitration (Section 6) Governing Law The phrase "the laws of the country in which You acquired the Program license" is replaced by: 1) "the laws of Austria" in Albania, Armenia, Azerbaijan, Belarus, Bosnia-Herzegovina, Bulgaria, Croatia, Georgia, Hungary, Kazakhstan, Kyrgyzstan, FYR Macedonia, Moldavia, Poland, Romania, Russia, Slovakia, Slovenia, Tajikistan, Turkmenistan, Ukraine, Uzbekistan, and FR Yugoslavia; 2) "the laws of France" in Algeria, Benin, Burkina Faso, Cameroon, Cape Verde, Central African Republic, Chad, Comoros, Congo Republic, Djibouti, Democratic Republic of Congo, Equatorial Guinea, French Guiana, French Polynesia, Gabon, Gambia, Guinea, Guinea-Bissau, Ivory Coast, Lebanon, Madagascar, Mali, Mauritania, Mauritius, Mayotte, Morocco, New Caledonia, Niger, Reunion, Senegal, Seychelles, Togo, Tunisia, Vanuatu, and Wallis & Futuna; 3) "the laws of Finland" in Estonia, Latvia, and Lithuania; 4) "the laws of England" in Angola, Bahrain, Botswana, Burundi, Egypt, Eritrea, Ethiopia, Ghana, Jordan, Kenya, Kuwait, Liberia, Malawi, Malta, Mozambique, Nigeria, Oman, Pakistan, Qatar, Rwanda, Sao Tome, Saudi Arabia, Sierra Leone, Somalia, Tanzania, Uganda, United Arab Emirates, the United Kingdom, West Bank/Gaza, Yemen, Zambia, and Zimbabwe; and 5) "the laws of South Africa" in South Africa, Namibia, Lesotho and Swaziland. Jurisdiction The following exceptions are added to this section: 1) In Austria the choice of jurisdiction for all disputes arising out of this Agreement and relating thereto, including its existence, will be the competent court of law in Vienna, Austria (Inner-City); 2) in Angola, Bahrain, Botswana, Burundi, Egypt, Eritrea, Ethiopia, Ghana, Jordan, Kenya, Kuwait, Liberia, Malawi, Malta, Mozambique, Nigeria, Oman, Pakistan, Qatar, Rwanda, Sao Tome, Saudi Arabia, Sierra Leone, Somalia, Tanzania, Uganda, United Arab Emirates, West Bank/Gaza, Yemen, Zambia, and Zimbabwe all disputes arising out of this Agreement or related to its execution, including summary proceedings, will be submitted to the exclusive jurisdiction of the English courts; 3) in Belgium and Luxembourg, for all disputes arising out of this Agreement or related to its interpretation or its execution, only the law and the courts of the capital of the country in which Your registered office and/or commercial office is located are competent; 4) in France, Algeria, Benin, Burkina Faso, Cameroon, Cape Verde, Central African Republic, Chad, Comoros, Congo Republic, Djibouti, Democratic Republic of Congo, Equatorial Guinea, French Guiana, French Polynesia, Gabon, Gambia, Guinea, Guinea-Bissau, Ivory Coast, Lebanon, Madagascar, Mali, Mauritania, Mauritius, Mayotte, Morocco, New Caledonia, Niger, Reunion, Senegal, Seychelles, Togo, Tunisia, Vanuatu, and Wallis & Futuna all disputes arising out of this Agreement or related to its violation or execution, including summary proceedings, will be settled exclusively by the Commercial Court of Paris; 5) in Russia, all disputes arising out of or in relation to the interpretation, the violation, the termination, the nullity of the execution of this Agreement shall be settled by Arbitration Court of Moscow; 6) in South Africa, Namibia, Lesotho and Swaziland, both of us agree to submit all disputes relating to this Agreement to the jurisdiction of the High Court in Johannesburg; 7) in Turkey all disputes arising out of or in connection with this Agreement shall be resolved by the Istanbul Central (Sultanahmet) Courts and Execution Directorates of Istanbul, the Republic of Turkey; 8) in each of the following specified countries, any legal claim arising out of this Agreement will be brought before, and settled exclusively by, the competent court of a) Athens for Greece, b) Tel Aviv-Jaffa for Israel, c) Milan for Italy, d) Lisbon for Portugal, and e) Madrid for Spain; and 9) in the United Kingdom, both of us agree to submit all disputes relating to this Agreement to the jurisdiction of the English courts. Arbitration In Albania, Armenia, Azerbaijan, Belarus, Bosnia-Herzegovina, Bulgaria, Croatia, Georgia, Hungary, Kazakhstan, Kyrgyzstan, FYR Macedonia, Moldavia, Poland, Romania, Russia, Slovakia, Slovenia, Tajikistan, Turkmenistan, Ukraine, Uzbekistan, and FR Yugoslavia all disputes arising out of this Agreement or related to its violation, termination or nullity will be finally settled under the Rules of Arbitration and Conciliation of the International Arbitral Center of the Federal Economic Chamber in Vienna (Vienna Rules) by three arbitrators appointed in accordance with these rules. The arbitration will be held in Vienna, Austria, and the official language of the proceedings will be English. The decision of the arbitrators will be final and binding upon both parties. Therefore, pursuant to paragraph 598 (2) of the Austrian Code of Civil Procedure, the parties expressly waive the application of paragraph 595 (1) figure 7 of the Code. IBM may, however, institute proceedings in a competent court in the country of installation. ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit apache2-mod_security2 for openSUSE:Factory
by root＠Hilbert.suse.de 19 May '09

19 May '09

Hello community, here is the log from the commit of package apache2-mod_security2 for openSUSE:Factory checked in at Tue May 19 02:53:18 CEST 2009. -------- --- apache2-mod_security2/apache2-mod_security2.changes 2009-01-23 17:02:35.000000000 +0100 +++ apache2-mod_security2/apache2-mod_security2.changes 2009-05-14 18:12:09.000000000 +0200 @@ -1,0 +2,43 @@ +Thu May 14 18:05:26 CEST 2009 - mrueckert(a)suse.de + +- update to version 2.5.9 + - Fixed parsing multipart content with a missing part header name + which would crash Apache. Discovered by "Internet Security + Auditors" (isecauditors.com) + - Added ability to specify the config script directly using + --with-apr and --with-apu. + - Added macro expansion for append/prepend action. + - Fixed race condition in concurrent updates of persistent + counters. Updates are now atomic. + - Cleaned up build, adding an option for verbose configure output + and making the mlogc build more portable. +- additional changes from 2.5.8 + - Fixed PDF XSS issue where a non-GET request for a PDF file + would crash the Apache httpd process. Discovered by Steve + Grubb at Red Hat. + - Removed an invalid "Internal error: Issuing "%s" for + unspecified error." message that was logged when denying with + nolog/noauditlog set and causing the request to be audited. +- additional changes from 2.5.7 + - Fixed XML DTD/Schema validation which will now fail after + request body processing errors, even if the XML parser returns + a document tree. + - Added ctl:forceRequestBodyVariable=on|off which, when enabled, + will force the REQUEST_BODY variable to be set when a request + body processor is not set. Previously the REQUEST_BODY target + was only populated by the URLENCODED request body processor. + - Integrated mlogc source. + - Fixed logging the hostname in the error_log which was logging + the request hostname instead of the Apache resolved hostname. + - Allow for disabling request body limit checks in phase:1. + - Added transformations for processing parity for legacy + protocols ported to HTTP(S): t:parityEven7bit, t:parityOdd7bit, + t:parityZero7bit + - Added t:cssDecode transformation to decode CSS escapes. + - Now log XML parsing/validation warnings and errors to be in the + debug log at levels 3 and 4, respectivly. +- build and package mlogc +- remove --with-apxs from the configure args as it breaks the build + configure now finds our apxs2 + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- modsecurity-apache_2.5.6.tar.gz New: ---- modsecurity-apache_2.5.9.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ apache2-mod_security2.spec ++++++ --- /var/tmp/diff_new_pack.z20123/_old 2009-05-19 02:52:04.000000000 +0200 +++ /var/tmp/diff_new_pack.z20123/_new 2009-05-19 02:52:04.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package apache2-mod_security2 (Version 2.5.6) +# spec file for package apache2-mod_security2 (Version 2.5.9) # # Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -19,14 +19,14 @@ Name: apache2-mod_security2 -Version: 2.5.6 -Release: 2 +Version: 2.5.9 +Release: 1 # License: GPL v2 only; GPLv2 with some FLOSS linking exceptions Group: Productivity/Networking/Web/Servers # BuildRoot: %{_tmppath}/%{name}-%{version}-build -BuildRequires: apache2-devel apache2-prefork c++_compiler libxml2-devel pcre-devel +BuildRequires: apache2-devel apache2-prefork c++_compiler curl-devel libxml2-devel pcre-devel %define apache apache2 %define modname mod_security2 %define tarballname modsecurity-apache_%{version} @@ -57,14 +57,18 @@ %build pushd %{apache} - ./configure --with-apxs=%{apxs} - CFLAGS="%{optflags}" make + ./configure + make + make -C mlogc-src/ popd %install pushd %{apache} - install -d -m 0755 %{buildroot}%{apache_libexecdir} - install .libs/mod_security2.so %{buildroot}%{apache_libexecdir}/%{modname}.so + install -D -m 0755 .libs/mod_security2.so %{buildroot}%{apache_libexecdir}/%{modname}.so + install -D -m 0755 mlogc-src/mlogc %{buildroot}%{_sbindir}/mlogc + install -D -m 0755 mlogc-src/mlogc-batch-load.pl %{buildroot}%{_sbindir}/mlogc-batch-load.pl + install -D -m 0640 mlogc-src/mlogc-default.conf %{buildroot}%{_sysconfdir}/mlogc.conf + cp mlogc-src/INSTALL mlogc-src/INSTALL.mlogc popd install -D -m 0644 %{SOURCE1} %{buildroot}%{apache_sysconfdir}/conf.d/%{modname}.conf @@ -76,10 +80,54 @@ %{apache_libexecdir}/%{modname}.so %config(noreplace) %{apache_sysconfdir}/conf.d/%{modname}.conf %doc doc/html-multipage/ doc/*.pdf -%doc README.TXT CHANGES LICENSE MODSECURITY_LICENSING_EXCEPTION -%doc tools rules +%doc README.TXT CHANGES LICENSE MODSECURITY_LICENSING_EXCEPTION modsecurity.conf-minimal +%doc apache2/mlogc-src/INSTALL.mlogc apache2/mlogc-src/mlogc-default.conf +%doc tools/ rules/ apache2/api/ +%{_sbindir}/mlogc +%{_sbindir}/mlogc-batch-load.pl +%config(noreplace) %{_sysconfdir}/mlogc.conf %changelog +* Thu May 14 2009 mrueckert(a)suse.de +- update to version 2.5.9 + - Fixed parsing multipart content with a missing part header name + which would crash Apache. Discovered by "Internet Security + Auditors" (isecauditors.com) + - Added ability to specify the config script directly using + --with-apr and --with-apu. + - Added macro expansion for append/prepend action. + - Fixed race condition in concurrent updates of persistent + counters. Updates are now atomic. + - Cleaned up build, adding an option for verbose configure output + and making the mlogc build more portable. +- additional changes from 2.5.8 + - Fixed PDF XSS issue where a non-GET request for a PDF file + would crash the Apache httpd process. Discovered by Steve + Grubb at Red Hat. + - Removed an invalid "Internal error: Issuing "%%s" for + unspecified error." message that was logged when denying with + nolog/noauditlog set and causing the request to be audited. +- additional changes from 2.5.7 + - Fixed XML DTD/Schema validation which will now fail after + request body processing errors, even if the XML parser returns + a document tree. + - Added ctl:forceRequestBodyVariable=on|off which, when enabled, + will force the REQUEST_BODY variable to be set when a request + body processor is not set. Previously the REQUEST_BODY target + was only populated by the URLENCODED request body processor. + - Integrated mlogc source. + - Fixed logging the hostname in the error_log which was logging + the request hostname instead of the Apache resolved hostname. + - Allow for disabling request body limit checks in phase:1. + - Added transformations for processing parity for legacy + protocols ported to HTTP(S): t:parityEven7bit, t:parityOdd7bit, + t:parityZero7bit + - Added t:cssDecode transformation to decode CSS escapes. + - Now log XML parsing/validation warnings and errors to be in the + debug log at levels 3 and 4, respectivly. +- build and package mlogc +- remove --with-apxs from the configure args as it breaks the build + configure now finds our apxs2 * Fri Jan 23 2009 skh(a)suse.de - fix broken config [bnc#457200] * Mon Sep 15 2008 skh(a)suse.de ++++++ modsecurity-apache_2.5.6.tar.gz -> modsecurity-apache_2.5.9.tar.gz ++++++ ++++ 52688 lines of diff (skipped) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit bogofilter for openSUSE:Factory
by root＠Hilbert.suse.de 19 May '09

19 May '09

Hello community, here is the log from the commit of package bogofilter for openSUSE:Factory checked in at Tue May 19 02:49:38 CEST 2009. -------- --- bogofilter/bogofilter.changes 2008-11-21 16:38:15.000000000 +0100 +++ bogofilter/bogofilter.changes 2009-05-07 15:30:56.000000000 +0200 @@ -1,0 +2,110 @@ +Thu May 7 14:03:29 CEST 2009 - lmuelle(a)suse.de + +- Update to version 1.2.0. + + Flex-2.5.35 has fix for memory allocation problem in 2.5.4, 2.5.31, and + 2.5.33, making bogofilter's flex patch obsolete. + + Bogofilter now uses listsort in place of qsort. + + Added token-count=n, token-count-min=n, and token-count-max=n options. + + Minor code cleanups. + + spamitarium.pl updated to version 0.3.0 + + update bf_compact documentation by removing explicit Berkeley DB + references, as it has been fixed to work with other database drivers in + March 2008. + + bf_compact, bf_copy and bf_tar now support transformed program names + + Update sqlite3 adaptor to take advantage of sqlite3_prepare_v2() API + function that appeared in SQLite 3.3.9. The new _v2 interface allows for + more specific error messages when executing SQL statements. Also enable + extended result codes for more precise error reporting. + + Update doc/integrating-with-postfix: the script now suggests sendmail -G + -i (where -G will be ignored by Postfix before 2.3) to tell Postfix it's a + gateway submission, not an original injection; the filter pipe(8) magic + for master.cf now suggests flags=Rq (was flags=R), as per Postfix's + FILTER_README. + + Drop support for systems that reverse setvbuf arguments. The last systems + to do that are reported to be shipped in 1987 by the autoconf manual, so + ditch them. + +------------------------------------------------------------------- +Wed Feb 18 17:00:15 CET 2009 - lmuelle(a)suse.de + +- Update to version 1.1.7. + + Updated sendmail milter contrib/bogofilter-milter.pl to v1.45 + + Added maildir training info to English and French FAQs. + + Fix uninitialized variable in lexer.c when unicode is disabled. + + In process_arg functions use the val parameter rather than optarg. + + Function process_arg now has the same prototype for + bogofilter, bogolexer, bogoutil, and bogotune. The proper + version is called by function read_config_file for all + programs. + + Fixed syntax errors in t.valgrind test + + bf_compact now supports compacting databases that use QDBM, Tokyo + Cabinet or SQLite3 and is covered by the test suite. + + bf_compact now verifies databases before dumping them, to avoid + getting into an unterminated loop and wasting all diskspace. + + Bogoupgrade now verifies databases before dumping them, to avoid + getting into an unterminated loop and burning all memory or disk + space when the database is corrupt. + + Bogoupgrade now uses Pod::Usage to print usage/help, prints error + messages that are a bit more concise and validates arguments a bit + stricter. + + Bump required sqlite version to 3.5.4, earlier versions could + sometimes corrupt the database. Update install-staticdblibs.sh. + Bogofilter will complain when used with older versions. + + bf_compact problem fixed. +- Update to version 1.1.6. + + Transaction support added for TokyoCabinet datastore. + + Bump required sqlite version to 3.4.2 and fix related compiler + warnings. Bogofilter will complain when used with older versions. + + Support for TokyoCabinet datastore added. + + doc/README.db was updated to BerkeleyDB 4.6 + + doc/README.db: section 3.5 was added, with information on how to + resolve "Logging region out of memory; you may need to increase its + size", section 4.2 now documents set_lg_regionmax. + + The install-staticdblibs.sh script was relicensed under GNU GPL v3, + adjusted to download Berkeley DB 4.2 from oracle.com, adds patch #5, + and updated to build SQLite 3.4.1. In order to for a rebuild of the + updated library, do: rm -rf /opt/db-4.2-lean /opt/sqlite-3-lean + and re-run the script. + + The recommended minimum sqlite3 version is now 3.4.0, bogofilter will + warn if used with older versions. Bugs that could cause database + corruption in rare circumstances have been fixed in sqlite3. + See doc/README.sqlite for details. + + Updated sendmail milter contrib/bogofilter-milter.pl to v1.27 + + Add '--spam-header-place={header}' to specify header line + before which the X-Bogosity line is placed. + + Support --db-verify for sqlite3. + + Fix defect where the database verification method would not be called + for traditional Berkeley DB databases. Reported by Eric Wood. + + Fix test suite for situations where there are blanks in the test or + working directories' names. + + Repair passthrough defect on systems whose standard system library + makes a distinction between text and binary mode in stdio stuff. +- Update to version 1.1.5 2007-01-14 (released) 2007-01-25 (declared stable) + + Fixed Makefile dependency problem. + + Fixed block-on-subnets problem. + + Added block-on-subnets regression test. +- Update to version 1.1.4 2007-01-01 (released) + + Update copyright notices. + + Add GSL dependency to bogofilter target to support parallel + makes. + + Fixed problem in flex-2.5.4 patch. +- Update to version 1.1.3 2006-12-03 (released) 2006-12-20 (declared stable) + + Fixed typo in configure.ac. +- Update to version 1.1.2 2006-12-02 (released) + + Revise install-staticlibs.sh's links for retrieving database + tarball and patches. + + Revise make rules for generating statically linked RPM. + + Provide separate flex patches for 2.5.4 and 2.5.3x + + Updated file comment for lexer_v3.l and removed unneeded + rules T1, T12, SHORT_TOKEN, and TOKEN_12. + + Miscellaneous minor cleanups of lexer_v3.l classes and rules. + + Patch flex skeleton code problem which can cause a seg-fault. + + Fix processing of "--unicode=no" option. + + Fix prefixes for ip address and url tokens. Restore colon + that was dropped in token.c edit for bogofilter-1.1.0. + + Fixed problem parsing message ids, which can cause a + seg-fault on an x86_64. + + Added '--ham-true' option for bogofilter (to match docs) + + FAQ's updated to point to current sylpheed-claws wiki + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- bogofilter-1.1.1.tar.bz2 New: ---- bogofilter-1.2.0.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ bogofilter.spec ++++++ --- /var/tmp/diff_new_pack.N16860/_old 2009-05-19 02:47:28.000000000 +0200 +++ /var/tmp/diff_new_pack.N16860/_new 2009-05-19 02:47:28.000000000 +0200 @@ -1,7 +1,7 @@ # -# spec file for package bogofilter (Version 1.1.1) +# spec file for package bogofilter (Version 1.2.0) # -# Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -20,8 +20,8 @@ Name: bogofilter BuildRequires: db-devel sharutils -Version: 1.1.1 -Release: 174 +Version: 1.2.0 +Release: 1 License: GPL v2 or later Group: Productivity/Networking/Email/Utilities Url: http://bogofilter.sourceforge.net/ @@ -65,12 +65,8 @@ %endif --sysconfdir=%{_sysconfdir} %{__make} -%ifnarch %arm -%{__make} check -%endif %install -[ "${RPM_BUILD_ROOT}" != "/" -a -d ${RPM_BUILD_ROOT} ] && rm -rf ${RPM_BUILD_ROOT} %{__make} DESTDIR=${RPM_BUILD_ROOT} install mv ${RPM_BUILD_ROOT}/%{_sysconfdir}/bogofilter.cf.example ${RPM_BUILD_ROOT}/%{_sysconfdir}/bogofilter.cf for d in contrib; do @@ -78,21 +74,23 @@ files=$( find ${d} -maxdepth 1 -type f) for f in ${files} ; do case ${f} in - *.c|*.o|*.obj|*/Makefile*) rm ${f}; continue ;; + *.c|*.o|*.obj|*/Makefile*) continue ;; *.1) cp -p ${f} ${RPM_BUILD_ROOT}/%{_mandir}/man1 ;; *) - head -n 1 ${f} | grep -q "^#\!" && \ - chmod 0755 ${f} cp -p ${f} ${RPM_BUILD_ROOT}/%{_datadir}/%{name}/${d} + head -n 1 ${f} | grep -q "^#\!" && \ + chmod 0755 ${RPM_BUILD_ROOT}/%{_datadir}/%{name}/${d}/${f##*/} ;; esac done done -rm doc/*.{1,1in,htmlin} doc/Makefile* -%clean -[ "${RPM_BUILD_ROOT}" != "/" -a -d ${RPM_BUILD_ROOT} ] && rm -rf ${RPM_BUILD_ROOT} +%check +%ifnarch %arm +%{__make} check \ + DESTDIR="%{RPM_BUILD_ROOT}" +%endif %files %defattr(-,root,root) @@ -117,9 +115,115 @@ %{_mandir}/man1/bogoupgrade.1.gz %{_mandir}/man1/bogoutil.1.gz %doc AUTHORS COPYING GETTING.STARTED INSTALL NEWS README* RELEASE.NOTES* -%doc TODO bogofilter.cf.example doc/ +%doc TODO bogofilter.cf.example +%doc doc/README* doc/bogofilter-SA-* doc/*.html doc/integrating* +%doc doc/programmer/ doc/rpm.notes.BerkeleyDB %changelog +* Thu May 07 2009 lmuelle(a)suse.de +- Update to version 1.2.0. + + Flex-2.5.35 has fix for memory allocation problem in 2.5.4, 2.5.31, and + 2.5.33, making bogofilter's flex patch obsolete. + + Bogofilter now uses listsort in place of qsort. + + Added token-count=n, token-count-min=n, and token-count-max=n options. + + Minor code cleanups. + + spamitarium.pl updated to version 0.3.0 + + update bf_compact documentation by removing explicit Berkeley DB + references, as it has been fixed to work with other database drivers in + March 2008. + + bf_compact, bf_copy and bf_tar now support transformed program names + + Update sqlite3 adaptor to take advantage of sqlite3_prepare_v2() API + function that appeared in SQLite 3.3.9. The new _v2 interface allows for + more specific error messages when executing SQL statements. Also enable + extended result codes for more precise error reporting. + + Update doc/integrating-with-postfix: the script now suggests sendmail -G + -i (where -G will be ignored by Postfix before 2.3) to tell Postfix it's a + gateway submission, not an original injection; the filter pipe(8) magic + for master.cf now suggests flags=Rq (was flags=R), as per Postfix's + FILTER_README. + + Drop support for systems that reverse setvbuf arguments. The last systems + to do that are reported to be shipped in 1987 by the autoconf manual, so + ditch them. +* Wed Feb 18 2009 lmuelle(a)suse.de +- Update to version 1.1.7. + + Updated sendmail milter contrib/bogofilter-milter.pl to v1.45 + + Added maildir training info to English and French FAQs. + + Fix uninitialized variable in lexer.c when unicode is disabled. + + In process_arg functions use the val parameter rather than optarg. + + Function process_arg now has the same prototype for + bogofilter, bogolexer, bogoutil, and bogotune. The proper + version is called by function read_config_file for all + programs. + + Fixed syntax errors in t.valgrind test + + bf_compact now supports compacting databases that use QDBM, Tokyo + Cabinet or SQLite3 and is covered by the test suite. + + bf_compact now verifies databases before dumping them, to avoid + getting into an unterminated loop and wasting all diskspace. + + Bogoupgrade now verifies databases before dumping them, to avoid + getting into an unterminated loop and burning all memory or disk + space when the database is corrupt. + + Bogoupgrade now uses Pod::Usage to print usage/help, prints error + messages that are a bit more concise and validates arguments a bit + stricter. + + Bump required sqlite version to 3.5.4, earlier versions could + sometimes corrupt the database. Update install-staticdblibs.sh. + Bogofilter will complain when used with older versions. + + bf_compact problem fixed. +- Update to version 1.1.6. + + Transaction support added for TokyoCabinet datastore. + + Bump required sqlite version to 3.4.2 and fix related compiler + warnings. Bogofilter will complain when used with older versions. + + Support for TokyoCabinet datastore added. + + doc/README.db was updated to BerkeleyDB 4.6 + + doc/README.db: section 3.5 was added, with information on how to + resolve "Logging region out of memory; you may need to increase its + size", section 4.2 now documents set_lg_regionmax. + + The install-staticdblibs.sh script was relicensed under GNU GPL v3, + adjusted to download Berkeley DB 4.2 from oracle.com, adds patch #5, + and updated to build SQLite 3.4.1. In order to for a rebuild of the + updated library, do: rm -rf /opt/db-4.2-lean /opt/sqlite-3-lean + and re-run the script. + + The recommended minimum sqlite3 version is now 3.4.0, bogofilter will + warn if used with older versions. Bugs that could cause database + corruption in rare circumstances have been fixed in sqlite3. + See doc/README.sqlite for details. + + Updated sendmail milter contrib/bogofilter-milter.pl to v1.27 + + Add '--spam-header-place={header}' to specify header line + before which the X-Bogosity line is placed. + + Support --db-verify for sqlite3. + + Fix defect where the database verification method would not be called + for traditional Berkeley DB databases. Reported by Eric Wood. + + Fix test suite for situations where there are blanks in the test or + working directories' names. + + Repair passthrough defect on systems whose standard system library + makes a distinction between text and binary mode in stdio stuff. +- Update to version 1.1.5 2007-01-14 (released) 2007-01-25 (declared stable) + + Fixed Makefile dependency problem. + + Fixed block-on-subnets problem. + + Added block-on-subnets regression test. +- Update to version 1.1.4 2007-01-01 (released) + + Update copyright notices. + + Add GSL dependency to bogofilter target to support parallel + makes. + + Fixed problem in flex-2.5.4 patch. +- Update to version 1.1.3 2006-12-03 (released) 2006-12-20 (declared stable) + + Fixed typo in configure.ac. +- Update to version 1.1.2 2006-12-02 (released) + + Revise install-staticlibs.sh's links for retrieving database + tarball and patches. + + Revise make rules for generating statically linked RPM. + + Provide separate flex patches for 2.5.4 and 2.5.3x + + Updated file comment for lexer_v3.l and removed unneeded + rules T1, T12, SHORT_TOKEN, and TOKEN_12. + + Miscellaneous minor cleanups of lexer_v3.l classes and rules. + + Patch flex skeleton code problem which can cause a seg-fault. + + Fix processing of "--unicode=no" option. + + Fix prefixes for ip address and url tokens. Restore colon + that was dropped in token.c edit for bogofilter-1.1.0. + + Fixed problem parsing message ids, which can cause a + seg-fault on an x86_64. + + Added '--ham-true' option for bogofilter (to match docs) + + FAQ's updated to point to current sylpheed-claws wiki * Fri Nov 21 2008 ro(a)suse.de - update check-build.sh * Mon Sep 04 2006 lmuelle(a)suse.de ++++++ bogofilter-1.1.1.tar.bz2 -> bogofilter-1.2.0.tar.bz2 ++++++ ++++ 48926 lines of diff (skipped) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit clicfs for openSUSE:Factory
by root＠Hilbert.suse.de 19 May '09

19 May '09

Hello community, here is the log from the commit of package clicfs for openSUSE:Factory checked in at Tue May 19 02:47:15 CEST 2009. -------- --- clicfs/clicfs.changes 2009-05-05 14:13:52.000000000 +0200 +++ clicfs/clicfs.changes 2009-05-18 13:48:13.000000000 +0200 @@ -1,0 +2,15 @@ +Mon May 18 13:47:55 CEST 2009 - coolo(a)novell.com + +- make the file size 64bit (bnc#504627) + +------------------------------------------------------------------- +Mon May 18 13:04:41 CEST 2009 - coolo(a)novell.com + +- don't confuse num_pages with write_pages (bnc#504700) + +------------------------------------------------------------------- +Mon May 11 15:10:36 CEST 2009 - coolo(a)suse.de + +- fix corruption when writing short blocks + +------------------------------------------------------------------- calling whatdependson for head-i586 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ clicfs.spec ++++++ --- /var/tmp/diff_new_pack.K15227/_old 2009-05-19 02:44:20.000000000 +0200 +++ /var/tmp/diff_new_pack.K15227/_new 2009-05-19 02:44:20.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package clicfs (Version 1.0) +# spec file for package clicfs (Version 1.1.2) # # Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -22,8 +22,8 @@ BuildRequires: cmake fuse-devel gcc-c++ openssl-devel xz-devel Requires: fuse Summary: Compressed Loop Image Container -Version: 1.0 -Release: 4 +Version: 1.1.2 +Release: 1 License: GPL v2 only Group: System/Filesystems Source: clicfs.tar.bz2 @@ -62,6 +62,12 @@ %_mandir/man1/* %changelog +* Mon May 18 2009 coolo(a)novell.com +- make the file size 64bit (bnc#504627) +* Mon May 18 2009 coolo(a)novell.com +- don't confuse num_pages with write_pages (bnc#504700) +* Mon May 11 2009 coolo(a)suse.de +- fix corruption when writing short blocks * Tue May 05 2009 coolo(a)suse.de - if the cow file is read only, then just read it * Mon Apr 20 2009 coolo(a)suse.de ++++++ clicfs.tar.bz2 ++++++ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/src/clicfs.c new/src/clicfs.c --- old/src/clicfs.c 2009-05-05 14:13:03.000000000 +0200 +++ new/src/clicfs.c 2009-05-18 13:45:56.000000000 +0200 @@ -32,8 +32,6 @@ FILE *logger = 0; -static uint32_t write_pages = 0; - static size_t detached_allocated = 0; static size_t sparse_memory = 0; static char *cowfilename = 0; @@ -50,36 +48,39 @@ static int clic_write_cow() { - if (!cowfilename || cowfile_ro == 1) + if (!cowfilename || cowfile_ro == 1 || !detached_allocated) return 0; - uint32_t indexlen = sizeof(uint32_t) * 2; + fprintf(stderr, "cow detached %dMB\n", (int)(detached_allocated / 1024)); + + uint32_t indexlen = 0; uint32_t i; for (i = 0; i < num_pages; ++i) { long ptr = (long)blockmap[i]; - //fprintf(stderr, "ptr %ld %d\n", (long)i, (int)(ptr & 0x3)); - if (ptr && (ptr & 0x3) == 0) { // detached now + if ( ptr && PTR_CLASS(ptr) == CLASS_MEMORY ) { // detached now uint32_t cowindex = clic_find_next_cow(); lseek(cowfilefd, cowindex * pagesize, SEEK_SET); - write(cowfilefd, blockmap[i], pagesize); + size_t ret = write(cowfilefd, blockmap[i], pagesize); + assert(ret == pagesize); free(blockmap[i]); detached_allocated -= (pagesize / 1024); blockmap[i] = (unsigned char*)(long)(cowindex << 2) + 2; } } + assert(!detached_allocated); + lseek(cowfilefd, cow_pages * pagesize, SEEK_SET); - uint32_t stringlen = thefilesize; - write(cowfilefd, (char*)&stringlen, sizeof(uint32_t)); + uint64_t stringlen = thefilesize; + indexlen += write(cowfilefd, (char*)&stringlen, sizeof(uint64_t)); stringlen = cow_pages; - write(cowfilefd, (char*)&stringlen, sizeof(uint32_t)); - lseek(cowfilefd, cow_pages * pagesize + sizeof(uint32_t) * 2, SEEK_SET); + indexlen += write(cowfilefd, (char*)&stringlen, sizeof(uint32_t)); stringlen = 0; for (i = 0; i < num_pages; ++i) { long ptr = (long)blockmap[i]; - if ((ptr & 0x3) == 2) { // block + if (PTR_CLASS(ptr) == CLASS_COW) { // block uint32_t key = i, value = ptr >> 2; write(cowfilefd, (char*)&key, sizeof(uint32_t)); write(cowfilefd, (char*)&value, sizeof(uint32_t)); @@ -261,14 +262,13 @@ static int clic_detach(size_t block) { - if (detached_allocated > 1500 && cowfilefd != -1) - clic_write_cow(); - + assert(block < num_pages); + unsigned char *ptr = blockmap[block]; - if (((long)ptr & 0x3) == 1 || ((long)ptr & 0x3) == 2) + if ((PTR_CLASS(ptr) == CLASS_RO ) || (PTR_CLASS(ptr) == CLASS_COW)) { - if (((long)ptr & 0x3) == 2) { - if (cows_index == DOENER_COW_COUNT - 1) + if (PTR_CLASS(ptr) == CLASS_COW) { + if (cows_index == CLICFS_COW_COUNT - 1) clic_write_cow(); } @@ -277,7 +277,7 @@ if (logger && detached_allocated % 1024 == 0 ) fprintf(logger, "detached %dMB\n", (int)(detached_allocated / 1024)); clic_read_block(newptr, block); - if (((long)ptr & 0x3) == 2) // we need to mark the place in the cow obsolete + if (PTR_CLASS(ptr) == CLASS_COW) // we need to mark the place in the cow obsolete cows[cows_index++] = (long)ptr >> 2; blockmap[block] = (unsigned char*)newptr; @@ -287,7 +287,7 @@ if (!blockmap[block]) { blockmap[block] = malloc(pagesize); - assert(((long)ptr & 0x3) == 0); + assert(PTR_CLASS(ptr) == CLASS_MEMORY); detached_allocated += (pagesize / 1024); if (logger && detached_allocated % 1024 == 0 ) fprintf(logger, "detached %dMB\n", (int)(detached_allocated / 1024)); memset(blockmap[block],0,pagesize); @@ -297,10 +297,10 @@ return 0; } -static size_t clic_write_block(const char *buf, off_t block, size_t size) +static size_t clic_write_block(const char *buf, off_t block, off_t ioff, size_t size) { clic_detach(block); - memcpy(blockmap[block], buf, size); + memcpy(blockmap[block]+ioff, buf, size); return size; } @@ -312,9 +312,14 @@ if(path[0] == '/' && strcmp(path + 1, thefile) != 0) return -ENOENT; - if (offset >= (off_t)thefilesize) { + if (offset >= (off_t)thefilesize) return 0; - } + + if (offset+size > thefilesize) + size = thefilesize-offset; + + if (!size) + return 0; off_t block = offset / pagesize; off_t ioff = offset - block * pagesize; @@ -322,12 +327,13 @@ assert(ioff == 0 || ioff + size <= pagesize); if (size <= pagesize) { - return clic_write_block(buf+ioff, block, size); + return clic_write_block(buf, block, ioff, size); } else { size_t wrote = 0; do { - size_t diff = clic_write_block(buf, block, size > pagesize ? pagesize : size); + size_t diff = clic_write_block(buf, block, ioff, size > pagesize ? pagesize : size); + ioff = 0; size -= diff; buf += diff; block++; @@ -340,10 +346,9 @@ static size_t clic_read_block(char *buf, size_t block) { - if (block >= write_pages) - return 0; + if (block >= num_pages) + return -EFAULT; - assert(block < write_pages); clic_log_access(block); if (!blockmap[block]) { // sparse block @@ -352,18 +357,18 @@ } long ptr = (long)blockmap[block]; - if ((ptr & 0x3) == 0) { + if (PTR_CLASS(ptr) == CLASS_MEMORY) { // detached memcpy(buf, blockmap[block], pagesize); return pagesize; } - if ((ptr & 0x3) == 2) { + if (PTR_CLASS(ptr) == CLASS_COW) { lseek(cowfilefd, (ptr >> 2) * pagesize, SEEK_SET); return read(cowfilefd, buf, pagesize); } - assert((ptr & 0x3) == 1); // in read only part + assert(PTR_CLASS(ptr) == CLASS_RO); // in read only part assert(block < num_pages); off_t mapped_block = clic_map_block(block); @@ -451,11 +456,14 @@ char *packfilename = 0; char *logfile = 0; +int ignore_cow_errors = 0; -enum { FUSE_OPT_MEMORY, FUSE_OPT_LOGGER, FUSE_OPT_COWFILE }; +enum { FUSE_OPT_SPARSE, FUSE_OPT_LOGGER, FUSE_OPT_COWFILE, FUSE_OPT_IGNORE_COW_ERRORS }; struct fuse_opt clic_opt[] = { - FUSE_OPT_KEY("-m %s", FUSE_OPT_MEMORY), + FUSE_OPT_KEY("--resevere-sparse %s", FUSE_OPT_SPARSE), + FUSE_OPT_KEY("--ignore-cow-errors", FUSE_OPT_IGNORE_COW_ERRORS), + FUSE_OPT_KEY("-m %s", FUSE_OPT_SPARSE), FUSE_OPT_KEY("-l %s", FUSE_OPT_LOGGER), FUSE_OPT_KEY("-c %s", FUSE_OPT_COWFILE), FUSE_OPT_END @@ -473,7 +481,7 @@ return 0; } break; - case FUSE_OPT_MEMORY: + case FUSE_OPT_SPARSE: sparse_memory = atoi(arg+2); return 0; break; @@ -485,11 +493,33 @@ cowfilename = strdup(arg+2); return 0; break; + case FUSE_OPT_IGNORE_COW_ERRORS: + ignore_cow_errors = 1; + break; } return 1; } +static int init_cow() +{ + FILE *cow = fopen(cowfilename, "w"); + if (!cow) { + perror("opening cow"); + return 1; + } + uint64_t stringlen64 = (thefilesize / pagesize * pagesize) + sparse_memory * 1024 * 1024; + fwrite((char*)&stringlen64, 1, sizeof(uint64_t), cow); + uint32_t stringlen = 0; + // there are 0 blocks + fwrite((char*)&stringlen, 1, sizeof(uint32_t), cow); + // the whole index is 12 bytes long + stringlen = sizeof(uint32_t) + sizeof(uint64_t); + fwrite((char*)&stringlen, 1, sizeof(uint32_t), cow); + fclose(cow); + return 0; +} + int main(int argc, char *argv[]) { struct fuse_args args = FUSE_ARGS_INIT(argc, argv); @@ -514,11 +544,8 @@ // not sure why but multiple threads make it slower fuse_opt_add_arg(&args, "-s"); - if (!packfilename || (cowfilename && sparse_memory)) { + if (!packfilename) { fprintf(stderr, "usage: [-m <mb>] [-l <logfile|->] [-c <cowfile>] <packfile> <mntpoint>\n"); - if (cowfilename && sparse_memory) { - fprintf(stderr, "writes can go either into cowfile or memory\n"); - } return 1; } @@ -530,39 +557,34 @@ free(packfilename); if (cowfilename) { - if (access(cowfilename, R_OK)) { - FILE *cow = fopen(cowfilename, "w"); - if (!cow) { - perror("opening cow"); - return 1; - } - uint32_t stringlen = (thefilesize / pagesize * pagesize) + 512 * 1024 * 1024; - fwrite((char*)&stringlen, 1, sizeof(uint32_t), cow); - stringlen = 0; - // there are 0 blocks - fwrite((char*)&stringlen, 1, sizeof(uint32_t), cow); - // the whole index is 8 bytes long - stringlen = sizeof(uint32_t) * 2; - fwrite((char*)&stringlen, 1, sizeof(uint32_t), cow); - fclose(cow); - } + + if (access(cowfilename, R_OK)) + init_cow(); + + if (clicfs_read_cow(cowfilename)) { + if (!ignore_cow_errors) + return 1; + + init_cow(); if (clicfs_read_cow(cowfilename)) - return 1; + return 1; + } + sparse_memory = 0; // ignore the option if we have a cow } // fake for write if (sparse_memory) { thefilesize = (thefilesize / pagesize * pagesize) + sparse_memory * 1024 * 1024; - write_pages = thefilesize / pagesize; + size_t write_pages = thefilesize / pagesize; blockmap = realloc(blockmap, sizeof(unsigned char*)*write_pages); - } else - write_pages = num_pages; + uint32_t i; + for (i = num_pages; i < write_pages; ++i) + blockmap[i] = 0; + num_pages = write_pages; + } uint32_t i; - for (i = num_pages; i < write_pages; ++i) - blockmap[i] = 0; - com_count = 6000000 / (bsize*pagesize); // get 6MB of cache coms = malloc(sizeof(struct buffer_combo) * com_count); for (i = 0; i < com_count; ++i) diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/src/clicfs_common.c new/src/clicfs_common.c --- old/src/clicfs_common.c 2009-05-05 14:13:03.000000000 +0200 +++ new/src/clicfs_common.c 2009-05-18 13:45:56.000000000 +0200 @@ -32,7 +32,7 @@ int cowfilefd = -1; char thefile[PATH_MAX]; -size_t thefilesize = 0; +uint64_t thefilesize = 0; size_t pagesize = 4096; uint64_t *sizes = 0; uint64_t *offs = 0; @@ -57,6 +57,15 @@ return stringlen; } +uint64_t clic_readindex_fd64(int fd) +{ + uint64_t stringlen = 0; + if (read(fd, &stringlen, sizeof(uint64_t)) != sizeof(uint64_t)) { + return 0; + } + return stringlen; +} + uint32_t clic_readindex_file(FILE * f) { uint32_t stringlen = 0; @@ -88,7 +97,7 @@ uint32_t indexlen = clic_readindex_fd(cowfilefd) + sizeof(uint32_t); if (lseek(cowfilefd, st.st_size - indexlen, SEEK_SET ) == -1) perror("seek"); - thefilesize = clic_readindex_fd(cowfilefd); + thefilesize = clic_readindex_fd64(cowfilefd); uint32_t newpages = thefilesize / pagesize; blockmap = realloc(blockmap, sizeof(unsigned char*)*newpages); uint32_t i; @@ -103,7 +112,7 @@ assert(pageindex < num_pages); blockmap[pageindex] = (unsigned char*)(long)(page << 2) + 2; } - cows = malloc(sizeof(uint32_t) * DOENER_COW_COUNT); + cows = malloc(sizeof(uint32_t) * CLICFS_COW_COUNT); cows_index = 0; return 0; } @@ -136,7 +145,7 @@ } thefile[stringlen] = 0; - size_t oparts = clic_readindex_file(packfile); + uint64_t oparts = clic_readindex_file(packfile); bsize = clic_readindex_file(packfile); pagesize = clic_readindex_file(packfile); thefilesize = oparts * bsize * pagesize; @@ -192,7 +201,7 @@ unsigned char *ptr = blockmap[block]; size_t ret = (long)ptr; // calling map_block for detached blocks is bogus - assert((ret & 0x3) == 1); + assert(PTR_CLASS(ret) == 1); return ret >> 2; } diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/src/clicfs.h new/src/clicfs.h --- old/src/clicfs.h 2009-05-05 14:13:03.000000000 +0200 +++ new/src/clicfs.h 2009-05-18 13:45:56.000000000 +0200 @@ -28,8 +28,14 @@ #define DOENER_MAGIC 1 +#define PTR_CLASS(x) ((long)x & 0x3) + +enum { CLASS_MEMORY = 0, + CLASS_RO = 1, + CLASS_COW = 2 }; + extern char thefile[PATH_MAX]; -extern size_t thefilesize; +extern uint64_t thefilesize; extern size_t pagesize; extern uint64_t *sizes; extern uint64_t *offs; @@ -42,7 +48,7 @@ // support temporary changes on ro medium extern int cowfile_ro; -#define DOENER_COW_COUNT 100 +#define CLICFS_COW_COUNT 1000 // an array extern uint32_t *cows; diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/src/mkclicfs.cpp new/src/mkclicfs.cpp --- old/src/mkclicfs.cpp 2009-05-05 14:13:03.000000000 +0200 +++ new/src/mkclicfs.cpp 2009-05-18 13:45:56.000000000 +0200 @@ -262,8 +262,6 @@ queue_put( from_reader, in ); } - fprintf( stderr, "thread 0 is gone\n" ); - thread[0] = 0; pthread_exit(NULL); @@ -473,6 +471,10 @@ struct stat st; stat(infile, &st); + if (!S_ISREG( st.st_mode )) { + fprintf(stderr, "expecting regular file as input: %s\n", infile); + return EXIT_FAILURE; + } num_pages = st.st_size / pagesize; /* ext3 should be X blocks */ ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit gtk-xfce-engine for openSUSE:Factory
by root＠Hilbert.suse.de 19 May '09

19 May '09

Hello community, here is the log from the commit of package gtk-xfce-engine for openSUSE:Factory checked in at Tue May 19 02:44:06 CEST 2009. -------- --- gtk-xfce-engine/gtk-xfce-engine.changes 2008-11-25 17:22:20.000000000 +0100 +++ gtk-xfce-engine/gtk-xfce-engine.changes 2009-02-27 13:16:51.000000000 +0100 @@ -1,0 +2,9 @@ +Fri Feb 27 13:15:51 CET 2009 - prusnak(a)suse.cz + +- updated to 2.6.0 (Xfce 4.6.0 release) + * Fix bg color being shown under group box title (Bug #1018) + * Remove README.html files (Bug #3280) + * Update WM colors to match the new xfwm4 decoration theme + * Much compact version of the default theme. + +------------------------------------------------------------------- @@ -4 +13 @@ -- Supplement gtk2-32bit/gtk2-64bit in baselibs.conf (bnc#354164). +- Supplement gtk2-32bit/gtk2-64bit in baselibs.conf (bnc#354164) calling whatdependson for head-i586 Old: ---- gtk-xfce-engine-2.4.3.tar.bz2 New: ---- gtk-xfce-engine-2.6.0.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ gtk-xfce-engine.spec ++++++ --- /var/tmp/diff_new_pack.B29899/_old 2009-05-19 02:42:28.000000000 +0200 +++ /var/tmp/diff_new_pack.B29899/_new 2009-05-19 02:42:28.000000000 +0200 @@ -1,7 +1,7 @@ # -# spec file for package gtk-xfce-engine (Version 2.4.3) +# spec file for package gtk-xfce-engine (Version 2.6.0) # -# Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -21,8 +21,8 @@ Name: gtk-xfce-engine BuildRequires: dbus-1-devel gtk2-devel update-desktop-files Summary: Port of Xfce Engine to GTK+-2.0 -Version: 2.4.3 -Release: 2 +Version: 2.6.0 +Release: 1 License: GPL v2 or later Url: http://www.xfce.org/ Source0: %{name}-%{version}.tar.bz2 @@ -59,8 +59,14 @@ %{_datadir}/themes/* %changelog +* Fri Feb 27 2009 prusnak(a)suse.cz +- updated to 2.6.0 (Xfce 4.6.0 release) + * Fix bg color being shown under group box title (Bug #1018) + * Remove README.html files (Bug #3280) + * Update WM colors to match the new xfwm4 decoration theme + * Much compact version of the default theme. * Tue Nov 25 2008 sbrabec(a)suse.cz -- Supplement gtk2-32bit/gtk2-64bit in baselibs.conf (bnc#354164). +- Supplement gtk2-32bit/gtk2-64bit in baselibs.conf (bnc#354164) * Wed Oct 29 2008 bwalle(a)suse.de - update to 4.2.3 (Xfce 4.4.3) o bug fixes ++++++ gtk-xfce-engine-2.4.3.tar.bz2 -> gtk-xfce-engine-2.6.0.tar.bz2 ++++++ ++++ 67083 lines of diff (skipped) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0