April 2014 - openSUSE Commits - openSUSE Mailing Lists

commit librelp for openSUSE:Factory
by root＠hilbert.suse.de 30 Apr '14

30 Apr '14

Hello community, here is the log from the commit of package librelp for openSUSE:Factory checked in at 2014-04-30 15:06:41 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/librelp (Old) and /work/SRC/openSUSE:Factory/.librelp.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "librelp" Changes: -------- --- /work/SRC/openSUSE:Factory/librelp/librelp.changes 2014-03-22 09:08:36.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.librelp.new/librelp.changes 2014-04-30 15:06:42.000000000 +0200 @@ -1,0 +2,11 @@ +Tue Apr 29 17:07:46 UTC 2014 - andreas.stieger(a)gmx.de + +- update to 1.2.7 + - bugfix: librelp was incompatible with C++ without a real reason + - bugfix: potential misadressing in wildcard match + - bugfix: always last wildcard match was reported, not first +- contains changes from 1.2.6 + - report error when preparing for non-anon TLS and this is + unsupported + +------------------------------------------------------------------- Old: ---- librelp-1.2.5.tar.gz New: ---- librelp-1.2.7.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ librelp.spec ++++++ --- /var/tmp/diff_new_pack.Kj9bF2/_old 2014-04-30 15:06:43.000000000 +0200 +++ /var/tmp/diff_new_pack.Kj9bF2/_new 2014-04-30 15:06:43.000000000 +0200 @@ -16,17 +16,17 @@ # -Name: librelp %define library_name librelp0 -Version: 1.2.5 +Name: librelp +Version: 1.2.7 Release: 0 -BuildRoot: %{_tmppath}/%{name}-%{version}-build -Url: http://www.librelp.com/ -Source: http://download.rsyslog.com/librelp/%{name}-%{version}.tar.gz Summary: A reliable logging library License: GPL-3.0+ Group: Development/Libraries/C and C++ +Url: http://www.librelp.com/ +Source: http://download.rsyslog.com/librelp/%{name}-%{version}.tar.gz BuildRequires: pkgconfig +BuildRoot: %{_tmppath}/%{name}-%{version}-build %if 0%{?sles_version} && 0%{?sles_version} <= 11 BuildRequires: libgnutls-devel >= 2.0.0 %else @@ -53,17 +53,11 @@ provide ample opportunity to extend the protocol without affecting existing applications. - -Authors: --------- - Rainer Gerhards <rgerhards(a)adiscon.com> - - -%package -n %library_name +%package -n %{library_name} Summary: A reliable logging library Group: Development/Libraries/C and C++ -%description -n %library_name +%description -n %{library_name} librelp is an easy to use library for the RELP protocol. RELP in turn provides reliable event logging over the network (and consequently RELP stands for Reliable Event Logging Protocol). RELP was initiated by Rainer Gerhards after @@ -83,15 +77,10 @@ provide ample opportunity to extend the protocol without affecting existing applications. - -Authors: --------- - Rainer Gerhards <rgerhards(a)adiscon.com> - %package devel -Requires: %{library_name} = %{version} Summary: A reliable logging library Group: Development/Libraries/C and C++ +Requires: %{library_name} = %{version} Requires: libgnutls-devel >= 1.4.0 %description devel @@ -114,11 +103,6 @@ provide ample opportunity to extend the protocol without affecting existing applications. - -Authors: --------- - Rainer Gerhards <rgerhards(a)adiscon.com> - %prep %setup -q @@ -127,8 +111,8 @@ make %{?_smp_mflags} %install -%makeinstall -%{__rm} %{buildroot}%{_libdir}/librelp.la +make DESTDIR=%{buildroot} install %{?_smp_mflags} +rm %{buildroot}%{_libdir}/librelp.la %post -n %{library_name} -p /sbin/ldconfig ++++++ librelp-1.2.5.tar.gz -> librelp-1.2.7.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/librelp-1.2.5/ChangeLog new/librelp-1.2.7/ChangeLog --- old/librelp-1.2.5/ChangeLog 2014-03-20 14:23:37.000000000 +0100 +++ new/librelp-1.2.7/ChangeLog 2014-04-28 17:59:02.000000000 +0200 @@ -1,4 +1,22 @@ ---------------------------------------------------------------------- +Version 1.2.7 - 2014-04-29 +- bugfix: librelp was incompatible with C++ without a real reason + Thanks to Ivan Kryak for the patch +- bugfix: potential misadressing in wildcard match + see: https://github.com/rsyslog/librelp/pull/3 + Thanks to Sebastian Schmidt for the patch. +- bugfix: always last wildcard match was reported, not first + see: https://github.com/rsyslog/librelp/pull/4 + Thanks to Sebastian Schmidt for the patch. +---------------------------------------------------------------------- +Version 1.2.6 - 2014-03-20 +- report error when preparing for non-anon TLS and this is unsupported + The error is reported when the processes own certificate is set, + which also turns off anon TLS. We now check if TLS AUTH is supported + and, if not, return an error. This enables better error tracking + in the client, as otherwise the problem is reported much later + or even not at all (in the case of a relp server). +---------------------------------------------------------------------- Version 1.2.5 - 2014-03-20 - permit to use anonymous TLS on platforms where GnuTLS misses certificate verification function. This permits to use at least diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/librelp-1.2.5/configure new/librelp-1.2.7/configure --- old/librelp-1.2.5/configure 2014-03-20 14:24:38.000000000 +0100 +++ new/librelp-1.2.7/configure 2014-04-28 17:59:19.000000000 +0200 @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.69 for librelp 1.2.5. +# Generated by GNU Autoconf 2.69 for librelp 1.2.7. # # Report bugs to <rgerhards(a)adiscon.com>. # @@ -590,8 +590,8 @@ # Identity of this package. PACKAGE_NAME='librelp' PACKAGE_TARNAME='librelp' -PACKAGE_VERSION='1.2.5' -PACKAGE_STRING='librelp 1.2.5' +PACKAGE_VERSION='1.2.7' +PACKAGE_STRING='librelp 1.2.7' PACKAGE_BUGREPORT='rgerhards(a)adiscon.com' PACKAGE_URL='' @@ -1323,7 +1323,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 librelp 1.2.5 to adapt to many kinds of systems. +\`configure' configures librelp 1.2.7 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1393,7 +1393,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of librelp 1.2.5:";; + short | recursive ) echo "Configuration of librelp 1.2.7:";; esac cat <<\_ACEOF @@ -1508,7 +1508,7 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -librelp configure 1.2.5 +librelp configure 1.2.7 generated by GNU Autoconf 2.69 Copyright (C) 2012 Free Software Foundation, Inc. @@ -2034,7 +2034,7 @@ This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by librelp $as_me 1.2.5, which was +It was created by librelp $as_me 1.2.7, which was generated by GNU Autoconf 2.69. Invocation command line was $ $0 $@ @@ -2897,7 +2897,7 @@ # Define the identity of the package. PACKAGE='librelp' - VERSION='1.2.5' + VERSION='1.2.7' cat >>confdefs.h <<_ACEOF @@ -2970,7 +2970,7 @@ # Define the identity of the package. PACKAGE='librelp' - VERSION='1.2.5' + VERSION='1.2.7' cat >>confdefs.h <<_ACEOF @@ -13321,7 +13321,7 @@ # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by librelp $as_me 1.2.5, which was +This file was extended by librelp $as_me 1.2.7, which was generated by GNU Autoconf 2.69. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -13387,7 +13387,7 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ -librelp config.status 1.2.5 +librelp config.status 1.2.7 configured by $0, generated by GNU Autoconf 2.69, with options \\"\$ac_cs_config\\" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/librelp-1.2.5/configure.ac new/librelp-1.2.7/configure.ac --- old/librelp-1.2.5/configure.ac 2014-03-20 14:21:44.000000000 +0100 +++ new/librelp-1.2.7/configure.ac 2014-04-28 17:58:53.000000000 +0200 @@ -2,7 +2,7 @@ # Process this file with autoconf to produce a configure script. AC_PREREQ(2.61) -AC_INIT([librelp], [1.2.5], [rgerhards(a)adiscon.com]) +AC_INIT([librelp], [1.2.7], [rgerhards(a)adiscon.com]) AM_INIT_AUTOMAKE AM_INIT_AUTOMAKE m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])]) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/librelp-1.2.5/src/librelp.h new/librelp-1.2.7/src/librelp.h --- old/librelp-1.2.5/src/librelp.h 2014-03-20 09:02:05.000000000 +0100 +++ new/librelp-1.2.7/src/librelp.h 2014-04-28 17:52:11.000000000 +0200 @@ -50,7 +50,6 @@ typedef struct relpSendbuf_s relpSendbuf_t; typedef struct relpOffers_s relpOffers_t; typedef struct relpOffer_s relpOffer_t; -typedef enum relpCmdEnaState_e relpCmdEnaState_t; /* IDs of librelp objects */ typedef enum relpObjID_e { @@ -85,6 +84,7 @@ eRelpCmdState_Disabled = 5 /**< feature can NOT be used (set during open handshake) */ }; +typedef enum relpCmdEnaState_e relpCmdEnaState_t; /* macro to assert we are dealing with the right relp object */ #ifdef NDEBUG diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/librelp-1.2.5/src/relpsrv.c new/librelp-1.2.7/src/relpsrv.c --- old/librelp-1.2.5/src/relpsrv.c 2014-03-14 08:02:16.000000000 +0100 +++ new/librelp-1.2.7/src/relpsrv.c 2014-03-24 15:03:33.000000000 +0100 @@ -349,11 +349,11 @@ CHKRet(relpTcpEnableTLSZip(pTcp)); } relpTcpSetDHBits(pTcp, pThis->dhBits); - relpTcpSetGnuTLSPriString(pTcp, pThis->pristring); - relpTcpSetAuthMode(pTcp, pThis->authmode); - relpTcpSetCACert(pTcp, pThis->caCertFile); - relpTcpSetOwnCert(pTcp, pThis->ownCertFile); - relpTcpSetPrivKey(pTcp, pThis->privKey); + CHKRet(relpTcpSetGnuTLSPriString(pTcp, pThis->pristring)); + CHKRet(relpTcpSetAuthMode(pTcp, pThis->authmode)); + CHKRet(relpTcpSetCACert(pTcp, pThis->caCertFile)); + CHKRet(relpTcpSetOwnCert(pTcp, pThis->ownCertFile)); + CHKRet(relpTcpSetPrivKey(pTcp, pThis->privKey)); CHKRet(relpTcpSetPermittedPeers(pTcp, &(pThis->permittedPeers))); } CHKRet(relpTcpLstnInit(pTcp, (pThis->pLstnPort == NULL) ? (unsigned char*) RELP_DFLT_PORT : pThis->pLstnPort, pThis->ai_family)); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/librelp-1.2.5/src/tcp.c new/librelp-1.2.7/src/tcp.c --- old/librelp-1.2.5/src/tcp.c 2014-03-20 09:02:05.000000000 +0100 +++ new/librelp-1.2.7/src/tcp.c 2014-04-22 15:33:25.000000000 +0200 @@ -482,8 +482,12 @@ if(cert == NULL) { pThis->privKeyFile = NULL; } else { - if((pThis->privKeyFile = strdup(cert)) == NULL) - ABORT_FINALIZE(RELP_RET_OUT_OF_MEMORY); +# ifdef HAVE_GNUTLS_CERTIFICATE_SET_VERIFY_FUNCTION + if((pThis->privKeyFile = strdup(cert)) == NULL) + ABORT_FINALIZE(RELP_RET_OUT_OF_MEMORY); +# else + ABORT_FINALIZE(RELP_RET_ERR_NO_TLS_AUTH); +# endif } finalize_it: LEAVE_RELPFUNC; @@ -1015,7 +1019,7 @@ * empty. That happens frequently if the domain root (e.g. "example.com.") * is properly given. */ - if(pWildcard->wildcardType == tcpPEER_WILDCARD_EMPTY_COMPONENT) + if(pWildcard != NULL && pWildcard->wildcardType == tcpPEER_WILDCARD_EMPTY_COMPONENT) pWildcard = pWildcard->pNext; if(pWildcard != NULL) { @@ -1049,6 +1053,8 @@ } else { relpTcpChkOnePeerWildcard(pThis->permittedPeers.peer[i].wildcardRoot, peername, pbFoundPositiveMatch); + if (*pbFoundPositiveMatch) + break; } } } -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit libkgapi for openSUSE:Factory
by root＠hilbert.suse.de 30 Apr '14

