March 2011 - openSUSE Commits - openSUSE Mailing Lists

commit fuse for openSUSE:Factory
by root＠hilbert.suse.de 23 Mar '11

23 Mar '11

Hello community, here is the log from the commit of package fuse for openSUSE:Factory checked in at Wed Mar 23 09:41:09 CET 2011. -------- --- fuse/fuse.changes 2011-02-21 20:01:44.000000000 +0100 +++ /mounts/work_src_done/STABLE/fuse/fuse.changes 2011-03-21 17:44:03.000000000 +0100 @@ -1,0 +2,5 @@ +Mon Mar 21 16:43:59 UTC 2011 - coolo(a)novell.com + +- licenses package is about to die + +------------------------------------------------------------------- calling whatdependson for head-i586 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ fuse.spec ++++++ --- /var/tmp/diff_new_pack.JLmX74/_old 2011-03-23 09:40:20.000000000 +0100 +++ /var/tmp/diff_new_pack.JLmX74/_new 2011-03-23 09:40:20.000000000 +0100 @@ -21,7 +21,7 @@ Name: fuse Summary: User space File System Version: 2.8.5 -Release: 8 +Release: 9 License: GPLv2+ ; LGPLv2.1+ Group: System/Filesystems # http://sourceforge.net/projects/fuse/files/fuse-2.X/%%{version}/fuse-%%{ver… @@ -39,8 +39,7 @@ %else Requires: util-linux(fake+no-canonicalize) %endif -Requires: licenses -BuildRequires: licenses pkgconfig +BuildRequires: pkgconfig %if 0%{?suse_version} >= 0 && 0%{?suse_version} >= 1000 Supplements: filesystem(fuse) %endif @@ -244,8 +243,6 @@ %install make DESTDIR="$RPM_BUILD_ROOT" install rm -rf $RPM_BUILD_ROOT/%{_sysconfdir}/init.d -ln -sf /usr/share/doc/licenses/md5/$(md5sum COPYING | sed 's/ .*//') COPYING -ln -sf /usr/share/doc/licenses/md5/$(md5sum COPYING.LIB | sed 's/ .*//') COPYING.LIB # Needed for OpenSUSE buildservice %if %suse_version <= 1020 install -m644 -D util/udev.rules $RPM_BUILD_ROOT/%{_sysconfdir}/udev/rules.d/99-fuse.rules ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 procps for openSUSE:Factory
by root＠hilbert.suse.de 23 Mar '11

23 Mar '11

Hello community, here is the log from the commit of package procps for openSUSE:Factory checked in at Wed Mar 23 09:19:23 CET 2011. -------- --- procps/procps.changes 2010-12-03 17:58:04.000000000 +0100 +++ /mounts/work_src_done/STABLE/procps/procps.changes 2011-03-22 18:37:05.000000000 +0100 @@ -1,0 +2,5 @@ +Tue Mar 22 17:31:22 UTC 2011 - idoenmez(a)novell.com + +- Fix procps-3.2.8.dif: use -Wl for linker options + +------------------------------------------------------------------- calling whatdependson for head-i586 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ procps.spec ++++++ --- /var/tmp/diff_new_pack.VMQnzA/_old 2011-03-23 09:16:03.000000000 +0100 +++ /var/tmp/diff_new_pack.VMQnzA/_new 2011-03-23 09:16:03.000000000 +0100 @@ -1,7 +1,7 @@ # -# spec file for package procps (Version 3.2.8) +# spec file for package procps # -# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2011 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 @@ -27,7 +27,7 @@ PreReq: %fillup_prereq %insserv_prereq AutoReqProv: on Version: 3.2.8 -Release: 23 +Release: 29 Summary: ps utilities for /proc Provides: ps Obsoletes: ps ++++++ procps-3.2.8.dif ++++++ --- /var/tmp/diff_new_pack.VMQnzA/_old 2011-03-23 09:16:03.000000000 +0100 +++ /var/tmp/diff_new_pack.VMQnzA/_new 2011-03-23 09:16:03.000000000 +0100 @@ -5,7 +5,7 @@ PKG_LDFLAGS := -Wl,-warn-common -LDFLAGS := -+LDFLAGS := -L ./proc --as-needed -lproc ++LDFLAGS := -L ./proc -Wl,--as-needed -lproc ALL_LDFLAGS := $(PKG_LDFLAGS) $(LDFLAGS) ############ Add some extra flags if gcc allows ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit xorg-x11-libX11 for openSUSE:Factory
by root＠hilbert.suse.de 23 Mar '11

23 Mar '11

Hello community, here is the log from the commit of package xorg-x11-libX11 for openSUSE:Factory checked in at Wed Mar 23 09:15:28 CET 2011. -------- --- xorg-x11-libX11/xorg-x11-libX11.changes 2011-03-17 18:33:48.000000000 +0100 +++ /mounts/work_src_done/STABLE/xorg-x11-libX11/xorg-x11-libX11.changes 2011-03-22 21:11:32.000000000 +0100 @@ -1,0 +2,6 @@ +Tue Mar 22 20:01:19 UTC 2011 - sndirsch(a)novell.com + +- disabled Ignore-user-locks-after-sleeping-in-_XReply-and-_XRe.patch + for now (bnc #679177, comment #6) + +------------------------------------------------------------------- calling whatdependson for head-i586 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ xorg-x11-libX11.spec ++++++ --- /var/tmp/diff_new_pack.99iDCD/_old 2011-03-23 09:08:28.000000000 +0100 +++ /var/tmp/diff_new_pack.99iDCD/_new 2011-03-23 09:08:28.000000000 +0100 @@ -28,7 +28,7 @@ PreReq: coreutils Url: http://xorg.freedesktop.org/ Version: 7.6 -Release: 13 +Release: 14 License: MIT License (or similar) BuildRoot: %{_tmppath}/%{name}-%{version}-build Group: System/Libraries @@ -131,7 +131,7 @@ %patch17 -p0 %patch18 -p0 %patch19 -p1 -%patch20 -p1 +#%patch20 -p1 %build autoreconf -fi ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit yast2-control-center for openSUSE:11.4
by root＠hilbert.suse.de 23 Mar '11

23 Mar '11

Hello community, here is the log from the commit of package yast2-control-center for openSUSE:11.4 checked in at Wed Mar 23 01:11:38 CET 2011. -------- --- old-versions/11.4/all/yast2-control-center/yast2-control-center.changes 2010-10-11 11:19:47.000000000 +0200 +++ 11.4/yast2-control-center/yast2-control-center.changes 2011-02-23 13:08:08.000000000 +0100 @@ -1,0 +2,18 @@ +Wed Feb 23 13:06:01 CET 2011 - tgoettlicher(a)suse.de + +- remember panel width (bnc #613352) +- 2.20.2 + +------------------------------------------------------------------- +Tue Feb 22 17:36:58 CET 2011 - tgoettlicher(a)suse.de + +- fixed bnc #650907: yast2 shrinks module selector item on search +- 2.20.1 + +------------------------------------------------------------------- +Tue Feb 22 14:20:36 CET 2011 - tgoettlicher(a)suse.de + +- bnc #661109: Layout of icons gets mixed after using search +- 2.20.0 + +------------------------------------------------------------------- Package does not exist at destination yet. Using Fallback old-versions/11.4/all/yast2-control-center Destination is old-versions/11.4/UPDATES/all/yast2-control-center calling whatdependson for 11.4-i586 Old: ---- yast2-control-center-2.19.3.tar.bz2 New: ---- yast2-control-center-2.20.2.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-control-center.spec ++++++ --- /var/tmp/diff_new_pack.drfjiG/_old 2011-03-23 01:11:20.000000000 +0100 +++ /var/tmp/diff_new_pack.drfjiG/_new 2011-03-23 01:11:20.000000000 +0100 @@ -1,7 +1,7 @@ # -# spec file for package yast2-control-center (Version 2.19.3) +# spec file for package yast2-control-center # -# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2011 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 @@ -18,11 +18,11 @@ Name: yast2-control-center -Version: 2.19.3 -Release: 1 +Version: 2.20.2 +Release: 1.<RELEASE2> BuildRoot: %{_tmppath}/%{name}-%{version}-build -Source0: yast2-control-center-2.19.3.tar.bz2 +Source0: yast2-control-center-2.20.2.tar.bz2 Group: System/YaST License: GPLv2+ BuildRequires: libdrm-devel libjpeg-devel libqt4-devel pkgconfig update-desktop-files yast2-devtools ++++++ yast2-control-center-2.19.3.tar.bz2 -> yast2-control-center-2.20.2.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-control-center-2.19.3/VERSION.cmake new/yast2-control-center-2.20.2/VERSION.cmake --- old/yast2-control-center-2.19.3/VERSION.cmake 2010-10-11 11:19:35.000000000 +0200 +++ new/yast2-control-center-2.20.2/VERSION.cmake 2011-03-18 10:47:14.000000000 +0100 @@ -1,3 +1,3 @@ SET(VERSION_MAJOR "2") -SET(VERSION_MINOR "19") -SET(VERSION_PATCH "3") +SET(VERSION_MINOR "20") +SET(VERSION_PATCH "2") diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-control-center-2.19.3/package/yast2-control-center.changes new/yast2-control-center-2.20.2/package/yast2-control-center.changes --- old/yast2-control-center-2.19.3/package/yast2-control-center.changes 2010-10-11 11:19:35.000000000 +0200 +++ new/yast2-control-center-2.20.2/package/yast2-control-center.changes 2011-03-18 10:47:14.000000000 +0100 @@ -1,4 +1,22 @@ ------------------------------------------------------------------- +Wed Feb 23 13:06:01 CET 2011 - tgoettlicher(a)suse.de + +- remember panel width (bnc #613352) +- 2.20.2 + +------------------------------------------------------------------- +Tue Feb 22 17:36:58 CET 2011 - tgoettlicher(a)suse.de + +- fixed bnc #650907: yast2 shrinks module selector item on search +- 2.20.1 + +------------------------------------------------------------------- +Tue Feb 22 14:20:36 CET 2011 - tgoettlicher(a)suse.de + +- bnc #661109: Layout of icons gets mixed after using search +- 2.20.0 + +------------------------------------------------------------------- Mon Oct 11 11:17:55 CEST 2010 - tgoettlicher(a)suse.de - Adapted license format diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-control-center-2.19.3/src/CMakeLists.txt new/yast2-control-center-2.20.2/src/CMakeLists.txt --- old/yast2-control-center-2.19.3/src/CMakeLists.txt 2010-10-11 11:19:35.000000000 +0200 +++ new/yast2-control-center-2.20.2/src/CMakeLists.txt 2011-03-18 10:47:14.000000000 +0100 @@ -17,22 +17,15 @@ main.cpp main_window.cpp kcategorizedview.cpp - # menuitem.cpp kcategorydrawer.cpp kcategorizedsortfilterproxymodel.cpp - # kcmodulemodel.cpp moduleiconitem.cpp - # kcmoduleinfo.cpp - yccmoduleinfoprovider.cpp - yqdesktopfilesmodel.cpp yqmodulegroupsmodel.cpp yqmodulesmodel.cpp yqmodulesproxymodel.cpp - yqsavelogs.cpp - i18n.cpp ) @@ -43,23 +36,17 @@ SET(yast2-control-center_HDRS main_window.h kcategorizedview.h - # menuitem.h - # kcmodulemodel.h kcategorydrawer.h kcategorizedsortfilterproxymodel.h moduleiconitem.h - # kcmoduleinfo.h kcategorizedview_p.h - yccmoduleinfoprovider.h - yqdesktopfilesmodel.h yqmodulegroupsmodel.h yqmodulesmodel.h yqmodulesproxymodel.h - + listview.h yqsavelogs.h - i18n.h ) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-control-center-2.19.3/src/kcategorizedsortfilterproxymodel.cpp new/yast2-control-center-2.20.2/src/kcategorizedsortfilterproxymodel.cpp --- old/yast2-control-center-2.19.3/src/kcategorizedsortfilterproxymodel.cpp 2010-10-11 11:19:35.000000000 +0200 +++ new/yast2-control-center-2.20.2/src/kcategorizedsortfilterproxymodel.cpp 2011-03-18 10:47:14.000000000 +0100 @@ -323,11 +323,13 @@ return ( nameMatches || keywordMatches ); } -void KCategorizedSortFilterProxyModel::bublisFilterFunction( const QString &s ) +void KCategorizedSortFilterProxyModel::customFilterFunction( const QString &s ) { d->filterGroups.clear(); setFilterFixedString( s ); d->filterString = s; + invalidateFilter(); + invalidate(); } QString KCategorizedSortFilterProxyModel::matchingGroupFilterRegexp() diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-control-center-2.19.3/src/kcategorizedsortfilterproxymodel.h new/yast2-control-center-2.20.2/src/kcategorizedsortfilterproxymodel.h --- old/yast2-control-center-2.19.3/src/kcategorizedsortfilterproxymodel.h 2010-10-11 11:19:35.000000000 +0200 +++ new/yast2-control-center-2.20.2/src/kcategorizedsortfilterproxymodel.h 2011-03-18 10:47:14.000000000 +0100 @@ -116,7 +116,7 @@ */ static int naturalCompare(const QString &a, const QString &b); - void bublisFilterFunction( const QString &s ); + void customFilterFunction( const QString &s ); QString matchingGroupFilterRegexp(); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-control-center-2.19.3/src/kcategorizedview.cpp new/yast2-control-center-2.20.2/src/kcategorizedview.cpp --- old/yast2-control-center-2.19.3/src/kcategorizedview.cpp 2010-10-11 11:19:35.000000000 +0200 +++ new/yast2-control-center-2.20.2/src/kcategorizedview.cpp 2011-03-18 10:47:14.000000000 +0100 @@ -27,6 +27,7 @@ #include <QScrollBar> #include <QPaintEvent> #include <QDebug> +#include <iostream> #include "kcategorydrawer.h" @@ -174,10 +175,12 @@ int itemWidthPlusSeparation = listView->spacing() + itemWidth; if (!itemWidthPlusSeparation) itemWidthPlusSeparation++; + int elementsPerRow = viewportWidth / itemWidthPlusSeparation; if (!elementsPerRow) elementsPerRow++; + int column; int row; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-control-center-2.19.3/src/kde/CMakeLists.txt new/yast2-control-center-2.20.2/src/kde/CMakeLists.txt --- old/yast2-control-center-2.19.3/src/kde/CMakeLists.txt 2010-10-11 11:19:35.000000000 +0200 +++ new/yast2-control-center-2.20.2/src/kde/CMakeLists.txt 2011-03-18 10:47:14.000000000 +0100 @@ -10,4 +10,4 @@ ########### install files ############### install( FILES kcmyast.desktop DESTINATION ${SERVICES_INSTALL_DIR} ) -install( FILES emoticons.knsrc DESTINATION ${CONFIG_INSTALL_DIR} ) +#install( FILES emoticons.knsrc DESTINATION ${CONFIG_INSTALL_DIR} ) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-control-center-2.19.3/src/kde/kcmyast.desktop new/yast2-control-center-2.20.2/src/kde/kcmyast.desktop --- old/yast2-control-center-2.19.3/src/kde/kcmyast.desktop 1970-01-01 01:00:00.000000000 +0100 +++ new/yast2-control-center-2.20.2/src/kde/kcmyast.desktop 2011-03-18 10:47:14.000000000 +0100 @@ -0,0 +1,13 @@ +[Desktop Entry] +Exec=kcmshell4 kcm_yast +Icon=yast +Type=Service +X-DocPath=kcontrol/emoticons/index.html + +X-KDE-ServiceTypes=KCModule,KCModuleInit +X-KDE-Library=kcm_yast +X-KDE-ParentApp=kcontrol +X-KDE-System-Settings-Parent-Category=computer-administration +X-KDE-Weight=110 + +Name=Advanced Administration (YaST) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-control-center-2.19.3/src/kde/kcmyast.destop new/yast2-control-center-2.20.2/src/kde/kcmyast.destop --- old/yast2-control-center-2.19.3/src/kde/kcmyast.destop 2010-10-11 11:19:35.000000000 +0200 +++ new/yast2-control-center-2.20.2/src/kde/kcmyast.destop 1970-01-01 01:00:00.000000000 +0100 @@ -1,13 +0,0 @@ -[Desktop Entry] -Exec=kcmshell4 kcm_yast -Icon=yast -Type=Service -X-DocPath=kcontrol/emoticons/index.html - -X-KDE-ServiceTypes=KCModule,KCModuleInit -X-KDE-Library=kcm_yast -X-KDE-ParentApp=kcontrol -X-KDE-System-Settings-Parent-Category=computer-administration -X-KDE-Weight=110 - -Name=Advanced Administration (YaST) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-control-center-2.19.3/src/listview.h new/yast2-control-center-2.20.2/src/listview.h --- old/yast2-control-center-2.19.3/src/listview.h 1970-01-01 01:00:00.000000000 +0100 +++ new/yast2-control-center-2.20.2/src/listview.h 2011-03-18 10:47:14.000000000 +0100 @@ -0,0 +1,13 @@ +#include <QtGui> + +class ListView : public QListView +{ +public: + ListView() : QListView() { mySize = QSize(42,42); } + + QSize sizeHint() const { return mySize; } + void setSizeHint( QSize s ) { mySize = s; } + +private: + QSize mySize; +}; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-control-center-2.19.3/src/main_window.cpp new/yast2-control-center-2.20.2/src/main_window.cpp --- old/yast2-control-center-2.19.3/src/main_window.cpp 2010-10-11 11:19:35.000000000 +0200 +++ new/yast2-control-center-2.20.2/src/main_window.cpp 2011-03-18 10:47:14.000000000 +0100 @@ -38,12 +38,15 @@ #include "yqmodulesmodel.h" #include "yqmodulegroupsmodel.h" +#include "listview.h" //#include "moduleiconitem.h" #define ORG_NAME "YaST2" #define APP_NAME "y2controlcenter-qt" #define USED_QUEUE_SIZE 5 +#define GROUPSIZE QSize(200,350) + /* Textdomain "control-center" @@ -67,7 +70,7 @@ } YQModulesModel *modmodel; - QListView *groupview; + ListView *groupview; KCategorizedView * modview; // category proxy model KCategorizedSortFilterProxyModel * kcsfpm; @@ -144,9 +147,11 @@ d->gcsfpm->setFilterKeyColumn( 2 ); d->gcsfpm->setFilterRole( Qt::UserRole ); - d->groupview = new QListView( ); + d->groupview = new ListView( ); + d->groupview->setModel(d->gcsfpm); d->groupview->setIconSize( QSize(32,32) ); + d->groupview->setSizeHint( readGroupViewSize() ); //now pre-select something d->groupview->setSelectionMode( QAbstractItemView::SingleSelection ); @@ -192,6 +197,8 @@ connect( logSaver, SIGNAL( statusMsg( const QString &)), statusBar(), SLOT( showMessage( const QString &) )); + +// d->groupview->setSizeHint(500,500); } void MainWindow::setFullScreen( bool fs ) @@ -309,7 +316,7 @@ void MainWindow::slotFilterChanged() { QString stext = d->searchField->text(); - d->kcsfpm->bublisFilterFunction( stext ); + d->kcsfpm->customFilterFunction( stext ); QString gr_filter = d->kcsfpm->matchingGroupFilterRegexp(); d->gcsfpm->setFilterRegExp ( gr_filter ); @@ -348,6 +355,19 @@ } +QSize MainWindow::readGroupViewSize() +{ + QSettings settings(ORG_NAME, APP_NAME); + QSize size; + + settings.beginGroup("GroupView"); + size = settings.value("Size", GROUPSIZE).toSize(); + settings.endGroup(); + + return size; +} + + void MainWindow::writeSettings() { QSettings settings(ORG_NAME, APP_NAME); @@ -361,6 +381,11 @@ QStringList used_list( d->recentlyUsed ); settings.setValue( "RecentlyUsed", used_list.join(",") ); settings.endGroup(); + + settings.beginGroup("GroupView"); + settings.setValue("Size", d->groupview->size()); + settings.endGroup(); + } void MainWindow::setWinTitle() diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-control-center-2.19.3/src/main_window.h new/yast2-control-center-2.20.2/src/main_window.h --- old/yast2-control-center-2.19.3/src/main_window.h 2010-10-11 11:19:35.000000000 +0200 +++ new/yast2-control-center-2.20.2/src/main_window.h 2011-03-18 10:47:14.000000000 +0100 @@ -62,6 +62,9 @@ void writeSettings(); void readSettings(); void setWinTitle(); + QSize readGroupViewSize(); + + QDockWidget *groupdock; }; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-control-center-2.19.3/src/moduleiconitem.cpp new/yast2-control-center-2.20.2/src/moduleiconitem.cpp --- old/yast2-control-center-2.19.3/src/moduleiconitem.cpp 2010-10-11 11:19:35.000000000 +0200 +++ new/yast2-control-center-2.20.2/src/moduleiconitem.cpp 2011-03-18 10:47:14.000000000 +0100 @@ -20,8 +20,6 @@ */ #include "moduleiconitem.h" -//#include <kiconloader.h> -//#include <kdebug.h> #include "kcmoduleinfo.h" #include <climits> @@ -88,9 +86,6 @@ } painter->setFont( f ); -// if( index.data( Qt::UserRole ).toInt() == KIconLoader::DisabledState ) { -// painter->setPen( option.palette.color( QPalette::Disabled, QPalette::Text ) ); -// } QIcon::Mode iconMode = QIcon::Normal; if (selected) iconMode = QIcon::Selected; @@ -114,8 +109,8 @@ QFontMetrics fm( f ); QSize s = QItemDelegate::sizeHint( option, index ); - int w = lviewstyle->pixelMetric( QStyle::PM_FocusFrameHMargin ) + 2*lviewstyle->pixelMetric( QStyle::PM_ListViewIconSize ) + - + fm.boundingRect( text ).width(); + int w = 2*lviewstyle->pixelMetric( QStyle::PM_FocusFrameHMargin ) + 2*lviewstyle->pixelMetric( QStyle::PM_ListViewIconSize ) + 8 + fm.boundingRect( text ).width(); + return QSize( w, s.height()); } @@ -137,42 +132,4 @@ return path; } -/*ModuleIconItem::ModuleIconItem( QListWidget* parent, const KCModuleInfo& module) - :// QListWidgetItem(SmallIcon( module.icon(), IMAGE_SIZE ), module.moduleName(), parent), - imageName(module.icon()) -{ - - std::cout << "ModuleIconItem::ModuleIconItem" << std::endl; -// setData( Qt::UserRole, KIconLoader::DefaultState ); - modules.append(module); - setSize(); -} - -ModuleIconItem::ModuleIconItem( QListWidget* parent, const QString &text, - const QString &_imageName ) - : //QListWidgetItem( SmallIcon( _imageName, IMAGE_SIZE ), text, parent ), - imageName(_imageName) -{ - std::cout << "ModuleIconItem::ModuleIconItem" << std::endl; -// setData( Qt::UserRole, KIconLoader::DefaultState ); - setSize(); -} - -void ModuleIconItem::loadIcon( bool enabled ) -{ - std::cout << "ModuleIconItem::loadIcon" << std::endl; -// int newState = enabled ? KIconLoader::DefaultState : KIconLoader::DisabledState; -// if( newState == data( Qt::UserRole ).toInt() ) - return; - -// setData( Qt::UserRole, newState ); -// setIcon( DesktopIcon( imageName, IMAGE_SIZE , newState ) ); -} -void ModuleIconItem::setSize() -{ - QStyle *style = listWidget()->style(); - QFontMetrics fm(font()); - const QRect &rect = fm.boundingRect(0, 0, ICON_WIDTH, INT_MAX, Qt::TextWordWrap, text()); - setData(Qt::SizeHintRole, QSize(ICON_WIDTH, IMAGE_SIZE + style->pixelMetric(QStyle::PM_FocusFrameVMargin) + rect.height())); -}*/ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-control-center-2.19.3/src/modulesview.cpp new/yast2-control-center-2.20.2/src/modulesview.cpp --- old/yast2-control-center-2.19.3/src/modulesview.cpp 2010-10-11 11:19:35.000000000 +0200 +++ new/yast2-control-center-2.20.2/src/modulesview.cpp 1970-01-01 01:00:00.000000000 +0100 @@ -1,187 +0,0 @@ -/** - * This file is part of the System Settings package - * Copyright (C) 2005 Benjamin C Meyer (ben+systempreferences at meyerhome dot net) - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Library General Public License for more details. - * - * You should have received a copy of the GNU Library General Public License - * along with this library; see the file COPYING.LIB. If not, write to - * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - * Boston, MA 02110-1301, USA. - */ - -#include "modulesview.h" - -#include <qlabel.h> -#include <QListWidget> -#include <qlayout.h> -#include <QApplication> - -#include "kcmsearch.h" -#include "moduleiconitem.h" -#include "kcmodulemenu.h" -#include <iostream> - - -ModulesView::ModulesView( KCModuleMenu *rootMenu, const QString &menuPath, QWidget *parent ) : QWidget( parent ), rootMenu( NULL ) -{ - this->rootMenu = rootMenu; - this->menuPath = menuPath; - this->categories = KServiceTypeTrader::self()->query("SystemSettingsCategory"); - - QVBoxLayout *layout = new QVBoxLayout( this ); - layout->setMargin( KDialog::marginHint() ); - layout->setSpacing( KDialog::spacingHint() ); - layout->setObjectName( QLatin1String( "layout" ) ); - - displayName = this->rootMenu->caption; - - QList<MenuItem> subMenus = rootMenu->menuList(menuPath); - QList<MenuItem>::const_iterator it; - for ( it = subMenus.begin(); it != subMenus.end(); ++it ){ - if( !(*it).menu ) - continue; - - // After the first time around add a line - if( it != subMenus.begin() ){ - QFrame *line = new QFrame( this ); - line->setObjectName( QLatin1String( "line" ) ); - line->setFrameShadow( QFrame::Sunken ); - line->setFrameShape( QFrame::HLine ); - layout->addWidget( line ); - } - - // Build the row of modules/icons - createRow( (*it).subMenu, layout ); - } - layout->addStretch(1); - - setBackgroundRole(QPalette::Base); - setForegroundRole(QPalette::Text); - - /* - // Align them up! - uint most = 0; - QList<RowIconView*>::iterator it2; - for ( it2 = groups.begin(); it2 != groups.end(); ++it2 ){ - for (int i = 0; i < (*it2)->count(); ++i ) { - QListWidgetItem * item = (*it2)->item( i ); - if ( item && item->sizeHint().width() > most ) { - most = item->sizeHint().width(); - } - } - } -*/ -/*FIXME - for ( it = groups.begin(); it != groups.end(); ++it ) - (*it)->setGridX(most); - - } -*/ -} - -ModulesView::~ModulesView() -{ -} - -void ModulesView::createRow( const QString &parentPath, QBoxLayout *boxLayout ) -{ - //find the category name and search for it - QString categoryName = parentPath.section('/', -2, -2); - QString iconName; - for (int i = 0; i < categories.size(); ++i) { - const KService* entry = categories.at(i).data(); - if (entry->name() == categoryName) { - iconName = entry->icon(); - break; - } - } - - // Make header - QHBoxLayout *rowLayout = new QHBoxLayout(); - rowLayout->setMargin( 0 ); - rowLayout->setSpacing( 6 ); - rowLayout->setObjectName( QLatin1String( "rowLayout" ) ); - - // Header Icon - QLabel *icon = new QLabel( this ); - icon->setObjectName( QLatin1String( "groupicon" ) ); - icon->setPixmap( SmallIcon( iconName )); - QSizePolicy sp( QSizePolicy::Minimum, QSizePolicy::Preferred ); - sp.setHeightForWidth( icon->sizePolicy().hasHeightForWidth() ); - icon->setSizePolicy( sp ); - rowLayout->addWidget( icon ); - - // Header Name - QLabel *textLabel = new QLabel( this ); - textLabel->setObjectName( QLatin1String( "groupcaption" ) ); - textLabel->setText( categoryName ); - QSizePolicy sp1( QSizePolicy::Expanding, QSizePolicy::Preferred ); - sp1.setHeightForWidth( textLabel->sizePolicy().hasHeightForWidth() ); - textLabel->setSizePolicy( sp1 ); - QFont textLabel_font( textLabel->font() ); - textLabel_font.setBold( true ); - textLabel->setFont( textLabel_font ); - rowLayout->addWidget( textLabel ); - - boxLayout->addLayout( rowLayout ); - - // Make IconView - RowIconView* iconWidget = new RowIconView( this ); - connect(iconWidget, SIGNAL( itemClicked( QListWidgetItem* ) ), - this, SIGNAL( itemSelected( QListWidgetItem* ) ) ); - connect(iconWidget, SIGNAL( itemActivated( QListWidgetItem* ) ), - this, SIGNAL( itemSelected( QListWidgetItem* ) ) ); - groups.append( iconWidget ); - boxLayout->addWidget( iconWidget ); - - int height = 0; - // Add all the items in their proper order - QList<MenuItem> list = rootMenu->menuList( parentPath ); - QList<MenuItem>::const_iterator it; - for ( it = list.begin(); it != list.end(); ++it ){ - ModuleIconItem *item = NULL; - if( !(*it).menu ) { - item = new ModuleIconItem( iconWidget, (*it).item ); - } else { - QString path = (*it).subMenu; - - QString categoryCaption = (*it).caption; - QString iconFile; - for (int i = 0; i < categories.size(); ++i) { - const KService* entry = categories.at(i).data(); - if (entry->name() == categoryCaption) { - iconFile = entry->icon(); - break; - } - } - - const QList<KCModuleInfo> &modules = rootMenu->modules( path ); - if ( modules.count() > 0 ) { - item = new ModuleIconItem( iconWidget, categoryCaption, iconFile); - item->modules = modules; - } - } - if (item) height = qMax(height, item->data(Qt::SizeHintRole).toSize().height()); - } - - // give the proper height to make all the items visible - iconWidget->setMinimumHeight(height); -} - -void ModulesView::clearSelection() { - QList<RowIconView*>::const_iterator it; - for ( it = groups.begin(); it != groups.end(); ++it ) { - (*it)->clearSelection(); - } -} - -#include "modulesview.moc" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-control-center-2.19.3/src/modulesview.h new/yast2-control-center-2.20.2/src/modulesview.h --- old/yast2-control-center-2.19.3/src/modulesview.h 2010-10-11 11:19:35.000000000 +0200 +++ new/yast2-control-center-2.20.2/src/modulesview.h 1970-01-01 01:00:00.000000000 +0100 @@ -1,111 +0,0 @@ -/** - * This file is part of the System Preferences package - * Copyright (C) 2005 Benjamin C Meyer (ben+systempreferences at meyerhome dot net) - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Library General Public License for more details. - * - * You should have received a copy of the GNU Library General Public License - * along with this library; see the file COPYING.LIB. If not, write to - * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - * Boston, MA 02110-1301, USA. - */ - -#ifndef MODULESVIEW_H -#define MODULESVIEW_H - -#include "moduleiconitem.h" - -#include <QListWidget> -#include <QList> - -/** - * Overloaded to give a larger default size that fits with text of two lines. - */ -class RowIconView : public QListWidget -{ - -public: - RowIconView( QWidget* parent ) : QListWidget( parent ) - { - setResizeMode(Adjust); - setViewMode(IconMode); - setMovement(Static); - setFrameShape(NoFrame); - setWordWrap(true); - setItemDelegate(new ModuleIconItemDelegate(this)); - } - - // Figure out the hight/width to have only one row - QSize minimumSizeHint() const { - int width = 0; - /* - for ( QIconViewItem *item = firstItem(); item; item = item->nextItem() ) - width += item->width(); - width += spacing()*(count())+(margin()+frameWidth()+lineWidth()+midLineWidth())*2 ; - */ - - //width = count()*gridX()+frameWidth()*2; - width = count()*gridSize().width()+frameWidth()*2; - - int height =48; -//FIXME for ( Q3IconViewItem *item = firstItem(); item; item = item->nextItem() ) -// if(item->height() > height) -// height = item->height(); - // I honestly don't know where the 4+4 is coming from... - // What other spacing did I miss? - height += (/*margin()+*/frameWidth()+spacing()+lineWidth()+midLineWidth())*2+8; - -/* - int h = fontMetrics().height(); - if ( h < 10 ) - h = 10; - int f = 2 * frameWidth(); - int height = ( 2*h ) + f + spacing() * 2 + 32 + lineWidth()*2 + 10; - */ - return QSize( width, height ); - } -}; - -class QBoxLayout; -class KCModuleMenu; - -/** - * This widget contains the IconView's of all of the modules etc - * It is the basic thing that users see. - */ -class ModulesView : public QWidget -{ - // To search the groups - friend class KcmSearch; - -Q_OBJECT -public: - void clearSelection(); - QString displayName; - -signals: - void itemSelected( QListWidgetItem* item ); - -public: - ModulesView( KCModuleMenu *rootMenu, const QString &menuPath, QWidget *parent=0 ); - ~ModulesView(); - -private: - QList<RowIconView*> groups; - KCModuleMenu *rootMenu; - QString menuPath; - KService::List categories; - - void createRow( const QString &parentPath, QBoxLayout *layout ); -}; - -#endif // MODULESVIEW_H - ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 virtualbox for openSUSE:11.4
by root＠hilbert.suse.de 23 Mar '11

23 Mar '11

Hello community, here is the log from the commit of package virtualbox for openSUSE:11.4 checked in at Wed Mar 23 01:10:58 CET 2011. -------- --- old-versions/11.4/all/virtualbox/virtualbox.changes 2011-02-18 09:07:04.000000000 +0100 +++ 11.4/virtualbox/virtualbox.changes 2011-03-17 14:20:12.000000000 +0100 @@ -1,0 +2,11 @@ +Thu Mar 17 13:17:54 UTC 2011 - mseben(a)gmail.com + +- fix missing permissions handling of VBoxNetDHCP (bnc#679785) +- fix permissions handling for virtualbox-qt subpackage + +------------------------------------------------------------------- +Wed Mar 9 15:43:08 UTC 2011 - crrodriguez(a)opensuse.org + +- fix requires sysvinit(syslog) + +------------------------------------------------------------------- Package does not exist at destination yet. Using Fallback old-versions/11.4/all/virtualbox Destination is old-versions/11.4/UPDATES/all/virtualbox calling whatdependson for 11.4-i586 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ virtualbox.spec ++++++ --- /var/tmp/diff_new_pack.btWKd2/_old 2011-03-23 01:10:04.000000000 +0100 +++ /var/tmp/diff_new_pack.btWKd2/_new 2011-03-23 01:10:04.000000000 +0100 @@ -43,7 +43,7 @@ # ExclusiveArch: %ix86 x86_64 Version: 4.0.4 -Release: 1.<RELEASE2> +Release: 1.<RELEASE4> Summary: VirtualBox is an Emulator License: GPLv2+ Group: System/Emulators/PC @@ -100,6 +100,9 @@ #rename from ose version: Provides: %{name}-ose = %version Obsoletes: %{name}-ose < %version +%if 0%{suse_version} > 1130 +PreReq: sysvinit(syslog) +%endif %description VirtualBox is an extremely feature rich, high performance product @@ -119,6 +122,7 @@ #rename from "ose" version: Provides: %{name}-ose-qt = %version Obsoletes: %{name}-ose-qt < %version +PreReq: permissions %description qt Qt GUI part for %{name}. @@ -493,10 +497,30 @@ /sbin/ldconfig %fillup_and_insserv -f -y vboxdrv %fillup_only -an vboxes -%run_permissions +%if %suse_version >=1140 + %set_permissions +%else + %run_permissions +%endif %post qt -%run_permissions +%if %suse_version >=1140 + %set_permissions +%else + %run_permissions +%endif + +%verifyscript +%if %suse_version >=1140 + %verify_permissions -e %{_vbox_instdir}/VBoxNetDHCP +%endif +%if %suse_version > 1110 + %verify_permissions -e %{_vbox_instdir}/VBoxNetAdpCtl +%endif +%verify_permissions -e %{_vbox_instdir}/VBoxBFE -e %{_vbox_instdir}/VBoxHeadless -e %{_vbox_instdir}/VBoxSDL + +%verifyscript qt +%verify_permissions -e %{_vbox_instdir}/VirtualBox %post guest-tools %fillup_and_insserv -f -y vboxadd @@ -517,12 +541,6 @@ %postun guest-tools %restart_on_update vboxadd %insserv_cleanup -%verifyscript -%if %suse_version > 1110 -%verify_permissions -e %{_vbox_instdir}/VBoxBFE -e %{_vbox_instdir}/VBoxHeadless -e %{_vbox_instdir}/VBoxSDL -e %{_vbox_instdir}/VirtualBox -e %{_vbox_instdir}/VBoxNetAdpCtl -%else -%verify_permissions -e %{_vbox_instdir}/VBoxBFE -e %{_vbox_instdir}/VBoxHeadless -e %{_vbox_instdir}/VBoxSDL -e %{_vbox_instdir}/VirtualBox -%endif %clean [ -d "%{buildroot}" -a "%{buildroot}" != "" ] && %__rm -rf "%{buildroot}" @@ -584,7 +602,11 @@ %{_var}/adm/fillup-templates/sysconfig.vbox %{_sbindir}/rcvboxes %{_sbindir}/rcvboxdrv -#check setuid bit +%if %suse_version > 1140 +%verify(not mode) %attr(0755,root,vboxusers) %{_vbox_instdir}/VBoxNetDHCP +%else +%{_vbox_instdir}/VBoxNetDHCP +%endif %if %suse_version > 1110 %verify(not mode) %attr(0755,root,vboxusers) %{_vbox_instdir}/VBoxNetAdpCtl %else @@ -593,8 +615,6 @@ %verify(not mode) %attr(0755,root,vboxusers) %{_vbox_instdir}/VBoxBFE %verify(not mode) %attr(0755,root,vboxusers) %{_vbox_instdir}/VBoxHeadless %verify(not mode) %attr(0755,root,vboxusers) %{_vbox_instdir}/VBoxSDL -#%verify(not mode) %attr(0755,root,vboxusers) %{_vbox_instdir}/VBoxNetDHCP -%{_vbox_instdir}/VBoxNetDHCP # %files qt ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 openvpn for openSUSE:11.4
by root＠hilbert.suse.de 23 Mar '11

23 Mar '11

Hello community, here is the log from the commit of package openvpn for openSUSE:11.4 checked in at Wed Mar 23 01:09:39 CET 2011. -------- --- old-versions/11.4/all/openvpn/openvpn.changes 2011-02-17 12:01:00.000000000 +0100 +++ 11.4/openvpn/openvpn.changes 2011-03-21 15:27:42.000000000 +0100 @@ -1,0 +2,5 @@ +Tue Mar 15 21:05:23 UTC 2011 - crrodriguez(a)opensuse.org + +- KVPNC is unable to parse openvpn version [bnc#679153] + +------------------------------------------------------------------- Package does not exist at destination yet. Using Fallback old-versions/11.4/all/openvpn Destination is old-versions/11.4/UPDATES/all/openvpn calling whatdependson for 11.4-i586 Old: ---- openvpn-no-build-date.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ openvpn.spec ++++++ --- /var/tmp/diff_new_pack.NmI6SC/_old 2011-03-23 01:09:17.000000000 +0100 +++ /var/tmp/diff_new_pack.NmI6SC/_new 2011-03-23 01:09:17.000000000 +0100 @@ -28,7 +28,7 @@ PreReq: %insserv_prereq %fillup_prereq %endif Version: 2.1.4 -Release: 11.<RELEASE3> +Release: 11.<RELEASE16> Summary: Full-featured SSL VPN solution using a TUN/TAP Interface Source: http://openvpn.net/release/openvpn-%{upstream_version}.tar.gz Source1: http://openvpn.net/signatures/openvpn-%{upstream_version}.tar.gz.asc @@ -38,7 +38,6 @@ Source5: client-netconfig.down Patch1: %{name}-2.1-plugin-man.dif Patch2: %{name}-2.1-plugin-build.dif -Patch3: openvpn-no-build-date.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: lzo-devel openssl-devel BuildRequires: iproute2 pam-devel @@ -130,11 +129,13 @@ %setup -q -n %{name}-%{upstream_version} %patch1 -p0 %patch2 -p0 -%patch3 sed -e "s|@PLUGIN_DIR@|%{plugin_dir}|g" \ -e "s|@PLUGIN_LIBDIR@|%{plugin_libdir}|g" \ -e "s|@PLUGIN_DOCDIR@|%{_defaultdocdir}/%{name}|g" \ -i openvpn.8 +# the build __DATE__ causes obs rebuild/republish of binaries; +# use the date of version.m4 file in the tar archive instead +sed -e "s|\" __DATE__|$(date '+%b %e %Y' -r version.m4)\"|g" -i options.c %build autoreconf -fi ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 crystalhd for openSUSE:Factory
by root＠hilbert.suse.de 22 Mar '11

22 Mar '11

Hello community, here is the log from the commit of package crystalhd for openSUSE:Factory checked in at Tue Mar 22 18:01:59 CET 2011. -------- --- crystalhd/crystalhd.changes 2010-12-14 17:37:14.000000000 +0100 +++ /mounts/work_src_done/STABLE/crystalhd/crystalhd.changes 2011-03-16 10:59:31.000000000 +0100 @@ -1,0 +2,5 @@ +Wed Mar 16 09:57:06 UTC 2011 - ismail(a)namtrac.org + +- Fixed unused variable warnings to fix compilation with gcc 4.6 + +------------------------------------------------------------------- calling whatdependson for head-i586 New: ---- unused-variable.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ crystalhd.spec ++++++ --- /var/tmp/diff_new_pack.NFH27Y/_old 2011-03-22 18:01:43.000000000 +0100 +++ /var/tmp/diff_new_pack.NFH27Y/_new 2011-03-22 18:01:43.000000000 +0100 @@ -1,7 +1,7 @@ # -# spec file for package crystalhd (Version 3.10.0) +# spec file for package crystalhd # -# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2011 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 @@ -23,13 +23,15 @@ Summary: Broadcom Crystal HD driver KMP Group: System/Kernel Version: 3.10.0 -Release: 1 +Release: 5 License: GPLv2 Group: System/Kernel Source0: crystalhd-driver_%{version}-1.tar.bz2 Source1: README Source2: LICENSE Source3: preamble +# PATCH-FIX-OPENSUSE unused-variable.patch -- Remove unused variables to fix compilation with gcc 4.6 +Patch: unused-variable.patch Requires: crystalhd-firmware Recommends: gstreamer-0_10-plugin-crystalhd Url: http://www.broadcom.com/support/crystal_hd/ @@ -53,6 +55,7 @@ %prep %setup -q -n crystalhd-driver +%patch echo 'crystalhd.ko external' > Module.supported set -- * mkdir source ++++++ unused-variable.patch ++++++ --- crystalhd_hw.c 2010-12-07 18:18:41.000000000 +0100 +++ crystalhd_hw.c 2011-03-16 10:45:04.498009062 +0100 @@ -716,7 +716,7 @@ { struct device *dev; struct tx_dma_pkt *tx_dma_packet = NULL; - uint32_t low_addr, high_addr; + //uint32_t low_addr, high_addr; addr_64 desc_addr; BC_STATUS sts, add_sts; uint32_t dummy_index = 0; @@ -772,8 +772,8 @@ } desc_addr.full_addr = tx_dma_packet->desc_mem.phy_addr; - low_addr = desc_addr.low_part; - high_addr = desc_addr.high_part; + //low_addr = desc_addr.low_part; + //high_addr = desc_addr.high_part; tx_dma_packet->call_back = call_back; tx_dma_packet->cb_event = cb_event; --- crystalhd_fleafuncs.c 2010-12-07 18:18:41.000000000 +0100 +++ crystalhd_fleafuncs.c 2011-03-16 10:51:22.826009081 +0100 @@ -168,7 +168,7 @@ { int32_t ddr2_speed_grade[2]; uint32_t sd_0_col_size, sd_0_bank_size, sd_0_row_size; - uint32_t sd_1_col_size, sd_1_bank_size, sd_1_row_size; + //uint32_t sd_1_col_size, sd_1_bank_size, sd_1_row_size; uint32_t ddr3_mode[2]; uint32_t regVal; bool bDDR3Detected=false; /*Should be filled in using the detection logic. Default to DDR2 */ @@ -182,9 +182,9 @@ sd_0_bank_size = BANK_SIZE_8; sd_0_row_size = ROW_SIZE_8K; /* DDR2 */ /* sd_0_row_size = ROW_SIZE_16K; // DDR3 */ - sd_1_col_size = COL_BITS_10; - sd_1_bank_size = BANK_SIZE_8; - sd_1_row_size = ROW_SIZE_8K; + //sd_1_col_size = COL_BITS_10; + //sd_1_bank_size = BANK_SIZE_8; + //sd_1_row_size = ROW_SIZE_8K; ddr3_mode[0] = 0; ddr3_mode[1] = 0; @@ -193,7 +193,7 @@ { ddr3_mode[0] = 1; sd_0_row_size = ROW_SIZE_16K; /* DDR3 */ - sd_1_row_size = ROW_SIZE_16K; /* DDR3 */ + //sd_1_row_size = ROW_SIZE_16K; /* DDR3 */ } @@ -844,7 +844,7 @@ bool StChangeSuccess=false; uint32_t tempFLL = 0; uint32_t freeListLen = 0; - BC_STATUS sts; + //BC_STATUS sts; struct crystalhd_rx_dma_pkt *rx_pkt = NULL; freeListLen = crystalhd_dioq_count(hw->rx_freeq); @@ -868,7 +868,7 @@ { rx_pkt = crystalhd_dioq_fetch(hw->rx_freeq); if (rx_pkt) - sts = hw->pfnPostRxSideBuff(hw, rx_pkt); + hw->pfnPostRxSideBuff(hw, rx_pkt); } /*printk(" Success\n"); */ @@ -892,7 +892,7 @@ { rx_pkt = crystalhd_dioq_fetch(hw->rx_freeq); if (rx_pkt) - sts = hw->pfnPostRxSideBuff(hw, rx_pkt); + hw->pfnPostRxSideBuff(hw, rx_pkt); } if (hw->PwrDwnTxIntr) { --- crystalhd_flea_ddr.c 2010-12-07 18:18:41.000000000 +0100 +++ crystalhd_flea_ddr.c 2011-03-16 10:56:14.138009092 +0100 @@ -317,11 +317,11 @@ uint8_t DIS_ODT = 0; uint8_t EN_2T_TIMING = 0; uint8_t CWL = 0; - uint8_t DQ_WIDTH = 0; + //uint8_t DQ_WIDTH = 0; - uint8_t DM_IDLE_MODE = 0; - uint8_t CTL_IDLE_MODE = 0; - uint8_t DQ_IDLE_MODE = 0; + //uint8_t DM_IDLE_MODE = 0; + //uint8_t CTL_IDLE_MODE = 0; + //uint8_t DQ_IDLE_MODE = 0; uint8_t DIS_LATENCY_CTRL = 0; @@ -452,9 +452,9 @@ DIS_ODT = 0; /*Power Saving Controls */ - DM_IDLE_MODE = 0; - CTL_IDLE_MODE = 0; - DQ_IDLE_MODE = 0; + //DM_IDLE_MODE = 0; + //CTL_IDLE_MODE = 0; + //DQ_IDLE_MODE = 0; /*Latency Control Setting */ DIS_LATENCY_CTRL = 0; @@ -462,7 +462,7 @@ /* ****** Start of Grain/Flea specific fixed settings ***** */ CS0_ONLY = 1 ; /* 16-bit mode only */ INTLV_DISABLE = 1 ; /* Interleave is always disabled */ - DQ_WIDTH = 16 ; + //DQ_WIDTH = 16 ; /* ****** End of Grain specific fixed settings ***** */ #if 0 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 prctl for openSUSE:Factory
by root＠hilbert.suse.de 22 Mar '11

22 Mar '11

Hello community, here is the log from the commit of package prctl for openSUSE:Factory checked in at Tue Mar 22 18:01:01 CET 2011. -------- --- prctl/prctl.changes 2010-11-19 10:34:46.000000000 +0100 +++ /mounts/work_src_done/STABLE/prctl/prctl.changes 2011-03-21 17:50:16.000000000 +0100 @@ -1,0 +2,5 @@ +Mon Mar 21 16:50:15 UTC 2011 - coolo(a)novell.com + +- licenses package is about to die + +------------------------------------------------------------------- calling whatdependson for head-i586 New: ---- COPYING ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ prctl.spec ++++++ --- /var/tmp/diff_new_pack.jusw3e/_old 2011-03-22 18:00:50.000000000 +0100 +++ /var/tmp/diff_new_pack.jusw3e/_new 2011-03-22 18:00:50.000000000 +0100 @@ -1,7 +1,7 @@ # -# spec file for package prctl (Version 1.5) +# spec file for package prctl # -# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2011 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,16 +21,15 @@ Name: prctl Summary: A utility to perform process operations Version: 1.5 -Release: 1 +Release: 6 Group: System/Monitoring License: GPLv2+ Url: http://sourceforge.net/projects/prctl Source0: prctl-%{version}.tar.gz +Source1: COPYING Patch0: prctl-1.5-Makefile.patch Patch1: prctl-1.5-warnings.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build -BuildRequires: licenses -Requires: licenses %description The prctl utility allows a user to control certain process behaviors in @@ -38,6 +37,7 @@ %prep %setup -q +cp %{S:1} . %patch0 -p1 -b .makefile %patch1 -p0 -b .warnings @@ -46,7 +46,6 @@ %install %{makeinstall} -%{__ln_s} -f %{_datadir}/doc/licenses/GPL-2.0.txt COPYING %clean %{__rm} -rf %{buildroot} ++++++ COPYING ++++++ GNU GENERAL PUBLIC LICENSE Version 2, June 1991 Copyright (C) 1989, 1991 Free Software Foundation, Inc. 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA Everyone is permitted to copy and distribute verbatim copies of this license document, but changing it is not allowed. Preamble The licenses for most software are designed to take away your freedom to share and change it. By contrast, the GNU General Public License is intended to guarantee your freedom to share and change free software--to make sure the software is free for all its users. This General Public License applies to most of the Free Software Foundation's software and to any other program whose authors commit to using it. (Some other Free Software Foundation software is covered by the GNU Library General Public License instead.) You can apply it to your programs, too. When we speak of free software, we are referring to freedom, not price. Our General Public Licenses are designed to make sure that you have the freedom to distribute copies of free software (and charge for this service if you wish), that you receive source code or can get it if you want it, that you can change the software or use pieces of it in new free programs; and that you know you can do these things. To protect your rights, we need to make restrictions that forbid anyone to deny you these rights or to ask you to surrender the rights. These restrictions translate to certain responsibilities for you if you distribute copies of the software, or if you modify it. For example, if you distribute copies of such a program, whether gratis or for a fee, you must give the recipients all the rights that you have. You must make sure that they, too, receive or can get the source code. And you must show them these terms so they know their rights. We protect your rights with two steps: (1) copyright the software, and (2) offer you this license which gives you legal permission to copy, distribute and/or modify the software. Also, for each author's protection and ours, we want to make certain that everyone understands that there is no warranty for this free software. If the software is modified by someone else and passed on, we want its recipients to know that what they have is not the original, so that any problems introduced by others will not reflect on the original authors' reputations. Finally, any free program is threatened constantly by software patents. We wish to avoid the danger that redistributors of a free program will individually obtain patent licenses, in effect making the program proprietary. To prevent this, we have made it clear that any patent must be licensed for everyone's free use or not licensed at all. The precise terms and conditions for copying, distribution and modification follow. GNU GENERAL PUBLIC LICENSE TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION 0. This License applies to any program or other work which contains a notice placed by the copyright holder saying it may be distributed under the terms of this General Public License. The "Program", below, refers to any such program or work, and a "work based on the Program" means either the Program or any derivative work under copyright law: that is to say, a work containing the Program or a portion of it, either verbatim or with modifications and/or translated into another language. (Hereinafter, translation is included without limitation in the term "modification".) Each licensee is addressed as "you". Activities other than copying, distribution and modification are not covered by this License; they are outside its scope. The act of running the Program is not restricted, and the output from the Program is covered only if its contents constitute a work based on the Program (independent of having been made by running the Program). Whether that is true depends on what the Program does. 1. You may copy and distribute verbatim copies of the Program's source code as you receive it, in any medium, provided that you conspicuously and appropriately publish on each copy an appropriate copyright notice and disclaimer of warranty; keep intact all the notices that refer to this License and to the absence of any warranty; and give any other recipients of the Program a copy of this License along with the Program. You may charge a fee for the physical act of transferring a copy, and you may at your option offer warranty protection in exchange for a fee. 2. You may modify your copy or copies of the Program or any portion of it, thus forming a work based on the Program, and copy and distribute such modifications or work under the terms of Section 1 above, provided that you also meet all of these conditions: a) You must cause the modified files to carry prominent notices stating that you changed the files and the date of any change. b) You must cause any work that you distribute or publish, that in whole or in part contains or is derived from the Program or any part thereof, to be licensed as a whole at no charge to all third parties under the terms of this License. c) If the modified program normally reads commands interactively when run, you must cause it, when started running for such interactive use in the most ordinary way, to print or display an announcement including an appropriate copyright notice and a notice that there is no warranty (or else, saying that you provide a warranty) and that users may redistribute the program under these conditions, and telling the user how to view a copy of this License. (Exception: if the Program itself is interactive but does not normally print such an announcement, your work based on the Program is not required to print an announcement.) These requirements apply to the modified work as a whole. If identifiable sections of that work are not derived from the Program, and can be reasonably considered independent and separate works in themselves, then this License, and its terms, do not apply to those sections when you distribute them as separate works. But when you distribute the same sections as part of a whole which is a work based on the Program, the distribution of the whole must be on the terms of this License, whose permissions for other licensees extend to the entire whole, and thus to each and every part regardless of who wrote it. Thus, it is not the intent of this section to claim rights or contest your rights to work written entirely by you; rather, the intent is to exercise the right to control the distribution of derivative or collective works based on the Program. In addition, mere aggregation of another work not based on the Program with the Program (or with a work based on the Program) on a volume of a storage or distribution medium does not bring the other work under the scope of this License. 3. You may copy and distribute the Program (or a work based on it, under Section 2) in object code or executable form under the terms of Sections 1 and 2 above provided that you also do one of the following: a) Accompany it with the complete corresponding machine-readable source code, which must be distributed under the terms of Sections 1 and 2 above on a medium customarily used for software interchange; or, b) Accompany it with a written offer, valid for at least three years, to give any third party, for a charge no more than your cost of physically performing source distribution, a complete machine-readable copy of the corresponding source code, to be distributed under the terms of Sections 1 and 2 above on a medium customarily used for software interchange; or, c) Accompany it with the information you received as to the offer to distribute corresponding source code. (This alternative is allowed only for noncommercial distribution and only if you received the program in object code or executable form with such an offer, in accord with Subsection b above.) The source code for a work means the preferred form of the work for making modifications to it. For an executable work, complete source code means all the source code for all modules it contains, plus any associated interface definition files, plus the scripts used to control compilation and installation of the executable. However, as a special exception, the source code distributed need not include anything that is normally distributed (in either source or binary form) with the major components (compiler, kernel, and so on) of the operating system on which the executable runs, unless that component itself accompanies the executable. If distribution of executable or object code is made by offering access to copy from a designated place, then offering equivalent access to copy the source code from the same place counts as distribution of the source code, even though third parties are not compelled to copy the source along with the object code. 4. You may not copy, modify, sublicense, or distribute the Program except as expressly provided under this License. Any attempt otherwise to copy, modify, sublicense or distribute the Program is void, and will automatically terminate your rights under this License. However, parties who have received copies, or rights, from you under this License will not have their licenses terminated so long as such parties remain in full compliance. 5. You are not required to accept this License, since you have not signed it. However, nothing else grants you permission to modify or distribute the Program or its derivative works. These actions are prohibited by law if you do not accept this License. Therefore, by modifying or distributing the Program (or any work based on the Program), you indicate your acceptance of this License to do so, and all its terms and conditions for copying, distributing or modifying the Program or works based on it. 6. Each time you redistribute the Program (or any work based on the Program), the recipient automatically receives a license from the original licensor to copy, distribute or modify the Program subject to these terms and conditions. You may not impose any further restrictions on the recipients' exercise of the rights granted herein. You are not responsible for enforcing compliance by third parties to this License. 7. If, as a consequence of a court judgment or allegation of patent infringement or for any other reason (not limited to patent issues), conditions are imposed on you (whether by court order, agreement or otherwise) that contradict the conditions of this License, they do not excuse you from the conditions of this License. If you cannot distribute so as to satisfy simultaneously your obligations under this License and any other pertinent obligations, then as a consequence you may not distribute the Program at all. For example, if a patent license would not permit royalty-free redistribution of the Program by all those who receive copies directly or indirectly through you, then the only way you could satisfy both it and this License would be to refrain entirely from distribution of the Program. If any portion of this section is held invalid or unenforceable under any particular circumstance, the balance of the section is intended to apply and the section as a whole is intended to apply in other circumstances. It is not the purpose of this section to induce you to infringe any patents or other property right claims or to contest validity of any such claims; this section has the sole purpose of protecting the integrity of the free software distribution system, which is implemented by public license practices. Many people have made generous contributions to the wide range of software distributed through that system in reliance on consistent application of that system; it is up to the author/donor to decide if he or she is willing to distribute software through any other system and a licensee cannot impose that choice. This section is intended to make thoroughly clear what is believed to be a consequence of the rest of this License. 8. If the distribution and/or use of the Program is restricted in certain countries either by patents or by copyrighted interfaces, the original copyright holder who places the Program under this License may add an explicit geographical distribution limitation excluding those countries, so that distribution is permitted only in or among countries not thus excluded. In such case, this License incorporates the limitation as if written in the body of this License. 9. The Free Software Foundation may publish revised and/or new versions of the General Public License from time to time. Such new versions will be similar in spirit to the present version, but may differ in detail to address new problems or concerns. Each version is given a distinguishing version number. If the Program specifies a version number of this License which applies to it and "any later version", you have the option of following the terms and conditions either of that version or of any later version published by the Free Software Foundation. If the Program does not specify a version number of this License, you may choose any version ever published by the Free Software Foundation. 10. If you wish to incorporate parts of the Program into other free programs whose distribution conditions are different, write to the author to ask for permission. For software which is copyrighted by the Free Software Foundation, write to the Free Software Foundation; we sometimes make exceptions for this. Our decision will be guided by the two goals of preserving the free status of all derivatives of our free software and of promoting the sharing and reuse of software generally. NO WARRANTY 11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION. 12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES. END OF TERMS AND CONDITIONS How to Apply These Terms to Your New Programs If you develop a new program, and you want it to be of the greatest possible use to the public, the best way to achieve this is to make it free software which everyone can redistribute and change under these terms. To do so, attach the following notices to the program. It is safest to attach them to the start of each source file to most effectively convey the exclusion of warranty; and each file should have at least the "copyright" line and a pointer to where the full notice is found. <one line to give the program's name and a brief idea of what it does.> Copyright (C) 19yy <name of author> This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version. This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA Also add information on how to contact you by electronic and paper mail. If the program is interactive, make it output a short notice like this when it starts in an interactive mode: Gnomovision version 69, Copyright (C) 19yy name of author Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'. This is free software, and you are welcome to redistribute it under certain conditions; type `show c' for details. The hypothetical commands `show w' and `show c' should show the appropriate parts of the General Public License. Of course, the commands you use may be called something other than `show w' and `show c'; they could even be mouse-clicks or menu items--whatever suits your program. You should also get your employer (if you work as a programmer) or your school, if any, to sign a "copyright disclaimer" for the program, if necessary. Here is a sample; alter the names: Yoyodyne, Inc., hereby disclaims all copyright interest in the program `Gnomovision' (which makes passes at compilers) written by James Hacker. <signature of Ty Coon>, 1 April 1989 Ty Coon, President of Vice This General Public License does not permit incorporating your program into proprietary programs. If your program is a subroutine library, you may consider it more useful to permit linking proprietary applications with the library. If this is what you want to do, use the GNU Library General Public License instead of this License. ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 tunctl for openSUSE:Factory
by root＠hilbert.suse.de 22 Mar '11

22 Mar '11

Hello community, here is the log from the commit of package tunctl for openSUSE:Factory checked in at Tue Mar 22 17:59:47 CET 2011. -------- --- tunctl/tunctl.changes 2011-02-16 18:22:28.000000000 +0100 +++ /mounts/work_src_done/STABLE/tunctl/tunctl.changes 2011-03-21 17:49:32.000000000 +0100 @@ -1,0 +2,5 @@ +Mon Mar 21 16:49:31 UTC 2011 - coolo(a)novell.com + +- licenses package is about to die + +------------------------------------------------------------------- calling whatdependson for head-i586 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ tunctl.spec ++++++ --- /var/tmp/diff_new_pack.oEgsYi/_old 2011-03-22 17:59:40.000000000 +0100 +++ /var/tmp/diff_new_pack.oEgsYi/_new 2011-03-22 17:59:40.000000000 +0100 @@ -20,7 +20,7 @@ Name: tunctl Version: 1.5 -Release: 9 +Release: 10 Summary: Create and remove virtual network interfaces Group: System/Management License: GPLv2+ @@ -30,8 +30,6 @@ Patch0: %{name}-%{version}-install-manpage-noexec.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build -Requires: licenses -BuildRequires: licenses BuildRequires: docbook-utils %description @@ -56,8 +54,6 @@ make DESTDIR="%{buildroot}" BIN_DIR=/sbin install %{__install} -d -m 0755 %{buildroot}/%{_docdir}/%{name}/ %{__install} -m 0644 ChangeLog %{buildroot}/%{_docdir}/%{name}/ -%{__ln_s} -f %{_datadir}/doc/licenses/md5/0636e73ff0215e8d672dc4c32c317bb3 \ - %{buildroot}%{_docdir}/%{name}/COPYING %clean %{__rm} -rf %{buildroot} ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 balsa for openSUSE:Factory
by root＠hilbert.suse.de 22 Mar '11

22 Mar '11

Hello community, here is the log from the commit of package balsa for openSUSE:Factory checked in at Tue Mar 22 17:59:25 CET 2011. -------- --- GNOME/balsa/balsa.changes 2011-02-12 20:23:30.000000000 +0100 +++ /mounts/work_src_done/STABLE/balsa/balsa.changes 2011-03-22 16:32:50.000000000 +0100 @@ -1,0 +2,8 @@ +Mon Mar 21 20:10:45 CET 2011 - sbrabec(a)suse.cz + +- Support touchscreen version of balsa. +- Fixed URL. +- Added desktop file integration patch (bgo#645444). +- Fixed libnotify for 11.3 and older. + +------------------------------------------------------------------- calling whatdependson for head-i586 New: ---- balsa-mail-handler.patch balsa-new-autotools.patch pre_checkin.sh ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ balsa.spec ++++++ --- /var/tmp/diff_new_pack.GMkI14/_old 2011-03-22 17:58:24.000000000 +0100 +++ /var/tmp/diff_new_pack.GMkI14/_new 2011-03-22 17:58:24.000000000 +0100 @@ -18,16 +18,21 @@ Name: balsa +%define TOUCHSCREEN_OPTIMIZATION %(echo %{name} | grep -qv touchscreen ; echo $?) +%define base_name balsa Version: 2.4.9 -Release: 2 +Release: 7 License: GPLv2+ Summary: The GNOME Mail Program -Url: http://balsa.gnome.org/ +Url: http://pawsa.fedorapeople.org/balsa/ Group: Productivity/Networking/Email/Clients -Source: %{name}-%{version}.tar.bz2 +Source: %{base_name}-%{version}.tar.bz2 # PATCH-FIX-UPSTREAM balsa-fix-scrollkeeper.patch bgo#636805 vuntz(a)opensuse.org -- Respect --disable-scrollkeeper Patch0: balsa-fix-scrollkeeper.patch -%define TOUCHSCREEN_OPTIMIZATION 0 +# PATCH-FEATURE-UPSTREAM balsa-mail-handler.patch bgo645444 sbrabec(a)suse.cz -- Offer balsa in gnome-default-applications-properties. +Patch1: balsa-mail-handler.patch +# PATCH-FEATURE-UPSTREAM balsa-new-autotools.patch bgo645530 sbrabec(a)suse.cz -- Fix for new autoconf, fix minimal libnotify version. +Patch2: balsa-new-autotools.patch BuildRequires: compface BuildRequires: fdupes BuildRequires: gnome-doc-utils-devel @@ -58,19 +63,36 @@ BuildRequires: pkgconfig(sqlite3) BuildRequires: pkgconfig(unique-1.0) BuildRequires: pkgconfig(webkit-1.0) -Recommends: %{name}-lang +Recommends: %{base_name}-lang +%if "%{name}" != "%{base_name}" +Conflicts: %{base_name} +%endif BuildRoot: %{_tmppath}/%{name}-%{version}-build +# lang packages are exactly equal for both balsa variants. Build it only once: +%if "%{name}" == "%{base_name}" +%define BUILD_LANG 1 +%else +%define BUILD_LANG 0 +%endif %description Nice GUI program to manage e-mail. +%if %BUILD_LANG %lang_package +%endif + %prep -%setup -q +%setup -q -n %{base_name}-%{version} translation-update-upstream %patch0 -p1 +mv balsa.desktop.in balsa.desktop.in.in +cp -a balsa.desktop.in.in balsa-mailto-handler.desktop.in.in +%patch1 -p1 +%patch2 -p1 %build +mkdir -p m4 ; gnome-doc-prepare -f ; autoreconf -f -i %configure\ %if %TOUCHSCREEN_OPTIMIZATION --enable-touch-ui\ @@ -96,8 +118,14 @@ %makeinstall # Change sr@Latn to sr@latin mv %{buildroot}%{_datadir}/locale/sr@Latn %{buildroot}%{_datadir}/locale/sr@latin -%suse_update_desktop_file -G "Mail Client" %{name} -%find_lang balsa %{?no_lang_C} +%suse_update_desktop_file -G "Mail Client" %{base_name} +%suse_update_desktop_file -G "Mail Client" %{base_name}-mailto-handler +%if %BUILD_LANG +%find_lang %{base_name} %{?no_lang_C} +%else +rm -r %{buildroot}%{_datadir}/locale %{buildroot}%{_datadir}/omf %{buildroot}%{_datadir}/gnome/help +rmdir %{buildroot}%{_datadir}/gnome +%endif %fdupes %{buildroot}%{_datadir} %clean @@ -137,6 +165,9 @@ %doc %{_mandir}/man1/balsa.1* %config %{_sysconfdir}/sound/events/*.soundlist -%files lang -f balsa.lang +%if %BUILD_LANG + +%files lang -f %{base_name}.lang +%endif %changelog ++++++ balsa-fix-scrollkeeper.patch ++++++ --- /var/tmp/diff_new_pack.GMkI14/_old 2011-03-22 17:58:25.000000000 +0100 +++ /var/tmp/diff_new_pack.GMkI14/_new 2011-03-22 17:58:25.000000000 +0100 @@ -32,3 +32,18 @@ fi # glib-genmarshal +Index: balsa-2.4.9/configure.in +=================================================================== +--- balsa-2.4.9.orig/configure.in ++++ balsa-2.4.9/configure.in +@@ -246,10 +246,8 @@ AM_CONDITIONAL([BUILD_WITH_G_D_U], [test + if test $with_g_d_u = yes ; then + GNOME_DOC_INIT + AM_CONDITIONAL([HAVE_GNOME_DOC_UTILS],[true]) +-AM_CONDITIONAL([ENABLE_SK],[true]) + else + AM_CONDITIONAL([HAVE_GNOME_DOC_UTILS],[false]) +-AM_CONDITIONAL([ENABLE_SK],[false]) + fi + + # glib-genmarshal ++++++ balsa-mail-handler.patch ++++++ Index: balsa-2.4.9/configure.in =================================================================== --- balsa-2.4.9.orig/configure.in +++ balsa-2.4.9/configure.in @@ -281,6 +281,7 @@ dnl #################################### dnl GNOME libs dnl ##################################################################### if test x$with_gnome != xno; then + TOOLKIT_CATEGORIES="GNOME;GTK;" gnome_extras="libgnome-2.0 libgnomeui-2.0 libbonobo-2.0 gconf-2.0" AC_MSG_CHECKING([whether we have gnome-keyring]) if $PKG_CONFIG --atleast-version=1.0 gnome-keyring-1; then @@ -298,9 +299,11 @@ if test x$with_gnome != xno; then AC_MSG_RESULT($with_gnome_keyring) AC_DEFINE(HAVE_GNOME,1,[Defined when gnome libs are available.]) else + TOOLKIT_CATEGORIES="GTK;" gnome_extras="" fi AM_CONDITIONAL([BUILD_WITH_GNOME], [test $with_gnome = "yes"]) +AC_SUBST(TOOLKIT_CATEGORIES) dnl ##################################################################### dnl 4. Libraries. @@ -997,6 +1000,8 @@ AC_OUTPUT([ Makefile balsa.1 balsa.spec +balsa.desktop.in +balsa-mailto-handler.desktop.in po/Makefile.in sounds/Makefile images/Makefile Index: balsa-2.4.9/Makefile.am =================================================================== --- balsa-2.4.9.orig/Makefile.am +++ balsa-2.4.9/Makefile.am @@ -9,8 +9,8 @@ pixmapdir = $(datadir)/pixmaps pixmap_DATA = gnome-balsa2.png desktopdir = $(datadir)/applications -desktop_in_files = balsa.desktop.in -desktop_DATA = balsa.desktop +desktop_in_files = balsa.desktop.in balsa-mailto-handler.desktop.in +desktop_DATA = balsa.desktop balsa-mailto-handler.desktop @INTLTOOL_DESKTOP_RULE@ balsa_extra_dist = \ @@ -19,7 +19,6 @@ balsa_extra_dist = \ balsa-mail-style.xml \ balsa-mail.lang \ balsa.1.in \ - balsa.desktop.in \ balsa.spec.in \ bootstrap.sh \ docs/mh-mail-HOWTO \ Index: balsa-2.4.9/balsa.desktop.in.in =================================================================== --- balsa-2.4.9.orig/balsa.desktop.in +++ balsa-2.4.9/balsa.desktop.in.in @@ -1,6 +1,8 @@ [Desktop Entry] _Name=Balsa _Comment=E-Mail utility +_GenericName=Mail Client +X-GNOME-FullName=Balsa Mail Client TryExec=balsa Exec=balsa Icon=gnome-balsa2 @@ -9,4 +9,4 @@ Icon=gnome-balsa2 Terminal=false Type=Application StartupNotify=true -Categories=GNOME;Network;Email; +Categories=@TOOLKIT_CATEGORIES@Network;Email; Index: balsa-2.4.9/balsa-mailto-handler.desktop.in.in =================================================================== --- balsa-2.4.9.orig/balsa.desktop.in +++ balsa-2.4.9/balsa-mailto-handler.desktop.in.in @@ -1,10 +1,14 @@ [Desktop Entry] _Name=Balsa _Comment=E-Mail utility +_GenericName=Mail Client +X-GNOME-FullName=Balsa Mail Client TryExec=balsa -Exec=balsa +Exec=balsa -m %U Icon=gnome-balsa2 Terminal=false Type=Application StartupNotify=true -Categories=GNOME;Network;Email; +Categories=@TOOLKIT_CATEGORIES@Network;Email; +MimeType=x-scheme-handler/mailto; +NoDisplay=true ++++++ balsa-new-autotools.patch ++++++ Index: balsa-2.4.9/configure.in =================================================================== --- balsa-2.4.9.orig/configure.in +++ balsa-2.4.9/configure.in @@ -713,8 +713,8 @@ fi # Libnotify configuration if test x$with_libnotify != xno; then PKG_CHECK_MODULES(NOTIFY, [ libnotify >= 0.7.0 ], [notifyver=7], - PKG_CHECK_MODULES(NOTIFY, [ libnotify >= 0.5.0 ], [notifyver=5], - [AC_MSG_ERROR([*** You enabled notify but the library is not found.])])) + [PKG_CHECK_MODULES(NOTIFY, [ libnotify >= 0.4.0 ], [notifyver=4], + [AC_MSG_ERROR([*** You enabled notify but the library is not found.])])]) AC_DEFINE_UNQUOTED(HAVE_NOTIFY,$notifyver, [Defined when libnotify can be used.]) BALSA_LIBS="$BALSA_LIBS $NOTIFY_LIBS" ++++++ pre_checkin.sh ++++++ #!/bin/bash CANONICAL_NAME=balsa # Actually, this file is dummy. Touchscreen version does not work properly. (bgo#641735) #VARIANTS=("" -touchscreen) for VAR in "${VARIANTS[@]}" ; do NAME=$CANONICAL_NAME$VAR if test $NAME = $CANONICAL_NAME ; then continue fi if test $CANONICAL_NAME.spec -ot $NAME.spec ; then echo "$CANONICAL_NAME.spec is older than $NAME.spec. Please merge changes manually and call pre-checkin.sh again." exit 1 fi if test $CANONICAL_NAME.changes -ot $NAME.changes ; then echo "$CANONICAL_NAME.changes is older than $NAME.changes. Please merge changes manually and call pre-checkin.sh again." exit 1 fi sed "s/^Name: *$CANONICAL_NAME$/&$VAR/" <$CANONICAL_NAME.spec >$NAME.spec cp -a $CANONICAL_NAME.changes $NAME.changes done touch $CANONICAL_NAME.spec $CANONICAL_NAME.changes ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 kiwi for openSUSE:Factory
by root＠hilbert.suse.de 22 Mar '11

22 Mar '11

Hello community, here is the log from the commit of package kiwi for openSUSE:Factory checked in at Tue Mar 22 17:58:02 CET 2011. -------- --- kiwi/kiwi.changes 2011-03-21 16:06:56.000000000 +0100 +++ /mounts/work_src_done/STABLE/kiwi/kiwi.changes 2011-03-22 13:23:18.000000000 +0100 @@ -1,0 +2,16 @@ +Tue Mar 22 13:12:38 CET 2011 - ms(a)suse.de + +- fixed start of udev and blogd + +------------------------------------------------------------------- +Tue Mar 22 11:47:06 CET 2011 - ms(a)suse.de + +- enable loading of agp modules before udev is started (bnc #659843) + +------------------------------------------------------------------- +Tue Mar 22 08:36:16 CET 2011 - ms(a)suse.de + +- reverts commit 8f5df54fd23cc6c16e7d72fe5954e62fd70bb458 + busybox is distributed with 11.4 (bnc #679660) + +------------------------------------------------------------------- calling whatdependson for head-i586 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kiwi.spec ++++++ --- /var/tmp/diff_new_pack.7gDGlZ/_old 2011-03-22 17:57:40.000000000 +0100 +++ /var/tmp/diff_new_pack.7gDGlZ/_new 2011-03-22 17:57:40.000000000 +0100 @@ -66,7 +66,7 @@ %endif Summary: OpenSuSE - KIWI Image System Version: 4.82 -Release: 1 +Release: 2 Group: System/Management License: GPLv2 Source: %{name}.tar.bz2 ++++++ kiwi.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/.revision new/kiwi/.revision --- old/kiwi/.revision 2011-03-18 14:26:05.000000000 +0100 +++ new/kiwi/.revision 2011-03-18 14:26:05.000000000 +0100 @@ -1 +1 @@ -a65d7d7eb8780e42462df6b18429a9c93622efce +4c0dbabe52edd5da25069676731a5ab6124c2589 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/modules/KIWIConfig.sh new/kiwi/modules/KIWIConfig.sh --- old/kiwi/modules/KIWIConfig.sh 2011-03-21 16:02:02.000000000 +0100 +++ new/kiwi/modules/KIWIConfig.sh 2011-03-22 13:18:53.000000000 +0100 @@ -984,6 +984,7 @@ gettext diff bc utimer cmp busybox kexec pam_console_apply setterm kpartx vgcfgbackup vgcfgrestore lsdasd dasd_configure qeth_configure fdasd mkdosfs egrep mkfs.xfs mdadm yes fdisk + startproc " tools="$tools $@" for path in /sbin /usr/sbin /usr/bin /bin;do diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/modules/KIWILinuxRC.sh new/kiwi/modules/KIWILinuxRC.sh --- old/kiwi/modules/KIWILinuxRC.sh 2011-03-16 14:57:08.000000000 +0100 +++ new/kiwi/modules/KIWILinuxRC.sh 2011-03-22 13:18:53.000000000 +0100 @@ -518,6 +518,16 @@ fi } #====================================== +# udevTrigger +#-------------------------------------- +function udevTrigger { + if [ -x /sbin/udevadm ];then + /sbin/udevadm trigger + else + /sbin/udevtrigger + fi +} +#====================================== # udevSystemStart #-------------------------------------- function udevSystemStart { @@ -570,19 +580,40 @@ createInitialDevices /dev # terminal devices mount -t devpts devpts /dev/pts + # load modules required before udev + moduleLoadBeforeUdev # start the udev daemon - udevd udev_log="debug" & - echo UDEVD_PID=$! >> /iprocs - # trigger udev events - if [ -x /sbin/udevadm ];then - /sbin/udevadm trigger - else - /sbin/udevtrigger - fi + startproc /sbin/udevd --daemon + UDEVD_PID=$(pidof /sbin/udevd) + echo UDEVD_PID=$UDEVD_PID >> /iprocs + # trigger events for all devices + udevTrigger + # wait for events to finish + udevPending # start splashy if configured startSplashy } #====================================== +# moduleLoadBeforeUdev +#-------------------------------------- +function moduleLoadBeforeUdev { + # /.../ + # load modules which have to be loaded before the + # udev daemon is started in this function + # ---- + loadAGPModules +} +#====================================== +# loadAGPModules +#-------------------------------------- +function loadAGPModules { + local krunning=$(uname -r) + for i in /lib/modules/$krunning/kernel/drivers/char/agp/*; do + test -e $i || continue + modprobe $(echo $i | sed "s#.*\\/\$[^\\/]\\+\$.ko#\\1#") + done +} +#====================================== # udevKill #-------------------------------------- function udevKill { @@ -605,8 +636,8 @@ > /dev/shm/initrd.msg ln -sf /dev/shm/initrd.msg /var/log/boot.msg mkdir -p /var/run - /sbin/blogd $REDIRECT - BLOGD_PID=$(cat /var/run/blogd.pid) + startproc /sbin/blogd $REDIRECT + BLOGD_PID=$(pidof /sbin/blogd) echo BLOGD_PID=$BLOGD_PID >> /iprocs fi } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/system/boot/ix86/isoboot/suse-SLED11/config.xml new/kiwi/system/boot/ix86/isoboot/suse-SLED11/config.xml --- old/kiwi/system/boot/ix86/isoboot/suse-SLED11/config.xml 2010-12-03 16:08:51.000000000 +0100 +++ new/kiwi/system/boot/ix86/isoboot/suse-SLED11/config.xml 2011-03-22 13:18:54.000000000 +0100 @@ -27,6 +27,8 @@ <file name="usb/storage/usb-storage.ko"/> </drivers> <drivers type="drivers"> + <file name="drivers/gpu/drm/i915/i915.ko"/> + <file name="drivers/char/agp/intel-agp.ko"/> <file name="crypto/*"/> <file name="drivers/virtio/*"/> <file name="drivers/block/virtio_blk.ko"/> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/system/boot/ix86/isoboot/suse-SLES11/config.xml new/kiwi/system/boot/ix86/isoboot/suse-SLES11/config.xml --- old/kiwi/system/boot/ix86/isoboot/suse-SLES11/config.xml 2010-12-03 16:08:51.000000000 +0100 +++ new/kiwi/system/boot/ix86/isoboot/suse-SLES11/config.xml 2011-03-22 13:18:54.000000000 +0100 @@ -27,6 +27,8 @@ <file name="usb/storage/usb-storage.ko"/> </drivers> <drivers type="drivers"> + <file name="drivers/gpu/drm/i915/i915.ko"/> + <file name="drivers/char/agp/intel-agp.ko"/> <file name="crypto/*"/> <file name="drivers/virtio/*"/> <file name="drivers/block/virtio_blk.ko"/> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/system/boot/ix86/netboot/suse-11.4/config.xml new/kiwi/system/boot/ix86/netboot/suse-11.4/config.xml --- old/kiwi/system/boot/ix86/netboot/suse-11.4/config.xml 2011-03-15 12:07:26.000000000 +0100 +++ new/kiwi/system/boot/ix86/netboot/suse-11.4/config.xml 2011-03-22 13:18:54.000000000 +0100 @@ -169,6 +169,7 @@ <package name="psmisc"/> <package name="iputils"/> <package name="atftp"/> + <package name="busybox"/> <package name="bind-libs"/> <package name="bind-utils"/> <package name="dhcpcd"/> @@ -202,6 +203,7 @@ <package name="clicfs"/> <package name="iputils"/> <package name="atftp"/> + <package name="busybox"/> <package name="dhcpcd"/> <package name="file"/> <package name="hwinfo"/> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/system/boot/ix86/netboot/suse-SLED11/config.xml new/kiwi/system/boot/ix86/netboot/suse-SLED11/config.xml --- old/kiwi/system/boot/ix86/netboot/suse-SLED11/config.xml 2011-01-20 09:19:55.000000000 +0100 +++ new/kiwi/system/boot/ix86/netboot/suse-SLED11/config.xml 2011-03-22 13:18:54.000000000 +0100 @@ -30,6 +30,8 @@ <file name="usb/storage/usb-storage.ko"/> </drivers> <drivers type="drivers" profiles="default,xen"> + <file name="drivers/gpu/drm/i915/i915.ko"/> + <file name="drivers/char/agp/intel-agp.ko"/> <file name="drivers/md/*"/> <file name="drivers/hid/*"/> <file name="drivers/ide/*"/> @@ -67,6 +69,8 @@ <file name="drivers/acpi/dock.ko"/> </drivers> <drivers type="drivers" profiles="diskless"> + <file name="drivers/gpu/drm/i915/i915.ko"/> + <file name="drivers/char/agp/intel-agp.ko"/> <file name="drivers/md/*"/> <file name="drivers/ide/*"/> <file name="drivers/block/loop.ko"/> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/system/boot/ix86/netboot/suse-SLES11/config.xml new/kiwi/system/boot/ix86/netboot/suse-SLES11/config.xml --- old/kiwi/system/boot/ix86/netboot/suse-SLES11/config.xml 2011-01-20 09:19:55.000000000 +0100 +++ new/kiwi/system/boot/ix86/netboot/suse-SLES11/config.xml 2011-03-22 13:18:54.000000000 +0100 @@ -30,6 +30,8 @@ <file name="usb/storage/usb-storage.ko"/> </drivers> <drivers type="drivers" profiles="default,xen"> + <file name="drivers/gpu/drm/i915/i915.ko"/> + <file name="drivers/char/agp/intel-agp.ko"/> <file name="drivers/md/*"/> <file name="drivers/hid/*"/> <file name="drivers/ide/*"/> @@ -67,6 +69,8 @@ <file name="drivers/acpi/dock.ko"/> </drivers> <drivers type="drivers" profiles="diskless"> + <file name="drivers/gpu/drm/i915/i915.ko"/> + <file name="drivers/char/agp/intel-agp.ko"/> <file name="drivers/md/*"/> <file name="drivers/ide/*"/> <file name="drivers/block/loop.ko"/> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/system/boot/ix86/oemboot/suse-11.4/config.xml new/kiwi/system/boot/ix86/oemboot/suse-11.4/config.xml --- old/kiwi/system/boot/ix86/oemboot/suse-11.4/config.xml 2011-03-15 12:07:26.000000000 +0100 +++ new/kiwi/system/boot/ix86/oemboot/suse-11.4/config.xml 2011-03-22 13:18:55.000000000 +0100 @@ -106,6 +106,7 @@ <packages type="image"> <package name="curl"/> <package name="atftp"/> + <package name="busybox"/> <package name="parted"/> <package name="adaptec-firmware"/> <package name="dialog"/> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/system/boot/ix86/oemboot/suse-SLED11/config.xml new/kiwi/system/boot/ix86/oemboot/suse-SLED11/config.xml --- old/kiwi/system/boot/ix86/oemboot/suse-SLED11/config.xml 2010-12-03 16:08:52.000000000 +0100 +++ new/kiwi/system/boot/ix86/oemboot/suse-SLED11/config.xml 2011-03-22 13:18:55.000000000 +0100 @@ -22,6 +22,8 @@ <profile name="rt" description="KERNEL: RealTime kernel"/> </profiles> <drivers type="drivers"> + <file name="drivers/gpu/drm/i915/i915.ko"/> + <file name="drivers/char/agp/intel-agp.ko"/> <file name="crypto/*"/> <file name="drivers/thermal/*"/> <file name="drivers/hwmon/*"/> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/system/boot/ix86/oemboot/suse-SLES11/config.xml new/kiwi/system/boot/ix86/oemboot/suse-SLES11/config.xml --- old/kiwi/system/boot/ix86/oemboot/suse-SLES11/config.xml 2010-12-03 16:08:52.000000000 +0100 +++ new/kiwi/system/boot/ix86/oemboot/suse-SLES11/config.xml 2011-03-22 13:18:55.000000000 +0100 @@ -22,6 +22,8 @@ <profile name="rt" description="KERNEL: RealTime kernel"/> </profiles> <drivers type="drivers"> + <file name="drivers/gpu/drm/i915/i915.ko"/> + <file name="drivers/char/agp/intel-agp.ko"/> <file name="crypto/*"/> <file name="drivers/thermal/*"/> <file name="drivers/hwmon/*"/> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/system/boot/ix86/vmxboot/suse-SLED11/config.xml new/kiwi/system/boot/ix86/vmxboot/suse-SLED11/config.xml --- old/kiwi/system/boot/ix86/vmxboot/suse-SLED11/config.xml 2010-12-03 16:08:52.000000000 +0100 +++ new/kiwi/system/boot/ix86/vmxboot/suse-SLED11/config.xml 2011-03-22 13:18:55.000000000 +0100 @@ -22,6 +22,8 @@ <profile name="rt" description="KERNEL: RealTime kernel"/> </profiles> <drivers type="drivers"> + <file name="drivers/gpu/drm/i915/i915.ko"/> + <file name="drivers/char/agp/intel-agp.ko"/> <file name="crypto/*"/> <file name="drivers/virtio/*"/> <file name="drivers/block/virtio_blk.ko"/> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/system/boot/ix86/vmxboot/suse-SLES11/config.xml new/kiwi/system/boot/ix86/vmxboot/suse-SLES11/config.xml --- old/kiwi/system/boot/ix86/vmxboot/suse-SLES11/config.xml 2010-12-03 16:08:52.000000000 +0100 +++ new/kiwi/system/boot/ix86/vmxboot/suse-SLES11/config.xml 2011-03-22 13:18:55.000000000 +0100 @@ -22,6 +22,8 @@ <profile name="rt" description="KERNEL: RealTime kernel"/> </profiles> <drivers type="drivers"> + <file name="drivers/gpu/drm/i915/i915.ko"/> + <file name="drivers/char/agp/intel-agp.ko"/> <file name="crypto/*"/> <file name="drivers/virtio/*"/> <file name="drivers/block/virtio_blk.ko"/> ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 smartmontools for openSUSE:Factory
by root＠hilbert.suse.de 22 Mar '11

22 Mar '11

Hello community, here is the log from the commit of package smartmontools for openSUSE:Factory checked in at Tue Mar 22 17:56:10 CET 2011. -------- --- smartmontools/smartmontools.changes 2011-02-03 17:25:25.000000000 +0100 +++ /mounts/work_src_done/STABLE/smartmontools/smartmontools.changes 2011-03-21 17:48:36.000000000 +0100 @@ -1,0 +2,5 @@ +Mon Mar 21 16:48:36 UTC 2011 - coolo(a)novell.com + +- licenses package is about to die + +------------------------------------------------------------------- calling whatdependson for head-i586 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ smartmontools.spec ++++++ --- /var/tmp/diff_new_pack.N9WtJ0/_old 2011-03-22 17:55:57.000000000 +0100 +++ /var/tmp/diff_new_pack.N9WtJ0/_new 2011-03-22 17:55:57.000000000 +0100 @@ -22,7 +22,7 @@ License: GPLv2+ Group: Hardware/Other Version: 5.40 -Release: 4 +Release: 13 Source: %{name}-%{version}.tar.bz2 Source2: smartmontools.sysconfig Source3: %{name}-rpmlintrc @@ -42,10 +42,6 @@ %if %suse_version <= 1100 Requires: powersave %endif -%if %suse_version > 1020 -Requires: licenses -BuildRequires: licenses -%endif Url: http://smartmontools.sourceforge.net/ BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: gcc-c++ @@ -120,9 +116,6 @@ mkdir -p $RPM_BUILD_ROOT%{_localstatedir}/lib/smartmontools #remove installed files we don't want to package rm -r $RPM_BUILD_ROOT%{_sysconfdir}/rc.d/init.d/ -%if %suse_version > 1020 -ln -sf %{_datadir}/doc/licenses/md5/$(md5sum COPYING | sed 's/ .*//') $RPM_BUILD_ROOT%{_docdir}/%{name}/COPYING -%endif cat >$RPM_BUILD_ROOT%{_sysconfdir}/smart_drivedb.h <<EOF /* smart_drivedb.h: Custom drive database. See also %{_datadir}/smartmontools/drivedb.h. */ EOF ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 mtools for openSUSE:Factory
by root＠hilbert.suse.de 22 Mar '11

22 Mar '11

Hello community, here is the log from the commit of package mtools for openSUSE:Factory checked in at Tue Mar 22 17:55:25 CET 2011. -------- --- mtools/mtools.changes 2010-11-16 12:00:47.000000000 +0100 +++ /mounts/work_src_done/STABLE/mtools/mtools.changes 2011-03-17 11:11:48.000000000 +0100 @@ -1,0 +2,5 @@ +Thu Mar 17 11:13:49 CET 2011 - pgajdos(a)suse.cz + +- fixed crash caused with access of invalid memory [bnc#679459] + +------------------------------------------------------------------- calling whatdependson for head-i586 New: ---- mtools-4.0.15-invalid-memory.diff ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ mtools.spec ++++++ --- /var/tmp/diff_new_pack.PnXyJQ/_old 2011-03-22 17:54:55.000000000 +0100 +++ /var/tmp/diff_new_pack.PnXyJQ/_new 2011-03-22 17:54:55.000000000 +0100 @@ -1,7 +1,7 @@ # -# spec file for package mtools (Version 4.0.15) +# spec file for package mtools # -# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2011 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,7 +21,7 @@ Name: mtools BuildRequires: libpng texlive-latex xorg-x11 xorg-x11-devel Version: 4.0.15 -Release: 1 +Release: 7 AutoReqProv: on Group: System/Filesystems License: GPLv2+ @@ -33,6 +33,7 @@ Patch3: %{name}-%{version}-aliasing.diff Patch4: %{name}-%{version}-fat-bits.diff Patch5: %{name}-%{version}-prototypes.diff +Patch6: %{name}-%{version}-invalid-memory.diff BuildRoot: %{_tmppath}/%{name}-%{version}-build %description @@ -93,6 +94,7 @@ %patch3 %patch4 %patch5 +%patch6 -p1 %build %{suse_update_config -f} ++++++ mtools-4.0.15-invalid-memory.diff ++++++ Index: mtools-4.0.15/fat.c =================================================================== --- mtools-4.0.15.orig/fat.c +++ mtools-4.0.15/fat.c @@ -468,7 +468,7 @@ void fat_write(Fs_t *This) set_dword(infoSector->signature2, INFOSECT_SIGNATURE2); set_dword(infoSector->pos, This->last); set_dword(infoSector->count, This->freeSpace); - set_dword(infoSector->signature3, 0xaa55); + set_word(infoSector->signature3, 0xaa55); if(forceWriteSector(This, (char *)infoSector, This->infoSectorLoc, 1) != (signed int) This->sector_size) fprintf(stderr,"Trouble writing the info sector\n"); ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 inkscape for openSUSE:Factory
by root＠hilbert.suse.de 22 Mar '11

22 Mar '11

Hello community, here is the log from the commit of package inkscape for openSUSE:Factory checked in at Tue Mar 22 17:54:25 CET 2011. -------- --- GNOME/inkscape/inkscape.changes 2011-02-12 20:26:04.000000000 +0100 +++ /mounts/work_src_done/STABLE/inkscape/inkscape.changes 2011-03-22 10:54:04.000000000 +0100 @@ -1,0 +2,5 @@ +Tue Mar 22 08:00:15 UTC 2011 - idoenmez(a)novell.com + +- Add inkscape-0.48.0-gcc46.patch: fix compilation with gcc 4.6 + +------------------------------------------------------------------- calling whatdependson for head-i586 New: ---- inkscape-0.48.0-gcc46.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ inkscape.spec ++++++ --- /var/tmp/diff_new_pack.Eo0dIM/_old 2011-03-22 17:54:16.000000000 +0100 +++ /var/tmp/diff_new_pack.Eo0dIM/_new 2011-03-22 17:54:16.000000000 +0100 @@ -19,7 +19,7 @@ Name: inkscape Version: 0.48.1 -Release: 2 +Release: 8 License: GPLv2 ; LGPLv2.1 Summary: Vector Illustration Program Url: http://www.inkscape.org/ @@ -32,6 +32,8 @@ Patch0: inkscape-remove-datetime.patch # PATCH-FIX-OPENSUSE inkscape-packages.patch sbrabec(a)suse.cz -- Suggest packages instead of compilation from source. Patch1: inkscape-packages.patch +# PATCH-FIX-UPSTREAM inkscape-0.48.0-gcc46.patch idoenmez(a)suse.de -- Fix compilation with gcc 4.6 +Patch2: inkscape-0.48.0-gcc46.patch BuildRequires: boost-devel BuildRequires: docbook-toys BuildRequires: fdupes @@ -156,6 +158,7 @@ %setup -q %patch0 -p1 %patch1 -p1 +%patch2 -p1 %build export CFLAGS="%{optflags} -fno-strict-aliasing" ++++++ inkscape-0.48.0-gcc46.patch ++++++ ++++ 1032 lines (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 libzip for openSUSE:Factory
by root＠hilbert.suse.de 22 Mar '11

22 Mar '11

Hello community, here is the log from the commit of package libzip for openSUSE:Factory checked in at Tue Mar 22 17:53:57 CET 2011. -------- --- libzip/libzip.changes 2011-03-21 16:24:41.000000000 +0100 +++ /mounts/work_src_done/STABLE/libzip/libzip.changes 2011-03-22 13:44:24.000000000 +0100 @@ -1,0 +2,10 @@ +Tue Mar 22 12:43:04 UTC 2011 - coolo(a)novell.com + +- fix -devel dependency + +------------------------------------------------------------------- +Tue Mar 22 11:29:09 UTC 2011 - mvyskocil(a)suse.cz + +- don't move zipconf.h to include dir + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- libzip-0.10-zipconf-location.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libzip.spec ++++++ --- /var/tmp/diff_new_pack.8NfZw2/_old 2011-03-22 17:53:36.000000000 +0100 +++ /var/tmp/diff_new_pack.8NfZw2/_new 2011-03-22 17:53:36.000000000 +0100 @@ -20,7 +20,7 @@ Name: libzip Version: 0.10 -Release: 1 +Release: 2 Summary: C library for reading, creating, and modifying zip archives License: BSD3c Group: Development/Libraries/C and C++ @@ -34,14 +34,11 @@ Patch0: libzip-0.8.hg20080403-visibility.patch #PATCH-FIX-UPSTREAM: for for failing tests by Thomas Klausner Patch1: libzip.test.diff -#PATCH-FIX-OPENSUSE: install zipconf.h to includedir -Patch2: libzip-0.10-zipconf-location.patch %description libzip is a C library for reading, creating, and modifying zip archives. Files can be added from data buffers, files, or compressed. This -package contains a set of small utilities built using libzip2 Set os small -utilities built around %{name} +package contains a set of small utilities built using libzip * zipmerge - merge source zip archives into the target one * zipcmp - compares the zip archives and check if they contains same files * ziptorrent - manipulate with a restricted file format used for using bittorrent on zip files. @@ -51,7 +48,9 @@ Summary: C library for reading, creating, and modifying zip archives Group: Development/Libraries/C and C++ -%description -n libzip2 +%define soname 2 + +%description -n libzip%{soname} This is libzip, a C library for reading, creating, and modifying zip archives. Files can be added from data buffers, files, or compressed data copied directly from other zip archives. Changes made without @@ -62,7 +61,7 @@ License: BSD3c Summary: C library for reading, creating, and modifying zip archives Group: Development/Libraries/C and C++ -Requires: libzip1 = %{version} glibc-devel +Requires: libzip%{soname} = %{version} glibc-devel %description devel libzip is a C library for reading, creating, and modifying zip @@ -72,7 +71,6 @@ %setup -q -n %{name}-%{version} %patch0 -p1 %patch1 -p1 -%patch2 -p1 %build autoreconf -fiv @@ -91,9 +89,9 @@ %clean rm -rf %{buildroot} -%post -n libzip2 -p /sbin/ldconfig +%post -n libzip%{soname} -p /sbin/ldconfig -%postun -n libzip2 -p /sbin/ldconfig +%postun -n libzip%{soname} -p /sbin/ldconfig %files %defattr(-,root,root) @@ -103,15 +101,16 @@ %{_bindir}/zipmerge %{_mandir}/man1/*.1* -%files -n libzip2 +%files -n libzip%{soname} %defattr(-,root,root) -%{_libdir}/libzip.so.2* +%{_libdir}/libzip.so.%{soname}* %files devel %defattr(-,root,root) -%{_libdir}/libzip.so -%{_includedir}/zip*.h -%{_libdir}/pkgconfig/libzip.pc +%{_libdir}/%{name}.so +%{_includedir}/zip.h +%{_libdir}/%{name}/ +%{_libdir}/pkgconfig/%{name}.pc %{_mandir}/man3/*.3* %changelog ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 merkaartor for openSUSE:Factory
by root＠hilbert.suse.de 22 Mar '11

22 Mar '11

Hello community, here is the log from the commit of package merkaartor for openSUSE:Factory checked in at Tue Mar 22 17:53:32 CET 2011. -------- New Changes file: --- /dev/null 2010-08-26 16:28:41.000000000 +0200 +++ merkaartor/merkaartor.changes 2011-03-22 13:16:18.000000000 +0100 @@ -0,0 +1,84 @@ +------------------------------------------------------------------- +Tue Mar 22 11:40:15 UTC 2011 - saschpe(a)suse.de + +- Don't cleanup buildroot in %%install section +- Use default file permissions in %%files section + +------------------------------------------------------------------- +Wed Feb 2 14:44:24 UTC 2011 - saschpe(a)suse.de + +- Fixed icon directory ownership by requiring hicolor-icon-scheme + +------------------------------------------------------------------- +Wed Jan 26 12:00:00 UTC 2011 - opensuse(a)dstoecker.de + +- update to 0.17.0 + +------------------------------------------------------------------- +Wed Dec 8 14:17:30 UTC 2010 - saschpe(a)suse.de + +- Spec file cleanup + * Moved changelog into changes file + * Fixed openSUSE-11.2 build + +------------------------------------------------------------------- +Thu Aug 19 00:00:00 UTC 2010 - opensuse(a)dstoecker.de + +- Build version 0.16.3 (minor fixes) + +------------------------------------------------------------------- +Mon Jun 14 00:00:00 UTC 2010 - opensuse(a)dstoecker.de + +- Build version 0.16.1 + - FIX : crash when deleting relations + - ADD : Allow to move complete relations + - FIX : First feature not OSM exported + - FIX : WMS'es in EPSG:4326 not showing + - FIX : Don't overzoom on layer zoom (and don't allow if the bbox is null). fixes #3046 + - ADD : Add a "portable" mode to merkaartor via command-line ("-p") or build setting ("PORTABLE=1") + +------------------------------------------------------------------- +Wed Apr 7 00:00:00 UTC 2010 - joop.boonen(a)opensuse.org 0.15.3 + +- Build version 0.15.3 + +------------------------------------------------------------------- +Mon Mar 8 00:00:00 UTC 2010 - opensuse(a)dstoecker.de + +- update to 0.15.2 + +------------------------------------------------------------------- +Wed Aug 12 00:00:00 UTC 2009 - opensuse(a)dstoecker.de + +- update to 0.14 + +------------------------------------------------------------------- +Thu Apr 2 00:00:00 UTC 2009 - opensuse(a)dstoecker.de + +- update to 0.13.1 + +------------------------------------------------------------------- +Mon Mar 16 00:00:00 UTC 2009 - opensuse(a)dstoecker.de + +- update to 0.13 + +------------------------------------------------------------------- +Wed Oct 15 00:00:00 UTC 2008 - opensuse(a)dstoecker.de + +- update to 0.12 + +------------------------------------------------------------------- +Thu Aug 7 00:00:00 UTC 2008 - opensuse(a)dstoecker.de + +- update to 0.11 + +------------------------------------------------------------------- +Fri Apr 11 00:00:00 UTC 2008 - opensuse(a)dstoecker.de + +- update to 0.0.10 + +------------------------------------------------------------------- +Sun Mar 23 00:00:00 UTC 2008 - Dirk Stöcker 0.0.9 + +- first version + calling whatdependson for head-i586 New: ---- merkaartor-0.17.2.tar.bz2 merkaartor.changes merkaartor.desktop merkaartor.png merkaartor.spec merkaartor.xml x-kml+xml.desktop x-mdc+xml.desktop x-nmea.desktop x-noniplot.desktop x-osb.desktop ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ merkaartor.spec ++++++ # # spec file for package merkaartor # # Copyright (c) 2011 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/ # # norootforbuild Name: merkaartor Version: 0.17.2 Release: 1 License: GPLv3+ BuildRoot: %{_tmppath}/%{name}-%{version}-build AutoReqProv: on Group: Productivity/Graphics/Other Url: http://www.irule.be/bvh/c++/merkaartor/ Summary: Small QT-based OpenStreetMap editor Source: %{name}-%{version}.tar.bz2 Source2: %{name}.desktop Source3: %{name}.png BuildRequires: boost-devel gcc gcc-c++ gpsd-devel libxslt-devel BuildRequires: libQtWebKit-devel libgdal-devel libproj-devel BuildRequires: hicolor-icon-theme libspatialite-devel libzbar-devel %if 0%{?suse_version} >= 1020 BuildRequires: libexiv2-devel %endif %if 0%{?suse_version} >= 1130 BuildRequires: libxml2-devel %else BuildRequires: libxml-devel %endif %if 0%{?mandriva_version} BuildRequires: X11-devel qt4-devel %else %if 0%{?fedora_version} BuildRequires: qt4 qt4-devel %else BuildRequires: qt-devel %endif BuildRequires: xorg-x11-devel %endif %if 0%{?suse_version} >= 1000 PreReq: shared-mime-info Source9: merkaartor.xml %endif %if 0%{?suse_version} < 1120 Source4: x-mdc+xml.desktop Source5: x-kml+xml.desktop Source6: x-nmea.desktop Source7: x-noniplot.desktop Source8: x-osb.desktop %if 0%{?suse_version} # for >= 11.1 validity tests BuildRequires: kdelibs3 %endif %endif %if 0%{?suse_version} == 1120 BuildRequires: hicolor-icon-theme %endif %description Merkaartor is a small editor for OpenStreetMap available under the GNU General Public License and developed using the Qt toolkit. It has some unique features like anti-aliased displaying, transparent display of map features like roads and true curved roads. %prep %setup %define lrelease lrelease %define qmake qmake %build # seems PROJ=1 is buggy at the moment %if 0%{?suse_version} >= 1020 %if 0%{?suse_version} >= 1120 %define flags NODEBUG=1 GDAL=1 GPSDLIB=1 PROJ=1 ZBAR=1 SPATIALITE=1 GEOIMAGE=1 LIBDIR=%{_libdir} %else %define flags NODEBUG=1 GDAL=1 GPSD=1 GEOIMAGE=1 FORCE_CUSTOM_STYLE=1 LIBDIR=%{_libdir} %endif %else %define flags NODEBUG=1 GDAL=1 GPSD=1 GEOIMAGE=0 FORCE_CUSTOM_STYLE=1 LIBDIR=%{_libdir} %endif %if 0%{?mandriva_version} %define lrelease lrelease-qt4 %define qmake qmake-qt4 %else %if 0%{?fedora_version} %define lrelease lrelease-qt4 %define qmake qmake-qt4 %endif %endif %{lrelease} Merkaartor.pro %{qmake} Merkaartor.pro PREFIX=%{_prefix} %{flags} %install make INSTALL_ROOT=%{buildroot} install install -d 755 %{buildroot}/%{_datadir}/applications install -m 644 %{SOURCE2} %{buildroot}/%{_datadir}/applications/%{name}.desktop install -d 755 %{buildroot}/%{_datadir}/pixmaps install -m 644 %{SOURCE3} %{buildroot}/%{_datadir}/pixmaps/%{name}.png %if 0%{?suse_version} < 1120 install -d 755 $RPM_BUILD_ROOT/opt/kde3/share/mimelnk/application/ install -m 644 %SOURCE4 $RPM_BUILD_ROOT/opt/kde3/share/mimelnk/application/ install -m 644 %SOURCE5 $RPM_BUILD_ROOT/opt/kde3/share/mimelnk/application/ install -m 644 %SOURCE6 $RPM_BUILD_ROOT/opt/kde3/share/mimelnk/application/ install -m 644 %SOURCE7 $RPM_BUILD_ROOT/opt/kde3/share/mimelnk/application/ install -m 644 %SOURCE8 $RPM_BUILD_ROOT/opt/kde3/share/mimelnk/application/ %endif %if 0%{?suse_version} >= 1000 install -d 755 $RPM_BUILD_ROOT/usr/share/mime/packages/ install -m 644 %SOURCE9 $RPM_BUILD_ROOT/usr/share/mime/packages/ %endif %if 0%{?suse_version} >= 1000 %post # update mime and desktop database if [ -f usr/bin/update-mime-database ] ; then usr/bin/update-mime-database /usr/share/mime > /dev/null || : fi if [ -f usr/bin/update-desktop-database ] ; then usr/bin/update-desktop-database > /dev/null || : fi %postun if [ -f usr/bin/update-mime-database ] ; then usr/bin/update-mime-database /usr/share/mime > /dev/null || : fi if [ -f usr/bin/update-desktop-database ] ; then usr/bin/update-desktop-database > /dev/null || : fi %endif %clean %{__rm} -rf %{buildroot} %files %defattr(-,root,root,-) %doc AUTHORS CHANGELOG HACKING LICENSE %{_bindir}/* %{_datadir}/applications/* %{_datadir}/pixmaps/* %{_prefix}/share/%{name} %{_libdir}/%{name} %{_datadir}/icons/hicolor/48x48/apps/%{name}.png %if 0%{?suse_version} < 1120 %config(noreplace) /opt/kde3/share/mimelnk/application/* %endif %if 0%{?suse_version} >= 1000 /usr/share/mime/packages/merkaartor.xml %endif %changelog ++++++ merkaartor.desktop ++++++ [Desktop Entry] Encoding=UTF-8 Name=Merkaartor Map Editor GenericName=Editor for OpenStreetMap maps Icon=merkaartor Exec=merkaartor Terminal=0 Type=Application Categories=Graphics;Science;Geoscience;Geography;X-SuSE-Core-Graphics; MimeType=application/x-gpx+xml;application/x-osm+xml;application/x-mdc+xml;application/x-osb;application/x-noniplot;application/x-nmea;application/x-kml+xml; X-SuSE-translate=false ++++++ x-kml+xml.desktop ++++++ [Desktop Entry] Encoding=UTF-8 Comment=KML track Comment[de]=KML-Track Icon=merkaartor.png Type=MimeType MimeType=application/x-kml+xml Patterns=*.kml;*.KML X-SuSE-translate=false [Property::X-KDE-text] Type=bool Value=true ++++++ x-mdc+xml.desktop ++++++ [Desktop Entry] Encoding=UTF-8 Comment=Merkaartor data Comment[de]=Merkaartor-Daten Icon=merkaartor.png Type=MimeType MimeType=application/x-mdc+xml Patterns=*.mdc X-SuSE-translate=false [Property::X-KDE-text] Type=bool Value=true ++++++ x-nmea.desktop ++++++ [Desktop Entry] Encoding=UTF-8 Comment=NMEA data Comment[de]=NMEA-Daten Icon=merkaartor.png Type=MimeType MimeType=application/x-nmea Patterns=*.nmea;*.nma;*.nme X-SuSE-translate=false [Property::X-KDE-text] Type=bool Value=true ++++++ x-noniplot.desktop ++++++ [Desktop Entry] Encoding=UTF-8 Comment=Noni GPSPlot data Comment[de]=Noni GPSPlot-Daten Icon=merkaartor.png Type=MimeType MimeType=application/x-noniplot Patterns=*.ngt X-SuSE-translate=false [Property::X-KDE-text] Type=bool Value=true ++++++ x-osb.desktop ++++++ [Desktop Entry] Encoding=UTF-8 Comment=OpenStreetMap binary data Comment[de]=OpenStreetMap-Binärdaten Icon=merkaartor.png Type=MimeType MimeType=application/x-osb Patterns=*.osb X-SuSE-translate=false [Property::X-KDE-text] Type=bool Value=true ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 libcdio for openSUSE:Factory
by root＠hilbert.suse.de 22 Mar '11

22 Mar '11

Hello community, here is the log from the commit of package libcdio for openSUSE:Factory checked in at Tue Mar 22 17:53:19 CET 2011. -------- --- libcdio/libcdio-mini.changes 2011-02-08 10:53:44.000000000 +0100 +++ /mounts/work_src_done/STABLE/libcdio/libcdio-mini.changes 2011-03-21 17:57:33.000000000 +0100 @@ -1,0 +2,5 @@ +Mon Mar 21 16:57:18 UTC 2011 - coolo(a)novell.com + +- licenses package is about to die + +------------------------------------------------------------------- libcdio.changes: same change calling whatdependson for head-i586 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libcdio-mini.spec ++++++ --- /var/tmp/diff_new_pack.k7Higw/_old 2011-03-22 17:53:06.000000000 +0100 +++ /var/tmp/diff_new_pack.k7Higw/_new 2011-03-22 17:53:06.000000000 +0100 @@ -24,7 +24,7 @@ # You want standard build unless you will work-around build dependency on itself. %define STANDARD_BUILD 0 %define _name libcdio -BuildRequires: gcc-c++ licenses pkg-config popt-devel +BuildRequires: gcc-c++ pkg-config popt-devel %if %STANDARD_BUILD BuildRequires: libcddb-devel libcdio-devel ncurses-devel vcdimager-devel #!BuildIgnore: libcdio-mini-devel @@ -32,7 +32,7 @@ #BuildRequires: cdparanoia %endif Version: 0.82 -Release: 2 +Release: 3 # WARNING: After changing versions please call Re or rpmbuild to auto-update spec file: %define libcdio_name 12 %define libcdio_paranoia_name 0 @@ -47,7 +47,6 @@ Source: http://ftp.gnu.org/gnu/libcdio/%{_name}-%{version}.tar.bz2 Source1: %{_name}_spec-prepare.sh Source2: baselibs.conf -Requires: licenses # bug437293 %ifarch ppc64 Obsoletes: libcdio-64bit @@ -264,12 +263,6 @@ %install %makeinstall mv $RPM_BUILD_ROOT%{_mandir}/jp $RPM_BUILD_ROOT%{_mandir}/ja -for FILE in COPYING ; do - MD5SUM=$(md5sum $FILE | sed 's/ .*//') - if test -f /usr/share/doc/licenses/md5/$MD5SUM ; then - ln -sf /usr/share/doc/licenses/md5/$MD5SUM $FILE - fi -done #empty depdendency libs rm -f %{buildroot}%{_libdir}/*.la ++++++ libcdio.spec ++++++ --- /var/tmp/diff_new_pack.k7Higw/_old 2011-03-22 17:53:06.000000000 +0100 +++ /var/tmp/diff_new_pack.k7Higw/_new 2011-03-22 17:53:06.000000000 +0100 @@ -24,7 +24,7 @@ # You want standard build unless you will work-around build dependency on itself. %define STANDARD_BUILD 1 %define _name libcdio -BuildRequires: gcc-c++ licenses pkg-config popt-devel +BuildRequires: gcc-c++ pkg-config popt-devel %if %STANDARD_BUILD BuildRequires: libcddb-devel libcdio-devel ncurses-devel vcdimager-devel #!BuildIgnore: libcdio-mini-devel @@ -32,7 +32,7 @@ #BuildRequires: cdparanoia %endif Version: 0.82 -Release: 2 +Release: 10 # WARNING: After changing versions please call Re or rpmbuild to auto-update spec file: %define libcdio_name 12 %define libcdio_paranoia_name 0 @@ -47,7 +47,6 @@ Source: http://ftp.gnu.org/gnu/libcdio/%{_name}-%{version}.tar.bz2 Source1: %{_name}_spec-prepare.sh Source2: baselibs.conf -Requires: licenses # bug437293 %ifarch ppc64 Obsoletes: libcdio-64bit @@ -264,12 +263,6 @@ %install %makeinstall mv $RPM_BUILD_ROOT%{_mandir}/jp $RPM_BUILD_ROOT%{_mandir}/ja -for FILE in COPYING ; do - MD5SUM=$(md5sum $FILE | sed 's/ .*//') - if test -f /usr/share/doc/licenses/md5/$MD5SUM ; then - ln -sf /usr/share/doc/licenses/md5/$MD5SUM $FILE - fi -done #empty depdendency libs rm -f %{buildroot}%{_libdir}/*.la ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 blocxx for openSUSE:Factory
by root＠hilbert.suse.de 22 Mar '11

22 Mar '11

Hello community, here is the log from the commit of package blocxx for openSUSE:Factory checked in at Tue Mar 22 17:52:11 CET 2011. -------- --- blocxx/blocxx.changes 2010-04-24 11:48:29.000000000 +0200 +++ /mounts/work_src_done/STABLE/blocxx/blocxx.changes 2011-02-25 10:03:08.000000000 +0100 @@ -1,0 +2,6 @@ +Fri Feb 25 08:56:43 UTC 2011 - mt(a)suse.de + +- Fixed to use std::ptrdiff_t in Enumeration.hpp (gcc 4.6). +- Fixed libblocxx-devel (self) obsolete flags in spec file. + +------------------------------------------------------------------- calling whatdependson for head-i586 New: ---- blocxx-2.1.0-std-ptrdiff.diff ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ blocxx-doc.spec ++++++ --- /var/tmp/diff_new_pack.Vv5W7r/_old 2011-03-22 17:51:45.000000000 +0100 +++ /var/tmp/diff_new_pack.Vv5W7r/_new 2011-03-22 17:51:45.000000000 +0100 @@ -1,7 +1,7 @@ # -# spec file for package blocxx-doc (Version 2.1.0.342) +# spec file for package blocxx-doc # -# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2011 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,7 +21,7 @@ Name: blocxx-doc %define blocxx_version 2.1.0 Version: 2.1.0.342 -Release: 132 +Release: 139 License: BSD3c(or similar) Group: Documentation/HTML AutoReqProv: on ++++++ blocxx.spec ++++++ --- /var/tmp/diff_new_pack.Vv5W7r/_old 2011-03-22 17:51:45.000000000 +0100 +++ /var/tmp/diff_new_pack.Vv5W7r/_new 2011-03-22 17:51:45.000000000 +0100 @@ -1,7 +1,7 @@ # -# spec file for package blocxx (Version 2.1.0.342) +# spec file for package blocxx # -# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2011 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,7 +21,7 @@ Name: blocxx %define blocxx_version 2.1.0 Version: 2.1.0.342 -Release: 24 +Release: 142 License: BSD3c(or similar) Group: Development/Libraries/C and C++ AutoReqProv: on @@ -38,6 +38,7 @@ Patch5: %{name}-2.1.0-asneeded.dif Patch6: %{name}-2.1.0-memorybarrier.diff Patch7: %{name}-2.1.0-catch-gcc45-bug_is_pod.diff +Patch8: %{name}-2.1.0-std-ptrdiff.diff BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: gcc-c++ pcre-devel pkg-config %if 0%{?suse_version} >= 1030 @@ -116,8 +117,8 @@ %else Requires: openssl-devel %endif -Obsoletes: %{name}-devel <= %{version} -Provides: %{name}-devel <= %{version} +Obsoletes: %{name}-devel < %{version} +Provides: %{name}-devel = %{version} # bug437293 %ifarch ppc64 Obsoletes: blocxx-devel-64bit @@ -257,6 +258,7 @@ %patch5 -p1 %patch6 -p1 %patch7 -p0 +%patch8 -p0 if test -f ./bootstrap.sh ; then ./bootstrap.sh else ++++++ blocxx-2.1.0-std-ptrdiff.diff ++++++ --- src/blocxx/Enumeration.hpp +++ src/blocxx/Enumeration.hpp 2011/02/25 08:55:25 @@ -41,6 +41,7 @@ #include "blocxx/TempFileEnumerationImplBase.hpp" #include "blocxx/IntrusiveReference.hpp" +#include <cstddef> // std::ptrdiff_t #include <iterator> // for the iterator tags namespace BLOCXX_NAMESPACE @@ -130,7 +131,7 @@ public: typedef T value_type; typedef const T* pointer; typedef const T& reference; - typedef ptrdiff_t difference_type; + typedef std::ptrdiff_t difference_type; Enumeration_input_iterator() : m_enumeration(0), m_ok(false) { } ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 pciutils for openSUSE:Factory
by root＠hilbert.suse.de 22 Mar '11

22 Mar '11

Hello community, here is the log from the commit of package pciutils for openSUSE:Factory checked in at Tue Mar 22 17:51:29 CET 2011. -------- --- pciutils/pciutils.changes 2010-06-28 08:50:54.000000000 +0200 +++ /mounts/work_src_done/STABLE/pciutils/pciutils.changes 2011-03-21 17:52:44.000000000 +0100 @@ -1,0 +2,5 @@ +Mon Mar 21 16:52:43 UTC 2011 - coolo(a)novell.com + +- licenses package is about to die + +------------------------------------------------------------------- calling whatdependson for head-i586 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ pciutils.spec ++++++ --- /var/tmp/diff_new_pack.4pyjFp/_old 2011-03-22 17:51:21.000000000 +0100 +++ /var/tmp/diff_new_pack.4pyjFp/_new 2011-03-22 17:51:21.000000000 +0100 @@ -1,7 +1,7 @@ # -# spec file for package pciutils (Version 3.1.7) +# spec file for package pciutils # -# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2011 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,11 +20,9 @@ Name: pciutils Version: 3.1.7 -Release: 7 +Release: 11 BuildRequires: zlib-devel -BuildRequires: licenses BuildRequires: pkg-config -Requires: licenses Requires: pciutils-ids AutoReqProv: on # bug437293 @@ -99,10 +97,6 @@ rm -rf $RPM_BUILD_ROOT%{_datadir}/pci.ids* install -D -m 0644 lib/libpci.pc $RPM_BUILD_ROOT%{_libdir}/pkgconfig/libpci.pc ln -sf /%{_lib}/libpci.so.3 %{buildroot}%{_libdir}/libpci.so -MD5SUM=$(md5sum %{S:1} | sed 's/ .*//') -if test -f /usr/share/doc/licenses/md5/$MD5SUM ; then - ln -sf /usr/share/doc/licenses/md5/$MD5SUM COPYING -fi %clean rm -rf $RPM_BUILD_ROOT ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 bash for openSUSE:Factory
by root＠hilbert.suse.de 22 Mar '11

22 Mar '11

Hello community, here is the log from the commit of package bash for openSUSE:Factory checked in at Tue Mar 22 17:51:06 CET 2011. -------- --- bash/bash.changes 2011-03-15 18:31:41.000000000 +0100 +++ /mounts/work_src_done/STABLE/bash/bash.changes 2011-03-22 13:17:49.000000000 +0100 @@ -1,0 +2,6 @@ +Tue Mar 22 13:16:43 CET 2011 - werner(a)suse.de + +- Remove patch to avod endless loop in UTF-8 locale as it breaks + glob expanding (bnc#681286) + +------------------------------------------------------------------- calling whatdependson for head-i586 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ bash.spec ++++++ --- /var/tmp/diff_new_pack.n1m2BD/_old 2011-03-22 17:50:37.000000000 +0100 +++ /var/tmp/diff_new_pack.n1m2BD/_new 2011-03-22 17:50:37.000000000 +0100 @@ -37,7 +37,7 @@ %endif AutoReqProv: on Version: 4.2 -Release: 3 +Release: 4 Summary: The GNU Bourne-Again Shell Url: http://www.gnu.org/software/bash/bash.html Source0: ftp://ftp.gnu.org/gnu/bash/bash-%{bash_vers}.tar.bz2 @@ -106,7 +106,7 @@ Provides: bash:%{_infodir}/bash.info.gz PreReq: %install_info_prereq Version: 4.2 -Release: 3 +Release: 4 AutoReqProv: on %if %suse_version > 1120 BuildArch: noarch @@ -142,7 +142,7 @@ Summary: Include Files mandatory for Development of bash loadable builtins Group: Development/Languages/C and C++ Version: 4.2 -Release: 3 +Release: 4 AutoReqProv: on %description -n bash-devel @@ -162,7 +162,7 @@ Summary: Loadable bash builtins Group: System/Shells Version: 4.2 -Release: 3 +Release: 4 AutoReqProv: on %description -n bash-loadables @@ -231,7 +231,7 @@ Group: System/Libraries Provides: bash:/%{_lib}/libreadline.so.%{rl_major} Version: 6.2 -Release: 3 +Release: 4 %if %suse_version > 1020 Recommends: readline-doc = %{version} %endif @@ -262,7 +262,7 @@ Group: Development/Libraries/C and C++ Provides: bash:%{_libdir}/libreadline.a Version: 6.2 -Release: 3 +Release: 4 Requires: libreadline6 = %{version} Requires: ncurses-devel %if %suse_version > 1020 @@ -293,7 +293,7 @@ Provides: readline:%{_infodir}/readline.info.gz PreReq: %install_info_prereq Version: 6.2 -Release: 3 +Release: 4 AutoReqProv: on %if %suse_version > 1120 BuildArch: noarch ++++++ bash-4.2-patches.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/bash-4.2-patches/bash-4.2-xdupmbstowcs2.patch new/bash-4.2-patches/bash-4.2-xdupmbstowcs2.patch --- old/bash-4.2-patches/bash-4.2-xdupmbstowcs2.patch 2011-03-15 18:19:59.000000000 +0100 +++ new/bash-4.2-patches/bash-4.2-xdupmbstowcs2.patch 1970-01-01 01:00:00.000000000 +0100 @@ -1,19 +0,0 @@ -*** ../bash-4.2-patched/lib/glob/xmbsrtowcs.c 2010-05-30 18:36:27.000000000 -0400 ---- lib/glob/xmbsrtowcs.c 2011-03-14 14:22:11.000000000 -0400 -*************** -*** 174,180 **** - wcslength = mbsnrtowcs(NULL, &tmp_p, nms, 0, &tmp_state); - - /* Conversion failed. */ -! if (wcslength == (size_t)-1) - { - free (wsbuf); - *destp = NULL; ---- 174,180 ---- - wcslength = mbsnrtowcs(NULL, &tmp_p, nms, 0, &tmp_state); - - /* Conversion failed. */ -! if (wcslength == 0 || wcslength == (size_t)-1) - { - free (wsbuf); - *destp = NULL; ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit expat for openSUSE:Factory
by root＠hilbert.suse.de 22 Mar '11

22 Mar '11

Hello community, here is the log from the commit of package expat for openSUSE:Factory checked in at Tue Mar 22 17:49:58 CET 2011. -------- --- expat/expat.changes 2010-01-08 15:07:45.000000000 +0100 +++ /mounts/work_src_done/STABLE/expat/expat.changes 2011-02-25 17:07:11.000000000 +0100 @@ -1,0 +2,5 @@ +Fri Feb 25 16:01:01 UTC 2011 - prusnak(a)opensuse.org + +- fix license (MIT) in spec file + +------------------------------------------------------------------- calling whatdependson for head-i586 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ expat.spec ++++++ --- /var/tmp/diff_new_pack.MJDxk1/_old 2011-03-22 17:49:41.000000000 +0100 +++ /var/tmp/diff_new_pack.MJDxk1/_new 2011-03-22 17:49:41.000000000 +0100 @@ -1,7 +1,7 @@ # -# spec file for package expat (Version 2.0.1) +# spec file for package expat # -# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2011 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,9 +20,9 @@ Name: expat Version: 2.0.1 -Release: 93 +Release: 104 Group: Development/Libraries/C and C++ -License: MIT License (or similar) +License: MIT Url: http://expat.sourceforge.net/ # bug437293 %ifarch ppc64 @@ -68,7 +68,7 @@ James Clark <jjc(a)jclark.com> %package -n libexpat1 -License: MPL .. +License: MIT Summary: XML Parser Toolkit Group: Development/Libraries/C and C++ # bug437293 @@ -107,7 +107,7 @@ James Clark <jjc(a)jclark.com> %package -n libexpat-devel -License: MPL .. +License: MIT Summary: XML Parser Toolkit Group: Development/Libraries/C and C++ Requires: libexpat1 = %{version} glibc-devel ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 greenbone-security-assistant for openSUSE:Factory
by root＠hilbert.suse.de 22 Mar '11

22 Mar '11

Hello community, here is the log from the commit of package greenbone-security-assistant for openSUSE:Factory checked in at Tue Mar 22 17:48:11 CET 2011. -------- New Changes file: --- /dev/null 2010-08-26 16:28:41.000000000 +0200 +++ /mounts/work_src_done/STABLE/greenbone-security-assistant/greenbone-security-assistant.changes 2011-03-02 16:39:04.000000000 +0100 @@ -0,0 +1,218 @@ +------------------------------------------------------------------- +Wed Mar 2 15:05:01 UTC 2011 - bitshuffler(a)opensuse.org + +- Updated to 2.0.1 + * Two memory leaks discovered by Pavel Sejnoha and one resource leak discovered + by Felix Wolfsteller have been closed. + * GSA now does XSL transformation in a separate process by default. + +------------------------------------------------------------------- +Wed Feb 23 19:32:13 UTC 2011 - bitshuffler(a)opensuse.org + +- Updated to 2.0.0 + * The JavaScript indicator has been improved. + * GSA now checks for required libxml threading support. + * The cookie base session identification has been improved. + * An issue with parsing the session cookie has been fixed. + * The handling of POST requests after a relogin has been improved. + * The documentation and the build environment have been updated. + * The scan config overview now shows the number of selected NVT through family + selection as well. + * A JavaScript indicator has been added. + * Support for fallback system reports has been added. + * An issue which caused logins to fail under certain circumstances due to overly + strict input validation has been fixed. + * The "About" page has been reworked. + * Cookie base session identification has been added. + +------------------------------------------------------------------- +Fri Feb 4 22:32:55 UTC 2011 - bitshuffler(a)opensuse.org + +- Updated to 1.99.3 + * A notice is added to the log if binding to the default port failed and the + fallback port was used. + * GSA now uses pkg-config to find required libraries. + * The HTTP Basic Auth based session management has been replace with a token + based session management. + * GSA now provides a manual page for the gsad binary. + +------------------------------------------------------------------- +Wed Jan 26 19:45:47 UTC 2011 - bitshuffler(a)opensuse.org + +- Updated to 1.99.2 + * The output of --version now complies with the GNU Coding Standards. + * The range of valid characters for LSC credential passwords has been extended + further. + * If no port is specified, GSA will now attempt to listen on the appropriate + privileged port (80 or 443) and fall back to listening on its default port + (9392) if those are unavailable. + +------------------------------------------------------------------- +Tue Dec 21 13:19:01 UTC 2010 - bitshuffler(a)opensuse.org + +- Updated to 1.99.1 + * Error handling for reports has been improved. + * A bug which cause credential comments to be ignored when creating new LSC + credentials has been fixed. + * Target credentials for SMB and SSH are now separated. + * The user interface for displaying filtered reports and for report downloads + has been improved. + * Hardening flags are now enabled during compile time to increase code quality. + * Support for setting the port range for a target has been added. + +------------------------------------------------------------------- +Fri Dec 3 17:29:33 UTC 2010 - bitshuffler(a)opensuse.org + +- Updated to 1.98.1 + * Support for report format plugin framework has been added. + * Support for master-slave mode has been added. + * Support for editing credentials has been added. + * Support for agent verification has been added. + * Input validation for user names and passwords has been improved. + * Support for Microsoft Internet Explorer has been improved. + * The usability and layout of the web interface has been improved. + * GSA now builds with libmicrohttpd 0.9.2 and above. + +------------------------------------------------------------------- +Sun Oct 31 18:42:17 UTC 2010 - bitshuffler(a)opensuse.org + +- Updated to 1.0.3 + * When creating new credentials, password authentication is now the default. + * A bug which caused the "Pause" button not to work under certain circumstances + has been fixed. + * The handling of errors during the XSL transformation has been improved. + * The handling of long lines in the XSL transformation has been improved. + * The range of characters allowed for LSC passwords has been extended. + * An issue which prevented gsa from building with libmicrohttpd 0.9.2 has been + fixed. + +------------------------------------------------------------------- +Tue Aug 17 14:41:08 UTC 2010 - bitshuffler(a)opensuse.org + +- Updated to 1.0.2 + * An issue which caused NVT family to be improperly submitted when using + Microsoft Internet Explorer to edit NVT families has been fixed. + +------------------------------------------------------------------- +Mon Aug 9 15:00:09 UTC 2010 - bitshuffler(a)opensuse.org + +- Updated to 1.0.1 + * A bug which made it impossible to edit families containing a dash in their + name has been fixed. + * The scan status and the progress bar are now displayed in the report view as + well. + * Task control buttons are now visible on the task summary page as well. + * Known scanner preferences are now displayed as yes/no radio buttons. + * The installation instructions have been updated. + +------------------------------------------------------------------- +Tue Aug 3 13:39:42 UTC 2010 - bitshuffler(a)opensuse.org + +- Updated to 1.0.0 + * A bug which caused NVT preferences to be saved incorrectly under certain + circumstances has been fixed. + +------------------------------------------------------------------- +Fri Jul 16 15:37:53 UTC 2010 - bitshuffler(a)opensuse.org + +- Updated to 1.0.0.rc1 + * Support for LDAP and ADS has been added. + * A number of changes have been made to stay compatible with the updated OMP + specification. + * Initial support for fetching targets from external sources has been added. + * Support for threat overrides has been added. + * Support for Syslog and SNMP escalators has been added. + * Support for agents has been improved. + +------------------------------------------------------------------- +Sat May 29 08:01:26 UTC 2010 - bitshuffler(a)opensuse.org + +- Updated to 1.0.0.beta7 + * An issue which caused empty charts in the performance monitor has been fixed. + * An issue which caused a new task created with both an escalator and a schedule + to lose the schedule has been fixed. + * Support for Internet Explorer 6 clients has been improved. + * Support for using the "Threat Level Change" escalator condition has been + added. + * The handling of uploaded preference files has been improved. + * The handling of requests for nonexistent pages has been improved. + * Support for pausing of tasks has been added. + * Support for displaying CVSS scores and Risk Factor values has been added. + * The handling of errors during XSL transformation has been improved. + * The scan start time and end time for individual host are now displayed in the + report. + * Support for excluding hosts without results from the report has been added. + * Support for filtering results based on CVSS scores has been fixed. + +------------------------------------------------------------------- +Thu Apr 15 16:44:52 UTC 2010 - bitshuffler(a)opensuse.org + +- Updated to 1.0.0.beta6 + * Support for ITG and CPE reports has been improved. + * Support for resuming stopped tasks has been added. + * Support for task scheduling has been added. + * Initial support for editing tasks has been added. + * Support for displaying the version of an installed feed has been added. + * A number of build issues have been fixed. + * The documentation available via the "?" icon has been updated. + * The gsad binary is now installed to /usr/sbin instead of /usr/bin. + +------------------------------------------------------------------- +Sat Mar 20 15:10:42 UTC 2010 - bitshuffler(a)opensuse.org + +- Updated to 1.0.0.beta5 + * Support for notes has been added. + * Support for ITG and CPE reports has been added. + * Improved HTTP conformity. + * Significant speed-up. + * Various cosmetic changes of the html pages + as well as of some report types. + +------------------------------------------------------------------- +Fri Feb 5 15:40:54 UTC 2010 - bitshuffler(a)opensuse.org + +- Updated to 1.0.0.beta4 + * Improved HTTP conformity. + * Improved Feed synchronization support. + * Improved line wrapping in reports. + * A bug in the report pagination has been fixed. + +------------------------------------------------------------------- +Thu Jan 28 08:46:16 UTC 2010 - bitshuffler(a)opensuse.org + +- Updated to 1.0.0.beta3 + * Improved HTTP conformity. + * Fixed resource leak. + * Improved input checking. + * Add option to run in chroot. + +------------------------------------------------------------------- +Wed Jan 27 12:10:52 UTC 2010 - bitshuffler(a)opensuse.org + +- Updated to 1.0.0.beta2 + * Integrated online help extended. + * Improved handling of feed management. + * Added support for administrator feature to edit + scanner settings. + * Added support for administrator feature to edit ++++ 21 more lines (skipped) ++++ between /dev/null ++++ and /mounts/work_src_done/STABLE/greenbone-security-assistant/greenbone-security-assistant.changes calling whatdependson for head-i586 New: ---- debian.changelog debian.compat debian.control debian.greenbone-security-assistant.default debian.greenbone-security-assistant.dirs debian.greenbone-security-assistant.init debian.greenbone-security-assistant.install debian.greenbone-security-assistant.logrotate debian.rules greenbone-security-assistant-2.0.1.tar.gz greenbone-security-assistant.changes greenbone-security-assistant.dsc greenbone-security-assistant.spec gsad.init.fedora gsad.init.mandriva gsad.init.suse gsad.logrotate ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ greenbone-security-assistant.spec ++++++ # # spec file for package greenbone-security-assistant # # Copyright (c) 2011 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/ # # norootforbuild Name: greenbone-security-assistant Version: 2.0.1 Release: 1 License: GPLv2+ Group: Productivity/Networking/Security Url: http://www.openvas.org Source0: %{name}-%{version}.tar.gz Source1: gsad.logrotate Source2: debian.greenbone-security-assistant.default Source3: gsad.init.suse Source4: gsad.init.fedora Source5: gsad.init.mandriva BuildRoot: %{_tmppath}/%{name}-%{version}-build %if 0%{?mandriva_version} BuildRequires: pinentry-gtk2 %if 0%{?mandriva_version} < 201000 BuildRequires: libxslt-proc %else BuildRequires: xsltproc %endif %endif %if 0%{?suse_version} BuildRequires: fdupes PreReq: %insserv_prereq PreReq: %fillup_prereq %endif BuildRequires: cmake >= 2.6.0 BuildRequires: doxygen BuildRequires: glib2-devel BuildRequires: libmicrohttpd-devel >= 0.4.2 BuildRequires: libopenvas-devel >= 3.98 BuildRequires: libxslt-devel BuildRequires: pkgconfig Requires: logrotate Summary: The Greenbone Security Assistant %description The Greenbone Security Assistant is a web application that connects to the OpenVAS Manager and OpenVAS Administrator to provide for a full-featured user interface for vulnerability management. %prep %setup -q %build %if 0%{?mandriva_version} %serverbuild %endif export CFLAGS="%{optflags}" cmake -DCMAKE_VERBOSE_MAKEFILE=ON \ -DCMAKE_INSTALL_PREFIX=%{_prefix} \ -DSYSCONFDIR=%{_sysconfdir} \ -DLOCALSTATEDIR=%{_localstatedir} \ -DCMAKE_BUILD_TYPE=release %__make %{?_smp_mflags} VERBOSE=1 %install %__make install DESTDIR=%{buildroot} %__install -D -m 644 %{_sourcedir}/gsad.logrotate %{buildroot}%{_sysconfdir}/logrotate.d/greenbone-security-assistant %if 0%{?suse_version} %__install -D -m 755 %{_sourcedir}/gsad.init.suse %{buildroot}%{_initrddir}/greenbone-security-assistant %__ln_s %{_initrddir}/greenbone-security-assistant %{buildroot}%{_sbindir}/rcgreenbone-security-assistant %__install -D -m 644 %{_sourcedir}/debian.greenbone-security-assistant.default %{buildroot}%{_var}/adm/fillup-templates/sysconfig.greenbone-security-assistant %endif %if 0%{?fedora_version} || 0%{?scientificlinux_version} %__install -D -m 755 %{_sourcedir}/gsad.init.fedora %{buildroot}%{_initrddir}/greenbone-security-assistant %__install -D -m 644 %{_sourcedir}/debian.greenbone-security-assistant.default %{buildroot}%{_sysconfdir}/sysconfig/greenbone-security-assistant %endif %if 0%{?mandriva_version} %__install -D -m 755 %{_sourcedir}/gsad.init.mandriva %{buildroot}%{_initrddir}/greenbone-security-assistant %__install -D -m 644 %{_sourcedir}/debian.greenbone-security-assistant.default %{buildroot}%{_sysconfdir}/sysconfig/greenbone-security-assistant %endif %__mkdir_p %{buildroot}%{_localstatedir}/log/openvas touch %{buildroot}%{_localstatedir}/log/openvas/gsad.log %if 0%{?suse_version} %fdupes %{buildroot} %endif %clean test "%{buildroot}" != "/" && %__rm -rf %{buildroot} %post %if 0%{?suse_version} %fillup_and_insserv greenbone-security-assistant %endif %if 0%{?mandriva_version} %_post_service greenbone-security-assistant %endif %if 0%{?fedora_version} || 0%{?scientificlinux_version} # only rpm -i (not rpm {-U|-F}) if [ $1 = 1 ]; then /sbin/chkconfig --add greenbone-security-assistant fi %endif %preun %if 0%{?suse_version} %stop_on_removal greenbone-security-assistant %endif %if 0%{?mandriva_version} %_preun_service greenbone-security-assistant %endif %if 0%{?fedora_version} || 0%{?scientificlinux_version} # only rpm -e (not rpm {-U|-F}) if [ $1 = 0 ]; then /sbin/service greenbone-security-assistant stop > /dev/null 2>&1 || : /sbin/chkconfig --del greenbone-security-assistant fi %endif %postun %if 0%{?suse_version} %restart_on_update greenbone-security-assistant %insserv_cleanup %endif %if 0%{?fedora_version} || 0%{?scientificlinux_version} # only rpm {-U|-F} (not rpm -e) if [ $1 = 1 ]; then /sbin/service greenbone-security-assistant condrestart fi %endif %files %defattr(-,root,root) %config(noreplace) %{_sysconfdir}/logrotate.d/greenbone-security-assistant %dir %{_sysconfdir}/openvas %config(noreplace) %{_sysconfdir}/openvas/gsad_log.conf %{_initrddir}/greenbone-security-assistant %{_sbindir}/gsad %{_mandir}/man8/gsad.8* %dir %{_datadir}/openvas %{_datadir}/openvas/gsa %dir %{_localstatedir}/log/openvas %ghost %{_localstatedir}/log/openvas/gsad.log %if 0%{?suse_version} %{_sbindir}/rcgreenbone-security-assistant %{_var}/adm/fillup-templates/sysconfig.greenbone-security-assistant %else %config(noreplace) %{_sysconfdir}/sysconfig/greenbone-security-assistant %endif %changelog ++++++ debian.changelog ++++++ greenbone-security-assistant (2.0.1-1) UNRELEASED; urgency=low * New upstream release. - Two memory leaks discovered by Pavel Sejnoha and one resource leak discovered by Felix Wolfsteller have been closed. - GSA now does XSL transformation in a separate process by default. -- Stephan Kleine <bitshuffler(a)opensuse.org> Wed, 02 Mar 2011 16:04:32 +0100 greenbone-security-assistant (2.0.0-1) UNRELEASED; urgency=low * New upstream release. - The JavaScript indicator has been improved. - GSA now checks for required libxml threading support. - The cookie base session identification has been improved. - An issue with parsing the session cookie has been fixed. - The handling of POST requests after a relogin has been improved. - The documentation and the build environment have been updated. - The scan config overview now shows the number of selected NVT through family selection as well. - A JavaScript indicator has been added. - Support for fallback system reports has been added. - An issue which caused logins to fail under certain circumstances due to overly strict input validation has been fixed. - The "About" page has been reworked. - Cookie base session identification has been added. -- Stephan Kleine <bitshuffler(a)opensuse.org> Fri, 23 Feb 2011 20:30:56 +0100 greenbone-security-assistant (1.99.3-1) UNRELEASED; urgency=low * New upstream release. - A notice is added to the log if binding to the default port failed and the fallback port was used. - GSA now uses pkg-config to find required libraries. - The HTTP Basic Auth based session management has been replace with a token based session management. - GSA now provides a manual page for the gsad binary. -- Stephan Kleine <bitshuffler(a)opensuse.org> Fri, 04 Feb 2011 23:31:10 +0100 greenbone-security-assistant (1.99.2-1) UNRELEASED; urgency=low * New upstream release. - The output of --version now complies with the GNU Coding Standards. - The range of valid characters for LSC credential passwords has been extended further. - If no port is specified, GSA will now attempt to listen on the appropriate privileged port (80 or 443) and fall back to listening on its default port (9392) if those are unavailable. -- Stephan Kleine <bitshuffler(a)opensuse.org> Tue, 26 Jan 2011 20:45:23 +0100 greenbone-security-assistant (1.99.1-1) UNRELEASED; urgency=low * New upstream release. - Error handling for reports has been improved. - A bug which cause credential comments to be ignored when creating new LSC credentials has been fixed. - Target credentials for SMB and SSH are now separated. - The user interface for displaying filtered reports and for report downloads has been improved. - Hardening flags are now enabled during compile time to increase code quality. - Support for setting the port range for a target has been added. -- Stephan Kleine <bitshuffler(a)opensuse.org> Tue, 21 Dec 2010 14:20:40 +0100 greenbone-security-assistant (1.98.1-1) UNRELEASED; urgency=low * New upstream release. - Support for report format plugin framework has been added. - Support for master-slave mode has been added. - Support for editing credentials has been added. - Support for agent verification has been added. - Input validation for user names and passwords has been improved. - Support for Microsoft Internet Explorer has been improved. - The usability and layout of the web interface has been improved. - GSA now builds with libmicrohttpd 0.9.2 and above. -- Stephan Kleine <bitshuffler(a)opensuse.org> Fri, 03 Dec 2010 18:28:20 +0100 greenbone-security-assistant (1.0.3-1) UNRELEASED; urgency=low * New upstream release. - When creating new credentials, password authentication is now the default. - A bug which caused the "Pause" button not to work under certain circumstances has been fixed. - The handling of errors during the XSL transformation has been improved. - The handling of long lines in the XSL transformation has been improved. - The range of characters allowed for LSC passwords has been extended. - An issue which prevented gsa from building with libmicrohttpd 0.9.2 has been fixed. -- Stephan Kleine <bitshuffler(a)opensuse.org> Sun, 31 Oct 2010 19:43:37 +0100 greenbone-security-assistant (1.0.2-1) UNRELEASED; urgency=low * New upstream release. - An issue which caused NVT family to be improperly submitted when using Microsoft Internet Explorer to edit NVT families has been fixed. -- Stephan Kleine <bitshuffler(a)opensuse.org> Tue, 17 Aug 2010 16:40:35 +0200 greenbone-security-assistant (1.0.1-1) UNRELEASED; urgency=low * New upstream release. - A bug which made it impossible to edit families containing a dash in their name has been fixed. - The scan status and the progress bar are now displayed in the report view as well. - Task control buttons are now visible on the task summary page as well. - Known scanner preferences are now displayed as yes/no radio buttons. - The installation instructions have been updated. -- Stephan Kleine <bitshuffler(a)opensuse.org> Mon, 09 Aug 2010 16:57:14 +0200 greenbone-security-assistant (1.0.0-1) UNRELEASED; urgency=low * New upstream release. - A bug which caused NVT preferences to be saved incorrectly under certain circumstances has been fixed. -- Stephan Kleine <bitshuffler(a)opensuse.org> Tue, 03 Aug 2010 15:39:10 +0200 greenbone-security-assistant (1.0.0.rc1-1) UNRELEASED; urgency=low * New upstream release. - Support for LDAP and ADS has been added. - A number of changes have been made to stay compatible with the updated OMP specification. - Initial support for fetching targets from external sources has been added. - Support for threat overrides has been added. - Support for Syslog and SNMP escalators has been added. - Support for agents has been improved. -- Stephan Kleine <bitshuffler(a)opensuse.org> Fri, 16 Jul 2010 17:35:44 +0200 greenbone-security-assistant (1.0.0.beta7-1) UNRELEASED; urgency=low * New upstream release. - An issue which caused empty charts in the performance monitor has been fixed. - An issue which caused a new task created with both an escalator and a schedule to lose the schedule has been fixed. - Support for Internet Explorer 6 clients has been improved. - Support for using the "Threat Level Change" escalator condition has been added. - The handling of uploaded preference files has been improved. - The handling of requests for nonexistent pages has been improved. - Support for pausing of tasks has been added. - Support for displaying CVSS scores and Risk Factor values has been added. - The handling of errors during XSL transformation has been improved. - The scan start time and end time for individual host are now displayed in the report. - Support for excluding hosts without results from the report has been added. - Support for filtering results based on CVSS scores has been fixed. -- Stephan Kleine <bitshuffler(a)opensuse.org> Sat, 29 May 2010 09:59:33 +0200 greenbone-security-assistant (1.0.0.beta6-1) UNRELEASED; urgency=low * New upstream release. - Support for ITG and CPE reports has been improved. - Support for resuming stopped tasks has been added. - Support for task scheduling has been added. - Initial support for editing tasks has been added. - Support for displaying the version of an installed feed has been added. - A number of build issues have been fixed. - The documentation available via the "?" icon has been updated. - The gsad binary is now installed to /usr/sbin instead of /usr/bin. -- Stephan Kleine <bitshuffler(a)opensuse.org> Thu, 15 Apr 2010 18:55:58 +0200 greenbone-security-assistant (1.0.0.beta5-1) UNRELEASED; urgency=low * New upstream release. - Support for notes has been added. - Support for ITG and CPE reports has been added. - Improved HTTP conformity. - Significant speed-up. - Various cosmetic changes of the html pages as well as of some report types. -- Stephan Kleine <bitshuffler(a)opensuse.org> Sat, 20 Mar 2010 16:12:37 +0100 greenbone-security-assistant (1.0.0.beta4-1) UNRELEASED; urgency=low * New upstream release. - Improved HTTP conformity. - Improved Feed synchronization support. - Improved line wrapping in reports. - A bug in the report pagination has been fixed. -- Stephan Kleine <bitshuffler(a)opensuse.org> Fri, 05 Feb 2010 15:39:09 +0100 greenbone-security-assistant (1.0.0.beta3-1) UNRELEASED; urgency=low * New upstream release. - Improved HTTP conformity. - Fixed resource leak. - Improved input checking. - Add option to run in chroot. -- Stephan Kleine <bitshuffler(a)opensuse.org> Thu, 28 Jan 2010 08:47:13 +0100 greenbone-security-assistant (1.0.0.beta2-1) UNRELEASED; urgency=low * New upstream release. - Integrated online help extended. - Improved handling of feed management. - Added support for administrator feature to edit scanner settings. - Added support for administrator feature to edit user details (password, IP-based access rules). - Allow "\" as part of a credential login name. - Remain on the task page after deleting the task's last report. - Improved handling of XML/HTML report exports. - Added command line option "--listen", "--alisten", "--mlisten". -- Stephan Kleine <bitshuffler(a)opensuse.org> Wen, 27 Jan 2010 12:14:51 +0100 greenbone-security-assistant (1.0.0.beta1-1) UNRELEASED; urgency=low * Initial package. -- Stephan Kleine <bitshuffler(a)opensuse.org> Sat, 23 Jan 2010 15:21:24 +0100 ++++++ debian.compat ++++++ 5 ++++++ debian.control ++++++ Source: greenbone-security-assistant Section: admin Priority: optional Maintainer: Stephan Kleine <bitshuffler(a)opensuse.org> Build-Depends: debhelper (>= 5), dpatch, cmake, doxygen, hardening-wrapper, libmicrohttpd-dev (>= 0.4.2), libopenvas4-dev, libxslt1-dev, pkg-config, xsltproc Standards-Version: 3.8.0 Package: greenbone-security-assistant Section: net Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends} Description: The Greenbone Security Assistant The Greenbone Security Assistant is a web application that connects to the OpenVAS Manager and OpenVAS Administrator to provide for a full-featured user interface for vulnerability management. Package: greenbone-security-assistant-dbg Section: debug Priority: extra Architecture: any Depends: ${misc:Depends}, greenbone-security-assistant (= ${binary:Version}) Description: The Greenbone Security Assistant (debug) The Greenbone Security Assistant is a web application that connects to the OpenVAS Manager and OpenVAS Administrator to provide for a full-featured user interface for vulnerability management. . This package contains the debugging symbols. ++++++ debian.greenbone-security-assistant.default ++++++ # # The address the Greenbone Security Assistant will listen on. # GSA_ADDRESS=127.0.0.1 # # The port the Greenbone Security Assistant will listen on. # GSA_PORT=9392 # # The file to use as private key for HTTPS # #GSA_SSL_PRIVATE_KEY= # # The file to use as certificate for HTTPS # #GSA_SSL_CERTIFICATE= # # Should HTTP get redirected to HTTPS # If $GSA_REDIRECT_PORT is not set it will redirect port 80. # #GSA_REDIRECT=1 # # Redirect HTTP from this port to $GSA_PORT # For this being effective $GSA_REDIRECT has to be set to 1. # #GSA_REDIRECT_PORT=9394 # # The address the OpenVAS Administrator is listening on. # ADMINISTRATOR_ADDRESS=127.0.0.1 # # The port the OpenVAS Administrator is listening on. # ADMINISTRATOR_PORT=9393 # # The address the OpenVAS Manager is listening on. # MANAGER_ADDRESS=127.0.0.1 # # The port the OpenVAS Manager is listening on. # MANAGER_PORT=9390 ++++++ debian.greenbone-security-assistant.dirs ++++++ var/log/openvas ++++++ debian.greenbone-security-assistant.init ++++++ #!/bin/sh -e # # /etc/init.d/greenbone-security-assistant # ### BEGIN INIT INFO # Provides: greenbone-security-assistant # Required-Start: $remote_fs # Required-Stop: $remote_fs # Should-Start: # Should-Stop: # Default-Start: # Default-Stop: 0 6 # Short-Description: Start and stop the Greenbone Security Assistant # Description: Controls the OpenVAS daemon "gsad". ### END INIT INFO # time to wait for daemons death, in seconds # don't set it too low or you might not let gsad die gracefully DODTIME=5 # Read config [ -r /etc/default/greenbone-security-assistant ] && . /etc/default/greenbone-security-assistant [ "$GSA_ADDRESS" ] && DAEMONOPTS="--listen=$GSA_ADDRESS" [ "$GSA_PORT" ] && DAEMONOPTS="$DAEMONOPTS --port=$GSA_PORT" [ "$GSA_SSL_PRIVATE_KEY" ] && DAEMONOPTS="$DAEMONOPTS --ssl-private-key=$GSA_SSL_PRIVATE_KEY" [ "$GSA_SSL_CERTIFICATE" ] && DAEMONOPTS="$DAEMONOPTS --ssl-certificate=$GSA_SSL_CERTIFICATE" [ "$GSA_REDIRECT" ] && [ "$GSA_REDIRECT" == 1 ] && DAEMONOPTS="$DAEMONOPTS --redirect" [ "$GSA_REDIRECT_PORT" ] && DAEMONOPTS="$DAEMONOPTS --rport=$GSA_REDIRECT_PORT" [ "$ADMINISTRATOR_ADDRESS" ] && DAEMONOPTS="$DAEMONOPTS --alisten=$ADMINISTRATOR_ADDRESS" [ "$ADMINISTRATOR_PORT" ] && DAEMONOPTS="$DAEMONOPTS --aport=$ADMINISTRATOR_PORT" [ "$MANAGER_ADDRESS" ] && DAEMONOPTS="$DAEMONOPTS --mlisten=$MANAGER_ADDRESS" [ "$MANAGER_PORT" ] && DAEMONOPTS="$DAEMONOPTS --mport=$MANAGER_PORT" DAEMON=/usr/sbin/gsad PIDFILE=/var/run/gsad.pid NAME=gsad LABEL="Greenbone Security Assistant" test -x $DAEMON || exit 0 running() { # No pidfile, probably no daemon present # [ ! -f "$PIDFILE" ] && return 1 pid=`cat $PIDFILE` # No pid, probably no daemon present [ -z "$pid" ] && return 1 [ ! -d /proc/$pid ] && return 1 cmd=`cat /proc/$pid/cmdline | tr "\000" "\n"|head -n 1 |cut -d : -f 1` # No gsad? [ "$cmd" != "$NAME" ] && return 1 return 0 } start_daemon() { start-stop-daemon --start --exec $DAEMON -- $DAEMONOPTS 2>&1 >/dev/null errcode=$? # If we don't sleep then running() might not see the pidfile sleep $DODTIME return $errcode } force_stop() { [ ! -e "$PIDFILE" ] && return if running ; then kill -15 $pid # Is it really dead? sleep "$DODTIME"s if running ; then kill -9 $pid sleep "$DODTIME"s if running ; then echo "Cannot kill $LABEL (pid=$pid)!" exit 1 fi fi fi rm -f $PIDFILE } case "$1" in start) echo -n "Starting $LABEL: " if start_daemon && running ; then echo "gsad." else echo "ERROR." exit 1 fi ;; stop) echo -n "Stopping $LABEL: " if running ; then start-stop-daemon --stop --pidfile $PIDFILE --quiet --oknodo --exec $DAEMON sleep "$DODTIME"s fi if running; then force_stop fi echo "gsad." ;; restart) echo -n "Restarting $LABEL: " if running; then start-stop-daemon --stop --pidfile $PIDFILE --quiet --oknodo --exec $DAEMON sleep "$DODTIME"s fi if running; then force_stop fi if start_daemon && running ; then echo "gsad." else echo "ERROR." exit 1 fi ;; reload|force-reload) echo -n "Reloading $LABEL configuration files: " start-stop-daemon --stop --pidfile $PIDFILE --signal 1 --exec $DAEMON sleep "$DODTIME"s if running ; then echo "done." else echo "ERROR." exit 1 fi ;; status) echo -n "$LABEL is " if running ; then echo "running" else echo " not running." exit 1 fi ;; *) echo "Usage: /etc/init.d/greenbone-security-assistant {start|stop|restart|reload|status}" exit 1 ;; esac exit 0 ++++++ debian.greenbone-security-assistant.install ++++++ etc/openvas usr/sbin usr/share/man/man8/gsad.8* usr/share/openvas/gsa ++++++ debian.greenbone-security-assistant.logrotate ++++++ /var/log/openvas/gsad.log { missingok notifempty create 640 root adm daily rotate 7 compress postrotate if [ -s /var/run/gsad.pid ]; then kill -1 `cat /var/run/gsad.pid`; fi openvaslogs=`ls /var/log/openvas/gsad.log.*` if [ -n "$openvaslogs" ]; then chown root:adm $openvaslogs chmod 640 $openvaslogs fi endscript } ++++++ debian.rules ++++++ #!/usr/bin/make -f # -*- makefile -*- # Sample debian/rules that uses debhelper. # This file was originally written by Joey Hess and Craig Small. # As a special exception, when this file is copied by dh-make into a # dh-make output file, you may use that output file without restriction. # This special exception was added by Craig Small in version 0.37 of dh-make. # Uncomment this to turn on verbose mode. export DH_VERBOSE=1 # Enable hardening-wrapper export DEB_BUILD_HARDENING=1 config: config-stamp config-stamp: dh_testdir # Add here commands to configure the package. cmake -DCMAKE_INSTALL_PREFIX=/usr -DSYSCONFDIR=/etc -DLOCALSTATEDIR=/var -DCMAKE_BUILD_TYPE=release . touch $@ build: build-stamp build-stamp: config-stamp dh_testdir # Add here commands to compile the package. $(MAKE) touch $@ clean: dh_testdir dh_testroot rm -f build-stamp config.stamp # Add here commands to clean up after the build process. dh_clean install: build dh_testdir dh_testroot dh_clean -k dh_installdirs # Add here commands to install the package into debian/tmp $(MAKE) install DESTDIR=$(CURDIR)/debian/tmp # Build architecture-independent files here. binary-indep: build install # We have nothing to do by default. # Build architecture-dependent files here. binary-arch: build install dh_testdir dh_testroot dh_installchangelogs CHANGES dh_installdocs dh_install --sourcedir=debian/tmp dh_installdebconf dh_installlogrotate dh_installinit -n -r -u stop 20 0 6 . dh_installman --sourcedir=debian/tmp dh_link dh_strip --dbg-package=greenbone-security-assistant-dbg dh_compress dh_fixperms dh_installdeb dh_shlibdeps dh_gencontrol dh_md5sums dh_builddeb binary: binary-indep binary-arch .PHONY: build clean binary-indep binary-arch binary install ++++++ greenbone-security-assistant.dsc ++++++ Format: 1.0 Source: greenbone-security-assistant Binary: greenbone-security-assistant Architecture: any Version: 2.0.1-1 Maintainer: Stephan Kleine <bitshuffler(a)opensuse.org> Homepage: http://www.openvas.org/ Standards-Version: 3.8.0 Build-Depends: debhelper (>= 5), dpatch, cmake, doxygen, hardening-wrapper, libmicrohttpd-dev (>= 0.4.2), libopenvas4-dev, libxslt1-dev, pkg-config, xsltproc Files: 776ce4e1000137c9aec7863372c8c876 373800 greenbone-security-assistant-2.0.1.tar.gz 131e6720b0526ade9405eade0d9150ac 56625 greenbone-security-assistant-2.0.1.diff.gz ++++++ gsad.init.fedora ++++++ #!/bin/sh # # greenbone-security-assistant This starts and stops the Greenbone Security Assistant. # # chkconfig: 35 75 25 # description: This starts and stops the Greenbone Security Assistant. # processname: /usr/sbin/gsad # config: /etc/openvas/gsad.conf # pidfile: /var/run/gsad.pid # ### BEGIN INIT INFO # Provides: $greenbone-security-assistant ### END INIT INFO # Source function library. . /etc/rc.d/init.d/functions EXEC="/usr/sbin/gsad" PROG=$(basename $EXEC) # Check for missing binaries (stale symlinks should not happen) # Note: Special treatment of stop for LSB conformance test -x $EXEC || { echo "$EXEC not installed"; if [ "$1" = "stop" ]; then exit 0; else exit 5; fi; } # Check for existence of needed config file GSAD_CONFIG=/etc/sysconfig/greenbone-security-assistant test -r $GSAD_CONFIG || { echo "$GSAD_CONFIG not existing"; if [ "$1" = "stop" ]; then exit 0; else exit 6; fi; } # Read config . $GSAD_CONFIG # Build parameters [ "$GSA_ADDRESS" ] && PARAMS="--listen=$GSA_ADDRESS" [ "$GSA_PORT" ] && PARAMS="$PARAMS --port=$GSA_PORT" [ "$GSA_SSL_PRIVATE_KEY" ] && PARAMS="$PARAMS --ssl-private-key=$GSA_SSL_PRIVATE_KEY" [ "$GSA_SSL_CERTIFICATE" ] && PARAMS="$PARAMS --ssl-certificate=$GSA_SSL_CERTIFICATE" [ "$GSA_REDIRECT" ] && [ "$GSA_REDIRECT" == 1 ] && PARAMS="$PARAMS --redirect" [ "$GSA_REDIRECT_PORT" ] && PARAMS="$PARAMS --rport=$GSA_REDIRECT_PORT" [ "$ADMINISTRATOR_ADDRESS" ] && PARAMS="$PARAMS --alisten=$ADMINISTRATOR_ADDRESS" [ "$ADMINISTRATOR_PORT" ] && PARAMS="$PARAMS --aport=$ADMINISTRATOR_PORT" [ "$MANAGER_ADDRESS" ] && PARAMS="$PARAMS --mlisten=$MANAGER_ADDRESS" [ "$MANAGER_PORT" ] && PARAMS="$PARAMS --mport=$MANAGER_PORT" LOCKFILE=/var/lock/subsys/$PROG start() { echo -n $"Starting greenbone-security-assistant: " daemon $EXEC $PARAMS RETVAL=$? echo [ $RETVAL -eq 0 ] && touch $LOCKFILE return $RETVAL } stop() { echo -n $"Stopping greenbone-security-assistant: " killproc $PROG RETVAL=$? echo [ $RETVAL -eq 0 ] && rm -f $LOCKFILE return $RETVAL } restart() { stop start } reload() { echo -n $"Reloading greenbone-security-assistant: " killproc $PROG -HUP RETVAL=$? echo return $RETVAL } force_reload() { restart } fdr_status() { status $PROG } case "$1" in start|stop|restart|reload) $1 ;; force-reload) force_reload ;; status) fdr_status ;; condrestart|try-restart) [ ! -f $LOCKFILE ] || restart ;; *) echo $"Usage: $0 {start|stop|status|restart|try-restart|reload|force-reload}" exit 2 esac ++++++ gsad.init.mandriva ++++++ #!/bin/sh # # LSB compatible service control script; see http://www.linuxbase.org/spec/ # ### BEGIN INIT INFO # Provides: greenbone-security-assistant # Required-Start: $syslog $remote_fs # Should-Start: $time ypbind smtp # Required-Stop: $syslog $remote_fs # Should-Stop: $time ypbind smtp # Default-Start: 3 5 # Default-Stop: 0 1 2 6 # Short-Description: Greenbone Security Assistant # Description: Start the Greenbone Security Assistant. ### END INIT INFO # # Source function library. . /etc/rc.d/init.d/functions EXEC="/usr/sbin/gsad" PROG=$(basename $EXEC) # Check for missing binaries (stale symlinks should not happen) # Note: Special treatment of stop for LSB conformance test -x $EXEC || { echo "$EXEC not installed"; if [ "$1" = "stop" ]; then exit 0; else exit 5; fi; } # Check for existence of needed config file GSAD_CONFIG=/etc/sysconfig/greenbone-security-assistant test -r $GSAD_CONFIG || { echo "$GSAD_CONFIG not existing"; if [ "$1" = "stop" ]; then exit 0; else exit 6; fi; } # Read config . $GSAD_CONFIG # Build parameters [ "$GSA_ADDRESS" ] && PARAMS="--listen=$GSA_ADDRESS" [ "$GSA_PORT" ] && PARAMS="$PARAMS --port=$GSA_PORT" [ "$GSA_SSL_PRIVATE_KEY" ] && PARAMS="$PARAMS --ssl-private-key=$GSA_SSL_PRIVATE_KEY" [ "$GSA_SSL_CERTIFICATE" ] && PARAMS="$PARAMS --ssl-certificate=$GSA_SSL_CERTIFICATE" [ "$GSA_REDIRECT" ] && [ "$GSA_REDIRECT" == 1 ] && PARAMS="$PARAMS --redirect" [ "$GSA_REDIRECT_PORT" ] && PARAMS="$PARAMS --rport=$GSA_REDIRECT_PORT" [ "$ADMINISTRATOR_ADDRESS" ] && PARAMS="$PARAMS --alisten=$ADMINISTRATOR_ADDRESS" [ "$ADMINISTRATOR_PORT" ] && PARAMS="$PARAMS --aport=$ADMINISTRATOR_PORT" [ "$MANAGER_ADDRESS" ] && PARAMS="$PARAMS --mlisten=$MANAGER_ADDRESS" [ "$MANAGER_PORT" ] && PARAMS="$PARAMS --mport=$MANAGER_PORT" LOCKFILE=/var/lock/subsys/$PROG start() { echo -n $"Starting greenbone-security-assistant: " daemon $EXEC $PARAMS RETVAL=$? echo [ $RETVAL -eq 0 ] && touch $LOCKFILE return $RETVAL } stop() { echo -n $"Stopping greenbone-security-assistant: " killproc $PROG RETVAL=$? echo [ $RETVAL -eq 0 ] && rm -f $LOCKFILE return $RETVAL } restart() { stop start } reload() { echo -n $"Reloading greenbone-security-assistant: " killproc $PROG -HUP RETVAL=$? echo return $RETVAL } force_reload() { restart } fdr_status() { status $PROG } case "$1" in start|stop|restart|reload) $1 ;; force-reload) force_reload ;; status) fdr_status ;; condrestart|try-restart) [ ! -f $LOCKFILE ] || restart ;; *) echo $"Usage: $0 {start|stop|status|restart|try-restart|reload|force-reload}" exit 2 esac ++++++ gsad.init.suse ++++++ #!/bin/sh # # /etc/init.d/greenbone-security-assistant # and its symbolic link # /usr/sbin/rcgreenbone-security-assistant # # LSB compatible service control script; see http://www.linuxbase.org/spec/ # ### BEGIN INIT INFO # Provides: greenbone-security-assistant # Required-Start: $syslog $remote_fs # Should-Start: $time ypbind smtp # Required-Stop: $syslog $remote_fs # Should-Stop: $time ypbind smtp # Default-Start: 3 5 # Default-Stop: 0 1 2 6 # Short-Description: Greenbone Security Assistant # Description: Start the Greenbone Security Assistant. ### END INIT INFO # # Note on runlevels: # 0 - halt/poweroff 6 - reboot # 1 - single user 2 - multiuser without network exported # 3 - multiuser w/ network (text mode) 5 - multiuser w/ network and X11 (xdm) # # Check for missing binaries (stale symlinks should not happen) # Note: Special treatment of stop for LSB conformance GSAD_BIN=/usr/sbin/gsad test -x $GSAD_BIN || { echo "$GSAD_BIN not installed"; if [ "$1" = "stop" ]; then exit 0; else exit 5; fi; } # Check for existence of needed config file and read it GSAD_CONFIG=/etc/sysconfig/greenbone-security-assistant test -r $GSAD_CONFIG || { echo "$GSAD_CONFIG not existing"; if [ "$1" = "stop" ]; then exit 0; else exit 6; fi; } # Read config . $GSAD_CONFIG # Build parameters [ "$GSA_ADDRESS" ] && PARAMS="--listen=$GSA_ADDRESS" [ "$GSA_PORT" ] && PARAMS="$PARAMS --port=$GSA_PORT" [ "$GSA_SSL_PRIVATE_KEY" ] && PARAMS="$PARAMS --ssl-private-key=$GSA_SSL_PRIVATE_KEY" [ "$GSA_SSL_CERTIFICATE" ] && PARAMS="$PARAMS --ssl-certificate=$GSA_SSL_CERTIFICATE" [ "$GSA_REDIRECT" ] && [ "$GSA_REDIRECT" == 1 ] && PARAMS="$PARAMS --redirect" [ "$GSA_REDIRECT_PORT" ] && PARAMS="$PARAMS --rport=$GSA_REDIRECT_PORT" [ "$ADMINISTRATOR_ADDRESS" ] && PARAMS="$PARAMS --alisten=$ADMINISTRATOR_ADDRESS" [ "$ADMINISTRATOR_PORT" ] && PARAMS="$PARAMS --aport=$ADMINISTRATOR_PORT" [ "$MANAGER_ADDRESS" ] && PARAMS="$PARAMS --mlisten=$MANAGER_ADDRESS" [ "$MANAGER_PORT" ] && PARAMS="$PARAMS --mport=$MANAGER_PORT" # Source LSB init functions # providing start_daemon, killproc, pidofproc, # log_success_msg, log_failure_msg and log_warning_msg. # This is currently not used by UnitedLinux based distributions and # not needed for init scripts for UnitedLinux only. If it is used, # the functions from rc.status should not be sourced or used. #. /lib/lsb/init-functions # Shell functions sourced from /etc/rc.status: # rc_check check and set local and overall rc status # rc_status check and set local and overall rc status # rc_status -v be verbose in local rc status and clear it afterwards # rc_status -v -r ditto and clear both the local and overall rc status # rc_status -s display "skipped" and exit with status 3 # rc_status -u display "unused" and exit with status 3 # rc_failed set local and overall rc status to failed # rc_failed <num> set local and overall rc status to <num> # rc_reset clear both the local and overall rc status # rc_exit exit appropriate to overall rc status # rc_active checks whether a service is activated by symlinks . /etc/rc.status # Reset status of this service rc_reset # Return values acc. to LSB for all commands but status: # 0 - success # 1 - generic or unspecified error # 2 - invalid or excess argument(s) # 3 - unimplemented feature (e.g. "reload") # 4 - user had insufficient privileges # 5 - program is not installed # 6 - program is not configured # 7 - program is not running # 8--199 - reserved (8--99 LSB, 100--149 distrib, 150--199 appl) # # Note that starting an already running service, stopping # or restarting a not-running service as well as the restart # with force-reload (in case signaling is not supported) are # considered a success. case "$1" in start) echo -n "Starting greenbone-security-assistant " ## Start daemon with startproc(8). If this fails ## the return value is set appropriately by startproc. /sbin/startproc $GSAD_BIN $PARAMS # Remember status and be verbose rc_status -v ;; stop) echo -n "Shutting down greenbone-security-assistant " ## Stop daemon with killproc(8) and if this fails ## killproc sets the return value according to LSB. /sbin/killproc -TERM $GSAD_BIN # Remember status and be verbose rc_status -v ;; try-restart|condrestart) ## Do a restart only if the service was active before. ## Note: try-restart is now part of LSB (as of 1.9). ## RH has a similar command named condrestart. if test "$1" = "condrestart"; then echo "${attn} Use try-restart ${done}(LSB)${attn} rather than condrestart ${warn}(RH)${norm}" fi $0 status if test $? = 0; then $0 restart else rc_reset # Not running is not a failure. fi # Remember status and be quiet rc_status ;; restart) ## Stop the service and regardless of whether it was ## running or not, start it again. $0 stop $0 start # Remember status and be quiet rc_status ;; force-reload) ## Signal the daemon to reload its config. Most daemons ## do this on signal 1 (SIGHUP). ## If it does not support it, restart the service if it ## is running. echo -n "Reload service greenbone-security-assistant " ## if it supports it: /sbin/killproc -HUP $GSAD_BIN #touch /var/run/gsad.pid rc_status -v ## Otherwise: #$0 try-restart #rc_status ;; reload) ## Like force-reload, but if daemon does not support ## signaling, do nothing (!) # If it supports signaling: echo -n "Reload service greenbone-security-assistant " /sbin/killproc -HUP $GSAD_BIN #touch /var/run/gsad.pid rc_status -v ## Otherwise if it does not support reload: #rc_failed 3 #rc_status -v ;; status) echo -n "Checking for service greenbone-security-assistant " ## Check status with checkproc(8), if process is running ## checkproc will return with exit status 0. # Return value is slightly different for the status command: # 0 - service up and running # 1 - service dead, but /var/run/ pid file exists # 2 - service dead, but /var/lock/ lock file exists # 3 - service not running (unused) # 4 - service status unknown :-( # 5--199 reserved (5--99 LSB, 100--149 distro, 150--199 appl.) # NOTE: checkproc returns LSB compliant status values. /sbin/checkproc $GSAD_BIN # NOTE: rc_status knows that we called this init script with # "status" option and adapts its messages accordingly. rc_status -v ;; probe) ## Optional: Probe for the necessity of a reload, print out the ## argument to this init script which is required for a reload. ## Note: probe is not (yet) part of LSB (as of 1.9) test $GSAD_CONFIG -nt /var/run/gsad.pid && echo reload ;; *) echo "Usage: $0 {start|stop|status|try-restart|restart|force-reload|reload|probe}" exit 1 ;; esac rc_exit ++++++ gsad.logrotate ++++++ /var/log/openvas/gsad.log { daily rotate 7 compress missingok notifempty sharedscripts } ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 choqok for openSUSE:Factory
by root＠hilbert.suse.de 22 Mar '11

22 Mar '11

Hello community, here is the log from the commit of package choqok for openSUSE:Factory checked in at Tue Mar 22 17:44:38 CET 2011. -------- --- KDE/choqok/choqok.changes 2011-01-27 17:55:19.000000000 +0100 +++ /mounts/work_src_done/STABLE/choqok/choqok.changes 2011-03-22 06:12:11.000000000 +0100 @@ -1,0 +2,5 @@ +Tue Mar 22 05:12:10 UTC 2011 - coolo(a)novell.com + +- licenses package is about to die + +------------------------------------------------------------------- calling whatdependson for head-i586 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ choqok.spec ++++++ --- /var/tmp/diff_new_pack.8ITMum/_old 2011-03-22 17:44:31.000000000 +0100 +++ /var/tmp/diff_new_pack.8ITMum/_new 2011-03-22 17:44:31.000000000 +0100 @@ -19,12 +19,12 @@ Name: choqok BuildRequires: kde4-filesystem libkde4-devel libqca2-devel libqjson-devel qoauth-devel -BuildRequires: fdupes licenses update-desktop-files +BuildRequires: fdupes update-desktop-files License: GPLv3 Group: Productivity/Networking/Other Summary: Micro-Blogging Client for KDE Version: 1.0 -Release: 1 +Release: 6 BuildRoot: %{_tmppath}/%{name}-%{version}-build Source: %{name}-%{version}.tar.bz2 Url: http://choqok.gnufolks.org ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 enblend-enfuse for openSUSE:Factory
by root＠hilbert.suse.de 22 Mar '11

22 Mar '11

Hello community, here is the log from the commit of package enblend-enfuse for openSUSE:Factory checked in at Tue Mar 22 17:44:09 CET 2011. -------- --- enblend-enfuse/enblend-enfuse.changes 2010-05-20 09:59:33.000000000 +0200 +++ /mounts/work_src_done/STABLE/enblend-enfuse/enblend-enfuse.changes 2011-03-21 17:52:30.000000000 +0100 @@ -1,0 +2,5 @@ +Mon Mar 21 16:52:29 UTC 2011 - coolo(a)novell.com + +- licenses package is about to die + +------------------------------------------------------------------- calling whatdependson for head-i586 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ enblend-enfuse.spec ++++++ --- /var/tmp/diff_new_pack.WnnkB9/_old 2011-03-22 17:43:49.000000000 +0100 +++ /var/tmp/diff_new_pack.WnnkB9/_new 2011-03-22 17:43:49.000000000 +0100 @@ -1,7 +1,7 @@ # -# spec file for package enblend-enfuse (Version 4.0) +# spec file for package enblend-enfuse # -# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2011 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 @@ -24,13 +24,12 @@ Group: Productivity/Graphics/Other Summary: Tool for Composing Images Version: 4.0 -Release: 3 +Release: 9 Source: %{name}-%{version}.tar.bz2 Patch0: enblend-enfuse-libpng14.patch Patch1: use-default-gcc-inlining.diff -BuildRequires: OpenEXR-devel boost-devel freeglut-devel gcc-c++ glew-devel liblcms-devel libpng-devel libtiff-devel licenses plotutils-devel +BuildRequires: OpenEXR-devel boost-devel freeglut-devel gcc-c++ glew-devel liblcms-devel libpng-devel libtiff-devel plotutils-devel BuildRequires: gnuplot tidy transfig -Requires: licenses Provides: enblend = %{version} Provides: enfuse = %{version} # package name for < openSUSE 11.1: @@ -73,7 +72,6 @@ %install %makeinstall -ln -sf /usr/share/doc/licenses/md5/$(md5sum COPYING | sed 's/ .*//') COPYING %clean rm -rf $RPM_BUILD_ROOT ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 hugin for openSUSE:Factory
by root＠hilbert.suse.de 22 Mar '11

22 Mar '11

Hello community, here is the log from the commit of package hugin for openSUSE:Factory checked in at Tue Mar 22 17:42:38 CET 2011. -------- --- hugin/hugin.changes 2010-12-28 17:19:55.000000000 +0100 +++ /mounts/work_src_done/STABLE/hugin/hugin.changes 2011-03-22 08:15:26.000000000 +0100 @@ -1,0 +2,10 @@ +Mon Mar 22 08:12:00 UTC 2011 - idoenmez(a)novell.com + +- Add hugin-fix-gcc46.patch: fix gcc 4.6 compilation + +------------------------------------------------------------------- +Mon Mar 21 16:51:59 UTC 2011 - coolo(a)novell.com + +- licenses package is about to die + +------------------------------------------------------------------- calling whatdependson for head-i586 New: ---- hugin-fix-gcc46.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ hugin.spec ++++++ --- /var/tmp/diff_new_pack.JsuznB/_old 2011-03-22 17:42:20.000000000 +0100 +++ /var/tmp/diff_new_pack.JsuznB/_new 2011-03-22 17:42:20.000000000 +0100 @@ -26,23 +26,24 @@ BuildRequires: python-wxGTK wxGTK-devel %endif %if %suse_version > 1020 -BuildRequires: fdupes licenses -Requires: licenses +BuildRequires: fdupes %endif License: GPLv2+ Group: Productivity/Graphics/Other Summary: Toolchain for Stitching of Images and Creating Panoramas Version: 2010.0.0 -Release: 6 +Release: 11 Source: %{name}-%{version}.tar.bz2 # For SVN snapshot: # svn co https://hugin.svn.sourceforge.net/svnroot/hugin/hugin/trunk hugin #Source: %{name}-svn2008xxxx.tar.bz2 Source1: %{name}-svn-dummy Patch0: hugin-libpng14.patch +# PATCH-FIX-UPSTREAM hugin-fix-gcc46.patch idoenmez(a)suse.de -- Fix compilation with gcc 4.6 +Patch1: hugin-fix-gcc46.patch Url: http://hugin.sourceforge.net/ BuildRoot: %{_tmppath}/%{name}-%{version}-build -Requires: licenses make +Requires: make # Optional package, if missing, it could cause unexpected errors: Requires: enblend-enfuse >= 3.2 # Optional third party package: @@ -80,6 +81,7 @@ %prep %setup -q %patch0 +%patch1 -p1 # For SVN snapshot: #setup -q -n %{name} # Rename Catalan in Spain to Catalan. @@ -115,12 +117,6 @@ mv $RPM_BUILD_ROOT%{_datadir}/icons/gnome $RPM_BUILD_ROOT%{_datadir}/icons/hicolor %if %suse_version > 1020 %fdupes $RPM_BUILD_ROOT%{_datadir} -for FILE in COPYING LICENCE LICENCE_JHEAD LICENCE_VIGRA ; do - MD5SUM=$(md5sum $FILE | sed 's/ .*//') - if test -f /usr/share/doc/licenses/md5/$MD5SUM ; then - ln -sf /usr/share/doc/licenses/md5/$MD5SUM $FILE - fi -done %endif %clean ++++++ hugin-fix-gcc46.patch ++++++ # HG changeset patch # User Bruno Postle <bruno(a)postle.net> # Date 1295990053 0 # Node ID 1fc6ad6e7c7ae679e3b8f96b6f4c36920f228138 # Parent 9e1d0816a1edd95a985ad6fd62da9c8b7342efb5 Fix for compilation with gcc-4.6.0 diff -r 9e1d0816a1ed -r 1fc6ad6e7c7a src/foreign/vigra/vigra/multi_iterator.hxx --- a/src/foreign/vigra/vigra/multi_iterator.hxx Mon Jan 24 21:37:53 2011 +0100 +++ b/src/foreign/vigra/vigra/multi_iterator.hxx Tue Jan 25 21:14:13 2011 +0000 @@ -41,6 +41,7 @@ #define VIGRA_MULTI_ITERATOR_HXX #include <sys/types.h> +#include <stddef.h> #include "tinyvector.hxx" #include "iteratortags.hxx" ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 kid3-qt for openSUSE:Factory
by root＠hilbert.suse.de 22 Mar '11

22 Mar '11

Hello community, here is the log from the commit of package kid3-qt for openSUSE:Factory checked in at Tue Mar 22 17:42:05 CET 2011. -------- --- kid3-qt/kid3-qt.changes 2011-03-18 00:00:02.000000000 +0100 +++ /mounts/work_src_done/STABLE/kid3-qt/kid3-qt.changes 2011-03-21 17:57:51.000000000 +0100 @@ -1,0 +2,5 @@ +Mon Mar 21 16:57:50 UTC 2011 - coolo(a)novell.com + +- licenses package is about to die + +------------------------------------------------------------------- calling whatdependson for head-i586 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kid3-qt.spec ++++++ --- /var/tmp/diff_new_pack.QI1PlC/_old 2011-03-22 17:40:11.000000000 +0100 +++ /var/tmp/diff_new_pack.QI1PlC/_new 2011-03-22 17:40:11.000000000 +0100 @@ -20,7 +20,7 @@ Name: kid3-qt Version: 1.6 -Release: 1 +Release: 2 Summary: Efficient ID3 Tag Editor - Non Kde version Source0: kid3-%{version}.tar.bz2 Patch0: kid3-qt-phonon.patch @@ -28,7 +28,7 @@ Group: Productivity/Multimedia/Sound/Utilities License: GPLv2+ BuildRoot: %{_tmppath}/%{name}-%{version}-build -BuildRequires: licenses pkg-config +BuildRequires: pkg-config %if 0%{?suse_version} >= 1130 BuildRequires: pkgconfig(phonon) %else @@ -40,8 +40,6 @@ BuildRequires: jpackage-utils libmusicbrainz3-devel libvorbis-devel BuildRequires: crimson fop hicolor-icon-theme susedoc xerces-j2 -Requires: licenses - Provides: kid3 = %{version} Obsoletes: kid3 < %{version} @@ -98,12 +96,6 @@ # install -Dpm 0644 deb/kid3.1 %{buildroot}%{_mandir}/man1/kid3-qt.1 -for FILE in COPYING ; do - MD5SUM=$(md5sum $FILE | sed 's/ .*//') - if test -f /usr/share/doc/licenses/md5/$MD5SUM ; then - ln -sf /usr/share/doc/licenses/md5/$MD5SUM $FILE - fi -done #find %%{buildroot} -type f -o -name "*.so" -exec strip "{}" \; cp -pr AUTHORS ChangeLog COPYING LICENSE NEWS README %{buildroot}%{_docdir}/%{name}/ %find_lang %{name} %{name}-qt.lang --without-kde --with-qt --all-name --without-mo ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 kiwi-config-openSUSE for openSUSE:Factory
by root＠hilbert.suse.de 22 Mar '11

22 Mar '11

Hello community, here is the log from the commit of package kiwi-config-openSUSE for openSUSE:Factory checked in at Tue Mar 22 17:39:17 CET 2011. -------- --- kiwi-config-openSUSE/kiwi-config-openSUSE.changes 2011-03-06 12:35:26.000000000 +0100 +++ /mounts/work_src_done/STABLE/kiwi-config-openSUSE/kiwi-config-openSUSE.changes 2011-03-21 17:55:38.000000000 +0100 @@ -1,0 +2,5 @@ +Mon Mar 21 16:55:21 UTC 2011 - coolo(a)novell.com + +- licenses package is about to die + +------------------------------------------------------------------- calling whatdependson for head-i586 New: ---- GPL-2.0.txt gpl-3.0.txt ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kiwi-config-openSUSE.spec ++++++ --- /var/tmp/diff_new_pack.OvKPP8/_old 2011-03-22 17:38:22.000000000 +0100 +++ /var/tmp/diff_new_pack.OvKPP8/_new 2011-03-22 17:38:22.000000000 +0100 @@ -20,13 +20,13 @@ Name: kiwi-config-openSUSE BuildRequires: fdupes kiwi-desc-isoboot BuildRequires: kiwi-desc-oemboot kiwi-desc-usbboot kiwi-doc kiwi-tools -BuildRequires: licenses skelcd-control-openSUSE skelcd-openSUSE-CD +BuildRequires: skelcd-control-openSUSE skelcd-openSUSE-CD BuildRequires: libxslt #opensuse-gnomequick_en-pdf opensuse-kdequick_en-pdf BuildRequires: jing kiwi yast2-country Summary: KDE live CD Version: 11.4 -Release: 9 +Release: 10 Group: System/Boot License: BSD3c(or similar) BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -46,6 +46,8 @@ Source23: langset.sh Source26: xdm-liveinstall.patch Source27: SoftLocks +Source30: GPL-2.0.txt +Source31: gpl-3.0.txt ExcludeArch: ia64 ppc64 s390x s390 ppc %description @@ -119,8 +121,8 @@ #test -z "$out" # jing is a great tool always exit 0 mkdir config-cdroot cd config-cdroot - install -m 644 /usr/share/doc/licenses/GPL-2.0.txt GPLv2.txt - install -m 644 /usr/share/doc/licenses/gpl-3.0.txt GPLv3.txt + install -m 644 %{SOURCE30} GPLv2.txt + install -m 644 %{SOURCE31} GPLv3.txt tar czf ../config-cdroot.tgz * cd .. rm -rf config-cdroot ++++++ GPL-2.0.txt ++++++ GNU GENERAL PUBLIC LICENSE Version 2, June 1991 Copyright (C) 1989, 1991 Free Software Foundation, Inc. 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA Everyone is permitted to copy and distribute verbatim copies of this license document, but changing it is not allowed. Preamble The licenses for most software are designed to take away your freedom to share and change it. By contrast, the GNU General Public License is intended to guarantee your freedom to share and change free software--to make sure the software is free for all its users. This General Public License applies to most of the Free Software Foundation's software and to any other program whose authors commit to using it. (Some other Free Software Foundation software is covered by the GNU Library General Public License instead.) You can apply it to your programs, too. When we speak of free software, we are referring to freedom, not price. Our General Public Licenses are designed to make sure that you have the freedom to distribute copies of free software (and charge for this service if you wish), that you receive source code or can get it if you want it, that you can change the software or use pieces of it in new free programs; and that you know you can do these things. To protect your rights, we need to make restrictions that forbid anyone to deny you these rights or to ask you to surrender the rights. These restrictions translate to certain responsibilities for you if you distribute copies of the software, or if you modify it. For example, if you distribute copies of such a program, whether gratis or for a fee, you must give the recipients all the rights that you have. You must make sure that they, too, receive or can get the source code. And you must show them these terms so they know their rights. We protect your rights with two steps: (1) copyright the software, and (2) offer you this license which gives you legal permission to copy, distribute and/or modify the software. Also, for each author's protection and ours, we want to make certain that everyone understands that there is no warranty for this free software. If the software is modified by someone else and passed on, we want its recipients to know that what they have is not the original, so that any problems introduced by others will not reflect on the original authors' reputations. Finally, any free program is threatened constantly by software patents. We wish to avoid the danger that redistributors of a free program will individually obtain patent licenses, in effect making the program proprietary. To prevent this, we have made it clear that any patent must be licensed for everyone's free use or not licensed at all. The precise terms and conditions for copying, distribution and modification follow. GNU GENERAL PUBLIC LICENSE TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION 0. This License applies to any program or other work which contains a notice placed by the copyright holder saying it may be distributed under the terms of this General Public License. The "Program", below, refers to any such program or work, and a "work based on the Program" means either the Program or any derivative work under copyright law: that is to say, a work containing the Program or a portion of it, either verbatim or with modifications and/or translated into another language. (Hereinafter, translation is included without limitation in the term "modification".) Each licensee is addressed as "you". Activities other than copying, distribution and modification are not covered by this License; they are outside its scope. The act of running the Program is not restricted, and the output from the Program is covered only if its contents constitute a work based on the Program (independent of having been made by running the Program). Whether that is true depends on what the Program does. 1. You may copy and distribute verbatim copies of the Program's source code as you receive it, in any medium, provided that you conspicuously and appropriately publish on each copy an appropriate copyright notice and disclaimer of warranty; keep intact all the notices that refer to this License and to the absence of any warranty; and give any other recipients of the Program a copy of this License along with the Program. You may charge a fee for the physical act of transferring a copy, and you may at your option offer warranty protection in exchange for a fee. 2. You may modify your copy or copies of the Program or any portion of it, thus forming a work based on the Program, and copy and distribute such modifications or work under the terms of Section 1 above, provided that you also meet all of these conditions: a) You must cause the modified files to carry prominent notices stating that you changed the files and the date of any change. b) You must cause any work that you distribute or publish, that in whole or in part contains or is derived from the Program or any part thereof, to be licensed as a whole at no charge to all third parties under the terms of this License. c) If the modified program normally reads commands interactively when run, you must cause it, when started running for such interactive use in the most ordinary way, to print or display an announcement including an appropriate copyright notice and a notice that there is no warranty (or else, saying that you provide a warranty) and that users may redistribute the program under these conditions, and telling the user how to view a copy of this License. (Exception: if the Program itself is interactive but does not normally print such an announcement, your work based on the Program is not required to print an announcement.) These requirements apply to the modified work as a whole. If identifiable sections of that work are not derived from the Program, and can be reasonably considered independent and separate works in themselves, then this License, and its terms, do not apply to those sections when you distribute them as separate works. But when you distribute the same sections as part of a whole which is a work based on the Program, the distribution of the whole must be on the terms of this License, whose permissions for other licensees extend to the entire whole, and thus to each and every part regardless of who wrote it. Thus, it is not the intent of this section to claim rights or contest your rights to work written entirely by you; rather, the intent is to exercise the right to control the distribution of derivative or collective works based on the Program. In addition, mere aggregation of another work not based on the Program with the Program (or with a work based on the Program) on a volume of a storage or distribution medium does not bring the other work under the scope of this License. 3. You may copy and distribute the Program (or a work based on it, under Section 2) in object code or executable form under the terms of Sections 1 and 2 above provided that you also do one of the following: a) Accompany it with the complete corresponding machine-readable source code, which must be distributed under the terms of Sections 1 and 2 above on a medium customarily used for software interchange; or, b) Accompany it with a written offer, valid for at least three years, to give any third party, for a charge no more than your cost of physically performing source distribution, a complete machine-readable copy of the corresponding source code, to be distributed under the terms of Sections 1 and 2 above on a medium customarily used for software interchange; or, c) Accompany it with the information you received as to the offer to distribute corresponding source code. (This alternative is allowed only for noncommercial distribution and only if you received the program in object code or executable form with such an offer, in accord with Subsection b above.) The source code for a work means the preferred form of the work for making modifications to it. For an executable work, complete source code means all the source code for all modules it contains, plus any associated interface definition files, plus the scripts used to control compilation and installation of the executable. However, as a special exception, the source code distributed need not include anything that is normally distributed (in either source or binary form) with the major components (compiler, kernel, and so on) of the operating system on which the executable runs, unless that component itself accompanies the executable. If distribution of executable or object code is made by offering access to copy from a designated place, then offering equivalent access to copy the source code from the same place counts as distribution of the source code, even though third parties are not compelled to copy the source along with the object code. 4. You may not copy, modify, sublicense, or distribute the Program except as expressly provided under this License. Any attempt otherwise to copy, modify, sublicense or distribute the Program is void, and will automatically terminate your rights under this License. However, parties who have received copies, or rights, from you under this License will not have their licenses terminated so long as such parties remain in full compliance. 5. You are not required to accept this License, since you have not signed it. However, nothing else grants you permission to modify or distribute the Program or its derivative works. These actions are prohibited by law if you do not accept this License. Therefore, by modifying or distributing the Program (or any work based on the Program), you indicate your acceptance of this License to do so, and all its terms and conditions for copying, distributing or modifying the Program or works based on it. 6. Each time you redistribute the Program (or any work based on the Program), the recipient automatically receives a license from the original licensor to copy, distribute or modify the Program subject to these terms and conditions. You may not impose any further restrictions on the recipients' exercise of the rights granted herein. You are not responsible for enforcing compliance by third parties to this License. 7. If, as a consequence of a court judgment or allegation of patent infringement or for any other reason (not limited to patent issues), conditions are imposed on you (whether by court order, agreement or otherwise) that contradict the conditions of this License, they do not excuse you from the conditions of this License. If you cannot distribute so as to satisfy simultaneously your obligations under this License and any other pertinent obligations, then as a consequence you may not distribute the Program at all. For example, if a patent license would not permit royalty-free redistribution of the Program by all those who receive copies directly or indirectly through you, then the only way you could satisfy both it and this License would be to refrain entirely from distribution of the Program. If any portion of this section is held invalid or unenforceable under any particular circumstance, the balance of the section is intended to apply and the section as a whole is intended to apply in other circumstances. It is not the purpose of this section to induce you to infringe any patents or other property right claims or to contest validity of any such claims; this section has the sole purpose of protecting the integrity of the free software distribution system, which is implemented by public license practices. Many people have made generous contributions to the wide range of software distributed through that system in reliance on consistent application of that system; it is up to the author/donor to decide if he or she is willing to distribute software through any other system and a licensee cannot impose that choice. This section is intended to make thoroughly clear what is believed to be a consequence of the rest of this License. 8. If the distribution and/or use of the Program is restricted in certain countries either by patents or by copyrighted interfaces, the original copyright holder who places the Program under this License may add an explicit geographical distribution limitation excluding those countries, so that distribution is permitted only in or among countries not thus excluded. In such case, this License incorporates the limitation as if written in the body of this License. 9. The Free Software Foundation may publish revised and/or new versions of the General Public License from time to time. Such new versions will be similar in spirit to the present version, but may differ in detail to address new problems or concerns. Each version is given a distinguishing version number. If the Program specifies a version number of this License which applies to it and "any later version", you have the option of following the terms and conditions either of that version or of any later version published by the Free Software Foundation. If the Program does not specify a version number of this License, you may choose any version ever published by the Free Software Foundation. 10. If you wish to incorporate parts of the Program into other free programs whose distribution conditions are different, write to the author to ask for permission. For software which is copyrighted by the Free Software Foundation, write to the Free Software Foundation; we sometimes make exceptions for this. Our decision will be guided by the two goals of preserving the free status of all derivatives of our free software and of promoting the sharing and reuse of software generally. NO WARRANTY 11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION. 12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES. END OF TERMS AND CONDITIONS How to Apply These Terms to Your New Programs If you develop a new program, and you want it to be of the greatest possible use to the public, the best way to achieve this is to make it free software which everyone can redistribute and change under these terms. To do so, attach the following notices to the program. It is safest to attach them to the start of each source file to most effectively convey the exclusion of warranty; and each file should have at least the "copyright" line and a pointer to where the full notice is found. <one line to give the program's name and a brief idea of what it does.> Copyright (C) 19yy <name of author> This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version. This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA Also add information on how to contact you by electronic and paper mail. If the program is interactive, make it output a short notice like this when it starts in an interactive mode: Gnomovision version 69, Copyright (C) 19yy name of author Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'. This is free software, and you are welcome to redistribute it under certain conditions; type `show c' for details. The hypothetical commands `show w' and `show c' should show the appropriate parts of the General Public License. Of course, the commands you use may be called something other than `show w' and `show c'; they could even be mouse-clicks or menu items--whatever suits your program. You should also get your employer (if you work as a programmer) or your school, if any, to sign a "copyright disclaimer" for the program, if necessary. Here is a sample; alter the names: Yoyodyne, Inc., hereby disclaims all copyright interest in the program `Gnomovision' (which makes passes at compilers) written by James Hacker. <signature of Ty Coon>, 1 April 1989 Ty Coon, President of Vice This General Public License does not permit incorporating your program into proprietary programs. If your program is a subroutine library, you may consider it more useful to permit linking proprietary applications with the library. If this is what you want to do, use the GNU Library General Public License instead of this License. ++++++ gpl-3.0.txt ++++++ ++++ 674 lines (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 lxcc for openSUSE:Factory
by root＠hilbert.suse.de 22 Mar '11

22 Mar '11

Hello community, here is the log from the commit of package lxcc for openSUSE:Factory checked in at Tue Mar 22 17:37:59 CET 2011. -------- --- lxcc/lxcc.changes 2010-06-07 16:06:21.000000000 +0200 +++ /mounts/work_src_done/STABLE/lxcc/lxcc.changes 2011-03-21 17:51:26.000000000 +0100 @@ -1,0 +2,11 @@ +Mon Mar 21 16:51:25 UTC 2011 - coolo(a)novell.com + +- licenses package is about to die + +------------------------------------------------------------------- +Mon Mar 14 14:37:08 UTC 2011 - gber(a)opensuse.org + +- install the icon properly in /usr/share/pixmaps +- call %desktop_database_post/un + +------------------------------------------------------------------- calling whatdependson for head-i586 New: ---- COPYING ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ lxcc.spec ++++++ --- /var/tmp/diff_new_pack.IZsltL/_old 2011-03-22 17:37:40.000000000 +0100 +++ /var/tmp/diff_new_pack.IZsltL/_new 2011-03-22 17:37:40.000000000 +0100 @@ -1,7 +1,7 @@ # -# spec file for package lxcc (Version 0.1.0+svn730) +# spec file for package lxcc # -# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2011 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,18 +21,17 @@ Name: lxcc Summary: LXDE Control Center Version: 0.1.0+svn730 -Release: 2 +Release: 8 License: GPLv3 Group: System/GUI/LXDE Url: https://noc.sidux.com/lxde Source0: %{name}.tar.bz2 Source1: %{name}_template.moo Source2: README.SUSE +Source3: COPYING BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: fdupes python-devel update-desktop-files -BuildRequires: licenses BuildArch: noarch -Requires: licenses Requires: python-gtk >= 2.0 Requires: python-gobject2 %py_requires @@ -44,25 +43,34 @@ %setup -q -n %name %__cp %{SOURCE1} . %__cp %{SOURCE2} . +%__mv usr/share/icons usr/share/pixmaps %build %install -%__mkdir_p %buildroot/ -%__cp -r usr %buildroot/ +find usr -depth -print | cpio -pvd %{buildroot} %suse_update_desktop_file %name -ln -sf /usr/share/doc/licenses/gpl-3.0.txt COPYING %fdupes -s %buildroot +cp %{S:3} . %clean %__rm -rf %buildroot +%if 0%{?suse_version} >= 1140 + +%post +%desktop_database_post + +%postun +%desktop_database_postun +%endif + %files %defattr (-,root,root,-) %doc %{name}_template.moo README.SUSE COPYING %{_bindir}/%name %{_datadir}/applications/* -%{_datadir}/icons/%name.png +%{_datadir}/pixmaps/%name.png %{_datadir}/locale/*/LC_MESSAGES/%name.moo %changelog ++++++ COPYING ++++++ ++++ 674 lines (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 ozerocdoff for openSUSE:Factory
by root＠hilbert.suse.de 22 Mar '11

22 Mar '11

Hello community, here is the log from the commit of package ozerocdoff for openSUSE:Factory checked in at Tue Mar 22 17:28:24 CET 2011. -------- --- ozerocdoff/ozerocdoff.changes 2010-02-23 10:57:32.000000000 +0100 +++ /mounts/work_src_done/STABLE/ozerocdoff/ozerocdoff.changes 2011-03-22 06:11:38.000000000 +0100 @@ -1,0 +2,5 @@ +Tue Mar 22 05:11:38 UTC 2011 - coolo(a)novell.com + +- licenses package is about to die + +------------------------------------------------------------------- calling whatdependson for head-i586 New: ---- COPYING ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ ozerocdoff.spec ++++++ --- /var/tmp/diff_new_pack.38J2AM/_old 2011-03-22 17:28:10.000000000 +0100 +++ /var/tmp/diff_new_pack.38J2AM/_new 2011-03-22 17:28:10.000000000 +0100 @@ -1,7 +1,7 @@ # -# spec file for package ozerocdoff (Version 0.4) +# spec file for package ozerocdoff # -# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2011 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 @@ -19,22 +19,23 @@ Name: ozerocdoff -BuildRequires: libusb-devel licenses +BuildRequires: libusb-devel # for directory ownership BuildRequires: hal udev License: GPLv2+ Group: Hardware/Modem Version: 0.4 -Release: 4 +Release: 14 Summary: Enable the modem ports on Option ZeroCD devices Url: http://www.pharscape.org/ozerocdoff.html Source0: udev.tar.gz +Source1: COPYING Patch0: ozerocdoff-makefile-libdir.diff Patch1: ozerocdoff-udevinfo.diff Patch2: ozerocdoff-udev.diff BuildRoot: %{_tmppath}/%{name}-%{version}-build AutoReqProv: on -Requires: hal udev licenses +Requires: hal udev %description This tool allows to switch so called "ZeroCD" devices from Option into @@ -48,10 +49,10 @@ %prep %setup -n udev +cp %{S:1} . %patch0 -p1 %patch1 -p1 %patch2 -p0 -ln -s /usr/share/doc/licenses/GPL-2.0.txt COPYING %build # This package failed when testing with -Wl,-as-needed being default. ++++++ COPYING ++++++ GNU GENERAL PUBLIC LICENSE Version 2, June 1991 Copyright (C) 1989, 1991 Free Software Foundation, Inc. 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA Everyone is permitted to copy and distribute verbatim copies of this license document, but changing it is not allowed. Preamble The licenses for most software are designed to take away your freedom to share and change it. By contrast, the GNU General Public License is intended to guarantee your freedom to share and change free software--to make sure the software is free for all its users. This General Public License applies to most of the Free Software Foundation's software and to any other program whose authors commit to using it. (Some other Free Software Foundation software is covered by the GNU Library General Public License instead.) You can apply it to your programs, too. When we speak of free software, we are referring to freedom, not price. Our General Public Licenses are designed to make sure that you have the freedom to distribute copies of free software (and charge for this service if you wish), that you receive source code or can get it if you want it, that you can change the software or use pieces of it in new free programs; and that you know you can do these things. To protect your rights, we need to make restrictions that forbid anyone to deny you these rights or to ask you to surrender the rights. These restrictions translate to certain responsibilities for you if you distribute copies of the software, or if you modify it. For example, if you distribute copies of such a program, whether gratis or for a fee, you must give the recipients all the rights that you have. You must make sure that they, too, receive or can get the source code. And you must show them these terms so they know their rights. We protect your rights with two steps: (1) copyright the software, and (2) offer you this license which gives you legal permission to copy, distribute and/or modify the software. Also, for each author's protection and ours, we want to make certain that everyone understands that there is no warranty for this free software. If the software is modified by someone else and passed on, we want its recipients to know that what they have is not the original, so that any problems introduced by others will not reflect on the original authors' reputations. Finally, any free program is threatened constantly by software patents. We wish to avoid the danger that redistributors of a free program will individually obtain patent licenses, in effect making the program proprietary. To prevent this, we have made it clear that any patent must be licensed for everyone's free use or not licensed at all. The precise terms and conditions for copying, distribution and modification follow. GNU GENERAL PUBLIC LICENSE TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION 0. This License applies to any program or other work which contains a notice placed by the copyright holder saying it may be distributed under the terms of this General Public License. The "Program", below, refers to any such program or work, and a "work based on the Program" means either the Program or any derivative work under copyright law: that is to say, a work containing the Program or a portion of it, either verbatim or with modifications and/or translated into another language. (Hereinafter, translation is included without limitation in the term "modification".) Each licensee is addressed as "you". Activities other than copying, distribution and modification are not covered by this License; they are outside its scope. The act of running the Program is not restricted, and the output from the Program is covered only if its contents constitute a work based on the Program (independent of having been made by running the Program). Whether that is true depends on what the Program does. 1. You may copy and distribute verbatim copies of the Program's source code as you receive it, in any medium, provided that you conspicuously and appropriately publish on each copy an appropriate copyright notice and disclaimer of warranty; keep intact all the notices that refer to this License and to the absence of any warranty; and give any other recipients of the Program a copy of this License along with the Program. You may charge a fee for the physical act of transferring a copy, and you may at your option offer warranty protection in exchange for a fee. 2. You may modify your copy or copies of the Program or any portion of it, thus forming a work based on the Program, and copy and distribute such modifications or work under the terms of Section 1 above, provided that you also meet all of these conditions: a) You must cause the modified files to carry prominent notices stating that you changed the files and the date of any change. b) You must cause any work that you distribute or publish, that in whole or in part contains or is derived from the Program or any part thereof, to be licensed as a whole at no charge to all third parties under the terms of this License. c) If the modified program normally reads commands interactively when run, you must cause it, when started running for such interactive use in the most ordinary way, to print or display an announcement including an appropriate copyright notice and a notice that there is no warranty (or else, saying that you provide a warranty) and that users may redistribute the program under these conditions, and telling the user how to view a copy of this License. (Exception: if the Program itself is interactive but does not normally print such an announcement, your work based on the Program is not required to print an announcement.) These requirements apply to the modified work as a whole. If identifiable sections of that work are not derived from the Program, and can be reasonably considered independent and separate works in themselves, then this License, and its terms, do not apply to those sections when you distribute them as separate works. But when you distribute the same sections as part of a whole which is a work based on the Program, the distribution of the whole must be on the terms of this License, whose permissions for other licensees extend to the entire whole, and thus to each and every part regardless of who wrote it. Thus, it is not the intent of this section to claim rights or contest your rights to work written entirely by you; rather, the intent is to exercise the right to control the distribution of derivative or collective works based on the Program. In addition, mere aggregation of another work not based on the Program with the Program (or with a work based on the Program) on a volume of a storage or distribution medium does not bring the other work under the scope of this License. 3. You may copy and distribute the Program (or a work based on it, under Section 2) in object code or executable form under the terms of Sections 1 and 2 above provided that you also do one of the following: a) Accompany it with the complete corresponding machine-readable source code, which must be distributed under the terms of Sections 1 and 2 above on a medium customarily used for software interchange; or, b) Accompany it with a written offer, valid for at least three years, to give any third party, for a charge no more than your cost of physically performing source distribution, a complete machine-readable copy of the corresponding source code, to be distributed under the terms of Sections 1 and 2 above on a medium customarily used for software interchange; or, c) Accompany it with the information you received as to the offer to distribute corresponding source code. (This alternative is allowed only for noncommercial distribution and only if you received the program in object code or executable form with such an offer, in accord with Subsection b above.) The source code for a work means the preferred form of the work for making modifications to it. For an executable work, complete source code means all the source code for all modules it contains, plus any associated interface definition files, plus the scripts used to control compilation and installation of the executable. However, as a special exception, the source code distributed need not include anything that is normally distributed (in either source or binary form) with the major components (compiler, kernel, and so on) of the operating system on which the executable runs, unless that component itself accompanies the executable. If distribution of executable or object code is made by offering access to copy from a designated place, then offering equivalent access to copy the source code from the same place counts as distribution of the source code, even though third parties are not compelled to copy the source along with the object code. 4. You may not copy, modify, sublicense, or distribute the Program except as expressly provided under this License. Any attempt otherwise to copy, modify, sublicense or distribute the Program is void, and will automatically terminate your rights under this License. However, parties who have received copies, or rights, from you under this License will not have their licenses terminated so long as such parties remain in full compliance. 5. You are not required to accept this License, since you have not signed it. However, nothing else grants you permission to modify or distribute the Program or its derivative works. These actions are prohibited by law if you do not accept this License. Therefore, by modifying or distributing the Program (or any work based on the Program), you indicate your acceptance of this License to do so, and all its terms and conditions for copying, distributing or modifying the Program or works based on it. 6. Each time you redistribute the Program (or any work based on the Program), the recipient automatically receives a license from the original licensor to copy, distribute or modify the Program subject to these terms and conditions. You may not impose any further restrictions on the recipients' exercise of the rights granted herein. You are not responsible for enforcing compliance by third parties to this License. 7. If, as a consequence of a court judgment or allegation of patent infringement or for any other reason (not limited to patent issues), conditions are imposed on you (whether by court order, agreement or otherwise) that contradict the conditions of this License, they do not excuse you from the conditions of this License. If you cannot distribute so as to satisfy simultaneously your obligations under this License and any other pertinent obligations, then as a consequence you may not distribute the Program at all. For example, if a patent license would not permit royalty-free redistribution of the Program by all those who receive copies directly or indirectly through you, then the only way you could satisfy both it and this License would be to refrain entirely from distribution of the Program. If any portion of this section is held invalid or unenforceable under any particular circumstance, the balance of the section is intended to apply and the section as a whole is intended to apply in other circumstances. It is not the purpose of this section to induce you to infringe any patents or other property right claims or to contest validity of any such claims; this section has the sole purpose of protecting the integrity of the free software distribution system, which is implemented by public license practices. Many people have made generous contributions to the wide range of software distributed through that system in reliance on consistent application of that system; it is up to the author/donor to decide if he or she is willing to distribute software through any other system and a licensee cannot impose that choice. This section is intended to make thoroughly clear what is believed to be a consequence of the rest of this License. 8. If the distribution and/or use of the Program is restricted in certain countries either by patents or by copyrighted interfaces, the original copyright holder who places the Program under this License may add an explicit geographical distribution limitation excluding those countries, so that distribution is permitted only in or among countries not thus excluded. In such case, this License incorporates the limitation as if written in the body of this License. 9. The Free Software Foundation may publish revised and/or new versions of the General Public License from time to time. Such new versions will be similar in spirit to the present version, but may differ in detail to address new problems or concerns. Each version is given a distinguishing version number. If the Program specifies a version number of this License which applies to it and "any later version", you have the option of following the terms and conditions either of that version or of any later version published by the Free Software Foundation. If the Program does not specify a version number of this License, you may choose any version ever published by the Free Software Foundation. 10. If you wish to incorporate parts of the Program into other free programs whose distribution conditions are different, write to the author to ask for permission. For software which is copyrighted by the Free Software Foundation, write to the Free Software Foundation; we sometimes make exceptions for this. Our decision will be guided by the two goals of preserving the free status of all derivatives of our free software and of promoting the sharing and reuse of software generally. NO WARRANTY 11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION. 12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES. END OF TERMS AND CONDITIONS How to Apply These Terms to Your New Programs If you develop a new program, and you want it to be of the greatest possible use to the public, the best way to achieve this is to make it free software which everyone can redistribute and change under these terms. To do so, attach the following notices to the program. It is safest to attach them to the start of each source file to most effectively convey the exclusion of warranty; and each file should have at least the "copyright" line and a pointer to where the full notice is found. <one line to give the program's name and a brief idea of what it does.> Copyright (C) 19yy <name of author> This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version. This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA Also add information on how to contact you by electronic and paper mail. If the program is interactive, make it output a short notice like this when it starts in an interactive mode: Gnomovision version 69, Copyright (C) 19yy name of author Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'. This is free software, and you are welcome to redistribute it under certain conditions; type `show c' for details. The hypothetical commands `show w' and `show c' should show the appropriate parts of the General Public License. Of course, the commands you use may be called something other than `show w' and `show c'; they could even be mouse-clicks or menu items--whatever suits your program. You should also get your employer (if you work as a programmer) or your school, if any, to sign a "copyright disclaimer" for the program, if necessary. Here is a sample; alter the names: Yoyodyne, Inc., hereby disclaims all copyright interest in the program `Gnomovision' (which makes passes at compilers) written by James Hacker. <signature of Ty Coon>, 1 April 1989 Ty Coon, President of Vice This General Public License does not permit incorporating your program into proprietary programs. If your program is a subroutine library, you may consider it more useful to permit linking proprietary applications with the library. If this is what you want to do, use the GNU Library General Public License instead of this License. ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 plasmoid-cwp for openSUSE:Factory
by root＠hilbert.suse.de 22 Mar '11

22 Mar '11

Hello community, here is the log from the commit of package plasmoid-cwp for openSUSE:Factory checked in at Tue Mar 22 17:26:09 CET 2011. -------- --- KDE/plasmoid-cwp/plasmoid-cwp.changes 2011-03-19 14:05:07.000000000 +0100 +++ /mounts/work_src_done/STABLE/plasmoid-cwp/plasmoid-cwp.changes 2011-03-21 17:50:05.000000000 +0100 @@ -1,0 +2,5 @@ +Mon Mar 21 16:50:04 UTC 2011 - coolo(a)novell.com + +- licenses package is about to die + +------------------------------------------------------------------- calling whatdependson for head-i586 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ plasmoid-cwp.spec ++++++ --- /var/tmp/diff_new_pack.jdIPHa/_old 2011-03-22 17:25:43.000000000 +0100 +++ /var/tmp/diff_new_pack.jdIPHa/_new 2011-03-22 17:25:43.000000000 +0100 @@ -21,7 +21,7 @@ Name: plasmoid-cwp Version: 1.5.0 -Release: 1 +Release: 2 Summary: Customizable Weather Plasmoid License: GPLv3+ @@ -33,12 +33,10 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: libkde4-devel -BuildRequires: licenses %if 0%{?suse_version} BuildRequires: update-desktop-files %endif Requires: kdebase4-workspace -Requires: licenses %kde4_runtime_requires Recommends: %{name}-lang = %{version} # renamed when plasmoid was renamed with version 0.9.3 @@ -70,12 +68,6 @@ %kde4_makeinstall cd .. -# -MD5SUM=$(md5sum COPYING | sed 's/ .*//') -if test -f /usr/share/doc/licenses/md5/$MD5SUM ; then - ln -sf /usr/share/doc/licenses/md5/$MD5SUM COPYING -fi - %if 0%{?suse_version} %suse_update_desktop_file %{buildroot}%{_datadir}/kde4/services/plasma-applet-cwp.desktop %endif ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 plasmoid-quickaccess for openSUSE:Factory
by root＠hilbert.suse.de 22 Mar '11

22 Mar '11

Hello community, here is the log from the commit of package plasmoid-quickaccess for openSUSE:Factory checked in at Tue Mar 22 17:24:57 CET 2011. -------- --- KDE/plasmoid-quickaccess/plasmoid-quickaccess.changes 2009-07-11 00:43:32.000000000 +0200 +++ /mounts/work_src_done/STABLE/plasmoid-quickaccess/plasmoid-quickaccess.changes 2011-03-21 17:53:02.000000000 +0100 @@ -1,0 +2,20 @@ +Mon Mar 21 16:53:02 UTC 2011 - coolo(a)novell.com + +- licenses package is about to die + +------------------------------------------------------------------- +Sun Mar 20 15:59:52 UTC 2011 - asterios.dramis(a)gmail.com + +- Added two patches to fix the issue that the widget icon in the panel does not + respect panel icon size (lp#670025). Patches are from + https://bugs.launchpad.net/quickaccess/+bug/670025. +- Added a patch, taken from Fedora, to fix "taking address of temporary object" + build error (with -fpermissive) which appears when compiling with gcc-4.6. +- Spec file updates: + * Changes based on rpmdevtools templates and spec-cleaner run. + * Changed License: to GPLv2+. + * Updates in Buildrequires: (replaced kdebase4-workspace-devel with + libkde4-devel). + * Updates in %install and %files sections. + +------------------------------------------------------------------- calling whatdependson for head-i586 New: ---- kde-plasma-quickaccess-0.8.1-fix-address-of-temporary-object-error.patch quickaccess.cpp.diff quickaccess.h.diff ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ plasmoid-quickaccess.spec ++++++ --- /var/tmp/diff_new_pack.34XffZ/_old 2011-03-22 17:23:07.000000000 +0100 +++ /var/tmp/diff_new_pack.34XffZ/_new 2011-03-22 17:23:07.000000000 +0100 @@ -1,7 +1,7 @@ # -# spec file for package plasmoid-quickaccess (Version 0.8.1) +# spec file for package plasmoid-quickaccess # -# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany. # Copyright (c) 2008-2009 Buschmann <buschmann23(a)opensuse.org> # # All modifications and additions to the file contributed by third parties @@ -18,63 +18,69 @@ # norootforbuild -BuildRequires: kdebase4-workspace-devel libkonq-devel licenses update-desktop-files Name: plasmoid-quickaccess +Version: 0.8.1 +Release: 12 Summary: Quick Access Plasmoid for KDE Desktop + +License: GPLv2+ Url: http://www.kde-look.org/content/show.php/QuickAccess?content=101968 -Version: 0.8.1 -Release: 2 -License: GPL v2 only Group: System/GUI/KDE Source0: 101968-plasma-widget-quickaccess_%{version}.orig.tar.bz2 +# PATCH-FIX-UPSTREAM quickaccess.cpp.diff lp#670025 asterios.dramis(a)gmail.com -- Fix for widget icon in panel does not respect panel icon size (see https://bugs.launchpad.net/quickaccess/+bug/670025) +Patch0: quickaccess.cpp.diff +# PATCH-FIX-UPSTREAM quickaccess.h.diff lp#670025 asterios.dramis(a)gmail.com -- Fix for widget icon in panel does not respect panel icon size (see https://bugs.launchpad.net/quickaccess/+bug/670025) +Patch1: quickaccess.h.diff +# PATCH-FIX-OPENSUSE kde-plasma-quickaccess-0.8.1-fix-address-of-temporary-object-error.patch asterios.dramis(a)gmail.com -- Fix "taking address of temporary object" build error (with -fpermissive) +Patch2: kde-plasma-quickaccess-0.8.1-fix-address-of-temporary-object-error.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build -AutoReqProv: yes -Requires: kdebase4-workspace licenses + +BuildRequires: libkde4-devel +BuildRequires: libkonq-devel +%if 0%{?suse_version} +BuildRequires: update-desktop-files +%endif +Requires: kdebase4-workspace +%kde4_runtime_requires Provides: kdebase3:/opt/kde3/share/apps/kicker/builtins/browser.desktop Provides: kde4-plasmoid-quickaccess = 0.8.1 Obsoletes: kde4-plasmoid-quickaccess <= 0.8.1 -%kde4_runtime_requires %description This is a small applet designed for the panel to have quick access to the most used folders. - - -Authors: --------- - Mark Herbert <wirrkpf(a)googlemail.com - > - %prep %setup -qn plasma-widget-quickaccess-%{version} +%patch0 +%patch1 +%patch2 -p1 -b .fix-address-of-temporary-object-error %build - %cmake_kde4 -d builddir - %make_jobs +%cmake_kde4 -d builddir +%make_jobs %install - pushd builddir - %makeinstall - popd - for FILE in COPYING ; do - MD5SUM=$(md5sum $FILE | sed 's/ .*//') - if test -f /usr/share/doc/licenses/md5/$MD5SUM ; then - ln -sf /usr/share/doc/licenses/md5/$MD5SUM $FILE - fi - done - %suse_update_desktop_file -n $RPM_BUILD_ROOT/usr/share/kde4/services/plasma-applet-quickaccess.desktop - %kde_post_install - %find_lang plasma_applet_quickaccess +pushd builddir +%kde4_makeinstall +popd + +%if 0%{?suse_version} +%suse_update_desktop_file %{buildroot}%{_kde4_servicesdir}/plasma-applet-quickaccess.desktop +%endif + +%find_lang plasma_applet_quickaccess + +%kde_post_install %clean - rm -rf $RPM_BUILD_ROOT +rm -rf %{buildroot} %files -f plasma_applet_quickaccess.lang -%defattr(-,root,root) -%doc COPYING README -%_libdir/kde4/plasma_applet_quickaccess.so -%_kde_share_dir/services/plasma-applet-quickaccess.desktop +%defattr(-,root,root,-) +%doc COPYING ChangeLog README +%{_kde4_modulesdir}/plasma_applet_quickaccess.so +%{_kde4_servicesdir}/plasma-applet-quickaccess.desktop %changelog ++++++ kde-plasma-quickaccess-0.8.1-fix-address-of-temporary-object-error.patch ++++++ diff -up plasma-widget-quickaccess-0.8.1/popupdialog.cpp.fix-address-of-temporary-object-error plasma-widget-quickaccess-0.8.1/popupdialog.cpp --- plasma-widget-quickaccess-0.8.1/popupdialog.cpp.fix-address-of-temporary-object-error 2009-05-27 21:02:59.000000000 +0200 +++ plasma-widget-quickaccess-0.8.1/popupdialog.cpp 2011-02-17 15:56:42.205288780 +0100 @@ -249,7 +249,7 @@ void PopupDialog::hideEvent ( QHideEvent m_backButton->hide(); if(m_settings->enableDolphinSorting()) { - checkDolphinSorting(&(m_current.url())); + checkDolphinSorting(m_current.url()); } QWidget::hideEvent( event ); emit signal_hide(); @@ -258,7 +258,7 @@ void PopupDialog::hideEvent ( QHideEvent void PopupDialog::setStartUrl(const KUrl &url) { if(m_settings->enableDolphinSorting()) - checkDolphinSorting(&url); + checkDolphinSorting(url); if( !m_model->dirLister()->openUrl( url ) ) kDebug() << "can not open url: " << url; connect(m_model->dirLister(), SIGNAL(completed()), this, SLOT(dirListerCompleted())); @@ -323,7 +323,7 @@ void PopupDialog::slot_open(const QModel } if(m_settings->enableDolphinSorting()) - checkDolphinSorting(&(m_current.url())); + checkDolphinSorting(m_current.url()); if(m_current.isFile() || !m_settings->allowNavigation()) { m_current.run(); @@ -332,8 +332,8 @@ void PopupDialog::slot_open(const QModel m_label->setFileItem(m_current); } -void PopupDialog::checkDolphinSorting(const KUrl *dir) { - KConfig conf(dir->path(KUrl::AddTrailingSlash)+".directory"); +void PopupDialog::checkDolphinSorting(const KUrl& dir) { + KConfig conf(dir.path(KUrl::AddTrailingSlash)+".directory"); KConfigGroup cg(&conf, "Dolphin"); int sortingType = cg.readEntry("Sorting", 0); int sortOrder = cg.readEntry("SortOrder", 0); diff -up plasma-widget-quickaccess-0.8.1/popupdialog.h.fix-address-of-temporary-object-error plasma-widget-quickaccess-0.8.1/popupdialog.h --- plasma-widget-quickaccess-0.8.1/popupdialog.h.fix-address-of-temporary-object-error 2009-05-27 21:01:52.000000000 +0200 +++ plasma-widget-quickaccess-0.8.1/popupdialog.h 2011-02-17 15:53:46.015491457 +0100 @@ -58,7 +58,7 @@ class PopupDialog : public ResizeDialog KFileItem startItem() { return m_start; } - void checkDolphinSorting(const KUrl *dir); + void checkDolphinSorting(const KUrl &dir); signals: void signal_hide(); ++++++ quickaccess.cpp.diff ++++++ --- quickaccess.cpp 2009-05-27 21:02:59.000000000 +0200 +++ quickaccess.cpp 2010-09-11 06:47:36.000000000 +0200 @@ -33,6 +33,7 @@ #include <KConfigDialog> #include <konq_operations.h> #include <KMessageBox> +#include <KGlobalSettings> //Plasma #include <Plasma/ToolTipManager> @@ -84,7 +85,7 @@ connect(m_icon, SIGNAL(clicked()), this, SLOT(slot_iconClicked())); layout->addItem(m_icon); - + Plasma::ToolTipManager::self()->registerWidget(this); //read the config @@ -101,6 +102,9 @@ setAspectRatioMode(Plasma::ConstrainedSquare); connect(m_saveTimer, SIGNAL(timeout()), this, SLOT(saveSettings())); + + connect(KGlobalSettings::self(), SIGNAL(iconChanged(int)), + this, SLOT(iconSizeChanged(int))); } void QuickAccess::popupEvent(bool show) @@ -338,4 +342,34 @@ } } +QSizeF QuickAccess::sizeHint(Qt::SizeHint which, const QSizeF & constraint) const +{ + if (which == Qt::PreferredSize) { + int iconSize; + + switch (formFactor()) { + case Plasma::Planar: + case Plasma::MediaCenter: + iconSize = IconSize(KIconLoader::Desktop); + break; + + case Plasma::Horizontal: + case Plasma::Vertical: + iconSize = IconSize(KIconLoader::Panel); + break; + } + + return QSizeF(iconSize, iconSize); + } + + return Plasma::Applet::sizeHint(which, constraint); +} + +void QuickAccess::iconSizeChanged(int group) +{ + if (group == KIconLoader::Desktop || group == KIconLoader::Panel) { + updateGeometry(); + } +} + #include "quickaccess.moc" ++++++ quickaccess.h.diff ++++++ --- quickaccess.h 2009-05-27 21:01:52.000000000 +0200 +++ quickaccess.h 2010-09-11 06:29:39.000000000 +0200 @@ -55,6 +55,7 @@ void dragLeaveEvent(QGraphicsSceneDragDropEvent *event); void dropEvent(QGraphicsSceneDragDropEvent *event); void popupEvent(bool show); + QSizeF sizeHint(Qt::SizeHint which, const QSizeF & constraint = QSizeF()) const; private slots: @@ -64,6 +65,7 @@ void showCustomLabelToggled(bool checked); void showPreviewToggled(bool checked); void saveSettings(); + void iconSizeChanged(int group); private: PopupDialog* dialog(); ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 sfftobmp for openSUSE:Factory
by root＠hilbert.suse.de 22 Mar '11

22 Mar '11

Hello community, here is the log from the commit of package sfftobmp for openSUSE:Factory checked in at Tue Mar 22 17:20:23 CET 2011. -------- --- sfftobmp/sfftobmp.changes 2011-03-21 13:19:38.000000000 +0100 +++ /mounts/work_src_done/STABLE/sfftobmp/sfftobmp.changes 2011-03-21 19:43:58.000000000 +0100 @@ -1,0 +2,6 @@ +Mon Mar 21 19:42:01 CET 2011 - pth(a)suse.de + +- Fix class member initialisation to quite the compiler. +- Cast vars to the type matching the printf format. + +------------------------------------------------------------------- calling whatdependson for head-i586 New: ---- sfftobmp-codecleanup.diff ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ sfftobmp.spec ++++++ --- /var/tmp/diff_new_pack.Hm4PVr/_old 2011-03-22 17:19:53.000000000 +0100 +++ /var/tmp/diff_new_pack.Hm4PVr/_new 2011-03-22 17:19:53.000000000 +0100 @@ -20,16 +20,18 @@ Name: sfftobmp BuildRequires: boost-devel gcc-c++ libjpeg-devel libtiff-devel +BuildRequires: unix2dos License: MIT Group: Hardware/ISDN AutoReqProv: on Version: 3.1.1 -Release: 111 +Release: 112 Summary: Tool to convert Structured Fax Files (.sff) to other image formats Source: %{name}-%{version}.tar.bz2 Url: http://sfftools.sourceforge.net/ BuildRoot: %{_tmppath}/%{name}-%{version}-build Patch: %{name}-gcc43.diff +Patch1: sfftobmp-codecleanup.diff %description The CAPI interface for programming ISDN hardware expects and gives @@ -49,7 +51,9 @@ %prep %setup -q -n %{name}%{version} +dos2unix -c mac src/output.h %patch +%patch1 %build #This will stop working with boost 1.48 ++++++ sfftobmp-codecleanup.diff ++++++ Index: src/output.cpp =================================================================== --- src/output.cpp.orig 2011-03-21 16:36:39.000000000 +0100 +++ src/output.cpp 2011-03-21 16:37:17.293874585 +0100 @@ -163,7 +163,7 @@ void CPBMFilter::BeginPage(sff_dword aPa m_pFile->Write(acBuf, strlen(acBuf)); sprintf(acBuf, "%s", "# generated with SffToBmp\n"); m_pFile->Write(acBuf, strlen(acBuf)); - sprintf(acBuf, "%ld %ld\n", aWidth, aHeight); + sprintf(acBuf, "%u %u\n", (unsigned int)aWidth, (unsigned int)aHeight); m_pFile->Write(acBuf, strlen(acBuf)); } Index: src/output.h =================================================================== --- src/output.h.orig 2011-03-21 16:37:14.482473442 +0100 +++ src/output.h 2011-03-21 16:37:17.294874728 +0100 @@ -87,9 +87,9 @@ protected: public: COutputFilter(const std::string& strExt, sff_word nPagecount) : - m_strExtension(strExt), + m_sink(m_abBuffer, sizeof(m_abBuffer)), m_nPageCount(nPagecount), - m_sink(m_abBuffer, sizeof(m_abBuffer)) + m_strExtension(strExt) { /* nth. else */ } virtual void Init(CFile *pFile); @@ -157,8 +157,8 @@ protected: public: CJPEGFilter(sff_word nPagecount, int nQuality = 40) : COutputFilter(".jpg", nPagecount), - m_quality(nQuality), - m_bytesink(m_abBuffer, sizeof(m_abBuffer)) + m_bytesink(m_abBuffer, sizeof(m_abBuffer)), + m_quality(nQuality) { /* nth. else */ }; CBitSink& GetBitSink(); @@ -185,8 +185,8 @@ protected: public: CTIFFFilter(sff_word nPagecount, sff_word nCompression, time_t nModTime) : COutputFilter(".tif", nPagecount), - m_wCompression(nCompression), m_tiffFile(NULL), + m_wCompression(nCompression), m_nModTime(nModTime) { /* nth. else */ }; Index: src/cmdline.cpp =================================================================== --- src/cmdline.cpp.orig 2011-03-21 16:36:39.000000000 +0100 +++ src/cmdline.cpp 2011-03-21 16:37:17.322878722 +0100 @@ -140,7 +140,7 @@ void CCmdLineProcessor::printVersion() void CCmdLineProcessor::parseCmdLine() { // short options string (one colon: req arg, two colon: opt arg) - char *shortopts = "vhbpT::t::frdj::o:q"; + const char * const shortopts = "vhbpT::t::frdj::o:q"; // long options list struct option longopts[] = { ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 rpmlint for openSUSE:Factory
by root＠hilbert.suse.de 22 Mar '11

22 Mar '11

Hello community, here is the log from the commit of package rpmlint for openSUSE:Factory checked in at Tue Mar 22 13:04:25 CET 2011. -------- --- rpmlint/rpmlint.changes 2011-02-16 11:29:27.000000000 +0100 +++ /mounts/work_src_done/STABLE/rpmlint/rpmlint.changes 2011-03-21 17:09:41.000000000 +0100 @@ -1,0 +2,11 @@ +Mon Mar 21 16:08:59 UTC 2011 - lnussel(a)suse.de + +- add NetworkManager to dbus whitelist (bnc#681128) +- add wpa_supplicant to dbus whitelist (bnc#681116) + +------------------------------------------------------------------- +Wed Mar 16 11:42:39 CET 2011 - dmueller(a)suse.de + +- fix typo (bnc#675329) + +------------------------------------------------------------------- calling whatdependson for head-i586 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ rpmlint.spec ++++++ --- /var/tmp/diff_new_pack.NvfUA7/_old 2011-03-22 13:02:57.000000000 +0100 +++ /var/tmp/diff_new_pack.NvfUA7/_new 2011-03-22 13:02:57.000000000 +0100 @@ -23,7 +23,7 @@ BuildRequires: rpm-python Summary: Rpm correctness checker Version: 1.0 -Release: 24 +Release: 25 Source0: %{name}-%{version}.tar.bz2 Source1: config Source1001: config.in ++++++ config ++++++ --- /var/tmp/diff_new_pack.NvfUA7/_old 2011-03-22 13:02:58.000000000 +0100 +++ /var/tmp/diff_new_pack.NvfUA7/_new 2011-03-22 13:02:58.000000000 +0100 @@ -307,6 +307,8 @@ "org.freedesktop.RealtimeKit1.service", # wpa_supplicant "fi.epitest.hostap.WPASupplicant.service", + # bnc#681116 + "fi.w1.wpa_supplicant1.service", "wpa_supplicant.conf", # kdebase4-workspace "org.kde.fontinst.service", @@ -339,6 +341,8 @@ "org.freedesktop.nm_dispatcher.service", "NetworkManager.conf", "NetworkManager-frontend.conf", + # bnc#681128 + "org.freedesktop.NetworkManager.service", # ModemManager "org.freedesktop.ModemManager.service", "org.freedesktop.ModemManager.conf", ++++++ suse-pkg-config-check.diff ++++++ --- /var/tmp/diff_new_pack.NvfUA7/_old 2011-03-22 13:02:58.000000000 +0100 +++ /var/tmp/diff_new_pack.NvfUA7/_new 2011-03-22 13:02:58.000000000 +0100 @@ -45,7 +45,7 @@ '''The URL tag is missing. Please add a http or ftp link to the project location.''', +'no-pkg-config-provides', -+'''The package installes a .pc file but does not provide pkgconfig(..) provides. ++'''The package installs a .pc file but does not provide pkgconfig(..) provides. +The most likely reason for that is that it was built without BuildRequires: pkg-config. +Please double check your build dependencies.''', + ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 openvas-manager for openSUSE:Factory
by root＠hilbert.suse.de 22 Mar '11

22 Mar '11

Hello community, here is the log from the commit of package openvas-manager for openSUSE:Factory checked in at Tue Mar 22 12:22:49 CET 2011. -------- New Changes file: --- /dev/null 2010-08-26 16:28:41.000000000 +0200 +++ /mounts/work_src_done/STABLE/openvas-manager/openvas-manager.changes 2011-03-03 01:57:28.000000000 +0100 @@ -0,0 +1,320 @@ +------------------------------------------------------------------- +Thu Mar 3 00:43:42 UTC 2011 - bitshuffler(a)opensuse.org + +- Updated to 2.0.2 + * The test infrastructure has been updated. + * A bug which caused the host count to be calculated incorrectly under certain + circumstances has been fixed. + * A number of memory and resource leaks discovered by Felix Wolfsteller have + been closed. + * A bug which caused database migration to fail when upgrading very old + installations has been fixed. + +------------------------------------------------------------------- +Wed Feb 23 18:55:19 UTC 2011 - bitshuffler(a)opensuse.org + +- Updated to 2.0.1 + * Support for fallback system reports has been added in case where a full system + report is unavailable. + * The expected location for signatures has been updated to match the FHS related + changes in OpenVAS Scanner. + * The "unscanned_closed" preference now defaults to "yes" for predefined + configs. + * The report format signature infrastructure has been improved. + * A bug which caused valid host names to be reject under certain circumstances + has been fixed. + +------------------------------------------------------------------- +Wed Feb 9 21:18:22 UTC 2011 - bitshuffler(a)opensuse.org + +- Updated to 2.0.0 + * The logging behaviour when started with --verbose has been improved. + * The w3af NVT is no longer part of the Full and fast default scan config. + * The build environment has been cleaned up. + +------------------------------------------------------------------- +Fri Feb 4 20:32:00 UTC 2011 - bitshuffler(a)opensuse.org + +- Updated to 1.99.4 + * Documentation has been updated. + * OpenVAS Manager now uses pkg-config to find required libraries. + * An issue which caused the creation of overrides to fail under some + circumstances has been fixed. + * The installation is now compliant with Filesystem Hierarchy Standard (FHS + 2.3). + +------------------------------------------------------------------- +Mon Jan 24 13:55:09 UTC 2011 - bitshuffler(a)opensuse.org + +- Updated to 1.99.3 + * A security-relevant bug has been fixed regarding email escalation methods. + Configured OpenVAS users were able to damage installation and/or gain higher + privileges. + * An issue which caused database migration to fail under certain circumstances + has been fixed. + * The default log level has been reduced to warning to prevent the logging of + potentially sensitive information in the default configuration. + +------------------------------------------------------------------- +Mon Jan 10 15:03:18 UTC 2011 - bitshuffler(a)opensuse.org + +- Updated to 1.99.2 + * The protocol documentation has been brought up to date. + * The output of --version now complies with the GNU Coding Standards. + * Passwords are now masked when loggings LSC package creation commands. + +------------------------------------------------------------------- +Tue Dec 21 13:00:23 UTC 2010 - bitshuffler(a)opensuse.org + +- Updated to 1.99.1 + * The protocol documentation has been improved. + * Target credentials for SMB and SSH are now separated. + * Support for setting the port range for a target has been added. + * Hardening flags are now enabled during compile time to increase code quality. + * Support for retrieving the total number of results matching an applied filter + has been added. + +------------------------------------------------------------------- +Fri Dec 10 13:47:09 UTC 2010 - bitshuffler(a)opensuse.org + +- Updated to 1.98.3 + * The protocol self-documentation has been improved. + * NTLMSSP is now enabled by default. + * Escalator message now include more information. + * The LaTeX and PDF reports have been made more consistent with the other + report formats. + * An issue which caused internal links in the PDF report to link to wrong + results under certain circumstances has been fixed. + * An issue which caused some existing LSC credential packages to be empty on + subsequent downloads under certain circumstances has been fixed. + +------------------------------------------------------------------- +Fri Dec 3 17:16:14 UTC 2010 - bitshuffler(a)opensuse.org + +- Updated to 1.98.2 + * The protocol self-documentation has been improved. + * A number of superfluous log messages has been downgraded or removed. + * A bug which caused issues to be counted incorrectly in the ports overview has + been fixed. + * The generation of PDF and LaTeX reports is now faster. + +------------------------------------------------------------------- +Fri Nov 19 16:47:08 UTC 2010 - bitshuffler(a)opensuse.org +- Updated to 1.98.1 + * Report Format plugin framework. All previous reporting features + were converted to plugins. The XML representation of a report + is now the base for any plugin and thus consistency of reports + is improved. + + Report Format Plugins can be set active so that they + appear in the selection lists. Selections can consider + content types so that for example only the plugins with + content type "text" are offered as Email body. + + It is possible to use parameters for the plugins so the + user can adjust the behaviour of the Report Format to + the individual preferences or needs. + + A verification method allows to distribute signatures + for valid plugins via the NVT Feed. + * New default Report Format: TXT for simple text. + * New default Report Format: LaTeX for LaTeX source. + * New sample Report Format: Simple Bar Chart. + Demonstrates how to use Gnuplot for graphical reports. + * New sample Report Format: Simple Topo Plot. + Demonstrates how to use Graphviz for graphical reports. + * New sample Report Format: Simple Pie Chart. + Demonstrates how to use PyChart for graphical reports. + * New sample Report Format: Simple Map Plot. + Demonstrates how to use MapServer and GDAL for graphical reports. + * New sample Report Format: Sourcefire Host Input. + Demonstrates that Report Formats can be used to build connectors. + * Master-Slave feature. Any OpenVAS Manager can use one or many other + OpenVAS Manager as slave to run scans. The whole scan task + is transferred to the slave, results are continuously reported + to the Master during scan process. After the scan is finished + all data are removed from the slave. + + The master can also retrieve system reports from the slave and + thus can collect the performance overview for all configured slaves. + * New Escalator: HTTP GET. This allows for example to access + text message (SMS) gateways or ticket management systems. + * Extended Escalator: For EMail escalation it is now possible + to select from configured Report Formats to be included in the + Email body. + * Agents: A verification method was added. This allows to + distribute signatures for valid agents via the NVT Feed. + * Credentials: Can now be edited. This allows to change the login + name or password without the need to create a new scan configuration. + * Credentials: Auto-generated installer packages are now created on + the fly. If the generators are improved, it is now easy to create + an updated package for already existing credentials. + * OMP self-documentation: Part of the Managers' XML-based communication protocol + OMP 2.0 is to deliver the full specification and documentation of the + protocol itself (command "HELP"). It can be retrieved as XML-, + RNC- or HTML representation. + * Targets: Various opportunities have been added to specify and combine IP ranges. + * Tasks: The task overview is delivered much faster now. + * Reports: The report filtering is much faster now. + +------------------------------------------------------------------- +Sun Oct 31 18:28:35 UTC 2010 - bitshuffler(a)opensuse.org + +- Updated to 1.0.3 + * Two bugs which caused the manager to fail to give adequate replies on certain + report and scan config requests have been fixed. + * A bug which caused PDF reports to be unavailable for reports which contained + certain unicode character has been fixed. + +------------------------------------------------------------------- +Tue Aug 17 14:26:50 UTC 2010 - bitshuffler(a)opensuse.org + +- Updated to 1.0.2 + * A bug which could cause changes in derived scan configs to affect predefined + scan configs under certain circumstances has been fixed. + +------------------------------------------------------------------- +Mon Aug 9 14:39:18 UTC 2010 - bitshuffler(a)opensuse.org + +- Updated to 1.0.1 + * A fix for incorrect preference values in the database has been adjusted to + work with GSA 1.0.1 as well. + +------------------------------------------------------------------- +Thu Jul 29 13:40:57 UTC 2010 - bitshuffler(a)opensuse.org + +- Updated to 1.0.0 + * A number of build issues has been addressed. + * The code documentation has been updated. + * Code cleanup: Internal error handling has been made more consistent. + * A potential ressource leak identified by static analysis has been fixed. + * A bug which caused NVT preferences to be displayed incorrectly has been + fixed. + +------------------------------------------------------------------- +Fri Jul 16 16:06:30 UTC 2010 - bitshuffler(a)opensuse.org + +- Updated to 1.0.0.rc1 ++++ 123 more lines (skipped) ++++ between /dev/null ++++ and /mounts/work_src_done/STABLE/openvas-manager/openvas-manager.changes calling whatdependson for head-i586 New: ---- debian.changelog debian.compat debian.control debian.openvas-manager.default debian.openvas-manager.dirs debian.openvas-manager.init debian.openvas-manager.install debian.openvas-manager.logrotate debian.rules openvas-manager-2.0.2.tar.gz openvas-manager.changes openvas-manager.dsc openvas-manager.spec openvasmd.init.fedora openvasmd.init.mandriva openvasmd.init.suse openvasmd.logrotate ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ openvas-manager.spec ++++++ # # spec file for package openvas-manager # # Copyright (c) 2011 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/ # # norootforbuild Name: openvas-manager Version: 2.0.2 Release: 1 License: GNU GPL v2 or later Group: Productivity/Networking/Security Url: http://www.openvas.org Source0: %{name}-%{version}.tar.gz Source1: openvasmd.logrotate Source2: debian.openvas-manager.default Source3: openvasmd.init.suse Source4: openvasmd.init.fedora Source5: openvasmd.init.mandriva BuildRoot: %{_tmppath}/%{name}-%{version}-build %if 0%{?fedora_version} || 0%{?scientificlinux_version} BuildRequires: sqlite-devel %endif %if 0%{?mandriva_version} BuildRequires: libsqlite3-devel BuildRequires: pinentry-gtk2 %endif %if 0%{?suse_version} BuildRequires: sqlite3-devel PreReq: %insserv_prereq PreReq: %fillup_prereq %endif BuildRequires: cmake >= 2.6.0 BuildRequires: doxygen BuildRequires: glib2-devel BuildRequires: libopenvas-devel BuildRequires: pkgconfig Requires: logrotate Summary: Manager Module of OpenVAS %description The OpenVAS-Manager is a layer between OpenVAS-Scanner and various client applications such as OpenVAS-Client or Greenbone Security Assistant. Among other features, it adds server-side storage of scan results and it makes it unnecessary for scan clients to keep connection until a scan finishes. %prep %setup -q %build %if 0%{?mandriva_version} %serverbuild %endif export CFLAGS="$RPM_OPT_FLAGS" %__mkdir build cd build cmake .. -DCMAKE_VERBOSE_MAKEFILE=ON \ -DCMAKE_INSTALL_PREFIX=%{_prefix} \ -DSYSCONFDIR=%{_sysconfdir} \ -DLOCALSTATEDIR=%{_localstatedir} \ -DCMAKE_BUILD_TYPE=release %__make %{?_smp_mflags} VERBOSE=1 %install pushd build %__make install DESTDIR=%{buildroot} popd %__install -Dm 0644 doc/openvasmd.8 %{buildroot}%{_mandir}/man8/openvasmd.8 %__install -Dm 0644 %{_sourcedir}/openvasmd.logrotate %{buildroot}%{_sysconfdir}/logrotate.d/openvas-manager %if 0%{?suse_version} %__install -Dm 0755 %{_sourcedir}/openvasmd.init.suse %{buildroot}%{_initrddir}/openvas-manager %__ln_s %{_initrddir}/openvas-manager %{buildroot}%{_sbindir}/rcopenvas-manager %__install -Dm 0644 %{_sourcedir}/debian.openvas-manager.default %{buildroot}%{_var}/adm/fillup-templates/sysconfig.openvas-manager %endif %if 0%{?fedora_version} || 0%{?scientificlinux_version} %__install -Dm 0755 %{_sourcedir}/openvasmd.init.fedora %{buildroot}%{_initrddir}/openvas-manager %__install -Dm 0644 %{_sourcedir}/debian.openvas-manager.default %{buildroot}%{_sysconfdir}/sysconfig/openvas-manager %endif %if 0%{?mandriva_version} %__install -Dm 0755 %{_sourcedir}/openvasmd.init.mandriva %{buildroot}%{_initrddir}/openvas-manager %__install -Dm 0644 %{_sourcedir}/debian.openvas-manager.default %{buildroot}%{_sysconfdir}/sysconfig/openvas-manager %endif %__mkdir_p %{buildroot}%{_localstatedir}/lib/openvas/mgr %__mkdir_p %{buildroot}%{_localstatedir}/log/openvas touch %{buildroot}%{_localstatedir}/log/openvas/openvasmd.log %clean test "%{buildroot}" != "/" && %__rm -rf %{buildroot} %post %if 0%{?suse_version} %fillup_and_insserv openvas-manager %endif %if 0%{?mandriva_version} %_post_service openvas-manager %endif %if 0%{?fedora_version} || 0%{?scientificlinux_version} # only rpm -i (not rpm {-U|-F}) if [ $1 = 1 ]; then /sbin/chkconfig --add openvas-manager fi %endif %preun %if 0%{?suse_version} %stop_on_removal openvas-manager %endif %if 0%{?mandriva_version} %_preun_service openvas-manager %endif %if 0%{?fedora_version} || 0%{?scientificlinux_version} # only rpm -e (not rpm {-U|-F}) if [ $1 = 0 ]; then /sbin/service openvas-manager stop > /dev/null 2>&1 || : /sbin/chkconfig --del openvas-manager fi %endif %postun %if 0%{?suse_version} %restart_on_update openvas-manager %insserv_cleanup %endif %if 0%{?fedora_version} || 0%{?scientificlinux_version} # only rpm {-U|-F} (not rpm -e) if [ $1 = 1 ]; then /sbin/service openvas-manager condrestart fi %endif %files %defattr(-,root,root) %doc CHANGES README %config(noreplace) %{_sysconfdir}/logrotate.d/openvas-manager %dir %{_sysconfdir}/openvas #config(noreplace) %{_sysconfdir}/openvas/openvasmd %config(noreplace) %{_sysconfdir}/openvas/openvasmd_log.conf %{_initrddir}/openvas-manager %{_sbindir}/openvasmd %{_mandir}/man8/openvasmd.8* %{_datadir}/openvas/openvasmd %dir %{_localstatedir}/lib/openvas %{_localstatedir}/lib/openvas/mgr %dir %{_localstatedir}/log/openvas %ghost %{_localstatedir}/log/openvas/openvasmd.log %if 0%{?suse_version} %{_sbindir}/rcopenvas-manager %{_var}/adm/fillup-templates/sysconfig.openvas-manager %else %config(noreplace) %{_sysconfdir}/sysconfig/openvas-manager %endif %changelog ++++++ debian.changelog ++++++ openvas-manager (2.0.2-1) UNRELEASED; urgency=low * New upstream release. - The test infrastructure has been updated. - A bug which caused the host count to be calculated incorrectly under certain circumstances has been fixed. - A number of memory and resource leaks discovered by Felix Wolfsteller have been closed. - A bug which caused database migration to fail when upgrading very old installations has been fixed. -- Stephan Kleine <bitshuffler(a)opensuse.org> Thu, 03 Mar 2011 01:41:38 +0100 openvas-manager (2.0.1-1) UNRELEASED; urgency=low * New upstream release. - Support for fallback system reports has been added in case where a full system report is unavailable. - The expected location for signatures has been updated to match the FHS related changes in OpenVAS Scanner. - The "unscanned_closed" preference now defaults to "yes" for predefined configs. - The report format signature infrastructure has been improved. - A bug which caused valid host names to be reject under certain circumstances has been fixed. -- Stephan Kleine <bitshuffler(a)opensuse.org> Wed, 23 Feb 2011 19:53:56 +0100 openvas-manager (2.0.0-1) UNRELEASED; urgency=low * New upstream release. - The logging behaviour when started with --verbose has been improved. - The w3af NVT is no longer part of the Full and fast default scan config. - The build environment has been cleaned up. -- Stephan Kleine <bitshuffler(a)opensuse.org> Wed, 09 Feb 2011 22:17:04 +0100 openvas-manager (1.99.4-1) UNRELEASED; urgency=low * New upstream release. - Documentation has been updated. - OpenVAS Manager now uses pkg-config to find required libraries. - An issue which caused the creation of overrides to fail under some circumstances has been fixed. - The installation is now compliant with Filesystem Hierarchy Standard (FHS 2.3). -- Stephan Kleine <bitshuffler(a)opensuse.org> Fri, 04 Feb 2011 21:30:54 +0100 openvas-manager (1.99.3-1) UNRELEASED; urgency=low * New upstream release. - A security-relevant bug has been fixed regarding email escalation methods. Configured OpenVAS users were able to damage installation and/or gain higher privileges. - An issue which caused database migration to fail under certain circumstances has been fixed. - The default log level has been reduced to warning to prevent the logging of potentially sensitive information in the default configuration. -- Stephan Kleine <bitshuffler(a)opensuse.org> Mon, 24 Jan 2011 14:54:44 +0100 openvas-manager (1.99.2-1) UNRELEASED; urgency=low * New upstream release. - The protocol documentation has been brought up to date. - The output of --version now complies with the GNU Coding Standards. - Passwords are now masked when loggings LSC package creation commands. -- Stephan Kleine <bitshuffler(a)opensuse.org> Mon, 10 Jan 2011 16:02:16 +0100 openvas-manager (1.99.1-1) UNRELEASED; urgency=low * New upstream release. - The protocol documentation has been improved. - Target credentials for SMB and SSH are now separated. - Support for setting the port range for a target has been added. - Hardening flags are now enabled during compile time to increase code quality. - Support for retrieving the total number of results matching an applied filter has been added. -- Stephan Kleine <bitshuffler(a)opensuse.org> Tue, 21 Dec 2010 14:02:16 +0100 openvas-manager (1.98.3-1) UNRELEASED; urgency=low * New upstream release. - The protocol self-documentation has been improved. - NTLMSSP is now enabled by default. - Escalator message now include more information. - The LaTeX and PDF reports have been made more consistent with the other report formats. - An issue which caused internal links in the PDF report to link to wrong results under certain circumstances has been fixed. - An issue which caused some existing LSC credential packages to be empty on subsequent downloads under certain circumstances has been fixed. -- Stephan Kleine <bitshuffler(a)opensuse.org> Fri, 10 Dec 2010 14:48:27 +0100 openvas-manager (1.98.2-1) UNRELEASED; urgency=low * New upstream release. - The protocol self-documentation has been improved. - A number of superfluous log messages has been downgraded or removed. - A bug which caused issues to be counted incorrectly in the ports overview has been fixed. - The generation of PDF and LaTeX reports is now faster. -- Stephan Kleine <bitshuffler(a)opensuse.org> Fri, 03 Dec 2010 18:14:52 +0100 openvas-manager (1.98.1-1) UNRELEASED; urgency=low * New upstream release. - Report Format plugin framework. All previous reporting features were converted to plugins. The XML representation of a report is now the base for any plugin and thus consistency of reports is improved. Report Format Plugins can be set active so that they appear in the selection lists. Selections can consider content types so that for example only the plugins with content type "text" are offered as Email body. It is possible to use parameters for the plugins so the user can adjust the behaviour of the Report Format to the individual preferences or needs. A verification method allows to distribute signatures for valid plugins via the NVT Feed. - New default Report Format: TXT for simple text. - New default Report Format: LaTeX for LaTeX source. - New sample Report Format: Simple Bar Chart. Demonstrates how to use Gnuplot for graphical reports. - New sample Report Format: Simple Topo Plot. Demonstrates how to use Graphviz for graphical reports. - New sample Report Format: Simple Pie Chart. Demonstrates how to use PyChart for graphical reports. - New sample Report Format: Simple Map Plot. Demonstrates how to use MapServer and GDAL for graphical reports. - New sample Report Format: Sourcefire Host Input. - Demonstrates that Report Formats can be used to build connectors. - Master-Slave feature. Any OpenVAS Manager can use one or many other OpenVAS Manager as slave to run scans. The whole scan task is transferred to the slave, results are continuously reported to the Master during scan process. After the scan is finished all data are removed from the slave. The master can also retrieve system reports from the slave and thus can collect the performance overview for all configured slaves. - New Escalator: HTTP GET. This allows for example to access text message (SMS) gateways or ticket management systems. - Extended Escalator: For EMail escalation it is now possible to select from configured Report Formats to be included in the Email body. - Agents: A verification method was added. This allows to distribute signatures for valid agents via the NVT Feed. - Credentials: Can now be edited. This allows to change the login name or password without the need to create a new scan configuration. - Credentials: Auto-generated installer packages are now created on the fly. If the generators are improved, it is now easy to create an updated package for already existing credentials. - OMP self-documentation: Part of the Managers' XML-based communication protocol OMP 2.0 is to deliver the full specification and documentation of the protocol itself (command "HELP"). It can be retrieved as XML-, RNC- or HTML representation. - Targets: Various opportunities have been added to specify and combine IP ranges. - Tasks: The task overview is delivered much faster now. - Reports: The report filtering is much faster now. -- Stephan Kleine <bitshuffler(a)opensuse.org> Fri, 19 Nov 2010 17:49:08 +0100 openvas-manager (1.0.3-1) UNRELEASED; urgency=low * New upstream release. - Two bugs which caused the manager to fail to give adequate replies on certain report and scan config requests have been fixed. - A bug which caused PDF reports to be unavailable for reports which contained certain unicode character has been fixed. -- Stephan Kleine <bitshuffler(a)opensuse.org> Sun, 31 Oct 2010 19:29:08 +0100 openvas-manager (1.0.2-1) UNRELEASED; urgency=low * New upstream release. - A bug which could cause changes in derived scan configs to affect predefined scan configs under certain circumstances has been fixed. -- Stephan Kleine <bitshuffler(a)opensuse.org> Tue, 17 Aug 2010 16:25:42 +0200 openvas-manager (1.0.1-1) UNRELEASED; urgency=low * New upstream release. - A fix for incorrect preference values in the database has been adjusted to work with GSA 1.0.1 as well. -- Stephan Kleine <bitshuffler(a)opensuse.org> Mon, 09 Aug 2010 16:41:26 +0200 openvas-manager (1.0.0-1) UNRELEASED; urgency=low * New upstream release. - A number of build issues has been addressed. - The code documentation has been updated. - Code cleanup: Internal error handling has been made more consistent. - A potential ressource leak identified by static analysis has been fixed. - A bug which caused NVT preferences to be displayed incorrectly has been fixed. -- Stephan Kleine <bitshuffler(a)opensuse.org> Thu, 29 Jul 2010 15:40:02 +0200 openvas-manager (1.0.0.rc1-1) UNRELEASED; urgency=low * New upstream release. - Code cleanup: Internal resource management has been improved to use UUIDs in more places. - Support for agents has been improved. - Support for external target sources has been added. - A bug which caused PDF exports to fail if the NVT description contained certain characters has been fixed. - A bug which caused hosts in the scan result to be sorted incorrectly under certain circumstances has been fixed. - Support for defining threat overrides has been added. - Some OMP commands have been renamed and adjusted to make the protocol more concise and useful. - Support for event logging has been added. - Support for syslog escalators has been added. - The documentation has been updated. -- Stephan Kleine <bitshuffler(a)opensuse.org> Fri, 16 Jul 2010 18:04:30 +0200 openvas-manager (1.0.0.beta7-1) UNRELEASED; urgency=low * New upstream release. - A large amount of code which was present in both openvas-manager and openvas-administrator has been moved to openvas-libraries. - An issue that caused started tasks to remain in the "Requested" stage indenfinitely has been fixed. - An issue that caused incorrect values of the scan progress under certain conditions has been fixed. - A new escalator condition has been add: Threat Level Changed. - Open ports are now included in scan reports even if no vulnerability was detected on that port. - Support for CVSS scores and Risk Factors has been improved. - Support for excluding host without any results from the report has been added. -- Stephan Kleine <bitshuffler(a)opensuse.org> Sat, 29 May 2010 09:31:25 +0200 openvas-manager (1.0.0.beta6-1) UNRELEASED; urgency=low * New upstream release. - A bug which caused incorrect NVT counts in the scan config under certain circumstances has been fixed. - The manager now uses certificate based authentication. - Support for resuming stopped tasks has been added. - Support for task scheduling has been added. - The openvasmd binary will now install into /usr/sbin instead of /usr/bin. -- Stephan Kleine <bitshuffler(a)opensuse.org> Thu, 15 Apr 2010 17:59:16 +0200 openvas-manager (1.0.0.beta5-1) UNRELEASED; urgency=low * New upstream release. - More internal data structures are now identified by UUID and not by name. - Several build issues have been fixed. - Note management has been introduced. - Support for handling ITG and CPE reports has been added. - OTP forwarding is now disabled by default. -- Stephan Kleine <bitshuffler(a)opensuse.org> Thu, 04 Mar 2010 19:12:18 +0100 openvas-manager (1.0.0.beta4-1) UNRELEASED; urgency=low * New upstream release. - More internal data structures are now identified by UUID and not by name. - A bug which prevented PDF reports to be generated from certain results due to unescaped LaTeX characters has been fixed. - A number of formatting and casting issues found by Stephan Kleine have been fixed. - The man page has been updated. -- Stephan Kleine <bitshuffler(a)opensuse.org> Mon, 08 Feb 2010 12:21:06 +0100 openvas-manager (1.0.0.beta3-1) UNRELEASED; urgency=low * New upstream release. - Nmap is now the default port scanner for predefined configurations. - The man page has been updated. - LSC credential management has been improved. - A number of internal data structures are now identified by UUID and not by name. - The manager now converts all input from the scanner to UTF-8. - The encoding of the LaTeX report has been switch to UTF-8. - A bug that caused some settings to be ignored during scan configuration import has been fixed. -- Stephan Kleine <bitshuffler(a)opensuse.org> Fri, 05 Feb 2010 15:19:05 +0100 openvas-manager (1.0.0.beta2-1) UNRELEASED; urgency=low * New upstream release. - Deleting of active reports is prevented. - Introduced ownership for all objects. This makes objects (like a "target") not appear for other users anymore. - Improved ISO-8859-1 to UTF-8 conversion hacks. - Allowed "\" for login names (important for windows) - Send users host restrictions ("rules") via OTP when starting a scan. - Activated NSIS package generator for credentials management. - Filter out potentials passwords from logging. - Introduced UUIDs for users. - Improved PDF report generator. -- Stephan Kleine <bitshuffler(a)opensuse.org> Wed, 27 Jan 2010 11:49:33 +0100 openvas-manager (1.0.0.beta1-1) UNRELEASED; urgency=low * Initial package. -- Stephan Kleine <bitshuffler(a)opensuse.org> Sat, 23 Jan 2010 09:36:42 +0100 ++++++ debian.compat ++++++ 5 ++++++ debian.control ++++++ Source: openvas-manager Section: admin Priority: optional Maintainer: Stephan Kleine <bitshuffler(a)opensuse.org> Build-Depends: debhelper (>= 5), cmake, doxygen, dpatch, hardening-wrapper, libopenvas4-dev, libsqlite3-dev, pkg-config Standards-Version: 3.8.0 Package: openvas-manager Section: net Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends} Description: Manager Module of OpenVAS The OpenVAS-Manager is a layer between OpenVAS-Scanner and various client applications such as OpenVAS-Client or Greenbone Security Assistant. Among other features, it adds server-side storage of scan results and it makes it unnecessary for scan clients to keep connection until a scan finishes. Package: openvas-manager-dbg Section: debug Priority: extra Architecture: any Depends: ${misc:Depends}, openvas-manager (= ${binary:Version}) Description: Manager Module of OpenVAS (debug) The OpenVAS-Manager is a layer between OpenVAS-Scanner and various client applications such as OpenVAS-Client or Greenbone Security Assistant. Among other features, it adds server-side storage of scan results and it makes it unnecessary for scan clients to keep connection until a scan finishes. . This package contains the debugging symbols. ++++++ debian.openvas-manager.default ++++++ # # The file the OpenVAS Manager will use as database. # DATABASE_FILE=/var/lib/openvas/mgr/tasks.db # # The address the OpenVAS Manager will listen on. # MANAGER_ADDRESS=127.0.0.1 # # The port the OpenVAS Manager will listen on. # MANAGER_PORT=9390 # # The address the OpenVAS Scanner is listening on. # SCANNER_ADDRESS=127.0.0.1 # # The port the OpenVAS Scanner is listening on. # SCANNER_PORT=9391 ++++++ debian.openvas-manager.dirs ++++++ var/log/openvas ++++++ debian.openvas-manager.init ++++++ #!/bin/sh -e # # /etc/init.d/openvas-manager # ### BEGIN INIT INFO # Provides: openvas-manager # Required-Start: $remote_fs # Required-Stop: $remote_fs # Should-Start: # Should-Stop: # Default-Start: # Default-Stop: 0 6 # Short-Description: Start and stop the OpenVAS Manager # Description: Controls the OpenVAS daemon "openvasmd". ### END INIT INFO # time to wait for daemons death, in seconds # don't set it too low or you might not let openvasmd die gracefully DODTIME=5 # Read config [ -r /etc/default/openvas-manager ] && . /etc/default/openvas-manager [ "$DATABASE_FILE" ] && DAEMONOPTS="--database="$DATABASE_FILE [ "$MANAGER_ADDRESS" ] && DAEMONOPTS="$DAEMONOPTS --listen=$MANAGER_ADDRESS" [ "$MANAGER_PORT" ] && DAEMONOPTS="$DAEMONOPTS --port=$MANAGER_PORT" [ "$SCANNER_ADDRESS" ] && DAEMONOPTS="$DAEMONOPTS --slisten=$SCANNER_ADDRESS" [ "$SCANNER_PORT" ] && DAEMONOPTS="$DAEMONOPTS --sport=$SCANNER_PORT" DAEMON=/usr/sbin/openvasmd PIDFILE=/var/run/openvasmd.pid NAME=openvasmd LABEL="OpenVAS Manager" test -x $DAEMON || exit 0 running() { # No pidfile, probably no daemon present # [ ! -f "$PIDFILE" ] && return 1 pid=`cat $PIDFILE` # No pid, probably no daemon present [ -z "$pid" ] && return 1 [ ! -d /proc/$pid ] && return 1 cmd=`cat /proc/$pid/cmdline | tr "\000" "\n"|head -n 1 |cut -d : -f 1` # No openvasmd? [ `basename "$cmd"` != "$NAME" ] && return 1 return 0 } start_daemon() { start-stop-daemon --start --exec $DAEMON -- $DAEMONOPTS 2>&1 >/dev/null errcode=$? # If we don't sleep then running() might not see the pidfile sleep $DODTIME return $errcode } force_stop() { [ ! -e "$PIDFILE" ] && return if running ; then kill -15 $pid # Is it really dead? sleep "$DODTIME"s if running ; then kill -9 $pid sleep "$DODTIME"s if running ; then echo "Cannot kill $LABEL (pid=$pid)!" exit 1 fi fi fi rm -f $PIDFILE } case "$1" in start) echo -n "Starting $LABEL: " if start_daemon && running ; then echo "openvasmd." else echo "ERROR." exit 1 fi ;; stop) echo -n "Stopping $LABEL: " if running ; then start-stop-daemon --stop --pidfile $PIDFILE --quiet --oknodo --exec $DAEMON sleep "$DODTIME"s fi if running; then force_stop fi echo "openvasmd." ;; restart) echo -n "Restarting $LABEL: " if running; then start-stop-daemon --stop --pidfile $PIDFILE --quiet --oknodo --exec $DAEMON sleep "$DODTIME"s fi if running; then force_stop fi if start_daemon && running ; then echo "openvasmd." else echo "ERROR." exit 1 fi ;; reload|force-reload) echo -n "Reloading $LABEL configuration files: " start-stop-daemon --stop --pidfile $PIDFILE --signal 1 --exec $DAEMON sleep "$DODTIME"s if running ; then echo "done." else echo "ERROR." exit 1 fi ;; status) echo -n "$LABEL is " if running ; then echo "running" else echo " not running." exit 1 fi ;; update) echo "Updating the NVT cache" $DAEMON $DAEMONOPTS --update ;; rebuild) echo "Rebuilding the NVT cache" $DAEMON $DAEMONOPTS --rebuild ;; *) echo "Usage: /etc/init.d/openvas-manager {start|stop|restart|reload|status|update|rebuild}" exit 1 ;; esac exit 0 ++++++ debian.openvas-manager.install ++++++ etc/openvas usr/sbin usr/share/man/man8 usr/share/openvas/openvasmd ++++++ debian.openvas-manager.logrotate ++++++ /var/log/openvas/openvasmd.log { missingok notifempty create 640 root adm daily rotate 7 compress postrotate if [ -s /var/run/openvasmd.pid ]; then kill -1 `cat /var/run/openvasmd.pid`; fi openvaslogs=`ls /var/log/openvas/openvasmd.log.*` if [ -n "$openvaslogs" ]; then chown root:adm $openvaslogs chmod 640 $openvaslogs fi endscript } ++++++ debian.rules ++++++ #!/usr/bin/make -f # -*- makefile -*- # Sample debian/rules that uses debhelper. # This file was originally written by Joey Hess and Craig Small. # As a special exception, when this file is copied by dh-make into a # dh-make output file, you may use that output file without restriction. # This special exception was added by Craig Small in version 0.37 of dh-make. # Uncomment this to turn on verbose mode. export DH_VERBOSE=1 # Enable hardening-wrapper export DEB_BUILD_HARDENING=1 config: config-stamp config-stamp: dh_testdir # Add here commands to configure the package. cmake -DCMAKE_VERBOSE_MAKEFILE=ON -DCMAKE_INSTALL_PREFIX=/usr -DSYSCONFDIR=/etc -DLOCALSTATEDIR=/var -DCMAKE_BUILD_TYPE=release . touch $@ build: build-stamp build-stamp: config-stamp dh_testdir # Add here commands to compile the package. $(MAKE) VERBOSE=1 touch $@ clean: dh_testdir dh_testroot rm -f build-stamp config.stamp # Add here commands to clean up after the build process. dh_clean install: build dh_testdir dh_testroot dh_clean -k dh_installdirs # Add here commands to install the package into debian/tmp $(MAKE) install DESTDIR=$(CURDIR)/debian/tmp install -Dm 0644 doc/openvasmd.8 $(CURDIR)/debian/tmp/usr/share/man/man8/openvasmd.8 # Build architecture-independent files here. binary-indep: build install # We have nothing to do by default. # Build architecture-dependent files here. binary-arch: build install dh_testdir dh_testroot dh_installchangelogs CHANGES dh_installdocs dh_install --sourcedir=debian/tmp dh_installdebconf dh_installlogrotate dh_installinit -n -r -u stop 20 0 6 . dh_installman --sourcedir=debian/tmp dh_link dh_strip --dbg-package=openvas-manager-dbg dh_compress dh_fixperms dh_installdeb dh_shlibdeps dh_gencontrol dh_md5sums dh_builddeb binary: binary-indep binary-arch .PHONY: build clean binary-indep binary-arch binary install ++++++ openvas-manager.dsc ++++++ Format: 1.0 Source: openvas-manager Binary: openvas-manager Architecture: any Version: 2.0.2-1 Maintainer: Stephan Kleine <bitshuffler(a)opensuse.org> Homepage: http://www.openvas.org/ Standards-Version: 3.8.0 Build-Depends: debhelper (>= 5), cmake, doxygen, dpatch, hardening-wrapper, libopenvas4-dev, libsqlite3-dev, pkg-config Files: 776ce4e1000137c9aec7863372c8c876 373800 openvas-manager-2.0.2.orig.tar.gz 131e6720b0526ade9405eade0d9150ac 56625 openvas-manager-2.0.2.diff.gz ++++++ openvasmd.init.fedora ++++++ #!/bin/sh # # openvas-manager This starts and stops the OpenVAS Manager. # # chkconfig: 35 75 25 # description: This starts and stops the OpenVAS Manager. # processname: /usr/sbin/openvasmd # config: /etc/openvas/openvasmd.conf # pidfile: /var/run/openvasmd.pid # ### BEGIN INIT INFO # Provides: $openvas-manager ### END INIT INFO # Source function library. . /etc/rc.d/init.d/functions EXEC="/usr/sbin/openvasmd" PROG=$(basename $EXEC) # Check for missing binaries (stale symlinks should not happen) # Note: Special treatment of stop for LSB conformance test -x $EXEC || { echo "$EXEC not installed"; if [ "$1" = "stop" ]; then exit 0; else exit 5; fi; } # Check for existence of needed config file OPENVASMD_CONFIG=/etc/sysconfig/openvas-manager test -r $OPENVASMD_CONFIG || { echo "$OPENVASMD_CONFIG not existing"; if [ "$1" = "stop" ]; then exit 0; else exit 6; fi; } # Read config . $OPENVASMD_CONFIG # Build parameters [ "$DATABASE_FILE" ] && PARAMS="--database="$DATABASE_FILE [ "$MANAGER_ADDRESS" ] && PARAMS="$PARAMS --listen=$MANAGER_ADDRESS" [ "$MANAGER_PORT" ] && PARAMS="$PARAMS --port=$MANAGER_PORT" [ "$SCANNER_ADDRESS" ] && PARAMS="$PARAMS --slisten=$SCANNER_ADDRESS" [ "$SCANNER_PORT" ] && PARAMS="$PARAMS --sport=$SCANNER_PORT" LOCKFILE=/var/lock/subsys/$PROG start() { echo -n $"Starting openvas-manager: " daemon $EXEC $PARAMS RETVAL=$? echo [ $RETVAL -eq 0 ] && touch $LOCKFILE return $RETVAL } stop() { echo -n $"Stopping openvas-manager: " killproc $PROG RETVAL=$? echo [ $RETVAL -eq 0 ] && rm -f $LOCKFILE return $RETVAL } restart() { stop start } reload() { echo -n $"Reloading openvas-manager: " killproc $PROG -HUP RETVAL=$? echo return $RETVAL } force_reload() { restart } fdr_status() { status $PROG } case "$1" in start|stop|restart|reload) $1 ;; force-reload) force_reload ;; status) fdr_status ;; condrestart|try-restart) [ ! -f $LOCKFILE ] || restart ;; update) ## Update the NVT cache and exit. $EXEC $PARAMS --update ;; rebuild) ## Rebuild the NVT cache and exit. $EXEC $PARAMS --rebuild ;; *) echo $"Usage: $0 {start|stop|status|restart|try-restart|reload|force-reload|update|rebuild}" exit 2 esac ++++++ openvasmd.init.mandriva ++++++ #!/bin/sh # # LSB compatible service control script; see http://www.linuxbase.org/spec/ # ### BEGIN INIT INFO # Provides: openvas-manager # Required-Start: $syslog $remote_fs # Should-Start: $time ypbind smtp # Required-Stop: $syslog $remote_fs # Should-Stop: $time ypbind smtp # Default-Start: 3 5 # Default-Stop: 0 1 2 6 # Short-Description: OpenVAS Manager # Description: Start the OpenVAS Manager. ### END INIT INFO # # Source function library. . /etc/rc.d/init.d/functions EXEC="/usr/sbin/openvasmd" PROG=$(basename $EXEC) # Check for missing binaries (stale symlinks should not happen) # Note: Special treatment of stop for LSB conformance test -x $EXEC || { echo "$EXEC not installed"; if [ "$1" = "stop" ]; then exit 0; else exit 5; fi; } # Check for existence of needed config file OPENVASMD_CONFIG=/etc/sysconfig/openvas-manager test -r $OPENVASMD_CONFIG || { echo "$OPENVASMD_CONFIG not existing"; if [ "$1" = "stop" ]; then exit 0; else exit 6; fi; } # Read config . $OPENVASMD_CONFIG # Build parameters [ "$DATABASE_FILE" ] && PARAMS="--database="$DATABASE_FILE [ "$MANAGER_ADDRESS" ] && PARAMS="$PARAMS --listen=$MANAGER_ADDRESS" [ "$MANAGER_PORT" ] && PARAMS="$PARAMS --port=$MANAGER_PORT" [ "$SCANNER_ADDRESS" ] && PARAMS="$PARAMS --slisten=$SCANNER_ADDRESS" [ "$SCANNER_PORT" ] && PARAMS="$PARAMS --sport=$SCANNER_PORT" LOCKFILE=/var/lock/subsys/$PROG start() { echo -n $"Starting openvas-manager: " daemon $EXEC $PARAMS RETVAL=$? echo [ $RETVAL -eq 0 ] && touch $LOCKFILE return $RETVAL } stop() { echo -n $"Stopping openvas-manager: " killproc $PROG RETVAL=$? echo [ $RETVAL -eq 0 ] && rm -f $LOCKFILE return $RETVAL } restart() { stop start } reload() { echo -n $"Reloading openvas-manager: " killproc $PROG -HUP RETVAL=$? echo return $RETVAL } force_reload() { restart } fdr_status() { status $PROG } case "$1" in start|stop|restart|reload) $1 ;; force-reload) force_reload ;; status) fdr_status ;; condrestart|try-restart) [ ! -f $LOCKFILE ] || restart ;; update) ## Update the NVT cache and exit. $EXEC $PARAMS --update ;; rebuild) ## Rebuild the NVT cache and exit. $EXEC $PARAMS --rebuild ;; *) echo $"Usage: $0 {start|stop|status|restart|try-restart|reload|force-reload|update|rebuild}" exit 2 esac ++++++ openvasmd.init.suse ++++++ #!/bin/sh # # /etc/init.d/openvas-manager # and its symbolic link # /usr/sbin/rcopenvas-manager # # LSB compatible service control script; see http://www.linuxbase.org/spec/ # ### BEGIN INIT INFO # Provides: openvas-manager # Required-Start: $syslog $remote_fs # Should-Start: $time ypbind smtp # Required-Stop: $syslog $remote_fs # Should-Stop: $time ypbind smtp # Default-Start: 3 5 # Default-Stop: 0 1 2 6 # Short-Description: OpenVAS Manager # Description: Start the OpenVAS Manager. ### END INIT INFO # # Note on runlevels: # 0 - halt/poweroff 6 - reboot # 1 - single user 2 - multiuser without network exported # 3 - multiuser w/ network (text mode) 5 - multiuser w/ network and X11 (xdm) # # Check for missing binaries (stale symlinks should not happen) # Note: Special treatment of stop for LSB conformance OPENVASMD_BIN=/usr/sbin/openvasmd test -x $OPENVASMD_BIN || { echo "$OPENVASMD_BIN not installed"; if [ "$1" = "stop" ]; then exit 0; else exit 5; fi; } # Check for existence of needed config file and read it OPENVASMD_CONFIG=/etc/sysconfig/openvas-manager test -r $OPENVASMD_CONFIG || { echo "$OPENVASMD_CONFIG not existing"; if [ "$1" = "stop" ]; then exit 0; else exit 6; fi; } # Read config . $OPENVASMD_CONFIG # Build parameters [ "$DATABASE_FILE" ] && PARAMS="--database="$DATABASE_FILE [ "$MANAGER_ADDRESS" ] && PARAMS="$PARAMS --listen=$MANAGER_ADDRESS" [ "$MANAGER_PORT" ] && PARAMS="$PARAMS --port=$MANAGER_PORT" [ "$SCANNER_ADDRESS" ] && PARAMS="$PARAMS --slisten=$SCANNER_ADDRESS" [ "$SCANNER_PORT" ] && PARAMS="$PARAMS --sport=$SCANNER_PORT" # Source LSB init functions # providing start_daemon, killproc, pidofproc, # log_success_msg, log_failure_msg and log_warning_msg. # This is currently not used by UnitedLinux based distributions and # not needed for init scripts for UnitedLinux only. If it is used, # the functions from rc.status should not be sourced or used. #. /lib/lsb/init-functions # Shell functions sourced from /etc/rc.status: # rc_check check and set local and overall rc status # rc_status check and set local and overall rc status # rc_status -v be verbose in local rc status and clear it afterwards # rc_status -v -r ditto and clear both the local and overall rc status # rc_status -s display "skipped" and exit with status 3 # rc_status -u display "unused" and exit with status 3 # rc_failed set local and overall rc status to failed # rc_failed <num> set local and overall rc status to <num> # rc_reset clear both the local and overall rc status # rc_exit exit appropriate to overall rc status # rc_active checks whether a service is activated by symlinks . /etc/rc.status # Reset status of this service rc_reset # Return values acc. to LSB for all commands but status: # 0 - success # 1 - generic or unspecified error # 2 - invalid or excess argument(s) # 3 - unimplemented feature (e.g. "reload") # 4 - user had insufficient privileges # 5 - program is not installed # 6 - program is not configured # 7 - program is not running # 8--199 - reserved (8--99 LSB, 100--149 distrib, 150--199 appl) # # Note that starting an already running service, stopping # or restarting a not-running service as well as the restart # with force-reload (in case signaling is not supported) are # considered a success. case "$1" in start) echo -n "Starting openvas-manager " ## Start daemon with startproc(8). If this fails ## the return value is set appropriately by startproc. /sbin/startproc $OPENVASMD_BIN $PARAMS # Remember status and be verbose rc_status -v ;; stop) echo -n "Shutting down openvas-manager " ## Stop daemon with killproc(8) and if this fails ## killproc sets the return value according to LSB. /sbin/killproc -TERM $OPENVASMD_BIN # Remember status and be verbose rc_status -v ;; try-restart|condrestart) ## Do a restart only if the service was active before. ## Note: try-restart is now part of LSB (as of 1.9). ## RH has a similar command named condrestart. if test "$1" = "condrestart"; then echo "${attn} Use try-restart ${done}(LSB)${attn} rather than condrestart ${warn}(RH)${norm}" fi $0 status if test $? = 0; then $0 restart else rc_reset # Not running is not a failure. fi # Remember status and be quiet rc_status ;; restart) ## Stop the service and regardless of whether it was ## running or not, start it again. $0 stop $0 start # Remember status and be quiet rc_status ;; force-reload) ## Signal the daemon to reload its config. Most daemons ## do this on signal 1 (SIGHUP). ## If it does not support it, restart the service if it ## is running. echo -n "Reload service openvas-manager " ## if it supports it: /sbin/killproc -HUP $OPENVASMD_BIN #touch /var/run/openvasmd.pid rc_status -v ## Otherwise: #$0 try-restart #rc_status ;; reload) ## Like force-reload, but if daemon does not support ## signaling, do nothing (!) # If it supports signaling: echo -n "Reload service openvas-manager " /sbin/killproc -HUP $OPENVASMD_BIN #touch /var/run/openvasmd.pid rc_status -v ## Otherwise if it does not support reload: #rc_failed 3 #rc_status -v ;; status) echo -n "Checking for service openvas-manager " ## Check status with checkproc(8), if process is running ## checkproc will return with exit status 0. # Return value is slightly different for the status command: # 0 - service up and running # 1 - service dead, but /var/run/ pid file exists # 2 - service dead, but /var/lock/ lock file exists # 3 - service not running (unused) # 4 - service status unknown :-( # 5--199 reserved (5--99 LSB, 100--149 distro, 150--199 appl.) # NOTE: checkproc returns LSB compliant status values. /sbin/checkproc $OPENVASMD_BIN # NOTE: rc_status knows that we called this init script with # "status" option and adapts its messages accordingly. rc_status -v ;; probe) ## Optional: Probe for the necessity of a reload, print out the ## argument to this init script which is required for a reload. ## Note: probe is not (yet) part of LSB (as of 1.9) test $OPENVASMD_CONFIG -nt /var/run/openvasmd.pid && echo reload ;; update) ## Update the NVT cache and exit. $OPENVASMD_BIN $PARAMS --update ;; rebuild) ## Rebuild the NVT cache and exit. $OPENVASMD_BIN $PARAMS --rebuild ;; *) echo "Usage: $0 {start|stop|status|try-restart|restart|force-reload|reload|probe|update|rebuild}" exit 1 ;; esac rc_exit ++++++ openvasmd.logrotate ++++++ /var/log/openvas/openvasmd.log { daily rotate 7 compress missingok notifempty sharedscripts } ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 phpMyAdmin for openSUSE:Factory
by root＠hilbert.suse.de 22 Mar '11

22 Mar '11

Hello community, here is the log from the commit of package phpMyAdmin for openSUSE:Factory checked in at Tue Mar 22 10:52:04 CET 2011. -------- --- phpMyAdmin/phpMyAdmin.changes 2011-02-24 15:23:45.000000000 +0100 +++ /mounts/work_src_done/STABLE/phpMyAdmin/phpMyAdmin.changes 2011-03-21 16:53:58.000000000 +0100 @@ -1,0 +2,13 @@ +Sat Mar 19 19:17:57 UTC 2011 - chris(a)computersalat.de + +- update to 3.3.10 + - patch sf#3147400 [structure] Aria table size printed as unknown, + thanks to erickoh75 - erickoh75 + - patch sf#3150164 [structure] Ordering by size gives incorrect results, + thanks to Madhura Jayaratne - madhuracj + - bug sf#3153409 [core] 0 row(s) affected + - bug sf#3155842 [core] Edit relational page and page number + - [security] Minor security fixes, see PMASA-2010-9 and PMASA-2010-10 + - [lang] German update, thanks to jannicars(a)users.sourceforge.net. + +------------------------------------------------------------------- @@ -50 +62,0 @@ - @@ -253,0 +266,2 @@ +------------------------------------------------------------------- +Sun Aug 16 06:13:35 UTC 2009 - javier(a)opensuse.org @@ -255 +268,0 @@ -* Sun Aug 16 2009 javier(a)opensuse.org @@ -281 +294,4 @@ -* Fri Jul 24 2009 javier(a)opensuse.org + +------------------------------------------------------------------- +Fri Jul 24 15:51:24 UTC 2009 - javier(a)opensuse.org + @@ -283 +299,4 @@ -* Sun Jun 28 2009 javier(a)opensuse.org + +------------------------------------------------------------------- +Sun Jun 28 04:17:23 UTC 2009 - javier(a)opensuse.org + @@ -285 +304,4 @@ -* Sun May 04 2008 crrodriguez(a)suse.de + +------------------------------------------------------------------- +Sun May 4 16:19:43 UTC 2008 - crrodriguez(a)suse.de + @@ -317 +339,4 @@ -* Mon Apr 07 2008 crrodriguez(a)suse.de + +------------------------------------------------------------------- +Mon Apr 7 11:27:24 UTC 2008 - crrodriguez(a)suse.de + @@ -319 +344,4 @@ -* Sat Mar 29 2008 crrodriguez(a)suse.de + +------------------------------------------------------------------- +Sat Mar 29 15:53:44 UTC 2008 - crrodriguez(a)suse.de + @@ -322 +350,4 @@ -* Mon Mar 10 2008 crrodriguez(a)suse.de + +------------------------------------------------------------------- +Mon Mar 10 04:13:27 UTC 2008 - crrodriguez(a)suse.de + @@ -324 +355,4 @@ -* Sat Mar 01 2008 crrodriguez(a)suse.de + +------------------------------------------------------------------- +Sat Mar 1 23:34:52 UTC 2008 - crrodriguez(a)suse.de + @@ -349 +383,4 @@ -* Sun Jan 13 2008 crrodriguez(a)suse.de + +------------------------------------------------------------------- +Sun Jan 13 11:02:14 UTC 2008 - crrodriguez(a)suse.de + @@ -380 +417,4 @@ -* Wed Aug 22 2007 crrodriguez(a)suse.de + +------------------------------------------------------------------- +Wed Aug 22 12:36:22 UTC 2007 - crrodriguez(a)suse.de + @@ -385 +425,4 @@ -* Mon Aug 06 2007 anosek(a)suse.cz + +------------------------------------------------------------------- +Mon Aug 6 21:59:16 UTC 2007 - anosek(a)suse.cz + @@ -387 +430,4 @@ -* Mon Jul 30 2007 anosek(a)suse.cz + +------------------------------------------------------------------- +Mon Jul 30 11:38:44 UTC 2007 - anosek(a)suse.cz + @@ -455 +501,4 @@ -* Wed Jul 25 2007 anosek(a)suse.cz + +------------------------------------------------------------------- +Wed Jul 25 14:31:02 UTC 2007 - anosek(a)suse.cz + @@ -469 +518,4 @@ -* Tue Jun 19 2007 anosek(a)suse.cz + +------------------------------------------------------------------- +Tue Jun 19 03:39:00 UTC 2007 - anosek(a)suse.cz + @@ -497 +549,4 @@ -* Tue Jun 12 2007 anosek(a)suse.cz + +------------------------------------------------------------------- +Tue Jun 12 21:48:10 UTC 2007 - anosek(a)suse.cz + @@ -516 +571,4 @@ -* Tue Jun 05 2007 anosek(a)suse.cz + +------------------------------------------------------------------- +Tue Jun 5 00:56:30 UTC 2007 - anosek(a)suse.cz + @@ -519 +577,4 @@ -* Tue Apr 24 2007 anosek(a)suse.cz + +------------------------------------------------------------------- +Tue Apr 24 08:46:01 UTC 2007 - anosek(a)suse.cz + @@ -522 +583,4 @@ -* Tue Mar 06 2007 anosek(a)suse.cz + +------------------------------------------------------------------- +Tue Mar 6 16:34:13 UTC 2007 - anosek(a)suse.cz + @@ -526 +590,4 @@ -* Wed Feb 28 2007 anosek(a)suse.cz + +------------------------------------------------------------------- +Wed Feb 28 14:16:10 UTC 2007 - anosek(a)suse.cz + @@ -534 +601,4 @@ -* Wed Jan 17 2007 anosek(a)suse.cz + +------------------------------------------------------------------- +Wed Jan 17 12:14:04 UTC 2007 - anosek(a)suse.cz + @@ -545 +615,4 @@ -* Sat Dec 02 2006 mmarek(a)suse.cz + +------------------------------------------------------------------- +Sat Dec 2 21:16:07 UTC 2006 - mmarek(a)suse.cz + @@ -548 +621,4 @@ -* Thu Nov 23 2006 anosek(a)suse.cz + +------------------------------------------------------------------- +Thu Nov 23 16:01:59 UTC 2006 - anosek(a)suse.cz + @@ -550 +626,4 @@ -* Wed Nov 08 2006 anosek(a)suse.cz + +------------------------------------------------------------------- +Wed Nov 8 04:04:15 UTC 2006 - anosek(a)suse.cz + @@ -555 +634,4 @@ -* Tue Oct 17 2006 postadal(a)suse.cz + +------------------------------------------------------------------- +Tue Oct 17 15:25:56 UTC 2006 - postadal(a)suse.cz + @@ -572 +654,4 @@ -* Thu Sep 21 2006 anosek(a)suse.cz + +------------------------------------------------------------------- +Thu Sep 21 06:18:48 UTC 2006 - anosek(a)suse.cz + @@ -591 +676,4 @@ -* Wed Aug 23 2006 anosek(a)suse.cz + +------------------------------------------------------------------- +Wed Aug 23 21:06:46 UTC 2006 - anosek(a)suse.cz + @@ -596 +684,4 @@ -* Tue Aug 15 2006 anosek(a)suse.cz + +------------------------------------------------------------------- +Tue Aug 15 20:48:22 UTC 2006 - anosek(a)suse.cz + @@ -600 +691,4 @@ -* Thu Aug 03 2006 mskibbe(a)suse.de + +------------------------------------------------------------------- +Thu Aug 3 18:53:02 UTC 2006 - mskibbe(a)suse.de + @@ -608 +702,4 @@ -* Thu Jun 01 2006 postadal(a)suse.cz + +------------------------------------------------------------------- +Thu Jun 1 12:57:37 UTC 2006 - postadal(a)suse.cz + @@ -612 +709,4 @@ -* Tue May 02 2006 mmarek(a)suse.cz + +------------------------------------------------------------------- +Tue May 2 17:32:14 UTC 2006 - mmarek(a)suse.cz + @@ -615 +715,4 @@ -* Thu Apr 20 2006 mmarek(a)suse.cz + ++++ 299 more lines (skipped) ++++ between phpMyAdmin/phpMyAdmin.changes ++++ and /mounts/work_src_done/STABLE/phpMyAdmin/phpMyAdmin.changes calling whatdependson for head-i586 Old: ---- phpMyAdmin-3.3.9.2-all-languages.tar.bz2 New: ---- phpMyAdmin-3.3.10-all-languages.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ phpMyAdmin.spec ++++++ --- /var/tmp/diff_new_pack.v9ah7i/_old 2011-03-22 10:50:51.000000000 +0100 +++ /var/tmp/diff_new_pack.v9ah7i/_new 2011-03-22 10:50:51.000000000 +0100 @@ -34,7 +34,7 @@ %endif Summary: Administration of MySQL over the web -Version: 3.3.9.2 +Version: 3.3.10 Release: 1 License: GPLv2+ Group: Productivity/Networking/Web/Frontends ++++++ phpMyAdmin-3.3.9.2-all-languages.tar.bz2 -> phpMyAdmin-3.3.10-all-languages.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/phpMyAdmin-3.3.9.2-all-languages/ChangeLog new/phpMyAdmin-3.3.10-all-languages/ChangeLog --- old/phpMyAdmin-3.3.9.2-all-languages/ChangeLog 2011-02-11 18:56:49.000000000 +0100 +++ new/phpMyAdmin-3.3.10-all-languages/ChangeLog 2011-03-19 13:00:19.000000000 +0100 @@ -5,6 +5,16 @@ $Id$ $HeadURL: https://phpmyadmin.svn.sourceforge.net/svnroot/phpmyadmin/trunk/phpMyAdmin/… $ +3.3.10.0 (2011-03-19) +- patch #3147400 [structure] Aria table size printed as unknown, + thanks to erickoh75 - erickoh75 +- patch #3150164 [structure] Ordering by size gives incorrect results, + thanks to Madhura Jayaratne - madhuracj +- bug #3153409 [core] 0 row(s) affected +- bug #3155842 [core] Edit relational page and page number +- [security] Minor security fixes, see PMASA-2010-9 and PMASA-2010-10 +- [lang] German update, thanks to to jannicars(a)users.sourceforge.net. + 3.3.9.2 (2011-02-11) - [security] SQL injection, see PMASA-2011-2 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/phpMyAdmin-3.3.9.2-all-languages/Documentation.html new/phpMyAdmin-3.3.10-all-languages/Documentation.html --- old/phpMyAdmin-3.3.9.2-all-languages/Documentation.html 2011-02-11 18:56:49.000000000 +0100 +++ new/phpMyAdmin-3.3.10-all-languages/Documentation.html 2011-03-19 13:00:19.000000000 +0100 @@ -10,7 +10,7 @@ <link rel="icon" href="./favicon.ico" type="image/x-icon" /> <link rel="shortcut icon" href="./favicon.ico" type="image/x-icon" /> <meta http-equiv="Content-Type" content="text/html; charset=utf-8" /> - <title>phpMyAdmin 3.3.9.2 - Documentation</title> + <title>phpMyAdmin 3.3.10 - Documentation</title> <link rel="stylesheet" type="text/css" href="docs.css" /> </head> @@ -18,7 +18,7 @@ <div id="header"> <h1> <a href="http://www.phpmyadmin.net/">php<span class="myadmin">MyAdmin</span></a> - 3.3.9.2 + 3.3.10 Documentation </h1> </div> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/phpMyAdmin-3.3.9.2-all-languages/Documentation.txt new/phpMyAdmin-3.3.10-all-languages/Documentation.txt --- old/phpMyAdmin-3.3.9.2-all-languages/Documentation.txt 2011-02-11 18:56:49.000000000 +0100 +++ new/phpMyAdmin-3.3.10-all-languages/Documentation.txt 2011-03-19 13:00:19.000000000 +0100 @@ -1,4 +1,4 @@ -phpMyAdmin 3.3.9.2 Documentation +phpMyAdmin 3.3.10 Documentation * Top * Requirements diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/phpMyAdmin-3.3.9.2-all-languages/README new/phpMyAdmin-3.3.10-all-languages/README --- old/phpMyAdmin-3.3.9.2-all-languages/README 2011-02-11 18:56:49.000000000 +0100 +++ new/phpMyAdmin-3.3.10-all-languages/README 2011-03-19 13:00:19.000000000 +0100 @@ -5,8 +5,8 @@ A set of PHP-scripts to manage MySQL over the web. - Version 3.3.9.2 - --------------- + Version 3.3.10 + -------------- http://www.phpmyadmin.net/ Copyright (C) 1998-2000 Tobias Ratschiller <tobias_at_ratschiller.com> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/phpMyAdmin-3.3.9.2-all-languages/RELEASE-DATE-3.3.10 new/phpMyAdmin-3.3.10-all-languages/RELEASE-DATE-3.3.10 --- old/phpMyAdmin-3.3.9.2-all-languages/RELEASE-DATE-3.3.10 1970-01-01 01:00:00.000000000 +0100 +++ new/phpMyAdmin-3.3.10-all-languages/RELEASE-DATE-3.3.10 2011-03-19 13:00:19.000000000 +0100 @@ -0,0 +1 @@ +Sat Mar 19 12:00:19 UTC 2011 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/phpMyAdmin-3.3.9.2-all-languages/RELEASE-DATE-3.3.9.2 new/phpMyAdmin-3.3.10-all-languages/RELEASE-DATE-3.3.9.2 --- old/phpMyAdmin-3.3.9.2-all-languages/RELEASE-DATE-3.3.9.2 2011-02-11 18:56:49.000000000 +0100 +++ new/phpMyAdmin-3.3.10-all-languages/RELEASE-DATE-3.3.9.2 1970-01-01 01:00:00.000000000 +0100 @@ -1 +0,0 @@ -Fri Feb 11 17:56:49 UTC 2011 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/phpMyAdmin-3.3.9.2-all-languages/db_structure.php new/phpMyAdmin-3.3.10-all-languages/db_structure.php --- old/phpMyAdmin-3.3.9.2-all-languages/db_structure.php 2011-02-11 18:56:49.000000000 +0100 +++ new/phpMyAdmin-3.3.10-all-languages/db_structure.php 2011-03-19 13:00:19.000000000 +0100 @@ -199,6 +199,8 @@ case 'HEAP' : case 'MEMORY' : case 'ARCHIVE' : + case 'Aria' : + case 'Maria' : if ($db_is_information_schema) { $each_table['Rows'] = PMA_Table::countRecords($db, $each_table['Name']); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/phpMyAdmin-3.3.9.2-all-languages/error.php new/phpMyAdmin-3.3.10-all-languages/error.php --- old/phpMyAdmin-3.3.9.2-all-languages/error.php 2011-02-11 18:56:49.000000000 +0100 +++ new/phpMyAdmin-3.3.10-all-languages/error.php 1970-01-01 01:00:00.000000000 +0100 @@ -1,90 +0,0 @@ -<?php -/* vim: set expandtab sw=4 ts=4 sts=4: */ -/** - * phpMyAdmin fatal error display page - * - * @version $Id$ - * @package phpMyAdmin - */ - -/** - * Input sanitizing. - */ -require_once './libraries/sanitizing.lib.php'; - -/* Get variables */ -if (! empty($_REQUEST['lang']) && is_string($_REQUEST['lang'])) { - $lang = htmlspecialchars($_REQUEST['lang']); -} else { - $lang = 'en'; -} - -if (! empty($_REQUEST['dir']) && is_string($_REQUEST['dir'])) { - $dir = htmlspecialchars($_REQUEST['dir']); -} else { - $dir = 'ltr'; -} - -if (! empty($_REQUEST['type']) && is_string($_REQUEST['type'])) { - $type = htmlspecialchars($_REQUEST['type']); -} else { - $type = 'error'; -} - -// force utf-8 to avoid XSS with crafted URL and utf-7 in charset parameter -$charset = 'utf-8'; - -header('Content-Type: text/html; charset=' . $charset); -?> -<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> -<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="<?php echo $lang; ?>" dir="<?php echo $dir; ?>"> -<head> - <link rel="icon" href="./favicon.ico" type="image/x-icon" /> - <link rel="shortcut icon" href="./favicon.ico" type="image/x-icon" /> - <title>phpMyAdmin</title> - <meta http-equiv="Content-Type" content="text/html; charset=<?php echo $charset; ?>" /> - <style type="text/css"> -  - </style> -</head> -<body> -<h1>phpMyAdmin - <?php echo $type; ?></h1> -<p><?php -if (!empty($_REQUEST['error'])) { - if (function_exists('get_magic_quotes_gpc') && get_magic_quotes_gpc()) { - echo PMA_sanitize(stripslashes($_REQUEST['error'])); - } else { - echo PMA_sanitize($_REQUEST['error']); - } -} else { - echo 'No error message!'; -} -?></p> -</body> -</html> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/phpMyAdmin-3.3.9.2-all-languages/lang/german-utf-8.inc.php new/phpMyAdmin-3.3.10-all-languages/lang/german-utf-8.inc.php --- old/phpMyAdmin-3.3.9.2-all-languages/lang/german-utf-8.inc.php 2011-02-11 18:56:49.000000000 +0100 +++ new/phpMyAdmin-3.3.10-all-languages/lang/german-utf-8.inc.php 2011-03-19 13:00:19.000000000 +0100 @@ -60,6 +60,7 @@ $strAlterOrderBy = 'Tabelle sortieren nach'; $strAnalyze = 'Analysieren'; $strAnalyzeTable = 'Analysiere Tabelle'; +$strAndSmall = 'und'; $strAndThen = 'und dann'; $strAnd = 'und'; $strAngularLinks = 'Winklige Verbindung'; @@ -413,6 +414,7 @@ $strImportNoticePt3 = 'Zum Ändern der Einstellungen auf das entsprechende "Optionen" klicken'; $strImportNoticePt4 = 'Zum Ändern der Struktur auf das entsprechenden "Struktur" klicken'; $strImportODSCurrency = 'Währungen importieren ($5.00 zu 5.00)'; +$strImportODS = 'Öffne Dokument Tabelle'; $strImportODSPercents = 'Prozentwerte importieren (12.00% wird zu .12)'; $strImportProceedingFile = 'Bitte Geduld, die Datei wird abgearbeitet.'; $strImportSuccessfullyFinished = 'Der Import wurde erfolgreich abgeschlossen, %d Abfragen wurden ausgeführt.'; @@ -781,6 +783,8 @@ $strReplicationServernConfiguredMaster = 'Dieser Server ist als nicht Master in einem Replikations-Prozess konfiguriert. Möchten Sie ihn <a href="%s">konfigurieren</a>?'; $strReplicationShowConnectedSlavesNote = 'Nur Slaves, die mit der Option --report-host=host_name gestartet wurden, sind in dieser Liste sichtbar'; $strReplicationShowConnectedSlaves = 'Zeige verbundene Slaves'; +$strReplicationShowMasterStatus = 'Zeige Haupt Status'; +$strReplicationSkippingErrorWarn = 'Errror überspringen kann dazu führen, dass die Master- und Slave Server nicht mehr abgeglichen sind!'; $strReplicationSlaveConfiguration = 'Slave-Konfiguration'; $strReplicationSlaveConfigured = 'Dieser Server ist als Slave in eienem Replikations Prozess konfiguriert. Möchten Sie:'; $strReplicationSlaveErrorManagement = 'Fehlerbehandlung:'; @@ -796,6 +800,7 @@ $strReplicationSlave = 'Slave Replikation'; $strReplicationSlaveSQLThreadNotRunning = 'Slave SQL Thread läuft nicht!'; $strReplicationSlaveSQLThread = 'Nur SQL Thread %s'; +$strReplicationStatusInfo = 'Dieser MySQL Server arbeitet als ein %s in <b>Replication</b> Prozess. Für weitere Informationen über den Replication Status auf dem Server, besuche bitte die <a href="#replication">Replication Abteilung</a>.'; $strReplicationStatus_master = 'Master-Status'; $strReplicationStatus = 'Replikations-Status'; $strReplicationStatus_slave = 'Slave-Status'; @@ -1016,6 +1021,7 @@ $strSetupImport_allow_interrupt_name = 'Teilweiser Import: Unterbrechung erlauben'; $strSetupImport_format_desc = 'Voreingestelltes Format. Bitte beachten, dass diese Liste vom Ort abhängt (Datenbank, Tabelle) und nur SQL immer verfügbar ist'; $strSetupImport_format_name = 'Dateiformat'; +$strSetupImport_skip_queries_desc = 'Anzahl von Einträgen (Abfragen) zum überspringen vom Start'; $strSetupImport_skip_queries_name = 'Teilimport: Überspringe Anfragen'; $strSetupInsecureConnectionMsg1 = 'Sie benutzen keine sichere Verbindung. Alle Daten (einschließlich sensitiver Information wie Passwörter) werden unverschlüsselt übertragen!'; $strSetupInsecureConnectionMsg2 = 'Falls Ihr Server HTTPS Anfragen akzeptiert, folgen Sie [a@%s]diesem Link[/a] um eine sichere Verbindung zu benutzen.'; @@ -1064,6 +1070,7 @@ $strSetupMaxTableList_name = 'Tabellen Maximum'; $strSetupMemoryLimit_desc = 'Anzahl der Bytes, welche ein Script zur Ausführung benötigen darf, z.B. [kbd]32M[/kbd] ([kbd]0[/kbd] für unbegrenzt)'; $strSetupMemoryLimit_name = 'Speicher Limit'; +$strSetupNavigationBarIconic_desc = 'Benutze nur Icons, nur Text oder beides'; $strSetupNavigationBarIconic_name = 'Navigationsleiste mit Icons'; $strSetupNewServer = 'Neuer Server'; $strSetupNoServers = 'Es sind keine Server konfiguriert'; @@ -1135,7 +1142,9 @@ $strSetupServers_LogoutURL_name = 'Logout URL'; $strSetupServers_nopassword_desc = 'Versuche ohne Passwort zu verbinden'; $strSetupServers_nopassword_name = 'Ohne Passwort verbinden'; +$strSetupServers_only_db_desc = 'Du kannst MySQL Platzhalter Symbole (% und _) benutzen, entferne sie falls du wörtliche Instanzen benutzen möchtest, z.B. nutze \'my\_db\' und nicht \'my_db\''; $strSetupServers_only_db_name = 'Nur aufgelistete Datenbanken zeigen'; +$strSetupServers_password_desc = 'Lass dies leer falls nicht, benutze config auth'; $strSetupServers_password_name = 'Passwort für config Authentifikation'; $strSetupServers_pdf_pages_desc = 'Leer lassen für keine PDF Schema Unterstützung, Vorschlag: [kbd]pma_pdf_pages[/kbd]'; $strSetupServers_pdf_pages_name = 'PDF Pages Table'; @@ -1193,6 +1202,7 @@ $strSetupSQLQuery_Explain_name = 'SQL erklären'; $strSetupSQLQuery_Refresh_name = 'Aktualisieren'; $strSetupSQLQuery_ShowAsPHP_name = 'PHP-Code erzeugen'; +$strSetupSQLQuery_Validate_name = 'Validiere SQL'; $strSetupSuggestDBName_desc = 'Schlage (wenn möglich) einen Datenbank-Namen im "Create Database" Formular vor oder lasse das Textfeld leer'; $strSetupSuggestDBName_name = 'Schlage einen neuen Datenbank-Namen vor'; $strSetupTrue = 'Ja'; @@ -1392,6 +1402,7 @@ $strStrucExcelCSV = 'CSV-Daten für MS Excel'; $strStrucOnly = 'Nur Struktur'; $strStructPropose = 'Tabellenstruktur analysieren'; +$strStructureDiff = 'Struktur Unterschiede' ; $strStructureForView = 'Struktur des Views'; $strStructureLC = 'Struktur'; $strStructure = 'Struktur'; @@ -1415,6 +1426,7 @@ $strTableAlreadyExists = 'Die Tabelle %s existiert bereits!'; $strTableAlterColumn = 'Spalte(n) ändern'; $strTableAlteredSuccessfully = 'Die Tabelle %1$s wurde erfolgreich geändert'; +$strTableAlterIndex = 'Ändere index(e)'; $strTableApplyIndex = 'Index/Indices anwenden'; $strTableComments = 'Tabellen-Kommentar'; $strTableDeleteRows = 'Möchten Sie alle vorhergehenden zeilen aus den Ziel-Tabellen löschen?'; @@ -1609,22 +1621,4 @@ $strZeroRemovesTheLimit = 'Der Wert 0 (null) entfernt die Beschränkung.'; $strZip = 'Zip-komprimiert'; -// To translate: -$strAndSmall = 'and'; //to translate - -$strImportODS = 'Open Document Spreadsheet'; //to translate - -$strReplicationShowMasterStatus = 'Show master status'; //to translate -$strReplicationSkippingErrorWarn = 'Skipping error(s) might lead into unsynchronized master and slave!'; //to translate -$strReplicationStatusInfo = 'This MySQL server works as %s in <b>replication</b> process. For further information about replication status on the server, please visit the <a href="#replication">replication section</a>.'; //to translate - -$strSetupImport_skip_queries_desc = 'Number of records (queries) to skip from start'; //to translate -$strSetupNavigationBarIconic_desc = 'Use only icons, only text or both'; //to translate -$strSetupServers_only_db_desc = 'You can use MySQL wildcard characters (% and _), escape them if you want to use their literal instances, i.e. use \'my\_db\' and not \'my_db\''; //to translate -$strSetupServers_password_desc = 'Leave empty if not using config auth'; //to translate -$strSetupSQLQuery_Validate_name = 'Validate SQL'; //to translate -$strStructureDiff = 'Structure Difference' ; //to translate - -$strTableAlterIndex = 'Alter index(s)'; //to translate - ?> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/phpMyAdmin-3.3.9.2-all-languages/libraries/Config.class.php new/phpMyAdmin-3.3.10-all-languages/libraries/Config.class.php --- old/phpMyAdmin-3.3.9.2-all-languages/libraries/Config.class.php 2011-02-11 18:56:49.000000000 +0100 +++ new/phpMyAdmin-3.3.10-all-languages/libraries/Config.class.php 2011-03-19 13:00:19.000000000 +0100 @@ -92,7 +92,7 @@ */ function checkSystem() { - $this->set('PMA_VERSION', '3.3.9.2'); + $this->set('PMA_VERSION', '3.3.10'); /** * @deprecated */ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/phpMyAdmin-3.3.9.2-all-languages/libraries/common.inc.php new/phpMyAdmin-3.3.10-all-languages/libraries/common.inc.php --- old/phpMyAdmin-3.3.9.2-all-languages/libraries/common.inc.php 2011-02-11 18:56:49.000000000 +0100 +++ new/phpMyAdmin-3.3.10-all-languages/libraries/common.inc.php 2011-03-19 13:00:19.000000000 +0100 @@ -325,7 +325,6 @@ 'db_printview.php', 'db_search.php', //'Documentation.html', - //'error.php', 'export.php', 'import.php', //'index.php', diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/phpMyAdmin-3.3.9.2-all-languages/libraries/core.lib.php new/phpMyAdmin-3.3.10-all-languages/libraries/core.lib.php --- old/phpMyAdmin-3.3.9.2-all-languages/libraries/core.lib.php 2011-02-11 18:56:49.000000000 +0100 +++ new/phpMyAdmin-3.3.10-all-languages/libraries/core.lib.php 2011-03-19 13:00:19.000000000 +0100 @@ -261,21 +261,18 @@ $error_message = strtr($error_message, array('<br />' => '[br]')); // Displays the error message - // (do not use & for parameters sent by header) - $query_params = array( - 'lang' => $GLOBALS['available_languages'][$GLOBALS['lang']][2], - 'dir' => $GLOBALS['text_dir'], - 'type' => $GLOBALS['strError'], - 'error' => $error_message, - ); - header('Location: ' . (defined('PMA_SETUP') ? '../' : '') . 'error.php?' - . http_build_query($query_params, null, '&')); + $lang = $GLOBALS['available_languages'][$GLOBALS['lang']][2]; + $dir = $GLOBALS['text_dir']; + $type = $GLOBALS['strError']; + $error = $error_message; // on fatal errors it cannot hurt to always delete the current session if (isset($GLOBALS['session_name']) && isset($_COOKIE[$GLOBALS['session_name']])) { PMA_removeCookie($GLOBALS['session_name']); } + require('./libraries/error.inc.php'); + exit; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/phpMyAdmin-3.3.9.2-all-languages/libraries/database_interface.lib.php new/phpMyAdmin-3.3.10-all-languages/libraries/database_interface.lib.php --- old/phpMyAdmin-3.3.9.2-all-languages/libraries/database_interface.lib.php 2011-02-11 18:56:49.000000000 +0100 +++ new/phpMyAdmin-3.3.10-all-languages/libraries/database_interface.lib.php 2011-03-19 13:00:19.000000000 +0100 @@ -79,8 +79,8 @@ /** * Common Functions */ -function PMA_DBI_query($query, $link = null, $options = 0) { - $res = PMA_DBI_try_query($query, $link, $options) +function PMA_DBI_query($query, $link = null, $options = 0, $cache_affected_rows = true) { + $res = PMA_DBI_try_query($query, $link, $options, $cache_affected_rows) or PMA_mysqlDie(PMA_DBI_getError($link), $query); return $res; } @@ -367,8 +367,16 @@ } else { // Prepare to sort by creating array of the selected sort // value to pass to array_multisort - foreach ($each_tables as $table_name => $table_data) { - ${$sort_by}[$table_name] = strtolower($table_data[$sort_by]); + + // Size = Data_length + Index_length + if ($sort_by == 'Data_length') { + foreach ($each_tables as $table_name => $table_data) { + ${$sort_by}[$table_name] = strtolower($table_data['Data_length'] + $table_data['Index_length']); + } + } else { + foreach ($each_tables as $table_name => $table_data) { + ${$sort_by}[$table_name] = strtolower($table_data[$sort_by]); + } } if ($sort_order == 'DESC') { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/phpMyAdmin-3.3.9.2-all-languages/libraries/dbi/mysql.dbi.lib.php new/phpMyAdmin-3.3.10-all-languages/libraries/dbi/mysql.dbi.lib.php --- old/phpMyAdmin-3.3.9.2-all-languages/libraries/dbi/mysql.dbi.lib.php 2011-02-11 18:56:49.000000000 +0100 +++ new/phpMyAdmin-3.3.10-all-languages/libraries/dbi/mysql.dbi.lib.php 2011-03-19 13:00:19.000000000 +0100 @@ -155,7 +155,7 @@ * @param integer $options * @return mixed */ -function PMA_DBI_try_query($query, $link = null, $options = 0) +function PMA_DBI_try_query($query, $link = null, $options = 0, $cache_affected_rows = true) { if (empty($link)) { if (isset($GLOBALS['userlink'])) { @@ -176,6 +176,10 @@ $r = mysql_query($query, $link); } + if ($cache_affected_rows) { + $GLOBALS['cached_affected_rows'] = PMA_DBI_affected_rows($link, $get_from_cache = false); + } + if ($GLOBALS['cfg']['DBG']['sql']) { $time = microtime(true) - $time; @@ -392,17 +396,24 @@ return false; } } - //$insert_id = mysql_insert_id($link); - // if the primary key is BIGINT we get an incorrect result + // If the primary key is BIGINT we get an incorrect result // (sometimes negative, sometimes positive) // and in the present function we don't know if the PK is BIGINT // so better play safe and use LAST_INSERT_ID() // - // by the way, no problem with mysqli_insert_id() return PMA_DBI_fetch_value('SELECT LAST_INSERT_ID();', 0, 0, $link); } -function PMA_DBI_affected_rows($link = null) +/** + * returns the number of rows affected by last query + * + * @uses $GLOBALS['userlink'] + * @uses mysql_affected_rows() + * @param object mysql $link the mysql object + * @param boolean $get_from_cache + * @return string integer + */ +function PMA_DBI_affected_rows($link = null, $get_from_cache = true) { if (empty($link)) { if (isset($GLOBALS['userlink'])) { @@ -411,7 +422,12 @@ return false; } } - return mysql_affected_rows($link); + + if ($get_from_cache) { + return $GLOBALS['cached_affected_rows']; + } else { + return mysql_affected_rows($link); + } } /** diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/phpMyAdmin-3.3.9.2-all-languages/libraries/dbi/mysqli.dbi.lib.php new/phpMyAdmin-3.3.10-all-languages/libraries/dbi/mysqli.dbi.lib.php --- old/phpMyAdmin-3.3.9.2-all-languages/libraries/dbi/mysqli.dbi.lib.php 2011-02-11 18:56:49.000000000 +0100 +++ new/phpMyAdmin-3.3.10-all-languages/libraries/dbi/mysqli.dbi.lib.php 2011-03-19 13:00:19.000000000 +0100 @@ -175,9 +175,10 @@ * @param string $query query to execute * @param object mysqli $link mysqli object * @param integer $options + * @param boolean $cache_affected_rows * @return mixed true, false or result object */ -function PMA_DBI_try_query($query, $link = null, $options = 0) +function PMA_DBI_try_query($query, $link = null, $options = 0, $cache_affected_rows = true) { if ($options == ($options | PMA_DBI_QUERY_STORE)) { $method = MYSQLI_STORE_RESULT; @@ -199,6 +200,11 @@ $time = microtime(true); } $r = mysqli_query($link, $query, $method); + + if ($cache_affected_rows) { + $GLOBALS['cached_affected_rows'] = PMA_DBI_affected_rows($link, $get_from_cache = false); + } + if ($GLOBALS['cfg']['DBG']['sql']) { $time = microtime(true) - $time; @@ -451,7 +457,13 @@ return false; } } - return mysqli_insert_id($link); + // When no controluser is defined, using mysqli_insert_id($link) + // does not always return the last insert id due to a mixup with + // the tracking mechanism, but this works: + return PMA_DBI_fetch_value('SELECT LAST_INSERT_ID();', 0, 0, $link); + // Curiously, this problem does not happen with the mysql extension but + // there is another problem with BIGINT primary keys so PMA_DBI_insert_id() + // in the mysql extension also uses this logic. } /** @@ -460,9 +472,10 @@ * @uses $GLOBALS['userlink'] * @uses mysqli_affected_rows() * @param object mysqli $link the mysqli object + * @param boolean $get_from_cache * @return string integer */ -function PMA_DBI_affected_rows($link = null) +function PMA_DBI_affected_rows($link = null, $get_from_cache = true) { if (empty($link)) { if (isset($GLOBALS['userlink'])) { @@ -471,7 +484,11 @@ return false; } } - return mysqli_affected_rows($link); + if ($get_from_cache) { + return $GLOBALS['cached_affected_rows']; + } else { + return mysqli_affected_rows($link); + } } /** diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/phpMyAdmin-3.3.9.2-all-languages/libraries/error.inc.php new/phpMyAdmin-3.3.10-all-languages/libraries/error.inc.php --- old/phpMyAdmin-3.3.9.2-all-languages/libraries/error.inc.php 1970-01-01 01:00:00.000000000 +0100 +++ new/phpMyAdmin-3.3.10-all-languages/libraries/error.inc.php 2011-03-19 13:00:19.000000000 +0100 @@ -0,0 +1,57 @@ +<?php +/* vim: set expandtab sw=4 ts=4 sts=4: */ +/** + * phpMyAdmin fatal error display page + * + * @package phpMyAdmin + */ + +if (! defined('PHPMYADMIN')) { + exit; +} + +header('Content-Type: text/html; charset=utf-8'); +?> +<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> +<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="<?php echo $lang; ?>" dir="<?php echo $dir; ?>"> +<head> + <link rel="icon" href="./favicon.ico" type="image/x-icon" /> + <link rel="shortcut icon" href="./favicon.ico" type="image/x-icon" /> + <title>phpMyAdmin</title> + <meta http-equiv="Content-Type" content="text/html; charset=utf-8" /> + <style type="text/css"> +  + </style> +</head> +<body> +<h1>phpMyAdmin - <?php echo $error_header; ?></h1> +<p><?php echo PMA_sanitize($error_message); ?></p> +</body> +</html> + diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/phpMyAdmin-3.3.9.2-all-languages/libraries/export/yaml.php new/phpMyAdmin-3.3.10-all-languages/libraries/export/yaml.php --- old/phpMyAdmin-3.3.9.2-all-languages/libraries/export/yaml.php 2011-02-11 18:56:49.000000000 +0100 +++ new/phpMyAdmin-3.3.10-all-languages/libraries/export/yaml.php 2011-03-19 13:00:19.000000000 +0100 @@ -167,11 +167,8 @@ continue; } - $record[$i] = preg_replace('/\r\n|\r|\n/', $crlf.' ', $record[$i]); - if (strstr($record[$i], $crlf)) - $record[$i] = '|-' . $crlf . ' '.$record[$i]; - - $buffer .= ' ' . $column . ': ' . $record[$i] . $crlf; + $record[$i] = str_replace(array('\\', '"', "\n", "\r"), array('\\\\', '\"', '\n', '\r'), $record[$i]); + $buffer .= ' ' . $column . ': "' . $record[$i] . '"' . $crlf; } if (! PMA_exportOutputHandler($buffer)) { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/phpMyAdmin-3.3.9.2-all-languages/libraries/relation.lib.php new/phpMyAdmin-3.3.10-all-languages/libraries/relation.lib.php --- old/phpMyAdmin-3.3.9.2-all-languages/libraries/relation.lib.php 2011-02-11 18:56:49.000000000 +0100 +++ new/phpMyAdmin-3.3.10-all-languages/libraries/relation.lib.php 2011-03-19 13:00:19.000000000 +0100 @@ -29,10 +29,16 @@ */ function PMA_query_as_controluser($sql, $show_error = true, $options = 0) { + // Avoid caching of the number of rows affected; for example, this function + // is called for tracking purposes but we want to display the correct number + // of rows affected by the original query, not by the query generated for + // tracking. + $cache_affected_rows = false; + if ($show_error) { - $result = PMA_DBI_query($sql, $GLOBALS['controllink'], $options); + $result = PMA_DBI_query($sql, $GLOBALS['controllink'], $options, $cache_affected_rows); } else { - $result = @PMA_DBI_try_query($sql, $GLOBALS['controllink'], $options); + $result = @PMA_DBI_try_query($sql, $GLOBALS['controllink'], $options, $cache_affected_rows); } // end if... else... if ($result) { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/phpMyAdmin-3.3.9.2-all-languages/phpinfo.php new/phpMyAdmin-3.3.10-all-languages/phpinfo.php --- old/phpMyAdmin-3.3.9.2-all-languages/phpinfo.php 2011-02-11 18:56:49.000000000 +0100 +++ new/phpMyAdmin-3.3.10-all-languages/phpinfo.php 2011-03-19 13:00:19.000000000 +0100 @@ -7,10 +7,6 @@ */ /** - * @ignore - */ -define('PMA_MINIMUM_COMMON', true); -/** * Gets core libraries and defines some variables */ require_once './libraries/common.inc.php'; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/phpMyAdmin-3.3.9.2-all-languages/tbl_replace.php new/phpMyAdmin-3.3.10-all-languages/tbl_replace.php --- old/phpMyAdmin-3.3.9.2-all-languages/tbl_replace.php 2011-02-11 18:56:49.000000000 +0100 +++ new/phpMyAdmin-3.3.10-all-languages/tbl_replace.php 2011-03-19 13:00:19.000000000 +0100 @@ -357,7 +357,7 @@ if (! $result) { $error_messages[] = PMA_DBI_getError(); } else { - // the following is a real assignment: + // The next line contains a real assignment, it's not a typo if ($tmp = @PMA_DBI_affected_rows()) { $total_affected_rows += $tmp; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/phpMyAdmin-3.3.9.2-all-languages/translators.html new/phpMyAdmin-3.3.10-all-languages/translators.html --- old/phpMyAdmin-3.3.9.2-all-languages/translators.html 2011-02-11 18:56:49.000000000 +0100 +++ new/phpMyAdmin-3.3.10-all-languages/translators.html 2011-03-19 13:00:19.000000000 +0100 @@ -11,7 +11,7 @@ <link rel="icon" href="./favicon.ico" type="image/x-icon" /> <link rel="shortcut icon" href="./favicon.ico" type="image/x-icon" /> <meta http-equiv="Content-Type" content="text/html; charset=utf-8" /> - <title>phpMyAdmin 3.3.9.2 - Official translators</title> + <title>phpMyAdmin 3.3.10 - Official translators</title> <link rel="stylesheet" type="text/css" href="docs.css" /> </head> @@ -19,7 +19,7 @@ <div id="header"> <h1> <a href="http://www.phpmyadmin.net/">php<span class="myadmin">MyAdmin</span></a> - 3.3.9.2 + 3.3.10 official translators list </h1> </div> ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 kiwi for openSUSE:Factory
by root＠hilbert.suse.de 22 Mar '11

22 Mar '11

Hello community, here is the log from the commit of package kiwi for openSUSE:Factory checked in at Tue Mar 22 10:38:01 CET 2011. -------- --- kiwi/kiwi.changes 2011-03-15 18:14:35.000000000 +0100 +++ /mounts/work_src_done/STABLE/kiwi/kiwi.changes 2011-03-21 16:06:56.000000000 +0100 @@ -1,0 +2,135 @@ +Mon Mar 21 15:41:19 CET 2011 - ms(a)suse.de + +- added suseStripFirmware() which removes all firmware files + which are not referenced by any module (bnc #681234) + +------------------------------------------------------------------- +Mon Mar 21 14:54:02 CET 2011 - ms(a)suse.de + +- fixed use of uninitialized value in __checkPatternTypeAttrrValueConsistent + +------------------------------------------------------------------- +Mon Mar 21 14:52:54 CET 2011 - ms(a)suse.de + +- DB: update documentation, new attribute prefer-license + +------------------------------------------------------------------- +Mon Mar 21 12:23:09 CET 2011 - ms(a)suse.de + +- added support for the repository attribute 'prefered-license' + The repository providing this flag will be used to install + the license tarball due to request in bnc #633664. If no repo + with a prefered license flag exists the search happens over + all repos but it's not guaranteed in that case that the search + order follows the repo order like they are written into + the XML description (bnc #680886) + +------------------------------------------------------------------- +Mon Mar 21 10:09:13 CET 2011 - ms(a)suse.de + +- DB: update documentation and examples, new element oem-silent-boot + +------------------------------------------------------------------- +Mon Mar 21 09:55:35 CET 2011 - ms(a)suse.de + +- added support for the configuration of a silent OEM boot mode + Normally the oem boot process switches the splash screen off. + With <oem-silent-boot>true</oem-silent-boot> as part of the + oemconfig section, the splash stays on top + +------------------------------------------------------------------- +Fri Mar 18 16:44:08 CET 2011 - ms(a)suse.de + +- fixed examples, added boot.local script to the suse-live-stick + example which allows to mount the fat boot partition as data + container below /media/stickstorage + +------------------------------------------------------------------- +Fri Mar 18 14:46:49 CET 2011 - ms(a)suse.de + +- fixed kiwirevision check. In case of a git revision it's + invalid to check for less than a number. The check must + match the revision + +------------------------------------------------------------------- +Fri Mar 18 14:40:53 CET 2011 - ms(a)suse.de + +- DB: update documentation, kiwirevision specifies a git commit id + +------------------------------------------------------------------- +Fri Mar 18 14:23:29 CET 2011 - ms(a)suse.de + +- v4.82 released + +------------------------------------------------------------------- +Fri Mar 18 10:58:06 CET 2011 - ms(a)suse.de + +- fixed exit code handling: +* kiwi --version => exit 0 +* kiwi --help | -h => exit 0 +* unknown option => exit 1 +* no root privileges => exit 1 +* processsing error => exit 1 + +------------------------------------------------------------------- +Fri Mar 18 10:34:46 CET 2011 - ms(a)suse.de + +- move the knowledge about the default package manager from + the KIWIManager object into the XML object. This is a configuration + value and thus the default should be in the part of the code + that processes the configuration + +------------------------------------------------------------------- +Fri Mar 18 09:59:04 CET 2011 - ms(a)suse.de + +- added a new target to the Makefile to allow the execution of a + single unit test, i.e. support 'make KIWIXMLValidator.t' + This is useful when working on unit tests as it allows to + execute only the test being worked on. + +------------------------------------------------------------------- +Thu Mar 17 18:47:24 CET 2011 - ms(a)suse.de + +- fixed spec file. perl-satsolver from the 11.4 distro doesn't + contain the code changes Klaus made during the Studio workshop + Therefore kiwi provides the required version now in the + Virtualization:Appliances repo for 11.4 (bnc #680549) + +------------------------------------------------------------------- +Thu Mar 17 17:57:50 CET 2011 - ms(a)suse.de + +- fixed 11.3 and 11.4 JeOS templates. openssl-certs doesn't exist + there anymore. I replaced it by ca-certificates + +------------------------------------------------------------------- +Thu Mar 17 12:19:23 CET 2011 - ms(a)suse.de + +- increased size of boot partition from 60M to 100M. If + mkinitrd is called it might happen that /boot runs + out of space + +------------------------------------------------------------------- +Wed Mar 16 20:30:15 CET 2011 - ms(a)suse.de + +- The ISO generation code allows for either genisoimage or mkisofs. + The checker does not support this. The patch addresses this problem + and the checker no will be happy if either genisoimage or mkisofs + is found (bnc #680148) + +------------------------------------------------------------------- +Wed Mar 16 14:44:36 CET 2011 - ms(a)suse.de + +- fixed typos in ppc boot scripts (spaces at end of line, tab mismatches) + and adapt latest noarch code changes from x86 boot scripts to ppc +- removed 01-console.sh from ppc JeOS template. That's done by the + setupConsole() function in suse-preinit + +------------------------------------------------------------------- +Wed Mar 16 08:50:04 CET 2011 - ms(a)suse.de + +- fix the VMware image example. The example does not contain + necessary packages for a graphical user interface, thus + setting window manager and runlevel in config.sh to imply + that a GUI environment is present is misleading + +------------------------------------------------------------------- @@ -781,0 +917,12 @@ + +------------------------------------------------------------------- +Tue Feb 1 16:35:11 CET 2011 - ms(a)suse.de + +- added support for ppc images: +* added oemboot boot code +* added vmxboot boot code +* adapt kiwi for creation of ppc disk images +* adapt kiwi for creation of ppc install iso +* added suse-SLE11-JeOS template for ppc +* added support for lilo boot loader used for ppc +* changed spec file to build ppc packages calling whatdependson for head-i586 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kiwi.spec ++++++ --- /var/tmp/diff_new_pack.Nm3EOH/_old 2011-03-22 10:34:51.000000000 +0100 +++ /var/tmp/diff_new_pack.Nm3EOH/_new 2011-03-22 10:34:51.000000000 +0100 @@ -56,7 +56,7 @@ Requires: satsolver-tools %endif %if %{suse_version} > 1130 -Requires: perl-satsolver +Requires: perl-satsolver >= 0.42 %endif %ifarch %ix86 x86_64 Requires: master-boot-code @@ -65,8 +65,8 @@ %endif %endif Summary: OpenSuSE - KIWI Image System -Version: 4.81 -Release: 2 +Version: 4.82 +Release: 1 Group: System/Management License: GPLv2 Source: %{name}.tar.bz2 @@ -183,7 +183,7 @@ Marcus Schaefer <ms(a)novell.com> %endif -%ifarch %ix86 x86_64 s390 s390x +%ifarch %ix86 x86_64 ppc ppc64 s390 s390x %package -n kiwi-desc-vmxboot License: GPLv2+ @@ -273,7 +273,7 @@ Marcus Schaefer <ms(a)novell.com> %endif -%ifarch %ix86 x86_64 s390 s390x +%ifarch %ix86 x86_64 ppc ppc64 s390 s390x %package -n kiwi-templates License: GPL v2.0 or later @@ -455,7 +455,7 @@ %{_datadir}/kiwi/image/isoboot/rhel* %endif -%ifarch %ix86 x86_64 s390 s390x +%ifarch %ix86 x86_64 ppc ppc64 s390 s390x %files -n kiwi-desc-vmxboot %defattr(-, root, root) @@ -482,10 +482,9 @@ %{_datadir}/kiwi/image/oemboot/suse* %endif -%ifarch %ix86 x86_64 - %files -n kiwi-templates %defattr(-, root, root) +%ifarch %ix86 x86_64 %{_datadir}/kiwi/image/suse-11.4-JeOS %{_datadir}/kiwi/image/suse-11.3-JeOS %{_datadir}/kiwi/image/suse-11.2-JeOS @@ -497,6 +496,9 @@ %ifarch s390 s390x %{_datadir}/kiwi/image/suse-SLE11-JeOS %endif +%ifarch ppc ppc64 +%{_datadir}/kiwi/image/suse-SLE11-JeOS +%endif %changelog ++++++ kiwi-docu.tar.bz2 ++++++ kiwi/kiwi-docu.tar.bz2 /mounts/work_src_done/STABLE/kiwi/kiwi-docu.tar.bz2 differ: char 11, line 1 ++++++ kiwi.tar.bz2 ++++++ ++++ 6584 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

drop libzip1 from openSUSE:Factory
by root＠hilbert.suse.de 22 Mar '11

22 Mar '11

Hello community, FYI: Package libzip1 was dropped from openSUSE:Factory at Tue Mar 22 10:36:38 CET 2011. You can find the latest sources of the package in the openSUSE:Dropped repository: https://build.opensuse.org/package/show?project=openSUSE:Dropped&package=li… 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 libzip for openSUSE:Factory
by root＠hilbert.suse.de 22 Mar '11

22 Mar '11

Hello community, here is the log from the commit of package libzip for openSUSE:Factory checked in at Tue Mar 22 10:29:50 CET 2011. -------- New Changes file: --- /dev/null 2010-08-26 16:28:41.000000000 +0200 +++ /mounts/work_src_done/STABLE/libzip/libzip.changes 2011-03-21 16:24:41.000000000 +0100 @@ -0,0 +1,38 @@ +------------------------------------------------------------------- +Mon Mar 21 10:01:42 UTC 2011 - mvyskocil(a)suse.cz + +- update to 0.10 - rename to libzip to avoid source package rename on + each soname change. Package libzip deprecate libzip-utils + * add zip_get_num_files(), deprecate zip_get_num_entries(). + * support for traditional PKWARE encryption added. + * fix opening archives with more than 65535 entries. + * fix some memory leaks. + * fix cmake build and installation + * fix memory leak in error case in zip_open() + * fix CVE-2011-0421 (no security implications though) (bnc#681193) + * more documentation. +- refresh libzip-0.8.hg20080403-visibility.patch +- add libzip.test.diff from upstream fixing failed tests +- add libzip-0.10-zipconf-location.patch installs zipconf.h to includedir +- add pkg-config to BuildRequires + +------------------------------------------------------------------- +Sun Jul 27 06:25:54 CEST 2008 - crrodriguez(a)suse.de + +- update to version 0.9 + * remove erroneous references to GPL + * add support for torrentzip + * new functions: zip_get_archive_flag, zip_set_archive_flag + * zip_source_zip: add flag to force recompression + * zip_sorce_file: only keep file open while reading from it + +------------------------------------------------------------------- +Thu Apr 3 20:11:56 CEST 2008 - crrodriguez(a)suse.de + +- initial version for openSUSE 11, needed by ARK/KDE4 + +------------------------------------------------------------------- +Thu Jun 7 09:13:37 UTC 2007 - judas_iscariote(a)shorewall.net + +- update to stable 0.8 version + calling whatdependson for head-i586 New: ---- libzip-0.10-zipconf-location.patch libzip-0.10.tar.bz2 libzip-0.8.hg20080403-visibility.patch libzip.changes libzip.spec libzip.test.diff ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libzip.spec ++++++ # # spec file for package libzip # # Copyright (c) 2011 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/ # # norootforbuild Name: libzip Version: 0.10 Release: 1 Summary: C library for reading, creating, and modifying zip archives License: BSD3c Group: Development/Libraries/C and C++ Source0: http://www.nih.at/libzip/%{name}-%{version}.tar.bz2 Url: http://www.nih.at/libzip BuildRequires: zlib-devel BuildRequires: pkg-config Provides: libzip-util = %{version} Obsoletes: libzip-util < %{version} BuildRoot: %{_tmppath}/%{name}-%{version}-build Patch0: libzip-0.8.hg20080403-visibility.patch #PATCH-FIX-UPSTREAM: for for failing tests by Thomas Klausner Patch1: libzip.test.diff #PATCH-FIX-OPENSUSE: install zipconf.h to includedir Patch2: libzip-0.10-zipconf-location.patch %description libzip is a C library for reading, creating, and modifying zip archives. Files can be added from data buffers, files, or compressed. This package contains a set of small utilities built using libzip2 Set os small utilities built around %{name} * zipmerge - merge source zip archives into the target one * zipcmp - compares the zip archives and check if they contains same files * ziptorrent - manipulate with a restricted file format used for using bittorrent on zip files. %package -n libzip2 License: BSD3c Summary: C library for reading, creating, and modifying zip archives Group: Development/Libraries/C and C++ %description -n libzip2 This is libzip, a C library for reading, creating, and modifying zip archives. Files can be added from data buffers, files, or compressed data copied directly from other zip archives. Changes made without closing the archive can be reverted. The API is documented by man pages. %package devel License: BSD3c Summary: C library for reading, creating, and modifying zip archives Group: Development/Libraries/C and C++ Requires: libzip1 = %{version} glibc-devel %description devel libzip is a C library for reading, creating, and modifying zip archives. This package contains devel files. %prep %setup -q -n %{name}-%{version} %patch0 -p1 %patch1 -p1 %patch2 -p1 %build autoreconf -fiv %configure --disable-static --with-pic %{__make} %{?jobs:-j%jobs} %check export MALLOC_CHECK_=2 %{__make} --debug=j %{?jobs:-j%jobs} check unset MALLOC_CHECK_ %install %{__make} install DESTDIR=%{buildroot} rm -f %{buildroot}%{_libdir}/libzip.la %clean rm -rf %{buildroot} %post -n libzip2 -p /sbin/ldconfig %postun -n libzip2 -p /sbin/ldconfig %files %defattr(-,root,root) %doc AUTHORS NEWS README THANKS TODO %{_bindir}/ziptorrent %{_bindir}/zipcmp %{_bindir}/zipmerge %{_mandir}/man1/*.1* %files -n libzip2 %defattr(-,root,root) %{_libdir}/libzip.so.2* %files devel %defattr(-,root,root) %{_libdir}/libzip.so %{_includedir}/zip*.h %{_libdir}/pkgconfig/libzip.pc %{_mandir}/man3/*.3* %changelog ++++++ libzip-0.10-zipconf-location.patch ++++++ Index: libzip-0.10/lib/Makefile.am =================================================================== --- libzip-0.10.orig/lib/Makefile.am 2011-03-18 13:51:24.000000000 +0100 +++ libzip-0.10/lib/Makefile.am 2011-03-21 15:21:13.837759964 +0100 @@ -1,4 +1,4 @@ -libincludedir = ${libdir}/@PACKAGE@/include +libincludedir = ${includedir} lib_LTLIBRARIES = libzip.la noinst_HEADERS = zipint.h Index: libzip-0.10/lib/Makefile.in =================================================================== --- libzip-0.10.orig/lib/Makefile.in 2011-03-18 13:51:26.000000000 +0100 +++ libzip-0.10/lib/Makefile.in 2011-03-21 15:22:02.202638002 +0100 @@ -237,7 +237,7 @@ top_build_prefix = @top_build_prefix@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ -libincludedir = ${libdir}/@PACKAGE@/include +libincludedir = @includedir@ lib_LTLIBRARIES = libzip.la noinst_HEADERS = zipint.h include_HEADERS = zip.h ++++++ libzip-0.8.hg20080403-visibility.patch ++++++ Index: libzip-0.10/configure.ac =================================================================== --- libzip-0.10.orig/configure.ac 2011-03-18 12:37:29.000000000 +0100 +++ libzip-0.10/configure.ac 2011-03-21 13:46:34.674834029 +0100 @@ -38,6 +38,35 @@ AC_MSG_ERROR([ZLIB version too old, please install at least v1.1.2]) fi +AC_CACHE_CHECK(for visibility(hidden) attribute, + ac_cv_visibility_hidden, + [cat > conftest.c <<EOF + int foo __attribute__ ((visibility ("hidden"))) = 1; +EOF + ac_cv_visibility_hidden=no + if ${CC-cc} -Werror -S conftest.c -o conftest.s >/dev/null 2>&1; then + if grep '\.hidden.*foo' conftest.s >/dev/null; then + ac_cv_visibility_hidden=yes + fi + fi + rm -f conftest.[cs] + ]) + + if test "$ac_cv_visibility_hidden" = "yes"; then + CFLAGS="$CFLAGS -DHAVE_GCCVISIBILITYPATCH=1 -fvisibility=hidden" + fi + + + + + + + + + + + + AC_EXEEXT AM_PROG_LIBTOOL Index: libzip-0.10/lib/zip.h =================================================================== --- libzip-0.10.orig/lib/zip.h 2011-03-04 18:17:43.000000000 +0100 +++ libzip-0.10/lib/zip.h 2011-03-21 13:48:52.466190330 +0100 @@ -34,14 +34,19 @@ IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ - -#ifndef ZIP_EXTERN #ifdef _WIN32 -#define ZIP_EXTERN __declspec(dllimport) + #ifdef BUILDING_DLL + #define ZIP_EXTERN __declspec(dllexport) + #else + #define ZIP_EXTERN __declspec(dllimport) + #endif #else -#define ZIP_EXTERN -#endif + #ifdef HAVE_GCCVISIBILITYPATCH + #define ZIP_EXTERN __attribute__ ((visibility("default"))) + #else + #define ZIP_EXTERN + #endif #endif #ifdef __cplusplus ++++++ libzip.test.diff ++++++ diff -r 6c57f552da7a regress/open_new_but_exists.test --- a/regress/open_new_but_exists.test Mon Mar 21 14:22:51 2011 +0100 +++ b/regress/open_new_but_exists.test Mon Mar 21 15:18:46 2011 +0100 @@ -3,4 +3,4 @@ args -e test.zip return 1 file test.zip test.zip test.zip -stdout opening `test.zip' returned error 10/0 +stdout opening `test.zip' returned error 10 diff -r 6c57f552da7a regress/open_nonarchive.test --- a/regress/open_nonarchive.test Mon Mar 21 14:22:51 2011 +0100 +++ b/regress/open_nonarchive.test Mon Mar 21 15:18:46 2011 +0100 @@ -3,4 +3,4 @@ file Makefile.am Makefile.am Makefile.am args Makefile.am return 1 -stdout opening `Makefile.am' returned error 19/2 +stdout opening `Makefile.am' returned error 19 diff -r 6c57f552da7a regress/tryopen.c --- a/regress/tryopen.c Mon Mar 21 14:22:51 2011 +0100 +++ b/regress/tryopen.c Mon Mar 21 15:18:46 2011 +0100 @@ -90,7 +90,9 @@ return 0; } - printf("opening `%s' returned error %d/%d\n", - fname, ze, errno); + printf("opening `%s' returned error %d", fname, ze); + if (zip_error_get_sys_type(ze) == ZIP_ET_SYS) + printf("/%d", errno); + printf("\n"); return 1; } ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 bootsplash for openSUSE:11.4
by root＠hilbert.suse.de 21 Mar '11

21 Mar '11

Hello community, here is the log from the commit of package bootsplash for openSUSE:11.4 checked in at Tue Mar 22 00:06:43 CET 2011. -------- --- old-versions/11.4/all/bootsplash/bootsplash.changes 2010-08-29 20:02:01.000000000 +0200 +++ 11.4/bootsplash/bootsplash.changes 2011-03-19 02:05:58.000000000 +0100 @@ -1,0 +2,5 @@ +Fri Mar 11 21:04:54 UTC 2011 - javier(a)opensuse.org + +- run mkinitrd in %postun (bnc#669474) + +------------------------------------------------------------------- Package does not exist at destination yet. Using Fallback old-versions/11.4/all/bootsplash Destination is old-versions/11.4/UPDATES/all/bootsplash calling whatdependson for 11.4-i586 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ bootsplash.spec ++++++ --- /var/tmp/diff_new_pack.r0hna7/_old 2011-03-22 00:06:26.000000000 +0100 +++ /var/tmp/diff_new_pack.r0hna7/_new 2011-03-22 00:06:26.000000000 +0100 @@ -1,7 +1,7 @@ # -# spec file for package bootsplash (Version 3.3) +# spec file for package bootsplash # -# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2011 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 @@ -22,7 +22,7 @@ BuildRequires: freetype2-devel libjpeg-devel libmng-devel Url: http://www.bootsplash.org/ Version: 3.3 -Release: 165 +Release: 167.<RELEASE168> Summary: Graphical System Boot Utilities License: GPLv2+ Group: System/Boot @@ -103,6 +103,9 @@ %postun %{insserv_cleanup} /sbin/mkinitrd_setup +if test -s /etc/sysconfig/bootloader ; then +/sbin/mkinitrd +fi %files %defattr(-,root,root) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 bootsplash-branding-openSUSE for openSUSE:11.4
by root＠hilbert.suse.de 21 Mar '11

21 Mar '11

Hello community, here is the log from the commit of package bootsplash-branding-openSUSE for openSUSE:11.4 checked in at Tue Mar 22 00:06:03 CET 2011. -------- --- old-versions/11.4/all/bootsplash-branding-openSUSE/bootsplash-branding-openSUSE.changes 2011-02-19 16:27:11.000000000 +0100 +++ 11.4/bootsplash-branding-openSUSE/bootsplash-branding-openSUSE.changes 2011-03-12 02:12:32.000000000 +0100 @@ -1,0 +2,11 @@ +Fri Mar 11 20:48:04 UTC 2011 - javier(a)opensuse.org + +- add support for 1600x900 and 1920x1080, run mkinitrd in %post + (bnc#615778, bnc#678523, bnc#668762) + +------------------------------------------------------------------- +Tue Mar 1 23:52:32 UTC 2011 - javier(a)opensuse.org + +- improve verbose bootsplash (bnc#669474) + +------------------------------------------------------------------- Package does not exist at destination yet. Using Fallback old-versions/11.4/all/bootsplash-branding-openSUSE Destination is old-versions/11.4/UPDATES/all/bootsplash-branding-openSUSE calling whatdependson for 11.4-i586 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ bootsplash-branding-openSUSE.spec ++++++ --- /var/tmp/diff_new_pack.QeBGQY/_old 2011-03-22 00:05:19.000000000 +0100 +++ /var/tmp/diff_new_pack.QeBGQY/_new 2011-03-22 00:05:19.000000000 +0100 @@ -21,7 +21,7 @@ Name: bootsplash-branding-openSUSE Url: http://www.bootsplash.org/ Version: 3.1 -Release: 64.<RELEASE2> +Release: 64.<RELEASE66> Summary: Default SUSE Bootsplash Theme License: BSD3c(or similar) Group: System/Boot @@ -146,6 +146,9 @@ %post %{fillup_only -ns bootsplash branding-openSUSE } perl -pi -e 's/^(THEME=).*/$1"openSUSE"/' /etc/sysconfig/bootsplash +if test -s /etc/sysconfig/bootloader ; then +/sbin/mkinitrd +fi %post -n bootsplash-branding-SLES %{fillup_only -ns bootsplash branding-SLES } ++++++ openSUSE.tar.bz2 ++++++ old-versions/11.4/all/bootsplash-branding-openSUSE/openSUSE.tar.bz2 11.4/bootsplash-branding-openSUSE/openSUSE.tar.bz2 differ: char 11, line 1 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 libzip1 for openSUSE:11.4
by root＠hilbert.suse.de 21 Mar '11

21 Mar '11

Hello community, here is the log from the commit of package libzip1 for openSUSE:11.4 checked in at Tue Mar 22 00:05:32 CET 2011. -------- --- old-versions/11.4/all/libzip1/libzip1.changes 2008-07-27 06:26:56.000000000 +0200 +++ 11.4/libzip1/libzip1.changes 2011-03-21 10:46:17.000000000 +0100 @@ -1,0 +2,5 @@ +Mon Mar 21 09:46:06 UTC 2011 - mvyskocil(a)suse.cz + +- fix bnc#681193 - VUL-0: libzip NULL deref (CVE-2011-0421) + +------------------------------------------------------------------- Package does not exist at destination yet. Using Fallback old-versions/11.4/all/libzip1 Destination is old-versions/11.4/UPDATES/all/libzip1 calling whatdependson for 11.4-i586 New: ---- libzip-0.9-CVE-2011-0421.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libzip1.spec ++++++ --- /var/tmp/diff_new_pack.bR5fwg/_old 2011-03-22 00:05:18.000000000 +0100 +++ /var/tmp/diff_new_pack.bR5fwg/_new 2011-03-22 00:05:18.000000000 +0100 @@ -1,7 +1,7 @@ # -# spec file for package libzip1 (Version 0.9) +# spec file for package libzip1 # -# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2011 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 @@ -22,14 +22,15 @@ Name: libzip1 Version: 0.9 -Release: 22 -License: BSD 3-Clause +Release: 30.<RELEASE31> +License: BSD3c Group: Development/Libraries/C and C++ Source0: http://www.nih.at/libzip/%{pkg_name}-%{version}.tar.bz2 Url: http://www.nih.at/libzip BuildRequires: zlib-devel BuildRoot: %{_tmppath}/%{name}-%{version}-build Patch0: libzip-0.8.hg20080403-visibility.patch +Patch1: libzip-0.9-CVE-2011-0421.patch %description libzip is a C library for reading, creating, and modifying zip @@ -46,7 +47,7 @@ Thomas Klausner <tk(a)giga.or.at> %package -n libzip-util -License: BSD 3-Clause +License: BSD3c Summary: C library for reading, creating, and modifying zip archives Group: Development/Libraries/C and C++ @@ -65,7 +66,7 @@ Thomas Klausner <tk(a)giga.or.at> %package -n libzip-devel -License: BSD 3-Clause +License: BSD3c Summary: C library for reading, creating, and modifying zip archives Group: Development/Libraries/C and C++ Requires: libzip1 = %{version} glibc-devel @@ -87,6 +88,7 @@ %prep %setup -q -n %{pkg_name}-%{version} %patch0 -p1 +%patch1 -p1 %build autoreconf -fiv ++++++ libzip-0.9-CVE-2011-0421.patch ++++++ Index: libzip-0.9/lib/zip_name_locate.c =================================================================== --- libzip-0.9/lib/zip_name_locate.c 2007-11-07 14:33:45.000000000 +0100 +++ libzip-0.9/lib/zip_name_locate.c 2011-03-21 10:36:21.149985060 +0100 @@ -59,6 +59,10 @@ _zip_error_set(error, ZIP_ER_INVAL, 0); return -1; } + + if((flags & ZIP_FL_UNCHANGED) && !za->cdir) { + return -1; + } cmp = (flags & ZIP_FL_NOCASE) ? strcasecmp : strcmp; ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 btrfsprogs for openSUSE:11.4
by root＠hilbert.suse.de 21 Mar '11

21 Mar '11

Hello community, here is the log from the commit of package btrfsprogs for openSUSE:11.4 checked in at Tue Mar 22 00:03:42 CET 2011. -------- --- old-versions/11.4/all/btrfsprogs/btrfsprogs.changes 2010-05-26 17:14:56.000000000 +0200 +++ 11.4/btrfsprogs/btrfsprogs.changes 2011-03-21 13:01:35.000000000 +0100 @@ -1,0 +2,22 @@ +Mon Mar 21 13:01:23 CET 2011 - dmueller(a)suse.de + +- change to a hardlink + +------------------------------------------------------------------- +Mon Mar 14 19:19:34 CET 2011 - dmueller(a)suse.de + +- add link for fsck.btrfs (bnc#665899) + +------------------------------------------------------------------- +Thu Dec 16 20:53:19 CET 2010 - dmueller(a)suse.de + +- update to v0.19-35-g1b444cd: + * used space accounting fix for the converter + * Add btrfs-list for listing subvolumes + * Add new util: 'btrfs' + * multidevice support for check_mounted + * check slash in deleting subvolumes + * Add btrfsck option to select the super block copy + * btrfs-debug-tree: add -d option to print only the device mapping + +------------------------------------------------------------------- Package does not exist at destination yet. Using Fallback old-versions/11.4/all/btrfsprogs Destination is old-versions/11.4/UPDATES/all/btrfsprogs calling whatdependson for 11.4-i586 Old: ---- 0001-used-space-accounting-fix-for-the-converter.patch 0002-btrfsctl-add-snapshot-subvolume-destroy-ioctl.patch 0003-btrfsck-check-root-back-forward-references.patch 0004-Add-btrfs-map-logical-program-to-map-and-read-logica.patch 0005-fix-use-after-free.patch btrfs-progs-0.19.tar.bz2 New: ---- btrfs-progs-v0.19-35-g1b444cd.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ btrfsprogs.spec ++++++ --- /var/tmp/diff_new_pack.4pNFJA/_old 2011-03-22 00:03:07.000000000 +0100 +++ /var/tmp/diff_new_pack.4pNFJA/_new 2011-03-22 00:03:07.000000000 +0100 @@ -1,7 +1,7 @@ # -# spec file for package btrfsprogs (Version 0.19) +# spec file for package btrfsprogs # -# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2011 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,35 +20,28 @@ Name: btrfsprogs Url: http://oss.oracle.com/~mason/btrfs/ Version: 0.19 -Release: 9 +Release: 17.<RELEASE18> +%define tar_version v0.19-35-g1b444cd Summary: Btrfs File System Utilities License: GNU General Public License (GPL) Group: System/Filesystems Supplements: filesystem(btrfs) -Source: http://ftp.kernel.org/pub/linux/kernel/people/mason/btrfs/btrfs-progs-%{ver… +Source: btrfs-progs-%{tar_version}.tar.bz2 Patch0: memleak-fix.diff -Patch1: 0001-used-space-accounting-fix-for-the-converter.patch -Patch2: 0002-btrfsctl-add-snapshot-subvolume-destroy-ioctl.patch -Patch3: 0003-btrfsck-check-root-back-forward-references.patch -Patch4: 0004-Add-btrfs-map-logical-program-to-map-and-read-logica.patch -Patch5: 0001-Plug-Memory-leak-in-find_and_setup_log_root.patch -Patch6: 0005-fix-use-after-free.patch +Patch1: 0001-Plug-Memory-leak-in-find_and_setup_log_root.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: libacl-devel libext2fs-devel libuuid-devel zlib-devel +# for /bin/true +Requires: coreutils %description -This package contains utilities for creating, checking, and debugging btrfs -file systems. +This package contains utilities for creating, checking, and +debugging btrfs file systems. %prep -%setup -q -n btrfs-progs-%{version} +%setup -q -n btrfs-progs-%{tar_version} %patch0 %patch1 -p1 -%patch2 -p1 -%patch3 -p1 -%patch4 -p1 -%patch5 -p1 -%patch6 -p1 %build make %{?jobs:-j%jobs} CFLAGS="%{optflags}" all convert @@ -57,9 +50,11 @@ make install DESTDIR=${RPM_BUILD_ROOT} prefix=%{_prefix} bindir=/sbin mandir=%{_mandir} # command line options are not compatible (bnc#599224) #ln ${RPM_BUILD_ROOT}/sbin/btrfsck ${RPM_BUILD_ROOT}/sbin/fsck.btrfs +ln /bin/true ${RPM_BUILD_ROOT}/sbin/fsck.btrfs %files %defattr(-, root, root) +/sbin/btrfs /sbin/btrfs-debug-tree /sbin/btrfs-show /sbin/btrfs-vol @@ -67,13 +62,14 @@ /sbin/btrfsck /sbin/btrfsctl /sbin/mkfs.btrfs -#/sbin/fsck.btrfs +/sbin/fsck.btrfs /sbin/btrfs-map-logical %_mandir/man8/btrfs-image.8.gz %_mandir/man8/btrfs-show.8.gz %_mandir/man8/btrfsck.8.gz %_mandir/man8/btrfsctl.8.gz %_mandir/man8/mkfs.btrfs.8.gz +%_mandir/man8/btrfs.8.gz %clean rm -rf $RPM_BUILD_ROOT ++++++ 0001-Plug-Memory-leak-in-find_and_setup_log_root.patch ++++++ --- /var/tmp/diff_new_pack.4pNFJA/_old 2011-03-22 00:03:07.000000000 +0100 +++ /var/tmp/diff_new_pack.4pNFJA/_new 2011-03-22 00:03:07.000000000 +0100 @@ -1,33 +1,28 @@ -From 4145e527ba81c288aa081073e1ce68fa0ceb4107 Mon Sep 17 00:00:00 2001 -From: Dirk Mueller <dmueller(a)suse.de> -Date: Fri, 26 Mar 2010 11:25:43 +0100 -Subject: [PATCH] Plug Memory leak in find_and_setup_log_root() +commit a2fe2e1b978f724f53d025461e65adb4e030d043 +Author: Dirk Mueller <dmueller(a)suse.de> +Date: Thu Dec 16 20:40:34 2010 +0100 -The error path forgets to free a previously allocated -memory structure. ---- - disk-io.c | 3 ++- - 1 files changed, 2 insertions(+), 1 deletions(-) + [PATCH] Plug Memory leak in find_and_setup_log_root() + + The error path forgets to free a previously allocated + memory structure. diff --git a/disk-io.c b/disk-io.c -index addebe1..eab3f0b 100644 +index a6e1000..2b5e1d5 100644 --- a/disk-io.c +++ b/disk-io.c -@@ -422,12 +422,13 @@ static int find_and_setup_log_root(struct btrfs_root *tree_root, - struct btrfs_super_block *disk_super) +@@ -423,11 +423,13 @@ static int find_and_setup_log_root(struct btrfs_root *tree_root, { u32 blocksize; -+ struct btrfs_root *log_root; u64 blocknr = btrfs_super_log_root(disk_super); - struct btrfs_root *log_root = malloc(sizeof(struct btrfs_root)); ++ struct btrfs_root *log_root; if (blocknr == 0) return 0; + log_root = malloc(sizeof(struct btrfs_root)); ++ blocksize = btrfs_level_size(tree_root, btrfs_super_log_root_level(disk_super)); --- -1.7.0.2 - ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 MozillaFirefox for openSUSE:11.4
by root＠hilbert.suse.de 21 Mar '11

21 Mar '11

Hello community, here is the log from the commit of package MozillaFirefox for openSUSE:11.4 checked in at Tue Mar 22 00:02:49 CET 2011. -------- --- old-versions/11.4/all/MozillaFirefox/MozillaFirefox.changes 2011-02-23 10:27:44.000000000 +0100 +++ 11.4/MozillaFirefox/MozillaFirefox.changes 2011-03-21 10:47:37.000000000 +0100 @@ -1,0 +2,6 @@ +Fri Mar 18 08:49:15 UTC 2011 - wr(a)rosenauer.org + +- update to version 4.0 (rc2) +- fixed rpm macros delivered with devel package (bnc#679950) + +------------------------------------------------------------------- Package does not exist at destination yet. Using Fallback old-versions/11.4/all/MozillaFirefox Destination is old-versions/11.4/UPDATES/all/MozillaFirefox calling whatdependson for 11.4-i586 Old: ---- firefox-4.0b12-source.tar.bz2 l10n-4.0b12.tar.bz2 New: ---- firefox-4.0.0-source.tar.bz2 l10n-4.0.0.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ MozillaFirefox.spec ++++++ --- /var/tmp/diff_new_pack.yZwmXh/_old 2011-03-22 00:02:35.000000000 +0100 +++ /var/tmp/diff_new_pack.yZwmXh/_new 2011-03-22 00:02:35.000000000 +0100 @@ -31,15 +31,15 @@ BuildRequires: wireless-tools %endif %if 0%{?use_xulrunner} -BuildRequires: %{xulrunner}-devel = 2.0b12 +BuildRequires: %{xulrunner}-devel = 2.0.0 %endif License: GPLv2+ ; LGPLv2.1+ ; MPLv1.1+ -Version: %{mainver}b12 -Release: 1.<RELEASE2> +Version: %{mainver}.0 +Release: 0.<RELEASE2> Provides: web_browser Provides: firefox = %{version}-%{release} Provides: firefox = %{mainver} -%define releasedate 2011022200 +%define releasedate 2011031700 Summary: Mozilla Firefox Web Browser Url: http://www.mozilla.org/ Group: Productivity/Networking/Web/Browsers @@ -137,7 +137,7 @@ %package translations-other Summary: Extra translations for MozillaFirefox License: GPLv2+ ; LGPLv2.1+ ; MPLv1.1+ -Provides: locale(%{name}:af;ak;ast;be;bg;bn_BD;br;bs;cy;el;en_ZA;eo;es_MX;et;eu;fy_NL;ga_IE;gd;gl;gu_IN;he;hi_IN;hr;hy_AM;id;is;kk;kn;ku;lg;lt;lv;mai;mk;ml;mr;nn_NO;nso;or;pa_IN;rm;ro;si;sk;sl;son;sq;sr;ta;ta_LK;te;th;tr;uk;zu) +Provides: locale(%{name}:af;ak;ast;be;bg;bn_BD;br;bs;cy;el;en_ZA;eo;es_MX;et;eu;fa;fy_NL;ga_IE;gd;gl;gu_IN;he;hi_IN;hr;hy_AM;id;is;kk;kn;ku;lg;lt;lv;mai;mk;ml;mr;nn_NO;nso;or;pa_IN;rm;ro;si;sk;sl;son;sq;sr;ta;ta_LK;te;th;tr;uk;zu) Group: System/Localization Requires: %{name} = %{version} Obsoletes: %{name}-translations < %{version}-%{release} @@ -338,10 +338,10 @@ %%firefox_major %{major} %%firefox_version %{version} %%firefox_mainver %{mainver} -%%firefox_mozillapath %{progdir} +%%firefox_mozillapath %%{_libdir}/%{progname} %%firefox_xulrunner %{xulrunner} %%firefox_xulrunner_version %(rpm -q --queryformat '%{VERSION}' %{xulrunner}) -%%firefox_pluginsdir %{_libdir}/browser-plugins +%%firefox_pluginsdir %%{_libdir}/browser-plugins %%firefox_appid \{ec8030f7-c20a-464f-9b0e-13a3a9e97384\} %%firefox_extdir %%(if [ "%%_target_cpu" = "noarch" ]; then echo %%{_datadir}/mozilla/extensions/%%{firefox_appid}; else echo %%{_libdir}/mozilla/extensions/%%{firefox_appid}; fi) ++++++ compare-locales.tar.bz2 ++++++ ++++++ firefox-4.0b12-source.tar.bz2 -> firefox-4.0.0-source.tar.bz2 ++++++ old-versions/11.4/all/MozillaFirefox/firefox-4.0b12-source.tar.bz2 11.4/MozillaFirefox/firefox-4.0.0-source.tar.bz2 differ: char 11, line 1 ++++++ l10n-4.0b12.tar.bz2 -> l10n-4.0.0.tar.bz2 ++++++ old-versions/11.4/all/MozillaFirefox/l10n-4.0b12.tar.bz2 11.4/MozillaFirefox/l10n-4.0.0.tar.bz2 differ: char 11, line 1 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 mozilla-xulrunner20 for openSUSE:11.4
by root＠hilbert.suse.de 21 Mar '11

21 Mar '11

Hello community, here is the log from the commit of package mozilla-xulrunner20 for openSUSE:11.4 checked in at Tue Mar 22 00:02:03 CET 2011. -------- --- old-versions/11.4/all/mozilla-xulrunner20/mozilla-xulrunner20.changes 2011-02-23 10:07:39.000000000 +0100 +++ 11.4/mozilla-xulrunner20/mozilla-xulrunner20.changes 2011-03-21 10:46:06.000000000 +0100 @@ -1,0 +2,10 @@ +Fri Mar 18 08:48:12 UTC 2011 - wr(a)rosenauer.org + +- update to 2.0 (rc2) + * removed upstreamed mozilla-gio-launch-uri.patch + * updated supported locale list +- set useragent buildid to branded Firefox default +- apply mozilla-cairo-lcd.patch for internal cairo to fix + font smoothing in combination with freetype + +------------------------------------------------------------------- Package does not exist at destination yet. Using Fallback old-versions/11.4/all/mozilla-xulrunner20 Destination is old-versions/11.4/UPDATES/all/mozilla-xulrunner20 calling whatdependson for 11.4-i586 Old: ---- l10n-2.0b12.tar.bz2 mozilla-gio-launch-uri.patch xulrunner-source-2.0b12.tar.bz2 New: ---- l10n-2.0.0.tar.bz2 mozilla-cairo-lcd.patch mozilla-gecko-version.patch xulrunner-source-2.0.0.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ mozilla-xulrunner20.spec ++++++ --- /var/tmp/diff_new_pack.nlOpYd/_old 2011-03-22 00:01:43.000000000 +0100 +++ /var/tmp/diff_new_pack.nlOpYd/_new 2011-03-22 00:01:43.000000000 +0100 @@ -30,12 +30,12 @@ BuildRequires: wireless-tools %endif License: GPLv2+ ; LGPLv2.1+ ; MPLv1.1+ -Version: 2.0b12 -Release: 1.<RELEASE2> -%define releasedate 2011022200 -%define version_internal 2.0b12 +Version: 2.0.0 +Release: 0.<RELEASE2> +%define releasedate 2011031700 +%define version_internal 2.0.0 %define apiversion 2.0 -%define uaweight 199900 +%define uaweight 200000 Summary: Mozilla Runtime Environment 2.0 Url: http://www.mozilla.org Group: Productivity/Other @@ -64,17 +64,18 @@ Patch5: mozilla-prefer_plugin_pref.patch Patch6: mozilla-shared-nss-db.patch Patch7: mozilla-kde.patch +Patch8: mozilla-cairo-lcd.patch # PATCH-FEATURE-SLED FATE#302023, FATE#302024 -Patch8: mozilla-gconf-backend.patch -Patch9: gecko-lockdown.patch -Patch10: toolkit-ui-lockdown.patch +Patch9: mozilla-gconf-backend.patch +Patch10: gecko-lockdown.patch +Patch11: toolkit-ui-lockdown.patch # --- -Patch11: mozilla-cpuid.patch -Patch12: mozilla-language.patch -Patch13: mozilla-gio.patch -Patch14: mozilla-cairo-return.patch -Patch15: mozilla-gio-launch-uri.patch +Patch12: mozilla-cpuid.patch +Patch13: mozilla-language.patch +Patch14: mozilla-gio.patch +Patch15: mozilla-cairo-return.patch Patch16: mozilla-ntlm-full-path.patch +Patch17: mozilla-gecko-version.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build Requires: mozilla-js20 = %{version} Requires(post): update-alternatives coreutils @@ -101,7 +102,7 @@ Requires: mozilla-nspr >= %(rpm -q --queryformat '%{VERSION}' mozilla-nspr) %endif %if %has_system_nss -BuildRequires: mozilla-nss-devel >= 3.12.6 +BuildRequires: mozilla-nss-devel >= 3.12.8 Requires: mozilla-nss >= %(rpm -q --queryformat '%{VERSION}' mozilla-nss) %endif Recommends: %{name}-gnome @@ -163,7 +164,7 @@ Summary: Extra translations for XULRunner 2.0 Group: System/Localization Requires: %{name} = %{version} -Provides: locale(%{name}:af;ak;ast;be;bg;bn_BD;br;bs;cy;el;en_ZA;eo;es_MX;et;eu;fy_NL;ga_IE;gd;gl;gu_IN;he;hi_IN;hr;hy_AM;id;is;kk;kn;ku;lg;lt;lv;mai;mk;ml;mr;nn_NO;nso;or;pa_IN;rm;ro;si;sk;sl;son;sq;sr;ta;ta_LK;te;th;tr;uk;zu) +Provides: locale(%{name}:af;ak;ast;be;bg;bn_BD;br;bs;cy;el;en_ZA;eo;es_MX;et;eu;fa;fy_NL;ga_IE;gd;gl;gu_IN;he;hi_IN;hr;hy_AM;id;is;kk;kn;ku;lg;lt;lv;mai;mk;ml;mr;nn_NO;nso;or;pa_IN;rm;ro;si;sk;sl;son;sq;sr;ta;ta_LK;te;th;tr;uk;zu) Obsoletes: %{name}-translations < %{version}-%{release} %description translations-other @@ -182,9 +183,9 @@ Requires(post): coreutils %description gnome -This subpackage contains the Necko Gnome-VFS and Gnome components which -rely on the gnome-vfs subsystem to be installed. They are recommended -for full desktop integration but not mandatory for small disk footprint +This subpackage contains the Gnome components which rely on certain +Gnome subsystems to be installed. They are recommended for full +desktop integration but not mandatory for small disk footprint KDE installations for example. @@ -209,17 +210,18 @@ %patch5 -p1 %patch6 -p1 %patch7 -p1 -#%patch8 -p1 +%patch8 -p1 #%patch9 -p1 #%patch10 -p1 -%if %suse_version < 1120 #%patch11 -p1 +%if %suse_version < 1120 +#%patch12 -p1 %endif -%patch12 -p1 %patch13 -p1 %patch14 -p1 %patch15 -p1 %patch16 -p1 +%patch17 -p1 %build kdehelperversion=$(cat toolkit/xre/nsKDEUtils.cpp | grep '#define KMOZILLAHELPER_VERSION' | cut -d ' ' -f 3) @@ -227,6 +229,9 @@ echo fix kde helper version in the .spec file exit 1 fi +source other-licenses/branding/firefox/configure.sh +unset MOZ_APP_DISPLAYNAME +export MOZ_UA_BUILDID MOZ_APP_DIR=%{_libdir}/xulrunner-%{version_internal} export MOZ_BUILD_DATE=%{releasedate} export CFLAGS="$RPM_OPT_FLAGS -Os -fno-strict-aliasing" ++++++ compare-locales.tar.bz2 ++++++ ++++++ create-tar.sh ++++++ --- /var/tmp/diff_new_pack.nlOpYd/_old 2011-03-22 00:01:43.000000000 +0100 +++ /var/tmp/diff_new_pack.nlOpYd/_new 2011-03-22 00:01:43.000000000 +0100 @@ -1,8 +1,8 @@ #!/bin/bash -BRANCH="mozilla-central" -RELEASE_TAG="FIREFOX_4_0b12_RELEASE" -VERSION="2.0b12" +BRANCH="releases/mozilla-2.0" +RELEASE_TAG="FIREFOX_4_0rc2_RELEASE" +VERSION="2.0.0" # mozilla hg clone http://hg.mozilla.org/$BRANCH mozilla @@ -18,7 +18,7 @@ ja-JP-mac|en-US) ;; *) - hg clone http://hg.mozilla.org/l10n-central/$locale l10n/$locale + hg clone http://hg.mozilla.org/releases/l10n-mozilla-2.0/$locale l10n/$locale [ "$RELEASE_TAG" == "default" ] || hg -R l10n/$locale up -C -r $RELEASE_TAG ;; esac ++++++ l10n-2.0b12.tar.bz2 -> l10n-2.0.0.tar.bz2 ++++++ old-versions/11.4/all/mozilla-xulrunner20/l10n-2.0b12.tar.bz2 11.4/mozilla-xulrunner20/l10n-2.0.0.tar.bz2 differ: char 11, line 1 ++++++ mozilla-cairo-lcd.patch ++++++ ++++ 1333 lines (skipped) ++++++ mozilla-gecko-version.patch ++++++ # HG changeset patch # Parent 7d3dc831fb0c3282bda0e5da3f7965e6422ee294 diff --git a/config/milestone.txt b/config/milestone.txt --- a/config/milestone.txt +++ b/config/milestone.txt @@ -5,9 +5,9 @@ # x.x.x.x # x.x.x+ # # Referenced by milestone.pl. # Hopefully I'll be able to automate replacement of *all* # hardcoded milestones in the tree from these two files. #-------------------------------------------------------- -2.0 +2.0.0 ++++++ mozilla-kde.patch ++++++ --- /var/tmp/diff_new_pack.nlOpYd/_old 2011-03-22 00:01:43.000000000 +0100 +++ /var/tmp/diff_new_pack.nlOpYd/_new 2011-03-22 00:01:43.000000000 +0100 @@ -2945,7 +2945,7 @@ diff --git a/uriloader/exthandler/unix/nsMIMEInfoUnix.cpp b/uriloader/exthandler/unix/nsMIMEInfoUnix.cpp --- a/uriloader/exthandler/unix/nsMIMEInfoUnix.cpp +++ b/uriloader/exthandler/unix/nsMIMEInfoUnix.cpp -@@ -50,28 +50,31 @@ +@@ -50,30 +50,33 @@ #include <QString> #if (MOZ_ENABLE_CONTENTACTION) #include <contentaction/contentaction.h> @@ -2957,6 +2957,8 @@ -#include "nsGNOMERegistry.h" +#include "nsCommonRegistry.h" #include "nsIGIOService.h" + #include "nsNetCID.h" + #include "nsIIOService.h" #include "nsIGnomeVFSService.h" #include "nsAutoPtr.h" #ifdef MOZ_ENABLE_DBUS @@ -2979,7 +2981,7 @@ nsCAutoString spec; aURI->GetAsciiSpec(spec); if (hildon_uri_open(spec.get(), action, nsnull)) -@@ -93,22 +96,22 @@ nsMIMEInfoUnix::LoadUriInternal(nsIURI * +@@ -95,22 +98,22 @@ nsMIMEInfoUnix::LoadUriInternal(nsIURI * return rv; } @@ -3004,7 +3006,7 @@ if (*_retval) return NS_OK; -@@ -151,32 +154,49 @@ nsMIMEInfoUnix::LaunchDefaultWithFile(ns +@@ -153,16 +156,33 @@ nsMIMEInfoUnix::LaunchDefaultWithFile(ns ContentAction::Action::defaultActionForFile(uri, QString(mSchemeOrType.get())); if (action.isValid()) { action.trigger(); @@ -3031,12 +3033,14 @@ + } + nsCOMPtr<nsIGIOService> giovfs = do_GetService(NS_GIOSERVICE_CONTRACTID); - nsCOMPtr<nsIGnomeVFSService> gnomevfs = do_GetService(NS_GNOMEVFSSERVICE_CONTRACTID); + nsCAutoString uriSpec; if (giovfs) { - nsCOMPtr<nsIGIOMimeApp> app; - if (NS_SUCCEEDED(giovfs->GetAppForMimeType(mSchemeOrType, getter_AddRefs(app))) && app) - return app->Launch(nativePath); - } else if (gnomevfs) { + // nsGIOMimeApp->Launch wants a URI string instead of local file + nsresult rv; + nsCOMPtr<nsIIOService> ioservice = do_GetService(NS_IOSERVICE_CONTRACTID, &rv); + NS_ENSURE_SUCCESS(rv, rv); + nsCOMPtr<nsIURI> uri; +@@ -180,17 +200,17 @@ nsMIMEInfoUnix::LaunchDefaultWithFile(ns /* Fallback to GnomeVFS */ nsCOMPtr<nsIGnomeVFSMimeApp> app; if (NS_SUCCEEDED(gnomevfs->GetAppForMimeType(mSchemeOrType, getter_AddRefs(app))) && app) @@ -3053,7 +3057,7 @@ if (giovfs) { nsCOMPtr<nsIGIOMimeApp> app; if (NS_SUCCEEDED(giovfs->GetAppForMimeType(type, getter_AddRefs(app))) && app) - return app->Launch(nativePath); + return app->Launch(uriSpec); } else if (gnomevfs) { diff --git a/uriloader/exthandler/unix/nsOSHelperAppService.cpp b/uriloader/exthandler/unix/nsOSHelperAppService.cpp --- a/uriloader/exthandler/unix/nsOSHelperAppService.cpp ++++++ xulrunner-source-2.0b12.tar.bz2 -> xulrunner-source-2.0.0.tar.bz2 ++++++ old-versions/11.4/all/mozilla-xulrunner20/xulrunner-source-2.0b12.tar.bz2 11.4/mozilla-xulrunner20/xulrunner-source-2.0.0.tar.bz2 differ: char 11, line 1 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 libzip1 for openSUSE:11.3
by root＠hilbert.suse.de 21 Mar '11

21 Mar '11

Hello community, here is the log from the commit of package libzip1 for openSUSE:11.3 checked in at Tue Mar 22 00:00:28 CET 2011. -------- --- old-versions/11.3/all/libzip1/libzip1.changes 2008-07-27 06:26:56.000000000 +0200 +++ 11.3/libzip1/libzip1.changes 2011-03-21 10:45:26.000000000 +0100 @@ -1,0 +2,5 @@ +Mon Mar 21 09:45:22 UTC 2011 - mvyskocil(a)suse.cz + +- fix bnc#681193 - VUL-0: libzip NULL deref (CVE-2011-0421) + +------------------------------------------------------------------- Package does not exist at destination yet. Using Fallback old-versions/11.3/all/libzip1 Destination is old-versions/11.3/UPDATES/all/libzip1 calling whatdependson for 11.3-i586 New: ---- libzip-0.9-CVE-2011-0421.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libzip1.spec ++++++ --- /var/tmp/diff_new_pack.3Wjl2n/_old 2011-03-22 00:00:23.000000000 +0100 +++ /var/tmp/diff_new_pack.3Wjl2n/_new 2011-03-22 00:00:23.000000000 +0100 @@ -1,7 +1,7 @@ # -# spec file for package libzip1 (Version 0.9) +# spec file for package libzip1 # -# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2011 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 @@ -22,14 +22,15 @@ Name: libzip1 Version: 0.9 -Release: 22 -License: BSD 3-Clause +Release: 27.<RELEASE2> +License: BSD3c Group: Development/Libraries/C and C++ Source0: http://www.nih.at/libzip/%{pkg_name}-%{version}.tar.bz2 Url: http://www.nih.at/libzip BuildRequires: zlib-devel BuildRoot: %{_tmppath}/%{name}-%{version}-build Patch0: libzip-0.8.hg20080403-visibility.patch +Patch1: libzip-0.9-CVE-2011-0421.patch %description libzip is a C library for reading, creating, and modifying zip @@ -46,7 +47,7 @@ Thomas Klausner <tk(a)giga.or.at> %package -n libzip-util -License: BSD 3-Clause +License: BSD3c Summary: C library for reading, creating, and modifying zip archives Group: Development/Libraries/C and C++ @@ -65,7 +66,7 @@ Thomas Klausner <tk(a)giga.or.at> %package -n libzip-devel -License: BSD 3-Clause +License: BSD3c Summary: C library for reading, creating, and modifying zip archives Group: Development/Libraries/C and C++ Requires: libzip1 = %{version} glibc-devel @@ -87,6 +88,7 @@ %prep %setup -q -n %{pkg_name}-%{version} %patch0 -p1 +%patch1 -p1 %build autoreconf -fiv ++++++ libzip-0.9-CVE-2011-0421.patch ++++++ Index: libzip-0.9/lib/zip_name_locate.c =================================================================== --- libzip-0.9/lib/zip_name_locate.c 2007-11-07 14:33:45.000000000 +0100 +++ libzip-0.9/lib/zip_name_locate.c 2011-03-21 10:36:21.149985060 +0100 @@ -59,6 +59,10 @@ _zip_error_set(error, ZIP_ER_INVAL, 0); return -1; } + + if((flags & ZIP_FL_UNCHANGED) && !za->cdir) { + return -1; + } cmp = (flags & ZIP_FL_NOCASE) ? strcasecmp : strcmp; ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 libzip1 for openSUSE:11.2
by root＠hilbert.suse.de 21 Mar '11

21 Mar '11

Hello community, here is the log from the commit of package libzip1 for openSUSE:11.2 checked in at Mon Mar 21 23:58:14 CET 2011. -------- --- old-versions/11.2/all/libzip1/libzip1.changes 2008-07-27 06:26:56.000000000 +0200 +++ 11.2/libzip1/libzip1.changes 2011-03-21 10:44:37.000000000 +0100 @@ -1,0 +2,5 @@ +Mon Mar 21 09:44:29 UTC 2011 - mvyskocil(a)suse.cz + +- fix bnc#681193 - VUL-0: libzip NULL deref (CVE-2011-0421) + +------------------------------------------------------------------- Package does not exist at destination yet. Using Fallback old-versions/11.2/all/libzip1 Destination is old-versions/11.2/UPDATES/all/libzip1 calling whatdependson for 11.2-i586 New: ---- libzip-0.9-CVE-2011-0421.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libzip1.spec ++++++ --- /var/tmp/diff_new_pack.m2cikA/_old 2011-03-21 23:57:36.000000000 +0100 +++ /var/tmp/diff_new_pack.m2cikA/_new 2011-03-21 23:57:36.000000000 +0100 @@ -1,7 +1,7 @@ # -# spec file for package libzip1 (Version 0.9) +# spec file for package libzip1 # -# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2011 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 @@ -22,14 +22,15 @@ Name: libzip1 Version: 0.9 -Release: 22 -License: BSD 3-Clause +Release: 23.<RELEASE4> +License: BSD3c Group: Development/Libraries/C and C++ Source0: http://www.nih.at/libzip/%{pkg_name}-%{version}.tar.bz2 Url: http://www.nih.at/libzip BuildRequires: zlib-devel BuildRoot: %{_tmppath}/%{name}-%{version}-build Patch0: libzip-0.8.hg20080403-visibility.patch +Patch1: libzip-0.9-CVE-2011-0421.patch %description libzip is a C library for reading, creating, and modifying zip @@ -46,7 +47,7 @@ Thomas Klausner <tk(a)giga.or.at> %package -n libzip-util -License: BSD 3-Clause +License: BSD3c Summary: C library for reading, creating, and modifying zip archives Group: Development/Libraries/C and C++ @@ -65,7 +66,7 @@ Thomas Klausner <tk(a)giga.or.at> %package -n libzip-devel -License: BSD 3-Clause +License: BSD3c Summary: C library for reading, creating, and modifying zip archives Group: Development/Libraries/C and C++ Requires: libzip1 = %{version} glibc-devel @@ -87,6 +88,7 @@ %prep %setup -q -n %{pkg_name}-%{version} %patch0 -p1 +%patch1 -p1 %build autoreconf -fiv ++++++ libzip-0.9-CVE-2011-0421.patch ++++++ Index: libzip-0.9/lib/zip_name_locate.c =================================================================== --- libzip-0.9/lib/zip_name_locate.c 2007-11-07 14:33:45.000000000 +0100 +++ libzip-0.9/lib/zip_name_locate.c 2011-03-21 10:36:21.149985060 +0100 @@ -59,6 +59,10 @@ _zip_error_set(error, ZIP_ER_INVAL, 0); return -1; } + + if((flags & ZIP_FL_UNCHANGED) && !za->cdir) { + return -1; + } cmp = (flags & ZIP_FL_NOCASE) ? strcasecmp : strcmp; ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 aaa_base for openSUSE:Factory
by root＠hilbert.suse.de 21 Mar '11

21 Mar '11

Hello community, here is the log from the commit of package aaa_base for openSUSE:Factory checked in at Mon Mar 21 15:41:25 CET 2011. -------- --- aaa_base/aaa_base.changes 2011-03-17 17:22:10.000000000 +0100 +++ aaa_base/aaa_base.changes 2011-03-21 14:05:41.000000000 +0100 @@ -1,0 +2,7 @@ +Mon Mar 21 13:58:08 CET 2011 - werner(a)suse.de + +- Avoid waiting on bind mounts in boot.localfs +- Be aware in refresh_initrd that modules used in initrd may use + options in the /etc/modprobe.d/ files + +------------------------------------------------------------------- calling whatdependson for head-i586 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ aaa_base.spec ++++++ --- /var/tmp/diff_new_pack.qAhp2z/_old 2011-03-21 15:40:08.000000000 +0100 +++ /var/tmp/diff_new_pack.qAhp2z/_new 2011-03-21 15:40:08.000000000 +0100 @@ -21,7 +21,7 @@ Name: aaa_base Version: 11.5 -Release: 3 +Release: 4 License: GPLv2+ Group: System/Fhs Url: http://gitorious.org/opensuse/aaa_base ++++++ aaa_base.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/aaa_base/files/etc/init.d/boot.localfs new/aaa_base/files/etc/init.d/boot.localfs --- old/aaa_base/files/etc/init.d/boot.localfs 2011-03-17 17:21:01.000000000 +0100 +++ new/aaa_base/files/etc/init.d/boot.localfs 2011-03-21 15:04:56.000000000 +0100 @@ -61,7 +61,7 @@ list_missed () { local dev line - local mount_opts="-t no${tmpfs//,/,no},$nofs -O no_netdev -O nonofail" + local mount_opts="-t no${tmpfs//,/,no},$nofs,nonone -O no_netdev -O nonofail" mount -afnv $mount_opts 2> /dev/null | while read line ; do dev="${line%% *}" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/aaa_base/files/sbin/refresh_initrd new/aaa_base/files/sbin/refresh_initrd --- old/aaa_base/files/sbin/refresh_initrd 2011-03-17 17:21:01.000000000 +0100 +++ new/aaa_base/files/sbin/refresh_initrd 2011-03-21 15:04:56.000000000 +0100 @@ -6,12 +6,29 @@ # # Author: Werner Fink <werner(a)suse.de> # +initrd=$(readlink /boot/initrd) +test -n "$initrd" || exit 0 +modules=lib/modules/${initrd#initrd-} refresh=no -test /etc/sysconfig/clock -nt /boot/initrd && refresh=yes -test /etc/sysconfig/kernel -nt /boot/initrd && refresh=yes +test /etc/sysconfig/clock -nt $initrd && refresh=yes +test /etc/sysconfig/kernel -nt $initrd && refresh=yes + +while read module ; do + module=${module##*/} + module=${module%.ko} + modconfs=$(grep -lE "[[:blank:]]$module[[:blank:]]" /etc/modprobe.d/*) + for modconf in $modconfs; do + test $modconf -nt $initrd && refresh=yes + break 2 + done +done < <(lsinitrd /boot/initrd | grep -E "$modules/.*\.ko") +unset modules module modconfs modconf + test "$refresh" = yes || exit 0 +modprobe dm_mod --quiet &> /dev/null || true + line=on test -e /proc/splash && read line < /proc/splash line=${line##*: } ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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

drop ksmolt from openSUSE:Factory
by root＠hilbert.suse.de 21 Mar '11

21 Mar '11

Hello community, FYI: Package ksmolt was dropped from openSUSE:Factory at Mon Mar 21 15:41:09 CET 2011. You can find the latest sources of the package in the openSUSE:Dropped repository: https://build.opensuse.org/package/show?project=openSUSE:Dropped&package=ks… 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 pdftk for openSUSE:Factory
by root＠hilbert.suse.de 21 Mar '11

21 Mar '11

Hello community, here is the log from the commit of package pdftk for openSUSE:Factory checked in at Mon Mar 21 15:37:55 CET 2011. -------- --- pdftk/pdftk.changes 2011-03-08 17:13:35.000000000 +0100 +++ /mounts/work_src_done/STABLE/pdftk/pdftk.changes 2011-03-17 23:44:38.000000000 +0100 @@ -1,0 +2,17 @@ +Thu Mar 17 22:17:27 UTC 2011 - brian(a)aljex.com + +- created new spec and makefile that builds on a wide range of SUSE versions (at least 10.0 to current) +- use the native/highest version of gcc/gcj on each version of SUSE, not forcing gcj41 +- removed unnecessary dos2unix +- use rpm macros where possible +- created Makefile.SUSE + allow for inconsistent names of executables and libgcj.jar + allow rpm to supply %%optflags + remove unrecognized -Wextra + fastjar has no suffix on any version of SUSE + un-hardcode "/usr/share/java", get from rpm macro(s) instead. + allow using "make -f Makefile.SUSE VERSUFF=-4.5", so Makefile.SUSE + can also be used manually following the same directions found in the source + for the other makefiles. + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- pdftk-1.44.tar.bz2 pdftk-fastjar_no_versuff.patch New: ---- Makefile.SUSE pdftk-1.44-src.zip ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ pdftk.spec ++++++ --- /var/tmp/diff_new_pack.3iQLJr/_old 2011-03-21 15:32:28.000000000 +0100 +++ /var/tmp/diff_new_pack.3iQLJr/_new 2011-03-21 15:32:28.000000000 +0100 @@ -19,29 +19,63 @@ Name: pdftk Version: 1.44 -Release: 1 +Release: 2 License: GPLv2+ Summary: A handy tool for manipulating PDF Url: http://www.pdflabs.com/ Group: Productivity/Publishing/PDF -Source0: pdftk-%{version}.tar.bz2 -Patch0: pdftk-fastjar_no_versuff.patch -Patch1: bug-427046_pdftk.cc.patch +Source0: %{name}-%{version}-src.zip +Source1: Makefile.SUSE +Patch0: bug-427046_pdftk.cc.patch +AutoReqProv: on +BuildRoot: %{_tmppath}/%{name}-%{version}-build +BuildRequires: unzip + +# BuildRequires package version suffix : "41" for "gcc41-java" +%define pkgv %nil +# gcc/gcj binaries version suffix : "-4.1" for "gcj-4.1" +%define gxxv %nil +# ligcj.jar version suffix : "-4.1" for "/usr/share/java/libgcj-4.1.jar" +%define jarv %nil + %if 0%{?suse_version} >= 1130 -BuildRequires: gcc45 -BuildRequires: gcc45-c++ -BuildRequires: gcc45-java -BuildRequires: libstdc++45-devel -%else -BuildRequires: gcc41 -BuildRequires: gcc41-c++ -BuildRequires: gcc41-java -BuildRequires: libstdc++41-devel +%define jarv -4.5 +%endif + +%if 0%{?suse_version} <= 1120 +%define jarv -4.4 +%endif + +%if 0%{?suse_version} <= 1110 +%define jarv -4.3 +%endif + +# openSUSE 11.0 and SLE_11 are odd cases. +# %jarv is still correct from above for both +%if 0%{?suse_version} == 1100 || 0%{?sles_version} == 11 +# "Nothing provides libgcj" +%define pkgv 43 +# "gcj command not found", "gcjh command not found" +%define gxxv -4.3 +%endif + +%if 0%{?suse_version} == 1020 +%define jarv -4.1.2 %endif -BuildRequires: dos2unix + +%if 0%{?suse_version} == 1010 +%define jarv -4.1.0 +%endif + +%if 0%{?suse_version} == 1000 +%define jarv -4.0.2 +%endif + +BuildRequires: gcc%{pkgv}-c++ gcc%{pkgv}-java libgcj%{pkgv} libgcj%{pkgv}-devel + +%if 0%{?suse_version} > 1010 || 0%{?sles_version} == 10 BuildRequires: fastjar -BuildRequires: unzip -BuildRoot: %{_tmppath}/%{name}-%{version}-build +%endif %description If PDF is electronic paper, then pdftk is an electronic staple-remover, @@ -66,34 +100,26 @@ * Repair Corrupted PDF (Where Possible) %prep -%setup -q -%patch0 -%patch1 -p1 +%setup -q -n %{name}-%{version}-dist +%patch0 -p1 +%__cp %{S:1} pdftk/Makefile +%__sed -i 's/\r$//' changelog.txt license_gpl_pdftk/*.txt license_gpl_pdftk/*/*.txt %build -%{suse_update_config -fl} -%if 0%{?suse_version} >= 1130 -VERSUFF=-4.5 -%else -VERSUFF=-4.1 -%endif -unset CLASSPATH && cd pdftk && make -f Makefile.Redhat VERSUFF=$VERSUFF && cd - -dos2unix -f changelog.txt pdftk.1.txt license_gpl_pdftk/*.txt +%__make -C pdftk CXXFLAGS="%optflags" LIBGCJ=%{_javadir}/libgcj%{jarv}.jar GXXV=%gxxv +%__strip pdftk/%name %install -mkdir -p %{buildroot}%{_bindir} -mkdir -p %{buildroot}%{_mandir}/man1 -install -m 0755 pdftk/pdftk %{buildroot}%{_bindir}/pdftk -install -m 0644 pdftk.1 %{buildroot}%{_mandir}/man1/pdftk.1 -gzip %{buildroot}%{_mandir}/man1/pdftk.1 +%__install -Dm 0755 pdftk/%name %{buildroot}%{_bindir}/%name +%__install -Dpm 0644 %{name}.1 %{buildroot}%{_mandir}/man1/%{name}.1 %clean -rm -rf %{buildroot} +%__rm -rf %buildroot %files %defattr(-,root,root) -%{_bindir}/* -%{_mandir}/man1/* -%doc changelog.txt pdftk.1.html pdftk.1.txt license_gpl_pdftk/*.txt +%{_bindir}/%name +%{_mandir}/man1/%{name}.* +%doc changelog.txt license_gpl_pdftk/*.txt license_gpl_pdftk/*/*.txt %changelog ++++++ Makefile.SUSE ++++++ # -*- Mode: Makefile -*- # Makefile.SUSE # Makefile for pdftk 1.44 on SUSE # brian(a)aljex.com # fastjar never has a suffix # libgcj suffix sometimes does not match g* binaries suffix # g* binaries sometimes must not have any suffix # un-hardcode /usr/share/java, see %_javadir in /usr/lib/rpm/macros # remove unrecognized "-Wextra" from *FLAGS # allow rpm to set CXXFLAGS from %optflags or %configure # allow GJAR to be overridden, ex: gjar-4.5 instead of fastjar etc # Backwards compatibility with generic pdftk build directions. # .spec file does not use VERSUFF, and it's not technically correct # for the older versions, although it works anyways. # It works on the new versions because the suffix in libgcj*.jar # and on g++/gcj/gcjh is the same. # It works on the old versions only because they happen to use gcjh 4.1 # or lower, which does not need libgcj*.jar in --classpath, and so you # can just set VERSUFF to match the executables (empty in all those cases), # and ignore the fact that this will set LIBGCJ wrong. # This allows the Makefile to be included in the upstream pdftk source, # and the generic manual build instructions should work for most versions of openSUSE. # The .spec however sets GXXV, JARV, _JAVADIR, and/or LIBGCJ explicitly as needed. # Here are the correct values to use for several versions of openSUSE: # 10.0 : make -f Makefile.SUSE # 10.1 : make -f Makefile.SUSE # 10.2 : make -f Makefile.SUSE # 10.3 : make -f Makefile.SUSE VERSUFF=-4.3 # 11.0 : make -f Makefile.SUSE VERSUFF=-4.3 # 11.1 : make -f Makefile.SUSE VERSUFF=-4.3 # 11.2 : make -f Makefile.SUSE VERSUFF=-4.4 # 11.3 : make -f Makefile.SUSE VERSUFF=-4.5 # 11.4 : make -f Makefile.SUSE VERSUFF=-4.5 ifdef VERSUFF GXXV := $(VERSUFF) export JARV := $(VERSUFF) endif export CXX := g++$(GXXV) export GCJ := gcj$(GXXV) export GCJH := gcjh$(GXXV) export GJAR ?= fastjar export AR = ar export RM = rm export ARFLAGS = rs export RMFLAGS = -vf # Allow .spec to supply "/usr/share/java" from rpm macro. # ( %_javadir = %{_datadir}/java ;%_datadir = %{_prefix}/share ;%_prefix = /usr ) export _JAVADIR ?= /usr/share/java # Allow .spec to supply entire path/filename for libgcj.jar export LIBGCJ ?= $(_JAVADIR)/libgcj$(JARV).jar # Allow .spec to supply CXXFLAGS from rpm macro (%optflags or %configure) export CXXFLAGS ?= -Wall -O2 export GCJFLAGS ?= -Wall -O2 export CPPFLAGS = -DPATH_DELIM=0x2f -DASK_ABOUT_WARNINGS=false -DUNBLOCK_SIGNALS -fdollars-in-identifiers export GCJHFLAGS = -force export LDLIBS = -lgcj include Makefile.Base ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 arpwatch-ethercodes for openSUSE:Factory
by root＠hilbert.suse.de 21 Mar '11

21 Mar '11

Hello community, here is the log from the commit of package arpwatch-ethercodes for openSUSE:Factory checked in at Mon Mar 21 15:36:38 CET 2011. -------- --- AUTO/all/arpwatch-ethercodes/arpwatch-ethercodes.changes 2011-03-18 07:40:07.000000000 +0100 +++ arpwatch-ethercodes/arpwatch-ethercodes.changes 2011-03-19 05:40:10.000000000 +0100 @@ -2 +2 @@ -Fri Mar 18 07:40:07 CET 2011 - autobuild(a)suse.de +Sat Mar 19 05:40:10 CET 2011 - autobuild(a)suse.de @@ -4 +4 @@ -- automated update on 2011-03-18 +- automated update on 2011-03-19 calling whatdependson for head-i586 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ arpwatch-ethercodes.spec ++++++ --- /var/tmp/diff_new_pack.CiEG7n/_old 2011-03-21 15:36:31.000000000 +0100 +++ /var/tmp/diff_new_pack.CiEG7n/_new 2011-03-21 15:36:31.000000000 +0100 @@ -25,7 +25,7 @@ Group: Productivity/Networking/Diagnostic AutoReqProv: on Summary: Ethercodes Data for arpwatch -Version: 2011.3.18 +Version: 2011.3.19 Release: 1 Source: http://standards.ieee.org/regauth/oui/oui.txt.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-build ++++++ oui.txt.bz2 ++++++ --- /var/tmp/diff_new_pack.CiEG7n/_old 2011-03-21 15:36:31.000000000 +0100 +++ /var/tmp/diff_new_pack.CiEG7n/_new 2011-03-21 15:36:31.000000000 +0100 @@ -7922,8 +7922,8 @@ TAIWAN 231 TAIWAN 231 R.O.C. TAIWAN, REPUBLIC OF CHINA -00-04-BD (hex) Motorola BCS -0004BD (base 16) Motorola BCS +00-04-BD (hex) Motorola Mobility, Inc. +0004BD (base 16) Motorola Mobility, Inc. 6450 Sequence Drive San Diego CA 92121 UNITED STATES @@ -13340,8 +13340,8 @@ Tokyo 198-8710 JAPAN -00-08-0E (hex) Motorola, BCS -00080E (base 16) Motorola, BCS +00-08-0E (hex) Motorola Mobility, Inc. +00080E (base 16) Motorola Mobility, Inc. 6450 Sequence Dr. San Diego CA 92121 UNITED STATES @@ -17960,8 +17960,8 @@ SCORESBY VIC 3179 AUSTRALIA -00-0B-06 (hex) Motorola BCS -000B06 (base 16) Motorola BCS +00-0B-06 (hex) Motorola Mobility, Inc. +000B06 (base 16) Motorola Mobility, Inc. 6450 Sequence Drive San Diego CA 92121 UNITED STATES @@ -20973,8 +20973,8 @@ Clackamas OR 97015 UNITED STATES -00-0C-E5 (hex) Motorola BCS -000CE5 (base 16) Motorola BCS +00-0C-E5 (hex) Motorola Mobility, Inc. +000CE5 (base 16) Motorola Mobility, Inc. 6450 Sequence Drive San Diego CA 92121 UNITED STATES @@ -23325,8 +23325,8 @@ Jacksonville FL 32246 UNITED STATES -00-0E-5C (hex) Motorola BCS -000E5C (base 16) Motorola BCS +00-0E-5C (hex) Motorola Mobility, Inc. +000E5C (base 16) Motorola Mobility, Inc. 6450 Sequence Drive San Diego CA 92121 UNITED STATES @@ -82096,6 +82096,9 @@ 11-00-AA (hex) PRIVATE 1100AA (base 16) +14-07-08 (hex) PRIVATE +140708 (base 16) + 14-07-E0 (hex) Abrantix AG 1407E0 (base 16) Abrantix AG Foerrlibuckstrasse 66 @@ -87478,6 +87481,13 @@ Paderborn NRW 33100 GERMANY +80-64-59 (hex) Nimbus Inc. +806459 (base 16) Nimbus Inc. + 1359 Gwanpyeong-dong, Yuseong-gu + Suite 619 Hanshin S meca + Daejeon 305-509 + KOREA, REPUBLIC OF + 80-65-E9 (hex) BenQ Corporation 8065E9 (base 16) BenQ Corporation 16 Jihu Road, Neihu @@ -87905,6 +87915,12 @@ Kyoto 601-8468 JAPAN +8C-11-CB (hex) ABUS Security-Center GmbH & Co. KG +8C11CB (base 16) ABUS Security-Center GmbH & Co. KG + Linker Kreuthweg 5 + Affing / Muehlhausen Bavaria 86444 + GERMANY + 8C-1F-94 (hex) RF Surgical System Inc. 8C1F94 (base 16) RF Surgical System Inc. 9740 Appaloosa Road @@ -89112,6 +89128,12 @@ Matsuyama city Ehime prefecture 790-0044 JAPAN +A4-5A-1C (hex) smart-electronic GmbH +A45A1C (base 16) smart-electronic GmbH + Industriestrasse 29 + St. Georgen Baden-Wuerttemberg 78122 + GERMANY + A4-5C-27 (hex) Nintendo Co., Ltd. A45C27 (base 16) Nintendo Co., Ltd. 11-1 HOKOTATE-CHO @@ -91500,7 +91522,7 @@ D4-2C-3D (hex) Sky Light Digital Limited D42C3D (base 16) Sky Light Digital Limited Rm. 1009 Kwong Sang Hong Centre, 151-153 Hoi Bun Road, Kwun Tong, Kowloon, - Hong Kong Guang Dong 999077 + Hong Kong 999077 CHINA D4-3D-67 (hex) Carma Industries Inc. ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 libreoffice-extensions for openSUSE:Factory
by root＠hilbert.suse.de 21 Mar '11

21 Mar '11

Hello community, here is the log from the commit of package libreoffice-extensions for openSUSE:Factory checked in at Mon Mar 21 15:36:17 CET 2011. -------- --- libreoffice-extensions/libreoffice-extensions.changes 2011-02-23 16:06:53.000000000 +0100 +++ libreoffice-extensions/libreoffice-extensions.changes 2011-03-18 18:59:37.000000000 +0100 @@ -1,0 +2,15 @@ +Fri Mar 18 16:40:02 CET 2011 - pmladek(a)suse.cz + +- updated to libreoffice-3.3.2.2 (3.3.2-rc2) + +------------------------------------------------------------------- +Wed Mar 16 16:45:15 UTC 2011 - neptunia(a)mail.ru + +- enabled KDE3 support (bnc#678998) + +------------------------------------------------------------------- +Wed Mar 9 17:42:27 CET 2011 - pmladek(a)suse.cz + +- updated to libreoffice-3.3.2.1 (3.3.2-rc1) + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- libreoffice-extensions-3.3.1.2.tar.bz2 New: ---- libreoffice-extensions-3.3.2.2.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libreoffice-extensions.spec ++++++ --- /var/tmp/diff_new_pack.RlS4pX/_old 2011-03-21 15:35:37.000000000 +0100 +++ /var/tmp/diff_new_pack.RlS4pX/_new 2011-03-21 15:35:37.000000000 +0100 @@ -19,11 +19,11 @@ Name: libreoffice-extensions -Version: 3.3.1.2 -Release: 2 +Version: 3.3.2.2 +Release: 1 %define piece extensions -%define ooo_build_version 3.3.1.2 -%define ooo_piece_version 3.3.1.2 +%define ooo_build_version 3.3.2.2 +%define ooo_piece_version 3.3.2.2 %define ooo_sourcedirname libreoffice-build-%ooo_piece_version %define ooo_prefix %_libdir %define ooo_home libreoffice @@ -46,7 +46,7 @@ BuildRequires: libreoffice-filters-devel = %version ############################ # KDE3 stuff -%if 0%{?suse_version} && 0%{?suse_version} <= 1110 +%if 0%{?suse_version} BuildRequires: kdelibs3-devel %endif ############################ ++++++ libreoffice-extensions-3.3.1.2.tar.bz2 -> libreoffice-extensions-3.3.2.2.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libreoffice-extensions-3.3.1.2/ChangeLog new/libreoffice-extensions-3.3.2.2/ChangeLog --- old/libreoffice-extensions-3.3.1.2/ChangeLog 2011-02-15 20:12:44.000000000 +0100 +++ new/libreoffice-extensions-3.3.2.2/ChangeLog 2011-03-15 17:53:49.000000000 +0100 @@ -1,34 +1,44 @@ -2011-02-15 Petr Mladek <pmladek(a)suse.cz> [235894b47fd353b1fd229afe2b3299029465a941] +2011-03-15 Petr Mladek <pmladek(a)suse.cz> [9aefb334af6d118177b8882ea5cbada7dcdebbec] -Version 3.3.1.2, tag libreoffice-3.3.1.2 (3.3.1-rc2) +Version 3.3.2.2, tag libreoffice-3.3.2.2 (3.3.2-rc2) -2011-02-12 Andras Timar <timar(a)fsf.hu> [14cfabedd4234b426ca7adab23709bc86c1feacb] +2011-03-08 Petr Mladek <pmladek(a)suse.cz> [3a094cef5f2b024c17f31c970662513ee0571a63] -l10n: typo fix in Dutch (nl) nlpsolver translation +Branch libreoffice-3-3-2 +This is 'libreoffice-3-3-2' - the stable branch for the 3.3.2 release. +Only very safe changes, reviewed by three people are allowed. -2011-02-08 Petr Mladek <pmladek(a)suse.cz> [a9475f3ee585c2d8667a8823f46cb04a96da84b5] +If you want to commit more complicated fix for the next 3.3.x release, +please use the 'libreoffice-3-3' branch. -Version 3.3.1.1, tag libreoffice-3.3.1.1 (3.3.1-rc1) +If you want to build something cool, unstable, and risky, use master. +2011-03-08 Petr Mladek <pmladek(a)suse.cz> [c1dd3ce52a040abfcb47d1514669b90232b53a9e] -2011-02-08 Andras Timar <timar(a)fsf.hu> [215bfd8724f8ebc7bdcd7c589dcd3ee2fc3cdef2] +Version 3.3.2.1, tag libreoffice-3.3.2.1 (3.3.2-rc1) -Added/modified NLPsolver translations from Pootle +2011-03-06 Andras Timar <timar(a)fsf.hu> [757a1bf6fec44991a620598dfa81810880019ad3] -2011-02-07 Jan Holesovsky <kendy(a)suse.cz> [740c46dbb713dcc3b4a07d69ccf7ff7a634cce24] +l10n: Updated translations from Pootle -Branch libreoffice-3-3-1 -This is 'libreoffice-3-3-1' - the stable branch for the 3.3.1 release. -Only very safe changes, reviewed by three people are allowed. +2011-02-13 Andras Timar <timar(a)fsf.hu> [e66669ef6836a5dfc48bcdd765078b55c998188e] -If you want to commit more complicated fix for the next 3.3.x release, -please use the 'libreoffice-3-3' branch. +l10n: don't extract strings from localized NLPSolver properties + + +2011-02-12 Andras Timar <timar(a)fsf.hu> [8da80b0c24eb81bdc36e92400ad3dda982fd6c1d] + +l10n: typo fix in Dutch (nl) nlpsolver translation + + +2011-02-07 Andras Timar <timar(a)fsf.hu> [2e2455211219b734eb6aacd3f3ce6ad0af9a632e] + +Added/modified NLPsolver translations from Pootle -If you want to build something cool, unstable, and risky, use master. 2011-01-12 Rene Engelhard <rene(a)debian.org> [6e673b3b275a5008c654c4bbfb41709d30cd62af] diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libreoffice-extensions-3.3.1.2/nlpsolver/locale/NLPSolverCommon_ast.properties new/libreoffice-extensions-3.3.2.2/nlpsolver/locale/NLPSolverCommon_ast.properties --- old/libreoffice-extensions-3.3.1.2/nlpsolver/locale/NLPSolverCommon_ast.properties 2011-02-14 15:41:53.000000000 +0100 +++ new/libreoffice-extensions-3.3.2.2/nlpsolver/locale/NLPSolverCommon_ast.properties 2011-03-08 20:12:46.000000000 +0100 @@ -1,3 +1,4 @@ +# x-no-translate #BaseNLPSolver NLPSolverCommon.Properties.AssumeNonNegative=Asumir variables non-negatives #BaseEvolutionarySolver diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libreoffice-extensions-3.3.1.2/nlpsolver/locale/NLPSolverCommon_ca.properties new/libreoffice-extensions-3.3.2.2/nlpsolver/locale/NLPSolverCommon_ca.properties --- old/libreoffice-extensions-3.3.1.2/nlpsolver/locale/NLPSolverCommon_ca.properties 2011-02-14 15:41:53.000000000 +0100 +++ new/libreoffice-extensions-3.3.2.2/nlpsolver/locale/NLPSolverCommon_ca.properties 2011-03-08 20:12:46.000000000 +0100 @@ -1,3 +1,4 @@ +# x-no-translate #BaseNLPSolver NLPSolverCommon.Properties.AssumeNonNegative=Assumeix variables no negatives #BaseEvolutionarySolver diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libreoffice-extensions-3.3.1.2/nlpsolver/locale/NLPSolverCommon_de.properties new/libreoffice-extensions-3.3.2.2/nlpsolver/locale/NLPSolverCommon_de.properties --- old/libreoffice-extensions-3.3.1.2/nlpsolver/locale/NLPSolverCommon_de.properties 2011-02-14 15:41:53.000000000 +0100 +++ new/libreoffice-extensions-3.3.2.2/nlpsolver/locale/NLPSolverCommon_de.properties 2011-03-08 20:12:46.000000000 +0100 @@ -1,3 +1,4 @@ +# x-no-translate #BaseNLPSolver NLPSolverCommon.Properties.AssumeNonNegative=Nicht-negative Variablen voraussetzen #BaseEvolutionarySolver diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libreoffice-extensions-3.3.1.2/nlpsolver/locale/NLPSolverCommon_en_GB.properties new/libreoffice-extensions-3.3.2.2/nlpsolver/locale/NLPSolverCommon_en_GB.properties --- old/libreoffice-extensions-3.3.1.2/nlpsolver/locale/NLPSolverCommon_en_GB.properties 2011-02-14 15:41:53.000000000 +0100 +++ new/libreoffice-extensions-3.3.2.2/nlpsolver/locale/NLPSolverCommon_en_GB.properties 2011-03-08 20:12:46.000000000 +0100 @@ -1,3 +1,4 @@ +# x-no-translate #BaseNLPSolver NLPSolverCommon.Properties.AssumeNonNegative=Assume Non-Negative Variables #BaseEvolutionarySolver diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libreoffice-extensions-3.3.1.2/nlpsolver/locale/NLPSolverCommon_es.properties new/libreoffice-extensions-3.3.2.2/nlpsolver/locale/NLPSolverCommon_es.properties --- old/libreoffice-extensions-3.3.1.2/nlpsolver/locale/NLPSolverCommon_es.properties 2011-02-14 15:41:53.000000000 +0100 +++ new/libreoffice-extensions-3.3.2.2/nlpsolver/locale/NLPSolverCommon_es.properties 2011-03-08 20:12:46.000000000 +0100 @@ -1,3 +1,4 @@ +# x-no-translate #BaseNLPSolver NLPSolverCommon.Properties.AssumeNonNegative=Asumir variables no-negativas #BaseEvolutionarySolver diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libreoffice-extensions-3.3.1.2/nlpsolver/locale/NLPSolverCommon_fa.properties new/libreoffice-extensions-3.3.2.2/nlpsolver/locale/NLPSolverCommon_fa.properties --- old/libreoffice-extensions-3.3.1.2/nlpsolver/locale/NLPSolverCommon_fa.properties 2011-02-14 15:41:53.000000000 +0100 +++ new/libreoffice-extensions-3.3.2.2/nlpsolver/locale/NLPSolverCommon_fa.properties 2011-03-08 20:12:46.000000000 +0100 @@ -1,3 +1,4 @@ +# x-no-translate #BaseNLPSolver NLPSolverCommon.Properties.AssumeNonNegative=\u0641\u0631\u0636 \u06A9\u0631\u062F\u0646 \u0645\u062A\u063A\u06CC\u0631\u0647\u0627\u06CC \u0646\u0627\u0645\u0646\u0641\u06CC #BaseEvolutionarySolver diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libreoffice-extensions-3.3.1.2/nlpsolver/locale/NLPSolverCommon_fi.properties new/libreoffice-extensions-3.3.2.2/nlpsolver/locale/NLPSolverCommon_fi.properties --- old/libreoffice-extensions-3.3.1.2/nlpsolver/locale/NLPSolverCommon_fi.properties 2011-02-14 15:41:53.000000000 +0100 +++ new/libreoffice-extensions-3.3.2.2/nlpsolver/locale/NLPSolverCommon_fi.properties 2011-03-08 20:12:46.000000000 +0100 @@ -1,3 +1,4 @@ +# x-no-translate #BaseNLPSolver NLPSolverCommon.Properties.AssumeNonNegative=Oleta muuttujat ei-negatiivisiksi #BaseEvolutionarySolver diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libreoffice-extensions-3.3.1.2/nlpsolver/locale/NLPSolverCommon_fr.properties new/libreoffice-extensions-3.3.2.2/nlpsolver/locale/NLPSolverCommon_fr.properties --- old/libreoffice-extensions-3.3.1.2/nlpsolver/locale/NLPSolverCommon_fr.properties 2011-02-14 15:41:53.000000000 +0100 +++ new/libreoffice-extensions-3.3.2.2/nlpsolver/locale/NLPSolverCommon_fr.properties 2011-03-08 20:12:46.000000000 +0100 @@ -1,3 +1,4 @@ +# x-no-translate #BaseNLPSolver NLPSolverCommon.Properties.AssumeNonNegative=Supposer des variables non n\u00E9gatives #BaseEvolutionarySolver diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libreoffice-extensions-3.3.1.2/nlpsolver/locale/NLPSolverCommon_gl.properties new/libreoffice-extensions-3.3.2.2/nlpsolver/locale/NLPSolverCommon_gl.properties --- old/libreoffice-extensions-3.3.1.2/nlpsolver/locale/NLPSolverCommon_gl.properties 1970-01-01 01:00:00.000000000 +0100 +++ new/libreoffice-extensions-3.3.2.2/nlpsolver/locale/NLPSolverCommon_gl.properties 2011-03-08 20:12:46.000000000 +0100 @@ -0,0 +1,22 @@ +# x-no-translate +#BaseNLPSolver +NLPSolverCommon.Properties.AssumeNonNegative=Asumir vari\u00E1beis como non negativas +#BaseEvolutionarySolver +NLPSolverCommon.Properties.SwarmSize=Tama\u00F1o da colonia +NLPSolverCommon.Properties.LibrarySize=Tama\u00F1o da biblioteca +NLPSolverCommon.Properties.LearningCycles=Ciclos de aprendizaxe +NLPSolverCommon.Properties.GuessVariableRange=Estimaci\u00F3n dos l\u00EDmites das vari\u00E1beis +NLPSolverCommon.Properties.VariableRangeThreshold=Limiar dos l\u00EDmites das vari\u00E1beis (ao estimar) +NLPSolverCommon.Properties.UseACRComparator=Utilizar o comparador ACR (no canto do BCH) +NLPSolverCommon.Properties.UseRandomStartingPoint=Utilizar punto de inicio aleatorio +NLPSolverCommon.Properties.StagnationLimit=L\u00EDmite de estancamento +NLPSolverCommon.Properties.Tolerance=Tolerancia de estancamento +NLPSolverCommon.Properties.EnhancedSolverStatus=Amosar o status estendido do solver +#DEPS +NLPSolverCommon.Properties.AgentSwitchRate=Taxa de alternancia do axente (probabilidade DE) +NLPSolverCommon.Properties.DEFactor=DE: Factor de escala (0-1.2) +NLPSolverCommon.Properties.DECR=DE: Probabilidade de cruzamento (0 - 1) +NLPSolverCommon.Properties.PSC1=PS: Constante cognitiva +NLPSolverCommon.Properties.PSC2=PS: Constante social +NLPSolverCommon.Properties.PSWeight=PS: Coeficiente de constrici\u00F3n +NLPSolverCommon.Properties.PSCL=PS: Probabilidade de mutaci\u00F3n (0-0.005) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libreoffice-extensions-3.3.1.2/nlpsolver/locale/NLPSolverCommon_hu.properties new/libreoffice-extensions-3.3.2.2/nlpsolver/locale/NLPSolverCommon_hu.properties --- old/libreoffice-extensions-3.3.1.2/nlpsolver/locale/NLPSolverCommon_hu.properties 2011-02-14 15:41:53.000000000 +0100 +++ new/libreoffice-extensions-3.3.2.2/nlpsolver/locale/NLPSolverCommon_hu.properties 2011-03-08 20:12:46.000000000 +0100 @@ -1,3 +1,4 @@ +# x-no-translate #BaseNLPSolver NLPSolverCommon.Properties.AssumeNonNegative=Nem negat\u00EDv v\u00E1ltoz\u00F3k felt\u00E9telez\u00E9se #BaseEvolutionarySolver diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libreoffice-extensions-3.3.1.2/nlpsolver/locale/NLPSolverCommon_it.properties new/libreoffice-extensions-3.3.2.2/nlpsolver/locale/NLPSolverCommon_it.properties --- old/libreoffice-extensions-3.3.1.2/nlpsolver/locale/NLPSolverCommon_it.properties 2011-02-14 15:41:53.000000000 +0100 +++ new/libreoffice-extensions-3.3.2.2/nlpsolver/locale/NLPSolverCommon_it.properties 2011-03-08 20:12:46.000000000 +0100 @@ -1,3 +1,4 @@ +# x-no-translate #BaseNLPSolver NLPSolverCommon.Properties.AssumeNonNegative=Presumi variabili non-negative #BaseEvolutionarySolver diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libreoffice-extensions-3.3.1.2/nlpsolver/locale/NLPSolverCommon_ja.properties new/libreoffice-extensions-3.3.2.2/nlpsolver/locale/NLPSolverCommon_ja.properties --- old/libreoffice-extensions-3.3.1.2/nlpsolver/locale/NLPSolverCommon_ja.properties 2011-02-14 15:41:53.000000000 +0100 +++ new/libreoffice-extensions-3.3.2.2/nlpsolver/locale/NLPSolverCommon_ja.properties 2011-03-08 20:12:46.000000000 +0100 @@ -1,3 +1,4 @@ +# x-no-translate #BaseNLPSolver NLPSolverCommon.Properties.AssumeNonNegative=\u975E\u8CA0\u306E\u5909\u6570\u3092\u4EEE\u5B9A\u3059\u308B #BaseEvolutionarySolver diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libreoffice-extensions-3.3.1.2/nlpsolver/locale/NLPSolverCommon_ko.properties new/libreoffice-extensions-3.3.2.2/nlpsolver/locale/NLPSolverCommon_ko.properties --- old/libreoffice-extensions-3.3.1.2/nlpsolver/locale/NLPSolverCommon_ko.properties 2011-02-14 15:41:53.000000000 +0100 +++ new/libreoffice-extensions-3.3.2.2/nlpsolver/locale/NLPSolverCommon_ko.properties 2011-03-08 20:12:46.000000000 +0100 @@ -1,3 +1,4 @@ +# x-no-translate #BaseNLPSolver NLPSolverCommon.Properties.AssumeNonNegative=\uC74C\uC218\uAC00 \uC544\uB2CC \uBCC0\uC218\uB97C \uAC00\uC815 #BaseEvolutionarySolver diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libreoffice-extensions-3.3.1.2/nlpsolver/locale/NLPSolverCommon_nb.properties new/libreoffice-extensions-3.3.2.2/nlpsolver/locale/NLPSolverCommon_nb.properties --- old/libreoffice-extensions-3.3.1.2/nlpsolver/locale/NLPSolverCommon_nb.properties 2011-02-14 15:41:53.000000000 +0100 +++ new/libreoffice-extensions-3.3.2.2/nlpsolver/locale/NLPSolverCommon_nb.properties 2011-03-08 20:12:46.000000000 +0100 @@ -1,3 +1,4 @@ +# x-no-translate #BaseNLPSolver NLPSolverCommon.Properties.AssumeNonNegative=Assume Non-Negative Variables #BaseEvolutionarySolver diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libreoffice-extensions-3.3.1.2/nlpsolver/locale/NLPSolverCommon_nl.properties new/libreoffice-extensions-3.3.2.2/nlpsolver/locale/NLPSolverCommon_nl.properties --- old/libreoffice-extensions-3.3.1.2/nlpsolver/locale/NLPSolverCommon_nl.properties 2011-02-14 15:42:30.000000000 +0100 +++ new/libreoffice-extensions-3.3.2.2/nlpsolver/locale/NLPSolverCommon_nl.properties 2011-03-08 20:12:46.000000000 +0100 @@ -1,3 +1,4 @@ +# x-no-translate #BaseNLPSolver NLPSolverCommon.Properties.AssumeNonNegative=Niet negatieve variabelen aannemen #BaseEvolutionarySolver diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libreoffice-extensions-3.3.1.2/nlpsolver/locale/NLPSolverCommon_pt_BR.properties new/libreoffice-extensions-3.3.2.2/nlpsolver/locale/NLPSolverCommon_pt_BR.properties --- old/libreoffice-extensions-3.3.1.2/nlpsolver/locale/NLPSolverCommon_pt_BR.properties 2011-02-14 15:41:53.000000000 +0100 +++ new/libreoffice-extensions-3.3.2.2/nlpsolver/locale/NLPSolverCommon_pt_BR.properties 2011-03-08 20:12:46.000000000 +0100 @@ -1,3 +1,4 @@ +# x-no-translate #BaseNLPSolver NLPSolverCommon.Properties.AssumeNonNegative=Assumir vari\u00E1veis como n\u00E3o negativas #BaseEvolutionarySolver diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libreoffice-extensions-3.3.1.2/nlpsolver/locale/NLPSolverCommon_ro.properties new/libreoffice-extensions-3.3.2.2/nlpsolver/locale/NLPSolverCommon_ro.properties --- old/libreoffice-extensions-3.3.1.2/nlpsolver/locale/NLPSolverCommon_ro.properties 1970-01-01 01:00:00.000000000 +0100 +++ new/libreoffice-extensions-3.3.2.2/nlpsolver/locale/NLPSolverCommon_ro.properties 2011-03-08 20:12:46.000000000 +0100 @@ -0,0 +1,22 @@ +# x-no-translate +#BaseNLPSolver +NLPSolverCommon.Properties.AssumeNonNegative=Presupune variabile non negative +#BaseEvolutionarySolver +NLPSolverCommon.Properties.SwarmSize=M\u0103rimea coloniei +NLPSolverCommon.Properties.LibrarySize=M\u0103rimea bibliotecii +NLPSolverCommon.Properties.LearningCycles=Cicli de \u00EEnv\u0103\u021Bare +NLPSolverCommon.Properties.GuessVariableRange=Estimarea limitelor variabilei +NLPSolverCommon.Properties.VariableRangeThreshold=Pragul limitelor variabilei (la estimare) +NLPSolverCommon.Properties.UseACRComparator=Utilizeaz\u0103 comparatorul ACR (\u00EEn locul lui BCH) +NLPSolverCommon.Properties.UseRandomStartingPoint=Utilizeaz\u0103 un punct de pornire aleator +NLPSolverCommon.Properties.StagnationLimit=Limit\u0103 de stagnare +NLPSolverCommon.Properties.Tolerance=Toleran\u021B\u0103 de stagnare +NLPSolverCommon.Properties.EnhancedSolverStatus=Afi\u0219eaz\u0103 starea extins\u0103 a rezolvatorului +#DEPS +NLPSolverCommon.Properties.AgentSwitchRate=Rata de schimbare a agentului (probabilitate DE) +NLPSolverCommon.Properties.DEFactor=DE: factor de scalare (0-1.2) +NLPSolverCommon.Properties.DECR=DE: probabilitate de jonc\u021Biune (0-1) +NLPSolverCommon.Properties.PSC1=PS: constant\u0103 cognitiv\u0103 +NLPSolverCommon.Properties.PSC2=PS: constant\u0103 social\u0103 +NLPSolverCommon.Properties.PSWeight=PS: coeficient de constric\u021Bie +NLPSolverCommon.Properties.PSCL=PS: probabilitate de mutare (0-0.005) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libreoffice-extensions-3.3.1.2/nlpsolver/locale/NLPSolverCommon_ru.properties new/libreoffice-extensions-3.3.2.2/nlpsolver/locale/NLPSolverCommon_ru.properties --- old/libreoffice-extensions-3.3.1.2/nlpsolver/locale/NLPSolverCommon_ru.properties 2011-02-14 15:41:53.000000000 +0100 +++ new/libreoffice-extensions-3.3.2.2/nlpsolver/locale/NLPSolverCommon_ru.properties 2011-03-08 20:12:46.000000000 +0100 @@ -1,3 +1,4 @@ +# x-no-translate #BaseNLPSolver NLPSolverCommon.Properties.AssumeNonNegative=\u041F\u0440\u0438\u043D\u044F\u0442\u044C \u043F\u0435\u0440\u0435\u043C\u0435\u043D\u043D\u044B\u0435 \u043A\u0430\u043A \u043D\u0435\u043E\u0442\u0440\u0438\u0446\u0430\u0442\u0435\u043B\u044C\u043D\u044B\u0435 #BaseEvolutionarySolver diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libreoffice-extensions-3.3.1.2/nlpsolver/locale/NLPSolverCommon_sk.properties new/libreoffice-extensions-3.3.2.2/nlpsolver/locale/NLPSolverCommon_sk.properties --- old/libreoffice-extensions-3.3.1.2/nlpsolver/locale/NLPSolverCommon_sk.properties 1970-01-01 01:00:00.000000000 +0100 +++ new/libreoffice-extensions-3.3.2.2/nlpsolver/locale/NLPSolverCommon_sk.properties 2011-03-08 20:12:46.000000000 +0100 @@ -0,0 +1,22 @@ +# x-no-translate +#BaseNLPSolver +NLPSolverCommon.Properties.AssumeNonNegative=Predpoklada\u0165 nez\u00E1porn\u00E9 premenn\u00E9 +#BaseEvolutionarySolver +NLPSolverCommon.Properties.SwarmSize=Ve\u013Ekos\u0165 roja +NLPSolverCommon.Properties.LibrarySize=Ve\u013Ekos\u0165 kni\u017Enice +NLPSolverCommon.Properties.LearningCycles=Cykly u\u010Denia +NLPSolverCommon.Properties.GuessVariableRange=Odhadn\u00FA\u0165 ohrani\u010Denie premenn\u00FDch +NLPSolverCommon.Properties.VariableRangeThreshold=Prahov\u00E1 hodnota ohrani\u010Denia premenn\u00FDch (pri odhade) +NLPSolverCommon.Properties.UseACRComparator=Pou\u017Ei\u0165 kompar\u00E1tor ACR (namiesto BCH) +NLPSolverCommon.Properties.UseRandomStartingPoint=Pou\u017Ei\u0165 n\u00E1hodn\u00FD \u0161tartovac\u00ED bod +NLPSolverCommon.Properties.StagnationLimit=Hranica stagn\u00E1cie +NLPSolverCommon.Properties.Tolerance=Tolerancia stagn\u00E1cie +NLPSolverCommon.Properties.EnhancedSolverStatus=Uk\u00E1za\u0165 roz\u0161\u00EDren\u00FD status rie\u0161i\u010Da +#DEPS +NLPSolverCommon.Properties.AgentSwitchRate=Agent Switch Rate (DE Probability) +NLPSolverCommon.Properties.DEFactor=DE: Scaling Factor (0-1.2) +NLPSolverCommon.Properties.DECR=DE: Crossover Probability (0-1) +NLPSolverCommon.Properties.PSC1=PS: Cognitive Constant +NLPSolverCommon.Properties.PSC2=PS: Social Constant +NLPSolverCommon.Properties.PSWeight=PS: koeficient stla\u010Denia +NLPSolverCommon.Properties.PSCL=PS: Mutation Probability (0-0.005) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libreoffice-extensions-3.3.1.2/nlpsolver/locale/NLPSolverCommon_sl.properties new/libreoffice-extensions-3.3.2.2/nlpsolver/locale/NLPSolverCommon_sl.properties --- old/libreoffice-extensions-3.3.1.2/nlpsolver/locale/NLPSolverCommon_sl.properties 2011-02-14 15:41:53.000000000 +0100 +++ new/libreoffice-extensions-3.3.2.2/nlpsolver/locale/NLPSolverCommon_sl.properties 2011-03-08 20:12:46.000000000 +0100 @@ -1,3 +1,4 @@ +# x-no-translate #BaseNLPSolver NLPSolverCommon.Properties.AssumeNonNegative=Domnevaj nenegativne spremenljivke diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libreoffice-extensions-3.3.1.2/nlpsolver/locale/NLPSolverCommon_zh_CN.properties new/libreoffice-extensions-3.3.2.2/nlpsolver/locale/NLPSolverCommon_zh_CN.properties --- old/libreoffice-extensions-3.3.1.2/nlpsolver/locale/NLPSolverCommon_zh_CN.properties 2011-02-14 15:41:53.000000000 +0100 +++ new/libreoffice-extensions-3.3.2.2/nlpsolver/locale/NLPSolverCommon_zh_CN.properties 2011-03-08 20:12:46.000000000 +0100 @@ -1,3 +1,4 @@ +# x-no-translate #BaseNLPSolver NLPSolverCommon.Properties.AssumeNonNegative=\u5047\u5B9A\u975E\u8D1F\u53D8\u91CF #BaseEvolutionarySolver diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libreoffice-extensions-3.3.1.2/nlpsolver/locale/NLPSolverCommon_zh_TW.properties new/libreoffice-extensions-3.3.2.2/nlpsolver/locale/NLPSolverCommon_zh_TW.properties --- old/libreoffice-extensions-3.3.1.2/nlpsolver/locale/NLPSolverCommon_zh_TW.properties 2011-02-14 15:41:53.000000000 +0100 +++ new/libreoffice-extensions-3.3.2.2/nlpsolver/locale/NLPSolverCommon_zh_TW.properties 2011-03-08 20:12:46.000000000 +0100 @@ -1,3 +1,4 @@ +# x-no-translate #BaseNLPSolver NLPSolverCommon.Properties.AssumeNonNegative=\u5047\u8A2D\u975E\u8CA0\u503C\u8B8A\u6578 #BaseEvolutionarySolver diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libreoffice-extensions-3.3.1.2/nlpsolver/locale/NLPSolverStatusDialog_ast.properties new/libreoffice-extensions-3.3.2.2/nlpsolver/locale/NLPSolverStatusDialog_ast.properties --- old/libreoffice-extensions-3.3.1.2/nlpsolver/locale/NLPSolverStatusDialog_ast.properties 2011-02-14 15:41:53.000000000 +0100 +++ new/libreoffice-extensions-3.3.2.2/nlpsolver/locale/NLPSolverStatusDialog_ast.properties 2011-03-08 20:12:46.000000000 +0100 @@ -1,3 +1,4 @@ +# x-no-translate #Dialog NLPSolverStatusDialog.Dialog.Caption=Est\u00E1u del resolvedor #Controls diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libreoffice-extensions-3.3.1.2/nlpsolver/locale/NLPSolverStatusDialog_ca.properties new/libreoffice-extensions-3.3.2.2/nlpsolver/locale/NLPSolverStatusDialog_ca.properties --- old/libreoffice-extensions-3.3.1.2/nlpsolver/locale/NLPSolverStatusDialog_ca.properties 2011-02-14 15:41:53.000000000 +0100 +++ new/libreoffice-extensions-3.3.2.2/nlpsolver/locale/NLPSolverStatusDialog_ca.properties 2011-03-08 20:12:46.000000000 +0100 @@ -1,3 +1,4 @@ +# x-no-translate #Dialog NLPSolverStatusDialog.Dialog.Caption=Estat del solucionador #Controls diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libreoffice-extensions-3.3.1.2/nlpsolver/locale/NLPSolverStatusDialog_de.properties new/libreoffice-extensions-3.3.2.2/nlpsolver/locale/NLPSolverStatusDialog_de.properties --- old/libreoffice-extensions-3.3.1.2/nlpsolver/locale/NLPSolverStatusDialog_de.properties 2011-02-14 15:41:53.000000000 +0100 +++ new/libreoffice-extensions-3.3.2.2/nlpsolver/locale/NLPSolverStatusDialog_de.properties 2011-03-08 20:12:46.000000000 +0100 @@ -1,3 +1,4 @@ +# x-no-translate #Dialog NLPSolverStatusDialog.Dialog.Caption=Solverstatus #Controls diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libreoffice-extensions-3.3.1.2/nlpsolver/locale/NLPSolverStatusDialog_en_GB.properties new/libreoffice-extensions-3.3.2.2/nlpsolver/locale/NLPSolverStatusDialog_en_GB.properties --- old/libreoffice-extensions-3.3.1.2/nlpsolver/locale/NLPSolverStatusDialog_en_GB.properties 2011-02-14 15:41:53.000000000 +0100 +++ new/libreoffice-extensions-3.3.2.2/nlpsolver/locale/NLPSolverStatusDialog_en_GB.properties 2011-03-08 20:12:46.000000000 +0100 @@ -1,3 +1,4 @@ +# x-no-translate #Dialog NLPSolverStatusDialog.Dialog.Caption=Solver Status #Controls diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libreoffice-extensions-3.3.1.2/nlpsolver/locale/NLPSolverStatusDialog_es.properties new/libreoffice-extensions-3.3.2.2/nlpsolver/locale/NLPSolverStatusDialog_es.properties --- old/libreoffice-extensions-3.3.1.2/nlpsolver/locale/NLPSolverStatusDialog_es.properties 2011-02-14 15:41:53.000000000 +0100 +++ new/libreoffice-extensions-3.3.2.2/nlpsolver/locale/NLPSolverStatusDialog_es.properties 2011-03-08 20:12:46.000000000 +0100 @@ -1,3 +1,4 @@ +# x-no-translate #Dialog NLPSolverStatusDialog.Dialog.Caption=Estado del solucionador #Controls diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libreoffice-extensions-3.3.1.2/nlpsolver/locale/NLPSolverStatusDialog_fa.properties new/libreoffice-extensions-3.3.2.2/nlpsolver/locale/NLPSolverStatusDialog_fa.properties --- old/libreoffice-extensions-3.3.1.2/nlpsolver/locale/NLPSolverStatusDialog_fa.properties 2011-02-14 15:41:53.000000000 +0100 +++ new/libreoffice-extensions-3.3.2.2/nlpsolver/locale/NLPSolverStatusDialog_fa.properties 2011-03-08 20:12:46.000000000 +0100 @@ -1,3 +1,4 @@ +# x-no-translate #Dialog NLPSolverStatusDialog.Dialog.Caption=\u0648\u0636\u0639\u06CC\u062A \u062D\u0644\u200C\u06A9\u0646\u0646\u062F\u0647 #Controls diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libreoffice-extensions-3.3.1.2/nlpsolver/locale/NLPSolverStatusDialog_fi.properties new/libreoffice-extensions-3.3.2.2/nlpsolver/locale/NLPSolverStatusDialog_fi.properties --- old/libreoffice-extensions-3.3.1.2/nlpsolver/locale/NLPSolverStatusDialog_fi.properties 2011-02-14 15:41:53.000000000 +0100 +++ new/libreoffice-extensions-3.3.2.2/nlpsolver/locale/NLPSolverStatusDialog_fi.properties 2011-03-08 20:12:46.000000000 +0100 @@ -1,3 +1,4 @@ +# x-no-translate #Dialog NLPSolverStatusDialog.Dialog.Caption=Ratkaisimen tila #Controls diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libreoffice-extensions-3.3.1.2/nlpsolver/locale/NLPSolverStatusDialog_fr.properties new/libreoffice-extensions-3.3.2.2/nlpsolver/locale/NLPSolverStatusDialog_fr.properties --- old/libreoffice-extensions-3.3.1.2/nlpsolver/locale/NLPSolverStatusDialog_fr.properties 2011-02-14 15:41:53.000000000 +0100 +++ new/libreoffice-extensions-3.3.2.2/nlpsolver/locale/NLPSolverStatusDialog_fr.properties 2011-03-08 20:12:46.000000000 +0100 @@ -1,3 +1,4 @@ +# x-no-translate #Dialog NLPSolverStatusDialog.Dialog.Caption=\u00C9tat du solveur #Controls diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libreoffice-extensions-3.3.1.2/nlpsolver/locale/NLPSolverStatusDialog_gl.properties new/libreoffice-extensions-3.3.2.2/nlpsolver/locale/NLPSolverStatusDialog_gl.properties --- old/libreoffice-extensions-3.3.1.2/nlpsolver/locale/NLPSolverStatusDialog_gl.properties 1970-01-01 01:00:00.000000000 +0100 +++ new/libreoffice-extensions-3.3.2.2/nlpsolver/locale/NLPSolverStatusDialog_gl.properties 2011-03-08 20:12:46.000000000 +0100 @@ -0,0 +1,28 @@ +# x-no-translate +#Dialog +NLPSolverStatusDialog.Dialog.Caption=Status do solver +#Controls +NLPSolverStatusDialog.Controls.lblSolution=Soluci\u00F3n actual: +NLPSolverStatusDialog.Controls.lblIteration=Iteraci\u00F3n: +NLPSolverStatusDialog.Controls.lblStagnation=Estancamento: +NLPSolverStatusDialog.Controls.lblRuntime=Tempo de execuci\u00F3n: +NLPSolverStatusDialog.Controls.btnStop=Alto +NLPSolverStatusDialog.Controls.btnOK=Aceptar +NLPSolverStatusDialog.Controls.btnContinue=Continuar +#Messages +NLPSolverStatusDialog.Message.StopIteration=Acadouse o n\u00FAmero m\u00E1ximo de iteraci\u00F3ns. +NLPSolverStatusDialog.Message.StopStagnation=O proceso det\u00EDvose debido a estancamento +NLPSolverStatusDialog.Message.StopUser=O proceso det\u00EDvose debido \u00E1 interrupci\u00F3n do usuario. +NLPSolverStatusDialog.Message.CurrentIteration=O proceso det\u00EDvose na iteraci\u00F3n %d de %d. +#Time formatting +NLPSolverStatusDialog.Time.Nanoseconds=Nanosegundos +NLPSolverStatusDialog.Time.Microseconds=Microsegundos +NLPSolverStatusDialog.Time.Milliseconds=Milisegundos +NLPSolverStatusDialog.Time.Second=Segundo +NLPSolverStatusDialog.Time.Seconds=Segundos +NLPSolverStatusDialog.Time.Minute=Minuto +NLPSolverStatusDialog.Time.Minutes=Minutos +NLPSolverStatusDialog.Time.Hour=Hora +NLPSolverStatusDialog.Time.Hours=Horas +NLPSolverStatusDialog.Time.Day=D\u00EDa +NLPSolverStatusDialog.Time.Days=D\u00EDas diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libreoffice-extensions-3.3.1.2/nlpsolver/locale/NLPSolverStatusDialog_hu.properties new/libreoffice-extensions-3.3.2.2/nlpsolver/locale/NLPSolverStatusDialog_hu.properties --- old/libreoffice-extensions-3.3.1.2/nlpsolver/locale/NLPSolverStatusDialog_hu.properties 2011-02-14 15:41:53.000000000 +0100 +++ new/libreoffice-extensions-3.3.2.2/nlpsolver/locale/NLPSolverStatusDialog_hu.properties 2011-03-08 20:12:46.000000000 +0100 @@ -1,3 +1,4 @@ +# x-no-translate #Dialog NLPSolverStatusDialog.Dialog.Caption=A Megold\u00F3 \u00E1llapota #Controls diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libreoffice-extensions-3.3.1.2/nlpsolver/locale/NLPSolverStatusDialog_is.properties new/libreoffice-extensions-3.3.2.2/nlpsolver/locale/NLPSolverStatusDialog_is.properties --- old/libreoffice-extensions-3.3.1.2/nlpsolver/locale/NLPSolverStatusDialog_is.properties 2011-02-14 15:41:53.000000000 +0100 +++ new/libreoffice-extensions-3.3.2.2/nlpsolver/locale/NLPSolverStatusDialog_is.properties 2011-03-08 20:12:46.000000000 +0100 @@ -1,3 +1,4 @@ +# x-no-translate #Dialog NLPSolverStatusDialog.Dialog.Caption=Solver Status #Controls diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libreoffice-extensions-3.3.1.2/nlpsolver/locale/NLPSolverStatusDialog_it.properties new/libreoffice-extensions-3.3.2.2/nlpsolver/locale/NLPSolverStatusDialog_it.properties --- old/libreoffice-extensions-3.3.1.2/nlpsolver/locale/NLPSolverStatusDialog_it.properties 2011-02-14 15:41:53.000000000 +0100 +++ new/libreoffice-extensions-3.3.2.2/nlpsolver/locale/NLPSolverStatusDialog_it.properties 2011-03-08 20:12:46.000000000 +0100 @@ -1,3 +1,4 @@ +# x-no-translate #Dialog NLPSolverStatusDialog.Dialog.Caption=Stato del risolutore #Controls diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libreoffice-extensions-3.3.1.2/nlpsolver/locale/NLPSolverStatusDialog_ja.properties new/libreoffice-extensions-3.3.2.2/nlpsolver/locale/NLPSolverStatusDialog_ja.properties --- old/libreoffice-extensions-3.3.1.2/nlpsolver/locale/NLPSolverStatusDialog_ja.properties 2011-02-14 15:41:53.000000000 +0100 +++ new/libreoffice-extensions-3.3.2.2/nlpsolver/locale/NLPSolverStatusDialog_ja.properties 2011-03-08 20:12:46.000000000 +0100 @@ -1,3 +1,4 @@ +# x-no-translate #Dialog NLPSolverStatusDialog.Dialog.Caption=\u30BD\u30EB\u30D0\u30FC\u306E\u72B6\u614B #Controls diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libreoffice-extensions-3.3.1.2/nlpsolver/locale/NLPSolverStatusDialog_ko.properties new/libreoffice-extensions-3.3.2.2/nlpsolver/locale/NLPSolverStatusDialog_ko.properties --- old/libreoffice-extensions-3.3.1.2/nlpsolver/locale/NLPSolverStatusDialog_ko.properties 2011-02-14 15:41:53.000000000 +0100 +++ new/libreoffice-extensions-3.3.2.2/nlpsolver/locale/NLPSolverStatusDialog_ko.properties 2011-03-08 20:12:46.000000000 +0100 @@ -1,3 +1,4 @@ +# x-no-translate #Dialog NLPSolverStatusDialog.Dialog.Caption=\uD574\uCC3E\uAE30 \uC0C1\uD0DC #Controls diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libreoffice-extensions-3.3.1.2/nlpsolver/locale/NLPSolverStatusDialog_nb.properties new/libreoffice-extensions-3.3.2.2/nlpsolver/locale/NLPSolverStatusDialog_nb.properties --- old/libreoffice-extensions-3.3.1.2/nlpsolver/locale/NLPSolverStatusDialog_nb.properties 2011-02-14 15:41:53.000000000 +0100 +++ new/libreoffice-extensions-3.3.2.2/nlpsolver/locale/NLPSolverStatusDialog_nb.properties 2011-03-08 20:12:46.000000000 +0100 @@ -1,3 +1,4 @@ +# x-no-translate #Dialog NLPSolverStatusDialog.Dialog.Caption=L\u00F8sningstatus #Controls diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libreoffice-extensions-3.3.1.2/nlpsolver/locale/NLPSolverStatusDialog_nl.properties new/libreoffice-extensions-3.3.2.2/nlpsolver/locale/NLPSolverStatusDialog_nl.properties --- old/libreoffice-extensions-3.3.1.2/nlpsolver/locale/NLPSolverStatusDialog_nl.properties 2011-02-14 15:41:53.000000000 +0100 +++ new/libreoffice-extensions-3.3.2.2/nlpsolver/locale/NLPSolverStatusDialog_nl.properties 2011-03-08 20:12:46.000000000 +0100 @@ -1,3 +1,4 @@ +# x-no-translate #Dialog NLPSolverStatusDialog.Dialog.Caption=Oplosserstatus #Controls diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libreoffice-extensions-3.3.1.2/nlpsolver/locale/NLPSolverStatusDialog_pt_BR.properties new/libreoffice-extensions-3.3.2.2/nlpsolver/locale/NLPSolverStatusDialog_pt_BR.properties --- old/libreoffice-extensions-3.3.1.2/nlpsolver/locale/NLPSolverStatusDialog_pt_BR.properties 2011-02-14 15:41:53.000000000 +0100 +++ new/libreoffice-extensions-3.3.2.2/nlpsolver/locale/NLPSolverStatusDialog_pt_BR.properties 2011-03-08 20:12:46.000000000 +0100 @@ -1,3 +1,4 @@ +# x-no-translate #Dialog NLPSolverStatusDialog.Dialog.Caption=Estado do solver #Controls diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libreoffice-extensions-3.3.1.2/nlpsolver/locale/NLPSolverStatusDialog_ro.properties new/libreoffice-extensions-3.3.2.2/nlpsolver/locale/NLPSolverStatusDialog_ro.properties --- old/libreoffice-extensions-3.3.1.2/nlpsolver/locale/NLPSolverStatusDialog_ro.properties 1970-01-01 01:00:00.000000000 +0100 +++ new/libreoffice-extensions-3.3.2.2/nlpsolver/locale/NLPSolverStatusDialog_ro.properties 2011-03-08 20:12:46.000000000 +0100 @@ -0,0 +1,28 @@ +# x-no-translate +#Dialog +NLPSolverStatusDialog.Dialog.Caption=Starea rezolvatorului +#Controls +NLPSolverStatusDialog.Controls.lblSolution=Solu\u021Bia curent\u0103: +NLPSolverStatusDialog.Controls.lblIteration=Itera\u021Bie: +NLPSolverStatusDialog.Controls.lblStagnation=Stagnare: +NLPSolverStatusDialog.Controls.lblRuntime=Durat\u0103 de execu\u021Bie: +NLPSolverStatusDialog.Controls.btnStop=Opre\u0219te +NLPSolverStatusDialog.Controls.btnOK=OK +NLPSolverStatusDialog.Controls.btnContinue=Continu\u0103 +#Messages +NLPSolverStatusDialog.Message.StopIteration=S-a atins num\u0103rul maxim de itera\u021Bii. +NLPSolverStatusDialog.Message.StopStagnation=Proces oprit din cauza stagn\u0103rii. +NLPSolverStatusDialog.Message.StopUser=Proces oprit din cauza \u00EEntreruperii de c\u0103tre utilizator. +NLPSolverStatusDialog.Message.CurrentIteration=Proces oprit la itera\u021Bia %d din %d. +#Time formatting +NLPSolverStatusDialog.Time.Nanoseconds=Nanosecunde +NLPSolverStatusDialog.Time.Microseconds=Microsecunde +NLPSolverStatusDialog.Time.Milliseconds=Milisecunde +NLPSolverStatusDialog.Time.Second=Secund\u0103 +NLPSolverStatusDialog.Time.Seconds=Secunde +NLPSolverStatusDialog.Time.Minute=Minut +NLPSolverStatusDialog.Time.Minutes=Minute +NLPSolverStatusDialog.Time.Hour=Or\u0103 +NLPSolverStatusDialog.Time.Hours=Ore +NLPSolverStatusDialog.Time.Day=Zi +NLPSolverStatusDialog.Time.Days=Zile diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libreoffice-extensions-3.3.1.2/nlpsolver/locale/NLPSolverStatusDialog_ru.properties new/libreoffice-extensions-3.3.2.2/nlpsolver/locale/NLPSolverStatusDialog_ru.properties --- old/libreoffice-extensions-3.3.1.2/nlpsolver/locale/NLPSolverStatusDialog_ru.properties 2011-02-14 15:41:53.000000000 +0100 +++ new/libreoffice-extensions-3.3.2.2/nlpsolver/locale/NLPSolverStatusDialog_ru.properties 2011-03-08 20:12:46.000000000 +0100 @@ -1,3 +1,4 @@ +# x-no-translate #Dialog NLPSolverStatusDialog.Dialog.Caption=\u0421\u043E\u0441\u0442\u043E\u044F\u043D\u0438\u0435 #Controls diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libreoffice-extensions-3.3.1.2/nlpsolver/locale/NLPSolverStatusDialog_sk.properties new/libreoffice-extensions-3.3.2.2/nlpsolver/locale/NLPSolverStatusDialog_sk.properties --- old/libreoffice-extensions-3.3.1.2/nlpsolver/locale/NLPSolverStatusDialog_sk.properties 1970-01-01 01:00:00.000000000 +0100 +++ new/libreoffice-extensions-3.3.2.2/nlpsolver/locale/NLPSolverStatusDialog_sk.properties 2011-03-08 20:12:46.000000000 +0100 @@ -0,0 +1,28 @@ +# x-no-translate +#Dialog +NLPSolverStatusDialog.Dialog.Caption=Stav rie\u0161i\u010Da +#Controls +NLPSolverStatusDialog.Controls.lblSolution=Aktu\u00E1lne rie\u0161enie: +NLPSolverStatusDialog.Controls.lblIteration=Iter\u00E1cia: +NLPSolverStatusDialog.Controls.lblStagnation=Stagn\u00E1cia: +NLPSolverStatusDialog.Controls.lblRuntime=Doba behu: +NLPSolverStatusDialog.Controls.btnStop=Preru\u0161i\u0165 +NLPSolverStatusDialog.Controls.btnOK=OK +NLPSolverStatusDialog.Controls.btnContinue=Pokra\u010Dova\u0165 +#Messages +NLPSolverStatusDialog.Message.StopIteration=Dosiahnut\u00E9 maximum iter\u00E1ci\u00ED +NLPSolverStatusDialog.Message.StopStagnation=Proces zastaven\u00FD pre stagn\u00E1ciu +NLPSolverStatusDialog.Message.StopUser=Proces preru\u0161en\u00FD pou\u017E\u00EDvate\u013Eom +NLPSolverStatusDialog.Message.CurrentIteration=Proces zastavil na %d iter\u00E1cii z %d. +#Time formatting +NLPSolverStatusDialog.Time.Nanoseconds=nanosek\u00FAnd +NLPSolverStatusDialog.Time.Microseconds=mikrosek\u00FAnd +NLPSolverStatusDialog.Time.Milliseconds=milisek\u00FAnd +NLPSolverStatusDialog.Time.Second=sekunda +NLPSolverStatusDialog.Time.Seconds=sek\u00FAnd +NLPSolverStatusDialog.Time.Minute=min\u00FAta +NLPSolverStatusDialog.Time.Minutes=min\u00FAt +NLPSolverStatusDialog.Time.Hour=hodina +NLPSolverStatusDialog.Time.Hours=hod\u00EDn +NLPSolverStatusDialog.Time.Day=de\u0148 +NLPSolverStatusDialog.Time.Days=dn\u00ED diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libreoffice-extensions-3.3.1.2/nlpsolver/locale/NLPSolverStatusDialog_sl.properties new/libreoffice-extensions-3.3.2.2/nlpsolver/locale/NLPSolverStatusDialog_sl.properties --- old/libreoffice-extensions-3.3.1.2/nlpsolver/locale/NLPSolverStatusDialog_sl.properties 2011-02-14 15:41:53.000000000 +0100 +++ new/libreoffice-extensions-3.3.2.2/nlpsolver/locale/NLPSolverStatusDialog_sl.properties 2011-03-08 20:12:46.000000000 +0100 @@ -1,3 +1,4 @@ +# x-no-translate #Dialog NLPSolverStatusDialog.Dialog.Caption=Stanje Re\u0161evalca diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libreoffice-extensions-3.3.1.2/nlpsolver/locale/NLPSolverStatusDialog_zh_CN.properties new/libreoffice-extensions-3.3.2.2/nlpsolver/locale/NLPSolverStatusDialog_zh_CN.properties --- old/libreoffice-extensions-3.3.1.2/nlpsolver/locale/NLPSolverStatusDialog_zh_CN.properties 2011-02-14 15:41:53.000000000 +0100 +++ new/libreoffice-extensions-3.3.2.2/nlpsolver/locale/NLPSolverStatusDialog_zh_CN.properties 2011-03-08 20:12:46.000000000 +0100 @@ -1,3 +1,4 @@ +# x-no-translate #Dialog NLPSolverStatusDialog.Dialog.Caption=\u6C42\u89E3\u5668\u72B6\u6001 #Controls diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libreoffice-extensions-3.3.1.2/nlpsolver/locale/NLPSolverStatusDialog_zh_TW.properties new/libreoffice-extensions-3.3.2.2/nlpsolver/locale/NLPSolverStatusDialog_zh_TW.properties --- old/libreoffice-extensions-3.3.1.2/nlpsolver/locale/NLPSolverStatusDialog_zh_TW.properties 2011-02-14 15:41:53.000000000 +0100 +++ new/libreoffice-extensions-3.3.2.2/nlpsolver/locale/NLPSolverStatusDialog_zh_TW.properties 2011-03-08 20:12:46.000000000 +0100 @@ -1,3 +1,4 @@ +# x-no-translate #Dialog NLPSolverStatusDialog.Dialog.Caption=\u89E3\u6C7A\u7A0B\u5F0F\u72C0\u614B #Controls ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 libreoffice-icon-themes for openSUSE:Factory
by root＠hilbert.suse.de 21 Mar '11

21 Mar '11

Hello community, here is the log from the commit of package libreoffice-icon-themes for openSUSE:Factory checked in at Mon Mar 21 15:35:18 CET 2011. -------- --- libreoffice-icon-themes/libreoffice-icon-themes.changes 2011-02-23 16:07:04.000000000 +0100 +++ libreoffice-icon-themes/libreoffice-icon-themes.changes 2011-03-18 19:00:13.000000000 +0100 @@ -1,0 +2,10 @@ +Fri Mar 18 16:40:02 CET 2011 - pmladek(a)suse.cz + +- updated to libreoffice-3.3.2.2 (3.3.2-rc2) + +------------------------------------------------------------------- +Wed Mar 9 17:42:27 CET 2011 - pmladek(a)suse.cz + +- updated to libreoffice-3.3.2.1 (3.3.2-rc1) + +------------------------------------------------------------------- calling whatdependson for head-i586 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libreoffice-icon-themes.spec ++++++ --- /var/tmp/diff_new_pack.Hh6MwA/_old 2011-03-21 15:34:39.000000000 +0100 +++ /var/tmp/diff_new_pack.Hh6MwA/_new 2011-03-21 15:34:39.000000000 +0100 @@ -19,10 +19,10 @@ Name: libreoffice-icon-themes -Version: 3.3.1.2 -Release: 2 -%define ooo_build_version 3.3.1.2 -%define ooo_piece_version 3.3.1.2 +Version: 3.3.2.2 +Release: 1 +%define ooo_build_version 3.3.2.2 +%define ooo_piece_version 3.3.2.2 %define ooo_basis_dir basis3.3 %define ooo_home libreoffice BuildRequires: libreoffice-icon-themes-prebuilt = %version ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 libreoffice-l10n for openSUSE:Factory
by root＠hilbert.suse.de 21 Mar '11

21 Mar '11

Hello community, here is the log from the commit of package libreoffice-l10n for openSUSE:Factory checked in at Mon Mar 21 15:34:20 CET 2011. -------- --- libreoffice-l10n/libreoffice-l10n.changes 2011-02-23 16:07:09.000000000 +0100 +++ libreoffice-l10n/libreoffice-l10n.changes 2011-03-18 19:00:23.000000000 +0100 @@ -1,0 +2,10 @@ +Fri Mar 18 16:40:02 CET 2011 - pmladek(a)suse.cz + +- updated to libreoffice-3.3.2.2 (3.3.2-rc2) + +------------------------------------------------------------------- +Wed Mar 9 17:42:27 CET 2011 - pmladek(a)suse.cz + +- updated to libreoffice-3.3.2.1 (3.3.2-rc1) + +------------------------------------------------------------------- calling whatdependson for head-i586 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libreoffice-l10n.spec ++++++ --- /var/tmp/diff_new_pack.7LOGqR/_old 2011-03-21 15:33:31.000000000 +0100 +++ /var/tmp/diff_new_pack.7LOGqR/_new 2011-03-21 15:33:31.000000000 +0100 @@ -19,11 +19,11 @@ Name: libreoffice-l10n -Version: 3.3.1.2 -Release: 2 +Version: 3.3.2.2 +Release: 1 %define piece l10n -%define ooo_build_version 3.3.1.2 -%define ooo_piece_version 3.3.1.2 +%define ooo_build_version 3.3.2.2 +%define ooo_piece_version 3.3.2.2 %define ooo_sourcedirname libreoffice-build-%ooo_piece_version %define ooo_home libreoffice %define ooo_basis_dir basis3.3 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 21 Mar '11

21 Mar '11

Hello community, here is the log from the commit of package clicfs for openSUSE:Factory checked in at Mon Mar 21 15:32:46 CET 2011. -------- --- clicfs/clicfs.changes 2010-11-30 13:38:39.000000000 +0100 +++ clicfs/clicfs.changes 2011-03-21 14:58:39.000000000 +0100 @@ -1,0 +2,8 @@ +Mon Mar 21 13:57:39 UTC 2011 - coolo(a)novell.com + +- update to 1.4.0 + - rework COW file format (packed file format unchanged) + - make use of more threads again + - make COW syncing much more robust and faster too + +------------------------------------------------------------------- calling whatdependson for head-i586 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ clicfs.spec ++++++ --- /var/tmp/diff_new_pack.ppkIJl/_old 2011-03-21 15:29:36.000000000 +0100 +++ /var/tmp/diff_new_pack.ppkIJl/_new 2011-03-21 15:29:36.000000000 +0100 @@ -1,7 +1,7 @@ # -# spec file for package clicfs (Version 1.3.10) +# spec file for package clicfs # -# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2011 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 @@ -22,7 +22,7 @@ BuildRequires: cmake e2fsprogs-devel fuse-devel gcc-c++ openssl-devel xz-devel Requires: fuse Summary: Compressed Loop Image Container -Version: 1.3.10 +Version: 1.4.0 Release: 1 License: GPLv2 Group: System/Filesystems @@ -36,7 +36,6 @@ creating a copy on write behaviour. - %prep %setup -c %name ++++++ clicfs.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/README new/README --- old/README 2010-11-30 13:37:15.000000000 +0100 +++ new/README 2011-03-21 14:55:37.000000000 +0100 @@ -1 +1,9 @@ This is not really worth the read (yet). + +COWFILE FORMAT: + 9 bytes: CLICCOW%02d + 8 bytes: file size (including sparse) + + num_pages*: + - 4 bytes: page index in cow (if > 0) + diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/misc/makeiso.sh new/misc/makeiso.sh --- old/misc/makeiso.sh 1970-01-01 01:00:00.000000000 +0100 +++ new/misc/makeiso.sh 2011-03-21 14:55:37.000000000 +0100 @@ -0,0 +1 @@ +make && cp src/clicfs initrd/usr/bin/clicfs && (cd initrd ; find . | cpio --create --format=newc --quiet | gzip -9 -f > ../CD1/boot/x86_64/loader/initrd) && genisoimage -R -J -f -pad -joliet-long -no-emul-boot -boot-load-size 4 -boot-info-table -b boot/x86_64/loader/isolinux.bin -o kde2.iso CD1/; isohybrid -id $(cat CD1/boot/grub/mbrid) kde2.iso && dd if=/dev/zero seek=1000 count=1 bs=1M of=kde2.iso diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/src/clicfs.c new/src/clicfs.c --- old/src/clicfs.c 2010-11-30 13:37:15.000000000 +0100 +++ new/src/clicfs.c 2011-03-21 14:55:37.000000000 +0100 @@ -17,6 +17,7 @@ */ #define FUSE_USE_VERSION 26 +#define _GNU_SOURCE #include <unistd.h> #include "clicfs.h" @@ -31,7 +32,7 @@ #include <sys/time.h> #include <sys/mman.h> -#define DEBUG 0 +//#define DEBUG 1 FILE *logger = 0; @@ -46,30 +47,31 @@ static uint32_t clic_find_next_cow() { - if (cows_index > 0) - return cows[--cows_index]; - return cow_pages + cow_index_pages; + if (cows_index > 0) { + //if (logger) fprintf(logger, "find_next (old): %d\n", cows[cows_index-1]); + return cows[--cows_index]; + } + //if (logger) fprintf(logger, "find_next (new): %d\n", cow_pages + 1); + return cow_pages + 1; } -static int clic_detach(size_t block, int islock); +static int clic_detach(size_t block); static int clic_write_cow(); pthread_mutex_t cowfile_mutex = PTHREAD_MUTEX_INITIALIZER; pthread_mutex_t cowfile_mutex_writer = PTHREAD_MUTEX_INITIALIZER; +pthread_mutex_t coms_by_part_mutex = PTHREAD_MUTEX_INITIALIZER; -static int clic_write_cow(int islocked) +static int clic_write_cow() { if (!cowfilename || cowfile_ro == 1 || !detached_allocated) return 0; int ret = 0; - //if (logger) fprintf(logger, "cow detached %dMB\n", (int)(detached_allocated / 1024)); + if (logger) fprintf(logger, "cow detached %dMB\n", (int)(detached_allocated / 1024)); if (logger) fprintf(logger, "clic_write_cow %ld\n", pthread_self()); - if (!islocked) { - pthread_mutex_lock(&cowfile_mutex_writer); - } pthread_mutex_lock(&cowfile_mutex); uint32_t i; @@ -78,95 +80,38 @@ long ptr = (long)blockmap[i]; if ( ptr && PTR_CLASS(ptr) == CLASS_MEMORY ) { // detached now off_t cowindex = clic_find_next_cow(); - off_t seeked = lseek(cowfilefd, cowindex * pagesize, SEEK_SET); - assert(seeked == (off_t)(cowindex * pagesize)); - size_t ret = write(cowfilefd, blockmap[i], pagesize); - assert(ret == pagesize); + ssize_t pret = pwrite(cowfilefd, blockmap[i], pagesize, cowindex * pagesize + cow_pages_start); + //if (logger) fprintf(logger, "pwrote %ld %ld -> %ld\n", pagesize, cowindex * pagesize + cow_pages_start, pret); + if (pret < 0) { + perror("pwrite cow"); + if (logger) fprintf(logger, "failed %s\n", strerror(errno)); + ret = -errno; + cowfile_ro = 1; + goto exit; + } + assert(pret == (ssize_t)pagesize); free(blockmap[i]); detached_allocated -= (pagesize / 1024); - blockmap[i] = (unsigned char*)(long)(cowindex << 2) + 2; - cow_pages++; - } - } - - assert(!detached_allocated); - - off_t seeked = lseek(cowfilefd, 0, SEEK_SET); - assert(seeked == 0); - uint64_t stringlen = thefilesize; - - char head[10]; - sprintf(head, "CLICCOW%02d", DOENER_MAGIC); - uint32_t index_len = write(cowfilefd, head, 9); - - index_len += write(cowfilefd, (char*)&stringlen, sizeof(uint64_t)); - stringlen = cow_pages; - index_len += write(cowfilefd, (char*)&stringlen, sizeof(uint32_t)); - stringlen = 0; - - index_len += 2 * sizeof(uint32_t) * cow_pages; - uint32_t new_cow_index_pages = index_len / pagesize + 1; - uint32_t moving; - uint32_t moved = 0; - - // should all be out - assert(cows_index == 0); - - pthread_mutex_unlock(&cowfile_mutex); - - for (moving = cow_index_pages; moving < new_cow_index_pages; ++moving) - { - // we only have a map from memory to cow, so we need to - // look up in reverse to find the page to move - // if this proves to be slow, we need even more memory - // to keep the reverse map - for (i = 0; i < num_pages; ++i) - { - long ptr = (long)blockmap[i]; - if (PTR_CLASS(ptr) == CLASS_COW) { // block - if ((uint32_t)(ptr >> 2) == moving) { - if (logger) fprintf(logger, "moving %ld %ld\n", (long)moving, (long)i); - clic_detach(i, 1); - moved++; - break; - } + blockmap[i] = (unsigned char*)(long)(cowindex << 2) + CLASS_COW; + uint32_t value = cowindex; + off_t offset = cow_index_start + i * sizeof(uint32_t); + pret = pwrite(cowfilefd, (char*)&value, sizeof(uint32_t), offset); + if (pret < 0) { + perror("pwrite2 cow"); + ret = -errno; } + //if (logger) fprintf(logger, "pwrote2 %d %d %ld -> %ld\n", i, cowindex, offset, pret); + cow_pages++; } } - assert(moved == cows_index); - - cow_index_pages = new_cow_index_pages; - - /* if we moved, we need to redetach */ - if (moved) { - cows_index = 0; - ret = clic_write_cow(1); - goto exit; - } - - pthread_mutex_lock(&cowfile_mutex); - - for (i = 0; i < num_pages; ++i) - { - long ptr = (long)blockmap[i]; - 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)); - stringlen++; - } - } - - assert(stringlen == cow_pages); - write(cowfilefd, (char*)&index_len, sizeof(uint32_t)); + fdatasync(cowfilefd); + last_sync = time(0); + // not true for threads assert(!detached_allocated); - pthread_mutex_unlock(&cowfile_mutex); - exit: - if (!islocked) - pthread_mutex_unlock(&cowfile_mutex_writer); - + pthread_mutex_unlock(&cowfile_mutex); + if (logger) fprintf(logger, "clic_write_cow %ld done %d\n", pthread_self(), ret); return ret; } @@ -247,8 +192,6 @@ struct buffer_combo *coms_sort_by_use_last = 0; static unsigned int com_count = 0; -pthread_mutex_t picker = PTHREAD_MUTEX_INITIALIZER, seeker = PTHREAD_MUTEX_INITIALIZER;; - FILE *pack; static void clic_append_by_use(struct buffer_combo *com) @@ -280,6 +223,7 @@ return; } if (coms_sort_by_part_size == after + 1) { // just append + assert(coms_sort_by_part_size < MAX_COMS_SIZE); coms_by_part[coms_sort_by_part_size] = com; } else { // I don't like memmove @@ -287,6 +231,7 @@ for (i = coms_sort_by_part_size-1; i > after; i--) coms_by_part[i+1] = coms_by_part[i]; coms_by_part[after+1] = com; + assert(after + 1 < MAX_COMS_SIZE); } coms_sort_by_part_size++; clic_append_by_use(com); @@ -360,6 +305,7 @@ } } else free(com->out_buffer); + if (logger) fprintf(logger, "free block %d\n", com->part); memory_used -= com->out_buffer_size; int32_t res = binary_search(coms_by_part, coms_sort_by_part_size, com->part); assert(coms_by_part[res] == com); @@ -379,11 +325,13 @@ //if (logger) fprintf(logger, "clic_uncompress %d %d\n", part, parts); time_t now = time(0); + pthread_mutex_lock(&coms_by_part_mutex); + if (coms_sort_by_use_first) // clean up { if (0) clic_dump_use(); // if the oldest is 1m, drop it - while (coms_sort_by_use_first && (now - coms_sort_by_use_first->last_used > 30 || (memory_used > 1024 * 1024 * 10 && coms_sort_by_use_first->part != part))) { + while (coms_sort_by_use_first && (now - coms_sort_by_use_first->last_used > 40 || (memory_used > 1024 * 1024 * 40 && coms_sort_by_use_first->part != part))) { clic_free_com(coms_sort_by_use_first); } //clic_dump_use(); @@ -397,6 +345,7 @@ com->last_used = now; clic_remove_com_from_use(com); clic_append_by_use(com); + pthread_mutex_unlock(&coms_by_part_mutex); return buf; } @@ -409,6 +358,7 @@ } struct buffer_combo *com = malloc(sizeof(struct buffer_combo)); + assert(com); memory_used += sizeof(struct buffer_combo); if (part < largeparts) { com->out_buffer_size = blocksize_large*pagesize; @@ -422,6 +372,7 @@ } else { com->out_buffer_size = blocksize_small*pagesize; com->out_buffer = malloc(blocksize_small*pagesize); + assert(com->out_buffer); com->mmapped = 0; } memory_used += com->out_buffer_size; @@ -430,12 +381,12 @@ clic_insert_com(com, res); - pthread_mutex_lock(&seeker); + pthread_mutex_unlock(&coms_by_part_mutex); unsigned char *inbuffer = malloc(sizes[part]); + assert(inbuffer); struct timeval begin, end; gettimeofday(&begin, 0); size_t readin = clic_readpart(inbuffer, part); - pthread_mutex_unlock(&seeker); gettimeofday(&end, 0); if (!readin) { free(inbuffer); @@ -446,7 +397,7 @@ if (logger) fprintf(logger, "uncompress %d %ld-%ld %ld (read took %ld - started %ld)\n", part, (long)offs[part], (long)sizes[part], (long)readin, (end.tv_sec - begin.tv_sec) * 1000 + (end.tv_usec - begin.tv_usec) / 1000, (begin.tv_sec - start.tv_sec) * 1000 + (begin.tv_usec - start.tv_usec) / 1000 ); #endif if (!clic_decompress_part(com->out_buffer, inbuffer, readin)) { - if (logger) fprintf(logger, "uncompess of part %d failed - ignoring", part); + if (logger) fprintf(logger, "uncompess of part %d failed - ignoring\n", part); } free(inbuffer); @@ -475,81 +426,105 @@ static ssize_t clic_read_block(char *buf, size_t block); -static int clic_detach(size_t block, int islocked) +static int clic_detach(size_t block) { assert(block < num_pages); - if (!islocked) - pthread_mutex_lock(&cowfile_mutex_writer); - int ret = 0; + //if (logger) fprintf(logger, "clic_detach\n"); unsigned char *ptr = blockmap[block]; + //if (logger) fprintf(logger, "clic_detach1 %ld\n", PTR_CLASS(ptr)); if ((PTR_CLASS(ptr) == CLASS_RO ) || (PTR_CLASS(ptr) == CLASS_COW)) { if (PTR_CLASS(ptr) == CLASS_COW) { - if (cows_index == CLICFS_COW_COUNT - 1) - clic_write_cow(1); + if (logger) fprintf(logger, "detach2 cow %d index\n", cows_index); + if (cows_index == CLICFS_COW_COUNT - 1) { + ret = clic_write_cow(); + if (logger) fprintf(logger, "detach cow %d\n", ret); + } + } + + if (cowfilename && cowfile_ro == 1) { + ret = -EROFS; + goto exit; } char *newptr = malloc(pagesize); + assert(newptr); + //if (logger) fprintf(logger, "clic_detach3 %ld\n", PTR_CLASS(newptr)); detached_allocated += (pagesize / 1024); if (logger && detached_allocated % 1024 == 0 ) fprintf(logger, "detached %dMB\n", (int)(detached_allocated / 1024)); clic_read_block(newptr, block); - if (PTR_CLASS(ptr) == CLASS_COW) { // we need to mark the place in the cow obsolete - //if (logger) fprintf(logger, "detach block %ld (was %ld)\n", (long)block, (long)ptr >> 2); + if (PTR_CLASS(ptr) == CLASS_COW && !cowfile_ro) { // we need to mark the place in the cow obsolete + if (logger) fprintf(logger, "detach block %ld (was %ld)\n", (long)block, (long)ptr >> 2); + assert(cows_index < CLICFS_COW_COUNT); cows[cows_index++] = (long)ptr >> 2; cow_pages--; } blockmap[block] = (unsigned char*)newptr; - ret = 1; goto exit; } + //if (logger) fprintf(logger, "clic_detach2 %p\n", blockmap[block]); if (!blockmap[block]) { - blockmap[block] = malloc(pagesize); - assert(PTR_CLASS(ptr) == CLASS_MEMORY); + if (cowfilename && cowfile_ro == 1) { + ret = -EROFS; + goto exit; + } + + blockmap[block] = malloc(pagesize); + //if (logger) fprintf(logger, "clic_detach4 %p\n", blockmap[block]); + assert(blockmap[block]); + //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); - ret = 1; } exit: - if (!islocked) - pthread_mutex_unlock(&cowfile_mutex_writer); - + //if (logger) fprintf(logger, "clic_detach done %d\n", ret); return ret; } static size_t clic_write_block(const char *buf, off_t block, off_t ioff, size_t size) { - clic_detach(block, 1); + //if (logger) fprintf(logger, "clic_write_block %ld\n", detached_allocated); + if (clic_detach(block)) { + if (logger) fprintf(logger, "clic_detach FAILED\n"); + return -ENOSPC; + } memcpy(blockmap[block]+ioff, buf, size); + + if (detached_allocated > 40000) + clic_write_cow(); + return size; } static int clic_write(const char *path, const char *buf, size_t size, off_t offset, struct fuse_file_info *fi) { - //if (logger) fprintf(logger, "write %s %ld %ld\n", path, offset, size); + if (logger) fprintf(logger, "%lx write0 %s %ld %ld %lx\n", pthread_self(), path, offset, size, pthread_self()); (void) fi; if(path[0] == '/' && strcmp(path + 1, thefile) != 0) return -ENOENT; - if (offset >= (off_t)thefilesize) + if (offset >= (off_t)thefilesize) { + if (logger) fprintf(logger, "%lx writeF %s %ld %ld -> 0!! %lx\n", pthread_self(), path, offset, size, pthread_self()); return 0; + } - if (offset+size > (off_t)thefilesize) + if ((off_t)(offset+size) > (off_t)thefilesize) size = thefilesize-offset; - if (!size) + if (!size) { + if (logger) fprintf(logger, "%lx write %s %ld %ld -> 0!!\n", pthread_self(), path, offset, size); return 0; - - pthread_mutex_lock(&cowfile_mutex_writer); + } off_t block = offset / pagesize; off_t ioff = offset - block * pagesize; @@ -561,12 +536,16 @@ int ret = 0; if (size <= pagesize) { + if (logger) fprintf(logger, "%lx write2 %s %ld %ld\n", pthread_self(), path, offset, size); ret = clic_write_block(buf, block, ioff, size); + if (logger) fprintf(logger, "%lx write3 %s %ld %ld -> %d\n", pthread_self(), path, offset, size, ret); } else { size_t wrote = 0; do { + if (logger) fprintf(logger, "%lx write4 %s %ld %ld %lx\n", pthread_self(), path, offset, size, pthread_self()); size_t diff = clic_write_block(buf, block, ioff, size > pagesize ? pagesize : size); + if (logger) fprintf(logger, "%lx write5 %s %ld %ld -> %ld\n", pthread_self(), path, offset, size, diff); ioff = 0; size -= diff; buf += diff; @@ -576,13 +555,13 @@ ret = wrote; } - pthread_mutex_unlock(&cowfile_mutex_writer); + if (logger) fprintf(logger, "%lx writeD %s %ld %ld -> %d\n", pthread_self(), path, offset, size, ret); return ret; } static ssize_t clic_read_block(char *buf, size_t block) { - if (block >= num_pages) + if (block >= num_pages) return -EFAULT; if (!blockmap[block]) { // sparse block @@ -600,8 +579,7 @@ if (PTR_CLASS(ptr) == CLASS_COW) { off_t target = ptr >> 2; pthread_mutex_lock(&cowfile_mutex); - lseek(cowfilefd, target * pagesize, SEEK_SET); - ssize_t haveread = read(cowfilefd, buf, pagesize); + ssize_t haveread = pread(cowfilefd, buf, pagesize, target * pagesize + cow_pages_start); pthread_mutex_unlock(&cowfile_mutex); return haveread; } @@ -635,7 +613,7 @@ static int clic_read(const char *path, char *buf, size_t size, off_t offset, struct fuse_file_info *fi) { - //if (logger) fprintf(logger, "read %ld %ld %ld\n", offset, size, thefilesize); + // if (logger) fprintf(logger, "read %ld %ld %ld\n", offset, size, thefilesize); (void) fi; if(path[0] == '/' && strcmp(path + 1, thefile) != 0) return -ENOENT; @@ -645,8 +623,6 @@ assert(size % pagesize == 0); assert(offset % pagesize == 0); - pthread_mutex_lock(&cowfile_mutex_writer); - do { if (offset >= (off_t)thefilesize) @@ -654,7 +630,8 @@ off_t block = offset / pagesize; ssize_t diff = clic_read_block(buf, block); if (diff < 0) { - return diff; + //if (logger) fprintf(logger, "read %ld %ld %ld -> %ld!!\n", offset, size, thefilesize, diff); + return diff; } //if (logger) fprintf(logger, "read block %ld: %ld bytes\n", (long)block, (long)diff); if (!diff) @@ -665,8 +642,7 @@ readtotal += diff; } while (size > 0); - pthread_mutex_unlock(&cowfile_mutex_writer); - + //if (logger) fprintf(logger, "read %ld %ld %ld -> %ld\n", offset, size, thefilesize, readtotal); return readtotal; } @@ -675,9 +651,8 @@ (void)path; (void)fi; // TODO write out cow - if (logger) fflush(logger); - clic_write_cow(0); - return 0; + if (logger) { fprintf(logger, "flush\n"); fflush(logger); } + return clic_write_cow(); } static int clic_fsync(const char *path, int datasync, struct fuse_file_info *fi) @@ -686,13 +661,10 @@ (void)fi; (void)datasync; // TODO write out cow - if (logger) fflush(logger); - clic_write_cow(0); - last_sync = time(0); - pthread_mutex_lock(&cowfile_mutex); - if (cowfilefd >= 0) fsync(cowfilefd); - pthread_mutex_unlock(&cowfile_mutex); - return 0; + if (logger) { fprintf(logger, "sync\n"); fflush(logger); } + + int ret = clic_write_cow(); + return ret; } static void *clic_sync_thread(void *arg) @@ -720,6 +692,7 @@ { // avoid random reads or our profiling will be destroyed conn->max_readahead = 0; + clic_sync_tid = 0; pthread_create(&clic_sync_tid, NULL, clic_sync_thread, 0); @@ -730,9 +703,11 @@ { (void)arg; if (logger) fprintf(logger, "destroy\n"); - pthread_cancel(clic_sync_tid); - void *res; - pthread_join(clic_sync_tid, &res); + if (clic_sync_tid > 0) { + pthread_cancel(clic_sync_tid); + void *res; + pthread_join(clic_sync_tid, &res); + } } @@ -810,18 +785,21 @@ assert( DOENER_MAGIC < 100 ); int index_len = fprintf(cow, "CLICCOW%02d", DOENER_MAGIC ); - index_len += fwrite((char*)&bigfilesize, 1, sizeof(uint64_t), cow); - uint32_t stringlen = 0; - // there are 0 blocks - index_len += fwrite((char*)&stringlen, 1, sizeof(uint32_t), cow); - // the whole index is 12 bytes long - stringlen = index_len + sizeof(uint32_t); - index_len += fwrite((char*)&stringlen, 1, sizeof(uint32_t), cow); - fclose(cow); - cow_index_pages = index_len / pagesize + 1; - cow_pages = 0; + char zeros[sizeof(uint32_t)]; + memset(zeros, 0, sizeof(uint32_t)); + + size_t write_pages = bigfilesize / pagesize; + blockmap = realloc(blockmap, sizeof(unsigned char*)*write_pages); + unsigned int i; + for (i = num_pages; i < write_pages; ++i) + blockmap[i] = 0; + num_pages = write_pages; + + for (i = 0; i < num_pages; ++i) + fwrite(zeros, 1, sizeof(uint32_t), cow); + fclose(cow); return 0; } @@ -848,7 +826,8 @@ } // not sure why but multiple threads make it slower - fuse_opt_add_arg(&args, "-s"); + //fuse_opt_add_arg(&args, "-s"); + fuse_opt_add_arg(&args, "-obig_writes"); if (!packfilename) { fprintf(stderr, "usage: [-m <mb>] [-l <logfile|->] [-c <cowfile>] <packfile> <mntpoint>\n"); @@ -862,6 +841,12 @@ free(packfilename); + int procfile = open("/proc/self/om_score_adj", O_WRONLY); + if (procfile > 0) { + write(procfile, "-1000", sizeof("-1000")); + close(procfile); + } + if (cowfilename) { if (access(cowfilename, R_OK)) @@ -891,16 +876,18 @@ } for (i = 0; i < largeparts; ++i) { - posix_fadvise( fileno(packfile), offs[i], sizes[i], POSIX_FADV_SEQUENTIAL); + posix_fadvise( packfilefd, offs[i], sizes[i], POSIX_FADV_SEQUENTIAL); } coms_by_part = malloc(sizeof(struct buffer_combo*)*MAX_COMS_SIZE); + assert(coms_by_part); gettimeofday(&start, 0); /* MAIN LOOP */ int ret = fuse_main(args.argc, args.argv, &clic_oper, NULL); - clic_write_cow(0); + clic_write_cow(); // ignored if (cowfilefd >= 0) close(cowfilefd); if (logger) fclose(logger); + logger=0; while (coms_sort_by_use_first) clic_free_com(coms_sort_by_use_first); @@ -916,7 +903,7 @@ free(blockmap); free(sizes); free(offs); - fclose(packfile); + close(packfilefd); if (cowfilename) free(cowfilename); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/src/clicfs.h new/src/clicfs.h --- old/src/clicfs.h 2010-11-30 13:37:15.000000000 +0100 +++ new/src/clicfs.h 2011-03-21 14:55:37.000000000 +0100 @@ -23,7 +23,7 @@ #include <sys/types.h> extern int preset; -extern FILE *packfile; +extern int packfilefd; extern int cowfilefd; // magic 2 added large parts @@ -53,8 +53,10 @@ extern uint32_t num_pages; // the number of pages marked as CLASS_COW extern uint32_t cow_pages; -// the number of pages in the cow for index -extern unsigned int cow_index_pages; +// the offset in the cow file where the page index starts +extern off_t cow_index_start; +// the offset in the cow file where the pages start +extern off_t cow_pages_start; // support temporary changes on ro medium extern int cowfile_ro; @@ -71,7 +73,7 @@ extern int clic_decompress_part(unsigned char *out, const unsigned char *in, size_t size); extern size_t clic_readpart(unsigned char *buffer, int part); extern off_t clic_map_block(off_t block); -extern uint32_t clic_readindex_fd(int fd ); +extern uint32_t clic_readindex_fd( int fd ); extern void clic_free_lzma(); extern void clic_find_block( off_t block, off_t *part, off_t *offset ); 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 2010-11-30 13:37:15.000000000 +0100 +++ new/src/clicfs_common.c 2011-03-21 14:55:37.000000000 +0100 @@ -16,6 +16,9 @@ 02110-1301, USA */ +#define _GNU_SOURCE +//#define DEBUG 1 + #include "clicfs.h" #include <stdio.h> #include <stdlib.h> @@ -26,9 +29,10 @@ #include <sys/stat.h> #include <unistd.h> #include <fcntl.h> +#include <pthread.h> int preset = 0; -FILE *packfile = 0; +int packfilefd = -1; int cowfilefd = -1; char thefile[PATH_MAX]; @@ -44,12 +48,14 @@ unsigned char **blockmap; uint32_t num_pages = 0; uint32_t cow_pages = 0; -uint32_t cow_index_pages = 0; +off_t cow_index_start = 0; +off_t cow_pages_start = 0; uint32_t *cows = 0; unsigned int cows_index = 0; int cowfile_ro = 0; static lzma_stream strm; +static pthread_mutex_t lzma_mutex = PTHREAD_MUTEX_INITIALIZER; uint32_t clic_readindex_fd(int fd) { @@ -69,15 +75,6 @@ return stringlen; } -uint32_t clic_readindex_file(FILE * f) -{ - uint32_t stringlen = 0; - if (fread(&stringlen, 1, sizeof(uint32_t), f) != sizeof(uint32_t)) { - return 0; - } - return stringlen; -} - int clicfs_read_cow(const char *cowfilename) { cowfilefd = open(cowfilename, O_RDWR); @@ -115,33 +112,39 @@ for (i = num_pages; i < newpages; ++i) blockmap[i] = 0; num_pages = newpages; - cow_pages = clic_readindex_fd(cowfilefd); - for (i = 0; i < cow_pages; ++i) + cow_pages = 0; + for (i = 0; i < num_pages; ++i) { - uint32_t pageindex = clic_readindex_fd(cowfilefd); uint32_t page = clic_readindex_fd(cowfilefd); - assert(pageindex < num_pages); - blockmap[pageindex] = (unsigned char*)(long)(page << 2) + 2; + if (page) { + blockmap[i] = (unsigned char*)(long)(page << 2) + CLASS_COW; + cow_pages++; + } } cows = malloc(sizeof(uint32_t) * CLICFS_COW_COUNT); cows_index = 0; - uint32_t index_len = clic_readindex_fd(cowfilefd); - cow_index_pages = index_len / pagesize + 1; + cow_index_start = 9 + sizeof(uint64_t); + cow_pages_start = cow_index_start + num_pages * sizeof(uint32_t); + // we do not round up but down here as cow pages start with 1 + cow_pages_start = ( cow_pages_start / pagesize + 0) * pagesize; return 0; } int clicfs_read_pack(const char *packfilename) { - packfile = fopen(packfilename, "r"); - if (!packfile) { + packfilefd = open(packfilename, O_LARGEFILE|O_RDONLY); + if (packfilefd < 0) { fprintf(stderr, "packfile %s can't be opened\n", packfilename); return 1; } char head[7]; char expected[7]; - fread(head, 1, 6, packfile); + if (read(packfilefd, head, 6) != 6) { + perror("can't read from packfile\n"); + return 1; + } head[6] = 0; sprintf(expected, "CLIC%02d", DOENER_MAGIC); if (strcmp(head,expected)) { @@ -149,46 +152,46 @@ return 1; } - uint32_t stringlen = clic_readindex_file(packfile); + uint32_t stringlen = clic_readindex_fd(packfilefd); if (stringlen == 0 || stringlen >= PATH_MAX) { fprintf(stderr, "abnormal len %lx\n", (long)stringlen); return 1; } - if (fread(thefile, 1, stringlen, packfile) != stringlen) { + if (read(packfilefd, thefile, stringlen) != stringlen) { fprintf(stderr, "short read %ld\n", (long)stringlen); return 1; } thefile[stringlen] = 0; - uint64_t oparts = clic_readindex_file(packfile); - blocksize_small = clic_readindex_file(packfile); - blocksize_large = clic_readindex_file(packfile); - pagesize = clic_readindex_file(packfile); + uint64_t oparts = clic_readindex_fd(packfilefd); + blocksize_small = clic_readindex_fd(packfilefd); + blocksize_large = clic_readindex_fd(packfilefd); + pagesize = clic_readindex_fd(packfilefd); thefilesize = oparts * blocksize_small * pagesize; - preset = clic_readindex_file(packfile); - num_pages = clic_readindex_file(packfile); + preset = clic_readindex_fd(packfilefd); + num_pages = clic_readindex_fd(packfilefd); blockmap = malloc(sizeof(unsigned char*)*num_pages); uint32_t i; for (i = 0; i < num_pages; ++i) { // make sure it's odd to diff between pointer and block - blockmap[i] = (unsigned char*)(long)((clic_readindex_file(packfile) << 2) + 1); + blockmap[i] = (unsigned char*)(long)((clic_readindex_fd(packfilefd) << 2) + 1); } - parts = clic_readindex_file(packfile); - largeparts = clic_readindex_file(packfile); + parts = clic_readindex_fd(packfilefd); + largeparts = clic_readindex_fd(packfilefd); sizes = malloc(sizeof(uint64_t)*parts); offs = malloc(sizeof(uint64_t)*parts); for (i = 0; i < parts; ++i) { - if (fread((char*)(sizes + i), sizeof(uint64_t), 1, packfile) != 1) + if (read(packfilefd, (char*)(sizes + i), sizeof(uint64_t)) != sizeof(uint64_t)) parts = 0; if (!sizes[i]) { fprintf(stderr, "unreasonable size 0 for part %d\n", i); return 1; } - if (fread((char*)(offs + i), sizeof(uint64_t), 1, packfile) != 1) + if (read(packfilefd, (char*)(offs + i), sizeof(uint64_t)) != sizeof(uint64_t)) parts = 0; if (i > 0 && offs[i] <= offs[i-1]) { fprintf(stderr, "the offset for i is not larger than i-1: %ld\n", (long)i); @@ -199,7 +202,7 @@ fprintf(stderr, "unreasonable part number 0\n"); return 1; } - fseeko(packfile, (oparts-parts)*sizeof(uint64_t)*2, SEEK_CUR); + lseek(packfilefd, (oparts-parts)*sizeof(uint64_t)*2, SEEK_CUR); const uint32_t flags = LZMA_TELL_UNSUPPORTED_CHECK | LZMA_CONCATENATED; // C sucks @@ -224,15 +227,11 @@ size_t clic_readpart(unsigned char *buffer, int part) { - if (fseeko(packfile, offs[part], SEEK_SET)) { - fprintf(stderr, "seek failed %d %lld\n", part, (long long)offs[part]); - return 0; - } #if defined(DEBUG) fprintf(stderr, "uncompress part=%d/%d off=%ld size=%ld\n", part, parts, offs[part], sizes[part] ); #endif - size_t readin = fread(buffer, 1, sizes[part], packfile); - if (readin != sizes[part]) { + ssize_t readin = pread(packfilefd, buffer, sizes[part], offs[part]); + if (readin != (ssize_t)sizes[part]) { fprintf(stderr, "short read: %d %ld %ld %ld\n", part, (long)offs[part], (long)sizes[part], (long)readin); // returning half read blocks won't help lzma return 0; @@ -242,6 +241,7 @@ int clic_decompress_part(unsigned char *out, const unsigned char *in, size_t readin) { + pthread_mutex_lock(&lzma_mutex); strm.next_in = in; strm.avail_in = readin; strm.next_out = out; @@ -264,12 +264,14 @@ if (ret == LZMA_DATA_ERROR) { fprintf(stderr, "lzma data corrupt!\n"); + pthread_mutex_unlock(&lzma_mutex); return 0; } #if defined(DEBUG) fprintf(stderr, "ret %d\n", ret); #endif assert (ret == LZMA_OK); + pthread_mutex_unlock(&lzma_mutex); /* don't use lzma_end (will free buffers) or LZMA_FINISH (will forbid any new use) */ return 1; } ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 rfc for openSUSE:Factory
by root＠hilbert.suse.de 21 Mar '11

21 Mar '11

Hello community, here is the log from the commit of package rfc for openSUSE:Factory checked in at Mon Mar 21 15:32:05 CET 2011. -------- --- AUTO/all/rfc/rfc.changes 2011-03-19 02:42:28.000000000 +0100 +++ /mounts/work_src_done/STABLE/rfc/rfc.changes 2011-03-21 12:42:21.000000000 +0100 @@ -2 +2 @@ -Sat Mar 19 02:42:28 CET 2011 - autobuild(a)suse.de +Mon Mar 21 12:42:21 CET 2011 - autobuild(a)suse.de @@ -4 +4 @@ -- automated update on 2011-03-19 +- automated update on 2011-03-21 calling whatdependson for head-i586 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ rfc.spec ++++++ --- /var/tmp/diff_new_pack.f1nsTQ/_old 2011-03-21 15:31:55.000000000 +0100 +++ /var/tmp/diff_new_pack.f1nsTQ/_new 2011-03-21 15:31:55.000000000 +0100 @@ -25,7 +25,7 @@ Summary: The RFCs (Request For Comments) Source: rfc.tgz BuildArch: noarch -Version: 2011.3.19 +Version: 2011.3.21 Release: 1 Url: ftp://ftp.isi.edu/in-notes BuildRoot: %{_tmppath}/%{name}-%{version}-build ++++++ rfc.tgz ++++++ AUTO/all/rfc/rfc.tgz /mounts/work_src_done/STABLE/rfc/rfc.tgz differ: char 5, line 1 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 smolt for openSUSE:Factory
by root＠hilbert.suse.de 21 Mar '11

21 Mar '11

Hello community, here is the log from the commit of package smolt for openSUSE:Factory checked in at Mon Mar 21 15:31:42 CET 2011. -------- --- smolt/smolt.changes 2011-03-15 12:20:23.000000000 +0100 +++ /mounts/work_src_done/STABLE/smolt/smolt.changes 2011-03-21 10:41:59.000000000 +0100 @@ -1,0 +2,6 @@ +Mon Mar 21 09:40:52 UTC 2011 - coolo(a)novell.com + +- do no longer recommend ksmolt, for KDE kpackagekit offers this + functionality and for !KDE smolt-gui is very likely not installed + +------------------------------------------------------------------- calling whatdependson for head-i586 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ smolt.spec ++++++ --- /var/tmp/diff_new_pack.zsQQEU/_old 2011-03-21 15:31:37.000000000 +0100 +++ /var/tmp/diff_new_pack.zsQQEU/_new 2011-03-21 15:31:37.000000000 +0100 @@ -19,7 +19,7 @@ Name: smolt Version: 1.4.3 -Release: 1 +Release: 2 License: GPLv3+ Summary: Hardware Profiler Url: https://fedorahosted.org/smolt/ @@ -56,7 +56,6 @@ Group: Hardware/Other Requires: %{name} = %{version} Requires: python-qt4 -Recommends: ksmolt Supplements: packageand(python-qt4:smolt) %description -n smolt-gui ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 kpackagekit for openSUSE:Factory
by root＠hilbert.suse.de 21 Mar '11

21 Mar '11

Hello community, here is the log from the commit of package kpackagekit for openSUSE:Factory checked in at Mon Mar 21 15:30:33 CET 2011. -------- --- KDE/kpackagekit/kpackagekit.changes 2011-02-21 09:12:34.000000000 +0100 +++ /mounts/work_src_done/STABLE/kpackagekit/kpackagekit.changes 2011-03-21 10:21:00.000000000 +0100 @@ -1,0 +2,6 @@ +Mon Mar 21 09:18:22 UTC 2011 - coolo(a)novell.com + +- fix the smolt diff and obsolete ksmolt, also run it on factory + with its test updates installed + +------------------------------------------------------------------- calling whatdependson for head-i586 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kpackagekit.spec ++++++ --- /var/tmp/diff_new_pack.aOjEtv/_old 2011-03-21 15:29:35.000000000 +0100 +++ /var/tmp/diff_new_pack.aOjEtv/_new 2011-03-21 15:29:35.000000000 +0100 @@ -20,7 +20,7 @@ Name: kpackagekit Version: 0.6.3.3 -Release: 9 +Release: 10 License: GPLv3 Group: System/Packages #http://websvn.kde.org/trunk/playground/sysadmin/kpackagekit/ @@ -40,6 +40,7 @@ Obsoletes: kde4-opensuse-updater < 0.8 Obsoletes: kupjk +Obsoletes: ksmolt = 0.2.3 %kde4_runtime_requires %description ++++++ smolt.diff ++++++ --- /var/tmp/diff_new_pack.aOjEtv/_old 2011-03-21 15:29:35.000000000 +0100 +++ /var/tmp/diff_new_pack.aOjEtv/_new 2011-03-21 15:29:35.000000000 +0100 @@ -1,6 +1,8 @@ iff -rupN kpackagekit-0.6.2/Updater/CMakeLists.txt kpackagekit-0.6.2/Updater/CMakeLists.txt ---- kpackagekit-0.6.2/Updater/CMakeLists.txt 2010-10-06 01:39:37.000000000 +0200 -+++ kpackagekit-0.6.2/Updater/CMakeLists.txt 2010-12-07 14:08:32.392749646 +0100 +Index: kpackagekit-0.6.3.3/Updater/CMakeLists.txt +=================================================================== +--- kpackagekit-0.6.3.3.orig/Updater/CMakeLists.txt 2011-01-03 18:58:18.000000000 +0100 ++++ kpackagekit-0.6.3.3/Updater/CMakeLists.txt 2011-03-21 10:09:04.241991433 +0100 @@ -1,6 +1,7 @@ set(kpk_update_SRCS KpkUpdateDetails.cpp @@ -9,9 +11,10 @@ KpkCheckableHeader.cpp UpdateKCM.cpp ) -diff -rupN kpackagekit-0.6.2/Updater/KpkSmolt.cpp kpackagekit-0.6.2/Updater/KpkSmolt.cpp ---- kpackagekit-0.6.2/Updater/KpkSmolt.cpp 1970-01-01 01:00:00.000000000 +0100 -+++ kpackagekit-0.6.2/Updater/KpkSmolt.cpp 2010-12-07 17:17:58.220827849 +0100 +Index: kpackagekit-0.6.3.3/Updater/KpkSmolt.cpp +=================================================================== +--- /dev/null 1970-01-01 00:00:00.000000000 +0000 ++++ kpackagekit-0.6.3.3/Updater/KpkSmolt.cpp 2011-03-21 10:09:04.241991433 +0100 @@ -0,0 +1,91 @@ +#include "KpkSmolt.h" + @@ -104,9 +107,10 @@ +} + +#include "KpkSmolt.moc" -diff -rupN kpackagekit-0.6.2/Updater/KpkSmolt.h kpackagekit-0.6.2/Updater/KpkSmolt.h ---- kpackagekit-0.6.2/Updater/KpkSmolt.h 1970-01-01 01:00:00.000000000 +0100 -+++ kpackagekit-0.6.2/Updater/KpkSmolt.h 2010-12-07 17:32:58.951283331 +0100 +Index: kpackagekit-0.6.3.3/Updater/KpkSmolt.h +=================================================================== +--- /dev/null 1970-01-01 00:00:00.000000000 +0000 ++++ kpackagekit-0.6.3.3/Updater/KpkSmolt.h 2011-03-21 10:09:04.242991563 +0100 @@ -0,0 +1,30 @@ +#ifndef KPK_SMOLT_H +#define KPK_SMOLT_H @@ -138,9 +142,10 @@ +}; + +#endif -diff -rupN kpackagekit-0.6.2/Updater/UpdateKCM.cpp kpackagekit-0.6.2/Updater/UpdateKCM.cpp ---- kpackagekit-0.6.2/Updater/UpdateKCM.cpp 2010-10-06 01:39:37.000000000 +0200 -+++ kpackagekit-0.6.2/Updater/UpdateKCM.cpp 2010-12-07 17:28:15.190025226 +0100 +Index: kpackagekit-0.6.3.3/Updater/UpdateKCM.cpp +=================================================================== +--- kpackagekit-0.6.3.3.orig/Updater/UpdateKCM.cpp 2011-01-03 18:58:18.000000000 +0100 ++++ kpackagekit-0.6.3.3/Updater/UpdateKCM.cpp 2011-03-21 10:18:07.231681034 +0100 @@ -22,6 +22,7 @@ #include "KpkUpdateDetails.h" @@ -149,7 +154,7 @@ #include "KpkMacros.h" #include "KpkCheckableHeader.h" -@@ -130,6 +131,7 @@ UpdateKCM::UpdateKCM(QWidget *&parent, c +@@ -139,6 +140,7 @@ UpdateKCM::UpdateKCM(QWidget *&parent, c checkUpdatesPB->setIcon(KIcon("view-refresh")); connect(checkUpdatesPB, SIGNAL(clicked(bool)), this, SLOT(refreshCache())); @@ -157,7 +162,7 @@ } UpdateKCM::~UpdateKCM() -@@ -169,6 +171,50 @@ void UpdateKCM::distroUpgrade(PackageKit +@@ -184,6 +186,44 @@ void UpdateKCM::distroUpgrade(PackageKit line->show(); } @@ -172,19 +177,13 @@ + if (! smoltGroup.readEntry("ShowSmoltNotification", true) ) + return; + -+ // run on opensuse only (not on sled) -+ QFile file( "/usr/share/applications/YaST2/suse_register.desktop" ); -+ if (! file.exists() ) -+ return; -+ + // check if smolt is installed -+ QFile execfile( "/usr/bin/smoltGui" ); -+ if (! execfile.exists() ) ++ if (! QFile::exists( "/usr/bin/smoltGui" )) + return; + + // run only if needed dummy file exists -+ QFile smoltdummyfile( "/var/run/smolt_do_opensuse_run" ); -+ if (! smoltdummyfile.exists() ) ++ if (! QFile::exists( "/var/run/smolt_do_opensuse_run") && ++ ! QFile::exists( "/usr/share/doc/packages/update-test-feature/README.update-test-feature") ) + return; + + smolt(); @@ -208,7 +207,7 @@ void UpdateKCM::checkEnableUpdateButton() { emit changed(m_updatesModel->hasChanges()); -@@ -206,6 +252,8 @@ void UpdateKCM::getUpdatesFinished(Enum: +@@ -221,6 +261,8 @@ void UpdateKCM::getUpdatesFinished(Enum: m_updatesT = 0; m_updatesModel->clearSelectedNotPresent(); checkEnableUpdateButton(); @@ -217,10 +216,11 @@ } void UpdateKCM::save() -diff -rupN kpackagekit-0.6.2/Updater/UpdateKCM.h kpackagekit-0.6.2/Updater/UpdateKCM.h ---- kpackagekit-0.6.2/Updater/UpdateKCM.h 2010-10-06 01:39:37.000000000 +0200 -+++ kpackagekit-0.6.2/Updater/UpdateKCM.h 2010-12-07 16:49:46.854025164 +0100 -@@ -52,6 +52,9 @@ private slots: +Index: kpackagekit-0.6.3.3/Updater/UpdateKCM.h +=================================================================== +--- kpackagekit-0.6.3.3.orig/Updater/UpdateKCM.h 2011-01-03 18:58:18.000000000 +0100 ++++ kpackagekit-0.6.3.3/Updater/UpdateKCM.h 2011-03-21 10:09:04.263994227 +0100 +@@ -51,6 +51,9 @@ private slots: void on_packageView_customContextMenuRequested(const QPoint &pos); void distroUpgrade(PackageKit::Enum::DistroUpgrade type, const QString &name, const QString &description); @@ -230,4 +230,3 @@ void getUpdates(); void getUpdatesFinished(PackageKit::Enum::Exit status); - ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 sfftobmp for openSUSE:Factory
by root＠hilbert.suse.de 21 Mar '11

21 Mar '11

Hello community, here is the log from the commit of package sfftobmp for openSUSE:Factory checked in at Mon Mar 21 15:29:24 CET 2011. -------- --- sfftobmp/sfftobmp.changes 2009-02-26 18:47:20.000000000 +0100 +++ sfftobmp/sfftobmp.changes 2011-03-21 13:19:38.000000000 +0100 @@ -1,0 +2,5 @@ +Mon Mar 21 13:17:09 CET 2011 - pth(a)suse.de + +- Compile with BOOST_FILESYSTEM_VERSION=2 to force the v2 API. + +------------------------------------------------------------------- calling whatdependson for head-i586 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ sfftobmp.spec ++++++ --- /var/tmp/diff_new_pack.ANuFtq/_old 2011-03-21 15:29:15.000000000 +0100 +++ /var/tmp/diff_new_pack.ANuFtq/_new 2011-03-21 15:29:15.000000000 +0100 @@ -1,7 +1,7 @@ # -# spec file for package sfftobmp (Version 3.1.1) +# spec file for package sfftobmp # -# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2011 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,11 +20,11 @@ Name: sfftobmp BuildRequires: boost-devel gcc-c++ libjpeg-devel libtiff-devel -License: X11/MIT +License: MIT Group: Hardware/ISDN AutoReqProv: on Version: 3.1.1 -Release: 100 +Release: 111 Summary: Tool to convert Structured Fax Files (.sff) to other image formats Source: %{name}-%{version}.tar.bz2 Url: http://sfftools.sourceforge.net/ @@ -52,6 +52,9 @@ %patch %build +#This will stop working with boost 1.48 +export CPPFLAGS="-DBOOST_FILESYSTEM_VERSION=2" + touch INSTALL NEWS README AUTHORS ChangeLog COPYING autoreconf --force --install %configure ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 libreoffice for openSUSE:Factory
by root＠hilbert.suse.de 21 Mar '11

21 Mar '11

Hello community, here is the log from the commit of package libreoffice for openSUSE:Factory checked in at Mon Mar 21 15:29:16 CET 2011. -------- --- libreoffice/libreoffice.changes 2011-02-23 16:06:29.000000000 +0100 +++ /mounts/work_src_done/STABLE/libreoffice/libreoffice.changes 2011-03-18 18:57:52.000000000 +0100 @@ -1,0 +2,63 @@ +Fri Mar 18 16:40:02 CET 2011 - pmladek(a)suse.cz + +- updated to libreoffice-3.3.2.2 (3.3.2-rc2): + * build + * fix non-working VBA container controls + * l10n + * l10n: update translations from Pootle + * libs-gui + * hidden tabs in Impress tasks panel (fdo#34718) + +------------------------------------------------------------------- +Wed Mar 16 16:45:15 UTC 2011 - neptunia(a)mail.ru + +- enabled KDE3 support (bnc#678998) + +------------------------------------------------------------------- +Wed Mar 9 17:42:27 CET 2011 - pmladek(a)suse.cz + +- updated to libreoffice-3.3.2.1 (3.3.2-rc1): + * build + * enabled KDE4 support for SLED11 + * move the WebDAV patches from NovellOnly to Experimental + * calc + * sheet reference export (i#116833) + * interval range crasher (fdo#34350) + * fixed incorrect cursor navigation (fdo#33756) + * go through all tokens to look for a volatile one (fdo#31939) + * selecting multiple cells does not update headers (fdo#34383) + * better fix for unusable TODAY() in formula computing (fdo#31939) + * filters + * ensure node outlines path (fdo#33701) + * macros not imported for word documents OOXML (fdo#34909) + * VBA event binding for macros imported from XLSM (fdo#34941) + * help + * typo $PRODUCTNAME -> %PRODUCTNAME (fdo#34857) + * remove Online Update and Improvement program (fdo#33468) + * impress + * occasional blank first slide in presentation (fdo#34533) + * libs-core + * restrict metafile decomposition (bnc#650049) + * StarDesktop.terminate() macro behaviour (fdo#30879) + * crashing oosplash and malformed picture (bnc#652562) + * don't leave a thread running after main is completed + * fixed BorderLine(2) conversion to SvxBorderLine (fdo#34226) + * Byref variable in a Declare statement (fdo#33964, i#115716) + * libs-gui + * Cairo canvas edge count calculation + * do not access polygon points outside range + * getEnglishSearchFontName() searches Takao fonts + * size computation for toolbar menus with controls + * catch exceptions from failing UNO-ness (fdo#33785) + * unnecessary reverse lookup on startup (fdo#32640) + * gDIMetaFile::bUseCanvas related changes (bnc#650049) + * work around IM problems with KDE4 integration (bnc#665112) + * sdk + * fix ODK settings.mk to only set STLPORTLIB if needed + * ure + * fix pyuno/demo/pyunoenv.tcsh for PYTHONPATH usage + * writer + * bad RTF when save with ru_RU locale (fdo#33478) + * visual editor produces wrong stack syntax (fdo#32759, fdo#32755) + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- libreoffice-postprocess-3.3.1.2.tar.bz2 New: ---- libreoffice-postprocess-3.3.2.2.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libreoffice.spec ++++++ --- /var/tmp/diff_new_pack.zkiDD2/_old 2011-03-21 15:29:02.000000000 +0100 +++ /var/tmp/diff_new_pack.zkiDD2/_new 2011-03-21 15:29:02.000000000 +0100 @@ -21,11 +21,11 @@ Name: libreoffice # allow to use xulrunner191 on SLED11-SP1 (bnc#540726) %define use_xulrunner191 no -Version: 3.3.1.2 -Release: 2 +Version: 3.3.2.2 +Release: 1 %define piece postprocess -%define ooo_build_version 3.3.1.2 -%define ooo_piece_version 3.3.1.2 +%define ooo_build_version 3.3.2.2 +%define ooo_piece_version 3.3.2.2 %define ooo_sourcedirname libreoffice-build-%ooo_piece_version %define ooo_prefix %_libdir %define ooo_home libreoffice @@ -43,7 +43,7 @@ %endif ############################ # KDE3 stuff -%if 0%{?suse_version} && 0%{?suse_version} <= 1110 +%if 0%{?suse_version} BuildRequires: kdelibs3-devel %endif ############################ ++++++ libreoffice-postprocess-3.3.1.2.tar.bz2 -> libreoffice-postprocess-3.3.2.2.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libreoffice-postprocess-3.3.1.2/ChangeLog new/libreoffice-postprocess-3.3.2.2/ChangeLog --- old/libreoffice-postprocess-3.3.1.2/ChangeLog 2011-02-15 20:18:11.000000000 +0100 +++ new/libreoffice-postprocess-3.3.2.2/ChangeLog 2011-03-15 17:59:30.000000000 +0100 @@ -1,18 +1,13 @@ -2011-02-15 Petr Mladek <pmladek(a)suse.cz> [4813538fc932b1f4699f943043167213e99c9765] +2011-03-15 Petr Mladek <pmladek(a)suse.cz> [81f5a55a5e0d7708a6cfd7a8a0fff6241919595b] -Version 3.3.1.2, tag libreoffice-3.3.1.2 (3.3.1-rc2) +Version 3.3.2.2, tag libreoffice-3.3.2.2 (3.3.2-rc2) -2011-02-08 Petr Mladek <pmladek(a)suse.cz> [634552bb653af74dc0c76090ca00f8c1bbc2b3c7] +2011-03-08 Petr Mladek <pmladek(a)suse.cz> [0ce669039352fae787c6013e4311cd339f141cb5] -Version 3.3.1.1, tag libreoffice-3.3.1.1 (3.3.1-rc1) +Branch libreoffice-3-3-2 - -2011-02-07 Jan Holesovsky <kendy(a)suse.cz> [28074451d6e974855f121fc3cb834175db14c1cd] - -Branch libreoffice-3-3-1 - -This is 'libreoffice-3-3-1' - the stable branch for the 3.3.1 release. +This is 'libreoffice-3-3-2' - the stable branch for the 3.3.2 release. Only very safe changes, reviewed by three people are allowed. If you want to commit more complicated fix for the next 3.3.x release, @@ -20,6 +15,11 @@ If you want to build something cool, unstable, and risky, use master. +2011-03-08 Petr Mladek <pmladek(a)suse.cz> [cea99eac8bb9d21db96ffc0889659fb46cf4bd54] + +Version 3.3.2.1, tag libreoffice-3.3.2.1 (3.3.2-rc1) + + 2011-01-11 Petr Mladek <pmladek(a)suse.cz> [cc61189c518e1a943d4568d43a8a4d37e2a358fd] Please, ignore the previous message; it was for the libreoffice-3-3-0 branch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 libreoffice-l10n-extras for openSUSE:Factory
by root＠hilbert.suse.de 21 Mar '11

21 Mar '11

Hello community, here is the log from the commit of package libreoffice-l10n-extras for openSUSE:Factory checked in at Mon Mar 21 15:29:00 CET 2011. -------- --- libreoffice-l10n-extras/libreoffice-l10n-extras.changes 2011-02-23 16:07:12.000000000 +0100 +++ libreoffice-l10n-extras/libreoffice-l10n-extras.changes 2011-03-18 19:00:49.000000000 +0100 @@ -1,0 +2,10 @@ +Fri Mar 18 16:40:02 CET 2011 - pmladek(a)suse.cz + +- updated to libreoffice-3.3.2.2 (3.3.2-rc2) + +------------------------------------------------------------------- +Wed Mar 9 17:42:27 CET 2011 - pmladek(a)suse.cz + +- updated to libreoffice-3.3.2.1 (3.3.2-rc1) + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- libreoffice-extras-3.3.1.2.tar.bz2 New: ---- libreoffice-extras-3.3.2.2.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libreoffice-l10n-extras.spec ++++++ --- /var/tmp/diff_new_pack.x4st1Z/_old 2011-03-21 15:28:44.000000000 +0100 +++ /var/tmp/diff_new_pack.x4st1Z/_new 2011-03-21 15:28:44.000000000 +0100 @@ -19,11 +19,11 @@ Name: libreoffice-l10n-extras -Version: 3.3.1.2 -Release: 2 +Version: 3.3.2.2 +Release: 1 %define piece extras -%define ooo_build_version 3.3.1.2 -%define ooo_piece_version 3.3.1.2 +%define ooo_build_version 3.3.2.2 +%define ooo_piece_version 3.3.2.2 %define ooo_sourcedirname libreoffice-build-%ooo_piece_version %define ooo_prefix %_libdir %define ooo_home libreoffice ++++++ libreoffice-extras-3.3.1.2.tar.bz2 -> libreoffice-extras-3.3.2.2.tar.bz2 ++++++ libreoffice-l10n-extras/libreoffice-extras-3.3.1.2.tar.bz2 libreoffice-l10n-extras/libreoffice-extras-3.3.2.2.tar.bz2 differ: char 11, line 1 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 libreoffice-branding-upstream for openSUSE:Factory
by root＠hilbert.suse.de 21 Mar '11

21 Mar '11

Hello community, here is the log from the commit of package libreoffice-branding-upstream for openSUSE:Factory checked in at Mon Mar 21 15:28:41 CET 2011. -------- --- libreoffice-branding-upstream/libreoffice-branding-upstream.changes 2011-02-23 16:06:45.000000000 +0100 +++ /mounts/work_src_done/STABLE/libreoffice-branding-upstream/libreoffice-branding-upstream.changes 2011-03-18 18:59:08.000000000 +0100 @@ -1,0 +2,10 @@ +Fri Mar 18 16:40:02 CET 2011 - pmladek(a)suse.cz + +- updated to libreoffice-3.3.2.2 (3.3.2-rc2) + +------------------------------------------------------------------- +Wed Mar 9 17:42:27 CET 2011 - pmladek(a)suse.cz + +- updated to libreoffice-3.3.2.1 (3.3.2-rc1) + +------------------------------------------------------------------- calling whatdependson for head-i586 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libreoffice-branding-upstream.spec ++++++ --- /var/tmp/diff_new_pack.mFQSjq/_old 2011-03-21 15:28:11.000000000 +0100 +++ /var/tmp/diff_new_pack.mFQSjq/_new 2011-03-21 15:28:11.000000000 +0100 @@ -19,10 +19,10 @@ Name: libreoffice-branding-upstream -Version: 3.3.1.2 -Release: 2 -%define ooo_build_version 3.3.1.2 -%define ooo_piece_version 3.3.1.2 +Version: 3.3.2.2 +Release: 1 +%define ooo_build_version 3.3.2.2 +%define ooo_piece_version 3.3.2.2 %define ooo_sourcedirname libreoffice-build-%ooo_piece_version %define ooo_home libreoffice %define ooo_basis_dir basis3.3 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 libreoffice-impress for openSUSE:Factory
by root＠hilbert.suse.de 21 Mar '11

21 Mar '11

Hello community, here is the log from the commit of package libreoffice-impress for openSUSE:Factory checked in at Mon Mar 21 15:28:30 CET 2011. -------- --- libreoffice-impress/libreoffice-impress.changes 2011-02-23 16:07:07.000000000 +0100 +++ libreoffice-impress/libreoffice-impress.changes 2011-03-18 19:00:18.000000000 +0100 @@ -1,0 +2,22 @@ +Fri Mar 18 16:40:02 CET 2011 - pmladek(a)suse.cz + +- updated to libreoffice-3.3.2.2 (3.3.2-rc2) + +------------------------------------------------------------------- +Wed Mar 16 16:45:15 UTC 2011 - neptunia(a)mail.ru + +- enabled KDE3 support (bnc#678998) + +------------------------------------------------------------------- +Wed Mar 9 17:42:27 CET 2011 - pmladek(a)suse.cz + +- updated to libreoffice-3.3.2.1 (3.3.2-rc1) + +------------------------------------------------------------------- +Fri Mar 4 19:22:46 CET 2011 - pmladek(a)suse.cz + +- removed Mesa-devel from BuildRequires on MeeGo; the packages were named + mesa-libGL-devel and mesa-libGLU-devel packages were installed there + by default + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- libreoffice-impress-3.3.1.2.tar.bz2 New: ---- libreoffice-impress-3.3.2.2.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libreoffice-impress.spec ++++++ --- /var/tmp/diff_new_pack.kbu0Rr/_old 2011-03-21 15:25:37.000000000 +0100 +++ /var/tmp/diff_new_pack.kbu0Rr/_new 2011-03-21 15:25:37.000000000 +0100 @@ -19,20 +19,20 @@ Name: libreoffice-impress -Version: 3.3.1.2 -Release: 2 +Version: 3.3.2.2 +Release: 1 %define piece impress -%define ooo_build_version 3.3.1.2 -%define ooo_piece_version 3.3.1.2 +%define ooo_build_version 3.3.2.2 +%define ooo_piece_version 3.3.2.2 %define ooo_sourcedirname libreoffice-build-%ooo_piece_version %define ooo_prefix %_libdir %define ooo_home libreoffice %define ooo_basis_dir basis3.3 #!BuildIgnore: libreoffice #!BuildIgnore: libreoffice-filters-optional -BuildRequires: ImageMagick Mesa-devel ant ant-apache-regexp bison boost-devel ccache cups-devel curl-devel flac-devel flex gcc-c++ gnome-vfs2-devel gperf gtk2-devel icu java-devel libexif libxml2-devel mono-devel neon-devel pam-devel perl-Archive-Zip perl-Compress-Zlib python-devel recode unixODBC-devel unzip xml-commons-apis zip +BuildRequires: ImageMagick ant ant-apache-regexp bison boost-devel ccache cups-devel curl-devel flac-devel flex gcc-c++ gnome-vfs2-devel gperf gtk2-devel icu java-devel libexif libxml2-devel mono-devel neon-devel pam-devel perl-Archive-Zip perl-Compress-Zlib python-devel recode unixODBC-devel unzip xml-commons-apis zip %if 0%{?suse_version} -BuildRequires: db-devel krb5 openldap2-devel update-desktop-files xorg-x11 +BuildRequires: Mesa-devel db-devel krb5 openldap2-devel update-desktop-files xorg-x11 %endif %if 0%{?meego_version} BuildRequires: db4-devel krb5-devel openldap-devel @@ -48,7 +48,7 @@ BuildRequires: libreoffice-filters-devel = %version ############################ # KDE3 stuff -%if 0%{?suse_version} && 0%{?suse_version} <= 1110 +%if 0%{?suse_version} BuildRequires: kdelibs3-devel %endif ############################ ++++++ libreoffice-impress-3.3.1.2.tar.bz2 -> libreoffice-impress-3.3.2.2.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libreoffice-impress-3.3.1.2/ChangeLog new/libreoffice-impress-3.3.2.2/ChangeLog --- old/libreoffice-impress-3.3.1.2/ChangeLog 2011-02-15 20:13:32.000000000 +0100 +++ new/libreoffice-impress-3.3.2.2/ChangeLog 2011-03-15 17:54:39.000000000 +0100 @@ -1,18 +1,13 @@ -2011-02-15 Petr Mladek <pmladek(a)suse.cz> [bc3c1a38a1bc4c5fa0d1790ce0237dec8af07a5c] +2011-03-15 Petr Mladek <pmladek(a)suse.cz> [8282bb6174ae0ed810fa9d2a755916b4fe5cbb2a] -Version 3.3.1.2, tag libreoffice-3.3.1.2 (3.3.1-rc2) +Version 3.3.2.2, tag libreoffice-3.3.2.2 (3.3.2-rc2) -2011-02-08 Petr Mladek <pmladek(a)suse.cz> [778c39e45277c821d83039734d1f0d6636870542] +2011-03-08 Petr Mladek <pmladek(a)suse.cz> [a2c90f8d9c924e20abf98a8fb5185f8e249f3654] -Version 3.3.1.1, tag libreoffice-3.3.1.1 (3.3.1-rc1) +Branch libreoffice-3-3-2 - -2011-02-07 Jan Holesovsky <kendy(a)suse.cz> [a2636e7e8926833cefa3b527dc3a4e3d6d8ffcc7] - -Branch libreoffice-3-3-1 - -This is 'libreoffice-3-3-1' - the stable branch for the 3.3.1 release. +This is 'libreoffice-3-3-2' - the stable branch for the 3.3.2 release. Only very safe changes, reviewed by three people are allowed. If you want to commit more complicated fix for the next 3.3.x release, @@ -20,6 +15,16 @@ If you want to build something cool, unstable, and risky, use master. +2011-03-08 Petr Mladek <pmladek(a)suse.cz> [dbf952b83b4cc8fbb7576a0959142920f824d87d] + +Version 3.3.2.1, tag libreoffice-3.3.2.1 (3.3.2-rc1) + + +2011-02-22 Michael Meeks <michael.meeks(a)novell.com> [89fe9346a5292ddb1ac19ba734034b61e4b628b2] + +fix fdo#34533 - occasional blank first slide in presentation + + 2011-01-11 Petr Mladek <pmladek(a)suse.cz> [b2cdf7bfe14ea650e52a4c90aaf5628b193d8509] Please, ignore the previous message; it was for the libreoffice-3-3-0 branch diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libreoffice-impress-3.3.1.2/sd/source/ui/slideshow/slideshowviewimpl.cxx new/libreoffice-impress-3.3.2.2/sd/source/ui/slideshow/slideshowviewimpl.cxx --- old/libreoffice-impress-3.3.1.2/sd/source/ui/slideshow/slideshowviewimpl.cxx 2010-11-11 16:20:26.000000000 +0100 +++ new/libreoffice-impress-3.3.2.2/sd/source/ui/slideshow/slideshowviewimpl.cxx 2011-03-08 20:12:48.000000000 +0100 @@ -500,7 +500,17 @@ if( pSlideShow ) { ::rtl::Reference< SlideshowImpl > aSLGuard( pSlideShow ); - rGuard.clear(); + + if( mbFirstPaint ) + { + mbFirstPaint = false; + SlideshowImpl* pSlideShow = mpSlideShow; + rGuard.clear(); + if( pSlideShow ) + pSlideShow->onFirstPaint(); + } else + rGuard.clear(); + pSlideShow->startUpdateTimer(); } } ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 libreoffice-help-en-US for openSUSE:Factory
by root＠hilbert.suse.de 21 Mar '11

21 Mar '11

Hello community, here is the log from the commit of package libreoffice-help-en-US for openSUSE:Factory checked in at Mon Mar 21 15:27:55 CET 2011. -------- --- libreoffice-help-en-US/libreoffice-help-en-US.changes 2011-02-23 16:06:58.000000000 +0100 +++ /mounts/work_src_done/STABLE/libreoffice-help-en-US/libreoffice-help-en-US.changes 2011-03-18 19:00:00.000000000 +0100 @@ -1,0 +2,10 @@ +Fri Mar 18 16:40:02 CET 2011 - pmladek(a)suse.cz + +- updated to libreoffice-3.3.2.2 (3.3.2-rc2) + +------------------------------------------------------------------- +Wed Mar 9 17:42:27 CET 2011 - pmladek(a)suse.cz + +- updated to libreoffice-3.3.2.1 (3.3.2-rc1) + +------------------------------------------------------------------- libreoffice-help-group1.changes: same change libreoffice-help-group2.changes: same change libreoffice-help-group3.changes: same change libreoffice-help-group4.changes: same change libreoffice-help-group5.changes: same change calling whatdependson for head-i586 Old: ---- libreoffice-help-3.3.1.2.tar.bz2 New: ---- libreoffice-help-3.3.2.2.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libreoffice-help-en-US.spec ++++++ --- /var/tmp/diff_new_pack.HwfTeH/_old 2011-03-21 15:26:22.000000000 +0100 +++ /var/tmp/diff_new_pack.HwfTeH/_new 2011-03-21 15:26:22.000000000 +0100 @@ -24,11 +24,11 @@ ## Generated by: ## perl lo-help-gen-spec libreoffice-help-en-US.spec.in lo-help-en-US ################################################################### -Version: 3.3.1.2 -Release: 2 +Version: 3.3.2.2 +Release: 1 %define piece help -%define ooo_build_version 3.3.1.2 -%define ooo_piece_version 3.3.1.2 +%define ooo_build_version 3.3.2.2 +%define ooo_piece_version 3.3.2.2 %define ooo_langs "en-US" %define ooo_sourcedirname libreoffice-build-%ooo_piece_version %define ooo_home libreoffice ++++++ libreoffice-help-group1.spec ++++++ --- /var/tmp/diff_new_pack.HwfTeH/_old 2011-03-21 15:26:22.000000000 +0100 +++ /var/tmp/diff_new_pack.HwfTeH/_new 2011-03-21 15:26:22.000000000 +0100 @@ -24,11 +24,11 @@ ## Generated by: ## perl lo-help-gen-spec libreoffice-help-groupX.spec.in lo-help-groupX ################################################################### -Version: 3.3.1.2 -Release: 2 +Version: 3.3.2.2 +Release: 1 %define piece help -%define ooo_build_version 3.3.1.2 -%define ooo_piece_version 3.3.1.2 +%define ooo_build_version 3.3.2.2 +%define ooo_piece_version 3.3.2.2 %define ooo_sourcedirname libreoffice-build-%ooo_piece_version %define ooo_home libreoffice %define ooo_basis_dir basis3.3 libreoffice-help-group2.spec: same change libreoffice-help-group3.spec: same change libreoffice-help-group4.spec: same change libreoffice-help-group5.spec: same change ++++++ libreoffice-help-3.3.1.2.tar.bz2 -> libreoffice-help-3.3.2.2.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libreoffice-help-3.3.1.2/ChangeLog new/libreoffice-help-3.3.2.2/ChangeLog --- old/libreoffice-help-3.3.1.2/ChangeLog 2011-02-15 20:14:19.000000000 +0100 +++ new/libreoffice-help-3.3.2.2/ChangeLog 2011-03-15 17:55:29.000000000 +0100 @@ -1,18 +1,13 @@ -2011-02-15 Petr Mladek <pmladek(a)suse.cz> [736ad5d5e594e1012a597dc5bd7f4d60e6bb3946] +2011-03-15 Petr Mladek <pmladek(a)suse.cz> [9d04a3aca876d35a0fa265ceb934609fd83a0622] -Version 3.3.1.2, tag libreoffice-3.3.1.2 (3.3.1-rc2) +Version 3.3.2.2, tag libreoffice-3.3.2.2 (3.3.2-rc2) -2011-02-08 Petr Mladek <pmladek(a)suse.cz> [2c703b0f3f87ea36f278b0581deef021e0f46bb5] +2011-03-08 Petr Mladek <pmladek(a)suse.cz> [bfa5a67b20321afa99dac1709cbeb57de629ab5c] -Version 3.3.1.1, tag libreoffice-3.3.1.1 (3.3.1-rc1) +Branch libreoffice-3-3-2 - -2011-02-07 Jan Holesovsky <kendy(a)suse.cz> [8f87c4f262787972da6f51e7d4f1a64fe990e5d9] - -Branch libreoffice-3-3-1 - -This is 'libreoffice-3-3-1' - the stable branch for the 3.3.1 release. +This is 'libreoffice-3-3-2' - the stable branch for the 3.3.2 release. Only very safe changes, reviewed by three people are allowed. If you want to commit more complicated fix for the next 3.3.x release, @@ -20,6 +15,30 @@ If you want to build something cool, unstable, and risky, use master. +2011-03-08 Petr Mladek <pmladek(a)suse.cz> [6c28c696fc215c96153454d731294f039dbc357a] + +Version 3.3.2.1, tag libreoffice-3.3.2.1 (3.3.2-rc1) + + +2011-03-03 Andras Timar <timar(a)fsf.hu> [f434a4e0ec81cecb3cebd8f06cd4e5799f078932] + +help: fix typo $PRODUCTNAME -> %PRODUCTNAME fdo#34857 + + +2011-03-03 Andras Timar <timar(a)fsf.hu> [7c132997214080308ed31aaeb74d7d582b79ad15] + +helpcontent: remove Online Update and Improvement program fdo#33468 + +remove improvement.xhp, online_update.xhp, and online_update_dialog.xhp +from makefiles + +2011-03-03 Andras Timar <timar(a)fsf.hu> [383e8a4419acc90af558ca069443cca371fbf6a8] + +helpcontent: remove Online Update and Improvement program fdo#33468 + +text was not removed - we may need it later +commented out + removed from makefile + 2011-02-01 Andras Timar <timar(a)fsf.hu> [a82c930f2a8124eb1a588c046b4b09f2ce18740d] OOo -> LibO on Getting Support Page - fdo#33249 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libreoffice-help-3.3.1.2/helpcontent2/source/text/shared/00/00000406.xhp new/libreoffice-help-3.3.2.2/helpcontent2/source/text/shared/00/00000406.xhp --- old/libreoffice-help-3.3.1.2/helpcontent2/source/text/shared/00/00000406.xhp 2010-11-11 16:19:21.000000000 +0100 +++ new/libreoffice-help-3.3.2.2/helpcontent2/source/text/shared/00/00000406.xhp 2011-03-08 20:12:48.000000000 +0100 @@ -209,14 +209,14 @@ </variable></paragraph> <paragraph xml-lang="en-US" id="par_idN10C3D" role="paragraph" l10n="NEW"><variable id="java">Choose <emph><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - $[officename] - Java</emph> </variable></paragraph> - <paragraph xml-lang="en-US" id="par_id5485702" role="paragraph" l10n="NEW"><variable id="online_update">Choose <emph><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - $[officename] - Online Update </emph> -</variable></paragraph> + <paragraph xml-lang="en-US" id="par_id3146989" role="paragraph" l10n="U" oldref="152"><variable id="accessibility">Choose <emph><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - $[officename] - Accessibility</emph> </variable></paragraph> <paragraph xml-lang="en-US" id="par_id3144746" role="paragraph" l10n="U" oldref="153"><variable id="appearance">Choose <emph><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - $[officename] - Appearance</emph> </variable></paragraph> - <paragraph xml-lang="en-US" id="par_id0526200904120665" role="paragraph" l10n="NEW"><variable id="improvement">Choose <emph><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - $[officename] - Improvement Program</emph> -</variable></paragraph> + <paragraph xml-lang="en-US" id="par_id3156355" role="paragraph" l10n="U" oldref="32"><variable id="landen">Choose <emph><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - Load/Save</emph> </variable></paragraph> <paragraph xml-lang="en-US" id="par_id3147223" role="paragraph" l10n="U" oldref="27"><variable id="rsave">Choose <emph><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - Load/Save - General</emph> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libreoffice-help-3.3.1.2/helpcontent2/source/text/shared/01/makefile.mk new/libreoffice-help-3.3.2.2/helpcontent2/source/text/shared/01/makefile.mk --- old/libreoffice-help-3.3.1.2/helpcontent2/source/text/shared/01/makefile.mk 2010-11-11 16:19:21.000000000 +0100 +++ new/libreoffice-help-3.3.2.2/helpcontent2/source/text/shared/01/makefile.mk 2011-03-08 20:12:48.000000000 +0100 @@ -322,8 +322,6 @@ guides.xhp \ mediaplayer.xhp \ moviesound.xhp \ - online_update.xhp \ - online_update_dialog.xhp \ packagemanager.xhp \ password_dlg.xhp \ password_main.xhp \ @@ -338,7 +336,7 @@ xformsdatachange.xhp \ xformsdataname.xhp \ xformsdatatab.xhp - + # --- Targets ------------------------------------------------------ .INCLUDE : target.mk diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libreoffice-help-3.3.1.2/helpcontent2/source/text/shared/main0108.xhp new/libreoffice-help-3.3.2.2/helpcontent2/source/text/shared/main0108.xhp --- old/libreoffice-help-3.3.1.2/helpcontent2/source/text/shared/main0108.xhp 2010-11-11 16:19:21.000000000 +0100 +++ new/libreoffice-help-3.3.2.2/helpcontent2/source/text/shared/main0108.xhp 2011-03-08 20:12:48.000000000 +0100 @@ -66,10 +66,10 @@ <bookmark xml-lang="en-US" branch="hid/SID_HELP_SUPPORTPAGE" id="bm_id5582987" localize="false"/> <bookmark xml-lang="en-US" branch="hid/.uno:HelpSupport" id="bm_id3159176" localize="false"/><paragraph role="heading" id="hd_id3154898" xml-lang="en-US" level="2" l10n="U" oldref="15">Support</paragraph> <paragraph role="paragraph" id="par_id3157909" xml-lang="en-US" l10n="U" oldref="16"><ahelp hid=".uno:HelpSupport">Shows information on how to get support.</ahelp></paragraph> -<embed href="text/shared/01/08060100.xhp#registrierung"/> + <bookmark xml-lang="en-US" branch="hid/SID_ABOUT" id="bm_id3757052" localize="false"/> <bookmark xml-lang="en-US" branch="hid/.uno:About" id="bm_id3151385" localize="false"/><paragraph role="heading" id="hd_id3153881" xml-lang="en-US" level="2" l10n="U" oldref="7">About $[officename]</paragraph> <paragraph role="paragraph" id="par_id3144510" xml-lang="en-US" l10n="U" oldref="8"><ahelp hid=".uno:About">Displays general program information such as version number and copyrights.</ahelp></paragraph> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libreoffice-help-3.3.1.2/helpcontent2/source/text/shared/optionen/01010000.xhp new/libreoffice-help-3.3.2.2/helpcontent2/source/text/shared/optionen/01010000.xhp --- old/libreoffice-help-3.3.1.2/helpcontent2/source/text/shared/optionen/01010000.xhp 2010-11-11 16:19:21.000000000 +0100 +++ new/libreoffice-help-3.3.2.2/helpcontent2/source/text/shared/optionen/01010000.xhp 2011-03-08 20:12:48.000000000 +0100 @@ -57,8 +57,8 @@ <embed href="text/shared/optionen/01012000.xhp#appearance"/> <embed href="text/shared/optionen/01013000.xhp#accessibility"/> <embed href="text/shared/optionen/java.xhp#java"/> - <embed href="text/shared/optionen/online_update.xhp#online_update"/> - <embed href="text/shared/optionen/improvement.xhp#improvement"/> + <embed href="text/shared/00/00000001.xhp#zurueck"/> </body> </helpdocument> \ No newline at end of file diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libreoffice-help-3.3.1.2/helpcontent2/source/text/shared/optionen/makefile.mk new/libreoffice-help-3.3.2.2/helpcontent2/source/text/shared/optionen/makefile.mk --- old/libreoffice-help-3.3.1.2/helpcontent2/source/text/shared/optionen/makefile.mk 2010-11-11 16:19:21.000000000 +0100 +++ new/libreoffice-help-3.3.2.2/helpcontent2/source/text/shared/optionen/makefile.mk 2011-03-08 20:12:48.000000000 +0100 @@ -113,7 +113,6 @@ 01160100.xhp \ 01160200.xhp \ 01160201.xhp \ - improvement.xhp \ java.xhp \ javaclasspath.xhp \ javaparameters.xhp \ @@ -121,14 +120,13 @@ macrosecurity_sl.xhp \ macrosecurity_ts.xhp \ mailmerge.xhp \ - online_update.xhp \ serverauthentication.xhp \ testaccount.xhp \ viewcertificate.xhp \ viewcertificate_c.xhp \ viewcertificate_d.xhp \ viewcertificate_g.xhp - + # --- Targets ------------------------------------------------------ .INCLUDE : target.mk diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libreoffice-help-3.3.1.2/helpcontent2/source/text/swriter/guide/words_count.xhp new/libreoffice-help-3.3.2.2/helpcontent2/source/text/swriter/guide/words_count.xhp --- old/libreoffice-help-3.3.1.2/helpcontent2/source/text/swriter/guide/words_count.xhp 2010-11-11 16:19:21.000000000 +0100 +++ new/libreoffice-help-3.3.2.2/helpcontent2/source/text/swriter/guide/words_count.xhp 2011-03-08 20:12:48.000000000 +0100 @@ -58,7 +58,7 @@ </listitem> </list> <section id="how"> - <paragraph xml-lang="en-US" id="hd_id1116200901133957" role="heading" level="2" l10n="NEW">How does $PRODUCTNAME count words?</paragraph> + <paragraph xml-lang="en-US" id="hd_id1116200901133957" role="heading" level="2" l10n="NEW">How does %PRODUCTNAME count words?</paragraph> <paragraph xml-lang="en-US" id="par_id1116200901133998" role="paragraph" l10n="NEW">In general, every string of characters between two spaces is a word. Tabs, line breaks, and paragraph breaks are word limits, too.</paragraph> <paragraph xml-lang="en-US" id="par_id1116200901133985" role="paragraph" l10n="NEW">Words with dashes or always visible hyphens, as in plug-in, add-on, user/config, are counted as one word each.</paragraph> <paragraph xml-lang="en-US" id="par_id111620090113399" role="paragraph" l10n="NEW">The words can be a mix of letters, numbers, and special characters. So the following text counts as four words: abc123 1.23 "$" http://www.example.com.</paragraph> @@ -67,4 +67,4 @@ <embed href="text/shared/00/00000004.xhp#related"/> <paragraph xml-lang="en-US" id="par_id3147418" role="paragraph" l10n="U" oldref="4"><link href="text/shared/01/01100400.xhp" name="File - Properties - Statistics">File - Properties - Statistics</link></paragraph> </body> -</helpdocument> \ No newline at end of file +</helpdocument> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libreoffice-help-3.3.1.2/helpcontent2/util/sbasic/makefile.mk new/libreoffice-help-3.3.2.2/helpcontent2/util/sbasic/makefile.mk --- old/libreoffice-help-3.3.1.2/helpcontent2/util/sbasic/makefile.mk 2010-11-11 16:19:21.000000000 +0100 +++ new/libreoffice-help-3.3.2.2/helpcontent2/util/sbasic/makefile.mk 2011-03-08 20:12:48.000000000 +0100 @@ -679,8 +679,6 @@ text$/shared$/01$/guides.xhp \ text$/shared$/01$/mediaplayer.xhp \ text$/shared$/01$/moviesound.xhp \ - text$/shared$/01$/online_update.xhp \ - text$/shared$/01$/online_update_dialog.xhp \ text$/shared$/01$/packagemanager.xhp \ text$/shared$/01$/password_dlg.xhp \ text$/shared$/01$/password_main.xhp \ @@ -1241,7 +1239,6 @@ text$/shared$/optionen$/01160100.xhp \ text$/shared$/optionen$/01160200.xhp \ text$/shared$/optionen$/01160201.xhp \ - text$/shared$/optionen$/improvement.xhp \ text$/shared$/optionen$/java.xhp \ text$/shared$/optionen$/javaclasspath.xhp \ text$/shared$/optionen$/javaparameters.xhp \ @@ -1249,7 +1246,6 @@ text$/shared$/optionen$/macrosecurity_sl.xhp \ text$/shared$/optionen$/macrosecurity_ts.xhp \ text$/shared$/optionen$/mailmerge.xhp \ - text$/shared$/optionen$/online_update.xhp \ text$/shared$/optionen$/serverauthentication.xhp \ text$/shared$/optionen$/testaccount.xhp \ text$/shared$/optionen$/viewcertificate.xhp \ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libreoffice-help-3.3.1.2/helpcontent2/util/scalc/makefile.mk new/libreoffice-help-3.3.2.2/helpcontent2/util/scalc/makefile.mk --- old/libreoffice-help-3.3.1.2/helpcontent2/util/scalc/makefile.mk 2010-11-11 16:19:21.000000000 +0100 +++ new/libreoffice-help-3.3.2.2/helpcontent2/util/scalc/makefile.mk 2011-03-08 20:12:48.000000000 +0100 @@ -692,8 +692,6 @@ text$/shared$/01$/guides.xhp \ text$/shared$/01$/mediaplayer.xhp \ text$/shared$/01$/moviesound.xhp \ - text$/shared$/01$/online_update.xhp \ - text$/shared$/01$/online_update_dialog.xhp \ text$/shared$/01$/packagemanager.xhp \ text$/shared$/01$/password_dlg.xhp \ text$/shared$/01$/password_main.xhp \ @@ -1254,7 +1252,6 @@ text$/shared$/optionen$/01160100.xhp \ text$/shared$/optionen$/01160200.xhp \ text$/shared$/optionen$/01160201.xhp \ - text$/shared$/optionen$/improvement.xhp \ text$/shared$/optionen$/java.xhp \ text$/shared$/optionen$/javaclasspath.xhp \ text$/shared$/optionen$/javaparameters.xhp \ @@ -1262,7 +1259,6 @@ text$/shared$/optionen$/macrosecurity_sl.xhp \ text$/shared$/optionen$/macrosecurity_ts.xhp \ text$/shared$/optionen$/mailmerge.xhp \ - text$/shared$/optionen$/online_update.xhp \ text$/shared$/optionen$/serverauthentication.xhp \ text$/shared$/optionen$/testaccount.xhp \ text$/shared$/optionen$/viewcertificate.xhp \ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libreoffice-help-3.3.1.2/helpcontent2/util/schart/makefile.mk new/libreoffice-help-3.3.2.2/helpcontent2/util/schart/makefile.mk --- old/libreoffice-help-3.3.1.2/helpcontent2/util/schart/makefile.mk 2010-11-11 16:19:21.000000000 +0100 +++ new/libreoffice-help-3.3.2.2/helpcontent2/util/schart/makefile.mk 2011-03-08 20:12:48.000000000 +0100 @@ -380,8 +380,6 @@ text$/shared$/01$/guides.xhp \ text$/shared$/01$/mediaplayer.xhp \ text$/shared$/01$/moviesound.xhp \ - text$/shared$/01$/online_update.xhp \ - text$/shared$/01$/online_update_dialog.xhp \ text$/shared$/01$/packagemanager.xhp \ text$/shared$/01$/password_dlg.xhp \ text$/shared$/01$/password_main.xhp \ @@ -942,7 +940,6 @@ text$/shared$/optionen$/01160100.xhp \ text$/shared$/optionen$/01160200.xhp \ text$/shared$/optionen$/01160201.xhp \ - text$/shared$/optionen$/improvement.xhp \ text$/shared$/optionen$/java.xhp \ text$/shared$/optionen$/javaclasspath.xhp \ text$/shared$/optionen$/javaparameters.xhp \ @@ -950,7 +947,6 @@ text$/shared$/optionen$/macrosecurity_sl.xhp \ text$/shared$/optionen$/macrosecurity_ts.xhp \ text$/shared$/optionen$/mailmerge.xhp \ - text$/shared$/optionen$/online_update.xhp \ text$/shared$/optionen$/serverauthentication.xhp \ text$/shared$/optionen$/testaccount.xhp \ text$/shared$/optionen$/viewcertificate.xhp \ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libreoffice-help-3.3.1.2/helpcontent2/util/sdatabase/makefile.mk new/libreoffice-help-3.3.2.2/helpcontent2/util/sdatabase/makefile.mk --- old/libreoffice-help-3.3.1.2/helpcontent2/util/sdatabase/makefile.mk 2010-11-11 16:19:21.000000000 +0100 +++ new/libreoffice-help-3.3.2.2/helpcontent2/util/sdatabase/makefile.mk 2011-03-08 20:12:48.000000000 +0100 @@ -378,8 +378,6 @@ text$/shared$/01$/guides.xhp \ text$/shared$/01$/mediaplayer.xhp \ text$/shared$/01$/moviesound.xhp \ - text$/shared$/01$/online_update.xhp \ - text$/shared$/01$/online_update_dialog.xhp \ text$/shared$/01$/packagemanager.xhp \ text$/shared$/01$/password_dlg.xhp \ text$/shared$/01$/password_main.xhp \ @@ -940,7 +938,6 @@ text$/shared$/optionen$/01160100.xhp \ text$/shared$/optionen$/01160200.xhp \ text$/shared$/optionen$/01160201.xhp \ - text$/shared$/optionen$/improvement.xhp \ text$/shared$/optionen$/java.xhp \ text$/shared$/optionen$/javaclasspath.xhp \ text$/shared$/optionen$/javaparameters.xhp \ @@ -948,7 +945,6 @@ text$/shared$/optionen$/macrosecurity_sl.xhp \ text$/shared$/optionen$/macrosecurity_ts.xhp \ text$/shared$/optionen$/mailmerge.xhp \ - text$/shared$/optionen$/online_update.xhp \ text$/shared$/optionen$/serverauthentication.xhp \ text$/shared$/optionen$/testaccount.xhp \ text$/shared$/optionen$/viewcertificate.xhp \ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libreoffice-help-3.3.1.2/helpcontent2/util/sdraw/makefile.mk new/libreoffice-help-3.3.2.2/helpcontent2/util/sdraw/makefile.mk --- old/libreoffice-help-3.3.1.2/helpcontent2/util/sdraw/makefile.mk 2010-11-11 16:19:21.000000000 +0100 +++ new/libreoffice-help-3.3.2.2/helpcontent2/util/sdraw/makefile.mk 2011-03-08 20:12:48.000000000 +0100 @@ -613,8 +613,6 @@ text$/shared$/01$/guides.xhp \ text$/shared$/01$/mediaplayer.xhp \ text$/shared$/01$/moviesound.xhp \ - text$/shared$/01$/online_update.xhp \ - text$/shared$/01$/online_update_dialog.xhp \ text$/shared$/01$/packagemanager.xhp \ text$/shared$/01$/password_dlg.xhp \ text$/shared$/01$/password_main.xhp \ @@ -1175,7 +1173,6 @@ text$/shared$/optionen$/01160100.xhp \ text$/shared$/optionen$/01160200.xhp \ text$/shared$/optionen$/01160201.xhp \ - text$/shared$/optionen$/improvement.xhp \ text$/shared$/optionen$/java.xhp \ text$/shared$/optionen$/javaclasspath.xhp \ text$/shared$/optionen$/javaparameters.xhp \ @@ -1183,7 +1180,6 @@ text$/shared$/optionen$/macrosecurity_sl.xhp \ text$/shared$/optionen$/macrosecurity_ts.xhp \ text$/shared$/optionen$/mailmerge.xhp \ - text$/shared$/optionen$/online_update.xhp \ text$/shared$/optionen$/serverauthentication.xhp \ text$/shared$/optionen$/testaccount.xhp \ text$/shared$/optionen$/viewcertificate.xhp \ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libreoffice-help-3.3.1.2/helpcontent2/util/simpress/makefile.mk new/libreoffice-help-3.3.2.2/helpcontent2/util/simpress/makefile.mk --- old/libreoffice-help-3.3.1.2/helpcontent2/util/simpress/makefile.mk 2010-11-11 16:19:21.000000000 +0100 +++ new/libreoffice-help-3.3.2.2/helpcontent2/util/simpress/makefile.mk 2011-03-08 20:12:48.000000000 +0100 @@ -615,8 +615,6 @@ text$/shared$/01$/guides.xhp \ text$/shared$/01$/mediaplayer.xhp \ text$/shared$/01$/moviesound.xhp \ - text$/shared$/01$/online_update.xhp \ - text$/shared$/01$/online_update_dialog.xhp \ text$/shared$/01$/packagemanager.xhp \ text$/shared$/01$/password_dlg.xhp \ text$/shared$/01$/password_main.xhp \ @@ -1177,7 +1175,6 @@ text$/shared$/optionen$/01160100.xhp \ text$/shared$/optionen$/01160200.xhp \ text$/shared$/optionen$/01160201.xhp \ - text$/shared$/optionen$/improvement.xhp \ text$/shared$/optionen$/java.xhp \ text$/shared$/optionen$/javaclasspath.xhp \ text$/shared$/optionen$/javaparameters.xhp \ @@ -1185,7 +1182,6 @@ text$/shared$/optionen$/macrosecurity_sl.xhp \ text$/shared$/optionen$/macrosecurity_ts.xhp \ text$/shared$/optionen$/mailmerge.xhp \ - text$/shared$/optionen$/online_update.xhp \ text$/shared$/optionen$/serverauthentication.xhp \ text$/shared$/optionen$/testaccount.xhp \ text$/shared$/optionen$/viewcertificate.xhp \ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libreoffice-help-3.3.1.2/helpcontent2/util/smath/makefile.mk new/libreoffice-help-3.3.2.2/helpcontent2/util/smath/makefile.mk --- old/libreoffice-help-3.3.1.2/helpcontent2/util/smath/makefile.mk 2010-11-11 16:19:21.000000000 +0100 +++ new/libreoffice-help-3.3.2.2/helpcontent2/util/smath/makefile.mk 2011-03-08 20:12:48.000000000 +0100 @@ -458,8 +458,6 @@ text$/shared$/01$/guides.xhp \ text$/shared$/01$/mediaplayer.xhp \ text$/shared$/01$/moviesound.xhp \ - text$/shared$/01$/online_update.xhp \ - text$/shared$/01$/online_update_dialog.xhp \ text$/shared$/01$/packagemanager.xhp \ text$/shared$/01$/password_dlg.xhp \ text$/shared$/01$/password_main.xhp \ @@ -1020,7 +1018,6 @@ text$/shared$/optionen$/01160100.xhp \ text$/shared$/optionen$/01160200.xhp \ text$/shared$/optionen$/01160201.xhp \ - text$/shared$/optionen$/improvement.xhp \ text$/shared$/optionen$/java.xhp \ text$/shared$/optionen$/javaclasspath.xhp \ text$/shared$/optionen$/javaparameters.xhp \ @@ -1028,7 +1025,6 @@ text$/shared$/optionen$/macrosecurity_sl.xhp \ text$/shared$/optionen$/macrosecurity_ts.xhp \ text$/shared$/optionen$/mailmerge.xhp \ - text$/shared$/optionen$/online_update.xhp \ text$/shared$/optionen$/serverauthentication.xhp \ text$/shared$/optionen$/testaccount.xhp \ text$/shared$/optionen$/viewcertificate.xhp \ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libreoffice-help-3.3.1.2/helpcontent2/util/swriter/makefile.mk new/libreoffice-help-3.3.2.2/helpcontent2/util/swriter/makefile.mk --- old/libreoffice-help-3.3.1.2/helpcontent2/util/swriter/makefile.mk 2010-11-11 16:19:21.000000000 +0100 +++ new/libreoffice-help-3.3.2.2/helpcontent2/util/swriter/makefile.mk 2011-03-08 20:12:48.000000000 +0100 @@ -771,8 +771,6 @@ text$/shared$/01$/guides.xhp \ text$/shared$/01$/mediaplayer.xhp \ text$/shared$/01$/moviesound.xhp \ - text$/shared$/01$/online_update.xhp \ - text$/shared$/01$/online_update_dialog.xhp \ text$/shared$/01$/packagemanager.xhp \ text$/shared$/01$/password_dlg.xhp \ text$/shared$/01$/password_main.xhp \ @@ -1333,7 +1331,6 @@ text$/shared$/optionen$/01160100.xhp \ text$/shared$/optionen$/01160200.xhp \ text$/shared$/optionen$/01160201.xhp \ - text$/shared$/optionen$/improvement.xhp \ text$/shared$/optionen$/java.xhp \ text$/shared$/optionen$/javaclasspath.xhp \ text$/shared$/optionen$/javaparameters.xhp \ @@ -1341,7 +1338,6 @@ text$/shared$/optionen$/macrosecurity_sl.xhp \ text$/shared$/optionen$/macrosecurity_ts.xhp \ text$/shared$/optionen$/mailmerge.xhp \ - text$/shared$/optionen$/online_update.xhp \ text$/shared$/optionen$/serverauthentication.xhp \ text$/shared$/optionen$/testaccount.xhp \ text$/shared$/optionen$/viewcertificate.xhp \ ++++++ libreoffice-help-en-US.spec.in ++++++ --- /var/tmp/diff_new_pack.HwfTeH/_old 2011-03-21 15:26:24.000000000 +0100 +++ /var/tmp/diff_new_pack.HwfTeH/_new 2011-03-21 15:26:24.000000000 +0100 @@ -19,11 +19,11 @@ Name: libreoffice-help-en-US @DO_NOT_EDIT_COMMENT@ -Version: 3.3.1.2 +Version: 3.3.2.2 Release: 1 %define piece help -%define ooo_build_version 3.3.1.2 -%define ooo_piece_version 3.3.1.2 +%define ooo_build_version 3.3.2.2 +%define ooo_piece_version 3.3.2.2 %define ooo_langs "en-US" %define ooo_sourcedirname libreoffice-build-%ooo_piece_version %define ooo_home libreoffice ++++++ libreoffice-help-groupX.spec.in ++++++ --- /var/tmp/diff_new_pack.HwfTeH/_old 2011-03-21 15:26:24.000000000 +0100 +++ /var/tmp/diff_new_pack.HwfTeH/_new 2011-03-21 15:26:24.000000000 +0100 @@ -19,11 +19,11 @@ Name: libreoffice-help-group@GROUP_NUMBER@ @DO_NOT_EDIT_COMMENT@ -Version: 3.3.1.2 +Version: 3.3.2.2 Release: 1 %define piece help -%define ooo_build_version 3.3.1.2 -%define ooo_piece_version 3.3.1.2 +%define ooo_build_version 3.3.2.2 +%define ooo_piece_version 3.3.2.2 %define ooo_sourcedirname libreoffice-build-%ooo_piece_version %define ooo_home libreoffice %define ooo_basis_dir basis3.3 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 libreoffice-calc for openSUSE:Factory
by root＠hilbert.suse.de 21 Mar '11

21 Mar '11

Hello community, here is the log from the commit of package libreoffice-calc for openSUSE:Factory checked in at Mon Mar 21 15:25:47 CET 2011. -------- --- libreoffice-calc/libreoffice-calc.changes 2011-02-23 16:06:47.000000000 +0100 +++ /mounts/work_src_done/STABLE/libreoffice-calc/libreoffice-calc.changes 2011-03-18 18:59:20.000000000 +0100 @@ -1,0 +2,20 @@ +Fri Mar 18 16:40:02 CET 2011 - pmladek(a)suse.cz + +- updated to libreoffice-3.3.2.2 (3.3.2-rc2) + +------------------------------------------------------------------- +Wed Mar 16 16:45:15 UTC 2011 - neptunia(a)mail.ru + +- enabled KDE3 support (bnc#678998) + +------------------------------------------------------------------- +Wed Mar 9 17:42:27 CET 2011 - pmladek(a)suse.cz + +- updated to libreoffice-3.3.2.1 (3.3.2-rc1) + +------------------------------------------------------------------- +Thu Mar 3 15:43:51 UTC 2011 - pmladek(a)novell.com + +- added cppunit-devel into BuildRequires on MeeGo + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- libreoffice-calc-3.3.1.2.tar.bz2 New: ---- libreoffice-calc-3.3.2.2.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libreoffice-calc.spec ++++++ --- /var/tmp/diff_new_pack.2o2tKl/_old 2011-03-21 15:25:37.000000000 +0100 +++ /var/tmp/diff_new_pack.2o2tKl/_new 2011-03-21 15:25:37.000000000 +0100 @@ -19,11 +19,11 @@ Name: libreoffice-calc -Version: 3.3.1.2 -Release: 2 +Version: 3.3.2.2 +Release: 1 %define piece calc -%define ooo_build_version 3.3.1.2 -%define ooo_piece_version 3.3.1.2 +%define ooo_build_version 3.3.2.2 +%define ooo_piece_version 3.3.2.2 %define ooo_sourcedirname libreoffice-build-%ooo_piece_version %define ooo_prefix %_libdir %define ooo_home libreoffice @@ -45,7 +45,7 @@ %endif ############################ # KDE3 stuff -%if 0%{?suse_version} && 0%{?suse_version} <= 1110 +%if 0%{?suse_version} BuildRequires: kdelibs3-devel %endif ############################ @@ -53,6 +53,9 @@ %if 0%{?suse_version} >= 01100 BuildRequires: libcppunit-devel %endif +%if 0%{?meego_version} +BuildRequires: cppunit-devel +%endif License: LGPLv3 Group: Productivity/Office/Suite AutoReqProv: on ++++++ libreoffice-calc-3.3.1.2.tar.bz2 -> libreoffice-calc-3.3.2.2.tar.bz2 ++++++ libreoffice-calc/libreoffice-calc-3.3.1.2.tar.bz2 /mounts/work_src_done/STABLE/libreoffice-calc/libreoffice-calc-3.3.2.2.tar.bz2 differ: char 11, line 1 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 libreoffice-base for openSUSE:Factory
by root＠hilbert.suse.de 21 Mar '11

21 Mar '11

Hello community, here is the log from the commit of package libreoffice-base for openSUSE:Factory checked in at Mon Mar 21 15:25:21 CET 2011. -------- --- libreoffice-base/libreoffice-base.changes 2011-02-23 16:06:35.000000000 +0100 +++ /mounts/work_src_done/STABLE/libreoffice-base/libreoffice-base.changes 2011-03-18 18:58:28.000000000 +0100 @@ -1,0 +2,15 @@ +Fri Mar 18 16:40:02 CET 2011 - pmladek(a)suse.cz + +- updated to libreoffice-3.3.2.2 (3.3.2-rc2) + +------------------------------------------------------------------- +Wed Mar 16 16:45:15 UTC 2011 - neptunia(a)mail.ru + +- enabled KDE3 support (bnc#678998) + +------------------------------------------------------------------- +Wed Mar 9 17:42:27 CET 2011 - pmladek(a)suse.cz + +- updated to libreoffice-3.3.2.1 (3.3.2-rc1) + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- libreoffice-base-3.3.1.2.tar.bz2 New: ---- libreoffice-base-3.3.2.2.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libreoffice-base.spec ++++++ --- /var/tmp/diff_new_pack.sKUDBQ/_old 2011-03-21 15:24:46.000000000 +0100 +++ /var/tmp/diff_new_pack.sKUDBQ/_new 2011-03-21 15:24:46.000000000 +0100 @@ -19,11 +19,11 @@ Name: libreoffice-base -Version: 3.3.1.2 -Release: 2 +Version: 3.3.2.2 +Release: 1 %define piece base -%define ooo_build_version 3.3.1.2 -%define ooo_piece_version 3.3.1.2 +%define ooo_build_version 3.3.2.2 +%define ooo_piece_version 3.3.2.2 %define ooo_sourcedirname libreoffice-build-%ooo_piece_version %define ooo_prefix %_libdir %define ooo_home libreoffice @@ -44,7 +44,7 @@ BuildRequires: libreoffice-libs-core-devel = %version ############################ # KDE3 stuff -%if 0%{?suse_version} && 0%{?suse_version} <= 1110 +%if 0%{?suse_version} BuildRequires: kdelibs3-devel %endif License: LGPLv3 ++++++ libreoffice-base-3.3.1.2.tar.bz2 -> libreoffice-base-3.3.2.2.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libreoffice-base-3.3.1.2/ChangeLog new/libreoffice-base-3.3.2.2/ChangeLog --- old/libreoffice-base-3.3.1.2/ChangeLog 2011-02-15 20:17:28.000000000 +0100 +++ new/libreoffice-base-3.3.2.2/ChangeLog 2011-03-15 17:58:44.000000000 +0100 @@ -1,18 +1,13 @@ -2011-02-15 Petr Mladek <pmladek(a)suse.cz> [8d7ac57a70a6e5d675e151e310ace013a8002326] +2011-03-15 Petr Mladek <pmladek(a)suse.cz> [18f1b2bed2c7cc98c201a7404053642fa7b9d731] -Version 3.3.1.2, tag libreoffice-3.3.1.2 (3.3.1-rc2) +Version 3.3.2.2, tag libreoffice-3.3.2.2 (3.3.2-rc2) -2011-02-08 Petr Mladek <pmladek(a)suse.cz> [a62bc9e4ff6f4ec47300a12ab30e4a6beea0ba85] +2011-03-08 Petr Mladek <pmladek(a)suse.cz> [651057c4980cb6d3945d341fbf652e59a4fb2a55] -Version 3.3.1.1, tag libreoffice-3.3.1.1 (3.3.1-rc1) +Branch libreoffice-3-3-2 - -2011-02-07 Jan Holesovsky <kendy(a)suse.cz> [8bce2b8399c917989cf9072c61947b9854c4d353] - -Branch libreoffice-3-3-1 - -This is 'libreoffice-3-3-1' - the stable branch for the 3.3.1 release. +This is 'libreoffice-3-3-2' - the stable branch for the 3.3.2 release. Only very safe changes, reviewed by three people are allowed. If you want to commit more complicated fix for the next 3.3.x release, @@ -20,6 +15,11 @@ If you want to build something cool, unstable, and risky, use master. +2011-03-08 Petr Mladek <pmladek(a)suse.cz> [946a33c8404212b6d697b1703d3aa370f5c18441] + +Version 3.3.2.1, tag libreoffice-3.3.2.1 (3.3.2-rc1) + + 2011-01-15 Lionel Elie Mamane <lionel(a)mamane.lu> [7351e5dc8e24e51af5af5c17798f26e00626711c] i#116187: report left/right page margin setting ignored on Unix 64 bit (cherry picked from commit 51a9333217687ff16df40ea3bd8983faaf5e425a) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 libreoffice-writer for openSUSE:Factory
by root＠hilbert.suse.de 21 Mar '11

21 Mar '11

Hello community, here is the log from the commit of package libreoffice-writer for openSUSE:Factory checked in at Mon Mar 21 15:25:18 CET 2011. -------- --- libreoffice-writer/libreoffice-writer.changes 2011-02-23 16:07:34.000000000 +0100 +++ libreoffice-writer/libreoffice-writer.changes 2011-03-18 19:03:26.000000000 +0100 @@ -1,0 +2,15 @@ +Fri Mar 18 16:40:02 CET 2011 - pmladek(a)suse.cz + +- updated to libreoffice-3.3.2.2 (3.3.2-rc2) + +------------------------------------------------------------------- +Wed Mar 16 16:45:15 UTC 2011 - neptunia(a)mail.ru + +- enabled KDE3 support (bnc#678998) + +------------------------------------------------------------------- +Wed Mar 9 17:42:27 CET 2011 - pmladek(a)suse.cz + +- updated to libreoffice-3.3.2.1 (3.3.2-rc1) + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- libreoffice-writer-3.3.1.2.tar.bz2 New: ---- libreoffice-writer-3.3.2.2.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libreoffice-writer.spec ++++++ --- /var/tmp/diff_new_pack.pd7JSa/_old 2011-03-21 15:24:53.000000000 +0100 +++ /var/tmp/diff_new_pack.pd7JSa/_new 2011-03-21 15:24:53.000000000 +0100 @@ -19,11 +19,11 @@ Name: libreoffice-writer -Version: 3.3.1.2 -Release: 2 +Version: 3.3.2.2 +Release: 1 %define piece writer -%define ooo_build_version 3.3.1.2 -%define ooo_piece_version 3.3.1.2 +%define ooo_build_version 3.3.2.2 +%define ooo_piece_version 3.3.2.2 %define ooo_sourcedirname libreoffice-build-%ooo_piece_version %define ooo_prefix %_libdir %define ooo_home libreoffice @@ -45,7 +45,7 @@ BuildRequires: libreoffice-filters-devel = %version ############################ # KDE3 stuff -%if 0%{?suse_version} && 0%{?suse_version} <= 1110 +%if 0%{?suse_version} BuildRequires: kdelibs3-devel %endif ############################ ++++++ libreoffice-writer-3.3.1.2.tar.bz2 -> libreoffice-writer-3.3.2.2.tar.bz2 ++++++ libreoffice-writer/libreoffice-writer-3.3.1.2.tar.bz2 libreoffice-writer/libreoffice-writer-3.3.2.2.tar.bz2 differ: char 11, line 1 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 libreoffice-components for openSUSE:Factory
by root＠hilbert.suse.de 21 Mar '11

21 Mar '11

Hello community, here is the log from the commit of package libreoffice-components for openSUSE:Factory checked in at Mon Mar 21 15:24:39 CET 2011. -------- --- libreoffice-components/libreoffice-components.changes 2011-02-23 16:06:51.000000000 +0100 +++ libreoffice-components/libreoffice-components.changes 2011-03-18 18:59:30.000000000 +0100 @@ -1,0 +2,15 @@ +Fri Mar 18 16:40:02 CET 2011 - pmladek(a)suse.cz + +- updated to libreoffice-3.3.2.2 (3.3.2-rc2) + +------------------------------------------------------------------- +Wed Mar 16 16:45:15 UTC 2011 - neptunia(a)mail.ru + +- enabled KDE3 support (bnc#678998) + +------------------------------------------------------------------- +Wed Mar 9 17:42:27 CET 2011 - pmladek(a)suse.cz + +- updated to libreoffice-3.3.2.1 (3.3.2-rc1) + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- libreoffice-components-3.3.1.2.tar.bz2 New: ---- libreoffice-components-3.3.2.2.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libreoffice-components.spec ++++++ --- /var/tmp/diff_new_pack.tFUeJM/_old 2011-03-21 15:24:08.000000000 +0100 +++ /var/tmp/diff_new_pack.tFUeJM/_new 2011-03-21 15:24:08.000000000 +0100 @@ -21,11 +21,11 @@ Name: libreoffice-components # allow to use xulrunner191 on SLED11-SP1 (bnc#540726) %define use_xulrunner191 no -Version: 3.3.1.2 -Release: 2 +Version: 3.3.2.2 +Release: 1 %define piece components -%define ooo_build_version 3.3.1.2 -%define ooo_piece_version 3.3.1.2 +%define ooo_build_version 3.3.2.2 +%define ooo_piece_version 3.3.2.2 %define ooo_sourcedirname libreoffice-build-%ooo_piece_version %define ooo_prefix %_libdir %define ooo_home libreoffice @@ -50,7 +50,7 @@ %endif ############################ # KDE3 stuff -%if 0%{?suse_version} && 0%{?suse_version} <= 1110 +%if 0%{?suse_version} BuildRequires: kdelibs3-devel %endif ############################ ++++++ libreoffice-components-3.3.1.2.tar.bz2 -> libreoffice-components-3.3.2.2.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libreoffice-components-3.3.1.2/ChangeLog new/libreoffice-components-3.3.2.2/ChangeLog --- old/libreoffice-components-3.3.1.2/ChangeLog 2011-02-15 20:11:57.000000000 +0100 +++ new/libreoffice-components-3.3.2.2/ChangeLog 2011-03-15 17:52:59.000000000 +0100 @@ -1,34 +1,40 @@ -2011-02-15 Petr Mladek <pmladek(a)suse.cz> [a2948caa8c99a1b5dd76402e79c5b1e2b31b3e7b] +2011-03-15 Petr Mladek <pmladek(a)suse.cz> [450421e441f5941c5180220a01cc42c29a7b2fc5] -Version 3.3.1.2, tag libreoffice-3.3.1.2 (3.3.1-rc2) +Version 3.3.2.2, tag libreoffice-3.3.2.2 (3.3.2-rc2) -2011-02-08 Petr Mladek <pmladek(a)suse.cz> [0038bc6128921ad380912b18634212681578abfd] +2011-03-08 Petr Mladek <pmladek(a)suse.cz> [bc5c8ef0d65d374ecbab338f2abb9d26414f7c86] -Version 3.3.1.1, tag libreoffice-3.3.1.1 (3.3.1-rc1) +Branch libreoffice-3-3-2 +This is 'libreoffice-3-3-2' - the stable branch for the 3.3.2 release. +Only very safe changes, reviewed by three people are allowed. -2011-02-08 bjoern.michaelsen(a)canonical.com <Bjoern Michaelsen> [d7771bc638587e49ea7225312933c73cfc041439] +If you want to commit more complicated fix for the next 3.3.x release, +please use the 'libreoffice-3-3' branch. -lp#696527: enable human icon theme in LibreOffice (cherry picked from commit cfa7e88f5959a8b3b729107d61351410be80f49b) +If you want to build something cool, unstable, and risky, use master. -Signed-off-by: Thorsten Behrens <tbehrens(a)novell.com> -(cherry picked from commit c1d45fdb7f6380a0e6640a336cd790027e903b4f) +2011-03-08 Petr Mladek <pmladek(a)suse.cz> [0bdca5ef30f83883eb038e3c84828e0dc5a873b8] -Signed-off-by: Cedric Bosdonnat <cedric.bosdonnat.ooo(a)free.fr> -Signed-off-by: Petr Mladek <pmladek(a)suse.cz> +Version 3.3.2.1, tag libreoffice-3.3.2.1 (3.3.2-rc1) -2011-02-07 Jan Holesovsky <kendy(a)suse.cz> [474fbc4e896114f138061af9002b88cd675c8f01] -Branch libreoffice-3-3-1 +2011-03-03 Andras Timar <timar(a)fsf.hu> [98abfb3b8ca07e23708907a3fb5ed464c89498b3] -This is 'libreoffice-3-3-1' - the stable branch for the 3.3.1 release. -Only very safe changes, reviewed by three people are allowed. +l10n: Updated oc_FR spelling dictionary -If you want to commit more complicated fix for the next 3.3.x release, -please use the 'libreoffice-3-3' branch. -If you want to build something cool, unstable, and risky, use master. +2011-03-03 Andras Timar <timar(a)fsf.hu> [2b3b78977da058300905c3863c4444b929a0b554] + +l10n: add Breton spelling dictionary + + +2011-02-08 bjoern.michaelsen(a)canonical.com <Bjoern Michaelsen> [c1d45fdb7f6380a0e6640a336cd790027e903b4f] + +lp#696527: enable human icon theme in LibreOffice (cherry picked from commit cfa7e88f5959a8b3b729107d61351410be80f49b) + +Signed-off-by: Thorsten Behrens <tbehrens(a)novell.com> 2011-02-06 Petr Mladek <pmladek(a)suse.cz> [94a2ea07194893531b93b78c2903d96bbc5526ce] diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libreoffice-components-3.3.1.2/setup_native/source/packinfo/packinfo_office.txt new/libreoffice-components-3.3.2.2/setup_native/source/packinfo/packinfo_office.txt --- old/libreoffice-components-3.3.1.2/setup_native/source/packinfo/packinfo_office.txt 2011-02-06 18:20:38.000000000 +0100 +++ new/libreoffice-components-3.3.2.2/setup_native/source/packinfo/packinfo_office.txt 2011-03-08 20:12:46.000000000 +0100 @@ -508,6 +508,22 @@ End Start +module = "gid_Module_Root_Extension_Dictionary_Br" +script = "shellscripts_extensions.txt" +solarispackagename = "%PACKAGEPREFIX%SOLARISBRANDPACKAGENAME%BRANDPACKAGEVERSION-dict-br" +solarisrequires = "%SOLSUREPACKAGEPREFIX%BRANDPACKAGEVERSION-ure, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core01, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core02, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core03, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core04, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core05, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core06, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core07, %PACKAGEPREFIX%SOLARISBRANDPACKAGENAME%BRANDPACKAGEVERSION" +packagename = "%UNIXPACKAGENAME%BRANDPACKAGEVERSION-dict-br" +requires = "%UREPACKAGEPREFIX%BRANDPACKAGEVERSION-ure,%BASISPACKAGEPREFIX%OOOBASEVERSION-core01,%BASISPACKAGEPREFIX%OOOBASEVERSION-core02,%BASISPACKAGEPREFIX%OOOBASEVERSION-core03,%BASISPACKAGEPREFIX%OOOBASEVERSION-core04,%BASISPACKAGEPREFIX%OOOBASEVERSION-core05,%BASISPACKAGEPREFIX%OOOBASEVERSION-core06,%BASISPACKAGEPREFIX%OOOBASEVERSION-core07,%UNIXPACKAGENAME%BRANDPACKAGEVERSION" +linuxpatchrequires = "" +copyright = "2009-2011 by An Drouizig" +solariscopyright = "solariscopyrightfile" +vendor = "An Drouizig" +description = "Br dictionary for %PRODUCTNAME %PRODUCTVERSION" +destpath = "/opt" +packageversion = "%PACKAGEVERSION" +End + +Start module = "gid_Module_Root_Extension_Dictionary_Ca" script = "shellscripts_extensions.txt" solarispackagename = "%PACKAGEPREFIX%SOLARISBRANDPACKAGENAME%BRANDPACKAGEVERSION-dict-ca" @@ -835,9 +851,9 @@ packagename = "%UNIXPACKAGENAME%BRANDPACKAGEVERSION-dict-oc" requires = "%UREPACKAGEPREFIX%BRANDPACKAGEVERSION-ure,%BASISPACKAGEPREFIX%OOOBASEVERSION-core01,%BASISPACKAGEPREFIX%OOOBASEVERSION-core02,%BASISPACKAGEPREFIX%OOOBASEVERSION-core03,%BASISPACKAGEPREFIX%OOOBASEVERSION-core04,%BASISPACKAGEPREFIX%OOOBASEVERSION-core05,%BASISPACKAGEPREFIX%OOOBASEVERSION-core06,%BASISPACKAGEPREFIX%OOOBASEVERSION-core07,%UNIXPACKAGENAME%BRANDPACKAGEVERSION" linuxpatchrequires = "" -copyright = "1990-2011 by Dicollecte" +copyright = "2006-2011 by Bruno Gallart" solariscopyright = "solariscopyrightfile" -vendor = "Dicollecte" +vendor = "OpenOc.org" description = "Occitan-languedocian dictionary for %PRODUCTNAME %PRODUCTVERSION" destpath = "/opt" packageversion = "%PACKAGEVERSION" ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 libreoffice-bootstrap for openSUSE:Factory
by root＠hilbert.suse.de 21 Mar '11

21 Mar '11

Hello community, here is the log from the commit of package libreoffice-bootstrap for openSUSE:Factory checked in at Mon Mar 21 15:24:31 CET 2011. -------- --- libreoffice-bootstrap/libreoffice-bootstrap.changes 2011-02-23 16:06:39.000000000 +0100 +++ /mounts/work_src_done/STABLE/libreoffice-bootstrap/libreoffice-bootstrap.changes 2011-03-18 18:58:54.000000000 +0100 @@ -1,0 +2,84 @@ +Fri Mar 18 16:40:02 CET 2011 - pmladek(a)suse.cz + +- updated to libreoffice-3.3.2.2 (3.3.2-rc2): + * build + * fix non-working VBA container controls + * l10n + * l10n: update translations from Pootle + * libs-gui + * hidden tabs in Impress tasks panel (fdo#34718) + +------------------------------------------------------------------- +Fri Mar 18 15:44:39 CET 2011 - pmladek(a)suse.cz + +- kde3-fpicker.diff: find KDE3 filepicker helper binary (bnc#680382) + +------------------------------------------------------------------- +Wed Mar 16 16:45:15 UTC 2011 - neptunia(a)mail.ru + +- enabled KDE3 support (bnc#678998) + +------------------------------------------------------------------- +Wed Mar 9 17:42:27 CET 2011 - pmladek(a)suse.cz + +- updated to libreoffice-3.3.2.1 (3.3.2-rc1): + * build + * enabled KDE4 support for SLED11 + * move the WebDAV patches from NovellOnly to Experimental + * calc + * sheet reference export (i#116833) + * interval range crasher (fdo#34350) + * fixed incorrect cursor navigation (fdo#33756) + * go through all tokens to look for a volatile one (fdo#31939) + * selecting multiple cells does not update headers (fdo#34383) + * better fix for unusable TODAY() in formula computing (fdo#31939) + * filters + * ensure node outlines path (fdo#33701) + * macros not imported for word documents OOXML (fdo#34909) + * VBA event binding for macros imported from XLSM (fdo#34941) + * help + * typo $PRODUCTNAME -> %PRODUCTNAME (fdo#34857) + * remove Online Update and Improvement program (fdo#33468) + * impress + * occasional blank first slide in presentation (fdo#34533) + * libs-core + * restrict metafile decomposition (bnc#650049) + * StarDesktop.terminate() macro behaviour (fdo#30879) + * crashing oosplash and malformed picture (bnc#652562) + * don't leave a thread running after main is completed + * fixed BorderLine(2) conversion to SvxBorderLine (fdo#34226) + * Byref variable in a Declare statement (fdo#33964, i#115716) + * libs-gui + * Cairo canvas edge count calculation + * do not access polygon points outside range + * getEnglishSearchFontName() searches Takao fonts + * size computation for toolbar menus with controls + * catch exceptions from failing UNO-ness (fdo#33785) + * unnecessary reverse lookup on startup (fdo#32640) + * gDIMetaFile::bUseCanvas related changes (bnc#650049) + * work around IM problems with KDE4 integration (bnc#665112) + * sdk + * fix ODK settings.mk to only set STLPORTLIB if needed + * ure + * fix pyuno/demo/pyunoenv.tcsh for PYTHONPATH usage + * writer + * bad RTF when save with ru_RU locale (fdo#33478) + * visual editor produces wrong stack syntax (fdo#32759, fdo#32755) +- updated setup_native_packinfo to version 3.3.2.1 + +------------------------------------------------------------------- +Thu Mar 3 15:55:53 UTC 2011 - pmladek(a)novell.com + +- added imake into BuildRequires on MeeGo; provided "makedepend" tool + +------------------------------------------------------------------- +Thu Mar 3 15:43:51 UTC 2011 - pmladek(a)novell.com + +- added cppunit-devel into BuildRequires on MeeGo + +------------------------------------------------------------------- +Wed Mar 2 17:34:24 CET 2011 - pmladek(a)suse.cz + +- switched to more stable internal Cairo on MeeGo (bnc#635016) + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- canvas-cairo-edge-count-calculation.diff canvas-polygon-access-out-of-range.diff drawinglayer-metadata-decomposition.diff libreoffice-bootstrap-3.3.1.2.tar.bz2 libreoffice-build-3.3.1.1-enable-kde4-support.diff libreoffice-build-3.3.1.1-setup-native.diff libreoffice-build-3.3.1.2.tar.gz libreoffice-build-slideshow-media-playback-bug.diff piece-packimages.diff sd-blank-first-slide.diff setup_native_packinfo-3.3.1.1.tar.bz2 svtools-enable-emfplus.diff vcl-input-methods-in-qt4.diff vcl-use-canvas-bool.diff New: ---- kde3-fpicker.diff libreoffice-bootstrap-3.3.2.2.tar.bz2 libreoffice-build-3.3.2.2.tar.gz setup_native_packinfo-3.3.2.1.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libreoffice-bootstrap.spec ++++++ --- /var/tmp/diff_new_pack.rnIBbJ/_old 2011-03-21 15:16:18.000000000 +0100 +++ /var/tmp/diff_new_pack.rnIBbJ/_new 2011-03-21 15:16:18.000000000 +0100 @@ -36,10 +36,11 @@ BuildRequires: xorg-x11-utils BuildRequires: libjpeg-devel libxslt-devel openssl-devel pkgconfig(gl) pkgconfig(glu) pkgconfig(xau) pkgconfig(xaw7) BuildRequires: db4-devel krb5-devel openldap-devel +BuildRequires: imake %endif ############################ # KDE3 stuff -%if 0%{?suse_version} && 0%{?suse_version} <= 1110 +%if 0%{?suse_version} BuildRequires: kdelibs3-devel %endif ############################ @@ -47,6 +48,9 @@ %if 0%{?suse_version} >= 01100 BuildRequires: libcppunit-devel %endif +%if 0%{?meego_version} +BuildRequires: cppunit-devel +%endif ############################ # mysql stuff %if 0%{?suse_version} @@ -179,8 +183,8 @@ # we would like to support also a non-conflicting OOo2 package %define ooo_bin_suffix no # -%define ooo_build_version 3.3.1.2 -%define ooo_piece_version 3.3.1.2 +%define ooo_build_version 3.3.2.2 +%define ooo_piece_version 3.3.2.2 %define ooo_build_dir build %define ooo_sourcedirname libreoffice-%ooo_piece_version %define ooo_prefix %_libdir @@ -188,8 +192,8 @@ %define ooo_basis_dir basis3.3 License: Artistic ; BSD3c ; GPLv2+ ; LPPL .. ; LGPLv2.1+ ; LGPLv3 ; MPL .. ; MIT Group: Productivity/Office/Suite -Version: 3.3.1.2 -Release: 2 +Version: 3.3.2.2 +Release: 1 AutoReqProv: on # we use the tool "free" to detect the available memory and reduce the parallelism is needed # too high parallelism caused troubles in the Build Service @@ -201,7 +205,7 @@ Source0: libreoffice-build-%ooo_build_version.tar.gz Source1: libreoffice-bootstrap-%ooo_piece_version.tar.bz2 # hacked soures from setup_native -Source30: setup_native_packinfo-3.3.1.1.tar.bz2 +Source30: setup_native_packinfo-3.3.2.1.tar.bz2 # Hmm, rpmlint complains about devel files in non-devel package # We would like to keep the -bootstrap package name # So we need to disable these rpmlint checks @@ -212,10 +216,6 @@ # patches against libreoffice-build # Patch0: libreoffice-build-3.3.0.1-enable-foo.diff # example Patch0: libreoffice-build-3.2.99.2-extensions-hack.diff -Patch1: libreoffice-build-3.3.1.1-setup-native.diff -Patch2: libreoffice-build-3.3.1.1-enable-kde4-support.diff -# fix audio/video playback in presentation (deb#612940, bnc#651250) -Patch3: libreoffice-build-slideshow-media-playback-bug.diff # allow to use xulrunner191 on SLED11-SP1 (bnc#540726) Patch500: ooo-build-3.1.99.2-xulrunner-1.9.1.diff # FIXME: fix the python UNO components registration on SLED10 @@ -228,18 +228,8 @@ Patch903: officecfg-help-in-usr-share.diff # FIXME: temporary disable mono-loader build until the dependency on comphelper is removed Patch904: cli_ure-disable-mono-loader.diff -# FIXME: defuzzed diff -Patch905: piece-packimages.diff -# occasional blank first slide in presentation (fdo#34533) -Patch906: sd-blank-first-slide.diff -# non-working input methods in KDE4 (bnc#665112) -Patch907: vcl-input-methods-in-qt4.diff -# FIXME: fix EMP+ import (bnc#650049) -Patch960: svtools-enable-emfplus.diff -Patch961: vcl-use-canvas-bool.diff -Patch962: drawinglayer-metadata-decomposition.diff -Patch963: canvas-polygon-access-out-of-range.diff -Patch964: canvas-cairo-edge-count-calculation.diff +# find KDE3 filepicker helper binary (bnc#680382) +Patch905: kde3-fpicker.diff # # patches against the upstream sources, must be -p0 # Patch1000: bug-123456-fix-foo.diff # example @@ -261,9 +251,6 @@ # apply patches against libreoffice-build # %patch0 # example %patch0 -%patch1 -%patch2 -%patch3 install -m 644 %{S:1} %{S:30} src/ %if 0%{?suse_version} == 01010 install -m 644 %{S:150} src/ @@ -284,14 +271,6 @@ cp %{P:903} patches/hotfixes cp %{P:904} patches/hotfixes cp %{P:905} patches/hotfixes -cp %{P:906} patches/hotfixes -cp %{P:907} patches/hotfixes -# EMF+ stuff -cp %{P:960} patches/hotfixes -cp %{P:961} patches/hotfixes -cp %{P:962} patches/hotfixes -cp %{P:963} patches/hotfixes -cp %{P:964} patches/hotfixes %endif %build @@ -389,10 +368,11 @@ --with-additional-sections="PostgreSQL" \ %endif %if 0%{?meego_version} + --without-system-cairo \ --with-system-icu \ --disable-kde4 \ %endif -%if 0%{?meego_version} || %suse_version > 1110 +%if 0%{?meego_version} --disable-kde \ %endif %if 0%{?suse_version} > 01130 ++++++ kde3-fpicker.diff ++++++ commit 16b7cf288722a40ad7d847c829c3a4fba570cf0a Author: Luboš Luňák <l.lunak(a)suse.cz> Date: Fri Mar 18 13:18:58 2011 +0100 use full path for kdefilepicker helper binary (bnc#31109) diff --git a/fpicker/source/unx/kde_unx/UnxFilePicker.cxx b/fpicker/source/unx/kde_unx/UnxFilePicker.cxx index 8c7cd91..c2756ee 100644 --- fpicker/source/unx/kde_unx/UnxFilePicker.cxx +++ fpicker/source/unx/kde_unx/UnxFilePicker.cxx @@ -38,8 +38,10 @@ #include <cppuhelper/interfacecontainer.h> #include <osl/diagnose.h> +#include <osl/file.hxx> #include <rtl/ustring.hxx> #include <rtl/ustrbuf.hxx> +#include <rtl/bootstrap.hxx> #include <tools/resmgr.hxx> #include <svtools/svtools.hrc> @@ -715,7 +717,11 @@ void UnxFilePicker::initFilePicker() #endif // The executable name - const char *pFname = "kdefilepicker"; + rtl::OUString helperurl( RTL_CONSTASCII_USTRINGPARAM("${ORIGIN}/kdefilepicker")); + rtl::Bootstrap::expandMacros( helperurl ); + rtl::OUString helperpath; + osl::FileBase::getSystemPathFromFileURL( helperurl, helperpath ); + rtl::OString helper( rtl::OUStringToOString( helperpath, osl_getThreadTextEncoding())); // ID of the main window const int nIdLen = 20; @@ -736,7 +742,7 @@ void UnxFilePicker::initFilePicker() } // Execute the fpicker implementation - execlp( pFname, pFname, "--winid", pWinId, NULL ); + execlp( helper.getStr(), helper.getStr(), "--winid", pWinId, NULL ); // Error, finish the child exit( -1 ); ++++++ libreoffice-bootstrap-3.3.1.2.tar.bz2 -> libreoffice-bootstrap-3.3.2.2.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libreoffice-bootstrap-3.3.1.2/ChangeLog new/libreoffice-bootstrap-3.3.2.2/ChangeLog --- old/libreoffice-bootstrap-3.3.1.2/ChangeLog 2011-02-15 20:12:31.000000000 +0100 +++ new/libreoffice-bootstrap-3.3.2.2/ChangeLog 2011-03-15 17:53:33.000000000 +0100 @@ -1,47 +1,72 @@ -2011-02-15 Petr Mladek <pmladek(a)suse.cz> [8d3f9ed91d97cd2a4a026efb5cf04380b8ad758a] +2011-03-15 Petr Mladek <pmladek(a)suse.cz> [e4e1e143677a13ab1e087159994f8a0be3810779] -Version 3.3.1.2, tag libreoffice-3.3.1.2 (3.3.1-rc2) +Version 3.3.2.2, tag libreoffice-3.3.2.2 (3.3.2-rc2) -2011-02-15 Petr Mladek <pmladek(a)suse.cz> [0fb3e5c711f97c93f2a600aa04c3813673d2dcdf] +2011-03-15 Petr Mladek <pmladek(a)suse.cz> [62cd43a502624bf166d5e420188bc60c179b55a7] -bump product version to 3.3.1rc2, release number to 8 +bump product version to 3.3.2rc2, release number to 202 -2011-02-15 Jesús Corrius <jesus(a)softcatala.org> [3aa64b12ff9c2c2eec25bc07a4cad099f9762942] +2011-03-08 Petr Mladek <pmladek(a)suse.cz> [c5d66af2e7edaafc30bb301f6fee2922248d4ff3] -fdo#33785: install mtfrenderer.uno.dll in the correct directory +Branch libreoffice-3-3-2 + +This is 'libreoffice-3-3-2' - the stable branch for the 3.3.2 release. +Only very safe changes, reviewed by three people are allowed. -Signed-off-by: Michael Meeks <michael.meeks(a)novell.com> -Signed-off-by: Jan Holesovsky <kendy(a)suse.cz> -Sigend-off-by: Thorsten Behrens <thb(a)documentfoundation.org> +If you want to commit more complicated fix for the next 3.3.x release, +please use the 'libreoffice-3-3' branch. -2011-02-14 Fridrich Štrba <fridrich.strba(a)bluewin.ch> [d1f6dd651ceecd4612fa77114e58011f08b5d574] +If you want to build something cool, unstable, and risky, use master. -multilingual sdk build targets +2011-03-08 Petr Mladek <pmladek(a)suse.cz> [4215649b045643e8153f2f26c79479aa81dd7e07] + +Version 3.3.2.1, tag libreoffice-3.3.2.1 (3.3.2-rc1) + + +2011-03-08 Petr Mladek <pmladek(a)suse.cz> [7028491d34028c7fa3575a4b5ffa97a5653fa429] + +do not create OxygeOffice rpms for LibreOffice build + +there was a cut&paste problem in the previous commit + +2011-03-07 Kalman Szalai - KAMI <kami911(a)gmail.com> [d1cd295b211d0be02aa9c4bfc297e38c1d06a39d] + +Introduce OxygenOffice as a product -2011-02-08 Petr Mladek <pmladek(a)suse.cz> [a1133696aa89bd123d66b254dbb4af341fd868bb] +2011-03-07 Petr Mladek <pmladek(a)suse.cz> [ef7505a3338038cdb9c4bb653ca456e09cc97926] -Version 3.3.1.1, tag libreoffice-3.3.1.1 (3.3.1-rc1) +bump product version to 3.3.2rc1, release number to 201 -2011-02-08 Petr Mladek <pmladek(a)suse.cz> [a012fe8650dcda48a311060aee43ab84a821e27c] +2011-03-03 Andras Timar <timar(a)fsf.hu> [27f27535d5e008e375c1d61a8bb25dea63c94ddf] + +l10n: add Breton spelling dictionary + + +2011-02-17 Petr Mladek <pmladek(a)suse.cz> [2118de2768280e3cb4fb27f74a65211833f71155] + +bump product version to 3.3.1rc2, release number to 8 + +Signed-off-by: Fridrich Štrba <fridrich.strba(a)bluewin.ch> + +2011-02-17 Petr Mladek <pmladek(a)suse.cz> [8df6667e9f53e8b006dff98004be5ecf71bab3ce] bump product version to 3.3.1rc1, widnows build version to 6 +Signed-off-by: Fridrich Štrba <fridrich.strba(a)bluewin.ch> -2011-02-07 Jan Holesovsky <kendy(a)suse.cz> [14976d4efb866788cb2f0cea60f745e013db3ff0] +2011-02-14 Fridrich Štrba <fridrich.strba(a)bluewin.ch> [b57fb0749c5011ac679bc92ffa3047ed70941b8d] -Branch libreoffice-3-3-1 +multilingual sdk build targets -This is 'libreoffice-3-3-1' - the stable branch for the 3.3.1 release. -Only very safe changes, reviewed by three people are allowed. -If you want to commit more complicated fix for the next 3.3.x release, -please use the 'libreoffice-3-3' branch. +2011-02-10 Jesús Corrius <jesus(a)softcatala.org> [a4848e8cebe712f96f409f8687fc76cef22b640f] + +fdo#33785: install mtfrenderer.uno.dll in the correct directory -If you want to build something cool, unstable, and risky, use master. 2011-02-03 Caolán McNamara <caolanm(a)redhat.com> [d534fb2ba429f8ddc368d1f4b6536e84a78f2a09] diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libreoffice-bootstrap-3.3.1.2/instsetoo_native/util/makefile.mk new/libreoffice-bootstrap-3.3.2.2/instsetoo_native/util/makefile.mk --- old/libreoffice-bootstrap-3.3.1.2/instsetoo_native/util/makefile.mk 2011-02-14 15:42:15.000000000 +0100 +++ new/libreoffice-bootstrap-3.3.2.2/instsetoo_native/util/makefile.mk 2011-03-08 20:12:46.000000000 +0100 @@ -147,6 +147,14 @@ broolanguagepack : $(foreach,i,$(alllangiso) broolanguagepack_$i) +oxygenoffice: $(foreach,i,$(alllangiso) oxygenoffice_$i) + +oxygenofficewithjre: $(foreach,i,$(alllangiso) oxygenofficewithjre_$i) + +oxygenofficelanguagepack : $(foreach,i,$(alllangiso) oxygenofficelanguagepack_$i) + +oxygenofficehelppack : $(foreach,i,$(alllangiso) oxygenofficehelppack_$i) + MSIOFFICETEMPLATESOURCE=$(PRJ)$/inc_openoffice$/windows$/msi_templates MSILANGPACKTEMPLATESOURCE=$(PRJ)$/inc_ooolangpack$/windows$/msi_templates MSIHELPPACKTEMPLATESOURCE=$(PRJ)$/inc_ooohelppack$/windows$/msi_templates @@ -202,6 +210,14 @@ $(foreach,i,$(alllangiso) broolanguagepack_$i) : $(ADDDEPS) +$(foreach,i,$(alllangiso) oxygenoffice_$i) : $(ADDDEPS) + +$(foreach,i,$(alllangiso) oxygenofficewithjre_$i) : $(ADDDEPS) + +$(foreach,i,$(alllangiso) oxygenofficelanguagepack_$i) : $(ADDDEPS) + +$(foreach,i,$(alllangiso) oxygenofficehelppack_$i) : $(ADDDEPS) + .IF "$(MAKETARGETS)"!="" $(MAKETARGETS) : $(ADDDEPS) .ENDIF # "$(MAKETARGETS)"!="" @@ -287,6 +303,29 @@ broolanguagepack_%{$(PKGFORMAT:^".")} : +$(PERL) -w $(SOLARENV)$/bin$/make_installer.pl -f $(PRJ)$/util$/openoffice.lst -l $(subst,$(@:s/_/ /:1)_, $(@:b)) -p BrOffice -u $(OUT) -buildid $(BUILD) -msitemplate $(MSILANGPACKTEMPLATEDIR) -msilanguage $(COMMONMISC)$/win_ulffiles -languagepack -format $(@:e:s/.//) $(VERBOSESWITCH) +$(foreach,i,$(alllangiso) oxygenoffice_$i) : $$@{$(PKGFORMAT:^".")} +.IF "$(MAKETARGETS)"!="" +.IF "$(MAKETARGETS:e)"=="" && "$(MAKETARGETS:s/_//)"!="$(MAKETARGETS)" +$(MAKETARGETS) : $$@{$(PKGFORMAT:^".")} +$(MAKETARGETS){$(PKGFORMAT:^".")} : $(ADDDEPS) +.ENDIF # "$(MAKETARGETS:e)"=="" && "$(MAKETARGETS:s/_//)"!="$(MAKETARGETS)" +.ENDIF # "$(MAKETARGETS)"!="" +oxygenoffice_%{$(PKGFORMAT:^".") .archive} : + $(PERL) -w $(SOLARENV)$/bin$/make_installer.pl -f $(PRJ)$/util$/openoffice.lst -l $(subst,$(@:s/_/ /:1)_, $(@:b)) -p OxygenOffice -u $(OUT) -buildid $(BUILD) -msitemplate $(MSIOFFICETEMPLATEDIR) -msilanguage $(COMMONMISC)$/win_ulffiles -format $(@:e:s/.//) $(VERBOSESWITCH) + $(PERL) -w $(SOLARENV)$/bin$/gen_update_info.pl --buildid $(BUILD) --arch "$(RTL_ARCH)" --os "$(RTL_OS)" --lstfile $(PRJ)$/util$/openoffice.lst --product OxygenOffice --languages $(subst,$(@:s/_/ /:1)_, $(@:b)) $(PRJ)$/util$/update.xml > $(MISC)/`date +%Y%m%d_%H%M`_$(RTL_OS)_$(RTL_ARCH)$(@:e).update.xml + +$(foreach,i,$(alllangiso) oxygenofficewithjre_$i) : $$@{$(PKGFORMAT:^".")} +oxygenofficewithjre_%{$(PKGFORMAT:^".")} : + $(PERL) -w $(SOLARENV)$/bin$/make_installer.pl -f $(PRJ)$/util$/openoffice.lst -l $(subst,$(@:s/_/ /:1)_, $(@:b)) -p OxygenOffice_wJRE -u $(OUT) -buildid $(BUILD) -msitemplate $(MSIOFFICETEMPLATEDIR) -msilanguage $(COMMONMISC)$/win_ulffiles -format $(@:e:s/.//) $(VERBOSESWITCH) + +$(foreach,i,$(alllangiso) oxygenofficelanguagepack_$i) : $$@{$(PKGFORMAT:^".")} +oxygenofficelanguagepack_%{$(PKGFORMAT:^".")} : + $(PERL) -w $(SOLARENV)$/bin$/make_installer.pl -f $(PRJ)$/util$/openoffice.lst -l $(subst,$(@:s/_/ /:1)_, $(@:b)) -p OxygenOffice -u $(OUT) -buildid $(BUILD) -msitemplate $(MSILANGPACKTEMPLATEDIR) -msilanguage $(COMMONMISC)$/win_ulffiles -languagepack -format $(@:e:s/.//) $(VERBOSESWITCH) + +$(foreach,i,$(alllangiso) oxygenofficehelppack_$i) : $$@{$(PKGFORMAT:^".")} +oxygenofficehelppack_%{$(PKGFORMAT:^".")} : + $(PERL) -w $(SOLARENV)$/bin$/make_installer.pl -f $(PRJ)$/util$/openoffice.lst -l $(subst,$(@:s/_/ /:1)_, $(@:b)) -p OxygenOffice -u $(OUT) -buildid $(BUILD) -msitemplate $(MSIHELPPACKTEMPLATEDIR) -msilanguage $(COMMONMISC)$/win_ulffiles -helppack -format $(@:e:s/.//) $(VERBOSESWITCH) + .ELSE # "$(alllangiso)"!="" openoffice: @echo cannot pack nothing... @@ -294,7 +333,7 @@ .ENDIF # "$(alllangiso)"!="" .IF "$(LOCALPYFILES)"!="" -$(foreach,i,$(alllangiso) openoffice_$i{$(PKGFORMAT:^".") .archive} openofficewithjre_$i{$(PKGFORMAT:^".")} openofficedev_$i{$(PKGFORMAT:^".")} broffice_$i{$(PKGFORMAT:^".")} brofficewithjre_$i{$(PKGFORMAT:^".")} brofficedev_$i{$(PKGFORMAT:^".")} sdkoo_$i{$(PKGFORMAT:^".")}) updatepack : $(LOCALPYFILES) +$(foreach,i,$(alllangiso) openoffice_$i{$(PKGFORMAT:^".") .archive} openofficewithjre_$i{$(PKGFORMAT:^".")} openofficedev_$i{$(PKGFORMAT:^".")} broffice_$i{$(PKGFORMAT:^".")} brofficewithjre_$i{$(PKGFORMAT:^".")} brofficedev_$i{$(PKGFORMAT:^".")} sdkoo_$i{$(PKGFORMAT:^".")} oxygenoffice_$i{$(PKGFORMAT:^".") .archive} oxygenofficewithjre_$i{$(PKGFORMAT:^".")}) updatepack : $(LOCALPYFILES) .ENDIF # "$(LOCALPYFILES)"!="" $(BIN)$/%.py : $(SOLARSHAREDBIN)$/pyuno$/%.py diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libreoffice-bootstrap-3.3.1.2/instsetoo_native/util/openoffice.lst new/libreoffice-bootstrap-3.3.2.2/instsetoo_native/util/openoffice.lst --- old/libreoffice-bootstrap-3.3.1.2/instsetoo_native/util/openoffice.lst 2011-02-15 16:32:02.000000000 +0100 +++ new/libreoffice-bootstrap-3.3.2.2/instsetoo_native/util/openoffice.lst 2011-03-15 17:38:48.000000000 +0100 @@ -5,7 +5,7 @@ variables { OOOBASEVERSION 3.3 - OOOPACKAGEVERSION 3.3.1 + OOOPACKAGEVERSION 3.3.2 UREPACKAGEVERSION 1.7.0 URELAYERVERSION 1 BASISROOTNAME LibreOffice @@ -62,7 +62,7 @@ POSTVERSIONEXTENSIONUNIX BRANDPACKAGEVERSION 3 USERDIRPRODUCTVERSION 3 - ABOUTBOXPRODUCTVERSION 3.3.1 + ABOUTBOXPRODUCTVERSION 3.3.2 BASEPRODUCTVERSION 3.3 PCPFILENAME openoffice.pcp UPDATEURL http://update.libreoffice.org/ProductUpdateService/check.Update @@ -74,7 +74,7 @@ FILEFORMATNAME OpenOffice.org FILEFORMATVERSION 1.0 WRITERCOMPATIBILITYVERSIONOOO11 OpenOffice.org 1.1 - PACKAGEVERSION 3.3.1 + PACKAGEVERSION 3.3.2 PACKAGEREVISION {milestone} LICENSENAME LGPL SERVICESPROJEKT 1 @@ -131,7 +131,7 @@ POSTVERSIONEXTENSIONUNIX BRANDPACKAGEVERSION 3 USERDIRPRODUCTVERSION 3 - ABOUTBOXPRODUCTVERSION 3.3.1 + ABOUTBOXPRODUCTVERSION 3.3.2 BASEPRODUCTVERSION 3.3 UPDATEURL http://update.libreoffice.org/ProductUpdateService/check.Update ODFNOTIFYURL http://odfnotify.libreoffice.org/OOo3.0/notification.jsp?version=ODF @@ -142,7 +142,7 @@ FILEFORMATNAME OpenOffice.org FILEFORMATVERSION 1.0 WRITERCOMPATIBILITYVERSIONOOO11 OpenOffice.org 1.1 - PACKAGEVERSION 3.3.1 + PACKAGEVERSION 3.3.2 PACKAGEREVISION {milestone} LICENSENAME LGPL SERVICESPROJEKT 1 @@ -198,7 +198,7 @@ POSTVERSIONEXTENSIONUNIX BRANDPACKAGEVERSION 3 USERDIRPRODUCTVERSION 3 - ABOUTBOXPRODUCTVERSION 3.3.1 + ABOUTBOXPRODUCTVERSION 3.3.2 BASEPRODUCTVERSION 3.3 DEVELOPMENTPRODUCT 1 BASISPACKAGEPREFIX libobasis-dev @@ -213,7 +213,7 @@ FILEFORMATNAME OpenOffice.org FILEFORMATVERSION 1.0 WRITERCOMPATIBILITYVERSIONOOO11 OpenOffice.org 1.1 - PACKAGEVERSION 3.3.1 + PACKAGEVERSION 3.3.2 PACKAGEREVISION {milestone} LICENSENAME LGPL SERVICESPROJEKT 1 @@ -314,7 +314,7 @@ POSTVERSIONEXTENSION SDK POSTVERSIONEXTENSIONUNIX sdk BRANDPACKAGEVERSION 3 - PACKAGEVERSION 3.3.1 + PACKAGEVERSION 3.3.2 PACKAGEREVISION {milestone} PACK_INSTALLED 1 POOLPRODUCT 0 @@ -361,7 +361,7 @@ POSTVERSIONEXTENSION SDK POSTVERSIONEXTENSIONUNIX sdk BRANDPACKAGEVERSION 3 - PACKAGEVERSION 3.3.1 + PACKAGEVERSION 3.3.2 PACKAGEREVISION {milestone} BASISPACKAGEPREFIX libobasis-dev UREPACKAGEPREFIX lodev @@ -395,3 +395,142 @@ include {solarenvpath}/{os}/loader2,{solarpath}/bin.{minor}/sdkoo,{solarpath}/bin.{minor}/osl,{solarpath}/bin.{minor},{solarpath}/lib.{minor},{solarcommonpath}/bin.{minor},{solarenvpath}/{os}/MS } } + +OxygenOffice +{ + Settings + { + variables + { + PRODUCTNAME OxygenOffice + PRODUCTNAME_BR OxygenOffice + PRODUCTVERSION 3.3 + PRODUCTEXTENSION + LONG_PRODUCTEXTENSION + SHORT_PRODUCTEXTENSION rc2 + POSTVERSIONEXTENSION + POSTVERSIONEXTENSIONUNIX + BRANDPACKAGEVERSION 3 + USERDIRPRODUCTVERSION 3 + ABOUTBOXPRODUCTVERSION 3.3.2 + BASEPRODUCTVERSION 3.3 + PCPFILENAME openoffice.pcp + UPDATEURL http://update.libreoffice.org/ProductUpdateService/check.Update + ODFNOTIFYURL http://odfnotify.libreoffice.org/OOo3.0/notification.jsp?version=ODF + ADD_INCLUDE_FILES cliureversion.mk,clioootypesversion.mk,userland.txt,version.lst + REMOVE_UPGRADE_CODE_FILE upgradecode_remove_ooo.txt + ADDSYSTEMINTEGRATION 1 + EVAL + FILEFORMATNAME OpenOffice.org + FILEFORMATVERSION 1.0 + WRITERCOMPATIBILITYVERSIONOOO11 OpenOffice.org 1.1 + PACKAGEVERSION 3.3.2 + PACKAGEREVISION {milestone} + LICENSENAME LGPL + SERVICESPROJEKT 1 + GLOBALFILEGID gid_File_Lib_Vcl + GLOBALPATCHFILEGID gid_File_Txt_Patchfiles + SPELLCHECKERFILE spellchecker_selection.txt + OPENSOURCE 1 + SETSTATICPATH 1 + OOODOWNLOADNAME 1 + XPDINSTALLER 0 + BETAUPGRADECODE + STUBUPGRADECODE {0E7B27B8-D658-4BF9-98D6-EC361582EB4A} + CHANGETARGETDIR 1 + USE_FILEVERSION 1 + LIBRARYVERSION 9.3.0 + PATCHCODEFILE ooo_patchcodes.txt + DOWNLOADBANNER ooobanner_ooop.bmp + DOWNLOADBITMAP ooobitmap_ooop.bmp + DOWNLOADBANNER_BR ooobanner_ooop.bmp + DOWNLOADBITMAP_BR ooobitmap_ooop.bmp + DOWNLOADSETUPICO ooosetup.ico + RELATIVE_PATHES_IN_DDF 1 + STARTCENTER_ADDFEATURE_URL http://extensions.libreoffice.org/ + STARTCENTER_INFO_URL http://www.libreoffice.org/ + STARTCENTER_TEMPLREP_URL http://templates.libreoffice.org/ + STARTCENTER_LAYOUT_STYLE 0 + REGISTRATION_PRODUCT OxygenOffice + REGISTRATION_CID 926117 + DICT_REPO_URL http://extensions.libreoffice.org/dictionaries/ + } + active 1 + compression 5 + script setup_osl + downloadname OOOP_{productversion}_{os}_install_{languages} + langpackdownloadname OOOP_{productversion}_languagepack_{os}_install_{languages} + helppackdownloadname OOOP_{productversion}_helppack_{os}_install_{languages} + include {solarenvpath}/{os}/loader2,.,{localcommonpath}/bin,{localpath}/bin,{solarpath}/bin.{minor}/ooowoure,{solarpath}/bin.{minor}/osl,{solarpath}/bin.{minor}/desktop-integration/{pkgtype},{solarpath}/bin.{minor},{solarpath}/lib.{minor},{solarpath}/pck.{minor}/openoffice,{solarpath}/pck.{minor},{solarpath}/xml.{minor}/office/instance,{solarpath}/xml.{minor},{solarcommonpath}/bin.{minor}/osl,{solarcommonpath}/bin.{minor},{solarcommonpath}/pck.{minor}/openoffice,{solarcommonpath}/pck.{minor},../../external/common,{solarenvpath}/{os}/OOo_external,{solarpath}/pck.{minor}/brand + } +} + +OxygenOffice_wJRE +{ + Settings + { + variables + { + PRODUCTNAME OxygenOffice + PRODUCTNAME_BR OxygenOffice + PRODUCTVERSION 3.3 + PRODUCTEXTENSION + LONG_PRODUCTEXTENSION + SHORT_PRODUCTEXTENSION rc2 + POSTVERSIONEXTENSION + POSTVERSIONEXTENSIONUNIX + BRANDPACKAGEVERSION 3 + USERDIRPRODUCTVERSION 3 + ABOUTBOXPRODUCTVERSION 3.3.2 + BASEPRODUCTVERSION 3.3 + UPDATEURL http://update.libreoffice.org/ProductUpdateService/check.Update + ODFNOTIFYURL http://odfnotify.libreoffice.org/OOo3.0/notification.jsp?version=ODF + ADD_INCLUDE_FILES cliureversion.mk,clioootypesversion.mk,javaversion2.dat,userland.txt,version.lst + REMOVE_UPGRADE_CODE_FILE upgradecode_remove_ooo.txt + ADDSYSTEMINTEGRATION 1 + EVAL + FILEFORMATNAME OpenOffice.org + FILEFORMATVERSION 1.0 + WRITERCOMPATIBILITYVERSIONOOO11 OpenOffice.org 1.1 + PACKAGEVERSION 3.3.2 + PACKAGEREVISION {milestone} + LICENSENAME LGPL + SERVICESPROJEKT 1 + WITHJREPRODUCT 1 + GLOBALFILEGID gid_File_Lib_Vcl + GLOBALPATCHFILEGID gid_File_Txt_Patchfiles + SPELLCHECKERFILE spellchecker_selection.txt + OPENSOURCE 1 + SETSTATICPATH 1 + OOODOWNLOADNAME 1 + XPDINSTALLER 1 + BETAUPGRADECODE + STUBUPGRADECODE {0E7B27B8-D658-4BF9-98D6-EC361582EB4A} + CHANGETARGETDIR 1 + USE_FILEVERSION 1 + LIBRARYVERSION 9.3.0 + PATCHCODEFILE ooo_patchcodes.txt + JAVAPRODUCT 1 + DOWNLOADBANNER ooobanner_ooop.bmp + DOWNLOADBITMAP ooobitmap_ooop.bmp + DOWNLOADBANNER_BR ooobanner_ooop.bmp + DOWNLOADBITMAP_BR ooobitmap_ooop.bmp + DOWNLOADSETUPICO ooosetup.ico + RELATIVE_PATHES_IN_DDF 1 + STARTCENTER_ADDFEATURE_URL http://extensions.libreoffice.org/ + STARTCENTER_INFO_URL http://www.libreoffice.org/ + STARTCENTER_TEMPLREP_URL http://templates.libreoffice.org/ + STARTCENTER_LAYOUT_STYLE 0 + REGISTRATION_PRODUCT OxygenOffice + REGISTRATION_CID 926117 + DICT_REPO_URL http://extensions.libreoffice.org/dictionaries/ + } + active 1 + compression 5 + script setup_osljre + downloadname OOOP_{productversion}_{os}_installwjre_{languages} + langpackdownloadname OOOP_{productversion}_languagepack_{os}_installwjre_{languages} + helppackdownloadname OOOP_{productversion}_helppack_{os}_installwjre_{languages} + include {solarenvpath}/{os}/loader2,.,{localcommonpath}/bin,{localpath}/bin,{solarpath}/bin.{minor}/osl,{solarpath}/bin.{minor}/desktop-integration/{pkgtype},{solarpath}/bin.{minor},{solarpath}/lib.{minor},{solarpath}/pck.{minor}/openoffice,{solarpath}/pck.{minor},{solarpath}/xml.{minor}/office/instance,{solarpath}/xml.{minor},{solarcommonpath}/bin.{minor}/osl,{solarcommonpath}/bin.{minor},{solarcommonpath}/pck.{minor}/openoffice,{solarcommonpath}/pck.{minor},../../external/common,{solarenvpath}/{os}/OOo_external,{solarpath}/pck.{minor}/brand + } +} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libreoffice-bootstrap-3.3.1.2/scp2/source/ooo/common_brand.scp new/libreoffice-bootstrap-3.3.2.2/scp2/source/ooo/common_brand.scp --- old/libreoffice-bootstrap-3.3.1.2/scp2/source/ooo/common_brand.scp 2011-02-02 13:16:12.000000000 +0100 +++ new/libreoffice-bootstrap-3.3.2.2/scp2/source/ooo/common_brand.scp 2011-03-08 20:12:46.000000000 +0100 @@ -221,6 +221,11 @@ DosName = "dict-af"; End +Directory gid_Brand_Dir_Share_Extensions_Dict_Br + ParentID = gid_Brand_Dir_Share_Extensions; + DosName = "dict-br"; +End + Directory gid_Brand_Dir_Share_Extensions_Dict_Ca ParentID = gid_Brand_Dir_Share_Extensions; DosName = "dict-ca"; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libreoffice-bootstrap-3.3.1.2/scp2/source/ooo/file_ooo.scp new/libreoffice-bootstrap-3.3.2.2/scp2/source/ooo/file_ooo.scp --- old/libreoffice-bootstrap-3.3.1.2/scp2/source/ooo/file_ooo.scp 2011-02-02 13:16:12.000000000 +0100 +++ new/libreoffice-bootstrap-3.3.2.2/scp2/source/ooo/file_ooo.scp 2011-03-08 20:12:46.000000000 +0100 @@ -1913,6 +1913,15 @@ #endif #ifndef WITHOUT_MYSPELL_DICTS +File gid_File_Extension_Dictionary_Br + Dir = gid_Brand_Dir_Share_Extensions_Dict_Br; + Name = "dict-br.oxt"; + Styles = (PACKED, FORCELANGUAGEPACK, ARCHIVE); + UnixRights = 444; +End +#endif + +#ifndef WITHOUT_MYSPELL_DICTS File gid_File_Extension_Dictionary_Ca Dir = gid_Brand_Dir_Share_Extensions_Dict_Ca; Name = "dict-ca.oxt"; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libreoffice-bootstrap-3.3.1.2/scp2/source/ooo/module_ooo.scp new/libreoffice-bootstrap-3.3.2.2/scp2/source/ooo/module_ooo.scp --- old/libreoffice-bootstrap-3.3.1.2/scp2/source/ooo/module_ooo.scp 2011-02-02 13:16:12.000000000 +0100 +++ new/libreoffice-bootstrap-3.3.2.2/scp2/source/ooo/module_ooo.scp 2011-03-08 20:12:46.000000000 +0100 @@ -67,6 +67,17 @@ Styles = (); End +Module gid_Module_Root_Extension_Dictionary_Br + MOD_NAME_DESC ( MODULE_EXTENSION_DICTIONARY_BR ); + Files = (gid_File_Extension_Dictionary_Br); + InstallOrder = "2000"; + Sortkey = "515"; + Spellcheckerlanguage = "br"; + PackageInfo = "packinfo_office.txt"; + ParentID = gid_Module_Dictionaries; + Styles = (); +End + Module gid_Module_Root_Extension_Dictionary_Ca MOD_NAME_DESC ( MODULE_EXTENSION_DICTIONARY_CA ); Files = (gid_File_Extension_Dictionary_Ca); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libreoffice-bootstrap-3.3.1.2/scp2/source/ooo/module_ooo.ulf new/libreoffice-bootstrap-3.3.2.2/scp2/source/ooo/module_ooo.ulf --- old/libreoffice-bootstrap-3.3.1.2/scp2/source/ooo/module_ooo.ulf 2011-02-02 13:16:12.000000000 +0100 +++ new/libreoffice-bootstrap-3.3.2.2/scp2/source/ooo/module_ooo.ulf 2011-03-08 20:12:46.000000000 +0100 @@ -55,6 +55,12 @@ [STR_DESC_MODULE_EXTENSION_DICTIONARY_AF] en-US = "Afrikaans spell checker" +[STR_NAME_MODULE_EXTENSION_DICTIONARY_BR] +en-US = "Breton" + +[STR_DESC_MODULE_EXTENSION_DICTIONARY_BR] +en-US = "Breton spell checker" + [STR_NAME_MODULE_EXTENSION_DICTIONARY_CA] en-US = "Catalan" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libreoffice-bootstrap-3.3.1.2/solenv/inc/minor.mk new/libreoffice-bootstrap-3.3.2.2/solenv/inc/minor.mk --- old/libreoffice-bootstrap-3.3.1.2/solenv/inc/minor.mk 2011-02-15 16:32:02.000000000 +0100 +++ new/libreoffice-bootstrap-3.3.2.2/solenv/inc/minor.mk 2011-03-15 17:38:48.000000000 +0100 @@ -1,5 +1,5 @@ RSCVERSION=330 -RSCREVISION=330m19(Build:8) -BUILD=8 +RSCREVISION=330m19(Build:202) +BUILD=202 LAST_MINOR=m19 SOURCEVERSION=OOO330 ++++++ libreoffice-build-3.2.99.2-extensions-hack.diff ++++++ --- /var/tmp/diff_new_pack.rnIBbJ/_old 2011-03-21 15:16:19.000000000 +0100 +++ /var/tmp/diff_new_pack.rnIBbJ/_new 2011-03-21 15:16:19.000000000 +0100 @@ -9,16 +9,15 @@ #Localize Localize : LocalizeFixes UnstableWP : UnstableLibwpd -@@ -2315,6 +2315,10 @@ +@@ -2315,6 +2315,9 @@ oox-drawingml-fix-apply-shape-reference-crash.diff, n#593611, rodo oox-smartart-import.diff, thorsten +[ PieceBits ] +piece-config-office-extensions.diff + -+ [ NovellOnlyWin32 ] - sled10-splash.diff, i#123456, pmladek + novell-win32-splash.diff, fridrich openlockedquerybox-alwaysontop.diff, n#656566, tml --- patches/dev300/piece-config-office-extensions.diff +++ patches/dev300/piece-config-office-extensions.diff ++++++ libreoffice-build-3.3.1.2.tar.gz -> libreoffice-build-3.3.2.2.tar.gz ++++++ libreoffice-bootstrap/libreoffice-build-3.3.1.2.tar.gz /mounts/work_src_done/STABLE/libreoffice-bootstrap/libreoffice-build-3.3.2.2.tar.gz differ: char 5, line 1 ++++++ setup_native_packinfo-3.3.1.1.tar.bz2 -> setup_native_packinfo-3.3.2.1.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/setup_native/source/packinfo/packinfo_office.txt new/setup_native/source/packinfo/packinfo_office.txt --- old/setup_native/source/packinfo/packinfo_office.txt 2011-02-06 18:33:13.000000000 +0100 +++ new/setup_native/source/packinfo/packinfo_office.txt 2011-03-04 17:11:52.000000000 +0100 @@ -508,6 +508,22 @@ End Start +module = "gid_Module_Root_Extension_Dictionary_Br" +script = "shellscripts_extensions.txt" +solarispackagename = "%PACKAGEPREFIX%SOLARISBRANDPACKAGENAME%BRANDPACKAGEVERSION-dict-br" +solarisrequires = "%SOLSUREPACKAGEPREFIX%BRANDPACKAGEVERSION-ure, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core01, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core02, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core03, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core04, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core05, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core06, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core07, %PACKAGEPREFIX%SOLARISBRANDPACKAGENAME%BRANDPACKAGEVERSION" +packagename = "%UNIXPACKAGENAME%BRANDPACKAGEVERSION-dict-br" +requires = "%UREPACKAGEPREFIX%BRANDPACKAGEVERSION-ure,%BASISPACKAGEPREFIX%OOOBASEVERSION-core01,%BASISPACKAGEPREFIX%OOOBASEVERSION-core02,%BASISPACKAGEPREFIX%OOOBASEVERSION-core03,%BASISPACKAGEPREFIX%OOOBASEVERSION-core04,%BASISPACKAGEPREFIX%OOOBASEVERSION-core05,%BASISPACKAGEPREFIX%OOOBASEVERSION-core06,%BASISPACKAGEPREFIX%OOOBASEVERSION-core07,%UNIXPACKAGENAME%BRANDPACKAGEVERSION" +linuxpatchrequires = "" +copyright = "2009-2011 by An Drouizig" +solariscopyright = "solariscopyrightfile" +vendor = "An Drouizig" +description = "Br dictionary for %PRODUCTNAME %PRODUCTVERSION" +destpath = "/opt" +packageversion = "%PACKAGEVERSION" +End + +Start module = "gid_Module_Root_Extension_Dictionary_Ca" script = "shellscripts_extensions.txt" solarispackagename = "%PACKAGEPREFIX%SOLARISBRANDPACKAGENAME%BRANDPACKAGEVERSION-dict-ca" @@ -835,9 +851,9 @@ packagename = "%UNIXPACKAGENAME%BRANDPACKAGEVERSION-dict-oc" requires = "%UREPACKAGEPREFIX%BRANDPACKAGEVERSION-ure,%BASISPACKAGEPREFIX%OOOBASEVERSION-core01,%BASISPACKAGEPREFIX%OOOBASEVERSION-core02,%BASISPACKAGEPREFIX%OOOBASEVERSION-core03,%BASISPACKAGEPREFIX%OOOBASEVERSION-core04,%BASISPACKAGEPREFIX%OOOBASEVERSION-core05,%BASISPACKAGEPREFIX%OOOBASEVERSION-core06,%BASISPACKAGEPREFIX%OOOBASEVERSION-core07,%UNIXPACKAGENAME%BRANDPACKAGEVERSION" linuxpatchrequires = "" -copyright = "1990-2011 by Dicollecte" +copyright = "2006-2011 by Bruno Gallart" solariscopyright = "solariscopyrightfile" -vendor = "Dicollecte" +vendor = "OpenOc.org" description = "Occitan-languedocian dictionary for %PRODUCTNAME %PRODUCTVERSION" destpath = "/opt" packageversion = "%PACKAGEVERSION" ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 libreoffice-filters for openSUSE:Factory
by root＠hilbert.suse.de 21 Mar '11

21 Mar '11

Hello community, here is the log from the commit of package libreoffice-filters for openSUSE:Factory checked in at Mon Mar 21 15:23:51 CET 2011. -------- --- libreoffice-filters/libreoffice-filters.changes 2011-02-23 16:06:56.000000000 +0100 +++ libreoffice-filters/libreoffice-filters.changes 2011-03-18 18:59:50.000000000 +0100 @@ -1,0 +2,15 @@ +Fri Mar 18 16:40:02 CET 2011 - pmladek(a)suse.cz + +- updated to libreoffice-3.3.2.2 (3.3.2-rc2) + +------------------------------------------------------------------- +Wed Mar 16 16:45:15 UTC 2011 - neptunia(a)mail.ru + +- enabled KDE3 support (bnc#678998) + +------------------------------------------------------------------- +Wed Mar 9 17:42:27 CET 2011 - pmladek(a)suse.cz + +- updated to libreoffice-3.3.2.1 (3.3.2-rc1) + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- libreoffice-filters-3.3.1.2.tar.bz2 New: ---- libreoffice-filters-3.3.2.2.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libreoffice-filters.spec ++++++ --- /var/tmp/diff_new_pack.5eilJx/_old 2011-03-21 15:23:22.000000000 +0100 +++ /var/tmp/diff_new_pack.5eilJx/_new 2011-03-21 15:23:22.000000000 +0100 @@ -19,11 +19,11 @@ Name: libreoffice-filters -Version: 3.3.1.2 -Release: 2 +Version: 3.3.2.2 +Release: 1 %define piece filters -%define ooo_build_version 3.3.1.2 -%define ooo_piece_version 3.3.1.2 +%define ooo_build_version 3.3.2.2 +%define ooo_piece_version 3.3.2.2 %define ooo_sourcedirname libreoffice-build-%ooo_piece_version %define ooo_prefix %_libdir %define ooo_home libreoffice @@ -53,7 +53,7 @@ BuildRequires: libreoffice-libs-core-devel = %version ############################ # KDE3 stuff -%if 0%{?suse_version} && 0%{?suse_version} <= 1110 +%if 0%{?suse_version} BuildRequires: kdelibs3-devel %endif ############################ ++++++ libreoffice-filters-3.3.1.2.tar.bz2 -> libreoffice-filters-3.3.2.2.tar.bz2 ++++++ libreoffice-filters/libreoffice-filters-3.3.1.2.tar.bz2 libreoffice-filters/libreoffice-filters-3.3.2.2.tar.bz2 differ: char 11, line 1 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 libreoffice-libs-core for openSUSE:Factory
by root＠hilbert.suse.de 21 Mar '11

21 Mar '11

Hello community, here is the log from the commit of package libreoffice-libs-core for openSUSE:Factory checked in at Mon Mar 21 15:23:06 CET 2011. -------- --- libreoffice-libs-core/libreoffice-libs-core.changes 2011-02-23 16:07:14.000000000 +0100 +++ libreoffice-libs-core/libreoffice-libs-core.changes 2011-03-18 19:01:08.000000000 +0100 @@ -1,0 +2,20 @@ +Fri Mar 18 16:40:02 CET 2011 - pmladek(a)suse.cz + +- updated to libreoffice-3.3.2.2 (3.3.2-rc2) + +------------------------------------------------------------------- +Wed Mar 16 16:45:15 UTC 2011 - neptunia(a)mail.ru + +- enabled KDE3 support (bnc#678998) + +------------------------------------------------------------------- +Wed Mar 9 17:42:27 CET 2011 - pmladek(a)suse.cz + +- updated to libreoffice-3.3.2.1 (3.3.2-rc1) + +------------------------------------------------------------------- +Thu Mar 3 15:43:51 UTC 2011 - pmladek(a)novell.com + +- added cppunit-devel into BuildRequires on MeeGo + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- libreoffice-libs-core-3.3.1.2.tar.bz2 New: ---- libreoffice-libs-core-3.3.2.2.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libreoffice-libs-core.spec ++++++ --- /var/tmp/diff_new_pack.U2NJ6B/_old 2011-03-21 15:22:21.000000000 +0100 +++ /var/tmp/diff_new_pack.U2NJ6B/_new 2011-03-21 15:22:21.000000000 +0100 @@ -19,11 +19,11 @@ Name: libreoffice-libs-core -Version: 3.3.1.2 -Release: 2 +Version: 3.3.2.2 +Release: 1 %define piece libs-core -%define ooo_build_version 3.3.1.2 -%define ooo_piece_version 3.3.1.2 +%define ooo_build_version 3.3.2.2 +%define ooo_piece_version 3.3.2.2 %define ooo_sourcedirname libreoffice-build-%ooo_piece_version %define ooo_prefix %_libdir %define ooo_home libreoffice @@ -63,7 +63,7 @@ %endif ############################ # KDE3 stuff -%if 0%{?suse_version} && 0%{?suse_version} <= 1110 +%if 0%{?suse_version} BuildRequires: kdelibs3-devel %endif ############################ @@ -74,6 +74,9 @@ %if 0%{?suse_version} >= 01100 BuildRequires: libcppunit-devel %endif +%if 0%{?meego_version} +BuildRequires: cppunit-devel +%endif ############################ # expat stuff %if 0%{?suse_version} > 01100 @@ -103,13 +106,6 @@ # compat stuff Provides: OpenOffice_org-libs-core = %version Obsoletes: OpenOffice_org-libs-core <= %version -%if 0%{?suse_version} > 1110 -# removed kde3 package on openSUSE >= 11.2 (bnc#605472, bnc#621472) -Obsoletes: libreoffice-kde <= %version -Obsoletes: OpenOffice_org-kde <= %version -Obsoletes: OpenOffice_org17-kde -Obsoletes: OpenOffice_org2-kde -%endif Summary: LibreOffice Core Libraries Url: http://www.documentfoundation.org/ Source0: libreoffice-%piece-%ooo_piece_version.tar.bz2 @@ -143,7 +139,7 @@ -%if 0%{?suse_version} && 0%{?suse_version} <= 1110 +%if 0%{?suse_version} %package -n libreoffice-kde License: LGPLv3 @@ -161,8 +157,7 @@ %description -n libreoffice-kde This package contains some KDE extensions for LibreOffice. -%endif -%if 0%{?suse_version} + %package -n libreoffice-kde4 License: LGPLv3 @@ -215,10 +210,8 @@ %package devel Requires: %name = %version Requires: libreoffice-gnome = %version -%if 0%{?suse_version} && 0%{?suse_version} <= 1110 -Requires: libreoffice-kde = %version -%endif %if 0%{?suse_version} +Requires: libreoffice-kde = %version Requires: libreoffice-kde4 = %version %endif Requires: libreoffice-mailmerge = %version @@ -363,14 +356,11 @@ %files -f files-gnome.txt -n libreoffice-gnome %defattr(-,root,root) -%if 0%{?suse_version} && 0%{?suse_version} <= 1110 +%if 0%{?suse_version} %files -f files-kde.txt -n libreoffice-kde %defattr(-,root,root) -%endif -%if 0%{?suse_version} - %files -f files-kde4.txt -n libreoffice-kde4 %defattr(-,root,root) %endif ++++++ libreoffice-libs-core-3.3.1.2.tar.bz2 -> libreoffice-libs-core-3.3.2.2.tar.bz2 ++++++ libreoffice-libs-core/libreoffice-libs-core-3.3.1.2.tar.bz2 libreoffice-libs-core/libreoffice-libs-core-3.3.2.2.tar.bz2 differ: char 11, line 1 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 libreoffice-libs-gui for openSUSE:Factory
by root＠hilbert.suse.de 21 Mar '11

21 Mar '11

Hello community, here is the log from the commit of package libreoffice-libs-gui for openSUSE:Factory checked in at Mon Mar 21 15:21:59 CET 2011. -------- --- libreoffice-libs-gui/libreoffice-libs-gui.changes 2011-02-23 16:07:24.000000000 +0100 +++ libreoffice-libs-gui/libreoffice-libs-gui.changes 2011-03-18 19:02:33.000000000 +0100 @@ -1,0 +2,20 @@ +Fri Mar 18 16:40:02 CET 2011 - pmladek(a)suse.cz + +- updated to libreoffice-3.3.2.2 (3.3.2-rc2) + +------------------------------------------------------------------- +Wed Mar 16 16:45:15 UTC 2011 - neptunia(a)mail.ru + +- enabled KDE3 support (bnc#678998) + +------------------------------------------------------------------- +Wed Mar 9 17:42:27 CET 2011 - pmladek(a)suse.cz + +- updated to libreoffice-3.3.2.1 (3.3.2-rc1) + +------------------------------------------------------------------- +Thu Mar 3 15:43:51 UTC 2011 - pmladek(a)novell.com + +- added cppunit-devel into BuildRequires on MeeGo + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- libreoffice-l10n-3.3.1.2.tar.bz2 libreoffice-libs-gui-3.3.1.2.tar.bz2 New: ---- libreoffice-l10n-3.3.2.2.tar.bz2 libreoffice-libs-gui-3.3.2.2.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libreoffice-libs-gui.spec ++++++ --- /var/tmp/diff_new_pack.yQsu9v/_old 2011-03-21 15:21:29.000000000 +0100 +++ /var/tmp/diff_new_pack.yQsu9v/_new 2011-03-21 15:21:29.000000000 +0100 @@ -20,11 +20,11 @@ %define distro SUSE Name: libreoffice-libs-gui -Version: 3.3.1.2 -Release: 2 +Version: 3.3.2.2 +Release: 1 %define piece libs-gui -%define ooo_build_version 3.3.1.2 -%define ooo_piece_version 3.3.1.2 +%define ooo_build_version 3.3.2.2 +%define ooo_piece_version 3.3.2.2 %define ooo_sourcedirname libreoffice-build-%ooo_piece_version %define ooo_prefix %_libdir %define ooo_home libreoffice @@ -50,7 +50,7 @@ %endif ############################ # KDE3 stuff -%if 0%{?suse_version} && 0%{?suse_version} <= 1110 +%if 0%{?suse_version} BuildRequires: kdelibs3-devel %endif ############################ @@ -58,6 +58,9 @@ %if 0%{?suse_version} >= 01100 BuildRequires: libcppunit-devel %endif +%if 0%{?meego_version} +BuildRequires: cppunit-devel +%endif ############################ # expat stuff %if 0%{?suse_version} > 01100 ++++++ libreoffice-l10n-3.3.1.2.tar.bz2 -> libreoffice-l10n-3.3.2.2.tar.bz2 ++++++ libreoffice-libs-gui/libreoffice-l10n-3.3.1.2.tar.bz2 libreoffice-libs-gui/libreoffice-l10n-3.3.2.2.tar.bz2 differ: char 11, line 1 ++++++ libreoffice-libs-gui-3.3.1.2.tar.bz2 -> libreoffice-libs-gui-3.3.2.2.tar.bz2 ++++++ libreoffice-libs-gui/libreoffice-libs-gui-3.3.1.2.tar.bz2 libreoffice-libs-gui/libreoffice-libs-gui-3.3.2.2.tar.bz2 differ: char 11, line 1 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 libreoffice-testing for openSUSE:Factory
by root＠hilbert.suse.de 21 Mar '11

21 Mar '11

Hello community, here is the log from the commit of package libreoffice-testing for openSUSE:Factory checked in at Mon Mar 21 15:21:14 CET 2011. -------- --- libreoffice-testing/libreoffice-testing.changes 2011-02-23 16:07:27.000000000 +0100 +++ libreoffice-testing/libreoffice-testing.changes 2011-03-18 19:03:05.000000000 +0100 @@ -1,0 +2,15 @@ +Fri Mar 18 16:40:02 CET 2011 - pmladek(a)suse.cz + +- updated to libreoffice-3.3.2.2 (3.3.2-rc2) + +------------------------------------------------------------------- +Wed Mar 9 17:42:27 CET 2011 - pmladek(a)suse.cz + +- updated to libreoffice-3.3.2.1 (3.3.2-rc1) + +------------------------------------------------------------------- +Thu Mar 3 15:43:51 UTC 2011 - pmladek(a)novell.com + +- added cppunit-devel into BuildRequires on MeeGo + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- libreoffice-testing-3.3.1.2.tar.bz2 New: ---- libreoffice-testing-3.3.2.2.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libreoffice-testing.spec ++++++ --- /var/tmp/diff_new_pack.Rvm9yV/_old 2011-03-21 15:20:39.000000000 +0100 +++ /var/tmp/diff_new_pack.Rvm9yV/_new 2011-03-21 15:20:39.000000000 +0100 @@ -19,11 +19,11 @@ Name: libreoffice-testing -Version: 3.3.1.2 -Release: 2 +Version: 3.3.2.2 +Release: 1 %define piece testing -%define ooo_build_version 3.3.1.2 -%define ooo_piece_version 3.3.1.2 +%define ooo_build_version 3.3.2.2 +%define ooo_piece_version 3.3.2.2 %define ooo_sourcedirname libreoffice-build-%ooo_piece_version %define ooo_prefix %_libdir %define ooo_home libreoffice @@ -35,6 +35,9 @@ %if 0%{?suse_version} >= 01100 BuildRequires: libcppunit-devel %endif +%if 0%{?meego_version} +BuildRequires: cppunit-devel +%endif ############################ # junit stuff %if %suse_version > 1110 ++++++ libreoffice-testing-3.3.1.2.tar.bz2 -> libreoffice-testing-3.3.2.2.tar.bz2 ++++++ libreoffice-testing/libreoffice-testing-3.3.1.2.tar.bz2 libreoffice-testing/libreoffice-testing-3.3.2.2.tar.bz2 differ: char 11, line 1 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 libreoffice-libs-extern for openSUSE:Factory
by root＠hilbert.suse.de 21 Mar '11

21 Mar '11

Hello community, here is the log from the commit of package libreoffice-libs-extern for openSUSE:Factory checked in at Mon Mar 21 15:20:21 CET 2011. -------- --- libreoffice-libs-extern/libreoffice-libs-extern.changes 2011-02-23 16:07:19.000000000 +0100 +++ libreoffice-libs-extern/libreoffice-libs-extern.changes 2011-03-18 19:01:39.000000000 +0100 @@ -1,0 +2,22 @@ +Fri Mar 18 16:40:02 CET 2011 - pmladek(a)suse.cz + +- updated to libreoffice-3.3.2.2 (3.3.2-rc2) + +------------------------------------------------------------------- +Wed Mar 16 16:45:15 UTC 2011 - neptunia(a)mail.ru + +- enabled KDE3 support (bnc#678998) + +------------------------------------------------------------------- +Wed Mar 9 17:42:27 CET 2011 - pmladek(a)suse.cz + +- updated to libreoffice-3.3.2.1 (3.3.2-rc1) + +------------------------------------------------------------------- +Thu Mar 3 17:02:04 CET 2011 - pmladek(a)suse.cz + +- switched to more stable internal Cairo on MeeGo (bnc#635016) + * added cairo-1.8.0 and pixman-0.12.0 source tarballs + * removed libcairo.so.2 and libpixman-1.so.0 from provides and requires + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- libreoffice-libs-extern-3.3.1.2.tar.bz2 libreoffice-libs-extern-sys-3.3.1.2.tar.bz2 New: ---- 09357cc74975b01714e00c5899ea1881-pixman-0.12.0.tar.gz 4ea70ea87b47e92d318d4e7f5b940f47-cairo-1.8.0.tar.gz libreoffice-libs-extern-3.3.2.2.tar.bz2 libreoffice-libs-extern-sys-3.3.2.2.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libreoffice-libs-extern.spec ++++++ --- /var/tmp/diff_new_pack.dllVQI/_old 2011-03-21 15:19:42.000000000 +0100 +++ /var/tmp/diff_new_pack.dllVQI/_new 2011-03-21 15:19:42.000000000 +0100 @@ -21,11 +21,11 @@ Name: libreoffice-libs-extern # allow to use xulrunner191 on SLED11-SP1 (bnc#540726) %define use_xulrunner191 no -Version: 3.3.1.2 -Release: 2 +Version: 3.3.2.2 +Release: 1 %define piece libs-extern -%define ooo_build_version 3.3.1.2 -%define ooo_piece_version 3.3.1.2 +%define ooo_build_version 3.3.2.2 +%define ooo_piece_version 3.3.2.2 %define ooo_sourcedirname libreoffice-build-%ooo_piece_version %define ooo_prefix %_libdir %define ooo_home libreoffice @@ -45,7 +45,7 @@ BuildRequires: libreoffice-ure-devel = %version ############################ # KDE3 stuff -%if 0%{?suse_version} && 0%{?suse_version} <= 1110 +%if 0%{?suse_version} BuildRequires: kdelibs3-devel %endif ############################ @@ -139,6 +139,8 @@ Source1030: 5ba6a61a2f66dfd5fee8cdd4cd262a37-libwpg-0.2.0.tar.bz2 Source1031: 9e436bff44c60dc8b97cba0c7fc11a5c-libwps-0.2.0.tar.bz2 Source1032: 5ff846847dab351604ad859e2fd4ed3c-libwpd-0.9.1.tar.bz2 +Source1033: 4ea70ea87b47e92d318d4e7f5b940f47-cairo-1.8.0.tar.gz +Source1034: 09357cc74975b01714e00c5899ea1881-pixman-0.12.0.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-build ExclusiveArch: %ix86 x86_64 ppc @@ -196,7 +198,7 @@ %{S:1015} %{S:1016} %{S:1017} %{S:1018} %{S:1019} \ %{S:1020} %{S:1021} %{S:1022} %{S:1023} %{S:1024} \ %{S:1025} %{S:1026} %{S:1027} %{S:1028} %{S:1029} \ - %{S:1030} %{S:1031} %{S:1032} \ + %{S:1030} %{S:1031} %{S:1032} %{S:1033} %{S:1034} \ ooo-build/src # we do not want to build some stuff on linux mkdir -p ooo-build/ooo/do-not-build @@ -225,6 +227,10 @@ %else cp %{S:90} mysqlcppconn/download %endif +# use more stable internal Cairo on MeeGo (bnc#635016) +%if 0%{?meego_version} +mv $ooo_libs_extern_sys/cairo . +%endif # Multi-Dimensional Data Structure mkdir -p mdds/download cp %{S:91} mdds/download ++++++ libreoffice-libs-extern-3.3.1.2.tar.bz2 -> libreoffice-libs-extern-3.3.2.2.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libreoffice-libs-extern-3.3.1.2/ChangeLog new/libreoffice-libs-extern-3.3.2.2/ChangeLog --- old/libreoffice-libs-extern-3.3.1.2/ChangeLog 2011-02-15 20:14:40.000000000 +0100 +++ new/libreoffice-libs-extern-3.3.2.2/ChangeLog 2011-03-15 17:55:50.000000000 +0100 @@ -1,18 +1,13 @@ -2011-02-15 Petr Mladek <pmladek(a)suse.cz> [02f6c554a23294bc1401edbb0c974164a4376c72] +2011-03-15 Petr Mladek <pmladek(a)suse.cz> [61cc3e00a34af76e7d771201c51ef3c5256b6dd4] -Version 3.3.1.2, tag libreoffice-3.3.1.2 (3.3.1-rc2) +Version 3.3.2.2, tag libreoffice-3.3.2.2 (3.3.2-rc2) -2011-02-08 Petr Mladek <pmladek(a)suse.cz> [50c9598ba64212a30b93ff818b01e6edb2d79ece] +2011-03-08 Petr Mladek <pmladek(a)suse.cz> [d2f589c64db83b04883cbb1b263a12bc11b30167] -Version 3.3.1.1, tag libreoffice-3.3.1.1 (3.3.1-rc1) +Branch libreoffice-3-3-2 - -2011-02-07 Jan Holesovsky <kendy(a)suse.cz> [48d68cb55dece21703b2fd24822905ebf024a7c8] - -Branch libreoffice-3-3-1 - -This is 'libreoffice-3-3-1' - the stable branch for the 3.3.1 release. +This is 'libreoffice-3-3-2' - the stable branch for the 3.3.2 release. Only very safe changes, reviewed by three people are allowed. If you want to commit more complicated fix for the next 3.3.x release, @@ -20,6 +15,11 @@ If you want to build something cool, unstable, and risky, use master. +2011-03-08 Petr Mladek <pmladek(a)suse.cz> [5e504305de063abcdf62f8276cb8b072a06f97bc] + +Version 3.3.2.1, tag libreoffice-3.3.2.1 (3.3.2-rc1) + + 2011-01-24 Fridrich Štrba <fridrich.strba(a)bluewin.ch> [42a8568ffba726cd03054933b6af60288cab8bdd] upgrade libwpd to 0.9.1 ++++++ libreoffice-libs-extern-sys-3.3.1.2.tar.bz2 -> libreoffice-libs-extern-sys-3.3.2.2.tar.bz2 ++++++ libreoffice-libs-extern/libreoffice-libs-extern-sys-3.3.1.2.tar.bz2 libreoffice-libs-extern/libreoffice-libs-extern-sys-3.3.2.2.tar.bz2 differ: char 11, line 1 ++++++ lo-libs-extern-prov ++++++ --- /var/tmp/diff_new_pack.dllVQI/_old 2011-03-21 15:19:44.000000000 +0100 +++ /var/tmp/diff_new_pack.dllVQI/_new 2011-03-21 15:19:44.000000000 +0100 @@ -3,4 +3,6 @@ -e librasqal.so \ -e librdf.so \ -e libmysqlcppconn.so \ + -e libcairo.so.2 \ + -e libpixman-1.so.0 \ | /usr/lib/rpm/find-provides “$@” ++++++ lo-libs-extern-req ++++++ --- /var/tmp/diff_new_pack.dllVQI/_old 2011-03-21 15:19:44.000000000 +0100 +++ /var/tmp/diff_new_pack.dllVQI/_new 2011-03-21 15:19:44.000000000 +0100 @@ -4,3 +4,4 @@ -e librasqal.so \ -e librdf.so \ -e libmysqlcppconn.so \ + -e libpixman-1.so.0 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 libreoffice-artwork for openSUSE:Factory
by root＠hilbert.suse.de 21 Mar '11

21 Mar '11

Hello community, here is the log from the commit of package libreoffice-artwork for openSUSE:Factory checked in at Mon Mar 21 15:19:22 CET 2011. -------- --- libreoffice-artwork/libreoffice-artwork.changes 2011-02-23 16:06:33.000000000 +0100 +++ libreoffice-artwork/libreoffice-artwork.changes 2011-03-18 18:58:15.000000000 +0100 @@ -1,0 +2,15 @@ +Fri Mar 18 16:40:02 CET 2011 - pmladek(a)suse.cz + +- updated to libreoffice-3.3.2.2 (3.3.2-rc2) + +------------------------------------------------------------------- +Wed Mar 16 16:45:15 UTC 2011 - neptunia(a)mail.ru + +- enabled KDE3 support (bnc#678998) + +------------------------------------------------------------------- +Wed Mar 9 17:42:27 CET 2011 - pmladek(a)suse.cz + +- updated to libreoffice-3.3.2.1 (3.3.2-rc1) + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- libreoffice-artwork-3.3.1.2.tar.bz2 New: ---- libreoffice-artwork-3.3.2.2.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libreoffice-artwork.spec ++++++ --- /var/tmp/diff_new_pack.5vJ4eo/_old 2011-03-21 15:18:58.000000000 +0100 +++ /var/tmp/diff_new_pack.5vJ4eo/_new 2011-03-21 15:18:58.000000000 +0100 @@ -19,11 +19,11 @@ Name: libreoffice-artwork -Version: 3.3.1.2 -Release: 2 +Version: 3.3.2.2 +Release: 1 %define piece artwork -%define ooo_build_version 3.3.1.2 -%define ooo_piece_version 3.3.1.2 +%define ooo_build_version 3.3.2.2 +%define ooo_piece_version 3.3.2.2 %define ooo_sourcedirname libreoffice-build-%ooo_piece_version %define ooo_prefix %_libdir %define ooo_home libreoffice @@ -41,7 +41,7 @@ %endif ############################ # KDE3 stuff -%if 0%{?suse_version} && 0%{?suse_version} <= 1110 +%if 0%{?suse_version} BuildRequires: kdelibs3-devel %endif License: Artistic ; BSD3c ; GPLv2+ ; LPPL .. ; LGPLv2.1+ ; LGPLv3 ; MPL .. ; MIT ++++++ libreoffice-artwork-3.3.1.2.tar.bz2 -> libreoffice-artwork-3.3.2.2.tar.bz2 ++++++ libreoffice-artwork/libreoffice-artwork-3.3.1.2.tar.bz2 libreoffice-artwork/libreoffice-artwork-3.3.2.2.tar.bz2 differ: char 11, line 1 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 libreoffice-ure for openSUSE:Factory
by root＠hilbert.suse.de 21 Mar '11

21 Mar '11

Hello community, here is the log from the commit of package libreoffice-ure for openSUSE:Factory checked in at Mon Mar 21 15:18:38 CET 2011. -------- --- libreoffice-ure/libreoffice-ure.changes 2011-02-23 16:07:31.000000000 +0100 +++ libreoffice-ure/libreoffice-ure.changes 2011-03-18 19:03:16.000000000 +0100 @@ -1,0 +2,20 @@ +Fri Mar 18 16:40:02 CET 2011 - pmladek(a)suse.cz + +- updated to libreoffice-3.3.2.2 (3.3.2-rc2) + +------------------------------------------------------------------- +Wed Mar 16 16:45:15 UTC 2011 - neptunia(a)mail.ru + +- enabled KDE3 support (bnc#678998) + +------------------------------------------------------------------- +Wed Mar 9 17:42:27 CET 2011 - pmladek(a)suse.cz + +- updated to libreoffice-3.3.2.1 (3.3.2-rc1) + +------------------------------------------------------------------- +Thu Mar 3 15:43:51 UTC 2011 - pmladek(a)novell.com + +- added cppunit-devel into BuildRequires on MeeGo + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- libreoffice-sdk-3.3.1.2.tar.bz2 libreoffice-ure-3.3.1.2.tar.bz2 New: ---- libreoffice-sdk-3.3.2.2.tar.bz2 libreoffice-ure-3.3.2.2.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libreoffice-ure.spec ++++++ --- /var/tmp/diff_new_pack.FVXGNs/_old 2011-03-21 15:17:35.000000000 +0100 +++ /var/tmp/diff_new_pack.FVXGNs/_new 2011-03-21 15:17:35.000000000 +0100 @@ -19,11 +19,11 @@ Name: libreoffice-ure -Version: 3.3.1.2 -Release: 2 +Version: 3.3.2.2 +Release: 1 %define piece ure -%define ooo_build_version 3.3.1.2 -%define ooo_piece_version 3.3.1.2 +%define ooo_build_version 3.3.2.2 +%define ooo_piece_version 3.3.2.2 %define ooo_sourcedirname libreoffice-build-%ooo_build_version %define ooo_prefix %_libdir %define ooo_home libreoffice @@ -42,7 +42,7 @@ %endif ############################ # KDE3 stuff -%if 0%{?suse_version} && 0%{?suse_version} <= 1110 +%if 0%{?suse_version} BuildRequires: kdelibs3-devel %endif ############################ @@ -50,6 +50,9 @@ %if 0%{?suse_version} >= 01100 BuildRequires: libcppunit-devel %endif +%if 0%{?meego_version} +BuildRequires: cppunit-devel +%endif License: LGPLv3 Group: Productivity/Office/Suite AutoReqProv: on ++++++ libreoffice-sdk-3.3.1.2.tar.bz2 -> libreoffice-sdk-3.3.2.2.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libreoffice-sdk-3.3.1.2/ChangeLog new/libreoffice-sdk-3.3.2.2/ChangeLog --- old/libreoffice-sdk-3.3.1.2/ChangeLog 2011-02-15 20:13:28.000000000 +0100 +++ new/libreoffice-sdk-3.3.2.2/ChangeLog 2011-03-15 17:54:33.000000000 +0100 @@ -1,30 +1,30 @@ -2011-02-15 Petr Mladek <pmladek(a)suse.cz> [475a8c2d2b9372e9cab59df9380a6db30e798826] +2011-03-15 Petr Mladek <pmladek(a)suse.cz> [ffbad8b9a4c3adcf4fdcb410e5dff8cdfcdcfd96] -Version 3.3.1.2, tag libreoffice-3.3.1.2 (3.3.1-rc2) +Version 3.3.2.2, tag libreoffice-3.3.2.2 (3.3.2-rc2) -2011-02-11 Rene Engelhard <rene(a)debian.org> [c5233661670df7de0ffdba7005242890b25df2a4] +2011-03-08 Petr Mladek <pmladek(a)suse.cz> [a314c71d4d3eeb6b63d47ed30295cb437194ef92] -fix ODK settings.mk to only set STLPORTLIB if needed +Branch libreoffice-3-3-2 -Signed-off-by: Petr Mladek <pmladek(a)suse.cz> +This is 'libreoffice-3-3-2' - the stable branch for the 3.3.2 release. +Only very safe changes, reviewed by three people are allowed. -2011-02-08 Petr Mladek <pmladek(a)suse.cz> [f0c071b771bcb5ad8766beae20d0843034970038] +If you want to commit more complicated fix for the next 3.3.x release, +please use the 'libreoffice-3-3' branch. -Version 3.3.1.1, tag libreoffice-3.3.1.1 (3.3.1-rc1) +If you want to build something cool, unstable, and risky, use master. +2011-03-08 Petr Mladek <pmladek(a)suse.cz> [f779dacc689b152f5ede60bc8bfc6029c2e77d68] -2011-02-07 Jan Holesovsky <kendy(a)suse.cz> [a095957324cb35016d2378c89e12188eb0e382e1] +Version 3.3.2.1, tag libreoffice-3.3.2.1 (3.3.2-rc1) -Branch libreoffice-3-3-1 -This is 'libreoffice-3-3-1' - the stable branch for the 3.3.1 release. -Only very safe changes, reviewed by three people are allowed. +2011-02-11 Rene Engelhard <rene(a)debian.org> [8cf803c664182e2aac245695fb3ddf36aac9b877] -If you want to commit more complicated fix for the next 3.3.x release, -please use the 'libreoffice-3-3' branch. +fix ODK settings.mk to only set STLPORTLIB if needed -If you want to build something cool, unstable, and risky, use master. +Signed-off-by: Petr Mladek <pmladek(a)suse.cz> 2011-01-11 Petr Mladek <pmladek(a)suse.cz> [a80b910ddedf4bb3b6fe53a5aa5fee5d48760368] ++++++ libreoffice-ure-3.3.1.2.tar.bz2 -> libreoffice-ure-3.3.2.2.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libreoffice-ure-3.3.1.2/ChangeLog new/libreoffice-ure-3.3.2.2/ChangeLog --- old/libreoffice-ure-3.3.1.2/ChangeLog 2011-02-15 20:14:30.000000000 +0100 +++ new/libreoffice-ure-3.3.2.2/ChangeLog 2011-03-15 17:55:40.000000000 +0100 @@ -1,18 +1,19 @@ -2011-02-15 Petr Mladek <pmladek(a)suse.cz> [9fb44f6214cc487570c154a543260166333bf564] +2011-03-15 Petr Mladek <pmladek(a)suse.cz> [abffc5b7655e3b266f2bbfb885d7daae2db65c6a] -Version 3.3.1.2, tag libreoffice-3.3.1.2 (3.3.1-rc2) +Version 3.3.2.2, tag libreoffice-3.3.2.2 (3.3.2-rc2) -2011-02-08 Petr Mladek <pmladek(a)suse.cz> [0fdd83bb80750974f216358fcb3fecaa0fa370d3] +2011-03-14 Jani Monoses <jani.monoses(a)canonical.com> [2199a47a3fdb624c93d222de9b72bef8edee6993] -Version 3.3.1.1, tag libreoffice-3.3.1.1 (3.3.1-rc1) +prefer gcc __sync functions over pthread +Signed-off-by: Bjoern Michaelsen <bjoern.michaelsen(a)canonical.com> -2011-02-07 Jan Holesovsky <kendy(a)suse.cz> [a7dce734c49ae5b48837f4db047594959505f5de] +2011-03-08 Petr Mladek <pmladek(a)suse.cz> [a7840842f1734dcbd5f7f2dca2de27cc0462958c] -Branch libreoffice-3-3-1 +Branch libreoffice-3-3-2 -This is 'libreoffice-3-3-1' - the stable branch for the 3.3.1 release. +This is 'libreoffice-3-3-2' - the stable branch for the 3.3.2 release. Only very safe changes, reviewed by three people are allowed. If you want to commit more complicated fix for the next 3.3.x release, @@ -20,6 +21,16 @@ If you want to build something cool, unstable, and risky, use master. +2011-03-08 Petr Mladek <pmladek(a)suse.cz> [aa69dfc89ad7def36625c4cb65088ea30c50405c] + +Version 3.3.2.1, tag libreoffice-3.3.2.1 (3.3.2-rc1) + + +2011-02-11 Rene Engelhard <rene(a)debian.org> [7744c3ad6f33c2cb80ae8a1005dce1d5ea2f65c0] + +fix pyuno/demo/pyunoenv.tcsh for PYTHONPATH usage + + 2011-02-03 Caolán McNamara <caolanm(a)redhat.com> [a5d54a8a2d254b49c5fffaa6b3d0c094b756e691] move cxxabi.h after stl headers to workaround gcc 4.6.0 and damn stlport diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libreoffice-ure-3.3.1.2/pyuno/demo/pyunoenv.tcsh new/libreoffice-ure-3.3.2.2/pyuno/demo/pyunoenv.tcsh --- old/libreoffice-ure-3.3.1.2/pyuno/demo/pyunoenv.tcsh 2011-02-14 15:41:55.000000000 +0100 +++ new/libreoffice-ure-3.3.2.2/pyuno/demo/pyunoenv.tcsh 2011-03-08 20:12:52.000000000 +0100 @@ -17,7 +17,12 @@ setenv LD_LIBRARY_PATH endif -setenv PYTHONPATH .:$OOOHOME/program:$OOOHOME/program/pydemo:$OOOHOME/program/python/lib:$PYTHONPATH +if ( $?PYTHOHOME ) + setenv PYTHONPATH $OOOHOME/program:$OOOHOME/program/pydemo:$OOOHOME/program/python/lib:$PYTHONPATH +else + setenv PYTHONPATH $OOOHOME/program:$OOOHOME/program/pydemo:$OOOHOME/program/python/lib +endif + setenv LD_LIBRARY_PATH $OOOHOME/program:$LD_LIBRARY_PATH if( $?PYTHONHOME ) then diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libreoffice-ure-3.3.1.2/sal/osl/unx/interlck.c new/libreoffice-ure-3.3.2.2/sal/osl/unx/interlck.c --- old/libreoffice-ure-3.3.1.2/sal/osl/unx/interlck.c 2010-11-11 16:43:29.000000000 +0100 +++ new/libreoffice-ure-3.3.2.2/sal/osl/unx/interlck.c 2011-03-15 11:32:09.000000000 +0100 @@ -134,7 +134,16 @@ return nCount; } +#elif ( __GNUC__ > 4 ) || (( __GNUC__ == 4) && ( __GNUC_MINOR__ >= 4 )) +oslInterlockedCount SAL_CALL osl_incrementInterlockedCount(oslInterlockedCount* pCount) +{ + return __sync_add_and_fetch(pCount, 1); +} +oslInterlockedCount SAL_CALL osl_decrementInterlockedCount(oslInterlockedCount* pCount) +{ + return __sync_sub_and_fetch(pCount, 1); +} #else /* use only if nothing else works, expensive due to single mutex for all reference counts */ ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 kbd for openSUSE:Factory
by root＠hilbert.suse.de 21 Mar '11

21 Mar '11

Hello community, here is the log from the commit of package kbd for openSUSE:Factory checked in at Mon Mar 21 15:15:56 CET 2011. -------- --- kbd/kbd.changes 2011-02-17 12:47:47.000000000 +0100 +++ /mounts/work_src_done/STABLE/kbd/kbd.changes 2011-03-21 14:10:35.000000000 +0100 @@ -1,0 +2,7 @@ +Mon Mar 21 14:07:36 CET 2011 - werner(a)suse.de + +- If /usr is located in a separate partition, the locale command fails. +- Ignore /var/run/keymap in sinlge user mode otherwise key mapping + could be wrong if booted cold into sinlge user mode + +------------------------------------------------------------------- calling whatdependson for head-i586 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kbd.spec ++++++ --- /var/tmp/diff_new_pack.eSF5OK/_old 2011-03-21 15:15:18.000000000 +0100 +++ /var/tmp/diff_new_pack.eSF5OK/_new 2011-03-21 15:15:18.000000000 +0100 @@ -24,7 +24,7 @@ Group: System/Console AutoReqProv: on Version: 1.15.2 -Release: 41 +Release: 42 Summary: Keyboard and Font Utilities Source: kbd-%{version}.tar.bz2 Source1: kbd_fonts.tar.bz2 ++++++ kbd.init ++++++ --- /var/tmp/diff_new_pack.eSF5OK/_old 2011-03-21 15:15:18.000000000 +0100 +++ /var/tmp/diff_new_pack.eSF5OK/_new 2011-03-21 15:15:18.000000000 +0100 @@ -41,7 +41,7 @@ # XXX: is this really needed just for LOCALE_CHARMAP? test -e /etc/SuSEconfig/profile && . /etc/SuSEconfig/profile test -e /etc/profile.d/lang.sh && . /etc/profile.d/lang.sh -LOCALE_CHARMAP=`locale charmap` +LOCALE_CHARMAP=`locale charmap 2>/dev/null` LC_ALL=POSIX KBDBASE="/usr/share/kbd" @@ -164,7 +164,7 @@ # this means that initialization was already done. # don't do it twice unless forced, it may annoy xdm and # produce lots of error messages. - test -s /var/run/keymap && exit 0 + test -s /var/run/keymap -a "$RUNLEVEL" != S && exit 0 ;; esac ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 perl-libwww-perl for openSUSE:Factory
by root＠hilbert.suse.de 21 Mar '11

21 Mar '11

Hello community, here is the log from the commit of package perl-libwww-perl for openSUSE:Factory checked in at Mon Mar 21 15:14:39 CET 2011. -------- --- perl-libwww-perl/perl-libwww-perl.changes 2010-12-02 07:31:58.000000000 +0100 +++ /mounts/work_src_done/STABLE/perl-libwww-perl/perl-libwww-perl.changes 2011-03-17 12:08:19.000000000 +0100 @@ -1,0 +2,27 @@ +Thu Mar 17 11:01:06 UTC 2011 - chris(a)computersalat.de + +- fix deps + o add several missing deps + +------------------------------------------------------------------- +Thu Mar 17 09:26:19 UTC 2011 - vcizek(a)novell.com + +- upgrade to 6.01 + Unbundled all modules not in the LWP:: namespace from the libwww-perl + distribution. The new broken out CPAN distribtions are File-Listing, + HTML-Form, HTTP-Cookies, HTTP-Daemon, HTTP-Date, HTTP-Message, HTTP-Negotiate, + Net-HTTP, and WWW-RobotRules. libwww-perl-6 require these to be installed. + + This release also drops the unmaintained lwp-rget script from the distribution. + Perl v5.8.8 or better is now required. + + Support internationalized URLs from command line scripts and in the proxy + environment variables. + + The lwp-dump script got new --request option. + The lwp-request script got new -E option, contributed by Tony Finch. + + Protocol handlers and callbacks can raise HTTP::Response objects as exceptions. + This will abort the current request and make LWP return the raised response. + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- libwww-perl-5.837.tar.bz2 New: ---- libwww-perl-6.01.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ perl-libwww-perl.spec ++++++ --- /var/tmp/diff_new_pack.plMpKx/_old 2011-03-21 15:08:25.000000000 +0100 +++ /var/tmp/diff_new_pack.plMpKx/_new 2011-03-21 15:08:25.000000000 +0100 @@ -1,7 +1,7 @@ # -# spec file for package perl-libwww-perl (Version 5.837) +# spec file for package perl-libwww-perl # -# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2011 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 @@ -18,52 +18,83 @@ Name: perl-libwww-perl -Version: 5.837 -Release: 2 -License: GPL+, Artistic License %define cpan_name libwww-perl -Summary: The World-Wide Web library for Perl -Url: http://search.cpan.org/dist/libwww-perl/ +Summary: The World-Wide-Web library for Perl +Version: 6.01 +Release: 1 +License: GPL+ or Artistic Group: Development/Libraries/Perl -#Source: http://www.cpan.org/modules/by-module/libwww/libwww-perl-%{version}.tar.gz +Url: http://search.cpan.org/dist/libwww-perl/ +#Source: http://www.cpan.org/authors/id/G/GA/GAAS/libwww-perl-%{version}.tar.gz Source: %{cpan_name}-%{version}.tar.bz2 # PATCH-FIX-OPENSUSE -- disable one perl requires that would be created automatically and we're unable to provide Patch0: disable-ghttp.diff -BuildRequires: perl -BuildRoot: %{_tmppath}/%{name}-%{version}-build -%{perl_requires} BuildArch: noarch +BuildRoot: %{_tmppath}/%{name}-%{version}-build +BuildRequires: perl BuildRequires: perl-macros -BuildRequires: perl(Compress::Raw::Zlib) -BuildRequires: perl(Crypt::SSLeay) BuildRequires: perl(Digest::MD5) -BuildRequires: perl(HTML::Parser) >= 3.33 -BuildRequires: perl(HTML::Tagset) -BuildRequires: perl(IO::Compress::Deflate) -BuildRequires: perl(IO::Compress::Gzip) -BuildRequires: perl(IO::Uncompress::Gunzip) -BuildRequires: perl(IO::Uncompress::Inflate) -BuildRequires: perl(IO::Uncompress::RawInflate) +BuildRequires: perl(Encode) >= 2.12 +BuildRequires: perl(Encode::Locale) +BuildRequires: perl(File::Listing) >= 6 +BuildRequires: perl(HTML::Entities) +BuildRequires: perl(HTML::HeadParser) +BuildRequires: perl(HTTP::Cookies) >= 6 +BuildRequires: perl(HTTP::Daemon) >= 6 +BuildRequires: perl(HTTP::Date) >= 6 +BuildRequires: perl(HTTP::Negotiate) >= 6 +BuildRequires: perl(HTTP::Request) >= 6 +BuildRequires: perl(HTTP::Request::Common) >= 6 +BuildRequires: perl(HTTP::Response) >= 6 +BuildRequires: perl(HTTP::Status) >= 6 +BuildRequires: perl(IO::Select) +BuildRequires: perl(IO::Socket) +BuildRequires: perl(LWP::MediaTypes) >= 6 +BuildRequires: perl(MIME::Base64) >= 2.1 +BuildRequires: perl(Net::FTP) >= 2.58 +BuildRequires: perl(Net::HTTP) >= 6 BuildRequires: perl(URI) >= 1.10 -Requires: perl(Compress::Raw::Zlib) -Requires: perl(Crypt::SSLeay) +BuildRequires: perl(URI::Escape) +BuildRequires: perl(WWW::RobotRules) >= 6 +# Requires: perl(Digest::MD5) -Requires: perl(HTML::Parser) >= 3.33 -Requires: perl(HTML::Tagset) -Requires: perl(IO::Compress::Deflate) -Requires: perl(IO::Compress::Gzip) -Requires: perl(IO::Uncompress::Gunzip) -Requires: perl(IO::Uncompress::Inflate) -Requires: perl(IO::Uncompress::RawInflate) +Requires: perl(Encode) >= 2.12 +Requires: perl(Encode::Locale) +Requires: perl(File::Listing) >= 6 +Requires: perl(HTML::Entities) +Requires: perl(HTML::HeadParser) +Requires: perl(HTTP::Cookies) >= 6 +Requires: perl(HTTP::Daemon) >= 6 +Requires: perl(HTTP::Date) >= 6 +Requires: perl(HTTP::Negotiate) >= 6 +Requires: perl(HTTP::Request) >= 6 +Requires: perl(HTTP::Request::Common) >= 6 +Requires: perl(HTTP::Response) >= 6 +Requires: perl(HTTP::Status) >= 6 +Requires: perl(IO::Select) +Requires: perl(IO::Socket) +Requires: perl(LWP::MediaTypes) >= 6 +Requires: perl(MIME::Base64) >= 2.1 +Requires: perl(Net::FTP) >= 2.58 +Requires: perl(Net::HTTP) >= 6 Requires: perl(URI) >= 1.10 +Requires: perl(URI::Escape) +Requires: perl(WWW::RobotRules) >= 6 +%{perl_requires} +# +Recommends: perl(Authen::NTML) >= 2.12 +Recommends: perl(Data::Dump) +Recommends: perl(IO::Socket::SSL) >= 1.38 +Recommends: perl(Mozilla::CA) >= 20110101 +Recommends: perl(Net::HTTPS) >= 6 %description The libwww-perl collection is a set of Perl modules which provides a -simple and consistent application programming interface to the World-Wide -Web. The main focus of the library is to provide classes and functions -that allow you to write WWW clients. The library also contain modules that -are of more general use and even classes that help you implement simple -HTTP servers. +simple and consistent application programming interface to the +World-Wide Web. The main focus of the library is to provide classes +and functions that allow you to write WWW clients. The library also +contain modules that are of more general use and even classes that +help you implement simple HTTP servers. %prep %setup -q -n %{cpan_name}-%{version} @@ -74,25 +105,22 @@ %{__make} %{?_smp_mflags} %check -#disable test that require network connection -mv t/live/jigsaw-chunk.t t/live/jigsaw-chunk.tt -mv t/live/jigsaw-md5.t t/live/jigsaw-md5.tt -mv t/live/jigsaw-md5-get.t t/live/jigsaw-md5-get.tt +%{__mv} t/live/jigsaw-chunk.t t/live/jigsaw-chunk.tt +%{__mv} t/live/jigsaw-md5.t t/live/jigsaw-md5.tt +%{__mv} t/live/jigsaw-md5-get.t t/live/jigsaw-md5-get.tt %{__make} test %install %perl_make_install -# remove .packlist file -%{__rm} -rf %{buildroot}%perl_vendorarch -# remove perllocal.pod file -%{__rm} -rf %{buildroot}%perl_archlib +%perl_process_packlist %perl_gen_filelist %clean %{__rm} -rf %{buildroot} %files -f %{name}.files -%defattr(-,root,root,-) +%defattr(644,root,root,755) %doc AUTHORS Changes README README.SSL talk-to-ourself +%attr(755,root,root) %{_bindir}/* %changelog ++++++ libwww-perl-5.837.tar.bz2 -> libwww-perl-6.01.tar.bz2 ++++++ ++++ 19228 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 boost for openSUSE:Factory
by root＠hilbert.suse.de 21 Mar '11

21 Mar '11

Hello community, here is the log from the commit of package boost for openSUSE:Factory checked in at Mon Mar 21 15:07:59 CET 2011. -------- --- boost/boost.changes 2011-03-16 12:05:20.000000000 +0100 +++ /mounts/work_src_done/STABLE/boost/boost.changes 2011-03-21 11:47:34.000000000 +0100 @@ -1,0 +2,31 @@ +Mon Mar 21 11:46:48 CET 2011 - pth(a)suse.de + +- Prefix bug numbers. + +------------------------------------------------------------------- +Fri Mar 18 17:04:45 CET 2011 - pth(a)suse.de + +- Make packaging of the pdf documentation configurable. + +------------------------------------------------------------------- +Fri Mar 18 11:59:14 CET 2011 - pth(a)suse.de + +- Update to 1.46.1, a bugfix release: + • Asio: + - EV_ONESHOT seems to cause problems on some versions of Mac OS X, with + the io_service destructor getting stuck inside the close() system call. + Changed the kqueue backend to use EV_CLEAR instead (boost#5021). + - Fixed compile failures with some versions of g++ due to the use of + anonymous enums (boost#4883). + - Fixed a bug on kqueue-based platforms, where some system calls that + repeatedly fail with EWOULDBLOCK are not correctly re-registered with + kqueue. + - Changed asio::streambuf to ensure that its internal pointers are + updated correctly after the data has been modified using std::streambuf + member functions. + - Fixed a bug that prevented the linger socket option from working on + platforms other than Windows. + + For the rest see NEWS or the boost web site http://www.boost.org + +------------------------------------------------------------------- @@ -19 +50 @@ - directory or see http://www.boost.org/users/news/version_1_46_1 . + directory or see http://www.boost.org/users/news/version_1_46_0 . calling whatdependson for head-i586 Old: ---- boost_1_46_0.tar.xz New: ---- boost_1_46_1.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ boost.spec ++++++ --- /var/tmp/diff_new_pack.QGtF2V/_old 2011-03-21 15:04:34.000000000 +0100 +++ /var/tmp/diff_new_pack.QGtF2V/_new 2011-03-21 15:04:34.000000000 +0100 @@ -17,17 +17,17 @@ # norootforbuild -%define ver 1.46.0 -%define file_version 1_46_0 +%define ver 1.46.1 +%define file_version 1_46_1 %define short_version 1_46 -%define lib_appendix 1_46_0 - -#Version of autoconf archive the boost macros where taken from. -%define archive_version 20100819 +%define lib_appendix 1_46_1 #Only define to 1 to generate the man pages %define build_docs 0 +#Define to 0 to not generate the pdf documentation +%define build_pdf 1 + # Just hardcode build_mpi to 1 as soon as openmpi builds on all # named architectures. @@ -67,8 +67,7 @@ BuildRequires: openmpi-devel %endif %if %build_docs -BuildRequires: docbook docbook-xsl-stylesheets doxygen libxslt python-devel texlive-latex xmlgraphics-fop -BuildRequires: java-sun +BuildRequires: docbook docbook-xsl-stylesheets doxygen libxslt python-devel texlive-latex %endif %if 0%suse_version > 1020 BuildRequires: fdupes @@ -179,6 +178,7 @@ as man pages. +%if %build_pdf %package doc-pdf License: BSD3c @@ -192,8 +192,7 @@ %description doc-pdf This package contains the documentation of the boost dynamic libraries in PDF format. - - +%endif %package -n libboost_date_time%{lib_appendix} @@ -765,8 +764,11 @@ %doc %{_mandir}/man7/*.7.gz %doc %{_mandir}/man9/*.9.gz +%if %build_pdf + %files doc-pdf %defattr(-, root, root, -) %doc %{_docdir}/pdf +%endif %changelog ++++++ NEWS ++++++ --- /var/tmp/diff_new_pack.QGtF2V/_old 2011-03-21 15:04:34.000000000 +0100 +++ /var/tmp/diff_new_pack.QGtF2V/_new 2011-03-21 15:04:34.000000000 +0100 @@ -1,150 +1,67 @@ -Boost C++ Libraries Boost C++ Libraries +Version 1.46.1 -`...one of the most highly regarded and expertly designed C++ library projects -in the world.' — Herb Sutter and Andrei Alexandrescu, C++ Coding Standards - -Version 1.46.0 - -February 21st, 2011 20:36 GMT - -New Libraries - - • Icl: Interval Container Library, interval sets and maps and aggregation of - associated values, from Joachim Faulhaber. +March 12th, 2011 15:45 GMT Updated Libraries - • Array: - - Added support for cbegin/cend (#4761) - - Fixed a problem with the Sun compiler (#4757) • Asio: - - Fixed an integer overflow problem that occurs when - ip::address_v4::broadcast() is used on 64-bit platforms. - - Fixed a problem on older Linux kernels (where epoll is used without - timerfd support) that prevents timely delivery of deadline_timer - handlers, after the program has been running for some time (#5045). - • Bind: - - make_adaptable now documented (#4532) - • Concept Check: - - fixed warnings with self-assignment (#4918) - • Filesystem: - - Version 3 of the library is now the default. - - IBM vacpp: Workaround for compiler bug affecting iterator_facade. (# - 4912) - - Verify, clarify, document that <boost/config/user.hpp> can be used to - specify BOOST_FILESYSTEM_VERSION. (#4891) - - Replaced C-style assert with BOOST_ASSERT. - - Undeprecated unique_path(). Instead, add a note mentioning the - workaround for lack of thread safety and possible change to cwd. - unique_path() is just too convenient to deprecate! - - Cleared several GCC warnings. - - Changed V2 code to use BOOST_THROW_EXCEPTION. - - Windows: Fix status() to report non-symlink reparse point correctly. - - Add symlink_option to recursive_directory_iterator, allowing control - over recursion into directory symlinks. Note that the default is - changed to not recurse into directory symlinks. - - Reference documentation cleanup, including fixing missing and broken - links, and adding missing functions. - - Miscellaneous implementation code cleanup. + - EV_ONESHOT seems to cause problems on some versions of Mac OS X, with + the io_service destructor getting stuck inside the close() system call. + Changed the kqueue backend to use EV_CLEAR instead (#5021). + - Fixed compile failures with some versions of g++ due to the use of + anonymous enums (#4883). + - Fixed a bug on kqueue-based platforms, where some system calls that + repeatedly fail with EWOULDBLOCK are not correctly re-registered with + kqueue. + - Changed asio::streambuf to ensure that its internal pointers are + updated correctly after the data has been modified using std::streambuf + member functions. + - Fixed a bug that prevented the linger socket option from working on + platforms other than Windows. • Fusion: - - vector copy constructor now copies sequence members in the same order - on different platforms (#2823) + - Fix disable_if for Visual C++ 7.1/8.0 + • Filesystem: + - Fix for STLPort (#5217). + - PGI large file support • Graph: - - Fixed Graphviz output to work on Visual C++ 7.1. - - Replaced assert with BOOST_ASSERT. - - Changed to Boost.Filesystem v3. - - Fixed the following bugs from Trac: #1021, #4556, #4631, #4642, #4715, - #4731, #4737, #4753, #4758, #4793, #4843, #4851, #4852, #4887, #4914, # - 4966. - - Fixed various bugs not in Trac. - • Hash: - - Support for std::type_index (#4756). - - Avoid -Wconversion warnings. - • Iostreams: - - Use BOOST_ASSERT instead of assert. - - Fixed flush regression (#4590). - • Iterator: - - fixed problem with implicit_cast (#3645) + - Bug fixes, including fixes for: #5181, #5180, #5199 and #5175. + • Icl: + - Intersects for interval_maps and segment_type/element_type (#5207). + - Fixed some ambiguous calls to functions in boost and std namespaces. + - Other bug fixes, and documentation fixes. • Math: - - Added Wald, Inverse Gaussian and geometric distributions. - - Added information about configuration macros. - - Added support for mpreal as a real-numered type. - • Meta State Machine: - - Compile-time state machine analysis. - - Boost.Parameter interface definition for msm::back::state_machine<> - template arguments. - - Possibility to provide a container for the event and deferred event - queues. A policy implementation based on a more efficient - Boost.CircularBuffer is provided. - - msm::back::state_machine<>::is_flag_active method made const. - - Added possibility to enqueue events for delayed processing. - - Bugfixes - ☆ #4926. - ☆ stack overflow using the Defer functor - ☆ anonymous transition of a submachine not called for the initial - state - • Optional: - - Updated test results with information about expected failures (#2294) - • Pool: - - Now can set a max_size for pool (#2696) - - boost/pool/pool.hpp uses reinterpret_cast instead of static_cast (#2941 - ) - - boost::pool_allocator now works with vector of vectors (#386) - - Boost pool is now compatible with Microsoft memory leak detection (# - 4346) - • Program Options: - - Fixed errors in examples in docs (#3992, #4858) - - Now takes argv as const (#3909) + - Several minor bug fixes. + • Polygon: + - Disabled 45-degree booleans optimization. • Proto: - - Breaking change: boost/proto/core.hpp no longer defines - functional::pop_front and functional::reverse, which have moved to - their own headers under boost/proto/functional - - Add callable wrappers for more Fusion algorithms (including - fusion::at); and callable wrappers for some std utilities like - make_pair, first and second, all under the new boost/proto/functional - directory - - Allow transforms to be specified separately from a grammar - - proto::matches preserves domain-specific expression wrappers - - Fix ADL issue with operator, in proto::and_ transform - - Fix handling of grammar checking in expressions involving multiple - domains (#4675) - - Fix ambiguous operator<< in proto::display_expr (#4910) - - fusion::is_sequence answers true for Proto expressions (#5006) - - Eliminate -Wundef GCC warning in boost/proto/fusion.hpp (#5075) - • Signals: - - gcc warning cleanup (#4365) - • Spirit: - - Spirit V2.4.2, see the 'What's New' section for details. - • Tokenizer: - - isspace/ispunct was called with wrong character type (#4791) + - Make display_expr copyable (#5096). + - Fix const correctness problem in pass_through. + • Property Tree: + - Fix compile error in JSON parser. + • Signals2: + - Fix unused parameter warning. + • TR1: + - Allow specialization of std::tr1::hash. + - Improved support for Pathscale and Sun compilers. • Unordered: - - Avoid using operator& with the value type. - - Avoid -Wconversion warnings. - • Wave: - - See the Changelog for details. - -Updated Tools - - • Boostbook: - - Better support for attributes on root elements - including lang. - • Inspect: - - Check that Boost headers do not use C's assert macro. - • Quickbook: - - Add support for lang attribute in documentation info. - - Improved anchors. - - Support import, include and xinclude in conditional phrases. - - Uses Filesystem 3. + - Add missing copy constructors and assignment operators when using + rvalue references (#5119). + +Other changes + + • Update getting started guide to reflect changes to boost build. + • In quickbook, workaround optimization bug in g++ 4.4. Compilers Tested Boost's primary test compilers are: • Linux: - - GCC: 3.4.6, 4.2.4, 4.3.4, 4.4.3, 4.4.5, 4.5.2, - - GCC, C++0x mode: 4.3.4, 4.4.3, 4.5.0, 4.5.2 + - GCC: 3.4.6, 4.2.4, 4.3.4, 4.4.1, 4.4.3, 4.4.5, 4.5.2 + - GCC, C++0x mode: 4.3.4, 4.4.3, 4.5.2 - Intel: 10.1, 11.0, 11.1 - Clang: 2.8 - - Pathscale: 3.2. + - Pathscale: 3.2 • OS X: - GCC: 4.0.1, 4.2.1, 4.4 - GCC, C++0x mode: 4.4. @@ -158,29 +75,28 @@ Boost's additional test compilers include: • Linux: - - GCC: 3.4.6, 4.2.4, 4.3.4, 4.3.5, 4.4.3, 4.4.5, 4.5.0, 4.5.2 - - GCC, C++0x mode: 4.3.4, 4.4.3, 4.5.0, 4.5.2 - - pgCC 11.1 + - GCC: 3.4.6, 4.2.4, 4.3.4, 4.4.3, 4.4.4, 4.4.5, 4.5.2 + - GCC, C++0x mode: 4.3.4, 4.4.3, 4.5.2 + - pgCC: 11.2 - Intel: 10.1, 11.0, 11.1 - - PathScale: 3.2, 4.0 - - Visual Age C++ 10.1 + - PathScale: 3.2, 4.0.8 + - Visual Age C++: 10.1 - Clang from subversion • OS X: - Intel C++ Compiler: 10.1, 11.0, 11.1 - GCC: 4.0.1, 4.2.1, 4.4.4 - GCC, C++0x mode: 4.4.4 - - Clang from subversion + - Clang from subversion, with GNU libstdc++, libc++ and libc++ in C++0x + mode. • Windows: - - Visual C++: 7.1, 8.0, 9.0, 10.0 + - Visual C++: 7.1, 9.0, 10.0 - Visual C++ with STLport: 9.0 - Visual C++, Windows Mobile 5, with STLport: 9.0 - - GCC, mingw: 4.4.0, 4.5.1, 4.6.0 + - GCC, mingw: 4.5.1 - GCC, mingw, C++0x mode: 4.5.1 - Borland: 6.1.3 (2009), 6.2.1 (2010) • AIX: - IBM XL C/C++ Enterprise Edition, V11.1.0.0 - • FreeBSD: - - GCC 4.2.1, 64 bit • Solaris: - Sun C++: 5.10 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 libsigc++2 for openSUSE:Factory
by root＠hilbert.suse.de 21 Mar '11

21 Mar '11

Hello community, here is the log from the commit of package libsigc++2 for openSUSE:Factory checked in at Mon Mar 21 15:03:58 CET 2011. -------- --- GNOME/libsigc++2/libsigc++2.changes 2010-10-11 19:54:49.000000000 +0200 +++ /mounts/work_src_done/STABLE/libsigc++2/libsigc++2.changes 2011-03-21 11:21:57.000000000 +0100 @@ -1,0 +2,6 @@ +Wed Mar 16 08:57:51 UTC 2011 - ismail(a)namtrac.org + +- Add libsigc++2-gcc46.patch: Patch from upstream + to fix compilation with gcc 4.6 + +------------------------------------------------------------------- calling whatdependson for head-i586 New: ---- libsigc++2-gcc46.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libsigc++2.spec ++++++ --- /var/tmp/diff_new_pack.zWzFuK/_old 2011-03-21 15:02:53.000000000 +0100 +++ /var/tmp/diff_new_pack.zWzFuK/_new 2011-03-21 15:02:53.000000000 +0100 @@ -1,7 +1,7 @@ # -# spec file for package libsigc++2 (Version 2.2.8) +# spec file for package libsigc++2 # -# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2011 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 @@ -22,7 +22,7 @@ %define _name libsigc++ BuildRequires: gcc-c++ pkg-config Version: 2.2.8 -Release: 2 +Release: 6 # NOTE: on upgrade to a new upstream version, change the Obsoletes from <= to < (here and in baselibs.conf) Group: System/Libraries License: LGPLv2.1+ @@ -30,6 +30,8 @@ Url: http://libsigc.sourceforge.net/ Source: %{_name}-%{version}.tar.bz2 Source99: baselibs.conf +# PATCH-FIX-UPSTREAM libsigc++2-gcc46.patch idoenmez(a)suse.de -- Fix compilation with gcc 4.6 +Patch0: libsigc++2-gcc46.patch AutoReqProv: on BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -73,6 +75,7 @@ %prep %setup -q -n %{_name}-%{version} +%patch0 -p1 %build # FIXME: Cannot autoreconf, bad templates: ++++++ libsigc++2-gcc46.patch ++++++ commit faabe1f90c142a5ea836884a04c0eef250e69f94 Author: Kalev Lember <kalev(a)smartlink.ee> Date: Fri Feb 4 12:17:05 2011 +0200 Fix the build with GCC 4.6 * sigc++/signal_base.h: Include <cstddef> for size_t. diff --git a/sigc++/signal_base.h b/sigc++/signal_base.h index 1638642..e43bd5e 100644 --- a/sigc++/signal_base.h +++ b/sigc++/signal_base.h @@ -21,6 +21,7 @@ #ifndef _SIGC_SIGNAL_BASE_H_ #define _SIGC_SIGNAL_BASE_H_ +#include <cstddef> #include <list> #include <sigc++config.h> #include <sigc++/type_traits.h> ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 gammu for openSUSE:Factory
by root＠hilbert.suse.de 21 Mar '11

21 Mar '11

Hello community, here is the log from the commit of package gammu for openSUSE:Factory checked in at Mon Mar 21 13:05:28 CET 2011. -------- --- gammu/gammu.changes 2010-04-12 08:24:20.000000000 +0200 +++ /mounts/work_src_done/STABLE/gammu/gammu.changes 2011-03-18 21:15:36.000000000 +0100 @@ -1,0 +2,29 @@ +Fri Mar 18 20:03:02 UTC 2011 - asterios.dramis(a)gmail.com + +- Spec file updates: + * Use UTC time/date for "Remove build time references" fix. + * Don't clean buildroot in %install section. + * Change permissions of gammu-smsd in %install section. + * Add rc-symlink for gammu-smsd. + * Fix for empty %postun check on non-SUSE distros. + * Minor other updates. + +------------------------------------------------------------------- +Fri Mar 11 20:13:17 UTC 2011 - asterios.dramis(a)gmail.com + +- Updated to 1.29.0: + * Lots of changes (see ChangeLog). +- Spec file updates: + * Changes based on rpmdevtools templates and spec-cleaner run. + * Lots of updates based on spec file from the package. Most important are: + + Added gammu-smsd package. + + Added libGammu7 package. + + Added libgsmsd7 package. + * Updates in Url: and Group:. + * Updates in Buildrequires:, Requires:, %build and %install sections. + * Removed support for openSUSE < 1110. + * Fixed rpmlint warning "file-contains-date-and-time". +- Added a patch to fix an rpmlint warning "unknown-lsb-keyword" for the init + script "gammu-smsd". + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- gammu-1.25.0.tar.bz2 New: ---- gammu-1.29.0.tar.bz2 gammu-smsd.lsb_unknown-lsb-keyword.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ gammu.spec ++++++ --- /var/tmp/diff_new_pack.yBVqcw/_old 2011-03-21 13:01:53.000000000 +0100 +++ /var/tmp/diff_new_pack.yBVqcw/_new 2011-03-21 13:01:53.000000000 +0100 @@ -1,7 +1,7 @@ # -# spec file for package gammu (Version 1.25.0) +# spec file for package gammu # -# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2011 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 @@ -18,40 +18,35 @@ Name: gammu -Version: 1.25.0 -Release: 3 -# Set to 0 to disable bluetooth support -%if 0%{?opensuse_bs} && 0%{?sles_version} == 9 -%define bluetooth 0 -%else -%define bluetooth 1 -%endif -# Set to 0 to disable PostgreSQL support -%define pqsql 1 -# Set to 0 to disable MySQL support -%define mysql 1 -# Set to 0 to disable DBI support -%define dbi 0 -# Set to 0 to disable USB support -%define usb 1 -# Change if using tar.gz sources -%define extension bz2 -# Python name -%{!?__python: %define __python python} -%{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")} -%if 0%{?fedora_version} || 0%{?centos_version} || 0%{?rhel_version} || 0%{?fedora} || 0%{?rhel} -%define gammu_docdir %_docdir/%{name}-%{version} -%else -%define gammu_docdir %_docdir/%{name} -%endif +Version: 1.29.0 +Release: 1 Summary: Mobile phone management utility + License: GPLv2 +Url: http://wammu.eu/gammu/ %if 0%{?suse_version} Group: Applications/Communications %else Group: Applications/Communications %endif -# Detect build requires, I really hate this crap +Source0: http://sourceforge.net/projects/%{name}/files/%{name}/%{version}/%{name}-%{… +# PATCH-FIX-OPENSUSE gammu-smsd.lsb.patch asterios.dramis(a)gmail.com -- Fix rpmlint warning "unknown-lsb-keyword" for init script +Patch0: gammu-smsd.lsb_unknown-lsb-keyword.patch +BuildRoot: %{_tmppath}/%{name}-%{version}-build + +# Python location +%{!?__python: %define __python python} +%define g_python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)") +%define g_python_major_version %(%{__python} -c 'import sys; print sys.version.split(" ")[0][:3]') + +# Docdir +%if 0%{?fedora_version} || 0%{?centos_version} || 0%{?rhel_version} || 0%{?fedora} || 0%{?rhel} +%define gammu_docdir %{_docdir}/%{name}-%{version} +%else +%define gammu_docdir %{_docdir}/%{name} +%endif + +# Detect build requires # SUSE %if 0%{?suse_version} %define dist_usb_libs libusb-1_0-devel @@ -66,7 +61,7 @@ %else # Mandriva %if 0%{?mandriva_version} -%define dist_usb_libs libusb-1_0-devel +%define dist_usb_libs libusb1.0-devel %define dist_dbi_libs libdbi-devel libdbi-drivers-dbd-sqlite3 sqlite3-tools # 64-bit Mandriva has 64 in package name %ifarch x86_64 @@ -74,12 +69,12 @@ %endif # Bluetooth things got renamed several times %if 0%{?mandriva_version} > 2007 -%define dist_bluez_libs lib%{?mandriva_hack}bluez2 lib%{?mandriva_hack}bluez-devel +%define dist_bluez_libs lib%{?mandriva_hack}bluez-devel %else %if 0%{?mandriva_version} > 2006 -%define dist_bluez_libs lib%{?mandriva_hack}bluez2 lib%{?mandriva_hack}bluez2-devel +%define dist_bluez_libs lib%{?mandriva_hack}bluez2-devel %else -%define dist_bluez_libs libbluez1 >= 2.0 libbluez1-devel >= 2.0 +%define dist_bluez_libs libbluez1-devel >= 2.0 %endif %endif # postgresql-devel does not work for whatever reason in buildservice @@ -93,38 +88,44 @@ %if 0%{?fedora_version} || 0%{?centos_version} || 0%{?rhel_version} || 0%{?fedora} || 0%{?rhel} %define dist_usb_libs libusb1-devel %define dist_dbi_libs libdbi-devel libdbi-dbd-sqlite sqlite -%define dist_bluez_libs bluez-libs >= 2.0 bluez-libs-devel >= 2.0 +%define dist_bluez_libs bluez-libs-devel >= 2.0 %define dist_postgres_libs postgresql-devel %else #Defaults for not know distributions %define dist_usb_libs libusb1-devel %define dist_dbi_libs libdbi-devel libdbi-dbd-sqlite sqlite -%define dist_bluez_libs bluez-libs >= 2.0 bluez-libs-devel >= 2.0 +%define dist_bluez_libs bluez-libs-devel >= 2.0 %define dist_postgres_libs postgresql-devel %endif %endif %endif -%if %bluetooth -BuildRequires: %{dist_bluez_libs} +BuildRequires: cmake +BuildRequires: doxygen +BuildRequires: gettext +BuildRequires: glib2-devel +%if 0%{?centos_version} || 0%{?rhel_version} || 0%{?rhel} +BuildRequires: curl-devel +%else +BuildRequires: libcurl-devel %endif -%if pqsql -BuildRequires: %{dist_postgres_libs} +%if 0%{?suse_version} > 1110 +BuildRequires: libgudev-1_0-devel %endif -%if %mysql BuildRequires: mysql-devel +%if 0%{?suse_version} +BuildRequires: pkg-config +%else +BuildRequires: pkgconfig %endif -%if %dbi +BuildRequires: python-devel +BuildRequires: %{dist_bluez_libs} +%if 0%{?suse_version} > 1130 BuildRequires: %{dist_dbi_libs} %endif -BuildRequires: python-devel -BuildRequires: libcurl-devel -%if %usb +BuildRequires: %{dist_postgres_libs} BuildRequires: %{dist_usb_libs} -%endif -BuildRequires: cmake gettext pkgconfig -Source: http://dl.cihar.com/gammu/releases/gammu-%{version}.tar.%{extension} -Url: http://cihar.com/gammu/ -BuildRoot: %{_tmppath}/%{name}-%{version}-build +Requires: bluez +Requires: dialog %description Gammu is command line utility and library to work with mobile phones @@ -142,15 +143,22 @@ * OBEX and IrMC capable phones (Sony-Ericsson, Motorola). * Symbian phones through gnapplet. +This package contains Gammu binary as well as some examples. + %package devel -License: GPLv2 Summary: Development files for Gammu +License: GPLv2 %if 0%{?suse_version} Group: Development/Libraries %else Group: Development/Libraries %endif -Requires: %{name} = %{version}-%{release} pkgconfig +%if 0%{?suse_version} +Requires: pkg-config +%else +Requires: pkgconfig +%endif +Requires: %{name} = %{version} %description devel Gammu is command line utility and library to work with mobile phones @@ -170,18 +178,110 @@ This package contain files needed for development. -%package -n python-gammu +%package smsd +Summary: SMS message daemon License: GPLv2 +%if 0%{?suse_version} +Group: Applications/Communications +%else +Group: Applications/Communications +%endif +%if 0%{?suse_version} +Requires(post): %insserv_prereq %fillup_prereq +Requires(preun): %insserv_prereq %fillup_prereq +Requires(postun): %insserv_prereq %fillup_prereq +%endif +%if 0%{?fedora_version} || 0%{?centos_version} || 0%{?rhel_version} || 0%{?fedora} || 0%{?rhel} +Requires(post): chkconfig +Requires(preun): chkconfig +Requires(preun): initscripts +%endif + +%description smsd +Gammu is command line utility and library to work with mobile phones +from many vendors. Support for different models differs, but basic +functions should work with majority of them. Program can work with +contacts, messages (SMS, EMS and MMS), calendar, todos, filesystem, +integrated radio, camera, etc. It also supports daemon mode to send and +receive SMSes. + +Currently supported phones include: + +* Many Nokia models. +* Alcatel BE5 (501/701), BF5 (715), BH4 (535/735). +* AT capable phones (Siemens, Nokia, Alcatel, IPAQ). +* OBEX and IrMC capable phones (Sony-Ericsson, Motorola). +* Symbian phones through gnapplet. + +This package contains Gammu SMS Daemon and tool to inject messages +into the queue. + +%package -n libGammu7 +Summary: Mobile phone management library +License: GPLv2 +%if 0%{?suse_version} +Group: System/Libraries +%else +Group: System/Libraries +%endif + +%description -n libGammu7 +Gammu is command line utility and library to work with mobile phones +from many vendors. Support for different models differs, but basic +functions should work with majority of them. Program can work with +contacts, messages (SMS, EMS and MMS), calendar, todos, filesystem, +integrated radio, camera, etc. It also supports daemon mode to send and +receive SMSes. + +Currently supported phones include: + +* Many Nokia models. +* Alcatel BE5 (501/701), BF5 (715), BH4 (535/735). +* AT capable phones (Siemens, Nokia, Alcatel, IPAQ). +* OBEX and IrMC capable phones (Sony-Ericsson, Motorola). +* Symbian phones through gnapplet. + +This package contains Gammu shared library. + +%package -n libgsmsd7 +Summary: SMS daemon helper library +License: GPLv2 +%if 0%{?suse_version} +Group: System/Libraries +%else +Group: System/Libraries +%endif + +%description -n libgsmsd7 +Gammu is command line utility and library to work with mobile phones +from many vendors. Support for different models differs, but basic +functions should work with majority of them. Program can work with +contacts, messages (SMS, EMS and MMS), calendar, todos, filesystem, +integrated radio, camera, etc. It also supports daemon mode to send and +receive SMSes. + +Currently supported phones include: + +* Many Nokia models. +* Alcatel BE5 (501/701), BF5 (715), BH4 (535/735). +* AT capable phones (Siemens, Nokia, Alcatel, IPAQ). +* OBEX and IrMC capable phones (Sony-Ericsson, Motorola). +* Symbian phones through gnapplet. + +This package contains Gammu SMS daemon shared library. + +%package -n python-gammu Summary: Python module to communicate with mobile phones +License: GPLv2 %if 0%{?suse_version} Group: Development/Languages %else Group: Development/Languages %endif -Requires: python +Requires: python >= %{g_python_major_version} +Requires: python < %{g_python_major_version}.99 +%if 0%{?suse_version} < 1130 %{?py_requires} -%if %bluetooth -Requires: python-pybluez %endif %description -n python-gammu @@ -190,6 +290,12 @@ %prep %setup -q +%patch0 +# Remove build time references - Fix rpmlint warning "file-contains-date-and-time" +FAKE_BUILDTIME=$(LC_ALL=C date -u -r %{_sourcedir}/%{name}.changes '+%H:%M') +FAKE_BUILDDATE=$(LC_ALL=C date -u -r %{_sourcedir}/%{name}.changes '+%b %e %Y') +sed -i "s/__TIME__/\"$FAKE_BUILDTIME\"/" gammu/gammu.c gammu-detect/main.c libgammu/gsmstate.c smsd/inject.c smsd/monitor.c smsd/main.c +sed -i "s/__DATE__/\"$FAKE_BUILDDATE\"/" gammu/gammu.c gammu-detect/main.c libgammu/gsmstate.c libgammu/phone/dummy/dummy.c smsd/inject.c smsd/monitor.c smsd/main.c %build mkdir build-dir @@ -197,53 +303,146 @@ cmake ../ \ -DBUILD_SHARED_LIBS=ON \ -DBUILD_PYTHON=/usr/bin/python \ - -DCMAKE_INSTALL_PREFIX=%_prefix \ - -DINSTALL_DOC_DIR=%gammu_docdir \ - -DINSTALL_LIB_DIR=%_lib \ - -DINSTALL_LIBDATA_DIR=%_lib -make %{?_smp_mflags} %{!?_smp_mflags:%{?jobs:-j %jobs}} -# %check -# cd build-dir -# ctest -V + -DCMAKE_INSTALL_PREFIX=%{_prefix} \ + -DINSTALL_DOC_DIR=%{gammu_docdir} \ + -DINSTALL_LIB_DIR=%{_lib} \ + -DINSTALL_LIBDATA_DIR=%{_lib} \ + -DINSTALL_LSB_INIT=ON +make %{?_smp_mflags} +cd .. + +%check +#cd build-dir +#ctest -V +#cd .. %install -%if 0%{?suse_version} == 0 -rm -rf %buildroot -mkdir %buildroot +%if !0%{?suse_version} +make -C build-dir install DESTDIR=%{buildroot} +%else +cd build-dir +%makeinstall +cd .. +%endif + +# Change permissions +chmod 755 %{buildroot}%{_sysconfdir}/init.d/gammu-smsd + +# rc-symlink for gammu-smsd +mkdir -p %{buildroot}%{_sbindir} +ln -sf ../../etc/init.d/gammu-smsd %{buildroot}%{_sbindir}/rcgammu-smsd + +# Install config file +install -p -m 0644 docs/config/smsdrc %{buildroot}%{_sysconfdir}/gammu-smsdrc + +# Install additional doc files +install -p -m 0644 AUTHORS BUGS README.cs README.en_GB %{buildroot}%{gammu_docdir}/ + +# Remove unneeded locales +%if 0%{?suse_version} < 1140 +rm -rf %{buildroot}%{_datadir}/locale/sw/ %endif -make -C build-dir install DESTDIR=%buildroot + %find_lang %{name} %find_lang libgammu -cat libgammu.lang >> %{name}.lang -%post -p /sbin/ldconfig +%clean +rm -rf %{buildroot} + +%post smsd +%if 0%{?mandriva_version} +%_post_service gammu-smsd +%endif +%if 0%{?suse_version} +%fillup_and_insserv gammu-smsd +%endif +%if 0%{?fedora_version} || 0%{?centos_version} || 0%{?rhel_version} || 0%{?fedora} || 0%{?rhel} +/sbin/chkconfig --add gammu-smsd +%endif + +%preun smsd +%if 0%{?suse_version} +%stop_on_removal gammu-smsd +%endif +%if 0%{?mandriva_version} +%_preun_service gammu-smsd +%endif +%if 0%{?fedora_version} || 0%{?centos_version} || 0%{?rhel_version} || 0%{?fedora} || 0%{?rhel} +if [ $1 = 0 ] ; then + /sbin/service gammu-smsd stop >/dev/null 2>&1 + /sbin/chkconfig --del <script> +fi +%endif -%postun -p /sbin/ldconfig +%if 0%{?suse_version} -%files -f %name.lang -%defattr(-,root,root) -%_bindir/* -%_libdir/*.so.* -%_mandir/man1/* -%_mandir/man5/* -%_mandir/man7/* -%lang(cs) %_mandir/cs -%doc %gammu_docdir -%config /etc/bash_completion.d/gammu +%postun smsd +%restart_on_update gammu-smsd +%insserv_cleanup +%endif + +%post -n libGammu7 -p /sbin/ldconfig + +%postun -n libGammu7 -p /sbin/ldconfig + +%post -n libgsmsd7 -p /sbin/ldconfig + +%postun -n libgsmsd7 -p /sbin/ldconfig + +%files -f %{name}.lang +%defattr(-,root,root,-) +%config %{_sysconfdir}/bash_completion.d/gammu +%{_bindir}/gammu +%{_bindir}/gammu-config +%{_bindir}/jadmaker +%doc %{gammu_docdir} +%doc %{_mandir}/man1/gammu-config.1%{ext_man} +%doc %{_mandir}/man1/gammu-detect.1%{ext_man} +%doc %{_mandir}/man1/gammu.1%{ext_man} +%doc %{_mandir}/man1/jadmaker.1%{ext_man} +%doc %{_mandir}/man5/gammu-backup.5%{ext_man} +%doc %{_mandir}/man5/gammu-smsbackup.5%{ext_man} +%doc %{_mandir}/man5/gammurc.5%{ext_man} %files devel -%defattr(-,root,root) -%_includedir/%name -%_libdir/pkgconfig/%name.pc -%_libdir/pkgconfig/%name-smsd.pc -%_libdir/*.so +%defattr(-,root,root,-) +%{_includedir}/gammu/ +%{_libdir}/*.so +%{_libdir}/pkgconfig/gammu-smsd.pc +%{_libdir}/pkgconfig/gammu.pc + +%files smsd +%defattr(-,root,root,-) +%config %{_sysconfdir}/gammu-smsdrc +%config %{_sysconfdir}/init.d/gammu-smsd +%{_bindir}/gammu-smsd +%{_bindir}/gammu-smsd-inject +%{_bindir}/gammu-smsd-monitor +%{_sbindir}/rcgammu-smsd +%doc %{_mandir}/man1/gammu-smsd-inject.1%{ext_man} +%doc %{_mandir}/man1/gammu-smsd-monitor.1%{ext_man} +%doc %{_mandir}/man1/gammu-smsd.1%{ext_man} +%doc %{_mandir}/man5/gammu-smsdrc.5%{ext_man} +%doc %{_mandir}/man7/gammu-smsd-dbi.7%{ext_man} +%doc %{_mandir}/man7/gammu-smsd-files.7%{ext_man} +%doc %{_mandir}/man7/gammu-smsd-mysql.7%{ext_man} +%doc %{_mandir}/man7/gammu-smsd-null.7%{ext_man} +%doc %{_mandir}/man7/gammu-smsd-pgsql.7%{ext_man} +%doc %{_mandir}/man7/gammu-smsd-run.7%{ext_man} +%doc %{_mandir}/man7/gammu-smsd-sql.7%{ext_man} +%doc %{_mandir}/man7/gammu-smsd-tables.7%{ext_man} + +%files -n libGammu7 -f libgammu.lang +%defattr(-,root,root,-) +%{_libdir}/libGammu.so.* + +%files -n libgsmsd7 +%defattr(-,root,root,-) +%{_libdir}/libgsmsd.so.* %files -n python-gammu -%defattr(-,root,root) +%defattr(-,root,root,-) %doc README.Python python/examples -%python_sitearch/* - -%clean -rm -rf %buildroot +%{g_python_sitearch}/gammu/ %changelog ++++++ gammu-1.25.0.tar.bz2 -> gammu-1.29.0.tar.bz2 ++++++ ++++ 1558320 lines of diff (skipped) ++++++ gammu-smsd.lsb_unknown-lsb-keyword.patch ++++++ --- contrib/init/gammu-smsd.lsb.orig 2011-01-19 09:33:05.000000000 +0200 +++ contrib/init/gammu-smsd.lsb 2011-03-07 00:26:06.528931642 +0200 @@ -29,7 +29,6 @@ # Default-Stop: 0 1 6 # Short-Description: Gammu SMS daemon # Description: Daemon for automatically sending and receiving messages using GSM phone. -# Author: Michal Čihař <michal(a)cihar.com> ### END INIT INFO # Uncommend and adjust following line if you need to set locales in init script: ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 kid3-qt for openSUSE:Factory
by root＠hilbert.suse.de 21 Mar '11

21 Mar '11

Hello community, here is the log from the commit of package kid3-qt for openSUSE:Factory checked in at Mon Mar 21 13:01:32 CET 2011. -------- --- kid3-qt/kid3-qt.changes 2010-10-08 09:58:46.000000000 +0200 +++ /mounts/work_src_done/STABLE/kid3-qt/kid3-qt.changes 2011-03-18 00:00:02.000000000 +0100 @@ -1,0 +2,7 @@ +Thu Mar 17 22:28:17 UTC 2011 - davejplater(a)gmail.com + +- Update to release 1.6 +- Man page added - kid3-qt.1 +- Improved numbering of tracks, GUI and usability. + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- kid3-1.5.tar.bz2 New: ---- kid3-1.6.tar.bz2 kid3-qt-phonon.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kid3-qt.spec ++++++ --- /var/tmp/diff_new_pack.DkFU0L/_old 2011-03-21 12:58:34.000000000 +0100 +++ /var/tmp/diff_new_pack.DkFU0L/_new 2011-03-21 12:58:34.000000000 +0100 @@ -1,7 +1,7 @@ # -# spec file for package kid3-qt (Version 1.5) +# spec file for package kid3-qt # -# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2011 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 @@ -19,20 +19,26 @@ Name: kid3-qt -Version: 1.5 +Version: 1.6 Release: 1 Summary: Efficient ID3 Tag Editor - Non Kde version Source0: kid3-%{version}.tar.bz2 +Patch0: kid3-qt-phonon.patch Url: http://kid3.sourceforge.net Group: Productivity/Multimedia/Sound/Utilities License: GPLv2+ BuildRoot: %{_tmppath}/%{name}-%{version}-build -BuildRequires: licenses +BuildRequires: licenses pkg-config +%if 0%{?suse_version} >= 1130 +BuildRequires: pkgconfig(phonon) +%else +BuildRequires: phonon-devel +%endif BuildRequires: flac-devel id3lib-devel libqt4-devel BuildRequires: libtunepimp-devel perl taglib-devel BuildRequires: perl(File::Spec) update-desktop-files -BuildRequires: libmusicbrainz-devel libvorbis-devel -BuildRequires: docbook-utils doxygen +BuildRequires: jpackage-utils libmusicbrainz3-devel libvorbis-devel +BuildRequires: crimson fop hicolor-icon-theme susedoc xerces-j2 Requires: licenses @@ -65,80 +71,85 @@ %prep %setup -q -n kid3-%{version} +%patch0 %build -cd kid3-qt +cd %{name} +export PKG_CONFIG_PATH="%{_libdir}/pkgconfig" # if configure does not exist: autoconf -autoconf -f -%configure --with-qmake=qmake --with-docdir=%{_docdir}/%{name} -%__make %{?jobs:-j%{jobs}} +autoconf -v -f + +%configure LIBS="$(pkg-config --libs phonon)"\ + --with-qmake=qmake \ + --with-docdir=%{_docdir}/%{name} \ + --without-mp4v2 \ + --with-extra-libs="$(pkg-config --libs phonon)" \ + --with-extra-includes=%{_includedir}/phonon + +%__make -e CXXFLAGS="$CXXFLAGS %{optflags} -ggdb" %{?jobs:-j%{jobs}} %install +pushd %{name} +export INSTALL_ROOT=%{buildroot} +%makeinstall +%suse_update_desktop_file -r "%{name}" AudioVideo AudioVideoEditing +popd +# +install -Dpm 0644 deb/kid3.1 %{buildroot}%{_mandir}/man1/kid3-qt.1 + for FILE in COPYING ; do MD5SUM=$(md5sum $FILE | sed 's/ .*//') if test -f /usr/share/doc/licenses/md5/$MD5SUM ; then ln -sf /usr/share/doc/licenses/md5/$MD5SUM $FILE fi done -pushd kid3-qt -export INSTALL_ROOT=%{buildroot} -%makeinstall -%suse_update_desktop_file -r "%{name}" AudioVideo AudioVideoEditing -popd - -#find %{buildroot} -type f -o -name "*.so" -exec strip "{}" \; +#find %%{buildroot} -type f -o -name "*.so" -exec strip "{}" \; +cp -pr AUTHORS ChangeLog COPYING LICENSE NEWS README %{buildroot}%{_docdir}/%{name}/ +%find_lang %{name} %{name}-qt.lang --without-kde --with-qt --all-name --without-mo %clean %__rm -rf "%{buildroot}" %files %defattr(644,root,root,755) -%doc AUTHORS ChangeLog COPYING LICENSE NEWS README +%doc %{_docdir}/%{name} %defattr(755,root,root,755) %_bindir/%{name} %defattr(644,root,root,755) %_datadir/applications/%{name}.desktop -%_datadir/icons/hicolor/16x16/apps/kid3-qt.png -%_datadir/icons/hicolor/32x32/apps/kid3-qt.png -%_datadir/icons/hicolor/48x48/apps/kid3-qt.png -%_datadir/icons/hicolor/scalable/apps/kid3-qt.svgz -%_datadir/kid3-qt/translations/kid3_de.qm -%_datadir/kid3-qt/translations/kid3_et.qm -%_datadir/kid3-qt/translations/kid3_fr.qm -%_datadir/kid3-qt/translations/kid3_it.qm -%_datadir/kid3-qt/translations/kid3_nl.qm -%_datadir/kid3-qt/translations/kid3_ru.qm -%_datadir/kid3-qt/translations/kid3_tr.qm -%_datadir/kid3-qt/translations/kid3_zh_TW.qm -%_datadir/kid3-qt/translations/kid3_pl.qm -%_datadir/kid3-qt/translations/kid3_fi.qm -%_datadir/kid3-qt/translations/kid3_es.qm -%_datadir/kid3-qt/translations/kid3_cs.qm -%_datadir/kid3-qt/translations/qt_de.qm +%_iconsbasedir/16x16/apps/%{name}.png +%_iconsbasedir/32x32/apps/%{name}.png +%_iconsbasedir/48x48/apps/%{name}.png +%_iconsbasedir/scalable/apps/%{name}.svgz +%_datadir/%{name}/translations/kid3_de.qm +%_datadir/%{name}/translations/kid3_et.qm +%_datadir/%{name}/translations/kid3_fr.qm +%_datadir/%{name}/translations/kid3_it.qm +%_datadir/%{name}/translations/kid3_nl.qm +%_datadir/%{name}/translations/kid3_ru.qm +%_datadir/%{name}/translations/kid3_tr.qm +%_datadir/%{name}/translations/kid3_zh_TW.qm +%_datadir/%{name}/translations/kid3_pl.qm +%_datadir/%{name}/translations/kid3_fi.qm +%_datadir/%{name}/translations/kid3_es.qm +%_datadir/%{name}/translations/kid3_cs.qm +%_datadir/%{name}/translations/qt_de.qm +%_mandir/man1/kid3-qt.1.gz %if 0%{?suse_version} != 1120 -%_datadir/kid3-qt/translations/qt_zh_TW.qm -%_datadir/kid3-qt/translations/qt_pl.qm -%_datadir/kid3-qt/translations/qt_ru.qm -%_datadir/kid3-qt/translations/qt_fr.qm -%_datadir/kid3-qt/translations/qt_es.qm +%_datadir/%{name}/translations/qt_zh_TW.qm +%_datadir/%{name}/translations/qt_pl.qm +%_datadir/%{name}/translations/qt_ru.qm +%_datadir/%{name}/translations/qt_fr.qm +%_datadir/%{name}/translations/qt_es.qm %endif %if 0%{?suse_version} > 1120 -%_datadir/kid3-qt/translations/qt_cs.qm +%_datadir/%{name}/translations/qt_cs.qm %endif -%dir %{_datadir}/icons/hicolor -%dir %{_datadir}/icons/hicolor/16x16 -%dir %{_datadir}/icons/hicolor/16x16/apps -%dir %{_datadir}/icons/hicolor/32x32 -%dir %{_datadir}/icons/hicolor/32x32/apps -%dir %{_datadir}/icons/hicolor/48x48 -%dir %{_datadir}/icons/hicolor/48x48/apps -%dir %{_datadir}/icons/hicolor/scalable -%dir %{_datadir}/icons/hicolor/scalable/apps -%dir %{_datadir}/kid3-qt -%dir %{_datadir}/kid3-qt/translations +%dir %{_datadir}/%{name} +%dir %{_datadir}/%{name}/translations %changelog ++++++ kid3-1.5.tar.bz2 -> kid3-1.6.tar.bz2 ++++++ ++++ 88476 lines of diff (skipped) ++++++ kid3-qt-phonon.patch ++++++ Index: kid3-qt/configure.in =================================================================== --- kid3-qt/configure.in.orig 2011-01-16 14:29:15.000000000 +0200 +++ kid3-qt/configure.in 2011-01-25 18:00:22.546046332 +0200 @@ -508,25 +508,27 @@ if test "$with_phonon" != "no"; then AC_DEFUN([AC_FIND_PHONON], [ AC_MSG_CHECKING([for libphonon]) - mkdir phonontest - cat >phonontest/phonontest.pro <<EOF -TEMPLATE = app -QT += phonon -SOURCES += phonontest.cpp -EOF - cat >phonontest/phonontest.cpp <<EOF +# pkg +# mkdir phonontest +# cat >phonontest/phonontest.pro <<EOF +#TEMPLATE = app +#QT += phonon +#SOURCES += phonontest.cpp +#EOF +# cat >phonontest/phonontest.cpp <<EOF #include <Phonon/Path> -int main() { - Phonon::Path p; - return 0; -} -EOF - cd phonontest - ${CFG_QMAKE} && make >/dev/null 2>&1 - phonon_result=$? - cd .. - rm -rf phonontest - if test $phonon_result -eq 0; then +#int main() { +# Phonon::Path p; +# return 0; +#} +#EOF +# cd phonontest +# ${CFG_QMAKE} && make >/dev/null 2>&1 +# phonon_result=$? +# cd .. +# rm -rf phonontest + + if pkg-config --exists phonon; then AC_MSG_RESULT(yes) HAVE_PHONON=1 AC_SUBST(HAVE_PHONON) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 perl-Tk for openSUSE:Factory
by root＠hilbert.suse.de 21 Mar '11

21 Mar '11

Hello community, here is the log from the commit of package perl-Tk for openSUSE:Factory checked in at Mon Mar 21 11:26:18 CET 2011. -------- --- perl-Tk/perl-Tk.changes 2010-12-01 14:56:50.000000000 +0100 +++ /mounts/work_src_done/STABLE/perl-Tk/perl-Tk.changes 2011-03-18 15:55:05.000000000 +0100 @@ -1,0 +2,8 @@ +Tue Mar 15 10:55:20 UTC 2011 - cfarrell(a)novell.com + +- license update: (GPL+ or Artistic) and zlib + More correct statement of the package license in Fedora + compatible syntax as per http://is.gd/HtnxI9 and + http://en.opensuse.org/openSUSE:Accepted_licences + +------------------------------------------------------------------- calling whatdependson for head-i586 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ perl-Tk.spec ++++++ --- /var/tmp/diff_new_pack.oliBjk/_old 2011-03-21 11:07:51.000000000 +0100 +++ /var/tmp/diff_new_pack.oliBjk/_new 2011-03-21 11:07:51.000000000 +0100 @@ -1,7 +1,7 @@ # -# spec file for package perl-Tk (Version 804.029) +# spec file for package perl-Tk # -# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2011 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 @@ -23,11 +23,11 @@ %ifnarch s390 s390x BuildRequires: xorg-x11-server %endif -License: Artistic ; Public Domain, Freeware +License: (GPL+ or Artistic) and zlib Group: Development/Libraries/Perl AutoReqProv: on Version: 804.029 -Release: 4 +Release: 11 Summary: Perl Tk Url: http://cpan.org/modules/by-module/Tk/ Source: Tk-%{version}.tar.bz2 @@ -48,7 +48,7 @@ graphical library Tk with the powerful scripting language Perl. %package devel -License: Artistic ; Public Domain, Freeware +License: (GPL+ or Artistic) and zlib AutoReqProv: on Requires: %{name} = %{version} Provides: perl-Tk:/usr/lib/perl5/vendor_perl/5.8.8/x86_64-linux-thread-multi/Tk/pTk/Lang.h ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 plasmoid-cwp for openSUSE:Factory
by root＠hilbert.suse.de 21 Mar '11

21 Mar '11

Hello community, here is the log from the commit of package plasmoid-cwp for openSUSE:Factory checked in at Mon Mar 21 11:07:01 CET 2011. -------- --- KDE/plasmoid-cwp/plasmoid-cwp.changes 2011-02-26 14:11:00.000000000 +0100 +++ /mounts/work_src_done/STABLE/plasmoid-cwp/plasmoid-cwp.changes 2011-03-19 14:05:07.000000000 +0100 @@ -1,0 +2,11 @@ +Sat Mar 19 12:59:38 UTC 2011 - asterios.dramis(a)gmail.com + +- Update to version 1.5.0 + - on request: changed app directory from ~/.cwp to ~/.[kde4]/share/apps/cwp + - xml: gismeteo.com: display N.A. if no update time is available + - xml: gismeteo.com: add some icon codes +- Spec file updates + - Updates in %description. +- Rebased readme.patch to apply cleanly. + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- 98925-cwp-1.4.0.tar.bz2 New: ---- 98925-cwp-1.5.0.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ plasmoid-cwp.spec ++++++ --- /var/tmp/diff_new_pack.7y99Xv/_old 2011-03-21 11:05:58.000000000 +0100 +++ /var/tmp/diff_new_pack.7y99Xv/_new 2011-03-21 11:05:58.000000000 +0100 @@ -20,7 +20,7 @@ Name: plasmoid-cwp -Version: 1.4.0 +Version: 1.5.0 Release: 1 Summary: Customizable Weather Plasmoid @@ -46,27 +46,16 @@ Obsoletes: plasmoid-customizable-weather < %{version} %description -This is another weather plasmoid. -It aims to be highly customizable, but a little harder to setup -than other weather plasmoids. -But you'll have up to 7 days forecast afterwards. - -Nearly any weather forecast provider can be used, as long as the -data is provided as html files (no flash). -The information how to extract the information from these -html files is stored inside xml files. -Commands like grep, head, tail, sed, awk, ... will do this job. +This is another weather plasmoid. It aims to be highly customizable, but a +little harder to setup than other weather plasmoids. Nearly any weather +forecast provider can be used, as long as the data is provided as html files +(no flash). The information how to extract the information from these html +files is stored inside xml files. Commands like grep, head, tail, sed, awk, ... +will do this job. Some xml files are already included, you can find them under /usr/share/kde4/apps/plasma-cwp - - -Author: --------- - Georg Hennig - - %lang_package %prep %setup -q -n cwp-%{version} ++++++ 98925-cwp-1.4.0.tar.bz2 -> 98925-cwp-1.5.0.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cwp-1.4.0/ChangeLog new/cwp-1.5.0/ChangeLog --- old/cwp-1.4.0/ChangeLog 2011-02-25 12:38:20.000000000 +0100 +++ new/cwp-1.5.0/ChangeLog 2011-03-07 20:47:38.000000000 +0100 @@ -1,3 +1,9 @@ +1.5.0 +===== +- on request: changed app directory from ~/.cwp to ~/.<kdedir>/share/apps/cwp +- xml: gismeteo.com: display N.A. if no update time is available +- xml: gismeteo.com: add some icon codes + 1.4.0 ===== - on request: export / import settings from configuration dialog diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cwp-1.4.0/README new/cwp-1.5.0/README --- old/cwp-1.4.0/README 2011-02-25 12:38:20.000000000 +0100 +++ new/cwp-1.5.0/README 2011-03-07 20:47:38.000000000 +0100 @@ -1,5 +1,5 @@ ========================================= -Customizable Weather Plasmoid (CWP) 1.4.0 +Customizable Weather Plasmoid (CWP) 1.5.0 ========================================= This is another weather plasmoid. @@ -36,12 +36,12 @@ If they don't, try to update your definition files: either install latest cwp release or/and download latest xml definition file package from http://www.kde-look.org/content/show.php/show.php?content=98925 -and unpack the xml files into ~/.cwp (the .cwp folder inside your home directory). +and unpack the xml files into ~/.<kdedir>/share/apps/cwp (the cwp application folder inside your home kde directory). To access extended information about current weather condition, left-click inside the current weather description! The time, when the provider updated his weather information is shown italic when clicked on update time. -CWP saves current weather data on exit inside $HOME/.cwp folder, so after crashes you might want to clean up +CWP saves current weather data on exit inside $HOME/.<kdedir>/share/apps/cwp folder, so after crashes you might want to clean up this directory, or completely remove it. Parts of the source code are taken from weather plasmoid 0.4, KDE 4.2, qimageblitz, yaWP. @@ -103,7 +103,7 @@ Add the plasmoid to your desktop. -If you plan to use custom xml files or icon background images, place them inside a $HOME/.cwp folder. +If you plan to use custom xml files or icon background images, place them inside a $HOME/.<kdedir>/share/apps/cwp folder. NOTE: a custom background file should have the following name: background_<some_description>.<extension> <extension> can be png, gif or jpg. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cwp-1.4.0/config.ui new/cwp-1.5.0/config.ui --- old/cwp-1.4.0/config.ui 2011-02-25 12:38:20.000000000 +0100 +++ new/cwp-1.5.0/config.ui 2011-03-07 20:47:38.000000000 +0100 @@ -893,13 +893,6 @@ </widget> </item> </layout> - <zorder>defaultBackgroundSelect</zorder> - <zorder>translucentBackgroundSelect</zorder> - <zorder>noBackgroundSelect</zorder> - <zorder>customColorBackgroundSelect</zorder> - <zorder>transparencySlider</zorder> - <zorder>transparencyLabel</zorder> - <zorder>customColorKColorButton</zorder> </widget> </item> <item row="2" column="0"> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cwp-1.4.0/data/br_weather_com.xml new/cwp-1.5.0/data/br_weather_com.xml --- old/cwp-1.4.0/data/br_weather_com.xml 2011-02-25 12:38:20.000000000 +0100 +++ new/cwp-1.5.0/data/br_weather_com.xml 2011-03-07 20:47:38.000000000 +0100 @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8" standalone="yes" ?> <custom_weather> - <xml_file_version type="cwp" version="2011-02-24" name="br.weather.com" search_page="http://br.weather.com" example_zip="BRXX0043" unit="C" /> + <xml_file_version type="cwp" version="2011-03-07" name="br.weather.com" search_page="http://br.weather.com" example_zip="BRXX0043" unit="C" /> <locale_settings locale="pt" encoding="latin1" /> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cwp-1.4.0/data/de_weather_com.xml new/cwp-1.5.0/data/de_weather_com.xml --- old/cwp-1.4.0/data/de_weather_com.xml 2011-02-25 12:38:20.000000000 +0100 +++ new/cwp-1.5.0/data/de_weather_com.xml 2011-03-07 20:47:38.000000000 +0100 @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8" standalone="yes" ?> <custom_weather> - <xml_file_version type="cwp" version="2011-02-24" name="de.weather.com" search_page="http://de.weather.com" example_zip="80331" unit="C" /> + <xml_file_version type="cwp" version="2011-03-07" name="de.weather.com" search_page="http://de.weather.com" example_zip="80331" unit="C" /> <locale_settings locale="de" encoding="latin1" /> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cwp-1.4.0/data/espanol_weather_com.xml new/cwp-1.5.0/data/espanol_weather_com.xml --- old/cwp-1.4.0/data/espanol_weather_com.xml 2011-02-25 12:38:20.000000000 +0100 +++ new/cwp-1.5.0/data/espanol_weather_com.xml 2011-03-07 20:47:38.000000000 +0100 @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8" standalone="yes" ?> <custom_weather> - <xml_file_version type="cwp" version="2011-02-24" name="espanol.weather.com" search_page="http://espanol.weather.com" example_zip="Ciudad-de-Mexico-MXDF0132" unit="C" /> + <xml_file_version type="cwp" version="2011-03-07" name="espanol.weather.com" search_page="http://espanol.weather.com" example_zip="Ciudad-de-Mexico-MXDF0132" unit="C" /> <locale_settings locale="utf-8" encoding="utf8" /> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cwp-1.4.0/data/fr_weather_com.xml new/cwp-1.5.0/data/fr_weather_com.xml --- old/cwp-1.4.0/data/fr_weather_com.xml 2011-02-25 12:38:20.000000000 +0100 +++ new/cwp-1.5.0/data/fr_weather_com.xml 2011-03-07 20:47:38.000000000 +0100 @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8" standalone="yes" ?> <custom_weather> - <xml_file_version type="cwp" version="2011-02-24" name="fr.weather.com" search_page="http://fr.weather.com" example_zip="Paris-FRXX0076" unit="C" /> + <xml_file_version type="cwp" version="2011-03-07" name="fr.weather.com" search_page="http://fr.weather.com" example_zip="Paris-FRXX0076" unit="C" /> <locale_settings locale="utf-8" encoding="utf8" /> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cwp-1.4.0/data/freemeteo_com_celsius.xml new/cwp-1.5.0/data/freemeteo_com_celsius.xml --- old/cwp-1.4.0/data/freemeteo_com_celsius.xml 2011-02-25 12:38:20.000000000 +0100 +++ new/cwp-1.5.0/data/freemeteo_com_celsius.xml 2011-03-07 20:47:38.000000000 +0100 @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8" standalone="yes" ?> <custom_weather> - <xml_file_version type="cwp" version="2011-02-24" name="freemeteo.com" search_page="http://freemeteo.com" example_zip="gid=3117735&la=4" unit="C" /> + <xml_file_version type="cwp" version="2011-03-07" name="freemeteo.com" search_page="http://freemeteo.com" example_zip="gid=3117735&la=4" unit="C" /> <locale_settings locale="utf-8" encoding="utf8" /> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cwp-1.4.0/data/freemeteo_com_fahrenheit.xml new/cwp-1.5.0/data/freemeteo_com_fahrenheit.xml --- old/cwp-1.4.0/data/freemeteo_com_fahrenheit.xml 2011-02-25 12:38:20.000000000 +0100 +++ new/cwp-1.5.0/data/freemeteo_com_fahrenheit.xml 2011-03-07 20:47:38.000000000 +0100 @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8" standalone="yes" ?> <custom_weather> - <xml_file_version type="cwp" version="2011-02-24" name="freemeteo.com" search_page="http://freemeteo.com" example_zip="gid=3117735&la=4" unit="F" /> + <xml_file_version type="cwp" version="2011-03-07" name="freemeteo.com" search_page="http://freemeteo.com" example_zip="gid=3117735&la=4" unit="F" /> <locale_settings locale="utf-8" encoding="utf8" /> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cwp-1.4.0/data/ilmeteo_it.xml new/cwp-1.5.0/data/ilmeteo_it.xml --- old/cwp-1.4.0/data/ilmeteo_it.xml 2011-02-25 12:38:20.000000000 +0100 +++ new/cwp-1.5.0/data/ilmeteo_it.xml 2011-03-07 20:47:38.000000000 +0100 @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8" standalone="yes" ?> <custom_weather> - <xml_file_version type="cwp" version="2011-02-24" name="ilmeteo.it" search_page="http://www.ilmeteo.it" example_zip="Roma" unit="C" /> + <xml_file_version type="cwp" version="2011-03-07" name="ilmeteo.it" search_page="http://www.ilmeteo.it" example_zip="Roma" unit="C" /> <locale_settings locale="utf-8" encoding="utf8" /> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cwp-1.4.0/data/in_weather_com.xml new/cwp-1.5.0/data/in_weather_com.xml --- old/cwp-1.4.0/data/in_weather_com.xml 2011-02-25 12:38:20.000000000 +0100 +++ new/cwp-1.5.0/data/in_weather_com.xml 2011-03-07 20:47:38.000000000 +0100 @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8" standalone="yes" ?> <custom_weather> - <xml_file_version type="cwp" version="2011-02-24" name="in.weather.com" search_page="http://in.weather.com" example_zip="New-Delhi-INXX0096" unit="C" /> + <xml_file_version type="cwp" version="2011-03-07" name="in.weather.com" search_page="http://in.weather.com" example_zip="New-Delhi-INXX0096" unit="C" /> <locale_settings locale="utf-8" encoding="utf8" /> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cwp-1.4.0/data/myforecast_com_celsius.xml new/cwp-1.5.0/data/myforecast_com_celsius.xml --- old/cwp-1.4.0/data/myforecast_com_celsius.xml 2011-02-25 12:38:20.000000000 +0100 +++ new/cwp-1.5.0/data/myforecast_com_celsius.xml 2011-03-07 20:47:38.000000000 +0100 @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8" standalone="yes" ?> <custom_weather> - <xml_file_version type="cwp" version="2011-02-24" name="www.myforecast.com" search_page="http://www.myforecast.com" example_zip="12844" unit="C" /> + <xml_file_version type="cwp" version="2011-03-07" name="www.myforecast.com" search_page="http://www.myforecast.com" example_zip="12844" unit="C" /> <locale_settings locale="en" encoding="latin1" /> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cwp-1.4.0/data/myforecast_com_fahrenheit.xml new/cwp-1.5.0/data/myforecast_com_fahrenheit.xml --- old/cwp-1.4.0/data/myforecast_com_fahrenheit.xml 2011-02-25 12:38:20.000000000 +0100 +++ new/cwp-1.5.0/data/myforecast_com_fahrenheit.xml 2011-03-07 20:47:38.000000000 +0100 @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8" standalone="yes" ?> <custom_weather> - <xml_file_version type="cwp" version="2011-02-24" name="www.myforecast.com" search_page="http://www.myforecast.com" example_zip="12844" unit="F" /> + <xml_file_version type="cwp" version="2011-03-07" name="www.myforecast.com" search_page="http://www.myforecast.com" example_zip="12844" unit="F" /> <locale_settings locale="en" encoding="latin1" /> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cwp-1.4.0/data/pogodynka_pl.xml new/cwp-1.5.0/data/pogodynka_pl.xml --- old/cwp-1.4.0/data/pogodynka_pl.xml 2011-02-25 12:38:20.000000000 +0100 +++ new/cwp-1.5.0/data/pogodynka_pl.xml 2011-03-07 20:47:38.000000000 +0100 @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8" standalone="yes" ?> <custom_weather> - <xml_file_version type="cwp" version="2011-02-24" name="pogodynka.pl" search_page="http://www.pogodynka.pl" example_zip="polska/warszawa_warszawa" unit="C" /> + <xml_file_version type="cwp" version="2011-03-07" name="pogodynka.pl" search_page="http://www.pogodynka.pl" example_zip="polska/warszawa_warszawa" unit="C" /> <locale_settings locale="utf-8" encoding="utf8" /> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cwp-1.4.0/data/satellite_images.xml new/cwp-1.5.0/data/satellite_images.xml --- old/cwp-1.4.0/data/satellite_images.xml 2011-02-25 12:38:20.000000000 +0100 +++ new/cwp-1.5.0/data/satellite_images.xml 2011-03-07 20:47:38.000000000 +0100 @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8" standalone="yes" ?> <custom_weather> - <xml_file_version type="cwp_satellite_images" version="2011-02-24" /> + <xml_file_version type="cwp_satellite_images" version="2011-03-07" />  <image name="- - Global - -" url="" /> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cwp-1.4.0/data/uk_weather_com.xml new/cwp-1.5.0/data/uk_weather_com.xml --- old/cwp-1.4.0/data/uk_weather_com.xml 2011-02-25 12:38:20.000000000 +0100 +++ new/cwp-1.5.0/data/uk_weather_com.xml 2011-03-07 20:47:38.000000000 +0100 @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8" standalone="yes" ?> <custom_weather> - <xml_file_version type="cwp" version="2011-02-24" name="uk.weather.com" search_page="http://uk.weather.com" example_zip="London-UKXX0085" unit="C" /> + <xml_file_version type="cwp" version="2011-03-07" name="uk.weather.com" search_page="http://uk.weather.com" example_zip="London-UKXX0085" unit="C" /> <locale_settings locale="utf-8" encoding="utf8" /> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cwp-1.4.0/data/wetter_com.xml new/cwp-1.5.0/data/wetter_com.xml --- old/cwp-1.4.0/data/wetter_com.xml 2011-02-25 12:38:20.000000000 +0100 +++ new/cwp-1.5.0/data/wetter_com.xml 2011-03-07 20:47:38.000000000 +0100 @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8" standalone="yes" ?> <custom_weather> - <xml_file_version type="cwp" version="2011-02-24" name="www.wetter.com" search_page="http://www.wetter.com" example_zip="DE0006515" unit="C" /> + <xml_file_version type="cwp" version="2011-03-07" name="www.wetter.com" search_page="http://www.wetter.com" example_zip="DE0006515" unit="C" /> <locale_settings locale="de" encoding="latin1" /> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cwp-1.4.0/data/www_accuweather_com_us_celsius.xml new/cwp-1.5.0/data/www_accuweather_com_us_celsius.xml --- old/cwp-1.4.0/data/www_accuweather_com_us_celsius.xml 2011-02-25 12:38:20.000000000 +0100 +++ new/cwp-1.5.0/data/www_accuweather_com_us_celsius.xml 2011-03-07 20:47:38.000000000 +0100 @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8" standalone="yes" ?> <custom_weather> - <xml_file_version type="cwp" version="2011-02-24" name="www.accuweather.com US" search_page="http://www.accuweather.com" example_zip="85001" unit="C" /> + <xml_file_version type="cwp" version="2011-03-07" name="www.accuweather.com US" search_page="http://www.accuweather.com" example_zip="85001" unit="C" /> <locale_settings locale="utf-8" encoding="utf8" /> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cwp-1.4.0/data/www_accuweather_com_us_fahrenheit.xml new/cwp-1.5.0/data/www_accuweather_com_us_fahrenheit.xml --- old/cwp-1.4.0/data/www_accuweather_com_us_fahrenheit.xml 2011-02-25 12:38:20.000000000 +0100 +++ new/cwp-1.5.0/data/www_accuweather_com_us_fahrenheit.xml 2011-03-07 20:47:38.000000000 +0100 @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8" standalone="yes" ?> <custom_weather> - <xml_file_version type="cwp" version="2011-02-24" name="www.accuweather.com US" search_page="http://www.accuweather.com" example_zip="85001" unit="F" /> + <xml_file_version type="cwp" version="2011-03-07" name="www.accuweather.com US" search_page="http://www.accuweather.com" example_zip="85001" unit="F" /> <locale_settings locale="utf-8" encoding="utf8" /> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cwp-1.4.0/data/www_accuweather_com_world_celsius.xml new/cwp-1.5.0/data/www_accuweather_com_world_celsius.xml --- old/cwp-1.4.0/data/www_accuweather_com_world_celsius.xml 2011-02-25 12:38:20.000000000 +0100 +++ new/cwp-1.5.0/data/www_accuweather_com_world_celsius.xml 2011-03-07 20:47:38.000000000 +0100 @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8" standalone="yes" ?> <custom_weather> - <xml_file_version type="cwp" version="2011-02-24" name="www.accuweather.com World" search_page="http://www.accuweather.com/rss-center.asp" example_zip="AFR|ZA|SF004|JOHANNESBURG" unit="C" /> + <xml_file_version type="cwp" version="2011-03-07" name="www.accuweather.com World" search_page="http://www.accuweather.com/rss-center.asp" example_zip="AFR|ZA|SF004|JOHANNESBURG" unit="C" /> <locale_settings locale="utf-8" encoding="utf8" /> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cwp-1.4.0/data/www_accuweather_com_world_fahrenheit.xml new/cwp-1.5.0/data/www_accuweather_com_world_fahrenheit.xml --- old/cwp-1.4.0/data/www_accuweather_com_world_fahrenheit.xml 2011-02-25 12:38:20.000000000 +0100 +++ new/cwp-1.5.0/data/www_accuweather_com_world_fahrenheit.xml 2011-03-07 20:47:38.000000000 +0100 @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8" standalone="yes" ?> <custom_weather> - <xml_file_version type="cwp" version="2011-02-24" name="www.accuweather.com World" search_page="http://www.accuweather.com/rss-center.asp" example_zip="AFR|ZA|SF004|JOHANNESBURG" unit="F" /> + <xml_file_version type="cwp" version="2011-03-07" name="www.accuweather.com World" search_page="http://www.accuweather.com/rss-center.asp" example_zip="AFR|ZA|SF004|JOHANNESBURG" unit="F" /> <locale_settings locale="utf-8" encoding="utf8" /> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cwp-1.4.0/data/www_gismeteo_com.xml new/cwp-1.5.0/data/www_gismeteo_com.xml --- old/cwp-1.4.0/data/www_gismeteo_com.xml 2011-02-25 12:38:20.000000000 +0100 +++ new/cwp-1.5.0/data/www_gismeteo_com.xml 2011-03-07 20:47:38.000000000 +0100 @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8" standalone="yes" ?> <custom_weather> - <xml_file_version type="cwp" version="2011-02-24" name="www.gismeteo.com" search_page="http://www.gismeteo.ru" example_zip="4944" unit="C" /> + <xml_file_version type="cwp" version="2011-03-07" name="www.gismeteo.com" search_page="http://www.gismeteo.ru" example_zip="4944" unit="C" /> <locale_settings locale="utf-8" encoding="utf8" /> @@ -32,7 +32,7 @@ /> <data_current_temperature url="urlc" - update_time="grep icon\ date | sed -e "s/.*icon date[^>]*>[^:]* $[0-9]\+:[0-9]\+$.*/\1/"" + update_time="grep icon\ date | sed -e "s/.*icon date[^>]*>[^:]* $[0-9]\+:[0-9]\+$.*/\1/" | awk '{if ($1 ~ /^[0-9]+:[0-9]+$/) {print} else {print "N.A."} ; }'" temperature="grep -A 19 id=\"weather\" | grep temp | sed -e "s/<[^>]*>//g" | sed -e "s/.*[^-0-9]$[-0-9]\+$&deg.*/\1/"" temperature_felt="echo -n" /> @@ -180,6 +180,23 @@ i62="d.sun.c3.r2" o62="39" i63="d.sun.c3.r3" o63="39" i64="d.sun.c2.r2" o64="39" + i65="d.sun.c1.s1" o65="41" + i66="d.sun.c1.s2" o66="41" + i67="d.sun.c1.s3" o67="41" + i68="d.sun.c1.s4" o68="41" + i69="d.sun.c2.s1" o69="41" + i70="d.sun.c2.s2" o70="41" + i71="d.sun.c2.s3" o71="41" + i72="d.sun.c2.s4" o72="41" + i73="d.sun.c3.s2" o73="41" + i74="d.sun.c3.s3" o74="41" + i75="d.sun.c3.s4" o75="41" + i76="n.moon.c2.s2" o76="46" + i77="n.moon.c2.s3" o77="46" + i78="n.moon.c2.s4" o78="46" + i79="n.moon.c3.s2" o79="46" + i80="n.moon.c3.s3" o80="46" + i81="n.moon.c3.s4" o81="46" /> <wind_transform i1="С" o1="N" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cwp-1.4.0/data/www_weather_com.cn.xml new/cwp-1.5.0/data/www_weather_com.cn.xml --- old/cwp-1.4.0/data/www_weather_com.cn.xml 2011-02-25 12:38:20.000000000 +0100 +++ new/cwp-1.5.0/data/www_weather_com.cn.xml 2011-03-07 20:47:38.000000000 +0100 @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8" standalone="yes" ?> <custom_weather> - <xml_file_version type="cwp" version="2011-02-24" name="www.weather.com.cn" search_page="http://www.weather.com.cn" example_zip="101010100" unit="C" /> + <xml_file_version type="cwp" version="2011-03-07" name="www.weather.com.cn" search_page="http://www.weather.com.cn" example_zip="101010100" unit="C" /> <locale_settings locale="utf-8" encoding="utf8" /> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cwp-1.4.0/data/www_weather_com.xml new/cwp-1.5.0/data/www_weather_com.xml --- old/cwp-1.4.0/data/www_weather_com.xml 2011-02-25 12:38:20.000000000 +0100 +++ new/cwp-1.5.0/data/www_weather_com.xml 2011-03-07 20:47:38.000000000 +0100 @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8" standalone="yes" ?> <custom_weather> - <xml_file_version type="cwp" version="2011-02-24" name="www.weather.com" search_page="http://www.weather.com" example_zip="USDC0001" unit="F" /> + <xml_file_version type="cwp" version="2011-03-07" name="www.weather.com" search_page="http://www.weather.com" example_zip="USDC0001" unit="F" /> <locale_settings locale="utf-8" encoding="utf8" /> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cwp-1.4.0/plasma-applet-cwp.desktop new/cwp-1.5.0/plasma-applet-cwp.desktop --- old/cwp-1.4.0/plasma-applet-cwp.desktop 2011-02-25 12:38:20.000000000 +0100 +++ new/cwp-1.5.0/plasma-applet-cwp.desktop 2011-03-07 20:47:38.000000000 +0100 @@ -30,7 +30,7 @@ X-KDE-PluginInfo-Author=Georg Hennig X-KDE-PluginInfo-Email=georg.hennig(a)web.de X-KDE-PluginInfo-Name=plasma_applet_cwp -X-KDE-PluginInfo-Version=1.4.0 +X-KDE-PluginInfo-Version=1.5.0 X-KDE-PluginInfo-Website=http://www.kde-look.org/content/show.php/show.php?… X-KDE-PluginInfo-Category= X-KDE-PluginInfo-Depends= diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cwp-1.4.0/plasma-cwp-data-provider.cpp new/cwp-1.5.0/plasma-cwp-data-provider.cpp --- old/cwp-1.4.0/plasma-cwp-data-provider.cpp 2011-02-25 12:38:20.000000000 +0100 +++ new/cwp-1.5.0/plasma-cwp-data-provider.cpp 2011-03-07 20:47:38.000000000 +0100 @@ -131,7 +131,7 @@ return; } - KConfig cf( local_data_path + QString( "/cwp_local_data_%1.cfg" ).arg( local_data_identifier ), KConfig::SimpleConfig ); + KConfig cf( local_data_path + QString( "cwp_local_data_%1.cfg" ).arg( local_data_identifier ), KConfig::SimpleConfig ); KConfigGroup cfg( &cf, "" ); data_update_time = cfg.readEntry( "data_update_time", "" ); @@ -206,18 +206,18 @@ data_custom_image_list.clear(); for ( i=0; i<100; i++ ) // random maximum location image number { - QFile file( local_data_path + QString( "/cwp_custom_image_%1_%2.img" ).arg( i ).arg( local_data_identifier ) ); + QFile file( local_data_path + QString( "cwp_custom_image_%1_%2.img" ).arg( i ).arg( local_data_identifier ) ); if ( !file.open(QIODevice::ReadOnly) ) break; data_custom_image_list.push_back( file.readAll() ); } - data_current_icon = QImage( local_data_path + QString( "/cwp_icon_current_%1.png" ).arg( local_data_identifier ) ); - data_day_icon[0] = QImage( local_data_path + QString( "/cwp_icon_0_%1.png" ).arg( local_data_identifier ) ); - data_day_icon[1] = QImage( local_data_path + QString( "/cwp_icon_1_%1.png" ).arg( local_data_identifier ) ); - data_day_icon[2] = QImage( local_data_path + QString( "/cwp_icon_2_%1.png" ).arg( local_data_identifier ) ); - data_day_icon[3] = QImage( local_data_path + QString( "/cwp_icon_3_%1.png" ).arg( local_data_identifier ) ); - data_day_icon[4] = QImage( local_data_path + QString( "/cwp_icon_4_%1.png" ).arg( local_data_identifier ) ); - data_day_icon[5] = QImage( local_data_path + QString( "/cwp_icon_5_%1.png" ).arg( local_data_identifier ) ); - data_day_icon[6] = QImage( local_data_path + QString( "/cwp_icon_6_%1.png" ).arg( local_data_identifier ) ); + data_current_icon = QImage( local_data_path + QString( "cwp_icon_current_%1.png" ).arg( local_data_identifier ) ); + data_day_icon[0] = QImage( local_data_path + QString( "cwp_icon_0_%1.png" ).arg( local_data_identifier ) ); + data_day_icon[1] = QImage( local_data_path + QString( "cwp_icon_1_%1.png" ).arg( local_data_identifier ) ); + data_day_icon[2] = QImage( local_data_path + QString( "cwp_icon_2_%1.png" ).arg( local_data_identifier ) ); + data_day_icon[3] = QImage( local_data_path + QString( "cwp_icon_3_%1.png" ).arg( local_data_identifier ) ); + data_day_icon[4] = QImage( local_data_path + QString( "cwp_icon_4_%1.png" ).arg( local_data_identifier ) ); + data_day_icon[5] = QImage( local_data_path + QString( "cwp_icon_5_%1.png" ).arg( local_data_identifier ) ); + data_day_icon[6] = QImage( local_data_path + QString( "cwp_icon_6_%1.png" ).arg( local_data_identifier ) ); if ( data_update_time != "" ) emit( data_fetched() ); } @@ -229,7 +229,7 @@ return; } - KConfig cf( local_data_path + QString( "/cwp_local_data_%1.cfg" ).arg( local_data_identifier ), KConfig::SimpleConfig ); + KConfig cf( local_data_path + QString( "cwp_local_data_%1.cfg" ).arg( local_data_identifier ), KConfig::SimpleConfig ); KConfigGroup cfg( &cf, "" ); cfg.writeEntry( "data_update_time", data_update_time ); @@ -303,18 +303,18 @@ int i; for ( i=0; i<data_custom_image_list.size(); i++ ) { - QFile file( local_data_path + QString( "/cwp_custom_image_%1_%2.img" ).arg( i ).arg( local_data_identifier ) ); + QFile file( local_data_path + QString( "cwp_custom_image_%1_%2.img" ).arg( i ).arg( local_data_identifier ) ); file.open( QIODevice::WriteOnly ); file.write( data_custom_image_list.at( i ) ); } - data_current_icon.save( local_data_path + QString( "/cwp_icon_current_%1.png" ).arg( local_data_identifier ) ); - data_day_icon[0].save( local_data_path + QString( "/cwp_icon_0_%1.png" ).arg( local_data_identifier ) ); - data_day_icon[1].save( local_data_path + QString( "/cwp_icon_1_%1.png" ).arg( local_data_identifier ) ); - data_day_icon[2].save( local_data_path + QString( "/cwp_icon_2_%1.png" ).arg( local_data_identifier ) ); - data_day_icon[3].save( local_data_path + QString( "/cwp_icon_3_%1.png" ).arg( local_data_identifier ) ); - data_day_icon[4].save( local_data_path + QString( "/cwp_icon_4_%1.png" ).arg( local_data_identifier ) ); - data_day_icon[5].save( local_data_path + QString( "/cwp_icon_5_%1.png" ).arg( local_data_identifier ) ); - data_day_icon[6].save( local_data_path + QString( "/cwp_icon_6_%1.png" ).arg( local_data_identifier ) ); + data_current_icon.save( local_data_path + QString( "cwp_icon_current_%1.png" ).arg( local_data_identifier ) ); + data_day_icon[0].save( local_data_path + QString( "cwp_icon_0_%1.png" ).arg( local_data_identifier ) ); + data_day_icon[1].save( local_data_path + QString( "cwp_icon_1_%1.png" ).arg( local_data_identifier ) ); + data_day_icon[2].save( local_data_path + QString( "cwp_icon_2_%1.png" ).arg( local_data_identifier ) ); + data_day_icon[3].save( local_data_path + QString( "cwp_icon_3_%1.png" ).arg( local_data_identifier ) ); + data_day_icon[4].save( local_data_path + QString( "cwp_icon_4_%1.png" ).arg( local_data_identifier ) ); + data_day_icon[5].save( local_data_path + QString( "cwp_icon_5_%1.png" ).arg( local_data_identifier ) ); + data_day_icon[6].save( local_data_path + QString( "cwp_icon_6_%1.png" ).arg( local_data_identifier ) ); } void Data_Provider::get_weather_values( QString &data_location_location_tmp, QString &data_location_country_tmp, QString &data_sun_sunrise_tmp, diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cwp-1.4.0/plasma-cwp.cpp new/cwp-1.5.0/plasma-cwp.cpp --- old/cwp-1.4.0/plasma-cwp.cpp 2011-02-25 12:38:20.000000000 +0100 +++ new/cwp-1.5.0/plasma-cwp.cpp 2011-03-07 20:47:38.000000000 +0100 @@ -210,7 +210,7 @@ } else { - data_provider = new Data_Provider( this, QDir::homePath() + "/.cwp", cwpIdentifier ); + data_provider = new Data_Provider( this, KStandardDirs::locateLocal( "data", "cwp/" ), cwpIdentifier ); connect( data_provider, SIGNAL( data_fetched() ), this, SLOT( refresh() ) ); QTimer::singleShot( 10*1000, this, SLOT( reloadData() ) ); } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cwp-1.4.0/version.h new/cwp-1.5.0/version.h --- old/cwp-1.4.0/version.h 2011-02-25 12:38:20.000000000 +0100 +++ new/cwp-1.5.0/version.h 2011-03-07 20:47:38.000000000 +0100 @@ -20,7 +20,7 @@ #ifndef version_h #define version_h -#define VERSION "1.4.0" +#define VERSION "1.5.0" #define DATE "2009-2011" #define AUTHOR "Georg Hennig" #define NAME "Customizable Weather Plasmoid (CWP)" ++++++ readme.patch ++++++ --- /var/tmp/diff_new_pack.7y99Xv/_old 2011-03-21 11:05:58.000000000 +0100 +++ /var/tmp/diff_new_pack.7y99Xv/_new 2011-03-21 11:05:58.000000000 +0100 @@ -1,8 +1,8 @@ ---- README.orig 2009-02-19 22:29:26.000000000 +0100 -+++ README 2009-02-19 22:30:11.000000000 +0100 +--- README.orig 2011-03-07 21:47:38.000000000 +0200 ++++ README 2011-03-19 15:02:57.278000031 +0200 @@ -38,6 +38,8 @@ http://www.kde-look.org/content/show.php/show.php?content=98925 - and unpack the xml files into ~/.cwp (the .cwp folder inside your home directory). + and unpack the xml files into ~/.<kdedir>/share/apps/cwp (the cwp application folder inside your home kde directory). +The xml files coming with the package are located under /usr/share/kde4/apps/plasma-cwp. + ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 post-build-checks for openSUSE:Factory
by root＠hilbert.suse.de 21 Mar '11

21 Mar '11

Hello community, here is the log from the commit of package post-build-checks for openSUSE:Factory checked in at Mon Mar 21 11:05:43 CET 2011. -------- --- post-build-checks/post-build-checks.changes 2010-12-07 15:38:47.000000000 +0100 +++ /mounts/work_src_done/STABLE/post-build-checks/post-build-checks.changes 2011-03-21 00:56:18.000000000 +0100 @@ -1,0 +2,5 @@ +Mon Mar 21 00:52:59 CET 2011 - ro(a)suse.de + +- add helper/sync.sh to disable sync inside build environment + +------------------------------------------------------------------- calling whatdependson for head-i586 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ post-build-checks.spec ++++++ --- /var/tmp/diff_new_pack.cCgW57/_old 2011-03-21 10:57:07.000000000 +0100 +++ /var/tmp/diff_new_pack.cCgW57/_new 2011-03-21 10:57:07.000000000 +0100 @@ -1,7 +1,7 @@ # -# spec file for package post-build-checks (Version 1.0) +# spec file for package post-build-checks # -# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2011 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 @@ -24,7 +24,7 @@ AutoReqProv: on Summary: post checks for build after rpms have been created Version: 1.0 -Release: 82 +Release: 89 PreReq: aaa_base permissions sed Url: http://gitorious.org/opensuse/post-build-checks # @@ -86,6 +86,10 @@ mv /bin/uname /bin/uname.bin ln -s /usr/lib/build/helper/uname.sh /bin/uname fi +if test -f /bin/sync -a ! -L /bin/sync ; then + mv /bin/sync /bin/sync.bin + ln -s /usr/lib/build/helper/sync.sh /bin/sync +fi %preun if ! test -e /.buildenv; then @@ -94,6 +98,9 @@ if test "$1" = 0 -a -f /bin/uname.bin ; then mv /bin/uname.bin /bin/uname fi +if test "$1" = 0 -a -f /bin/sync.bin ; then + mv /bin/sync.bin /bin/sync +fi %files %defattr(-, root, root) ++++++ post-build-checks-1.0.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/post-build-checks-1.0/checks/04-check-filelist new/post-build-checks-1.0/checks/04-check-filelist --- old/post-build-checks-1.0/checks/04-check-filelist 2010-12-07 15:11:18.000000000 +0100 +++ new/post-build-checks-1.0/checks/04-check-filelist 2011-03-21 00:52:07.000000000 +0100 @@ -12,4 +12,8 @@ [ $? = 0 ] || ret=1 done -exit $ret +if [ "$ret" -ne 0 ]; then + echo "*** This failure will be made fatal at Dec 8, please fix your package ***" +fi +#exit $ret +exit 0 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/post-build-checks-1.0/helper/sync.sh new/post-build-checks-1.0/helper/sync.sh --- old/post-build-checks-1.0/helper/sync.sh 1970-01-01 01:00:00.000000000 +0100 +++ new/post-build-checks-1.0/helper/sync.sh 2011-03-21 00:52:07.000000000 +0100 @@ -0,0 +1,8 @@ +#!/bin/bash + +if test -f /.buildenv ; then + echo "sync disabled inside build environment." + exit 0 +fi + +exec /bin/sync.bin $* ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 rfc for openSUSE:Factory
by root＠hilbert.suse.de 21 Mar '11

21 Mar '11

Hello community, here is the log from the commit of package rfc for openSUSE:Factory checked in at Mon Mar 21 10:56:49 CET 2011. -------- --- AUTO/all/rfc/rfc.changes 2011-01-05 20:42:59.000000000 +0100 +++ /mounts/work_src_done/STABLE/rfc/rfc.changes 2011-03-19 02:42:28.000000000 +0100 @@ -2 +2 @@ -Wed Jan 5 20:42:58 CET 2011 - autobuild(a)suse.de +Sat Mar 19 02:42:28 CET 2011 - autobuild(a)suse.de @@ -4 +4 @@ -- automated update on 2011-01-05 +- automated update on 2011-03-19 calling whatdependson for head-i586 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ rfc.spec ++++++ --- /var/tmp/diff_new_pack.jJZYGz/_old 2011-03-21 10:52:32.000000000 +0100 +++ /var/tmp/diff_new_pack.jJZYGz/_new 2011-03-21 10:52:32.000000000 +0100 @@ -1,5 +1,5 @@ # -# spec file for package rfc (Version 2011.1.5) +# spec file for package rfc # # Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -25,7 +25,7 @@ Summary: The RFCs (Request For Comments) Source: rfc.tgz BuildArch: noarch -Version: 2011.1.5 +Version: 2011.3.19 Release: 1 Url: ftp://ftp.isi.edu/in-notes BuildRoot: %{_tmppath}/%{name}-%{version}-build ++++++ rfc.tgz ++++++ AUTO/all/rfc/rfc.tgz /mounts/work_src_done/STABLE/rfc/rfc.tgz differ: char 5, line 1 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 wammu for openSUSE:Factory
by root＠hilbert.suse.de 21 Mar '11

21 Mar '11

Hello community, here is the log from the commit of package wammu for openSUSE:Factory checked in at Mon Mar 21 10:52:14 CET 2011. -------- --- wammu/wammu.changes 2010-04-18 21:16:11.000000000 +0200 +++ /mounts/work_src_done/STABLE/wammu/wammu.changes 2011-03-18 21:15:45.000000000 +0100 @@ -1,0 +2,37 @@ +Fri Mar 18 20:11:26 UTC 2011 - asterios.dramis(a)gmail.com + +- Spec file updates: + * Don't clean buildroot in %install section. + * Fix for "python setup.py install" invoked twice on non-Suse distros. + +------------------------------------------------------------------- +Sun Mar 13 19:57:31 UTC 2011 - asterios.dramis(a)gmail.com + +- Updated to 0.35: + * New Turkish translation. + * Updated Dutch translation. + * Handle security error when getting phone info (bug #1264). + * Read all messages on phones not supporting status but support GetNext (bug + #1261). + From 0.34: + * Fixed handling error when SMSC is not configured in phone (bug #1244). + * Drop dependency of RPM on python-xml, it's not needed anymore (bug #1248). + * Better error messages on non existing devices or on wrong privileges. + * Support for storing call entry as new contact (bug #1283). + * More user friendly errors from talkback dialog. + * Lot of translations were updated. + From 0.33: + * Fixed displaying of an animation in SMS (bug #1091). + * Can Add and Delete multiple selections when Edit Recipient's numbers. + * Better log messages when scanning for phones (bug #1182). +- Spec file updates: + * Changes based on rpmdevtools templates and spec-cleaner run. + * Updates in Url: and Group:. + * Updates in Buildrequires: and Requires: sections. + * Added a wammu-lang package based on rpmlint warning + "package-with-huge-translation". + * Fixed desktop file Category using "suse_update_desktop_file" instead of + using sed in %prep section. + * Minor other updates. + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- wammu-0.32.1.tar.bz2 New: ---- wammu-0.35.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ wammu.spec ++++++ --- /var/tmp/diff_new_pack.Y3hXwq/_old 2011-03-21 10:42:47.000000000 +0100 +++ /var/tmp/diff_new_pack.Y3hXwq/_new 2011-03-21 10:42:47.000000000 +0100 @@ -1,7 +1,7 @@ # -# spec file for package wammu (Version 0.32.1) +# spec file for package wammu # -# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2011 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 @@ -18,36 +18,49 @@ Name: wammu -Version: 0.32.1 -Release: 2 +Version: 0.35 +Release: 1 +Summary: Mobile Phone Manager -%define extension bz2 - -%define python_gammu_req 0.24 +License: GPLv2 +Url: http://wammu.eu/wammu/ +%if 0%{?suse_version} +Group: Applications/Communications +%else +Group: Applications/Communications +%endif +Source0: http://sourceforge.net/projects/gammu/files/%{name}/%{version}/%{name}-%{ve… +BuildRoot: %{_tmppath}/%{name}-%{version}-build +# Python location %{!?__python: %define __python python} %define wammu_python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(0)") -Summary: Mobile phone manager -Source: http://dl.cihar.com/%{name}/latest/%{name}-%{version}.tar.%{extension} -License: GPLv2 -%if 0%{?suse_version} -Group: Hardware/Mobile -%else -Group: Hardware/Mobile +%if 0%{?fedora_version} || 0%{?centos_version} || 0%{?rhel_version} || 0%{?fedora} || 0%{?rhel} +BuildRequires: desktop-file-utils %endif -Requires: wxPython >= 2.6, python-gammu >= %{python_gammu_req}, python-xml BuildRequires: python-devel +BuildRequires: python-gammu >= 0.24 +BuildRequires: python-pybluez +%if 0%{?suse_version} > 1130 +BuildRequires: python-wxWidgets >= 2.6 +%else +BuildRequires: wxPython >= 2.6 +%endif +BuildRequires: python-xml %if 0%{?suse_version} BuildRequires: update-desktop-files %endif -%if 0%{?fedora_version} || 0%{?centos_version} || 0%{?rhel_version} || 0%{?fedora} || 0%{?rhel} -BuildRequires: desktop-file-utils +Requires: python-base = %py_ver +Requires: python-gammu >= 0.24 +Requires: python-pybluez +%if 0%{?suse_version} > 1130 +Requires: python-wxWidgets >= 2.6 +%else +Requires: wxPython >= 2.6 %endif -%{?py_requires} - -Url: http://wammu.eu/ -BuildRoot: %{_tmppath}/%{name}-%{version}-build +Requires: python-xml +Recommends: %{name}-lang = %{version} # These distributions use /usr/lib for python on all architectures %if 0%{?fedora_version} || 0%{?centos_version} || 0%{?rhel_version} || 0%{?fedora} || 0%{?rhel} || 0%{?mandriva_version} || 0%{?suse_version} > 1110 BuildArch: noarch @@ -66,51 +79,61 @@ instead. +%lang_package %prep %setup -q -# Ugly hack for SUSE because it does not like TelephonyTools -%if 0%{?suse_version} -sed -i 's/TelephonyTools/Telephony/' wammu.desktop.in -%endif %build -CFLAGS="$RPM_OPT_FLAGS" %{__python} setup.py build +CFLAGS="%{optflags}" %{__python} setup.py build %install -%if 0%{?suse_version} == 0 -rm -rf %buildroot -mkdir %buildroot -%endif -%{__python} setup.py install --root=%buildroot --prefix=%{_prefix} %if 0%{?fedora_version} || 0%{?centos_version} || 0%{?rhel_version} || 0%{?fedora} || 0%{?rhel} -%{__python} setup.py install -O1 --root=%buildroot --prefix=%{_prefix} +%{__python} setup.py install -O1 --root=%{buildroot} --prefix=%{_prefix} +%else +%{__python} setup.py install --prefix=%{_prefix} --root=%{buildroot} %endif -%find_lang %{name} --all-name --with-man + %if 0%{?suse_version} -%suse_update_desktop_file %{name} +%suse_update_desktop_file -r %{name} GTK Utility Telephony %endif %if 0%{?fedora_version} || 0%{?centos_version} || 0%{?rhel_version} || 0%{?fedora} || 0%{?rhel} desktop-file-install --vendor "" \ - --dir %buildroot%{_datadir}/applications \ + --dir %{buildroot}%{_datadir}/applications \ --mode 0644 \ --remove-category=Application \ - %buildroot%{_datadir}/applications/%{name}.desktop + %{buildroot}%{_datadir}/applications/%{name}.desktop +%endif + +# Remove unneeded locales +%if 0%{?suse_version} < 1140 +rm -rf %{buildroot}%{_datadir}/locale/sw/ %endif +%find_lang %{name} --with-man --all-name + %clean -rm -rf %buildroot +rm -rf %{buildroot} + +%files +%defattr(-,root,root,-) +%doc AUTHORS COPYING ChangeLog FAQ PKG-INFO README* +%{_bindir}/wammu +%{_bindir}/wammu-configure +%{wammu_python_sitelib}/Wammu/ +%{wammu_python_sitelib}/wammu-*.egg-info +%{_datadir}/Wammu/ +%{_datadir}/applications/wammu.desktop +%doc %{_mandir}/man1/wammu.1%{ext_man} +%doc %{_mandir}/man1/wammu-configure.1%{ext_man} +%{_datadir}/pixmaps/wammu.* -%files -f %name.lang -%defattr(-,root,root) -%doc COPYING AUTHORS FAQ README PKG-INFO ChangeLog -%doc %{_mandir}/man1/* +%files lang -f %{name}.lang +%defattr(-,root,root,-) %lang(cs) %doc %dir %{_mandir}/cs %lang(nl) %doc %dir %{_mandir}/nl -%{_bindir}/%{name} -%{_bindir}/%{name}-configure -%{_datadir}/Wammu -%{_datadir}/pixmaps/* -%{_datadir}/applications/%{name}.desktop -%{wammu_python_sitelib}/* +%if 0%{?suse_version} < 1130 +%lang(ru) %doc %dir %{_mandir}/ru +%endif +%lang(sk) %doc %dir %{_mandir}/sk %changelog ++++++ wammu-0.32.1.tar.bz2 -> wammu-0.35.tar.bz2 ++++++ ++++ 61872 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 webalizer for openSUSE:Factory
by root＠hilbert.suse.de 21 Mar '11

21 Mar '11

Hello community, here is the log from the commit of package webalizer for openSUSE:Factory checked in at Mon Mar 21 10:42:28 CET 2011. -------- --- webalizer/webalizer.changes 2010-09-01 15:59:06.000000000 +0200 +++ /mounts/work_src_done/STABLE/webalizer/webalizer.changes 2011-03-19 19:20:41.000000000 +0100 @@ -1,0 +2,17 @@ +Sat Mar 19 18:17:06 UTC 2011 - chris(a)computersalat.de + +- update to 2.23 + o Fix sporadic eol problem with some IIS/W3C logs + o Fix compiler directive syntax error (broke some 64 bit systems) + o Modest speed improvements in hash table code + - for further changes please see CHANGES file +- fix License: GPLv2+ +- spec-cleaner +- remove obsolete define patch +- add Makefile patch + o fix for data-/mandir +- remove Obsoletes/Provides webalize +- remove author from spec +- preun: do not remove var/lib/webalizer/* + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- webalizer-2.21-02-define.diff webalizer-2.21-02-src.tar.bz2 New: ---- webalizer-2.23-04-Makefile.patch webalizer-2.23-04-src.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ webalizer.spec ++++++ --- /var/tmp/diff_new_pack.BuhOyN/_old 2011-03-21 10:39:02.000000000 +0100 +++ /var/tmp/diff_new_pack.BuhOyN/_new 2011-03-21 10:39:02.000000000 +0100 @@ -1,7 +1,7 @@ # -# spec file for package webalizer (Version 2.21) +# spec file for package webalizer # -# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2011 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 @@ -15,30 +15,44 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # -# norootforbuild +%define apache_serverroot %(/usr/sbin/apxs2 -q datadir 2>/dev/null || apxs -q PREFIX) +%define editlvl 04 Name: webalizer -BuildRequires: apache2-devel db-devel gd-devel libGeoIP-devel libapr-util1-devel libjpeg-devel libpng-devel mm pcre-devel xorg-x11 xorg-x11-devel -%define editlvl 02 -License: LGPLv2.1+ +Summary: A Web Server Log File Analysis Program +Version: 2.23 +Release: 1 +License: GPLv2+ Group: Productivity/Networking/Web/Utilities -Provides: webalize -Obsoletes: webalize -AutoReqProv: on -Version: 2.21 -Release: 11 Url: http://www.mrunix.net/webalizer/ -Summary: A Web Server Log File Analysis Program Source: %{name}-%{version}-%{editlvl}-src.tar.bz2 -Patch: %{name}-%{version}-%{editlvl}.diff -Patch1: %{name}-%{version}-%{editlvl}-ia64.diff -Patch3: %{name}-%{version}-%{editlvl}-maxagent.diff -Patch4: %{name}-%{version}-%{editlvl}-configuration.diff -Patch5: %{name}-%{version}-%{editlvl}-fclose.diff -Patch6: %{name}-%{version}-%{editlvl}-define.diff +# PATCH-MISSING-TAG -- See http://en.opensuse.org/Packaging/Patches +Patch0: %{name}-2.21-02.diff +# PATCH-MISSING-TAG -- See http://en.opensuse.org/Packaging/Patches +Patch1: %{name}-2.21-02-ia64.diff +# PATCH-MISSING-TAG -- See http://en.opensuse.org/Packaging/Patches +Patch3: %{name}-2.21-02-maxagent.diff +# PATCH-MISSING-TAG -- See http://en.opensuse.org/Packaging/Patches +Patch4: %{name}-2.21-02-configuration.diff +# PATCH-MISSING-TAG -- See http://en.opensuse.org/Packaging/Patches +Patch5: %{name}-2.21-02-fclose.diff +# FIX-DATADIR - fix for datadir and mandir +Patch6: %{name}-2.23-04-Makefile.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build -%define apache_serverroot %(/usr/sbin/apxs2 -q datadir 2>/dev/null || apxs -q PREFIX) +BuildRequires: apache2-devel +BuildRequires: db-devel +BuildRequires: gd-devel +BuildRequires: libGeoIP-devel +BuildRequires: libapr-util1-devel +BuildRequires: libjpeg-devel +BuildRequires: libpng-devel +BuildRequires: mm +BuildRequires: pcre-devel +BuildRequires: xorg-x11 +BuildRequires: xorg-x11-devel +#Provides: webalize +#Obsoletes: webalize %description Webalizer is a web server log file analysis program which produces @@ -54,15 +68,9 @@ Combined log formats as defined by NCSA and others, and variations of these which it attempts to handle intelligently. - - -Authors: --------- - Bradford L. Barrett <brad(a)usagl.net> - %prep %setup -q -n %{name}-%{version}-%{editlvl} -%patch +%patch0 %patch1 %patch3 %patch4 @@ -72,39 +80,39 @@ %build %{suse_update_config -f} autoconf -CFLAGS="$RPM_OPT_FLAGS -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64" ./configure --prefix=/usr \ - --with-gdlib=%{_libdir} \ - --with-gd=/usr/include/gd \ +CFLAGS="%{optflags} -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64" ./configure \ + --prefix=%{_prefix} \ --mandir=%{_mandir} \ --sysconfdir=%{_sysconfdir} \ - --enable-dns \ --enable-bz2 \ --enable-geoip \ + --with-gdlib=%{_libdir} \ + --with-gd=/usr/include/gd \ %{_target_cpu}-suse-linux make LIBNAME=%{_lib} %install -install -d -m 755 $RPM_BUILD_ROOT/usr/bin -install -d -m 755 $RPM_BUILD_ROOT/etc -install -d -m 755 $RPM_BUILD_ROOT/%{_mandir}/man1 -make "DESTDIR=$RPM_BUILD_ROOT" install -install -d -m 755 $RPM_BUILD_ROOT%{apache_serverroot}/htdocs/webalizer -install -d -m 755 $RPM_BUILD_ROOT/var/lib/webalizer -mv $RPM_BUILD_ROOT/%{_sysconfdir}/webalizer.conf.sample $RPM_BUILD_ROOT/%{_sysconfdir}/webalizer.conf - -%clean -rm -rf $RPM_BUILD_ROOT +install -d -m 755 %{buildroot}%{_prefix}/bin +install -d -m 755 %{buildroot}/etc +install -d -m 755 %{buildroot}/%{_mandir}/man1 +make "DESTDIR=%{buildroot}" install +install -d -m 755 %{buildroot}%{apache_serverroot}/htdocs/webalizer +install -d -m 755 %{buildroot}%{_localstatedir}/lib/webalizer +mv %{buildroot}/%{_sysconfdir}/webalizer.conf.sample %{buildroot}/%{_sysconfdir}/webalizer.conf %preun -rm -f var/lib/webalizer/* +#rm -f var/lib/webalizer/* + +%clean +rm -rf %{buildroot} %files %defattr(-,root,root) -%config /etc/webalizer.conf -%dir %{apache_serverroot}/htdocs/webalizer -%doc %{_mandir}/man?/* %doc CHANGES COPYING Copyright README README.FIRST country-codes.txt -/usr/bin/* -/var/lib/webalizer +%doc %{_mandir}/man?/* +%config(noreplace) %{_sysconfdir}/webalizer.conf +%dir %{apache_serverroot}/htdocs/webalizer +%{_bindir}/* +%{_localstatedir}/lib/webalizer %changelog ++++++ webalizer-2.23-04-Makefile.patch ++++++ diff -ruN webalizer-2.23-04-orig/Makefile.in webalizer-2.23-04/Makefile.in --- webalizer-2.23-04-orig/Makefile.in 2011-01-03 05:54:32.000000000 +0100 +++ webalizer-2.23-04/Makefile.in 2011-03-19 19:08:52.000000000 +0100 @@ -18,10 +18,10 @@ prefix = @prefix@ exec_prefix = @exec_prefix@ -datadir = @datarootdir@ +datadir = @datadir@ BINDIR = @bindir@ -MANDIR = ${datadir}/man/man1 +MANDIR = @mandir@ ETCDIR = @sysconfdir@ GEODB = @GEODB_LOC@ CC = @CC@ @@ -92,25 +92,25 @@ install: all mkdir -p ${DESTDIR}${BINDIR} - mkdir -p ${DESTDIR}${MANDIR} + mkdir -p ${DESTDIR}${MANDIR}/man1 mkdir -p ${DESTDIR}${ETCDIR} $(INSTALL_PROGRAM) webalizer ${DESTDIR}${BINDIR}/webalizer $(INSTALL_PROGRAM) wcmgr ${DESTDIR}${BINDIR}/wcmgr rm -f ${DESTDIR}${BINDIR}/webazolver @LN_S@ webalizer ${DESTDIR}${BINDIR}/webazolver - $(INSTALL_DATA) webalizer.1 ${DESTDIR}${MANDIR}/webalizer.1 - $(INSTALL_DATA) wcmgr.1 ${DESTDIR}${MANDIR}/wcmgr.1 - rm -f ${DESTDIR}${MANDIR}/webazolver.1 - @LN_S@ webalizer.1 ${DESTDIR}${MANDIR}/webazolver.1 + $(INSTALL_DATA) webalizer.1 ${DESTDIR}${MANDIR}/man1/webalizer.1 + $(INSTALL_DATA) wcmgr.1 ${DESTDIR}${MANDIR}/man1/wcmgr.1 + rm -f ${DESTDIR}${MANDIR}/man1/webazolver.1 + @LN_S@ webalizer.1 ${DESTDIR}${MANDIR}/man1/webazolver.1 $(INSTALL_DATA) sample.conf ${DESTDIR}${ETCDIR}/webalizer.conf.sample uninstall: rm -f ${DESTDIR}${BINDIR}/webalizer rm -f ${DESTDIR}${BINDIR}/webazolver rm -f ${DESTDIR}${BINDIR}/wcmgr - rm -f ${DESTDIR}${MANDIR}/webalizer.1 - rm -f ${DESTDIR}${MANDIR}/webazolver.1 - rm -f ${DESTDIR}${MANDIR}/wcmgr.1 + rm -f ${DESTDIR}${MANDIR}/man1/webalizer.1 + rm -f ${DESTDIR}${MANDIR}/man1/webazolver.1 + rm -f ${DESTDIR}${MANDIR}/man1/wcmgr.1 rm -f ${DESTDIR}${ETCDIR}/webalizer.conf.sample rm -f webalizer_lang.h @LN_S@ lang/webalizer_lang.${DEFLANG} webalizer_lang.h ++++++ webalizer-2.21-02-src.tar.bz2 -> webalizer-2.23-04-src.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/webalizer-2.21-02/CHANGES new/webalizer-2.23-04/CHANGES --- old/webalizer-2.21-02/CHANGES 2009-01-08 06:38:59.000000000 +0100 +++ new/webalizer-2.23-04/CHANGES 2010-10-06 09:33:24.000000000 +0200 @@ -1,5 +1,17 @@ -------------------------------------------------------------------- -2.21-xx changes from 2.20-xx (brad(a)mrunix.net) +2.23-xx changes from 2.21-xx +-------------------------------------------------------------------- + +Fixes: + o Fix sporadic eol problem with some IIS/W3C logs + + o Fix compiler directive syntax error (broke some 64 bit systems) + +Changes/Additions: + o Modest speed improvements in hash table code + +-------------------------------------------------------------------- +2.21-xx changes from 2.20-xx -------------------------------------------------------------------- Fixes: @@ -10,8 +22,11 @@ Changes/Additions: o Added "YearTotals" config option for main index page totals + o Rename local stricmp() function to ouricmp() to prevent name + confilict on systems that happen to provide it already. + -------------------------------------------------------------------- -2.20-xx changes from 2.01-xx (brad(a)mrunix.net) +2.20-xx changes from 2.01-xx -------------------------------------------------------------------- Fixes: @@ -142,7 +157,7 @@ package builds. -------------------------------------------------------------------- -2.01-xx changes from 1.30-04 (brad(a)mrunix.net) +2.01-xx changes from 1.30-04 -------------------------------------------------------------------- Fixes: @@ -297,7 +312,7 @@ o Usual documentation updates for new features/functions. -------------------------------------------------------------------- -1.30-xx changes from 1.22-06 (brad(a)mrunix.net) +1.30-xx changes from 1.22-06 -------------------------------------------------------------------- Fixes: @@ -379,7 +394,7 @@ o Language files and documentation updated for new functions. -------------------------------------------------------------------- -1.22-xx changes from 1.20-11 (brad(a)mrunix.net) +1.22-xx changes from 1.20-11 -------------------------------------------------------------------- Fixes: @@ -442,7 +457,7 @@ o Updated documentation for new functions/features. -------------------------------------------------------------------- -1.20-xx changes from 1.12-10 (brad(a)mrunix.net) +1.20-xx changes from 1.12-10 -------------------------------------------------------------------- Fixes: @@ -467,7 +482,7 @@ "Incremental" configuration file keyword). -------------------------------------------------------------------- -1.1x-xx changes from 1.00-05 (brad(a)mrunix.net) +1.1x-xx changes from 1.00-05 -------------------------------------------------------------------- Fixes: @@ -509,7 +524,7 @@ o Usual README and CHANGES documentation updates. -------------------------------------------------------------------- -1.00-xx changes from 0.99-06 (brad(a)mrunix.net) +1.00-xx changes from 0.99-06 -------------------------------------------------------------------- Fixes: @@ -532,7 +547,7 @@ languages will be distributed as I receive them. -------------------------------------------------------------------- -0.99-xx changes from 0.98-16 (brad(a)mrunix.net) +0.99-xx changes from 0.98-16 -------------------------------------------------------------------- 0.99 is mostly a bug-fix release, with a few added extra goodies. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/webalizer-2.21-02/Copyright new/webalizer-2.23-04/Copyright --- old/webalizer-2.21-02/Copyright 2009-01-13 05:47:39.000000000 +0100 +++ new/webalizer-2.23-04/Copyright 2011-01-03 05:53:07.000000000 +0100 @@ -1,6 +1,6 @@ webalizer - a web server log analysis program - Copyright (C) 1997-2009 Bradford L. Barrett + Copyright (C) 1997-2011 Bradford L. Barrett This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/webalizer-2.21-02/Makefile.in new/webalizer-2.23-04/Makefile.in --- old/webalizer-2.21-02/Makefile.in 2009-01-13 05:44:21.000000000 +0100 +++ new/webalizer-2.23-04/Makefile.in 2011-01-03 05:54:32.000000000 +0100 @@ -1,7 +1,7 @@ # # Makefile for webalizer - a web server log analysis program # -# Copyright (C) 1997-2009 Bradford L. Barrett +# Copyright (C) 1997-2011 Bradford L. Barrett # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/webalizer-2.21-02/Makefile.std new/webalizer-2.23-04/Makefile.std --- old/webalizer-2.21-02/Makefile.std 2009-01-13 05:46:50.000000000 +0100 +++ new/webalizer-2.23-04/Makefile.std 2011-01-03 05:55:05.000000000 +0100 @@ -1,7 +1,7 @@ # # Makefile for webalizer - a web server logfile analysis thingie # -# (c)1997-2009 by Bradford L. Barrett +# (c)1997-2011 by Bradford L. Barrett # Distributed under the GNU GPL. See "README" and "Copyright" # files supplied with this distribution for more information. # diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/webalizer-2.21-02/README new/webalizer-2.23-04/README --- old/webalizer-2.21-02/README 2009-01-13 05:44:49.000000000 +0100 +++ new/webalizer-2.23-04/README 2011-01-03 05:55:25.000000000 +0100 @@ -1,5 +1,5 @@ The Webalizer - A web server log file analysis tool -Copyright 1997-2009 by Bradford L. Barrett +Copyright 1997-2011 by Bradford L. Barrett Distributed under the GNU GPL. See the files "COPYING" and "Copyright" supplied with the distribution for additional info. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/webalizer-2.21-02/README.FIRST new/webalizer-2.23-04/README.FIRST --- old/webalizer-2.21-02/README.FIRST 2008-06-16 08:27:11.000000000 +0200 +++ new/webalizer-2.23-04/README.FIRST 2010-10-09 07:44:13.000000000 +0200 @@ -1,4 +1,4 @@ -Upgrade information for the Webalizer Version 2.20 +Upgrade information for the Webalizer Version 2.2x This release is, for the most part, a drop-in replacement for all installations currently running 2.01, and all users are encouraged diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/webalizer-2.21-02/configure new/webalizer-2.23-04/configure --- old/webalizer-2.21-02/configure 2009-01-13 05:48:53.000000000 +0100 +++ new/webalizer-2.23-04/configure 2011-01-03 05:54:04.000000000 +0100 @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.61 for webalizer 2.20. +# Generated by GNU Autoconf 2.61 for webalizer V2.23. # # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, # 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc. @@ -572,8 +572,8 @@ # Identity of this package. PACKAGE_NAME='webalizer' PACKAGE_TARNAME='webalizer' -PACKAGE_VERSION='2.20' -PACKAGE_STRING='webalizer 2.20' +PACKAGE_VERSION='V2.23' +PACKAGE_STRING='webalizer V2.23' PACKAGE_BUGREPORT='' # Factoring default headers for most tests. @@ -1181,7 +1181,7 @@ # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures webalizer 2.20 to adapt to many kinds of systems. +\`configure' configures webalizer V2.23 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1242,7 +1242,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of webalizer 2.20:";; + short | recursive ) echo "Configuration of webalizer V2.23:";; esac cat <<\_ACEOF @@ -1255,6 +1255,7 @@ --enable-dns Enable DNS/GeoDB lookup code [default=yes] --enable-bz2 Enable BZip2 decompression code [default=no] --enable-geoip Enable GeoIP geolocation code [default=no] + --enable-oldhash Use old hash function (slower) [default=no] Optional Packages: --with-PACKAGE[=ARG] use PACKAGE [ARG=yes] @@ -1347,7 +1348,7 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -webalizer configure 2.20 +webalizer configure V2.23 generated by GNU Autoconf 2.61 Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, @@ -1361,7 +1362,7 @@ This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by webalizer $as_me 2.20, which was +It was created by webalizer $as_me V2.23, which was generated by GNU Autoconf 2.61. Invocation command line was $ $0 $@ @@ -6386,6 +6387,15 @@ +# Check whether --enable-oldhash was given. +if test "${enable_oldhash+set}" = set; then + enableval=$enable_oldhash; OLDHASH=${enableval} +else + OLDHASH="no" +fi + + if test "$OLDHASH" = "yes"; then OPTS="-DUSE_OLDHASH"; fi + LANG_CACHE=yes @@ -6869,7 +6879,7 @@ # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by webalizer $as_me 2.20, which was +This file was extended by webalizer $as_me V2.23, which was generated by GNU Autoconf 2.61. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -6916,7 +6926,7 @@ _ACEOF cat >>$CONFIG_STATUS <<_ACEOF ac_cs_version="\\ -webalizer config.status 2.20 +webalizer config.status V2.23 configured by $0, generated by GNU Autoconf 2.61, with options \\"`echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/webalizer-2.21-02/configure.in new/webalizer-2.23-04/configure.in --- old/webalizer-2.21-02/configure.in 2009-01-13 05:45:04.000000000 +0100 +++ new/webalizer-2.23-04/configure.in 2011-01-03 05:53:44.000000000 +0100 @@ -1,12 +1,12 @@ dnl dnl The Webalizer - A web server log file analysis program -dnl Copyright (C) 1997-2009 by Bradford L. Barrett +dnl Copyright (C) 1997-2011 by Bradford L. Barrett dnl -dnl configure.in template for The Webalizer Version 2.20 +dnl configure.in template for The Webalizer Version 2.23 dnl Process this file with autoconf to produce a configure script. dnl -AC_INIT(webalizer,2.20) +AC_INIT(webalizer,V2.23) OPTS=${DEFS} LIBS=${LIBS} @@ -268,6 +268,14 @@ AC_SUBST(GEODB_LOC) dnl ------------------------------------------ +dnl check which hash function to use +dnl ------------------------------------------ +AC_ARG_ENABLE(oldhash, + [ --enable-oldhash Use old hash function (slower) [[default=no]]], + OLDHASH=${enableval}, OLDHASH="no") + if test "$OLDHASH" = "yes"; then OPTS="-DUSE_OLDHASH"; fi + +dnl ------------------------------------------ dnl check language to use (default is english) dnl ------------------------------------------ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/webalizer-2.21-02/dns_resolv.c new/webalizer-2.23-04/dns_resolv.c --- old/webalizer-2.21-02/dns_resolv.c 2009-01-13 05:42:46.000000000 +0100 +++ new/webalizer-2.23-04/dns_resolv.c 2011-01-03 05:51:00.000000000 +0100 @@ -1,7 +1,7 @@ /* webalizer - a web server log analysis program - Copyright (C) 1997-2009 Bradford L. Barrett + Copyright (C) 1997-2011 Bradford L. Barrett This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/webalizer-2.21-02/graphs.c new/webalizer-2.23-04/graphs.c --- old/webalizer-2.21-02/graphs.c 2009-01-13 05:42:53.000000000 +0100 +++ new/webalizer-2.23-04/graphs.c 2011-01-03 05:51:06.000000000 +0100 @@ -1,7 +1,7 @@ /* graphs.c - produces graphs used by the Webalizer - Copyright (C) 1997-2009 Bradford L. Barrett + Copyright (C) 1997-2011 Bradford L. Barrett This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/webalizer-2.21-02/hashtab.c new/webalizer-2.23-04/hashtab.c --- old/webalizer-2.21-02/hashtab.c 2009-01-13 05:42:57.000000000 +0100 +++ new/webalizer-2.23-04/hashtab.c 2011-01-03 05:51:12.000000000 +0100 @@ -1,7 +1,7 @@ /* webalizer - a web server log analysis program - Copyright (C) 1997-2009 Bradford L. Barrett + Copyright (C) 1997-2011 Bradford L. Barrett This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -38,6 +38,11 @@ #include <sys/types.h> #endif +/* some need for uint* */ +#ifdef HAVE_STDINT_H +#include <stdint.h> +#endif + /* need socket header? */ #ifdef HAVE_SYS_SOCKET_H #include <sys/socket.h> @@ -68,7 +73,7 @@ void update_entry(char *); /* update entry/exit */ void update_exit(char *); /* page totals */ -u_int64_t hash(char *); /* hash function */ +unsigned int hash(char *); /* hash function */ /* local data */ @@ -83,6 +88,10 @@ DNODEPTR host_table[MAXHASH]; /* DNS hash table */ #endif /* USE_DNS */ +/* Last node pointers */ +HNODEPTR lm_hnode=NULL; +HNODEPTR ld_hnode=NULL; +RNODEPTR l_rnode=NULL; /*********************************************/ /* DEL_HTABS - clear out our hash tables */ @@ -153,19 +162,23 @@ HNODEPTR *htab) /* ptr>next */ { HNODEPTR cptr,nptr; + unsigned int hval; /* check if hashed */ - if ( (cptr = htab[hash(str)]) == NULL) + hval=hash(str); + if ( (cptr = htab[hval]) == NULL) { /* not hashed */ if ( (nptr=new_hnode(str)) != NULL) { + if (htab==sm_htab) lm_hnode=nptr; + else ld_hnode=nptr; nptr->flag = type; nptr->count = count; nptr->files = file; nptr->xfer = xfer; nptr->next = NULL; - htab[hash(str)] = nptr; + htab[hval] = nptr; if (type!=OBJ_GRP) (*ctr)++; if (visit) @@ -189,7 +202,16 @@ } else { - /* hashed */ + /* hashed (SPEEDUP) */ + if (htab==sm_htab) + { + if (lm_hnode!=NULL && strcmp(lm_hnode->string,str)==0) cptr=lm_hnode; + } + else + { + if (ld_hnode!=NULL && strcmp(ld_hnode->string,str)==0) cptr=ld_hnode; + } + while (cptr != NULL) { if (strcmp(cptr->string,str)==0) @@ -215,6 +237,8 @@ cptr->lasturl=find_url(log_rec.url); cptr->tstamp=tstamp; } + if (htab==sm_htab) lm_hnode=cptr; + else ld_hnode=cptr; return 0; } } @@ -223,12 +247,14 @@ /* not found... */ if ( (nptr = new_hnode(str)) != NULL) { + if (htab==sm_htab) lm_hnode=nptr; + else ld_hnode=nptr; nptr->flag = type; nptr->count = count; nptr->files = file; nptr->xfer = xfer; - nptr->next = htab[hash(str)]; - htab[hash(str)]=nptr; + nptr->next = htab[hval]; + htab[hval]=nptr; if (type!=OBJ_GRP) (*ctr)++; if (visit) @@ -260,6 +286,8 @@ /* check if it's a hidden object */ if ((hide_sites)||(isinlist(hidden_sites,nptr->string)!=NULL)) nptr->flag=OBJ_HIDE; + if (htab==sm_htab) lm_hnode=nptr; + else ld_hnode=nptr; } } return nptr==NULL; @@ -290,6 +318,8 @@ htab[i]=NULL; } } + lm_hnode=NULL; + ld_hnode=NULL; } /*********************************************/ @@ -334,11 +364,13 @@ u_int64_t *ctr, u_int64_t entry, u_int64_t exit, UNODEPTR *htab) { UNODEPTR cptr,nptr; + unsigned int hval; if (str[0]=='-') return 0; + hval = hash(str); /* check if hashed */ - if ( (cptr = htab[hash(str)]) == NULL) + if ( (cptr = htab[hval]) == NULL) { /* not hashed */ if ( (nptr=new_unode(str)) != NULL) @@ -349,7 +381,7 @@ nptr->next = NULL; nptr->entry= entry; nptr->exit = exit; - htab[hash(str)] = nptr; + htab[hval] = nptr; if (type!=OBJ_GRP) (*ctr)++; } } @@ -376,17 +408,17 @@ nptr->flag = type; nptr->count= count; nptr->xfer = xfer; - nptr->next = htab[hash(str)]; + nptr->next = htab[hval]; nptr->entry= entry; nptr->exit = exit; - htab[hash(str)]=nptr; + htab[hval] = nptr; if (type!=OBJ_GRP) (*ctr)++; } } if (nptr!=NULL) { if (type==OBJ_GRP) nptr->flag=OBJ_GRP; - else if (isinlist(hidden_urls,nptr->string)!=NULL) + else if (isinglist(hidden_urls,nptr->string)!=NULL) nptr->flag=OBJ_HIDE; } return nptr==NULL; @@ -461,11 +493,13 @@ u_int64_t *ctr, RNODEPTR *htab) { RNODEPTR cptr,nptr; + unsigned int hval; if (str[0]=='-') strcpy(str,"- (Direct Request)"); + hval = hash(str); /* check if hashed */ - if ( (cptr = htab[hash(str)]) == NULL) + if ( (cptr = htab[hval]) == NULL) { /* not hashed */ if ( (nptr=new_rnode(str)) != NULL) @@ -473,13 +507,15 @@ nptr->flag = type; nptr->count = count; nptr->next = NULL; - htab[hash(str)] = nptr; + htab[hval] = nptr; if (type!=OBJ_GRP) (*ctr)++; } } else { - /* hashed */ + /* hashed (SPEEDUP) */ + if (l_rnode!=NULL && strcmp(l_rnode->string,str)==0) cptr=l_rnode; + while (cptr != NULL) { if (strcmp(cptr->string,str)==0) @@ -498,8 +534,8 @@ { nptr->flag = type; nptr->count = count; - nptr->next = htab[hash(str)]; - htab[hash(str)]=nptr; + nptr->next = htab[hval]; + htab[hval] = nptr; if (type!=OBJ_GRP) (*ctr)++; } } @@ -508,6 +544,7 @@ if (type==OBJ_GRP) nptr->flag=OBJ_GRP; else if (isinlist(hidden_refs,nptr->string)!=NULL) nptr->flag=OBJ_HIDE; + l_rnode=nptr; } return nptr==NULL; } @@ -537,6 +574,7 @@ htab[i]=NULL; } } + l_rnode=NULL; } /*********************************************/ @@ -581,11 +619,13 @@ u_int64_t *ctr, ANODEPTR *htab) { ANODEPTR cptr,nptr; + unsigned int hval; if (str[0]=='-') return 0; /* skip bad user agents */ + hval = hash(str); /* check if hashed */ - if ( (cptr = htab[hash(str)]) == NULL) + if ( (cptr = htab[hval]) == NULL) { /* not hashed */ if ( (nptr=new_anode(str)) != NULL) @@ -593,7 +633,7 @@ nptr->flag = type; nptr->count= count; nptr->next = NULL; - htab[hash(str)] = nptr; + htab[hval] = nptr; if (type!=OBJ_GRP) (*ctr)++; } } @@ -618,8 +658,8 @@ { nptr->flag = type; nptr->count = count; - nptr->next = htab[hash(str)]; - htab[hash(str)]=nptr; + nptr->next = htab[hval]; + htab[hval] = nptr; if (type!=OBJ_GRP) (*ctr)++; } } @@ -696,18 +736,20 @@ int put_snode(char *str, u_int64_t count, SNODEPTR *htab) { SNODEPTR cptr,nptr; + unsigned int hval; if (str[0]==0 || str[0]==' ') return 0; /* skip bad search strs */ + hval=hash(str); /* check if hashed */ - if ( (cptr = htab[hash(str)]) == NULL) + if ( (cptr = htab[hval]) == NULL) { /* not hashed */ if ( (nptr=new_snode(str)) != NULL) { nptr->count = count; nptr->next = NULL; - htab[hash(str)] = nptr; + htab[hval] = nptr; } } else @@ -727,8 +769,8 @@ if ( (nptr = new_snode(str)) != NULL) { nptr->count = count; - nptr->next = htab[hash(str)]; - htab[hash(str)]=nptr; + nptr->next = htab[hval]; + htab[hval] = nptr; } } return nptr==NULL; @@ -810,11 +852,13 @@ INODEPTR *htab) /* hashtable */ { INODEPTR cptr,nptr; + unsigned int hval; if ((str[0]=='-') || (str[0]==0)) return 0; /* skip if no username */ + hval = hash(str); /* check if hashed */ - if ( (cptr = htab[hash(str)]) == NULL) + if ( (cptr = htab[hval]) == NULL) { /* not hashed */ if ( (nptr=new_inode(str)) != NULL) @@ -824,7 +868,7 @@ nptr->files = file; nptr->xfer = xfer; nptr->next = NULL; - htab[hash(str)] = nptr; + htab[hval] = nptr; if (type!=OBJ_GRP) (*ctr)++; if (visit) @@ -871,8 +915,8 @@ nptr->count = count; nptr->files = file; nptr->xfer = xfer; - nptr->next = htab[hash(str)]; - htab[hash(str)]=nptr; + nptr->next = htab[hval]; + htab[hval] = nptr; if (type!=OBJ_GRP) (*ctr)++; if (visit) @@ -970,11 +1014,13 @@ int put_dnode(char *str, void *addr, int len, DNODEPTR *htab) { DNODEPTR cptr,nptr; + unsigned int hval; if (str[0]==0 || str[0]==' ') return 0; /* skip bad hostnames */ + hval = hash(str); /* check if hashed */ - if ( (cptr = htab[hash(str)]) == NULL) + if ( (cptr = htab[hval]) == NULL) { /* not hashed */ if ( (nptr=new_dnode(str)) != NULL) @@ -983,7 +1029,7 @@ else memset(&nptr->addr, 0, sizeof(struct sockaddr_storage)); nptr->addrlen = len; nptr->next = NULL; - htab[hash(str)] = nptr; + htab[hval] = nptr; } } else @@ -1000,8 +1046,8 @@ if (addr) memcpy(&nptr->addr, addr, len); else memset(&nptr->addr, 0, sizeof(struct sockaddr_storage)); nptr->addrlen = len; - nptr->next = htab[hash(str)]; - htab[hash(str)]=nptr; + nptr->next = htab[hval]; + htab[hval] = nptr; } } return nptr==NULL; @@ -1037,18 +1083,6 @@ #endif /* USE_DNS */ /*********************************************/ -/* HASH - return hash value for string */ -/*********************************************/ - -u_int64_t hash(char *str) -{ - u_int64_t hashval; - for (hashval = 0; *str != '\0'; str++) - hashval = *str + 31 * hashval; - return hashval % MAXHASH; -} - -/*********************************************/ /* FIND_URL - Find URL in hash table */ /*********************************************/ @@ -1167,3 +1201,84 @@ } return tot; } + +#ifdef USE_OLDHASH +/*********************************************/ +/* HASH - return hash value for string */ +/*********************************************/ + +unsigned int hash(char *str) +{ + uint32_t hashval=0; + + for (hashval = 0; *str != '\0'; str++) + hashval = *str + (hashval << 5) - hashval; + + return hashval % MAXHASH; +} + +#else /* USE_OLDHASH */ +/*********************************************/ +/* HASH (SuperFastHash by Paul Hsieh) */ +/*********************************************/ + +#undef get16bits +#if (defined(__GNUC__) && defined(__i386__)) || defined(__WATCOMC__) \ + || defined(_MSC_VER) || defined (__BORLANDC__) || defined (__TURBOC__) +#define get16bits(d) (*((const uint16_t *) (d))) +#endif + +#if !defined (get16bits) +#define get16bits(d) ((((uint32_t)(((const uint8_t *)(d))[1])) << 8)\ + +(uint32_t)(((const uint8_t *)(d))[0]) ) +#endif + +unsigned int hash(char *str) +{ + int len=strlen(str); + uint32_t hash = len, tmp; + int rem; + + if (len <= 0 || str == NULL) return 0; + + rem = len & 3; + len >>= 2; + + /* Main loop */ + for (;len > 0; len--) + { + hash += get16bits (str); + tmp = (get16bits (str+2) << 11) ^ hash; + hash = (hash << 16) ^ tmp; + str += 2*sizeof (uint16_t); + hash += hash >> 11; + } + + /* Handle end cases */ + switch (rem) + { + case 3: hash += get16bits (str); + hash ^= hash << 16; + hash ^= str[sizeof (uint16_t)] << 18; + hash += hash >> 11; + break; + case 2: hash += get16bits (str); + hash ^= hash << 11; + hash += hash >> 17; + break; + case 1: hash += *str; + hash ^= hash << 10; + hash += hash >> 1; + } + + /* Force "avalanching" of final 127 bits */ + hash ^= hash << 3; + hash += hash >> 5; + hash ^= hash << 4; + hash += hash >> 17; + hash ^= hash << 25; + hash += hash >> 6; + + return hash % MAXHASH; +} +#endif /* USE_OLDHASH */ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/webalizer-2.21-02/lang/webalizer_lang.czech new/webalizer-2.23-04/lang/webalizer_lang.czech --- old/webalizer-2.21-02/lang/webalizer_lang.czech 2008-07-02 00:24:12.000000000 +0200 +++ new/webalizer-2.23-04/lang/webalizer_lang.czech 2009-04-30 09:04:36.000000000 +0200 @@ -13,6 +13,7 @@ 28-Mar-2002 Fixes/corrections by Pavel Kolesnikov (k(a)les.cz) 26-Mar-2008 Updated to current IANA TLDs (brad(a)mrunix.net) 26-May-2008 Modified for level 2.2 support (brad(a)mrunix.net) + 30-Mar-2009 translations/fixes by Vitezslav Samel (vita(a)samel.cz) Language files are named using the following convention: @@ -85,17 +86,17 @@ /* DNS Stuff */ char *msg_dns_nocf= "Nejsou specifikovany zadne cache soubory, koncim..."; -char *msg_dns_nodb= "Chyba: Namohu odevrit soubory DNS cache"; +char *msg_dns_nodb= "Chyba: Nemohu otevrit soubory DNS cache"; char *msg_dns_nolk= "Chyba: Nemohu zamknout soubory DNS cache"; char *msg_dns_usec= "Pouzivam soubory DNS cache"; char *msg_dns_rslv= "DNS Kontrola"; char *msg_dns_none= "Neni co zpracovat"; -char *msg_dns_abrt= "DNS support not present, aborting..."; +char *msg_dns_abrt= "Neni podpora pro DNS, koncim..."; /* Geolocation stuff */ -char *msg_geo_open= "Error opening file"; -char *msg_geo_use = "Using"; -char *msg_geo_nolu= "lookups disabled"; +char *msg_geo_open= "Nemohu otevrit soubor"; +char *msg_geo_use = "Pouzivam"; +char *msg_geo_nolu= "vyhledavani vypnuto"; char *msg_geo_dflt= "default"; /* memory allocation errors */ @@ -132,7 +133,7 @@ char *h_msg[]= { "-h = vypis tento help" , "-V = vypis informaci o verzi" , - "-v = be verbose" , + "-v = bud upovidany" , "-d = vypis dalsi ladici informace" , "-F type = typ logu. type= (clf | ftp | squid | w3c)", "-f = chyby v prekladu stranek" , @@ -156,31 +157,31 @@ "-r name = skryj odkazovac 'name'" , "-s name = skryj misto 'name'" , "-u name = skryj URL 'name'" , - "-x name = Use filename extension 'name'" , - "-O name = Omit page 'name'" , - "-P name = Page type extension 'name'" , + "-x name = pouzij priponu souboru 'name'" , + "-O name = vynechej stranku 'name'" , + "-P name = stranky maji priponu 'name'" , "-I name = nazev Index(u) 'name'" , - "-K poc = 'poc' months in summary table" , - "-k poc = 'poc' months in summary graph" , - "-A poc = Zobraz 'poc' Nej prohlizecu" , - "-C poc = Zobraz 'poc' Nej zemi" , - "-R poc = Zobraz 'poc' Nej odkazovacu" , - "-S poc = Zobraz 'poc' Nej mist" , - "-U poc = Zobraz 'poc' Nej URL" , - "-e poc = Zobraz 'poc' vstupnich stranek" , - "-E poc = Zobraz 'poc' odchozich stranek" , - "-g poc = Seskup domeny do 'poc' urovni" , - "-X = Skryt jednotlive site" , - "-z dir = Use country flags in 'dir'" , + "-K poc = zobraz 'poc' mesicu v prehledu" , + "-k poc = zobraz 'poc' mesicu v prehledovem grafu", + "-A poc = zobraz 'poc' Nej prohlizecu" , + "-C poc = zobraz 'poc' Nej zemi" , + "-R poc = zobraz 'poc' Nej odkazovacu" , + "-S poc = zobraz 'poc' Nej mist" , + "-U poc = zobraz 'poc' Nej URL" , + "-e poc = zobraz 'poc' vstupnich stranek" , + "-E poc = zobraz 'poc' odchozich stranek" , + "-g poc = seskup domeny do 'poc' urovni" , + "-X = skryt jednotlive site" , + "-z dir = vlajky zemi jsou v adresari 'dir'" , #ifdef USE_DNS - "-D name = Pouzi DNS Cache 'name'" , - "-N poc = Pocet DNS procesu (0=zakazat)" , - "-j = Enable native GeoDB lookups" , - "-J name = Use GeoIP database 'name'" , + "-D name = pouzij DNS Cache 'name'" , + "-N poc = pocet DNS procesu (0=zakazat)" , + "-j = pouzij vestavene vyhledavani v GeoDB" , + "-J name = pouzij GeoDB databazi 'name'" , #endif #ifdef USE_GEOIP - "-w = Enable GeoIP lookups" , - "-W name = Use GeoIP database 'name'" , + "-w = pouzij vyhledavani pomoci GeoIP" , + "-W name = pouzij GeoIP databazi 'name'" , #endif NULL}; @@ -263,7 +264,7 @@ char *msg_mtot_mpd= "Str�nek za den"; char *msg_mtot_msd= "M�st za den"; char *msg_mtot_mvd= "N�v�t�v za den"; -char *msg_mtot_mkd= "KByt� za den"; +char *msg_mtot_mkd= "KByt� za den"; char *msg_mtot_rc = "N�v�t�vy podle k�du odpov�di"; /* daily total table */ @@ -364,23 +365,23 @@ { IDX_3C('m','i','l'), "US vojensk� (mil)", 0,0,0 }, { IDX_3C('n','e','t'), "S�� (net)", 0,0,0 }, { IDX_3C('o','r','g'), "Neziskov� organizace (org)", 0,0,0 }, -{ IDX_3C('b','i','z'), "Generic Business (biz)", 0,0,0 }, -{ IDX_3C('c','a','t'), "Catalan Community (cat)", 0,0,0 }, +{ IDX_3C('b','i','z'), "Obchodn� spole�nosti (biz)", 0,0,0 }, +{ IDX_3C('c','a','t'), "Katal�nsk� komunita (cat)", 0,0,0 }, { IDX_3C('p','r','o'), "Professional (pro)", 0,0,0 }, -{ IDX_3C('t','e','l'), "Ind. Contact Data (tel)", 0,0,0 }, -{ IDX_4C('a','e','r','o'),"Air Transport Industry (aero)", 0,0,0 }, -{ IDX_4C('a','s','i','a'),"Asia Pacific Community (asia)", 0,0,0 }, -{ IDX_4C('c','o','o','p'),"Cooperative Association (coop)", 0,0,0 }, -{ IDX_4C('i','n','f','o'),"Generic TLD (info)", 0,0,0 }, -{ IDX_4C('j','o','b','s'),"Human Resources (jobs)", 0,0,0 }, -{ IDX_4C('m','o','b','i'),"Generic Mobile TLD (mobi)", 0,0,0 }, -{ IDX_4C('n','a','m','e'),"Individual (name)", 0,0,0 }, +{ IDX_3C('t','e','l'), "Glob�ln� adres�� kontakt� (tel)", 0,0,0 }, +{ IDX_4C('a','e','r','o'),"Leteck� pr�mysl (aero)", 0,0,0 }, +{ IDX_4C('a','s','i','a'),"Asijsko/pacifick� komunita (asia)",0,0,0 }, +{ IDX_4C('c','o','o','p'),"Dru�stva (coop)", 0,0,0 }, +{ IDX_4C('i','n','f','o'),"Obecn� TLD (info)", 0,0,0 }, +{ IDX_4C('j','o','b','s'),"Lidsk� zdroje (jobs)", 0,0,0 }, +{ IDX_4C('m','o','b','i'),"Obecn� mobiln� TLD (mobi)", 0,0,0 }, +{ IDX_4C('n','a','m','e'),"Osobn� (name)", 0,0,0 }, { IDX_4C('a','r','p','a'),"P�vodn� Arpanet (arpa)", 0,0,0 }, { IDX_4C('n','a','t','o'),"NATO (nato)", 0,0,0 }, -{ IDX_6C('m','u','s','e','u','m'), "Museums (museum)", 0,0,0 }, -{ IDX_6C('t','r','a','v','e','l'), "Travel Ind. (travel)", 0,0,0 }, -{ IDX_2C('a','c'), "Ascension Island", 0,0,0 }, -{ IDX_2C('a','d'), "Andora", 0,0,0 }, +{ IDX_6C('m','u','s','e','u','m'), "Muzea (museum)", 0,0,0 }, +{ IDX_6C('t','r','a','v','e','l'), "Cestovn� ruch (travel)", 0,0,0 }, +{ IDX_2C('a','c'), "Ostrov Ascension", 0,0,0 }, +{ IDX_2C('a','d'), "Andorra", 0,0,0 }, { IDX_2C('a','e'), "Spojen� arabsk� emir�ty", 0,0,0 }, { IDX_2C('a','f'), "Afgh�nist�n", 0,0,0 }, { IDX_2C('a','g'), "Antigua a Barbuda", 0,0,0 }, @@ -395,7 +396,7 @@ { IDX_2C('a','t'), "Rakousko", 0,0,0 }, { IDX_2C('a','u'), "Austr�lie", 0,0,0 }, { IDX_2C('a','w'), "Aruba", 0,0,0 }, -{ IDX_2C('a','x'), "Aland Islands", 0,0,0 }, +{ IDX_2C('a','x'), "Alandy", 0,0,0 }, { IDX_2C('a','z'), "Azerbajd��n", 0,0,0 }, { IDX_2C('b','a'), "Bosna a Hercegovina", 0,0,0 }, { IDX_2C('b','b'), "Barbados", 0,0,0 }, @@ -406,9 +407,9 @@ { IDX_2C('b','h'), "Bahrajn", 0,0,0 }, { IDX_2C('b','i'), "Burundi", 0,0,0 }, { IDX_2C('b','j'), "Benin", 0,0,0 }, -{ IDX_2C('b','l'), "Saint Barthelemy", 0,0,0 }, -{ IDX_2C('b','m'), "Bermuda", 0,0,0 }, -{ IDX_2C('b','n'), "Brunei Darussalam", 0,0,0 }, +{ IDX_2C('b','l'), "Svat� Bartolom�j", 0,0,0 }, +{ IDX_2C('b','m'), "Bermudy", 0,0,0 }, +{ IDX_2C('b','n'), "Brunej", 0,0,0 }, { IDX_2C('b','o'), "Bol�vie", 0,0,0 }, { IDX_2C('b','r'), "Braz�lie", 0,0,0 }, { IDX_2C('b','s'), "Bahamy", 0,0,0 }, @@ -419,7 +420,7 @@ { IDX_2C('b','z'), "Belize", 0,0,0 }, { IDX_2C('c','a'), "Kanada", 0,0,0 }, { IDX_2C('c','c'), "Kokosov� (Keelingovy) ostrovy", 0,0,0 }, -{ IDX_2C('c','d'), "Congo, Democratic Republic", 0,0,0 }, +{ IDX_2C('c','d'), "Kongo", 0,0,0 }, { IDX_2C('c','f'), "St�edoafrick� republika", 0,0,0 }, { IDX_2C('c','g'), "Kongo", 0,0,0 }, { IDX_2C('c','h'), "�v�carsko", 0,0,0 }, @@ -427,7 +428,7 @@ { IDX_2C('c','k'), "Cookovy ostrovy", 0,0,0 }, { IDX_2C('c','l'), "Chile", 0,0,0 }, { IDX_2C('c','m'), "Kamerun", 0,0,0 }, -{ IDX_2C('c','n'), "Cina", 0,0,0 }, +{ IDX_2C('c','n'), "��na", 0,0,0 }, { IDX_2C('c','o'), "Kolumbie", 0,0,0 }, { IDX_2C('c','r'), "Kostarika", 0,0,0 }, { IDX_2C('c','u'), "Kuba", 0,0,0 }, @@ -448,7 +449,7 @@ { IDX_2C('e','r'), "Eritrea", 0,0,0 }, { IDX_2C('e','s'), "�pan�lsko", 0,0,0 }, { IDX_2C('e','t'), "Etiopie", 0,0,0 }, -{ IDX_2C('e','u'), "European Union", 0,0,0 }, +{ IDX_2C('e','u'), "Evropsk� unie", 0,0,0 }, { IDX_2C('f','i'), "Finsko", 0,0,0 }, { IDX_2C('f','j'), "Fid�i", 0,0,0 }, { IDX_2C('f','k'), "Falklandsk� ostrovy (Malv�ny)", 0,0,0 }, @@ -469,7 +470,7 @@ { IDX_2C('g','p'), "Guadeloupe", 0,0,0 }, { IDX_2C('g','q'), "Rovn�kov� Guinea", 0,0,0 }, { IDX_2C('g','r'), "�ecko", 0,0,0 }, -{ IDX_2C('g','s'), "Sv. Georgia a Sv. Sandwich ostr.", 0,0,0 }, +{ IDX_2C('g','s'), "Ji�n� Georgia a Ji�n� Sandwichovy ostrovy", 0,0,0 }, { IDX_2C('g','t'), "Guatemala", 0,0,0 }, { IDX_2C('g','u'), "Guam", 0,0,0 }, { IDX_2C('g','w'), "Guinea-Bissau", 0,0,0 }, @@ -483,11 +484,11 @@ { IDX_2C('i','d'), "Indon�sie", 0,0,0 }, { IDX_2C('i','e'), "Irsko", 0,0,0 }, { IDX_2C('i','l'), "Izrael", 0,0,0 }, -{ IDX_2C('i','m'), "Isle of Man", 0,0,0 }, +{ IDX_2C('i','m'), "Ostrov Man", 0,0,0 }, { IDX_2C('i','n'), "Indie", 0,0,0 }, -{ IDX_2C('i','o'), "British Indian Ocean Territory", 0,0,0 }, +{ IDX_2C('i','o'), "Britsk� indickooce�nsk� �zem�", 0,0,0 }, { IDX_2C('i','q'), "Ir�k", 0,0,0 }, -{ IDX_2C('i','r'), "Ir�n", 0,0,0 }, +{ IDX_2C('i','r'), "�r�n", 0,0,0 }, { IDX_2C('i','s'), "Island", 0,0,0 }, { IDX_2C('i','t'), "It�lie", 0,0,0 }, { IDX_2C('j','e'), "Jersey", 0,0,0 }, @@ -495,19 +496,19 @@ { IDX_2C('j','o'), "Jord�nsko", 0,0,0 }, { IDX_2C('j','p'), "Japonsko", 0,0,0 }, { IDX_2C('k','e'), "Ke�a", 0,0,0 }, -{ IDX_2C('k','g'), "Kyrgyzstan", 0,0,0 }, +{ IDX_2C('k','g'), "Kyrgyzst�n", 0,0,0 }, { IDX_2C('k','h'), "Kambod�a", 0,0,0 }, { IDX_2C('k','i'), "Kiribati", 0,0,0 }, { IDX_2C('k','m'), "Komory", 0,0,0 }, -{ IDX_2C('k','n'), "Svat� Kitts a Nevis", 0,0,0 }, -{ IDX_2C('k','p'), "Korea (Severn�)", 0,0,0 }, -{ IDX_2C('k','r'), "Korea (Ji�n�)", 0,0,0 }, +{ IDX_2C('k','n'), "Svat� Kry�tof a Nevis", 0,0,0 }, +{ IDX_2C('k','p'), "Severn� Korea", 0,0,0 }, +{ IDX_2C('k','r'), "Ji�n� Korea", 0,0,0 }, { IDX_2C('k','w'), "Kuvajt", 0,0,0 }, { IDX_2C('k','y'), "Kajmansk� ostrovy", 0,0,0 }, -{ IDX_2C('k','z'), "Kazachstan", 0,0,0 }, +{ IDX_2C('k','z'), "Kazachst�n", 0,0,0 }, { IDX_2C('l','a'), "Laos", 0,0,0 }, { IDX_2C('l','b'), "Libanon", 0,0,0 }, -{ IDX_2C('l','c'), "Santa Lucia", 0,0,0 }, +{ IDX_2C('l','c'), "Svat� Lucie", 0,0,0 }, { IDX_2C('l','i'), "Lichten�tejnsko", 0,0,0 }, { IDX_2C('l','k'), "Sr� Lanka", 0,0,0 }, { IDX_2C('l','r'), "Lib�rie", 0,0,0 }, @@ -515,12 +516,12 @@ { IDX_2C('l','t'), "Litva", 0,0,0 }, { IDX_2C('l','u'), "Lucembursko", 0,0,0 }, { IDX_2C('l','v'), "Loty�sko", 0,0,0 }, -{ IDX_2C('l','y'), "Libie", 0,0,0 }, +{ IDX_2C('l','y'), "Libye", 0,0,0 }, { IDX_2C('m','a'), "Maroko", 0,0,0 }, { IDX_2C('m','c'), "Monako", 0,0,0 }, -{ IDX_2C('m','d'), "Mold�vie", 0,0,0 }, -{ IDX_2C('m','e'), "Montenegro", 0,0,0 }, -{ IDX_2C('m','f'), "Saint Martin (French part)", 0,0,0 }, +{ IDX_2C('m','d'), "Moldavsko", 0,0,0 }, +{ IDX_2C('m','e'), "�ern� hora", 0,0,0 }, +{ IDX_2C('m','f'), "Svat� Martin (francouzsk� ��st)", 0,0,0 }, { IDX_2C('m','g'), "Madagaskar", 0,0,0 }, { IDX_2C('m','h'), "Marshallovy ostrovy", 0,0,0 }, { IDX_2C('m','k'), "Makedonie", 0,0,0 }, @@ -528,7 +529,7 @@ { IDX_2C('m','m'), "Myanmar", 0,0,0 }, { IDX_2C('m','n'), "Mongolsko", 0,0,0 }, { IDX_2C('m','o'), "Macao", 0,0,0 }, -{ IDX_2C('m','p'), "Northern Mariana Islands", 0,0,0 }, +{ IDX_2C('m','p'), "Severn� Mariany", 0,0,0 }, { IDX_2C('m','q'), "Martinik", 0,0,0 }, { IDX_2C('m','r'), "Mauret�nie", 0,0,0 }, { IDX_2C('m','s'), "Montserrat", 0,0,0 }, @@ -539,11 +540,11 @@ { IDX_2C('m','x'), "Mexiko", 0,0,0 }, { IDX_2C('m','y'), "Malajsie", 0,0,0 }, { IDX_2C('m','z'), "Mozambik", 0,0,0 }, -{ IDX_2C('n','a'), "Nam�bie", 0,0,0 }, +{ IDX_2C('n','a'), "Namibie", 0,0,0 }, { IDX_2C('n','c'), "Nov� Kaledonie", 0,0,0 }, { IDX_2C('n','e'), "Niger", 0,0,0 }, -{ IDX_2C('n','f'), "Norfolk Island", 0,0,0 }, -{ IDX_2C('n','g'), "Nigerie", 0,0,0 }, +{ IDX_2C('n','f'), "Norfolk", 0,0,0 }, +{ IDX_2C('n','g'), "Nig�rie", 0,0,0 }, { IDX_2C('n','i'), "Nikaragua", 0,0,0 }, { IDX_2C('n','l'), "Nizozemsko", 0,0,0 }, { IDX_2C('n','o'), "Norsko", 0,0,0 }, @@ -555,55 +556,55 @@ { IDX_2C('p','a'), "Panama", 0,0,0 }, { IDX_2C('p','e'), "Peru", 0,0,0 }, { IDX_2C('p','f'), "Francouzsk� Polyn�sie", 0,0,0 }, -{ IDX_2C('p','g'), "Papua Nov� Guinea", 0,0,0 }, +{ IDX_2C('p','g'), "Papua-Nov� Guinea", 0,0,0 }, { IDX_2C('p','h'), "Filip�ny", 0,0,0 }, -{ IDX_2C('p','k'), "Pakist�n", 0,0,0 }, +{ IDX_2C('p','k'), "P�kist�n", 0,0,0 }, { IDX_2C('p','l'), "Polsko", 0,0,0 }, -{ IDX_2C('p','m'), "St. Pierre and Miquelon", 0,0,0 }, -{ IDX_2C('p','n'), "Pitcairn", 0,0,0 }, +{ IDX_2C('p','m'), "Saint-Pierre a Miquelon", 0,0,0 }, +{ IDX_2C('p','n'), "Pitcairnovy ostrovy", 0,0,0 }, { IDX_2C('p','r'), "Portoriko", 0,0,0 }, -{ IDX_2C('p','s'), "Palestinian Territory, Occupied", 0,0,0 }, +{ IDX_2C('p','s'), "Palestinsk� autonomie", 0,0,0 }, { IDX_2C('p','t'), "Portugalsko", 0,0,0 }, { IDX_2C('p','w'), "Palau", 0,0,0 }, -{ IDX_2C('p','y'), "Paraguaj", 0,0,0 }, +{ IDX_2C('p','y'), "Paraguay", 0,0,0 }, { IDX_2C('q','a'), "Katar", 0,0,0 }, -{ IDX_2C('r','e'), "Reunion", 0,0,0 }, +{ IDX_2C('r','e'), "R�union", 0,0,0 }, { IDX_2C('r','o'), "Rumunsko", 0,0,0 }, -{ IDX_2C('r','s'), "Serbia", 0,0,0 }, +{ IDX_2C('r','s'), "Srbsko", 0,0,0 }, { IDX_2C('r','u'), "Rusk� federace", 0,0,0 }, { IDX_2C('r','w'), "Rwanda", 0,0,0 }, -{ IDX_2C('s','a'), "Saudsk� Ar�bie", 0,0,0 }, +{ IDX_2C('s','a'), "Sa�dsk� Ar�bie", 0,0,0 }, { IDX_2C('s','b'), "�alamounovy ostrovy", 0,0,0 }, { IDX_2C('s','c'), "Seychely", 0,0,0 }, -{ IDX_2C('s','d'), "S�d�n", 0,0,0 }, +{ IDX_2C('s','d'), "S�d�n", 0,0,0 }, { IDX_2C('s','e'), "�v�dsko", 0,0,0 }, { IDX_2C('s','g'), "Singapur", 0,0,0 }, { IDX_2C('s','h'), "Sv. Helena", 0,0,0 }, { IDX_2C('s','i'), "Slovinsko", 0,0,0 }, -{ IDX_2C('s','j'), "Svalbard and Jan Mayen Islands", 0,0,0 }, +{ IDX_2C('s','j'), "�picberky a ostrov Jan Mayen", 0,0,0 }, { IDX_2C('s','k'), "Slovensk� republika", 0,0,0 }, { IDX_2C('s','l'), "Sierra Leone", 0,0,0 }, { IDX_2C('s','m'), "San Marino", 0,0,0 }, { IDX_2C('s','n'), "Senegal", 0,0,0 }, { IDX_2C('s','o'), "Som�lsko", 0,0,0 }, { IDX_2C('s','r'), "Surinam", 0,0,0 }, -{ IDX_2C('s','t'), "Sao Tome and Principe", 0,0,0 }, -{ IDX_2C('s','u'), "SSSR", 0,0,0 }, +{ IDX_2C('s','t'), "Svat� Tom� a Princ�v ostrov", 0,0,0 }, +{ IDX_2C('s','u'), "Sov�tsk� svaz", 0,0,0 }, { IDX_2C('s','v'), "Salv�dor", 0,0,0 }, { IDX_2C('s','y'), "S�rie", 0,0,0 }, { IDX_2C('s','z'), "Svazijsko", 0,0,0 }, -{ IDX_2C('t','c'), "Turks and Caicos Islands", 0,0,0 }, +{ IDX_2C('t','c'), "Turks a Caicos", 0,0,0 }, { IDX_2C('t','d'), "�ad", 0,0,0 }, -{ IDX_2C('t','f'), "Francouzsk� ji�n� teritoria", 0,0,0 }, +{ IDX_2C('t','f'), "Francouzsk� ji�n� teritoria-Antarktida", 0,0,0 }, { IDX_2C('t','g'), "Togo", 0,0,0 }, { IDX_2C('t','h'), "Thajsko", 0,0,0 }, -{ IDX_2C('t','j'), "Tad�ikistan", 0,0,0 }, +{ IDX_2C('t','j'), "T�d�ikist�n", 0,0,0 }, { IDX_2C('t','k'), "Tokelau", 0,0,0 }, -{ IDX_2C('t','l'), "Timor-Leste", 0,0,0 }, -{ IDX_2C('t','m'), "Turkmenistan", 0,0,0 }, +{ IDX_2C('t','l'), "V�chodn� Timor", 0,0,0 }, +{ IDX_2C('t','m'), "Turkmenist�n", 0,0,0 }, { IDX_2C('t','n'), "Tunisko", 0,0,0 }, { IDX_2C('t','o'), "Tongo", 0,0,0 }, -{ IDX_2C('t','p'), "V�chodn� Timur", 0,0,0 }, +{ IDX_2C('t','p'), "V�chodn� Timor", 0,0,0 }, { IDX_2C('t','r'), "Turecko", 0,0,0 }, { IDX_2C('t','t'), "Trinidad a Tobago", 0,0,0 }, { IDX_2C('t','v'), "Tuvalu", 0,0,0 }, @@ -612,18 +613,18 @@ { IDX_2C('u','a'), "Ukrajina", 0,0,0 }, { IDX_2C('u','g'), "Uganda", 0,0,0 }, { IDX_2C('u','k'), "Velk� Brit�nie (UK)", 0,0,0 }, -{ IDX_2C('u','m'), "US Minor Outlying Islands", 0,0,0 }, +{ IDX_2C('u','m'), "Men�� odlehl� ostrovy USA", 0,0,0 }, { IDX_2C('u','s'), "USA (US)", 0,0,0 }, { IDX_2C('u','y'), "Uruguay", 0,0,0 }, -{ IDX_2C('u','z'), "Uzbekistan", 0,0,0 }, +{ IDX_2C('u','z'), "Uzbekist�n", 0,0,0 }, { IDX_2C('v','a'), "Vatik�n", 0,0,0 }, -{ IDX_2C('v','c'), "Saint Vincent and the Grenadines", 0,0,0 }, +{ IDX_2C('v','c'), "Svat� Vincenc a Grenadiny", 0,0,0 }, { IDX_2C('v','e'), "Venezuela", 0,0,0 }, -{ IDX_2C('v','g'), "Panensk� ostrovy (Britsk�)", 0,0,0 }, -{ IDX_2C('v','i'), "Panenske ostrovy (US)", 0,0,0 }, +{ IDX_2C('v','g'), "Britsk� Panensk� ostrovy", 0,0,0 }, +{ IDX_2C('v','i'), "Americk� Panensk� ostrovy", 0,0,0 }, { IDX_2C('v','n'), "Vietnam", 0,0,0 }, { IDX_2C('v','u'), "Vanuatu", 0,0,0 }, -{ IDX_2C('w','f'), "Wallis and Futuna Islands", 0,0,0 }, +{ IDX_2C('w','f'), "Wallis a Futuna", 0,0,0 }, { IDX_2C('w','s'), "Samoa", 0,0,0 }, { IDX_2C('y','e'), "Jemen", 0,0,0 }, { IDX_2C('y','t'), "Mayotte", 0,0,0 }, @@ -631,9 +632,9 @@ { IDX_2C('z','a'), "Jihoafrick� republika", 0,0,0 }, { IDX_2C('z','m'), "Zambie", 0,0,0 }, { IDX_2C('z','w'), "Zimbabwe", 0,0,0 }, -{ IDX_2C('a','1'), "Anonymous Proxy", 0,0,0 }, -{ IDX_2C('a','2'), "Satellite Provider", 0,0,0 }, -{ IDX_2C('o','1'), "Other", 0,0,0 }, -{ IDX_2C('a','p'), "Asia/Pacific Region", 0,0,0 }, -{ IDX_3C('l','a','n'), "Local Network (lan)", 0,0,0 }, +{ IDX_2C('a','1'), "Anonymn� proxy", 0,0,0 }, +{ IDX_2C('a','2'), "Satelitn� poskytovatel�", 0,0,0 }, +{ IDX_2C('o','1'), "Ostatn�", 0,0,0 }, +{ IDX_2C('a','p'), "Asijskopacifick� region", 0,0,0 }, +{ IDX_3C('l','a','n'), "Lok�ln� s�� (lan)", 0,0,0 }, { 0, NULL, 0,0,0 }}; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/webalizer-2.21-02/linklist.c new/webalizer-2.23-04/linklist.c --- old/webalizer-2.21-02/linklist.c 2009-01-13 05:43:00.000000000 +0100 +++ new/webalizer-2.23-04/linklist.c 2011-01-03 05:51:20.000000000 +0100 @@ -1,7 +1,7 @@ /* webalizer - a web server log analysis program - Copyright (C) 1997-2009 Bradford L. Barrett + Copyright (C) 1997-2011 Bradford L. Barrett This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/webalizer-2.21-02/output.c new/webalizer-2.23-04/output.c --- old/webalizer-2.21-02/output.c 2009-01-13 06:34:04.000000000 +0100 +++ new/webalizer-2.23-04/output.c 2011-01-03 05:52:05.000000000 +0100 @@ -1,7 +1,7 @@ /* webalizer - a web server log analysis program - Copyright (C) 1997-2009 Bradford L. Barrett + Copyright (C) 1997-2011 Bradford L. Barrett This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -175,7 +175,7 @@ fprintf(out_fp,"\n", version,editlvl); fprintf(out_fp,"\n"); - fprintf(out_fp,"\n"); + fprintf(out_fp,"\n"); fprintf(out_fp,"\n"); fprintf(out_fp,"\n"); fprintf(out_fp,"\n"); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/webalizer-2.21-02/parser.c new/webalizer-2.23-04/parser.c --- old/webalizer-2.21-02/parser.c 2009-01-13 05:43:08.000000000 +0100 +++ new/webalizer-2.23-04/parser.c 2011-01-03 05:51:34.000000000 +0100 @@ -1,7 +1,7 @@ /* webalizer - a web server log analysis program - Copyright (C) 1997-2009 Bradford L. Barrett + Copyright (C) 1997-2011 Bradford L. Barrett This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -556,6 +556,21 @@ memset(&gm_time, 0, sizeof(struct tm)); size = strlen(buffer); /* get length of buffer */ eob = buffer + size; /* calculate end of buffer */ + + /* remove line end markers, reduce eob accordingly */ + cp = eob; + while(cp>buffer) + { + cp--; + if (*cp == '\r' || *cp=='\n') + { + *cp = '\0'; + eob--; + } + else + break; + } + fmt_logrec(buffer); /* seperate fields with \0's */ cp = buffer; @@ -575,7 +590,7 @@ while (*cp) cp++; cp++; index = 1; - while ((cp < eob) && (*cp != '\r') && (*cp != '\n')) + while (cp < eob) { /* Set the field index */ if (!strcmp(cp, "date")) field_index.date = index; @@ -607,7 +622,7 @@ /* Check if the number of entries in this line are conform to the format specified in the header */ index = 1; - while ((cp < eob) && (*cp != '\r') && (*cp != '\n')) + while (cp < eob) { while (*cp) cp++; cp++; @@ -621,7 +636,7 @@ /* Reset the field pointers and begin parsing the data line */ memset(&fields, 0, sizeof(struct fields_struct)); index = 1; - while ((cp < eob) && (*cp != '\r') && (*cp != '\n')) + while (cp < eob) { /* Set the field pointers */ if (index == field_index.date) fields.date = cp; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/webalizer-2.21-02/preserve.c new/webalizer-2.23-04/preserve.c --- old/webalizer-2.21-02/preserve.c 2009-01-13 05:43:12.000000000 +0100 +++ new/webalizer-2.23-04/preserve.c 2011-01-03 05:51:40.000000000 +0100 @@ -1,7 +1,7 @@ /* webalizer - a web server log analysis program - Copyright (C) 1997-2009 Bradford L. Barrett + Copyright (C) 1997-2011 Bradford L. Barrett This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/webalizer-2.21-02/sample.conf new/webalizer-2.23-04/sample.conf --- old/webalizer-2.21-02/sample.conf 2009-01-13 05:46:19.000000000 +0100 +++ new/webalizer-2.23-04/sample.conf 2011-01-03 05:53:33.000000000 +0100 @@ -1,6 +1,6 @@ # # Sample Webalizer configuration file -# Copyright 1997-2009 by Bradford L. Barrett +# Copyright 1997-2011 by Bradford L. Barrett # # Distributed under the GNU General Public License. See the # files "Copyright" and "COPYING" provided with the webalizer diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/webalizer-2.21-02/wcmgr.1 new/webalizer-2.23-04/wcmgr.1 --- old/webalizer-2.21-02/wcmgr.1 2009-01-13 05:45:27.000000000 +0100 +++ new/webalizer-2.23-04/wcmgr.1 2011-01-03 05:54:43.000000000 +0100 @@ -103,7 +103,7 @@ .SH BUGS Please report bugs to the author. .SH COPYRIGHT -Copyright (C) 1997-2009 by Bradford L. Barrett. Distributed under +Copyright (C) 1997-2011 by Bradford L. Barrett. Distributed under the GNU GPL. See the files "\fICOPYING\fP" and "\fICopyright\fP", supplied with all distributions for additional information. .SH AUTHOR diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/webalizer-2.21-02/wcmgr.c new/webalizer-2.23-04/wcmgr.c --- old/webalizer-2.21-02/wcmgr.c 2009-01-13 05:45:49.000000000 +0100 +++ new/webalizer-2.23-04/wcmgr.c 2011-01-03 05:52:38.000000000 +0100 @@ -3,7 +3,7 @@ webalizer - a web server log analysis program - Copyright (C) 1997-2009 Bradford L. Barrett + Copyright (C) 1997-2011 Bradford L. Barrett This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -96,7 +96,7 @@ char *version = "1.00"; /* program version */ char *editlvl = "03"; /* edit level */ char *moddate = "12-Jul-2008"; /* modification date */ -char *copyright = "Copyright 2007-2009 by Bradford L. Barrett"; +char *copyright = "Copyright 2007-2011 by Bradford L. Barrett"; int action = 'l'; /* action flag (default=list) */ int create = 0; /* cache creation flag */ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/webalizer-2.21-02/webalizer.1 new/webalizer-2.23-04/webalizer.1 --- old/webalizer-2.21-02/webalizer.1 2009-01-13 05:51:37.000000000 +0100 +++ new/webalizer-2.23-04/webalizer.1 2011-01-03 05:54:51.000000000 +0100 @@ -898,7 +898,7 @@ .SH BUGS Please report bugs to the author. .SH COPYRIGHT -Copyright (C) 1997-2009 by Bradford L. Barrett. Distributed under +Copyright (C) 1997-2011 by Bradford L. Barrett. Distributed under the GNU GPL. See the files "\fICOPYING\fP" and "\fICopyright\fP", supplied with all distributions for additional information. .SH AUTHOR diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/webalizer-2.21-02/webalizer.c new/webalizer-2.23-04/webalizer.c --- old/webalizer-2.21-02/webalizer.c 2009-01-13 06:35:54.000000000 +0100 +++ new/webalizer-2.23-04/webalizer.c 2011-01-03 05:52:28.000000000 +0100 @@ -1,7 +1,7 @@ /* webalizer - a web server log analysis program - Copyright (C) 1997-2009 Bradford L. Barrett + Copyright (C) 1997-2011 Bradford L. Barrett This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -28,7 +28,7 @@ /* Fix broken Zlib 64 bitness */ #if _FILE_OFFSET_BITS == 64 #ifndef _LARGEFILE64_SOURCE -#define _LARGEFILE64_SOURCE = 1 +#define _LARGEFILE64_SOURCE 1 #endif #endif @@ -104,17 +104,17 @@ char *get_domain(char *); /* return domain name */ void agent_mangle(char *); /* reformat user agent */ char *our_gzgets(void *, char *, int); /* our gzgets */ -int stricmp(char *, char *); /* case ins. compare */ +int ouricmp(char *, char *); /* case ins. compare */ int isipaddr(char *); /* is IP address test */ /*********************************************/ /* GLOBAL VARIABLES */ /*********************************************/ -char *version = "2.21"; /* program version */ -char *editlvl = "02"; /* edit level */ -char *moddate = "13-Jan-2009"; /* modification date */ -char *copyright = "Copyright 1997-2009 by Bradford L. Barrett"; +char *version = "2.23"; /* program version */ +char *editlvl = "04"; /* edit level */ +char *moddate = "19-Nov-2010"; /* modification date */ +char *copyright = "Copyright 1997-2011 by Bradford L. Barrett"; int verbose = 2; /* 2=verbose,1=err, 0=none */ int debug_mode = 0; /* debug mode flag */ @@ -1670,7 +1670,7 @@ key=0; for (i=0;i<num_kwords;i++) - if (!stricmp(keyword,kwords[i])) { key=i; break; } + if (!ouricmp(keyword,kwords[i])) { key=i; break; } if (key==0) { printf("%s '%s' (%s)\n", /* Invalid keyword */ msg_bad_key,keyword,fname); @@ -2116,10 +2116,10 @@ } /*********************************************/ -/* STRICMP - Case insensitive string compare */ +/* OURICMP - Case insensitive string compare */ /*********************************************/ -int stricmp(char *str1, char *str2) +int ouricmp(char *str1, char *str2) { while((*str1!=0) && (tolower((unsigned char)*str1)==tolower((unsigned char)*str2))) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/webalizer-2.21-02/webalizer.h new/webalizer-2.23-04/webalizer.h --- old/webalizer-2.21-02/webalizer.h 2009-01-08 06:10:27.000000000 +0100 +++ new/webalizer-2.23-04/webalizer.h 2010-10-09 10:06:40.000000000 +0200 @@ -12,7 +12,7 @@ #define MAX(a,b) ((a) > (b) ? (a) : (b)) #endif -#define MAXHASH 2048 /* Size of our hash tables */ +#define MAXHASH 4096 /* Size of our hash tables */ #define BUFSIZE 4096 /* Max buffer size for log record */ #define MAXHOST 128 /* Max hostname buffer size */ #define MAXURL 4096 /* Max HTTP request/URL field size */ ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 aaa_base for openSUSE:Factory
by root＠hilbert.suse.de 21 Mar '11

21 Mar '11

Hello community, here is the log from the commit of package aaa_base for openSUSE:Factory checked in at Mon Mar 21 10:38:47 CET 2011. -------- --- aaa_base/aaa_base.changes 2011-03-15 15:42:28.000000000 +0100 +++ /mounts/work_src_done/STABLE/aaa_base/aaa_base.changes 2011-03-17 17:22:10.000000000 +0100 @@ -1,0 +2,5 @@ +Thu Mar 17 16:21:06 UTC 2011 - lnussel(a)suse.de + +- add scripts to make tarball + +------------------------------------------------------------------- @@ -4,0 +10,5 @@ + +------------------------------------------------------------------- +Wed Mar 9 15:49:56 UTC 2011 - lnussel(a)suse.de + +- sources are maintained in git now. Adopt package accordingly. calling whatdependson for head-i586 Old: ---- aaa_base.post aaa_base.pre arch_special.tar.bz2 get_kernel_version.c get_version_number.sh sysconfig_parts.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ aaa_base.spec ++++++ --- /var/tmp/diff_new_pack.ymtEBx/_old 2011-03-21 10:33:48.000000000 +0100 +++ /var/tmp/diff_new_pack.ymtEBx/_new 2011-03-21 10:33:48.000000000 +0100 @@ -21,9 +21,10 @@ Name: aaa_base Version: 11.5 -Release: 2 +Release: 3 License: GPLv2+ Group: System/Fhs +Url: http://gitorious.org/opensuse/aaa_base Provides: bin bootutls etc skeleng skelger Provides: aaa_skel = %{version}-%{release} Obsoletes: aaa_skel < %{version} @@ -33,13 +34,9 @@ AutoReqProv: on Summary: SUSE Linux Base Package BuildRoot: %{_tmppath}/%{name}-%{version}-build +# run make package in checkout out git repo to recreate Source: aaa_base.tar.bz2 -Source5: arch_special.tar.bz2 -Source7: sysconfig_parts.tar.bz2 -Source8: get_kernel_version.c -Source20: aaa_base-rpmlintrc -Source21: aaa_base.pre -Source22: aaa_base.post +Source99: aaa_base-rpmlintrc %description This package installs several important configuration files. Central @@ -58,50 +55,30 @@ and convenience hacks). %prep -%setup -n aaa_base -b 5 -b 7 - -cd .. -mkdir -p scripts -cp -v %{SOURCE21} scripts -cp -v %{SOURCE22} scripts - -cd $RPM_SOURCE_DIR +%setup -n aaa_base %build -gcc -Wl,-z,relro,-z,now $RPM_OPT_FLAGS -D_FILE_OFFSET_BITS=64 $RPM_SOURCE_DIR/get_kernel_version.c -o $RPM_SOURCE_DIR/get_kernel_version +make CFLAGS="$RPM_OPT_FLAGS" +if test -d patches/$RPM_ARCH; then + pushd files + for file in ../patches/$RPM_ARCH/*; do + patch -p0 --input=$file + done + find -name "*.orig" | xargs -r rm + popd +fi %install -install -d -m 700 root +# +make DESTDIR=$RPM_BUILD_ROOT install +# # make sure it does not creep in again -test -d ../aaa_base/root/.gnupg && exit 1 -cp -a ../aaa_base/* $RPM_BUILD_ROOT +test -d $RPM_BUILD_ROOT/root/.gnupg && exit 1 +# # for the release %if !%{with aaa_base_malloc_debug} rm $RPM_BUILD_ROOT/etc/profile.d/malloc-debug.* %endif -cp $RPM_SOURCE_DIR/get_kernel_version $RPM_BUILD_ROOT/sbin -mkdir -p $RPM_BUILD_ROOT/var/adm/fillup-templates -for i in $RPM_BUILD_DIR/sysconfig_parts/sysconfig.* ; do - cp $i $RPM_BUILD_ROOT/var/adm/fillup-templates/ -done -# -## do arch specific patches BEGIN -# -pushd $RPM_BUILD_ROOT -test -d $RPM_BUILD_DIR/arch_special/$RPM_ARCH && \ - { - for file in $RPM_BUILD_DIR/arch_special/$RPM_ARCH/* ; do - patch -p0 --input=$file - done - } -# -# delete .orig files -# -find $RPM_BUILD_ROOT -name "*.orig" | xargs -r rm -popd -# -## do arch specific patches END -# # # mark these as ghost for i in passwd group shadow gshadow ; do @@ -111,9 +88,9 @@ # loop module auto loading bnc#661715 mkdir -p $RPM_BUILD_ROOT/lib/udev/devices -%pre -f ../scripts/aaa_base.pre +%pre -f aaa_base.pre -%post -f ../scripts/aaa_base.post +%post -f aaa_base.post %postun %insserv_cleanup ++++++ aaa_base.tar.bz2 ++++++ ++++ 26675 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 busybox for openSUSE:Factory
by root＠hilbert.suse.de 21 Mar '11

21 Mar '11

Hello community, here is the log from the commit of package busybox for openSUSE:Factory checked in at Mon Mar 21 10:33:22 CET 2011. -------- --- busybox/busybox-static.changes 2010-10-31 19:12:36.000000000 +0100 +++ /mounts/work_src_done/STABLE/busybox/busybox-static.changes 2011-03-13 00:08:13.000000000 +0100 @@ -1,0 +2,18 @@ +Sat Mar 12 23:03:39 UTC 2011 - chris(a)computersalat.de + +- update to 1.18.13 + see http://www.busybox.net/ for full changelog +- add upstream patches + o buildsys.patch + o cksum.patch + o klogd.patch + o menuconfig.patch + o modutils24.patch + o wget.patch +- rework libunarchive-array patch + o -> libarchive patch +- remove .gitignore files +- added missing BusyBox.1 as S:1 +- added export CFLAGS="{optflags} -fno-strict-aliasing" + +------------------------------------------------------------------- busybox.changes: same change calling whatdependson for head-i586 Old: ---- busybox-1.17.2.tar.bz2 busybox.libunarchive-array.patch New: ---- BusyBox.1 busybox-1.18.3-buildsys.patch busybox-1.18.3-cksum.patch busybox-1.18.3-klogd.patch busybox-1.18.3-libarchive.patch busybox-1.18.3-menuconfig.patch busybox-1.18.3-modutils24.patch busybox-1.18.3-wget.patch busybox-1.18.3.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ busybox-static.spec ++++++ --- /var/tmp/diff_new_pack.1VxDpf/_old 2011-03-21 10:28:48.000000000 +0100 +++ /var/tmp/diff_new_pack.1VxDpf/_new 2011-03-21 10:28:48.000000000 +0100 @@ -1,7 +1,7 @@ # -# spec file for package busybox-static (Version 1.17.2) +# spec file for package busybox-static # -# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2011 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 @@ -15,24 +15,32 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # -# norootforbuild Name: busybox-static Url: http://www.busybox.net/ -Version: 1.17.2 -Release: 2 +Version: 1.18.3 +Release: 1 Summary: The Swiss Army Knife of Embedded Linux License: GPLv2+ Group: System/Base AutoReqProv: on Source: http://busybox.net/downloads/busybox-%{version}.tar.bz2 +Source1: BusyBox.1 Source2: busybox.SuSE.config Source3: mkinitrd-setup.sh Source4: mkinitrd-boot.sh -Patch1: busybox.uClibc-build-fix.patch +# upstream patches +Patch0: busybox-1.18.3-buildsys.patch +Patch1: busybox-1.18.3-cksum.patch +Patch2: busybox-1.18.3-klogd.patch +Patch3: busybox-1.18.3-menuconfig.patch +Patch4: busybox-1.18.3-modutils24.patch +Patch5: busybox-1.18.3-wget.patch +# other patches +Patch99: busybox.uClibc-build-fix.patch Patch100: busybox.install.patch -Patch101: busybox.libunarchive-array.patch +Patch101: busybox-1.18.3-libarchive.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: uClibc-devel ExcludeArch: s390 s390x ppc64 @@ -50,16 +58,26 @@ %prep %setup -q -n busybox-%{version} +%patch0 -p1 %patch1 -p1 +%patch2 -p1 +%patch3 -p1 +%patch4 -p1 +%patch5 -p1 +%patch99 -p1 %patch100 -p1 %patch101 -p1 - -%build -cp -avL %{S:2} .config +%{__cp} -a %{S:1} docs/ +%{__cp} -a %{S:2} .config find -name CVS | xargs rm -rf +find -name .cvsignore | xargs rm -rf find -name .svn | xargs rm -rf +find -name .gitignore | xargs rm -rf + +%build export VERBOSE=-v export BUILD_VERBOSE=2 +export CFLAGS="%{optflags} -fno-strict-aliasing" # somehow uClibc prefers it's own ar.h header, so rename it mv include/ar.h include/b_ar.h sed -i -e 's/"ar.h"/"b_ar.h"/' archival/*.c archival/*/*.c @@ -67,7 +85,6 @@ make -e CC=gcc-uClibc %{?_smp_mflags} %install -find -name ".cvsignore" -exec rm {} \; install -d $RPM_BUILD_ROOT/usr/bin install busybox $RPM_BUILD_ROOT/usr/bin/busybox-static ++++++ busybox.spec ++++++ --- /var/tmp/diff_new_pack.1VxDpf/_old 2011-03-21 10:28:49.000000000 +0100 +++ /var/tmp/diff_new_pack.1VxDpf/_new 2011-03-21 10:28:49.000000000 +0100 @@ -1,7 +1,7 @@ # -# spec file for package busybox (Version 1.17.2) +# spec file for package busybox # -# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2011 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 @@ -15,23 +15,31 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # -# norootforbuild Name: busybox Url: http://www.busybox.net/ -Version: 1.17.2 -Release: 2 +Version: 1.18.3 +Release: 1 Summary: The Swiss Army Knife of Embedded Linux License: GPLv2+ Group: System/Base AutoReqProv: on Source: http://busybox.net/downloads/%{name}-%{version}.tar.bz2 +Source1: BusyBox.1 Source2: busybox.SuSE.config Source3: mkinitrd-setup.sh Source4: mkinitrd-boot.sh +# upstream patches +Patch0: %{name}-1.18.3-buildsys.patch +Patch1: %{name}-1.18.3-cksum.patch +Patch2: %{name}-1.18.3-klogd.patch +Patch3: %{name}-1.18.3-menuconfig.patch +Patch4: %{name}-1.18.3-modutils24.patch +Patch5: %{name}-1.18.3-wget.patch +# other patches Patch100: busybox.install.patch -Patch101: busybox.libunarchive-array.patch +Patch101: %{name}-1.18.3-libarchive.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build %description @@ -47,21 +55,30 @@ %prep %setup -q -n %{name}-%{version} +%patch0 -p1 +%patch1 -p1 +%patch2 -p1 +%patch3 -p1 +%patch4 -p1 +%patch5 -p1 %patch100 -p1 %patch101 -p1 - -%build -cp -avL %{S:2} .config +%{__cp} -a %{S:1} docs/ +%{__cp} -a %{S:2} .config find -name CVS | xargs rm -rf +find -name .cvsignore | xargs rm -rf find -name .svn | xargs rm -rf +find -name .gitignore | xargs rm -rf + +%build export VERBOSE=-v export BUILD_VERBOSE=2 +export CFLAGS="%{optflags} -fno-strict-aliasing" make -e oldconfig make -e %{?_smp_mflags} make -e doc busybox.links %{?_smp_mflags} %install -find -name ".cvsignore" -exec rm {} \; install -d $RPM_BUILD_ROOT/usr/bin install -d $RPM_BUILD_ROOT/usr/share/busybox install busybox.links $RPM_BUILD_ROOT/usr/share/busybox ++++++ BusyBox.1 ++++++ ++++ 4530 lines (skipped) ++++++ busybox-1.18.3-buildsys.patch ++++++ --- busybox-1.18.3/Config.in +++ busybox-1.18.3-buildsys/Config.in @@ -126,7 +126,6 @@ config FEATURE_INSTALLER config INSTALL_NO_USR bool "Don't use /usr" default n - depends on FEATURE_INSTALLER help Disable use of /usr. busybox --install and "make install" will install applets only to /bin and /sbin, ++++++ busybox-1.18.3-cksum.patch ++++++ --- busybox-1.18.3/coreutils/cksum.c +++ busybox-1.18.3-cksum/coreutils/cksum.c @@ -38,6 +38,7 @@ int cksum_main(int argc UNUSED_PARAM, ch #define read_buf bb_common_bufsiz1 while ((bytes_read = safe_read(fd, read_buf, sizeof(read_buf))) > 0) { + length += bytes_read; crc = crc32_block_endian1(crc, read_buf, bytes_read, crc32_table); } close(fd); ++++++ busybox-1.18.3-klogd.patch ++++++ --- busybox-1.18.3/sysklogd/klogd.c +++ busybox-1.18.3-klogd/sysklogd/klogd.c @@ -150,12 +150,41 @@ int klogd_main(int argc UNUSED_PARAM, ch */ klogd_open(); openlog("kernel", 0, LOG_KERN); + /* + * glibc problem: for some reason, glibc changes LOG_KERN to LOG_USER + * above. The logic behind this is that standard + * http://pubs.opengroup.org/onlinepubs/9699919799/functions/syslog.html + * says the following about openlog and syslog: + * "LOG_USER + * Messages generated by arbitrary processes. + * This is the default facility identifier if none is specified." + * + * I believe glibc misinterpreted this text as "if openlog's + * third parameter is 0 (=LOG_KERN), treat it as LOG_USER". + * Whereas it was meant to say "if *syslog* is called with facility + * 0 in its 1st parameter without prior call to openlog, then perform + * implicit openlog(LOG_USER)". + * + * As a result of this, eh, feature, standard klogd was forced + * to open-code its own openlog and syslog implementation (!). + * + * Note that prohibiting openlog(LOG_KERN) on libc level does not + * add any security: any process can open a socket to "/dev/log" + * and write a string "<0>Voila, a LOG_KERN + LOG_EMERG message" + * + * Google code search tells me there is no widespread use of + * openlog("foo", 0, 0), thus fixing glibc won't break userspace. + * + * The bug against glibc was filed: + * bugzilla.redhat.com/show_bug.cgi?id=547000 + */ if (i) klogd_setloglevel(i); - bb_signals(BB_FATAL_SIGS, record_signo); signal(SIGHUP, SIG_IGN); + /* We want klogd_read to not be restarted, thus _norestart: */ + bb_signals_recursive_norestart(BB_FATAL_SIGS, record_signo); syslog(LOG_NOTICE, "klogd started: %s", bb_banner); ++++++ busybox-1.18.3-libarchive.patch ++++++ diff -ruN busybox-1.18.3-orig/archival/libarchive/get_header_tar.c busybox-1.18.3/archival/libarchive/get_header_tar.c --- busybox-1.18.3-orig/archival/libarchive/get_header_tar.c 2011-02-08 18:24:57.000000000 +0100 +++ busybox-1.18.3/archival/libarchive/get_header_tar.c 2011-03-12 23:28:59.000000000 +0100 @@ -287,6 +287,9 @@ } file_header->link_target = NULL; if (!p_linkname && parse_names && tar.linkname[0]) { + /* we trash magic[0] here to terminate tar.linkname, it's ok */ + tar.magic[0] = '\0'; + file_header->link_target = xstrndup(tar.linkname, sizeof(tar.linkname)); /* FIXME: what if we have non-link object with link_target? */ /* Will link_target be free()ed? */ ++++++ busybox-1.18.3-menuconfig.patch ++++++ --- busybox-1.18.3/scripts/kconfig/mconf.c +++ busybox-1.18.3-menuconfig/scripts/kconfig/mconf.c @@ -256,7 +256,7 @@ search_help[] = N_( " USB$ => find all CONFIG_ symbols ending with USB\n" "\n"); -static char buf[4096], *bufptr = buf; +static char buf[4096*10], *bufptr = buf; static char input_buf[4096]; static const char filename[] = ".config"; static char *args[1024], **argptr = args; ++++++ busybox-1.18.3-modutils24.patch ++++++ --- busybox-1.18.3/modutils/modutils-24.c +++ busybox-1.18.3-modutils24/modutils/modutils-24.c @@ -2474,6 +2474,7 @@ new_process_module_arguments(struct obj_ n = 0; p = val; while (*p != 0) { + char sv_ch; char *endp; if (++n > max) @@ -2482,14 +2483,17 @@ new_process_module_arguments(struct obj_ switch (*pinfo) { case 's': len = strcspn(p, ","); + sv_ch = p[len]; p[len] = 0; obj_string_patch(f, sym->secidx, loc - contents, p); loc += tgt_sizeof_char_p; p += len; + *p = sv_ch; break; case 'c': len = strcspn(p, ","); + sv_ch = p[len]; p[len] = 0; if (len >= charssize) bb_error_msg_and_die("string too long for %s (max %ld)", param, @@ -2497,6 +2501,7 @@ new_process_module_arguments(struct obj_ strcpy((char *) loc, p); loc += charssize; p += len; + *p = sv_ch; break; case 'b': *loc++ = strtoul(p, &endp, 0); ++++++ busybox-1.18.3-wget.patch ++++++ --- busybox-1.18.3/networking/wget.c +++ busybox-1.18.3-wget/networking/wget.c @@ -446,7 +446,7 @@ static FILE* prepare_ftp_session(FILE ** static void NOINLINE retrieve_file_data(FILE *dfp, int output_fd) { - char buf[512]; + char buf[4*1024]; /* made bigger to speed up local xfers */ #if ENABLE_FEATURE_WGET_STATUSBAR || ENABLE_FEATURE_WGET_TIMEOUT # if ENABLE_FEATURE_WGET_TIMEOUT unsigned second_cnt; @@ -455,7 +455,6 @@ static void NOINLINE retrieve_file_data( polldata.fd = fileno(dfp); polldata.events = POLLIN | POLLPRI; - ndelay_on(polldata.fd); #endif progress_meter(PROGRESS_START); @@ -464,6 +463,10 @@ static void NOINLINE retrieve_file_data( /* Loops only if chunked */ while (1) { + +#if ENABLE_FEATURE_WGET_STATUSBAR || ENABLE_FEATURE_WGET_TIMEOUT + ndelay_on(polldata.fd); +#endif while (1) { int n; unsigned rdsz; @@ -493,22 +496,46 @@ static void NOINLINE retrieve_file_data( progress_meter(PROGRESS_BUMP); } #endif + /* fread internally uses read loop, which in our case + * is usually exited when we get EAGAIN. + * In this case, libc sets error marker on the stream. + * Need to clear it before next fread to avoid possible + * rare false positive ferror below. Rare because usually + * fread gets more than zero bytes, and we don't fall + * into if (n <= 0) ... + */ + clearerr(dfp); + errno = 0; n = safe_fread(buf, rdsz, dfp); + /* man fread: + * If error occurs, or EOF is reached, the return value + * is a short item count (or zero). + * fread does not distinguish between EOF and error. + */ if (n <= 0) { - if (ferror(dfp)) { - /* perror will not work: ferror doesn't set errno */ - bb_error_msg_and_die(bb_msg_read_error); - } - break; +#if ENABLE_FEATURE_WGET_STATUSBAR || ENABLE_FEATURE_WGET_TIMEOUT + if (errno == EAGAIN) /* poll lied, there is no data? */ + continue; /* yes */ +#endif + if (ferror(dfp)) + bb_perror_msg_and_die(bb_msg_read_error); + break; /* EOF, not error */ } + xwrite(output_fd, buf, n); #if ENABLE_FEATURE_WGET_STATUSBAR G.transferred += n; progress_meter(PROGRESS_BUMP); #endif - if (G.got_clen) + if (G.got_clen) { G.content_len -= n; + if (G.content_len == 0) + break; + } } +#if ENABLE_FEATURE_WGET_STATUSBAR || ENABLE_FEATURE_WGET_TIMEOUT + ndelay_off(polldata.fd); +#endif if (!G.chunked) break; @@ -706,6 +733,11 @@ int wget_main(int argc UNUSED_PARAM, cha fprintf(sfp, "Host: %s\r\nUser-Agent: %s\r\n", target.host, user_agent); + /* Ask server to close the connection as soon as we are done + * (IOW: we do not intend to send more requests) + */ + fprintf(sfp, "Connection: close\r\n"); + #if ENABLE_FEATURE_WGET_AUTHENTICATION if (target.user) { fprintf(sfp, "Proxy-Authorization: Basic %s\r\n"+6, @@ -719,22 +751,25 @@ int wget_main(int argc UNUSED_PARAM, cha if (G.beg_range) fprintf(sfp, "Range: bytes=%"OFF_FMT"u-\r\n", G.beg_range); + #if ENABLE_FEATURE_WGET_LONG_OPTIONS if (extra_headers) fputs(extra_headers, sfp); if (opt & WGET_OPT_POST_DATA) { char *estr = URL_escape(post_data); - fprintf(sfp, "Content-Type: application/x-www-form-urlencoded\r\n"); - fprintf(sfp, "Content-Length: %u\r\n" "\r\n" "%s", - (int) strlen(estr), estr); - /*fprintf(sfp, "Connection: Keep-Alive\r\n\r\n");*/ - /*fprintf(sfp, "%s\r\n", estr);*/ + fprintf(sfp, + "Content-Type: application/x-www-form-urlencoded\r\n" + "Content-Length: %u\r\n" + "\r\n" + "%s", + (int) strlen(estr), estr + ); free(estr); } else #endif - { /* If "Connection:" is needed, document why */ - fprintf(sfp, /* "Connection: close\r\n" */ "\r\n"); + { + fprintf(sfp, "\r\n"); } fflush(sfp); ++++++ busybox-1.17.2.tar.bz2 -> busybox-1.18.3.tar.bz2 ++++++ ++++ 77483 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 pan for openSUSE:Factory
by root＠hilbert.suse.de 21 Mar '11

21 Mar '11

Hello community, here is the log from the commit of package pan for openSUSE:Factory checked in at Mon Mar 21 10:28:28 CET 2011. -------- --- GNOME/pan/pan.changes 2011-02-12 20:26:40.000000000 +0100 +++ /mounts/work_src_done/STABLE/pan/pan.changes 2011-02-20 11:06:30.000000000 +0100 @@ -1,0 +2,56 @@ +Sun Feb 20 10:55:05 CET 2011 - vuntz(a)opensuse.org + +- Update to version 0.134: + + No window icon when running in NZB-mode. (bgo#574419) + + Use GRegex instead of PCRE. (bgo#596653) + + Tooltips missing from two 'Post Article' toolbar buttons. + (bgo#548860) + + Infinite loop with server that doesn't support LIST NEWSGROUPS. + (bgo#545220) + + Add port to server dialog. (bgo#527313) + + Support 64 bit article numbers. (bgo#549655) + + Don't queue xover for 0 connections. (bgo#596682) + + Make wrapping honor changes in compose-wrap pref. (bgo#596680) + + Change nzb task saving delay & add pref. (bgo#596683) + + Port to GMime 2.4 & 2.5. (bgo#541676) + + Spawn editor asynchronously. (bgo#465763) + + Change allocation buffer for article tree. + + Save some more memory by re-ordering a few variables. + + Don't save files as executable. + + Fix handling of multibyte spaces in text-massager. + + Re-write multipart handling for viewing. + + Change default mime-type for incoming attachments. (bgo#135734) + + Add some additional mime types. + + Fix bug in multipart article mids. + + Add console support for windows. + + Update filter-info and scorefile-test to support non-overview + headers. + + Skip non-overview test if not cached. + + Allow scoring article on all headers. + + Promote rescore_articles to data interface. + + Update score when article is cached. + + Add regex support to search. (bgo#351196) + + Additional info for about & User-Agent. (bgo#424083) + + Allow subject line use in save path. (bgo#403797) + + Improve regexes used for squashing subject line. + + Reduce memory allocation for multiparts. + + Allow newsrc paths relative to PAN_HOME. + + Save tasks on exit. (bgo#609355) + + Always show full revision info in UA hdr. + + Remember size of post window. + + Add tests for subject line. + + Make separator user configurable. + + Add support for Face header. + + Fix various crashes. + + Stop using deprecated API and behaviors (including bgo#579753, + bgo#596648). + + Build fixes (including bgo#573722). + + Updated translations. +- Update fix-desktop-file-11.0.diff to apply without fuzz. +- Drop pan-0.133-gcc44.patch: fixed upstream. +- Drop pan-gmime24.patch: fixed upstream. +- Remove pcre-devel BuildRequires as pan now uses GRegex. +- Remove xf86tools Requires: this is now provided by x11-tools, and + there is nothing useful for pan there. + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- pan-0.133-gcc44.patch pan-0.133.tar.bz2 pan-gmime24.patch New: ---- pan-0.134.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ pan.spec ++++++ --- /var/tmp/diff_new_pack.aOKCgn/_old 2011-03-21 10:27:18.000000000 +0100 +++ /var/tmp/diff_new_pack.aOKCgn/_new 2011-03-21 10:27:18.000000000 +0100 @@ -18,8 +18,8 @@ Name: pan -Version: 0.133 -Release: 12 +Version: 0.134 +Release: 1 License: GPLv2+ Summary: A Powerful Newsreader for GNOME Url: http://pan.rebelbase.com/ @@ -27,21 +27,15 @@ Source0: ftp://source.rebelbase.com/pub/pan/pan-%{version}.tar.bz2 # PATCH-FIX-UPSTREAM fix-desktop-file-11.0.diff -- validate desktop file Patch0: fix-desktop-file-11.0.diff -# PATCH-FIX-UPSTREAM pan-0.133-gcc44.patch -- Fix build with gcc >= 4.4 -Patch1: pan-0.133-gcc44.patch -# PATCH-FIX-UPSTREAM pan-gmime24.patch bgo#541676 dimstar(a)opensuse.org -- Build with gmime 2.4. Taken from de-facto upstream http://github.com/lostcoder/pan2/commit/eb4a0e36 -Patch2: pan-gmime24.patch BuildRequires: fdupes BuildRequires: gcc-c++ BuildRequires: intltool -BuildRequires: pcre-devel BuildRequires: translation-update-upstream BuildRequires: update-desktop-files BuildRequires: pkgconfig(gmime-2.4) BuildRequires: pkgconfig(gtk+-2.0) BuildRequires: pkgconfig(gtkspell-2.0) Recommends: %{name}-lang -Requires: xf86tools BuildRoot: %{_tmppath}/%{name}-%{version}-build %description @@ -53,8 +47,6 @@ %setup -q translation-update-upstream %patch0 -%patch1 -%patch2 -p1 sed -i -e "s,sr@Latn,sr@latin," configure sed -i -e "s,sr@Latn,sr@latin," po/LINGUAS sed -i -e "s,sr@Latn,sr@latin," pan.desktop ++++++ fix-desktop-file-11.0.diff ++++++ --- /var/tmp/diff_new_pack.aOKCgn/_old 2011-03-21 10:27:18.000000000 +0100 +++ /var/tmp/diff_new_pack.aOKCgn/_new 2011-03-21 10:27:18.000000000 +0100 @@ -1,4 +1,6 @@ ---- pan.desktop +Index: pan.desktop +=================================================================== +--- pan.desktop.orig +++ pan.desktop @@ -1,6 +1,6 @@ [Desktop Entry] @@ -9,8 +11,8 @@ Name[az]=Pan Xəbərlər Oxuyucusu Name[bg]=Четец на новини (Pan) Name[ca]=Lector de notícies Pan -@@ -74,8 +74,8 @@ - Comment[vi]=Đọc tin tức từ Usenet +@@ -80,8 +80,8 @@ Comment[vi]=Đọc tin tức từ Usenet + Comment[zh_CN]=阅读来自 Usenet 的新闻 Comment[zh_TW]=從 Usenet 讀取新聞 Exec=pan -Icon=pan.png @@ -20,7 +22,9 @@ -Categories=GTK;Application;Network;News +Categories=GTK;Network;News; StartupNotify=false ---- pan.desktop.in +Index: pan.desktop.in +=================================================================== +--- pan.desktop.in.orig +++ pan.desktop.in @@ -1,10 +1,10 @@ [Desktop Entry] ++++++ pan-0.133.tar.bz2 -> pan-0.134.tar.bz2 ++++++ ++++ 88124 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 nfs-utils for openSUSE:Factory
by root＠hilbert.suse.de 21 Mar '11

21 Mar '11

Hello community, here is the log from the commit of package nfs-utils for openSUSE:Factory checked in at Mon Mar 21 10:26:58 CET 2011. -------- --- nfs-utils/nfs-utils.changes 2011-02-17 00:58:58.000000000 +0100 +++ /mounts/work_src_done/STABLE/nfs-utils/nfs-utils.changes 2011-03-19 15:11:03.000000000 +0100 @@ -1,0 +2,7 @@ +Sat Mar 19 14:10:18 UTC 2011 - jengelh(a)medozas.de + +- Must up the loopback device, otherwise trying to contact the + portmapper (even if it does not actually run) will hang forever- + the TCP RST is crucial for mount.nfs + +------------------------------------------------------------------- calling whatdependson for head-i586 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ nfs-utils.spec ++++++ --- /var/tmp/diff_new_pack.F1wHQm/_old 2011-03-21 10:26:35.000000000 +0100 +++ /var/tmp/diff_new_pack.F1wHQm/_new 2011-03-21 10:26:35.000000000 +0100 @@ -27,7 +27,7 @@ Url: http://nfs.sourceforge.net Summary: Support Utilities for Kernel nfsd Version: 1.2.3 -Release: 13 +Release: 14 Group: Productivity/Networking/NFS License: GPLv2+ BuildRoot: %{_tmppath}/%{name}-%{version}-build ++++++ mkinitrd-boot.sh ++++++ --- /var/tmp/diff_new_pack.F1wHQm/_old 2011-03-21 10:26:35.000000000 +0100 +++ /var/tmp/diff_new_pack.F1wHQm/_new 2011-03-21 10:26:35.000000000 +0100 @@ -65,3 +65,6 @@ else dont_load_modules fi + +# Absolutely required for networking to function +ip link set dev lo up ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 libsmbios for openSUSE:Factory
by root＠hilbert.suse.de 21 Mar '11

21 Mar '11

Hello community, here is the log from the commit of package libsmbios for openSUSE:Factory checked in at Mon Mar 21 10:18:21 CET 2011. -------- --- libsmbios/libsmbios.changes 2009-10-28 18:29:40.000000000 +0100 +++ /mounts/work_src_done/STABLE/libsmbios/libsmbios.changes 2011-03-18 21:55:56.000000000 +0100 @@ -1,0 +2,24 @@ +Fri Mar 18 20:55:11 UTC 2011 - asterios.dramis(a)gmail.com + +- Update to version 2.2.26: + * Lots of changes (see ChangeLog). +- Spec file updates: + * Major changes in subpackages (based on the package spec file and Fedora + package): + + Replaced libsmbios-bin and libsmbios-unsupported-bin with + smbios-utils-bin and smbios-utils-python (added smbios-utils meta-package + to Obsolete+Provide them). + + Added python-smbios and yum-dellsysid subpackages. + + Removed static subpackage. + * Changes based on rpmdevtools templates and spec-cleaner run. + * Changed License: to GPLv2+ or OSL 2.1. + * Updates in Summary:, Url:, Group: and %description sections. + * Updates in Buildrequires:, Requires:, Obsoletes: and Provides: sections. + * Updates in %prep, %build and %install sections. + * Removed %define entries, other conditions, etc. + * Removed support for suse_version < 1100. + * Various other changes based on the package spec file. +- Fixed rpmlint warning about "files-duplicate". +- Removed the two patches (fixed upstream). + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- libsmbios-2.0.2-gcc44.patch libsmbios-2.0.2.tar.bz2 libsmbios-fix-compiler_warning_cgcc.diff New: ---- libsmbios-2.2.26.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libsmbios.spec ++++++ --- /var/tmp/diff_new_pack.Ob3wl3/_old 2011-03-21 09:48:54.000000000 +0100 +++ /var/tmp/diff_new_pack.Ob3wl3/_new 2011-03-21 09:48:54.000000000 +0100 @@ -1,7 +1,7 @@ # -# spec file for package libsmbios (Version 2.0.2) +# spec file for package libsmbios # -# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2011 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 @@ -16,252 +16,259 @@ # +%{!?python_sitelib: %global python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print(get_python_lib())")} +%{!?python_sitearch: %global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print(get_python_lib(1))")} Name: libsmbios -BuildRequires: Xerces-c-devel cppunit-devel gcc-c++ libxml2-devel tree -Url: http://linux.dell.com/libsmbios/main/index.html -%define _unpackaged_files_terminate_build 0 -%define build_static 0 -# automatically determine if we should build docs -%define build_docs %( ( which doxygen > /dev/null 2>&1 && echo 1) || echo 0 ) -%define run_cppunit %( ([ -e /usr/include/cppunit ] && echo 1) || echo 0) -%{?_without_docs: %{expand: %%define build_docs 0}} -%{?_with_docs: %{expand: %%define build_docs 1}} -%{?_without_cppunit: %{expand: %%define run_cppunit 0}} -%{?_with_cppunit: %{expand: %%define run_cppunit 1}} -%define major 2 -%define minor 0 -%define sub 2 -%define extralevel %{nil} -%define release_name libsmbios -%define release_version %{major}.%{minor}.%{sub}%{extralevel} -%define LIBNAME libsmbios2 -Version: %{major}.%{minor}.%{sub} -Release: 2 -License: BSD 3-clause (or similar) ; GPL v2 or later ; Other uncritical OpenSource License -Source: %{name}-%{version}.tar.bz2 -Patch0: libsmbios-fix-compiler_warning_cgcc.diff -Patch1: libsmbios-2.0.2-gcc44.patch -Summary: Open BIOS parsing libs +Version: 2.2.26 +Release: 1 +Summary: Libraries to get information from standard BIOS tables + +License: GPLv2+ or OSL 2.1 +Url: http://linux.dell.com/libsmbios/main/ Group: System/Management +Source0: http://linux.dell.com/libsmbios/download/libsmbios/libsmbios-%{version}/%{n… BuildRoot: %{_tmppath}/%{name}-%{version}-build -ExclusiveArch: %ix86 ia64 x86_64 + +BuildRequires: doxygen +BuildRequires: fdupes +BuildRequires: gcc-c++ +BuildRequires: libcppunit-devel +BuildRequires: libxml2-devel +BuildRequires: pkgconfig +BuildRequires: python-base # Modules: dcdbas.ko Supplements: modalias(dmi:*:[bs]vnD[Ee][Ll][Ll]*:*) # Generated with: extract-modaliases dcdbas +# libsmbios only ever makes sense on intel compatible arches, no DMI tables on ppc, s390, etc. +ExclusiveArch: ia64 %{ix86} x86_64 %description -Libsmbios is a library and utilites that can be used by client programs +Libsmbios is a library and utilities that can be used by client programs to get information from standard BIOS tables, such as the SMBIOS table. +%package devel +Summary: Development headers and archives +License: GPLv2+ or OSL 2.1 +Group: Development/Libraries/C and C++ +Requires: libsmbios2 = %{version} +Requires: libstdc++-devel +%description devel +Libsmbios is a library and utilities that can be used by client programs to get +information from standard BIOS tables, such as the SMBIOS table. -Authors: --------- - Michael Brown - -%if 0%{?suse_version} < 1100 - -%package libs -License: GPL v2 or later -%else +This package contains the headers and .a files necessary to compile new client +programs against libsmbios. %package -n libsmbios2 -License: BSD 3-clause (or similar) ; GPL v2 or later ; Other uncritical OpenSource License -%endif -Summary: Libsmbios shared libraries -Group: System/Management -Provides: %name = %version -Obsoletes: libsmbios-libs <= 0.13.12 -Supplements: modalias(dmi:*:[bs]vnD[Ee][Ll][Ll]*:*) - -%package bin -License: GPL v2 or later -Summary: The "supported" sample binaries that use libsmbios +Summary: Libraries to get information from standard BIOS tables +License: GPLv2+ or OSL 2.1 Group: System/Management Supplements: modalias(dmi:*:[bs]vnD[Ee][Ll][Ll]*:*) +Obsoletes: libsmbios-libs <= 0.13.12 +Provides: libsmbios-libs = %{version} -%package unsupported-bin -License: GPL v2 or later -Summary: Unsupported sample binaries using libsmbios -Group: System/Management - -%package devel -License: GPL v2 or later -Summary: development headers and archives -Group: System/Management -Requires: libstdc++-devel - -%package static -License: GPL v2 or later ; Other uncritical OpenSource License -Summary: Open BIOS parsing libs -Group: System/Management -%if 0%{?suse_version} < 1100 - -%description libs -Libsmbios is a library and utilites that can be used by client programs +%description -n libsmbios2 +Libsmbios is a library and utilities that can be used by client programs to get information from standard BIOS tables, such as the SMBIOS table. - - -Authors: --------- - Michael Brown - -%else - -%description -n %LIBNAME - +%package -n python-smbios +Summary: Python interface to Libsmbios C library +License: GPLv2+ or OSL 2.1 +Group: Development/Libraries/Python +Requires: libsmbios2 = %{version} +Supplements: modalias(dmi:*:[bs]vnD[Ee][Ll][Ll]*:*) +%if %{?suse_version: 0%{?suse_version} > 1110} %{!?suse_version:1} +BuildArch: noarch %endif -Libsmbios is a library and utilites that can be used by client programs -to get information from standard BIOS tables, such as the SMBIOS table. -Authors: --------- - Michael Brown - -%description devel -Libsmbios is a library and utilites that can be used by client programs -to get information from standard BIOS tables, such as the SMBIOS table. - -This package contains the headers and .a files necessary to compile new -client programs against libsmbios - - - -Authors: --------- - Michael Brown - -%description bin -Libsmbios is a library and utilites that can be used by client programs -to get information from standard BIOS tables, such as the SMBIOS table. - -This package contains some sample binaries that use libsmbios. +%description -n python-smbios +This package provides a Python interface to libsmbios. +%package -n smbios-utils +Summary: Meta-package that pulls in all smbios binaries and python scripts +License: GPLv2+ or OSL 2.1 +Group: System/Management +Requires: smbios-utils-bin +Requires: smbios-utils-python +Supplements: modalias(dmi:*:[bs]vnD[Ee][Ll][Ll]*:*) +Obsoletes: libsmbios-bin <= 2.0.2 +Provides: libsmbios-bin = %{version} +Obsoletes: libsmbios-unsupported-bin <= 2.0.2 +Provides: libsmbios-unsupported-bin = %{version} + +%description -n smbios-utils +This is a meta-package that pulls in the binary libsmbios executables as well +as the python executables. + +%package -n smbios-utils-bin +Summary: Binary utilities that use libsmbios +License: GPLv2+ or OSL 2.1 +Group: System/Management +Requires: libsmbios2 = %{version} +Supplements: modalias(dmi:*:[bs]vnD[Ee][Ll][Ll]*:*) -Authors: --------- - Michael Brown +%description -n smbios-utils-bin +Get BIOS information, such as System product name, product id, service tag and +asset tag. + +%package -n smbios-utils-python +Summary: Python executables that use libsmbios +License: GPLv2+ or OSL 2.1 +Group: System/Management +Requires: python-smbios = %{version} +Supplements: modalias(dmi:*:[bs]vnD[Ee][Ll][Ll]*:*) -%description unsupported-bin -Libsmbios is a library and utilites that can be used by client programs -to get information from standard BIOS tables, such as the SMBIOS table. +%description -n smbios-utils-python +Get BIOS information, such as System product name, product id, service tag and +asset tag. Set service and asset tags on Dell machines. Manipulate wireless +cards/bluetooth on Dell laptops. Set BIOS password on select Dell systems. +Update BIOS on select Dell systems. Set LCD brightness on select Dell laptops. + +%package -n yum-dellsysid +Summary: YUM plugin to retrieve the Dell System ID +License: GPLv2+ or OSL 2.1 +Group: System/Packages +# yum plugin and supporting functions first appeared in 2.2.0 +Requires: smbios-utils-python >= 2.2.0 +Requires: yum + +%description -n yum-dellsysid +Libsmbios is a library and utilities that can be used by client programs to get +information from standard BIOS tables, such as the SMBIOS table. -This package contains some sample binaries that use libsmbios. +This package contains a YUM plugin which allows the use of certain +substitutions in yum repository configuration files on Dell systems. +%prep +%setup -q +%build +%configure --disable-rpath -Authors: --------- - Michael Brown +make %{?_smp_mflags} -%description static -Libsmbios is a library and utilites that can be used by client programs -to get information from standard BIOS tables, such as the SMBIOS table. +%install +%makeinstall +# Install headers +install -dp -m 0755 %{buildroot}%{_includedir} +cp -a src/include/* %{buildroot}/%{_includedir}/ +cp -a out/public-include/* %{buildroot}/%{_includedir}/ +# +find %{buildroot}/%{_includedir} out/libsmbios_c++ out/libsmbios_c -exec touch -r configure.ac {} \; -Authors: --------- - Michael Brown +# Remove *.la files (package provides pkg-config files), remove static libraries +rm -f %{buildroot}/%{_libdir}/lib*.{la,a} -%prep -%setup -q -%patch0 -%patch1 -find . -type d -exec chmod -f 755 {} \; -find doc include libraries bin-supported bin-unsupported build cppunit -type f -exec chmod -f 644 {} \; +# Prepare doc files for devel package +mv out/libsmbios_c out/libsmbios_c-%{_arch} +mv out/libsmbios_c++ out/libsmbios_c++-%{_arch} + +# Manually install the doc files for the devel package in order to fix duplicates with "fdupes -s" +install -dp -m 0755 %{buildroot}%{_defaultdocdir}/%{name}-devel +cp -a out/libsmbios_c-%{_arch} %{buildroot}%{_defaultdocdir}/%{name}-devel/ +cp -a out/libsmbios_c++-%{_arch} %{buildroot}%{_defaultdocdir}/%{name}-devel/ -%build -%configure --disable-static --with-pic -make %{?_smp_mflags} EXTRA_CXXFLAGS="%{optflags}" EXTRA_CFLAGS="%{optflags}" -e RELEASE_MAJOR=%{major} RELEASE_MINOR=%{minor} RELEASE_SUBLEVEL=%{sub} RELEASE_EXTRALEVEL=%{extralevel} -%if %{build_docs} - make -e RELEASE_MAJOR=%{major} RELEASE_MINOR=%{minor} RELEASE_SUBLEVEL=%{sub} RELEASE_EXTRALEVEL=%{extralevel} doxygen -%endif -%if %{run_cppunit} - make -e EXTRA_CXXFLAGS="%{optflags}" EXTRA_CFLAGS="%{optflags}" RELEASE_MAJOR=%{major} RELEASE_MINOR=%{minor} RELEASE_SUBLEVEL=%{sub} RELEASE_EXTRALEVEL=%{extralevel} unit_test +# +rename libsmbios.mo libsmbios-2.2-x86_64.mo $(find %{buildroot}/%{_datadir} -name libsmbios.mo) +# Remove unneeded locales +%if 0%{?suse_version} < 1140 +rm -rf %{buildroot}%{_datadir}/locale/en/ +rm -rf %{buildroot}%{_datadir}/locale/en@boldquot/ +rm -rf %{buildroot}%{_datadir}/locale/en@quot/ %endif +%find_lang %{name}-2.2-x86_64 -%install -make install DESTDIR=%{buildroot} -mkdir -p %{buildroot}/usr/include -cp -a include/smbios %{buildroot}/usr/include/ -rm -vf %{buildroot}/%{_libdir}/lib*.la -rm -fv %{buildroot}/%{_libdir}/lib*.a +# Backwards compatible symlinks +ln -s %{_sbindir}/dellWirelessCtl %{buildroot}%{_bindir}/dellWirelessCtl +ln -s smbios-lcd-brightness %{buildroot}%{_sbindir}/dellLcdBrightness +ln -s smbios-rbu-bios-update %{buildroot}%{_sbindir}/dellBiosUpdate +ln -s smbios-sys-info %{buildroot}%{_sbindir}/getSystemId +ln -s smbios-wireless-ctl %{buildroot}%{_sbindir}/dellWirelessCtl -%clean -rm -rf ${RPM_BUILD_ROOT} -%if 0%{?suse_version} < 1100 +%fdupes -s %{buildroot} -%post libs -p /sbin/ldconfig -%else +%clean +rm -rf %{buildroot} -%post -n %LIBNAME -p /sbin/ldconfig -%endif -%if 0%{?suse_version} < 1100 +%post -n libsmbios2 -p /sbin/ldconfig -%postun libs -p /sbin/ldconfig -%else +%postun -n libsmbios2 -p /sbin/ldconfig -%postun -n %LIBNAME -p /sbin/ldconfig -%endif -%if 0%{?suse_version} < 1100 - -%files libs -%else +%files devel +%defattr(-,root,root,-) +%doc %{_defaultdocdir}/%{name}-devel/ +%{_includedir}/smbios/ +%{_includedir}/smbios_c/ +%{_libdir}/libsmbios.so +%{_libdir}/libsmbios_c.so +%{_libdir}/pkgconfig/libsmbios_c*.pc -%files -n %LIBNAME -%endif -%defattr(-,root,root) +%files -n libsmbios2 -f %{name}-2.2-x86_64.lang +%defattr(-,root,root,-) +%doc AUTHORS COPYING-GPL COPYING-OSL ChangeLog NEWS README TODO doc/old_news.txt +%doc src/bin/getopts_LICENSE.txt src/include/smbios/config/boost_LICENSE_1_0_txt %{_libdir}/libsmbios.so.* +%{_libdir}/libsmbios_c.so.* -%files devel -%defattr(-,root,root) -%doc COPYING-GPL COPYING-OSL README bin-unsupported/getopts_LICENSE.txt -%if %{build_docs} - %doc doc/full/html -%endif -/usr/include/smbios -%{_libdir}/libsmbios.so +%files -n python-smbios +%defattr(-,root,root,-) +%{python_sitelib}/libsmbios_c/ -%files bin -%defattr(644,root,root,755) +%files -n smbios-utils +%defattr(-,root,root,-) %doc COPYING-GPL COPYING-OSL README -%defattr(555,root,root) -%{_sbindir}/assetTag -%{_sbindir}/dellBiosUpdate -%{_sbindir}/getSystemId -%{_sbindir}/propertyTag -%{_sbindir}/serviceTag -%{_sbindir}/verifySmiPassword -%{_sbindir}/wakeupCtl -%{_sbindir}/dellLcdBrightness -%{_sbindir}/dellWirelessCtl -%{_sbindir}/mkbiospkg.sh -%files unsupported-bin -%defattr(644,root,root,755) -%doc COPYING-GPL COPYING-OSL README include/smbios/config/boost_LICENSE_1_0_txt bin-unsupported/getopts_LICENSE.txt -%defattr(555,root,root) -%{_sbindir}/activateCmosToken -%{_sbindir}/ascii2enUS_scancode -%{_sbindir}/createUnitTestFiles -%{_sbindir}/disable_console_redir -%{_sbindir}/dumpCmos +%files -n smbios-utils-bin +%defattr(-,root,root,-) +%doc doc/pkgheader.sh +%defattr(555,root,root,-) +# legacy C++ +%{_sbindir}/dellBiosUpdate-compat %{_sbindir}/dellLEDCtl -%{_sbindir}/getPasswordFormat -%{_sbindir}/isCmosTokenActive -%{_sbindir}/probes -%{_sbindir}/smitest -%{_sbindir}/stateByteCtl -%{_sbindir}/upBootCtl -%{_sbindir}/dumpSmbios -%if %{build_static} - -%files static -%defattr(555,root,root) -%{_bindir}/*S +%ifnarch ia64 +%{_sbindir}/dellMediaDirectCtl %endif +# new C utilities +%{_sbindir}/smbios-get-ut-data +%{_sbindir}/smbios-state-byte-ctl +%{_sbindir}/smbios-sys-info-lite +%{_sbindir}/smbios-upflag-ctl + +%files -n smbios-utils-python +%defattr(-,root,root,-) +%dir %{_sysconfdir}/libsmbios +%config(noreplace) %{_sysconfdir}/libsmbios/* +%defattr(555,root,root,-) +# used by HAL in old location, so keep it around until HAL is updated +%{_bindir}/dellWirelessCtl +# python utilities +%{_sbindir}/smbios-lcd-brightness +%{_sbindir}/smbios-passwd +%{_sbindir}/smbios-rbu-bios-update +%{_sbindir}/smbios-sys-info +%{_sbindir}/smbios-token-ctl +%{_sbindir}/smbios-wakeup-ctl +%{_sbindir}/smbios-wireless-ctl +# backwards compatible symlinks +%{_sbindir}/dellBiosUpdate +%{_sbindir}/dellLcdBrightness +%{_sbindir}/dellWirelessCtl +%{_sbindir}/getSystemId +%defattr(-,root,root,-) +# data files +%{_datadir}/smbios-utils/ + +%files -n yum-dellsysid +%defattr(-,root,root,-) +# YUM Plugin +%dir %{_sysconfdir}/yum +%dir %{_sysconfdir}/yum/pluginconf.d +%config(noreplace) %{_sysconfdir}/yum/pluginconf.d/dellsysid.conf +%dir %{_exec_prefix}/lib/yum-plugins +%{_exec_prefix}/lib/yum-plugins/dellsysid.* %changelog ++++++ libsmbios-2.0.2.tar.bz2 -> libsmbios-2.2.26.tar.bz2 ++++++ ++++ 184739 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 libcares2 for openSUSE:Factory
by root＠hilbert.suse.de 21 Mar '11

21 Mar '11

Hello community, here is the log from the commit of package libcares2 for openSUSE:Factory checked in at Mon Mar 21 09:48:27 CET 2011. -------- --- libcares2/libcares2.changes 2010-12-13 17:22:36.000000000 +0100 +++ /mounts/work_src_done/STABLE/libcares2/libcares2.changes 2011-03-19 22:19:45.000000000 +0100 @@ -1,0 +2,6 @@ +Sat Mar 19 21:16:09 UTC 2011 - crrodriguez(a)opensuse.org + +- fix NULL ptr dereference + + +------------------------------------------------------------------- calling whatdependson for head-i586 New: ---- 0022-advance_tcp_send_queue-avoid-NULL-ptr-dereference.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libcares2.spec ++++++ --- /var/tmp/diff_new_pack.xBAUFn/_old 2011-03-21 09:39:28.000000000 +0100 +++ /var/tmp/diff_new_pack.xBAUFn/_new 2011-03-21 09:39:28.000000000 +0100 @@ -1,7 +1,7 @@ # -# spec file for package libcares2 (Version 1.7.4) +# spec file for package libcares2 # -# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2011 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 @@ -22,7 +22,7 @@ Name: libcares2 Version: 1.7.4 -Release: 1 +Release: 7 License: MIT License (or similar) BuildRoot: %{_tmppath}/%{name}-%{version}-build Group: Development/Libraries/C and C++ @@ -30,6 +30,7 @@ Source: http://daniel.haxx.se/projects/c-ares/%{pkg_name}-%{version}.tar.bz2 Source2: baselibs.conf BuildRequires: pkg-config +Patch: 0022-advance_tcp_send_queue-avoid-NULL-ptr-dereference.patch %description c-ares is a C library that performs DNS requests and name resolves @@ -49,6 +50,7 @@ %prep %setup -q -n %{pkg_name}-%{version} +%patch -p1 %build %configure --enable-symbol-hiding --enable-nonblocking --enable-shared --disable-static --with-pic ++++++ 0022-advance_tcp_send_queue-avoid-NULL-ptr-dereference.patch ++++++ >From 366cd6d54dfdf0d487f60333c45e9c7da9327050 Mon Sep 17 00:00:00 2001 From: Daniel Stenberg <daniel(a)haxx.se> Date: Mon, 27 Dec 2010 13:10:48 +0100 Subject: [PATCH 22/34] advance_tcp_send_queue: avoid NULL ptr dereference MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit If given a too large 'num_bytes' value, it would cause a NULL ptr dereference. Instead the code will now break out of the loop at the end of the list. Signed-off-by: Cristian Rodríguez <cristian.rodriguez(a)opensuse.org> --- ares_process.c | 43 +++++++++++++++++++++---------------------- 1 files changed, 21 insertions(+), 22 deletions(-) diff --git a/ares_process.c b/ares_process.c index 7d04eff..ca4c8ee 100644 --- a/ares_process.c +++ b/ares_process.c @@ -300,29 +300,28 @@ static void advance_tcp_send_queue(ares_channel channel, int whichserver, { struct send_request *sendreq; struct server_state *server = &channel->servers[whichserver]; - while (num_bytes > 0) - { - sendreq = server->qhead; - if ((size_t)num_bytes >= sendreq->len) - { - num_bytes -= sendreq->len; - server->qhead = sendreq->next; - if (server->qhead == NULL) - { - SOCK_STATE_CALLBACK(channel, server->tcp_socket, 1, 0); - server->qtail = NULL; - } - if (sendreq->data_storage != NULL) - free(sendreq->data_storage); - free(sendreq); - } - else - { - sendreq->data += num_bytes; - sendreq->len -= num_bytes; - num_bytes = 0; - } + while (num_bytes > 0) { + sendreq = server->qhead; + if ((size_t)num_bytes >= sendreq->len) { + num_bytes -= sendreq->len; + server->qhead = sendreq->next; + if (sendreq->data_storage) + free(sendreq->data_storage); + free(sendreq); + if (server->qhead == NULL) { + SOCK_STATE_CALLBACK(channel, server->tcp_socket, 1, 0); + server->qtail = NULL; + + /* qhead is NULL so we cannot continue this loop */ + break; + } + } + else { + sendreq->data += num_bytes; + sendreq->len -= num_bytes; + num_bytes = 0; } + } } /* If any TCP socket selects true for reading, read some data, -- 1.7.4.1 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit yast2-ldap-client for openSUSE:Factory
by root＠hilbert.suse.de 21 Mar '11

21 Mar '11

Hello community, here is the log from the commit of package yast2-ldap-client for openSUSE:Factory checked in at Mon Mar 21 09:39:12 CET 2011. -------- --- yast2-ldap-client/yast2-ldap-client.changes 2011-03-17 09:15:15.000000000 +0100 +++ /mounts/work_src_done/STABLE/yast2-ldap-client/yast2-ldap-client.changes 2011-03-18 15:31:10.000000000 +0100 @@ -1,0 +2,6 @@ +Fri Mar 18 15:29:33 CET 2011 - jsuchome(a)suse.cz + +- added command line options for SSSD (bnc#680848) +- 2.21.2 + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- yast2-ldap-client-2.21.1.tar.bz2 New: ---- yast2-ldap-client-2.21.2.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-ldap-client.spec ++++++ --- /var/tmp/diff_new_pack.kFfjwa/_old 2011-03-21 09:33:00.000000000 +0100 +++ /var/tmp/diff_new_pack.kFfjwa/_new 2011-03-21 09:33:00.000000000 +0100 @@ -19,11 +19,11 @@ Name: yast2-ldap-client -Version: 2.21.1 +Version: 2.21.2 Release: 1 BuildRoot: %{_tmppath}/%{name}-%{version}-build -Source0: yast2-ldap-client-2.21.1.tar.bz2 +Source0: yast2-ldap-client-2.21.2.tar.bz2 Prefix: /usr @@ -58,7 +58,7 @@ OpenLDAP server will be used for user authentication. %prep -%setup -n yast2-ldap-client-2.21.1 +%setup -n yast2-ldap-client-2.21.2 %build %{prefix}/bin/y2tool y2autoconf ++++++ yast2-ldap-client-2.21.1.tar.bz2 -> yast2-ldap-client-2.21.2.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-ldap-client-2.21.1/VERSION new/yast2-ldap-client-2.21.2/VERSION --- old/yast2-ldap-client-2.21.1/VERSION 2011-03-17 09:13:08.000000000 +0100 +++ new/yast2-ldap-client-2.21.2/VERSION 2011-03-18 15:30:01.000000000 +0100 @@ -1 +1 @@ -2.21.1 +2.21.2 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-ldap-client-2.21.1/src/Ldap.ycp new/yast2-ldap-client-2.21.2/src/Ldap.ycp --- old/yast2-ldap-client-2.21.1/src/Ldap.ycp 2011-03-17 09:12:31.000000000 +0100 +++ new/yast2-ldap-client-2.21.2/src/Ldap.ycp 2011-03-17 09:14:41.000000000 +0100 @@ -5,7 +5,7 @@ * Authors: Thorsten Kukuk <kukuk(a)suse.de> * Anas Nashif <nashif(a)suse.de> * - * $Id: Ldap.ycp 63567 2011-03-11 14:02:48Z jsuchome $ + * $Id: Ldap.ycp 63583 2011-03-17 08:14:40Z jsuchome $ */ { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-ldap-client-2.21.1/src/ldap.ycp new/yast2-ldap-client-2.21.2/src/ldap.ycp --- old/yast2-ldap-client-2.21.1/src/ldap.ycp 2010-08-18 12:35:33.000000000 +0200 +++ new/yast2-ldap-client-2.21.2/src/ldap.ycp 2011-03-18 15:29:07.000000000 +0100 @@ -93,6 +93,50 @@ } } + if (options["sssd"]:"" != "") + { + boolean sssd = (options["sssd"]:"" == "yes"); + if (Ldap::sssd != sssd) + { + Ldap::sssd = sssd; + Ldap::modified = true; + } + } + + if (options["cache_credentials"]:"" != "") + { + boolean cache_credentials = (options["cache_credentials"]:"" == "yes"); + if (Ldap::sssd_cache_credentials!= cache_credentials) + { + Ldap::sssd_cache_credentials= cache_credentials; + Ldap::modified = true; + } + } + + if (options["realm"]:"" != "") + { + string realm = options["realm"]:""; + if (Ldap::krb5_realm != realm) + { + Ldap::krb5_realm = realm; + Ldap::modified = true; + } + } + if (options["kdc"]:"" != "") + { + string kdc = options["kdc"]:""; + if (Ldap::krb5_kdcip != kdc) + { + Ldap::krb5_kdcip = kdc; + Ldap::modified = true; + } + } + + if (Ldap::krb5_kdcip != "" && Ldap::krb5_realm != "") + { + Ldap::sssd_with_krb = true; + } + if (haskey (options, "createconfig")) { if (Ldap::bind_pass == nil) @@ -202,14 +246,38 @@ "type" : "enum", "typespec" : [ "yes", "no" ], ], + "sssd" : $[ + // help text for the 'sssd' option + "help" : _("Use System Security Services Daemon (SSSD)"), + "type" : "enum", + "typespec" : [ "yes", "no" ], + ], + "cache_credentials" : $[ + // help text for the 'cache_credentials' option + "help" : _("SSSD Offline Authentication"), + "type" : "enum", + "typespec" : [ "yes", "no" ], + ], + "realm" :$[ + // command line help text for the 'realm' option + "help" : _("Kerberos Realm"), + "type" : "string" + ], + "kdc" :$[ + // command line help text for the 'kdc' option + "help" : _("KDC Server Address"), + "type" : "string" + ], ], "mappings" : $[ "pam" : [ "enable", "disable", "server", "base", - "createconfig", "ldappw", "automounter", "mkhomedir", "tls" + "createconfig", "ldappw", "automounter", "mkhomedir", "tls", + "sssd", "realm", "kdc", "cache_credentials" ], "summary" : [], "configure" : [ "server", "base", "createconfig", "ldappw", - "automounter", "mkhomedir", "tls" + "automounter", "mkhomedir", "tls", + "sssd", "realm", "kdc", "cache_credentials" ], ] ]; ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 perl-Test-Pod for openSUSE:Factory
by root＠hilbert.suse.de 21 Mar '11

21 Mar '11

Hello community, here is the log from the commit of package perl-Test-Pod for openSUSE:Factory checked in at Mon Mar 21 09:32:33 CET 2011. -------- --- perl-Test-Pod/perl-Test-Pod.changes 2010-11-30 20:28:47.000000000 +0100 +++ /mounts/work_src_done/STABLE/perl-Test-Pod/perl-Test-Pod.changes 2011-03-18 19:41:04.000000000 +0100 @@ -1,0 +2,8 @@ +Tue Mar 15 08:16:07 UTC 2011 - cfarrell(a)novell.com + +- license update: Artistic 2.0 or GPLv2 + The README states that the package is under either Artistic 2 (_not_ the + standard Perl dual license choice) and GPLv2 (also not the standard Perl + dual license choice). Changed in the PDB and LDB already) + +------------------------------------------------------------------- calling whatdependson for head-i586 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ perl-Test-Pod.spec ++++++ --- /var/tmp/diff_new_pack.NZ71NI/_old 2011-03-21 09:31:41.000000000 +0100 +++ /var/tmp/diff_new_pack.NZ71NI/_new 2011-03-21 09:31:41.000000000 +0100 @@ -1,7 +1,7 @@ # -# spec file for package perl-Test-Pod (Version 1.44) +# spec file for package perl-Test-Pod # -# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2011 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 @@ -22,8 +22,8 @@ %define cpan_name Test-Pod Summary: Check for POD errors in files Version: 1.44 -Release: 2 -License: GPL+ or Artistic +Release: 7 +License: Artistic 2.0 or GPLv2 Group: Development/Libraries/Perl Url: http://search.cpan.org/dist/Test-Pod/ Source: http://www.cpan.org/modules/by-module/Test/Test-Pod-%{version}.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 vcdimager for openSUSE:Factory
by root＠hilbert.suse.de 21 Mar '11

21 Mar '11

Hello community, here is the log from the commit of package vcdimager for openSUSE:Factory checked in at Mon Mar 21 09:31:21 CET 2011. -------- --- vcdimager/vcdimager.changes 2010-08-23 14:31:10.000000000 +0200 +++ /mounts/work_src_done/STABLE/vcdimager/vcdimager.changes 2011-03-17 15:34:45.000000000 +0100 @@ -1,0 +2,6 @@ +Thu Mar 17 14:34:44 UTC 2011 - cfarrell(a)novell.com + +- license update: GPLv2 + Heiko Eissfeldt and Joerg Schilling insist on GPLv2 only license for reed solomon in sector.c etc. See bnc#672491. Upstream has changed the license also" + +------------------------------------------------------------------- calling whatdependson for head-i586 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ vcdimager.spec ++++++ --- /var/tmp/diff_new_pack.S69feg/_old 2011-03-21 09:30:30.000000000 +0100 +++ /var/tmp/diff_new_pack.S69feg/_new 2011-03-21 09:30:30.000000000 +0100 @@ -1,7 +1,7 @@ # -# spec file for package vcdimager (Version 0.7.23) +# spec file for package vcdimager # -# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2011 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 @@ -19,7 +19,7 @@ Name: vcdimager -BuildRequires: cdparanoia libcddb-devel libxml2-devel pkgconfig popt-devel +BuildRequires: cdparanoia gawk libcddb-devel libxml2-devel pkgconfig popt-devel # In automatic build systems, use feature-limited version of libcdio to break build loop. %if "x%{?_project}" != "x" BuildRequires: libcdio-mini-devel @@ -28,7 +28,7 @@ BuildRequires: libcdio-devel %endif Url: http://www.vcdimager.org/ -License: GPLv2+ +License: GPLv2 Group: Productivity/Multimedia/CD/Record PreReq: %install_info_prereq AutoReqProv: on @@ -38,7 +38,7 @@ %endif # Version: 0.7.23 -Release: 173 +Release: 177 Summary: Video CD (VCD) authoring software Source: %{name}-%{version}.tar.bz2 Source2: baselibs.conf @@ -77,8 +77,8 @@ %package devel Url: http://www.vcdimager.org/ -License: GPLv2+ -Group: Productivity/Multimedia/CD/Record +License: GPLv2 +Group: Development/Languages/C and C++ Summary: Video CD (VCD) authoring software Requires: %{name} = %{version} libcdio-devel glibc-devel # bug437293 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 samba for openSUSE:Factory
by root＠hilbert.suse.de 21 Mar '11

21 Mar '11

Hello community, here is the log from the commit of package samba for openSUSE:Factory checked in at Mon Mar 21 09:28:55 CET 2011. -------- --- samba/samba.changes 2011-03-07 14:06:00.000000000 +0100 +++ /mounts/work_src_done/STABLE/samba/samba.changes 2011-03-18 17:25:03.000000000 +0100 @@ -1,0 +2,20 @@ +Fri Mar 18 15:53:07 UTC 2011 - lmuelle(a)suse.de + +- Replace jobs by _smp_mflags macro while calling make on post-11.4 systems. + +------------------------------------------------------------------- +Thu Mar 17 10:24:31 CET 2011 - ddiss(a)suse.de + +- Don't crash when publishing a single printer; (bnc#643119). + +------------------------------------------------------------------- +Wed Mar 9 10:46:20 UTC 2011 - lmuelle(a)suse.de + +- Define the libwbclient packages ahead of packages with a different version. + +------------------------------------------------------------------- +Wed Mar 9 00:48:12 UTC 2011 - jengelh(a)medozas.de + +- Use %_smp_mflags for parallel building. + +------------------------------------------------------------------- calling whatdependson for head-i586 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ samba-doc.spec ++++++ --- /var/tmp/diff_new_pack.g7kX82/_old 2011-03-21 09:27:29.000000000 +0100 +++ /var/tmp/diff_new_pack.g7kX82/_new 2011-03-21 09:27:29.000000000 +0100 @@ -75,9 +75,14 @@ %define libtdb_ver %{version} %define libtevent_ver %{version} %endif +%if 0%{?suse_version} == 0 || 0%{?suse_version} > 1140 +%define build_make_smp_mflags %{?_smp_mflags} +%else +%define build_make_smp_mflags %{?jobs:-j%jobs} +%endif Url: http://www.samba.org/ Version: 3.5.8 -Release: 1 +Release: 2 License: GPLv3+ Summary: Samba Documentation Group: Documentation/Other @@ -420,7 +425,7 @@ -------- The Samba Team <samba(a)samba.org> -Source Timestamp: 2509 +Source Timestamp: 2516 Branch : 3.5.8 %changelog ++++++ samba.spec ++++++ --- /var/tmp/diff_new_pack.g7kX82/_old 2011-03-21 09:27:29.000000000 +0100 +++ /var/tmp/diff_new_pack.g7kX82/_new 2011-03-21 09:27:29.000000000 +0100 @@ -75,6 +75,11 @@ %define libtdb_ver %{version} %define libtevent_ver %{version} %endif +%if 0%{?suse_version} == 0 || 0%{?suse_version} > 1140 +%define build_make_smp_mflags %{?_smp_mflags} +%else +%define build_make_smp_mflags %{?jobs:-j%jobs} +%endif %define vscan_ver 0.3.6b %define ldapsmb_ver 1.34b License: GPLv3+ @@ -82,7 +87,7 @@ Url: http://www.samba.org/ AutoReqProv: on Version: 3.5.8 -Release: 1 +Release: 2 Provides: samba-gplv3 = %{version}-%{release} Obsoletes: samba-gplv3 < %{version} %ifarch ppc64 @@ -184,7 +189,7 @@ The Samba Team <samba(a)samba.org> -Source Timestamp: 2509 +Source Timestamp: 2516 Branch : 3.5.8 %package client @@ -230,7 +235,7 @@ -------- The Samba Team <samba(a)samba.org> -Source Timestamp: 2509 +Source Timestamp: 2516 Branch : 3.5.8 %if 0%{?suse_version} == 0 || 0%{?suse_version} > 1020 @@ -257,7 +262,7 @@ The Samba Team <samba(a)samba.org> -Source Timestamp: 2509 +Source Timestamp: 2516 Branch : 3.5.8 %endif @@ -287,7 +292,7 @@ -------- The Samba Team <samba(a)samba.org> -Source Timestamp: 2509 +Source Timestamp: 2516 Branch : 3.5.8 %endif @@ -314,7 +319,7 @@ -------- Jeremy Allison <jra at samba dot org> -Source Timestamp: 2509 +Source Timestamp: 2516 Branch : 3.5.8 %if %{make_utils} @@ -365,7 +370,7 @@ -------- The Samba Team <samba(a)samba.org> -Source Timestamp: 2509 +Source Timestamp: 2516 Branch : 3.5.8 %if 0%{?suse_version} && 0%{?suse_version} < 1031 @@ -390,7 +395,7 @@ %if 0%{?suse_version} && 0%{?suse_version} < 1031 %description -n libsmbclient -Source Timestamp: 2509 +Source Timestamp: 2516 Branch : 3.5.8 %else @@ -435,7 +440,7 @@ -------- The Samba Team <samba(a)samba.org> -Source Timestamp: 2509 +Source Timestamp: 2516 Branch : 3.5.8 %package -n libnetapi0 @@ -454,7 +459,7 @@ -------- The Samba Team <samba(a)samba.org> -Source Timestamp: 2509 +Source Timestamp: 2516 Branch : 3.5.8 %package -n libnetapi-devel @@ -474,7 +479,7 @@ -------- The Samba Team <samba(a)samba.org> -Source Timestamp: 2509 +Source Timestamp: 2516 Branch : 3.5.8 %if 0%{?suse_version} && 0%{?suse_version} < 1031 @@ -494,7 +499,7 @@ %if 0%{?suse_version} && 0%{?suse_version} < 1031 %description -n libsmbsharemodes -Source Timestamp: 2509 +Source Timestamp: 2516 Branch : 3.5.8 %else @@ -530,20 +535,18 @@ The Samba Team <samba(a)samba.org> -Source Timestamp: 2509 +Source Timestamp: 2516 Branch : 3.5.8 -%package -n libtalloc2 -License: LGPLv3+ -Summary: Samba talloc Library +%package -n libwbclient0 +License: GPLv3+ +Summary: Samba libwbclient Library Group: System/Libraries AutoReqProv: on -Version: %{libtalloc_ver} -Release: 5 PreReq: /sbin/ldconfig -%description -n libtalloc2 -This package includes the talloc library. +%description -n libwbclient0 +This package includes the wbclient library. @@ -551,21 +554,19 @@ -------- The Samba Team <samba(a)samba.org> -Source Timestamp: 2509 +Source Timestamp: 2516 Branch : 3.5.8 -%package -n libtalloc-devel -License: LGPLv3+ -Summary: Libraries and Header Files to Develop Programs with talloc Support +%package -n libwbclient-devel +License: GPLv3+ +Summary: Libraries and Header Files to Develop Programs with wbclient Support Group: Development/Libraries/C and C++ AutoReqProv: on -Version: %{libtalloc_ver} -Release: 5 -Requires: libtalloc2 = %{version} +Requires: libwbclient0 = %{version} -%description -n libtalloc-devel +%description -n libwbclient-devel This package contains the static libraries and header files needed to -develop programs which make use of the talloc programming interface. +develop programs which make use of the wbclient programming interface. @@ -573,20 +574,20 @@ -------- The Samba Team <samba(a)samba.org> -Source Timestamp: 2509 +Source Timestamp: 2516 Branch : 3.5.8 -%package -n libtdb1 +%package -n libtalloc2 License: LGPLv3+ -Summary: Samba tdb Library +Summary: Samba talloc Library Group: System/Libraries AutoReqProv: on -Version: %{libtdb_ver} -Release: 5 +Version: %{libtalloc_ver} +Release: 6 PreReq: /sbin/ldconfig -%description -n libtdb1 -This package includes the tdb library. +%description -n libtalloc2 +This package includes the talloc library. @@ -594,21 +595,21 @@ -------- The Samba Team <samba(a)samba.org> -Source Timestamp: 2509 +Source Timestamp: 2516 Branch : 3.5.8 -%package -n libtdb-devel +%package -n libtalloc-devel License: LGPLv3+ -Summary: Libraries and Header Files to Develop Programs with tdb Support +Summary: Libraries and Header Files to Develop Programs with talloc Support Group: Development/Libraries/C and C++ AutoReqProv: on -Version: %{libtdb_ver} -Release: 5 -Requires: libtdb1 = %{version} +Version: %{libtalloc_ver} +Release: 6 +Requires: libtalloc2 = %{libtalloc_ver} -%description -n libtdb-devel +%description -n libtalloc-devel This package contains the static libraries and header files needed to -develop programs which make use of the tdb programming interface. +develop programs which make use of the talloc programming interface. @@ -616,18 +617,20 @@ -------- The Samba Team <samba(a)samba.org> -Source Timestamp: 2509 +Source Timestamp: 2516 Branch : 3.5.8 -%package -n libwbclient0 -License: GPLv3+ -Summary: Samba libwbclient Library +%package -n libtdb1 +License: LGPLv3+ +Summary: Samba tdb Library Group: System/Libraries AutoReqProv: on +Version: %{libtdb_ver} +Release: 6 PreReq: /sbin/ldconfig -%description -n libwbclient0 -This package includes the wbclient library. +%description -n libtdb1 +This package includes the tdb library. @@ -635,19 +638,21 @@ -------- The Samba Team <samba(a)samba.org> -Source Timestamp: 2509 +Source Timestamp: 2516 Branch : 3.5.8 -%package -n libwbclient-devel -License: GPLv3+ -Summary: Libraries and Header Files to Develop Programs with wbclient Support +%package -n libtdb-devel +License: LGPLv3+ +Summary: Libraries and Header Files to Develop Programs with tdb Support Group: Development/Libraries/C and C++ AutoReqProv: on -Requires: libwbclient0 = %{version} +Version: %{libtdb_ver} +Release: 6 +Requires: libtdb1 = %{libtdb_ver} -%description -n libwbclient-devel +%description -n libtdb-devel This package contains the static libraries and header files needed to -develop programs which make use of the wbclient programming interface. +develop programs which make use of the tdb programming interface. @@ -655,7 +660,7 @@ -------- The Samba Team <samba(a)samba.org> -Source Timestamp: 2509 +Source Timestamp: 2516 Branch : 3.5.8 %package -n libtevent0 @@ -664,7 +669,7 @@ Group: System/Libraries AutoReqProv: on Version: %{libtevent_ver} -Release: 5 +Release: 6 PreReq: /sbin/ldconfig %description -n libtevent0 @@ -676,7 +681,7 @@ -------- The Samba Team <samba(a)samba.org> -Source Timestamp: 2509 +Source Timestamp: 2516 Branch : 3.5.8 %package -n libtevent-devel @@ -685,7 +690,7 @@ Group: Development/Libraries/C and C++ AutoReqProv: on Version: %{libtevent_ver} -Release: 5 +Release: 6 Requires: libtevent0 = %{libtevent_ver} %description -n libtevent-devel @@ -699,7 +704,7 @@ The Samba Team <samba(a)samba.org> -Source Timestamp: 2509 +Source Timestamp: 2516 Branch : 3.5.8 %package -n libldb0 @@ -708,7 +713,7 @@ Group: System/Libraries AutoReqProv: on Version: %{libldb_ver} -Release: 5 +Release: 6 PreReq: /sbin/ldconfig %description -n libldb0 @@ -721,7 +726,7 @@ The Samba Team <samba(a)samba.org> -Source Timestamp: 2509 +Source Timestamp: 2516 Branch : 3.5.8 %package -n libldb-devel @@ -730,7 +735,7 @@ Group: Development/Libraries/C and C++ AutoReqProv: on Version: %{libldb_ver} -Release: 5 +Release: 6 Requires: libldb0 = %{libldb_ver} %description -n libldb-devel @@ -743,7 +748,7 @@ -------- The Samba Team <samba(a)samba.org> -Source Timestamp: 2509 +Source Timestamp: 2516 Branch : 3.5.8 %if %{make_ldapsmb} @@ -754,7 +759,7 @@ Group: Productivity/Networking/Samba AutoReqProv: on Version: 1.34b -Release: 301 +Release: 302 Requires: perl-ldap %description -n ldapsmb @@ -767,7 +772,7 @@ -------- Guenther Deschner <guenther at deschner dot de> -Source Timestamp: 2509 +Source Timestamp: 2516 Branch : 3.5.8 %endif @@ -790,7 +795,7 @@ -------- Steve French <sfrench at Samba dot org> -Source Timestamp: 2509 +Source Timestamp: 2516 Branch : 3.5.8 %endif @@ -993,22 +998,22 @@ %else %{__make} proto %endif -%{__make} %{?jobs:-j%jobs} \ +%{__make} %{build_make_smp_mflags} \ everything -#%{__make} %{?jobs:-j%jobs} -C tdb tdbtest tdbtorture +#%{__make} %{build_make_smp_mflags} -C tdb tdbtest tdbtorture %if %{make_vscan} pushd ../examples/VFS/samba-vscan-%{vscan_ver}/ %{?suse_update_config:%{suse_update_config -f}} autoreconf --force --install ./configure ${CONFIGURE_OPTIONS} ${CONFIGURE_OPTIONS_DEVEL} --with-samba-source=../../../source3/ -%{__make} %{?jobs:-j%jobs} +%{__make} %{build_make_smp_mflags} popd %endif %if %{make_ldapsmb} pushd ../ldapsmb-%{ldapsmb_ver} ./autogen.sh rm ldapsmb -%{__make} %{?jobs:-j%jobs} all doc +%{__make} %{build_make_smp_mflags} all doc popd %endif popd ++++++ build-source-timestamp ++++++ --- /var/tmp/diff_new_pack.g7kX82/_old 2011-03-21 09:27:29.000000000 +0100 +++ /var/tmp/diff_new_pack.g7kX82/_new 2011-03-21 09:27:29.000000000 +0100 @@ -1,2 +1,2 @@ -2509 +2516 Branch : 3.5.8 ++++++ patches.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/patches/samba.org/21576e3f8c32878910460bf9575c200ad93d682a new/patches/samba.org/21576e3f8c32878910460bf9575c200ad93d682a --- old/patches/samba.org/21576e3f8c32878910460bf9575c200ad93d682a 1970-01-01 01:00:00.000000000 +0100 +++ new/patches/samba.org/21576e3f8c32878910460bf9575c200ad93d682a 2011-03-18 16:39:42.000000000 +0100 @@ -0,0 +1,24 @@ +commit 21576e3f8c32878910460bf9575c200ad93d682a +Author: Günther Deschner <gd(a)samba.org> +Date: Fri Oct 1 06:08:12 2010 +0200 + + s3-net: make sure we dont crash when publishing a single printer. + + Guenther + +Index: source3/utils/net_rpc_printer.c +=================================================================== +--- source3/utils/net_rpc_printer.c.orig ++++ source3/utils/net_rpc_printer.c +@@ -1091,6 +1091,11 @@ static bool get_printer_info(struct rpc_ + &hnd)) + return false; + ++ *info_p = talloc_zero(mem_ctx, union spoolss_PrinterInfo); ++ if (*info_p == NULL) { ++ return false; ++ } ++ + if (!net_spoolss_getprinter(pipe_hnd, mem_ctx, &hnd, level, *info_p)) { + rpccli_spoolss_ClosePrinter(pipe_hnd, mem_ctx, &hnd, NULL); + return false; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/patches/series new/patches/series --- old/patches/series 2011-03-07 13:35:05.000000000 +0100 +++ new/patches/series 2011-03-18 16:39:42.000000000 +0100 @@ -10,6 +10,7 @@ samba.org/c67b4ed3a406011d0fc7e1e2cbdc27ec4822e57c -p0 # bso 6364, bnc 630812 samba.org/0ec0095d1a40435042b8ff9e4bc7fedbeb371e5f -p0 # bnc 632055 samba.org/9c12232f1ae36e00d04114ad73edd8ba3c2c6a5c -p0 # bnc 666460 +samba.org/21576e3f8c32878910460bf9575c200ad93d682a -p0 # bnc 643119 # SuSE specific changes # disabled -> WIP lmuelle ++++++ vendor-files.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/vendor-files/tools/package-data new/vendor-files/tools/package-data --- old/vendor-files/tools/package-data 2011-03-07 14:04:24.000000000 +0100 +++ new/vendor-files/tools/package-data 2011-03-18 17:23:45.000000000 +0100 @@ -1,2 +1,2 @@ # This is an autogenrated file. -SAMBA_PACKAGE_SVN_VERSION="2509" +SAMBA_PACKAGE_SVN_VERSION="2516" ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 arpwatch-ethercodes for openSUSE:Factory
by root＠hilbert.suse.de 18 Mar '11

18 Mar '11

Hello community, here is the log from the commit of package arpwatch-ethercodes for openSUSE:Factory checked in at Fri Mar 18 16:18:08 CET 2011. -------- --- AUTO/all/arpwatch-ethercodes/arpwatch-ethercodes.changes 2011-03-16 05:40:08.000000000 +0100 +++ arpwatch-ethercodes/arpwatch-ethercodes.changes 2011-03-18 07:40:07.000000000 +0100 @@ -2 +2 @@ -Wed Mar 16 05:40:07 CET 2011 - autobuild(a)suse.de +Fri Mar 18 07:40:07 CET 2011 - autobuild(a)suse.de @@ -4 +4 @@ -- automated update on 2011-03-16 +- automated update on 2011-03-18 calling whatdependson for head-i586 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ arpwatch-ethercodes.spec ++++++ --- /var/tmp/diff_new_pack.DCsqGj/_old 2011-03-18 16:17:58.000000000 +0100 +++ /var/tmp/diff_new_pack.DCsqGj/_new 2011-03-18 16:17:58.000000000 +0100 @@ -25,7 +25,7 @@ Group: Productivity/Networking/Diagnostic AutoReqProv: on Summary: Ethercodes Data for arpwatch -Version: 2011.3.16 +Version: 2011.3.18 Release: 1 Source: http://standards.ieee.org/regauth/oui/oui.txt.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-build ++++++ oui.txt.bz2 ++++++ --- /var/tmp/diff_new_pack.DCsqGj/_old 2011-03-18 16:17:59.000000000 +0100 +++ /var/tmp/diff_new_pack.DCsqGj/_new 2011-03-18 16:17:59.000000000 +0100 @@ -20691,9 +20691,8 @@ 00-0C-B8 (hex) MEDION AG 000CB8 (base 16) MEDION AG - z.H. Andreas Claus - G�nsemarkt 16-18 - Essen NRW 45127 + Am Zehnthof 77 + Essen NRW 45307 GERMANY 00-0C-B9 (hex) LEA @@ -25362,8 +25361,8 @@ Oppenweiler Baden W�rttemberg 71570 GERMANY -00-0F-9F (hex) Motorola BCS -000F9F (base 16) Motorola BCS +00-0F-9F (hex) Motorola Mobility, Inc. +000F9F (base 16) Motorola Mobility, Inc. 6450 Sequence Drive San Diego CA 92121 UNITED STATES @@ -27739,8 +27738,8 @@ San Gabriel CA 91776 UNITED STATES -00-11-1A (hex) Motorola BCS -00111A (base 16) Motorola BCS +00-11-1A (hex) Motorola Mobility, Inc. +00111A (base 16) Motorola Mobility, Inc. 6450 Sequence Drive San Diego CA 92121 UNITED STATES @@ -28382,8 +28381,8 @@ Shanghai 200030 CHINA -00-11-80 (hex) Motorola BCS -001180 (base 16) Motorola BCS +00-11-80 (hex) Motorola Mobility, Inc. +001180 (base 16) Motorola Mobility, Inc. 6450 Sequence Drive San Diego CA 92121 UNITED STATES @@ -28674,8 +28673,8 @@ Shanghai 200041 CHINA -00-11-AE (hex) Motorola BCS -0011AE (base 16) Motorola BCS +00-11-AE (hex) Motorola Mobility, Inc. +0011AE (base 16) Motorola Mobility, Inc. 6450 Sequence Drive San Diego CA 92121 UNITED STATES @@ -29430,8 +29429,8 @@ Dallas TX 75244 UNITED STATES -00-12-25 (hex) Motorola BCS -001225 (base 16) Motorola BCS +00-12-25 (hex) Motorola Mobility, Inc. +001225 (base 16) Motorola Mobility, Inc. 6450 Sequence Drive San Diego CA 92121 UNITED STATES @@ -30066,8 +30065,8 @@ Irvine California 92618 UNITED STATES -00-12-8A (hex) Motorola BCS -00128A (base 16) Motorola BCS +00-12-8A (hex) Motorola Mobility, Inc. +00128A (base 16) Motorola Mobility, Inc. 645 N. US Hwy 45 Room no. MW-113 Libertyville IL 60048 @@ -30463,8 +30462,8 @@ LUJHU TAOYUAN 338 TAIWAN, REPUBLIC OF CHINA -00-12-C9 (hex) Motorola BCS -0012C9 (base 16) Motorola BCS +00-12-C9 (hex) Motorola Mobility, Inc. +0012C9 (base 16) Motorola Mobility, Inc. 6450 Sequence Drive San Diego CA 92121 UNITED STATES @@ -33422,8 +33421,8 @@ Carlsbad CA 92008 UNITED STATES -00-14-9A (hex) Motorola Mobile Devices Business -00149A (base 16) Motorola Mobile Devices Business +00-14-9A (hex) Motorola Mobility, Inc. +00149A (base 16) Motorola Mobility, Inc. 600 N Us Hwy 45 Rm MW113 Libertyville IL 60048 @@ -35141,8 +35140,8 @@ Muri AG 5630 SWITZERLAND -00-15-A8 (hex) Motorola Mobile Devices -0015A8 (base 16) Motorola Mobile Devices +00-15-A8 (hex) Motorola Mobility, Inc. +0015A8 (base 16) Motorola Mobility, Inc. 600 N Us Hwy 45 Rm MW113 Libertyville IL 60048 @@ -36435,8 +36434,8 @@ Lapulapu City Cebu 6015 PHILIPPINES -00-16-75 (hex) Motorola MDb -001675 (base 16) Motorola MDb +00-16-75 (hex) Motorola Mobility, Inc. +001675 (base 16) Motorola Mobility, Inc. 600 N US Hwy 45 Libertyville Illinois 60048 UNITED STATES @@ -37305,8 +37304,8 @@ Zhonghe City Taipei County 235 TAIWAN, REPUBLIC OF CHINA -00-17-00 (hex) Motorola MDb -001700 (base 16) Motorola MDb +00-17-00 (hex) Motorola Mobility, Inc. +001700 (base 16) Motorola Mobility, Inc. 600 N. US Hwy 45 Libertyville IL 60048 UNITED STATES @@ -38136,8 +38135,8 @@ Dallas TX 75243 UNITED STATES -00-17-84 (hex) Motorola Mobile Devices -001784 (base 16) Motorola Mobile Devices +00-17-84 (hex) Motorola Mobility, Inc. +001784 (base 16) Motorola Mobility, Inc. 600 N. Hwy 45 Libertyville IL 60048 UNITED STATES @@ -38738,8 +38737,8 @@ SEOUL Keumcheon-Gu 153-772 KOREA, REPUBLIC OF -00-17-E2 (hex) Motorola Mobile Devices -0017E2 (base 16) Motorola Mobile Devices +00-17-E2 (hex) Motorola Mobility, Inc. +0017E2 (base 16) Motorola Mobility, Inc. 600 N. Hwy 45 Libertyville IL 60048 UNITED STATES @@ -39165,13 +39164,9 @@ Terrassa Barcelona 08228 SPAIN -00-18-25 (hex) Wavion LTD -001825 (base 16) Wavion LTD - 6 Ha’yetsira Street - PO Box 580 - Yoqne’am-Illit 20692 - ISRAEL - +00-18-25 (hex) PRIVATE +001825 (base 16) + 00-18-26 (hex) Cale Access AB 001826 (base 16) Cale Access AB Box 1307 @@ -40824,8 +40819,8 @@ Solon OH 44139 UNITED STATES -00-19-2C (hex) Motorola Mobile Devices -00192C (base 16) Motorola Mobile Devices +00-19-2C (hex) Motorola Mobility, Inc. +00192C (base 16) Motorola Mobility, Inc. 600 N. Hwy 45 Libertyville IL 60048 UNITED STATES @@ -41767,8 +41762,8 @@ Peijing 100006 CHINA -00-19-C0 (hex) Motorola Mobile Devices -0019C0 (base 16) Motorola Mobile Devices +00-19-C0 (hex) Motorola Mobility, Inc. +0019C0 (base 16) Motorola Mobility, Inc. 600 N. Hwy 45 Libertyville IL 60048 UNITED STATES @@ -42347,8 +42342,8 @@ Manchester NH 03103 UNITED STATES -00-1A-1B (hex) Motorola Mobile Devices -001A1B (base 16) Motorola Mobile Devices +00-1A-1B (hex) Motorola Mobility, Inc. +001A1B (base 16) Motorola Mobility, Inc. 600 N. Hwy 45 Libertyville IL 60048 UNITED STATES @@ -42928,8 +42923,8 @@ Seoul 140-896 KOREA, REPUBLIC OF -00-1A-77 (hex) Motorola Mobile Devices -001A77 (base 16) Motorola Mobile Devices +00-1A-77 (hex) Motorola Mobility, Inc. +001A77 (base 16) Motorola Mobility, Inc. 600 N. Hwy 45 Libertyville IL 60048 UNITED STATES @@ -43566,8 +43561,8 @@ Melbourne FL 32935 UNITED STATES -00-1A-DB (hex) Motorola Mobile Devices -001ADB (base 16) Motorola Mobile Devices +00-1A-DB (hex) Motorola Mobility, Inc. +001ADB (base 16) Motorola Mobility, Inc. 600 N. Hwy 45 Libertyville IL 60048 UNITED STATES @@ -44334,8 +44329,8 @@ Tucheng Taipei 236 TAIWAN, REPUBLIC OF CHINA -00-1B-52 (hex) Motorola Mobile Devices -001B52 (base 16) Motorola Mobile Devices +00-1B-52 (hex) Motorola Mobility, Inc. +001B52 (base 16) Motorola Mobility, Inc. 600 N. Hwy 45 Libertyville IL 60048 UNITED STATES @@ -45556,8 +45551,8 @@ San Diego CA 92121 UNITED STATES -00-1C-12 (hex) Motorola Mobile Devices -001C12 (base 16) Motorola Mobile Devices +00-1C-12 (hex) Motorola Mobility, Inc. +001C12 (base 16) Motorola Mobility, Inc. 600 N. US 45 Libertyville Illinois 60048 UNITED STATES @@ -46663,8 +46658,8 @@ Kulim Kedah 09000 MALAYSIA -00-1C-C1 (hex) Motorola Mobile Devices -001CC1 (base 16) Motorola Mobile Devices +00-1C-C1 (hex) Motorola Mobility, Inc. +001CC1 (base 16) Motorola Mobility, Inc. 600 N. US 45 Libertyville Illinois 60048 UNITED STATES @@ -47580,8 +47575,8 @@ Lausanne VD 1015 SWITZERLAND -00-1D-51 (hex) GE Energy -001D51 (base 16) GE Energy +00-1D-51 (hex) Babcock & Wilcox Power Generation Group, Inc +001D51 (base 16) Babcock & Wilcox Power Generation Group, Inc 11864 Canon Blvd, Suite 105 Newport News VA 23606 UNITED STATES @@ -48270,8 +48265,8 @@ Pearl River NY 10965 UNITED STATES -00-1D-BE (hex) Motorola Mobile Devices -001DBE (base 16) Motorola Mobile Devices +00-1D-BE (hex) Motorola Mobility, Inc. +001DBE (base 16) Motorola Mobility, Inc. 600 N. US 45 Libertyville Illinois 60048 UNITED STATES @@ -49579,8 +49574,8 @@ Taipei 112 TAIWAN, REPUBLIC OF CHINA -00-1E-8D (hex) Motorola Mobile Devices -001E8D (base 16) Motorola Mobile Devices +00-1E-8D (hex) Motorola Mobility, Inc. +001E8D (base 16) Motorola Mobility, Inc. 600 N. US 45 Libertyville Illinois 60048 UNITED STATES @@ -51109,8 +51104,8 @@ Ulm BW 89077 GERMANY -00-1F-7E (hex) Motorola Mobile Devices -001F7E (base 16) Motorola Mobile Devices +00-1F-7E (hex) Motorola Mobility, Inc. +001F7E (base 16) Motorola Mobility, Inc. 600 N. US 45 Libertyville Illinois 60048 UNITED STATES @@ -53899,8 +53894,8 @@ Madrid 28045 SPAIN -00-21-36 (hex) Motorola Mobile Devices business (MDb) -002136 (base 16) Motorola Mobile Devices business (MDb) +00-21-36 (hex) Motorola Mobility, Inc. +002136 (base 16) Motorola Mobility, Inc. 600 N. US Highway 45 Libertyville IL 60048 UNITED STATES @@ -56298,8 +56293,8 @@ Curno Bergamo 24035 ITALY -00-22-B4 (hex) Motorola Mobile Devices -0022B4 (base 16) Motorola Mobile Devices +00-22-B4 (hex) Motorola Mobility, Inc. +0022B4 (base 16) Motorola Mobility, Inc. 600 N. U.S. Highway 45 Libertyville Illinois 60048 UNITED STATES @@ -80528,6 +80523,12 @@ GERMANY GERMANY +04-E1-C8 (hex) IMS Solu��es em Energia Ltda. +04E1C8 (base 16) IMS Solu��es em Energia Ltda. + Av. Bernardino Silveira Pastoriza, 720 + Porto Alegre RS 91160-310 + BRAZIL + 04-E2-F8 (hex) AEP srl 04E2F8 (base 16) AEP srl Via dei Colli, 240 @@ -82450,8 +82451,8 @@ Piscataway NJ 08854 UNITED STATES -1C-14-48 (hex) Motorola CHS -1C1448 (base 16) Motorola CHS +1C-14-48 (hex) Motorola Mobility, Inc. +1C1448 (base 16) Motorola Mobility, Inc. 6450 Sequence Drive San Diego CA 92121 UNITED STATES @@ -82750,6 +82751,12 @@ Andover MA 01810 UNITED STATES +20-B7-C0 (hex) Omicron electronics GmbH +20B7C0 (base 16) Omicron electronics GmbH + Oberes Ried 1 + Klaus 6833 + AUSTRIA + 20-BF-DB (hex) DVL 20BFDB (base 16) DVL 21 Gradinilor Str @@ -85268,6 +85275,12 @@ Dietikon Zurich 8953 SWITZERLAND +58-E8-08 (hex) AUTONICS CORPORATION +58E808 (base 16) AUTONICS CORPORATION + 41-5 YONGDANG-DONG + YANGSAN-SI KYEONGNAM 626-847 + KOREA, REPUBLIC OF + 58-EE-CE (hex) Icon Time Systems 58EECE (base 16) Icon Time Systems 15201 NW Greenbrier Parkway @@ -87458,6 +87471,13 @@ Oulu 90590 FINLAND +80-58-C5 (hex) NovaTec Kommunikationstechnik GmbH +8058C5 (base 16) NovaTec Kommunikationstechnik GmbH + Technologiepark 9 + 4th Floor + Paderborn NRW 33100 + GERMANY + 80-65-E9 (hex) BenQ Corporation 8065E9 (base 16) BenQ Corporation 16 Jihu Road, Neihu @@ -88000,6 +88020,13 @@ 8C-84-01 (hex) PRIVATE 8C8401 (base 16) +8C-89-A5 (hex) Micro-Star INT'L CO., LTD +8C89A5 (base 16) Micro-Star INT'L CO., LTD + No.69, Lide st. + Jhonghe City + Taipei County 235 + TAIWAN, REPUBLIC OF CHINA + 8C-90-D3 (hex) Alcatel Lucent 8C90D3 (base 16) Alcatel Lucent 600 March Drive @@ -88457,6 +88484,12 @@ Jakarta 13150 INDONESIA +94-E8-48 (hex) FYLDE MICRO LTD +94E848 (base 16) FYLDE MICRO LTD + 8 AVROE CRESCENT + BLACKPOOL LANCASHIRE FY4 2DP + UNITED KINGDOM + 94-F6-92 (hex) Geminico co.,Ltd. 94F692 (base 16) Geminico co.,Ltd. #102-1112, Chunui-Technopark, 200-1, @@ -90170,6 +90203,13 @@ San Jose CA 95134 UNITED STATES +B8-C7-16 (hex) Fiberhome Telecommunication Technologies Co.,LTD +B8C716 (base 16) Fiberhome Telecommunication Technologies Co.,LTD + No.5 Dongxin Road + Hongshan District + Wuhan Hubei 430074 + CHINA + B8-D0-6F (hex) GUANGZHOU HKUST FOK YING TUNG RESEARCH INSTITUTE B8D06F (base 16) GUANGZHOU HKUST FOK YING TUNG RESEARCH INSTITUTE Rm 403, North of Software Building,Nansha IT Park, @@ -91316,6 +91356,12 @@ Burlington Ontario L7L 6A1 CANADA +D0-66-7B (hex) Samsung Electronics Co., LTD +D0667B (base 16) Samsung Electronics Co., LTD + 416, Maetan-3dong, Yeongtong-gu + Suwon-si Gyeonggi-do 443742 + KOREA, REPUBLIC OF + D0-75-BE (hex) Reno A&E D075BE (base 16) Reno A&E 4655 Aircenter Circle @@ -91451,6 +91497,12 @@ Marlborough MA 01752 UNITED STATES +D4-2C-3D (hex) Sky Light Digital Limited +D42C3D (base 16) Sky Light Digital Limited + Rm. 1009 Kwong Sang Hong Centre, 151-153 Hoi Bun Road, Kwun Tong, Kowloon, + Hong Kong Guang Dong 999077 + CHINA + D4-3D-67 (hex) Carma Industries Inc. D43D67 (base 16) Carma Industries Inc. 132 Walsh Road @@ -91875,6 +91927,12 @@ Budapest 1191 HUNGARY +DC-05-ED (hex) Nabtesco Automotive Corporation +DC05ED (base 16) Nabtesco Automotive Corporation + 9-18, Kaigan 1-chome + Minato-ku Tokyo 105-0022 + JAPAN + DC-07-C1 (hex) HangZhou QiYang Technology Co.,Ltd. DC07C1 (base 16) HangZhou QiYang Technology Co.,Ltd. Floor 5, Building 2, Road XiYuanYi, WestLake Technology Park, @@ -93617,6 +93675,13 @@ Etters PA 17319 UNITED STATES +FC-83-29 (hex) Trei technics +FC8329 (base 16) Trei technics + 801 Northpoint Pkwy + Ste 54 + West Palm Beach Florida 33407 + UNITED STATES + FC-8E-7E (hex) Pace France FC8E7E (base 16) Pace France 33, rue de Verdun ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 postfix for openSUSE:11.3
by root＠hilbert.suse.de 18 Mar '11

18 Mar '11

Hello community, here is the log from the commit of package postfix for openSUSE:11.3 checked in at Fri Mar 18 14:59:33 CET 2011. -------- --- old-versions/11.3/UPDATES/all/postfix/postfix.changes 2010-08-12 20:59:58.000000000 +0200 +++ 11.3/postfix/postfix.changes 2011-03-15 12:02:46.000000000 +0100 @@ -1,0 +2,5 @@ +Tue Mar 15 11:00:32 UTC 2011 - varkoly(a)novell.com + +- bnc#677792 - VUL-0: postfix: STARTTLS plaintext injection + +------------------------------------------------------------------- calling whatdependson for 11.3-i586 New: ---- bnc#677792.diff ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ postfix.spec ++++++ --- /var/tmp/diff_new_pack.uNleDA/_old 2011-03-18 14:59:24.000000000 +0100 +++ /var/tmp/diff_new_pack.uNleDA/_new 2011-03-18 14:59:24.000000000 +0100 @@ -1,7 +1,7 @@ # -# spec file for package postfix (Version 2.7.1) +# spec file for package postfix # -# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2011 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 @@ -22,7 +22,7 @@ Name: postfix Summary: A fast, secure, and flexible mailer Version: 2.7.1 -Release: 2.<RELEASE2> +Release: 2.<RELEASE4> License: IBM Public License .. Group: Productivity/Networking/Email/Servers Url: http://www.postfix.org/ @@ -39,6 +39,7 @@ Patch10: %{name}-2.2.9-main.cf.patch Patch11: %{name}-2.6.1-vda-ng.patch Patch12: %{name}-2.6.1-vda-ng-64bit.patch +Patch13: bnc#677792.diff BuildRoot: %{_tmppath}/%{name}-%{version}-build PreReq: %insserv_prereq %fillup_prereq PreReq: /usr/bin/getent @@ -171,6 +172,7 @@ %ifarch x86_64 %patch12 -p1 %endif +%patch13 # --------------------------------------------------------------------------- %build ++++++ bnc#677792.diff ++++++ --- src/smtpd/smtpd.c-orig 2011-03-15 11:46:16.488687003 +0100 +++ src/smtpd/smtpd.c 2011-03-15 11:47:22.865687008 +0100 @@ -4097,6 +4097,9 @@ /* Flush before we switch the stream's read/write routines. */ smtp_flush(state->client); + /* At this point there must not be any pending plaintext. */ + vstream_fpurge(state->client, VSTREAM_PURGE_BOTH); + /* * Reset all inputs to the initial state. * --- src/smtp/smtp_proto.c.orig 2011-03-15 11:44:46.016054002 +0100 +++ src/smtp/smtp_proto.c 2011-03-15 11:45:49.621686995 +0100 @@ -812,6 +812,9 @@ SMTP_RESP_FAKE(&fake, "4.7.5"), "Server certificate not verified")); + /* At this point there must not be any pending plaintext. */ + vstream_fpurge(session->stream, VSTREAM_PURGE_BOTH); + /* * At this point we have to re-negotiate the "EHLO" to reget the * feature-list. ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 postfix for openSUSE:11.2
by root＠hilbert.suse.de 18 Mar '11

18 Mar '11

Hello community, here is the log from the commit of package postfix for openSUSE:11.2 checked in at Fri Mar 18 14:59:02 CET 2011. -------- --- old-versions/11.2/UPDATES/all/postfix/postfix.changes 2010-01-29 18:07:41.000000000 +0100 +++ 11.2/postfix/postfix.changes 2011-03-15 12:02:20.000000000 +0100 @@ -1,0 +2,5 @@ +Tue Mar 15 11:01:22 UTC 2011 - varkoly(a)novell.com + +- bnc#677792 - VUL-0: postfix: STARTTLS plaintext injection + +------------------------------------------------------------------- calling whatdependson for 11.2-i586 New: ---- bnc#677792.diff ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ postfix.spec ++++++ --- /var/tmp/diff_new_pack.PUu0BN/_old 2011-03-18 14:58:56.000000000 +0100 +++ /var/tmp/diff_new_pack.PUu0BN/_new 2011-03-18 14:58:56.000000000 +0100 @@ -1,7 +1,7 @@ # -# spec file for package postfix (Version 2.6.1) +# spec file for package postfix # -# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2011 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 @@ -22,7 +22,7 @@ Name: postfix Summary: A fast, secure, and flexible mailer Version: 2.6.1 -Release: 2.<RELEASE6> +Release: 2.<RELEASE8> License: IBM Public License .. Group: Productivity/Networking/Email/Servers Url: http://www.postfix.org/ @@ -38,6 +38,7 @@ Patch10: %{name}-2.2.9-main.cf.patch Patch11: %{name}-%{version}-vda-ng.patch Patch12: %{name}-%{version}-vda-ng-64bit.patch +Patch13: bnc#677792.diff BuildRoot: %{_tmppath}/%{name}-%{version}-build PreReq: %insserv_prereq %fillup_prereq PreReq: /usr/bin/getent @@ -167,6 +168,7 @@ %ifarch x86_64 %patch12 -p1 %endif +%patch13 # --------------------------------------------------------------------------- %build ++++++ bnc#677792.diff ++++++ --- src/smtpd/smtpd.c-orig 2011-03-15 11:46:16.488687003 +0100 +++ src/smtpd/smtpd.c 2011-03-15 11:47:22.865687008 +0100 @@ -4097,6 +4097,9 @@ /* Flush before we switch the stream's read/write routines. */ smtp_flush(state->client); + /* At this point there must not be any pending plaintext. */ + vstream_fpurge(state->client, VSTREAM_PURGE_BOTH); + /* * Reset all inputs to the initial state. * --- src/smtp/smtp_proto.c.orig 2011-03-15 11:44:46.016054002 +0100 +++ src/smtp/smtp_proto.c 2011-03-15 11:45:49.621686995 +0100 @@ -812,6 +812,9 @@ SMTP_RESP_FAKE(&fake, "4.7.5"), "Server certificate not verified")); + /* At this point there must not be any pending plaintext. */ + vstream_fpurge(session->stream, VSTREAM_PURGE_BOTH); + /* * At this point we have to re-negotiate the "EHLO" to reget the * feature-list. ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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