openSUSE Commits
Threads by month
- ----- 2024 -----
- 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
January 2016
- 1 participants
- 1523 discussions
Hello community,
here is the log from the commit of package libfsntfs for openSUSE:Factory checked in at 2016-01-28 17:23:26
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/libfsntfs (Old)
and /work/SRC/openSUSE:Factory/.libfsntfs.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "libfsntfs"
Changes:
--------
--- /work/SRC/openSUSE:Factory/libfsntfs/libfsntfs.changes 2015-12-09 22:22:17.000000000 +0100
+++ /work/SRC/openSUSE:Factory/.libfsntfs.new/libfsntfs.changes 2016-01-28 17:24:22.000000000 +0100
@@ -1,0 +2,5 @@
+Tue Jan 26 03:09:55 UTC 2016 - Greg.Freemyer(a)gmail.com
+
+- correct "Provides: pyfsntfs" line, erroneously said pylnk previously
+
+-------------------------------------------------------------------
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ libfsntfs.spec ++++++
--- /var/tmp/diff_new_pack.GWTd9s/_old 2016-01-28 17:24:23.000000000 +0100
+++ /var/tmp/diff_new_pack.GWTd9s/_new 2016-01-28 17:24:23.000000000 +0100
@@ -94,7 +94,7 @@
Group: Development/Libraries/Python
Requires: %lname = %version
Requires: python
-Provides: pylnk = %version
+Provides: pyfsntfs = %version
%description -n python-%name
Python binding for libfsntfs, which can access the NTFS filesystem.
1
0
Hello community,
here is the log from the commit of package freeradius-server for openSUSE:Factory checked in at 2016-01-28 17:23:25
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/freeradius-server (Old)
and /work/SRC/openSUSE:Factory/.freeradius-server.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "freeradius-server"
Changes:
--------
--- /work/SRC/openSUSE:Factory/freeradius-server/freeradius-server.changes 2015-10-06 13:27:59.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.freeradius-server.new/freeradius-server.changes 2016-01-28 17:24:17.000000000 +0100
@@ -1,0 +2,8 @@
+Mon Jan 25 18:48:55 UTC 2016 - michael(a)stroeder.com
+
+- removed installation of experimental module rlm_sqlhpwippool.so
+- update to 3.0.11
+ * for a detailed list of changes look at:
+ /usr/share/doc/packages/freeradius-server/ChangeLog
+
+-------------------------------------------------------------------
Old:
----
freeradius-server-3.0.10.tar.bz2
freeradius-server-3.0.10.tar.bz2.sig
New:
----
freeradius-server-3.0.11.tar.bz2
freeradius-server-3.0.11.tar.bz2.sig
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ freeradius-server.spec ++++++
--- /var/tmp/diff_new_pack.CRLcan/_old 2016-01-28 17:24:19.000000000 +0100
+++ /var/tmp/diff_new_pack.CRLcan/_new 2016-01-28 17:24:19.000000000 +0100
@@ -20,7 +20,7 @@
%define apxs2 apxs2-prefork
%define apache2_sysconfdir %(%{_sbindir}/%{apxs2} -q SYSCONFDIR)
Name: freeradius-server
-Version: 3.0.10
+Version: 3.0.11
Release: 0
Summary: Very Highly Configurable Radius Server
License: GPL-2.0 and LGPL-2.1
@@ -618,7 +618,6 @@
%{_libdir}/freeradius/rlm_unpack.so
%{_libdir}/freeradius/rlm_cache_memcached.so
%{_libdir}/freeradius/rlm_cache_rbtree.so
-%{_libdir}/freeradius/rlm_sqlhpwippool.so
%files utils
%defattr(-,root,root)
++++++ freeradius-server-3.0.10.tar.bz2 -> freeradius-server-3.0.11.tar.bz2 ++++++
++++ 11460 lines of diff (skipped)
++++++ freeradius-server-rlm_sql_unixodbc-configure.patch ++++++
--- /var/tmp/diff_new_pack.CRLcan/_old 2016-01-28 17:24:22.000000000 +0100
+++ /var/tmp/diff_new_pack.CRLcan/_new 2016-01-28 17:24:22.000000000 +0100
@@ -1,5 +1,5 @@
---- freeradius-server-3.0.9-orig/src/modules/rlm_sql/drivers/rlm_sql_unixodbc/configure 2015-07-08 22:43:41.921011659 +0200
-+++ freeradius-server-3.0.9/src/modules/rlm_sql/drivers/rlm_sql_unixodbc/configure 2015-07-08 22:45:58.874299508 +0200
+--- freeradius-server-3.0.11.orig/src/modules/rlm_sql/drivers/rlm_sql_unixodbc/configure 2016-01-25 19:27:03.000000000 +0100
++++ freeradius-server-3.0.11/src/modules/rlm_sql/drivers/rlm_sql_unixodbc/configure 2016-01-25 20:42:24.835741109 +0100
@@ -1843,7 +1843,7 @@
fi
1
0
Hello community,
here is the log from the commit of package ubuntu-mate-artwork for openSUSE:Factory checked in at 2016-01-28 17:23:23
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/ubuntu-mate-artwork (Old)
and /work/SRC/openSUSE:Factory/.ubuntu-mate-artwork.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "ubuntu-mate-artwork"
Changes:
--------
--- /work/SRC/openSUSE:Factory/ubuntu-mate-artwork/ubuntu-mate-artwork.changes 2016-01-05 09:41:54.000000000 +0100
+++ /work/SRC/openSUSE:Factory/.ubuntu-mate-artwork.new/ubuntu-mate-artwork.changes 2016-01-28 17:24:12.000000000 +0100
@@ -1,0 +2,12 @@
+Mon Jan 25 19:56:45 UTC 2016 - sor.alexei(a)meowr.ru
+
+- Update to 16.04.1:
+ * Basic "app-notification" theming to avoid weirdness in Nautilus.
+ * Update the nautilus.css with the current upstream one, it could
+ probably be tweaked a bit and has references to colour used
+ upstream but those don't look out of place with our theme and
+ is better than what we had.
+ * Add MATE colourised icons for categories (lp#1530446).
+ * Add new community contributed wallpapers.
+
+-------------------------------------------------------------------
Old:
----
ubuntu-mate-artwork_16.04.0.tar.xz
New:
----
ubuntu-mate-artwork_16.04.1.tar.xz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ ubuntu-mate-artwork.spec ++++++
--- /var/tmp/diff_new_pack.w21h9n/_old 2016-01-28 17:24:17.000000000 +0100
+++ /var/tmp/diff_new_pack.w21h9n/_new 2016-01-28 17:24:17.000000000 +0100
@@ -17,8 +17,9 @@
%define _name ubuntu-mate
+%define _version 16.04.0
Name: ubuntu-mate-artwork
-Version: 16.04.0
+Version: 16.04.1
Release: 0
Summary: Ubuntu MATE themes and artwork
License: GPL-3.0+ and CC-BY-SA-4.0 and CC-BY-SA-3.0
@@ -124,7 +125,7 @@
The default Ubuntu MATE wallpapers for the Ubuntu MATE releases.
%prep
-%setup -q
+%setup -q -n %{name}-%{_version}
%patch0 -p1
%patch1 -p1
# Remove unwanted: Debian package, GRUB theme, Plymouth theme, odd script, LightDM defaults.
++++++ ubuntu-mate-artwork_16.04.0.tar.xz -> ubuntu-mate-artwork_16.04.1.tar.xz ++++++
/work/SRC/openSUSE:Factory/ubuntu-mate-artwork/ubuntu-mate-artwork_16.04.0.tar.xz /work/SRC/openSUSE:Factory/.ubuntu-mate-artwork.new/ubuntu-mate-artwork_16.04.1.tar.xz differ: char 25, line 1
1
0
Hello community,
here is the log from the commit of package ubuntu-themes for openSUSE:Factory checked in at 2016-01-28 17:23:22
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/ubuntu-themes (Old)
and /work/SRC/openSUSE:Factory/.ubuntu-themes.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "ubuntu-themes"
Changes:
--------
--- /work/SRC/openSUSE:Factory/ubuntu-themes/ubuntu-themes.changes 2015-12-20 10:52:56.000000000 +0100
+++ /work/SRC/openSUSE:Factory/.ubuntu-themes.new/ubuntu-themes.changes 2016-01-28 17:24:10.000000000 +0100
@@ -1,0 +2,6 @@
+Mon Jan 25 19:56:45 UTC 2016 - sor.alexei(a)meowr.ru
+
+- Update to 14.04~bzr20160120:
+ * Scrollbars: Fix through drawing on webkit.
+
+-------------------------------------------------------------------
Old:
----
ubuntu-themes_14.04+16.04.20151216.orig.tar.gz
New:
----
ubuntu-themes_14.04+16.04.20160120.orig.tar.gz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ ubuntu-themes.spec ++++++
--- /var/tmp/diff_new_pack.6ethTN/_old 2016-01-28 17:24:12.000000000 +0100
+++ /var/tmp/diff_new_pack.6ethTN/_new 2016-01-28 17:24:12.000000000 +0100
@@ -1,7 +1,7 @@
#
# spec file for package ubuntu-themes
#
-# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2016 SUSE LINUX 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,9 +16,9 @@
#
-%define _version 14.04+16.04.20151216
+%define _version 14.04+16.04.20160120
Name: ubuntu-themes
-Version: 14.04~bzr20151216
+Version: 14.04~bzr20160120
Release: 0
Summary: Eyecandy from Ubuntu
License: GPL-3.0+
++++++ ubuntu-themes_14.04+16.04.20151216.orig.tar.gz -> ubuntu-themes_14.04+16.04.20160120.orig.tar.gz ++++++
/work/SRC/openSUSE:Factory/ubuntu-themes/ubuntu-themes_14.04+16.04.20151216.orig.tar.gz /work/SRC/openSUSE:Factory/.ubuntu-themes.new/ubuntu-themes_14.04+16.04.20160120.orig.tar.gz differ: char 5, line 1
1
0
Hello community,
here is the log from the commit of package libvirt-python for openSUSE:Factory checked in at 2016-01-28 17:23:21
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/libvirt-python (Old)
and /work/SRC/openSUSE:Factory/.libvirt-python.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "libvirt-python"
Changes:
--------
--- /work/SRC/openSUSE:Factory/libvirt-python/libvirt-python.changes 2016-01-15 10:42:04.000000000 +0100
+++ /work/SRC/openSUSE:Factory/.libvirt-python.new/libvirt-python.changes 2016-01-28 17:24:09.000000000 +0100
@@ -1,0 +2,6 @@
+Mon Jan 18 19:35:09 UTC 2016 - jfehlig(a)suse.com
+
+- Update to 1.3.1
+ - Add all new APIs and constants in libvirt 1.3.1
+
+-------------------------------------------------------------------
Old:
----
libvirt-python-1.3.0.tar.gz
libvirt-python-1.3.0.tar.gz.asc
New:
----
libvirt-python-1.3.1.tar.gz
libvirt-python-1.3.1.tar.gz.asc
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ libvirt-python.spec ++++++
--- /var/tmp/diff_new_pack.tlOPdN/_old 2016-01-28 17:24:10.000000000 +0100
+++ /var/tmp/diff_new_pack.tlOPdN/_new 2016-01-28 17:24:10.000000000 +0100
@@ -18,7 +18,7 @@
Name: libvirt-python
Url: http://libvirt.org/
-Version: 1.3.0
+Version: 1.3.1
Release: 0
Summary: Library providing a simple virtualization API
License: LGPL-2.1+
++++++ libvirt-python-1.3.0.tar.gz -> libvirt-python-1.3.1.tar.gz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libvirt-python-1.3.0/ChangeLog new/libvirt-python-1.3.1/ChangeLog
--- old/libvirt-python-1.3.0/ChangeLog 2015-12-09 10:21:28.000000000 +0100
+++ new/libvirt-python-1.3.1/ChangeLog 2016-01-17 03:50:36.000000000 +0100
@@ -1,3 +1,9 @@
+2016-01-17 Daniel Veillard <veillard(a)redhat.com>
+
+ Version bump to 1.3.1
+ For release but no change from 1.3.0
+
+
2015-11-24 Pavel Hrdina <phrdina(a)redhat.com>
Post-release version bump to 1.3.0
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libvirt-python-1.3.0/PKG-INFO new/libvirt-python-1.3.1/PKG-INFO
--- old/libvirt-python-1.3.0/PKG-INFO 2015-12-09 10:21:29.000000000 +0100
+++ new/libvirt-python-1.3.1/PKG-INFO 2016-01-17 03:50:36.000000000 +0100
@@ -1,6 +1,6 @@
Metadata-Version: 1.1
Name: libvirt-python
-Version: 1.3.0
+Version: 1.3.1
Summary: The libvirt virtualization API
Home-page: http://www.libvirt.org
Author: Libvirt Maintainers
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libvirt-python-1.3.0/libvirt-python.spec new/libvirt-python-1.3.1/libvirt-python.spec
--- old/libvirt-python-1.3.0/libvirt-python.spec 2015-12-09 10:21:28.000000000 +0100
+++ new/libvirt-python-1.3.1/libvirt-python.spec 2016-01-17 03:50:36.000000000 +0100
@@ -6,7 +6,7 @@
Summary: The libvirt virtualization API python2 binding
Name: libvirt-python
-Version: 1.3.0
+Version: 1.3.1
Release: 1%{?dist}%{?extra_release}
Source0: http://libvirt.org/sources/python/%{name}-%{version}.tar.gz
Url: http://libvirt.org
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libvirt-python-1.3.0/setup.py new/libvirt-python-1.3.1/setup.py
--- old/libvirt-python-1.3.0/setup.py 2015-12-09 10:19:07.000000000 +0100
+++ new/libvirt-python-1.3.1/setup.py 2016-01-17 03:35:05.000000000 +0100
@@ -311,7 +311,7 @@
_c_modules, _py_modules = get_module_lists()
setup(name = 'libvirt-python',
- version = '1.3.0',
+ version = '1.3.1',
url = 'http://www.libvirt.org',
maintainer = 'Libvirt Maintainers',
maintainer_email = 'libvir-list(a)redhat.com',
1
0
Hello community,
here is the log from the commit of package machinery for openSUSE:Factory checked in at 2016-01-28 17:23:19
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/machinery (Old)
and /work/SRC/openSUSE:Factory/.machinery.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "machinery"
Changes:
--------
--- /work/SRC/openSUSE:Factory/machinery/machinery.changes 2016-01-16 11:57:09.000000000 +0100
+++ /work/SRC/openSUSE:Factory/.machinery.new/machinery.changes 2016-01-28 17:24:08.000000000 +0100
@@ -1,0 +2,12 @@
+Mon Jan 25 16:49:58 CET 2016 - thardeck(a)suse.de
+
+- update to version 1.17.0
+ * Fix reset button in HTML view (gh#SUSE/machinery#1899)
+ * Align config-files scope in HTML view (gh#SUSE/machinery#1814)
+ * Allow closing file dialog (in WebUI) by pressing ESC
+ * Support inspection of Ubuntu 14.04 systems
+ * New `--ssh-identity-file` option to specify a SSH private key when inspecting
+ a remote system
+ * New `--ssh-port` option to specify an SSH port when inspecting a remote system
+
+-------------------------------------------------------------------
Old:
----
machinery-tool-1.16.4.gem
New:
----
machinery-tool-1.17.0.gem
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ machinery.spec ++++++
--- /var/tmp/diff_new_pack.f4sTvo/_old 2016-01-28 17:24:09.000000000 +0100
+++ /var/tmp/diff_new_pack.f4sTvo/_new 2016-01-28 17:24:09.000000000 +0100
@@ -17,7 +17,7 @@
Name: machinery
-Version: 1.16.4
+Version: 1.17.0
Release: 0
%define binary_name machinery
%define mod_name machinery-tool
++++++ machinery-tool-1.16.4.gem -> machinery-tool-1.17.0.gem ++++++
++++ 6072 lines of diff (skipped)
1
0
Hello community,
here is the log from the commit of package caja for openSUSE:Factory checked in at 2016-01-28 17:23:18
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/caja (Old)
and /work/SRC/openSUSE:Factory/.caja.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "caja"
Changes:
--------
--- /work/SRC/openSUSE:Factory/caja/caja.changes 2015-12-24 12:17:45.000000000 +0100
+++ /work/SRC/openSUSE:Factory/.caja.new/caja.changes 2016-01-28 17:24:06.000000000 +0100
@@ -1,0 +2,7 @@
+Mon Jan 25 15:46:12 UTC 2016 - sor.alexei(a)meowr.ru
+
+- Update to 1.12.3:
+ * Fix wrong text colour in icon view with some light themes.
+ * Fix crash due to unneeded assert.
+
+-------------------------------------------------------------------
Old:
----
caja-1.12.2.tar.xz
New:
----
caja-1.12.3.tar.xz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ caja.spec ++++++
--- /var/tmp/diff_new_pack.CmcRZ6/_old 2016-01-28 17:24:07.000000000 +0100
+++ /var/tmp/diff_new_pack.CmcRZ6/_new 2016-01-28 17:24:07.000000000 +0100
@@ -1,7 +1,7 @@
#
# spec file for package caja
#
-# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -20,7 +20,7 @@
%define typelib typelib-1_0-Caja-2_0
%define _version 1.12
Name: caja
-Version: 1.12.2
+Version: 1.12.3
Release: 0
Summary: File manager for the MATE desktop
License: GPL-2.0 and LGPL-2.0
++++++ caja-1.12.2.tar.xz -> caja-1.12.3.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/caja-1.12.2/NEWS new/caja-1.12.3/NEWS
--- old/caja-1.12.2/NEWS 2015-12-23 14:00:45.000000000 +0100
+++ new/caja-1.12.3/NEWS 2016-01-25 12:29:44.000000000 +0100
@@ -1,3 +1,7 @@
+Major changes in 1.12.3 are:
+* Fix wrong text color in icon view with some light themes
+* Fix crash due to unneeded assert
+
Major changes in 1.12.2 are:
* Set smclient mode to "no restart" when either running as root
or on other desktops
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/caja-1.12.2/configure new/caja-1.12.3/configure
--- old/caja-1.12.2/configure 2015-12-23 14:07:31.000000000 +0100
+++ new/caja-1.12.3/configure 2016-01-25 12:30:41.000000000 +0100
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.69 for caja 1.12.2.
+# Generated by GNU Autoconf 2.69 for caja 1.12.3.
#
# Report bugs to <http://www.mate-desktop.org>.
#
@@ -590,8 +590,8 @@
# Identity of this package.
PACKAGE_NAME='caja'
PACKAGE_TARNAME='caja'
-PACKAGE_VERSION='1.12.2'
-PACKAGE_STRING='caja 1.12.2'
+PACKAGE_VERSION='1.12.3'
+PACKAGE_STRING='caja 1.12.3'
PACKAGE_BUGREPORT='http://www.mate-desktop.org'
PACKAGE_URL=''
@@ -1475,7 +1475,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 caja 1.12.2 to adapt to many kinds of systems.
+\`configure' configures caja 1.12.3 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1545,7 +1545,7 @@
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of caja 1.12.2:";;
+ short | recursive ) echo "Configuration of caja 1.12.3:";;
esac
cat <<\_ACEOF
@@ -1696,7 +1696,7 @@
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-caja configure 1.12.2
+caja configure 1.12.3
generated by GNU Autoconf 2.69
Copyright (C) 2012 Free Software Foundation, Inc.
@@ -2065,7 +2065,7 @@
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
-It was created by caja $as_me 1.12.2, which was
+It was created by caja $as_me 1.12.3, which was
generated by GNU Autoconf 2.69. Invocation command line was
$ $0 $@
@@ -2975,7 +2975,7 @@
# Define the identity of the package.
PACKAGE='caja'
- VERSION='1.12.2'
+ VERSION='1.12.3'
cat >>confdefs.h <<_ACEOF
@@ -17169,7 +17169,7 @@
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
-This file was extended by caja $as_me 1.12.2, which was
+This file was extended by caja $as_me 1.12.3, which was
generated by GNU Autoconf 2.69. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -17235,7 +17235,7 @@
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
ac_cs_version="\\
-caja config.status 1.12.2
+caja config.status 1.12.3
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/caja-1.12.2/configure.ac new/caja-1.12.3/configure.ac
--- old/caja-1.12.2/configure.ac 2015-12-23 14:00:45.000000000 +0100
+++ new/caja-1.12.3/configure.ac 2016-01-25 12:29:44.000000000 +0100
@@ -19,7 +19,7 @@
m4_define(caja_extension_current, 5)
m4_define(caja_extension_revision, 0)
-AC_INIT([caja], [1.12.2], [http://www.mate-desktop.org]
+AC_INIT([caja], [1.12.3], [http://www.mate-desktop.org]
# GLib min/max required versions
AC_DEFINE([GLIB_VERSION_MAX_ALLOWED], [GLIB_VERSION_2_36],
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/caja-1.12.2/data/caja-autorun-software.desktop.in new/caja-1.12.3/data/caja-autorun-software.desktop.in
--- old/caja-1.12.2/data/caja-autorun-software.desktop.in 2015-12-23 14:07:37.000000000 +0100
+++ new/caja-1.12.3/data/caja-autorun-software.desktop.in 2016-01-25 12:30:47.000000000 +0100
@@ -11,4 +11,4 @@
X-MATE-Bugzilla-Bugzilla=MATE
X-MATE-Bugzilla-Product=caja
X-MATE-Bugzilla-Component=general
-X-MATE-Bugzilla-Version=1.12.2
+X-MATE-Bugzilla-Version=1.12.3
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/caja-1.12.2/data/caja-browser.desktop.in new/caja-1.12.3/data/caja-browser.desktop.in
--- old/caja-1.12.2/data/caja-browser.desktop.in 2015-12-23 14:07:37.000000000 +0100
+++ new/caja-1.12.3/data/caja-browser.desktop.in 2016-01-25 12:30:47.000000000 +0100
@@ -14,4 +14,4 @@
X-MATE-Bugzilla-Bugzilla=MATE
X-MATE-Bugzilla-Product=caja
X-MATE-Bugzilla-Component=general
-X-MATE-Bugzilla-Version=1.12.2
+X-MATE-Bugzilla-Version=1.12.3
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/caja-1.12.2/data/caja-computer.desktop.in new/caja-1.12.3/data/caja-computer.desktop.in
--- old/caja-1.12.2/data/caja-computer.desktop.in 2015-12-23 14:07:37.000000000 +0100
+++ new/caja-1.12.3/data/caja-computer.desktop.in 2016-01-25 12:30:47.000000000 +0100
@@ -14,4 +14,4 @@
X-MATE-Bugzilla-Bugzilla=MATE
X-MATE-Bugzilla-Product=caja
X-MATE-Bugzilla-Component=general
-X-MATE-Bugzilla-Version=1.12.2
+X-MATE-Bugzilla-Version=1.12.3
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/caja-1.12.2/data/caja-file-management-properties.desktop.in new/caja-1.12.3/data/caja-file-management-properties.desktop.in
--- old/caja-1.12.2/data/caja-file-management-properties.desktop.in 2015-12-23 14:07:37.000000000 +0100
+++ new/caja-1.12.3/data/caja-file-management-properties.desktop.in 2016-01-25 12:30:47.000000000 +0100
@@ -12,4 +12,4 @@
X-MATE-Bugzilla-Bugzilla=MATE
X-MATE-Bugzilla-Product=caja
X-MATE-Bugzilla-Component=Preferences
-X-MATE-Bugzilla-Version=1.12.2
+X-MATE-Bugzilla-Version=1.12.3
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/caja-1.12.2/data/caja-folder-handler.desktop.in new/caja-1.12.3/data/caja-folder-handler.desktop.in
--- old/caja-1.12.2/data/caja-folder-handler.desktop.in 2015-12-23 14:07:37.000000000 +0100
+++ new/caja-1.12.3/data/caja-folder-handler.desktop.in 2016-01-25 12:30:47.000000000 +0100
@@ -13,4 +13,4 @@
X-MATE-Bugzilla-Bugzilla=MATE
X-MATE-Bugzilla-Product=caja
X-MATE-Bugzilla-Component=general
-X-MATE-Bugzilla-Version=1.12.2
+X-MATE-Bugzilla-Version=1.12.3
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/caja-1.12.2/data/caja.desktop new/caja-1.12.3/data/caja.desktop
--- old/caja-1.12.2/data/caja.desktop 2015-12-23 14:07:52.000000000 +0100
+++ new/caja-1.12.3/data/caja.desktop 2016-01-25 12:31:18.000000000 +0100
@@ -229,7 +229,7 @@
X-MATE-Bugzilla-Bugzilla=MATE
X-MATE-Bugzilla-Product=caja
X-MATE-Bugzilla-Component=general
-X-MATE-Bugzilla-Version=1.12.2
+X-MATE-Bugzilla-Version=1.12.3
X-MATE-Autostart-Phase=Desktop
X-MATE-Autostart-Notify=true
X-MATE-AutoRestart=true
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/caja-1.12.2/data/caja.desktop.in new/caja-1.12.3/data/caja.desktop.in
--- old/caja-1.12.2/data/caja.desktop.in 2015-12-23 14:07:37.000000000 +0100
+++ new/caja-1.12.3/data/caja.desktop.in 2016-01-25 12:30:47.000000000 +0100
@@ -11,7 +11,7 @@
X-MATE-Bugzilla-Bugzilla=MATE
X-MATE-Bugzilla-Product=caja
X-MATE-Bugzilla-Component=general
-X-MATE-Bugzilla-Version=1.12.2
+X-MATE-Bugzilla-Version=1.12.3
X-MATE-Autostart-Phase=Desktop
X-MATE-Autostart-Notify=true
X-MATE-AutoRestart=true
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/caja-1.12.2/docs/caja-file-management-properties.1 new/caja-1.12.3/docs/caja-file-management-properties.1
--- old/caja-1.12.2/docs/caja-file-management-properties.1 2015-07-16 09:11:15.000000000 +0200
+++ new/caja-1.12.3/docs/caja-file-management-properties.1 2016-01-11 12:31:37.000000000 +0100
@@ -11,7 +11,7 @@
.PP
File Management Preferences allows the user to configure the way caja behaves.
.PP
-You can specify appearance preferences for the Default View; and defaults for Icon, Compact, List, and Tree View; and select sort options and display options. You can configure Caja to recognize Single or Double Click input; as well as Include a Delete command and menu option that bypasses the Trash. Caja File Management Preferences (\fBcaja-file-management-properties\fR) also allows you to tell Caja how to handle certain files; whether to View or Run excutable text files; Automatically view or play Media like CDs, DVDs, or photos, and which applications to use when performing these tasks. Among some other options, this dialog also allows you to adjust file-preview settings, and settings for installed plugins if they exist.
+You can specify appearance preferences for the Default View; and defaults for Icon, Compact, List, and Tree View; and select sort options and display options. You can configure Caja to recognize Single or Double Click input; as well as Include a Delete command and menu option that bypasses the Trash. Caja File Management Preferences (\fBcaja-file-management-properties\fR) also allows you to tell Caja how to handle certain files; whether to View or Run executable text files; Automatically view or play Media like CDs, DVDs, or photos, and which applications to use when performing these tasks. Among some other options, this dialog also allows you to adjust file-preview settings, and settings for installed plugins if they exist.
.SH "BUGS"
.SS Should you encounter any bugs, they may be reported at:
http://github.com/mate-desktop/caja/issues
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/caja-1.12.2/libcaja-private/caja-icon-container.c new/caja-1.12.3/libcaja-private/caja-icon-container.c
--- old/caja-1.12.2/libcaja-private/caja-icon-container.c 2015-10-19 15:07:09.000000000 +0200
+++ new/caja-1.12.3/libcaja-private/caja-icon-container.c 2016-01-25 12:29:41.000000000 +0100
@@ -9434,7 +9434,8 @@
}
else
{
- if (container->details->use_drop_shadows || eel_background_is_dark (background))
+ if (container->details->use_drop_shadows ||
+ (eel_background_is_dark (background) && eel_background_is_set(background)))
{
setup_gc_with_fg (container, LABEL_COLOR, 0xEFEFEF);
setup_gc_with_fg (container,
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/caja-1.12.2/src/caja-pathbar.c new/caja-1.12.3/src/caja-pathbar.c
--- old/caja-1.12.2/src/caja-pathbar.c 2015-10-19 15:07:09.000000000 +0200
+++ new/caja-1.12.3/src/caja-pathbar.c 2016-01-25 12:29:41.000000000 +0100
@@ -326,6 +326,9 @@
g_free (p);
path_bar->home_path = g_file_new_for_path (g_get_home_dir ());
path_bar->root_path = g_file_new_for_path ("/");
+ path_bar->current_path = NULL;
+ path_bar->current_button_data = NULL;
+
desktop_is_home = g_file_equal (path_bar->home_path, path_bar->desktop_path);
g_signal_connect_swapped (caja_preferences, "changed::" CAJA_PREFERENCES_DESKTOP_IS_HOME_DIR,
@@ -1858,8 +1861,8 @@
return;
}
- g_assert (path_bar->current_path != NULL);
- g_assert (path_bar->current_button_data != NULL);
+ g_return_if_fail (path_bar->current_path != NULL);
+ g_return_if_fail (path_bar->current_button_data != NULL);
current_button_data = path_bar->current_button_data;
1
0
Hello community,
here is the log from the commit of package mate-panel for openSUSE:Factory checked in at 2016-01-28 17:23:17
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/mate-panel (Old)
and /work/SRC/openSUSE:Factory/.mate-panel.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "mate-panel"
Changes:
--------
--- /work/SRC/openSUSE:Factory/mate-panel/mate-panel.changes 2016-01-12 16:12:32.000000000 +0100
+++ /work/SRC/openSUSE:Factory/.mate-panel.new/mate-panel.changes 2016-01-28 17:24:04.000000000 +0100
@@ -1,0 +2,10 @@
+Mon Jan 25 15:46:12 UTC 2016 - sor.alexei(a)meowr.ru
+
+- Update to 1.12.2:
+ * Drawer applet: Fix occasional stretching of drawer's panel over
+ the entire screen.
+ * Drawer applet: Fix occasional crash on applet removing.
+ * GTK+3: Fix infinite loop with some themes.
+ * Some more fixes.
+
+-------------------------------------------------------------------
Old:
----
mate-panel-1.12.1.tar.xz
New:
----
mate-panel-1.12.2.tar.xz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ mate-panel.spec ++++++
--- /var/tmp/diff_new_pack.R9hfXW/_old 2016-01-28 17:24:05.000000000 +0100
+++ /var/tmp/diff_new_pack.R9hfXW/_new 2016-01-28 17:24:05.000000000 +0100
@@ -21,7 +21,7 @@
%define typelib typelib-1_0-MatePanelApplet-4_0
%define _version 1.12
Name: mate-panel
-Version: 1.12.1
+Version: 1.12.2
Release: 0
Summary: MATE Desktop Panel
License: GPL-2.0+
++++++ mate-panel-1.12.1.tar.xz -> mate-panel-1.12.2.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mate-panel-1.12.1/NEWS new/mate-panel-1.12.2/NEWS
--- old/mate-panel-1.12.1/NEWS 2015-11-30 08:39:30.000000000 +0100
+++ new/mate-panel-1.12.2/NEWS 2016-01-25 09:29:41.000000000 +0100
@@ -1,3 +1,10 @@
+1.12.2
+ * Drawer applet: fix occasional stretching of drawer's panel
+ over the entire screen
+ * Drawer applet: fix occasional crash on applet removing
+ * GTK+3: fix infinite loop with some themes
+ * Some more fixes
+
1.12.1
* GTK+3: fix background in some themes
* Some more fixes
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mate-panel-1.12.1/aclocal.m4 new/mate-panel-1.12.2/aclocal.m4
--- old/mate-panel-1.12.1/aclocal.m4 2015-11-30 08:39:57.000000000 +0100
+++ new/mate-panel-1.12.2/aclocal.m4 2016-01-25 12:36:01.000000000 +0100
@@ -693,7 +693,7 @@
DISABLE_DEPRECATED=""
if test $USE_MAINTAINER_MODE = yes; then
- DOMAINS="G ATK PANGO GDK GDK_PIXBUF GTK MATECONF MATECOMPONENT MATECOMPONENT_UI MATE LIBGLADE VTE MATE_VFS WNCK LIBSOUP"
+ DOMAINS="G ATK PANGO GDK GDK_PIXBUF GTK MATE LIBGLADE VTE WNCK LIBSOUP"
for DOMAIN in $DOMAINS; do
DISABLE_DEPRECATED="$DISABLE_DEPRECATED -D${DOMAIN}_DISABLE_DEPRECATED -D${DOMAIN}_DISABLE_SINGLE_INCLUDES"
done
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mate-panel-1.12.1/applets/wncklet/workspace-switcher.c new/mate-panel-1.12.2/applets/wncklet/workspace-switcher.c
--- old/mate-panel-1.12.1/applets/wncklet/workspace-switcher.c 2015-11-11 09:39:07.000000000 +0100
+++ new/mate-panel-1.12.2/applets/wncklet/workspace-switcher.c 2015-12-17 11:57:39.000000000 +0100
@@ -489,6 +489,9 @@
GtkActionGroup* action_group;
gchar* ui_path;
gboolean display_names;
+#if GTK_CHECK_VERSION (3, 0, 0)
+ GtkCssProvider *provider;
+#endif
pager = g_new0(PagerData, 1);
@@ -543,6 +546,17 @@
pager->wm = PAGER_WM_UNKNOWN;
wnck_pager_set_shadow_type(WNCK_PAGER(pager->pager), GTK_SHADOW_IN);
+#if GTK_CHECK_VERSION (3, 0, 0)
+ provider = gtk_css_provider_new ();
+ gtk_css_provider_load_from_data (provider,
+ "WnckPager:selected {\n"
+ "background-color: #4A90D9; }",
+ -1, NULL);
+ gtk_style_context_add_provider (gtk_widget_get_style_context (pager->pager),
+ GTK_STYLE_PROVIDER (provider),
+ GTK_STYLE_PROVIDER_PRIORITY_FALLBACK);
+ g_object_unref (provider);
+#endif
g_signal_connect(G_OBJECT(pager->pager), "destroy", G_CALLBACK(destroy_pager), pager);
gtk_container_add(GTK_CONTAINER(pager->applet), pager->pager);
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mate-panel-1.12.1/configure new/mate-panel-1.12.2/configure
--- old/mate-panel-1.12.1/configure 2015-11-30 08:39:58.000000000 +0100
+++ new/mate-panel-1.12.2/configure 2016-01-25 12:36:02.000000000 +0100
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.69 for mate-panel 1.12.1.
+# Generated by GNU Autoconf 2.69 for mate-panel 1.12.2.
#
# Report bugs to <https://github.com/mate-desktop/mate-panel/issues>.
#
@@ -590,8 +590,8 @@
# Identity of this package.
PACKAGE_NAME='mate-panel'
PACKAGE_TARNAME='mate-panel'
-PACKAGE_VERSION='1.12.1'
-PACKAGE_STRING='mate-panel 1.12.1'
+PACKAGE_VERSION='1.12.2'
+PACKAGE_STRING='mate-panel 1.12.2'
PACKAGE_BUGREPORT='https://github.com/mate-desktop/mate-panel/issues'
PACKAGE_URL='http://www.mate-desktop.org'
@@ -1508,7 +1508,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 mate-panel 1.12.1 to adapt to many kinds of systems.
+\`configure' configures mate-panel 1.12.2 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1582,7 +1582,7 @@
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of mate-panel 1.12.1:";;
+ short | recursive ) echo "Configuration of mate-panel 1.12.2:";;
esac
cat <<\_ACEOF
@@ -1765,7 +1765,7 @@
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-mate-panel configure 1.12.1
+mate-panel configure 1.12.2
generated by GNU Autoconf 2.69
Copyright (C) 2012 Free Software Foundation, Inc.
@@ -2134,7 +2134,7 @@
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
-It was created by mate-panel $as_me 1.12.1, which was
+It was created by mate-panel $as_me 1.12.2, which was
generated by GNU Autoconf 2.69. Invocation command line was
$ $0 $@
@@ -2999,7 +2999,7 @@
# Define the identity of the package.
PACKAGE='mate-panel'
- VERSION='1.12.1'
+ VERSION='1.12.2'
cat >>confdefs.h <<_ACEOF
@@ -3299,7 +3299,7 @@
DISABLE_DEPRECATED=""
if test $USE_MAINTAINER_MODE = yes; then
- DOMAINS="G ATK PANGO GDK GDK_PIXBUF GTK MATECONF MATECOMPONENT MATECOMPONENT_UI MATE LIBGLADE VTE MATE_VFS WNCK LIBSOUP"
+ DOMAINS="G ATK PANGO GDK GDK_PIXBUF GTK MATE LIBGLADE VTE WNCK LIBSOUP"
for DOMAIN in $DOMAINS; do
DISABLE_DEPRECATED="$DISABLE_DEPRECATED -D${DOMAIN}_DISABLE_DEPRECATED -D${DOMAIN}_DISABLE_SINGLE_INCLUDES"
done
@@ -19226,7 +19226,7 @@
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
-This file was extended by mate-panel $as_me 1.12.1, which was
+This file was extended by mate-panel $as_me 1.12.2, which was
generated by GNU Autoconf 2.69. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -19293,7 +19293,7 @@
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
ac_cs_version="\\
-mate-panel config.status 1.12.1
+mate-panel config.status 1.12.2
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/mate-panel-1.12.1/configure.ac new/mate-panel-1.12.2/configure.ac
--- old/mate-panel-1.12.1/configure.ac 2015-11-30 08:38:13.000000000 +0100
+++ new/mate-panel-1.12.2/configure.ac 2016-01-25 09:27:41.000000000 +0100
@@ -1,4 +1,4 @@
-AC_INIT([mate-panel], [1.12.1], [https://github.com/mate-desktop/mate-panel/issues]
+AC_INIT([mate-panel], [1.12.2], [https://github.com/mate-desktop/mate-panel/issues]
[mate-panel], [http://www.mate-desktop.org]
AC_CONFIG_HEADERS(config.h)
AM_INIT_AUTOMAKE([1.9 no-dist-gzip dist-xz tar-ustar -Wno-portability check-news])
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mate-panel-1.12.1/libmate-panel-applet/mate-panel-applet.c new/mate-panel-1.12.2/libmate-panel-applet/mate-panel-applet.c
--- old/mate-panel-1.12.1/libmate-panel-applet/mate-panel-applet.c 2015-11-30 08:37:55.000000000 +0100
+++ new/mate-panel-1.12.2/libmate-panel-applet/mate-panel-applet.c 2016-01-25 09:27:33.000000000 +0100
@@ -1981,7 +1981,6 @@
GtkStyleContext* context;
context = gtk_widget_get_style_context (widget);
- gtk_widget_reset_style (widget);
switch (type) {
case PANEL_NO_BACKGROUND:
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mate-panel-1.12.1/mate-panel/drawer.c new/mate-panel-1.12.2/mate-panel/drawer.c
--- old/mate-panel-1.12.1/mate-panel/drawer.c 2015-10-26 12:31:36.000000000 +0100
+++ new/mate-panel-1.12.2/mate-panel/drawer.c 2016-01-11 13:20:35.000000000 +0100
@@ -47,20 +47,26 @@
Drawer *drawer)
{
drawer->toplevel = NULL;
- gtk_widget_destroy (drawer->button);
+
+ if (drawer->button) {
+ gtk_widget_destroy (drawer->button);
+ drawer->button = NULL;
+ }
}
static void
destroy_drawer (GtkWidget *widget,
Drawer *drawer)
{
- if (drawer->toplevel)
+ if (drawer->toplevel) {
gtk_widget_destroy (GTK_WIDGET (drawer->toplevel));
- drawer->toplevel = NULL;
+ drawer->toplevel = NULL;
+ }
- if (drawer->close_timeout_id)
+ if (drawer->close_timeout_id) {
g_source_remove (drawer->close_timeout_id);
- drawer->close_timeout_id = 0;
+ drawer->close_timeout_id = 0;
+ }
}
static void
@@ -302,13 +308,11 @@
{
g_return_if_fail (drawer != NULL);
g_return_if_fail (drawer->toplevel != NULL);
- g_return_if_fail (tooltip != NULL);
-
- if (tooltip && !tooltip [0])
- tooltip = NULL;
- panel_toplevel_set_name (drawer->toplevel, tooltip);
- panel_util_set_tooltip_text (drawer->button, tooltip);
+ if (tooltip != NULL && tooltip [0] != '\0') {
+ panel_toplevel_set_name (drawer->toplevel, tooltip);
+ panel_util_set_tooltip_text (drawer->button, tooltip);
+ }
}
static Drawer *
@@ -413,37 +417,20 @@
}
static void
-panel_drawer_use_custom_icon_changed (GSettings *settings,
+panel_drawer_custom_icon_changed (GSettings *settings,
gchar *key,
Drawer *drawer)
{
- gboolean use_custom_icon;
- char *custom_icon = NULL;
-
- use_custom_icon = g_settings_get_boolean (settings, key);
-
- if (use_custom_icon) {
- custom_icon = g_settings_get_string (settings, PANEL_OBJECT_CUSTOM_ICON_KEY);
- }
-
- button_widget_set_icon_name (BUTTON_WIDGET (drawer->button), custom_icon);
-
- g_free (custom_icon);
-}
+ g_return_if_fail (drawer != NULL);
+ g_return_if_fail (drawer->button != NULL);
-static void
-panel_drawer_custom_icon_changed (GSettings *settings,
- gchar *key,
- Drawer *drawer)
-{
- char *custom_icon;
- custom_icon = g_settings_get_string (settings, key);
+ gboolean use_custom_icon = g_settings_get_boolean (settings, PANEL_OBJECT_USE_CUSTOM_ICON_KEY);
+ char *custom_icon = g_settings_get_string (settings, PANEL_OBJECT_CUSTOM_ICON_KEY);
- if (custom_icon && custom_icon [0]) {
- gboolean use_custom_icon;
- use_custom_icon = g_settings_get_boolean (settings, PANEL_OBJECT_USE_CUSTOM_ICON_KEY);
- if (use_custom_icon)
- button_widget_set_icon_name (BUTTON_WIDGET (drawer->button), custom_icon);
+ if (use_custom_icon && custom_icon != NULL && custom_icon [0] != '\0') {
+ button_widget_set_icon_name (BUTTON_WIDGET (drawer->button), custom_icon);
+ } else {
+ button_widget_set_icon_name (BUTTON_WIDGET (drawer->button), PANEL_ICON_DRAWER);
}
g_free (custom_icon);
@@ -464,7 +451,7 @@
{
g_signal_connect (drawer->info->settings,
"changed::" PANEL_OBJECT_USE_CUSTOM_ICON_KEY,
- G_CALLBACK (panel_drawer_use_custom_icon_changed),
+ G_CALLBACK (panel_drawer_custom_icon_changed),
drawer);
g_signal_connect (drawer->info->settings,
"changed::" PANEL_OBJECT_CUSTOM_ICON_KEY,
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mate-panel-1.12.1/mate-panel/mate-panel.desktop.in new/mate-panel-1.12.2/mate-panel/mate-panel.desktop.in
--- old/mate-panel-1.12.1/mate-panel/mate-panel.desktop.in 2015-11-30 08:40:05.000000000 +0100
+++ new/mate-panel-1.12.2/mate-panel/mate-panel.desktop.in 2016-01-25 12:36:09.000000000 +0100
@@ -9,7 +9,7 @@
X-MATE-Bugzilla-Bugzilla=MATE
X-MATE-Bugzilla-Product=mate-panel
X-MATE-Bugzilla-Component=general
-X-MATE-Bugzilla-Version=1.12.1
+X-MATE-Bugzilla-Version=1.12.2
Categories=GTK;System;Core;
OnlyShowIn=MATE;
NoDisplay=true
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mate-panel-1.12.1/mate-panel/panel-background.c new/mate-panel-1.12.2/mate-panel/panel-background.c
--- old/mate-panel-1.12.1/mate-panel/panel-background.c 2015-11-30 08:37:55.000000000 +0100
+++ new/mate-panel-1.12.2/mate-panel/panel-background.c 2016-01-25 09:27:33.000000000 +0100
@@ -104,7 +104,6 @@
context = gtk_widget_get_style_context (widget);
effective_type = panel_background_effective_type (background);
- gtk_widget_reset_style (widget);
switch (effective_type) {
case PANEL_BACK_NONE:
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mate-panel-1.12.1/mate-panel/panel-toplevel.c new/mate-panel-1.12.2/mate-panel/panel-toplevel.c
--- old/mate-panel-1.12.1/mate-panel/panel-toplevel.c 2015-10-26 12:31:36.000000000 +0100
+++ new/mate-panel-1.12.2/mate-panel/panel-toplevel.c 2016-01-25 09:27:33.000000000 +0100
@@ -5078,6 +5078,11 @@
{
g_return_if_fail (PANEL_IS_TOPLEVEL (toplevel));
+ if (toplevel->priv->attached && expand) {
+ g_warning ("attempt to expand attached toplevel; ignoring");
+ return;
+ }
+
expand = expand != FALSE;
if (toplevel->priv->expand == expand)
1
0
Hello community,
here is the log from the commit of package qbittorrent for openSUSE:Factory checked in at 2016-01-28 17:23:15
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/qbittorrent (Old)
and /work/SRC/openSUSE:Factory/.qbittorrent.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "qbittorrent"
Changes:
--------
--- /work/SRC/openSUSE:Factory/qbittorrent/qbittorrent.changes 2016-01-23 01:16:36.000000000 +0100
+++ /work/SRC/openSUSE:Factory/.qbittorrent.new/qbittorrent.changes 2016-01-28 17:24:02.000000000 +0100
@@ -1,0 +2,9 @@
+Mon Jan 25 10:12:32 UTC 2016 - sor.alexei(a)meowr.ru
+
+- Update to 3.3.3:
+ * BUGFIX: Temporarily disable "filename" column of peers view.
+ It has a bug that causes frequent crashes.
+ * WEBUI: Move style of dynamic table header to CSS.
+ * WEBUI: Fix unnecessary updates of torrent peers table.
+
+-------------------------------------------------------------------
Old:
----
qbittorrent-3.3.2.tar.xz
New:
----
qbittorrent-3.3.3.tar.xz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ qbittorrent.spec ++++++
--- /var/tmp/diff_new_pack.ukkPGw/_old 2016-01-28 17:24:02.000000000 +0100
+++ /var/tmp/diff_new_pack.ukkPGw/_new 2016-01-28 17:24:02.000000000 +0100
@@ -19,7 +19,7 @@
%define _name qBittorrent
Name: qbittorrent
-Version: 3.3.2
+Version: 3.3.3
Release: 0
Summary: A BitTorrent client in Qt
License: GPL-2.0+
++++++ qbittorrent-3.3.2.tar.xz -> qbittorrent-3.3.3.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qbittorrent-3.3.2/Changelog new/qbittorrent-3.3.3/Changelog
--- old/qbittorrent-3.3.2/Changelog 2016-01-19 00:50:18.000000000 +0100
+++ new/qbittorrent-3.3.3/Changelog 2016-01-20 23:52:26.000000000 +0100
@@ -1,3 +1,8 @@
+* Thu Jan 21 2016 - sledgehammer999 <sledgehammer999(a)qbittorrent.org> - v3.3.3
+ - BUGFIX: Temporarily disable "filename" column of peers view. It has a bug that causes frequent crashes. See issue #4597.
+ - WEBUI: Move style of dynamic table header to CSS (buinsky)
+ - WEBUI: Fix unnecessary updates of torrent peers table (buinsky)
+
* Tue Jan 19 2016 - sledgehammer999 <sledgehammer999(a)qbittorrent.org> - v3.3.2
- FEATURE: Add a new column to peers list that shows list of files which are downloaded right now from a peer. (evsh)
- FEATURE: Improve the "Watch folders" UI. Closes #4300. You'll need to redo your watch folders settings. (sledgehammer999, glassez)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qbittorrent-3.3.2/dist/mac/Info.plist new/qbittorrent-3.3.3/dist/mac/Info.plist
--- old/qbittorrent-3.3.2/dist/mac/Info.plist 2016-01-19 00:50:18.000000000 +0100
+++ new/qbittorrent-3.3.3/dist/mac/Info.plist 2016-01-20 23:52:26.000000000 +0100
@@ -45,7 +45,7 @@
<key>CFBundlePackageType</key>
<string>APPL</string>
<key>CFBundleShortVersionString</key>
- <string>3.3.2</string>
+ <string>3.3.3</string>
<key>CFBundleSignature</key>
<string>qBit</string>
<key>CFBundleExecutable</key>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qbittorrent-3.3.2/dist/windows/options.nsi new/qbittorrent-3.3.3/dist/windows/options.nsi
--- old/qbittorrent-3.3.2/dist/windows/options.nsi 2016-01-19 00:50:18.000000000 +0100
+++ new/qbittorrent-3.3.3/dist/windows/options.nsi 2016-01-20 23:52:26.000000000 +0100
@@ -19,7 +19,7 @@
!define CSIDL_APPDATA '0x1A' ;Application Data path
!define CSIDL_LOCALAPPDATA '0x1C' ;Local Application Data path
-!define PROG_VERSION "3.3.2"
+!define PROG_VERSION "3.3.3"
!define MUI_FINISHPAGE_RUN
!define MUI_FINISHPAGE_RUN_FUNCTION PageFinishRun
!define MUI_FINISHPAGE_RUN_TEXT $(launch_qbt)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qbittorrent-3.3.2/src/base/bittorrent/peerinfo.cpp new/qbittorrent-3.3.3/src/base/bittorrent/peerinfo.cpp
--- old/qbittorrent-3.3.2/src/base/bittorrent/peerinfo.cpp 2016-01-19 00:50:18.000000000 +0100
+++ new/qbittorrent-3.3.3/src/base/bittorrent/peerinfo.cpp 2016-01-20 23:52:26.000000000 +0100
@@ -408,8 +408,3 @@
{
return m_flagsDescription;
}
-
-int PeerInfo::downloadingPieceIndex() const
-{
- return m_nativeInfo.downloading_piece_index;
-}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qbittorrent-3.3.2/src/base/bittorrent/peerinfo.h new/qbittorrent-3.3.3/src/base/bittorrent/peerinfo.h
--- old/qbittorrent-3.3.2/src/base/bittorrent/peerinfo.h 2016-01-19 00:50:18.000000000 +0100
+++ new/qbittorrent-3.3.3/src/base/bittorrent/peerinfo.h 2016-01-20 23:52:26.000000000 +0100
@@ -100,7 +100,6 @@
#ifndef DISABLE_COUNTRIES_RESOLUTION
QString country() const;
#endif
- int downloadingPieceIndex() const;
private:
void calcRelevance(const TorrentHandle *torrent);
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qbittorrent-3.3.2/src/base/bittorrent/torrentinfo.cpp new/qbittorrent-3.3.3/src/base/bittorrent/torrentinfo.cpp
--- old/qbittorrent-3.3.2/src/base/bittorrent/torrentinfo.cpp 2016-01-19 00:50:18.000000000 +0100
+++ new/qbittorrent-3.3.3/src/base/bittorrent/torrentinfo.cpp 2016-01-20 23:52:26.000000000 +0100
@@ -211,20 +211,6 @@
return QByteArray(m_nativeInfo->metadata().get(), m_nativeInfo->metadata_size());
}
-QStringList TorrentInfo::filesForPiece(int pieceIndex) const
-{
- if (pieceIndex < 0)
- return QStringList();
-
- std::vector<libtorrent::file_slice> files(
- nativeInfo()->map_block(pieceIndex, 0, nativeInfo()->piece_length()));
- QStringList res;
- for (const libtorrent::file_slice& s: files) {
- res.append(filePath(s.file_index));
- }
- return res;
-}
-
void TorrentInfo::renameFile(uint index, const QString &newPath)
{
if (!isValid()) return;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qbittorrent-3.3.2/src/base/bittorrent/torrentinfo.h new/qbittorrent-3.3.3/src/base/bittorrent/torrentinfo.h
--- old/qbittorrent-3.3.2/src/base/bittorrent/torrentinfo.h 2016-01-19 00:50:18.000000000 +0100
+++ new/qbittorrent-3.3.3/src/base/bittorrent/torrentinfo.h 2016-01-20 23:52:26.000000000 +0100
@@ -75,7 +75,6 @@
QList<TrackerEntry> trackers() const;
QList<QUrl> urlSeeds() const;
QByteArray metadata() const;
- QStringList filesForPiece(int pieceIndex) const;
void renameFile(uint index, const QString &newPath);
boost::intrusive_ptr<libtorrent::torrent_info> nativeInfo() const;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qbittorrent-3.3.2/src/gui/properties/peerlistdelegate.h new/qbittorrent-3.3.3/src/gui/properties/peerlistdelegate.h
--- old/qbittorrent-3.3.2/src/gui/properties/peerlistdelegate.h 2016-01-19 00:50:18.000000000 +0100
+++ new/qbittorrent-3.3.3/src/gui/properties/peerlistdelegate.h 2016-01-20 23:52:26.000000000 +0100
@@ -41,7 +41,7 @@
public:
enum PeerListColumns {COUNTRY, IP, PORT, CONNECTION, FLAGS, CLIENT, PROGRESS, DOWN_SPEED, UP_SPEED,
- TOT_DOWN, TOT_UP, RELEVANCE, DOWNLOADING_PIECE, IP_HIDDEN, COL_COUNT};
+ TOT_DOWN, TOT_UP, RELEVANCE, IP_HIDDEN, COL_COUNT};
public:
PeerListDelegate(QObject *parent) : QItemDelegate(parent) {}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qbittorrent-3.3.2/src/gui/properties/peerlistwidget.cpp new/qbittorrent-3.3.3/src/gui/properties/peerlistwidget.cpp
--- old/qbittorrent-3.3.2/src/gui/properties/peerlistwidget.cpp 2016-01-19 00:50:18.000000000 +0100
+++ new/qbittorrent-3.3.3/src/gui/properties/peerlistwidget.cpp 2016-01-20 23:52:26.000000000 +0100
@@ -78,7 +78,6 @@
m_listModel->setHeaderData(PeerListDelegate::TOT_DOWN, Qt::Horizontal, tr("Downloaded", "i.e: total data downloaded"));
m_listModel->setHeaderData(PeerListDelegate::TOT_UP, Qt::Horizontal, tr("Uploaded", "i.e: total data uploaded"));
m_listModel->setHeaderData(PeerListDelegate::RELEVANCE, Qt::Horizontal, tr("Relevance", "i.e: How relevant this peer is to us. How many pieces it has that we don't."));
- m_listModel->setHeaderData(PeerListDelegate::DOWNLOADING_PIECE, Qt::Horizontal, tr("Files", "i.e. files that are being downloaded right now"));
// Proxy model to support sorting without actually altering the underlying model
m_proxyModel = new PeerListSortModel();
m_proxyModel->setDynamicSortFilter(true);
@@ -283,14 +282,14 @@
QString peerIp = addr.ip.toString();
if (m_peerItems.contains(peerIp)) {
// Update existing peer
- updatePeer(peerIp, torrent, peer);
+ updatePeer(peerIp, peer);
oldeersSet.remove(peerIp);
if (forceHostnameResolution && m_resolver)
m_resolver->resolve(peerIp);
}
else {
// Add new peer
- m_peerItems[peerIp] = addPeer(peerIp, torrent, peer);
+ m_peerItems[peerIp] = addPeer(peerIp, peer);
m_peerAddresses[peerIp] = addr;
// Resolve peer host name is asked
if (m_resolver)
@@ -308,7 +307,7 @@
}
}
-QStandardItem* PeerListWidget::addPeer(const QString& ip, BitTorrent::TorrentHandle *const torrent, const BitTorrent::PeerInfo &peer)
+QStandardItem* PeerListWidget::addPeer(const QString &ip, const BitTorrent::PeerInfo &peer)
{
int row = m_listModel->rowCount();
// Adding Peer to peer list
@@ -338,14 +337,10 @@
m_listModel->setData(m_listModel->index(row, PeerListDelegate::TOT_DOWN), peer.totalDownload());
m_listModel->setData(m_listModel->index(row, PeerListDelegate::TOT_UP), peer.totalUpload());
m_listModel->setData(m_listModel->index(row, PeerListDelegate::RELEVANCE), peer.relevance());
- QStringList downloadingFiles(torrent->info().filesForPiece(peer.downloadingPieceIndex()));
- m_listModel->setData(m_listModel->index(row, PeerListDelegate::DOWNLOADING_PIECE), downloadingFiles.join(QLatin1String(";")));
- m_listModel->setData(m_listModel->index(row, PeerListDelegate::DOWNLOADING_PIECE), downloadingFiles.join(QLatin1String("\n")), Qt::ToolTipRole);
-
return m_listModel->item(row, PeerListDelegate::IP);
}
-void PeerListWidget::updatePeer(const QString &ip, BitTorrent::TorrentHandle *const torrent, const BitTorrent::PeerInfo &peer)
+void PeerListWidget::updatePeer(const QString &ip, const BitTorrent::PeerInfo &peer)
{
QStandardItem *item = m_peerItems.value(ip);
int row = item->row();
@@ -369,9 +364,6 @@
m_listModel->setData(m_listModel->index(row, PeerListDelegate::TOT_DOWN), peer.totalDownload());
m_listModel->setData(m_listModel->index(row, PeerListDelegate::TOT_UP), peer.totalUpload());
m_listModel->setData(m_listModel->index(row, PeerListDelegate::RELEVANCE), peer.relevance());
- QStringList downloadingFiles(torrent->info().filesForPiece(peer.downloadingPieceIndex()));
- m_listModel->setData(m_listModel->index(row, PeerListDelegate::DOWNLOADING_PIECE), downloadingFiles.join(QLatin1String(";")));
- m_listModel->setData(m_listModel->index(row, PeerListDelegate::DOWNLOADING_PIECE), downloadingFiles.join(QLatin1String("\n")), Qt::ToolTipRole);
}
void PeerListWidget::handleResolved(const QString &ip, const QString &hostname)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qbittorrent-3.3.2/src/gui/properties/peerlistwidget.h new/qbittorrent-3.3.3/src/gui/properties/peerlistwidget.h
--- old/qbittorrent-3.3.2/src/gui/properties/peerlistwidget.h 2016-01-19 00:50:18.000000000 +0100
+++ new/qbittorrent-3.3.3/src/gui/properties/peerlistwidget.h 2016-01-20 23:52:26.000000000 +0100
@@ -68,8 +68,8 @@
~PeerListWidget();
void loadPeers(BitTorrent::TorrentHandle *const torrent, bool forceHostnameResolution = false);
- QStandardItem *addPeer(const QString &ip, BitTorrent::TorrentHandle *const torrent, const BitTorrent::PeerInfo &peer);
- void updatePeer(const QString &ip, BitTorrent::TorrentHandle *const torrent, const BitTorrent::PeerInfo &peer);
+ QStandardItem *addPeer(const QString &ip, const BitTorrent::PeerInfo &peer);
+ void updatePeer(const QString &ip, const BitTorrent::PeerInfo &peer);
void updatePeerHostNameResolutionState();
void updatePeerCountryResolutionState();
void clear();
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qbittorrent-3.3.2/src/webui/www/public/css/dynamicTable.css new/qbittorrent-3.3.3/src/webui/www/public/css/dynamicTable.css
--- old/qbittorrent-3.3.2/src/webui/www/public/css/dynamicTable.css 2016-01-19 00:50:18.000000000 +0100
+++ new/qbittorrent-3.3.3/src/webui/www/public/css/dynamicTable.css 2016-01-20 23:52:26.000000000 +0100
@@ -88,3 +88,7 @@
white-space: nowrap;
max-width: 300px;
}
+
+tr.dynamicTableHeader {
+ cursor: pointer;
+}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qbittorrent-3.3.2/src/webui/www/public/properties_content.html new/qbittorrent-3.3.3/src/webui/www/public/properties_content.html
--- old/qbittorrent-3.3.2/src/webui/www/public/properties_content.html 2016-01-19 00:50:18.000000000 +0100
+++ new/qbittorrent-3.3.3/src/webui/www/public/properties_content.html 2016-01-20 23:52:26.000000000 +0100
@@ -67,7 +67,7 @@
<div id="peers">
<table class="torrentTable" cellpadding="0" cellspacing="0" style="width: 100%">
<thead>
- <tr id="torrentPeersTableHeader">
+ <tr id="torrentPeersTableHeader" class="dynamicTableHeader">
</tr>
</thead>
<tbody id="torrentPeersTable"></tbody>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qbittorrent-3.3.2/src/webui/www/public/scripts/dynamicTable.js new/qbittorrent-3.3.3/src/webui/www/public/scripts/dynamicTable.js
--- old/qbittorrent-3.3.2/src/webui/www/public/scripts/dynamicTable.js 2016-01-19 00:50:18.000000000 +0100
+++ new/qbittorrent-3.3.3/src/webui/www/public/scripts/dynamicTable.js 2016-01-20 23:52:26.000000000 +0100
@@ -212,8 +212,11 @@
if (tr.hasClass('selected'))
tr.removeClass('selected');
}
+ this.onSelectedRowChanged();
},
+ onSelectedRowChanged : function () {},
+
updateRowData : function (data) {
var rowId = data['rowId'];
var row;
@@ -350,7 +353,6 @@
} else {
// Simple selection
this._this.selectRow(this.rowId);
- updatePropertiesPanel();
}
}
return false;
@@ -439,18 +441,18 @@
Extends: DynamicTable,
initColumns : function () {
- this.newColumn('priority', 'width: 30px; cursor: pointer', '#');
- this.newColumn('state_icon', 'width: 16px', '');
- this.newColumn('name', 'min-width: 200px; cursor: pointer', 'QBT_TR(Name)QBT_TR');
- this.newColumn('size', 'width: 100px; cursor: pointer', 'QBT_TR(Size)QBT_TR');
- this.newColumn('progress', 'width: 80px; cursor: pointer', 'QBT_TR(Done)QBT_TR');
- this.newColumn('num_seeds', 'width: 100px; cursor: pointer', 'QBT_TR(Seeds)QBT_TR');
- this.newColumn('num_leechs', 'width: 100px; cursor: pointer', 'QBT_TR(Peers)QBT_TR');
- this.newColumn('dlspeed', 'width: 100px; cursor: pointer', 'QBT_TR(Down Speed)QBT_TR');
- this.newColumn('upspeed', 'width: 100px; cursor: pointer', 'QBT_TR(Up Speed)QBT_TR');
- this.newColumn('eta', 'width: 100px; cursor: pointer', 'QBT_TR(ETA)QBT_TR');
- this.newColumn('ratio', 'width: 100px; cursor: pointer', 'QBT_TR(Ratio)QBT_TR');
- this.newColumn('label', 'width: 100px; cursor: pointer', 'QBT_TR(Label)QBT_TR');
+ this.newColumn('priority', 'width: 30px', '#');
+ this.newColumn('state_icon', 'width: 16px; cursor: default', '');
+ this.newColumn('name', 'min-width: 200px', 'QBT_TR(Name)QBT_TR');
+ this.newColumn('size', 'width: 100px', 'QBT_TR(Size)QBT_TR');
+ this.newColumn('progress', 'width: 80px', 'QBT_TR(Done)QBT_TR');
+ this.newColumn('num_seeds', 'width: 100px', 'QBT_TR(Seeds)QBT_TR');
+ this.newColumn('num_leechs', 'width: 100px', 'QBT_TR(Peers)QBT_TR');
+ this.newColumn('dlspeed', 'width: 100px', 'QBT_TR(Down Speed)QBT_TR');
+ this.newColumn('upspeed', 'width: 100px', 'QBT_TR(Up Speed)QBT_TR');
+ this.newColumn('eta', 'width: 100px', 'QBT_TR(ETA)QBT_TR');
+ this.newColumn('ratio', 'width: 100px', 'QBT_TR(Ratio)QBT_TR');
+ this.newColumn('label', 'width: 100px', 'QBT_TR(Label)QBT_TR');
this.columns['state_icon'].onclick = '';
this.columns['state_icon'].dataProperties[0] = 'state';
@@ -720,6 +722,10 @@
getCurrentTorrentHash : function () {
return this.getSelectedRowId();
+ },
+
+ onSelectedRowChanged : function () {
+ updatePropertiesPanel();
}
});
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qbittorrent-3.3.2/src/webui/www/public/transferlist.html new/qbittorrent-3.3.3/src/webui/www/public/transferlist.html
--- old/qbittorrent-3.3.2/src/webui/www/public/transferlist.html 2016-01-19 00:50:18.000000000 +0100
+++ new/qbittorrent-3.3.3/src/webui/www/public/transferlist.html 2016-01-20 23:52:26.000000000 +0100
@@ -1,6 +1,6 @@
<table class="torrentTable" cellpadding="0" cellspacing="0">
<thead>
- <tr id="torrentsTableHeader">
+ <tr id="torrentsTableHeader" class="dynamicTableHeader">
</tr>
</thead>
<tbody id="torrentsTable"></tbody>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qbittorrent-3.3.2/version.pri new/qbittorrent-3.3.3/version.pri
--- old/qbittorrent-3.3.2/version.pri 2016-01-19 00:50:18.000000000 +0100
+++ new/qbittorrent-3.3.3/version.pri 2016-01-20 23:52:26.000000000 +0100
@@ -3,7 +3,7 @@
# Define version numbers here
VER_MAJOR = 3
VER_MINOR = 3
-VER_BUGFIX = 2
+VER_BUGFIX = 3
VER_BUILD = 0
VER_STATUS = # Should be empty for stable releases!
1
0
Hello community,
here is the log from the commit of package squid for openSUSE:Factory checked in at 2016-01-28 17:23:14
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/squid (Old)
and /work/SRC/openSUSE:Factory/.squid.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "squid"
Changes:
--------
--- /work/SRC/openSUSE:Factory/squid/squid.changes 2015-12-09 22:34:26.000000000 +0100
+++ /work/SRC/openSUSE:Factory/.squid.new/squid.changes 2016-01-28 17:23:58.000000000 +0100
@@ -2 +2 @@
-Wed Dec 9 10:11:36 UTC 2015 - mpluskal(a)suse.com
+Sun Jan 24 18:28:45 UTC 2016 - chris(a)computersalat.de
@@ -4,27 +4,37 @@
-- Update to 4.0.3
- * Bug 4372: missing template files
- * Bug 4371: compile errors: no such file or directory:
- DiskIO/*/*DiskIOModule.o
- * Bug 4368: A simpler and more robust HTTP request line parser
- * Fix compile erorr on clang undefined reference to
- '__atomic_load_8'
- * ext_kerberos_ldap_group_acl: Add missing workarounds for
- Heimdal Kerberos
- * ext_ldap_group_acl: Allow unlimited LDAP search filter
- * ext_unix_group_acl: Support -r parameter to strip @REALM from
- usernames
- * ... and much code cleanup and polishing
- * ... and all fixes from squid 3.5.11
-- Changes for squid-4.0.2
- * Regression Bug 4351: compile errors when authentication modules
- disabled
- * Regression fix: HTTP/1.1 Transfer-Encoding:chunked parsing
- * Bug 4359: assertion failure 'Comm::IsConnOpen(conn)' within
- ConnStateData::requestTimeout
- * Bug 4356: segmentation fault using proxy_auth ACL
- * Bug 4352: compile errors in OS X 10.11
- * Bug 4021: ext_user_regex does exact match
- * Bug 3574: avoid crashes, prohibit reconfiguration during
- shutdown
- * Support re-assigning delay pools based on HTTP reply details
- * ... and all fixes from squid 3.5.11
+- Changes to squid-3.5.13 (06 Jan 2016):
+ * Bug 4397: DragonFly BSD, POSIX shared memory is implemented as filepath
+ * Bug 4387: Kerberos build errors on Solaris
+ * TLS: Support Ephemeral Elliptic Curve Diffie-Hellman (EECDH) key exchange
+ * TLS: Complete certificate chains using external intermediate certificates
+ * Avoid memory leaks when an X.509 certificate validator is used with SslBump
+ * Fix connection retry and fallback after failed server TLS connections
+ * Fix GnuTLS detection via pkg-config
+ * Fix startup crash with a misconfigured (too-small) shared memory cache
+ * ... and some documentation updates
+- Changes to squid-3.5.12 (28 Nov 2015):
+ * Bug 4374: refresh_pattern config parser (%)
+ * Bug 4373: assertion 'calloutContext->redirect_state == REDIRECT_NONE'
+ * Bug 4228: links with krb5 libs despite --without options
+ * Fix SSL_get_certificate() problem detection
+ * Fix TLS handshake problem during Renegotiation
+ * Fix cache_peer forceddomain= in CONNECT
+ * Fix status code-based HTTP reason phrase for eCAP-generated messages
+ * Fix build errors in cpuafinity.cc
+ * ... and several documentation updates
+- Changes to squid-3.5.11 (01 Nov 2015):
+ * Bug 3574: crashes on reconfigure and startup
+ * Bug 4347: compile errors with LibreSSL 2.3
+ * Bug 4281: copy-paste typos in src/tools.cc
+ * Bug 4279: No response from proxy for FTP-download of non-existing file
+ * Bug 4188: Bumping intercepted SSL connections does not work on Solaris
+ * Fix incorrect authentication headers on cache digest requests
+ * Fix connection stats, including %<lp, missing for persistent connections
+ * Fix invalid memory access issues in SBuf
+ * Avoid errors when parsing manager ACL in old squid.conf
+- rebase squid-config.patch
+- disable pre scriptlet (sed -i '/emulate_httpd_log/d' /etc/{name}/{name}.conf)
+- downgrade to 3.5.x
+ * cause 4.x is Beta, should not have been here
+ * moved 4.x Beta package to server:proxy:Beta
+- fix ChangeLog
+ * remove 4.x ChangeLog Entries
@@ -39,57 +48,0 @@
-
-
--------------------------------------------------------------------
-Tue Oct 27 17:12:19 UTC 2015 - chris(a)computersalat.de
-
-- update to 4.0.1
- * Bug 4329: GCC 5.2 no known conversion for argument
- * Bug 4292: negotiate_wrapper: Unreleased Resources
- * Bug 4269: ignore-must-revalidate broken
- * Bug 4190: assertion 'hash_remove_link' from Auth::User::cacheCleanup
- * Bug 3920: Splay::remove() reference counting inconsistent
- * Bug 3069: CONNECT method bytes sent logging
- * Bug 2741 partial: libsecurity API for GnuTLS support
- * Bug 1961 partial: redesign of URL handling
- * Fix crash when parsing invalid squid.conf
- * Fix eCAP: Return 'unknown body size' for bodies with unknown body sizes
- * Remove unused OS detection: Sun, SysV, Ultrix, BSDi
- * Remove cache_peer_domain directive
- * RFC 6176 compliance: Remove SSLv2 support
- * HTTP/1.1: Remove refresh_pattern ignore-auth and ignore-must-revalidate
- * Remove GCC 2.x and 3.x detection and support
- * C++11 compiler support is now mandatory
- * Enable flexible transport protocol
- * Enable long (--foo) command line parameters on squid binary
- * Add per-rule refresh_pattern matching statistics
- * Replace sslversion=N with tls-min-version=1.N
- * Replace sslproxy_* directives with tls_outgoing_options
- * Replace GNU atomics and related hacks with C++11 std::atomic
- * Replace external_acl_type format %macros with logformat codes
- * Support Ephemeral Elliptic Curve Diffie-Hellman (EECDH) key exchange
- * Support Secure ICAP services
- * Support rotate=N option on access_log
- * Support bypass for non-HTTP intercepted traffic (on_unsupported_protocol)
- * Support lifetime timeout for persistent connections (pconn_lifetime)
- * Support timeout for URL-rewrite helper lookups (url_rewrite_timeout)
- * Support logging fast things (nanosecond log resolution)
- * Support ICAP/eCAP adaptation for 100-continue responses
- * Support configurable helper queue size, with consistent defaults
- and better overflow handling.
- * Support named service PID file by default (pid_filename)
- * url_lfs_rewrite: Add URL-rewriter based on local file existence
- * negotiate_kerberos_auth: output group= kv-pair
- * helper-mux: add man(8) page
- * purge: convert README to man(1) page
- * basic_msnt_multi_domain_auth: Superceeded by basic_smb_lm_auth
- * basic_sspi_auth: fix MinGW compile errors
- * negotiate_sspi_auth: fix various build errors
- * Crypto-NG: libnettle Base64 algorithm support
- * Parser-NG: HTTP Parser structural redesign
- * libltdl: copyright updated to LGPL version 2.1
- * ... and several performance optimizations
- * ... and many documentation changes
- * ... and much code cleanup and polishing
-- fix dependency (C++11)
- * gcc >= 4.7
-- rebase squid-config.patch
-- rebase and fix squid-brokenad.patch
Old:
----
squid-4.0.3.tar.xz
squid-4.0.3.tar.xz.asc
New:
----
squid-3.5.13.tar.xz
squid-3.5.13.tar.xz.asc
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ squid.spec ++++++
--- /var/tmp/diff_new_pack.xkZAQU/_old 2016-01-28 17:23:59.000000000 +0100
+++ /var/tmp/diff_new_pack.xkZAQU/_new 2016-01-28 17:23:59.000000000 +0100
@@ -1,7 +1,7 @@
#
# spec file for package squid
#
-# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2016 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -20,14 +20,14 @@
%define squidconfdir %{_sysconfdir}/squid
Name: squid
-Version: 4.0.3
+Version: 3.5.13
Release: 0
Summary: A fully featured HTTP/1.0 proxy
License: GPL-2.0+
Group: Productivity/Networking/Web/Proxy
-Url: http://www.squid-cache.org/Versions/v4
-Source0: http://www.squid-cache.org/Versions/v4/%{name}-%{version}.tar.xz
-Source1: http://www.squid-cache.org/Versions/v4/%{name}-%{version}.tar.xz.asc
+Url: http://www.squid-cache.org/Versions/v3/3.5
+Source0: http://www.squid-cache.org/Versions/v3/3.5/%{name}-%{version}.tar.xz
+Source1: http://www.squid-cache.org/Versions/v3/3.5/%{name}-%{version}.tar.xz.asc
Source3: squid.init
Source4: squid.sysconfig
@@ -57,7 +57,7 @@
BuildRequires: expat
#
BuildRequires: fdupes
-BuildRequires: gcc-c++ >= 4.7
+BuildRequires: gcc-c++
BuildRequires: krb5-devel
BuildRequires: libcap-devel
BuildRequires: libexpat-devel
@@ -106,20 +106,26 @@
Requires: logrotate
Provides: http_proxy
+# due to package rename
+# Wed Aug 15 17:40:30 UTC 2012
+Provides: %{name}3 = %{version}
+Obsoletes: %{name}3 < %{version}
+
%description
-Squis is a fully-featured HTTP/1.0 proxy which is almost (but not quite - we're getting there!) a fully-featured HTTP/1.1 proxy. Squid offers a rich access control, authorization and logging environment to develop web proxy and content serving applications. Squid offers a rich set of traffic optimization options, most of which are enabled by default for simpler installation and high performance.
+Squid is a fully-featured HTTP/1.0 proxy which is almost (but not quite - we're getting there!) a fully-featured HTTP/1.1 proxy. Squid offers a rich access control, authorization and logging environment to develop web proxy and content serving applications. Squid offers a rich set of traffic optimization options, most of which are enabled by default for simpler installation and high performance.
-Squid 4 represents a new feature release above 3.5.
+Squid 3.5 represents a new feature release above 3.4.
The most important of these new features are:
- Configurable helper queue size
- Helper concurrency channels changes
- SSL support removal
- MSNT-multi-domain helper removal
- Secure ICAP
- Elliptic Curve Diffie-Hellman (ECDH)
- Improved SMP support
+ * Support libecap v1.0
+ * Authentication helper query extensions
+ * Support named services
+ * Upgraded squidclient tool
+ * Helper support for concurrency channels
+ * Native FTP Relay
+ * Receive PROXY protocol, Versions 1 & 2
+ * Basic authentication MSNT helper changes
%prep
%setup -q
@@ -307,12 +313,11 @@
mv %{_sysconfdir}/%{name}.conf %{_sysconfdir}/%{name}/%{name}.conf
fi
fi
-# emulate_httpd_log is gone with 3.5
-if [ -e %{_sysconfdir}/%{name}/%{name}.conf ]; then
- if [ $(grep -c emulate_httpd_log %{_sysconfdir}/%{name}/%{name}.conf) -gt 0 ];then
- sed -i '/emulate_httpd_log/d' %{_sysconfdir}/%{name}/%{name}.conf
- fi
-fi
+# emulate_httpd_log is gone with 3.2 not 3.5
+### rpmlint is complaining about modifying squid.conf
+#if [ -e etc/%{name}/%{name}.conf ]; then
+# sed -i '/emulate_httpd_log/d' /etc/%{name}/%{name}.conf
+#fi
%pretrans -p <lua>
-- Directory to symlink is not working in RPM so workaround it
@@ -435,7 +440,7 @@
%{_sbindir}/digest_edirectory_auth
## will get removed in 3.6 series
# http://www.squid-cache.org/Versions/v3/3.5/RELEASENOTES.html#toc2.8
-#%%{_sbindir}/basic_msnt_multi_domain_auth
+%{_sbindir}/basic_msnt_multi_domain_auth
##
%{_sbindir}/basic_ncsa_auth
%{_sbindir}/basic_nis_auth
@@ -465,7 +470,7 @@
%{_sbindir}/ext_session_acl
%{_sbindir}/ext_unix_group_acl
%{_sbindir}/ext_wbinfo_group_acl
-%{_sbindir}/helper-mux
+%{_sbindir}/helper-mux.pl
%{_sbindir}/log_db_daemon
%{_sbindir}/log_file_daemon
%{_sbindir}/negotiate_kerberos_auth
@@ -485,7 +490,6 @@
%{_sbindir}/unlinkd
%{_sbindir}/url_fake_rewrite
%{_sbindir}/url_fake_rewrite.sh
-%{_sbindir}/url_lfs_rewrite
%if 0%{?suse_version}
%{_sbindir}/rc%{name}
%{_localstatedir}/adm/fillup-templates/sysconfig.%{name}
++++++ squid-4.0.3.tar.xz -> squid-3.5.13.tar.xz ++++++
++++ 165399 lines of diff (skipped)
++++++ squid-4.0.3.tar.xz.asc -> squid-3.5.13.tar.xz.asc ++++++
--- /work/SRC/openSUSE:Factory/squid/squid-4.0.3.tar.xz.asc 2015-12-09 22:34:26.000000000 +0100
+++ /work/SRC/openSUSE:Factory/.squid.new/squid-3.5.13.tar.xz.asc 2016-01-28 17:23:58.000000000 +0100
@@ -1,8 +1,8 @@
-File: squid-4.0.3.tar.xz
-Date: Sat Nov 28 16:16:30 UTC 2015
-Size: 2341200
-MD5 : 1b2c7e775d494993ea260ba959515162
-SHA1: 039396491f13c2da8f20252cce16509ce31ccaf3
+File: squid-3.5.13.tar.xz
+Date: Thu Jan 7 04:33:15 UTC 2016
+Size: 2379460
+MD5 : 7a22503cfc99e1f89cb309b5facfbbc3
+SHA1: 3c45f8a8522c67c633c85c65dbfe63ccaf6df0e8
Key : 0xFF5CF463 <squid3(a)treenet.co.nz>
fingerprint = EA31 CC5E 9488 E516 8D2D CC5E B268 E706 FF5C F463
keyring = http://www.squid-cache.org/pgp.asc
@@ -10,11 +10,11 @@
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1
-iQEcBAABAgAGBQJWWdSjAAoJELJo5wb/XPRjxtQIAMmFTrgiFwNo0gioSaUG7m8l
-7VlewDor+dRzhJ+KYPt0VhLbO8V6KjgoDmp1ISDpnQ3PgQaFP1v0tLLh5pfGRuUf
-rO8OQEowrmxIu/oe9/8Reh3ci1nsT/xXFC1DBWxhVwzy1I081xzmuEDS5s0OqhtE
-PlcyOPmWhT5fYiNfzmdIuJC+3NWW8k82nOtbFlR4vWdjtHWaIaZjgb3MCW3Y2mgb
-1dPSEUDLbB7V70qN8iE9pwh923eRMo7Y6u9ejImxbYzwZVA3kn/bnqyPFCAbYVmg
-D6fPumqfh5wab2Et1csNNK2daxpEelaAFTFX7eEUBLfRWCepDYU1U5KKtUxNaeg=
-=eU8K
+iQEcBAABAgAGBQJWkOegAAoJELJo5wb/XPRjWIcIAK0RQqBz4QcEE6bZba5qLK+l
+T/hoKPMNi2QTjpR4WGIWhuw2YoX9HrWUceP8BZ0HsA9HssAG8Te5du0hjjOHNbxy
+3jMdSchM3KVLw7xlotDsp3CWRzFgYp3UE5Czcvy4vakggGNTPJ7NddgX1dda3ChG
+tl4yDlzOw6hkab4wEGbT0V8/WUbNEWtGFtZNCFdhL1hdtfKBXqtLwSo3/vLxqFJT
+85aQNU5C6bOAiz4LBLhIv7uY81vwIK73zFgGsiY3RBXe0ekC7Q9TvAh5wkejLM/b
+mp4xVXk6ZJXFBggbeUzBVR+OGEl4GhqEwI+6MULTc6DXVE4m5PvpF6wcn5yf9yg=
+=U8vk
-----END PGP SIGNATURE-----
++++++ squid-brokenad.patch ++++++
--- /var/tmp/diff_new_pack.xkZAQU/_old 2016-01-28 17:24:01.000000000 +0100
+++ /var/tmp/diff_new_pack.xkZAQU/_new 2016-01-28 17:24:01.000000000 +0100
@@ -2,7 +2,7 @@
===================================================================
--- helpers/external_acl/kerberos_ldap_group/support_krb5.cc.orig
+++ helpers/external_acl/kerberos_ldap_group/support_krb5.cc
-@@ -80,7 +80,7 @@ k5_error(const char* msg, krb5_error_cod
+@@ -81,7 +81,7 @@ k5_error(const char* msg, krb5_error_cod
* create Kerberos memory cache
*/
int
@@ -10,59 +10,59 @@
+krb5_create_cache(struct main_args *margs, char *domain)
{
- krb5_keytab keytab = NULL;
-@@ -288,8 +288,17 @@ krb5_create_cache(char *domain)
- if (code) {
- k5_error("Error while unparsing principal name",code);
- } else {
-- debug((char *) "%s| %s: DEBUG: Found principal name: %s\n", LogTime(), PROGRAM, principal_name);
-- found = 1;
-+ if (margs->brokenad == 1) {
-+ if (!strncmp(principal_name,"HTTP/",strlen("HTTP/"))==0){
-+ debug((char *) "%s| %s: DEBUG: Found principal without 'HTTP/' service name: %s NOT USING IT\n", LogTime(), PROGRAM, principal_name);
-+ } else {
-+ debug((char *) "%s| %s: DEBUG: Found principal with 'HTTP/' service name: %s\n", LogTime(), PROGRAM, principal_name);
-+ found = 1;
-+ }
+ krb5_keytab keytab = 0;
+@@ -178,8 +178,17 @@ krb5_create_cache(char *domain)
+ if (code) {
+ k5_error("Error while unparsing principal name",code);
+ } else {
+- debug((char *) "%s| %s: DEBUG: Found principal name: %s\n", LogTime(), PROGRAM, principal_name);
+- found = 1;
++ if (margs->brokenad == 1) {
++ if (!strncmp(principal_name,"HTTP/",strlen("HTTP/"))==0){
++ debug((char *) "%s| %s: DEBUG: Found principal without 'HTTP/' service name: %s NOT USING IT\n", LogTime(), PROGRAM, principal_name);
+ } else {
-+ debug((char *) "%s| %s: DEBUG: Found principal name: %s\n", LogTime(), PROGRAM, principal_name);
++ debug((char *) "%s| %s: DEBUG: Found principal with 'HTTP/' service name: %s\n", LogTime(), PROGRAM, principal_name);
+ found = 1;
+ }
- }
++ } else {
++ debug((char *) "%s| %s: DEBUG: Found principal name: %s\n", LogTime(), PROGRAM, principal_name);
++ found = 1;
++ }
}
+ }
#if USE_HEIMDAL_KRB5 || ( HAVE_KRB5_KT_FREE_ENTRY && HAVE_DECL_KRB5_KT_FREE_ENTRY )
Index: helpers/external_acl/kerberos_ldap_group/kerberos_ldap_group.cc
===================================================================
--- helpers/external_acl/kerberos_ldap_group/kerberos_ldap_group.cc.orig
+++ helpers/external_acl/kerberos_ldap_group/kerberos_ldap_group.cc
-@@ -79,6 +79,7 @@ init_args(struct main_args *margs)
+@@ -61,6 +61,7 @@ init_args(struct main_args *margs)
+ margs->rc_allow = 0;
margs->AD = 0;
margs->mdepth = 5;
- margs->nokerberos = 0;
+ margs->brokenad = 0;
margs->ddomain = NULL;
margs->groups = NULL;
margs->ndoms = NULL;
-@@ -202,7 +203,7 @@ main(int argc, char *const argv[])
+@@ -179,7 +180,7 @@ main(int argc, char *const argv[])
init_args(&margs);
-- while (-1 != (opt = getopt(argc, argv, "diasng:D:N:S:u:U:t:T:p:l:b:m:h"))) {
-+ while (-1 != (opt = getopt(argc, argv, "diasnxg:D:N:S:u:U:t:T:p:l:b:m:h"))) {
+- while (-1 != (opt = getopt(argc, argv, "diasg:D:N:S:u:U:t:T:p:l:b:m:h"))) {
++ while (-1 != (opt = getopt(argc, argv, "diasxg:D:N:S:u:U:t:T:p:l:b:m:h"))) {
switch (opt) {
case 'd':
debug_enabled = 1;
-@@ -219,6 +220,9 @@ main(int argc, char *const argv[])
- case 'n':
- margs.nokerberos = 1;
+@@ -231,6 +232,9 @@ main(int argc, char *const argv[])
+ case 'S':
+ margs.llist = xstrdup(optarg);
break;
+ case 'x':
+ margs.brokenad = 1;
+ break;
- case 'g':
- margs.glist = xstrdup(optarg);
- break;
-@@ -274,6 +278,7 @@ main(int argc, char *const argv[])
+ case 'h':
+ fprintf(stderr, "Usage: \n");
+ fprintf(stderr, "squid_kerb_ldap [-d] [-i] -g group list [-D domain] [-N netbios domain map] [-s] [-u ldap user] [-p ldap user password] [-l ldap url] [-b ldap bind path] [-a] [-m max depth] [-h]\n");
+@@ -247,6 +251,7 @@ main(int argc, char *const argv[])
fprintf(stderr, "-l ldap url\n");
fprintf(stderr, "-b ldap bind path\n");
fprintf(stderr, "-s use SSL encryption with Kerberos authentication\n");
@@ -74,18 +74,18 @@
===================================================================
--- helpers/external_acl/kerberos_ldap_group/support.h.orig
+++ helpers/external_acl/kerberos_ldap_group/support.h
-@@ -106,6 +106,7 @@ struct main_args {
+@@ -105,6 +105,7 @@ struct main_args {
+ int rc_allow;
int AD;
int mdepth;
- int nokerberos;
+ int brokenad;
char *ddomain;
struct gdstruct *groups;
struct ndstruct *ndoms;
-@@ -181,7 +182,7 @@ struct kstruct {
- char* mem_ccache[MAX_DOMAINS];
- int ncache;
- };
+@@ -164,7 +165,7 @@ int create_nd(struct main_args *margs);
+ int create_ls(struct main_args *margs);
+
+ #ifdef HAVE_KRB5
-int krb5_create_cache(char *domain);
+int krb5_create_cache(struct main_args *margs, char *domain);
void krb5_cleanup(void);
@@ -95,12 +95,12 @@
===================================================================
--- helpers/external_acl/kerberos_ldap_group/support_ldap.cc.orig
+++ helpers/external_acl/kerberos_ldap_group/support_ldap.cc
-@@ -902,7 +902,7 @@ get_memberof(struct main_args *margs, ch
- kc = 1;
- debug((char *) "%s| %s: DEBUG: Kerberos is disabled. Use username/password with ldap url instead\n", LogTime(), PROGRAM);
- } else {
-- kc = krb5_create_cache(domain);
-+ kc = krb5_create_cache(margs,domain);
- if (kc) {
- error((char *) "%s| %s: ERROR: Error during setup of Kerberos credential cache\n", LogTime(), PROGRAM);
- }
+@@ -898,7 +898,7 @@ get_memberof(struct main_args *margs, ch
+ debug((char *) "%s| %s: DEBUG: Setup Kerberos credential cache\n", LogTime(), PROGRAM);
+
+ #if HAVE_KRB5
+- kc = krb5_create_cache(domain);
++ kc = krb5_create_cache(margs,domain);
+ if (kc) {
+ error((char *) "%s| %s: ERROR: Error during setup of Kerberos credential cache\n", LogTime(), PROGRAM);
+ }
++++++ squid-config.patch ++++++
--- /var/tmp/diff_new_pack.xkZAQU/_old 2016-01-28 17:24:01.000000000 +0100
+++ /var/tmp/diff_new_pack.xkZAQU/_new 2016-01-28 17:24:01.000000000 +0100
@@ -2,7 +2,7 @@
===================================================================
--- src/cf.data.pre.orig
+++ src/cf.data.pre
-@@ -1498,6 +1498,8 @@ http_access deny manager
+@@ -1464,6 +1464,8 @@ http_access deny manager
# Adapt localnet in the ACL section to list your (internal) IP networks
# from where browsing should be allowed
http_access allow localnet
@@ -11,7 +11,7 @@
http_access allow localhost
# And finally deny all other access to this proxy
-@@ -3672,6 +3674,10 @@ DOC_START
+@@ -3761,6 +3763,10 @@ DOC_START
Instead, if you want Squid to use the entire disk drive,
subtract 20% and use that value.
@@ -22,7 +22,7 @@
'L1' is the number of first-level subdirectories which
will be created under the 'Directory'. The default is 16.
-@@ -3790,7 +3796,7 @@ DOC_START
+@@ -3879,7 +3885,7 @@ DOC_START
NOCOMMENT_START
# Uncomment and adjust the following to add a disk cache directory.
@@ -31,7 +31,7 @@
NOCOMMENT_END
DOC_END
-@@ -4504,7 +4510,7 @@ DOC_END
+@@ -4576,7 +4582,7 @@ DOC_END
NAME: logfile_rotate
TYPE: int
@@ -39,4 +39,4 @@
+DEFAULT: 0
LOC: Config.Log.rotateNumber
DOC_START
- Specifies the default number of logfile rotations to make when you
+ Specifies the number of logfile rotations to make when you
1
0
Hello community,
here is the log from the commit of package rubygem-puppet for openSUSE:Factory checked in at 2016-01-28 17:23:13
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/rubygem-puppet (Old)
and /work/SRC/openSUSE:Factory/.rubygem-puppet.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "rubygem-puppet"
Changes:
--------
--- /work/SRC/openSUSE:Factory/rubygem-puppet/rubygem-puppet.changes 2015-12-09 22:33:29.000000000 +0100
+++ /work/SRC/openSUSE:Factory/.rubygem-puppet.new/rubygem-puppet.changes 2016-01-28 17:23:56.000000000 +0100
@@ -1,0 +2,6 @@
+Fri Jan 22 17:15:04 UTC 2016 - kstreitova(a)suse.com
+
+- Update to 3.8.5
+ https://docs.puppetlabs.com/puppet/3.8/reference/release_notes.html#puppet-…
+
+-------------------------------------------------------------------
Old:
----
puppet-3.8.4.gem
New:
----
puppet-3.8.5.gem
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ rubygem-puppet.spec ++++++
--- /var/tmp/diff_new_pack.PLXK0l/_old 2016-01-28 17:23:57.000000000 +0100
+++ /var/tmp/diff_new_pack.PLXK0l/_new 2016-01-28 17:23:57.000000000 +0100
@@ -24,7 +24,7 @@
#
Name: rubygem-puppet
-Version: 3.8.4
+Version: 3.8.5
Release: 0
%define mod_name puppet
%define mod_full_name %{mod_name}-%{version}
++++++ puppet-3.8.4.gem -> puppet-3.8.5.gem ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ext/build_defaults.yaml new/ext/build_defaults.yaml
--- old/ext/build_defaults.yaml 1970-01-01 01:00:00.000000000 +0100
+++ new/ext/build_defaults.yaml 1970-01-01 01:00:00.000000000 +0100
@@ -19,17 +19,17 @@
ref: 'refs/tags/3.8.3'
repo: 'git://github.com/puppetlabs/puppet_for_the_win.git'
facter:
- ref: 'refs/tags/2.4.4'
+ ref: 'refs/tags/2.4.5'
repo: 'git://github.com/puppetlabs/facter.git'
hiera:
ref: 'refs/tags/1.3.4'
repo: 'git://github.com/puppetlabs/hiera.git'
sys:
ref:
- x86: 'refs/tags/1.9.3-p551.6'
- x64: 'refs/tags/2.0.0.9-x64'
+ x86: 'refs/tags/1.9.3-p551.8'
+ x64: 'refs/tags/2.0.0.11-x64'
repo: 'git://github.com/puppetlabs/puppet-win32-ruby.git'
-apt_host: 'apt.puppetlabs.com'
+apt_signing_server: 'apt.puppetlabs.com'
apt_repo_url: 'http://apt.puppetlabs.com'
apt_repo_path: '/opt/repository/incoming'
ips_repo: '/var/pkgrepo'
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lib/puppet/daemon.rb new/lib/puppet/daemon.rb
--- old/lib/puppet/daemon.rb 1970-01-01 01:00:00.000000000 +0100
+++ new/lib/puppet/daemon.rb 1970-01-01 01:00:00.000000000 +0100
@@ -24,6 +24,7 @@
SIGNAL_CHECK_INTERVAL = 5
attr_accessor :agent, :server, :argv
+ attr_reader :signals
def initialize(pidfile, scheduler = Puppet::Scheduler::Scheduler.new())
@scheduler = scheduler
@@ -107,13 +108,21 @@
# Trap a couple of the main signals. This should probably be handled
# in a way that anyone else can register callbacks for traps, but, eh.
def set_signal_traps
- signals = {:INT => :stop, :TERM => :stop }
- # extended signals not supported under windows
- signals.update({:HUP => :restart, :USR1 => :reload, :USR2 => :reopen_logs }) unless Puppet.features.microsoft_windows?
- signals.each do |signal, method|
+ [:INT, :TERM].each do |signal|
Signal.trap(signal) do
- Puppet.notice "Caught #{signal}; storing #{method}"
- @signals << method
+ Puppet.notice "Caught #{signal}; exiting"
+ stop
+ end
+ end
+
+ # extended signals not supported under windows
+ if !Puppet.features.microsoft_windows?
+ signals = {:HUP => :restart, :USR1 => :reload, :USR2 => :reopen_logs }
+ signals.each do |signal, method|
+ Signal.trap(signal) do
+ Puppet.notice "Caught #{signal}; storing #{method}"
+ @signals << method
+ end
end
end
end
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lib/puppet/node.rb new/lib/puppet/node.rb
--- old/lib/puppet/node.rb 1970-01-01 01:00:00.000000000 +0100
+++ new/lib/puppet/node.rb 1970-01-01 01:00:00.000000000 +0100
@@ -18,6 +18,8 @@
::PSON.register_document_type('Node',self)
+ ENVIRONMENT = 'environment'.freeze
+
def self.from_data_hash(data)
raise ArgumentError, "No name provided in serialized data" unless name = data['name']
@@ -58,7 +60,7 @@
if @environment
@environment
else
- if env = parameters["environment"]
+ if env = parameters[ENVIRONMENT]
self.environment = env
elsif environment_name
self.environment = environment_name
@@ -80,6 +82,13 @@
else
@environment = env
end
+
+ # Keep environment_name attribute and parameter in sync if they have been set
+ unless @environment.nil?
+ @parameters[ENVIRONMENT] = @environment.name if @parameters.include?(ENVIRONMENT)
+ self.environment_name = @environment.name if instance_variable_defined?(:@environment_name)
+ end
+ @environment
end
def has_environment_instance?
@@ -129,7 +138,7 @@
@parameters[name] = value unless @parameters.include?(name)
end
- @parameters["environment"] ||= self.environment.name.to_s
+ @parameters[ENVIRONMENT] ||= self.environment.name.to_s
end
# Calculate the list of names we might use for looking
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lib/puppet/pops/evaluator/access_operator.rb new/lib/puppet/pops/evaluator/access_operator.rb
--- old/lib/puppet/pops/evaluator/access_operator.rb 1970-01-01 01:00:00.000000000 +0100
+++ new/lib/puppet/pops/evaluator/access_operator.rb 1970-01-01 01:00:00.000000000 +0100
@@ -39,7 +39,7 @@
fail(Puppet::Pops::Issues::BAD_STRING_SLICE_ARITY, @semantic.left_expr, {:actual => keys.size})
when 1
# Note that Ruby 1.8.7 requires a length of 1 to produce a String
- k1 = coerce_numeric(keys[0], @semantic.keys, scope)
+ k1 = coerce_numeric(keys[0], @semantic.keys[0], scope)
bad_access_key_type(o, 0, k1, Integer) unless k1.is_a?(Integer)
k2 = 1
k1 = k1 < 0 ? o.length + k1 : k1 # abs pos
@@ -50,8 +50,8 @@
o[ k1, k2 ]
end
when 2
- k1 = coerce_numeric(keys[0], @semantic.keys, scope)
- k2 = coerce_numeric(keys[1], @semantic.keys, scope)
+ k1 = coerce_numeric(keys[0], @semantic.keys[0], scope)
+ k2 = coerce_numeric(keys[1], @semantic.keys[1], scope)
[k1, k2].each_with_index { |k,i| bad_access_key_type(o, i, k, Integer) unless k.is_a?(Integer) }
k1 = k1 < 0 ? o.length + k1 : k1 # abs pos (negative is count from end)
@@ -317,6 +317,9 @@
end
ranged_integer = Puppet::Pops::Types::PIntegerType.new()
from, to = keys
+ # NOTE! Do not merge the following line to 4.x. It has the same check in the initialize method
+ raise ArgumentError, "'from' must be less or equal to 'to'. Got (#{from}, #{to}" if from.is_a?(Numeric) && to.is_a?(Numeric) && from > to
+
ranged_integer.from = from == :default ? nil : from
ranged_integer.to = to == :default ? nil : to
ranged_integer
@@ -333,6 +336,9 @@
end
ranged_float = Puppet::Pops::Types::PFloatType.new()
from, to = keys
+ # NOTE! Do not merge the following line to 4.x. It has the same check in the initialize method
+ raise ArgumentError, "'from' must be less or equal to 'to'. Got (#{from}, #{to}" if from.is_a?(Numeric) && to.is_a?(Numeric) && from > to
+
ranged_float.from = from == :default || from.nil? ? nil : Float(from)
ranged_float.to = to == :default || to.nil? ? nil : Float(to)
ranged_float
@@ -428,6 +434,9 @@
end
ranged_integer = Puppet::Pops::Types::PIntegerType.new()
from, to = keys
+ # NOTE! Do not merge the following line to 4.x. It has the same check in the initialize method
+ raise ArgumentError, "'from' must be less or equal to 'to'. Got (#{from}, #{to}" if from.is_a?(Numeric) && to.is_a?(Numeric) && from > to
+
ranged_integer.from = from == :default ? nil : from
ranged_integer.to = to == :default ? nil : to
ranged_integer
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lib/puppet/pops/issues.rb new/lib/puppet/pops/issues.rb
--- old/lib/puppet/pops/issues.rb 1970-01-01 01:00:00.000000000 +0100
+++ new/lib/puppet/pops/issues.rb 1970-01-01 01:00:00.000000000 +0100
@@ -546,6 +546,10 @@
"Resource Override can only operate on resources, got: #{label.label(actual)}"
end
+ DUPLICATE_PARAMETER = hard_issue :DUPLICATE_PARAMETER, :param_name do
+ "The parameter '#{param_name}' is declared more than once in the parameter list"
+ end
+
RESERVED_PARAMETER = hard_issue :RESERVED_PARAMETER, :container, :param_name do
"The parameter $#{param_name} redefines a built in parameter in #{label.the(container)}"
end
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lib/puppet/pops/types/type_calculator.rb new/lib/puppet/pops/types/type_calculator.rb
--- old/lib/puppet/pops/types/type_calculator.rb 1970-01-01 01:00:00.000000000 +0100
+++ new/lib/puppet/pops/types/type_calculator.rb 1970-01-01 01:00:00.000000000 +0100
@@ -1069,11 +1069,7 @@
to = range.to
x = from.nil? ? 1 : from
y = to.nil? ? TheInfinity : to
- if x < y
- [x, y]
- else
- [y, x]
- end
+ [x, y]
end
# @api private
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lib/puppet/pops/types/type_factory.rb new/lib/puppet/pops/types/type_factory.rb
--- old/lib/puppet/pops/types/type_factory.rb 1970-01-01 01:00:00.000000000 +0100
+++ new/lib/puppet/pops/types/type_factory.rb 1970-01-01 01:00:00.000000000 +0100
@@ -17,6 +17,9 @@
# @api public
#
def self.range(from, to)
+ # NOTE! Do not merge the following line to 4.x. It has the same check in the initialize method
+ raise ArgumentError, "'from' must be less or equal to 'to'. Got (#{from}, #{to}" if from.is_a?(Numeric) && to.is_a?(Numeric) && from > to
+
t = Types::PIntegerType.new()
# optimize eq with symbol (faster when it is left)
t.from = from unless (:default == from || from == 'default')
@@ -28,6 +31,9 @@
# @api public
#
def self.float_range(from, to)
+ # NOTE! Do not merge the following line to 4.x. It has the same check in the initialize method
+ raise ArgumentError, "'from' must be less or equal to 'to'. Got (#{from}, #{to}" if from.is_a?(Numeric) && to.is_a?(Numeric) && from > to
+
t = Types::PFloatType.new()
# optimize eq with symbol (faster when it is left)
t.from = Float(from) unless :default == from || from.nil?
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lib/puppet/pops/types/types.rb new/lib/puppet/pops/types/types.rb
--- old/lib/puppet/pops/types/types.rb 1970-01-01 01:00:00.000000000 +0100
+++ new/lib/puppet/pops/types/types.rb 1970-01-01 01:00:00.000000000 +0100
@@ -121,11 +121,7 @@
def range
f = from || NEGATIVE_INFINITY
t = to || INFINITY
- if f < t
- [f, t]
- else
- [t,f]
- end
+ [f, t]
end
# Returns Enumerator if no block is given
@@ -133,11 +129,7 @@
def each
return self.to_enum unless block_given?
return nil if from.nil? || to.nil?
- if to < from
- from.downto(to) {|x| yield x }
- else
- from.upto(to) {|x| yield x }
- end
+ from.upto(to) {|x| yield x }
end
def hash
@@ -212,11 +204,7 @@
return [0, INFINITY] if size_type.nil?
f = size_type.from || 0
t = size_type.to || INFINITY
- if f < t
- [f, t]
- else
- [t,f]
- end
+ [f, t]
end
def hash
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lib/puppet/pops/validation/checker4_0.rb new/lib/puppet/pops/validation/checker4_0.rb
--- old/lib/puppet/pops/validation/checker4_0.rb 1970-01-01 01:00:00.000000000 +0100
+++ new/lib/puppet/pops/validation/checker4_0.rb 1970-01-01 01:00:00.000000000 +0100
@@ -233,6 +233,7 @@
def check_EppExpression(o)
if o.eContainer.is_a?(Puppet::Pops::Model::LambdaExpression)
internal_check_no_capture(o.eContainer, o)
+ internal_check_parameter_name_uniqueness(o.eContainer)
end
end
@@ -327,12 +328,14 @@
def check_HostClassDefinition(o)
check_NamedDefinition(o)
internal_check_no_capture(o)
+ internal_check_parameter_name_uniqueness(o)
internal_check_reserved_params(o)
end
def check_ResourceTypeDefinition(o)
check_NamedDefinition(o)
internal_check_no_capture(o)
+ internal_check_parameter_name_uniqueness(o)
internal_check_reserved_params(o)
end
@@ -366,6 +369,13 @@
end
end
+ def internal_check_parameter_name_uniqueness(o)
+ unique = Set.new
+ o.parameters.each do |p|
+ acceptor.accept(Issues::DUPLICATE_PARAMETER, p, {:param_name => p.name}) unless unique.add?(p.name)
+ end
+ end
+
def check_IfExpression(o)
rvalue(o.test)
end
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lib/puppet/provider/group/windows_adsi.rb new/lib/puppet/provider/group/windows_adsi.rb
--- old/lib/puppet/provider/group/windows_adsi.rb 1970-01-01 01:00:00.000000000 +0100
+++ new/lib/puppet/provider/group/windows_adsi.rb 1970-01-01 01:00:00.000000000 +0100
@@ -39,6 +39,11 @@
return '' if users.nil? or !users.kind_of?(Array)
users = users.map do |user_name|
sid = Puppet::Util::Windows::SID.name_to_sid_object(user_name)
+ if !sid
+ resource.debug("#{user_name} (unresolvable to SID)")
+ next user_name
+ end
+
if sid.account =~ /\\/
account, _ = Puppet::Util::Windows::ADSI::User.parse_name(sid.account)
else
@@ -50,6 +55,10 @@
return users.join(',')
end
+ def member_valid?(user_name)
+ ! Puppet::Util::Windows::SID.name_to_sid_object(user_name).nil?
+ end
+
def group
@group ||= Puppet::Util::Windows::ADSI::Group.new(@resource[:name])
end
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lib/puppet/provider/package/pip.rb new/lib/puppet/provider/package/pip.rb
--- old/lib/puppet/provider/package/pip.rb 1970-01-01 01:00:00.000000000 +0100
+++ new/lib/puppet/provider/package/pip.rb 1970-01-01 01:00:00.000000000 +0100
@@ -3,6 +3,7 @@
require 'puppet/provider/package'
require 'xmlrpc/client'
+require 'puppet/util/http_proxy'
Puppet::Type.type(:package).provide :pip,
:parent => ::Puppet::Provider::Package do
@@ -56,7 +57,16 @@
# cache of PyPI's package list so this operation will always have to
# ask the web service.
def latest
- client = XMLRPC::Client.new2("http://pypi.python.org/pypi")
+ http_proxy_host = Puppet::Util::HttpProxy.http_proxy_host
+ http_proxy_port = Puppet::Util::HttpProxy.http_proxy_port
+ if http_proxy_host && http_proxy_port
+ proxy = "#{http_proxy_host}:#{http_proxy_port}"
+ else
+ # nil is acceptable
+ proxy = http_proxy_host
+ end
+
+ client = XMLRPC::Client.new2("http://pypi.python.org/pypi", proxy)
client.http_header_extra = {"Content-Type" => "text/xml"}
client.timeout = 10
result = client.call("package_releases", @resource[:name])
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lib/puppet/provider/service/launchd.rb new/lib/puppet/provider/service/launchd.rb
--- old/lib/puppet/provider/service/launchd.rb 1970-01-01 01:00:00.000000000 +0100
+++ new/lib/puppet/provider/service/launchd.rb 1970-01-01 01:00:00.000000000 +0100
@@ -205,6 +205,12 @@
# format.
def self.read_plist(path)
begin
+ return Plist::parse_xml(path)
+ rescue ArgumentError => detail
+ Puppet.debug("Error reading #{path}: #{detail}. Retrying with plutil.")
+ end
+
+ begin
Plist::parse_xml(plutil('-convert', 'xml1', '-o', '/dev/stdout', path))
rescue Puppet::ExecutionFailure => detail
Puppet.warning("Cannot read file #{path}; Puppet is skipping it. \n" +
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lib/puppet/provider/service/upstart.rb new/lib/puppet/provider/service/upstart.rb
--- old/lib/puppet/provider/service/upstart.rb 1970-01-01 01:00:00.000000000 +0100
+++ new/lib/puppet/provider/service/upstart.rb 1970-01-01 01:00:00.000000000 +0100
@@ -151,7 +151,11 @@
end
def status
- return super if not is_upstart?
+ if (@resource[:hasstatus] == :false) ||
+ @resource[:status] ||
+ ! is_upstart?
+ return super
+ end
output = status_exec(@resource[:name].split)
if output =~ /start\//
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lib/puppet/resource.rb new/lib/puppet/resource.rb
--- old/lib/puppet/resource.rb 1970-01-01 01:00:00.000000000 +0100
+++ new/lib/puppet/resource.rb 1970-01-01 01:00:00.000000000 +0100
@@ -387,7 +387,7 @@
begin
Puppet::DataBinding.indirection.find(
name,
- :environment => scope.environment.to_s,
+ :environment => scope.environment,
:variables => scope)
rescue Puppet::DataBinding::LookupError => e
raise Puppet::Error.new("Error from DataBinding '#{Puppet[:data_binding_terminus]}' while looking up '#{name}': #{e.message}", e)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lib/puppet/type/group.rb new/lib/puppet/type/group.rb
--- old/lib/puppet/type/group.rb 1970-01-01 01:00:00.000000000 +0100
+++ new/lib/puppet/type/group.rb 1970-01-01 01:00:00.000000000 +0100
@@ -80,7 +80,9 @@
newproperty(:members, :array_matching => :all, :required_features => :manages_members) do
desc "The members of the group. For directory services where group
- membership is stored in the group objects, not the users."
+ membership is stored in the group objects, not the users. Use
+ with auth_membership to determine whether the specified members
+ are inclusive or the minimum."
def change_to_s(currentvalue, newvalue)
currentvalue = currentvalue.join(",") if currentvalue != :absent
@@ -99,16 +101,26 @@
def is_to_s(currentvalue)
if provider.respond_to?(:members_to_s)
currentvalue = '' if currentvalue.nil?
- return provider.members_to_s(currentvalue.split(','))
+ currentvalue = currentvalue.is_a?(Array) ? currentvalue : currentvalue.split(',')
+
+ return provider.members_to_s(currentvalue)
end
super(currentvalue)
end
alias :should_to_s :is_to_s
+
+ validate do |value|
+ if provider.respond_to?(:member_valid?)
+ return provider.member_valid?(value)
+ end
+ end
end
newparam(:auth_membership, :boolean => true, :parent => Puppet::Parameter::Boolean) do
- desc "whether the provider is authoritative for group membership."
+ desc "Whether the provider is authoritative for group membership. This
+ must be set to true to allow setting the group to no members with
+ `members => [],`."
defaultto true
end
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lib/puppet/util/windows/security.rb new/lib/puppet/util/windows/security.rb
--- old/lib/puppet/util/windows/security.rb 1970-01-01 01:00:00.000000000 +0100
+++ new/lib/puppet/util/windows/security.rb 1970-01-01 01:00:00.000000000 +0100
@@ -372,7 +372,10 @@
dacl.allow(well_known_nobody_sid, nobody_allow)
# TODO: system should be first?
- dacl.allow(well_known_system_sid, system_allow)
+ flags = !isdir ? 0 :
+ Puppet::Util::Windows::AccessControlEntry::CONTAINER_INHERIT_ACE |
+ Puppet::Util::Windows::AccessControlEntry::OBJECT_INHERIT_ACE
+ dacl.allow(well_known_system_sid, system_allow, flags)
# add inherit-only aces for child dirs and files that are created within the dir
inherit_only = Puppet::Util::Windows::AccessControlEntry::INHERIT_ONLY_ACE
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lib/puppet/version.rb new/lib/puppet/version.rb
--- old/lib/puppet/version.rb 1970-01-01 01:00:00.000000000 +0100
+++ new/lib/puppet/version.rb 1970-01-01 01:00:00.000000000 +0100
@@ -7,7 +7,7 @@
module Puppet
- PUPPETVERSION = '3.8.4'
+ PUPPETVERSION = '3.8.5'
##
# version is a public API method intended to always provide a fast and
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/metadata new/metadata
--- old/metadata 1970-01-01 01:00:00.000000000 +0100
+++ new/metadata 1970-01-01 01:00:00.000000000 +0100
@@ -1,7 +1,7 @@
--- !ruby/object:Gem::Specification
name: puppet
version: !ruby/object:Gem::Version
- version: 3.8.4
+ version: 3.8.5
prerelease:
platform: ruby
authors:
@@ -9,7 +9,7 @@
autorequire:
bindir: bin
cert_chain: []
-date: 2015-11-03 00:00:00.000000000 Z
+date: 2016-01-21 00:00:00.000000000 Z
dependencies:
- !ruby/object:Gem::Dependency
name: facter
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/spec/integration/util/windows/security_spec.rb new/spec/integration/util/windows/security_spec.rb
--- old/spec/integration/util/windows/security_spec.rb 1970-01-01 01:00:00.000000000 +0100
+++ new/spec/integration/util/windows/security_spec.rb 1970-01-01 01:00:00.000000000 +0100
@@ -237,6 +237,24 @@
system_aces.each do |ace|
ace.mask.should == klass::FILE_ALL_ACCESS && ! ace.inherited?
end
+
+ if Puppet::FileSystem.directory?(path)
+ system_aces.each do |ace|
+ ace.object_inherit?.should be_true
+ ace.container_inherit?.should be_true
+ end
+
+ # it's critically important that this file be default created
+ # and that this file not have it's owner / group / mode set by winsec
+ nested_file = File.join(path, 'nested_file')
+ File.new(nested_file, 'w').close
+
+ system_aces = winsec.get_aces_for_path_by_sid(nested_file, sids[:system])
+ # even when SYSTEM is the owner (in CI), there should be an inherited SYSTEM
+ system_aces.any? do |ace|
+ ace.mask == klass::FILE_ALL_ACCESS && ace.inherited?
+ end.should be_true
+ end
end
describe "for modes that require deny aces" do
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/spec/unit/daemon_spec.rb new/spec/unit/daemon_spec.rb
--- old/spec/unit/daemon_spec.rb 1970-01-01 01:00:00.000000000 +0100
+++ new/spec/unit/daemon_spec.rb 1970-01-01 01:00:00.000000000 +0100
@@ -47,15 +47,24 @@
let(:server) { stub("Server", :start => nil, :wait_for_shutdown => nil) }
describe "when setting signal traps" do
- signals = {:INT => :stop, :TERM => :stop }
- signals.update({:HUP => :restart, :USR1 => :reload, :USR2 => :reopen_logs}) unless Puppet.features.microsoft_windows?
- signals.each do |signal, method|
- it "should log and call #{method} when it receives #{signal}" do
- Signal.expects(:trap).with(signal).yields
+ [:INT, :TERM].each do |signal|
+ it "logs a notice and exits when sent #{signal}" do
+ Signal.stubs(:trap).with(signal).yields
+ Puppet.expects(:notice).with("Caught #{signal}; exiting")
+ daemon.expects(:stop)
- Puppet.expects(:notice)
+ daemon.set_signal_traps
+ end
+ end
+
+ {:HUP => :restart, :USR1 => :reload, :USR2 => :reopen_logs}.each do |signal, method|
+ it "logs a notice and remembers to call #{method} when it receives #{signal}" do
+ Signal.stubs(:trap).with(signal).yields
+ Puppet.expects(:notice).with("Caught #{signal}; storing #{method}")
daemon.set_signal_traps
+
+ expect(daemon.signals).to eq([method])
end
end
end
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/spec/unit/node_spec.rb new/spec/unit/node_spec.rb
--- old/spec/unit/node_spec.rb 1970-01-01 01:00:00.000000000 +0100
+++ new/spec/unit/node_spec.rb 1970-01-01 01:00:00.000000000 +0100
@@ -48,6 +48,14 @@
node.parameters["environment"] = :bar
node.environment.name.should == :bar
end
+
+ it "should allow its environment parameter to be set by attribute after initialization" do
+ node = Puppet::Node.new("foo", { :parameters => { 'environment' => :foo } })
+ node.environment_name = :foo
+ node.environment = :bar
+ expect(node.environment_name).to eq(:bar)
+ expect(node.parameters['environment']).to eq(:bar)
+ end
end
it "can survive a round-trip through YAML" do
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/spec/unit/pops/evaluator/access_ops_spec.rb new/spec/unit/pops/evaluator/access_ops_spec.rb
--- old/spec/unit/pops/evaluator/access_ops_spec.rb 1970-01-01 01:00:00.000000000 +0100
+++ new/spec/unit/pops/evaluator/access_ops_spec.rb 1970-01-01 01:00:00.000000000 +0100
@@ -123,9 +123,9 @@
expect(evaluate(expr)).to eql(range(1,1))
end
- it 'produces an Integer[from, <from]' do
+ it 'gives an error for Integer[from, <from]' do
expr = fqr('Integer')[1,0]
- expect(evaluate(expr)).to eql(range(1,0))
+ expect{evaluate(expr)}.to raise_error(/'from' must be less or equal to 'to'/)
end
it 'produces an error for Integer[] if there are more than 2 keys' do
@@ -154,9 +154,9 @@
expect(evaluate(expr)).to eql(float_range(1.0,1.0))
end
- it 'produces a Float[from, <from]' do
+ it 'gives an error for Float[from, <from]' do
expr = fqr('Float')[1.0,0.0]
- expect(evaluate(expr)).to eql(float_range(1.0,0.0))
+ expect{evaluate(expr)}.to raise_error(/'from' must be less or equal to 'to'/)
end
it 'produces an error for Float[] if there are more than 2 keys' do
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/spec/unit/pops/parser/parser_rspec_helper.rb new/spec/unit/pops/parser/parser_rspec_helper.rb
--- old/spec/unit/pops/parser/parser_rspec_helper.rb 1970-01-01 01:00:00.000000000 +0100
+++ new/spec/unit/pops/parser/parser_rspec_helper.rb 1970-01-01 01:00:00.000000000 +0100
@@ -8,4 +8,9 @@
parser = Puppet::Pops::Parser::Parser.new()
parser.parse_string(code)
end
+
+ def parse_epp(code)
+ parser = Puppet::Pops::Parser::EppParser.new()
+ parser.parse_string(code)
+ end
end
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/spec/unit/pops/validator/validator_spec.rb new/spec/unit/pops/validator/validator_spec.rb
--- old/spec/unit/pops/validator/validator_spec.rb 1970-01-01 01:00:00.000000000 +0100
+++ new/spec/unit/pops/validator/validator_spec.rb 1970-01-01 01:00:00.000000000 +0100
@@ -177,6 +177,18 @@
end
end
+ context 'for parameter names' do
+ ['class', 'define'].each do |word|
+ it "should require that #{word} parameter names are unique" do
+ expect(validate(parse("#{word} foo($a = 10, $a = 20) {}"))).to have_issue(Puppet::Pops::Issues::DUPLICATE_PARAMETER)
+ end
+ end
+
+ it "should require that template parameter names are unique" do
+ expect(validate(parse_epp("<%-| $a, $a |-%><%= $a == doh %>"))).to have_issue(Puppet::Pops::Issues::DUPLICATE_PARAMETER)
+ end
+ end
+
context 'for reserved parameter names' do
['name', 'title'].each do |word|
it "produces an error when $#{word} is used as a parameter in a class" do
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/spec/unit/provider/group/windows_adsi_spec.rb new/spec/unit/provider/group/windows_adsi_spec.rb
--- old/spec/unit/provider/group/windows_adsi_spec.rb 1970-01-01 01:00:00.000000000 +0100
+++ new/spec/unit/provider/group/windows_adsi_spec.rb 1970-01-01 01:00:00.000000000 +0100
@@ -35,11 +35,13 @@
let(:user1) { stub(:account => 'user1', :domain => '.', :to_s => 'user1sid') }
let(:user2) { stub(:account => 'user2', :domain => '.', :to_s => 'user2sid') }
let(:user3) { stub(:account => 'user3', :domain => '.', :to_s => 'user3sid') }
+ let(:invalid_user) { SecureRandom.uuid }
before :each do
Puppet::Util::Windows::SID.stubs(:name_to_sid_object).with('user1').returns(user1)
Puppet::Util::Windows::SID.stubs(:name_to_sid_object).with('user2').returns(user2)
Puppet::Util::Windows::SID.stubs(:name_to_sid_object).with('user3').returns(user3)
+ Puppet::Util::Windows::SID.stubs(:name_to_sid_object).with(invalid_user).returns(nil)
end
describe "#members_insync?" do
@@ -123,6 +125,9 @@
it "should return a user string like DOMAIN\\USER,DOMAIN2\\USER2" do
provider.members_to_s(['user1', 'user2']).should == '.\user1,.\user2'
end
+ it "should return the username when it cannot be resolved to a SID (for the sake of resource_harness error messages)" do
+ expect(provider.members_to_s([invalid_user])).to eq("#{invalid_user}")
+ end
end
end
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/spec/unit/provider/package/pip_spec.rb new/spec/unit/provider/package/pip_spec.rb
--- old/spec/unit/provider/package/pip_spec.rb 1970-01-01 01:00:00.000000000 +0100
+++ new/spec/unit/provider/package/pip_spec.rb 1970-01-01 01:00:00.000000000 +0100
@@ -12,7 +12,6 @@
@client = stub_everything('client')
@client.stubs(:call).with('package_releases', 'real_package').returns(["1.3", "1.2.5", "1.2.4"])
@client.stubs(:call).with('package_releases', 'fake_package').returns([])
- XMLRPC::Client.stubs(:new2).returns(@client)
end
describe "parse" do
@@ -118,23 +117,53 @@
end
describe "latest" do
+ context "connecting directly" do
- it "should find a version number for real_package" do
- @resource[:name] = "real_package"
- @provider.latest.should_not == nil
- end
+ before :each do
+ XMLRPC::Client.expects(:new2).with("http://pypi.python.org/pypi", nil).returns(@client)
+ end
- it "should not find a version number for fake_package" do
- @resource[:name] = "fake_package"
- @provider.latest.should == nil
- end
+ it "should find a version number for real_package" do
+ @resource[:name] = "real_package"
+ @provider.latest.should_not == nil
+ end
+
+ it "should not find a version number for fake_package" do
+ @resource[:name] = "fake_package"
+ @provider.latest.should == nil
+ end
+
+ it "should handle a timeout gracefully" do
+ @resource[:name] = "fake_package"
+ @client.stubs(:call).raises(Timeout::Error)
+ lambda { @provider.latest }.should raise_error(Puppet::Error)
+ end
- it "should handle a timeout gracefully" do
- @resource[:name] = "fake_package"
- @client.stubs(:call).raises(Timeout::Error)
- lambda { @provider.latest }.should raise_error(Puppet::Error)
end
+ context "connecting via a proxy" do
+ before :each do
+ Puppet::Util::HttpProxy.expects(:http_proxy_host).returns 'some_host'
+ Puppet::Util::HttpProxy.expects(:http_proxy_port).returns 'some_port'
+ XMLRPC::Client.expects(:new2).with("http://pypi.python.org/pypi", "some_host:some_port").returns(@client)
+ end
+
+ it "should find a version number for real_package" do
+ @resource[:name] = "real_package"
+ @provider.latest.should_not == nil
+ end
+
+ it "should not find a version number for fake_package" do
+ @resource[:name] = "fake_package"
+ @provider.latest.should == nil
+ end
+
+ it "should handle a timeout gracefully" do
+ @resource[:name] = "fake_package"
+ @client.stubs(:call).raises(Timeout::Error)
+ lambda { @provider.latest }.should raise_error(Puppet::Error)
+ end
+ end
end
describe "install" do
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/spec/unit/provider/service/launchd_spec.rb new/spec/unit/provider/service/launchd_spec.rb
--- old/spec/unit/provider/service/launchd_spec.rb 1970-01-01 01:00:00.000000000 +0100
+++ new/spec/unit/provider/service/launchd_spec.rb 1970-01-01 01:00:00.000000000 +0100
@@ -274,6 +274,7 @@
}
end
let(:busted_plist_path) { '/Library/LaunchAgents/org.busted.plist' }
+ let(:binary_plist_path) { '/Library/LaunchAgents/org.binary.plist' }
it "[17624] should warn that the plist in question is being skipped" do
provider.expects(:launchd_paths).returns(['/Library/LaunchAgents'])
@@ -284,6 +285,8 @@
end
it "[15929] should skip plists that plutil cannot read" do
+ Plist.expects(:parse_xml).with(busted_plist_path).raises(ArgumentError, 'boom')
+ Puppet.expects(:debug).with("Error reading #{busted_plist_path}: boom. Retrying with plutil.")
provider.expects(:plutil).with('-convert', 'xml1', '-o', '/dev/stdout',
busted_plist_path).raises(Puppet::ExecutionFailure, 'boom')
Puppet.expects(:warning).with("Cannot read file #{busted_plist_path}; " +
@@ -291,6 +294,14 @@
"Details: boom")
provider.read_plist(busted_plist_path)
end
+
+ it "should read binary plists with plutil" do
+ Plist.expects(:parse_xml).with(binary_plist_path).raises(ArgumentError, 'boom')
+ Puppet.expects(:debug).with("Error reading #{binary_plist_path}: boom. Retrying with plutil.")
+ provider.expects(:plutil).with('-convert', 'xml1', '-o', '/dev/stdout', binary_plist_path).returns('plist')
+ Plist.expects(:parse_xml).with('plist').returns('plist_map')
+ expect(provider.read_plist(binary_plist_path)).to eq('plist_map')
+ end
end
it "should return the cached value when available" do
provider.instance_variable_set(:@label_to_path_map, {'xx'=>'yy'})
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/spec/unit/provider/service/upstart_spec.rb new/spec/unit/provider/service/upstart_spec.rb
--- old/spec/unit/provider/service/upstart_spec.rb 1970-01-01 01:00:00.000000000 +0100
+++ new/spec/unit/provider/service/upstart_spec.rb 1970-01-01 01:00:00.000000000 +0100
@@ -100,6 +100,63 @@
provider.status.should == :running
end
+ describe "when a special status command is specifed" do
+ it "should use the provided status command" do
+ resource = Puppet::Type.type(:service).new(:name => 'foo', :provider => :upstart, :status => '/bin/foo')
+ provider = provider_class.new(resource)
+ provider.stubs(:is_upstart?).returns(true)
+
+ provider.expects(:status_exec).with(['foo']).never
+ provider.expects(:execute).with(['/bin/foo'], :failonfail => false, :override_locale => false, :squelch => false, :combine => true)
+ Process::Status.any_instance.stubs(:exitstatus).returns(0)
+ provider.status
+ end
+
+ it "should return :stopped when the provided status command return non-zero" do
+ resource = Puppet::Type.type(:service).new(:name => 'foo', :provider => :upstart, :status => '/bin/foo')
+ provider = provider_class.new(resource)
+ provider.stubs(:is_upstart?).returns(true)
+
+ provider.expects(:status_exec).with(['foo']).never
+ provider.expects(:execute).with(['/bin/foo'], :failonfail => false, :override_locale => false, :squelch => false, :combine => true)
+ $CHILD_STATUS.stubs(:exitstatus).returns 1
+ provider.status.should == :stopped
+ end
+
+ it "should return :running when the provided status command return zero" do
+ resource = Puppet::Type.type(:service).new(:name => 'foo', :provider => :upstart, :status => '/bin/foo')
+ provider = provider_class.new(resource)
+ provider.stubs(:is_upstart?).returns(true)
+
+ provider.expects(:status_exec).with(['foo']).never
+ provider.expects(:execute).with(['/bin/foo'], :failonfail => false, :override_locale => false, :squelch => false, :combine => true)
+ $CHILD_STATUS.stubs(:exitstatus).returns 0
+ provider.status.should == :running
+ end
+ end
+
+ describe "when :hasstatus is set to false" do
+ it "should return :stopped if the pid can not be found" do
+ resource = Puppet::Type.type(:service).new(:name => 'foo', :hasstatus => false, :provider => :upstart)
+ provider = provider_class.new(resource)
+ provider.stubs(:is_upstart?).returns(true)
+
+ provider.expects(:status_exec).with(['foo']).never
+ provider.expects(:getpid).returns nil
+ provider.status.should == :stopped
+ end
+
+ it "should return :running if the pid can be found" do
+ resource = Puppet::Type.type(:service).new(:name => 'foo', :hasstatus => false, :provider => :upstart)
+ provider = provider_class.new(resource)
+ provider.stubs(:is_upstart?).returns(true)
+
+ provider.expects(:status_exec).with(['foo']).never
+ provider.expects(:getpid).returns 2706
+ provider.status.should == :running
+ end
+ end
+
it "should properly handle services with 'start' in their name" do
resource = Puppet::Type.type(:service).new(:name => "foostartbar", :provider => :upstart)
provider = provider_class.new(resource)
1
0
Hello community,
here is the log from the commit of package rubygem-puppet-syntax for openSUSE:Factory checked in at 2016-01-28 17:23:11
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/rubygem-puppet-syntax (Old)
and /work/SRC/openSUSE:Factory/.rubygem-puppet-syntax.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "rubygem-puppet-syntax"
Changes:
--------
--- /work/SRC/openSUSE:Factory/rubygem-puppet-syntax/rubygem-puppet-syntax.changes 2015-05-16 07:14:45.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.rubygem-puppet-syntax.new/rubygem-puppet-syntax.changes 2016-01-28 17:23:55.000000000 +0100
@@ -1,0 +2,11 @@
+Fri Jan 22 17:46:06 UTC 2016 - kstreitova(a)suse.com
+
+- Version bump 2.1.0
+ * Support Puppet 4. Many thanks to @DavidS
+ * Support validation of EPP templates. Thanks to @trlinkin
+ * Test improvements and refactoring, including Travis CI tests against Puppet 4. Thanks to @trlinkin
+ * Don't error when a tag metaparameter is present. Thank you @dhardy92
+ * Report the filename of invalid hiera data files. Thanks @danzilio
+- run spec-cleaner
+
+-------------------------------------------------------------------
Old:
----
puppet-syntax-2.0.0.gem
New:
----
puppet-syntax-2.1.0.gem
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ rubygem-puppet-syntax.spec ++++++
--- /var/tmp/diff_new_pack.vmxVW4/_old 2016-01-28 17:23:56.000000000 +0100
+++ /var/tmp/diff_new_pack.vmxVW4/_new 2016-01-28 17:23:56.000000000 +0100
@@ -1,7 +1,7 @@
#
# spec file for package rubygem-puppet-syntax
#
-# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -15,20 +15,21 @@
# Please submit bugfixes or comments via http://bugs.opensuse.org/
#
-Name: rubygem-puppet-syntax
-Version: 2.0.0
-Release: 0
+
%define mod_name puppet-syntax
%define mod_full_name %{mod_name}-%{version}
-BuildRoot: %{_tmppath}/%{name}-%{version}-build
-BuildRequires: ruby-macros >= 5
-BuildRequires: %{ruby}
-BuildRequires: %{rubygem gem2rpm}
-Url: https://github.com/gds-operations/puppet-syntax
-Source: http://rubygems.org/gems/%{mod_full_name}.gem
+Name: rubygem-puppet-syntax
+Version: 2.1.0
+Release: 0
Summary: Syntax checks for Puppet manifests, templates, and Hiera YAML
License: MIT
Group: Development/Languages/Ruby
+Url: https://github.com/gds-operations/puppet-syntax
+Source: http://rubygems.org/gems/%{mod_full_name}.gem
+BuildRequires: %{rubygem gem2rpm}
+BuildRequires: %{ruby}
+BuildRequires: ruby-macros >= 5
+BuildRoot: %{_tmppath}/%{name}-%{version}-build
%description
Syntax checks for Puppet manifests and templates.
++++++ puppet-syntax-2.0.0.gem -> puppet-syntax-2.1.0.gem ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/.travis.yml new/.travis.yml
--- old/.travis.yml 1970-01-01 01:00:00.000000000 +0100
+++ new/.travis.yml 1970-01-01 01:00:00.000000000 +0100
@@ -1,15 +1,27 @@
---
language: ruby
+# Workaround https://github.com/bundler/bundler/issues/3558
+before_install: gem install bundler
script: bundle exec rake
rvm:
- 1.9.3
+ - 2.1.6
env:
- PUPPET_VERSION="~> 3.0.0"
- PUPPET_VERSION="~> 3.1.0"
- PUPPET_VERSION="~> 3.2.0"
- PUPPET_VERSION="~> 3.4.0"
- PUPPET_VERSION="~> 3.7.3"
+ - PUPPET_VERSION="~> 4.2.0"
+ - PUPPET_VERSION="~> 4.3.0"
- PUPPET_VERSION=">= 0"
matrix:
+ exclude:
+ - rvm: 2.1.6
+ env: PUPPET_VERSION="~> 3.2.0"
+ - rvm: 2.1.6
+ env: PUPPET_VERSION="~> 3.1.0"
+ - rvm: 2.1.6
+ env: PUPPET_VERSION="~> 3.0.0"
allow_failures:
- env: PUPPET_VERSION=">= 0"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/CHANGELOG new/CHANGELOG
--- old/CHANGELOG 1970-01-01 01:00:00.000000000 +0100
+++ new/CHANGELOG 1970-01-01 01:00:00.000000000 +0100
@@ -1,3 +1,10 @@
+2016-01-18 Release 2.1.0
+- Support Puppet 4. Many thanks to @DavidS
+- Support validation of EPP templates. Thanks to @trlinkin
+- Test improvements and refactoring, including Travis CI tests against Puppet 4. Thanks to @trlinkin
+- Don't error when a tag metaparameter is present. Thank you @dhardy92
+- Report the filename of invalid hiera data files. Thanks @danzilio
+
2015-02-25 Release 2.0.0
- Removed support for Puppet version 2.7.x
- New option, fail_on_deprecation_notices, which defaults to true (compatible
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lib/puppet-syntax/hiera.rb new/lib/puppet-syntax/hiera.rb
--- old/lib/puppet-syntax/hiera.rb 1970-01-01 01:00:00.000000000 +0100
+++ new/lib/puppet-syntax/hiera.rb 1970-01-01 01:00:00.000000000 +0100
@@ -11,7 +11,7 @@
begin
YAML.load_file(hiera_file)
rescue Exception => error
- errors << error
+ errors << "ERROR: Failed to parse #{hiera_file}: #{error}"
end
end
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lib/puppet-syntax/manifests.rb new/lib/puppet-syntax/manifests.rb
--- old/lib/puppet-syntax/manifests.rb 1970-01-01 01:00:00.000000000 +0100
+++ new/lib/puppet-syntax/manifests.rb 1970-01-01 01:00:00.000000000 +0100
@@ -36,6 +36,11 @@
e =~ /^You cannot collect( exported resources)? without storeconfigs being set/
}
+ # tag parameter in class raise warnings notice in output that prevent from succeed
+ output.reject! { |e|
+ e =~ /^tag is a metaparam; this value will inherit to all contained resources in the /
+ }
+
deprecations = output.select { |e|
e =~ /^Deprecation notice:|is deprecated/
}
@@ -48,7 +53,7 @@
private
def validate_manifest(file)
- Puppet[:parser] = 'future' if PuppetSyntax.future_parser
+ Puppet[:parser] = 'future' if PuppetSyntax.future_parser and Puppet::PUPPETVERSION.to_i < 4
Puppet::Face[:parser, :current].validate(file)
end
end
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lib/puppet-syntax/tasks/puppet-syntax.rb new/lib/puppet-syntax/tasks/puppet-syntax.rb
--- old/lib/puppet-syntax/tasks/puppet-syntax.rb 1970-01-01 01:00:00.000000000 +0100
+++ new/lib/puppet-syntax/tasks/puppet-syntax.rb 1970-01-01 01:00:00.000000000 +0100
@@ -30,6 +30,12 @@
desc 'Syntax check Puppet manifests'
task :manifests do |t|
+ if Puppet::PUPPETVERSION.to_i >= 4 and PuppetSyntax.future_parser
+ info <<-EOS
+[INFO] Puppet 4 has been detected and `future_parser` has been set to
+'true'. The `future_parser setting will be ignored.
+ EOS
+ end
$stderr.puts "---> #{t.name}"
files = FileList["**/*.pp"]
files.reject! { |f| File.directory?(f) }
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lib/puppet-syntax/templates.rb new/lib/puppet-syntax/templates.rb
--- old/lib/puppet-syntax/templates.rb 1970-01-01 01:00:00.000000000 +0100
+++ new/lib/puppet-syntax/templates.rb 1970-01-01 01:00:00.000000000 +0100
@@ -1,4 +1,5 @@
require 'erb'
+require 'puppet'
require 'stringio'
module PuppetSyntax
@@ -10,19 +11,11 @@
$stderr = warnings = StringIO.new()
errors = []
- filelist.each do |erb_file|
- begin
- erb = ERB.new(File.read(erb_file), nil, '-')
- erb.filename = erb_file
- erb.result
- rescue NameError
- # This is normal because we don't have the variables that would
- # ordinarily be bound by the parent Puppet manifest.
- rescue TypeError
- # This is normal because we don't have the variables that would
- # ordinarily be bound by the parent Puppet manifest.
- rescue SyntaxError => error
- errors << error
+ filelist.each do |file|
+ if File.extname(file) == '.epp' or PuppetSyntax.epp_only
+ errors.concat validate_epp(file)
+ else
+ errors.concat validate_erb(file)
end
end
@@ -32,5 +25,42 @@
errors
end
+
+ def validate_epp(filename)
+ if Puppet::PUPPETVERSION.to_i < 4
+ raise "Cannot validate EPP without Puppet 4"
+ end
+
+ require 'puppet/pops'
+ errors = []
+ begin
+ parser = Puppet::Pops::Parser::EvaluatingParser::EvaluatingEppParser.new()
+ parser.parse_file(filename)
+ rescue => detail
+ errors << detail
+ end
+
+ errors
+ end
+
+ def validate_erb(filename)
+ errors = []
+
+ begin
+ erb = ERB.new(File.read(filename), nil, '-')
+ erb.filename = filename
+ erb.result
+ rescue NameError => error
+ # This is normal because we don't have the variables that would
+ # ordinarily be bound by the parent Puppet manifest.
+ rescue TypeError
+ # This is normal because we don't have the variables that would
+ # ordinarily be bound by the parent Puppet manifest.
+ rescue SyntaxError => error
+ errors << error
+ end
+
+ errors
+ end
end
end
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lib/puppet-syntax/version.rb new/lib/puppet-syntax/version.rb
--- old/lib/puppet-syntax/version.rb 1970-01-01 01:00:00.000000000 +0100
+++ new/lib/puppet-syntax/version.rb 1970-01-01 01:00:00.000000000 +0100
@@ -1,3 +1,3 @@
module PuppetSyntax
- VERSION = "2.0.0"
+ VERSION = "2.1.0"
end
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lib/puppet-syntax.rb new/lib/puppet-syntax.rb
--- old/lib/puppet-syntax.rb 1970-01-01 01:00:00.000000000 +0100
+++ new/lib/puppet-syntax.rb 1970-01-01 01:00:00.000000000 +0100
@@ -10,6 +10,6 @@
@fail_on_deprecation_notices = true
class << self
- attr_accessor :exclude_paths, :future_parser, :hieradata_paths, :fail_on_deprecation_notices
+ attr_accessor :exclude_paths, :future_parser, :hieradata_paths, :fail_on_deprecation_notices, :epp_only
end
end
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/metadata new/metadata
--- old/metadata 1970-01-01 01:00:00.000000000 +0100
+++ new/metadata 1970-01-01 01:00:00.000000000 +0100
@@ -1,7 +1,7 @@
--- !ruby/object:Gem::Specification
name: puppet-syntax
version: !ruby/object:Gem::Version
- version: 2.0.0
+ version: 2.1.0
prerelease:
platform: ruby
authors:
@@ -9,7 +9,7 @@
autorequire:
bindir: bin
cert_chain: []
-date: 2015-02-26 00:00:00.000000000 Z
+date: 2016-01-18 00:00:00.000000000 Z
dependencies:
- !ruby/object:Gem::Dependency
name: rake
@@ -90,9 +90,14 @@
- spec/fixtures/test_module/manifests/future_syntax.pp
- spec/fixtures/test_module/manifests/pass.pp
- spec/fixtures/test_module/manifests/pass_storeconfigs.pp
+- spec/fixtures/test_module/manifests/tag_notice.pp
+- spec/fixtures/test_module/templates/fail_error.epp
- spec/fixtures/test_module/templates/fail_error.erb
+- spec/fixtures/test_module/templates/fail_error_also.epp
- spec/fixtures/test_module/templates/fail_warning.erb
+- spec/fixtures/test_module/templates/pass.epp
- spec/fixtures/test_module/templates/pass.erb
+- spec/fixtures/test_module/templates/pass_also.epp
- spec/fixtures/test_module/templates/pass_unbound_var.erb
- spec/fixtures/test_module/templates/typeerror_shouldwin.erb
- spec/puppet-syntax/hiera_spec.rb
@@ -116,7 +121,7 @@
version: '0'
segments:
- 0
- hash: 2080509366784508245
+ hash: 1512611786751491860
required_rubygems_version: !ruby/object:Gem::Requirement
none: false
requirements:
@@ -125,7 +130,7 @@
version: '0'
segments:
- 0
- hash: 2080509366784508245
+ hash: 1512611786751491860
requirements: []
rubyforge_project:
rubygems_version: 1.8.23.2
@@ -142,9 +147,14 @@
- spec/fixtures/test_module/manifests/future_syntax.pp
- spec/fixtures/test_module/manifests/pass.pp
- spec/fixtures/test_module/manifests/pass_storeconfigs.pp
+- spec/fixtures/test_module/manifests/tag_notice.pp
+- spec/fixtures/test_module/templates/fail_error.epp
- spec/fixtures/test_module/templates/fail_error.erb
+- spec/fixtures/test_module/templates/fail_error_also.epp
- spec/fixtures/test_module/templates/fail_warning.erb
+- spec/fixtures/test_module/templates/pass.epp
- spec/fixtures/test_module/templates/pass.erb
+- spec/fixtures/test_module/templates/pass_also.epp
- spec/fixtures/test_module/templates/pass_unbound_var.erb
- spec/fixtures/test_module/templates/typeerror_shouldwin.erb
- spec/puppet-syntax/hiera_spec.rb
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/spec/fixtures/test_module/manifests/tag_notice.pp new/spec/fixtures/test_module/manifests/tag_notice.pp
--- old/spec/fixtures/test_module/manifests/tag_notice.pp 1970-01-01 01:00:00.000000000 +0100
+++ new/spec/fixtures/test_module/manifests/tag_notice.pp 1970-01-01 01:00:00.000000000 +0100
@@ -0,0 +1,5 @@
+class tag_parameter_test ($tag=undef){
+ notify { 'tag_should pass':
+ message => 'with flying colours',
+ }
+}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/spec/fixtures/test_module/templates/fail_error.epp new/spec/fixtures/test_module/templates/fail_error.epp
--- old/spec/fixtures/test_module/templates/fail_error.epp 1970-01-01 01:00:00.000000000 +0100
+++ new/spec/fixtures/test_module/templates/fail_error.epp 1970-01-01 01:00:00.000000000 +0100
@@ -0,0 +1,3 @@
+This is plain text
+<% This is not valid EPP %>
+This is also plain text
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/spec/fixtures/test_module/templates/fail_error_also.epp new/spec/fixtures/test_module/templates/fail_error_also.epp
--- old/spec/fixtures/test_module/templates/fail_error_also.epp 1970-01-01 01:00:00.000000000 +0100
+++ new/spec/fixtures/test_module/templates/fail_error_also.epp 1970-01-01 01:00:00.000000000 +0100
@@ -0,0 +1,3 @@
+This is plain text
+<% } %>
+This is also plain text
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/spec/fixtures/test_module/templates/pass.epp new/spec/fixtures/test_module/templates/pass.epp
--- old/spec/fixtures/test_module/templates/pass.epp 1970-01-01 01:00:00.000000000 +0100
+++ new/spec/fixtures/test_module/templates/pass.epp 1970-01-01 01:00:00.000000000 +0100
@@ -0,0 +1,3 @@
+<%# VALID COMMENT %>
+<% $valid = 'valid' -%>
+This is a <%= $valid %> template.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/spec/fixtures/test_module/templates/pass_also.epp new/spec/fixtures/test_module/templates/pass_also.epp
--- old/spec/fixtures/test_module/templates/pass_also.epp 1970-01-01 01:00:00.000000000 +0100
+++ new/spec/fixtures/test_module/templates/pass_also.epp 1970-01-01 01:00:00.000000000 +0100
@@ -0,0 +1,3 @@
+<%# VALID COMMENT %>
+<% $valid = 'valid' -%>
+This is a <%= $valid %> template.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/spec/puppet-syntax/hiera_spec.rb new/spec/puppet-syntax/hiera_spec.rb
--- old/spec/puppet-syntax/hiera_spec.rb 1970-01-01 01:00:00.000000000 +0100
+++ new/spec/puppet-syntax/hiera_spec.rb 1970-01-01 01:00:00.000000000 +0100
@@ -14,14 +14,9 @@
end
it "should return an error from invalid YAML" do
- case RUBY_VERSION
- when /1.8/
- files = fixture_hiera('hiera_bad_18.yaml')
- expected = /syntax error on line 3, col -1: `'/
- else
- files = fixture_hiera('hiera_bad.yaml')
- expected = /scanning a directive at line 1 column 1/
- end
+ hiera_yaml = RUBY_VERSION =~ /1.8/ ? 'hiera_bad_18.yaml' : 'hiera_bad.yaml'
+ files = fixture_hiera(hiera_yaml)
+ expected = /ERROR: Failed to parse #{files[0]}:/
res = subject.check(files)
expect(res.size).to be == 1
expect(res.first).to match(expected)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/spec/puppet-syntax/manifests_spec.rb new/spec/puppet-syntax/manifests_spec.rb
--- old/spec/puppet-syntax/manifests_spec.rb 1970-01-01 01:00:00.000000000 +0100
+++ new/spec/puppet-syntax/manifests_spec.rb 1970-01-01 01:00:00.000000000 +0100
@@ -16,13 +16,27 @@
expect(has_errors).to eq(false)
end
+ it 'should return nothing from a valid file with a class using tag parameter' do
+ files = fixture_manifests('tag_notice.pp')
+ output, has_errors = subject.check(files)
+
+ expect(output).to eq([])
+ expect(has_errors).to eq(false)
+ end
+
it 'should return an error from an invalid file' do
files = fixture_manifests('fail_error.pp')
output, has_errors = subject.check(files)
- expect(output.size).to eq(1)
- expect(output[0]).to match(/Syntax error at .*:3$/)
- expect(has_errors).to eq(true)
+ if Puppet::PUPPETVERSION.to_i >= 4
+ expect(output.size).to eq(3)
+ expect(output[2]).to match(/Found 2 errors. Giving up/)
+ expect(has_errors).to eq(true)
+ else
+ expect(output.size).to eq(1)
+ expect(output[0]).to match(/Syntax error at .*:3$/)
+ expect(has_errors).to eq(true)
+ end
end
it 'should return a warning from an invalid file' do
@@ -30,9 +44,10 @@
output, has_errors = subject.check(files)
expect(output.size).to eq(2)
- expect(output[0]).to match(/Unrecognised escape sequence '\\\[' .* at line 3$/)
- expect(output[1]).to match(/Unrecognised escape sequence '\\\]' .* at line 3$/)
expect(has_errors).to eq(true)
+
+ expect(output[0]).to match(/Unrecogni(s|z)ed escape sequence '\\\['/)
+ expect(output[1]).to match(/Unrecogni(s|z)ed escape sequence '\\\]'/)
end
it 'should ignore warnings about storeconfigs' do
@@ -56,18 +71,37 @@
files = fixture_manifests(['fail_error.pp', 'fail_warning.pp'])
output, has_errors = subject.check(files)
- expect(output.size).to eq(3)
- expect(output[0]).to match(/Syntax error at '\}' .*:3$/)
- expect(output[1]).to match(/Unrecognised escape sequence '\\\[' .* at line 3$/)
- expect(output[2]).to match(/Unrecognised escape sequence '\\\]' .* at line 3$/)
expect(has_errors).to eq(true)
+ if Puppet::PUPPETVERSION.to_i >= 4
+ expect(output.size).to eq(5)
+ expect(output[0]).to match(/This Name has no effect. A Host Class Definition can not end with a value-producing expression without other effect at \S*\/fail_error.pp:2:32$/)
+ expect(output[1]).to match(/This Name has no effect. A value(-producing expression without other effect may only be placed last in a block\/sequence| was produced and then forgotten.*) at \S*\/fail_error.pp:2:3$/)
+ expect(output[2]).to match('Found 2 errors. Giving up')
+ expect(output[3]).to match(/Unrecogni(s|z)ed escape sequence '\\\['/)
+ expect(output[4]).to match(/Unrecogni(s|z)ed escape sequence '\\\]'/)
+ else
+ expect(output.size).to eq(3)
+ expect(output[0]).to match(/Syntax error at '\}' .*:3$/)
+ expect(output[1]).to match(/Unrecogni(s|z)ed escape sequence '\\\['/)
+ expect(output[2]).to match(/Unrecogni(s|z)ed escape sequence '\\\]'/)
+ end
end
describe 'deprecation notices' do
- # These tests should fail in Puppet 4, but we need to wait for the release
- # before we'll know exactly how to test it.
- if Puppet::Util::Package.versioncmp(Puppet.version, '3.7') >= 0
- context 'on puppet >= 3.7' do
+ case Puppet.version.to_f
+ when 4.0..4.99
+ context 'on puppet 4.0.0 and above' do
+ it 'should instead be failures' do
+ files = fixture_manifests('deprecation_notice.pp')
+ output, has_errors = subject.check(files)
+
+ expect(has_errors).to eq(true)
+ expect(output.size).to eq(1)
+ expect(output[0]).to match (/Node inheritance is not supported in Puppet >= 4.0.0/)
+ end
+ end
+ when 3.7, 3.8
+ context 'on puppet 3.7 and 3.8' do
it 'should return deprecation notices as warnings' do
files = fixture_manifests('deprecation_notice.pp')
output, has_errors = subject.check(files)
@@ -78,7 +112,7 @@
expect(output[1]).to match(/Deprecation notice:/)
end
end
- elsif Puppet::Util::Package.versioncmp(Puppet.version, '3.5') >= 0
+ when 3.5, 3.6
context 'on puppet 3.5 and 3.6' do
it 'should return deprecation notices as warnings' do
files = fixture_manifests('deprecation_notice.pp')
@@ -89,8 +123,8 @@
expect(output[0]).to match(/The use of 'import' is deprecated/)
end
end
- elsif Puppet::Util::Package.versioncmp(Puppet.version, '3.5') < 0
- context 'on puppet < 3.5' do
+ when 3.0..3.4
+ context 'on puppet 3.0 to 3.4' do
it 'should not print deprecation notices' do
files = fixture_manifests('deprecation_notice.pp')
output, has_errors = subject.check(files)
@@ -104,15 +138,27 @@
describe 'future_parser' do
context 'future_parser = false (default)' do
- it 'should fail without setting future option to true on future manifest' do
- expect(PuppetSyntax.future_parser).to eq(false)
+ if Puppet::Util::Package.versioncmp(Puppet.version, '4.0') < 0
+ it 'should fail without setting future option to true on future manifest on Puppet < 4.0.0' do
+ expect(PuppetSyntax.future_parser).to eq(false)
- files = fixture_manifests(['future_syntax.pp'])
- output, has_errors = subject.check(files)
+ files = fixture_manifests(['future_syntax.pp'])
+ output, has_errors = subject.check(files)
- expect(output.size).to eq(1)
- expect(output[0]).to match(/Syntax error at '='; expected '\}' .*:2$/)
- expect(has_errors).to eq(true)
+ expect(output.size).to eq(1)
+ expect(output[0]).to match(/Syntax error at '='; expected '\}' .*:2$/)
+ expect(has_errors).to eq(true)
+ end
+ else
+ it 'should succeed on Puppet >= 4.0.0' do
+ expect(PuppetSyntax.future_parser).to eq(false)
+
+ files = fixture_manifests(['future_syntax.pp'])
+ output, has_errors = subject.check(files)
+
+ expect(output.size).to eq(0)
+ expect(has_errors).to eq(false)
+ end
end
end
@@ -121,8 +167,8 @@
PuppetSyntax.future_parser = true
}
- if Puppet::Util::Package.versioncmp(Puppet.version, '3.2') >= 0
- context 'Puppet >= 3.2' do
+ if Puppet::Util::Package.versioncmp(Puppet.version, '3.2') >= 0 and Puppet::PUPPETVERSION.to_i < 4
+ context 'Puppet >= 3.2 < 4' do
it 'should pass with future option set to true on future manifest' do
files = fixture_manifests(['future_syntax.pp'])
output, has_errors = subject.check(files)
@@ -131,7 +177,7 @@
expect(has_errors).to eq(false)
end
end
- context 'Puppet >= 3.7' do
+ context 'Puppet >= 3.7 < 4' do
# Certain elements of the future parser weren't added until 3.7
if Puppet::Util::Package.versioncmp(Puppet.version, '3.7') >= 0
it 'should fail on what were deprecation notices in the non-future parser' do
@@ -144,7 +190,7 @@
end
end
end
- else
+ elsif Puppet::Util::Package.versioncmp(Puppet.version, '3.2') < 0
context 'Puppet < 3.2' do
it 'should return an error that the parser option is not supported' do
files = fixture_manifests(['future_syntax.pp'])
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/spec/puppet-syntax/tasks/puppet-syntax_spec.rb new/spec/puppet-syntax/tasks/puppet-syntax_spec.rb
--- old/spec/puppet-syntax/tasks/puppet-syntax_spec.rb 1970-01-01 01:00:00.000000000 +0100
+++ new/spec/puppet-syntax/tasks/puppet-syntax_spec.rb 1970-01-01 01:00:00.000000000 +0100
@@ -1,4 +1,5 @@
require 'spec_helper'
+require 'puppet-syntax/tasks/puppet-syntax'
describe 'PuppetSyntax rake tasks' do
it 'should generate FileList of manifests relative to Rakefile' do
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/spec/puppet-syntax/templates_spec.rb new/spec/puppet-syntax/templates_spec.rb
--- old/spec/puppet-syntax/templates_spec.rb 1970-01-01 01:00:00.000000000 +0100
+++ new/spec/puppet-syntax/templates_spec.rb 1970-01-01 01:00:00.000000000 +0100
@@ -59,4 +59,72 @@
expect(res).to match([])
end
+
+ if Puppet::PUPPETVERSION.to_i < 4
+ context 'on Puppet < 4.0.0' do
+ it 'should throw an exception when parsing EPP files' do
+ file = fixture_templates('pass.epp')
+ expect{ subject.check(file) }.to raise_error(/Cannot validate EPP without Puppet 4/)
+ end
+
+ context "when the 'epp_only' options is set" do
+ before(:each) {
+ PuppetSyntax.epp_only = true
+ }
+
+ it 'should throw an exception for any file' do
+ file = fixture_templates('pass.erb')
+ expect{ subject.check(file) }.to raise_error(/Cannot validate EPP without Puppet 4/)
+ end
+ end
+ end
+ end
+
+ if Puppet::PUPPETVERSION.to_i >= 4
+ context 'on Puppet >= 4.0.0' do
+ it 'should return nothing from a valid file' do
+ files = fixture_templates('pass.epp')
+ res = subject.check(files)
+
+ expect(res).to match([])
+ end
+
+ it 'should catch SyntaxError' do
+ files = fixture_templates('fail_error.epp')
+ res = subject.check(files)
+
+ expect(res.size).to eq(1)
+ expect(res[0]).to match(/This Type-Name has no effect/)
+ end
+
+ it 'should read more than one valid file' do
+ files = fixture_templates(['pass.epp', 'pass_also.epp'])
+ res = subject.check(files)
+
+ expect(res).to match([])
+ end
+
+ it 'should continue after finding an error in the first file' do
+ files = fixture_templates(['fail_error.epp', 'fail_error_also.epp'])
+ res = subject.check(files)
+
+ expect(res.size).to eq(2)
+ expect(res[0]).to match(/This Type-Name has no effect/)
+ expect(res[1]).to match(/Syntax error at '}' at \S*\/fail_error_also.epp:2:4/)
+ end
+
+ context "when the 'epp_only' options is set" do
+ before(:each) {
+ PuppetSyntax.epp_only = true
+ }
+
+ it 'should process an ERB as EPP and find an error' do
+ files = fixture_templates('pass.erb')
+ res = subject.check(files)
+
+ expect(res.size).to eq(1)
+ end
+ end
+ end
+ end
end
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/spec/puppet-syntax_spec.rb new/spec/puppet-syntax_spec.rb
--- old/spec/puppet-syntax_spec.rb 1970-01-01 01:00:00.000000000 +0100
+++ new/spec/puppet-syntax_spec.rb 1970-01-01 01:00:00.000000000 +0100
@@ -29,4 +29,9 @@
expect(PuppetSyntax.fail_on_deprecation_notices).to eq(false)
end
+ it 'should support forcing EPP only templates' do
+ PuppetSyntax.epp_only = true
+ expect(PuppetSyntax.epp_only).to eq(true)
+ end
+
end
1
0
Hello community,
here is the log from the commit of package libvshadow for openSUSE:Factory checked in at 2016-01-28 17:23:10
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/libvshadow (Old)
and /work/SRC/openSUSE:Factory/.libvshadow.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "libvshadow"
Changes:
--------
--- /work/SRC/openSUSE:Factory/libvshadow/libvshadow.changes 2015-01-30 15:04:52.000000000 +0100
+++ /work/SRC/openSUSE:Factory/.libvshadow.new/libvshadow.changes 2016-01-28 17:23:53.000000000 +0100
@@ -1,0 +2,8 @@
+Mon Jan 25 12:27:50 UTC 2016 - Greg.Freemyer(a)gmail.com
+
+- update to v0~20160110
+ * worked on Python 3 support
+ * worked on win2k3 format support
+ * introduced new function has_in_volume_data
+
+-------------------------------------------------------------------
Old:
----
libvshadow-alpha-20150106.tar.gz
New:
----
libvshadow-alpha-20160110.tar.gz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ libvshadow.spec ++++++
--- /var/tmp/diff_new_pack.kJzmvn/_old 2016-01-28 17:23:54.000000000 +0100
+++ /var/tmp/diff_new_pack.kJzmvn/_new 2016-01-28 17:23:54.000000000 +0100
@@ -1,7 +1,7 @@
#
# spec file for package libvshadow
#
-# Copyright (c) 2015 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -18,7 +18,7 @@
Name: libvshadow
%define lname libvshadow1
-%define timestamp 20150106
+%define timestamp 20160110
Version: 0~%{timestamp}
Release: 0
Summary: Library to access the Volume Shadow Snapshot (VSS) format
++++++ libvshadow-alpha-20150106.tar.gz -> libvshadow-alpha-20160110.tar.gz ++++++
++++ 26196 lines of diff (skipped)
1
0
Hello community,
here is the log from the commit of package bundle-lang-common for openSUSE:Factory checked in at 2016-01-28 17:23:03
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/bundle-lang-common (Old)
and /work/SRC/openSUSE:Factory/.bundle-lang-common.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "bundle-lang-common"
Changes:
--------
--- /work/SRC/openSUSE:Factory/bundle-lang-common/bundle-lang-common.changes 2016-01-03 13:27:33.000000000 +0100
+++ /work/SRC/openSUSE:Factory/.bundle-lang-common.new/bundle-lang-common.changes 2016-01-28 17:23:50.000000000 +0100
@@ -1,0 +2,5 @@
+Mon Jan 25 10:31:05 UTC 2016 - dimstar(a)opensuse.org
+
+- Update package list.
+
+-------------------------------------------------------------------
bundle-lang-gnome.changes: same change
bundle-lang-kde.changes: same change
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ bundle-lang-common.spec ++++++
--- /var/tmp/diff_new_pack.Sivdll/_old 2016-01-28 17:23:51.000000000 +0100
+++ /var/tmp/diff_new_pack.Sivdll/_new 2016-01-28 17:23:51.000000000 +0100
@@ -1,7 +1,7 @@
#
# spec file for package bundle-lang-common
#
-# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
++++++ bundle-lang-gnome.spec ++++++
++++ 1160 lines (skipped)
++++ between /work/SRC/openSUSE:Factory/bundle-lang-common/bundle-lang-gnome.spec
++++ and /work/SRC/openSUSE:Factory/.bundle-lang-common.new/bundle-lang-gnome.spec
bundle-lang-kde.spec: same change
++++++ bundle-lang-other.spec ++++++
--- /var/tmp/diff_new_pack.Sivdll/_old 2016-01-28 17:23:51.000000000 +0100
+++ /var/tmp/diff_new_pack.Sivdll/_new 2016-01-28 17:23:51.000000000 +0100
@@ -1,7 +1,7 @@
#
# spec file for package bundle-lang-other
#
-# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
++++++ packages.txt ++++++
--- /var/tmp/diff_new_pack.Sivdll/_old 2016-01-28 17:23:51.000000000 +0100
+++ /var/tmp/diff_new_pack.Sivdll/_new 2016-01-28 17:23:51.000000000 +0100
@@ -58,7 +58,7 @@
dasher-lang gnome-extras
dconf-editor-lang gnome-extras
decibel-audio-player-lang gnome-extras
-deja-dup-lang gnome
+deja-dup-lang gnome-extras
devhelp-lang gnome-extras
dia-lang gnome-extras
docky-lang gnome-extras
@@ -100,14 +100,14 @@
gedit-latex-lang gnome-extras
gedit-plugins-lang gnome-extras
geeqie-lang gnome-extras
-gegl-0_2-lang gnome
+gegl-0_2-lang gnome-extras
gegl-0_3-lang gnome
genius-lang gnome-extras
gftp-common-lang gnome-extras
ghex-lang gnome-extras
giggle-lang gnome-extras
gimp-gap-lang gnome-extras
-gimp-lang gnome
+gimp-lang gnome-extras
gimp-plugin-lqr-lang gnome-extras
gimp-save-for-web-lang gnome-extras
girl-lang gnome-extras
@@ -277,11 +277,11 @@
krb5-auth-dialog-lang gnome-extras
kross-lang kde
kscreen5-lang kde
+kscreenlocker-lang kde
kservice-lang kde
ksshaskpass5-lang kde
ksysguard5-lang kde
ktexteditor-lang kde
-ktorrent-lang kde
kwallet-tools-lang kde
kwalletd5-lang kde
kwin5-lang kde
@@ -343,7 +343,7 @@
libgweather-lang gnome
libinfinity-lang gnome-extras
libiptcdata-lang gnome
-libkfbapi-lang kde
+libkgapi-lang kde
libksysguard5-lang kde
libktorrent5-lang kde
libosinfo-lang gnome
@@ -358,7 +358,7 @@
libsocialweb-lang gnome
libsoup-lang common
libwebkit2gtk3-lang gnome
-libwebkitgtk2-lang gnome
+libwebkitgtk2-lang gnome-extras
libwebkitgtk3-lang gnome
libwnck-lang gnome
libwnck2-lang gnome-extras
@@ -416,7 +416,6 @@
seahorse-sharing-lang gnome-extras
sed-lang common
shared-mime-info-lang common
-shotwell-lang gnome-extras
simple-scan-lang gnome
smuxi-engine-campfire-lang gnome-extras
smuxi-engine-irc-lang gnome-extras
1
0
Hello community,
here is the log from the commit of package cabal-rpm for openSUSE:Factory checked in at 2016-01-28 17:23:02
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/cabal-rpm (Old)
and /work/SRC/openSUSE:Factory/.cabal-rpm.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "cabal-rpm"
Changes:
--------
--- /work/SRC/openSUSE:Factory/cabal-rpm/cabal-rpm.changes 2015-10-20 00:04:39.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.cabal-rpm.new/cabal-rpm.changes 2016-01-28 17:23:49.000000000 +0100
@@ -1,0 +2,8 @@
+Mon Jan 25 09:20:25 UTC 2016 - mimi.vx(a)gmail.com
+
+- update to 0.9.9
+- drop remove_exclusivearch.patch
+- drop cabal-rpm.1 manpage, use instead link to upstream cblrpm.1
+* couple of minor improvements for SUSE packaging
+
+-------------------------------------------------------------------
Old:
----
cabal-rpm-0.9.8.tar.gz
cabal-rpm.1
New:
----
cabal-rpm-0.9.9.tar.gz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ cabal-rpm.spec ++++++
--- /var/tmp/diff_new_pack.dsT9st/_old 2016-01-28 17:23:50.000000000 +0100
+++ /var/tmp/diff_new_pack.dsT9st/_new 2016-01-28 17:23:50.000000000 +0100
@@ -1,7 +1,7 @@
#
# spec file for package cabal-rpm
#
-# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -17,14 +17,13 @@
Name: cabal-rpm
-Version: 0.9.8
+Version: 0.9.9
Release: 0
Summary: RPM packaging tool for Haskell Cabal-based packages
License: GPL-3.0+
Group: Development/Tools/Other
Url: https://hackage.haskell.org/package/%{name}
Source0: https://hackage.haskell.org/package/%{name}-%{version}/%{name}-%{version}.t…
-Source2: cabal-rpm.1
BuildRequires: ghc-Cabal-devel
# Begin cabal-rpm deps:
BuildRequires: ghc-directory-devel
@@ -53,16 +52,15 @@
%setup -q
%build
-%define cabal_configure_options --flags="-old-locale"
%{ghc_bin_build}
%install
%{ghc_bin_install}
install -p -m 0644 -D man/cblrpm.1 %{buildroot}%{_mandir}/man1/cblrpm.1
-install -p -m 0644 %{SOURCE2} %{buildroot}%{_mandir}/man1/
ln -s cblrpm %{buildroot}%{_bindir}/%{name}
+ln -s %{_mandir}/man1/cblrpm.1 %{buildroot}%{_mandir}/man1/%{name}.1
%files
%defattr(-,root,root,-)
++++++ cabal-rpm-0.9.8.tar.gz -> cabal-rpm-0.9.9.tar.gz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cabal-rpm-0.9.8/ChangeLog new/cabal-rpm-0.9.9/ChangeLog
--- old/cabal-rpm-0.9.8/ChangeLog 2015-10-08 05:36:01.000000000 +0200
+++ new/cabal-rpm-0.9.9/ChangeLog 2016-01-25 10:33:19.000000000 +0100
@@ -1,3 +1,6 @@
+* 0.9.9 (2016-01-25)
+- couple of minor improvements for SUSE packaging
+
* 0.9.8 (2015-10-08)
- better %license logic
- fix handling of versions without '.'
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cabal-rpm-0.9.8/cabal-rpm.cabal new/cabal-rpm-0.9.9/cabal-rpm.cabal
--- old/cabal-rpm-0.9.8/cabal-rpm.cabal 2015-10-08 05:36:01.000000000 +0200
+++ new/cabal-rpm-0.9.9/cabal-rpm.cabal 2016-01-25 10:33:19.000000000 +0100
@@ -1,5 +1,5 @@
Name: cabal-rpm
-Version: 0.9.8
+Version: 0.9.9
Synopsis: RPM packaging tool for Haskell Cabal-based packages
Description:
This package provides a RPM packaging tool for Haskell Cabal-based packages.
@@ -17,7 +17,7 @@
Author: Jens Petersen <juhp(a)community.haskell.org>, Bryan O'Sullivan <bos(a)serpentine.com>
Maintainer: Jens Petersen <petersen(a)fedoraproject.org>
Copyright: 2007-2008 Bryan O'Sullivan <bos(a)serpentine.com>,
- 2012-2015 Jens Petersen <petersen(a)fedoraproject.org>
+ 2012-2016 Jens Petersen <petersen(a)fedoraproject.org>
Category: Distribution
Build-type: Simple
Extra-source-files: README.md ChangeLog man/cblrpm.1.md man/cblrpm.1
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cabal-rpm-0.9.8/src/Commands/Spec.hs new/cabal-rpm-0.9.9/src/Commands/Spec.hs
--- old/cabal-rpm-0.9.8/src/Commands/Spec.hs 2015-10-08 05:36:01.000000000 +0200
+++ new/cabal-rpm-0.9.9/src/Commands/Spec.hs 2016-01-25 10:33:19.000000000 +0100
@@ -3,7 +3,7 @@
-- |
-- Module : Commands.Spec
-- Copyright : (C) 2007-2008 Bryan O'Sullivan
--- (C) 2012-2015 Jens Petersen
+-- (C) 2012-2016 Jens Petersen
--
-- Maintainer : Jens Petersen <petersen(a)fedoraproject.org>
-- Stability : alpha
@@ -32,7 +32,7 @@
import Data.List (groupBy, intercalate, isPrefixOf, isSuffixOf,
sort, (\\))
import Data.Maybe (fromMaybe)
-import Data.Time.Clock (UTCTime, getCurrentTime)
+import Data.Time.Clock (getCurrentTime)
import Data.Time.Format (formatTime)
import Data.Version (showVersion)
@@ -58,13 +58,15 @@
import qualified Paths_cabal_rpm (version)
-defaultRelease :: FilePath -> UTCTime -> IO String
-defaultRelease cabalPath now = do
+defaultRelease :: FilePath -> Distro -> IO String
+defaultRelease cabalPath distro = do
let pkgDir = takeDirectory cabalPath
scmRepo <- isScmDir pkgDir
- return $ if scmRepo
- then formatTime defaultTimeLocale "0.%Y%m%d" now
- else "1"
+ if scmRepo
+ then do
+ now <- getCurrentTime
+ return $ formatTime defaultTimeLocale "0.%Y%m%d" now
+ else return $ if (distro == SUSE) then "0" else "1"
rstrip :: (Char -> Bool) -> String -> String
rstrip p = reverse . dropWhile p . reverse
@@ -80,15 +82,11 @@
verbose = rpmVerbosity flags
hasExec = hasExes pkgDesc
hasLib = hasLibs pkgDesc
- now <- getCurrentTime
- defRelease <- defaultRelease cabalPath now
(pkgname, binlib) <- getPkgName mspec pkgDesc (rpmBinary flags)
let pkg_name = if pkgname == name then "%{name}" else "%{pkg_name}"
basename | binlib = "%{pkg_name}"
| hasExecPkg = name
| otherwise = "ghc-%{pkg_name}"
- version = packageVersion pkg
- release = fromMaybe defRelease (rpmRelease flags)
specFile = fromMaybe "" mdest </> pkgname ++ ".spec"
hasExecPkg = binlib || (hasExec && not hasLib)
-- run commands before opening file to prevent empty file on error
@@ -119,6 +117,7 @@
if distro /= SUSE
then put "# https://fedoraproject.org/wiki/Packaging:Haskell"
else do
+ now <- getCurrentTime
let year = formatTime defaultTimeLocale "%Y" now
put "#"
put $ "# spec file for package " ++ pkgname
@@ -178,6 +177,9 @@
-- putDef "debug_package" "%{nil}"
-- putNewline
+ defRelease <- defaultRelease cabalPath distro
+ let version = packageVersion pkg
+ release = fromMaybe defRelease (rpmRelease flags)
putHdr "Name" (if binlib then "%{pkg_name}" else basename)
putHdr "Version" version
putHdr "Release" $ release ++ (if distro == SUSE then [] else "%{?dist}")
@@ -205,7 +207,8 @@
unless (null $ alldeps ++ extraTestDeps) $ do
put "# Begin cabal-rpm deps:"
mapM_ (putHdr "BuildRequires") alldeps
- when (any (\ d -> d `elem` map showDep ["template-haskell", "hamlet"]) deps) $
+ when (distro /= SUSE &&
+ any (\ d -> d `elem` map showDep ["template-haskell", "hamlet"]) deps) $
putHdr "ExclusiveArch" "%{ghc_arches_with_ghci}"
unless (null extraTestDeps) $ do
put "%if %{with tests}"
@@ -349,6 +352,7 @@
put "%changelog"
unless (distro == SUSE) $ do
+ now <- getCurrentTime
let date = formatTime defaultTimeLocale "%a %b %e %Y" now
put $ "*" +-+ date +-+ "Fedora Haskell SIG <haskell(a)lists.fedoraproject.org> - " ++ version ++ "-" ++ release
put $ "- spec file generated by cabal-rpm-" ++ showVersion Paths_cabal_rpm.version
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cabal-rpm-0.9.8/src/Dependencies.hs new/cabal-rpm-0.9.9/src/Dependencies.hs
--- old/cabal-rpm-0.9.8/src/Dependencies.hs 2015-10-08 05:36:01.000000000 +0200
+++ new/cabal-rpm-0.9.9/src/Dependencies.hs 2016-01-25 10:33:19.000000000 +0100
@@ -1,6 +1,6 @@
-- |
-- Module : Dependencies
--- Copyright : (C) 2012-2015 Jens Petersen
+-- Copyright : (C) 2012-2016 Jens Petersen
--
-- Maintainer : Jens Petersen <petersen(a)fedoraproject.org>
-- Stability : alpha
@@ -123,7 +123,7 @@
-> String -- ^self
-> [String] -- ^depends
testsuiteDependencies pkgDesc self =
- map showDep . delete self . filter excludedPkgs . nub . map depName $ concatMap targetBuildDepends $ map testBuildInfo $ testSuites pkgDesc
+ map showDep . delete self . filter excludedPkgs . nub . map depName $ concatMap (targetBuildDepends . testBuildInfo) (testSuites pkgDesc)
missingPackages :: PackageDescription -> IO [String]
missingPackages pkgDesc = do
1
0
Hello community,
here is the log from the commit of package wrk for openSUSE:Factory checked in at 2016-01-28 17:23:01
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/wrk (Old)
and /work/SRC/openSUSE:Factory/.wrk.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "wrk"
Changes:
--------
--- /work/SRC/openSUSE:Factory/wrk/wrk.changes 2015-08-05 06:51:54.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.wrk.new/wrk.changes 2016-01-28 17:23:48.000000000 +0100
@@ -1,0 +2,5 @@
+Mon Jan 25 07:46:48 UTC 2016 - mpluskal(a)suse.com
+
+- Install to /usr/bin (boo#963355)
+
+-------------------------------------------------------------------
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ wrk.spec ++++++
--- /var/tmp/diff_new_pack.hYHmZf/_old 2016-01-28 17:23:49.000000000 +0100
+++ /var/tmp/diff_new_pack.hYHmZf/_new 2016-01-28 17:23:49.000000000 +0100
@@ -1,7 +1,7 @@
#
# spec file for package wrk
#
-# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -48,12 +48,12 @@
make %{?_smp_mflags} OPTFLAGS="%{optflags}"
%install
-install -D -m 0755 wrk %{buildroot}%{_sbindir}/wrk
+install -D -m 0755 wrk %{buildroot}%{_bindir}/wrk
%files
%defattr(-,root,root)
%doc LICENSE README NOTICE
%doc scripts/
-%{_sbindir}/wrk
+%{_bindir}/wrk
%changelog
1
0
Hello community,
here is the log from the commit of package 3omns for openSUSE:Factory checked in at 2016-01-28 17:22:59
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/3omns (Old)
and /work/SRC/openSUSE:Factory/.3omns.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "3omns"
Changes:
--------
--- /work/SRC/openSUSE:Factory/3omns/3omns.changes 2015-09-30 05:52:22.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.3omns.new/3omns.changes 2016-01-28 17:23:47.000000000 +0100
@@ -1,0 +2,23 @@
+Sat Jan 23 11:29:00 UTC 2016 - nemysis(a)openSUSE.org
+
+- Recreate tarball, new GitHub commit
+ Please look 'git log' and announce message:
+
+ * Add bot.lua to dist
+
+ * Fixed some bot AI bugs
+ * Revamped networking code to add reliability
+ * Added the -R command line option to print resources path
+
+- license update: GPL-3.0+ No indication that this is GPL-3.0 (only)
+- Add BuildRequires for bitstream-vera-fonts
+- Add Requires for bitstream-vera-fonts, thanks dstoecker
+- Replace bundled font with a symlink to an identical system font
+- Remove COPYING.font from Documentation
+
+-------------------------------------------------------------------
+Fri Jan 1 12:04:44 UTC 2016 - rpm(a)fthiessen.de
+
+- Fixed lua dependencies so it will also build on openSUSE <= 13.2
+
+-------------------------------------------------------------------
Old:
----
3omns-0.1+git-21292f0.tar.bz2
New:
----
3omns-0.1+git-ded6410.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ 3omns.spec ++++++
--- /var/tmp/diff_new_pack.pw09HU/_old 2016-01-28 17:23:48.000000000 +0100
+++ /var/tmp/diff_new_pack.pw09HU/_new 2016-01-28 17:23:48.000000000 +0100
@@ -1,7 +1,7 @@
#
# spec file for package 3omns
#
-# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -20,12 +20,12 @@
Version: 0.1
Release: 0
Summary: Old-school Arcade-style Tile-based Bomb-dropping Deathmatch Game
-License: GPL-3.0
+License: GPL-3.0+
Group: Amusements/Games/Action/Arcade
Url: https://chazomaticus.github.io/3omns/
# Downloaded from https://github.com/chazomaticus/3omns
# Packed as tar.bz2
-Source0: %{name}-%{version}+git-21292f0.tar.bz2
+Source0: %{name}-%{version}+git-ded6410.tar.bz2
%if 0%{?suse_version}
BuildRequires: fdupes
BuildRequires: hicolor-icon-theme
@@ -34,19 +34,21 @@
BuildRequires: asciidoc
BuildRequires: autoconf
BuildRequires: automake
+BuildRequires: bitstream-vera-fonts
BuildRequires: docbook-xsl-stylesheets
BuildRequires: docbook_5
BuildRequires: glibc-devel
BuildRequires: libxml2-devel
BuildRequires: libxslt-devel
-BuildRequires: pkgconfig(SDL2_image)
-BuildRequires: pkgconfig(SDL2_ttf)
%if 0%{?suse_version} > 1320
BuildRequires: lua52-devel
%else
-BuildRequires: pkgconfig(lua)
+BuildRequires: lua-devel >= 5.2
%endif
+BuildRequires: pkgconfig(SDL2_image)
+BuildRequires: pkgconfig(SDL2_ttf)
BuildRequires: pkgconfig(sdl2)
+Requires: bitstream-vera-fonts
%description
3omns is an old-school arcade-style tile-based bomb-dropping deathmatch game.
@@ -65,6 +67,10 @@
%install
%make_install
+# Use system fonts instead of bundling our own
+rm -f %{buildroot}%{_datadir}/%{name}/ttf/Vera.ttf
+ln -s ../../fonts/truetype/Vera.ttf %{buildroot}%{_datadir}/%{name}/ttf/Vera.ttf
+
%if 0%{?suse_version}
%suse_update_desktop_file %{name}
%fdupes -s %{buildroot}%{_prefix}
@@ -72,7 +78,7 @@
%files
%defattr(-,root,root,-)
-%doc COPYING COPYING.font NEWS README
+%doc COPYING NEWS README
%{_bindir}/%{name}
%{_mandir}/man6/%{name}.6%{ext_man}
%{_datadir}/applications/%{name}.desktop
++++++ 3omns-0.1+git-21292f0.tar.bz2 -> 3omns-0.1+git-ded6410.tar.bz2 ++++++
1
0
Hello community,
here is the log from the commit of package edgar for openSUSE:Factory checked in at 2016-01-28 17:22:58
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/edgar (Old)
and /work/SRC/openSUSE:Factory/.edgar.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "edgar"
Changes:
--------
--- /work/SRC/openSUSE:Factory/edgar/edgar.changes 2015-12-09 22:15:31.000000000 +0100
+++ /work/SRC/openSUSE:Factory/.edgar.new/edgar.changes 2016-01-28 17:23:42.000000000 +0100
@@ -1,0 +2,7 @@
+Sat Jan 23 19:08:45 UTC 2016 - nemysis(a)openSUSE.org
+
+- Update to 1.23, announce message:
+
+ * Updated French and German translations
+
+-------------------------------------------------------------------
Old:
----
edgar-1.22.tar.gz
New:
----
edgar-1.23.tar.gz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ edgar.spec ++++++
--- /var/tmp/diff_new_pack.gAoNeP/_old 2016-01-28 17:23:47.000000000 +0100
+++ /var/tmp/diff_new_pack.gAoNeP/_new 2016-01-28 17:23:47.000000000 +0100
@@ -1,7 +1,7 @@
#
# spec file for package edgar
#
-# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -17,7 +17,7 @@
Name: edgar
-Version: 1.22
+Version: 1.23
Release: 0
Summary: 2D platform game with a persistent world
License: GPL-2.0
@@ -70,7 +70,7 @@
%endif
%files -f %name.lang
-%defattr(-,root,root)
+%defattr(-,root,root,-)
%doc doc/*
%attr(-,root,games) %{_bindir}/%{name}
%{_mandir}/man6/%{name}.6%{ext_man}
++++++ edgar-1.22.tar.gz -> edgar-1.23.tar.gz ++++++
/work/SRC/openSUSE:Factory/edgar/edgar-1.22.tar.gz /work/SRC/openSUSE:Factory/.edgar.new/edgar-1.23.tar.gz differ: char 29, line 2
1
0
Hello community,
here is the log from the commit of package chromium for openSUSE:Factory checked in at 2016-01-28 17:22:57
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/chromium (Old)
and /work/SRC/openSUSE:Factory/.chromium.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "chromium"
Changes:
--------
--- /work/SRC/openSUSE:Factory/chromium/chromium.changes 2016-01-01 19:50:31.000000000 +0100
+++ /work/SRC/openSUSE:Factory/.chromium.new/chromium.changes 2016-01-28 17:23:08.000000000 +0100
@@ -1,0 +2,21 @@
+Fri Jan 22 19:08:56 UTC 2016 - tittiatcoke(a)gmail.com
+
+- Update to Chromium 48.0.2564.82
+ * Security fixes:
+ - CVE-2016-1612: Bad cast in V8 (boo#963184)
+ - CVE-2016-1613: Use-after-free in PDFium (boo#963185)
+ - CVE-2016-1614: Information leak in Blink (boo#963186)
+ - CVE-2016-1615: Origin confusion in Omnibox (boo#963187)
+ - CVE-2016-1616: URL Spoofing (boo#963188)
+ - CVE-2016-1617: History sniffing with HSTS and CSP (boo#963189)
+ - CVE-2016-1618: Weak random number generator in Blink (boo#963190)
+ - CVE-2016-1619: Out-of-bounds read in PDFium (boo#963191)
+ - CVE-2016-1620 chromium-browser: various fixes (boo#963192)
+
+-------------------------------------------------------------------
+Thu Jan 14 15:22:38 UTC 2016 - tittiatcoke(a)gmail.com
+
+- Update to Chromium 47.0.2526.111.
+ * No changelog available
+
+-------------------------------------------------------------------
Old:
----
chromium-47.0.2526.106.tar.xz
New:
----
chromium-48.0.2564.82.tar.xz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ chromium.spec ++++++
--- /var/tmp/diff_new_pack.qRGV3j/_old 2016-01-28 17:23:38.000000000 +0100
+++ /var/tmp/diff_new_pack.qRGV3j/_new 2016-01-28 17:23:38.000000000 +0100
@@ -1,7 +1,7 @@
#
# spec file for package chromium
#
-# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -21,7 +21,7 @@
%bcond_without libva
Name: chromium
-Version: 47.0.2526.106
+Version: 48.0.2564.82
Release: 0
Summary: Google's opens source browser project
License: BSD-3-Clause and LGPL-2.1+
++++++ chromium-47.0.2526.106.tar.xz -> chromium-48.0.2564.82.tar.xz ++++++
/work/SRC/openSUSE:Factory/chromium/chromium-47.0.2526.106.tar.xz /work/SRC/openSUSE:Factory/.chromium.new/chromium-48.0.2564.82.tar.xz differ: char 27, line 1
++++++ chromium-enable-vaapi.patch ++++++
++++ 1679 lines (skipped)
++++ between /work/SRC/openSUSE:Factory/chromium/chromium-enable-vaapi.patch
++++ and /work/SRC/openSUSE:Factory/.chromium.new/chromium-enable-vaapi.patch
1
0
28 Jan '16
Hello community,
here is the log from the commit of package rubygem-exception_notification for openSUSE:Factory checked in at 2016-01-28 17:22:55
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/rubygem-exception_notification (Old)
and /work/SRC/openSUSE:Factory/.rubygem-exception_notification.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "rubygem-exception_notification"
Changes:
--------
--- /work/SRC/openSUSE:Factory/rubygem-exception_notification/rubygem-exception_notification.changes 2016-01-12 16:12:08.000000000 +0100
+++ /work/SRC/openSUSE:Factory/.rubygem-exception_notification.new/rubygem-exception_notification.changes 2016-01-28 17:22:57.000000000 +0100
@@ -1,0 +2,20 @@
+Thu Jan 21 05:34:37 UTC 2016 - coolo(a)suse.com
+
+- updated to version 4.1.4
+ see installed CHANGELOG.rdoc
+
+-------------------------------------------------------------------
+Wed Dec 23 05:33:29 UTC 2015 - coolo(a)suse.com
+
+- updated to version 4.1.3
+ see installed CHANGELOG.rdoc
+
+ == undefined
+
+ * enhancements
+ * Add a way to have a backtrace callback on notifiers (by @pcboy)
+
+ * bug fixes
+ * Fix incompatible character encodings error (by @san650)
+
+-------------------------------------------------------------------
Old:
----
exception_notification-4.1.2.gem
New:
----
exception_notification-4.1.4.gem
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ rubygem-exception_notification.spec ++++++
--- /var/tmp/diff_new_pack.mgbyWJ/_old 2016-01-28 17:22:58.000000000 +0100
+++ /var/tmp/diff_new_pack.mgbyWJ/_new 2016-01-28 17:22:58.000000000 +0100
@@ -1,7 +1,7 @@
#
# spec file for package rubygem-exception_notification
#
-# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -24,7 +24,7 @@
#
Name: rubygem-exception_notification
-Version: 4.1.2
+Version: 4.1.4
Release: 0
%define mod_name exception_notification
%define mod_full_name %{mod_name}-%{version}
++++++ exception_notification-4.1.2.gem -> exception_notification-4.1.4.gem ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/CHANGELOG.rdoc new/CHANGELOG.rdoc
--- old/CHANGELOG.rdoc 2015-12-04 21:45:42.000000000 +0100
+++ new/CHANGELOG.rdoc 2016-01-07 22:21:05.000000000 +0100
@@ -1,3 +1,17 @@
+== 4.1.4
+
+* bug fixes
+ * HTML-escape exception messages sent to hipchat
+ * Send the correct options in send_notice
+
+== 4.1.3
+
+* enhancements
+ * Add a way to have a backtrace callback on notifiers (by @pcboy)
+
+* bug fixes
+ * Fix incompatible character encodings error (by @san650)
+
== 4.1.2
* enhancements
* Change format of Slack notifications (by @eldano)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/README.md new/README.md
--- old/README.md 2015-12-04 21:45:42.000000000 +0100
+++ new/README.md 2016-01-07 22:21:05.000000000 +0100
@@ -7,26 +7,21 @@
**THIS README IS FOR THE MASTER BRANCH AND REFLECTS THE WORK CURRENTLY EXISTING ON THE MASTER BRANCH. IF YOU ARE WISHING TO USE A NON-MASTER BRANCH OF EXCEPTION NOTIFICATION, PLEASE CONSULT THAT BRANCH'S README AND NOT THIS ONE.**
--
-
-The Exception Notification gem provides a set of [notifiers](#notifiers) for sending notifications when errors occur in a Rack/Rails application.
-
-The built-in notifiers can deliver notifications by [email](#email-notifier), [campfire rooms](#campfire-notifier) or via [webhooks](#webhook-notifier).
+---
+The Exception Notification gem provides a set of [notifiers](#notifiers) for sending notifications when errors occur in a Rack/Rails application. The built-in notifiers can deliver notifications by [email](#email-notifier), [Campfire](#campfire-notifier), [HipChat](#hipchat-notifier), [Slack](#slack-notifier), [IRC](#irc-notifier) or via custom [WebHooks](#webhook-notifier).
There's a great [Railscast about Exception Notification](http://railscasts.com/episodes/104-exception-notifications-re… you can see that may help you getting started.
[Follow us on Twitter](https://twitter.com/exception_notif) to get updates and notices about new releases.
-
## Requirements
-* Ruby 1.9.3 or greater
-* Rails 3.1 or greater, Sinatra or another Rack-based application.
+* Ruby 2.0 or greater
+* Rails 4.0 or greater, Sinatra or another Rack-based application.
For previous releases, please checkout [this](#versions).
-
## Getting Started
Add the following line to your application's Gemfile:
@@ -35,7 +30,9 @@
gem 'exception_notification'
```
-As of Rails 3 ExceptionNotification is used as a rack middleware, or in the environment you want it to run. In most cases you would want ExceptionNotification to run on production. Thus, you can make it work by putting the following lines in your `config/environments/production.rb`:
+### Rails
+
+ExceptionNotification is used as a rack middleware, or in the environment you want it to run. In most cases you would want ExceptionNotification to run on production. Thus, you can make it work by putting the following lines in your `config/environments/production.rb`:
```ruby
Rails.application.config.middleware.use ExceptionNotification::Rack,
@@ -46,24 +43,38 @@
}
```
-> **Note**: In order to enable delivery notifications by email make sure you have [ActionMailer configured](#actionmailer-configuration).
+**Note**: In order to enable delivery notifications by email make sure you have [ActionMailer configured](#actionmailer-configuration).
+### Rack/Sinatra
In order to use ExceptionNotification with Sinatra, please take a look in the [example application](https://github.com/smartinez87/exception_notification/tree/mas….
+## Notifiers
+
+ExceptionNotification relies on notifiers to deliver notifications when errors occur in your applications. By default, six notifiers are available:
+
+* [Campfire notifier](#campfire-notifier)
+* [Email notifier](#email-notifier)
+* [HipChat notifier](#hipchat-notifier)
+* [IRC notifier](#irc-notifier)
+* [Slack notifier](#slack-notifier)
+* [WebHook notifier](#webhook-notifier)
-### Upgrading to 4.x version
+But, you also can easily implement your own [custom notifier](#custom-notifier).
-As of 4.x version the configuration syntax has changed. All email related options MUST BE nested under the `:email` key. Thus, previous configuration like:
+### Campfire notifier
+
+This notifier sends notifications to your Campfire room.
+
+#### Usage
+
+Just add the [tinder](https://github.com/collectiveidea/tinder) gem to your `Gemfile`:
```ruby
-Rails.application.config.middleware.use ExceptionNotifier,
- :email_prefix => "[PREFIX] ",
- :sender_address => %{"notifier" <notifier(a)example.com>},
- :exception_recipients => %w{exceptions(a)example.com}
+gem 'tinder'
```
-becomes:
+To configure it, you need to set the `subdomain`, `token` and `room_name` options, like this:
```ruby
Rails.application.config.middleware.use ExceptionNotification::Rack,
@@ -71,21 +82,42 @@
:email_prefix => "[PREFIX] ",
:sender_address => %{"notifier" <notifier(a)example.com>},
:exception_recipients => %w{exceptions(a)example.com}
+ },
+ :campfire => {
+ :subdomain => 'my_subdomain',
+ :token => 'my_token',
+ :room_name => 'my_room'
}
```
-Beside that, the rack middleware was renamed to `ExceptionNotification::Rack`.
+#### Options
-## Notifiers
+##### subdomain
-ExceptionNotification relies on notifiers to deliver notifications when errors occur in your applications. By default, three notifiers are available: [email notifier](#email-notifier), [campfire notifier](#campfire-notifier) and [webhook notifier](#webhook-notifier). But, you also can easily implement your own [custom notifier](#custom-notifier).
+*String, required*
+Your subdomain at Campfire.
+
+##### room_name
+
+*String, required*
+
+The Campfire room where the notifications must be published to.
+
+##### token
+
+*String, required*
+
+The API token to allow access to your Campfire account.
+
+
+For more options to set Campfire, like _ssl_, check [here](https://github.com/collectiveidea/tinder/blob/master/lib/tinder/campf….
### Email notifier
The Email notifier sends notifications by email. The notifications/emails sent includes information about the current request, session, and environment, and also gives a backtrace of the exception.
-After an exception notification has been delivered the rack environment variable 'exception_notifier.delivered' will be set to true.
+After an exception notification has been delivered the rack environment variable `exception_notifier.delivered` will be set to true.
#### ActionMailer configuration
@@ -110,21 +142,18 @@
Who the message is from.
-
##### exception_recipients
*String/Array of strings, default: []*
Who the message is destined for, can be a string of addresses, or an array of addresses.
-
##### email_prefix
*String, default: [ERROR]*
The subject's prefix of the message.
-
##### sections
*Array of strings, default: %w(request session environment backtrace)*
@@ -174,7 +203,6 @@
In the above case, `@document` and `@person` would be made available to the email renderer, allowing your new section(s) to access and display them. See the existing sections defined by the plugin for examples of how to write your own.
-
##### background_sections
*Array of strings, default: %w(backtrace data)*
@@ -191,7 +219,6 @@
}
```
-
##### email_headers
*Hash of strings, default: {}*
@@ -208,28 +235,24 @@
}
```
-
##### verbose_subject
*Boolean, default: true*
If enabled, include the exception message in the subject. Use `:verbose_subject => false` to exclude it.
-
##### normalize_subject
*Boolean, default: false*
If enabled, remove numbers from subject so they thread as a single one. Use `:normalize_subject => true` to enable it.
-
##### email_format
*Symbol, default: :text*
By default, ExceptionNotification sends emails in plain text, in order to sends multipart notifications (aka HTML emails) use `:email_format => :html`.
-
##### delivery_method
*Symbol, default: :smtp*
@@ -267,73 +290,18 @@
A complete list of `smtp_settings` options can be found in the [ActionMailer Configuration documentation](http://api.rubyonrails.org/classes/ActionMailer/Base.html#cl….
-
##### mailer_parent
*String, default: ActionMailer::Base*
The parent mailer which ExceptionNotification mailer inherit from.
-
##### deliver_with
*Symbol, default: :deliver_now
The method name to send emalis using ActionMailer.
-
-### Campfire notifier
-
-This notifier sends notifications to your Campfire room.
-
-#### Usage
-
-Just add the [tinder](https://github.com/collectiveidea/tinder) gem to your `Gemfile`:
-
-```ruby
-gem 'tinder'
-```
-
-To configure it, you need to set the `subdomain`, `token` and `room_name` options, like this:
-
-```ruby
-Rails.application.config.middleware.use ExceptionNotification::Rack,
- :email => {
- :email_prefix => "[PREFIX] ",
- :sender_address => %{"notifier" <notifier(a)example.com>},
- :exception_recipients => %w{exceptions(a)example.com}
- },
- :campfire => {
- :subdomain => 'my_subdomain',
- :token => 'my_token',
- :room_name => 'my_room'
- }
-```
-
-#### Options
-
-##### subdomain
-
-*String, required*
-
-Your subdomain at Campfire.
-
-##### room_name
-
-*String, required*
-
-The Campfire room where the notifications must be published to.
-
-##### token
-
-*String, required*
-
-The API token to allow access to your Campfire account.
-
-
-For more options to set Campfire, like _ssl_, check [here](https://github.com/collectiveidea/tinder/blob/master/lib/tinder/campf….
-
-
### HipChat notifier
This notifier sends notifications to your Hipchat room.
@@ -395,67 +363,6 @@
For all options & possible values see [Hipchat API](https://www.hipchat.com/docs/api/method/rooms/message).
-### Webhook notifier
-
-This notifier ships notifications over the HTTP protocol.
-
-#### Usage
-
-Just add the [HTTParty](https://github.com/jnunemaker/httparty) gem to your `Gemfile`:
-
-```ruby
-gem 'httparty'
-```
-
-To configure it, you need to set the `url` option, like this:
-
-```ruby
-Rails.application.config.middleware.use ExceptionNotification::Rack,
- :email => {
- :email_prefix => "[PREFIX] ",
- :sender_address => %{"notifier" <notifier(a)example.com>},
- :exception_recipients => %w{exceptions(a)example.com}
- },
- :webhook => {
- :url => 'http://domain.com:5555/hubot/path'
- }
-```
-
-By default, the WebhookNotifier will call the URLs using the POST method. But, you can change this using the `http_method` option.
-
-```ruby
-Rails.application.config.middleware.use ExceptionNotification::Rack,
- :email => {
- :email_prefix => "[PREFIX] ",
- :sender_address => %{"notifier" <notifier(a)example.com>},
- :exception_recipients => %w{exceptions(a)example.com}
- },
- :webhook => {
- :url => 'http://domain.com:5555/hubot/path',
- :http_method => :get
- }
-```
-
-Besides the `url` and `http_method` options, all the other options are passed directly to HTTParty. Thus, if the HTTP server requires authentication, you can include the following options:
-
-```ruby
-Rails.application.config.middleware.use ExceptionNotification::Rack,
- :email => {
- :email_prefix => "[PREFIX] ",
- :sender_address => %{"notifier" <notifier(a)example.com>},
- :exception_recipients => %w{exceptions(a)example.com}
- },
- :webhook => {
- :url => 'http://domain.com:5555/hubot/path',
- :basic_auth => {
- :username => 'alice',
- :password => 'password'
- }
- }
-```
-
-For more HTTParty options, check out the [documentation](https://github.com/jnunemaker/httparty).
-
### IRC notifier
This notifier sends notifications to an IRC channel using the carrier-pigeon gem.
@@ -638,6 +545,68 @@
Contains additional payload for a message (e.g avatar, attachments, etc). See [slack-notifier](https://github.com/stevenosloan/slack-notifier#additional-p… for more information.. Default: '{}'
+
+### WebHook notifier
+
+This notifier ships notifications over the HTTP protocol.
+
+#### Usage
+
+Just add the [HTTParty](https://github.com/jnunemaker/httparty) gem to your `Gemfile`:
+
+```ruby
+gem 'httparty'
+```
+
+To configure it, you need to set the `url` option, like this:
+
+```ruby
+Rails.application.config.middleware.use ExceptionNotification::Rack,
+ :email => {
+ :email_prefix => "[PREFIX] ",
+ :sender_address => %{"notifier" <notifier(a)example.com>},
+ :exception_recipients => %w{exceptions(a)example.com}
+ },
+ :webhook => {
+ :url => 'http://domain.com:5555/hubot/path'
+ }
+```
+
+By default, the WebhookNotifier will call the URLs using the POST method. But, you can change this using the `http_method` option.
+
+```ruby
+Rails.application.config.middleware.use ExceptionNotification::Rack,
+ :email => {
+ :email_prefix => "[PREFIX] ",
+ :sender_address => %{"notifier" <notifier(a)example.com>},
+ :exception_recipients => %w{exceptions(a)example.com}
+ },
+ :webhook => {
+ :url => 'http://domain.com:5555/hubot/path',
+ :http_method => :get
+ }
+```
+
+Besides the `url` and `http_method` options, all the other options are passed directly to HTTParty. Thus, if the HTTP server requires authentication, you can include the following options:
+
+```ruby
+Rails.application.config.middleware.use ExceptionNotification::Rack,
+ :email => {
+ :email_prefix => "[PREFIX] ",
+ :sender_address => %{"notifier" <notifier(a)example.com>},
+ :exception_recipients => %w{exceptions(a)example.com}
+ },
+ :webhook => {
+ :url => 'http://domain.com:5555/hubot/path',
+ :basic_auth => {
+ :username => 'alice',
+ :password => 'password'
+ }
+ }
+```
+
+For more HTTParty options, check out the [documentation](https://github.com/jnunemaker/httparty).
+
### Custom notifier
Simply put, notifiers are objects which respond to `#call(exception, options)` method. Thus, a lambda can be used as a notifier as follow:
Files old/checksums.yaml.gz and new/checksums.yaml.gz differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/exception_notification.gemspec new/exception_notification.gemspec
--- old/exception_notification.gemspec 2015-12-04 21:45:42.000000000 +0100
+++ new/exception_notification.gemspec 2016-01-07 22:21:05.000000000 +0100
@@ -1,8 +1,7 @@
Gem::Specification.new do |s|
s.name = 'exception_notification'
- s.version = '4.1.2'
+ s.version = '4.1.4'
s.authors = ["Jamis Buck", "Josh Peek"]
- s.date = %q{2015-12-04}
s.summary = "Exception notification for Rails apps"
s.homepage = "http://smartinez87.github.com/exception_notification"
s.email = "smartinez87(a)gmail.com"
@@ -21,7 +20,7 @@
s.add_development_dependency "rails", "~> 4.0"
s.add_development_dependency "resque", "~> 1.2.0"
- # Sidekiq 3.2.2 does not support Ruby 1.9.
+ # Sidekiq 3.2.2 does not support Ruby 1.9.
s.add_development_dependency "sidekiq", "~> 3.0.0", "< 3.2.2"
s.add_development_dependency "tinder", "~> 1.8"
s.add_development_dependency "httparty", "~> 0.10.2"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lib/exception_notifier/base_notifier.rb new/lib/exception_notifier/base_notifier.rb
--- old/lib/exception_notifier/base_notifier.rb 1970-01-01 01:00:00.000000000 +0100
+++ new/lib/exception_notifier/base_notifier.rb 2016-01-07 22:21:05.000000000 +0100
@@ -0,0 +1,25 @@
+module ExceptionNotifier
+ class BaseNotifier
+ attr_accessor :base_options
+
+ def initialize(options={})
+ @base_options = options
+ end
+
+ def send_notice(exception, options, message, message_opts=nil)
+ _pre_callback(exception, options, message, message_opts)
+ result = yield(message, message_opts)
+ _post_callback(exception, options, message, message_opts)
+ result
+ end
+
+ def _pre_callback(exception, options, message, message_opts)
+ @base_options[:pre_callback].call(options, self, exception.backtrace, message, message_opts) if @base_options[:pre_callback].respond_to?(:call)
+ end
+
+ def _post_callback(exception, options, message, message_opts)
+ @base_options[:post_callback].call(options, self, exception.backtrace, message, message_opts) if @base_options[:post_callback].respond_to?(:call)
+ end
+
+ end
+end
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lib/exception_notifier/campfire_notifier.rb new/lib/exception_notifier/campfire_notifier.rb
--- old/lib/exception_notifier/campfire_notifier.rb 2015-12-04 21:45:42.000000000 +0100
+++ new/lib/exception_notifier/campfire_notifier.rb 2016-01-07 22:21:05.000000000 +0100
@@ -1,11 +1,12 @@
module ExceptionNotifier
- class CampfireNotifier
+ class CampfireNotifier < BaseNotifier
attr_accessor :subdomain
attr_accessor :token
attr_accessor :room
def initialize(options)
+ super
begin
subdomain = options.delete(:subdomain)
room_name = options.delete(:room_name)
@@ -20,7 +21,9 @@
if active?
message = "A new exception occurred: '#{exception.message}'"
message += " on '#{exception.backtrace.first}'" if exception.backtrace
- @room.paste message message
+ send_notice(exception, options, message) do |msg, _|
+ @room.paste msg
+ end
end
end
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lib/exception_notifier/email_notifier.rb new/lib/exception_notifier/email_notifier.rb
--- old/lib/exception_notifier/email_notifier.rb 2015-12-04 21:45:42.000000000 +0100
+++ new/lib/exception_notifier/email_notifier.rb 2016-01-07 22:21:05.000000000 +0100
@@ -4,7 +4,9 @@
require 'pp'
module ExceptionNotifier
- class EmailNotifier < Struct.new(:sender_address, :exception_recipients,
+ class EmailNotifier < BaseNotifier
+ attr_accessor(:sender_address, :exception_recipients,
+ :pre_callback, :post_callback,
:email_prefix, :email_format, :sections, :background_sections,
:verbose_subject, :normalize_subject, :delivery_method, :mailer_settings,
:email_headers, :mailer_parent, :template_path, :deliver_with)
@@ -78,6 +80,12 @@
end
end
+ helper_method :safe_encode
+
+ def safe_encode(value)
+ value.encode("utf-8", invalid: :replace, undef: :replace, replace: "_")
+ end
+
def html_mail?
@options[:email_format] == :html
end
@@ -115,20 +123,22 @@
end
def initialize(options)
+ super
delivery_method = (options[:delivery_method] || :smtp)
mailer_settings_key = "#{delivery_method}_settings".to_sym
options[:mailer_settings] = options.delete(mailer_settings_key)
- super(*options.reverse_merge(EmailNotifier.default_options).values_at(
+ options.reverse_merge(EmailNotifier.default_options).select{|k,v|[
:sender_address, :exception_recipients,
+ :pre_callback, :post_callback,
:email_prefix, :email_format, :sections, :background_sections,
:verbose_subject, :normalize_subject, :delivery_method, :mailer_settings,
- :email_headers, :mailer_parent, :template_path, :deliver_with))
+ :email_headers, :mailer_parent, :template_path, :deliver_with].include?(k)}.each{|k,v| send("#{k}=", v)}
end
def options
@options ||= {}.tap do |opts|
- each_pair { |k,v| opts[k] = v }
+ self.instance_variables.each { |var| opts[var[1..-1].to_sym] = self.instance_variable_get(var) }
end
end
@@ -147,9 +157,13 @@
env = options[:env]
default_options = self.options
if env.nil?
- mailer.background_exception_notification(exception, options, default_options)
+ send_notice(exception, options, nil, default_options) do |_, default_opts|
+ mailer.background_exception_notification(exception, options, default_opts)
+ end
else
- mailer.exception_notification(env, exception, options, default_options)
+ send_notice(exception, options, nil, default_options) do |_, default_opts|
+ mailer.exception_notification(env, exception, options, default_opts)
+ end
end
end
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lib/exception_notifier/hipchat_notifier.rb new/lib/exception_notifier/hipchat_notifier.rb
--- old/lib/exception_notifier/hipchat_notifier.rb 2015-12-04 21:45:42.000000000 +0100
+++ new/lib/exception_notifier/hipchat_notifier.rb 2016-01-07 22:21:05.000000000 +0100
@@ -1,11 +1,12 @@
module ExceptionNotifier
- class HipchatNotifier
+ class HipchatNotifier < BaseNotifier
attr_accessor :from
attr_accessor :room
attr_accessor :message_options
def initialize(options)
+ super
begin
api_token = options.delete(:api_token)
room_name = options.delete(:room_name)
@@ -15,7 +16,7 @@
@from = options.delete(:from) || 'Exception'
@room = HipChat::Client.new(api_token, opts)[room_name]
@message_template = options.delete(:message_template) || ->(exception) {
- msg = "A new exception occurred: '#{exception.message}'"
+ msg = "A new exception occurred: '#{Rack::Utils.escape_html(exception.message)}'"
msg += " on '#{exception.backtrace.first}'" if exception.backtrace
msg
}
@@ -30,7 +31,9 @@
return if !active?
message = @message_template.call(exception)
- @room.send(@from, message, @message_options)
+ send_notice(exception, options, message, @message_options) do |msg, message_opts|
+ @room.send(@from, msg, message_opts)
+ end
end
private
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lib/exception_notifier/irc_notifier.rb new/lib/exception_notifier/irc_notifier.rb
--- old/lib/exception_notifier/irc_notifier.rb 2015-12-04 21:45:42.000000000 +0100
+++ new/lib/exception_notifier/irc_notifier.rb 2016-01-07 22:21:05.000000000 +0100
@@ -1,6 +1,7 @@
module ExceptionNotifier
- class IrcNotifier
+ class IrcNotifier < BaseNotifier
def initialize(options)
+ super
@config = OpenStruct.new
parse_options(options)
end
@@ -8,7 +9,11 @@
def call(exception, options={})
message = "'#{exception.message}'"
message += " on '#{exception.backtrace.first}'" if exception.backtrace
- send_message([*(a)config.prefix, *message].join(' ')) if active?
+ if active?
+ send_notice(exception, options, message) do |msg, _|
+ send_message([*(a)config.prefix, *msg].join(' '))
+ end
+ end
end
def send_message(message)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lib/exception_notifier/slack_notifier.rb new/lib/exception_notifier/slack_notifier.rb
--- old/lib/exception_notifier/slack_notifier.rb 2015-12-04 21:45:42.000000000 +0100
+++ new/lib/exception_notifier/slack_notifier.rb 2016-01-07 22:21:05.000000000 +0100
@@ -1,10 +1,11 @@
module ExceptionNotifier
- class SlackNotifier
+ class SlackNotifier < BaseNotifier
include ExceptionNotifier::BacktraceCleaner
attr_accessor :notifier
def initialize(options)
+ super
begin
@ignore_data_if = options[:ignore_data_if]
@@ -38,7 +39,11 @@
attchs = [color: 'danger', text: text, fields: fields, mrkdwn_in: %w(text fields)]
- @notifier.ping '', @message_opts.merge(attachments: attchs) if valid?
+ if valid?
+ send_notice(exception, options, clean_message, @message_opts.merge(attachments: attchs)) do |msg, message_opts|
+ @notifier.ping '', message_opts
+ end
+ end
end
protected
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lib/exception_notifier/views/exception_notifier/_environment.text.erb new/lib/exception_notifier/views/exception_notifier/_environment.text.erb
--- old/lib/exception_notifier/views/exception_notifier/_environment.text.erb 2015-12-04 21:45:42.000000000 +0100
+++ new/lib/exception_notifier/views/exception_notifier/_environment.text.erb 2016-01-07 22:21:05.000000000 +0100
@@ -1,5 +1,5 @@
<% filtered_env = @request.filtered_env -%>
<% max = filtered_env.keys.map(&:to_s).max { |a, b| a.length <=> b.length } -%>
<% filtered_env.keys.map(&:to_s).sort.each do |key| -%>
-* <%= raw("%-*s: %s" % [max.length, key, inspect_object(filtered_env[key])]) %>
+* <%= raw safe_encode("%-*s: %s" % [max.length, key, inspect_object(filtered_env[key])]) %>
<% end -%>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lib/exception_notifier/views/exception_notifier/_request.text.erb new/lib/exception_notifier/views/exception_notifier/_request.text.erb
--- old/lib/exception_notifier/views/exception_notifier/_request.text.erb 2015-12-04 21:45:42.000000000 +0100
+++ new/lib/exception_notifier/views/exception_notifier/_request.text.erb 2016-01-07 22:21:05.000000000 +0100
@@ -1,7 +1,7 @@
-* URL : <%= raw @request.url %>
+* URL : <%= raw safe_encode @request.url %>
* HTTP Method: <%= raw @request.request_method %>
* IP address : <%= raw @request.remote_ip %>
-* Parameters : <%= raw @request.filtered_parameters.inspect %>
+* Parameters : <%= raw safe_encode @request.filtered_parameters.inspect %>
* Timestamp : <%= raw Time.current %>
* Server : <%= raw Socket.gethostname %>
<% if defined?(Rails) && Rails.respond_to?(:root) %>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lib/exception_notifier/webhook_notifier.rb new/lib/exception_notifier/webhook_notifier.rb
--- old/lib/exception_notifier/webhook_notifier.rb 2015-12-04 21:45:42.000000000 +0100
+++ new/lib/exception_notifier/webhook_notifier.rb 2016-01-07 22:21:05.000000000 +0100
@@ -1,9 +1,10 @@
require 'action_dispatch'
module ExceptionNotifier
- class WebhookNotifier
+ class WebhookNotifier < BaseNotifier
def initialize(options)
+ super
@default_options = options
end
@@ -23,7 +24,7 @@
options[:body][:exception] = {:error_class => exception.class.to_s,
:message => exception.message.inspect,
:backtrace => exception.backtrace}
- options[:body][:data] = (env['exception_notifier.exception_data'] || {}).merge(options[:data] || {})
+ options[:body][:data] = (env && env['exception_notifier.exception_data'] || {}).merge(options[:data] || {})
unless env.nil?
request = ActionDispatch::Request.new(env)
@@ -38,8 +39,9 @@
options[:body][:session] = request.session
options[:body][:environment] = request.filtered_env
end
-
- HTTParty.send(http_method, url, options)
+ send_notice(exception, options, nil, @default_options) do |msg, opts|
+ HTTParty.send(http_method, url, opts)
+ end
end
end
end
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lib/exception_notifier.rb new/lib/exception_notifier.rb
--- old/lib/exception_notifier.rb 2015-12-04 21:45:42.000000000 +0100
+++ new/lib/exception_notifier.rb 2016-01-07 22:21:05.000000000 +0100
@@ -1,6 +1,7 @@
require 'logger'
require 'active_support/core_ext/string/inflections'
require 'active_support/core_ext/module/attribute_accessors'
+require 'exception_notifier/base_notifier'
module ExceptionNotifier
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/metadata new/metadata
--- old/metadata 2015-12-04 21:45:42.000000000 +0100
+++ new/metadata 2016-01-07 22:21:05.000000000 +0100
@@ -1,7 +1,7 @@
--- !ruby/object:Gem::Specification
name: exception_notification
version: !ruby/object:Gem::Version
- version: 4.1.2
+ version: 4.1.4
platform: ruby
authors:
- Jamis Buck
@@ -9,7 +9,7 @@
autorequire:
bindir: bin
cert_chain: []
-date: 2015-12-04 00:00:00.000000000 Z
+date: 2016-01-07 00:00:00.000000000 Z
dependencies:
- !ruby/object:Gem::Dependency
name: actionmailer
@@ -242,6 +242,7 @@
- lib/exception_notification/resque.rb
- lib/exception_notification/sidekiq.rb
- lib/exception_notifier.rb
+- lib/exception_notifier/base_notifier.rb
- lib/exception_notifier/campfire_notifier.rb
- lib/exception_notifier/email_notifier.rb
- lib/exception_notifier/hipchat_notifier.rb
@@ -353,7 +354,7 @@
version: 1.8.11
requirements: []
rubyforge_project:
-rubygems_version: 2.4.5
+rubygems_version: 2.4.5.1
signing_key:
specification_version: 4
summary: Exception notification for Rails apps
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/test/dummy/config/environment.rb new/test/dummy/config/environment.rb
--- old/test/dummy/config/environment.rb 2015-12-04 21:45:42.000000000 +0100
+++ new/test/dummy/config/environment.rb 2016-01-07 22:21:05.000000000 +0100
@@ -8,7 +8,9 @@
:exception_recipients => %w{dummyexceptions(a)example.com},
:email_headers => { "X-Custom-Header" => "foobar" },
:sections => ['new_section', 'request', 'session', 'environment', 'backtrace'],
- :background_sections => %w(new_bkg_section backtrace data)
+ :background_sections => %w(new_bkg_section backtrace data),
+ :pre_callback => proc { |opts, notifier, backtrace, message, message_opts| message_opts[:pre_callback_called] = 1 },
+ :post_callback => proc { |opts, notifier, backtrace, message, message_opts| message_opts[:post_callback_called] = 1 }
}
# Initialize the rails application
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/test/exception_notifier/campfire_notifier_test.rb new/test/exception_notifier/campfire_notifier_test.rb
--- old/test/exception_notifier/campfire_notifier_test.rb 2015-12-04 21:45:42.000000000 +0100
+++ new/test/exception_notifier/campfire_notifier_test.rb 2016-01-07 22:21:05.000000000 +0100
@@ -46,6 +46,30 @@
assert_nil campfire.call(fake_exception)
end
+ test "should call pre/post_callback if specified" do
+ pre_callback_called, post_callback_called = 0,0
+ Tinder::Campfire.stubs(:new).returns(Object.new)
+
+ campfire = ExceptionNotifier::CampfireNotifier.new(
+ {
+ :subdomain => 'test',
+ :token => 'test_token',
+ :room_name => 'test_room',
+ :pre_callback => proc { |opts, notifier, backtrace, message, message_opts|
+ pre_callback_called += 1
+ },
+ :post_callback => proc { |opts, notifier, backtrace, message, message_opts|
+ post_callback_called += 1
+ }
+ }
+ )
+ campfire.room = Object.new
+ campfire.room.stubs(:paste).returns(fake_notification)
+ campfire.call(fake_exception)
+ assert_equal(1, pre_callback_called)
+ assert_equal(1, post_callback_called)
+ end
+
private
def fake_notification
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/test/exception_notifier/email_notifier_test.rb new/test/exception_notifier/email_notifier_test.rb
--- old/test/exception_notifier/email_notifier_test.rb 2015-12-04 21:45:42.000000000 +0100
+++ new/test/exception_notifier/email_notifier_test.rb 2016-01-07 22:21:05.000000000 +0100
@@ -13,6 +13,11 @@
end
end
+ test "should call pre/post_callback if specified" do
+ assert_equal @email_notifier.options[:pre_callback_called], 1
+ assert_equal @email_notifier.options[:post_callback_called], 1
+ end
+
test "should have default sender address overridden" do
assert_equal @email_notifier.sender_address, %("Dummy Notifier" <dummynotifier(a)example.com>)
end
@@ -150,6 +155,26 @@
assert_nil @ignored_mail
end
+ test "should encode environment strings" do
+ email_notifier = ExceptionNotifier::EmailNotifier.new(
+ :sender_address => "<dummynotifier(a)example.com>",
+ :exception_recipients => %w{dummyexceptions(a)example.com},
+ :deliver_with => :deliver_now
+ )
+
+ mail = email_notifier.create_email(
+ @exception,
+ :env => {
+ "REQUEST_METHOD" => "GET",
+ "rack.input" => "",
+ "invalid_encoding" => "R\xC3\xA9sum\xC3\xA9".force_encoding(Encoding::ASCII),
+ },
+ :email_format => :text
+ )
+
+ assert_match /invalid_encoding\s+: R__sum__/, mail.encoded
+ end
+
if defined?(Rails) && ('4.2'...'5.0').cover?(Rails.version)
test "should be able to specify ActionMailer::MessageDelivery method" do
email_notifier = ExceptionNotifier::EmailNotifier.new(
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/test/exception_notifier/hipchat_notifier_test.rb new/test/exception_notifier/hipchat_notifier_test.rb
--- old/test/exception_notifier/hipchat_notifier_test.rb 2015-12-04 21:45:42.000000000 +0100
+++ new/test/exception_notifier/hipchat_notifier_test.rb 2016-01-07 22:21:05.000000000 +0100
@@ -16,6 +16,24 @@
hipchat.call(fake_exception)
end
+ test "should call pre/post_callback if specified" do
+ pre_callback_called, post_callback_called = 0,0
+ options = {
+ :api_token => 'good_token',
+ :room_name => 'room_name',
+ :color => 'yellow',
+ :pre_callback => proc { |*| pre_callback_called += 1},
+ :post_callback => proc { |*| post_callback_called += 1}
+ }
+
+ HipChat::Room.any_instance.expects(:send).with('Exception', fake_body, { :color => 'yellow' }.merge(options.except(:api_token, :room_name)))
+
+ hipchat = ExceptionNotifier::HipchatNotifier.new(options)
+ hipchat.call(fake_exception)
+ assert_equal(1, pre_callback_called)
+ assert_equal(1, post_callback_called)
+ end
+
test "should send hipchat notification without backtrace info if properly configured" do
options = {
:api_token => 'good_token',
@@ -86,6 +104,22 @@
hipchat.call(fake_exception)
end
+ test "should send hipchat notification with HTML-escaped meessage if using default message_template" do
+ options = {
+ :api_token => 'good_token',
+ :room_name => 'room_name',
+ :color => 'yellow',
+ }
+
+ exception = fake_exception_with_html_characters
+ body = "A new exception occurred: '#{Rack::Utils.escape_html(exception.message)}' on '#{exception.backtrace.first}'"
+
+ HipChat::Room.any_instance.expects(:send).with('Exception', body, { :color => 'yellow' })
+
+ hipchat = ExceptionNotifier::HipchatNotifier.new(options)
+ hipchat.call(exception)
+ end
+
test "should use APIv1 if api_version is not specified" do
options = {
:api_token => 'good_token',
@@ -123,6 +157,14 @@
rescue Exception => e
e
end
+ end
+
+ def fake_exception_with_html_characters
+ exception = begin
+ raise StandardError.new('an error with <html> characters')
+ rescue Exception => e
+ e
+ end
end
def fake_body_without_backtrace
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/test/exception_notifier/irc_notifier_test.rb new/test/exception_notifier/irc_notifier_test.rb
--- old/test/exception_notifier/irc_notifier_test.rb 2015-12-04 21:45:42.000000000 +0100
+++ new/test/exception_notifier/irc_notifier_test.rb 2016-01-07 22:21:05.000000000 +0100
@@ -16,6 +16,25 @@
irc.call(fake_exception)
end
+ test "should call pre/post_callback if specified" do
+ pre_callback_called, post_callback_called = 0,0
+
+ options = {
+ :domain => 'irc.example.com',
+ :pre_callback => proc { |*| pre_callback_called += 1},
+ :post_callback => proc { |*| post_callback_called += 1}
+ }
+
+ CarrierPigeon.expects(:send).with(has_key(:uri)) do |v|
+ /divided by 0/.match(v[:message])
+ end
+
+ irc = ExceptionNotifier::IrcNotifier.new(options)
+ irc.call(fake_exception)
+ assert_equal(1, pre_callback_called)
+ assert_equal(1, post_callback_called)
+ end
+
test "should send irc notification without backtrace info if properly configured" do
options = {
:domain => 'irc.example.com'
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/test/exception_notifier/slack_notifier_test.rb new/test/exception_notifier/slack_notifier_test.rb
--- old/test/exception_notifier/slack_notifier_test.rb 2015-12-04 21:45:42.000000000 +0100
+++ new/test/exception_notifier/slack_notifier_test.rb 2016-01-07 22:21:05.000000000 +0100
@@ -110,6 +110,35 @@
slack_notifier.call(@exception, notification_options)
end
+ test "should call pre/post_callback proc if specified" do
+ post_callback_called = 0
+ options = {
+ webhook_url: "http://slack.webhook.url",
+ username: "test",
+ custom_hook: "hook",
+ :pre_callback => proc { |opts, notifier, backtrace, message, message_opts|
+ (message_opts[:attachments] = []) << { text: "#{backtrace.join("\n")}", color: 'danger' }
+ },
+ :post_callback => proc { |opts, notifier, backtrace, message, message_opts|
+ post_callback_called = 1
+ },
+ additional_parameters: {
+ icon_url: "icon",
+ }
+ }
+
+ Slack::Notifier.any_instance.expects(:ping).with('',
+ {:icon_url => 'icon',
+ :attachments => [
+ {:text => "backtrace line 1\nbacktrace line 2",
+ :color => 'danger'}
+ ]})
+
+ slack_notifier = ExceptionNotifier::SlackNotifier.new(options)
+ slack_notifier.call(@exception)
+ assert_equal(post_callback_called, 1)
+ end
+
private
def fake_exception
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/test/exception_notifier/webhook_notifier_test.rb new/test/exception_notifier/webhook_notifier_test.rb
--- old/test/exception_notifier/webhook_notifier_test.rb 2015-12-04 21:45:42.000000000 +0100
+++ new/test/exception_notifier/webhook_notifier_test.rb 2016-01-07 22:21:05.000000000 +0100
@@ -25,6 +25,12 @@
assert response[:body][:data][:extra_data].has_key?(:data_item1)
end
+ test "should call pre/post_callback if specified" do
+ HTTParty.stubs(:send).returns(fake_response)
+ webhook = ExceptionNotifier::WebhookNotifier.new({:url => 'http://localhost:8000'})
+ webhook.call(fake_exception)
+ end
+
private
def fake_response
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/test/exception_notifier_test.rb new/test/exception_notifier_test.rb
--- old/test/exception_notifier_test.rb 2015-12-04 21:45:42.000000000 +0100
+++ new/test/exception_notifier_test.rb 2016-01-07 22:21:05.000000000 +0100
@@ -98,4 +98,5 @@
ExceptionNotifier.unregister_exception_notifier(:test)
end
+
end
1
0
Hello community,
here is the log from the commit of package gnu_parallel for openSUSE:Factory checked in at 2016-01-28 17:22:54
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/gnu_parallel (Old)
and /work/SRC/openSUSE:Factory/.gnu_parallel.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "gnu_parallel"
Changes:
--------
--- /work/SRC/openSUSE:Factory/gnu_parallel/gnu_parallel.changes 2015-12-24 12:17:31.000000000 +0100
+++ /work/SRC/openSUSE:Factory/.gnu_parallel.new/gnu_parallel.changes 2016-01-28 17:22:55.000000000 +0100
@@ -1,0 +2,19 @@
+Sun Jan 24 09:26:20 UTC 2016 - mpluskal(a)suse.com
+
+- Update to 20160122
+ * --sql DBURL uses DBURL as storage for jobs and output. It does
+ not run any jobs so it requires at least one --sqlworker. DBURL
+ must point to a table.
+ * --sqlworker DBURL gets jobs from DBURL and stores the result
+ back to DBURL.
+ * --sqlandworker is a shorthand for --sql and --sqlworker.
+ * --sqlworker requires the output of a single job to fit in
+ memory.
+ * --results now also saves a file called 'seq' containing the
+ sequence number.
+ * If $PARALLEL_ENV is a file, then that file will be read into
+ $PARALLEL_ENV.
+ * man parallel_tutorial has been given an overhaul.
+ * --workdir now accepts replacementstrings.
+
+-------------------------------------------------------------------
Old:
----
parallel-20151222.tar.bz2
parallel-20151222.tar.bz2.sig
New:
----
parallel-20160122.tar.bz2
parallel-20160122.tar.bz2.sig
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ gnu_parallel.spec ++++++
--- /var/tmp/diff_new_pack.hpLUys/_old 2016-01-28 17:22:57.000000000 +0100
+++ /var/tmp/diff_new_pack.hpLUys/_new 2016-01-28 17:22:57.000000000 +0100
@@ -1,7 +1,7 @@
#
# spec file for package gnu_parallel
#
-# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -17,7 +17,7 @@
Name: gnu_parallel
-Version: 20151222
+Version: 20160122
Release: 0
Summary: Shell tool for executing jobs in parallel
License: GPL-3.0+
++++++ parallel-20151222.tar.bz2 -> parallel-20160122.tar.bz2 ++++++
++++ 14070 lines of diff (skipped)
++++++ parallel-20151222.tar.bz2.sig -> parallel-20160122.tar.bz2.sig ++++++
--- /work/SRC/openSUSE:Factory/gnu_parallel/parallel-20151222.tar.bz2.sig 2015-12-24 12:17:32.000000000 +0100
+++ /work/SRC/openSUSE:Factory/.gnu_parallel.new/parallel-20160122.tar.bz2.sig 2016-01-28 17:22:56.000000000 +0100
@@ -2,7 +2,7 @@
# To check the signature run:
# echo | gpg
-# gpg --auto-key-locate keyserver --keyserver-options auto-key-retrieve parallel-20151222.tar.bz2.sig
+# gpg --auto-key-locate keyserver --keyserver-options auto-key-retrieve parallel-20160122.tar.bz2.sig
echo | gpg 2>/dev/null
gpg --auto-key-locate keyserver --keyserver-options auto-key-retrieve $0
@@ -11,32 +11,32 @@
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1
-iQTwBAABCgAGBQJWeYTWAAoJENGrRRaIiIiIP+kmoKeCUOFNU0+ltKpu+35MU9JQ
-AzC9jjjer6TucYzAs1LJKgbM1wAm0KQHy34NyURBq752uORytFUlXTj6ET6oIwhv
-AL0viaPNCBLXzPlpgUu7oCHYiSi5D8DwOm9dNtSxwqJkI+q2DuDFTDis41i6SMJ8
-aUPb345YzUvQfPVh5l0VXW/pLNfOV3aht5M85ayRdivBZ7S/67id27h9PbeUSTM9
-612GnoW3fm5arQifQal5ik6H50s6Brm+wPR+FSHFzNBD91zOAqq8kYuijJKx/Hpt
-afqUBwfa1CGOyzJuc4bpffAFZwEoUuH9CJUo13uzCVJ0pVRo/oMXc+/4YQ3ARt/h
-jviXE6YX+vLnOZd3HbOB5dJacH7CnMsXLophPB6SbQsvWmD+2Lj8ZoOtQBQHCfKD
-hXkCo3IG8AA+7wxv2E5kZcYnwqakLeiauFAS3RvO3JrO8+sAKN5R+lsVEOa8ZV4z
-cPkLMYiGdszScosntQU3SlyHykpKonQUnqmB6tlt8kiLTqVij/aU4e9/n00R3cfB
-YlLoOFYTe4zn6f5nv4nN8O26zZtzNJrdJMt1kSeS/VY1W682wpP4ES4wpf+J4ZXZ
-njCbjZyghyT1TtpvSGRm/CppGZHSuYkbNMoHfq5iFWNKf8cPnZEOnAu8RizQgiD0
-Z/7JiEQOTdsKjCBEGUTXenBWfd1Q+cZrBMwMmCWfc5gLPdj9/ovAs7cyA2vhcbe4
-4CxandBXOXPWJrKEmKLuZrDCbPfbeGraG4Js6iYaNtFHTszCz9sO4RjsfPO4Bo9j
-x7UpUptsdAgk0iRUjMhrJY3k4HFpxRhWVYh3Qw1cpQ4wWKnzJDC1fyjoXD4nA0MH
-+xXhAEkRdscslBFluZE+rN8NcKEZ3VSUIXcjz3vYidXPniBq9eLxQgN+kaECkxCO
-zrs0OU963w09xfeZrRW+KuLxhAZXEZPJuaHmIHq51aC+5raLCHA1R7x16+1Moyp0
-JH8psDFNs3gboTeUzfHuO1ioNoln9VOMkARec48iiQyL4TUGw8pmxBGeiAi2AFOE
-OOlR9lm/tZBV76PxUX0K4GlWUDBiurfypYXvOZowR0rAbB5uotoxn5sQSYF1qNcV
-5GscXtRvr41EJI6f3NcrmLw2TzrKjYh4RsGpq/c1mn4Ax6nobqXb5oF4sYX+W7yP
-W6lcIZ75GWBVVdWd6GZ9YIUKq2fZ2wWrgZWuLG7Urp9hC6Cgz8bvLbapJTPQMBWL
-QXOH+UirxLFo3O8xBb1MzrDVz+ib27OZgQbRtOAL7HnNP0G7UV3gQwqXDfe+iPPq
-5kzYxv0CrP6CreUWDfsAl1FBvkbw4BvlT729eY56KZYPBGBT9VZvyVQ4l7R9RU/X
-xAF/Fwse2D18Sy+ylDmeYCUXoBiSDPmF53sORsgEay4viE7rLUypI1EQxErOXwMV
-1d+NP1eP0FprLovHdSiVOnZjuQTpi/uuWyRkoBuu0fXlofvlhTLnvsAvmqfTP8b6
-km5WR9GsNqeIhzbleFlMF7RMvbL1AOY8hfxT1qsnB/GPJQWqFQSAQUjEHU/DjdsI
-0hEel0n2SPzkeRwLrvV5JkSUJ2S/TqwotrJ1YZnxvJhzKVCzgS4ahZs0RSu8mpBe
-EDaqj5KeXIxjLl38K+LLwZSMsA==
-=tHYa
+iQTwBAABCgAGBQJWo0LhAAoJENGrRRaIiIiI7FEmnj2pBNeU+Fg9KhlOHpQp2WhX
+upcnCkXHh9qQuUGGxkbQcNUXNfPwi1EzWOBm//A/lhZi7j8B1pDgTHK3t+mn8GVL
+WWh0IinYTw80rLqGwV+Zll8DBi/O5WTKRyXqDPExvDxge7Y85mLsPcS8SEslG+cK
+pUsLExXijtdjQ+1r8x97+klNIZFQBfhvWB3RHMIZPi+ivFdzVRg0eU7sD22LDPTG
+62PRRECfJwlSjL1F4GJzXztSuIalk42yRy5UUrF64Rx5iPWaJQLX0U7hvqeTz8d+
+YBC3clrqil3hLYLG6Dedh93wQgsEPyTirUXxqThw1ikfaagto1r65ht5Hx9bMIf4
+eK/0LVxVI2tJxVwV4W7TyBC/QykBErlfhHRSuceTTNC0yPks1ia4KDcpTISSQuGH
+gHPBpnML0sHEW1vL3f4JYkLXRl2+Ji4epzY/PBP2P1KbbWqMD7hu8mzHKJw2NKdb
+RnIgPPx7XWUz6MmTm7qqQbHgZtolksAsTs06/M6G+M7TZ9lyopafhLE3Zuj2HJ5r
+5WQRy45wJ+n+vbfkZ+VXv6O7dAOhRdCB/pBpT2a76vRMfrK0X5rcxSyywABh4BlO
+Xq5CMhKu9bqBJtGzu/VvG2gHZkkEjcYtkVRdR7HTQ4FV8Gbq1pEAQ9QXBnQvy13+
+ZbaixIo5Hz+Vi16TIMC+yMg7qRZu9fif9MqtcO+Hl79et0VFaeMRDzKVhkuHA4j9
+GYWSV0K2EzXwTxcvVuPDuGtvYPQbELt5TxekdXQNKAtWU9cCuQ+5X9rVcszgprcd
+faZly4fnd1UPtxsilVfeGm4EAWZxYSBNQiSORhjbcR/jH/Bb3KTL8V2qyVGvgkeo
+kwX0YuUnVoHA82nbKL7Sj/Xuf5ygLBE3ogGIU9CPPASbt64qa4IEZu1MMI+Pa5Vw
+qtrURGfZohObJQ0jKPnMlLcKLlY4MXBQrYnH+xV/6BC5MnFicjncJmtaQ8t+C64+
+jefqIfEzbUVoS2VcORtSvybU+X8nro6ymhOjlCYOFMpIcxHKPSl6p5i2LlfqT8AA
+zYm+il2tcpOI4sSpSurc1XBjImdtEXaBZ33IeOouqiI7KmWI2DV6dvrBHWfNSt8t
+30OWWjp9QLDBBbepfYOHYsvoe9yKtadYHbXLXxst0y2j5oEgSINVOUfGERe3bDt0
+lBG6RLlGD8iC4oCHcnmuayGbO9/kIvOB2Gt98XNe8kfagoDh/stS2LWUy6hx/H8z
+vogCebQmw+xDHQejisIZXogQ0nTj1RwcHtUpGwDOwSIq5TC/eIvi3mifP7LJF/S9
+uMVFwpcTcQFLc6hKJT/3dFppwhE7sGY9o0C0AXyZzPV10hjs4TFpUDtdDbEpq2uQ
+qDfWO+V1cYcVpccU+lQ6u67do2y0qUgrOt53quY+zBRLDUhKnX2SCp+8yvLhkweH
+CggO4/YKzBl3/BMl79K4HRuJrvlxS1lcpgD8yHymObtD1fnxD6TP4fQlCRP8yjvo
+KR3mMvcLDtGntV1XyLrX6lccvUH8IZvpADPrl4opUOZTyWZY92vUuqnuWzvT2QAL
+/fswn6WeUCZJfmRIR2eUMQvLg8F+u8HtenwKKCguxszRaDSIKX4/0B+vkeMuWllZ
+s9DbzSDiWUcm6PpEdT1K+eQG+w==
+=4Qzi
-----END PGP SIGNATURE-----
1
0
Hello community,
here is the log from the commit of package privoxy for openSUSE:Factory checked in at 2016-01-28 17:22:44
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/privoxy (Old)
and /work/SRC/openSUSE:Factory/.privoxy.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "privoxy"
Changes:
--------
--- /work/SRC/openSUSE:Factory/privoxy/privoxy.changes 2015-01-29 09:58:35.000000000 +0100
+++ /work/SRC/openSUSE:Factory/.privoxy.new/privoxy.changes 2016-01-28 17:22:45.000000000 +0100
@@ -1,0 +2,15 @@
+Sat Jan 23 19:46:10 UTC 2016 - astieger(a)suse.com
+
+- Privoxy 3.0.24
+ Includes fixes for two security issues that may be used to
+ remotely trigger crashes on platforms that carefully check memory
+ accesses.
+ * Security fixes (denial of service):
+ + Prevent invalid reads in case of corrupt chunk-encoded
+ content. CVE-2016-1982 [boo#963151]
+ + Remove empty Host headers in client requests. Previously
+ they would result in invalid reads. CVE-2016-1983 [boo#963152]
+ * General bug fixes and improvements
+ * White and blacklist updates
+
+-------------------------------------------------------------------
Old:
----
privoxy-3.0.23-stable-src.tar.gz
New:
----
privoxy-3.0.24-stable-src.tar.gz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ privoxy.spec ++++++
--- /var/tmp/diff_new_pack.2Rk6P8/_old 2016-01-28 17:22:46.000000000 +0100
+++ /var/tmp/diff_new_pack.2Rk6P8/_new 2016-01-28 17:22:46.000000000 +0100
@@ -1,7 +1,7 @@
#
# spec file for package privoxy
#
-# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -30,7 +30,7 @@
%endif
%endif
Name: privoxy
-Version: 3.0.23
+Version: 3.0.24
Release: 0
Summary: The Internet Junkbuster - HTTP Proxy Server
License: GPL-2.0+
@@ -227,7 +227,7 @@
%{_sysconfdir}/NetworkManager/dispatcher.d/privoxyd
%dir %{_sysconfdir}/NetworkManager
%dir %{_sysconfdir}/NetworkManager/dispatcher.d
-%doc %{_mandir}/man1/privoxy.1.gz
+%{_mandir}/man1/privoxy.1.gz
%config(noreplace) %{_sysconfdir}/logrotate.d/privoxy
%dir /%{chroot}/etc
%config(noreplace) /%{chroot}%{_sysconfdir}/config
++++++ privoxy-3.0.23-stable-src.tar.gz -> privoxy-3.0.24-stable-src.tar.gz ++++++
++++ 4407 lines of diff (skipped)
1
0
28 Jan '16
Hello community,
here is the log from the commit of package epiphany-branding-openSUSE for openSUSE:Factory checked in at 2016-01-28 17:22:43
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/epiphany-branding-openSUSE (Old)
and /work/SRC/openSUSE:Factory/.epiphany-branding-openSUSE.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "epiphany-branding-openSUSE"
Changes:
--------
--- /work/SRC/openSUSE:Factory/epiphany-branding-openSUSE/epiphany-branding-SLED.changes 2015-10-30 13:43:37.000000000 +0100
+++ /work/SRC/openSUSE:Factory/.epiphany-branding-openSUSE.new/epiphany-branding-SLED.changes 2016-01-28 17:22:44.000000000 +0100
@@ -1,0 +2,14 @@
+Sat Jan 22 18:30:00 UTC 2016 - dimstar(a)opensuse.org
+
+- Make build not rely on lsb and opensuse-release (no constant
+ rebuild in Tumbleweed):
+ + Drop lsb/lsb-release BuildRequires.
+ + Drop opensuse-release BuildRequires.
+ + Use %{suse_version} in build section to inject proper values
+ into branding.conf. On Tumbleweed we no longer use the snapshot
+ version (which is anyway useless) but simply inject
+ 'Tumbleweed'. We currently detect openSUSE 13.1, 13.2,
+ Leap 42.1, SLE12 and Tumbleweed systems. All others will have
+ 'SUSE/undef' in the browsers user agent string.
+
+-------------------------------------------------------------------
epiphany-branding-openSUSE.changes: same change
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ epiphany-branding-SLED.spec ++++++
--- /var/tmp/diff_new_pack.bLCwb7/_old 2016-01-28 17:22:45.000000000 +0100
+++ /var/tmp/diff_new_pack.bLCwb7/_new 2016-01-28 17:22:45.000000000 +0100
@@ -1,7 +1,7 @@
#
# spec file for package epiphany-branding-SLED
#
-# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -38,13 +38,6 @@
# WARNING: As this package conflicts with epiphany-branding-SLED, you cannot
# reuse build root. You have to build in a clean build root every time!
BuildRequires: epiphany-branding-upstream >= 3.11.2
-%if 0%{suse_version} > 1110
-BuildRequires: lsb-release
-%else
-BuildRequires: lsb
-%endif
-BuildRequires: suse-release
-%define distro_version %(lsb_release -r -s)
%define epiphany_version %(rpm -q --qf '%%{version}' epiphany)
Requires: epiphany = %{epiphany_version}
Provides: epiphany-branding = %{epiphany_version}
@@ -71,7 +64,28 @@
cp -a %{SOURCE0} .
%build
-sed "s,@distroversion@,%{distro_version},g;s,@pkgversion@,%{epiphany_version},g" %{SOURCE1} > branding.conf
+case "%{?suse_version}" in
+ 1330)
+ DISTRO="Tumbleweed"
+ ;;
+ 1320)
+ DISTRO="13.2"
+ ;;
+ 1315)
+%if %{?is_opensuse}
+ DISTRO="Leap 42.1"
+%else
+ DISTRO="SLE12"
+%endif
+ ;;
+ 1310)
+ DISTRO="13.1"
+ ;;
+ *)
+ DISTRO="undef"
+ ;;
+esac
+sed "s,@distroversion@,$DISTRO,g;s,@pkgversion@,%{epiphany_version},g" %{SOURCE1} > branding.conf
%install
# custom bookmarks
epiphany-branding-openSUSE.spec: same change
++++++ epiphany-branding.changes.in ++++++
--- /var/tmp/diff_new_pack.bLCwb7/_old 2016-01-28 17:22:45.000000000 +0100
+++ /var/tmp/diff_new_pack.bLCwb7/_new 2016-01-28 17:22:45.000000000 +0100
@@ -1,4 +1,18 @@
-------------------------------------------------------------------
+Sat Jan 22 18:30:00 UTC 2016 - dimstar(a)opensuse.org
+
+- Make build not rely on lsb and opensuse-release (no constant
+ rebuild in Tumbleweed):
+ + Drop lsb/lsb-release BuildRequires.
+ + Drop opensuse-release BuildRequires.
+ + Use %{suse_version} in build section to inject proper values
+ into branding.conf. On Tumbleweed we no longer use the snapshot
+ version (which is anyway useless) but simply inject
+ 'Tumbleweed'. We currently detect openSUSE 13.1, 13.2,
+ Leap 42.1, SLE12 and Tumbleweed systems. All others will have
+ 'SUSE/undef' in the browsers user agent string.
+
+-------------------------------------------------------------------
Mon Oct 12 15:23:23 UTC 2015 - zaitor(a)opensuse.org
- Bump version to 42.1, to prepare for next version of openSUSE.
++++++ epiphany-branding.spec.in ++++++
--- /var/tmp/diff_new_pack.bLCwb7/_old 2016-01-28 17:22:45.000000000 +0100
+++ /var/tmp/diff_new_pack.bLCwb7/_new 2016-01-28 17:22:45.000000000 +0100
@@ -37,13 +37,6 @@
# WARNING: As this package conflicts with epiphany-branding-%{branding_name}, you cannot
# reuse build root. You have to build in a clean build root every time!
BuildRequires: epiphany-branding-upstream >= 3.11.2
-%if 0%{suse_version} > 1110
-BuildRequires: lsb-release
-%else
-BuildRequires: lsb
-%endif
-BuildRequires: suse-release
-%define distro_version %(lsb_release -r -s)
%define epiphany_version %(rpm -q --qf '%%{version}' epiphany)
Requires: epiphany = %{epiphany_version}
Provides: epiphany-branding = %{epiphany_version}
@@ -70,7 +63,28 @@
cp -a %{SOURCE0} .
%build
-sed "s,@distroversion@,%{distro_version},g;s,@pkgversion@,%{epiphany_version},g" %{SOURCE1} > branding.conf
+case "%{?suse_version}" in
+ 1330)
+ DISTRO="Tumbleweed"
+ ;;
+ 1320)
+ DISTRO="13.2"
+ ;;
+ 1315)
+%if %{?is_opensuse}
+ DISTRO="Leap 42.1"
+%else
+ DISTRO="SLE12"
+%endif
+ ;;
+ 1310)
+ DISTRO="13.1"
+ ;;
+ *)
+ DISTRO="undef"
+ ;;
+esac
+sed "s,@distroversion@,$DISTRO,g;s,@pkgversion@,%{epiphany_version},g" %{SOURCE1} > branding.conf
%install
# custom bookmarks
1
0
Hello community,
here is the log from the commit of package dateutils for openSUSE:Factory checked in at 2016-01-28 17:22:39
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/dateutils (Old)
and /work/SRC/openSUSE:Factory/.dateutils.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "dateutils"
Changes:
--------
--- /work/SRC/openSUSE:Factory/dateutils/dateutils.changes 2016-01-12 16:13:29.000000000 +0100
+++ /work/SRC/openSUSE:Factory/.dateutils.new/dateutils.changes 2016-01-28 17:22:40.000000000 +0100
@@ -1,0 +2,10 @@
+Fri Jan 22 22:45:28 UTC 2016 - sweet_f_a(a)gmx.de
+
+- bump version 0.3.5, this is a bugfix release.
+ * Bugfixes:
+ - bug/40, distinguish between numerals-only dates and durations
+ - tests will succeed independent of current date
+ * See info page examples and/or README.
+- remove dateutils-0.3.4-fix-test-126.patch (upstream applied)
+
+-------------------------------------------------------------------
Old:
----
dateutils-0.3.4-fix-test-126.patch
dateutils-0.3.4.tar.xz
New:
----
dateutils-0.3.5.tar.xz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ dateutils.spec ++++++
--- /var/tmp/diff_new_pack.Abpt6b/_old 2016-01-28 17:22:41.000000000 +0100
+++ /var/tmp/diff_new_pack.Abpt6b/_new 2016-01-28 17:22:41.000000000 +0100
@@ -16,7 +16,7 @@
#
-%define xversion 0.3.4
+%define xversion 0.3.5
%define have_octave 0
@@ -39,15 +39,13 @@
%endif
Name: dateutils
-Version: 0.3.4
+Version: 0.3.5
Release: 0
Summary: Nifty command line date and time utilities
License: BSD-3-Clause
Group: Productivity/Text/Utilities
Url: https://github.com/hroptatyr/dateutils/
Source: https://bitbucket.org/hroptatyr/dateutils/downloads/%{name}-%{version}.tar.…
-# PATCH-FIX-UPSTREAM dateutils-0.3.4-fix-test-126 -- Fix the test that was failing due to year change (from upstream)
-Patch: dateutils-0.3.4-fix-test-126.patch
BuildRequires: pkgconfig
BuildRequires: xz
%if 0%{?suse_version}
@@ -80,7 +78,6 @@
%prep
%setup -q -n %{name}-%{xversion}
-%patch -p1
%build
%configure \
++++++ dateutils-0.3.4.tar.xz -> dateutils-0.3.5.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/dateutils-0.3.4/.version new/dateutils-0.3.5/.version
--- old/dateutils-0.3.4/.version 2015-08-28 14:07:53.000000000 +0200
+++ new/dateutils-0.3.5/.version 2016-01-22 12:03:34.000000000 +0100
@@ -1 +1 @@
-v0.3.4
+v0.3.5
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/dateutils-0.3.4/README.md new/dateutils-0.3.5/README.md
--- old/dateutils-0.3.4/README.md 2015-08-28 14:04:43.000000000 +0200
+++ new/dateutils-0.3.5/README.md 2016-01-22 12:01:32.000000000 +0100
@@ -38,8 +38,8 @@
Examples
========
-I love everything to be explained by example to get a first
-impression. So here it comes.
+I love everything explained by example to get a first impression.
+So here it comes.
dateseq
-------
@@ -258,6 +258,18 @@
=>
2011-08-01
+ Find the next Monday from the current date (today is 2016-01-08):
+
+ $ dateround today Mon
+ =>
+ 2015-01-11
+
+ Go back to last September, then round to the end of the month:
+
+ $ dateround today -- -Sep +31d
+ =>
+ 2015-09-30
+
Round a stream of dates strictly to the next month's first:
$ dateround -S -n 1 <<EOF
@@ -309,9 +321,12 @@
datesort
-----
- New in the 0.3 series of dateutils.
A tool to bring the lines of a file into chronological order.
+ At the moment the `datesort` tool depends on `sort(1)` with support
+ for fields, in particular `-t` to select a separator and `-k` to sort
+ by a particular field.
+
$ datesort <<EOF
2009-06-03 caev="DVCA" secu="VOD" exch="XLON" xdte="2009-06-03" nett/GBX="5.2"
2011-11-16 caev="DVCA" secu="VOD" exch="XLON" xdte="2011-11-16" nett/GBX="3.05"
@@ -328,12 +343,9 @@
2013-06-12 caev="DVCA" secu="VOD" exch="XLON" xdte="2013-06-12" nett/GBX="6.92"
2013-11-20 caev="DVCA" secu="VOD" exch="XLON" xdte="2013-11-20" nett/GBX="3.53"
- At the moment the `datesort` tool is built upon `sort(1)` and `cut(1)`.
-
datezone
--------
- New in the 0.3 series of dateutils.
A tool to quickly inspect date/time values in different timezones.
The result will be a matrix that shows every date-time value in every
timezone:
@@ -363,25 +375,29 @@
strptime
--------
- A tool that brings the flexibility of strptime(3) to the command
- line. While date(1) has support for output formats, it lacks any kind
- of support to read arbitrary input from the domain of dates, in
- particular when the input format is specifically known beforehand and
- only matching dates/times shall be considered.
-
- Usually, to print something like `Mon, May-01/2000` in ISO 8601,
- people come up with the most prolific recommendations like using perl
- or sed or awk or any two of them, or they come up with a pageful of
- shell code full of bashisms, and when sufficiently pestered they
- "improve" their variant to a dozen pages of portable shell code.
+ A tool that brings the flexibility of [`strptime(3)`][1] to the
+ command line. While (at least GNU) [`date(1)`][2] has support for
+ output formats, it lacks any kind of support to read arbitrary input
+ from the domain of dates, in particular when the input format is
+ specifically known beforehand and only matching dates/times shall be
+ considered.
- The strptime tool does the job just fine
+ With the `strptime` tool reading weird dates like `Mon, May-01/2000`
+ becomes a matter of
strptime -i "%a, %b-%d/%Y" "Mon, May-01/2000"
=>
2000-05-01
- just like you would have done in C.
+ just as you would have done in C.
+
+ Note that `strptime` actually uses the system libc's strptime routine,
+ and for output the system's strftime routine. Input and output
+ modifiers will therefore vary between systems.
+
+ For a portable parser/printer combination use `dateconv` as described
+ above. Its input and output format specifiers are independent of the
+ C runtime.
Similar projects
@@ -396,6 +412,10 @@
Use the one that best fits your purpose. And in case you happen to like
mine, vote: [dateutils' openhub page](https://www.openhub.net/p/dateutils)
+
+ [1]: http://linux.die.net/man/3/strptime
+ [2]: http://linux.die.net/man/1/date
+
<!--
Local variables:
mode: auto-fill
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/dateutils-0.3.4/build-aux/yuck-scmver.c new/dateutils-0.3.5/build-aux/yuck-scmver.c
--- old/dateutils-0.3.4/build-aux/yuck-scmver.c 2015-08-28 14:04:43.000000000 +0200
+++ new/dateutils-0.3.5/build-aux/yuck-scmver.c 2016-01-22 12:01:32.000000000 +0100
@@ -1,6 +1,6 @@
/*** yuck-scmver.c -- snarf versions off project cwds
*
- * Copyright (C) 2013-2015 Sebastian Freundt
+ * Copyright (C) 2013-2016 Sebastian Freundt
*
* Author: Sebastian Freundt <freundt(a)ga-group.nl>
*
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/dateutils-0.3.4/build-aux/yuck-scmver.h new/dateutils-0.3.5/build-aux/yuck-scmver.h
--- old/dateutils-0.3.4/build-aux/yuck-scmver.h 2015-08-28 14:04:43.000000000 +0200
+++ new/dateutils-0.3.5/build-aux/yuck-scmver.h 2016-01-22 12:01:32.000000000 +0100
@@ -1,6 +1,6 @@
/*** yuck-version.h -- snarf versions off project cwds
*
- * Copyright (C) 2013-2015 Sebastian Freundt
+ * Copyright (C) 2013-2016 Sebastian Freundt
*
* Author: Sebastian Freundt <freundt(a)ga-group.nl>
*
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/dateutils-0.3.4/build-aux/yuck.c new/dateutils-0.3.5/build-aux/yuck.c
--- old/dateutils-0.3.4/build-aux/yuck.c 2015-08-28 14:04:43.000000000 +0200
+++ new/dateutils-0.3.5/build-aux/yuck.c 2016-01-22 12:01:32.000000000 +0100
@@ -1,6 +1,6 @@
/*** yuck.c -- generate umbrella commands
*
- * Copyright (C) 2013-2015 Sebastian Freundt
+ * Copyright (C) 2013-2016 Sebastian Freundt
*
* Author: Sebastian Freundt <freundt(a)ga-group.nl>
*
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/dateutils-0.3.4/configure new/dateutils-0.3.5/configure
--- old/dateutils-0.3.4/configure 2015-08-28 14:07:45.000000000 +0200
+++ new/dateutils-0.3.5/configure 2016-01-22 12:03:27.000000000 +0100
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.68 for dateutils 0.3.4.
+# Generated by GNU Autoconf 2.68 for dateutils 0.3.5.
#
# Report bugs to <https://github.com/hroptatyr/dateutils/issues>.
#
@@ -14,7 +14,7 @@
# gives unlimited permission to copy, distribute and modify it.
#
# # #### Configuration script for dateutils and friends.
-# #### Copyright (C) 2011-2015 Sebastian Freundt
+# #### Copyright (C) 2011-2016 Sebastian Freundt
#
# ### Don't edit this script!
# ### This script was automatically generated by the `autoconf' program
@@ -580,8 +580,8 @@
# Identity of this package.
PACKAGE_NAME='dateutils'
PACKAGE_TARNAME='dateutils'
-PACKAGE_VERSION='0.3.4'
-PACKAGE_STRING='dateutils 0.3.4'
+PACKAGE_VERSION='0.3.5'
+PACKAGE_STRING='dateutils 0.3.5'
PACKAGE_BUGREPORT='https://github.com/hroptatyr/dateutils/issues'
PACKAGE_URL=''
@@ -1487,7 +1487,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 dateutils 0.3.4 to adapt to many kinds of systems.
+\`configure' configures dateutils 0.3.5 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1557,7 +1557,7 @@
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of dateutils 0.3.4:";;
+ short | recursive ) echo "Configuration of dateutils 0.3.5:";;
esac
cat <<\_ACEOF
@@ -1702,7 +1702,7 @@
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-dateutils configure 0.3.4
+dateutils configure 0.3.5
generated by GNU Autoconf 2.68
Copyright (C) 2010 Free Software Foundation, Inc.
@@ -1710,7 +1710,7 @@
gives unlimited permission to copy, distribute and modify it.
#### Configuration script for dateutils and friends.
-#### Copyright (C) 2011-2015 Sebastian Freundt
+#### Copyright (C) 2011-2016 Sebastian Freundt
### Don't edit this script!
### This script was automatically generated by the `autoconf' program
@@ -2127,7 +2127,7 @@
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
-It was created by dateutils $as_me 0.3.4, which was
+It was created by dateutils $as_me 0.3.5, which was
generated by GNU Autoconf 2.68. Invocation command line was
$ $0 $@
@@ -2950,7 +2950,7 @@
# Define the identity of the package.
PACKAGE='dateutils'
- VERSION='0.3.4'
+ VERSION='0.3.5'
cat >>confdefs.h <<_ACEOF
@@ -19707,7 +19707,7 @@
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
-This file was extended by dateutils $as_me 0.3.4, which was
+This file was extended by dateutils $as_me 0.3.5, which was
generated by GNU Autoconf 2.68. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -19777,7 +19777,7 @@
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
ac_cs_version="\\
-dateutils config.status 0.3.4
+dateutils config.status 0.3.5
configured by $0, generated by GNU Autoconf 2.68,
with options \\"\$ac_cs_config\\"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/dateutils-0.3.4/configure.ac new/dateutils-0.3.5/configure.ac
--- old/dateutils-0.3.4/configure.ac 2015-08-28 14:04:43.000000000 +0200
+++ new/dateutils-0.3.5/configure.ac 2016-01-22 12:01:32.000000000 +0100
@@ -3,7 +3,7 @@
dnl -------------------------------------------------------------------------
AC_PREREQ([2.63])
-AC_INIT([dateutils], [0.3.4], [https://github.com/hroptatyr/dateutils/issues]
+AC_INIT([dateutils], [0.3.5], [https://github.com/hroptatyr/dateutils/issues]
AC_CONFIG_AUX_DIR([build-aux])
AC_CONFIG_HEADER([src/config.h])
AC_CONFIG_MACRO_DIR([m4])
@@ -15,7 +15,7 @@
AC_COPYRIGHT([dnl
#### Configuration script for dateutils and friends.
-#### Copyright (C) 2011-2015 Sebastian Freundt
+#### Copyright (C) 2011-2016 Sebastian Freundt
### Don't edit this script!
### This script was automatically generated by the `autoconf' program
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/dateutils-0.3.4/contrib/leaps.c new/dateutils-0.3.5/contrib/leaps.c
--- old/dateutils-0.3.4/contrib/leaps.c 2015-08-28 14:04:43.000000000 +0200
+++ new/dateutils-0.3.5/contrib/leaps.c 2016-01-22 12:01:32.000000000 +0100
@@ -1,6 +1,6 @@
/*** leaps.c -- materialised leap seconds
*
- * Copyright (C) 2012-2015 Sebastian Freundt
+ * Copyright (C) 2012-2016 Sebastian Freundt
*
* Author: Sebastian Freundt <freundt(a)ga-group.nl>
*
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/dateutils-0.3.4/contrib/leaps.h new/dateutils-0.3.5/contrib/leaps.h
--- old/dateutils-0.3.4/contrib/leaps.h 2015-08-28 14:04:43.000000000 +0200
+++ new/dateutils-0.3.5/contrib/leaps.h 2016-01-22 12:01:32.000000000 +0100
@@ -1,6 +1,6 @@
/*** leaps.h -- materialised leap seconds
*
- * Copyright (C) 2012-2015 Sebastian Freundt
+ * Copyright (C) 2012-2016 Sebastian Freundt
*
* Author: Sebastian Freundt <freundt(a)ga-group.nl>
*
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/dateutils-0.3.4/contrib/tzconv.c new/dateutils-0.3.5/contrib/tzconv.c
--- old/dateutils-0.3.4/contrib/tzconv.c 2015-08-28 14:04:43.000000000 +0200
+++ new/dateutils-0.3.5/contrib/tzconv.c 2016-01-22 12:01:32.000000000 +0100
@@ -1,6 +1,6 @@
/*** tzconv.c -- convert matlab dates between timezones
*
- * Copyright (C) 2013-2014 Sebastian Freundt
+ * Copyright (C) 2013-2016 Sebastian Freundt
*
* Author: Sebastian Freundt <freundt(a)ga-group.nl>
*
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/dateutils-0.3.4/contrib/tzraw.c new/dateutils-0.3.5/contrib/tzraw.c
--- old/dateutils-0.3.4/contrib/tzraw.c 2015-08-28 14:04:43.000000000 +0200
+++ new/dateutils-0.3.5/contrib/tzraw.c 2016-01-22 12:01:32.000000000 +0100
@@ -1,6 +1,6 @@
/*** tzraw.c -- reader for olson database zoneinfo files
*
- * Copyright (C) 2009-2015 Sebastian Freundt
+ * Copyright (C) 2009-2016 Sebastian Freundt
*
* Author: Sebastian Freundt <freundt(a)ga-group.nl>
*
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/dateutils-0.3.4/contrib/tzraw.h new/dateutils-0.3.5/contrib/tzraw.h
--- old/dateutils-0.3.4/contrib/tzraw.h 2015-08-28 14:04:43.000000000 +0200
+++ new/dateutils-0.3.5/contrib/tzraw.h 2016-01-22 12:01:32.000000000 +0100
@@ -1,6 +1,6 @@
/*** tzraw.h -- reader for olson database zoneinfo files
*
- * Copyright (C) 2009-2015 Sebastian Freundt
+ * Copyright (C) 2009-2016 Sebastian Freundt
*
* Author: Sebastian Freundt <freundt(a)ga-group.nl>
*
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/dateutils-0.3.4/info/dadd.manu new/dateutils-0.3.5/info/dadd.manu
--- old/dateutils-0.3.4/info/dadd.manu 2015-08-28 14:08:26.000000000 +0200
+++ new/dateutils-0.3.5/info/dadd.manu 2016-01-22 12:04:01.000000000 +0100
@@ -1,5 +1,5 @@
.\" auto generated by yuck -*- nroff -*-
-.TH DATEADD "1" "August 2015" "dateutils 0.3.4" "User Commands"
+.TH DATEADD "1" "January 2016" "dateutils 0.3.5" "User Commands"
.SH NAME
dateadd - Add DURATION to DATE/TIME and print the result.
.SH SYNOPSIS
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/dateutils-0.3.4/info/dateadd.manu new/dateutils-0.3.5/info/dateadd.manu
--- old/dateutils-0.3.4/info/dateadd.manu 2015-08-28 14:08:26.000000000 +0200
+++ new/dateutils-0.3.5/info/dateadd.manu 2016-01-22 12:04:01.000000000 +0100
@@ -1,5 +1,5 @@
.\" auto generated by yuck -*- nroff -*-
-.TH DATEADD "1" "August 2015" "dateutils 0.3.4" "User Commands"
+.TH DATEADD "1" "January 2016" "dateutils 0.3.5" "User Commands"
.SH NAME
dateadd - Add DURATION to DATE/TIME and print the result.
.SH SYNOPSIS
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/dateutils-0.3.4/info/dateconv.man new/dateutils-0.3.5/info/dateconv.man
--- old/dateutils-0.3.4/info/dateconv.man 2015-08-28 14:08:26.000000000 +0200
+++ new/dateutils-0.3.5/info/dateconv.man 2016-01-22 12:04:01.000000000 +0100
@@ -1,5 +1,5 @@
.\" auto generated by yuck -*- nroff -*-
-.TH DATECONV "1" "August 2015" "dateutils 0.3.4" "User Commands"
+.TH DATECONV "1" "January 2016" "dateutils 0.3.5" "User Commands"
.SH NAME
dateconv - Convert DATE/TIMEs between calendrical systems.
.SH SYNOPSIS
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/dateutils-0.3.4/info/datediff.mand new/dateutils-0.3.5/info/datediff.mand
--- old/dateutils-0.3.4/info/datediff.mand 2015-08-28 14:08:26.000000000 +0200
+++ new/dateutils-0.3.5/info/datediff.mand 2016-01-22 12:04:01.000000000 +0100
@@ -1,5 +1,5 @@
.\" auto generated by yuck -*- nroff -*-
-.TH DATEDIFF "1" "August 2015" "dateutils 0.3.4" "User Commands"
+.TH DATEDIFF "1" "January 2016" "dateutils 0.3.5" "User Commands"
.SH NAME
datediff - Compute duration from DATE/TIME (the reference date/time) to the other
.SH SYNOPSIS
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/dateutils-0.3.4/info/dategrep.man new/dateutils-0.3.5/info/dategrep.man
--- old/dateutils-0.3.4/info/dategrep.man 2015-08-28 14:08:26.000000000 +0200
+++ new/dateutils-0.3.5/info/dategrep.man 2016-01-22 12:04:01.000000000 +0100
@@ -1,5 +1,5 @@
.\" auto generated by yuck -*- nroff -*-
-.TH DATEGREP "1" "August 2015" "dateutils 0.3.4" "User Commands"
+.TH DATEGREP "1" "January 2016" "dateutils 0.3.5" "User Commands"
.SH NAME
dategrep - Grep standard input for lines that match EXPRESSION.
.SH SYNOPSIS
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/dateutils-0.3.4/info/dateround.manu new/dateutils-0.3.5/info/dateround.manu
--- old/dateutils-0.3.4/info/dateround.manu 2015-08-28 14:08:26.000000000 +0200
+++ new/dateutils-0.3.5/info/dateround.manu 2016-01-22 12:04:01.000000000 +0100
@@ -1,5 +1,5 @@
.\" auto generated by yuck -*- nroff -*-
-.TH DATEROUND "1" "August 2015" "dateutils 0.3.4" "User Commands"
+.TH DATEROUND "1" "January 2016" "dateutils 0.3.5" "User Commands"
.SH NAME
dateround - Round DATE/TIME to the next occurrence of RNDSPEC.
.SH SYNOPSIS
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/dateutils-0.3.4/info/dateseq.manu new/dateutils-0.3.5/info/dateseq.manu
--- old/dateutils-0.3.4/info/dateseq.manu 2015-08-28 14:08:27.000000000 +0200
+++ new/dateutils-0.3.5/info/dateseq.manu 2016-01-22 12:04:01.000000000 +0100
@@ -1,5 +1,5 @@
.\" auto generated by yuck -*- nroff -*-
-.TH DATESEQ "1" "August 2015" "dateutils 0.3.4" "User Commands"
+.TH DATESEQ "1" "January 2016" "dateutils 0.3.5" "User Commands"
.SH NAME
dateseq - Generate a sequence of date/times from FIRST to LAST, optionally in steps of
.SH SYNOPSIS
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/dateutils-0.3.4/info/datesort.man new/dateutils-0.3.5/info/datesort.man
--- old/dateutils-0.3.4/info/datesort.man 2015-08-28 14:08:27.000000000 +0200
+++ new/dateutils-0.3.5/info/datesort.man 2016-01-22 12:04:01.000000000 +0100
@@ -1,5 +1,5 @@
.\" auto generated by yuck -*- nroff -*-
-.TH DATESORT "1" "August 2015" "dateutils 0.3.4" "User Commands"
+.TH DATESORT "1" "January 2016" "dateutils 0.3.5" "User Commands"
.SH NAME
datesort - Sort contents of FILE chronologically.
.SH SYNOPSIS
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/dateutils-0.3.4/info/datetest.man new/dateutils-0.3.5/info/datetest.man
--- old/dateutils-0.3.4/info/datetest.man 2015-08-28 14:08:27.000000000 +0200
+++ new/dateutils-0.3.5/info/datetest.man 2016-01-22 12:04:01.000000000 +0100
@@ -1,5 +1,5 @@
.\" auto generated by yuck -*- nroff -*-
-.TH DATETEST "1" "August 2015" "dateutils 0.3.4" "User Commands"
+.TH DATETEST "1" "January 2016" "dateutils 0.3.5" "User Commands"
.SH NAME
datetest - Like test(1) but for dates.
.SH SYNOPSIS
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/dateutils-0.3.4/info/dateutils.info new/dateutils-0.3.5/info/dateutils.info
--- old/dateutils-0.3.4/info/dateutils.info 2015-08-28 14:08:27.000000000 +0200
+++ new/dateutils-0.3.5/info/dateutils.info 2016-01-22 12:04:01.000000000 +0100
@@ -28,7 +28,7 @@
This manual documents the dateutils package.
- Copyright (C) 2011-2015 Sebastian Freundt.
+ Copyright (C) 2011-2016 Sebastian Freundt.
Permission is granted to copy, distribute and/or modify this
document under the terms of the GNU Free Documentation License, Version
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/dateutils-0.3.4/info/dateutils.texi new/dateutils-0.3.5/info/dateutils.texi
--- old/dateutils-0.3.4/info/dateutils.texi 2015-08-28 14:04:43.000000000 +0200
+++ new/dateutils-0.3.5/info/dateutils.texi 2016-01-22 12:01:32.000000000 +0100
@@ -30,7 +30,7 @@
This manual documents the dateutils package.
-Copyright @copyright{} 2011-2015 Sebastian Freundt.
+Copyright @copyright{} 2011-2016 Sebastian Freundt.
Permission is granted to copy, distribute and/or modify this
document under the terms of the GNU Free Documentation License,
@@ -54,7 +54,7 @@
@center Sebastian Freundt
@page
@vskip 0pt plus 1filll
-Copyright @copyright{} 2011-2015 Sebastian Freundt.
+Copyright @copyright{} 2011-2016 Sebastian Freundt.
Permission is granted to copy, distribute and/or modify this
document under the terms of the GNU Free Documentation License,
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/dateutils-0.3.4/info/datezone.man new/dateutils-0.3.5/info/datezone.man
--- old/dateutils-0.3.4/info/datezone.man 2015-08-28 14:08:27.000000000 +0200
+++ new/dateutils-0.3.5/info/datezone.man 2016-01-22 12:04:01.000000000 +0100
@@ -1,5 +1,5 @@
.\" auto generated by yuck -*- nroff -*-
-.TH DATEZONE "1" "August 2015" "dateutils 0.3.4" "User Commands"
+.TH DATEZONE "1" "January 2016" "dateutils 0.3.5" "User Commands"
.SH NAME
datezone - Convert DATE/TIMEs between timezones.
.SH SYNOPSIS
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/dateutils-0.3.4/info/dconv.man new/dateutils-0.3.5/info/dconv.man
--- old/dateutils-0.3.4/info/dconv.man 2015-08-28 14:08:26.000000000 +0200
+++ new/dateutils-0.3.5/info/dconv.man 2016-01-22 12:04:01.000000000 +0100
@@ -1,5 +1,5 @@
.\" auto generated by yuck -*- nroff -*-
-.TH DATECONV "1" "August 2015" "dateutils 0.3.4" "User Commands"
+.TH DATECONV "1" "January 2016" "dateutils 0.3.5" "User Commands"
.SH NAME
dateconv - Convert DATE/TIMEs between calendrical systems.
.SH SYNOPSIS
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/dateutils-0.3.4/info/ddiff.mand new/dateutils-0.3.5/info/ddiff.mand
--- old/dateutils-0.3.4/info/ddiff.mand 2015-08-28 14:08:26.000000000 +0200
+++ new/dateutils-0.3.5/info/ddiff.mand 2016-01-22 12:04:01.000000000 +0100
@@ -1,5 +1,5 @@
.\" auto generated by yuck -*- nroff -*-
-.TH DATEDIFF "1" "August 2015" "dateutils 0.3.4" "User Commands"
+.TH DATEDIFF "1" "January 2016" "dateutils 0.3.5" "User Commands"
.SH NAME
datediff - Compute duration from DATE/TIME (the reference date/time) to the other
.SH SYNOPSIS
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/dateutils-0.3.4/info/dgrep.man new/dateutils-0.3.5/info/dgrep.man
--- old/dateutils-0.3.4/info/dgrep.man 2015-08-28 14:08:26.000000000 +0200
+++ new/dateutils-0.3.5/info/dgrep.man 2016-01-22 12:04:01.000000000 +0100
@@ -1,5 +1,5 @@
.\" auto generated by yuck -*- nroff -*-
-.TH DATEGREP "1" "August 2015" "dateutils 0.3.4" "User Commands"
+.TH DATEGREP "1" "January 2016" "dateutils 0.3.5" "User Commands"
.SH NAME
dategrep - Grep standard input for lines that match EXPRESSION.
.SH SYNOPSIS
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/dateutils-0.3.4/info/dround.manu new/dateutils-0.3.5/info/dround.manu
--- old/dateutils-0.3.4/info/dround.manu 2015-08-28 14:08:26.000000000 +0200
+++ new/dateutils-0.3.5/info/dround.manu 2016-01-22 12:04:01.000000000 +0100
@@ -1,5 +1,5 @@
.\" auto generated by yuck -*- nroff -*-
-.TH DATEROUND "1" "August 2015" "dateutils 0.3.4" "User Commands"
+.TH DATEROUND "1" "January 2016" "dateutils 0.3.5" "User Commands"
.SH NAME
dateround - Round DATE/TIME to the next occurrence of RNDSPEC.
.SH SYNOPSIS
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/dateutils-0.3.4/info/dseq.manu new/dateutils-0.3.5/info/dseq.manu
--- old/dateutils-0.3.4/info/dseq.manu 2015-08-28 14:08:27.000000000 +0200
+++ new/dateutils-0.3.5/info/dseq.manu 2016-01-22 12:04:01.000000000 +0100
@@ -1,5 +1,5 @@
.\" auto generated by yuck -*- nroff -*-
-.TH DATESEQ "1" "August 2015" "dateutils 0.3.4" "User Commands"
+.TH DATESEQ "1" "January 2016" "dateutils 0.3.5" "User Commands"
.SH NAME
dateseq - Generate a sequence of date/times from FIRST to LAST, optionally in steps of
.SH SYNOPSIS
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/dateutils-0.3.4/info/dsort.man new/dateutils-0.3.5/info/dsort.man
--- old/dateutils-0.3.4/info/dsort.man 2015-08-28 14:08:27.000000000 +0200
+++ new/dateutils-0.3.5/info/dsort.man 2016-01-22 12:04:01.000000000 +0100
@@ -1,5 +1,5 @@
.\" auto generated by yuck -*- nroff -*-
-.TH DATESORT "1" "August 2015" "dateutils 0.3.4" "User Commands"
+.TH DATESORT "1" "January 2016" "dateutils 0.3.5" "User Commands"
.SH NAME
datesort - Sort contents of FILE chronologically.
.SH SYNOPSIS
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/dateutils-0.3.4/info/dtest.man new/dateutils-0.3.5/info/dtest.man
--- old/dateutils-0.3.4/info/dtest.man 2015-08-28 14:08:27.000000000 +0200
+++ new/dateutils-0.3.5/info/dtest.man 2016-01-22 12:04:01.000000000 +0100
@@ -1,5 +1,5 @@
.\" auto generated by yuck -*- nroff -*-
-.TH DATETEST "1" "August 2015" "dateutils 0.3.4" "User Commands"
+.TH DATETEST "1" "January 2016" "dateutils 0.3.5" "User Commands"
.SH NAME
datetest - Like test(1) but for dates.
.SH SYNOPSIS
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/dateutils-0.3.4/info/dzone.man new/dateutils-0.3.5/info/dzone.man
--- old/dateutils-0.3.4/info/dzone.man 2015-08-28 14:08:27.000000000 +0200
+++ new/dateutils-0.3.5/info/dzone.man 2016-01-22 12:04:01.000000000 +0100
@@ -1,5 +1,5 @@
.\" auto generated by yuck -*- nroff -*-
-.TH DATEZONE "1" "August 2015" "dateutils 0.3.4" "User Commands"
+.TH DATEZONE "1" "January 2016" "dateutils 0.3.5" "User Commands"
.SH NAME
datezone - Convert DATE/TIMEs between timezones.
.SH SYNOPSIS
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/dateutils-0.3.4/info/strptime.man new/dateutils-0.3.5/info/strptime.man
--- old/dateutils-0.3.4/info/strptime.man 2015-08-28 14:08:26.000000000 +0200
+++ new/dateutils-0.3.5/info/strptime.man 2016-01-22 12:04:01.000000000 +0100
@@ -1,5 +1,5 @@
.\" auto generated by yuck -*- nroff -*-
-.TH STRPTIME "1" "August 2015" "dateutils 0.3.4" "User Commands"
+.TH STRPTIME "1" "January 2016" "dateutils 0.3.5" "User Commands"
.SH NAME
strptime - Parse input from stdin according to one of the given formats FORMATs.
.SH SYNOPSIS
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/dateutils-0.3.4/lib/bizda.c new/dateutils-0.3.5/lib/bizda.c
--- old/dateutils-0.3.4/lib/bizda.c 2015-08-28 14:04:43.000000000 +0200
+++ new/dateutils-0.3.5/lib/bizda.c 2016-01-22 12:01:32.000000000 +0100
@@ -1,6 +1,6 @@
/*** bizda.c -- guts for bizda dates
*
- * Copyright (C) 2010-2015 Sebastian Freundt
+ * Copyright (C) 2010-2016 Sebastian Freundt
*
* Author: Sebastian Freundt <freundt(a)ga-group.nl>
*
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/dateutils-0.3.4/lib/boops.h new/dateutils-0.3.5/lib/boops.h
--- old/dateutils-0.3.4/lib/boops.h 2015-08-28 14:04:43.000000000 +0200
+++ new/dateutils-0.3.5/lib/boops.h 2016-01-22 12:01:32.000000000 +0100
@@ -1,6 +1,6 @@
/*** boops.h -- byte-order operations
*
- * Copyright (C) 2012-2015 Sebastian Freundt
+ * Copyright (C) 2012-2016 Sebastian Freundt
* Copyright (C) 2012 Ruediger Meier
*
* Author: Sebastian Freundt <freundt(a)ga-group.nl>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/dateutils-0.3.4/lib/daisy.c new/dateutils-0.3.5/lib/daisy.c
--- old/dateutils-0.3.4/lib/daisy.c 2015-08-28 14:04:43.000000000 +0200
+++ new/dateutils-0.3.5/lib/daisy.c 2016-01-22 12:01:32.000000000 +0100
@@ -1,6 +1,6 @@
/*** daisy.c -- guts for daisy dates
*
- * Copyright (C) 2010-2015 Sebastian Freundt
+ * Copyright (C) 2010-2016 Sebastian Freundt
*
* Author: Sebastian Freundt <freundt(a)ga-group.nl>
*
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/dateutils-0.3.4/lib/date-core-private.h new/dateutils-0.3.5/lib/date-core-private.h
--- old/dateutils-0.3.4/lib/date-core-private.h 2015-08-28 14:04:43.000000000 +0200
+++ new/dateutils-0.3.5/lib/date-core-private.h 2016-01-22 12:01:32.000000000 +0100
@@ -1,6 +1,6 @@
/*** date-core-private.h -- our universe of dates, private bits
*
- * Copyright (C) 2011-2015 Sebastian Freundt
+ * Copyright (C) 2011-2016 Sebastian Freundt
*
* Author: Sebastian Freundt <freundt(a)ga-group.nl>
*
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/dateutils-0.3.4/lib/date-core-strpf.c new/dateutils-0.3.5/lib/date-core-strpf.c
--- old/dateutils-0.3.4/lib/date-core-strpf.c 2015-08-28 14:04:43.000000000 +0200
+++ new/dateutils-0.3.5/lib/date-core-strpf.c 2016-01-22 12:01:32.000000000 +0100
@@ -1,6 +1,6 @@
/*** date-core-strpf.c -- parser and formatter funs for date-core
*
- * Copyright (C) 2011-2015 Sebastian Freundt
+ * Copyright (C) 2011-2016 Sebastian Freundt
*
* Author: Sebastian Freundt <freundt(a)ga-group.nl>
*
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/dateutils-0.3.4/lib/date-core-strpf.h new/dateutils-0.3.5/lib/date-core-strpf.h
--- old/dateutils-0.3.4/lib/date-core-strpf.h 2015-08-28 14:04:43.000000000 +0200
+++ new/dateutils-0.3.5/lib/date-core-strpf.h 2016-01-22 12:01:32.000000000 +0100
@@ -1,6 +1,6 @@
/*** date-core-strpf.h -- parser and formatter funs for date-core
*
- * Copyright (C) 2011-2015 Sebastian Freundt
+ * Copyright (C) 2011-2016 Sebastian Freundt
*
* Author: Sebastian Freundt <freundt(a)ga-group.nl>
*
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/dateutils-0.3.4/lib/date-core.c new/dateutils-0.3.5/lib/date-core.c
--- old/dateutils-0.3.4/lib/date-core.c 2015-08-28 14:04:43.000000000 +0200
+++ new/dateutils-0.3.5/lib/date-core.c 2016-01-22 12:01:32.000000000 +0100
@@ -1,6 +1,6 @@
/*** date-core.c -- our universe of dates
*
- * Copyright (C) 2011-2015 Sebastian Freundt
+ * Copyright (C) 2011-2016 Sebastian Freundt
*
* Author: Sebastian Freundt <freundt(a)ga-group.nl>
*
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/dateutils-0.3.4/lib/date-core.h new/dateutils-0.3.5/lib/date-core.h
--- old/dateutils-0.3.4/lib/date-core.h 2015-08-28 14:04:43.000000000 +0200
+++ new/dateutils-0.3.5/lib/date-core.h 2016-01-22 12:01:32.000000000 +0100
@@ -1,6 +1,6 @@
/*** date-core.h -- our universe of dates
*
- * Copyright (C) 2011-2015 Sebastian Freundt
+ * Copyright (C) 2011-2016 Sebastian Freundt
*
* Author: Sebastian Freundt <freundt(a)ga-group.nl>
*
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/dateutils-0.3.4/lib/dt-core-private.h new/dateutils-0.3.5/lib/dt-core-private.h
--- old/dateutils-0.3.4/lib/dt-core-private.h 2015-08-28 14:04:43.000000000 +0200
+++ new/dateutils-0.3.5/lib/dt-core-private.h 2016-01-22 12:01:32.000000000 +0100
@@ -1,6 +1,6 @@
/*** dt-core-private.h -- our universe of datetimes, private bits
*
- * Copyright (C) 2012-2015 Sebastian Freundt
+ * Copyright (C) 2012-2016 Sebastian Freundt
*
* Author: Sebastian Freundt <freundt(a)ga-group.nl>
*
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/dateutils-0.3.4/lib/dt-core-strpf.c new/dateutils-0.3.5/lib/dt-core-strpf.c
--- old/dateutils-0.3.4/lib/dt-core-strpf.c 2015-08-28 14:04:43.000000000 +0200
+++ new/dateutils-0.3.5/lib/dt-core-strpf.c 2016-01-22 12:01:32.000000000 +0100
@@ -1,6 +1,6 @@
/*** dt-core-strpf.c -- parser and formatter funs for dt-core
*
- * Copyright (C) 2011-2015 Sebastian Freundt
+ * Copyright (C) 2011-2016 Sebastian Freundt
*
* Author: Sebastian Freundt <freundt(a)ga-group.nl>
*
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/dateutils-0.3.4/lib/dt-core-strpf.h new/dateutils-0.3.5/lib/dt-core-strpf.h
--- old/dateutils-0.3.4/lib/dt-core-strpf.h 2015-08-28 14:04:43.000000000 +0200
+++ new/dateutils-0.3.5/lib/dt-core-strpf.h 2016-01-22 12:01:32.000000000 +0100
@@ -1,6 +1,6 @@
/*** dt-core-strpf.h -- parser and formatter funs for dt-core
*
- * Copyright (C) 2011-2015 Sebastian Freundt
+ * Copyright (C) 2011-2016 Sebastian Freundt
*
* Author: Sebastian Freundt <freundt(a)ga-group.nl>
*
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/dateutils-0.3.4/lib/dt-core-tz-glue.c new/dateutils-0.3.5/lib/dt-core-tz-glue.c
--- old/dateutils-0.3.4/lib/dt-core-tz-glue.c 2015-08-28 14:04:43.000000000 +0200
+++ new/dateutils-0.3.5/lib/dt-core-tz-glue.c 2016-01-22 12:01:32.000000000 +0100
@@ -1,6 +1,6 @@
/*** dt-core-tz-glue.c -- gluing date/times and tzs
*
- * Copyright (C) 2012-2015 Sebastian Freundt
+ * Copyright (C) 2012-2016 Sebastian Freundt
*
* Author: Sebastian Freundt <freundt(a)ga-group.nl>
*
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/dateutils-0.3.4/lib/dt-core-tz-glue.h new/dateutils-0.3.5/lib/dt-core-tz-glue.h
--- old/dateutils-0.3.4/lib/dt-core-tz-glue.h 2015-08-28 14:04:43.000000000 +0200
+++ new/dateutils-0.3.5/lib/dt-core-tz-glue.h 2016-01-22 12:01:32.000000000 +0100
@@ -1,6 +1,6 @@
/*** dt-core-tz-glue.h -- glue between tzraw and dt-core
*
- * Copyright (C) 2012-2015 Sebastian Freundt
+ * Copyright (C) 2012-2016 Sebastian Freundt
*
* Author: Sebastian Freundt <freundt(a)ga-group.nl>
*
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/dateutils-0.3.4/lib/dt-core.c new/dateutils-0.3.5/lib/dt-core.c
--- old/dateutils-0.3.4/lib/dt-core.c 2015-08-28 14:04:43.000000000 +0200
+++ new/dateutils-0.3.5/lib/dt-core.c 2016-01-22 12:01:32.000000000 +0100
@@ -1,6 +1,6 @@
/*** dt-core.c -- our universe of datetimes
*
- * Copyright (C) 2011-2015 Sebastian Freundt
+ * Copyright (C) 2011-2016 Sebastian Freundt
*
* Author: Sebastian Freundt <freundt(a)ga-group.nl>
*
@@ -593,8 +593,13 @@
* no format specifiers */
case DT_JDN:
+ /* we demand a float representation from start to finish */
res.d.jdn = (dt_jdn_t)strtod(str, &on);
+ if (UNLIKELY(*on < '\0' || *on > ' ')) {
+ /* nah, that's not a distinguished float */
+ goto fucked;
+ }
/* fix up const-ness problem */
sp = on;
/* don't worry about time slot or date/time sandwiches */
@@ -603,10 +608,8 @@
case DT_LDN:
res.d.ldn = (dt_ldn_t)strtoi(str, &sp);
- if (*sp != '.') {
- dt_make_d_only(&res, DT_LDN);
- } else {
- /* yes, big cluster fuck */
+ if (*sp == '.') {
+ /* oooh, a double it seems */
double tmp = strtod(sp, &on);
/* fix up const-ness problem */
@@ -620,6 +623,12 @@
tmp -= (double)res.t.hms.s;
res.t.hms.ns = (tmp *= NANOS_PER_SEC);
dt_make_sandwich(&res, DT_LDN, DT_HMS);
+ } else if (UNLIKELY(*sp < '\0' || *sp > ' ')) {
+ /* not on my turf */
+ goto fucked;
+ } else {
+ /* looking good */
+ dt_make_d_only(&res, DT_LDN);
}
goto sober;
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/dateutils-0.3.4/lib/dt-core.h new/dateutils-0.3.5/lib/dt-core.h
--- old/dateutils-0.3.4/lib/dt-core.h 2015-08-28 14:04:43.000000000 +0200
+++ new/dateutils-0.3.5/lib/dt-core.h 2016-01-22 12:01:32.000000000 +0100
@@ -1,6 +1,6 @@
/*** dt-core.h -- our universe of datetimes
*
- * Copyright (C) 2011-2015 Sebastian Freundt
+ * Copyright (C) 2011-2016 Sebastian Freundt
*
* Author: Sebastian Freundt <freundt(a)ga-group.nl>
*
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/dateutils-0.3.4/lib/generics.h new/dateutils-0.3.5/lib/generics.h
--- old/dateutils-0.3.4/lib/generics.h 2015-08-28 14:04:43.000000000 +0200
+++ new/dateutils-0.3.5/lib/generics.h 2016-01-22 12:01:32.000000000 +0100
@@ -1,6 +1,6 @@
/*** generics.h -- type invariant generic funs
*
- * Copyright (C) 2012-2015 Sebastian Freundt
+ * Copyright (C) 2012-2016 Sebastian Freundt
*
* Author: Sebastian Freundt <freundt(a)ga-group.nl>
*
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/dateutils-0.3.4/lib/leaps.c new/dateutils-0.3.5/lib/leaps.c
--- old/dateutils-0.3.4/lib/leaps.c 2015-08-28 14:04:43.000000000 +0200
+++ new/dateutils-0.3.5/lib/leaps.c 2016-01-22 12:01:32.000000000 +0100
@@ -1,6 +1,6 @@
/*** leaps.c -- materialised leap seconds
*
- * Copyright (C) 2012-2015 Sebastian Freundt
+ * Copyright (C) 2012-2016 Sebastian Freundt
*
* Author: Sebastian Freundt <freundt(a)ga-group.nl>
*
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/dateutils-0.3.4/lib/leaps.h new/dateutils-0.3.5/lib/leaps.h
--- old/dateutils-0.3.4/lib/leaps.h 2015-08-28 14:04:43.000000000 +0200
+++ new/dateutils-0.3.5/lib/leaps.h 2016-01-22 12:01:32.000000000 +0100
@@ -1,6 +1,6 @@
/*** leaps.h -- materialised leap seconds
*
- * Copyright (C) 2012-2015 Sebastian Freundt
+ * Copyright (C) 2012-2016 Sebastian Freundt
*
* Author: Sebastian Freundt <freundt(a)ga-group.nl>
*
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/dateutils-0.3.4/lib/ltrcc.c new/dateutils-0.3.5/lib/ltrcc.c
--- old/dateutils-0.3.4/lib/ltrcc.c 2015-08-28 14:04:43.000000000 +0200
+++ new/dateutils-0.3.5/lib/ltrcc.c 2016-01-22 12:01:32.000000000 +0100
@@ -1,6 +1,6 @@
/*** ltrcc.c -- leapseconds materialiser
*
- * Copyright (C) 2012-2015 Sebastian Freundt
+ * Copyright (C) 2012-2016 Sebastian Freundt
*
* Author: Sebastian Freundt <freundt(a)ga-group.nl>
*
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/dateutils-0.3.4/lib/nifty.h new/dateutils-0.3.5/lib/nifty.h
--- old/dateutils-0.3.4/lib/nifty.h 2015-08-28 14:04:43.000000000 +0200
+++ new/dateutils-0.3.5/lib/nifty.h 2016-01-22 12:01:32.000000000 +0100
@@ -1,6 +1,6 @@
/*** nifty.h -- generally handy macroes
*
- * Copyright (C) 2009-2015 Sebastian Freundt
+ * Copyright (C) 2009-2016 Sebastian Freundt
*
* Author: Sebastian Freundt <freundt(a)ga-group.nl>
*
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/dateutils-0.3.4/lib/strops.c new/dateutils-0.3.5/lib/strops.c
--- old/dateutils-0.3.4/lib/strops.c 2015-08-28 14:04:43.000000000 +0200
+++ new/dateutils-0.3.5/lib/strops.c 2016-01-22 12:01:32.000000000 +0100
@@ -1,6 +1,6 @@
/*** strops.c -- useful string operations
*
- * Copyright (C) 2011-2015 Sebastian Freundt
+ * Copyright (C) 2011-2016 Sebastian Freundt
*
* Author: Sebastian Freundt <freundt(a)ga-group.nl>
*
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/dateutils-0.3.4/lib/strops.h new/dateutils-0.3.5/lib/strops.h
--- old/dateutils-0.3.4/lib/strops.h 2015-08-28 14:04:43.000000000 +0200
+++ new/dateutils-0.3.5/lib/strops.h 2016-01-22 12:01:32.000000000 +0100
@@ -1,6 +1,6 @@
/*** strops.h -- useful string operations
*
- * Copyright (C) 2011-2015 Sebastian Freundt
+ * Copyright (C) 2011-2016 Sebastian Freundt
*
* Author: Sebastian Freundt <freundt(a)ga-group.nl>
*
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/dateutils-0.3.4/lib/time-core-private.h new/dateutils-0.3.5/lib/time-core-private.h
--- old/dateutils-0.3.4/lib/time-core-private.h 2015-08-28 14:04:43.000000000 +0200
+++ new/dateutils-0.3.5/lib/time-core-private.h 2016-01-22 12:01:32.000000000 +0100
@@ -1,6 +1,6 @@
/*** time-core-private.h -- our universe of times, private bits
*
- * Copyright (C) 2011-2015 Sebastian Freundt
+ * Copyright (C) 2011-2016 Sebastian Freundt
*
* Author: Sebastian Freundt <freundt(a)ga-group.nl>
*
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/dateutils-0.3.4/lib/time-core-strpf.c new/dateutils-0.3.5/lib/time-core-strpf.c
--- old/dateutils-0.3.4/lib/time-core-strpf.c 2015-08-28 14:04:43.000000000 +0200
+++ new/dateutils-0.3.5/lib/time-core-strpf.c 2016-01-22 12:01:32.000000000 +0100
@@ -1,6 +1,6 @@
/*** time-core-strpf.c -- parser and formatter funs for time-core
*
- * Copyright (C) 2011-2015 Sebastian Freundt
+ * Copyright (C) 2011-2016 Sebastian Freundt
*
* Author: Sebastian Freundt <freundt(a)ga-group.nl>
*
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/dateutils-0.3.4/lib/time-core-strpf.h new/dateutils-0.3.5/lib/time-core-strpf.h
--- old/dateutils-0.3.4/lib/time-core-strpf.h 2015-08-28 14:04:43.000000000 +0200
+++ new/dateutils-0.3.5/lib/time-core-strpf.h 2016-01-22 12:01:32.000000000 +0100
@@ -1,6 +1,6 @@
/*** time-core-strpf.h -- parser and formatter funs for time-core
*
- * Copyright (C) 2011-2015 Sebastian Freundt
+ * Copyright (C) 2011-2016 Sebastian Freundt
*
* Author: Sebastian Freundt <freundt(a)ga-group.nl>
*
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/dateutils-0.3.4/lib/time-core.c new/dateutils-0.3.5/lib/time-core.c
--- old/dateutils-0.3.4/lib/time-core.c 2015-08-28 14:04:43.000000000 +0200
+++ new/dateutils-0.3.5/lib/time-core.c 2016-01-22 12:01:32.000000000 +0100
@@ -1,6 +1,6 @@
/*** time-core.c -- our universe of times
*
- * Copyright (C) 2011-2015 Sebastian Freundt
+ * Copyright (C) 2011-2016 Sebastian Freundt
*
* Author: Sebastian Freundt <freundt(a)ga-group.nl>
*
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/dateutils-0.3.4/lib/time-core.h new/dateutils-0.3.5/lib/time-core.h
--- old/dateutils-0.3.4/lib/time-core.h 2015-08-28 14:04:43.000000000 +0200
+++ new/dateutils-0.3.5/lib/time-core.h 2016-01-22 12:01:32.000000000 +0100
@@ -1,6 +1,6 @@
/*** time-core.h -- our universe of times
*
- * Copyright (C) 2011-2015 Sebastian Freundt
+ * Copyright (C) 2011-2016 Sebastian Freundt
*
* Author: Sebastian Freundt <freundt(a)ga-group.nl>
*
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/dateutils-0.3.4/lib/token.c new/dateutils-0.3.5/lib/token.c
--- old/dateutils-0.3.4/lib/token.c 2015-08-28 14:04:43.000000000 +0200
+++ new/dateutils-0.3.5/lib/token.c 2016-01-22 12:01:32.000000000 +0100
@@ -1,6 +1,6 @@
/*** token.c -- tokeniser specs and stuff
*
- * Copyright (C) 2011-2015 Sebastian Freundt
+ * Copyright (C) 2011-2016 Sebastian Freundt
*
* Author: Sebastian Freundt <freundt(a)ga-group.nl>
*
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/dateutils-0.3.4/lib/token.h new/dateutils-0.3.5/lib/token.h
--- old/dateutils-0.3.4/lib/token.h 2015-08-28 14:04:43.000000000 +0200
+++ new/dateutils-0.3.5/lib/token.h 2016-01-22 12:01:32.000000000 +0100
@@ -1,6 +1,6 @@
/*** token.h -- tokeniser specs and stuff
*
- * Copyright (C) 2011-2015 Sebastian Freundt
+ * Copyright (C) 2011-2016 Sebastian Freundt
*
* Author: Sebastian Freundt <freundt(a)ga-group.nl>
*
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/dateutils-0.3.4/lib/tzmap.c new/dateutils-0.3.5/lib/tzmap.c
--- old/dateutils-0.3.4/lib/tzmap.c 2015-08-28 14:04:43.000000000 +0200
+++ new/dateutils-0.3.5/lib/tzmap.c 2016-01-22 12:01:32.000000000 +0100
@@ -1,6 +1,6 @@
/*** tzmap.c -- zonename maps
*
- * Copyright (C) 2014-2015 Sebastian Freundt
+ * Copyright (C) 2014-2016 Sebastian Freundt
*
* Author: Sebastian Freundt <freundt(a)ga-group.nl>
*
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/dateutils-0.3.4/lib/tzmap.h new/dateutils-0.3.5/lib/tzmap.h
--- old/dateutils-0.3.4/lib/tzmap.h 2015-08-28 14:04:43.000000000 +0200
+++ new/dateutils-0.3.5/lib/tzmap.h 2016-01-22 12:01:32.000000000 +0100
@@ -1,6 +1,6 @@
/*** tzmap.h -- zonename maps
*
- * Copyright (C) 2014-2015 Sebastian Freundt
+ * Copyright (C) 2014-2016 Sebastian Freundt
*
* Author: Sebastian Freundt <freundt(a)ga-group.nl>
*
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/dateutils-0.3.4/lib/tzraw.c new/dateutils-0.3.5/lib/tzraw.c
--- old/dateutils-0.3.4/lib/tzraw.c 2015-08-28 14:04:43.000000000 +0200
+++ new/dateutils-0.3.5/lib/tzraw.c 2016-01-22 12:01:32.000000000 +0100
@@ -1,6 +1,6 @@
/*** tzraw.c -- reader for olson database zoneinfo files
*
- * Copyright (C) 2009-2015 Sebastian Freundt
+ * Copyright (C) 2009-2016 Sebastian Freundt
*
* Author: Sebastian Freundt <freundt(a)ga-group.nl>
*
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/dateutils-0.3.4/lib/tzraw.h new/dateutils-0.3.5/lib/tzraw.h
--- old/dateutils-0.3.4/lib/tzraw.h 2015-08-28 14:04:43.000000000 +0200
+++ new/dateutils-0.3.5/lib/tzraw.h 2016-01-22 12:01:32.000000000 +0100
@@ -1,6 +1,6 @@
/*** tzraw.h -- reader for olson database zoneinfo files
*
- * Copyright (C) 2009-2015 Sebastian Freundt
+ * Copyright (C) 2009-2016 Sebastian Freundt
*
* Author: Sebastian Freundt <freundt(a)ga-group.nl>
*
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/dateutils-0.3.4/lib/version.c new/dateutils-0.3.5/lib/version.c
--- old/dateutils-0.3.4/lib/version.c 2015-08-28 14:08:06.000000000 +0200
+++ new/dateutils-0.3.5/lib/version.c 2016-01-22 12:03:44.000000000 +0100
@@ -1,4 +1,4 @@
/* -*- c -*- */
#include "version.h"
-const char dateutils_version_string[] = "0.3.4";
+const char dateutils_version_string[] = "0.3.5";
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/dateutils-0.3.4/lib/yd.c new/dateutils-0.3.5/lib/yd.c
--- old/dateutils-0.3.4/lib/yd.c 2015-08-28 14:04:43.000000000 +0200
+++ new/dateutils-0.3.5/lib/yd.c 2016-01-22 12:01:32.000000000 +0100
@@ -1,6 +1,6 @@
/*** yd.c -- guts for yd dates that consist of a year and a year-day
*
- * Copyright (C) 2010-2015 Sebastian Freundt
+ * Copyright (C) 2010-2016 Sebastian Freundt
*
* Author: Sebastian Freundt <freundt(a)ga-group.nl>
*
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/dateutils-0.3.4/lib/ymcw.c new/dateutils-0.3.5/lib/ymcw.c
--- old/dateutils-0.3.4/lib/ymcw.c 2015-08-28 14:04:43.000000000 +0200
+++ new/dateutils-0.3.5/lib/ymcw.c 2016-01-22 12:01:32.000000000 +0100
@@ -1,6 +1,6 @@
/*** ymcw.c -- guts for ymcw dates
*
- * Copyright (C) 2010-2015 Sebastian Freundt
+ * Copyright (C) 2010-2016 Sebastian Freundt
*
* Author: Sebastian Freundt <freundt(a)ga-group.nl>
*
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/dateutils-0.3.4/lib/ymd.c new/dateutils-0.3.5/lib/ymd.c
--- old/dateutils-0.3.4/lib/ymd.c 2015-08-28 14:04:43.000000000 +0200
+++ new/dateutils-0.3.5/lib/ymd.c 2016-01-22 12:01:32.000000000 +0100
@@ -1,6 +1,6 @@
/*** ymd.c -- guts for ymd dates
*
- * Copyright (C) 2010-2015 Sebastian Freundt
+ * Copyright (C) 2010-2016 Sebastian Freundt
*
* Author: Sebastian Freundt <freundt(a)ga-group.nl>
*
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/dateutils-0.3.4/lib/ywd.c new/dateutils-0.3.5/lib/ywd.c
--- old/dateutils-0.3.4/lib/ywd.c 2015-08-28 14:04:43.000000000 +0200
+++ new/dateutils-0.3.5/lib/ywd.c 2016-01-22 12:01:32.000000000 +0100
@@ -1,6 +1,6 @@
/*** ywd.c -- guts for ywd dates
*
- * Copyright (C) 2012-2015 Sebastian Freundt
+ * Copyright (C) 2012-2016 Sebastian Freundt
*
* Author: Sebastian Freundt <freundt(a)ga-group.nl>
*
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/dateutils-0.3.4/m4/clitosis.m4 new/dateutils-0.3.5/m4/clitosis.m4
--- old/dateutils-0.3.4/m4/clitosis.m4 2015-08-28 14:04:43.000000000 +0200
+++ new/dateutils-0.3.5/m4/clitosis.m4 2016-01-22 12:01:32.000000000 +0100
@@ -1,6 +1,6 @@
dnl clitosis.m4 --- checks necessary for the clitosis test harness
dnl
-dnl Copyright (C) 2013-2015 Sebastian Freundt
+dnl Copyright (C) 2013-2016 Sebastian Freundt
dnl
dnl Author: Sebastian Freundt <hroptatyr(a)fresse.org>
dnl
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/dateutils-0.3.4/m4/sxe-compiler.m4 new/dateutils-0.3.5/m4/sxe-compiler.m4
--- old/dateutils-0.3.4/m4/sxe-compiler.m4 2015-08-28 14:04:43.000000000 +0200
+++ new/dateutils-0.3.5/m4/sxe-compiler.m4 2016-01-22 12:01:32.000000000 +0100
@@ -1,6 +1,6 @@
dnl compiler.m4 --- compiler magic
dnl
-dnl Copyright (C) 2005-2015 Sebastian Freundt
+dnl Copyright (C) 2005-2016 Sebastian Freundt
dnl Copyright (c) 2005 Steven G. Johnson
dnl Copyright (c) 2005 Matteo Frigo
dnl
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/dateutils-0.3.4/m4/sxe-libtool.m4 new/dateutils-0.3.5/m4/sxe-libtool.m4
--- old/dateutils-0.3.4/m4/sxe-libtool.m4 2015-08-28 14:04:43.000000000 +0200
+++ new/dateutils-0.3.5/m4/sxe-libtool.m4 2016-01-22 12:01:32.000000000 +0100
@@ -1,6 +1,6 @@
dnl sxe-libtool.m4 -- just a quick libtoolish macros
dnl
-dnl Copyright (C) 2007-2014 Sebastian Freundt.
+dnl Copyright (C) 2007-2016 Sebastian Freundt.
dnl
dnl This file is part of unserding
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/dateutils-0.3.4/m4/yuck.m4 new/dateutils-0.3.5/m4/yuck.m4
--- old/dateutils-0.3.4/m4/yuck.m4 2015-08-28 14:04:43.000000000 +0200
+++ new/dateutils-0.3.5/m4/yuck.m4 2016-01-22 12:01:32.000000000 +0100
@@ -1,6 +1,6 @@
dnl yuck.m4 --- yuck goodies
dnl
-dnl Copyright (C) 2013-2015 Sebastian Freundt
+dnl Copyright (C) 2013-2016 Sebastian Freundt
dnl
dnl Author: Sebastian Freundt <hroptatyr(a)fresse.org>
dnl
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/dateutils-0.3.4/src/alist.c new/dateutils-0.3.5/src/alist.c
--- old/dateutils-0.3.4/src/alist.c 2015-08-28 14:04:43.000000000 +0200
+++ new/dateutils-0.3.5/src/alist.c 2016-01-22 12:01:32.000000000 +0100
@@ -1,6 +1,6 @@
/*** alist.c -- bog standard associative lists
*
- * Copyright (C) 2010-2015 Sebastian Freundt
+ * Copyright (C) 2010-2016 Sebastian Freundt
*
* Author: Sebastian Freundt <freundt(a)ga-group.nl>
*
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/dateutils-0.3.4/src/alist.h new/dateutils-0.3.5/src/alist.h
--- old/dateutils-0.3.4/src/alist.h 2015-08-28 14:04:43.000000000 +0200
+++ new/dateutils-0.3.5/src/alist.h 2016-01-22 12:01:32.000000000 +0100
@@ -1,6 +1,6 @@
/*** alist.h -- bog standard associative lists
*
- * Copyright (C) 2010-2015 Sebastian Freundt
+ * Copyright (C) 2010-2016 Sebastian Freundt
*
* Author: Sebastian Freundt <freundt(a)ga-group.nl>
*
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/dateutils-0.3.4/src/dadd.c new/dateutils-0.3.5/src/dadd.c
--- old/dateutils-0.3.4/src/dadd.c 2015-08-28 14:04:43.000000000 +0200
+++ new/dateutils-0.3.5/src/dadd.c 2016-01-22 12:01:32.000000000 +0100
@@ -1,6 +1,6 @@
/*** dadd.c -- perform simple date arithmetic, date plus duration
*
- * Copyright (C) 2011-2015 Sebastian Freundt
+ * Copyright (C) 2011-2016 Sebastian Freundt
*
* Author: Sebastian Freundt <freundt(a)ga-group.nl>
*
@@ -218,7 +218,6 @@
yuck_t argi[1U];
struct dt_dt_s d;
struct __strpdtdur_st_s st = __strpdtdur_st_initialiser();
- char *inp;
const char *ofmt;
char **fmt;
size_t nfmt;
@@ -260,34 +259,37 @@
dt_set_base(base);
}
+ /* sanity checks, decide whether we're a mass date adder
+ * or a mass duration adder, or both, a date and durations are
+ * present on the command line */
+ with (const char *inp = argi->args[0U]) {
+ /* date parsing needed postponing as we need to find out
+ * about the durations */
+ if (!dt_unk_p(dt_io_strpdt(inp, fmt, nfmt, NULL))) {
+ dt_given_p = true;
+ }
+ }
+
/* check first arg, if it's a date the rest of the arguments are
* durations, if not, dates must be read from stdin */
- for (size_t i = 0; i < argi->nargs; i++) {
- inp = argi->args[i];
+ for (size_t i = dt_given_p; i < argi->nargs; i++) {
+ const char *inp = argi->args[i];
do {
if (dt_io_strpdtdur(&st, inp) < 0) {
- if (UNLIKELY(i == 0)) {
- /* that's ok, must be a date then */
- dt_given_p = true;
- } else {
- serror("Error: \
+ serror("Error: \
cannot parse duration string `%s'", st.istr);
- rc = 1;
- goto dur_out;
- }
+ rc = 1;
+ goto dur_out;
}
} while (__strpdtdur_more_p(&st));
}
/* check if there's only d durations */
hackz = durs_only_d_p(st.durs, st.ndurs) ? NULL : fromz;
- /* sanity checks, decide whether we're a mass date adder
- * or a mass duration adder, or both, a date and durations are
- * present on the command line */
+ /* read the first argument again in light of a completely parsed
+ * duration sequence */
if (dt_given_p) {
- /* date parsing needed postponing as we need to find out
- * about the durations */
- inp = argi->args[0U];
+ const char *inp = argi->args[0U];
if (dt_unk_p(d = dt_io_strpdt(inp, fmt, nfmt, hackz))) {
error("\
Error: cannot interpret date/time string `%s'", inp);
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/dateutils-0.3.4/src/dconv.c new/dateutils-0.3.5/src/dconv.c
--- old/dateutils-0.3.4/src/dconv.c 2015-08-28 14:04:43.000000000 +0200
+++ new/dateutils-0.3.5/src/dconv.c 2016-01-22 12:01:32.000000000 +0100
@@ -1,6 +1,6 @@
/*** dconv.c -- convert calendrical and time stamp systems
*
- * Copyright (C) 2011-2015 Sebastian Freundt
+ * Copyright (C) 2011-2016 Sebastian Freundt
*
* Author: Sebastian Freundt <freundt(a)ga-group.nl>
*
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/dateutils-0.3.4/src/ddiff.c new/dateutils-0.3.5/src/ddiff.c
--- old/dateutils-0.3.4/src/ddiff.c 2015-08-28 14:04:43.000000000 +0200
+++ new/dateutils-0.3.5/src/ddiff.c 2016-01-22 12:01:32.000000000 +0100
@@ -1,6 +1,6 @@
/*** ddiff.c -- perform simple date arithmetic, date minus date
*
- * Copyright (C) 2011-2015 Sebastian Freundt
+ * Copyright (C) 2011-2016 Sebastian Freundt
*
* Author: Sebastian Freundt <freundt(a)ga-group.nl>
*
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/dateutils-0.3.4/src/dexpr-parser.y new/dateutils-0.3.5/src/dexpr-parser.y
--- old/dateutils-0.3.4/src/dexpr-parser.y 2015-08-28 14:04:43.000000000 +0200
+++ new/dateutils-0.3.5/src/dexpr-parser.y 2016-01-22 12:01:32.000000000 +0100
@@ -1,6 +1,6 @@
/*** dexpr-parser.y -- parsing date expressions -*- c -*-
*
- * Copyright (C) 2002-2015 Sebastian Freundt
+ * Copyright (C) 2002-2016 Sebastian Freundt
*
* Author: Sebastian Freundt <freundt(a)fresse.org>
*
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/dateutils-0.3.4/src/dexpr-scanner.c new/dateutils-0.3.5/src/dexpr-scanner.c
--- old/dateutils-0.3.4/src/dexpr-scanner.c 2015-08-28 14:08:17.000000000 +0200
+++ new/dateutils-0.3.5/src/dexpr-scanner.c 2016-01-22 12:03:54.000000000 +0100
@@ -503,7 +503,7 @@
#line 1 "dexpr-scanner.l"
/*** dexpr.l -- date/time expressions for dateutils -*- C -*-
*
- * Copyright (C) 2002-2015 Sebastian Freundt
+ * Copyright (C) 2002-2016 Sebastian Freundt
*
* Author: Sebastian Freundt <freundt(a)fresse.org>
*
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/dateutils-0.3.4/src/dexpr-scanner.l new/dateutils-0.3.5/src/dexpr-scanner.l
--- old/dateutils-0.3.4/src/dexpr-scanner.l 2015-08-28 14:04:43.000000000 +0200
+++ new/dateutils-0.3.5/src/dexpr-scanner.l 2016-01-22 12:01:32.000000000 +0100
@@ -1,6 +1,6 @@
/*** dexpr.l -- date/time expressions for dateutils -*- C -*-
*
- * Copyright (C) 2002-2015 Sebastian Freundt
+ * Copyright (C) 2002-2016 Sebastian Freundt
*
* Author: Sebastian Freundt <freundt(a)fresse.org>
*
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/dateutils-0.3.4/src/dgrep.c new/dateutils-0.3.5/src/dgrep.c
--- old/dateutils-0.3.4/src/dgrep.c 2015-08-28 14:04:43.000000000 +0200
+++ new/dateutils-0.3.5/src/dgrep.c 2016-01-22 12:01:32.000000000 +0100
@@ -1,6 +1,6 @@
/*** dgrep.c -- grep for lines with dates
*
- * Copyright (C) 2011-2015 Sebastian Freundt
+ * Copyright (C) 2011-2016 Sebastian Freundt
*
* Author: Sebastian Freundt <freundt(a)ga-group.nl>
*
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/dateutils-0.3.4/src/dround.c new/dateutils-0.3.5/src/dround.c
--- old/dateutils-0.3.4/src/dround.c 2015-08-28 14:04:43.000000000 +0200
+++ new/dateutils-0.3.5/src/dround.c 2016-01-22 12:01:32.000000000 +0100
@@ -1,6 +1,6 @@
/*** dround.c -- perform simple date arithmetic, round to duration
*
- * Copyright (C) 2012-2015 Sebastian Freundt
+ * Copyright (C) 2012-2016 Sebastian Freundt
*
* Author: Sebastian Freundt <freundt(a)ga-group.nl>
*
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/dateutils-0.3.4/src/dsort.c new/dateutils-0.3.5/src/dsort.c
--- old/dateutils-0.3.4/src/dsort.c 2015-08-28 14:04:43.000000000 +0200
+++ new/dateutils-0.3.5/src/dsort.c 2016-01-22 12:01:32.000000000 +0100
@@ -1,6 +1,6 @@
/*** dsort.c -- sort FILEs or stdin chronologically
*
- * Copyright (C) 2011-2015 Sebastian Freundt
+ * Copyright (C) 2011-2016 Sebastian Freundt
*
* Author: Sebastian Freundt <freundt(a)ga-group.nl>
*
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/dateutils-0.3.4/src/dt-io-zone.c new/dateutils-0.3.5/src/dt-io-zone.c
--- old/dateutils-0.3.4/src/dt-io-zone.c 2015-08-28 14:04:43.000000000 +0200
+++ new/dateutils-0.3.5/src/dt-io-zone.c 2016-01-22 12:01:32.000000000 +0100
@@ -1,6 +1,6 @@
/*** dt-io-zone.c -- abstract from raw zone interface
*
- * Copyright (C) 2010-2015 Sebastian Freundt
+ * Copyright (C) 2010-2016 Sebastian Freundt
*
* Author: Sebastian Freundt <freundt(a)ga-group.nl>
*
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/dateutils-0.3.4/src/dt-io-zone.h new/dateutils-0.3.5/src/dt-io-zone.h
--- old/dateutils-0.3.4/src/dt-io-zone.h 2015-08-28 14:04:43.000000000 +0200
+++ new/dateutils-0.3.5/src/dt-io-zone.h 2016-01-22 12:01:32.000000000 +0100
@@ -1,6 +1,6 @@
/*** dt-io-zone.h -- abstract from raw zone interface
*
- * Copyright (C) 2009-2015 Sebastian Freundt
+ * Copyright (C) 2009-2016 Sebastian Freundt
*
* Author: Sebastian Freundt <freundt(a)ga-group.nl>
*
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/dateutils-0.3.4/src/dtest.c new/dateutils-0.3.5/src/dtest.c
--- old/dateutils-0.3.4/src/dtest.c 2015-08-28 14:04:43.000000000 +0200
+++ new/dateutils-0.3.5/src/dtest.c 2016-01-22 12:01:32.000000000 +0100
@@ -1,6 +1,6 @@
/*** dtest.c -- like test(1) but for dates
*
- * Copyright (C) 2011-2015 Sebastian Freundt
+ * Copyright (C) 2011-2016 Sebastian Freundt
*
* Author: Sebastian Freundt <freundt(a)ga-group.nl>
*
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/dateutils-0.3.4/src/dzone.c new/dateutils-0.3.5/src/dzone.c
--- old/dateutils-0.3.4/src/dzone.c 2015-08-28 14:04:43.000000000 +0200
+++ new/dateutils-0.3.5/src/dzone.c 2016-01-22 12:01:32.000000000 +0100
@@ -1,6 +1,6 @@
/*** dzone.c -- convert date/times between timezones
*
- * Copyright (C) 2011-2015 Sebastian Freundt
+ * Copyright (C) 2011-2016 Sebastian Freundt
*
* Author: Sebastian Freundt <freundt(a)ga-group.nl>
*
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/dateutils-0.3.4/src/prchunk.c new/dateutils-0.3.5/src/prchunk.c
--- old/dateutils-0.3.4/src/prchunk.c 2015-08-28 14:04:43.000000000 +0200
+++ new/dateutils-0.3.5/src/prchunk.c 2016-01-22 12:01:32.000000000 +0100
@@ -1,6 +1,6 @@
/*** prchunk.c -- guessing line oriented data formats
*
- * Copyright (C) 2010-2015 Sebastian Freundt
+ * Copyright (C) 2010-2016 Sebastian Freundt
*
* Author: Sebastian Freundt <freundt(a)ga-group.nl>
*
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/dateutils-0.3.4/src/prchunk.h new/dateutils-0.3.5/src/prchunk.h
--- old/dateutils-0.3.4/src/prchunk.h 2015-08-28 14:04:43.000000000 +0200
+++ new/dateutils-0.3.5/src/prchunk.h 2016-01-22 12:01:32.000000000 +0100
@@ -1,6 +1,6 @@
/*** prchunk.h -- guessing line oriented data formats
*
- * Copyright (C) 2010-2015 Sebastian Freundt
+ * Copyright (C) 2010-2016 Sebastian Freundt
*
* Author: Sebastian Freundt <freundt(a)ga-group.nl>
*
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/dateutils-0.3.4/src/strptime.c new/dateutils-0.3.5/src/strptime.c
--- old/dateutils-0.3.4/src/strptime.c 2015-08-28 14:04:43.000000000 +0200
+++ new/dateutils-0.3.5/src/strptime.c 2016-01-22 12:01:32.000000000 +0100
@@ -1,6 +1,6 @@
/*** strptime.c -- a shell interface to strptime(3)
*
- * Copyright (C) 2011-2015 Sebastian Freundt
+ * Copyright (C) 2011-2016 Sebastian Freundt
*
* Author: Sebastian Freundt <freundt(a)ga-group.nl>
*
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/dateutils-0.3.4/test/Makefile.am new/dateutils-0.3.5/test/Makefile.am
--- old/dateutils-0.3.4/test/Makefile.am 2015-08-28 14:04:43.000000000 +0200
+++ new/dateutils-0.3.5/test/Makefile.am 2016-01-22 12:01:32.000000000 +0100
@@ -33,7 +33,7 @@
## our friendly helper
include clitosis.am
-AM_CLIT_LOG_FLAGS = -v --builddir "$(top_builddir)/src" --timeout 20 --keep-going
+AM_CLIT_LOG_FLAGS = -v --builddir "$(top_builddir)/src" --timeout 300 --keep-going
TESTS_ENVIRONMENT += GPERF=$(GPERF)
TESTS_ENVIRONMENT += GDATE=$(GDATE)
@@ -298,6 +298,7 @@
dt_tests += dadd.086.clit
dt_tests += dadd.087.clit
dt_tests += dadd.088.clit
+dt_tests += dadd.089.clit
dt_tests += dtest.001.clit
dt_tests += dtest.002.clit
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/dateutils-0.3.4/test/Makefile.in new/dateutils-0.3.5/test/Makefile.in
--- old/dateutils-0.3.4/test/Makefile.in 2015-08-28 14:07:48.000000000 +0200
+++ new/dateutils-0.3.5/test/Makefile.in 2016-01-22 12:03:30.000000000 +0100
@@ -554,37 +554,37 @@
dadd.076.clit dadd.077.clit dadd.078.clit dadd.079.clit \
dadd.080.clit dadd.081.clit dadd.082.clit dadd.083.clit \
dadd.084.clit dadd.085.clit dadd.086.clit dadd.087.clit \
- dadd.088.clit dtest.001.clit dtest.002.clit dtest.003.clit \
- dtest.004.clit dtest.005.clit dtest.006.clit dtest.007.clit \
- dtest.008.clit dtest.009.clit ddiff.001.clit ddiff.002.clit \
- ddiff.003.clit ddiff.004.clit ddiff.005.clit ddiff.006.clit \
- ddiff.007.clit ddiff.008.clit ddiff.009.clit ddiff.010.clit \
- ddiff.011.clit ddiff.012.clit ddiff.013.clit ddiff.014.clit \
- ddiff.015.clit ddiff.016.clit ddiff.017.clit ddiff.018.clit \
- ddiff.019.clit ddiff.020.clit ddiff.021.clit ddiff.022.clit \
- ddiff.023.clit ddiff.024.clit ddiff.025.clit ddiff.026.clit \
- ddiff.027.clit ddiff.028.clit ddiff.029.clit ddiff.030.clit \
- ddiff.031.clit ddiff.032.clit ddiff.033.clit ddiff.034.clit \
- ddiff.035.clit ddiff.036.clit ddiff.037.clit ddiff.038.clit \
- ddiff.039.clit ddiff.040.clit ddiff.041.clit ddiff.042.clit \
- ddiff.043.clit ddiff.044.clit ddiff.045.clit ddiff.046.clit \
- ddiff.047.clit ddiff.048.clit ddiff.049.clit ddiff.050.clit \
- ddiff.051.clit ddiff.052.clit ddiff.053.clit ddiff.054.clit \
- ddiff.055.clit ddiff.056.clit ddiff.057.clit ddiff.058.clit \
- ddiff.059.clit ddiff.060.clit ddiff.061.clit ddiff.062.clit \
- ddiff.063.clit ddiff.064.clit ddiff.065.clit ddiff.066.clit \
- ddiff.067.clit ddiff.068.clit ddiff.069.clit ddiff.070.clit \
- dgrep.001.clit dgrep.002.clit dgrep.003.clit dgrep.004.clit \
- dgrep.005.clit dgrep.006.clit dgrep.007.clit dgrep.008.clit \
- dgrep.009.clit dgrep.010.clit dgrep.011.clit dgrep.012.clit \
- dgrep.013.clit dgrep.014.clit dgrep.015.clit dgrep.016.clit \
- dgrep.017.clit dgrep.018.clit dgrep.019.clit dgrep.020.clit \
- dgrep.021.clit dgrep.022.clit dgrep.023.clit dgrep.024.clit \
- dgrep.025.clit dgrep.026.clit dgrep.027.clit dgrep.028.clit \
- dgrep.029.clit dgrep.030.clit dgrep.031.clit dgrep.032.clit \
- dgrep.033.clit dgrep.034.clit dgrep.035.clit dgrep.036.clit \
- dgrep.037.clit dgrep.038.clit dgrep.039.clit dgrep.040.clit \
- dround.001.clit dround.002.clit dround.003.clit \
+ dadd.088.clit dadd.089.clit dtest.001.clit dtest.002.clit \
+ dtest.003.clit dtest.004.clit dtest.005.clit dtest.006.clit \
+ dtest.007.clit dtest.008.clit dtest.009.clit ddiff.001.clit \
+ ddiff.002.clit ddiff.003.clit ddiff.004.clit ddiff.005.clit \
+ ddiff.006.clit ddiff.007.clit ddiff.008.clit ddiff.009.clit \
+ ddiff.010.clit ddiff.011.clit ddiff.012.clit ddiff.013.clit \
+ ddiff.014.clit ddiff.015.clit ddiff.016.clit ddiff.017.clit \
+ ddiff.018.clit ddiff.019.clit ddiff.020.clit ddiff.021.clit \
+ ddiff.022.clit ddiff.023.clit ddiff.024.clit ddiff.025.clit \
+ ddiff.026.clit ddiff.027.clit ddiff.028.clit ddiff.029.clit \
+ ddiff.030.clit ddiff.031.clit ddiff.032.clit ddiff.033.clit \
+ ddiff.034.clit ddiff.035.clit ddiff.036.clit ddiff.037.clit \
+ ddiff.038.clit ddiff.039.clit ddiff.040.clit ddiff.041.clit \
+ ddiff.042.clit ddiff.043.clit ddiff.044.clit ddiff.045.clit \
+ ddiff.046.clit ddiff.047.clit ddiff.048.clit ddiff.049.clit \
+ ddiff.050.clit ddiff.051.clit ddiff.052.clit ddiff.053.clit \
+ ddiff.054.clit ddiff.055.clit ddiff.056.clit ddiff.057.clit \
+ ddiff.058.clit ddiff.059.clit ddiff.060.clit ddiff.061.clit \
+ ddiff.062.clit ddiff.063.clit ddiff.064.clit ddiff.065.clit \
+ ddiff.066.clit ddiff.067.clit ddiff.068.clit ddiff.069.clit \
+ ddiff.070.clit dgrep.001.clit dgrep.002.clit dgrep.003.clit \
+ dgrep.004.clit dgrep.005.clit dgrep.006.clit dgrep.007.clit \
+ dgrep.008.clit dgrep.009.clit dgrep.010.clit dgrep.011.clit \
+ dgrep.012.clit dgrep.013.clit dgrep.014.clit dgrep.015.clit \
+ dgrep.016.clit dgrep.017.clit dgrep.018.clit dgrep.019.clit \
+ dgrep.020.clit dgrep.021.clit dgrep.022.clit dgrep.023.clit \
+ dgrep.024.clit dgrep.025.clit dgrep.026.clit dgrep.027.clit \
+ dgrep.028.clit dgrep.029.clit dgrep.030.clit dgrep.031.clit \
+ dgrep.032.clit dgrep.033.clit dgrep.034.clit dgrep.035.clit \
+ dgrep.036.clit dgrep.037.clit dgrep.038.clit dgrep.039.clit \
+ dgrep.040.clit dround.001.clit dround.002.clit dround.003.clit \
dround.004.clit dround.005.clit dround.006.clit \
dround.007.clit dround.008.clit dround.009.clit \
dround.010.clit dround.011.clit dround.012.clit \
@@ -707,7 +707,7 @@
clitosis_CPPFLAGS = -D_POSIX_C_SOURCE=200112L -D_XOPEN_SOURCE=600 \
-D_BSD_SOURCE -D_ALL_SOURCE -D_NETBSD_SOURCE -UHAVE_VERSION_H
clitosis_LDADD = $(am__append_1)
-AM_CLIT_LOG_FLAGS = -v --builddir "$(top_builddir)/src" --timeout 20 --keep-going
+AM_CLIT_LOG_FLAGS = -v --builddir "$(top_builddir)/src" --timeout 300 --keep-going
dtcore_strp_LDADD = $(DT_LIBS)
dtcore_conv_LDADD = $(DT_LIBS)
dtcore_add_LDADD = $(DT_LIBS)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/dateutils-0.3.4/test/clitosis.c new/dateutils-0.3.5/test/clitosis.c
--- old/dateutils-0.3.4/test/clitosis.c 2015-08-28 14:04:43.000000000 +0200
+++ new/dateutils-0.3.5/test/clitosis.c 2016-01-22 12:01:32.000000000 +0100
@@ -1,6 +1,6 @@
/*** clitosis.c -- command-line-interface tester on shell input syntax
*
- * Copyright (C) 2013-2015 Sebastian Freundt
+ * Copyright (C) 2013-2016 Sebastian Freundt
*
* Author: Sebastian Freundt <freundt(a)ga-group.nl>
*
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/dateutils-0.3.4/test/dadd.089.clit new/dateutils-0.3.5/test/dadd.089.clit
--- old/dateutils-0.3.4/test/dadd.089.clit 1970-01-01 01:00:00.000000000 +0100
+++ new/dateutils-0.3.5/test/dadd.089.clit 2016-01-22 12:01:32.000000000 +0100
@@ -0,0 +1,7 @@
+#!/usr/bin/clitoris
+
+## this is don_crissti's issue
+## http://unix.stackexchange.com/questions/24626/quickly-calculate-date-differ…
+$ dadd -i '%m%d%Y' 01012015 +1d
+2015-01-02
+$
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/dateutils-0.3.4/test/dconv.126.clit new/dateutils-0.3.5/test/dconv.126.clit
--- old/dateutils-0.3.4/test/dconv.126.clit 2015-08-28 14:04:43.000000000 +0200
+++ new/dateutils-0.3.5/test/dconv.126.clit 2016-01-22 12:01:32.000000000 +0100
@@ -1,8 +1,8 @@
#!/usr/bin/clitoris ## -*- shell-script -*-
-$ dconv -i '%_b%_y' K5 -f '%Y-%m'
-2015-05
-$ dconv -i '%_b%_y' Z2 -f '%Y-%m'
+$ dconv -i '%_b%_y' K7 -f '%Y-%m' -b 2016-01-01
+2017-05
+$ dconv -i '%_b%_y' Z2 -f '%Y-%m' -b 2016-01-01
2022-12
$
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/dateutils-0.3.4/version.mk new/dateutils-0.3.5/version.mk
--- old/dateutils-0.3.4/version.mk 2015-08-28 14:07:53.000000000 +0200
+++ new/dateutils-0.3.5/version.mk 2016-01-22 12:03:34.000000000 +0100
@@ -1,3 +1,3 @@
-VERSION = 0.3.4
+VERSION = 0.3.5
PACKAGE_VERSION = $(VERSION)
PACKAGE_STRING = $(PACKAGE) $(VERSION)
1
0
Hello community,
here is the log from the commit of package mate-tweak for openSUSE:Factory checked in at 2016-01-28 17:22:38
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/mate-tweak (Old)
and /work/SRC/openSUSE:Factory/.mate-tweak.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "mate-tweak"
Changes:
--------
--- /work/SRC/openSUSE:Factory/mate-tweak/mate-tweak.changes 2016-01-12 16:14:03.000000000 +0100
+++ /work/SRC/openSUSE:Factory/.mate-tweak.new/mate-tweak.changes 2016-01-28 17:22:39.000000000 +0100
@@ -1,0 +2,6 @@
+Fri Jan 22 23:45:12 UTC 2016 - sor.alexei(a)meowr.ru
+
+- Update to 3.5.4.
+- Remove mate-tweak-no-dock-lacking-warnings.patch: fixed upstream.
+
+-------------------------------------------------------------------
Old:
----
mate-tweak-3.5.3.tar.gz
mate-tweak-no-dock-lacking-warnings.patch
New:
----
mate-tweak-3.5.4.tar.gz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ mate-tweak.spec ++++++
--- /var/tmp/diff_new_pack.24AVcU/_old 2016-01-28 17:22:40.000000000 +0100
+++ /var/tmp/diff_new_pack.24AVcU/_new 2016-01-28 17:22:40.000000000 +0100
@@ -17,9 +17,9 @@
%define _name mate_tweak
-%define _rev 998ebdda6538
+%define _rev 67b861cfc2ca
Name: mate-tweak
-Version: 3.5.3
+Version: 3.5.4
Release: 0
Summary: MATE desktop tweak tool
License: GPL-2.0+
@@ -28,8 +28,6 @@
Source: https://bitbucket.org/ubuntu-mate/%{name}/get/%{version}.tar.gz#/%{name}-%{…
# PATCH-FIX-OPENSUSE mate-tweak-use-matemenu.patch sor.alexei(a)meowr.ru -- Layouts are patched to use mate-menu instead of mintMenu or gnome-main-menu.
Patch0: %{name}-use-matemenu.patch
-# PATCH-FIX-UPSTREAM mate-tweak-no-dock-lacking-warnings.patch sor.alexei(a)meowr.ru -- Do not show Python warnings if no dock is present.
-Patch1: %{name}-no-dock-lacking-warnings.patch
BuildRequires: fdupes
BuildRequires: gobject-introspection-devel
BuildRequires: intltool
@@ -42,6 +40,7 @@
Requires: mate-panel
Requires: python3-configobj
Requires: python3-gobject
+Requires: python3-psutil
# For privilege granting.
Requires: xdg-utils
Recommends: %{name}-lang
@@ -62,8 +61,7 @@
%prep
%setup -q -n ubuntu-mate-%{name}-%{_rev}
%patch0 -p1
-%patch1 -p1
-# Make the world a bit simpler.
+# Make world a bit simpler.
sed -i "s/'pkexec', '/'xdg-su', '-c /g" %{name}
sed -i '/polkit/d' setup.py
@@ -91,10 +89,14 @@
%defattr(-,root,root)
%doc COPYING README.md
%{_bindir}/%{name}
+%{_bindir}/marco-*
+%{_bindir}/metacity-*
%{_libexecdir}/%{name}/
%{python3_sitelib}/%{_name}-*
%{_datadir}/%{name}/
%{_datadir}/applications/%{name}.desktop
+%dir %{_datadir}/mate/
+%{_datadir}/mate/applications/
%{_mandir}/man?/%{name}.?%{?ext_man}
%files lang -f %{name}.lang
++++++ mate-tweak-3.5.3.tar.gz -> mate-tweak-3.5.4.tar.gz ++++++
++++ 56275 lines of diff (skipped)
1
0