30 Apr '14

Hello community, here is the log from the commit of package libkgapi for openSUSE:Factory checked in at 2014-04-30 15:06:28 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/libkgapi (Old) and /work/SRC/openSUSE:Factory/.libkgapi.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "libkgapi" Changes: -------- --- /work/SRC/openSUSE:Factory/libkgapi/libkgapi.changes 2014-03-21 13:33:24.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.libkgapi.new/libkgapi.changes 2014-04-30 15:06:29.000000000 +0200 @@ -1,0 +2,6 @@ +Tue Apr 29 22:28:03 UTC 2014 - hrvoje.senjan(a)gmail.com + +- Update to 2.1.1 + * Bugfix release, no changelog provided + +------------------------------------------------------------------- Old: ---- libkgapi-2.1.0.tar.bz2 New: ---- libkgapi-2.1.1.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libkgapi.spec ++++++ --- /var/tmp/diff_new_pack.jkLOPr/_old 2014-04-30 15:06:30.000000000 +0200 +++ /var/tmp/diff_new_pack.jkLOPr/_new 2014-04-30 15:06:30.000000000 +0200 @@ -17,7 +17,7 @@ Name: libkgapi -Version: 2.1.0 +Version: 2.1.1 Release: 0 Summary: Extension for accessing your Google data License: GPL-2.0+ ++++++ libkgapi-2.1.0.tar.bz2 -> libkgapi-2.1.1.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libkgapi-2.1.0/CMakeLists.txt new/libkgapi-2.1.1/CMakeLists.txt --- old/libkgapi-2.1.0/CMakeLists.txt 2014-03-01 18:30:47.000000000 +0100 +++ new/libkgapi-2.1.1/CMakeLists.txt 2014-04-07 23:08:28.000000000 +0200 @@ -2,7 +2,7 @@ set(KGAPI_VERSION_MAJOR 2) set(KGAPI_VERSION_MINOR 1) -set(KGAPI_VERSION_RELEASE 0) +set(KGAPI_VERSION_RELEASE 1) set(KGAPI_VERSION "${KGAPI_VERSION_MAJOR}.${KGAPI_VERSION_MINOR}.${KGAPI_VERSION_RELEASE}") cmake_minimum_required(VERSION 2.8) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libkgapi-2.1.0/libkgapi2/authjob.cpp new/libkgapi-2.1.1/libkgapi2/authjob.cpp --- old/libkgapi-2.1.0/libkgapi2/authjob.cpp 2014-03-01 18:30:47.000000000 +0100 +++ new/libkgapi-2.1.1/libkgapi2/authjob.cpp 2014-04-07 23:08:28.000000000 +0200 @@ -147,6 +147,16 @@ return d->account; } +void AuthJob::setUsername(const QString& username) +{ + d->username = username; +} + +void AuthJob::setPassword(const QString& password) +{ + d->password = password; +} + void AuthJob::handleReply(const QNetworkReply *reply, const QByteArray& rawData) { Q_UNUSED(reply); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libkgapi-2.1.0/libkgapi2/authjob.h new/libkgapi-2.1.1/libkgapi2/authjob.h --- old/libkgapi-2.1.0/libkgapi2/authjob.h 2014-03-01 18:30:47.000000000 +0100 +++ new/libkgapi-2.1.1/libkgapi2/authjob.h 2014-04-07 23:08:28.000000000 +0200 @@ -108,6 +108,34 @@ */ AccountPtr account() const; + /** + * Sets the username that will be used when authenticate is called + * + * The username will be automatically filled in the Google login + * form in the authentication widget. + * + * Be aware that the username will be set every time \sa authenticate is + * called so if you want to change or remove it call \sa setUsername again + * with empty string or \sa clearCredentials. + * + * @param username username to use + */ + void setUsername(const QString &username); + + /** + * Sets the password that will be used when authenticate is called + * + * The password will be automatically filled in the Google login + * form in the authentication widget. + * + * Be aware that the password will be set every time \sa authenticate is + * called so if you want to change or remove it call \sa setPassword again + * with empty string or \sa clearCredentials. + * + * @param password password to use + */ + void setPassword(const QString &password); + protected: /** diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libkgapi-2.1.0/libkgapi2/job.cpp new/libkgapi-2.1.1/libkgapi2/job.cpp --- old/libkgapi-2.1.0/libkgapi2/job.cpp 2014-03-01 18:30:47.000000000 +0100 +++ new/libkgapi-2.1.1/libkgapi2/job.cpp 2014-04-07 23:08:28.000000000 +0200 @@ -35,6 +35,7 @@ Job::Private::Private(Job *parent): isRunning(false), error(KGAPI2::NoError), + accessManager(0), maxTimeout(0), q(parent) { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libkgapi-2.1.0/libkgapi2/ui/authwidget_p.cpp new/libkgapi-2.1.1/libkgapi2/ui/authwidget_p.cpp --- old/libkgapi-2.1.0/libkgapi2/ui/authwidget_p.cpp 2014-03-01 18:30:47.000000000 +0100 +++ new/libkgapi-2.1.1/libkgapi2/ui/authwidget_p.cpp 2014-04-07 23:08:28.000000000 +0200 @@ -22,15 +22,16 @@ #include "accountinfo/accountinfofetchjob.h" #include "private/newtokensfetchjob_p.h" +#include <QtWebKit/QWebView> #include <QtWebKit/QWebFrame> #include <QtWebKit/QWebElement> +#include <QtNetwork/QNetworkProxy> #include <qjson/parser.h> #include <KDE/KUrl> #include <KDE/KLocalizedString> #include <KIO/AccessManager> -#include <KDE/KWebView> #include <QDateTime> @@ -71,7 +72,10 @@ progressbar->setValue(0); vbox->addWidget(progressbar); - webview = new KWebView(q); + webview = new QWebView(q); + KIO::AccessManager *m = new KIO::AccessManager(webview); + webview->page()->networkAccessManager()->setProxyFactory(m->proxyFactory()); + vbox->addWidget(webview); connect(webview, SIGNAL(loadProgress(int)), progressbar, SLOT(setValue(int))); connect(webview, SIGNAL(urlChanged(QUrl)), this, SLOT(webviewUrlChanged(QUrl))); -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit libdbi-drivers for openSUSE:Factory
by root＠hilbert.suse.de 30 Apr '14

30 Apr '14

Hello community, here is the log from the commit of package libdbi-drivers for openSUSE:Factory checked in at 2014-04-30 15:05:50 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/libdbi-drivers (Old) and /work/SRC/openSUSE:Factory/.libdbi-drivers.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "libdbi-drivers" Changes: -------- --- /work/SRC/openSUSE:Factory/libdbi-drivers/libdbi-drivers.changes 2014-02-11 10:30:15.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.libdbi-drivers.new/libdbi-drivers.changes 2014-04-30 15:05:52.000000000 +0200 @@ -1,0 +2,8 @@ +Thu Apr 17 14:57:46 UTC 2014 - jengelh(a)inai.de + +- Update to new git snapshot 0.9.0+git40 +* Support the new datetimex API from libdbi-0.9.0+git21 +* dbd_sqlite3: resolve a stack buffer overflow +- Remove sqlite3.diff, badcode.diff, libdl.diff: merged upstream + +------------------------------------------------------------------- Old: ---- badcode.diff libdbi-drivers-0.9.0.tar.gz libdl.diff sqlite3.diff New: ---- libdbi-drivers-0.9.0.g40.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libdbi-drivers.spec ++++++ --- /var/tmp/diff_new_pack.lzfW4B/_old 2014-04-30 15:05:54.000000000 +0200 +++ /var/tmp/diff_new_pack.lzfW4B/_new 2014-04-30 15:05:54.000000000 +0200 @@ -1,7 +1,7 @@ # # spec file for package libdbi-drivers # -# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2014 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,29 +16,38 @@ # -%define libdbi_sover 1 Name: libdbi-drivers -Version: 0.9.0 +Version: 0.9.0.g40 +#Snapshot: libdbi-drivers-0.9.0-40-gb48dd7e Release: 0 Summary: Database drivers for libdbi License: LGPL-2.1+ -Group: System/Libraries -Url: http://libdbi-drivers.sf.net/ +Group: Productivity/Databases/Servers +URL: http://libdbi-drivers.sf.net/ -Source: http://downloads.sf.net/libdbi-drivers/%name-%version.tar.gz -Patch1: sqlite3.diff -Patch2: badcode.diff -Patch3: libdl.diff +#Source: http://downloads.sf.net/libdbi-drivers/%name-%version.tar.gz +Source: %name-%version.tar.xz BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: autoconf BuildRequires: automake BuildRequires: gettext -BuildRequires: libdbi-devel +BuildRequires: libdbi-devel >= 0.9.0.g21 BuildRequires: libtool BuildRequires: mysql-devel BuildRequires: openjade BuildRequires: postgresql-devel +BuildRequires: sqlite2-devel BuildRequires: sqlite3-devel +BuildRequires: xz +%define build_doc 0 +%if %build_doc +# Only needed when doc is not already prebuilt +BuildRequires: docbook-dsssl-stylesheets +BuildRequires: openjade +BuildRequires: texlive-collection-fontsrecommended +BuildRequires: texlive-jadetex +BuildRequires: texlive-pdftex-bin +%endif %description libdbi implements a database-independent abstraction layer in C, @@ -48,7 +57,6 @@ %package dbd-mysql Summary: MySQL driver for libdbi Group: System/Libraries -Requires: libdbi%{libdbi_sover} = %version %description dbd-mysql This driver provides connectivity to MySQL database servers through @@ -59,8 +67,6 @@ %package dbd-pgsql Summary: PostgreSQL driver for libdbi Group: System/Libraries -Requires: libdbi%{libdbi_sover} = %version -Requires: postgresql >= 7.0.3 %description dbd-pgsql This driver provides connectivity to PostgreSQL database servers @@ -68,26 +74,32 @@ a program's driver does not require recompilation or rewriting source code. +%package dbd-sqlite +Summary: SQLite (old) driver for libdbi +Group: System/Libraries + +%description dbd-sqlite +This driver provides connectivity to SQLite database servers through the +libdbi database independent abstraction layer. Switching a program's driver +does not require recompilation or rewriting source code. + %package dbd-sqlite3 Summary: SQLite3 driver for libdbi Group: System/Libraries -Requires: libdbi%{libdbi_sover} = %version -Requires: sqlite %description dbd-sqlite3 -This driver provides connectivity to SQLite database servers through the +This driver provides connectivity to SQLite 3.x database servers through the libdbi database independent abstraction layer. Switching a program's driver does not require recompilation or rewriting source code. %prep -%setup -q -%patch -P 1 -P 2 -P 3 -p1 +%setup -qn %name #ensure license doesn't have a executable permission chmod 644 COPYING # Fake the __DATE__ so we do not needelessly rebuild -FAKE_BUILDDATE=$(LC_ALL=C date -u -r %{_sourcedir}/%{name}.changes '+%%b %%e %%Y') +FAKE_BUILDDATE=$(LC_ALL=C date -u -r %_sourcedir/%name.changes '+%%b %%e %%Y') sed -i "s/__DATE__/\"$FAKE_BUILDDATE\"/" drivers/*/*.c %build @@ -95,15 +107,15 @@ %configure \ --with-mysql \ --with-pgsql \ - --with-sqlite3 \ - --with-dbi-incdir=%_includedir/dbi \ - --with-dbi-libdir=%{_libdir} \ + --with-sqlite3 --with-sqlite \ + --with-dbi-incdir="%_includedir/dbi" \ + --with-dbi-libdir="%_libdir" \ --disable-static \ - --disable-docs + --docdir="%_docdir/%name" --disable-docs make %{?_smp_mflags} %install -make DESTDIR=$RPM_BUILD_ROOT install +make install DESTDIR="%buildroot" find "%buildroot" -type f -name "*.la" -delete %check @@ -112,19 +124,24 @@ %files dbd-mysql %defattr(-,root,root) %doc COPYING -%dir %{_libdir}/dbd -%{_libdir}/dbd/libdbdmysql.so +%dir %_libdir/dbd +%_libdir/dbd/libdbdmysql.so %files dbd-pgsql %defattr(-,root,root) %doc COPYING -%dir %{_libdir}/dbd -%{_libdir}/dbd/libdbdpgsql.so +%dir %_libdir/dbd +%_libdir/dbd/libdbdpgsql.so + +%files dbd-sqlite +%defattr(-,root,root) +%dir %_libdir/dbd +%_libdir/dbd/libdbdsqlite.so %files dbd-sqlite3 %defattr(-,root,root) %doc COPYING -%dir %{_libdir}/dbd -%{_libdir}/dbd/libdbdsqlite3.so +%dir %_libdir/dbd +%_libdir/dbd/libdbdsqlite3.so %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 kdebase4-workspace for openSUSE:Factory
by root＠hilbert.suse.de 30 Apr '14

30 Apr '14

Hello community, here is the log from the commit of package kdebase4-workspace for openSUSE:Factory checked in at 2014-04-30 15:05:44 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/kdebase4-workspace (Old) and /work/SRC/openSUSE:Factory/.kdebase4-workspace.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "kdebase4-workspace" Changes: -------- --- /work/SRC/openSUSE:Factory/kdebase4-workspace/kdebase4-workspace.changes 2014-04-14 06:49:12.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.kdebase4-workspace.new/kdebase4-workspace.changes 2014-04-30 15:05:46.000000000 +0200 @@ -1,0 +2,17 @@ +Tue Apr 29 11:21:26 UTC 2014 - hrvoje.senjan(a)gmail.com + +- Split out default cursors into separate oxygen-cursors4 package, + for allowing users they choose between cursors coming from + kdebase4-workspace and future Plasma Next releses + +------------------------------------------------------------------- +Fri Apr 25 19:54:22 UTC 2014 - tittiatcoke(a)gmail.com + +- Update to 4.11.9 + * Bugfix release +- Remove upstreamed patches + - screenlocker-always-show-password-dialog-when-needed.patch + - screenlocker-dont-leak-screensaver-processes.patch + - kdm-fix-resumption-from-console-mode.patch + +------------------------------------------------------------------- Old: ---- kde-workspace-4.11.8.tar.xz kdm-fix-resumption-from-console-mode.patch screenlocker-always-show-password-dialog-when-needed.patch screenlocker-dont-leak-screensaver-processes.patch New: ---- kde-workspace-4.11.9.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kdebase4-workspace.spec ++++++ --- /var/tmp/diff_new_pack.02FWHf/_old 2014-04-30 15:05:47.000000000 +0200 +++ /var/tmp/diff_new_pack.02FWHf/_new 2014-04-30 15:05:47.000000000 +0200 @@ -19,7 +19,7 @@ %define with_multiseat 1 Name: kdebase4-workspace -Version: 4.11.8 +Version: 4.11.9 Release: 0 Summary: The KDE Workspace Components License: GPL-2.0+ @@ -103,8 +103,6 @@ # Patch is based on the changes within GDM to detect running plymouth # and issue a quit to the plymouth daemon Patch15: kdm_plymouth.patch -# PATCH-FIX-UPSTREAM kdm-fix-resumption-from-console-mode.patch (kde#312947, bnc#756198) -Patch16: kdm-fix-resumption-from-console-mode.patch ## Workspace patches # PATCH-FIX-OPENSUSE startkde.diff -- Injects branded startupconfigkeys to users $KDEHOME, and adds %datadir/kde4/env # to list of read enviroments @@ -141,12 +139,6 @@ Patch66: add-calculator-hotkey.patch # PATCH-FIX-OPENSUSE Remove the dependencies on strigi Patch67: remove_strigi.patch -# PATCH-FIX-UPSTREAM screenlocker-always-show-password-dialog-when-needed.patch -- password input dialog was not shown -# under certain circumstances (kde#327947, kde#329076, bnc#864305) -Patch68: screenlocker-always-show-password-dialog-when-needed.patch -# PATCH-FIX-UPSTREAM screenlocker-dont-leak-screensaver-processes.patch -- screensaver processes might keep running in -# background when unlocking the screen (kde#224200, bnc#809835) -Patch69: screenlocker-dont-leak-screensaver-processes.patch # Taken from fedora, additional changes resubmitted to fedora Patch71: kde-workspace-4.11.0-kdm-logind-multiseat.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -166,6 +158,7 @@ Requires: xprop # The openSUSE-release package should always be installed, but just to make sure as that kinfocenter needs it Requires: distribution-release +Requires: socat Recommends: kdebase4-SuSE Recommends: kwin Recommends: plasma-addons @@ -184,6 +177,7 @@ Provides: kded-appmenu = %{version} Obsoletes: kded-appmenu < %{version} Requires: appmenu-qt > 0.2.0 +Requires: oxygen-cursors #Akonadi plasma engine is no longer provided Obsoletes: kdebase4-workspace-plasma-engine-akonadi < %{version} Provides: kdebase4-workspace-plasma-engine-akonadi = %{version} @@ -324,6 +318,15 @@ %description -n krandr KDE Screen management tools +%package -n oxygen-cursors4 +Summary: The KDE Workspace Cursors +Group: System/GUI/KDE +Provides: oxygen-cursors = %{version} + +%description -n oxygen-cursors4 +This package contains the default cursor set for a K Desktop Environment +workspace. + %prep %setup -q -n kde-workspace-%{version} ## KDM patches @@ -342,7 +345,6 @@ %patch13 %patch14 -p1 %patch15 -p1 -%patch16 -p1 ## Workspace patches %patch50 %patch51 @@ -360,8 +362,6 @@ %patch65 -p1 %patch66 -p1 %patch67 -p1 -%patch68 -p0 -%patch69 -p1 %if %{with_multiseat} %patch71 -p1 %endif @@ -617,13 +617,8 @@ %{_kde4_datadir}/autostart/ %{_kde4_datadir}/dbus-1/ %{_kde4_datadir}/polkit-1/ -%{_kde4_iconsdir}/Oxygen* %{_kde4_iconsdir}/hicolor/*/*/* %{_kde4_iconsdir}/oxygen/*/* -%dir %{_kde4_iconsdir}/KDE_Classic -%dir %{_kde4_iconsdir}/KDE_Classic/cursors -%{_kde4_iconsdir}/KDE_Classic/* -%{_kde4_iconsdir}/KDE_Classic/cursors/* %{_kde4_libdir}/kconf_update_bin/ %{_kde4_libdir}/*.so %{_kde4_libdir}/*.so.* @@ -710,4 +705,10 @@ %exclude %{_kde4_servicesdir}/kded/randrmonitor.desktop %exclude %{_kde4_servicesdir}/randr.desktop +%files -n oxygen-cursors4 +%defattr(-,root,root) +%doc COPYING README +%{_kde4_iconsdir}/Oxygen_*/ +%{_kde4_iconsdir}/KDE_Classic/ + %changelog ++++++ kde-workspace-4.11.8.tar.xz -> kde-workspace-4.11.9.tar.xz ++++++ /work/SRC/openSUSE:Factory/kdebase4-workspace/kde-workspace-4.11.8.tar.xz /work/SRC/openSUSE:Factory/.kdebase4-workspace.new/kde-workspace-4.11.9.tar.xz differ: char 27, line 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 flash-player for openSUSE:Factory:NonFree
by root＠hilbert.suse.de 30 Apr '14

30 Apr '14

Hello community, here is the log from the commit of package flash-player for openSUSE:Factory:NonFree checked in at 2014-04-30 15:05:38 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory:NonFree/flash-player (Old) and /work/SRC/openSUSE:Factory:NonFree/.flash-player.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "flash-player" Changes: -------- --- /work/SRC/openSUSE:Factory:NonFree/flash-player/flash-player.changes 2014-04-11 13:28:28.000000000 +0200 +++ /work/SRC/openSUSE:Factory:NonFree/.flash-player.new/flash-player.changes 2014-04-30 15:05:40.000000000 +0200 @@ -1,0 +2,6 @@ +Tue Apr 29 15:34:46 UTC 2014 - sbrabec(a)suse.com + +- Security update to 11.2.202.356 (bnc#875577): + * APSB14-13, CVE-2014-0515 + +------------------------------------------------------------------- Old: ---- flashplayer_11.2.202.350_sa.i386.tar.gz install_flash_player_11.2.202.350_linux.i386.tar.gz install_flash_player_11.2.202.350_linux.x86_64.tar.gz New: ---- flashplayer_11.2.202.356_sa.i386.tar.gz install_flash_player_11.2.202.356_linux.i386.tar.gz install_flash_player_11.2.202.356_linux.x86_64.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ flash-player.spec ++++++ --- /var/tmp/diff_new_pack.kBHsl7/_old 2014-04-30 15:05:42.000000000 +0200 +++ /var/tmp/diff_new_pack.kBHsl7/_new 2014-04-30 15:05:42.000000000 +0200 @@ -19,7 +19,7 @@ %define build_standalone 1 Name: flash-player -Version: 11.2.202.350 +Version: 11.2.202.356 Release: 0 Summary: Adobe Flash Plugin and Standalone Player License: SUSE-NonFree ++++++ flashplayer_11.2.202.350_sa.i386.tar.gz -> flashplayer_11.2.202.356_sa.i386.tar.gz ++++++ Files old/install_flash_player_linux_sa/flashplayer and new/install_flash_player_linux_sa/flashplayer differ ++++++ install_flash_player_11.2.202.350_linux.i386.tar.gz -> install_flash_player_11.2.202.356_linux.i386.tar.gz ++++++ /work/SRC/openSUSE:Factory:NonFree/flash-player/install_flash_player_11.2.202.350_linux.i386.tar.gz /work/SRC/openSUSE:Factory:NonFree/.flash-player.new/install_flash_player_11.2.202.356_linux.i386.tar.gz differ: char 5, line 1 ++++++ install_flash_player_11.2.202.350_linux.x86_64.tar.gz -> install_flash_player_11.2.202.356_linux.x86_64.tar.gz ++++++ /work/SRC/openSUSE:Factory:NonFree/flash-player/install_flash_player_11.2.202.350_linux.x86_64.tar.gz /work/SRC/openSUSE:Factory:NonFree/.flash-player.new/install_flash_player_11.2.202.356_linux.x86_64.tar.gz differ: char 5, line 1 ++++++ update.sh ++++++ --- /var/tmp/diff_new_pack.kBHsl7/_old 2014-04-30 15:05:42.000000000 +0200 +++ /var/tmp/diff_new_pack.kBHsl7/_new 2014-04-30 15:05:42.000000000 +0200 @@ -35,7 +35,7 @@ done sed -i -e "s,Version:.*,Version: $version," ../flash-player.spec ( cd ..; - osc vc -m "Security update to $version: (bnc#XXXXXX)" + osc vc -m "Security update to $version (bnc#XXXXXX):" ) fi -- 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:Factory
by root＠hilbert.suse.de 30 Apr '14

30 Apr '14

Hello community, here is the log from the commit of package btrfsprogs for openSUSE:Factory checked in at 2014-04-30 15:00:45 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/btrfsprogs (Old) and /work/SRC/openSUSE:Factory/.btrfsprogs.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "btrfsprogs" Changes: -------- --- /work/SRC/openSUSE:Factory/btrfsprogs/btrfsprogs.changes 2014-04-14 06:43:25.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.btrfsprogs.new/btrfsprogs.changes 2014-04-30 15:00:47.000000000 +0200 @@ -1,0 +2,5 @@ +Sat Apr 26 09:45:23 UTC 2014 - coolo(a)suse.com + +- own mkinitrd directories + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ btrfsprogs.spec ++++++ --- /var/tmp/diff_new_pack.dJPGYt/_old 2014-04-30 15:00:48.000000000 +0200 +++ /var/tmp/diff_new_pack.dJPGYt/_new 2014-04-30 15:00:48.000000000 +0200 @@ -159,6 +159,8 @@ %{_sbindir}/mkfs.btrfs %{_sbindir}/btrfs-debug-tree %{_sbindir}/btrfs-show-super +%dir /lib/mkinitrd +%dir /lib/mkinitrd/scripts /lib/mkinitrd/scripts/boot-btrfs.sh /lib/mkinitrd/scripts/setup-btrfs.sh # other -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit translation-update-upstream for openSUSE:Factory
by root＠hilbert.suse.de 30 Apr '14

30 Apr '14

Hello community, here is the log from the commit of package translation-update-upstream for openSUSE:Factory checked in at 2014-04-30 15:00:44 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/translation-update-upstream (Old) and /work/SRC/openSUSE:Factory/.translation-update-upstream.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "translation-update-upstream" Changes: -------- --- /work/SRC/openSUSE:Factory/translation-update-upstream/translation-update-upstream.changes 2013-03-22 12:08:51.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.translation-update-upstream.new/translation-update-upstream.changes 2014-04-30 15:00:45.000000000 +0200 @@ -1,0 +2,10 @@ +Fri Apr 25 09:58:27 UTC 2014 - schwab(a)linux-m68k.org + +- Only process PO header in msgheadermerge + +------------------------------------------------------------------- +Wed Apr 23 09:22:19 UTC 2014 - dmueller(a)suse.com + +- speed up msgheadermerge by factor 20-25 + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ translation-update-upstream.spec ++++++ --- /var/tmp/diff_new_pack.bzQ80E/_old 2014-04-30 15:00:47.000000000 +0200 +++ /var/tmp/diff_new_pack.bzQ80E/_new 2014-04-30 15:00:47.000000000 +0200 @@ -1,7 +1,7 @@ # # spec file for package translation-update-upstream # -# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2014 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 ++++++ msgheadermerge ++++++ --- /var/tmp/diff_new_pack.bzQ80E/_old 2014-04-30 15:00:47.000000000 +0200 +++ /var/tmp/diff_new_pack.bzQ80E/_new 2014-04-30 15:00:47.000000000 +0200 @@ -10,8 +10,8 @@ RC=0 # Broken pipe is an expected behavior. Redirect stderr to /dev/null. -msgexec -i $1 $0-parse ${1%.po}-msgheadermerge-temp 2>/dev/null -msgexec -i $2 $0-parse ${2%.po}-msgheadermerge-temp 2>/dev/null +msggrep --force-po $1 | msgexec $0-parse ${1%.po}-msgheadermerge-temp 2>/dev/null +msggrep --force-po $2 | msgexec $0-parse ${2%.po}-msgheadermerge-temp 2>/dev/null # If --swap-plural-forms was used, use plural definition from the other header. if test "$6" = --old-plural-forms ; then -- 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 30 Apr '14

30 Apr '14

Hello community, here is the log from the commit of package aaa_base for openSUSE:Factory checked in at 2014-04-30 15:00:41 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/aaa_base (Old) and /work/SRC/openSUSE:Factory/.aaa_base.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "aaa_base" Changes: -------- --- /work/SRC/openSUSE:Factory/aaa_base/aaa_base.changes 2014-04-08 17:05:55.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.aaa_base.new/aaa_base.changes 2014-04-30 15:00:43.000000000 +0200 @@ -1,0 +2,5 @@ +Wed Apr 16 13:08:38 UTC 2014 - lnussel(a)suse.de + +- remove mkinitrd script for mtab + +------------------------------------------------------------------- Old: ---- aaa_base-13.2+git20140407.618dd70.tar.xz New: ---- aaa_base-13.2+git20140416.19ef0a1.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ aaa_base.spec ++++++ --- /var/tmp/diff_new_pack.duK4cS/_old 2014-04-30 15:00:45.000000000 +0200 +++ /var/tmp/diff_new_pack.duK4cS/_new 2014-04-30 15:00:45.000000000 +0200 @@ -17,7 +17,7 @@ Name: aaa_base -Version: 13.2+git20140407.618dd70 +Version: 13.2+git20140416.19ef0a1 Release: 0 Url: https://github.com/openSUSE/aaa_base Provides: aaa_skel = %{version}-%{release} @@ -174,9 +174,6 @@ /etc/hushlogins %dir /lib/aaa_base /lib/aaa_base/convert_sysctl* -%dir /lib/mkinitrd -%dir /lib/mkinitrd/scripts -/lib/mkinitrd/scripts/boot-mtab.sh /usr/bin/chkconfig /sbin/chkconfig /usr/bin/get_kernel_version ++++++ aaa_base-13.2+git20140407.618dd70.tar.xz -> aaa_base-13.2+git20140416.19ef0a1.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/aaa_base-13.2+git20140407.618dd70/files/lib/mkinitrd/scripts/boot-mtab.sh new/aaa_base-13.2+git20140416.19ef0a1/files/lib/mkinitrd/scripts/boot-mtab.sh --- old/aaa_base-13.2+git20140407.618dd70/files/lib/mkinitrd/scripts/boot-mtab.sh 2014-04-07 16:18:41.000000000 +0200 +++ new/aaa_base-13.2+git20140416.19ef0a1/files/lib/mkinitrd/scripts/boot-mtab.sh 1970-01-01 01:00:00.000000000 +0100 @@ -1,11 +0,0 @@ -#!/bin/bash -# -#%stage: setup -#%programs: /bin/ln -#%modules: -#%dontshow - -if test -w /root/etc/ -a ! -L /root/etc/mtab ; then - echo "replacing /etc/mtab with symlink to /proc/self/mounts" - ln -sf /proc/self/mounts /root/etc/mtab -fi -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit screen for openSUSE:Factory
by root＠hilbert.suse.de 30 Apr '14

30 Apr '14

Hello community, here is the log from the commit of package screen for openSUSE:Factory checked in at 2014-04-30 15:00:39 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/screen (Old) and /work/SRC/openSUSE:Factory/.screen.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "screen" Changes: -------- --- /work/SRC/openSUSE:Factory/screen/screen.changes 2014-04-22 07:35:24.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.screen.new/screen.changes 2014-04-30 15:00:40.000000000 +0200 @@ -1,0 +2,22 @@ +Thu Apr 17 10:23:40 UTC 2014 - jw(a)suse.com + +- Update to 4.2.0 as released on screen-devel(a)gnu.org yesterday. + Thank you Amadeusz! + * keep libtinfo.diff (from coolo 2011, why exactly?) + * keep global_screenrc.patch (renamed from screen-4.0.2.dif) + * keep screen-man-loginshell.diff (to be upstreamed) + * dropped screen-__P.diff (not needed) + * keep term_too_long.diff (savannah#30880, to be upstreamed) + * keep use_locale.diff (from lnt-sysadmin(a)lists.lrz.de 2012, check?) + * keep screen-4.0.3-ipv6.patch (builtin telnet, to be upstreamed) + * keep screen_enhance_windows_list.patch (to be upstreamed) + * keep screen-poll-zombies.patch (to be upstreamed) + * keep xX_string_escape.patch (renamed from show_all_active.patch, to be upstreamed) + * keep sort_command.patch (from trenn 2011, to be upstreamed) + * added msg_version_3.patch (ouch, incompatible protocol, to be upstreamed) + +- added %rundir with /var/run for 1310 and before; but /run afterwards. + aj advocates /run for Factory; for 1310 it was banned by + suse-filelist-forbidden-fhs23 + +------------------------------------------------------------------- Old: ---- screen-4.0.2.dif screen-4.0.4.tar.gz screen-__P.diff show_all_active.patch New: ---- global_screenrc.patch msg_version_3.patch screen-4.2.0.tar.gz xX_string_escape.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ screen.spec ++++++ --- /var/tmp/diff_new_pack.edf0tV/_old 2014-04-30 15:00:42.000000000 +0200 +++ /var/tmp/diff_new_pack.edf0tV/_new 2014-04-30 15:00:42.000000000 +0200 @@ -16,6 +16,12 @@ # +%if 0%{?suse_version} > 1310 +%define rundir /run +%else +%define rundir /var/run +%endif + Url: http://www.gnu.org/software/screen/ Name: screen @@ -28,17 +34,18 @@ %else BuildRequires: utempter %endif +BuildRequires: autoconf +BuildRequires: automake PreReq: %install_info_prereq PreReq: coreutils -Version: 4.0.4 +Version: 4.2.0 Release: 0 Summary: A program to allow multiple screens on a VT100/ANSI Terminal License: GPL-2.0+ Group: System/Console Source: %{name}-%{version}.tar.gz Source1: screen.conf -Patch0: screen-4.0.2.dif -Patch1: screen-__P.diff +Patch0: global_screenrc.patch Patch2: screen-man-loginshell.diff Patch3: screen-4.0.3-ipv6.patch # upstream savannah#30880 @@ -47,8 +54,9 @@ Patch6: libtinfo.diff Patch9: use_locale.diff Patch10: screen-poll-zombies.patch -Patch11: show_all_active.patch +Patch11: xX_string_escape.patch Patch12: screen_enhance_windows_list.patch +Patch13: msg_version_3.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build %description @@ -60,28 +68,49 @@ %prep %setup +# global_screenrc.patch %patch0 -%patch1 +# screen-man-loginshell.diff %patch2 -p1 +# screen-4.0.3-ipv6.patch %patch3 +# term_too_long.diff %patch4 -p1 +# sort_command.patch %patch5 +# libtinfo.diff %patch6 +# use_locale.diff %patch9 -p1 +# screen-poll-zombies.patch %patch10 -p1 +# xX_string_escape.patch %patch11 +# screen_enhance_windows_list.patch %patch12 +# msg_version_3.patch +%patch13 -p1 %build +sh ./autogen.sh + CFLAGS="-DMAXWIN=1000 $RPM_OPT_FLAGS" %configure --prefix=/usr --infodir=%{_infodir} \ --mandir=%{_mandir} \ - --with-socket-dir='(eff_uid ? "/run/uscreens" : "/run/screens")' \ + --with-socket-dir='(eff_uid ? "%rundir/uscreens" : "%rundir/screens")' \ --with-sys-screenrc=/etc/screenrc \ --with-pty-group=5 \ --enable-use-locale \ --enable-telnet \ --enable-colors256 \ --verbose + +# update Makefile so that make -j becomes reliable +:> osdef.h # so that make depend has a chance +:> comm.h # so that make depend has a chance +make depend # FIXME: this should be self sufficient. +rm osdef.h # so that make will use osdef.sh +rm comm.h # so that make will use comm.sh + make %{?_smp_mflags} %install @@ -92,10 +121,10 @@ mkdir -p $RPM_BUILD_ROOT/etc mkdir -p $RPM_BUILD_ROOT/usr/lib mkdir -p $RPM_BUILD_ROOT/usr/lib/tmpfiles.d -mkdir -p $RPM_BUILD_ROOT/run/screens -chmod 755 $RPM_BUILD_ROOT/run/screens -mkdir -p $RPM_BUILD_ROOT/run/uscreens -chmod 1777 $RPM_BUILD_ROOT/run/uscreens +mkdir -p $RPM_BUILD_ROOT%rundir/screens +chmod 755 $RPM_BUILD_ROOT%rundir/screens +mkdir -p $RPM_BUILD_ROOT%rundir/uscreens +chmod 1777 $RPM_BUILD_ROOT%rundir/uscreens install -m 644 screenrc $RPM_BUILD_ROOT/etc/screenrc install -m 644 %SOURCE1 $RPM_BUILD_ROOT/usr/lib/tmpfiles.d @@ -108,8 +137,8 @@ /usr/lib/tmpfiles.d/screen.conf /usr/share/screen/utf8encodings # Created via aaa_base or systemd on system boot -%ghost %dir /run/screens -%ghost %dir /run/uscreens +%ghost %dir %rundir/screens +%ghost %dir %rundir/uscreens %doc %{_infodir}/screen.info*.gz %doc %{_mandir}/man1/screen.1.gz @@ -118,8 +147,8 @@ # Create our dirs immediatly, after a manual package install. # After a reboot systemd/aaa_base will take care. -test -d /run/screens || mkdir -m 755 /run/screens -test -d /run/uscreens || mkdir -m 1777 /run/uscreens +test -d %rundir/screens || mkdir -m 755 %rundir/screens +test -d %rundir/uscreens || mkdir -m 1777 %rundir/uscreens %postun %install_info_delete --info-dir=%{_infodir} %{_infodir}/%{name}.info.gz ++++++ global_screenrc.patch ++++++ Index: screenrc =================================================================== --- /dev/null 1970-01-01 00:00:00.000000000 +0000 +++ screenrc 2011-11-21 15:47:46.649112381 +0100 @@ -0,0 +1,4 @@ +# this is the global screenrc file. Handle with care. + +termcapinfo xterm* G0:is=\E[?4l\E>:ti@:te@ +termcapinfo linux me=\E[m:AX ++++++ libtinfo.diff ++++++ --- /var/tmp/diff_new_pack.edf0tV/_old 2014-04-30 15:00:42.000000000 +0200 +++ /var/tmp/diff_new_pack.edf0tV/_new 2014-04-30 15:00:42.000000000 +0200 @@ -11,18 +11,3 @@ AC_TRY_LINK(,tgetent((char *)0, (char *)0);,, LIBS="-lncursesw $olibs" AC_CHECKING(libncursesw) ---- ./configure.orig 2012-06-11 14:43:37.000000000 +0000 -+++ ./configure 2012-06-11 14:45:41.000000000 +0000 -@@ -6296,9 +6296,9 @@ else - $as_echo "$as_me: failed program was:" >&5 - sed 's/^/| /' conftest.$ac_ext >&5 - -- LIBS="-ltermlib $olibs" --{ $as_echo "$as_me:$LINENO: checking libtermlib..." >&5 --$as_echo "$as_me: checking libtermlib..." >&6;} -+ LIBS="-ltinfo $olibs" -+{ $as_echo "$as_me:$LINENO: checking libtinfo..." >&5 -+$as_echo "$as_me: checking libtinfo..." >&6;} - cat >conftest.$ac_ext <<_ACEOF - /* confdefs.h. */ - _ACEOF ++++++ msg_version_3.patch ++++++ --- screen-4.2.0/screen.h 2014-04-16 23:38:41.000000000 +0200 +++ screen-4.2.0/screen.h.new 2014-04-17 12:13:38.014982957 +0200 @@ -182,8 +182,9 @@ * A few revisions after 8147d08 incorrectly * carried version 1, but should have carried 2. * 2: screen version 4.1.0devel (revisions 8b46d8a upto YYYYYYY) + * 3: screen version 4.2.0 (was incorrectly originally. Patched here) */ -#define MSG_VERSION 2 +#define MSG_VERSION 3 #define MSG_REVISION (('m'<<24) | ('s'<<16) | ('g'<<8) | MSG_VERSION) struct msg ++++++ screen-4.0.4.tar.gz -> screen-4.2.0.tar.gz ++++++ ++++ 15620 lines of diff (skipped) ++++++ screen-poll-zombies.patch ++++++ --- /var/tmp/diff_new_pack.edf0tV/_old 2014-04-30 15:00:43.000000000 +0200 +++ /var/tmp/diff_new_pack.edf0tV/_new 2014-04-30 15:00:43.000000000 +0200 @@ -25,16 +25,6 @@ + { "zombie", ARGS_012 }, + { "zombie_timeout", ARGS_1 } }; ---- ./comm.h.dist.orig 2013-09-13 13:23:15.271279615 +0000 -+++ ./comm.h.dist 2013-09-13 13:23:44.198279564 +0000 -@@ -237,5 +237,6 @@ struct action - #define RC_XON 180 - #define RC_ZMODEM 181 - #define RC_ZOMBIE 182 -+#define RC_ZOMBIE_TIMEOUT 183 - --#define RC_LAST 182 -+#define RC_LAST 183 --- ./doc/screen.1.orig 2013-09-13 13:22:50.993279658 +0000 +++ ./doc/screen.1 2013-09-13 13:23:15.266279615 +0000 @@ -3547,6 +3547,15 @@ Optionally you can put the word \*Qonerr ++++++ use_locale.diff ++++++ --- /var/tmp/diff_new_pack.edf0tV/_old 2014-04-30 15:00:43.000000000 +0200 +++ /var/tmp/diff_new_pack.edf0tV/_new 2014-04-30 15:00:43.000000000 +0200 @@ -1,15 +1,3 @@ -diff -Pdpru a/configure b/configure ---- a/configure 2012-09-19 14:44:09.593017471 +0200 -+++ b/configure 2012-09-19 15:20:44.406073384 +0200 -@@ -1338,7 +1339,7 @@ Optional Features: - --enable-FEATURE[=ARG] include FEATURE [ARG=yes] - --disable-socket-dir disable system wide socket-dir and use ~/.screen instead - --enable-pam enable PAM support -- --enable-locale use localized month/day names -+ --enable-use-locale use localized month/day names - --enable-telnet enable builtin telnet - --enable-colors256 enable support for 256 colors - --enable-rxvt_osc enable support for rxvt OSC codes diff -Pdpru a/configure.in b/configure.in --- a/configure.in 2012-09-19 14:44:09.592017464 +0200 +++ b/configure.in 2012-09-19 15:21:45.555515336 +0200 ++++++ xX_string_escape.patch ++++++ screen: Introduce Xx string escape showing the executed command of a window either only the executed command ('X') or the whole command line ('x') of each window is shown. Signed-off-by: Thomas Renninger <trenn(a)suse.de> --- ./doc/screen.1.orig 2013-09-13 13:26:28.055279274 +0000 +++ ./doc/screen.1 2013-09-13 13:26:41.385279250 +0000 @@ -3747,6 +3747,10 @@ window; with '+' qualifier: starting wit one. .IP W all window numbers and names except the current one +.IP x +the executed command including arguments running in this windows +.IP X +the executed command without arguments running in this windows .IP y last two digits of the year number .IP Y --- ./screen.c.orig 2013-09-13 13:26:28.057279274 +0000 +++ ./screen.c 2013-09-13 13:34:30.151278421 +0000 @@ -2693,6 +2693,20 @@ int rec; } p += strlen(p) - 1; break; + case 'X': case 'x': + *p = 0; + for (i = 0; win && win->w_cmdargs[i]; i++) + { + if (l < strlen(win->w_cmdargs[i]) + 1) + break; + sprintf(p, i ? "%s" : " %s", win->w_cmdargs[i]); + l -= strlen(p); + p += strlen(p); + if (i == 0 && *s == 'X') + break; + } + p--; + break; case 'l': #ifdef LOADAV *p = 0; -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit php5-pear-phpunit for openSUSE:13.1:Update
by root＠hilbert.suse.de 30 Apr '14

30 Apr '14

Hello community, here is the log from the commit of package php5-pear-phpunit for openSUSE:13.1:Update checked in at 2014-04-30 13:52:17 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:13.1:Update/php5-pear-phpunit (Old) and /work/SRC/openSUSE:13.1:Update/.php5-pear-phpunit.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "php5-pear-phpunit" Changes: -------- New Changes file: NO CHANGES FILE!!! New: ---- _link ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ _link ++++++ <link package='php5-pear-phpunit.2755' 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