openSUSE Commits
Threads by month
- ----- 2024 -----
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2023 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2022 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2021 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2020 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2019 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2018 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2017 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2016 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2015 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2014 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2013 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2012 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2011 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2010 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2009 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2008 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2007 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2006 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
November 2014
- 1 participants
- 1346 discussions
Hello community,
here is the log from the commit of package curl for openSUSE:Factory checked in at 2014-11-24 11:14:27
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/curl (Old)
and /work/SRC/openSUSE:Factory/.curl.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "curl"
Changes:
--------
--- /work/SRC/openSUSE:Factory/curl/curl.changes 2014-10-29 21:09:11.000000000 +0100
+++ /work/SRC/openSUSE:Factory/.curl.new/curl.changes 2014-11-24 11:14:28.000000000 +0100
@@ -1,0 +2,23 @@
+Fri Nov 14 15:29:07 UTC 2014 - vcizek(a)suse.com
+
+- update to 7.39.0:
+- changes:
+ SSLv3 is disabled by default
+ CURLOPT_COOKIELIST: Added "RELOAD" command
+ build: Added WinIDN build configuration options to Visual Studio projects
+ ssh: improve key file search
+ SSL: public key pinning. Use CURLOPT_PINNEDPUBLICKEY and --pinnedpubkey
+ vtls: remove QsoSSL support, use gskit!
+ mk-ca-bundle: added SHA-384 signature algorithm
+ docs: added many examples for libcurl opts and other doc improvements
+ build: Added VC ssh2 target to main Makefile
+ MinGW: Added support to build with nghttp2
+ NetWare: Added support to build with nghttp2
+ build: added Watcom support to build with WinSSL
+ build: Added optional specific version generation of VC project files
+ ... and a bunch of bugfixes
+- refreshed libcurl-ocloexec.patch
+- removed gpg-offline verification
+- spec-cleaned curl.spec
+
+-------------------------------------------------------------------
Old:
----
curl-7.38.0.tar.lzma
curl-7.38.0.tar.lzma.asc
New:
----
curl-7.39.0.tar.lzma
curl-7.39.0.tar.lzma.asc
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ curl.spec ++++++
--- /var/tmp/diff_new_pack.tdYynD/_old 2014-11-24 11:14:29.000000000 +0100
+++ /var/tmp/diff_new_pack.tdYynD/_new 2014-11-24 11:14:29.000000000 +0100
@@ -19,9 +19,8 @@
%bcond_without openssl
%bcond_with mozilla_nss
%bcond_without testsuite
-
Name: curl
-Version: 7.38.0
+Version: 7.39.0
Release: 0
Summary: A Tool for Transferring Data from URLs
License: BSD-3-Clause and MIT
@@ -31,38 +30,34 @@
Source2: http://curl.haxx.se/download/%{name}-%{version}.tar.lzma.asc
Source3: baselibs.conf
Source4: %{name}.keyring
-Patch: libcurl-ocloexec.patch
+Patch0: libcurl-ocloexec.patch
Patch1: dont-mess-with-rpmoptflags.diff
Patch3: curl-secure-getenv.patch
-# Use rpmbuild -D 'VERIFY_SIG 1' to verify signature during build or run one-shot check by "gpg-offline --verify --package=curl curl-*.asc".
-%if 0%{?VERIFY_SIG}
-BuildRequires: gpg-offline
-%endif
+BuildRequires: krb5-mini-devel
BuildRequires: libidn-devel
+BuildRequires: libssh2-devel
BuildRequires: libtool
BuildRequires: lzma
BuildRequires: openldap2-devel
BuildRequires: pkg-config
BuildRequires: zlib-devel
+Requires: libcurl4 = %{version}
+BuildRoot: %{_tmppath}/%{name}-%{version}-build
%if %{with openssl}
BuildRequires: openssl-devel
%endif
%if %{with mozilla_nss}
BuildRequires: mozilla-nss-devel
%endif
-BuildRequires: krb5-mini-devel
-BuildRequires: libssh2-devel
#BuildRequires: openssh
%if 0%{?_with_stunnel:1}
# used by the testsuite
BuildRequires: stunnel
%endif
-BuildRoot: %{_tmppath}/%{name}-%{version}-build
# bug437293
%ifarch ppc64
Obsoletes: curl-64bit
%endif
-Requires: libcurl4 = %{version}
%description
Curl is a client to get documents and files from or send documents to a
@@ -94,11 +89,8 @@
user interaction or any kind of interactivity.
%prep
-%if 0%{?VERIFY_SIG}
-%gpg_verify %{S:2}
-%endif
%setup -q
-%patch
+%patch0
%patch1
%patch3
@@ -106,7 +98,7 @@
# curl complains if macro definition is contained in CFLAGS
# see m4/xc-val-flgs.m4
CPPFLAGS="-D_FORTIFY_SOURCE=2"
-CFLAGS=$(echo $RPM_OPT_FLAGS | sed 's/-D_FORTIFY_SOURCE=2//')
+CFLAGS=$(echo %{optflags} | sed 's/-D_FORTIFY_SOURCE=2//')
export CPPFLAGS CFLAGS
autoreconf -fi
# local hack to make curl-config --libs stop printing libraries it depends on
@@ -117,14 +109,14 @@
--enable-ipv6 \
%if %{with openssl}
--with-ssl \
- --with-ca-path=/etc/ssl/certs/ \
+ --with-ca-path=%{_sysconfdir}/ssl/certs/ \
%else
--without-ssl \
%if %{with mozilla_nss}
--with-nss \
%endif
%endif
- --with-gssapi=/usr/lib/mit \
+ --with-gssapi=%{_libexecdir}/mit \
--with-libssh2\
--enable-hidden-symbols \
--disable-static \
@@ -136,10 +128,9 @@
make %{?_smp_mflags}
%if %{with testsuite}
-
%check
cd tests
-make
+make %{?_smp_mflags}
# make sure the testsuite runs don't race on MP machines in autobuild
if test -z "$BUILD_INCARNATION" -a -r /.buildenv; then
. /.buildenv
@@ -158,10 +149,10 @@
%endif
%install
-%{makeinstall}
-rm $RPM_BUILD_ROOT%_libdir/libcurl.la
-install -d $RPM_BUILD_ROOT/usr/share/aclocal
-install -m 644 docs/libcurl/libcurl.m4 $RPM_BUILD_ROOT/usr/share/aclocal/
+make DESTDIR=%{buildroot} install %{?_smp_mflags}
+rm %{buildroot}%{_libdir}/libcurl.la
+install -d %{buildroot}%{_datadir}/aclocal
+install -m 644 docs/libcurl/libcurl.m4 %{buildroot}%{_datadir}/aclocal/
%post -n libcurl4 -p /sbin/ldconfig
@@ -172,7 +163,7 @@
%doc README RELEASE-NOTES
%doc docs/{BUGS,FAQ,FEATURES,MANUAL,RESOURCES,TODO,TheArtOfHttpScripting}
%doc lib/README.curl_off_t
-%{_prefix}/bin/curl
+%{_bindir}/curl
%doc %{_mandir}/man1/curl.1%{ext_man}
%files -n libcurl4
@@ -181,10 +172,10 @@
%files -n libcurl-devel
%defattr(-,root,root)
-%{_prefix}/bin/curl-config
-%{_prefix}/include/curl
-%dir %{_prefix}/share/aclocal
-%{_prefix}/share/aclocal/libcurl.m4
+%{_bindir}/curl-config
+%{_includedir}/curl
+%dir %{_datadir}/aclocal
+%{_datadir}/aclocal/libcurl.m4
%{_libdir}/libcurl.so
%{_libdir}/pkgconfig/libcurl.pc
%{_mandir}/man1/curl-config.1%{ext_man}
++++++ libcurl-ocloexec.patch ++++++
--- /var/tmp/diff_new_pack.tdYynD/_old 2014-11-24 11:14:29.000000000 +0100
+++ /var/tmp/diff_new_pack.tdYynD/_new 2014-11-24 11:14:29.000000000 +0100
@@ -9,9 +9,9 @@
Index: lib/cookie.c
===================================================================
---- lib/cookie.c.orig 2014-02-04 16:25:31.256657224 +0100
-+++ lib/cookie.c 2014-02-04 16:25:32.638671791 +0100
-@@ -882,7 +882,7 @@ struct CookieInfo *Curl_cookie_init(stru
+--- lib/cookie.c.orig 2014-11-14 16:22:55.236645676 +0100
++++ lib/cookie.c 2014-11-14 16:22:56.345659444 +0100
+@@ -914,7 +914,7 @@ struct CookieInfo *Curl_cookie_init(stru
fp = NULL;
}
else
@@ -20,7 +20,7 @@
c->newsession = newsession; /* new session? */
-@@ -1226,7 +1226,7 @@ static int cookie_output(struct CookieIn
+@@ -1262,7 +1262,7 @@ static int cookie_output(struct CookieIn
use_stdout=TRUE;
}
else {
@@ -31,18 +31,18 @@
}
Index: lib/file.c
===================================================================
---- lib/file.c.orig 2014-02-04 16:25:31.257657234 +0100
-+++ lib/file.c 2014-02-04 16:25:32.638671791 +0100
-@@ -232,7 +232,7 @@ static CURLcode file_connect(struct conn
- fd = open_readonly(actual_path, O_RDONLY|O_BINARY);
- file->path = actual_path;
- #else
+--- lib/file.c.orig 2014-11-14 16:22:55.236645676 +0100
++++ lib/file.c 2014-11-14 16:23:47.405293344 +0100
+@@ -240,7 +240,7 @@ static CURLcode file_connect(struct conn
+ /* binary zeroes indicate foul play */
+ return CURLE_URL_MALFORMAT;
+
- fd = open_readonly(real_path, O_RDONLY);
+ fd = open_readonly(real_path, O_RDONLY|O_CLOEXEC);
file->path = real_path;
#endif
file->freepath = real_path; /* free this when done */
-@@ -330,7 +330,7 @@ static CURLcode file_upload(struct conne
+@@ -338,7 +338,7 @@ static CURLcode file_upload(struct conne
else
mode = MODE_DEFAULT|O_TRUNC;
@@ -53,9 +53,9 @@
return CURLE_WRITE_ERROR;
Index: lib/formdata.c
===================================================================
---- lib/formdata.c.orig 2014-02-04 16:25:31.257657234 +0100
-+++ lib/formdata.c 2014-02-04 16:25:32.639671801 +0100
-@@ -1297,7 +1297,7 @@ CURLcode Curl_getformdata(struct Session
+--- lib/formdata.c.orig 2014-11-14 16:22:55.237645688 +0100
++++ lib/formdata.c 2014-11-14 16:22:56.346659457 +0100
+@@ -1261,7 +1261,7 @@ CURLcode Curl_getformdata(struct Session
FILE *fileread;
fileread = strequal("-", file->contents)?
@@ -64,7 +64,7 @@
/*
* VMS: This only allows for stream files on VMS. Stream files are
-@@ -1458,7 +1458,7 @@ static size_t readfromfile(struct Form *
+@@ -1420,7 +1420,7 @@ static size_t readfromfile(struct Form *
else {
if(!form->fp) {
/* this file hasn't yet been opened */
@@ -75,8 +75,8 @@
}
Index: lib/hostip6.c
===================================================================
---- lib/hostip6.c.orig 2014-02-04 16:25:31.277657445 +0100
-+++ lib/hostip6.c 2014-02-04 16:25:32.639671801 +0100
+--- lib/hostip6.c.orig 2014-11-14 16:22:55.237645688 +0100
++++ lib/hostip6.c 2014-11-14 16:22:56.346659457 +0100
@@ -39,7 +39,7 @@
#ifdef HAVE_PROCESS_H
#include <process.h>
@@ -97,8 +97,8 @@
ipv6_works = 0;
Index: lib/if2ip.c
===================================================================
---- lib/if2ip.c.orig 2014-02-04 16:25:31.277657445 +0100
-+++ lib/if2ip.c 2014-02-04 16:25:32.639671801 +0100
+--- lib/if2ip.c.orig 2014-11-14 16:22:55.238645701 +0100
++++ lib/if2ip.c 2014-11-14 16:22:56.346659457 +0100
@@ -171,7 +171,7 @@ if2ip_result_t Curl_if2ip(int af, unsign
if(len >= sizeof(req.ifr_name))
return IF2IP_NOT_FOUND;
@@ -110,9 +110,9 @@
Index: lib/netrc.c
===================================================================
---- lib/netrc.c.orig 2014-02-04 16:25:32.639671801 +0100
-+++ lib/netrc.c 2014-02-04 16:26:01.737978525 +0100
-@@ -99,7 +99,7 @@ int Curl_parsenetrc(const char *host,
+--- lib/netrc.c.orig 2014-11-14 16:22:55.238645701 +0100
++++ lib/netrc.c 2014-11-14 16:22:56.346659457 +0100
+@@ -111,7 +111,7 @@ int Curl_parsenetrc(const char *host,
netrc_alloc = TRUE;
}
@@ -123,9 +123,9 @@
if(file) {
Index: lib/connect.c
===================================================================
---- lib/connect.c.orig 2014-02-04 16:25:31.277657445 +0100
-+++ lib/connect.c 2014-02-04 16:25:32.761673087 +0100
-@@ -1298,7 +1298,7 @@ CURLcode Curl_socket(struct connectdata
+--- lib/connect.c.orig 2014-11-14 16:22:55.238645701 +0100
++++ lib/connect.c 2014-11-14 16:22:56.346659457 +0100
+@@ -1306,7 +1306,7 @@ CURLcode Curl_socket(struct connectdata
(struct curl_sockaddr *)addr);
else
/* opensocket callback not set, so simply create the socket now */
@@ -136,9 +136,9 @@
/* no socket, no connection */
Index: configure.ac
===================================================================
---- configure.ac.orig 2014-02-04 16:25:31.278657455 +0100
-+++ configure.ac 2014-02-04 16:25:32.762673098 +0100
-@@ -182,6 +182,7 @@ AC_CANONICAL_HOST
+--- configure.ac.orig 2014-11-14 16:22:55.239645713 +0100
++++ configure.ac 2014-11-14 16:22:56.347659469 +0100
+@@ -181,6 +181,7 @@ AC_CANONICAL_HOST
dnl Get system canonical name
AC_DEFINE_UNQUOTED(OS, "${host}", [cpu-machine-OS])
@@ -146,7 +146,7 @@
dnl Checks for programs.
dnl Our curl_off_t internal and external configure settings
-@@ -194,6 +195,7 @@ dnl Our configure and build reentrant se
+@@ -193,6 +194,7 @@ dnl Our configure and build reentrant se
CURL_CONFIGURE_THREAD_SAFE
CURL_CONFIGURE_REENTRANT
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org
For additional commands, e-mail: opensuse-commit+help(a)opensuse.org
1
0
Hello community,
here is the log from the commit of package rpcbind for openSUSE:Factory checked in at 2014-11-24 11:14:26
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/rpcbind (Old)
and /work/SRC/openSUSE:Factory/.rpcbind.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "rpcbind"
Changes:
--------
--- /work/SRC/openSUSE:Factory/rpcbind/rpcbind.changes 2014-06-17 11:22:58.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.rpcbind.new/rpcbind.changes 2014-11-24 11:14:26.000000000 +0100
@@ -1,0 +2,6 @@
+Wed Nov 12 15:05:00 CET 2014 - kukuk(a)suse.de
+
+- Disable debug code, which else would fill up the log files
+ [bnc#905042]
+
+-------------------------------------------------------------------
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ rpcbind.spec ++++++
--- /var/tmp/diff_new_pack.48eA8Y/_old 2014-11-24 11:14:28.000000000 +0100
+++ /var/tmp/diff_new_pack.48eA8Y/_new 2014-11-24 11:14:28.000000000 +0100
@@ -119,7 +119,7 @@
--bindir=/sbin \
--enable-libwrap \
--enable-warmstarts \
- --enable-debug \
+ --disable-debug \
--with-statedir=%{_localstatedir}/lib/rpcbind \
--with-rpcuser=rpc
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org
For additional commands, e-mail: opensuse-commit+help(a)opensuse.org
1
0
Hello community,
here is the log from the commit of package salt for openSUSE:Factory checked in at 2014-11-24 11:13:31
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/salt (Old)
and /work/SRC/openSUSE:Factory/.salt.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "salt"
Changes:
--------
--- /work/SRC/openSUSE:Factory/salt/salt.changes 2014-10-23 14:21:19.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.salt.new/salt.changes 2014-11-24 11:13:44.000000000 +0100
@@ -1,0 +2,81 @@
+Mon Nov 3 21:35:31 UTC 2014 - aboe76(a)gmail.com
+
+- Updated to Major Release 2014.7.0
+- added python-zipp as depency
+- added recommend python-pygit2, this is the preferred gitfs backend of saltstack
+- added zsh-completion package
+- Removed Patch fix-service-py-version-parsing-sles.patch already fixed in this package
+- Removed Patch pass-all-systemd-list-units.patch already fixed in this package
+- Removed Patch disable-service-py-for-suse-family.patch already fixed in this package
+- Removed Patch allow-systemd-units-no-unit-files.patch already fixed in this package
+- Removed Patch allow-systemd-parameterized-services.patch already fixed in this package
+- More information at: http://docs.saltstack.com/en/latest/topics/releases/2014.7.0.html
+- SALT SSH ENHANCEMENTS:
+ + Support for Fileserver Backends
+ + Support for Saltfile
+ + Ext Pillar
+ + No more sshpass needed
+ + Pure Python Shim
+ + Custom Module Delivery
+ + CP module Support
+ + More Thin Directory Options
+ - Salt State System enhancements:
+ + New Imperative State Keyword "Listen"
+ + New Mod Aggregate Runtime Manipulator
+ + New Requisites: onchanges and onfail
+ + New Global onlyif and unless
+ + Use names to expand and override values
+ - Salt Major Features:
+ + Improved Scheduler Additions
+ + Red Hat 7 Support
+ + Fileserver Backends in Salt-call
+ + Amazon Execution Modules in salt-cloud
+ + LXC Runner Enhancements
+ + Next Gen Docker Management
+ + Peer System Performance Improvements
+ + SDB Encryption at rest for configs
+ + GPG Renderer encrypted pillar at rest
+ + OpenStack Expansions
+ + Queues System external queue systems into Salt events
+ + Multi Master Failover Additions
+ + Chef Execution Module
+ - salt-api Project Merge
+ + Synchronous and Asynchronous Execution of Runner and Wheel Modules
+ + rest_cherrypy Additions
+ + Web Hooks
+ - Fileserver Backend Enhancements:
+ + New gitfs Features
+ + Pygit2 and Dulwich support
+ + Mountpoints support
+ + New hgfs Features
+ + mountpoints support
+ + New svnfs Features:
+ + mountpoints
+ + minionfs Featuressupport
+ + mountpoints
+ - New Salt Modules:
+ + Oracle
+ + Random
+ + Redis
+ + Amazon Simple Queue Service
+ + Block Device Management
+ + CoreOS etcd
+ + Genesis
+ + InfluxDB
+ + Server Density
+ + Twilio Notifications
+ + Varnish
+ + ZNC IRC Bouncer
+ + SMTP
+ - NEW RUNNERS:
+ + Map/Reduce Style
+ + Queue
+ - NEW EXTERNAL PILLARS:
+ + CoreOS etcd
+ - NEW SALT-CLOUD PROVIDERS:
+ + Aliyun ECS Cloud
+ + LXC Containers
+ + Proxmox (OpenVZ containers & KVM)
+- DEPRECATIONS:
+ + Salt.modules.virtualenv_mod
+-------------------------------------------------------------------
Old:
----
allow-systemd-parameterized-services.patch
allow-systemd-units-no-unit-files.patch
disable-service-py-for-suse-family.patch
fix-service-py-version-parsing-sles.patch
pass-all-systemd-list-units.patch
salt-2014.1.13.tar.gz
New:
----
salt-2014.7.0.tar.gz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ salt.spec ++++++
--- /var/tmp/diff_new_pack.hkoDcH/_old 2014-11-24 11:13:45.000000000 +0100
+++ /var/tmp/diff_new_pack.hkoDcH/_new 2014-11-24 11:13:45.000000000 +0100
@@ -16,25 +16,16 @@
#
Name: salt
-Version: 2014.1.13
+Version: 2014.7.0
Release: 0
Summary: A parallel remote execution system
License: Apache-2.0
Group: System/Monitoring
Url: http://saltstack.org/
Source0: http://pypi.python.org/packages/source/s/%{name}/%{name}-%{version}.tar.gz
-# PATCH-FIX-UPSTREAM allow-systemd-units-no-unit-files.patch tserong(a)suse.com -- allow salt to detect init script services
-Patch1: allow-systemd-units-no-unit-files.patch
-# PATCH-FIX-UPSTREAM allow-systemd-units-no-unit-files.patch tserong(a)suse.com -- part 2 of above fix
-Patch2: allow-systemd-parameterized-services.patch
-# PATCH-FIX-UPSTREAM pass-all-systemd-list-units.patch tserong(a)suse.com -- part 3 of above fix
-Patch3: pass-all-systemd-list-units.patch
+
# PATCH-FIX-OPENSUSE use-forking-daemon.patch tserong(a)suse.com -- We don't have python-systemd, so notify can't work
-Patch4: use-forking-daemon.patch
-# PATCH-FIX-UPSTREAM disable-service-py-for-suse-family.patch tserong(a)suse.com -- ensure salt uses systemd for services on SLES
-Patch5: disable-service-py-for-suse-family.patch
-# PATCH-FIX-UPSTREAM fix-service-py-version-parsing-sles.patch tserong(a)suse.com -- fix SLES 11 version parsing
-Patch6: fix-service-py-version-parsing-sles.patch
+Patch1: use-forking-daemon.patch
#for building
BuildRequires: fdupes
@@ -48,7 +39,7 @@
BuildRequires: python-psutil
BuildRequires: python-pycrypto
BuildRequires: python-pyzmq
-BuildRequires: python-requests
+BuildRequires: python-requests >= 1.0.0
BuildRequires: python-yaml
%if 0%{?sles_version}
@@ -83,6 +74,7 @@
Requires: python-xml
Requires: python-yaml
Requires: python-yaml
+Requires: python-zypp
Requires(pre): %fillup_prereq
%if 0%{?suse_version} < 1210
Requires(pre): %insserv_prereq
@@ -96,6 +88,7 @@
%if %with_bashcomp
BuildRequires: bash-completion
+BuildRequires: zsh
%endif #with_bashcomp
BuildRoot: %{_tmppath}/%{name}-%{version}-build
@@ -107,6 +100,7 @@
Recommends: python-botocore
Recommends: python-netaddr
+Recommends: python-pygit2
%description
Salt is a distributed remote execution system used to execute commands and
@@ -116,13 +110,22 @@
information, and not just dozens, but hundreds or even thousands of individual
servers, handle them quickly and through a simple and manageable interface.
+%package api
+Summary: The api for Salt a parallel remote execution system
+Group: System/Monitoring
+Requires: %{name} = %{version}
+Requires: %{name}-master = %{version}
+Recommends: python-CherryPy
+
+%description api
+salt-api is a modular interface on top of Salt that can provide a variety of entry points into a running Salt system.
+
%package cloud
Summary: Salt Cloud is a generic cloud provisioning tool
Group: System/Monitoring
Requires: %{name} = %{version}
Requires: python-PyYAML
Requires: python-apache-libcloud
-Recommends: sshpass
Recommends: python-botocore
Recommends: python-netaddr
@@ -149,10 +152,10 @@
Requires: %{name} = %{version}
%if 0%{?suse_version} == 1315
Recommends: git
-Recommends: python-GitPython
+Recommends: python-pygit2
%else
Requires: git
-Requires: python-GitPython
+Requires: python-pygit2
%endif
Requires: python-M2Crypto
Requires: python-msgpack-python
@@ -212,7 +215,6 @@
Requires: %{name} = %{version}
BuildRequires: python-markupsafe
Requires: python-markupsafe
-Recommends: sshpass
%if 0%{?suse_version} < 1210
Requires(pre): %insserv_prereq
%endif
@@ -234,16 +236,22 @@
%description bash-completion
Bash command line completion support for %{name}.
+%package zsh-completion
+Summary: Zsh Completion for %{name}
+Group: System/Management
+Conflicts: salt-zsh-completion
+Requires: %{name} = %{version}
+Requires: zsh
+BuildArch: noarch
+
+%description zsh-completion
+Zsh command line completion support for %{name}.
+
%endif # with_bashcomp
%prep
%setup -q
%patch1 -p1
-%patch2 -p1
-%patch3 -p1
-%patch4 -p1
-%patch5 -p1
-%patch6 -p1
%build
python setup.py build
@@ -279,17 +287,21 @@
install -Dpm 0644 pkg/salt-master.service %{buildroot}%_unitdir/salt-master.service
install -Dpm 0644 pkg/salt-minion.service %{buildroot}%_unitdir/salt-minion.service
install -Dpm 0644 pkg/salt-syndic.service %{buildroot}%_unitdir/salt-syndic.service
+install -Dpm 0644 pkg/salt-api.service %{buildroot}%_unitdir/salt-api.service
ln -s service %{buildroot}%{_sbindir}/rcsalt-master
ln -s service %{buildroot}%{_sbindir}/rcsalt-syndic
ln -s service %{buildroot}%{_sbindir}/rcsalt-minion
+ln -s service %{buildroot}%{_sbindir}/rcsalt-api
%else
## install init scripts
install -Dpm 0755 pkg/suse/salt-master %{buildroot}%{_initddir}/salt-master
install -Dpm 0755 pkg/suse/salt-syndic %{buildroot}%{_initddir}/salt-syndic
install -Dpm 0755 pkg/suse/salt-minion %{buildroot}%{_initddir}/salt-minion
+install -Dpm 0755 pkg/suse/salt-api %{buildroot}%{_initddir}/salt-api
ln -sf %{_initddir}/salt-master %{buildroot}%{_sbindir}/rcsalt-master
ln -sf %{_initddir}/salt-syndic %{buildroot}%{_sbindir}/rcsalt-syndic
ln -sf %{_initddir}/salt-minion %{buildroot}%{_sbindir}/rcsalt-minion
+ln -sf %{_initddir}/salt-api %{buildroot}%{_sbindir}/rcsalt-api
%endif
#
@@ -309,13 +321,14 @@
#
## install completion scripts
%if %with_bashcomp
-install -Dpm 0644 pkg/salt.bash "%{buildroot}/etc/bash_completion.d/%{name}"
+install -Dpm 0644 pkg/salt.bash %{buildroot}/etc/bash_completion.d/%{name}
+install -Dpm 0644 scripts/completion/zsh_completion.zsh %{buildroot}/etc/zsh_completion.d/%{name}
%endif #with_bashcomp
-%check
-%if 0%{?suse_version} < 1310
-%{__python} setup.py test --runtests-opts=-u
-%endif
+#%%check
+#%%if 0%{?suse_version} < 1310
+#%%{__python} setup.py test --runtests-opts=-u
+#%%endif
%preun syndic
%if 0%{?_unitdir:1}
@@ -401,6 +414,44 @@
%restart_on_update salt-minion
%endif
+%preun api
+%if 0%{?_unitdir:1}
+%service_del_preun salt-api.service
+%else
+%stop_on_removal
+%endif
+
+%pre api
+%if 0%{?_unitdir:1}
+%service_add_pre salt-api.service
+%endif
+
+%post api
+%if 0%{?_unitdir:1}
+%service_add_post salt-api.service
+%else
+%fillup_and_insserv
+%endif
+
+%postun api
+%if 0%{?_unitdir:1}
+%service_del_postun salt-api.service
+%else
+%insserv_cleanup
+%restart_on_update
+%endif
+
+%files api
+%defattr(-,root,root)
+%{_bindir}/salt-api
+%{_sbindir}/rcsalt-api
+%if 0%{?_unitdir:1}
+%_unitdir/salt-api.service
+%else
+%{_sysconfdir}/init.d/salt-api
+%endif
+%{_mandir}/man1/salt-api.1.*
+
%files cloud
%defattr(-,root,root)
%{_bindir}/salt-cloud
@@ -475,6 +526,8 @@
%dir %{_sysconfdir}/salt
%dir /var/log/salt
%{_bindir}/salt-call
+%{_bindir}/salt-unity
+%{_mandir}/man1/salt-unity.1.gz
%{_mandir}/man1/salt-call.1.gz
%{_mandir}/man7/salt.7.gz
%config(noreplace) %{_sysconfdir}/logrotate.d/salt
@@ -488,6 +541,10 @@
%defattr(-,root,root)
%config %{_sysconfdir}/bash_completion.d/%{name}
+%files zsh-completion
+%defattr(-,root,root)
+%config %{_sysconfdir}/zsh_completion.d/%{name}
+
%endif #with_bashcomp
%changelog
++++++ salt-2014.1.13.tar.gz -> salt-2014.7.0.tar.gz ++++++
++++ 197578 lines of diff (skipped)
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org
For additional commands, e-mail: opensuse-commit+help(a)opensuse.org
1
0
Hello community,
here is the log from the commit of package ninja-ide for openSUSE:Factory checked in at 2014-11-24 11:13:30
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/ninja-ide (Old)
and /work/SRC/openSUSE:Factory/.ninja-ide.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "ninja-ide"
Changes:
--------
--- /work/SRC/openSUSE:Factory/ninja-ide/ninja-ide.changes 2013-10-24 19:09:05.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.ninja-ide.new/ninja-ide.changes 2014-11-24 11:13:43.000000000 +0100
@@ -1,0 +2,13 @@
+Thu Nov 20 16:24:38 UTC 2014 - toddrme2178(a)gmail.com
+
+- Include .rpmlinc file in sources.
+- Provide url for source file verification.
+- Switch to .desktop file included in the package.
+
+-------------------------------------------------------------------
+Thu Nov 20 11:04:53 UTC 2014 - toddrme2178(a)gmail.com
+
+- Require python-setuptools since the main package depends on it.
+- Spec file cleanups
+
+-------------------------------------------------------------------
Old:
----
ninja-ide-2.3.zip
ninja-ide.desktop
New:
----
v2.3.tar.gz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ ninja-ide.spec ++++++
--- /var/tmp/diff_new_pack.R0snTu/_old 2014-11-24 11:13:44.000000000 +0100
+++ /var/tmp/diff_new_pack.R0snTu/_new 2014-11-24 11:13:44.000000000 +0100
@@ -1,7 +1,7 @@
#
# spec file for package ninja-ide
#
-# 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
@@ -13,11 +13,8 @@
# published by the Open Source Initiative.
# Please submit bugfixes or comments via http://bugs.opensuse.org/
-#
-
+#https://codeload.github.com/ninja-ide/ninja-ide/zip/v2.3
-%{!?python_sitelib: %global python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
-%{!?python_sitearch: %global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
Name: ninja-ide
Version: 2.3
@@ -26,9 +23,9 @@
Summary: Ninja IDE for Python development
License: GPL-3.0
Group: Development/Languages/Python
-Source0: %{name}-%{version}.zip
-Source1: ninja-ide.desktop
-Source2: %{name}.1.gz
+Source0: https://github.com/ninja-ide/ninja-ide/archive/v%{version}.tar.gz
+Source1: %{name}.1.gz
+Source99: %{name}.rpmlintrc
BuildRoot: %{_tmppath}/%{name}-%{version}-build
BuildRequires: desktop-file-utils
BuildRequires: fdupes
@@ -39,22 +36,14 @@
BuildRequires: unzip
BuildRequires: update-desktop-files
BuildRequires: zlib-devel
-%if 0%{?suse_version} > 1230
BuildRequires: python-setuptools
-%endif
Requires: python-pyinotify
Requires: python-qt4
-%if 0%{?sles_version} == 11
-%ifarch x86_64
-BuildArch: x86_64
-%endif
-%endif
-%if 0%{?suse_version}
-%py_requires
-%if 0%{?suse_version} >= 1140
+%if 0%{?suse_version} && 0%{?suse_version} <= 1110
+%{!?python_sitelib: %global python_sitelib %(python -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
+%else
BuildArch: noarch
%endif
-%endif
%description
Features:
@@ -75,28 +64,27 @@
%setup -q #-n ninja-ide
%build
-%{__python} setup.py build
+python setup.py build
%install
-desktop-file-install --dir %{buildroot}%{_datadir}/applications %{SOURCE1}
-%{__install} -d %{buildroot}%{_datadir}/pixmaps/
-%{__cp} icon.png %{buildroot}%{_datadir}/pixmaps/ninja-ide.png
+desktop-file-install --dir %{buildroot}%{_datadir}/applications build_files/ninja-ide-git.desktop
+install -d %{buildroot}%{_datadir}/pixmaps/
+cp icon.png %{buildroot}%{_datadir}/pixmaps/ninja-ide.png
+
mkdir -p %{buildroot}%{_mandir}/man1
-cp %{SOURCE2} %{buildroot}%{_mandir}/man1/%{name}.1.gz
-%if 0%{?suse_version} < 1230
-%{__python} setup.py install -O1 --skip-build --root %{buildroot} --prefix=%{_prefix}
-%else
-%{__python} setup.py install -O1 --skip-build --root %{buildroot}
-%endif
-%suse_update_desktop_file -i ninja-ide Development IDE
-%fdupes %{buildroot}%{python_sitelib}/
+cp %{SOURCE1} %{buildroot}%{_mandir}/man1/%{name}.1.gz
+
+python setup.py install -O1 --skip-build --root %{buildroot}
+
+%suse_update_desktop_file -i ninja-ide-git Development IDE
+%fdupes %{buildroot}%{python_sitelib}
find %{buildroot} -name 'pep8mod.py' | xargs chmod 0755
%files
%defattr(-,root,root,-)
%{_bindir}/%{name}
-%{_datadir}/applications/*desktop
-%{_datadir}/pixmaps/*png
+%{_datadir}/applications/*.desktop
+%{_datadir}/pixmaps/*.png
%{python_sitelib}/*
%{_mandir}/man1/%{name}.1.*
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org
For additional commands, e-mail: opensuse-commit+help(a)opensuse.org
1
0
Hello community,
here is the log from the commit of package weechat for openSUSE:Factory checked in at 2014-11-24 11:13:29
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/weechat (Old)
and /work/SRC/openSUSE:Factory/.weechat.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "weechat"
Changes:
--------
--- /work/SRC/openSUSE:Factory/weechat/weechat.changes 2014-10-18 09:09:17.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.weechat.new/weechat.changes 2014-11-24 11:13:42.000000000 +0100
@@ -1,0 +2,8 @@
+Thu Nov 20 14:46:54 UTC 2014 - tchvatal(a)suse.com
+
+- Remove sle11 support as now I don't need it anymore
+- Use %cmake macro properly
+- Document that there are tests that need extra pkg
+- Split documentation into -doc subpackage
+
+-------------------------------------------------------------------
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ weechat.spec ++++++
--- /var/tmp/diff_new_pack.ALgzDK/_old 2014-11-24 11:13:42.000000000 +0100
+++ /var/tmp/diff_new_pack.ALgzDK/_new 2014-11-24 11:13:43.000000000 +0100
@@ -27,8 +27,11 @@
Source1: weechat.desktop
# PATCH-FIX-UPSTREAM weechat-capath.patch https://savannah.nongnu.org/patch/index.php?8153 lnussel(a)suse.de -- use system's default certificate store
Patch0: weechat-capath.patch
+BuildRequires: asciidoc
BuildRequires: cmake
BuildRequires: curl-devel
+BuildRequires: docbook5-xsl-stylesheets
+BuildRequires: enchant-devel
BuildRequires: gcc-c++
BuildRequires: grep
BuildRequires: guile-devel
@@ -37,30 +40,20 @@
BuildRequires: libgnutls-devel
BuildRequires: libgpg-error-devel
BuildRequires: libtool
+BuildRequires: libxslt-tools
+BuildRequires: lua51-devel
BuildRequires: lzo-devel
BuildRequires: ncurses-devel
BuildRequires: perl
BuildRequires: pkg-config
BuildRequires: python-devel
BuildRequires: ruby-devel
+BuildRequires: source-highlight
BuildRequires: tcl-devel
BuildRequires: update-desktop-files
Requires: hicolor-icon-theme
+Suggests: %{name}-doc
BuildRoot: %{_tmppath}/%{name}-%{version}-build
-%if 0%{?suse_version} > 1220
-BuildRequires: enchant-devel
-%endif
-%if 0%{?suse_version} > 1220
-BuildRequires: lua51-devel
-%else
-BuildRequires: lua-devel
-%endif
-%if 0%{?suse_version} > 1220
-BuildRequires: asciidoc
-BuildRequires: docbook5-xsl-stylesheets
-BuildRequires: libxslt-tools
-BuildRequires: source-highlight
-%endif
%description
WeeChat (Wee Enhanced Environment for Chat) is a fast and light cross-platform
@@ -70,29 +63,34 @@
%lang_package
+%package doc
+Summary: Documentation for %{name}
+Group: Documentation/HTML
+Requires: %{name} = %{version}
+
+%description doc
+Various documentation files for %{name}.
+
%package devel
Summary: Development Environment for %{name} Plugins
Group: Development/Libraries/C and C++
-Requires: %{name} = %{version}-%{release}
+Requires: %{name} = %{version}
%description devel
Development environment for authoring %{name} plugins.
-%if 0%{?suse_version} > 1220
-
%package guile
Summary: Guile Scripting Support for %{name}
Group: Productivity/Networking/IRC
-Requires: %{name} = %{version}-%{release}
+Requires: %{name} = %{version}
%description guile
Support for %{name} scripts written in the Guile language.
-%endif
%package lua
Summary: Lua Scripting Support for %{name}
Group: Productivity/Networking/IRC
-Requires: %{name} = %{version}-%{release}
+Requires: %{name} = %{version}
%description lua
Support for %{name} scripts written in the Lua language.
@@ -100,7 +98,7 @@
%package perl
Summary: Perl Scripting Support for %{name}
Group: Productivity/Networking/IRC
-Requires: %{name} = %{version}-%{release}
+Requires: %{name} = %{version}
%{?libperl_requires}
%description perl
@@ -109,7 +107,7 @@
%package python
Summary: Python Scripting Support for %{name}
Group: Productivity/Networking/IRC
-Requires: %{name} = %{version}-%{release}
+Requires: %{name} = %{version}
%description python
Support for %{name} scripts written in the Python language.
@@ -117,7 +115,7 @@
%package tcl
Summary: Tcl Scripting Support for %{name}
Group: Productivity/Networking/IRC
-Requires: %{name} = %{version}-%{release}
+Requires: %{name} = %{version}
%description tcl
Support for %{name} scripts written in the Tcl language.
@@ -125,21 +123,18 @@
%package ruby
Summary: Ruby Scripting Support for %{name}
Group: Productivity/Networking/IRC
-Requires: %{name} = %{version}-%{release}
+Requires: %{name} = %{version}
%description ruby
Support for %{name} scripts written in the Ruby language.
-%if 0%{?suse_version} > 1220
-
%package aspell
Summary: Aspell Spell-Checking Support for %{name}
Group: Productivity/Networking/IRC
-Requires: %{name} = %{version}-%{release}
+Requires: %{name} = %{version}
%description aspell
Spell-checking support for %{name}, using the aspell library.
-%endif
%prep
%setup -q
@@ -152,41 +147,31 @@
%build
export CFLAGS="%{optflags}"
-mkdir build
-pushd build
-cmake \
- -DCMAKE_INSTALL_PREFIX="%{_prefix}" \
+# Tests require cpputest package
+# no-undefined for perl seem not to work as desired
+%cmake \
+ -DCMAKE_EXE_LINKER_FLAGS=-Wl,--as-needed -DCMAKE_MODULE_LINKER_FLAGS=-Wl,--as-needed -DCMAKE_SHARED_LINKER_FLAGS=-Wl,--as-needed \
-DLIBDIR="%{_libdir}" \
-DPYTHON_LIBRARY="%{_libdir}/libpython%{py_ver}.so" \
-DENABLE_ENCHANT=ON \
-DENABLE_DOC=ON \
- -DENABLE_MAN=ON \
- ..
-make %{?_smp_flags} VERBOSE=1
-popd #build
+ -DENABLE_MAN=ON
+make %{?_smp_mflags}
%install
-pushd build
-make DESTDIR=%{buildroot} install %{?_smp_mflags}
-popd #build
+%cmake_install
# due to an unknown race condition cmake does not always create a compatibility
# symlink
ln -sf %{_bindir}/weechat %{buildroot}%{_bindir}/weechat-curses
install -D -m 0644 "%{SOURCE1}" "%{buildroot}%{_datadir}/applications/%{name}.desktop"
-%if 0%{?suse_version}
%suse_update_desktop_file -r "%{name}" Network IRCClient
-%endif
-%if 0%{?suse_version} > 1220
mv "%{buildroot}%{_datadir}/doc/weechat" html
-%endif
%find_lang "%{name}" --with-man
-%if 0%{?suse_version} > 1220
-
%post
%desktop_database_post
%icon_theme_cache_post
@@ -194,15 +179,15 @@
%postun
%desktop_database_postun
%icon_theme_cache_postun
-%endif
+
+%files doc
+%defattr(-,root,root)
+%doc html/
%files
%defattr(-,root,root)
%doc AUTHORS.asciidoc ChangeLog.asciidoc Contributing.asciidoc COPYING
%doc README.asciidoc ReleaseNotes.asciidoc
-%if 0%{?suse_version} > 1220
-%doc html/
-%endif
%{_bindir}/weechat-curses
%{_bindir}/weechat
%dir %{_libdir}/weechat
@@ -217,9 +202,7 @@
%{_libdir}/weechat/plugins/script.so
%{_libdir}/weechat/plugins/trigger.so
%{_libdir}/weechat/plugins/xfer.so
-%if 0%{?suse_version} > 1220
%{_mandir}/man1/weechat.1*
-%endif
%{_datadir}/applications/weechat.desktop
%{_datadir}/icons/hicolor/*/apps/weechat.png
@@ -231,12 +214,9 @@
%{_includedir}/weechat
%{_libdir}/pkgconfig/weechat.pc
-%if 0%{?suse_version} > 1220
-
%files guile
%defattr(-,root,root)
%{_libdir}/weechat/plugins/guile.so
-%endif
%files lua
%defattr(-,root,root)
@@ -258,11 +238,8 @@
%defattr(-,root,root)
%{_libdir}/weechat/plugins/ruby.so
-%if 0%{?suse_version} > 1220
-
%files aspell
%defattr(-,root,root)
%{_libdir}/weechat/plugins/aspell.so
-%endif
%changelog
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org
For additional commands, e-mail: opensuse-commit+help(a)opensuse.org
1
0
Hello community,
here is the log from the commit of package ebtables for openSUSE:Factory checked in at 2014-11-24 11:13:27
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/ebtables (Old)
and /work/SRC/openSUSE:Factory/.ebtables.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "ebtables"
Changes:
--------
--- /work/SRC/openSUSE:Factory/ebtables/ebtables.changes 2014-10-01 11:23:35.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.ebtables.new/ebtables.changes 2014-11-24 11:13:41.000000000 +0100
@@ -1,0 +2,6 @@
+Thu Nov 13 18:52:25 UTC 2014 - dimstar(a)opensuse.org
+
+- Also save include/linux/netfilter_bridge/ebt_ulog.h, as it no
+ longer exists in the mainline kernel.
+
+-------------------------------------------------------------------
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ ebtables.spec ++++++
--- /var/tmp/diff_new_pack.CnJEHF/_old 2014-11-24 11:13:41.000000000 +0100
+++ /var/tmp/diff_new_pack.CnJEHF/_new 2014-11-24 11:13:41.000000000 +0100
@@ -50,10 +50,12 @@
# delete all kernel headers, but keep ebt_ip6.h and ebt_nflog.h
mv include/linux/netfilter_bridge/ebt_ip6.{h,h.save}
mv include/linux/netfilter_bridge/ebt_nflog.{h,h.save}
+mv include/linux/netfilter_bridge/ebt_ulog.{h,h.save}
rm -f include/linux/*.h
rm -f include/linux/netfilter_bridge/*.h
mv include/linux/netfilter_bridge/ebt_ip6.{h.save,h}
mv include/linux/netfilter_bridge/ebt_nflog.{h.save,h}
+mv include/linux/netfilter_bridge/ebt_ulog.{h.save,h}
make \
CFLAGS="%optflags" \
CXXFLAGS="%optflags" \
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org
For additional commands, e-mail: opensuse-commit+help(a)opensuse.org
1
0
Hello community,
here is the log from the commit of package kiwi for openSUSE:Factory checked in at 2014-11-24 11:13:20
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/kiwi (Old)
and /work/SRC/openSUSE:Factory/.kiwi.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "kiwi"
Changes:
--------
--- /work/SRC/openSUSE:Factory/kiwi/kiwi.changes 2014-11-06 16:49:49.000000000 +0100
+++ /work/SRC/openSUSE:Factory/.kiwi.new/kiwi.changes 2014-11-24 11:13:32.000000000 +0100
@@ -2 +2 @@
-Wed Nov 5 10:19:30 CET 2014 - ms(a)suse.de
+Fri Nov 21 10:37:41 CET 2014 - ms(a)suse.de
@@ -4 +4,221 @@
-- v7.01.18 released
+- v7.02.6 released
+
+-------------------------------------------------------------------
+Fri Nov 21 10:36:26 CET 2014 - ms(a)suse.de
+
+- Fixed Makefile clean target
+
+ make sure all autogenerated data is wiped on clean
+ make sure clean target is called on build of package
+
+-------------------------------------------------------------------
+Fri Nov 21 10:34:00 CET 2014 - ms(a)suse.de
+
+- v7.02.5 released
+
+-------------------------------------------------------------------
+Fri Nov 21 09:48:31 CET 2014 - ms(a)suse.de
+
+- Allow to run kiwi --describe from git checkout
+
+-------------------------------------------------------------------
+Fri Nov 21 09:30:19 CET 2014 - ms(a)suse.de
+
+- Fixed typo in 13.2 os release matcher
+
+-------------------------------------------------------------------
+Fri Nov 21 09:25:48 CET 2014 - ms(a)suse.de
+
+- Support kiwi --describe for openSUSE 13.2
+
+ analysing and cloning of 13.2 systems added
+
+-------------------------------------------------------------------
+Thu Nov 20 16:52:05 CET 2014 - ms(a)suse.de
+
+- Added fribidi and fbiterm to kiwi-media-requires package
+
+ Unfortunately these two packages are not on the openSUSE 13.2
+ DVD. But kiwi uses fbiterm in the boot images. Thus users
+ have to add the online repo in order to build. For 13.2 it's
+ too late but with this change I hope the two packages will
+ be placed on the DVD again
+
+-------------------------------------------------------------------
+Tue Nov 18 14:04:07 CET 2014 - ms(a)suse.de
+
+- Cleanup use of installBootLoader
+
+ Instead of building device nodes out of the partition id's hash
+ use the already existing device map information. That eliminates
+ some unneeded logic as well as two helper methods used to find
+ the right place for the device when only the partition id is
+ known
+
+-------------------------------------------------------------------
+Mon Nov 17 17:41:23 CET 2014 - ms(a)suse.de
+
+- Fixed suseStripKernel for updates/ modules
+
+ If the dependency checker finds a dependency to a module in the updates
+ or weak-updates directory the move of the module will fail because kiwi
+ always uses updates/weak-updates modules and has moved them already.
+ The dependency code however creates a new updates/weak-updates directory
+ for the affected module and that causes a conflict when the original
+ updates/weak-updates are moved back to the final place. In the end the
+ result is that no updates/weak-updates module are present in the initrd
+
+-------------------------------------------------------------------
+Mon Nov 17 16:16:44 CET 2014 - ms(a)suse.de
+
+- Better error message in pxeSetupDownloadServer
+
+ Be more descriptive if the PXE download server can't be
+ found. In addition cleanup suse/rhel-dump to call
+ pxeSetupDownloadServer instead of duplicating the code
+
+-------------------------------------------------------------------
+Mon Nov 17 15:32:43 CET 2014 - schwab(a)suse.de
+
+- Don't remove kernel and initrd in KIWIMiniIsoPlugin
+
+-------------------------------------------------------------------
+Mon Nov 17 12:38:01 CET 2014 - ms(a)suse.de
+
+- Make sure drivers/virtio is part of netboot initrd
+
+ This allows to use the virtio network from qemu if
+ started with the virtio-net-pci driver
+
+-------------------------------------------------------------------
+Mon Nov 17 08:52:54 CET 2014 - ms(a)suse.de
+
+- Added 12.2 to the cleanup list in the spec file
+
+-------------------------------------------------------------------
+Mon Nov 17 08:48:45 CET 2014 - ms(a)suse.de
+
+- fix bashism in post script
+
+ Use a simple string list in the spec file to walk through
+ the list of distribution names in order to cleanup old ones
+ Original patch by: Led <ledest(a)gmail.com>
+
+-------------------------------------------------------------------
+Thu Nov 13 15:31:15 CET 2014 - ms(a)suse.de
+
+- v7.02.4 released
+
+-------------------------------------------------------------------
+Thu Nov 13 10:33:38 CET 2014 - ms(a)suse.de
+
+- Fixed and cleanup unit test processing
+
+ When running the unit tests the class KIWILog is overwritten
+ in a way that a global kiwi logger is created from Common::ktLog
+ but there is no declaration which really overwrites the KIWILog
+ package to be a Common::ktLog. This patch fixes this and makes
+ unit testing work in travis again. In addition methods from
+ Common::ktLog no longer present in KIWILog were removed too
+
+-------------------------------------------------------------------
+Wed Nov 12 17:11:20 CET 2014 - ms(a)suse.de
+
+- Fixed result bundler for vhd-fixed format
+
+ There is a small inconsistency between the schema format setup
+ and the extension used in the result file. The schema wants
+ format="vhd-fixed" and the file is written as file.vhdfixed
+
+-------------------------------------------------------------------
+Wed Nov 12 15:46:56 CET 2014 - ms(a)suse.de
+
+- v7.02.3 released
+
+-------------------------------------------------------------------
+Wed Nov 12 10:04:21 CET 2014 - ms(a)suse.de
+
+- Compress install PXE tarball using XZ
+
+ Instead of tar's -z we use now -J for xz compression and
+ also changed the output name to *.install.tar.xz in order
+ to allow the buildservice to match this file as a result
+
+-------------------------------------------------------------------
+Wed Nov 12 09:18:53 CET 2014 - ms(a)suse.de
+
+- v7.02.2 released
+
+-------------------------------------------------------------------
+Wed Nov 12 09:16:09 CET 2014 - ms(a)suse.de
+
+- DB: rebuild documentation, build for factory version
+
+-------------------------------------------------------------------
+Wed Nov 12 09:15:49 CET 2014 - ms(a)suse.de
+
+- v7.02.1 released
+
+-------------------------------------------------------------------
+Tue Nov 11 15:15:36 CET 2014 - ms(a)suse.de
+
+- Fixed broken travis script
+
+-------------------------------------------------------------------
+Tue Nov 11 15:13:25 CET 2014 - ms(a)suse.de
+
+- Run travis using perl 5.18
+
+-------------------------------------------------------------------
+Tue Nov 11 15:12:25 CET 2014 - ms(a)suse.de
+
+- Run Travis checks only for master
+
+-------------------------------------------------------------------
+Tue Nov 11 15:05:31 CET 2014 - ms(a)suse.de
+
+- Revert "Update .travis.yml, run clean target before test"
+
+ This reverts commit 67b5d1880ef36b4ded9879ca4ba07dea7f3293f6.
+
+-------------------------------------------------------------------
+Tue Nov 11 14:58:50 CET 2014 - ms(a)suse.de
+
+- Update .travis.yml, run clean target before test
+
+-------------------------------------------------------------------
+Tue Nov 11 14:23:24 CET 2014 - ms(a)suse.de
+
+- Update 13.2 JeOS description
+
+ added less and iproute2 packages by default
+
+-------------------------------------------------------------------
++++ 34 more lines (skipped)
++++ between /work/SRC/openSUSE:Factory/kiwi/kiwi.changes
++++ and /work/SRC/openSUSE:Factory/.kiwi.new/kiwi.changes
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ kiwi.spec ++++++
--- /var/tmp/diff_new_pack.6QhaFt/_old 2014-11-24 11:13:33.000000000 +0100
+++ /var/tmp/diff_new_pack.6QhaFt/_new 2014-11-24 11:13:33.000000000 +0100
@@ -26,7 +26,7 @@
Group: System/Management
Url: http://github.com/openSUSE/kiwi
Name: kiwi
-Version: 7.01.18
+Version: 7.02.6
Release: 0
Provides: kiwi-image:lxc
Provides: kiwi-image:tbz
@@ -597,6 +597,8 @@
Recommends: kiwi-desc-isoboot
Recommends: kiwi-desc-netboot
Recommends: kiwi-templates
+Recommends: fribidi
+Recommends: fbiterm
%ifarch x86_64
%if 0%{?suse_version} > 1220
Recommends: shim
@@ -731,9 +733,8 @@
%post -n kiwi-templates
#============================================================
-# Clean up old old template directories if the exists
-oldDists=( 10.1 10.2 10.3 11.0 11.1 11.2 11.3 12.1 SLE10 SLED10 )
-for dist in ${oldDists[@]};do
+# Clean up old old template directories if present
+for dist in 10.1 10.2 10.3 11.0 11.1 11.2 11.3 12.1 12.2 SLE10 SLED10; do
rm -rf /usr/share/kiwi/image/suse-$dist-JeOS
done
%endif
++++++ kiwi-docu.tar.bz2 ++++++
++++ 11447 lines of diff (skipped)
++++++ kiwi-repo.tar.bz2 ++++++
++++++ kiwi.tar.bz2 ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/.gitignore new/kiwi/.gitignore
--- old/kiwi/.gitignore 2014-09-15 16:02:49.000000000 +0200
+++ new/kiwi/.gitignore 2014-11-21 09:45:22.000000000 +0100
@@ -8,3 +8,9 @@
*.op.*.old
# hidden temporary files
.tmp.*
+# kiwirc file created if kiwi is called from git checkout
+.kiwirc
+# revision file created for packaging or if called from git checkout
+.revision
+# d3 css data packed into a tarball
+metadata/KIWIAnalyse.tgz
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/.revision new/kiwi/.revision
--- old/kiwi/.revision 2014-11-05 09:55:27.000000000 +0100
+++ new/kiwi/.revision 2014-11-05 09:55:27.000000000 +0100
@@ -1 +1 @@
-900319e56c748dc9ad9249170ac71aaabb06df7e
+1434aa96414213b5877479e2be7915ef436d8126
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/.travis.yml new/kiwi/.travis.yml
--- old/kiwi/.travis.yml 2014-09-15 16:02:49.000000000 +0200
+++ new/kiwi/.travis.yml 2014-11-12 09:22:00.000000000 +0100
@@ -1,8 +1,18 @@
+branches:
+ only:
+ - master
+
language: perl
+
+perl:
+ - "5.18"
+
before_install:
- sudo apt-get update -qq
- sudo apt-get install -y xsltproc
- sudo apt-get install -y syslinux
+
install:
- cpanm -f -n $(cat .perlmodules | tr "\n" " ")
+
script: make test
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/Makefile new/kiwi/Makefile
--- old/kiwi/Makefile 2014-11-05 10:11:53.000000000 +0100
+++ new/kiwi/Makefile 2014-11-21 10:35:56.000000000 +0100
@@ -270,6 +270,7 @@
${MAKE} -C locale clean
rm -f tools/burner/Makefile
rm -f tools/burner/imagewriter
+ rm -f metadata/KIWIAnalyse.tgz
rm -f .revision
rm -f .kiwirc
@@ -282,5 +283,5 @@
rm -f /etc/bash_completion.d/kiwi.sh
rm -f /dev/shm/lwp-download
-build:
+build: clean
./.doit -p --local
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/distribution/kiwi-instsource-plugins-openSUSE-13-2/KIWIMiniIsoPlugin.pm new/kiwi/distribution/kiwi-instsource-plugins-openSUSE-13-2/KIWIMiniIsoPlugin.pm
--- old/kiwi/distribution/kiwi-instsource-plugins-openSUSE-13-2/KIWIMiniIsoPlugin.pm 2014-11-03 12:21:39.000000000 +0100
+++ new/kiwi/distribution/kiwi-instsource-plugins-openSUSE-13-2/KIWIMiniIsoPlugin.pm 2014-11-18 11:09:59.000000000 +0100
@@ -171,9 +171,9 @@
my $rootdir = dirname($rootfile);
$this->logMsg("I", "removing files from <$rootdir>");
foreach my $file (glob("$rootdir/*")) {
- if (-f $file && $file !~ m,/efi$,) {
+ if (-f $file && $file !~ m,/(efi|linux|initrd)$,) {
$this->logMsg("I", "removing <$file>");
- unlink $file;
+ unlink $file;
}
}
return $this;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/kiwi new/kiwi/kiwi
--- old/kiwi/kiwi 2014-11-05 10:14:46.000000000 +0100
+++ new/kiwi/kiwi 2014-11-21 09:43:43.000000000 +0100
@@ -5,6 +5,9 @@
pushd $callpath &>/dev/null
+if [ ! -d "metadata/KIWIAnalyse.tgz" ];then
+ tar -C metadata -czf metadata/KIWIAnalyse.tgz d3
+fi
if [ ! -s ".revision" ];then
./.version > .revision
fi
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/metadata/KIWIAnalyse.systems new/kiwi/metadata/KIWIAnalyse.systems
--- old/kiwi/metadata/KIWIAnalyse.systems 2014-09-15 16:02:53.000000000 +0200
+++ new/kiwi/metadata/KIWIAnalyse.systems 2014-11-21 09:29:52.000000000 +0100
@@ -31,3 +31,4 @@
openSUSE-12.2=suse-12.2
openSUSE-12.3=suse-12.3
openSUSE-13.1=suse-13.1
+openSUSE-13.2=suse-13.2
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/modules/KIWIBoot.pm new/kiwi/modules/KIWIBoot.pm
--- old/kiwi/modules/KIWIBoot.pm 2014-10-26 10:15:13.000000000 +0100
+++ new/kiwi/modules/KIWIBoot.pm 2014-11-18 13:59:58.000000000 +0100
@@ -1191,7 +1191,7 @@
if ($needBiosP) {
$pnr++;
push @commands,"n","p:legacy",$pnr,".","+".$legacysize."M";
- $this->{partids}{biosgrub} = $pnr;
+ $this->{partids}{biosgrub} = $pnr;
}
#==========================================
# setup Power PReP partition
@@ -1201,7 +1201,7 @@
push @commands,"n","p:prep",$pnr,".","+".$prepsize."M";
push @commands,"t",$pnr,"41";
push @commands,"a",$pnr;
- $this->{partids}{prep} = $pnr;
+ $this->{partids}{prep} = $pnr;
}
#==========================================
# setup boot partition
@@ -1440,8 +1440,8 @@
#==========================================
# Install boot loader on disk
#------------------------------------------
- my $bootdevice = $diskname;
- if (! $this -> installBootLoader ($bootloader, $bootdevice)) {
+ my $diskdevice = $diskname;
+ if (! $this -> installBootLoader ($bootloader, $diskdevice, \%deviceMap)) {
$this -> cleanStack ();
return;
}
@@ -1616,12 +1616,12 @@
#------------------------------------------
$kiwi -> info ("Packing installation data...");
$tarname = $system;
- $tarname =~ s/\.raw$/\.install\.tgz/;
+ $tarname =~ s/\.raw$/\.install\.tar\.xz/;
foreach my $file ($md5name,$sysname,$irdname,$krnname,$appname) {
push @packfiles, basename $file;
}
$status = KIWIQX::qxx (
- "tar -C $destdir -czf $tarname @packfiles"
+ "tar -C $destdir -cJf $tarname @packfiles"
);
$result = $? >> 8;
if ($result != 0) {
@@ -2821,11 +2821,11 @@
#==========================================
# Install boot loader on disk
#------------------------------------------
- my $bootdevice = $diskname;
+ my $diskdevice = $diskname;
if ($haveDiskDevice) {
- $bootdevice = $this->{loop};
+ $diskdevice = $this->{loop};
}
- if (! $this->installBootLoader ($bootloader,$bootdevice)) {
+ if (! $this->installBootLoader ($bootloader,$diskdevice, \%deviceMap)) {
$this -> cleanStack ();
return;
}
@@ -5453,6 +5453,7 @@
my $this = shift;
my $loader = shift;
my $diskname = shift;
+ my $deviceMap= shift;
my $kiwi = $this->{kiwi};
my $tmpdir = $this->{tmpdir};
my $chainload= $this->{chainload};
@@ -5463,7 +5464,6 @@
my $haveTree = $this->{haveTree};
my $locator = KIWILocator -> instance();
my $bootdev;
- my $prepdev;
my $result;
my $status;
my $grubtool;
@@ -5472,26 +5472,10 @@
#==========================================
# Setup boot device name
#------------------------------------------
- my $boot_id = 1;
- my $prep_id = 1;
- if ($this->{partids}) {
- if ($this->{partids}{prep}) {
- $prep_id = $this->{partids}{prep};
- }
- if ($this->{partids}{installboot}) {
- $boot_id = $this->{partids}{installboot};
- } elsif ($this->{partids}{boot}) {
- $boot_id = $this->{partids}{boot};
- } elsif ($this->{partids}{root}) {
- $boot_id = $this->{partids}{root};
- }
- }
- if ((! $this->{bindloop}) && (-b $diskname)) {
- $bootdev = $this -> __getPartBase ($diskname).$boot_id;
- $prepdev = $this -> __getPartBase ($diskname).$prep_id;
+ if ($deviceMap->{boot}) {
+ $bootdev = $deviceMap->{boot};
} else {
- $bootdev = $this->{bindloop}.$boot_id;
- $prepdev = $this->{bindloop}.$prep_id;
+ $bootdev = $deviceMap->{root};
}
#==========================================
# Grub2
@@ -5532,7 +5516,7 @@
#------------------------------------------
my $stages = "/mnt/boot/grub2/$grubarch";
if (! KIWIGlobals -> instance() -> mount ($bootdev, '/mnt')) {
- $kiwi -> error ("Couldn't mount boot partition: $status");
+ $kiwi -> error ("Couldn't mount boot partition: $bootdev");
$kiwi -> failed ();
return;
}
@@ -5579,7 +5563,7 @@
}
} elsif (-e "$stages/core.elf") {
# architectures: ppc64le
- $loaderTarget = $prepdev;
+ $loaderTarget = $deviceMap->{prep};
$grubtoolopts = "--grub-mkdevicemap=$dmfile -v ";
$grubtoolopts.= "-d /mnt/usr/lib/grub2/$grubarch ";
$grubtoolopts.= "--root-directory=/mnt --force --no-nvram ";
@@ -5663,7 +5647,7 @@
#==========================================
# re-init bootid, legacy grub starts at 0
#------------------------------------------
- $boot_id = 0;
+ my $boot_id = 0;
if ($this->{partids}) {
if ($this->{partids}{boot}) {
$boot_id = $this->{partids}{boot} - 1;
@@ -6160,7 +6144,6 @@
$this->{cleanupStack} = \@cStack;
$disk =~ s/dev\///;
$part = "/dev/mapper".$disk."p";
- $this->{bindloop} = $part;
return $this;
}
@@ -6564,7 +6547,7 @@
# wait for udev to finish device creation
KIWIQX::qxx ("udevadm settle --timeout=30 2>&1");
for my $part
- (qw(root readonly readwrite boot jump installroot installboot)
+ (qw(root readonly readwrite boot jump installroot installboot prep)
) {
if ($this->{partids}{$part}) {
$result{$part} = $this -> __getPartDevice (
@@ -6623,7 +6606,7 @@
$result{$part} = "/dev/$group/".$this->{partids}{$part."_lv"};
}
}
- for my $part (qw(boot jump)) {
+ for my $part (qw(boot jump prep)) {
if ($this->{partids}{$part}) {
$result{$part} = $this -> __getPartDevice (
$device,$this->{partids}{$part}
@@ -7567,59 +7550,6 @@
}
#==========================================
-# __getPartID
-#------------------------------------------
-sub __getPartID {
- # ...
- # try to find the partition number which references
- # the provided flag like "boot" or "lvm"
- # ---
- my $this = shift;
- my $disk = shift;
- my $flag = shift;
- my $fd = FileHandle -> new();
- if ($fd -> open ("parted -m $disk print | cut -f1,7 -d:|")) {
- while (my $line = <$fd>) {
- if ($line =~ /^(\d):[ ,]*$flag/) {
- return $1;
- }
- }
- $fd -> close();
- }
- return 0;
-}
-
-#==========================================
-# __getPartBase
-#------------------------------------------
-sub __getPartBase {
- # ...
- # find the correct partition device for a
- # given disk device by checking for the first
- # two partitions
- # ---
- my $this = shift;
- my $disk = shift;
- my $devcopy = $disk;
- my $devbase = basename $devcopy;
- my @checklist = (
- "/dev/mapper/".$devbase."p1",
- "/dev/mapper/".$devbase."p2",
- "/dev/".$devbase."p1",
- "/dev/".$devbase."p2",
- "/dev/".$devbase."1",
- "/dev/".$devbase."2"
- );
- foreach my $device (@checklist) {
- if (-b $device) {
- chop $device;
- return $device;
- }
- }
- return;
-}
-
-#==========================================
# __getPartDevice
#------------------------------------------
sub __getPartDevice {
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/modules/KIWIConfig.sh new/kiwi/modules/KIWIConfig.sh
--- old/kiwi/modules/KIWIConfig.sh 2014-09-15 16:02:54.000000000 +0200
+++ new/kiwi/modules/KIWIConfig.sh 2014-11-18 11:11:26.000000000 +0100
@@ -1579,20 +1579,20 @@
fi
done
done
- for mod in `find $stripdir -name "*.ko"`;do
- d=`/usr/bin/basename $mod`
- i=`/sbin/modprobe \
+ for mod in $(find $stripdir -name "*.ko");do
+ d=$(/usr/bin/basename $mod)
+ i=$(/sbin/modprobe \
--set-version $VERSION \
--ignore-install \
--show-depends \
- ${d%.ko} | sed -ne 's:.*insmod /\?::p'`
+ ${d%.ko} | sed -ne 's:.*insmod /\?::p')
for d in $i; do
case "$d" in
*=*) ;;
*)
- if ! test -f $stripdir/$d ; then
+ if [ -f $d ] && [ ! -f $stripdir/$d ]; then
echo "Fixing kernel module Dependency: $d"
- mkdir -vp `/usr/bin/dirname $stripdir/$d`
+ mkdir -vp $(/usr/bin/dirname $stripdir/$d)
cp -flav $d $stripdir/$d
fi
;;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/modules/KIWIGlobals.pm new/kiwi/modules/KIWIGlobals.pm
--- old/kiwi/modules/KIWIGlobals.pm 2014-11-05 10:19:23.000000000 +0100
+++ new/kiwi/modules/KIWIGlobals.pm 2014-11-21 10:37:35.000000000 +0100
@@ -1835,7 +1835,7 @@
# Globals (generic)
#------------------------------------------
my %data;
- $data{Version} = "7.01.18";
+ $data{Version} = "7.02.6";
$data{Publisher} = "SUSE LINUX GmbH";
$data{Preparer} = "KIWI - http://opensuse.github.com/kiwi";
$data{ConfigName} = "config.xml";
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/modules/KIWILinuxRC.sh new/kiwi/modules/KIWILinuxRC.sh
--- old/kiwi/modules/KIWILinuxRC.sh 2014-10-30 11:59:29.000000000 +0100
+++ new/kiwi/modules/KIWILinuxRC.sh 2014-11-17 16:10:46.000000000 +0100
@@ -9383,16 +9383,16 @@
pxeCheckServer
if [ -z "$SERVER" ];then
if [ ! -z "$ip" ];then
- Echo "Found server in PXE ip kernel cmdline"
+ Echo "Found PXE download server IP in kernel cmdline"
SERVER=$(echo $ip | awk -F ':' '{ print $2 }')
else
- Echo "No server configured, trying: tftp.$DOMAIN"
+ Echo "No PXE download server configured, trying: tftp.$DOMAIN"
SERVER=tftp.$DOMAIN
fi
fi
- Echo "Checking Server name: $SERVER"
+ Echo "Checking connectivity of PXE download server: $SERVER"
if ! ping -c 1 -w 30 $SERVER >/dev/null 2>&1;then
- Echo "Server: $SERVER not found"
+ Echo "PXE download server: $SERVER not found"
if [ -z "$SERVERTYPE" ] || [ "$SERVERTYPE" = "tftp" ]; then
if [ ! -z "$DHCPSIADDR" ];then
Echo "Using: $DHCPSIADDR from DHCP info"
@@ -9405,7 +9405,7 @@
SERVER=$SERVERID
else
systemException \
- "Can't assign SERVER IP/name... fatal !" \
+ "Can't find responding PXE download server... fatal !" \
"reboot"
fi
fi
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/modules/KIWIManager.pm new/kiwi/modules/KIWIManager.pm
--- old/kiwi/modules/KIWIManager.pm 2014-09-15 16:02:54.000000000 +0200
+++ new/kiwi/modules/KIWIManager.pm 2014-11-13 10:27:39.000000000 +0100
@@ -585,18 +585,26 @@
my $kiwi = $this->{kiwi};
my @kchroot = @{$this->{kchroot}};
my $root = $this->{root};
+ my $locator = $this->{locator};
my $data;
my $code;
#==========================================
# check for rpm binary
#------------------------------------------
- if (! -e "$root/bin/rpm") {
+ my $rpm = $locator -> getExecPath('rpm');
+ my $rpmdb = $locator -> getExecPath('rpmdb');
+ my $dbdump = $locator -> getExecPath('db_dump');
+ my $dbload = $locator -> getExecPath('db45_load');
+ if (! $rpm) {
return $this;
}
+ if (! $rpmdb) {
+ $rpmdb = $rpm;
+ }
#==========================================
# try to initialize rpm database
#------------------------------------------
- $data = KIWIQX::qxx ("@kchroot /bin/rpm --initdb &>/dev/null");
+ $data = KIWIQX::qxx ("@kchroot $rpmdb --initdb &>/dev/null");
$code = $? >> 8;
#==========================================
# try to rebuild DB on failed init
@@ -605,23 +613,23 @@
$kiwi -> info ('Rebuild RPM package db...');
my $nameIndex = "$root/var/lib/rpm/Name";
my $packIndex = "$root/var/lib/rpm/Packages";
- if (! -x "/usr/bin/db_dump") {
+ if (! $dbdump) {
$kiwi -> failed ();
$kiwi -> error ("db_dump tool required for rpm db rebuild\n");
return;
}
- if (! -x "/usr/bin/db45_load") {
+ if (! $dbload) {
$kiwi -> failed ();
$kiwi -> error ("db45_load tool required for rpm db rebuild\n");
return;
}
KIWIQX::qxx ('mv '.$packIndex.' '.$packIndex.'.bak');
KIWIQX::qxx ('mv '.$nameIndex.' '.$nameIndex.'.bak');
- KIWIQX::qxx ('db_dump '.$packIndex.'.bak | db45_load '.$packIndex);
- KIWIQX::qxx ('db_dump '.$nameIndex.'.bak | db45_load '.$nameIndex);
+ KIWIQX::qxx ($dbdump.' '.$packIndex.'.bak | '.$dbload.' '.$packIndex);
+ KIWIQX::qxx ($dbdump.' '.$nameIndex.'.bak | '.$dbload.' '.$nameIndex);
KIWIQX::qxx ('rm -f '.$packIndex.'.bak');
KIWIQX::qxx ('rm -f '.$nameIndex.'.bak');
- $data = KIWIQX::qxx ("@kchroot /bin/rpm --rebuilddb 2>&1");
+ $data = KIWIQX::qxx ("@kchroot $rpmdb --rebuilddb 2>&1");
$code = $? >> 8;
if ($code != 0) {
$kiwi -> failed ();
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/modules/KIWIResult.pm new/kiwi/modules/KIWIResult.pm
--- old/kiwi/modules/KIWIResult.pm 2014-10-06 11:13:34.000000000 +0200
+++ new/kiwi/modules/KIWIResult.pm 2014-11-13 10:27:39.000000000 +0100
@@ -389,7 +389,7 @@
} elsif ($buildinfo->exists('main','install.stick')) {
return $this -> __bundleExtension ('install.raw');
} elsif ($buildinfo->exists('main','install.pxe')) {
- return $this -> __bundleExtension ('install.tgz');
+ return $this -> __bundleExtension ('install.tar.xz');
}
#==========================================
# handle formats
@@ -398,6 +398,12 @@
if (! $format) {
return $this -> __bundleExtension ('raw');
}
+ if ($format eq 'vhd-fixed') {
+ # inconsistency between format specified in schema and
+ # extension used in the result file. More clean fix would
+ # be a schema change plus xsl stylesheet
+ $format = 'vhdfixed';
+ }
if ($format eq 'gce') {
my @archives = glob ("$source/*gce-*.tar.gz");
if (! @archives) {
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/system/boot/armv7l/oemboot/suse-dump new/kiwi/system/boot/armv7l/oemboot/suse-dump
--- old/kiwi/system/boot/armv7l/oemboot/suse-dump 2014-09-15 16:02:54.000000000 +0200
+++ new/kiwi/system/boot/armv7l/oemboot/suse-dump 2014-11-17 16:16:15.000000000 +0100
@@ -36,27 +36,7 @@
#======================================
# find TFTP server from lease file
#--------------------------------------
- pxeCheckServer
- if [ -z $SERVER ];then
- SERVER=tftp.$DOMAIN
- fi
- Echo "Checking Server name: $SERVER"
- if ! ping -c 1 $SERVER >/dev/null 2>&1;then
- Echo "Server: $SERVER not found"
- if [ -z "$SERVERTYPE" ] || [ "$SERVERTYPE" = "tftp" ]; then
- if [ ! -z "$DHCPSIADDR" ];then
- Echo "Using: $DHCPSIADDR from dhcpcd-info"
- SERVER=$DHCPSIADDR
- elif [ ! -z "$DHCPSID" ];then
- Echo "Using: $DHCPSID from dhcpcd-info"
- SERVER=$DHCPSID
- else
- systemException \
- "Can't assign SERVER IP/name... fatal !" \
- "reboot"
- fi
- fi
- fi
+ pxeSetupDownloadServer
#======================================
# setup server name and blocksize
#--------------------------------------
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/system/boot/ix86/netboot/suse-12.3/config.xml new/kiwi/system/boot/ix86/netboot/suse-12.3/config.xml
--- old/kiwi/system/boot/ix86/netboot/suse-12.3/config.xml 2014-11-03 12:47:04.000000000 +0100
+++ new/kiwi/system/boot/ix86/netboot/suse-12.3/config.xml 2014-11-17 12:37:18.000000000 +0100
@@ -27,6 +27,7 @@
</drivers>
<drivers profiles="default,xen">
<file name="crypto/*"/>
+ <file name="drivers/virtio/*"/>
<file name="drivers/acpi/dock.ko"/>
<file name="drivers/ata/*"/>
<file name="drivers/block/aoe/aoe.ko"/>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/system/boot/ix86/netboot/suse-13.1/config.xml new/kiwi/system/boot/ix86/netboot/suse-13.1/config.xml
--- old/kiwi/system/boot/ix86/netboot/suse-13.1/config.xml 2014-11-03 12:47:02.000000000 +0100
+++ new/kiwi/system/boot/ix86/netboot/suse-13.1/config.xml 2014-11-17 12:36:21.000000000 +0100
@@ -27,6 +27,7 @@
</drivers>
<drivers profiles="default,xen">
<file name="crypto/*"/>
+ <file name="drivers/virtio/*"/>
<file name="drivers/acpi/dock.ko"/>
<file name="drivers/ata/*"/>
<file name="drivers/block/aoe/aoe.ko"/>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/system/boot/ix86/netboot/suse-13.2/config.xml new/kiwi/system/boot/ix86/netboot/suse-13.2/config.xml
--- old/kiwi/system/boot/ix86/netboot/suse-13.2/config.xml 2014-11-03 12:47:03.000000000 +0100
+++ new/kiwi/system/boot/ix86/netboot/suse-13.2/config.xml 2014-11-17 12:36:28.000000000 +0100
@@ -27,6 +27,7 @@
</drivers>
<drivers profiles="default,xen">
<file name="crypto/*"/>
+ <file name="drivers/virtio/*"/>
<file name="drivers/acpi/dock.ko"/>
<file name="drivers/ata/*"/>
<file name="drivers/block/aoe/aoe.ko"/>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/system/boot/ix86/netboot/suse-SLED11/config.xml new/kiwi/system/boot/ix86/netboot/suse-SLED11/config.xml
--- old/kiwi/system/boot/ix86/netboot/suse-SLED11/config.xml 2014-11-03 12:47:01.000000000 +0100
+++ new/kiwi/system/boot/ix86/netboot/suse-SLED11/config.xml 2014-11-17 12:36:53.000000000 +0100
@@ -27,6 +27,7 @@
</drivers>
<drivers profiles="default,xen">
<file name="crypto/*"/>
+ <file name="drivers/virtio/*"/>
<file name="drivers/usb/core/usbcore.ko"/>
<file name="drivers/usb/host/*"/>
<file name="drivers/usb/storage/usb-storage.ko"/>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/system/boot/ix86/netboot/suse-SLED12/config.xml new/kiwi/system/boot/ix86/netboot/suse-SLED12/config.xml
--- old/kiwi/system/boot/ix86/netboot/suse-SLED12/config.xml 2014-11-03 12:47:03.000000000 +0100
+++ new/kiwi/system/boot/ix86/netboot/suse-SLED12/config.xml 2014-11-17 12:36:47.000000000 +0100
@@ -26,6 +26,7 @@
</drivers>
<drivers profiles="default,xen">
<file name="crypto/*"/>
+ <file name="drivers/virtio/*"/>
<file name="drivers/acpi/dock.ko"/>
<file name="drivers/ata/*"/>
<file name="drivers/block/aoe/aoe.ko"/>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/system/boot/ix86/netboot/suse-SLES11/config.xml new/kiwi/system/boot/ix86/netboot/suse-SLES11/config.xml
--- old/kiwi/system/boot/ix86/netboot/suse-SLES11/config.xml 2014-11-03 12:47:03.000000000 +0100
+++ new/kiwi/system/boot/ix86/netboot/suse-SLES11/config.xml 2014-11-17 12:37:00.000000000 +0100
@@ -27,6 +27,7 @@
</drivers>
<drivers profiles="default,xen">
<file name="crypto/*"/>
+ <file name="drivers/virtio/*"/>
<file name="drivers/usb/core/usbcore.ko"/>
<file name="drivers/usb/host/*"/>
<file name="drivers/usb/storage/usb-storage.ko"/>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/system/boot/ix86/netboot/suse-SLES12/config.xml new/kiwi/system/boot/ix86/netboot/suse-SLES12/config.xml
--- old/kiwi/system/boot/ix86/netboot/suse-SLES12/config.xml 2014-11-03 12:47:02.000000000 +0100
+++ new/kiwi/system/boot/ix86/netboot/suse-SLES12/config.xml 2014-11-17 12:36:39.000000000 +0100
@@ -26,6 +26,7 @@
</drivers>
<drivers profiles="default,xen">
<file name="crypto/*"/>
+ <file name="drivers/virtio/*"/>
<file name="drivers/acpi/dock.ko"/>
<file name="drivers/ata/*"/>
<file name="drivers/block/aoe/aoe.ko"/>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/system/boot/ix86/oemboot/rhel-dump new/kiwi/system/boot/ix86/oemboot/rhel-dump
--- old/kiwi/system/boot/ix86/oemboot/rhel-dump 2014-09-15 16:02:55.000000000 +0200
+++ new/kiwi/system/boot/ix86/oemboot/rhel-dump 2014-11-17 16:15:49.000000000 +0100
@@ -36,27 +36,7 @@
#======================================
# find TFTP server from lease file
#--------------------------------------
- pxeCheckServer
- if [ -z $SERVER ];then
- SERVER=tftp.$DOMAIN
- fi
- Echo "Checking Server name: $SERVER"
- if ! ping -c 1 $SERVER >/dev/null 2>&1;then
- Echo "Server: $SERVER not found"
- if [ -z "$SERVERTYPE" ] || [ "$SERVERTYPE" = "tftp" ]; then
- if [ ! -z "$DHCPSIADDR" ];then
- Echo "Using: $DHCPSIADDR from dhcpcd-info"
- SERVER=$DHCPSIADDR
- elif [ ! -z "$DHCPSID" ];then
- Echo "Using: $DHCPSID from dhcpcd-info"
- SERVER=$DHCPSID
- else
- systemException \
- "Can't assign SERVER IP/name... fatal !" \
- "reboot"
- fi
- fi
- fi
+ pxeSetupDownloadServer
#======================================
# setup server name and blocksize
#--------------------------------------
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/system/boot/ix86/oemboot/suse-dump new/kiwi/system/boot/ix86/oemboot/suse-dump
--- old/kiwi/system/boot/ix86/oemboot/suse-dump 2014-09-15 16:02:55.000000000 +0200
+++ new/kiwi/system/boot/ix86/oemboot/suse-dump 2014-11-17 16:13:04.000000000 +0100
@@ -36,27 +36,7 @@
#======================================
# find TFTP server from lease file
#--------------------------------------
- pxeCheckServer
- if [ -z $SERVER ];then
- SERVER=tftp.$DOMAIN
- fi
- Echo "Checking Server name: $SERVER"
- if ! ping -c 1 $SERVER >/dev/null 2>&1;then
- Echo "Server: $SERVER not found"
- if [ -z "$SERVERTYPE" ] || [ "$SERVERTYPE" = "tftp" ]; then
- if [ ! -z "$DHCPSIADDR" ];then
- Echo "Using: $DHCPSIADDR from dhcpcd-info"
- SERVER=$DHCPSIADDR
- elif [ ! -z "$DHCPSID" ];then
- Echo "Using: $DHCPSID from dhcpcd-info"
- SERVER=$DHCPSID
- else
- systemException \
- "Can't assign SERVER IP/name... fatal !" \
- "reboot"
- fi
- fi
- fi
+ pxeSetupDownloadServer
#======================================
# setup server name and blocksize
#--------------------------------------
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/system/boot/ppc/oemboot/suse-dump new/kiwi/system/boot/ppc/oemboot/suse-dump
--- old/kiwi/system/boot/ppc/oemboot/suse-dump 2014-09-15 16:02:55.000000000 +0200
+++ new/kiwi/system/boot/ppc/oemboot/suse-dump 2014-11-17 16:16:05.000000000 +0100
@@ -36,27 +36,7 @@
#======================================
# find TFTP server from lease file
#--------------------------------------
- pxeCheckServer
- if [ -z $SERVER ];then
- SERVER=tftp.$DOMAIN
- fi
- Echo "Checking Server name: $SERVER"
- if ! ping -c 1 $SERVER >/dev/null 2>&1;then
- Echo "Server: $SERVER not found"
- if [ -z "$SERVERTYPE" ] || [ "$SERVERTYPE" = "tftp" ]; then
- if [ ! -z "$DHCPSIADDR" ];then
- Echo "Using: $DHCPSIADDR from dhcpcd-info"
- SERVER=$DHCPSIADDR
- elif [ ! -z "$DHCPSID" ];then
- Echo "Using: $DHCPSID from dhcpcd-info"
- SERVER=$DHCPSID
- else
- systemException \
- "Can't assign SERVER IP/name... fatal !" \
- "reboot"
- fi
- fi
- fi
+ pxeSetupDownloadServer
#======================================
# setup server name and blocksize
#--------------------------------------
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/system/boot/s390/oemboot/suse-dump new/kiwi/system/boot/s390/oemboot/suse-dump
--- old/kiwi/system/boot/s390/oemboot/suse-dump 2014-09-15 16:02:55.000000000 +0200
+++ new/kiwi/system/boot/s390/oemboot/suse-dump 2014-11-17 16:16:10.000000000 +0100
@@ -36,27 +36,7 @@
#======================================
# find TFTP server from lease file
#--------------------------------------
- pxeCheckServer
- if [ -z $SERVER ];then
- SERVER=tftp.$DOMAIN
- fi
- Echo "Checking Server name: $SERVER"
- if ! ping -c 1 $SERVER >/dev/null 2>&1;then
- Echo "Server: $SERVER not found"
- if [ -z "$SERVERTYPE" ] || [ "$SERVERTYPE" = "tftp" ]; then
- if [ ! -z "$DHCPSIADDR" ];then
- Echo "Using: $DHCPSIADDR from dhcpcd-info"
- SERVER=$DHCPSIADDR
- elif [ ! -z "$DHCPSID" ];then
- Echo "Using: $DHCPSID from dhcpcd-info"
- SERVER=$DHCPSID
- else
- systemException \
- "Can't assign SERVER IP/name... fatal !" \
- "reboot"
- fi
- fi
- fi
+ pxeSetupDownloadServer
#======================================
# setup server name and blocksize
#--------------------------------------
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/template/ix86/suse-13.2-JeOS/config.xml new/kiwi/template/ix86/suse-13.2-JeOS/config.xml
--- old/kiwi/template/ix86/suse-13.2-JeOS/config.xml 2014-11-03 12:47:00.000000000 +0100
+++ new/kiwi/template/ix86/suse-13.2-JeOS/config.xml 2014-11-20 16:43:20.000000000 +0100
@@ -68,7 +68,7 @@
<user password="$1$wYJUgpM5$RXMMeASDc035eX.NbYWFl0" home="/root" name="root"/>
</users>
<repository type="yast2">
- <source path="obs://openSUSE:Factory/snapshot"/>
+ <source path="obs://13.2/repo/oss"/>
</repository>
<packages type="image">
<!--
@@ -99,6 +99,9 @@
<package name="kiwi-desc-vmxboot"/>
<package name="kiwi-desc-netboot"/>
<package name="openssh"/>
+ <package name="iproute2"/>
+ <package name="less"/>
+ <package name="bash-completion"/>
</packages>
<packages type="iso">
<package name="gfxboot-branding-openSUSE" bootinclude="true" bootdelete="true"/>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/template/ix86/suse-13.2-JeOS/root/etc/sysconfig/network/ifcfg-lan0 new/kiwi/template/ix86/suse-13.2-JeOS/root/etc/sysconfig/network/ifcfg-lan0
--- old/kiwi/template/ix86/suse-13.2-JeOS/root/etc/sysconfig/network/ifcfg-lan0 1970-01-01 01:00:00.000000000 +0100
+++ new/kiwi/template/ix86/suse-13.2-JeOS/root/etc/sysconfig/network/ifcfg-lan0 2014-11-12 09:21:59.000000000 +0100
@@ -0,0 +1,4 @@
+BOOTPROTO='dhcp'
+MTU=''
+REMOTE_IPADDR=''
+STARTMODE='onboot'
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/template/ix86/suse-13.2-JeOS/root/etc/udev/rules.d/70-persistent-net.rules new/kiwi/template/ix86/suse-13.2-JeOS/root/etc/udev/rules.d/70-persistent-net.rules
--- old/kiwi/template/ix86/suse-13.2-JeOS/root/etc/udev/rules.d/70-persistent-net.rules 1970-01-01 01:00:00.000000000 +0100
+++ new/kiwi/template/ix86/suse-13.2-JeOS/root/etc/udev/rules.d/70-persistent-net.rules 2014-11-12 09:21:59.000000000 +0100
@@ -0,0 +1 @@
+SUBSYSTEM=="net", ACTION=="add", DRIVERS=="?*", ATTR{address}=="?*", ATTR{dev_id}=="0x0", ATTR{type}=="1", KERNEL=="?*", NAME="lan0"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/tests/jenkins/prepare.sh new/kiwi/tests/jenkins/prepare.sh
--- old/kiwi/tests/jenkins/prepare.sh 2014-09-15 16:02:55.000000000 +0200
+++ new/kiwi/tests/jenkins/prepare.sh 2014-11-12 09:21:59.000000000 +0100
@@ -34,7 +34,7 @@
# install required packages
spec=/home/jenkins/kiwi/kiwi/rpm/kiwi.spec
-packages="grub grub2 genisoimage cdrkit-cdrtools-compat squashfs osc yum trang"
+packages="grub grub2 genisoimage cdrkit-cdrtools-compat squashfs osc yum trang dosfstools"
if ! zypper -n install --no-recommends $packages;then
exit 1
fi
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/tests/unit/lib/Common/ktLog.pm new/kiwi/tests/unit/lib/Common/ktLog.pm
--- old/kiwi/tests/unit/lib/Common/ktLog.pm 2014-09-15 16:02:56.000000000 +0200
+++ new/kiwi/tests/unit/lib/Common/ktLog.pm 2014-11-13 10:33:37.000000000 +0100
@@ -459,17 +459,6 @@
}
#==========================================
-# storeXML
-#------------------------------------------
-sub storeXML {
- # ...
- # Dummy function, storing the XML has nothing really to do with logging
- # but that's a discussion for another day.
- my $this = shift;
- return $this;
-}
-
-#==========================================
# warning
#------------------------------------------
sub warning {
@@ -483,17 +472,6 @@
}
#==========================================
-# writeXMLDiff
-#------------------------------------------
-sub writeXMLDiff {
- # ...
- # Dummy implementation to mimick regular KIWILog object
- # ---
- my $this = shift;
- return $this;
-}
-
-#==========================================
# doNorm
#------------------------------------------
sub doNorm {
@@ -642,5 +620,12 @@
$this -> {skipped} = 0;
return $this;
}
+1;
+## no critic (Multiple "package" declarations)
+package KIWILog;
+sub instance {
+ return Common::ktLog -> instance();
+}
1;
+## use critic
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org
For additional commands, e-mail: opensuse-commit+help(a)opensuse.org
1
0
Hello community,
here is the log from the commit of package pulseaudio for openSUSE:Factory checked in at 2014-11-24 11:13:19
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/pulseaudio (Old)
and /work/SRC/openSUSE:Factory/.pulseaudio.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "pulseaudio"
Changes:
--------
--- /work/SRC/openSUSE:Factory/pulseaudio/pulseaudio.changes 2014-11-06 16:50:38.000000000 +0100
+++ /work/SRC/openSUSE:Factory/.pulseaudio.new/pulseaudio.changes 2014-11-24 11:13:29.000000000 +0100
@@ -1,0 +2,20 @@
+Thu Nov 20 18:26:27 CET 2014 - tiwai(a)suse.de
+
+- Revert yet another one due to still lost headphone handling
+ (bnc#905418):
+ alsa-mixer-recognize-Dock-headphone-jack.patch
+
+-------------------------------------------------------------------
+Mon Nov 17 22:38:54 CET 2014 - tiwai(a)suse.de
+
+- Remove a patch causing more regressions, lost headphone handling
+ on Thinkpads (bnc#905418):
+ 0002-alsa-mixer-Ignore-some-elements-in-the-analog-output.patch
+
+-------------------------------------------------------------------
+Wed Nov 12 12:53:49 CET 2014 - tiwai(a)suse.de
+
+- Fix setup-pulseaudio script not to leave $ALSA_CONFIG_PATH when
+ alsa-plugins-pulse isn't installed (bnc#905055)
+
+-------------------------------------------------------------------
Old:
----
alsa-mixer-Ignore-some-elements-in-the-analog-output.patch
alsa-mixer-recognize-Dock-headphone-jack.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ pulseaudio.spec ++++++
--- /var/tmp/diff_new_pack.EOEKgR/_old 2014-11-24 11:13:30.000000000 +0100
+++ /var/tmp/diff_new_pack.EOEKgR/_new 2014-11-24 11:13:30.000000000 +0100
@@ -1,7 +1,7 @@
#
# spec file for package pulseaudio
#
-# 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
@@ -44,10 +44,6 @@
Patch2: pulseaudio-wrong-memset.patch
# PATCH-FIX-UPSTREAM pulseaudio-bnc881524-rtp.patch sreeves(a)suse.com
Patch3: pulseaudio-bnc881524-rtp.patch
-# PATCH-FIX-UPSTREAM alsa-mixer-recognize-Dock-headphone-jack.patch tiwai(a)suse.de
-Patch4: alsa-mixer-recognize-Dock-headphone-jack.patch
-# PATCH-FIX-UPSTREAM alsa-mixer-Ignore-some-elements-in-the-analog-output.patch tiwai(a)suse.de
-Patch5: alsa-mixer-Ignore-some-elements-in-the-analog-output.patch
BuildRequires: alsa-devel >= 1.0.19
# require only minimal bluez, if we are on bluez 5 we will determine in %build phase
BuildRequires: bluez-devel >= 4.99
@@ -79,13 +75,13 @@
BuildRequires: pkgconfig(gconf-2.0)
BuildRequires: pkgconfig(glib-2.0)
BuildRequires: pkgconfig(gtk+-3.0)
+BuildRequires: pkgconfig(ice)
BuildRequires: pkgconfig(json) >= 0.9
BuildRequires: pkgconfig(sbc) >= 1.0
+BuildRequires: pkgconfig(sm)
BuildRequires: pkgconfig(x11)
-BuildRequires: pkgconfig(xcb)
BuildRequires: pkgconfig(x11-xcb)
-BuildRequires: pkgconfig(ice)
-BuildRequires: pkgconfig(sm)
+BuildRequires: pkgconfig(xcb)
BuildRequires: pkgconfig(xtst)
PreReq: %fillup_prereq
PreReq: pwdutils
@@ -302,8 +298,6 @@
%patch1 -p1
%patch2
%patch3 -p1
-%patch4 -p1
-%patch5 -p1
%build
echo 'HTML_TIMESTAMP=NO' >> doxygen/doxygen.conf.in
++++++ setup-pulseaudio ++++++
--- /var/tmp/diff_new_pack.EOEKgR/_old 2014-11-24 11:13:30.000000000 +0100
+++ /var/tmp/diff_new_pack.EOEKgR/_new 2014-11-24 11:13:30.000000000 +0100
@@ -81,6 +81,7 @@
set_variable ALSA_CONFIG_PATH /etc/alsa-pulse.conf
else
echo "Missing /etc/alsa-pluse.conf; please install alsa-plugins-pulse package"
+ delete_variable ALSA_CONFIG_PATH
fi
}
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org
For additional commands, e-mail: opensuse-commit+help(a)opensuse.org
1
0
Hello community,
here is the log from the commit of package libpng12 for openSUSE:Factory checked in at 2014-11-24 11:13:18
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/libpng12 (Old)
and /work/SRC/openSUSE:Factory/.libpng12.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "libpng12"
Changes:
--------
--- /work/SRC/openSUSE:Factory/libpng12/libpng12.changes 2014-05-06 13:39:41.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.libpng12.new/libpng12.changes 2014-11-24 11:13:27.000000000 +0100
@@ -1,0 +2,6 @@
+Thu Nov 20 20:13:50 UTC 2014 - pgajdos(a)suse.com
+
+- updated to 1.2.52:
+ * Avoid out-of-bounds memory access while checking version string.
+
+-------------------------------------------------------------------
Old:
----
libpng-1.2.51.tar.xz
New:
----
libpng-1.2.52.tar.xz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ libpng12.spec ++++++
--- /var/tmp/diff_new_pack.51eeuE/_old 2014-11-24 11:13:28.000000000 +0100
+++ /var/tmp/diff_new_pack.51eeuE/_new 2014-11-24 11:13:28.000000000 +0100
@@ -19,7 +19,7 @@
#
%define major 1
%define minor 2
-%define micro 51
+%define micro 52
%define branch %{major}%{minor}
%define libname libpng%{branch}-0
++++++ libpng-1.2.51.tar.xz -> libpng-1.2.52.tar.xz ++++++
++++ 7714 lines of diff (skipped)
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org
For additional commands, e-mail: opensuse-commit+help(a)opensuse.org
1
0
Hello community,
here is the log from the commit of package libpng16 for openSUSE:Factory checked in at 2014-11-24 11:13:17
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/libpng16 (Old)
and /work/SRC/openSUSE:Factory/.libpng16.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "libpng16"
Changes:
--------
--- /work/SRC/openSUSE:Factory/libpng16/libpng16.changes 2014-08-28 10:01:56.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.libpng16.new/libpng16.changes 2014-11-24 11:13:25.000000000 +0100
@@ -1,0 +2,10 @@
+Thu Nov 20 20:06:41 UTC 2014 - pgajdos(a)suse.com
+
+- updated to 1.6.15:
+ * Avoid out-of-bounds memory access in png_user_version_check().
+ * Fixed incorrect handling of the iTXt compression.
+ * Free all allocated memory in pngimage.
+ * Fixed array size calculations to avoid warnings.
+ etc. see ANNOUNCE
+
+-------------------------------------------------------------------
Old:
----
libpng-1.6.13.tar.xz
libpng-1.6.13.tar.xz.asc
New:
----
libpng-1.6.15.tar.xz
libpng-1.6.15.tar.xz.asc
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ libpng16.spec ++++++
--- /var/tmp/diff_new_pack.D9Kx4b/_old 2014-11-24 11:13:26.000000000 +0100
+++ /var/tmp/diff_new_pack.D9Kx4b/_new 2014-11-24 11:13:26.000000000 +0100
@@ -19,7 +19,7 @@
#
%define major 1
%define minor 6
-%define micro 13
+%define micro 15
%define branch %{major}%{minor}
%define libname libpng%{branch}-%{branch}
++++++ libpng-1.6.13.tar.xz -> libpng-1.6.15.tar.xz ++++++
++++ 10470 lines of diff (skipped)
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org
For additional commands, e-mail: opensuse-commit+help(a)opensuse.org
1
0