October 2014 - openSUSE Commits - openSUSE Mailing Lists

commit digikam for openSUSE:Factory
by root＠hilbert.suse.de 01 Oct '14

01 Oct '14

Hello community, here is the log from the commit of package digikam for openSUSE:Factory checked in at 2014-10-01 11:22:05 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/digikam (Old) and /work/SRC/openSUSE:Factory/.digikam.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "digikam" Changes: -------- --- /work/SRC/openSUSE:Factory/digikam/digikam.changes 2014-09-19 13:55:44.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.digikam.new/digikam.changes 2014-10-01 11:22:06.000000000 +0200 @@ -1,0 +2,13 @@ +Wed Sep 24 17:47:04 UTC 2014 - hrvoje.senjan(a)gmail.com + +- Added handle_right_libkexiv2_version.diff and + handle_right_libkexiv2_version2.diff, kde#339144, bnc#898260 + +------------------------------------------------------------------- +Tue Sep 23 15:55:06 UTC 2014 - hrvoje.senjan(a)gmail.com + +- Add bug325580.patch: Fix job reset when it's done : do not return + directly is an error appera with a job, without to reset job. + kde#325580, kde#339210 + +------------------------------------------------------------------- New: ---- bug325580.patch handle_right_libkexiv2_version.diff handle_right_libkexiv2_version2.diff ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ digikam.spec ++++++ --- /var/tmp/diff_new_pack.7WWdxv/_old 2014-10-01 11:22:08.000000000 +0200 +++ /var/tmp/diff_new_pack.7WWdxv/_new 2014-10-01 11:22:08.000000000 +0200 @@ -33,6 +33,12 @@ Patch5: digikam_no_build_vkontakte.diff # PATCH-FIX-UPSTREAM digikam-3.0.0.no-kdcraw.version-check.patch -- version check for libkdcraw currently broken Patch6: digikam-3.0.0.no-kdcraw.version-check.patch +# PATCH-FIX-UPSTREAM bug325580.patch -- Fix job reset when it's done : do not return directly is an error appera with a job, without to reset job. +Patch7: bug325580.patch +# PATCH-FIX-UPSTREAM handle_right_libkexiv2_version.diff +Patch8: handle_right_libkexiv2_version.diff +# PATCH-FIX-UPSTREAM handle_right_libkexiv2_version2.diff +Patch9: handle_right_libkexiv2_version2.diff BuildRequires: ImageMagick-devel BuildRequires: bison BuildRequires: boost-devel @@ -238,6 +244,9 @@ %patch3 %patch5 %patch6 -p1 +%patch7 -p1 +%patch8 -p1 +%patch9 -p1 # Remove build time references so build-compare can do its work FAKE_BUILDDATE=$(LC_ALL=C date -u -r %{_sourcedir}/%{name}.changes '+%%b %%e %%Y') ++++++ bug325580.patch ++++++ commit d523a9768ab8276860c76e02b9d9b598a3d607f9 Author: Gilles Caulier <caulier.gilles(a)gmail.com> Date: Thu Sep 11 19:40:30 2014 +0200 Fix job reset when it's done : do not return directly is an error appera with a job, without to reset job. Fix broken signal/slot connection. BUGS: 325580 FIXED-IN: 4.4.0 diff --git a/digikam/album/albumlabelstreeview.cpp b/digikam/album/albumlabelstreeview.cpp index 2e1ff30..2047cdf 100644 --- a/core/digikam/album/albumlabelstreeview.cpp +++ b/core/digikam/album/albumlabelstreeview.cpp @@ -934,7 +934,6 @@ void AlbumLabelsSearchHandler::slotResult(KJob* job) // Pop-up a message about the error. DNotificationWrapper(QString(), job->errorString(), DigikamApp::instance(), DigikamApp::instance()->windowTitle()); - return; } } diff --git a/digikam/album/albummanager.cpp b/digikam/album/albummanager.cpp index bd05e27..02452b0 100644 --- a/core/digikam/album/albummanager.cpp +++ b/core/digikam/album/albummanager.cpp @@ -2969,7 +2969,6 @@ void AlbumManager::slotAlbumsJobResult(KJob* job) // Pop-up a message about the error. DNotificationWrapper(QString(), job->errorString(), 0, i18n("digiKam")); - return; } } @@ -3000,7 +2999,6 @@ void AlbumManager::slotPeopleJobResult(KJob* job) // Pop-up a message about the error. DNotificationWrapper(QString(), job->errorString(), 0, i18n("digiKam")); - return; } } @@ -3044,7 +3042,6 @@ void AlbumManager::slotTagsJobResult(KJob* job) // Pop-up a message about the error. DNotificationWrapper(QString(), job->errorString(), 0, i18n("digiKam")); - return; } } @@ -3075,7 +3072,6 @@ void AlbumManager::slotDatesJobResult(KJob* job) // Pop-up a message about the error. DNotificationWrapper(QString(), job->errorString(), 0, i18n("digiKam")); - return; } emit signalAllDAlbumsLoaded(); diff --git a/libs/models/imagealbummodel.cpp b/libs/models/imagealbummodel.cpp index 7681fa3..5486b55 100644 --- a/core/libs/models/imagealbummodel.cpp +++ b/core/libs/models/imagealbummodel.cpp @@ -346,7 +346,6 @@ void ImageAlbumModel::slotResult(KJob* job) // Pop-up a message about the error. DNotificationWrapper(QString(), job->errorString(), DigikamApp::instance(), DigikamApp::instance()->windowTitle()); - return; } } diff --git a/showfoto/main/showfoto.cpp b/showfoto/main/showfoto.cpp index 4d8ff09..9d407f7 100644 --- a/core/showfoto/main/showfoto.cpp +++ b/core/showfoto/main/showfoto.cpp @@ -912,7 +912,7 @@ void ShowFoto::saveAsIsComplete() // Pop-up a message to bring user when save is done. Digikam::DNotificationWrapper("editorsavefilecompleted", i18n("Image saved successfully"), - this, windowTitle()); + this, windowTitle()); */ } diff --git a/utilities/maintenance/duplicatesfinder.cpp b/utilities/maintenance/duplicatesfinder.cpp index 2636d7d..9ed2f9e 100644 --- a/core/utilities/maintenance/duplicatesfinder.cpp +++ b/core/utilities/maintenance/duplicatesfinder.cpp @@ -110,7 +110,7 @@ void DuplicatesFinder::slotStart() d->job->addMetaData("threshold", QString::number(thresh)); connect(d->job, SIGNAL(result(KJob*)), - this, SLOT(slotDone(KJob*))); + this, SLOT(slotDone())); connect(d->job, SIGNAL(totalAmount(KJob*,KJob::Unit,qulonglong)), this, SLOT(slotDuplicatesSearchTotalAmount(KJob*,KJob::Unit,qulonglong))); @@ -139,10 +139,9 @@ void DuplicatesFinder::slotDone() // Pop-up a message about the error. DNotificationWrapper(QString(), d->job->errorString(), DigikamApp::instance(), DigikamApp::instance()->windowTitle()); - return; } - d->job = NULL; + d->job = 0; MaintenanceTool::slotDone(); } @@ -151,7 +150,7 @@ void DuplicatesFinder::slotCancel() if (d->job) { d->job->kill(); - d->job = NULL; + d->job = 0; } MaintenanceTool::slotCancel(); diff --git a/utilities/maintenance/imageinfojob.cpp b/utilities/maintenance/imageinfojob.cpp index 397601e..9efe80e 100644 --- a/core/utilities/maintenance/imageinfojob.cpp +++ b/core/utilities/maintenance/imageinfojob.cpp @@ -110,6 +110,8 @@ bool ImageInfoJob::isRunning() const void ImageInfoJob::slotResult(KJob* job) { + d->job = 0; + if (job->error()) { kWarning() << "Failed to list url: " << job->errorString(); @@ -117,11 +119,8 @@ void ImageInfoJob::slotResult(KJob* job) // Pop-up a message about the error. DNotificationWrapper(QString(), d->job->errorString(), DigikamApp::instance(), DigikamApp::instance()->windowTitle()); - return; } - d->job = 0; - emit signalCompleted(); } ++++++ handle_right_libkexiv2_version.diff ++++++ commit 573069e8cd3b7155582e0c7be3625c0cc4879619 Author: Gilles Caulier <caulier.gilles(a)gmail.com> Date: Tue Sep 23 09:49:20 2014 +0200 Handle right libkexiv2 version to extract preview and prevent crash in Exiv2 preview extractor. CCBUGS: 339144 diff --git a/core/libs/threadimageio/thumbnailcreator.cpp b/core/libs/threadimageio/thumbnailcreator.cpp index ed07d0d..9f238a4 100644 --- a/core/libs/threadimageio/thumbnailcreator.cpp +++ b/core/libs/threadimageio/thumbnailcreator.cpp @@ -62,6 +62,7 @@ #include <libkexiv2/kexiv2previews.h> #include <libkexiv2/rotationmatrix.h> +#include <libkexiv2/version.h> // Local includes @@ -519,6 +520,9 @@ ThumbnailImage ThumbnailCreator::createT KDcraw::loadHalfPreview(qimage, path); } + // See bug #339144 : only handle preview if right libkexiv2 version is used. +#if KEXIV2_VERSION >= 0x020302 + // Special case with DNG file. See B.K.O #338081 if (qimage.isNull()) { @@ -528,6 +532,9 @@ ThumbnailImage ThumbnailCreator::createT qimage = preview.image(); } + +#endif + // DImg-dependent loading methods: TIFF, PNG, everything supported by QImage if (qimage.isNull() && !failedAtDImg) { ++++++ handle_right_libkexiv2_version2.diff ++++++ commit e2eeb730d02aad858f15c6f35f2a6b6beb38acf5 Author: Gilles Caulier <caulier.gilles(a)gmail.com> Date: Tue Sep 23 10:28:39 2014 +0200 Another place where we need to handle right libkexiv2 version to extract preview and prevent crash in Exiv2 preview extractor. CCBUGS: 339144 diff --git a/core/libs/threadimageio/previewtask.cpp b/core/libs/threadimageio/previewtask.cpp index 3c3b72a..99bb4d6 100644 --- a/core/libs/threadimageio/previewtask.cpp +++ b/core/libs/threadimageio/previewtask.cpp @@ -254,7 +254,11 @@ void PreviewLoadingTask::execute() // require at least half preview size if (qMax(previews.width(), previews.height()) >= sizeLimit) { + + // See bug #339144 : only handle preview if right libkexiv2 version is used. +#if KEXIV2_VERSION >= 0x020302 qimage = previews.image(); +#endif if (!qimage.isNull()) { -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit libqt5-qtbase for openSUSE:Factory
by root＠hilbert.suse.de 01 Oct '14

