openSUSE Commits
Threads by month
- ----- 2024 -----
- May
- April
- March
- February
- January
- ----- 2023 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2022 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2021 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2020 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2019 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2018 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2017 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2016 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2015 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2014 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2013 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2012 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2011 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2010 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2009 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2008 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2007 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2006 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
November 2014
- 1 participants
- 1346 discussions
Hello community,
here is the log from the commit of package liferea for openSUSE:Factory checked in at 2014-11-26 20:57:37
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/liferea (Old)
and /work/SRC/openSUSE:Factory/.liferea.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "liferea"
Changes:
--------
--- /work/SRC/openSUSE:Factory/liferea/liferea.changes 2014-01-23 15:49:01.000000000 +0100
+++ /work/SRC/openSUSE:Factory/.liferea.new/liferea.changes 2014-11-26 22:59:57.000000000 +0100
@@ -1,0 +2,13 @@
+Tue Oct 28 15:02:40 UTC 2014 - badshah400(a)gmail.com
+
+- Update to version 1.10.12:
+ + Fix gh#lwindolf/liferea#86: Support HTTP content negotiation
+ + Fix gh#lwindolf/liferea#98: Stop calling Atom person
+ constructs w/ URI invalid
+ + Fix gh#lwindolf/liferea#100: Problems with dark Adwaita theme
+ in GTK 3.14
+- Changes from versions 1.10.6 through 1.10.11:
+ + See ChangeLog file
+ (/usr/share/doc/packages/liferea/ChangeLog).
+
+-------------------------------------------------------------------
Old:
----
liferea-1.10.5.tar.bz2
New:
----
liferea-1.10.12.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ liferea.spec ++++++
--- /var/tmp/diff_new_pack.vxCVTa/_old 2014-11-26 22:59:58.000000000 +0100
+++ /var/tmp/diff_new_pack.vxCVTa/_new 2014-11-26 22:59:58.000000000 +0100
@@ -17,13 +17,13 @@
Name: liferea
-Version: 1.10.5
+Version: 1.10.12
Release: 0
Summary: Linux Feed Reader
License: GPL-2.0+
Group: Productivity/Other
Url: http://liferea.sourceforge.net/
-Source: https://github.com/lwindolf/liferea/releases/download/v1.10.5/%{name}-%{ver…
+Source: https://github.com/lwindolf/liferea/releases/download/v%{version}/%{name}-%…
# PATCH-FEATURE-OPENSUSE liferea-opensuse-feeds.patch -- Add openSUSE feeds to default feeds
Patch0: liferea-opensuse-feeds.patch
BuildRequires: fdupes
++++++ liferea-1.10.5.tar.bz2 -> liferea-1.10.12.tar.bz2 ++++++
++++ 9251 lines of diff (skipped)
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org
For additional commands, e-mail: opensuse-commit+help(a)opensuse.org
1
0
Hello community,
here is the log from the commit of package libzypp for openSUSE:Factory checked in at 2014-11-26 20:57:19
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/libzypp (Old)
and /work/SRC/openSUSE:Factory/.libzypp.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "libzypp"
Changes:
--------
--- /work/SRC/openSUSE:Factory/libzypp/libzypp.changes 2014-10-14 07:09:07.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.libzypp.new/libzypp.changes 2014-11-26 22:59:53.000000000 +0100
@@ -1,0 +2,46 @@
+Tue Nov 11 17:09:28 CET 2014 - ma(a)suse.de
+
+- Call rpm with '--noglob' (bnc#892431)
+- Downloader: unify workflow downloading a (signed) master index file
+- Fix iostream includes (fixes #34)
+- Explicitly call libsolv:pool_setdisttype (fixes #36)
+- version 14.30.2 (30)
+
+-------------------------------------------------------------------
+Sun Nov 9 01:13:17 CET 2014 - ma(a)suse.de
+
+- Update zypp-po.tar.bz2
+
+-------------------------------------------------------------------
+Sun Nov 2 01:14:10 CET 2014 - ma(a)suse.de
+
+- Update zypp-po.tar.bz2
+
+-------------------------------------------------------------------
+Mon Oct 27 11:38:00 CET 2014 - ma(a)suse.de
+
+- doc: add hint to code 12 pattern packages
+- MediaCurl: Fix URL path concatenation (bnc#901590)
+- Move doxygen html doc to libzypp-devel-doc (bnc#901691)
+- Remove non-breaking spaces from changes file
+- Control lifetime of downloaded mirrorlist
+- version 14.30.1 (30)
+
+-------------------------------------------------------------------
+Thu Oct 16 11:03:11 CEST 2014 - ma(a)suse.de
+
+- Update zypp-po.tar.bz2
+
+-------------------------------------------------------------------
+Wed Oct 15 15:07:09 CEST 2014 - ma(a)suse.de
+
+- Store baseurls in list as order expresses preference
+- Support parsing multiple baseurls from a repo file (bnc#899510)
+- Fix handling local mirrorlist= files in .repo (bnc#899510)
+- Provide missing man pages (fixes #33)
+- Enable building autodocs, translations and test per default on debian
+- Fix several typos in output messages and comments (fixes #29)
+- Make the include dir path configurable (fixes #27)
+- version 14.30.0 (30)
+
+-------------------------------------------------------------------
@@ -8000 +8046 @@
- to avoid UI confusion.
+ to avoid UI confusion.
@@ -8091 +8137 @@
- as advised by matz profiling.
+ as advised by matz profiling.
@@ -8284 +8330 @@
- TmpDir for zypp. # 178292
+ TmpDir for zypp. # 178292
@@ -8387 +8433 @@
- not used yet
+ not used yet
@@ -8391 +8437 @@
- in order to implement smart sync of sources by zmd
+ in order to implement smart sync of sources by zmd
@@ -8604 +8650 @@
- default gpg dir in / (#171055)
+ default gpg dir in / (#171055)
Old:
----
libzypp-14.29.4.tar.bz2
New:
----
libzypp-14.30.2.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ libzypp.spec ++++++
--- /var/tmp/diff_new_pack.ZsaILa/_old 2014-11-26 22:59:54.000000000 +0100
+++ /var/tmp/diff_new_pack.ZsaILa/_new 2014-11-26 22:59:54.000000000 +0100
@@ -19,12 +19,13 @@
%define force_gcc_46 0
Name: libzypp
-BuildRoot: %{_tmppath}/%{name}-%{version}-build
+Version: 14.30.2
+Release: 0
+Url: git://gitorious.org/opensuse/libzypp.git
Summary: Package, Patch, Pattern, and Product Management
License: GPL-2.0+
Group: System/Packages
-Version: 14.29.4
-Release: 0
+BuildRoot: %{_tmppath}/%{name}-%{version}-build
Source: %{name}-%{version}.tar.bz2
Source1: %{name}-rpmlintrc
Provides: yast2-packagemanager
@@ -74,7 +75,7 @@
BuildRequires: pkg-config
%endif
-BuildRequires: libsolv-devel >= 0.6.5
+BuildRequires: libsolv-devel >= 0.6.6
%if 0%{?suse_version} >= 1100
BuildRequires: libsolv-tools
%requires_eq libsolv-tools
@@ -145,6 +146,10 @@
Ladislav Slezak <lslezak(a)suse.cz>
%package devel
+Summary: Package, Patch, Pattern, and Product Management - developers files
+Group: Development/Libraries/C and C++
+Provides: yast2-packagemanager-devel
+Obsoletes: yast2-packagemanager-devel
Requires: boost-devel
Requires: bzip2
Requires: glibc-devel
@@ -178,25 +183,19 @@
%else
Requires: libsolv-devel
%endif
+
+%description devel
+Package, Patch, Pattern, and Product Management - developers files
+
+%package devel-doc
Summary: Package, Patch, Pattern, and Product Management - developers files
-Group: System/Packages
+Group: Documentation/HTML
Provides: yast2-packagemanager-devel
Obsoletes: yast2-packagemanager-devel
-%description -n libzypp-devel
+%description devel-doc
Package, Patch, Pattern, and Product Management - developers files
-Authors:
---------
- Michael Andres <ma(a)suse.de>
- Jiri Srain <jsrain(a)suse.cz>
- Stefan Schubert <schubi(a)suse.de>
- Duncan Mac-Vicar <dmacvicar(a)suse.de>
- Klaus Kaempf <kkaempf(a)suse.de>
- Marius Tomaschewski <mt(a)suse.de>
- Stanislav Visnovsky <visnov(a)suse.cz>
- Ladislav Slezak <lslezak(a)suse.cz>
-
%prep
%setup -q
@@ -371,9 +370,12 @@
%files devel
%defattr(-,root,root)
%{_libdir}/libzypp.so
-%{_docdir}/%{name}
%{_includedir}/zypp
%{_datadir}/cmake/Modules/*
%{_libdir}/pkgconfig/libzypp.pc
+%files devel-doc
+%defattr(-,root,root)
+%{_docdir}/%{name}
+
%changelog
++++++ libzypp-14.29.4.tar.bz2 -> libzypp-14.30.2.tar.bz2 ++++++
++++ 1692 lines of diff (skipped)
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org
For additional commands, e-mail: opensuse-commit+help(a)opensuse.org
1
0
Hello community,
here is the log from the commit of package libzypp-bindings for openSUSE:Factory checked in at 2014-11-26 20:57:17
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/libzypp-bindings (Old)
and /work/SRC/openSUSE:Factory/.libzypp-bindings.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "libzypp-bindings"
Changes:
--------
--- /work/SRC/openSUSE:Factory/libzypp-bindings/libzypp-bindings.changes 2014-09-07 02:35:07.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.libzypp-bindings.new/libzypp-bindings.changes 2014-11-26 22:59:56.000000000 +0100
@@ -1,0 +2,6 @@
+Fri Oct 17 11:22:13 CEST 2014 - ma(a)suse.de
+
+- Adapt to libzypp changes.
+- 0.6.3
+
+-------------------------------------------------------------------
Old:
----
libzypp-bindings-0.6.2.tar.bz2
New:
----
libzypp-bindings-0.6.3.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ libzypp-bindings.spec ++++++
--- /var/tmp/diff_new_pack.kJdeOp/_old 2014-11-26 22:59:56.000000000 +0100
+++ /var/tmp/diff_new_pack.kJdeOp/_new 2014-11-26 22:59:56.000000000 +0100
@@ -18,7 +18,7 @@
Name: libzypp-bindings
-Version: 0.6.2
+Version: 0.6.3
Release: 0
Summary: Bindings for libzypp
License: GPL-2.0+
@@ -26,7 +26,7 @@
BuildRoot: %{_tmppath}/%{name}-%{version}-build
BuildRequires: cmake
BuildRequires: gcc-c++ >= 4.5
-BuildRequires: libzypp-devel >= 14.5.0
+BuildRequires: libzypp-devel >= 14.30.0
BuildRequires: python-devel
BuildRequires: ruby-devel
BuildRequires: swig >= 1.3.40
++++++ libzypp-bindings-0.6.2.tar.bz2 -> libzypp-bindings-0.6.3.tar.bz2 ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libzypp-bindings-0.6.2/VERSION.cmake new/libzypp-bindings-0.6.3/VERSION.cmake
--- old/libzypp-bindings-0.6.2/VERSION.cmake 2014-08-14 14:46:36.000000000 +0200
+++ new/libzypp-bindings-0.6.3/VERSION.cmake 2014-10-17 11:23:53.000000000 +0200
@@ -1,4 +1,4 @@
# on maintenance branch add a 2nd level to patch (p.1, p.2, ...)
SET(VERSION_MAJOR "0")
SET(VERSION_MINOR "6")
-SET(VERSION_PATCH "2")
+SET(VERSION_PATCH "3")
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libzypp-bindings-0.6.2/libzypp-bindings.spec.cmake new/libzypp-bindings-0.6.3/libzypp-bindings.spec.cmake
--- old/libzypp-bindings-0.6.2/libzypp-bindings.spec.cmake 2014-07-01 11:46:31.000000000 +0200
+++ new/libzypp-bindings-0.6.3/libzypp-bindings.spec.cmake 2014-10-17 11:23:53.000000000 +0200
@@ -26,7 +26,7 @@
BuildRoot: %{_tmppath}/%{name}-%{version}-build
BuildRequires: cmake
BuildRequires: gcc-c++ >= 4.5
-BuildRequires: libzypp-devel >= 14.5.0
+BuildRequires: libzypp-devel >= 14.30.0
BuildRequires: python-devel
BuildRequires: ruby-devel
BuildRequires: swig >= 1.3.40
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libzypp-bindings-0.6.2/package/libzypp-bindings.changes new/libzypp-bindings-0.6.3/package/libzypp-bindings.changes
--- old/libzypp-bindings-0.6.2/package/libzypp-bindings.changes 2014-08-14 14:46:36.000000000 +0200
+++ new/libzypp-bindings-0.6.3/package/libzypp-bindings.changes 2014-10-17 11:23:53.000000000 +0200
@@ -1,4 +1,10 @@
-------------------------------------------------------------------
+Fri Oct 17 11:22:13 CEST 2014 - ma(a)suse.de
+
+- Adapt to libzypp changes.
+- 0.6.3
+
+-------------------------------------------------------------------
Thu Aug 14 14:45:12 CEST 2014 - mls(a)suse.de
- work around syntax errors because of __attribute__
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libzypp-bindings-0.6.2/swig/RepoInfo.i new/libzypp-bindings-0.6.3/swig/RepoInfo.i
--- old/libzypp-bindings-0.6.2/swig/RepoInfo.i 2014-07-01 11:46:31.000000000 +0200
+++ new/libzypp-bindings-0.6.3/swig/RepoInfo.i 2014-10-17 11:23:53.000000000 +0200
@@ -1,6 +1,6 @@
#ifdef SWIGPERL5
#else
-%template(UrlSet) std::set<zypp::Url>;
+%template(UrlSet) std::list<zypp::Url>;
#endif
namespace zypp
@@ -31,7 +31,7 @@
typedef std::list<zypp::RepoInfo> RepoInfoList;
%template(RepoInfoList) std::list<zypp::RepoInfo>;
-%extend zypp::RepoInfo
+%extend zypp::RepoInfo
{
std::string dump(void) const
{
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org
For additional commands, e-mail: opensuse-commit+help(a)opensuse.org
1
0
Hello community,
here is the log from the commit of package julia for openSUSE:Factory checked in at 2014-11-26 20:55:46
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/julia (Old)
and /work/SRC/openSUSE:Factory/.julia.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "julia"
Changes:
--------
--- /work/SRC/openSUSE:Factory/julia/julia.changes 2014-10-29 21:10:51.000000000 +0100
+++ /work/SRC/openSUSE:Factory/.julia.new/julia.changes 2014-11-26 22:57:45.000000000 +0100
@@ -1,0 +2,6 @@
+Wed Nov 26 13:41:38 UTC 2014 - dmitry_r(a)opensuse.org
+
+- Update to version 0.3.3
+ * Bugfix release, no changelog available
+
+-------------------------------------------------------------------
Old:
----
julia-0.3.2.tar.gz
New:
----
julia-0.3.3.tar.gz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ julia.spec ++++++
--- /var/tmp/diff_new_pack.xyWivm/_old 2014-11-26 22:57:46.000000000 +0100
+++ /var/tmp/diff_new_pack.xyWivm/_new 2014-11-26 22:57:46.000000000 +0100
@@ -17,7 +17,7 @@
Name: julia
-Version: 0.3.2
+Version: 0.3.3
Release: 0
%define rmath_ver 226598f
%define libuv_ver a12eb33
++++++ julia-0.3.2.tar.gz -> julia-0.3.3.tar.gz ++++++
++++ 6053 lines of diff (skipped)
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org
For additional commands, e-mail: opensuse-commit+help(a)opensuse.org
1
0
Hello community,
here is the log from the commit of package icecast for openSUSE:Factory checked in at 2014-11-26 20:55:43
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/icecast (Old)
and /work/SRC/openSUSE:Factory/.icecast.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "icecast"
Changes:
--------
--- /work/SRC/openSUSE:Factory/icecast/icecast.changes 2014-11-24 11:10:11.000000000 +0100
+++ /work/SRC/openSUSE:Factory/.icecast.new/icecast.changes 2014-11-26 22:57:23.000000000 +0100
@@ -1,0 +2,15 @@
+Tue Nov 25 22:38:43 CET 2014 - tiwai(a)suse.de
+
+- updated to version 2.4.1:
+ * Fixes in logging, <auth> in default mounts, JSON status API
+ * SSL Security improvements:
+ * Handle empty strings in config file better
+ * Require Content-Type header for PUT requests
+ * Fix possible leak of on-connect scripts (CVE-2014-9018,bnc#906538)
+ More details, see http://icecast.org/news/icecast-release-2_4_1/
+- Remove obsoleted patch:
+ icecast-2.4.0-produce-valid-json.patch
+- Change doc subpackage to noarch
+- Spec file cleanup
+
+-------------------------------------------------------------------
Old:
----
icecast-2.4.0-produce-valid-json.patch
icecast-2.4.0.tar.gz
New:
----
icecast-2.4.1.tar.gz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ icecast.spec ++++++
--- /var/tmp/diff_new_pack.zJTZta/_old 2014-11-26 22:57:24.000000000 +0100
+++ /var/tmp/diff_new_pack.zJTZta/_new 2014-11-26 22:57:24.000000000 +0100
@@ -17,7 +17,7 @@
Name: icecast
-Version: 2.4.0
+Version: 2.4.1
Release: 0
Summary: Audio Streaming Server
License: GPL-2.0+
@@ -33,8 +33,6 @@
# PATCH-MISSING-TAG -- See http://en.opensuse.org/openSUSE:Packaging_Patches_guidelines
Patch1: icecast-fix-no-add-needed.patch
Patch3: icecast-add_pidfile_directive.patch
-# PATCH-FIX-UPSTREAM -- Produce valid json status, already in upstream trunk svn. boo#905468.
-Patch4: icecast-2.4.0-produce-valid-json.patch
# PATCH-FEATURE-OPENSUSE -- mp3 frame validation
Patch100: icecast-mp3-frame-validation.patch
BuildRequires: curl-devel
@@ -67,6 +65,7 @@
%package doc
Summary: Documentation for Icecast
Group: Documentation/Other
+BuildArch: noarch
%description doc
Icecast is a MP3 and OGG streaming server able to serve many clients
@@ -77,20 +76,18 @@
%prep
%setup -q
-%patch0
-%patch1
-%patch3
-%patch4
-%patch100
+%patch0 -p1
+%patch1 -p1
+%patch3 -p1
+%patch100 -p1
%build
autoreconf -fiv
%configure
-make
+make %{?_smp_mflags}
%install
-make install DESTDIR=%{buildroot}
-rm -rf %{buildroot}%{_datadir}/doc/%{name}
+make install DESTDIR=%{buildroot} docdir=%{_docdir}/%{name}
# init script
install -d -m 0755 %{buildroot}%{_sbindir}
install -D -m 0755 %{SOURCE1} %{buildroot}%{_sysconfdir}/init.d/%{name}
@@ -106,14 +103,7 @@
# logrotate
install -D -m 0644 %{SOURCE3} %{buildroot}/etc/logrotate.d/%{name}
-D=%{buildroot}%{_docdir}/%{name}
-install -d "$D"
-cp -a README AUTHORS COPYING NEWS TODO ChangeLog "$D/"
-cp -a doc/*.{html,jpg,png} "$D/"
-cp -a conf/*.dist "$D/"
-
-%clean
-%{?buildroot:%__rm -rf %{buildroot}}
+cp -a conf/*.dist %{buildroot}%{_docdir}/%{name}
%pre
/usr/sbin/groupadd -r %{name} >/dev/null 2>&1 || :
@@ -165,10 +155,12 @@
%files doc
%defattr(-,root,root)
-%dir %doc %{_docdir}/%{name}
-%doc %{_docdir}/%{name}/*.html
-%doc %{_docdir}/%{name}/*.jpg
-%doc %{_docdir}/%{name}/*.png
-%doc %{_docdir}/%{name}/*.dist
+%doc %{_docdir}/%{name}
+%exclude %{_docdir}/%{name}/README
+%exclude %{_docdir}/%{name}/AUTHORS
+%exclude %{_docdir}/%{name}/COPYING
+%exclude %{_docdir}/%{name}/NEWS
+%exclude %{_docdir}/%{name}/TODO
+%exclude %{_docdir}/%{name}/ChangeLog
%changelog
++++++ icecast-2.3.1_runas_icecast_user.patch ++++++
--- /var/tmp/diff_new_pack.zJTZta/_old 2014-11-26 22:57:24.000000000 +0100
+++ /var/tmp/diff_new_pack.zJTZta/_new 2014-11-26 22:57:24.000000000 +0100
@@ -1,27 +1,12 @@
---- conf/icecast_minimal.xml.in.orig
-+++ conf/icecast_minimal.xml.in
-@@ -32,4 +32,19 @@
- <errorlog>error.log</errorlog>
- <loglevel>3</loglevel> <!-- 4 Debug, 3 Info, 2 Warn, 1 Error -->
- </logging>
-+ <security>
-+ <chroot>0</chroot>
-+ <!--
-+ Note from the packager:
-+ For security reasons you should not run the icecast server as root.
-+ SUSE adds a icecast user and group for this purpose.
-+
-+ If you change the user/group here you need to change the ownership
-+ of the @localstatedir@/log/@PACKAGE@ aswell
-+ -->
-+ <changeowner>
-+ <user>icecast</user>
-+ <group>icecast</group>
-+ </changeowner>
-+ </security>
- </icecast>
---- conf/icecast_shoutcast_compat.xml.in.orig
-+++ conf/icecast_shoutcast_compat.xml.in
+---
+ conf/icecast.xml.in | 12 +++++++++---
+ conf/icecast_minimal.xml.in | 15 +++++++++++++++
+ conf/icecast_shoutcast_compat.xml.in | 12 ++++++++++++
+ conf/icecast_urlauth.xml.in | 12 ++++++++++++
+ 4 files changed, 48 insertions(+), 3 deletions(-)
+
+--- a/conf/icecast_shoutcast_compat.xml.in
++++ b/conf/icecast_shoutcast_compat.xml.in
@@ -44,5 +44,17 @@
</logging>
<security>
@@ -40,8 +25,8 @@
+ </changeowner>
</security>
</icecast>
---- conf/icecast_urlauth.xml.in.orig
-+++ conf/icecast_urlauth.xml.in
+--- a/conf/icecast_urlauth.xml.in
++++ b/conf/icecast_urlauth.xml.in
@@ -43,5 +43,17 @@
</logging>
<security>
@@ -60,9 +45,9 @@
+ </changeowner>
</security>
</icecast>
---- conf/icecast.xml.in.orig
-+++ conf/icecast.xml.in
-@@ -165,10 +165,16 @@
+--- a/conf/icecast.xml.in
++++ b/conf/icecast.xml.in
+@@ -235,10 +235,16 @@
<security>
<chroot>0</chroot>
<!--
@@ -82,3 +67,27 @@
- -->
</security>
</icecast>
+--- a/conf/icecast_minimal.xml.in
++++ b/conf/icecast_minimal.xml.in
+@@ -33,6 +33,21 @@
+ <errorlog>error.log</errorlog>
+ <loglevel>3</loglevel> <!-- 4 Debug, 3 Info, 2 Warn, 1 Error -->
+ </logging>
++ <security>
++ <chroot>0</chroot>
++ <!--
++ Note from the packager:
++ For security reasons you should not run the icecast server as root.
++ SUSE adds a icecast user and group for this purpose.
++
++ If you change the user/group here you need to change the ownership
++ of the @localstatedir@/log/@PACKAGE@ aswell
++ -->
++ <changeowner>
++ <user>icecast</user>
++ <group>icecast</group>
++ </changeowner>
++ </security>
+ <http-headers>
+ <header name="Access-Control-Allow-Origin" value="*" />
+ </http-headers>
++++++ icecast-2.4.0.tar.gz -> icecast-2.4.1.tar.gz ++++++
++++ 15449 lines of diff (skipped)
++++++ icecast-add_pidfile_directive.patch ++++++
--- /var/tmp/diff_new_pack.zJTZta/_old 2014-11-26 22:57:25.000000000 +0100
+++ /var/tmp/diff_new_pack.zJTZta/_new 2014-11-26 22:57:25.000000000 +0100
@@ -1,6 +1,10 @@
---- conf/icecast.xml.in.orig 2013-06-05 01:46:14.664301324 +0200
-+++ conf/icecast.xml.in 2013-06-05 01:47:00.851343292 +0200
-@@ -138,7 +138,7 @@
+---
+ conf/icecast.xml.in | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+--- a/conf/icecast.xml.in
++++ b/conf/icecast.xml.in
+@@ -198,7 +198,7 @@
<logdir>@localstatedir@/log/@PACKAGE@</logdir>
<webroot>@pkgdatadir@/web</webroot>
<adminroot>@pkgdatadir@/admin</adminroot>
++++++ icecast-fix-no-add-needed.patch ++++++
--- /var/tmp/diff_new_pack.zJTZta/_old 2014-11-26 22:57:25.000000000 +0100
+++ /var/tmp/diff_new_pack.zJTZta/_new 2014-11-26 22:57:25.000000000 +0100
@@ -1,33 +1,37 @@
---- configure.in.orig 2014-05-04 20:46:52.000000000 +0200
-+++ configure.in 2014-05-20 16:41:18.210785900 +0200
-@@ -1,6 +1,7 @@
- AC_INIT([Icecast], [2.4.0], [icecast(a)xiph.org])
-
- AC_PREREQ(2.54)
-+AC_CONFIG_MACRO_DIR([m4])
- AC_CONFIG_SRCDIR(src/main.c)
- dnl Process this file with autoconf to produce a configure script.
-
-@@ -8,7 +9,8 @@
- AM_CONFIG_HEADER(config.h)
- AM_MAINTAINER_MODE
-
--AC_PROG_CC
-+AC_PROG_CC_STDC
-+AC_USE_SYSTEM_EXTENSIONS
- AC_CANONICAL_HOST
- AC_PROG_LIBTOOL
- AC_SYS_LARGEFILE
-@@ -53,9 +55,12 @@
-
- dnl -- configure options --
-
-+XIPH_PATH_XML
- XIPH_PATH_XSLT
- XIPH_VAR_APPEND([XIPH_CPPFLAGS],[$XSLT_CFLAGS])
- XIPH_VAR_PREPEND([XIPH_LIBS],[$XSLT_LIBS])
-+XIPH_VAR_APPEND([XIPH_CPPFLAGS],[$XML_CFLAGS])
-+XIPH_VAR_PREPEND([XIPH_LIBS],[$XML_LIBS])
-
- XIPH_PATH_VORBIS([
- XIPH_VAR_APPEND([XIPH_CPPFLAGS],[$VORBIS_CFLAGS])
+---
+ configure.in | 7 ++++++-
+ 1 file changed, 6 insertions(+), 1 deletion(-)
+
+--- a/configure.in
++++ b/configure.in
+@@ -1,6 +1,7 @@
+ AC_INIT([Icecast], [2.4.1], [icecast(a)xiph.org])
+
+ AC_PREREQ(2.54)
++AC_CONFIG_MACRO_DIR([m4])
+ AC_CONFIG_SRCDIR(src/main.c)
+ dnl Process this file with autoconf to produce a configure script.
+
+@@ -8,7 +9,8 @@ AM_INIT_AUTOMAKE
+ AM_CONFIG_HEADER(config.h)
+ AM_MAINTAINER_MODE
+
+-AC_PROG_CC
++AC_PROG_CC_STDC
++AC_USE_SYSTEM_EXTENSIONS
+ AC_CANONICAL_HOST
+ AC_PROG_LIBTOOL
+ AC_SYS_LARGEFILE
+@@ -53,9 +55,12 @@ XIPH_NET
+
+ dnl -- configure options --
+
++XIPH_PATH_XML
+ XIPH_PATH_XSLT
+ XIPH_VAR_APPEND([XIPH_CPPFLAGS],[$XSLT_CFLAGS])
+ XIPH_VAR_PREPEND([XIPH_LIBS],[$XSLT_LIBS])
++XIPH_VAR_APPEND([XIPH_CPPFLAGS],[$XML_CFLAGS])
++XIPH_VAR_PREPEND([XIPH_LIBS],[$XML_LIBS])
+
+ XIPH_PATH_VORBIS([
+ XIPH_VAR_APPEND([XIPH_CPPFLAGS],[$VORBIS_CFLAGS])
++++++ icecast-mp3-frame-validation.patch ++++++
--- /var/tmp/diff_new_pack.zJTZta/_old 2014-11-26 22:57:25.000000000 +0100
+++ /var/tmp/diff_new_pack.zJTZta/_new 2014-11-26 22:57:25.000000000 +0100
@@ -15,10 +15,13 @@
http://lists.xiph.org/pipermail//icecast-dev/2011-October/001998.html
-Index: src/format_mp3.c
-===================================================================
---- src/format_mp3.c.orig
-+++ src/format_mp3.c
+---
+ src/format_mp3.c | 160 +++++++++++++++++++++++++++++++++++++++++++++++++++++++
+ src/format_mp3.h | 10 +++
+ 2 files changed, 170 insertions(+)
+
+--- a/src/format_mp3.c
++++ b/src/format_mp3.c
@@ -509,6 +509,161 @@ static int complete_read (source_t *sour
return 1;
}
@@ -201,10 +204,8 @@
refbuf->sync_point = 1;
return refbuf;
-Index: src/format_mp3.h
-===================================================================
---- src/format_mp3.h.orig
-+++ src/format_mp3.h
+--- a/src/format_mp3.h
++++ b/src/format_mp3.h
@@ -39,6 +39,16 @@ typedef struct {
char build_metadata[4081];
} mp3_state;
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org
For additional commands, e-mail: opensuse-commit+help(a)opensuse.org
1
0
Hello community,
here is the log from the commit of package harfbuzz for openSUSE:Factory checked in at 2014-11-26 20:57:22
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/harfbuzz (Old)
and /work/SRC/openSUSE:Factory/.harfbuzz.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "harfbuzz"
Changes:
--------
--- /work/SRC/openSUSE:Factory/harfbuzz/harfbuzz.changes 2014-08-25 11:54:39.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.harfbuzz.new/harfbuzz.changes 2014-11-26 22:57:09.000000000 +0100
@@ -1,0 +2,8 @@
+Sat Nov 22 12:01:10 UTC 2014 - zaitor(a)opensuse.org
+
+- Update to version 0.9.36:
+ + Fix performance bug in hb_ot_collect_glyphs() (moz#1090869).
+ + Add basic vertical-text support to hb-ot-font.
+ + Misc build fixes.
+
+-------------------------------------------------------------------
Old:
----
harfbuzz-0.9.35.tar.bz2
New:
----
harfbuzz-0.9.36.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ harfbuzz.spec ++++++
--- /var/tmp/diff_new_pack.h4PFsG/_old 2014-11-26 22:57:09.000000000 +0100
+++ /var/tmp/diff_new_pack.h4PFsG/_new 2014-11-26 22:57:09.000000000 +0100
@@ -17,7 +17,7 @@
Name: harfbuzz
-Version: 0.9.35
+Version: 0.9.36
Release: 0
Summary: An OpenType text shaping engine
License: MIT
++++++ harfbuzz-0.9.35.tar.bz2 -> harfbuzz-0.9.36.tar.bz2 ++++++
++++ 5917 lines of diff (skipped)
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org
For additional commands, e-mail: opensuse-commit+help(a)opensuse.org
1
0
Hello community,
here is the log from the commit of package haproxy for openSUSE:Factory checked in at 2014-11-26 20:55:40
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/haproxy (Old)
and /work/SRC/openSUSE:Factory/.haproxy.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "haproxy"
Changes:
--------
--- /work/SRC/openSUSE:Factory/haproxy/haproxy.changes 2014-11-26 10:33:31.000000000 +0100
+++ /work/SRC/openSUSE:Factory/.haproxy.new/haproxy.changes 2014-11-26 22:57:07.000000000 +0100
@@ -1,0 +2,33 @@
+Wed Nov 26 11:50:42 UTC 2014 - mrueckert(a)suse.de
+
+- update to 1.5.9
+ - BUILD: fix "make install" to support spaces in the install dirs
+ - BUG/MEDIUM: checks: fix conflicts between agent checks and ssl
+ healthchecks
+ - BUG/MEDIUM: ssl: fix bad ssl context init can cause segfault in
+ case of OOM.
+ - BUG/MINOR: samples: fix unnecessary memcopy converting binary
+ to string.
+ - BUG/MEDIUM: connection: sanitize PPv2 header length before
+ parsing address information
+ - BUG/MEDIUM: pattern: don't load more than once a pattern list.
+ - BUG/MEDIUM: ssl: force a full GC in case of memory shortage
+ - BUG/MINOR: config: don't inherit the default balance algorithm
+ in frontends
+ - BUG/MAJOR: frontend: initialize capture pointers earlier
+ - BUG/MINOR: stats: correctly set the request/response analysers
+ - DOC: fix typo in the body parser documentation for msg.sov
+ - BUG/MINOR: peers: the buffer size is global.tune.bufsize, not
+ trash.size
+ - MINOR: sample: add a few basic internal fetches (nbproc, proc,
+ stopping)
+ - BUG/MAJOR: sessions: unlink session from list on out of memory
+- Drop patches pulled from git
+ - 0001-BUILD-fix-make-install-to-support-spaces-in-the-inst.patch
+ - 0002-BUG-MEDIUM-ssl-fix-bad-ssl-context-init-can-cause-se.patch
+ - 0003-BUG-MEDIUM-ssl-force-a-full-GC-in-case-of-memory-sho.patch
+ - 0004-BUG-MEDIUM-checks-fix-conflicts-between-agent-checks.patch
+ - 0005-BUG-MINOR-config-don-t-inherit-the-default-balance-a.patch
+ - 0006-BUG-MAJOR-frontend-initialize-capture-pointers-earli.patch
+
+-------------------------------------------------------------------
Old:
----
0001-BUILD-fix-make-install-to-support-spaces-in-the-inst.patch
0002-BUG-MEDIUM-ssl-fix-bad-ssl-context-init-can-cause-se.patch
0003-BUG-MEDIUM-ssl-force-a-full-GC-in-case-of-memory-sho.patch
0004-BUG-MEDIUM-checks-fix-conflicts-between-agent-checks.patch
0005-BUG-MINOR-config-don-t-inherit-the-default-balance-a.patch
0006-BUG-MAJOR-frontend-initialize-capture-pointers-earli.patch
haproxy-1.5.8.tar.gz
New:
----
haproxy-1.5.9.tar.gz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ haproxy.spec ++++++
--- /var/tmp/diff_new_pack.6ca5wt/_old 2014-11-26 22:57:08.000000000 +0100
+++ /var/tmp/diff_new_pack.6ca5wt/_new 2014-11-26 22:57:08.000000000 +0100
@@ -33,7 +33,7 @@
%bcond_without apparmor
Name: haproxy
-Version: 1.5.8
+Version: 1.5.9
Release: 0
#
#
@@ -60,20 +60,6 @@
Patch1: haproxy-1.2.16_config_haproxy_user.patch
Patch2: haproxy-makefile_lib.patch
Patch3: sec-options.patch
-
-# PATCH-FIX-UPSTREAM BUILD: fix "make install" to support spaces in the install dirs
-Patch4: 0001-BUILD-fix-make-install-to-support-spaces-in-the-inst.patch
-# PATCH-FIX-UPSTREAM BUG/MEDIUM: ssl: fix bad ssl context init can cause segfault in case of OOM.
-Patch5: 0002-BUG-MEDIUM-ssl-fix-bad-ssl-context-init-can-cause-se.patch
-# PATCH-FIX-UPSTREAM BUG/MEDIUM: ssl: force a full GC in case of memory shortage
-Patch6: 0003-BUG-MEDIUM-ssl-force-a-full-GC-in-case-of-memory-sho.patch
-# PATCH-FIX-UPSTREAM BUG/MEDIUM: checks: fix conflicts between agent checks and ssl healthchecks
-Patch7: 0004-BUG-MEDIUM-checks-fix-conflicts-between-agent-checks.patch
-# PATCH-FIX-UPSTREAM BUG/MINOR: config: don't inherit the default balance algorithm in frontends
-Patch8: 0005-BUG-MINOR-config-don-t-inherit-the-default-balance-a.patch
-# PATCH-FIX-UPSTREAM BUG/MAJOR: frontend: initialize capture pointers earlier
-Patch9: 0006-BUG-MAJOR-frontend-initialize-capture-pointers-earli.patch
-
Source99: haproxy-rpmlintrc
#
Summary: The Reliable, High Performance TCP/HTTP Load Balancer
@@ -107,13 +93,6 @@
%patch2
%patch3
-%patch4 -p1
-%patch5 -p1
-%patch6 -p1
-%patch7 -p1
-%patch8 -p1
-%patch9 -p1
-
%build
%{__make} \
TARGET=linux26 \
++++++ haproxy-1.5.8.tar.gz -> haproxy-1.5.9.tar.gz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/haproxy-1.5.8/CHANGELOG new/haproxy-1.5.9/CHANGELOG
--- old/haproxy-1.5.8/CHANGELOG 2014-10-31 10:06:53.000000000 +0100
+++ new/haproxy-1.5.9/CHANGELOG 2014-11-26 00:38:07.000000000 +0100
@@ -1,6 +1,22 @@
ChangeLog :
===========
+2014/11/26 : 1.5.9
+ - BUILD: fix "make install" to support spaces in the install dirs
+ - BUG/MEDIUM: checks: fix conflicts between agent checks and ssl healthchecks
+ - BUG/MEDIUM: ssl: fix bad ssl context init can cause segfault in case of OOM.
+ - BUG/MINOR: samples: fix unnecessary memcopy converting binary to string.
+ - BUG/MEDIUM: connection: sanitize PPv2 header length before parsing address information
+ - BUG/MEDIUM: pattern: don't load more than once a pattern list.
+ - BUG/MEDIUM: ssl: force a full GC in case of memory shortage
+ - BUG/MINOR: config: don't inherit the default balance algorithm in frontends
+ - BUG/MAJOR: frontend: initialize capture pointers earlier
+ - BUG/MINOR: stats: correctly set the request/response analysers
+ - DOC: fix typo in the body parser documentation for msg.sov
+ - BUG/MINOR: peers: the buffer size is global.tune.bufsize, not trash.size
+ - MINOR: sample: add a few basic internal fetches (nbproc, proc, stopping)
+ - BUG/MAJOR: sessions: unlink session from list on out of memory
+
2014/10/31 : 1.5.8
- BUG/MAJOR: buffer: check the space left is enough or not when input data in a buffer is wrapped
- BUG/BUILD: revert accidental change in the makefile from latest SSL fix
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/haproxy-1.5.8/Makefile new/haproxy-1.5.9/Makefile
--- old/haproxy-1.5.8/Makefile 2014-10-31 10:06:53.000000000 +0100
+++ new/haproxy-1.5.9/Makefile 2014-11-26 00:38:07.000000000 +0100
@@ -710,19 +710,19 @@
$(CC) $(COPTS) -DDEFAULT_MMAP_THRESHOLD=$(DLMALLOC_THRES) -c -o $@ $<
install-man:
- install -d $(DESTDIR)$(MANDIR)/man1
- install -m 644 doc/haproxy.1 $(DESTDIR)$(MANDIR)/man1
+ install -d "$(DESTDIR)$(MANDIR)"/man1
+ install -m 644 doc/haproxy.1 "$(DESTDIR)$(MANDIR)"/man1
install-doc:
- install -d $(DESTDIR)$(DOCDIR)
+ install -d "$(DESTDIR)$(DOCDIR)"
for x in configuration architecture haproxy-en haproxy-fr; do \
- install -m 644 doc/$$x.txt $(DESTDIR)$(DOCDIR) ; \
+ install -m 644 doc/$$x.txt "$(DESTDIR)$(DOCDIR)" ; \
done
install-bin: haproxy haproxy-systemd-wrapper
- install -d $(DESTDIR)$(SBINDIR)
- install haproxy $(DESTDIR)$(SBINDIR)
- install haproxy-systemd-wrapper $(DESTDIR)$(SBINDIR)
+ install -d "$(DESTDIR)$(SBINDIR)"
+ install haproxy "$(DESTDIR)$(SBINDIR)"
+ install haproxy-systemd-wrapper "$(DESTDIR)$(SBINDIR)"
install: install-bin install-man install-doc
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/haproxy-1.5.8/README new/haproxy-1.5.9/README
--- old/haproxy-1.5.8/README 2014-10-31 10:06:53.000000000 +0100
+++ new/haproxy-1.5.9/README 2014-11-26 00:38:07.000000000 +0100
@@ -1,9 +1,9 @@
----------------------
HAProxy how-to
----------------------
- version 1.5.8
+ version 1.5.9
willy tarreau
- 2014/10/31
+ 2014/11/25
1) How to build it
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/haproxy-1.5.8/VERDATE new/haproxy-1.5.9/VERDATE
--- old/haproxy-1.5.8/VERDATE 2014-10-31 10:06:53.000000000 +0100
+++ new/haproxy-1.5.9/VERDATE 2014-11-26 00:38:07.000000000 +0100
@@ -1,2 +1,2 @@
$Format:%ci$
-2014/10/31
+2014/11/25
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/haproxy-1.5.8/VERSION new/haproxy-1.5.9/VERSION
--- old/haproxy-1.5.8/VERSION 2014-10-31 10:06:53.000000000 +0100
+++ new/haproxy-1.5.9/VERSION 2014-11-26 00:38:07.000000000 +0100
@@ -1 +1 @@
-1.5.8
+1.5.9
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/haproxy-1.5.8/doc/configuration.txt new/haproxy-1.5.9/doc/configuration.txt
--- old/haproxy-1.5.8/doc/configuration.txt 2014-10-31 10:06:53.000000000 +0100
+++ new/haproxy-1.5.9/doc/configuration.txt 2014-11-26 00:38:07.000000000 +0100
@@ -2,9 +2,9 @@
HAProxy
Configuration Manual
----------------------
- version 1.5.8
+ version 1.5.9
willy tarreau
- 2014/10/31
+ 2014/11/25
This document covers the configuration language as implemented in the version
@@ -10180,6 +10180,11 @@
tcp-request content accept if ! too_fast
tcp-request content accept if WAIT_END
+nbproc : integer
+ Returns an integer value corresponding to the number of processes that were
+ started (it equals the global "nbproc" setting). This is useful for logging
+ and debugging purposes.
+
nbsrv([<backend>]) : integer
Returns an integer value corresponding to the number of usable servers of
either the current backend or the named backend. This is mostly used with
@@ -10188,6 +10193,11 @@
to handle some load. It is useful to report a failure when combined with
"monitor fail".
+proc : integer
+ Returns an integer value corresponding to the position of the process calling
+ the function, between 1 and global.nbproc. This is useful for logging and
+ debugging purposes.
+
queue([<backend>]) : integer
Returns the total number of queued connections of the designated backend,
including all the connections in server queues. If no backend name is
@@ -10238,6 +10248,11 @@
acl srv2_full srv_sess_rate(be1/srv2) gt 50
use_backend be2 if srv1_full or srv2_full
+stopping : boolean
+ Returns TRUE if the process calling the function is currently stopping. This
+ can be useful for logging, or for relaxing certain checks or helping close
+ certain connections upon graceful shutdown.
+
table_avl([<table>]) : integer
Returns the total number of available entries in the current proxy's
stick-table or in the designated stick-table. See also table_cnt.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/haproxy-1.5.8/doc/internals/body-parsing.txt new/haproxy-1.5.9/doc/internals/body-parsing.txt
--- old/haproxy-1.5.8/doc/internals/body-parsing.txt 2014-10-31 10:06:53.000000000 +0100
+++ new/haproxy-1.5.9/doc/internals/body-parsing.txt 2014-11-26 00:38:07.000000000 +0100
@@ -69,7 +69,7 @@
msg.sov : start of value. First character of the header's value in the header
states, start of the body in the data states. Strictly positive
values indicate that headers were not forwarded yet (<buf.p> is
- before the start of the body), and null or positive values are seen
+ before the start of the body), and null or negative values are seen
after headers are forwarded (<buf.p> is at or past the start of the
body). The value stops changing when data start to leave the buffer
(in order to avoid integer overflows). So the maximum possible range
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/haproxy-1.5.8/examples/haproxy.spec new/haproxy-1.5.9/examples/haproxy.spec
--- old/haproxy-1.5.8/examples/haproxy.spec 2014-10-31 10:06:53.000000000 +0100
+++ new/haproxy-1.5.9/examples/haproxy.spec 2014-11-26 00:38:07.000000000 +0100
@@ -1,6 +1,6 @@
Summary: HA-Proxy is a TCP/HTTP reverse proxy for high availability environments
Name: haproxy
-Version: 1.5.8
+Version: 1.5.9
Release: 1
License: GPL
Group: System Environment/Daemons
@@ -76,6 +76,9 @@
%attr(0755,root,root) %config %{_sysconfdir}/rc.d/init.d/%{name}
%changelog
+* Wed Nov 26 2014 Willy Tarreau <w(a)1wt.eu>
+- updated to 1.5.9
+
* Fri Oct 31 2014 Willy Tarreau <w(a)1wt.eu>
- updated to 1.5.8
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/haproxy-1.5.8/include/proto/pattern.h new/haproxy-1.5.9/include/proto/pattern.h
--- old/haproxy-1.5.8/include/proto/pattern.h 2014-10-31 10:06:53.000000000 +0100
+++ new/haproxy-1.5.9/include/proto/pattern.h 2014-11-26 00:38:07.000000000 +0100
@@ -206,7 +206,8 @@
*/
void pattern_init_expr(struct pattern_expr *expr);
struct pattern_expr *pattern_lookup_expr(struct pattern_head *head, struct pat_ref *ref);
-struct pattern_expr *pattern_new_expr(struct pattern_head *head, struct pat_ref *ref, char **err);
+struct pattern_expr *pattern_new_expr(struct pattern_head *head, struct pat_ref *ref,
+ char **err, int *reuse);
struct sample_storage **pattern_find_smp(struct pattern_expr *expr, struct pat_ref_elt *elt);
int pattern_delete(struct pattern_expr *expr, struct pat_ref_elt *ref);
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/haproxy-1.5.8/include/types/checks.h new/haproxy-1.5.9/include/types/checks.h
--- old/haproxy-1.5.8/include/types/checks.h 2014-10-31 10:06:53.000000000 +0100
+++ new/haproxy-1.5.9/include/types/checks.h 2014-11-26 00:38:07.000000000 +0100
@@ -125,6 +125,7 @@
};
struct check {
+ struct xprt_ops *xprt; /* transport layer operations for health checks */
struct connection *conn; /* connection state for health checks */
unsigned short port; /* the port to use for the health checks */
struct buffer *bi, *bo; /* input and output buffers to send/recv check */
@@ -132,7 +133,7 @@
struct timeval start; /* last health check start time */
long duration; /* time in ms took to finish last health check */
short status, code; /* check result, check code */
- char desc[HCHK_DESC_LEN]; /* health check descritpion */
+ char desc[HCHK_DESC_LEN]; /* health check description */
int use_ssl; /* use SSL for health checks */
int send_proxy; /* send a PROXY protocol header with checks */
struct tcpcheck_rule *current_step; /* current step when using tcpcheck */
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/haproxy-1.5.8/include/types/server.h new/haproxy-1.5.9/include/types/server.h
--- old/haproxy-1.5.8/include/types/server.h 2014-10-31 10:06:53.000000000 +0100
+++ new/haproxy-1.5.9/include/types/server.h 2014-11-26 00:38:07.000000000 +0100
@@ -194,7 +194,6 @@
struct { /* configuration used by health-check and agent-check */
struct protocol *proto; /* server address protocol for health checks */
- struct xprt_ops *xprt; /* transport layer operations for health checks */
struct sockaddr_storage addr; /* the address to check, if different from <addr> */
} check_common;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/haproxy-1.5.8/src/acl.c new/haproxy-1.5.9/src/acl.c
--- old/haproxy-1.5.8/src/acl.c 2014-10-31 10:06:53.000000000 +0100
+++ new/haproxy-1.5.9/src/acl.c 2014-11-26 00:38:07.000000000 +0100
@@ -532,7 +532,7 @@
}
/* Create new pattern expression associated to this reference. */
- pattern_expr = pattern_new_expr(&expr->pat, ref, err);
+ pattern_expr = pattern_new_expr(&expr->pat, ref, err, NULL);
if (!pattern_expr)
goto out_free_expr;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/haproxy-1.5.8/src/cfgparse.c new/haproxy-1.5.9/src/cfgparse.c
--- old/haproxy-1.5.8/src/cfgparse.c 2014-10-31 10:06:53.000000000 +0100
+++ new/haproxy-1.5.9/src/cfgparse.c 2014-11-26 00:38:07.000000000 +0100
@@ -2003,7 +2003,6 @@
curproxy->no_options = defproxy.no_options;
curproxy->no_options2 = defproxy.no_options2;
curproxy->bind_proc = defproxy.bind_proc;
- curproxy->lbprm.algo = defproxy.lbprm.algo;
curproxy->except_net = defproxy.except_net;
curproxy->except_mask = defproxy.except_mask;
curproxy->except_to = defproxy.except_to;
@@ -2037,6 +2036,7 @@
}
if (curproxy->cap & PR_CAP_BE) {
+ curproxy->lbprm.algo = defproxy.lbprm.algo;
curproxy->fullconn = defproxy.fullconn;
curproxy->conn_retries = defproxy.conn_retries;
curproxy->max_ka_queue = defproxy.max_ka_queue;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/haproxy-1.5.8/src/checks.c new/haproxy-1.5.9/src/checks.c
--- old/haproxy-1.5.8/src/checks.c 2014-10-31 10:06:53.000000000 +0100
+++ new/haproxy-1.5.9/src/checks.c 2014-11-26 00:38:07.000000000 +0100
@@ -1413,7 +1413,7 @@
/* prepare a new connection */
conn_init(conn);
- conn_prepare(conn, s->check_common.proto, s->check_common.xprt);
+ conn_prepare(conn, s->check_common.proto, check->xprt);
conn_attach(conn, check, &check_conn_cb);
conn->target = &s->obj_type;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/haproxy-1.5.8/src/connection.c new/haproxy-1.5.9/src/connection.c
--- old/haproxy-1.5.8/src/connection.c 2014-10-31 10:06:53.000000000 +0100
+++ new/haproxy-1.5.9/src/connection.c 2014-11-26 00:38:07.000000000 +0100
@@ -424,6 +424,9 @@
case 0x01: /* PROXY command */
switch (hdr_v2->fam) {
case 0x11: /* TCPv4 */
+ if (ntohs(hdr_v2->len) < PP2_ADDR_LEN_INET)
+ goto bad_header;
+
((struct sockaddr_in *)&conn->addr.from)->sin_family = AF_INET;
((struct sockaddr_in *)&conn->addr.from)->sin_addr.s_addr = hdr_v2->addr.ip4.src_addr;
((struct sockaddr_in *)&conn->addr.from)->sin_port = hdr_v2->addr.ip4.src_port;
@@ -433,6 +436,9 @@
conn->flags |= CO_FL_ADDR_FROM_SET | CO_FL_ADDR_TO_SET;
break;
case 0x21: /* TCPv6 */
+ if (ntohs(hdr_v2->len) < PP2_ADDR_LEN_INET6)
+ goto bad_header;
+
((struct sockaddr_in6 *)&conn->addr.from)->sin6_family = AF_INET6;
memcpy(&((struct sockaddr_in6 *)&conn->addr.from)->sin6_addr, hdr_v2->addr.ip6.src_addr, 16);
((struct sockaddr_in6 *)&conn->addr.from)->sin6_port = hdr_v2->addr.ip6.src_port;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/haproxy-1.5.8/src/frontend.c new/haproxy-1.5.9/src/frontend.c
--- old/haproxy-1.5.8/src/frontend.c 2014-10-31 10:06:53.000000000 +0100
+++ new/haproxy-1.5.9/src/frontend.c 2014-11-26 00:38:07.000000000 +0100
@@ -106,11 +106,17 @@
if (global.tune.client_rcvbuf)
setsockopt(cfd, SOL_SOCKET, SO_RCVBUF, &global.tune.client_rcvbuf, sizeof(global.tune.client_rcvbuf));
- if (unlikely(s->fe->nb_req_cap > 0 && (s->txn.req.cap = pool_alloc2(s->fe->req_cap_pool)) == NULL))
- goto out_return; /* no memory */
+ if (unlikely(s->fe->nb_req_cap > 0)) {
+ if ((s->txn.req.cap = pool_alloc2(s->fe->req_cap_pool)) == NULL)
+ goto out_return; /* no memory */
+ memset(s->txn.req.cap, 0, s->fe->nb_req_cap * sizeof(void *));
+ }
- if (unlikely(s->fe->nb_rsp_cap > 0 && (s->txn.rsp.cap = pool_alloc2(s->fe->rsp_cap_pool)) == NULL))
- goto out_free_reqcap; /* no memory */
+ if (unlikely(s->fe->nb_rsp_cap > 0)) {
+ if ((s->txn.rsp.cap = pool_alloc2(s->fe->rsp_cap_pool)) == NULL)
+ goto out_free_reqcap; /* no memory */
+ memset(s->txn.rsp.cap, 0, s->fe->nb_rsp_cap * sizeof(void *));
+ }
if (s->fe->http_needed) {
/* we have to allocate header indexes only if we know
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/haproxy-1.5.8/src/pattern.c new/haproxy-1.5.9/src/pattern.c
--- old/haproxy-1.5.8/src/pattern.c 2014-10-31 10:06:53.000000000 +0100
+++ new/haproxy-1.5.9/src/pattern.c 2014-11-26 00:38:07.000000000 +0100
@@ -1855,12 +1855,19 @@
* <ref> can be NULL. If an error is occured, the function returns NULL and
* <err> is filled. Otherwise, the function returns new pattern_expr linked
* with <head> and <ref>.
+ *
+ * The returned value can be a alredy filled pattern list, in this case the
+ * flag <reuse> is set.
*/
-struct pattern_expr *pattern_new_expr(struct pattern_head *head, struct pat_ref *ref, char **err)
+struct pattern_expr *pattern_new_expr(struct pattern_head *head, struct pat_ref *ref,
+ char **err, int *reuse)
{
struct pattern_expr *expr;
struct pattern_expr_list *list;
+ if (reuse)
+ *reuse = 0;
+
/* Memory and initialization of the chain element. */
list = malloc(sizeof(*list));
if (!list) {
@@ -1915,6 +1922,8 @@
* with ref and we must not free it.
*/
list->do_free = 0;
+ if (reuse)
+ *reuse = 1;
}
/* The new list element reference the pattern_expr. */
@@ -2087,6 +2096,7 @@
struct pat_ref *ref;
struct pattern_expr *expr;
struct pat_ref_elt *elt;
+ int reuse;
/* Lookup for the existing reference. */
ref = pat_ref_lookup(filename);
@@ -2161,12 +2171,20 @@
*/
expr = pattern_lookup_expr(head, ref);
if (!expr || (expr->mflags != patflags)) {
- expr = pattern_new_expr(head, ref, err);
+ expr = pattern_new_expr(head, ref, err, &reuse);
if (!expr)
return 0;
expr->mflags = patflags;
}
+ /* The returned expression may be not empty, because the function
+ * "pattern_new_expr" lookup for similar pattern list and can
+ * reuse a already filled pattern list. In this case, we can not
+ * reload the patterns.
+ */
+ if (reuse)
+ return 1;
+
/* Load reference content in the pattern expression. */
list_for_each_entry(elt, &ref->head, list) {
if (!pat_ref_push(elt, expr, patflags, err)) {
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/haproxy-1.5.8/src/peers.c new/haproxy-1.5.9/src/peers.c
--- old/haproxy-1.5.8/src/peers.c 2014-10-31 10:06:53.000000000 +0100
+++ new/haproxy-1.5.9/src/peers.c 2014-11-26 00:38:07.000000000 +0100
@@ -1240,7 +1240,7 @@
if ((s->req->buf = pool_alloc2(pool2_buffer)) == NULL)
goto out_fail_req_buf; /* no memory */
- s->req->buf->size = trash.size;
+ s->req->buf->size = global.tune.bufsize;
channel_init(s->req);
s->req->prod = &s->si[0];
s->req->cons = &s->si[1];
@@ -1266,7 +1266,7 @@
if ((s->rep->buf = pool_alloc2(pool2_buffer)) == NULL)
goto out_fail_rep_buf; /* no memory */
- s->rep->buf->size = trash.size;
+ s->rep->buf->size = global.tune.bufsize;
channel_init(s->rep);
s->rep->prod = &s->si[1];
s->rep->cons = &s->si[0];
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/haproxy-1.5.8/src/proto_http.c new/haproxy-1.5.9/src/proto_http.c
--- old/haproxy-1.5.8/src/proto_http.c 2014-10-31 10:06:53.000000000 +0100
+++ new/haproxy-1.5.9/src/proto_http.c 2014-11-26 00:38:07.000000000 +0100
@@ -4086,8 +4086,7 @@
select_compression_request_header(s, req->buf);
/* enable the minimally required analyzers to handle keep-alive and compression on the HTTP response */
- req->analysers = (req->analysers & AN_REQ_HTTP_BODY) |
- AN_REQ_HTTP_XFER_BODY | AN_RES_WAIT_HTTP | AN_RES_HTTP_PROCESS_BE | AN_RES_HTTP_XFER_BODY;
+ req->analysers = (req->analysers & AN_REQ_HTTP_BODY) | AN_REQ_HTTP_XFER_BODY;
goto done;
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/haproxy-1.5.8/src/sample.c new/haproxy-1.5.9/src/sample.c
--- old/haproxy-1.5.8/src/sample.c 2014-10-31 10:06:53.000000000 +0100
+++ new/haproxy-1.5.9/src/sample.c 2014-11-26 00:38:07.000000000 +0100
@@ -497,27 +497,20 @@
return 1;
}
-/* The sample is always copied into a new one so that smp->size is always
- * valid. The NULL char always enforces the end of string if it is met.
+/*
+ * The NULL char always enforces the end of string if it is met.
+ * Data is never changed, so we can ignore the CONST case
*/
static int c_bin2str(struct sample *smp)
{
- struct chunk *trash = get_trash_chunk();
- unsigned char c;
- int ptr = 0;
+ int i;
- while (ptr < smp->data.str.len) {
- c = smp->data.str.str[ptr];
- if (!c)
+ for (i = 0; i < smp->data.str.len; i++) {
+ if (!smp->data.str.str[i]) {
+ smp->data.str.len = i;
break;
- trash->str[ptr] = c;
- ptr++;
+ }
}
- trash->len = ptr;
- trash->str[ptr] = 0;
- smp->data.str = *trash;
- smp->type = SMP_T_STR;
- smp->flags &= ~SMP_F_CONST;
return 1;
}
@@ -1345,6 +1338,26 @@
return 1;
}
+/* returns the number of processes */
+static int
+smp_fetch_nbproc(struct proxy *px, struct session *s, void *l7, unsigned int opt,
+ const struct arg *args, struct sample *smp, const char *kw)
+{
+ smp->type = SMP_T_UINT;
+ smp->data.uint = global.nbproc;
+ return 1;
+}
+
+/* returns the number of the current process (between 1 and nbproc */
+static int
+smp_fetch_proc(struct proxy *px, struct session *s, void *l7, unsigned int opt,
+ const struct arg *args, struct sample *smp, const char *kw)
+{
+ smp->type = SMP_T_UINT;
+ smp->data.uint = relative_pid;
+ return 1;
+}
+
/* generate a random 32-bit integer for whatever purpose, with an optional
* range specified in argument.
*/
@@ -1363,6 +1376,16 @@
return 1;
}
+/* returns true if the current process is stopping */
+static int
+smp_fetch_stopping(struct proxy *px, struct session *s, void *l7, unsigned int opt,
+ const struct arg *args, struct sample *smp, const char *kw)
+{
+ smp->type = SMP_T_BOOL;
+ smp->data.uint = stopping;
+ return 1;
+}
+
/* Note: must not be declared <const> as its list will be overwritten.
* Note: fetches that may return multiple types must be declared as the lowest
* common denominator, the type that can be casted into all other ones. For
@@ -1373,7 +1396,10 @@
{ "always_true", smp_fetch_true, 0, NULL, SMP_T_BOOL, SMP_USE_INTRN },
{ "env", smp_fetch_env, ARG1(1,STR), NULL, SMP_T_STR, SMP_USE_INTRN },
{ "date", smp_fetch_date, ARG1(0,SINT), NULL, SMP_T_UINT, SMP_USE_INTRN },
+ { "nbproc", smp_fetch_nbproc,0, NULL, SMP_T_UINT, SMP_USE_INTRN },
+ { "proc", smp_fetch_proc, 0, NULL, SMP_T_UINT, SMP_USE_INTRN },
{ "rand", smp_fetch_rand, ARG1(0,UINT), NULL, SMP_T_UINT, SMP_USE_INTRN },
+ { "stopping", smp_fetch_stopping, 0, NULL, SMP_T_BOOL, SMP_USE_INTRN },
{ /* END */ },
}};
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/haproxy-1.5.8/src/server.c new/haproxy-1.5.9/src/server.c
--- old/haproxy-1.5.8/src/server.c 2014-10-31 10:06:53.000000000 +0100
+++ new/haproxy-1.5.9/src/server.c 2014-11-26 00:38:07.000000000 +0100
@@ -929,7 +929,7 @@
newsrv->addr = *sk;
newsrv->proto = newsrv->check_common.proto = protocol_by_family(newsrv->addr.ss_family);
- newsrv->xprt = newsrv->check_common.xprt = &raw_sock;
+ newsrv->xprt = newsrv->check.xprt = newsrv->agent.xprt = &raw_sock;
if (!newsrv->proto) {
Alert("parsing [%s:%d] : Unknown protocol family %d '%s'\n",
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/haproxy-1.5.8/src/session.c new/haproxy-1.5.9/src/session.c
--- old/haproxy-1.5.8/src/session.c 2014-10-31 10:06:53.000000000 +0100
+++ new/haproxy-1.5.9/src/session.c 2014-11-26 00:38:07.000000000 +0100
@@ -579,6 +579,7 @@
/* and restore the connection pointer in case we destroyed it,
* because kill_mini_session() will need it.
*/
+ LIST_DEL(&s->list);
s->target = &conn->obj_type;
return ret;
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/haproxy-1.5.8/src/ssl_sock.c new/haproxy-1.5.9/src/ssl_sock.c
--- old/haproxy-1.5.8/src/ssl_sock.c 2014-10-31 10:06:53.000000000 +0100
+++ new/haproxy-1.5.9/src/ssl_sock.c 2014-11-26 00:38:07.000000000 +0100
@@ -1812,7 +1812,7 @@
if (srv->use_ssl)
srv->xprt = &ssl_sock;
if (srv->check.use_ssl)
- srv->check_common.xprt = &ssl_sock;
+ srv->check.xprt = &ssl_sock;
srv->ssl_ctx.ctx = SSL_CTX_new(SSLv23_client_method());
if (!srv->ssl_ctx.ctx) {
@@ -2033,22 +2033,51 @@
/* If it is in client mode initiate SSL session
in connect state otherwise accept state */
if (objt_server(conn->target)) {
+ int may_retry = 1;
+
+ retry_connect:
/* Alloc a new SSL session ctx */
conn->xprt_ctx = SSL_new(objt_server(conn->target)->ssl_ctx.ctx);
if (!conn->xprt_ctx) {
+ if (may_retry--) {
+ pool_gc2();
+ goto retry_connect;
+ }
conn->err_code = CO_ER_SSL_NO_MEM;
return -1;
}
- SSL_set_connect_state(conn->xprt_ctx);
- if (objt_server(conn->target)->ssl_ctx.reused_sess)
- SSL_set_session(conn->xprt_ctx, objt_server(conn->target)->ssl_ctx.reused_sess);
-
/* set fd on SSL session context */
- SSL_set_fd(conn->xprt_ctx, conn->t.sock.fd);
+ if (!SSL_set_fd(conn->xprt_ctx, conn->t.sock.fd)) {
+ SSL_free(conn->xprt_ctx);
+ conn->xprt_ctx = NULL;
+ if (may_retry--) {
+ pool_gc2();
+ goto retry_connect;
+ }
+ conn->err_code = CO_ER_SSL_NO_MEM;
+ return -1;
+ }
/* set connection pointer */
- SSL_set_app_data(conn->xprt_ctx, conn);
+ if (!SSL_set_app_data(conn->xprt_ctx, conn)) {
+ SSL_free(conn->xprt_ctx);
+ conn->xprt_ctx = NULL;
+ if (may_retry--) {
+ pool_gc2();
+ goto retry_connect;
+ }
+ conn->err_code = CO_ER_SSL_NO_MEM;
+ return -1;
+ }
+
+ SSL_set_connect_state(conn->xprt_ctx);
+ if (objt_server(conn->target)->ssl_ctx.reused_sess) {
+ if(!SSL_set_session(conn->xprt_ctx, objt_server(conn->target)->ssl_ctx.reused_sess)) {
+ SSL_SESSION_free(objt_server(conn->target)->ssl_ctx.reused_sess);
+ objt_server(conn->target)->ssl_ctx.reused_sess = NULL;
+ }
+ }
/* leave init state and start handshake */
conn->flags |= CO_FL_SSL_WAIT_HS | CO_FL_WAIT_L6_CONN;
@@ -2058,20 +2087,45 @@
return 0;
}
else if (objt_listener(conn->target)) {
+ int may_retry = 1;
+
+ retry_accept:
/* Alloc a new SSL session ctx */
conn->xprt_ctx = SSL_new(objt_listener(conn->target)->bind_conf->default_ctx);
if (!conn->xprt_ctx) {
+ if (may_retry--) {
+ pool_gc2();
+ goto retry_accept;
+ }
conn->err_code = CO_ER_SSL_NO_MEM;
return -1;
}
- SSL_set_accept_state(conn->xprt_ctx);
-
/* set fd on SSL session context */
- SSL_set_fd(conn->xprt_ctx, conn->t.sock.fd);
+ if (!SSL_set_fd(conn->xprt_ctx, conn->t.sock.fd)) {
+ SSL_free(conn->xprt_ctx);
+ conn->xprt_ctx = NULL;
+ if (may_retry--) {
+ pool_gc2();
+ goto retry_accept;
+ }
+ conn->err_code = CO_ER_SSL_NO_MEM;
+ return -1;
+ }
/* set connection pointer */
- SSL_set_app_data(conn->xprt_ctx, conn);
+ if (!SSL_set_app_data(conn->xprt_ctx, conn)) {
+ SSL_free(conn->xprt_ctx);
+ conn->xprt_ctx = NULL;
+ if (may_retry--) {
+ pool_gc2();
+ goto retry_accept;
+ }
+ conn->err_code = CO_ER_SSL_NO_MEM;
+ return -1;
+ }
+
+ SSL_set_accept_state(conn->xprt_ctx);
/* leave init state and start handshake */
conn->flags |= CO_FL_SSL_WAIT_HS | CO_FL_WAIT_L6_CONN;
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org
For additional commands, e-mail: opensuse-commit+help(a)opensuse.org
1
0
Hello community,
here is the log from the commit of package gtkwave for openSUSE:Factory checked in at 2014-11-26 20:55:45
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/gtkwave (Old)
and /work/SRC/openSUSE:Factory/.gtkwave.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "gtkwave"
Changes:
--------
--- /work/SRC/openSUSE:Factory/gtkwave/gtkwave.changes 2014-11-10 17:28:54.000000000 +0100
+++ /work/SRC/openSUSE:Factory/.gtkwave.new/gtkwave.changes 2014-11-26 22:57:01.000000000 +0100
@@ -1,0 +2,6 @@
+Wed Nov 26 13:38:45 UTC 2014 - dmitry_r(a)opensuse.org
+
+- Update to version 3.3.64
+ * bugfix release, see included ChangeLog file for details
+
+-------------------------------------------------------------------
Old:
----
gtkwave-3.3.63.tar.gz
New:
----
gtkwave-3.3.64.tar.gz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ gtkwave.spec ++++++
--- /var/tmp/diff_new_pack.5NGV4r/_old 2014-11-26 22:57:02.000000000 +0100
+++ /var/tmp/diff_new_pack.5NGV4r/_new 2014-11-26 22:57:02.000000000 +0100
@@ -17,7 +17,7 @@
Name: gtkwave
-Version: 3.3.63
+Version: 3.3.64
Release: 0
Summary: Waveform viewer for Ditital Signals
License: GPL-2.0+
++++++ gtkwave-3.3.63.tar.gz -> gtkwave-3.3.64.tar.gz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gtkwave-3.3.63/ChangeLog new/gtkwave-3.3.64/ChangeLog
--- old/gtkwave-3.3.63/ChangeLog 2014-11-07 01:41:05.000000000 +0100
+++ new/gtkwave-3.3.64/ChangeLog 2014-11-26 03:23:11.000000000 +0100
@@ -1489,3 +1489,8 @@
on a mouse) if shift pressed.
Timescale fix for Verilator where it emits 0ps as a timescale.
Added sample gtkwave.appdata.xml file in share/appdata.
+3.3.64 25nov14 Fix to FileChooser to prevent requester from blocking on asking
+ for a directory if a dumpfile is loaded without some amount of
+ absolute/relative pathname.
+ Updated LZ4 for version r124.
+ Fix for x-windows OSX compiles.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gtkwave-3.3.63/LICENSE.TXT new/gtkwave-3.3.64/LICENSE.TXT
--- old/gtkwave-3.3.63/LICENSE.TXT 2014-09-03 18:14:43.000000000 +0200
+++ new/gtkwave-3.3.64/LICENSE.TXT 2014-11-26 03:24:39.000000000 +0100
@@ -1,6 +1,6 @@
##########################################################################
-GTKWave 3.3.63 Wave Viewer is Copyright (C) 1999-2014 Tony Bybell.
+GTKWave 3.3.64 Wave Viewer is Copyright (C) 1999-2014 Tony Bybell.
Portions of GTKWave are Copyright (C) 1999-2014 Udi Finkelstein.
Context support is Copyright (C) 2007-2014 Kermin Elliott Fleming.
Trace group support is Copyright (C) 2009-2014 Donald Baltus.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gtkwave-3.3.63/configure new/gtkwave-3.3.64/configure
--- old/gtkwave-3.3.63/configure 2014-11-07 01:41:05.000000000 +0100
+++ new/gtkwave-3.3.64/configure 2014-11-07 23:16:21.000000000 +0100
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.69 for gtkwave 3.3.63.
+# Generated by GNU Autoconf 2.69 for gtkwave 3.3.64.
#
# Report bugs to <bybell(a)rocketmail.com>.
#
@@ -580,8 +580,8 @@
# Identity of this package.
PACKAGE_NAME='gtkwave'
PACKAGE_TARNAME='gtkwave'
-PACKAGE_VERSION='3.3.63'
-PACKAGE_STRING='gtkwave 3.3.63'
+PACKAGE_VERSION='3.3.64'
+PACKAGE_STRING='gtkwave 3.3.64'
PACKAGE_BUGREPORT='bybell(a)rocketmail.com'
PACKAGE_URL=''
@@ -1383,7 +1383,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 gtkwave 3.3.63 to adapt to many kinds of systems.
+\`configure' configures gtkwave 3.3.64 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1449,7 +1449,7 @@
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of gtkwave 3.3.63:";;
+ short | recursive ) echo "Configuration of gtkwave 3.3.64:";;
esac
cat <<\_ACEOF
@@ -1595,7 +1595,7 @@
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-gtkwave configure 3.3.63
+gtkwave configure 3.3.64
generated by GNU Autoconf 2.69
Copyright (C) 2012 Free Software Foundation, Inc.
@@ -2239,7 +2239,7 @@
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
-It was created by gtkwave $as_me 3.3.63, which was
+It was created by gtkwave $as_me 3.3.64, which was
generated by GNU Autoconf 2.69. Invocation command line was
$ $0 $@
@@ -3106,7 +3106,7 @@
# Define the identity of the package.
PACKAGE='gtkwave'
- VERSION='3.3.63'
+ VERSION='3.3.64'
cat >>confdefs.h <<_ACEOF
@@ -10992,7 +10992,7 @@
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
-This file was extended by gtkwave $as_me 3.3.63, which was
+This file was extended by gtkwave $as_me 3.3.64, which was
generated by GNU Autoconf 2.69. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -11058,7 +11058,7 @@
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
ac_cs_version="\\
-gtkwave config.status 3.3.63
+gtkwave config.status 3.3.64
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/gtkwave-3.3.63/configure.ac new/gtkwave-3.3.64/configure.ac
--- old/gtkwave-3.3.63/configure.ac 2014-11-07 01:41:05.000000000 +0100
+++ new/gtkwave-3.3.64/configure.ac 2014-11-07 23:16:21.000000000 +0100
@@ -2,7 +2,7 @@
# Process this file with autoconf to produce a configure script.
AC_PREREQ(2.59)
-AC_INIT(gtkwave, 3.3.63, bybell(a)rocketmail.com)
+AC_INIT(gtkwave, 3.3.64, bybell(a)rocketmail.com)
AC_CONFIG_SRCDIR([src/vcd.c])
AM_INIT_AUTOMAKE
AC_CONFIG_HEADER([config.h])
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gtkwave-3.3.63/contrib/bundle_for_osx/Info-gtkwave.plist new/gtkwave-3.3.64/contrib/bundle_for_osx/Info-gtkwave.plist
--- old/gtkwave-3.3.63/contrib/bundle_for_osx/Info-gtkwave.plist 2014-09-03 18:14:43.000000000 +0200
+++ new/gtkwave-3.3.64/contrib/bundle_for_osx/Info-gtkwave.plist 2014-11-07 23:16:21.000000000 +0100
@@ -8,7 +8,7 @@
<key>CFBundleExecutable</key>
<string>gtkwave</string>
<key>CFBundleGetInfoString</key>
- <string>3.3.63, (C) 1999-2014 Tony Bybell http://gtkwave.sourceforge.net</string>
+ <string>3.3.64, (C) 1999-2014 Tony Bybell http://gtkwave.sourceforge.net</string>
<key>CFBundleIconFile</key>
<string>gtkwave.icns</string>
<key>CFBundleIdentifier</key>
@@ -18,11 +18,11 @@
<key>CFBundlePackageType</key>
<string>APPL</string>
<key>CFBundleShortVersionString</key>
- <string>3.3.63</string>
+ <string>3.3.64</string>
<key>CFBundleSignature</key>
<string>????</string>
<key>CFBundleVersion</key>
- <string>3.3.63</string>
+ <string>3.3.64</string>
<key>NSHumanReadableCopyright</key>
<string>Copyright 1999 - 2014 Tony Bybell, GNU General Public License.</string>
<key>LSMinimumSystemVersion</key>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gtkwave-3.3.63/src/file.c new/gtkwave-3.3.64/src/file.c
--- old/gtkwave-3.3.63/src/file.c 2014-08-11 02:38:54.000000000 +0200
+++ new/gtkwave-3.3.64/src/file.c 2014-11-14 22:35:18.000000000 +0100
@@ -320,7 +320,8 @@
{
if(GLOBALS->loaded_file_name)
{
- char *tname = strdup_2(GLOBALS->loaded_file_name);
+ char *can = realpath_2(GLOBALS->loaded_file_name, NULL); /* prevents filechooser from blocking/asking where to save file */
+ char *tname = strdup_2(can ? can : GLOBALS->loaded_file_name);
char *delim = strrchr(tname, '/');
if(!delim) delim = strrchr(tname, '\\');
if(delim)
@@ -332,6 +333,8 @@
{
free_2(tname);
}
+
+ free(can);
}
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gtkwave-3.3.63/src/helpers/fst/lz4.c new/gtkwave-3.3.64/src/helpers/fst/lz4.c
--- old/gtkwave-3.3.63/src/helpers/fst/lz4.c 2014-10-11 00:00:38.000000000 +0200
+++ new/gtkwave-3.3.64/src/helpers/fst/lz4.c 2014-11-26 03:23:11.000000000 +0100
@@ -289,7 +289,7 @@
/**************************************
Macros
**************************************/
-#define LZ4_STATIC_ASSERT(c) { enum { LZ4_static_assert = 1/(!!(c)) }; } /* use only *after* variable declarations */
+#define LZ4_STATIC_ASSERT(c) { enum { LZ4_static_assert = 1/(int)(!!(c)) }; } /* use only *after* variable declarations */
#if LZ4_ARCH64 || !defined(__GNUC__)
# define LZ4_WILDCOPY(d,s,e) { do { LZ4_COPY8(d,s) } while (d<e); } /* at the end, d>=e; */
#else
@@ -701,6 +701,7 @@
LZ4_stream_t* LZ4_createStream(void)
{
LZ4_stream_t* lz4s = (LZ4_stream_t*)ALLOCATOR(4, LZ4_STREAMSIZE_U32);
+ LZ4_STATIC_ASSERT(LZ4_STREAMSIZE >= sizeof(LZ4_stream_t_internal)); /* A compilation error here means LZ4_STREAMSIZE is not large enough */
LZ4_resetStream(lz4s);
return lz4s;
}
@@ -719,14 +720,13 @@
const BYTE* const dictEnd = p + dictSize;
const BYTE* base;
- LZ4_STATIC_ASSERT(LZ4_STREAMSIZE >= sizeof(LZ4_stream_t_internal)); /* A compilation error here means LZ4_STREAMSIZE is not large enough */
if (dict->initCheck) LZ4_resetStream(LZ4_dict); /* Uninitialized structure detected */
if (dictSize < MINMATCH)
{
dict->dictionary = NULL;
dict->dictSize = 0;
- return 1;
+ return 0;
}
if (p <= dictEnd - 64 KB) p = dictEnd - 64 KB;
@@ -741,7 +741,7 @@
p+=3;
}
- return 1;
+ return dict->dictSize;
}
@@ -876,8 +876,8 @@
* in order to remove useless branches during compilation optimization.
*/
FORCE_INLINE int LZ4_decompress_generic(
- const char* source,
- char* dest,
+ const char* const source,
+ char* const dest,
int inputSize,
int outputSize, /* If endOnInput==endOnInputSize, this value is the max size of Output Buffer. */
@@ -885,20 +885,20 @@
int partialDecoding, /* full, partial */
int targetOutputSize, /* only used if partialDecoding==partial */
int dict, /* noDict, withPrefix64k, usingExtDict */
- const char* dictStart, /* only if dict==usingExtDict */
- int dictSize /* note : = 0 if noDict */
+ const BYTE* const lowPrefix, /* == dest if dict == noDict */
+ const BYTE* const dictStart, /* only if dict==usingExtDict */
+ const size_t dictSize /* note : = 0 if noDict */
)
{
/* Local Variables */
const BYTE* restrict ip = (const BYTE*) source;
- const BYTE* ref;
const BYTE* const iend = ip + inputSize;
BYTE* op = (BYTE*) dest;
BYTE* const oend = op + outputSize;
BYTE* cpy;
BYTE* oexit = op + targetOutputSize;
- const BYTE* const lowLimit = (const BYTE*)dest - dictSize;
+ const BYTE* const lowLimit = lowPrefix - dictSize;
const BYTE* const dictEnd = (const BYTE*)dictStart + dictSize;
const size_t dec32table[] = {4, 1, 2, 1, 4, 4, 4, 4};
@@ -919,8 +919,9 @@
{
unsigned token;
size_t length;
+ const BYTE* match;
- /* get runlength */
+ /* get literal length */
token = *ip++;
if ((length=(token>>ML_BITS)) == RUN_MASK)
{
@@ -931,8 +932,8 @@
length += s;
}
while (likely((endOnInput)?ip<iend-RUN_MASK:1) && (s==255));
- if ((safeDecode) && LZ4_32BITS && unlikely((size_t)(op+length)<(size_t)(op))) goto _output_error; /* overflow detection */
- if ((safeDecode) && LZ4_32BITS && unlikely((size_t)(ip+length)<(size_t)(ip))) goto _output_error; /* overflow detection */
+ if ((safeDecode) && unlikely((size_t)(op+length)<(size_t)(op))) goto _output_error; /* overflow detection */
+ if ((safeDecode) && unlikely((size_t)(ip+length)<(size_t)(ip))) goto _output_error; /* overflow detection */
}
/* copy literals */
@@ -958,8 +959,8 @@
LZ4_WILDCOPY(op, ip, cpy); ip -= (op-cpy); op = cpy;
/* get offset */
- LZ4_READ_LITTLEENDIAN_16(ref,cpy,ip); ip+=2;
- if ((checkOffset) && (unlikely(ref < lowLimit))) goto _output_error; /* Error : offset outside destination buffer */
+ LZ4_READ_LITTLEENDIAN_16(match,cpy,ip); ip+=2;
+ if ((checkOffset) && (unlikely(match < lowLimit))) goto _output_error; /* Error : offset outside destination buffer */
/* get matchlength */
if ((length=(token&ML_MASK)) == ML_MASK)
@@ -971,36 +972,38 @@
s = *ip++;
length += s;
} while (s==255);
- if ((safeDecode) && LZ4_32BITS && unlikely((size_t)(op+length)<(size_t)op)) goto _output_error; /* overflow detection */
+ if ((safeDecode) && unlikely((size_t)(op+length)<(size_t)op)) goto _output_error; /* overflow detection */
}
length += MINMATCH;
/* check external dictionary */
- if ((dict==usingExtDict) && (ref < (BYTE* const)dest))
+ if ((dict==usingExtDict) && (match < lowPrefix))
{
- if (unlikely(op+length > oend-LASTLITERALS)) goto _output_error;
+ if (unlikely(op+length > oend-LASTLITERALS)) goto _output_error; /* doesn't respect parsing restriction */
- if (length <= (size_t)(dest-(char*)ref))
+ if (length <= (size_t)(lowPrefix-match))
{
- ref = dictEnd - (dest-(char*)ref);
- memcpy(op, ref, length);
+ /* match can be copied as a single segment from external dictionary */
+ match = dictEnd - (lowPrefix-match);
+ memcpy(op, match, length);
op += length;
}
else
{
- size_t copySize = (size_t)(dest-(char*)ref);
+ /* match encompass external dictionary and current segment */
+ size_t copySize = (size_t)(lowPrefix-match);
memcpy(op, dictEnd - copySize, copySize);
op += copySize;
copySize = length - copySize;
- if (copySize > (size_t)((char*)op-dest)) /* overlap */
+ if (copySize > (size_t)(op-lowPrefix)) /* overlap within current segment */
{
BYTE* const endOfMatch = op + copySize;
- const BYTE* copyFrom = (BYTE*)dest;
+ const BYTE* copyFrom = lowPrefix;
while (op < endOfMatch) *op++ = *copyFrom++;
}
else
{
- memcpy(op, dest, copySize);
+ memcpy(op, lowPrefix, copySize);
op += copySize;
}
}
@@ -1009,25 +1012,25 @@
/* copy repeated sequence */
cpy = op + length;
- if (unlikely((op-ref)<(int)STEPSIZE))
+ if (unlikely((op-match)<(int)STEPSIZE))
{
- const size_t dec64 = dec64table[op-ref];
- op[0] = ref[0];
- op[1] = ref[1];
- op[2] = ref[2];
- op[3] = ref[3];
- ref += dec32table[op-ref];
- A32(op+4) = A32(ref);
- op += 8; ref -= dec64;
- } else { LZ4_COPY8(op,ref); }
+ const size_t dec64 = dec64table[op-match];
+ op[0] = match[0];
+ op[1] = match[1];
+ op[2] = match[2];
+ op[3] = match[3];
+ match += dec32table[op-match];
+ A32(op+4) = A32(match);
+ op += 8; match -= dec64;
+ } else { LZ4_COPY8(op,match); }
if (unlikely(cpy>oend-12))
{
if (cpy > oend-LASTLITERALS) goto _output_error; /* Error : last 5 bytes must be literals */
- if (op<oend-COPYLENGTH) LZ4_WILDCOPY(op, ref, (oend-COPYLENGTH));
- while(op<cpy) *op++=*ref++;
+ if (op<oend-COPYLENGTH) LZ4_WILDCOPY(op, match, (oend-COPYLENGTH));
+ while(op<cpy) *op++=*match++;
}
- else LZ4_WILDCOPY(op, ref, cpy);
+ else LZ4_WILDCOPY(op, match, cpy);
op=cpy; /* correction */
}
@@ -1045,25 +1048,28 @@
int LZ4_decompress_safe(const char* source, char* dest, int compressedSize, int maxDecompressedSize)
{
- return LZ4_decompress_generic(source, dest, compressedSize, maxDecompressedSize, endOnInputSize, full, 0, noDict, NULL, 0);
+ return LZ4_decompress_generic(source, dest, compressedSize, maxDecompressedSize, endOnInputSize, full, 0, noDict, (BYTE*)dest, NULL, 0);
}
int LZ4_decompress_safe_partial(const char* source, char* dest, int compressedSize, int targetOutputSize, int maxDecompressedSize)
{
- return LZ4_decompress_generic(source, dest, compressedSize, maxDecompressedSize, endOnInputSize, partial, targetOutputSize, noDict, NULL, 0);
+ return LZ4_decompress_generic(source, dest, compressedSize, maxDecompressedSize, endOnInputSize, partial, targetOutputSize, noDict, (BYTE*)dest, NULL, 0);
}
int LZ4_decompress_fast(const char* source, char* dest, int originalSize)
{
- return LZ4_decompress_generic(source, dest, 0, originalSize, endOnOutputSize, full, 0, withPrefix64k, NULL, 64 KB);
+ return LZ4_decompress_generic(source, dest, 0, originalSize, endOnOutputSize, full, 0, withPrefix64k, (BYTE*)(dest - 64 KB), NULL, 64 KB);
}
+
/* streaming decompression functions */
typedef struct
{
- const char* dictionary;
- int dictSize;
+ BYTE* externalDict;
+ size_t extDictSize;
+ BYTE* prefixEnd;
+ size_t prefixSize;
} LZ4_streamDecode_t_internal;
/*
@@ -1074,7 +1080,6 @@
LZ4_streamDecode_t* LZ4_createStreamDecode(void)
{
LZ4_streamDecode_t* lz4s = (LZ4_streamDecode_t*) ALLOCATOR(sizeof(U32), LZ4_STREAMDECODESIZE_U32);
- MEM_INIT(lz4s, 0, LZ4_STREAMDECODESIZE);
return lz4s;
}
@@ -1094,8 +1099,10 @@
int LZ4_setStreamDecode (LZ4_streamDecode_t* LZ4_streamDecode, const char* dictionary, int dictSize)
{
LZ4_streamDecode_t_internal* lz4sd = (LZ4_streamDecode_t_internal*) LZ4_streamDecode;
- lz4sd->dictionary = dictionary;
- lz4sd->dictSize = dictSize;
+ lz4sd->prefixSize = (size_t) dictSize;
+ lz4sd->prefixEnd = (BYTE*) dictionary + dictSize;
+ lz4sd->externalDict = NULL;
+ lz4sd->extDictSize = 0;
return 1;
}
@@ -1104,23 +1111,32 @@
These decoding functions allow decompression of multiple blocks in "streaming" mode.
Previously decoded blocks must still be available at the memory position where they were decoded.
If it's not possible, save the relevant part of decoded data into a safe buffer,
- and indicate where it stands using LZ4_setDictDecode()
+ and indicate where it stands using LZ4_setStreamDecode()
*/
int LZ4_decompress_safe_continue (LZ4_streamDecode_t* LZ4_streamDecode, const char* source, char* dest, int compressedSize, int maxOutputSize)
{
LZ4_streamDecode_t_internal* lz4sd = (LZ4_streamDecode_t_internal*) LZ4_streamDecode;
int result;
- result = LZ4_decompress_generic(source, dest, compressedSize, maxOutputSize, endOnInputSize, full, 0, usingExtDict, lz4sd->dictionary, lz4sd->dictSize);
- if (result <= 0) return result;
- if (lz4sd->dictionary + lz4sd->dictSize == dest)
+ if (lz4sd->prefixEnd == (BYTE*)dest)
{
- lz4sd->dictSize += result;
+ result = LZ4_decompress_generic(source, dest, compressedSize, maxOutputSize,
+ endOnInputSize, full, 0,
+ usingExtDict, lz4sd->prefixEnd - lz4sd->prefixSize, lz4sd->externalDict, lz4sd->extDictSize);
+ if (result <= 0) return result;
+ lz4sd->prefixSize += result;
+ lz4sd->prefixEnd += result;
}
else
{
- lz4sd->dictionary = dest;
- lz4sd->dictSize = result;
+ lz4sd->extDictSize = lz4sd->prefixSize;
+ lz4sd->externalDict = lz4sd->prefixEnd - lz4sd->extDictSize;
+ result = LZ4_decompress_generic(source, dest, compressedSize, maxOutputSize,
+ endOnInputSize, full, 0,
+ usingExtDict, (BYTE*)dest, lz4sd->externalDict, lz4sd->extDictSize);
+ if (result <= 0) return result;
+ lz4sd->prefixSize = result;
+ lz4sd->prefixEnd = (BYTE*)dest + result;
}
return result;
@@ -1131,16 +1147,25 @@
LZ4_streamDecode_t_internal* lz4sd = (LZ4_streamDecode_t_internal*) LZ4_streamDecode;
int result;
- result = LZ4_decompress_generic(source, dest, 0, originalSize, endOnOutputSize, full, 0, usingExtDict, lz4sd->dictionary, lz4sd->dictSize);
- if (result <= 0) return result;
- if (lz4sd->dictionary + lz4sd->dictSize == dest)
+ if (lz4sd->prefixEnd == (BYTE*)dest)
{
- lz4sd->dictSize += result;
+ result = LZ4_decompress_generic(source, dest, 0, originalSize,
+ endOnOutputSize, full, 0,
+ usingExtDict, lz4sd->prefixEnd - lz4sd->prefixSize, lz4sd->externalDict, lz4sd->extDictSize);
+ if (result <= 0) return result;
+ lz4sd->prefixSize += originalSize;
+ lz4sd->prefixEnd += originalSize;
}
else
{
- lz4sd->dictionary = dest;
- lz4sd->dictSize = result;
+ lz4sd->extDictSize = lz4sd->prefixSize;
+ lz4sd->externalDict = (BYTE*)dest - lz4sd->extDictSize;
+ result = LZ4_decompress_generic(source, dest, 0, originalSize,
+ endOnOutputSize, full, 0,
+ usingExtDict, (BYTE*)dest, lz4sd->externalDict, lz4sd->extDictSize);
+ if (result <= 0) return result;
+ lz4sd->prefixSize = originalSize;
+ lz4sd->prefixEnd = (BYTE*)dest + originalSize;
}
return result;
@@ -1157,28 +1182,30 @@
FORCE_INLINE int LZ4_decompress_usingDict_generic(const char* source, char* dest, int compressedSize, int maxOutputSize, int safe, const char* dictStart, int dictSize)
{
if (dictSize==0)
- return LZ4_decompress_generic(source, dest, compressedSize, maxOutputSize, safe, full, 0, noDict, NULL, 64 KB);
- if ((dictStart+dictSize == dest) && (dictSize >= (int)(64 KB - 1)))
- return LZ4_decompress_generic(source, dest, compressedSize, maxOutputSize, safe, full, 0, withPrefix64k, NULL, 64 KB);
- return LZ4_decompress_generic(source, dest, compressedSize, maxOutputSize, safe, full, 0, usingExtDict, dictStart, dictSize);
+ return LZ4_decompress_generic(source, dest, compressedSize, maxOutputSize, safe, full, 0, noDict, (BYTE*)dest, NULL, 0);
+ if (dictStart+dictSize == dest)
+ {
+ if (dictSize >= (int)(64 KB - 1))
+ return LZ4_decompress_generic(source, dest, compressedSize, maxOutputSize, safe, full, 0, withPrefix64k, (BYTE*)dest-64 KB, NULL, 0);
+ return LZ4_decompress_generic(source, dest, compressedSize, maxOutputSize, safe, full, 0, noDict, (BYTE*)dest-dictSize, NULL, 0);
+ }
+ return LZ4_decompress_generic(source, dest, compressedSize, maxOutputSize, safe, full, 0, usingExtDict, (BYTE*)dest, (BYTE*)dictStart, dictSize);
}
int LZ4_decompress_safe_usingDict(const char* source, char* dest, int compressedSize, int maxOutputSize, const char* dictStart, int dictSize)
{
- //return LZ4_decompress_generic(source, dest, compressedSize, maxOutputSize, endOnInputSize, full, 0, usingExtDict, dictStart, dictSize);
return LZ4_decompress_usingDict_generic(source, dest, compressedSize, maxOutputSize, 1, dictStart, dictSize);
}
int LZ4_decompress_fast_usingDict(const char* source, char* dest, int originalSize, const char* dictStart, int dictSize)
{
- //return LZ4_decompress_generic(source, dest, 0, originalSize, endOnOutputSize, full, 0, usingExtDict, dictStart, dictSize);
return LZ4_decompress_usingDict_generic(source, dest, 0, originalSize, 0, dictStart, dictSize);
}
/* debug function */
int LZ4_decompress_safe_forceExtDict(const char* source, char* dest, int compressedSize, int maxOutputSize, const char* dictStart, int dictSize)
{
- return LZ4_decompress_generic(source, dest, compressedSize, maxOutputSize, endOnInputSize, full, 0, usingExtDict, dictStart, dictSize);
+ return LZ4_decompress_generic(source, dest, compressedSize, maxOutputSize, endOnInputSize, full, 0, usingExtDict, (BYTE*)dest, (BYTE*)dictStart, dictSize);
}
@@ -1258,10 +1285,10 @@
int LZ4_decompress_safe_withPrefix64k(const char* source, char* dest, int compressedSize, int maxOutputSize)
{
- return LZ4_decompress_generic(source, dest, compressedSize, maxOutputSize, endOnInputSize, full, 0, withPrefix64k, NULL, 64 KB);
+ return LZ4_decompress_generic(source, dest, compressedSize, maxOutputSize, endOnInputSize, full, 0, withPrefix64k, (BYTE*)dest - 64 KB, NULL, 64 KB);
}
int LZ4_decompress_fast_withPrefix64k(const char* source, char* dest, int originalSize)
{
- return LZ4_decompress_generic(source, dest, 0, originalSize, endOnOutputSize, full, 0, withPrefix64k, NULL, 64 KB);
+ return LZ4_decompress_generic(source, dest, 0, originalSize, endOnOutputSize, full, 0, withPrefix64k, (BYTE*)dest - 64 KB, NULL, 64 KB);
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gtkwave-3.3.63/src/helpers/fst/lz4.h new/gtkwave-3.3.64/src/helpers/fst/lz4.h
--- old/gtkwave-3.3.63/src/helpers/fst/lz4.h 2014-10-11 00:00:38.000000000 +0200
+++ new/gtkwave-3.3.64/src/helpers/fst/lz4.h 2014-11-26 03:23:11.000000000 +0100
@@ -47,8 +47,8 @@
Version
**************************************/
#define LZ4_VERSION_MAJOR 1 /* for major interface/format changes */
-#define LZ4_VERSION_MINOR 3 /* for minor interface/format changes */
-#define LZ4_VERSION_RELEASE 1 /* for tweaks, bug-fixes, or development */
+#define LZ4_VERSION_MINOR 4 /* for minor interface/format changes */
+#define LZ4_VERSION_RELEASE 0 /* for tweaks, bug-fixes, or development */
#define LZ4_VERSION_NUMBER (LZ4_VERSION_MAJOR *100*100 + LZ4_VERSION_MINOR *100 + LZ4_VERSION_RELEASE)
int LZ4_versionNumber (void);
@@ -193,30 +193,30 @@
* LZ4_freeStream releases its memory.
*/
LZ4_stream_t* LZ4_createStream(void);
-int LZ4_freeStream (LZ4_stream_t* LZ4_stream);
+int LZ4_freeStream (LZ4_stream_t* LZ4_streamPtr);
/*
* LZ4_loadDict
* Use this function to load a static dictionary into LZ4_stream.
* Any previous data will be forgotten, only 'dictionary' will remain in memory.
* Loading a size of 0 is allowed.
- * Return : 1 if OK, 0 if error
+ * Return : dictionary size, in bytes (necessarily <= 64 KB)
*/
-int LZ4_loadDict (LZ4_stream_t* LZ4_stream, const char* dictionary, int dictSize);
+int LZ4_loadDict (LZ4_stream_t* LZ4_streamPtr, const char* dictionary, int dictSize);
/*
* LZ4_compress_continue
* Compress data block 'source', using blocks compressed before as dictionary to improve compression ratio
* Previous data blocks are assumed to still be present at their previous location.
*/
-int LZ4_compress_continue (LZ4_stream_t* LZ4_stream, const char* source, char* dest, int inputSize);
+int LZ4_compress_continue (LZ4_stream_t* LZ4_streamPtr, const char* source, char* dest, int inputSize);
/*
* LZ4_compress_limitedOutput_continue
* Same as before, but also specify a maximum target compressed size (maxOutputSize)
* If objective cannot be met, compression exits, and returns a zero.
*/
-int LZ4_compress_limitedOutput_continue (LZ4_stream_t* LZ4_stream, const char* source, char* dest, int inputSize, int maxOutputSize);
+int LZ4_compress_limitedOutput_continue (LZ4_stream_t* LZ4_streamPtr, const char* source, char* dest, int inputSize, int maxOutputSize);
/*
* LZ4_saveDict
@@ -227,14 +227,14 @@
* Return : dictionary size in bytes, or 0 if error
* Note : any dictSize > 64 KB will be interpreted as 64KB.
*/
-int LZ4_saveDict (LZ4_stream_t* LZ4_stream, char* safeBuffer, int dictSize);
+int LZ4_saveDict (LZ4_stream_t* LZ4_streamPtr, char* safeBuffer, int dictSize);
/************************************************
Experimental Streaming Decompression Functions
************************************************/
-#define LZ4_STREAMDECODESIZE_U32 4
+#define LZ4_STREAMDECODESIZE_U32 8
#define LZ4_STREAMDECODESIZE (LZ4_STREAMDECODESIZE_U32 * sizeof(unsigned int))
/*
* LZ4_streamDecode_t
@@ -244,29 +244,29 @@
typedef struct { unsigned int table[LZ4_STREAMDECODESIZE_U32]; } LZ4_streamDecode_t;
/*
+ * If you prefer dynamic allocation methods,
+ * LZ4_createStreamDecode will allocate and initialize an LZ4_streamDecode_t structure
+ * LZ4_freeStreamDecode releases its memory.
+ */
+LZ4_streamDecode_t* LZ4_createStreamDecode(void);
+int LZ4_freeStreamDecode (LZ4_streamDecode_t* LZ4_stream);
+
+/*
* LZ4_setStreamDecode
* Use this function to instruct where to find the dictionary.
* This function can be used to specify a static dictionary,
* or to instruct where to find some previously decoded data saved into a different memory space.
- * Setting a size of 0 is allowed (same effect as no dictionary).
+ * Setting a size of 0 is allowed (same effect as no dictionary, same effect as reset).
* Return : 1 if OK, 0 if error
*/
int LZ4_setStreamDecode (LZ4_streamDecode_t* LZ4_streamDecode, const char* dictionary, int dictSize);
/*
- * If you prefer dynamic allocation methods,
- * LZ4_createStreamDecode will allocate and initialize an LZ4_streamDecode_t structure
- * LZ4_freeStreamDecode releases its memory.
- */
-LZ4_streamDecode_t* LZ4_createStreamDecode(void);
-int LZ4_freeStreamDecode (LZ4_streamDecode_t* LZ4_stream);
-
-/*
*_continue() :
These decoding functions allow decompression of multiple blocks in "streaming" mode.
- Previously decoded blocks must still be available at the memory position where they were decoded.
- If it's not possible, save the relevant part of decoded data into a safe buffer,
- and indicate where its new address using LZ4_setStreamDecode()
+ Previously decoded blocks *must* remain available at the memory position where they were decoded (up to 64 KB)
+ If this condition is not possible, save the relevant part of decoded data into a safe buffer,
+ and indicate where is its new address using LZ4_setStreamDecode()
*/
int LZ4_decompress_safe_continue (LZ4_streamDecode_t* LZ4_streamDecode, const char* source, char* dest, int compressedSize, int maxDecompressedSize);
int LZ4_decompress_fast_continue (LZ4_streamDecode_t* LZ4_streamDecode, const char* source, char* dest, int originalSize);
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gtkwave-3.3.63/src/main.c new/gtkwave-3.3.64/src/main.c
--- old/gtkwave-3.3.63/src/main.c 2014-08-11 02:38:54.000000000 +0200
+++ new/gtkwave-3.3.64/src/main.c 2014-11-23 17:54:17.000000000 +0100
@@ -707,6 +707,12 @@
#endif
}
+#if defined(__APPLE__)
+#ifndef MAC_INTEGRATION
+do_primary_inits:
+#endif
+#endif
+
if(!mainwindow_already_built)
{
wave_gconf_init(argc, argv);
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org
For additional commands, e-mail: opensuse-commit+help(a)opensuse.org
1
0
Hello community,
here is the log from the commit of package gtk3-branding-openSUSE for openSUSE:Factory checked in at 2014-11-26 20:57:32
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/gtk3-branding-openSUSE (Old)
and /work/SRC/openSUSE:Factory/.gtk3-branding-openSUSE.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "gtk3-branding-openSUSE"
Changes:
--------
--- /work/SRC/openSUSE:Factory/gtk3-branding-openSUSE/gtk3-branding-SLED.changes 2014-09-30 19:36:30.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.gtk3-branding-openSUSE.new/gtk3-branding-SLED.changes 2014-11-26 22:56:58.000000000 +0100
@@ -1,0 +2,5 @@
+Tue Nov 25 11:10:40 UTC 2014 - dimstar(a)opensuse.org
+
+- Change settings.ini: The default icon theme is called Adwaita.
+
+-------------------------------------------------------------------
gtk3-branding-openSUSE.changes: same change
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
gtk3-branding-openSUSE.spec: same change
++++++ gtk3-branding-settings.ini ++++++
--- /var/tmp/diff_new_pack.6pM25t/_old 2014-11-26 22:56:59.000000000 +0100
+++ /var/tmp/diff_new_pack.6pM25t/_new 2014-11-26 22:56:59.000000000 +0100
@@ -10,6 +10,6 @@
[Settings]
gtk-theme-name = Adwaita
gtk-cursor-theme-name = Adwaita
-gtk-icon-theme-name = gnome
-gtk-fallback-icon-theme = gnome
+gtk-icon-theme-name = Adwaita
+gtk-fallback-icon-theme = Adwaita
gtk-enable-primary-paste = true
++++++ gtk3-branding.changes.in ++++++
--- /var/tmp/diff_new_pack.6pM25t/_old 2014-11-26 22:56:59.000000000 +0100
+++ /var/tmp/diff_new_pack.6pM25t/_new 2014-11-26 22:56:59.000000000 +0100
@@ -1,4 +1,9 @@
-------------------------------------------------------------------
+Tue Nov 25 11:10:40 UTC 2014 - dimstar(a)opensuse.org
+
+- Change settings.ini: The default icon theme is called Adwaita.
+
+-------------------------------------------------------------------
Tue Jul 15 23:50:47 UTC 2014 - dimstar(a)opensuse.org
- Drop gnome-icon-theme Requires: no longer required after the
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org
For additional commands, e-mail: opensuse-commit+help(a)opensuse.org
1
0
Hello community,
here is the log from the commit of package gtk2 for openSUSE:Factory checked in at 2014-11-26 20:57:39
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/gtk2 (Old)
and /work/SRC/openSUSE:Factory/.gtk2.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "gtk2"
Changes:
--------
--- /work/SRC/openSUSE:Factory/gtk2/gtk2.changes 2014-11-13 09:17:09.000000000 +0100
+++ /work/SRC/openSUSE:Factory/.gtk2.new/gtk2.changes 2014-11-26 22:56:55.000000000 +0100
@@ -1,0 +2,13 @@
+Tue Nov 25 16:28:13 UTC 2014 - dimstar(a)opensuse.org
+
+- Do not package ChangeLog: it's a 2MB plain text file which is not
+ going to be read ever by anybody. NEWS contains similar
+ information in a more approachable way.
+
+-------------------------------------------------------------------
+Tue Nov 25 13:38:51 UTC 2014 - dimstar(a)opensuse.org
+
+- Ad gtk2-allow-deprecated-gdk-pixbuf-API.patch: Allow deprecated
+ gdk-pixbuf API, taken from git.
+
+-------------------------------------------------------------------
New:
----
gtk2-allow-deprecated-gdk-pixbuf-API.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ gtk2.spec ++++++
--- /var/tmp/diff_new_pack.d8hESO/_old 2014-11-26 22:56:56.000000000 +0100
+++ /var/tmp/diff_new_pack.d8hESO/_new 2014-11-26 22:56:56.000000000 +0100
@@ -35,6 +35,8 @@
Source5: macros.gtk2
# PATCH-FIX-UPSTREAM gtk2-window-dragging.patch bgo#611313 -- Taken from Fedora, to support window dragging from menubars/toolbars
Patch0: gtk2-window-dragging.patch
+# PATCH-FIX-UPSTREAM gtk2-allow-deprecated-gdk-pixbuf-API.patch dimstar(a)opensuse.org -- Allow deprecated gdk-pixbuf API, taken from git
+Patch1: gtk2-allow-deprecated-gdk-pixbuf-API.patch
# PATCH-FIX-OPENSUSE gtk2-GTK_PATH64.patch sbrabec(a)novell.com - 64-bit dual install. Use GTK_PATH64 environment variable instead of GTK_PATH
Patch8: gtk2-GTK_PATH64.patch
# PATCH-FEATURE-UPSTREAM bugzilla-129753-gtk+-2.8.9-localize-font-style-name.diff bnc129753 bgo319484 mfabian(a)novell.com - Translate the font styles in the GUI
@@ -322,6 +324,7 @@
done
gnome-patch-translation-prepare
%patch0 -p1
+%patch1 -p1
%if "%{_lib}" == "lib64"
cp -a %{SOURCE2} .
# WARNING: This patch does not patch not installed demos and tests.
@@ -479,7 +482,7 @@
%files -n libgtk-2_0-0
%defattr(-,root,root)
-%doc AUTHORS COPYING README NEWS ChangeLog
+%doc AUTHORS COPYING README NEWS
%if "%{_lib}" == "lib64"
%doc README.SUSE
%endif
++++++ gtk2-allow-deprecated-gdk-pixbuf-API.patch ++++++
>From 5bafcca63f8d065461c311f1ab768e7d0d290813 Mon Sep 17 00:00:00 2001
From: Matthias Clasen <mclasen(a)redhat.com>
Date: Wed, 22 Oct 2014 22:10:56 -0400
Subject: Ignore gdk-pixbuf deprecations
We're not going to start updating the 2.24 branch to newer
gdk-pixbuf APIs, so ignore deprecations.
diff --git a/configure.ac b/configure.ac
index 85f0454..9e5c4f7 100644
--- a/configure.ac
+++ b/configure.ac
@@ -621,8 +621,6 @@ if test "x$GLIB_VERSION_MAJOR_MINOR" = "x$GLIB_REQUIRED_VERSION_MAJOR_MINOR"; th
CFLAGS="-DG_DISABLE_DEPRECATED $CFLAGS"
fi
-CFLAGS="-DGDK_PIXBUF_DISABLE_DEPRECATED $CFLAGS"
-
dnl
dnl Check for bind_textdomain_codeset, including -lintl if GLib brings it in.
--
cgit v0.10.1
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org
For additional commands, e-mail: opensuse-commit+help(a)opensuse.org
1
0