01 Oct '14

Hello community, here is the log from the commit of package libqt5-qtbase for openSUSE:Factory checked in at 2014-10-01 11:22:03 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/libqt5-qtbase (Old) and /work/SRC/openSUSE:Factory/.libqt5-qtbase.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "libqt5-qtbase" Changes: -------- --- /work/SRC/openSUSE:Factory/libqt5-qtbase/libqt5-qtbase.changes 2014-09-24 13:09:18.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.libqt5-qtbase.new/libqt5-qtbase.changes 2014-10-01 11:22:04.000000000 +0200 @@ -1,0 +2,9 @@ +Wed Sep 24 16:23:20 UTC 2014 - mlin(a)suse.com + +- Add libqt5-do-not-use-shm-if-display-name-doesnt-look-local.patch + from Michal Srb, bnc#888858 + * additional check the display name before use SHM, this patch is + equivalent to what has been did in Qt4: + https://qt.gitorious.org/qt/qt/source/6a7f06d70e1267d3d995a3c863ba8f748d45e… + +------------------------------------------------------------------- New: ---- libqt5-do-not-use-shm-if-display-name-doesnt-look-local.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libqt5-qtbase.spec ++++++ --- /var/tmp/diff_new_pack.t3wbDT/_old 2014-10-01 11:22:06.000000000 +0200 +++ /var/tmp/diff_new_pack.t3wbDT/_new 2014-10-01 11:22:06.000000000 +0200 @@ -46,6 +46,8 @@ Patch3: libqt5-Fix-Gujarati-font.patch # PATCH-FIX-UPSTREAM protect-geometry-QTBUG-40584.patch -- https://bugreports.qt-project.org/browse/QTBUG-40584 Patch4: protect-geometry-QTBUG-40584.patch +# Patch-FIX-SUSE libqt5-do-not-use-shm-if-display-name-doesnt-look-local.patch -- bnc#888858 +Patch5: libqt5-do-not-use-shm-if-display-name-doesnt-look-local.patch # patches 1000-2000 and above from upstream 5.3 branch # # patches 2000-3000 and above from upstream 5.4 branch # # PATCH-FIX-UPSTREAM f1ee10f81ac18789e9a7dc715b464415ba2bc2b8.patch -- prefer QPA implementation in qsystemtrayicon_x11 if available @@ -141,6 +143,7 @@ %patch2 -p1 %patch3 -p1 %patch4 -p1 +%patch5 -p1 %patch2000 -p1 %patch2001 -p1 %patch2002 -p1 ++++++ libqt5-do-not-use-shm-if-display-name-doesnt-look-local.patch ++++++ Do not use SHM if display name doesn't look local. Verifying availability of SHM only by using response of SHM Attach is not reliable. There is always small chance that when we are a remote client of X server, we'll get shmid that is already in use by some local X client. In that case X server can not recognize that it is not accessing our shared memory but the one of the other client and will report success. This adds check for display name equivalent to one that was in Qt4. Determining whether the connection is local/remote from display name is not 100% reliable, but worked fine for years in Qt4. Signed-off-by: Michal Srb <msrb(a)suse.com> diff --git a/src/plugins/platforms/xcb/qxcbbackingstore.cpp b/src/plugins/platforms/xcb/qxcbbackingstore.cpp index dc677cd..4cd249e 100644 --- a/src/plugins/platforms/xcb/qxcbbackingstore.cpp +++ b/src/plugins/platforms/xcb/qxcbbackingstore.cpp @@ -117,7 +117,8 @@ QXcbShmImage::QXcbShmImage(QXcbScreen *screen, const QSize &size, uint depth, QI m_shm_info.shmseg = xcb_generate_id(xcb_connection()); const xcb_query_extension_reply_t *shm_reply = xcb_get_extension_data(xcb_connection(), &xcb_shm_id); - bool shm_present = shm_reply != NULL && shm_reply->present; + bool is_local = (!displayName() || displayName()[0] == ':'); + bool shm_present = is_local && shm_reply != NULL && shm_reply->present; xcb_generic_error_t *error = NULL; if (shm_present) error = xcb_request_check(xcb_connection(), xcb_shm_attach_checked(xcb_connection(), m_shm_info.shmseg, m_shm_info.shmid, false)); diff --git a/src/plugins/platforms/xcb/qxcbobject.h b/src/plugins/platforms/xcb/qxcbobject.h index 354984c..2ecb5e7 100644 --- a/src/plugins/platforms/xcb/qxcbobject.h +++ b/src/plugins/platforms/xcb/qxcbobject.h @@ -56,6 +56,7 @@ public: xcb_atom_t atom(QXcbAtom::Atom atom) const { return m_connection->atom(atom); } xcb_connection_t *xcb_connection() const { return m_connection->xcb_connection(); } + const char *displayName() const { return m_connection->displayName(); } private: QXcbConnection *m_connection; -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit pcsc-lite for openSUSE:Factory
by root＠hilbert.suse.de 01 Oct '14

01 Oct '14

Hello community, here is the log from the commit of package pcsc-lite for openSUSE:Factory checked in at 2014-10-01 11:22:00 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/pcsc-lite (Old) and /work/SRC/openSUSE:Factory/.pcsc-lite.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "pcsc-lite" Changes: -------- --- /work/SRC/openSUSE:Factory/pcsc-lite/pcsc-lite.changes 2014-08-27 07:45:50.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.pcsc-lite.new/pcsc-lite.changes 2014-10-01 11:22:03.000000000 +0200 @@ -1,0 +2,9 @@ +Wed Sep 24 14:20:37 UTC 2014 - wr(a)rosenauer.org + +- Updated to version 1.8.12 + * make hotplug using libudev (default) more robust + * add ReiserFS file system support (for configuration files) + * add musl libC support (increase the thread stack) + * Some other minor improvements and bug corrections + +------------------------------------------------------------------- Old: ---- pcsc-lite-1.8.11.tar.bz2 pcsc-lite-1.8.11.tar.bz2.asc New: ---- pcsc-lite-1.8.12.tar.bz2 pcsc-lite-1.8.12.tar.bz2.asc ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ pcsc-lite.spec ++++++ --- /var/tmp/diff_new_pack.Qof5tI/_old 2014-10-01 11:22:04.000000000 +0200 +++ /var/tmp/diff_new_pack.Qof5tI/_new 2014-10-01 11:22:04.000000000 +0200 @@ -40,7 +40,7 @@ %if %suse_version > 1220 BuildRequires: gpg-offline %endif -Version: 1.8.11 +Version: 1.8.12 Release: 0 Requires(pre): pwdutils Url: http://pcsclite.alioth.debian.org/ ++++++ pcsc-lite-1.8.11.tar.bz2 -> pcsc-lite-1.8.12.tar.bz2 ++++++ ++++ 6225 lines of diff (skipped) ++++++ pcsc-lite.keyring ++++++ --- /var/tmp/diff_new_pack.Qof5tI/_old 2014-10-01 11:22:04.000000000 +0200 +++ /var/tmp/diff_new_pack.Qof5tI/_new 2014-10-01 11:22:04.000000000 +0200 @@ -30,3 +30,311 @@ AKCXbqMkNr5QNdPi37LtspMzCHlvoACgknJVGCR6Fmz7s1wL38ZLkcqYgsM= =ItMa -----END PGP PUBLIC KEY BLOCK----- + + +pub 4096R/E8F9C57E 2010-09-19 +uid Ludovic Rousseau <ludovic.rousseau(a)free.fr> +uid Ludovic Rousseau <rousseau(a)debian.org> +sub 4096R/2F1BEFF0 2010-09-19 + +-----BEGIN PGP PUBLIC KEY BLOCK----- +Version: GnuPG v2.0.22 (GNU/Linux) + +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 +pRP4yT/Kvsj1Rz0cYYI= +=a5wl +-----END PGP PUBLIC KEY BLOCK----- -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit orc for openSUSE:Factory
by root＠hilbert.suse.de 01 Oct '14

01 Oct '14

Hello community, here is the log from the commit of package orc for openSUSE:Factory checked in at 2014-10-01 11:21:59 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/orc (Old) and /work/SRC/openSUSE:Factory/.orc.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "orc" Changes: -------- --- /work/SRC/openSUSE:Factory/orc/orc.changes 2014-09-20 15:49:55.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.orc.new/orc.changes 2014-10-01 11:22:01.000000000 +0200 @@ -1,0 +2,9 @@ +Tue Sep 23 20:58:44 UTC 2014 - zaitor(a)opensuse.org + +- Temp-disable testsuite on i586 until we get the random fails + sorted out with upstream. +- Drop orc-disable-test-limits.patch, and autoreconf call, and + corresponding BuildRequires, as testsuite is disabled, and patch + needing them is dropped. + +------------------------------------------------------------------- Old: ---- orc-disable-test-limits.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ orc.spec ++++++ --- /var/tmp/diff_new_pack.nVDhTF/_old 2014-10-01 11:22:02.000000000 +0200 +++ /var/tmp/diff_new_pack.nVDhTF/_new 2014-10-01 11:22:02.000000000 +0200 @@ -26,11 +26,7 @@ Url: http://cgit.freedesktop.org/gstreamer/orc Source: http://gstreamer.freedesktop.org/src/orc/%{name}-%{version}.tar.xz Source99: baselibs.conf -Patch1: orc-disable-test-limits.patch -BuildRequires: autoconf -BuildRequires: automake BuildRequires: gtk-doc -BuildRequires: libtool BuildRequires: pkg-config Provides: %{name}-devel = %{version} BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -66,10 +62,8 @@ %prep %setup -q -%patch1 -p1 %build -autoreconf -fi %configure \ --disable-static \ --enable-gtk-doc @@ -84,8 +78,9 @@ # Remove libtool archives find %{buildroot} -type f -name "*.la" -delete -print +# Temp disable check on i586 until we have sorted out the i586 fails with upstream %check -%ifnarch %{arm} +%ifnarch %{arm} || %{ix86} make check %{?_smp_mflags} %endif -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit dracut for openSUSE:Factory
by root＠hilbert.suse.de 01 Oct '14

01 Oct '14

Hello community, here is the log from the commit of package dracut for openSUSE:Factory checked in at 2014-10-01 11:21:57 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/dracut (Old) and /work/SRC/openSUSE:Factory/.dracut.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "dracut" Changes: -------- --- /work/SRC/openSUSE:Factory/dracut/dracut.changes 2014-09-24 13:09:10.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.dracut.new/dracut.changes 2014-10-01 11:21:58.000000000 +0200 @@ -1,0 +2,13 @@ +Wed Sep 24 16:21:11 UTC 2014 - trenn(a)suse.de + +- Add ip= and root=nfs.. to dracut internal cmdline to make nfsroot working + (bnc#896464) +* Add 0160-nfs-Add-ip-.-and-root-nfs.-parameters-to-internal-dr.patch +- Fix error message in case there is no internal dracut cmdline added + Simple fix +* Add 0161-Fix-error-message-when-there-are-no-internal-kernel-.patch +- Request DHCP lease instead of getting/applying the offer + No bug number, but Pawel rated this high prio. This should hit SLE12 still. +* Add 0162-network-Request-DHCP-lease-instead-of-getting-applyi.patch + +------------------------------------------------------------------- @@ -5 +18 @@ - bnc#896464 + bnc#896464, bnc#896259 New: ---- 0160-nfs-Add-ip-.-and-root-nfs.-parameters-to-internal-dr.patch 0161-Fix-error-message-when-there-are-no-internal-kernel-.patch 0162-network-Request-DHCP-lease-instead-of-getting-applyi.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ dracut.spec ++++++ --- /var/tmp/diff_new_pack.MHmmvb/_old 2014-10-01 11:22:01.000000000 +0200 +++ /var/tmp/diff_new_pack.MHmmvb/_new 2014-10-01 11:22:01.000000000 +0200 @@ -180,6 +180,9 @@ Patch157: 0157-Add-boot-zipl-to-host-devs-if-it-is-a-mount-point.patch Patch158: 0158-Add-SUSE-kernel-module-dependencies-in-etc-modprobe..patch Patch159: 0159-network-Try-to-load-xennet.patch +Patch160: 0160-nfs-Add-ip-.-and-root-nfs.-parameters-to-internal-dr.patch +Patch161: 0161-Fix-error-message-when-there-are-no-internal-kernel-.patch +Patch162: 0162-network-Request-DHCP-lease-instead-of-getting-applyi.patch BuildRequires: asciidoc BuildRequires: bash @@ -382,6 +385,9 @@ %patch157 -p1 %patch158 -p1 %patch159 -p1 +%patch160 -p1 +%patch161 -p1 +%patch162 -p1 %build %configure\ ++++++ 0159-network-Try-to-load-xennet.patch ++++++ --- /var/tmp/diff_new_pack.MHmmvb/_old 2014-10-01 11:22:01.000000000 +0200 +++ /var/tmp/diff_new_pack.MHmmvb/_new 2014-10-01 11:22:01.000000000 +0200 @@ -3,7 +3,7 @@ Date: Fri, 19 Sep 2014 15:34:54 +0200 Subject: network: Try to load xennet -bnc#896464 +bnc#896464, bnc#896259 Signed-off-by: Thomas Renninger <trenn(a)suse.de> --- ++++++ 0160-nfs-Add-ip-.-and-root-nfs.-parameters-to-internal-dr.patch ++++++ >From 25e7640c04a687f7bbd3ac2416ea2f1fef122c48 Mon Sep 17 00:00:00 2001 From: Thomas Renninger <trenn(a)suse.de> Date: Wed, 24 Sep 2014 17:23:32 +0200 Subject: nfs: Add ip=... and root=nfs... parameters to internal dracut cmdline If the rootfs is an nfs mount, also know as nfsroot, add the correct parameter to the dracut cmdline. Signed-off-by: Thomas Renninger <trenn(a)suse.de> --- modules.d/95nfs/module-setup.sh | 39 ++++++++++++++++++++++++++++++++++++++- 1 files changed, 38 insertions(+), 1 deletions(-) diff --git a/modules.d/95nfs/module-setup.sh b/modules.d/95nfs/module-setup.sh index c126efc..b6ddb21 100755 --- a/modules.d/95nfs/module-setup.sh +++ b/modules.d/95nfs/module-setup.sh @@ -31,14 +31,51 @@ installkernel() { hostonly='' instmods nfs sunrpc ipv6 nfsv2 nfsv3 nfsv4 nfs_acl nfs_layout_nfsv41_files lockd rpcsec_gss_krb5 auth_rpcgss } +cmdline() { + local nfs_device + local nfs_options + local nfs_root + local nfs_address + local lookup + local ifname + + ### nfsroot= ### + nfs_device=$(findmnt -t nfs4 -n -o SOURCE /) + if [ -n "$nfs_device" ];then + nfs_root="root=nfs4:$nfs_device" + else + nfs_device=$(findmnt -t nfs -n -o SOURCE /) + [ -z "$nfs_device" ] && return + nfs_root="root=nfs:$nfs_device" + fi + nfs_options=$(findmnt -t nfs4,nfs -n -o OPTIONS /) + [ -n "$nfs_options" ] && nfs_root="$nfs_root:$nfs_options" + echo "$nfs_root" + + ### ip= ### + if [[ $nfs_device = [0-9]*\.[0-9]*\.[0-9]*.[0-9]* ]] || [[ $nfs_device = \[.*\] ]]; then + nfs_address="$nfs_device" + else + lookup=$(host $(echo ${nfs_device%%:*})| head -n1) + nfs_address=${lookup##* } + fi + ifname=$(ip -o route get to $nfs_address | sed -n 's/.*dev $[^ ]*$.*/\1/p') + printf 'ip=%s:static\n' ${ifname} +} + # called by dracut install() { local _i local _nsslibs inst_multiple -o portmap rpcbind rpc.statd mount.nfs \ - mount.nfs4 umount rpc.idmapd sed /etc/netconfig + mount.nfs4 umount rpc.idmapd sed /etc/netconfig host sed inst_multiple /etc/services /etc/nsswitch.conf /etc/rpc /etc/protocols /etc/idmapd.conf + if [[ $hostonly_cmdline == "yes" ]]; then + local _netconf="$(cmdline)" + [[ $_netconf ]] && printf "%s\n" "$_netconf" >> "${initdir}/etc/cmdline.d/95nfs.conf" + fi + if [ -f /lib/modprobe.d/nfs.conf ]; then inst_multiple /lib/modprobe.d/nfs.conf else -- 1.7.6.1 ++++++ 0161-Fix-error-message-when-there-are-no-internal-kernel-.patch ++++++ >From 044c4999b7791f40c27bb5f92b76f67bbd6cc18a Mon Sep 17 00:00:00 2001 From: Thomas Renninger <trenn(a)suse.de> Date: Wed, 24 Sep 2014 17:35:28 +0200 Subject: Fix error message when there are no internal kernel commandline parameters Otherwise you could get messages like that: Stored kernel commandline: /usr/bin/dracut: line 1559: /var/tmp/initramfs.psHn4a/etc/cmdline.d/*.conf: No such file or directory Signed-off-by: Thomas Renninger <trenn(a)suse.de> --- dracut.sh | 12 ++++++++---- 1 files changed, 8 insertions(+), 4 deletions(-) diff --git a/dracut.sh b/dracut.sh index c301138..eab56f5 100755 --- a/dracut.sh +++ b/dracut.sh @@ -1564,10 +1564,14 @@ if ! ( echo $PARMS_TO_STORE > $initdir/lib/dracut/build-parameter.txt ); then fi if [[ $hostonly_cmdline ]] ; then - dinfo "Stored kernel commandline:" - for conf in $initdir/etc/cmdline.d/*.conf ; do - dinfo "$(< $conf)" - done + if [ -d $initdir/etc/cmdline.d ];then + dinfo "Stored kernel commandline:" + for conf in $initdir/etc/cmdline.d/*.conf ; do + dinfo "$(< $conf)" + done + else + dinfo "No dracut internal kernel commandline stored in initrd" + fi fi rm -f -- "$outfile" dinfo "*** Creating image file ***" -- 1.7.6.1 ++++++ 0162-network-Request-DHCP-lease-instead-of-getting-applyi.patch ++++++ >From b4216546ff3254f2ca21c6b29c745e1bfd4956cc Mon Sep 17 00:00:00 2001 From: Pawel Wieczorkiewicz <pwieczorkiewicz(a)suse.de> Date: Wed, 24 Sep 2014 18:14:37 +0200 Subject: network: Request DHCP lease instead of getting/applying the offer - Request ipv6 lease in proper mode: auto when auto6+dhcp6 requested otherwise managed mode - wait for DAD results in case of ipv6 Signed-off-by: Pawel Wieczorkiewicz <pwieczorkiewicz(a)suse.de> --- modules.d/40network/ifup.sh | 20 ++++++++++++++++---- 1 files changed, 16 insertions(+), 4 deletions(-) diff --git a/modules.d/40network/ifup.sh b/modules.d/40network/ifup.sh index 5cd4f68..1ff1a4a 100755 --- a/modules.d/40network/ifup.sh +++ b/modules.d/40network/ifup.sh @@ -182,9 +182,15 @@ do_dhcp() { local dhclient='' if [ "$1" = "-6" ] ; then - dhclient="wickedd-dhcp6" + local ipv6_mode='' + if [ -f /tmp/net.$netif.auto6 ] ; then + ipv6_mode="auto" + else + ipv6_mode="managed" + fi + dhclient="wickedd-dhcp6 --test --test-mode $ipv6_mode" else - dhclient="wickedd-dhcp4" + dhclient="wickedd-dhcp4 --test" fi if ! iface_has_link $netif; then @@ -198,10 +204,14 @@ do_dhcp() { fi echo "Starting dhcp for interface $netif" - $dhclient --test $netif > /tmp/leaseinfo.${netif}.dhcp.ipv${1:1:1} + $dhclient --test-format leaseinfo --test-output /tmp/leaseinfo.${netif}.dhcp.ipv${1:1:1} --test-request - $netif << EOF +<request type="lease"/> +EOF dhcp_apply $1 || return $? + if [ "$1" = "-6" ] ; then + wait_for_ipv6_dad $netif + fi - echo $netif > /tmp/setup_net_${netif}.ok return 0 } @@ -220,6 +230,7 @@ do_ipv6auto() { echo 0 > /proc/sys/net/ipv6/conf/$netif/forwarding echo 1 > /proc/sys/net/ipv6/conf/$netif/accept_ra echo 1 > /proc/sys/net/ipv6/conf/$netif/accept_redirects + echo 1 > /proc/sys/net/ipv6/conf/$netif/autoconf linkup $netif wait_for_ipv6_auto $netif @@ -492,6 +503,7 @@ for p in $(getargs ip=); do load_ipv6 do_dhcp -6 ;; auto6) + echo $netif > /tmp/net.$netif.auto6 do_ipv6auto ;; static) do_ifcfg ;; -- 1.7.6.1 -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit open-iscsi for openSUSE:Factory
by root＠hilbert.suse.de 01 Oct '14

01 Oct '14

Hello community, here is the log from the commit of package open-iscsi for openSUSE:Factory checked in at 2014-10-01 11:21:53 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/open-iscsi (Old) and /work/SRC/openSUSE:Factory/.open-iscsi.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "open-iscsi" Changes: -------- --- /work/SRC/openSUSE:Factory/open-iscsi/open-iscsi.changes 2014-07-28 06:31:23.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.open-iscsi.new/open-iscsi.changes 2014-10-01 11:21:55.000000000 +0200 @@ -1,0 +2,9 @@ +Tue Sep 23 14:09:33 PDT 2014 - lduncan(a)suse.com + +- Added fix from hannes to fixup IPv6 iBFT interface + description +- Also cherry-picked commit fro sle12 from hannes: + Allow modifications for iface.gateway and iface.subnet_mask, + needed for today's fix + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ open-iscsi-Factory-latest.diff.bz2 ++++++ ++++ 669 lines (skipped) ++++ between /work/SRC/openSUSE:Factory/open-iscsi/open-iscsi-Factory-latest.diff.bz2 ++++ and /work/SRC/openSUSE:Factory/.open-iscsi.new/open-iscsi-Factory-latest.diff.bz2 -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit libfm for openSUSE:Factory
by root＠hilbert.suse.de 01 Oct '14

01 Oct '14

Hello community, here is the log from the commit of package libfm for openSUSE:Factory checked in at 2014-10-01 09:17:54 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/libfm (Old) and /work/SRC/openSUSE:Factory/.libfm.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "libfm" Changes: -------- --- /work/SRC/openSUSE:Factory/libfm/libfm.changes 2014-09-09 19:00:35.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.libfm.new/libfm.changes 2014-10-01 09:17:55.000000000 +0200 @@ -1,0 +2,6 @@ +Fri Sep 12 16:41:20 UTC 2014 - andrea(a)opensuse.org + +- removed libfm-extra and libfm-extra-devel and files, moved to a + new bootstrap package + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libfm.spec ++++++ --- /var/tmp/diff_new_pack.GYFcjb/_old 2014-10-01 09:17:56.000000000 +0200 +++ /var/tmp/diff_new_pack.GYFcjb/_new 2014-10-01 09:17:56.000000000 +0200 @@ -47,7 +47,6 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-build %lang_package - %description A glib/gio-based library providing some file management utilities and related-widgets missing in gtk+/glib. This is the core of PCManFM. The @@ -61,7 +60,6 @@ Summary: Libfm libraries Group: System/Libraries - %description -n libfm4 libfm main library @@ -70,7 +68,6 @@ Summary: GTK libfm libraries Group: System/Libraries - %description -n libfm-gtk4 GTK system libraries for libfm @@ -78,16 +75,6 @@ Summary: Create shortcuts for LXDE Group: System/GUI/LXDE - -%package -n libfm-extra4 -Summary: EXTRA libfm features libraries -Group: System/Libraries - - -%description -n libfm-extra4 -Libraries with extra features for libfm - - %description -n lxshortcut LXShortcut is a small program used to edit application shortcuts created with freedesktop.org Desktop Entry spec. @@ -97,11 +84,10 @@ Summary: Devel files for libfm Group: Development/Libraries/C and C++ Requires: %{name} = %{version} +Requires: pkgconfig(libfm-extra) Requires: libfm4 = %{version} -Requires: libfm-extra-devel = %{version} Requires: pkg-config - %description devel A glib/gio-based lib used to develop file managers providing some file management utilities and related-widgets missing in gtk+/glib. @@ -116,26 +102,14 @@ Requires: libfm4 = %{version} Requires: pkg-config - %description -n libfm-gtk-devel GTK libfm libraries for development -%package -n libfm-extra-devel -Summary: EXTRA devel libfm features libraries -Group: Development/Libraries/C and C++ -Requires: pkg-config -Requires: libfm-extra4 = %{version} - - -%description -n libfm-extra-devel -Development files for libraries with extra features for libfm - %package doc Summary: GTK libfm libraries Group: Documentation/Other Requires: %{name} >= %{version} - %description doc libfm developers documentation @@ -144,7 +118,6 @@ %setup -q %patch0 -p1 - %build %configure \ --enable-gtk-doc \ @@ -156,7 +129,6 @@ # macro for parallel make make %{?_smp_mflags} - %install %make_install rm -f %{buildroot}%{_libdir}/*.la @@ -164,40 +136,37 @@ rm -f %{buildroot}%{_datadir}/applications/libfm-pref-apps.desktop # using libfm-pref-apps.1.gz fails! rm -f %{buildroot}%{_mandir}/man1/libfm-pref-apps.1 +# we need to remove libfm-extra stuff +rm -rf %{buildroot}%{_includedir}/%{name} +rm -rf %{buildroot}%{_includedir}/%{name}-1.0/fm-extra.h +rm -rf %{buildroot}%{_includedir}/%{name}-1.0/fm-version.h +rm -rf %{buildroot}%{_includedir}/%{name}-1.0/fm-xml-file.h +rm -rf %{buildroot}%{_libdir}/pkgconfig/%{name}-extra.pc +rm -rf %{buildroot}%{_libdir}/%{name}-extra.so +rm -rf %{buildroot}%{_libdir}/%{name}-extra.so.4 +rm -rf %{buildroot}%{_libdir}/%{name}-extra.so.4.0.2 + %find_lang %{name} %fdupes -s %{buildroot}/%{_datadir}/locale %suse_update_desktop_file -u -r -G 'Shortcut Editor' lxshortcut Utility DesktopUtility GTK - %post /sbin/ldconfig /usr/bin/update-mime-database %{_datadir}/mime &> /dev/null || : - %postun /sbin/ldconfig /usr/bin/update-mime-database %{_datadir}/mime &> /dev/null || : /usr/bin/update-desktop-database - %post -n libfm4 -p /sbin/ldconfig - %postun -n libfm4 -p /sbin/ldconfig - %post -n libfm-gtk4 -p /sbin/ldconfig - %postun -n libfm-gtk4 -p /sbin/ldconfig - -%post -n libfm-extra4 -p /sbin/ldconfig - - -%postun -n libfm-extra4 -p /sbin/ldconfig - - %files %defattr(-,root,root) %dir %{_sysconfdir}/xdg/%{name} @@ -220,22 +189,10 @@ %defattr(-,root,root) %dir %{_includedir}/%{name}-1.0 %exclude %{_includedir}/%{name}-1.0/fm-gtk*.h -%exclude %{_includedir}/%{name}-1.0/fm-extra.h -%exclude %{_includedir}/%{name}-1.0/fm-version.h -%exclude %{_includedir}/%{name}-1.0/fm-xml-file.h %{_includedir}/%{name}-1.0/*.h %{_libdir}/pkgconfig/%{name}.pc %{_libdir}/%{name}.so -%files -n libfm-extra-devel -%defattr(-,root,root) -%{_includedir}/%{name} -%{_includedir}/%{name}-1.0/fm-extra.h -%{_includedir}/%{name}-1.0/fm-version.h -%{_includedir}/%{name}-1.0/fm-xml-file.h -%{_libdir}/pkgconfig/%{name}-extra.pc -%{_libdir}/%{name}-extra.so - %files -n libfm-gtk-devel %defattr(-,root,root) %{_includedir}/%{name}-1.0/fm-gtk*.h @@ -261,16 +218,10 @@ %{_datadir}/%{name}/archivers.list %{_datadir}/%{name}/ui/*.ui -%files -n libfm-extra4 -%defattr(-,root,root) -%{_libdir}/%{name}-extra.so.4 -%{_libdir}/%{name}-extra.so.4.0.2 - %files -n lxshortcut %defattr(-,root,root) %{_bindir}/lxshortcut %{_datadir}/applications/lxshortcut.desktop %{_mandir}/man1/lxshortcut.1.gz - %changelog -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit rsyslog for openSUSE:13.1:Update
by root＠hilbert.suse.de 01 Oct '14

01 Oct '14

Hello community, here is the log from the commit of package rsyslog for openSUSE:13.1:Update checked in at 2014-10-01 08:45:54 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:13.1:Update/rsyslog (Old) and /work/SRC/openSUSE:13.1:Update/.rsyslog.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "rsyslog" Changes: -------- New Changes file: NO CHANGES FILE!!! ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ _link ++++++ --- /var/tmp/diff_new_pack.TVKbHR/_old 2014-10-01 08:45:55.000000000 +0200 +++ /var/tmp/diff_new_pack.TVKbHR/_new 2014-10-01 08:45:55.000000000 +0200 @@ -1 +1 @@ -<link package='rsyslog.2976' cicount='copy' /> +<link package='rsyslog.3026' cicount='copy' /> -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit rsyslog.3026 for openSUSE:13.1:Update
by root＠hilbert.suse.de 01 Oct '14

01 Oct '14

Hello community, here is the log from the commit of package rsyslog.3026 for openSUSE:13.1:Update checked in at 2014-10-01 08:45:50 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:13.1:Update/rsyslog.3026 (Old) and /work/SRC/openSUSE:13.1:Update/.rsyslog.3026.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "rsyslog.3026" Changes: -------- New Changes file: --- /dev/null 2014-09-26 12:09:11.568032006 +0200 +++ /work/SRC/openSUSE:13.1:Update/.rsyslog.3026.new/rsyslog.changes 2014-10-01 08:45:52.000000000 +0200 @@ -0,0 +1,1366 @@ +------------------------------------------------------------------- +Wed Sep 17 11:28:48 UTC 2014 - wagner-thomas(a)gmx.at + +- added template file for fast firewall config + +------------------------------------------------------------------- +Fri Aug 22 14:37:57 UTC 2014 - mt(a)suse.de + +- Stop syslog.socket in %preun to avoid the daemon we uninstall + gets started by a log message due to dependencies (bnc#840815). + +------------------------------------------------------------------- +Wed Dec 11 22:53:14 UTC 2013 - andreas.stieger(a)gmx.de + +- update to 7.4.7 [v7.4-stable] [bnc#855058] +- bugfix: limiting queue disk space did not work properly +- bugfix: linux kernel-like ratelimiter did not work properly with all + inputs (for example, it did not work with imdup). +- bugfix: disk queues created files in wrong working directory +- bugfix: legacy directive $ActionQueueWorkerThreads was not honored +- bugfix: segfault on startup when certain script constructs are used + e.g. "if not $msg ..." +- bugfix: imuxsock: UseSysTimeStamp config parameter did not work correctly +- bugfix: $SystemLogUseSysTimeStamp/$SystemLogUsePIDFromSystem did not work +- improved checking of queue config parameters on startup +- bugfix: call to ruleset with async queue did not use the queue +- bugfix: if imtcp is loaded and no listeners are configured (which is + uncommon), rsyslog crashes during shutdown. + +------------------------------------------------------------------- +Mon Nov 4 20:18:45 UTC 2013 - andreas.stieger(a)gmx.de + +- update to 7.4.6 [v7.4-stable] [bnc#848574] + Fixes various segfault, memory leak and buffer overrun fixes and + a selection of application bugs + - bugfix: potential abort during HUP + - bugfix: imtcp flowControl parameter incorrectly defaulted to "off" + - now requires libestr 0.1.9 for number handling in RainerScript + - bugfix: memory leak in strlen() RainerScript function + - bugfix: buffer overrun if re_extract function was called for submatch 50 + - bugfix: memleak in re_extract() function + - bugfix: potential abort in RainerScript optimizer + - bugfix: memory leak in omhiredis + - bugfix: segfault if variable was assigned to non-container subtree +- also contains changes from 7.4.5 + - mmanon: removed the check for specific "terminator characters" + - omelasticsearch: add failed.httprequests stats counter + - bugfix: invalid property filter was not properly disabled in ruleset + - bugfix: segfault if re_extract() function was used and no match found + - bugfix: potential misadressing on startup if property-filter was used + - bugfix: omelasticsearch: correct failed.http stats counter + - bugfix: omelasticsearch: did not correctly initialize stats counters + - bugfix: omelasticsearch: failed.es counter was only maintained in bulk mode + - bugfix: mmanon did not detect all IP addresses in rewrite mode + - bugfix: mmanon sometimes used invalid replacement char in simple mode + - bugfix: memory leak in mmnormalize + - bugfix: array-based ==/!= comparisions lead to invalid results + - bugfix: omprog blocked signals to executed programs + - bugfix: doc: imuxsock legacy param $SystemLogSocketParseTrusted was + misspelled + - bugfix: imfile "facility" input parameter improperly handled + - bugfix: small memory leak in imfile when $ResetConfigVariables was used + - bugfix: segfault on startup if TLS was used but no CA cert set + - bugfix: segfault on startup if TCP TLS was used but no cert or key set + - bugfix: some more build problems with newer json-c versions + - bugfix: build system: libgcrypt.h needed even if libgrcypt was disabled +- fix ppc build, add patch from upstream to fix build on platforms + without atomic instructions + rsyslog-7.4.6-omelasticsearch-atomic-instructions-ppc.patch +------------------------------------------------------------------- +Thu Sep 12 21:42:29 UTC 2013 - andreas.stieger(a)gmx.de + +- update to 7.4.4 [v7.4-stable] +- better error messages in GuardTime signature provider +- make rsyslog use the new json-c pkgconfig file if available +- bugfix: imfile parameter "persistStateInterval" was unusable + due to a case typo in imfile; work-around was to use legacy config +- bugfix: TLV16 flag encoding error in signature files from GT provider + This fixes a problem where the TLV16 flag was improperly encoded. + Unfortunately, existing files already have the bug and may not properly + be processed. The fix uses constants from the GuardTime API lib to + prevent such problems in the future. +- bugfix: slightly malformed SMTP handling in ommail +- bugfix: segfault in omprog if no template was provided (now dflt is used) +- bugfix: segfault in ompipe if no template was provided (now dflt is used) +- bugfix: segfault in omsnmp if no template was provided (now dflt is used) +- bugfix: some omsnmp optional config params were flagged as mandatory +- bugfix: segfault in omelasticsearch when resuming queued messages + after restarting Elasticsearch +- bugfix: imtcp addtlframedelimiter could not be set to zero +- doc bugfix: remove no-longer existing omtemplate from developer doc + was specifically mentioned as a sample for creating new plugins + +------------------------------------------------------------------- +Sat Jul 20 12:52:05 UTC 2013 - andreas.stieger(a)gmx.de + +- update to 7.4.3 [v7.4-stable] + - bugfix: memory leak if disk queues were used and json data + rresent + - bugfix: CEE/json data was lost during disk queue operation + - bugfix: potential segfault during startup on invalid config + - bugfix: 100% CPU utilization when DA queue became full + - bugfix: omlibdbi did not properly close connection on some + errors + - cosmetic bugfix: file name buffer was not freed on disk queue + destruction + +------------------------------------------------------------------- +Fri Jul 5 08:25:02 UTC 2013 - mt(a)suse.de + +- Update to 7.4.2 [v7.4-stable] (bnc#828140,CVE-2013-4758): + - bugfix: in RFC5425 TLS, multiple wildcards in auth could cause + segfault + - bugfix: RainerScript object required parameters were not properly + checked - this clould result to segfaults on startup if parameters + were missing. + - bugfix: double-free in omelasticsearch + closes: http://bugzilla.adiscon.com/show_bug.cgi?id=461 + a security advisory for this bug is available at: + http://www.lsexperts.de/advisories/lse-2013-07-03.txt + PLEASE NOTE: This issue only existed if omelasticsearch was used + in a non-default configuration, where the "errorfile" parameter + was specified. Without that parameter set, the bug could not be + triggered. Thanks to Markus Vervier and Marius Ionescu for providing + a detailled bug report. Special thanks to Markus for coordinating + his security advisory with us. + - bugfix: omrelp potential segfault at startup on invalid config + parameters + - bugfix: small memory leak when $uptime property was used + - bugfix: potential segfault on rsyslog termination in imudp + closes: http://bugzilla.adiscon.com/show_bug.cgi?id=456 + - bugfix: lmsig_gt abort on invalid configuration parameters + closes: http://bugzilla.adiscon.com/show_bug.cgi?id=448 + Thanks to Risto Laanoja for the patch. + - imtcp: fix typo in "listner" parameter, which is "listener" + Currently, both names are accepted. + - solved build problems on FreeBSD + closes: http://bugzilla.adiscon.com/show_bug.cgi?id=457 + closes: http://bugzilla.adiscon.com/show_bug.cgi?id=458 + Thanks to Christiano for reproting and suggesting patches + - solved build problems on CENTOS5 + +------------------------------------------------------------------- +Wed Jun 26 10:48:34 UTC 2013 - mt(a)suse.de + +- Use --enable-cached-man-pages configure option on SLES-11, where + rst2man is not available and removed prebuilt man pages. + +------------------------------------------------------------------- +Sat Jun 22 20:54:14 UTC 2013 - andreas.stieger(a)gmx.de + +- update to 7.4.1 [v7.4-stable]: + - imjournal: add ratelimiting capability + - bugfix imzmq3: potential segfault on startup +- includes changes from 7.4.0 [v7.4-stable]: + - doc bugfix: ReadMode wrong in imfile doc, two values were swapped + - imjournal: no longer do periodic wakeup + - bugfix: potential hang *in debug mode* on rsyslogd termination + - bugfix: $template statement with multiple spaces lead to invalid tpl name + - 0mq fixes +- includes changes from version 7.3.15 + - bugfix: problem in build system (especially when cross-compiling) + - bugfix: imjournal had problem with systemd journal API change + - imjournal: now obtain and include PID + - bugfix: .logsig files had tlv16 indicator bit at wrong offset + - bugfix: omrelp legacy config parameters set a timeout of zero + which lead the legacy config to be unusable. + - bugfix: segfault on startup if a disk queue was configure without file + name + - bugfix: invalid addressing in string class (recent regression) +- packaging changes: + - rebase rsyslog-unit.patch + - move libee/liblognorm dependencies to mmnormalize conditional + +------------------------------------------------------------------- +Fri Jun 14 04:17:57 UTC 2013 - crrodriguez(a)opensuse.org + +- Required version of pkgconfig(relp) is >= 1.0.3 +- Requires version of libsystemd-journal is >= 197 +- Notify systemd on sucessful startup of the daemon to avoid + confusing behaviour such as : + http://lists.opensuse.org/opensuse/2013-06/msg00603.html + +------------------------------------------------------------------- +Mon May 13 09:42:56 UTC 2013 - mt(a)suse.de + +- Fixed SLES-11 build that does not have rst2man/python-docutils; + added pre-built rscryutil.1 and rsgtutil.1 as sources because + v7.3.14 does not ship them pre-built any more. + +------------------------------------------------------------------- +Tue May 7 18:27:48 UTC 2013 - mt(a)suse.de + +- update to 7.3.14 [beta] 2013-05-06: + - bugfix: some man pages were not properly installed either + rscryutil or rsgtutil man was installed, but not both. + Thanks to Marius Tomaschewski for the patch. ++++ 1169 more lines (skipped) ++++ between /dev/null ++++ and /work/SRC/openSUSE:13.1:Update/.rsyslog.3026.new/rsyslog.changes New: ---- rsyslog-7.4.6-omelasticsearch-atomic-instructions-ppc.patch rsyslog-7.4.7.tar.gz rsyslog-service-prepare.in rsyslog-unit.patch rsyslog.changes rsyslog.conf.in rsyslog.d.remote.conf.in rsyslog.firewall rsyslog.spec rsyslog.sysconfig ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ rsyslog.spec ++++++ ++++ 1036 lines (skipped) ++++++ rsyslog-7.4.6-omelasticsearch-atomic-instructions-ppc.patch ++++++ From: Rainer Gerhards <rgerhards(a)adiscon.com> Date: Fri, 18 Oct 2013 05:11:44 +0000 (+0200) Subject: bugfix: omelasticsearch did not compile on platforms without atomic instructions X-Git-Url: http://git.adiscon.com/?p=rsyslog.git;a=commitdiff_plain;h=16207e3d55ac6bb1… References: http://git.adiscon.com/?p=rsyslog.git;a=commitdiff;h=16207e3d55ac6bb15af6d5… Fixes build on ppc. [ 249s] In file included from ../../runtime/prop.h:25:0, [ 249s] from ../../runtime/glbl.h:35, [ 249s] from ../../runtime/stream.h:70, [ 249s] from ../../runtime/obj.h:48, [ 249s] from ../../runtime/rsyslog.h:525, [ 249s] from omelasticsearch.c:26: [ 249s] omelasticsearch.c: In function 'curlPost': [ 249s] omelasticsearch.c:611:39: error: 'mutHTTPReqFail' undeclared (first use in this function) [ 249s] STATSCOUNTER_INC(indexHTTPReqFail, mutHTTPReqFail); and similar --- plugins/omelasticsearch/omelasticsearch.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) Index: rsyslog-7.4.6/plugins/omelasticsearch/omelasticsearch.c =================================================================== --- rsyslog-7.4.6.orig/plugins/omelasticsearch/omelasticsearch.c 2013-10-29 15:08:48.000000000 +0000 +++ rsyslog-7.4.6/plugins/omelasticsearch/omelasticsearch.c 2013-11-04 20:00:38.000000000 +0000 @@ -608,7 +608,7 @@ curlPost(instanceData *pData, uchar *mes case CURLE_COULDNT_RESOLVE_PROXY: case CURLE_COULDNT_CONNECT: case CURLE_WRITE_ERROR: - STATSCOUNTER_INC(indexHTTPReqFail, mutHTTPReqFail); + STATSCOUNTER_INC(indexHTTPReqFail, mutIndexHTTPReqFail); indexHTTPFail += nmsgs; DBGPRINTF("omelasticsearch: we are suspending ourselfs due " "to failure %lld of curl_easy_perform()\n", @@ -1001,16 +1001,16 @@ CODEmodInit_QueryRegCFSLineHdlr /* support statistics gathering */ CHKiRet(statsobj.Construct(&indexStats)); CHKiRet(statsobj.SetName(indexStats, (uchar *)"omelasticsearch")); - STATSCOUNTER_INIT(indexSubmit, mutCtrIndexSubmit); + STATSCOUNTER_INIT(indexSubmit, mutIndexSubmit); CHKiRet(statsobj.AddCounter(indexStats, (uchar *)"submitted", ctrType_IntCtr, &indexSubmit)); - STATSCOUNTER_INIT(indexHTTPFail, mutCtrIndexHTTPFail); + STATSCOUNTER_INIT(indexHTTPFail, mutIndexHTTPFail); CHKiRet(statsobj.AddCounter(indexStats, (uchar *)"failed.http", ctrType_IntCtr, &indexHTTPFail)); - STATSCOUNTER_INIT(indexHTTPReqFail, mutCtrIndexHTTPReqFail); + STATSCOUNTER_INIT(indexHTTPReqFail, mutIndexHTTPReqFail); CHKiRet(statsobj.AddCounter(indexStats, (uchar *)"failed.httprequests", ctrType_IntCtr, &indexHTTPReqFail)); - STATSCOUNTER_INIT(indexESFail, mutCtrIndexESFail); + STATSCOUNTER_INIT(indexESFail, mutIndexESFail); CHKiRet(statsobj.AddCounter(indexStats, (uchar *)"failed.es", ctrType_IntCtr, &indexESFail)); CHKiRet(statsobj.ConstructFinalize(indexStats)); ++++++ rsyslog-service-prepare.in ++++++ #!/bin/sh test -s "/etc/sysconfig/syslog" && \ . "/etc/sysconfig/syslog" run_dir="RUN_DIR" cfg_file="ADDITIONAL_SOCKETS" umask 0022 /bin/mkdir -p -m 0755 "${run_dir}" # # Prepare include with sockets in chroot's # > "${cfg_file}" for variable in ${!SYSLOGD_ADDITIONAL_SOCKET*}; do eval value=\$$variable test -z "$value" && continue test -d "${value%/*}" || continue echo "\$AddUnixListenSocket $value" done >> "${cfg_file}" # # make sure xconsole exists and is a pipe # if test -e /dev/xconsole -a ! -p /dev/xconsole ; then /bin/rm -f /dev/xconsole fi if test ! -e /dev/xconsole ; then /bin/mknod -m 0600 /dev/xconsole p /bin/chown root:tty /dev/xconsole restorecon /dev/xconsole 2> /dev/null fi exit 0 ++++++ rsyslog-unit.patch ++++++ --- rsyslog.service.in | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) Index: rsyslog-7.4.1/rsyslog.service.in =================================================================== --- rsyslog-7.4.1.orig/rsyslog.service.in 2013-06-17 06:50:28.000000000 +0100 +++ rsyslog-7.4.1/rsyslog.service.in 2013-06-22 21:41:46.000000000 +0100 @@ -1,11 +1,18 @@ [Unit] Description=System Logging Service Requires=syslog.socket +Requires=var-run.mount +After=var-run.mount +Conflicts=syslog-ng.service syslogd.service [Service] Type=notify -ExecStart=@sbindir@/rsyslogd -n +ExecStart=@sbindir@/rsyslogd -n $RSYSLOGD_PARAMS StandardOutput=null +Environment=RSYSLOGD_PARAMS= +ExecStartPre=@sbindir@/rsyslog-service-prepare +EnvironmentFile=-/etc/sysconfig/syslog +ExecReload=/bin/kill -HUP $MAINPID [Install] WantedBy=multi-user.target ++++++ rsyslog.conf.in ++++++ ## ## === When you're using remote logging, enable on-disk queues === ## === in rsyslog.d/remote.conf. When neccesary also set the === ## === SYSLOG_REQUIRES_NETWORK=yes in /etc/sysconfig/syslog, === ## === e.g. when rsyslog has to receive on a specific IP only. === ## ## Note, that when the MYSQL, PGSQL, GSSAPI, GnuTLS or SNMP modules ## (provided in separate rsyslog-module-* packages) are enabled, the ## configuration can't be used on a system with /usr on a remote ## filesystem, except on newer systems where initrd mounts /usr. ## [The modules are linked against libraries installed bellow of ## /usr thus also installed in /usr/lib*/rsyslog because of this.] ## # # if you experience problems, check # http://www.rsyslog.com/troubleshoot for assistance # and report them at http://bugzilla.novell.com/ # # since rsyslog v3: load input modules # If you do not load inputs, nothing happens! # provides --MARK-- message capability (every 1 hour) $ModLoad immark.so $MarkMessagePeriod 3600 # provides support for local system logging (e.g. via logger command) $ModLoad imuxsock.so # reduce dupplicate log messages (last message repeated n times) $RepeatedMsgReduction on # kernel logging (may be also provided by /sbin/klogd) # see also http://www.rsyslog.com/doc-imklog.html. $ModLoad imklog.so # set log level 1 (same as in /etc/sysconfig/syslog). $klogConsoleLogLevel 1 # Use rsyslog native, rfc5424 conform log format as default # ($ActionFileDefaultTemplate RSYSLOG_FileFormat). # # To change a single file to use obsolete BSD syslog format # (rfc 3164, no high-precision timestamps), set the variable # bellow or append ";RSYSLOG_FileFormat" to the filename. # See # http://www.rsyslog.com/doc/rsyslog_conf_templates.html # for more informations. # #$ActionFileDefaultTemplate RSYSLOG_TraditionalFileFormat # # Include config generated by /etc/init.d/syslog script # using the SYSLOGD_ADDITIONAL_SOCKET* variables in the # /etc/sysconfig/syslog file. # $IncludeConfig ADDITIONAL_SOCKETS # # Include config files, that the admin provided? : # $IncludeConfig ETC_RSYSLOG_D_GLOB ### # print most important on tty10 and on the xconsole pipe # if ( \ /* kernel up to warning except of firewall */ \ ($syslogfacility-text == 'kern') and \ ($syslogseverity <= 4 /* warning */ ) and not \ ($msg contains 'IN=' and $msg contains 'OUT=') \ ) or ( \ /* up to errors except of facility authpriv */ \ ($syslogseverity <= 3 /* errors */ ) and not \ ($syslogfacility-text == 'authpriv') \ ) \ then /dev/tty10 & |/dev/xconsole # Emergency messages to everyone logged on (wall) *.emerg :omusrmsg:* # enable this, if you want that root is informed # immediately, e.g. of logins #*.alert root # # firewall messages into separate file and stop their further processing # if ($syslogfacility-text == 'kern') and \ ($msg contains 'IN=' and $msg contains 'OUT=') \ then -/var/log/firewall & stop # # acpid messages into separate file and stop their further processing # # => all acpid messages for debuging (uncomment if needed): #if ($programname == 'acpid' or $syslogtag == '[acpid]:') then \ # -/var/log/acpid # # => up to notice (skip info and debug) if ($programname == 'acpid' or $syslogtag == '[acpid]:') and \ ($syslogseverity <= 5 /* notice */) \ then -/var/log/acpid & stop # # NetworkManager into separate file and stop their further processing # if ($programname == 'NetworkManager') or \ ($programname startswith 'nm-') \ then -/var/log/NetworkManager & stop # # email-messages # mail.* -/var/log/mail mail.info -/var/log/mail.info mail.warning -/var/log/mail.warn mail.err /var/log/mail.err # # news-messages # news.crit -/var/log/news/news.crit news.err -/var/log/news/news.err news.notice -/var/log/news/news.notice # enable this, if you want to keep all news messages # in one file #news.* -/var/log/news.all # # Warnings in one file # *.=warning;*.=err -/var/log/warn *.crit /var/log/warn # # the rest in one file # *.*;mail.none;news.none -/var/log/messages # # enable this, if you want to keep all messages # in one file #*.* -/var/log/allmessages # # Some foreign boot scripts require local7 # local0.*;local1.* -/var/log/localmessages local2.*;local3.* -/var/log/localmessages local4.*;local5.* -/var/log/localmessages local6.*;local7.* -/var/log/localmessages ### ++++++ rsyslog.d.remote.conf.in ++++++ ## ## === When you're using remote logging, enable on-disk queues === ## === in rsyslog.d/remote.conf. When neccesary also set the === ## === SYSLOG_REQUIRES_NETWORK=yes in /etc/sysconfig/syslog, === ## === e.g. when rsyslog has to receive on a specific IP only. === ## ## Note, that when the MYSQL, PGSQL, GSSAPI, GnuTLS or SNMP modules ## (provided in separate rsyslog-module-* packages) are enabled, the ## configuration can't be used on a system with /usr on a remote ## filesystem, except on newer systems where initrd mounts /usr. ## [The modules are linked against libraries installed bellow of ## /usr thus also installed in /usr/lib*/rsyslog because of this.] ## # ######### Enable On-Disk queues for remote logging ########## # # An on-disk queue is created for this action. If the remote host is # down, messages are spooled to disk and sent when it is up again. # #$WorkDirectory RSYSLOG_SPOOL_DIR # where to place spool files #$ActionQueueFileName uniqName # unique name prefix for spool files #$ActionQueueMaxDiskSpace 1g # 1gb space limit (use as much as possible) #$ActionQueueSaveOnShutdown on # save messages to disk on shutdown #$ActionQueueType LinkedList # run asynchronously #$ActionResumeRetryCount -1 # infinite retries if host is down # ######### Sending Messages to Remote Hosts ########## # Remote Logging using TCP for reliable delivery # remote host is: name/ip:port, e.g. 192.168.0.1:514, port optional #*.* @@remote-host # Remote Logging using UDP # remote host is: name/ip:port, e.g. 192.168.0.1:514, port optional #*.* @remote-host # ######### Receiving Messages from Remote Hosts ########## # TCP Syslog Server: # provides TCP syslog reception and GSS-API (if compiled to support it) #$ModLoad imtcp.so # load module ##$UDPServerAddress 10.10.0.1 # force to listen on this IP only, ## # needs SYSLOG_REQUIRES_NETWORK=yes. #$InputTCPServerRun <port> # Starts a TCP server on selected port # UDP Syslog Server: #$ModLoad imudp.so # provides UDP syslog reception ##$UDPServerAddress 10.10.0.1 # force to listen on this IP only, ## # needs SYSLOG_REQUIRES_NETWORK=yes. #$UDPServerRun 514 # start a UDP syslog server at standard port 514 ########### Encrypting Syslog Traffic with TLS ########## # -- TLS Syslog Server: ## make gtls driver the default #$DefaultNetstreamDriver gtls # ## certificate files #$DefaultNetstreamDriverCAFile ETC_RSYSLOG_D_DIR/ca.pem #$DefaultNetstreamDriverCertFile ETC_RSYSLOG_D_DIR/server_cert.pem #$DefaultNetstreamDriverKeyFile ETC_RSYSLOG_D_DIR/server_key.pem # #$ModLoad imtcp # load TCP listener # #$InputTCPServerStreamDriverMode 1 # run driver in TLS-only mode #$InputTCPServerStreamDriverAuthMode anon # client is NOT authenticated #$InputTCPServerRun 10514 # start up listener at port 10514 # # -- TLS Syslog Client: ## certificate files - just CA for a client #$DefaultNetstreamDriverCAFile ETC_RSYSLOG_D_DIR/ca.pem # ## set up the action #$DefaultNetstreamDriver gtls # use gtls netstream driver #$ActionSendStreamDriverMode 1 # require TLS for the connection #$ActionSendStreamDriverAuthMode anon # server is NOT authenticated #*.* @@(o)server.example.net:10514 # send (all) messages ++++++ rsyslog.firewall ++++++ # Do not edit this file as it's just a template and will be # overwritten on package updates! Copy to a new file instead. # Fill in the required variables and delete the unused ones. # If in doubt ask security(a)suse.de # # Only the variables TCP, UDP, RPC, IP, BROADCAST, RELATED and # MODULES are allowed. More may be supported in the future. # # For a more detailed description of the individual variables see # the comments for FW_SERVICES_*_EXT in /etc/sysconfig/SuSEfirewall2 # ## Name: Syslog Server ## Description: Opens ports to accept remote syslog clients. # space separated list of allowed TCP ports TCP="" # space separated list of allowed UDP ports UDP="syslog" # space separated list of allowed RPC services RPC="" # space separated list of allowed IP protocols IP="" # space separated list of allowed UDP ports that accept broadcasts BROADCAST="" ### variables below are only needed in very special cases # space separated list of net,protocol[,sport[,dport]] # see FW_SERVICES_ACCEPT_RELATED_EXT # net 0/0 means IPv4 and IPv6. If this sevice should only work for # IPv4 use 0.0.0.0/0 RELATED="" # additional kernel modules needed for this service # see FW_LOAD_MODULES MODULES="" ++++++ rsyslog.sysconfig ++++++ ## Type: string ## Default: "" ## Config: "" ## ServiceRestart: syslog # # Parameters for rsyslogd, except of the version compatibility (-c) # and the config file (-f), because they're used by sysconfig and # earlysysconfig init scripts. # # See also the RSYSLOGD_COMPAT_VERSION variable in this file, the # documentation provided in /usr/share/doc/packages/rsyslog/doc by # the rsyslog-doc package and the rsyslogd(8) and rsyslog.conf(5) # manual pages. # RSYSLOGD_PARAMS="" -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit gnome-code-assistance for openSUSE:Factory
by root＠hilbert.suse.de 01 Oct '14

01 Oct '14

Hello community, here is the log from the commit of package gnome-code-assistance for openSUSE:Factory checked in at 2014-10-01 07:40:35 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/gnome-code-assistance (Old) and /work/SRC/openSUSE:Factory/.gnome-code-assistance.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "gnome-code-assistance" Changes: -------- --- /work/SRC/openSUSE:Factory/gnome-code-assistance/gnome-code-assistance.changes 2014-05-05 21:15:53.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.gnome-code-assistance.new/gnome-code-assistance.changes 2014-10-01 07:40:52.000000000 +0200 @@ -1,0 +2,17 @@ +Mon Sep 29 10:43:49 UTC 2014 - dimstar(a)opensuse.org + +- Use vala 0.26 with GNOME 3.14: + + Replace pkgconfig(libvala-0.24) BuildRequires with + pkgconfig(libvala-0.26). + + Use sed to add libvala-0.26 as supported vala version to + configure. + +------------------------------------------------------------------- +Tue Sep 9 18:06:46 UTC 2014 - mrueckert(a)suse.de + +- Fix buildrequires for the ruby support: + - ruby(abi) is no longer numerical. Use versioned ruby + BuildRequires. + - Use rubygem(ruby-dbus) instead of rubygem-ruby-dbus. + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ gnome-code-assistance.spec ++++++ --- /var/tmp/diff_new_pack.ap90w0/_old 2014-10-01 07:40:52.000000000 +0200 +++ /var/tmp/diff_new_pack.ap90w0/_new 2014-10-01 07:40:52.000000000 +0200 @@ -34,8 +34,8 @@ # C backend BuildRequires: llvm-devel # Ruby backend -BuildRequires: rubygem-ruby-dbus -BuildRequires: ruby(abi) >= 2.0 +BuildRequires: ruby >= 2.0 +BuildRequires: rubygem(ruby-dbus) # GJS Backend BuildRequires: gjs # Vala backend @@ -43,7 +43,7 @@ BuildRequires: pkgconfig(gio-2.0) >= 2.36 BuildRequires: pkgconfig(glib-2.0) >= 2.36 BuildRequires: pkgconfig(gobject-2.0) >= 2.36 -BuildRequires: pkgconfig(libvala-0.24) +BuildRequires: pkgconfig(libvala-0.26) BuildRequires: pkgconfig(vapigen) BuildRoot: %{_tmppath}/%{name}-%{version}-build %glib2_gsettings_schema_requires @@ -56,6 +56,7 @@ %prep %setup -q +sed -i "s:libvala-0.24:libvala-0.26 libvala-0.24:" configure %build %configure \ -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0