openSUSE Commits
Threads by month
- ----- 2024 -----
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2023 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2022 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2021 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2020 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2019 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2018 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2017 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2016 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2015 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2014 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2013 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2012 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2011 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2010 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2009 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2008 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2007 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2006 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
March 2013
- 1 participants
- 1893 discussions
Hello community,
here is the log from the commit of package rubygem-tilt for openSUSE:Factory checked in at 2013-03-26 07:02:06
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/rubygem-tilt (Old)
and /work/SRC/openSUSE:Factory/.rubygem-tilt.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "rubygem-tilt", Maintainer is "MRueckert(a)suse.com"
Changes:
--------
--- /work/SRC/openSUSE:Factory/rubygem-tilt/rubygem-tilt.changes 2013-03-11 07:46:16.000000000 +0100
+++ /work/SRC/openSUSE:Factory/.rubygem-tilt.new/rubygem-tilt.changes 2013-03-26 07:02:07.000000000 +0100
@@ -1,0 +2,10 @@
+Mon Mar 18 06:16:43 UTC 2013 - coolo(a)suse.com
+
+- updated to version 1.3.6
+ * Accept Hash that implements #path as options (#180, lawso017)
+ * Changed extension for CsvTemplate from '.csv' to '.rcsv' (#177, alexgb)
+ * Fixed extension for PlainTemplate (judofyr)
+ * Improved local variables regexp (#174, razorinc)
+ * Added CHANGELOG.md
+
+-------------------------------------------------------------------
@@ -4,0 +15,15 @@
+ * Support RDoc 4.0 (#168, judofyr)
+ * Add mention of Org-Mode support (#165, aslakknutsen)
+ * Add AsciiDoctorTemplate (#163, #164, aslakknutsen)
+ * Add PlainTextTemplate (nathanaeljones)
+ * Restrict locals to valid variable names (#158, thinkerbot)
+ * ERB: Improve trim mode support (#156, ssimeonov)
+ * Add CSVTemplate (#153, alexgb)
+ * Remove special case for 1.9.1 (#147, guilleiguaran)
+ * Add allows\_script? method to Template (#143, bhollis)
+ * Default to using Redcarpet2 (#139, DAddYE)
+ * Allow File/Tempfile as filenames (#134, jamesotron)
+ * Add EtanniTemplate (#131, manveru)
+ * Support RDoc 3.10 (#112, timfel)
+ * Always compile templates; remove old source evaluator (rtomayko)
+ * Less: Options are now being passed to the parser (#106, cowboyd)
Old:
----
tilt-1.3.4.gem
New:
----
tilt-1.3.6.gem
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ rubygem-tilt.spec ++++++
--- /var/tmp/diff_new_pack.K0h4aM/_old 2013-03-26 07:02:09.000000000 +0100
+++ /var/tmp/diff_new_pack.K0h4aM/_new 2013-03-26 07:02:09.000000000 +0100
@@ -17,7 +17,7 @@
Name: rubygem-tilt
-Version: 1.3.4
+Version: 1.3.6
Release: 0
%define mod_name tilt
%define mod_full_name %{mod_name}-%{version}
--
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 rubygem-slop for openSUSE:Factory checked in at 2013-03-26 07:01:52
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/rubygem-slop (Old)
and /work/SRC/openSUSE:Factory/.rubygem-slop.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "rubygem-slop", Maintainer is ""
Changes:
--------
--- /work/SRC/openSUSE:Factory/rubygem-slop/rubygem-slop.changes 2013-03-08 11:20:50.000000000 +0100
+++ /work/SRC/openSUSE:Factory/.rubygem-slop.new/rubygem-slop.changes 2013-03-26 07:01:53.000000000 +0100
@@ -1,0 +2,8 @@
+Mon Mar 18 06:18:24 UTC 2013 - coolo(a)suse.com
+
+- updated to version 3.4.4
+ * Disable the run callback when the help option is used and `-h`
+ or `--help` is passed. #106
+ * Ensure default `--help` option exits by default (#107, Autumn Perrault).
+
+-------------------------------------------------------------------
Old:
----
slop-3.4.3.gem
New:
----
slop-3.4.4.gem
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ rubygem-slop.spec ++++++
--- /var/tmp/diff_new_pack.V2XBlP/_old 2013-03-26 07:01:55.000000000 +0100
+++ /var/tmp/diff_new_pack.V2XBlP/_new 2013-03-26 07:01:55.000000000 +0100
@@ -17,7 +17,7 @@
Name: rubygem-slop
-Version: 3.4.3
+Version: 3.4.4
Release: 0
%define mod_name slop
%define mod_full_name %{mod_name}-%{version}
@@ -28,7 +28,7 @@
BuildRequires: ruby-devel >= 1.8.7
Url: http://github.com/injekt/slop
Source: %{mod_full_name}.gem
-Summary: Option gathering made easy
+Summary: Simple Lightweight Option Parsing
License: MIT
Group: Development/Languages/Ruby
--
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 projectM for openSUSE:Factory checked in at 2013-03-26 07:01:33
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/projectM (Old)
and /work/SRC/openSUSE:Factory/.projectM.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "projectM", Maintainer is ""
Changes:
--------
--- /work/SRC/openSUSE:Factory/projectM/projectM.changes 2012-05-31 17:09:17.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.projectM.new/projectM.changes 2013-03-26 07:01:35.000000000 +0100
@@ -1,0 +2,5 @@
+Sun Mar 24 16:50:14 UTC 2013 - schwab(a)suse.de
+
+- Properly determine list of lib64 platforms
+
+-------------------------------------------------------------------
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ projectM.spec ++++++
--- /var/tmp/diff_new_pack.l6R1yS/_old 2013-03-26 07:01:39.000000000 +0100
+++ /var/tmp/diff_new_pack.l6R1yS/_new 2013-03-26 07:01:39.000000000 +0100
@@ -1,7 +1,7 @@
#
# spec file for package projectM
#
-# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -115,7 +115,7 @@
%fdupes
%suse_update_desktop_file -n %{buildroot}%{_datadir}/applications/%{name}-pulseaudio.desktop Mixer
-%ifarch x86_64 ppc64
+%if "%{_lib}" == "lib64"
mv %{buildroot}%{_prefix}/lib/* %{buildroot}%{_libdir}
%endif
--
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 pragha for openSUSE:Factory checked in at 2013-03-26 07:01:25
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/pragha (Old)
and /work/SRC/openSUSE:Factory/.pragha.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "pragha", Maintainer is ""
Changes:
--------
--- /work/SRC/openSUSE:Factory/pragha/pragha.changes 2013-03-03 21:07:56.000000000 +0100
+++ /work/SRC/openSUSE:Factory/.pragha.new/pragha.changes 2013-03-26 07:01:27.000000000 +0100
@@ -1,0 +2,9 @@
+Sun Mar 24 17:18:10 UTC 2013 - dimstar(a)opensuse.org
+
+- Switch to GStreamer 1.0:
+ + Change pkgconfig(gstreamer-0.10*) BuildRequires to
+ pkgconfig(gstreamer-1.0*).
+ + Replace gstreamer-0_10-* Requires with gstreamer-*.
+ + Pass --with-gstreamer=1.0 to configure.
+
+-------------------------------------------------------------------
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ pragha.spec ++++++
--- /var/tmp/diff_new_pack.oJI2aS/_old 2013-03-26 07:01:28.000000000 +0100
+++ /var/tmp/diff_new_pack.oJI2aS/_new 2013-03-26 07:01:28.000000000 +0100
@@ -35,8 +35,8 @@
BuildRequires: intltool
BuildRequires: libtool
BuildRequires: pkgconfig(dbus-glib-1)
-BuildRequires: pkgconfig(gstreamer-0.10)
-BuildRequires: pkgconfig(gstreamer-plugins-base-0.10)
+BuildRequires: pkgconfig(gstreamer-1.0)
+BuildRequires: pkgconfig(gstreamer-plugins-base-1.0)
BuildRequires: pkgconfig(gthread-2.0) >= 2.32
BuildRequires: pkgconfig(gtk+-2.0) >= 2.24
BuildRequires: pkgconfig(keybinder)
@@ -49,8 +49,8 @@
BuildRequires: pkgconfig(libxfce4ui-1)
BuildRequires: pkgconfig(taglib)
BuildRequires: pkgconfig(totem-plparser)
-Requires: gstreamer-0_10-plugins-base
-Requires: gstreamer-0_10-plugins-good
+Requires: gstreamer-plugins-base
+Requires: gstreamer-plugins-good
Recommends: %{name}-lang
BuildRoot: %{_tmppath}/%{name}-%{version}-build
@@ -86,7 +86,7 @@
%patch1 -p1
%build
-%configure
+%configure --with-gstreamer=1.0
make %{?_smp_mflags}
%install
--
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 php5 for openSUSE:Factory checked in at 2013-03-26 07:01:10
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/php5 (Old)
and /work/SRC/openSUSE:Factory/.php5.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "php5", Maintainer is "PGajdos(a)suse.com"
Changes:
--------
--- /work/SRC/openSUSE:Factory/php5/php5.changes 2013-03-08 11:20:49.000000000 +0100
+++ /work/SRC/openSUSE:Factory/.php5.new/php5.changes 2013-03-26 07:01:11.000000000 +0100
@@ -1,0 +2,77 @@
+Thu Mar 21 11:58:40 UTC 2013 - pgajdos(a)suse.com
+
+- updated to 5.4.13:
+ Core:
+ Fixed bug #64235 (Insteadof not work for class method in 5.4.11).
+ Implemented FR #64175 (Added HTTP codes as of RFC 6585).
+ Fixed bug #64142 (dval to lval different behavior on ppc64).
+ Fixed bug #64070 (Inheritance with Traits failed with error).
+ CLI server:
+ Fixed bug #64128 (buit-in web server is broken on ppc64).
+ Mbstring:
+ mb_split() can now handle empty matches like preg_split() does.
+ OpenSSL:
+ Fixed bug #61930 (openssl corrupts ssl key resource when using openssl_get_publickey()).
+ PDO_mysql:
+ Fixed bug #60840 (undefined symbol: mysqlnd_debug_std_no_trace_funcs).
+ Phar:
+ Fixed timestamp update on Phar contents modification.
+ SOAP
+ Added check that soap.wsdl_cache_dir conforms to open_basedir (CVE-2013-1635).
+ Disabled external entities loading (CVE-2013-1643, CVE-2013-1824).
+ SPL:
+ Fixed bug #64264 (SPLFixedArray toArray problem).
+ Fixed bug #64228 (RecursiveDirectoryIterator always assumes SKIP_DOTS).
+ Fixed bug #64106 (Segfault on SplFixedArray[][x] = y when extended).
+ Fixed bug #52861 (unset fails with ArrayObject and deep arrays).
+ SNMP:
+ Fixed bug #64124 (IPv6 malformed).
+
+-------------------------------------------------------------------
+Thu Mar 21 09:27:28 UTC 2013 - pgajdos(a)suse.com
+
+- updated to 5.4.12:
+ * dropped sqlite.so (no longer shipped with 5.4)
+ * dropped t1lib support
+ * dropped %{suse_version} 10.x support
+ * see /usr/share/doc/packages/php5/UPGRADING or
+ http://svn.php.net/viewvc/php/php-src/branches/PHP_5_4/UPGRADING
+ for details
+ * source changes:
+ D php-5.2.9-BNC-457056.patch -- renamed to php5-BNC-457056.patch
+ D php-5.3.0-bnc513080.patch -- there's no relevant code in exif.c
+ D php-5.3.1-systzdata-v7.patch -- renamed to php5-systzdata-v7.patch
+ D php-5.3.2-aconf26x.patch -- dropped, it is not needed yet
+ D php-5.3.2-ini.patch -- renamed to php5-ini.patch
+ D php-5.3.2-no-build-date.patch -- renamed to php5-no-build-date.patch
+ D php-5.3.22.tar.bz2 -- old tarball
+ D php-5.3.4-format-string-issues.patch -- renamed to php5-format-string-issues.patch
+ D php-5.3.4-pts.patch -- renamed to php5-pts.patch
+ D php-5.3.6-gcc_builtins.patch -- renamed to php5-gcc_builtins.patch
+ D php-5.3.6-ini-date.timezone.patch -- part of php5-ini.patch
+ D php-5.3.8-CVE-2011-4153.patch -- fixed in 5.4 branch
+ D php-5.3.8-crypt-tests.patch -- renamed to php5-crypt-tests.patch
+ D php-5.3.8-no-reentrant-crypt.patch -- renamed to php5-no-reentrant-crypt.patch
+ A php-5.4.13.tar.bz2 -- new version tarball
+ D php-cloexec.patch -- renamed to php5-cloexec.patch
+ M php-suse-addons.tar.bz2 -- content of tar balls are actualy equal
+ A php5-BNC-457056.patch -- renamed from php-5.2.9-BNC-457056.patch, not rebased
+ A php5-cloexec.patch -- renamed from php-cloexec.patch, rebased
+ A php5-sytzdata-v7.patch -- renamed from sytzdata-v7.pach, not rebased
+ A php-format-string-issues.patch -- renamed from php5-5.3.4-format-string-issues.patch, not rebased
+ A php5-crypt-tests.patch -- renamed from php-5.3.8-crypt-tests.patch, not rebased
+ A php5-gcc_builtins.patch -- renamed from php-5.3.6-gcc_builtins.patch, not rebased
+ A php5-ini.patch -- renamed from php-5.3.2-ini.patch, rebased
+ A php5-mbstring-missing-return.patch -- new patch, missing return
+ M php5-missing-extdeps.patch -- rebased
+ A php5-no-build-date.patch -- renamed from php-5.3.2-no-build-date.patch, rebased
+ A php5-no-reentrant-crypt.patch -- renamed from php-5.3.8-no-reentrant-crypt.patch, not rebased
+ M php5-openssl.patch -- rebased
+ M php5-phpize.patch -- rebased
+ A php5-pts.patch -- renamed from php-5.3.4-pts.patch, not rebased
+ A php5-suhosin-php54.patch -- patch on top of suhosin-0.9.33.tgz to work with php 5.4
+ M php5.changes -- this change log
+ M php5.spec -- new version, etc
+ D suhosin-patch-5.3.3-0.9.10.patch.gz -- dropped, seems not be used for some time
+
+-------------------------------------------------------------------
Old:
----
php-5.2.9-BNC-457056.patch
php-5.3.0-bnc513080.patch
php-5.3.1-systzdata-v7.patch
php-5.3.2-aconf26x.patch
php-5.3.2-ini.patch
php-5.3.2-no-build-date.patch
php-5.3.22.tar.bz2
php-5.3.4-format-string-issues.patch
php-5.3.4-pts.patch
php-5.3.6-gcc_builtins.patch
php-5.3.6-ini-date.timezone.patch
php-5.3.8-CVE-2011-4153.patch
php-5.3.8-crypt-tests.patch
php-5.3.8-no-reentrant-crypt.patch
php-cloexec.patch
suhosin-patch-5.3.3-0.9.10.patch.gz
New:
----
php-5.4.13.tar.bz2
php5-BNC-457056.patch
php5-cloexec.patch
php5-crypt-tests.patch
php5-format-string-issues.patch
php5-gcc_builtins.patch
php5-ini.patch
php5-mbstring-missing-return.patch
php5-no-build-date.patch
php5-no-reentrant-crypt.patch
php5-pts.patch
php5-suhosin-php54.patch
php5-systzdata-v7.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ php5.spec ++++++
--- /var/tmp/diff_new_pack.SQLBfU/_old 2013-03-26 07:01:14.000000000 +0100
+++ /var/tmp/diff_new_pack.SQLBfU/_new 2013-03-26 07:01:14.000000000 +0100
@@ -17,11 +17,9 @@
Name: php5
-%global apiver 20090626
-%global zendver 20090626
+%global apiver 20100412
+%global zendver 20100525
%define suhosin_version 0.9.33
-%define suhosin_patch_version 0.9.10
-%define with_suhosin_patch 0
%define pkg_name php5
%define with_spell 1
@@ -59,35 +57,22 @@
%if 0%{suse_version} > 1110
BuildRequires: freetds-devel
%endif
-#BuildRequires: mysql-devel
%if %{with_spell}
BuildRequires: aspell-devel
%endif
-%if 0%{?suse_version} > 1000
# I would like this to become a hard dependency, as PHP is
# documented to have this modules by default (no addtional libs are needed)
Recommends: php-ctype php-dom php-iconv php-sqlite php-tokenizer
Recommends: php-xmlreader php-xmlwriter php-json
# other highly reccommended extensions
Suggests: php-mbstring php-gd php-pear php-gettext php-mysql php-suhosin
-%else
-BuildRequires: libgcrypt-devel
-BuildRequires: libjpeg
-BuildRequires: rpm-devel
-%endif
BuildRequires: libedit-devel
BuildRequires: libjpeg-devel
BuildRequires: pcre-devel
BuildRequires: re2c
-BuildRequires: sqlite-devel
-BuildRequires: sqlite2-devel
-BuildRequires: t1lib-devel
+BuildRequires: sqlite3-devel
#10.3 does not install sendmail binary with the minimal system
Requires: smtp_daemon
-%if 0%{?suse_version} < 1100
-#10 requires tcpd-devel to build
-BuildRequires: tcpd-devel
-%endif
%define extension_dir %{_libdir}/%{pkg_name}/extensions
%define peardir %{_datadir}/%{pkg_name}/PEAR
%define php_sysconf %{_sysconfdir}/%{pkg_name}
@@ -101,12 +86,8 @@
%define apache2_sysconfdir %(%{apxs2} -q SYSCONFDIR)
%define apache2_includedir %(%{apxs2} -q INCLUDEDIR)
%define apache2_serverroot %(%{apxs2} -q PREFIX)
-%define need_libxml2_hack %(if grep -q XML_PARSE_OLDSAX %{_includedir}/libxml/parser.h;then echo 1; else echo 0; fi)
-#unfortunately at this stage we dont have a working PHP binary..
-#define builtin_tz_ver 2007.9
-###
-###
-Version: 5.3.22
+%define need_libxml2_hack %(if [ -e %{_includedir}/libxml/parser.h ]; then if grep -q XML_PARSE_OLDSAX %{_includedir}/libxml/parser.h;then echo 1; else echo 0; fi; else echo 0; fi)
+Version: 5.4.13
Release: 0
Provides: php
Provides: php-api = %{apiver}
@@ -145,31 +126,23 @@
Source7: install-pear-nozlib.phar
Source8: php-fpm.init
#SUSE specific stuff
-Patch2: php5-phpize.patch
-Patch3: php5-apache_sapi_install.patch
-Patch4: php5-php-config.patch
-#currently disabled, on purpose !
-%if %{with_suhosin_patch}
-Patch6: suhosin-patch-5.3.3-%{suhosin_patch_version}.patch.gz
-%endif
-Patch7: php-5.3.1-systzdata-v7.patch
+Patch0: php5-phpize.patch
+Patch1: php5-apache_sapi_install.patch
+Patch2: php5-php-config.patch
+Patch3: php5-ini.patch
+Patch4: php5-no-build-date.patch
+Patch5: php5-pts.patch
+Patch6: php5-openssl.patch
+Patch7: php5-systzdata-v7.patch
#bugs
-Patch13: php-5.2.9-BNC-457056.patch
-Patch19: php-5.3.0-bnc513080.patch
-Patch20: php-5.3.2-ini.patch
-# PATCH-FIX-UPSTREAM php5-autoconf-2.65.patch http://bugs.php.ney/bug.php?id=50291 dimstar(a)opensuse.org -- Build fails with autoconf > 2.63
-# Modified to work with PHP 5.3.7 release
-Patch22: php-5.3.2-aconf26x.patch
-Patch24: php-5.3.2-no-build-date.patch
-Patch25: php-cloexec.patch
-Patch26: php-5.3.4-pts.patch
-Patch27: php-5.3.4-format-string-issues.patch
-Patch29: php5-openssl.patch
-Patch30: php-5.3.6-ini-date.timezone.patch
-Patch31: php5-missing-extdeps.patch
+Patch10: php5-suhosin-php54.patch
+Patch11: php5-mbstring-missing-return.patch
+Patch12: php5-BNC-457056.patch
+Patch13: php5-cloexec.patch
+Patch14: php5-missing-extdeps.patch
%if 0%{suse_version} > 1120
%ifarch x86_64
-Patch33: php-5.3.6-gcc_builtins.patch
+Patch15: php5-gcc_builtins.patch
%endif
%endif
# following patch is to fix configure tests for crypt; the aim is to have php
@@ -177,11 +150,10 @@
# DES, so as soon as upstream fixes this, don't forgot to remove extended DES
# from their checking as I indicated in crypt-tests.patch yet, or php will
# silently use his own implementation again
-Patch36: php-5.3.8-crypt-tests.patch
+Patch16: php5-crypt-tests.patch
# related to previous patch; !(defined(_REENTRANT) || defined(_THREAD_SAFE))
-Patch37: php-5.3.8-no-reentrant-crypt.patch
-# following is fixed in 5.4 branch
-Patch38: php-5.3.8-CVE-2011-4153.patch
+Patch17: php5-no-reentrant-crypt.patch
+Patch18: php5-format-string-issues.patch
Url: http://www.php.net
BuildRoot: %{_tmppath}/%{name}-%{version}-build
Summary: PHP5 Core Files
@@ -990,14 +962,14 @@
See http://www.php.net/credits.php for more details
%package sqlite
-Provides: php-sqlite = %{version}
+Provides: php-sqlite
Provides: php-sqlite3 = %{version}
Provides: php5-pdo_sqlite = %{version}
+Provides: php5-sqlite3 = %{version}
Summary: PHP5 Extension Module
Group: Development/Libraries/PHP
Requires: %{name} = %{version}
Requires: %{name}-pdo = %{version}
-Obsoletes: php5-pdo_sqlite < %{version}
%description sqlite
This is an extension for the SQLite Embeddable SQL Database Engine.
@@ -1248,43 +1220,39 @@
See http://www.php.net/credits.php for more details
%prep
+echo %{apache2_mmn}
%setup -q -n php-%{version} -a 1
%{__tar} xf %{S:2} -C ext
%{__mv} ext/suhosin-%{suhosin_version} ext/suhosin
%{__cp} %{S:4} pear/README.SUSE
%{__cp} %{S:5} .
%{__cp} %{S:7} pear/
+%patch0
+%patch1
%patch2
%patch3
%patch4
-%if %{with_suhosin_patch}
+%patch5
%patch6
-%endif
%patch7
+%patch10
+%patch11 -p1
%if %{need_libxml2_hack}
-echo "***APPLY LIBXML2.7 FIX***"
-%patch13
+echo "*** APPLY LIBXML2.7 FIX ***"
+%patch12
%else
-echo "***SKIPPING LIBMXL2.7 FIX ***"
+echo "*** SKIPPING LIBMXL2.7 FIX ***"
%endif
-%patch19
-%patch20
-%patch22
-%patch24
-%patch25
-%patch26
-%patch27
-%patch29
-%patch30
-%patch31
+%patch13
+%patch14
%if 0%{suse_version} > 1120
%ifarch x86_64·
-%patch33
+%patch15
%endif
%endif
-%patch36
-%patch37
-%patch38
+%patch16
+%patch17
+%patch18
# Safety check for API version change.
vapi=`sed -n '/#define PHP_API_VERSION/{s/.* //;p}' main/php.h`
if test "x${vapi}" != "x%{apiver}"; then
@@ -1310,19 +1278,20 @@
# Regenerate configure scripts (patches change config.m4's)
touch configure.in
# we build three SAPI
-%{__mkdir_p} build-apache2 build-fpm
-%{__mkdir_p} build-fastcgi/sapi/cgi/libfcgi
-%{__mkdir_p} build-cli/ext/sqlite/libsqlite/src/
+%{__mkdir_p} build-apache2
+%{__mkdir_p} build-fpm
+%{__mkdir_p} build-fastcgi
+%{__mkdir_p} build-cli
for parser in `find -name "*.re"`;do
re2c --no-generation-date -gi "$parser" > ${parser%.*}.c
done
-%{__rm} -rf ext/pcre/pcrelib ext/pdo_sqlite/sqlite
+%{__rm} -r ext/pcre/pcrelib
# regenerate configure etc.
# workaround: suhosin-patch updates timestamp of configure, confusing buildconf
-%{__rm} -f configure
+%{__rm} configure
./buildconf --force
# export flags
CFLAGS="$RPM_OPT_FLAGS -O3 -fPIE -fPIC -DPIC -D_GNU_SOURCE -fno-strict-aliasing"
@@ -1376,16 +1345,16 @@
--enable-hash \
--with-mhash \
"$@" || cat config.log
-# Some modules are builtin, reasons:
-# - libxml can not be shared (and is needed by PEAR)
-# - spl doesn't build shared
-# - simplexml is needed by spl
-# - session need to be builtin, otherwise sqlite and other session engines fail
-# - pcre is needed for PEAR
-# - filter is builtin due security reasons
-#We have still have harcoded RPATH in some modules
-%{__sed} -i 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' libtool
-%{__sed} -i 's|^runpath_var=LD_RUN_PATH|runpath_var=LIBTOOL_IS_BROKED|g' libtool
+ # Some modules are builtin, reasons:
+ # - libxml can not be shared (and is needed by PEAR)
+ # - spl doesn't build shared
+ # - simplexml is needed by spl
+ # - session need to be builtin, otherwise sqlite and other session engines fail
+ # - pcre is needed for PEAR
+ # - filter is builtin due security reasons
+ # We have still have harcoded RPATH in some modules
+ %{__sed} -i 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' libtool
+ %{__sed} -i 's|^runpath_var=LD_RUN_PATH|runpath_var=LIBTOOL_IS_BROKED|g' libtool
%{__make} %{?jobs:-j%jobs PHP_PEAR_PHP_BIN=%{_bindir}/php}
popd
}
@@ -1446,9 +1415,6 @@
--with-png-dir=%{_usr} \
--with-jpeg-dir=%{_usr} \
--with-zlib-dir=%{_usr} \
-%if 0%{?suse_version} > 1020
- --with-t1lib=%{_usr} \
-%endif
--with-gettext=shared \
--with-gmp=shared \
--with-iconv=shared \
@@ -1488,22 +1454,12 @@
--with-inifile \
--with-flatfile \
--enable-pdo=shared \
-%if 0%{?suse_version} > 1010
--with-pdo_sqlite=shared,%{_usr} \
--with-sqlite3=shared,%{_usr} \
-%else
- --with-pdo_sqlite=shared \
- --with-sqlite3=shared \
-%endif
+ --enable-sqlite-utf8 \
--with-pdo-mysql=shared,mysqlnd \
--with-pdo-pgsql=shared,%{_usr} \
--with-pdo-odbc=shared,unixODBC,%{_usr} \
-%if 0%{?suse_version} > 1010
- --with-sqlite=shared,%{_usr} \
-%else
- --with-sqlite=shared \
-%endif
- --enable-sqlite-utf8 \
--enable-zip=shared \
--enable-suhosin=shared \
--enable-intl=shared,%{_usr} \
@@ -1642,12 +1598,9 @@
%post fpm
%{fillup_and_insserv -f php-fpm}
-%clean
-rm -rf %{buildroot}
-
%files
%defattr(-, root, root)
-%doc README* CODING_STANDARDS CREDITS EXTENSIONS LICENSE NEWS TODO* php-suse-addons/test.php5
+%doc README* CODING_STANDARDS CREDITS EXTENSIONS LICENSE NEWS UPGRADING php-suse-addons/test.php5
%doc %{_mandir}/man1/*
%dir %{php_sysconf}
%dir %{php_sysconf}/conf.d
@@ -1812,7 +1765,6 @@
%defattr(644,root,root,755)
%{extension_dir}/mssql.so
%config(noreplace) %{php_sysconf}/conf.d/mssql.ini
-
%endif
%files mysql
@@ -1899,8 +1851,6 @@
%files sqlite
%defattr(644,root,root,755)
-%{extension_dir}/sqlite.so
-%config(noreplace) %{php_sysconf}/conf.d/sqlite.ini
%{extension_dir}/pdo_sqlite.so
%config(noreplace) %{php_sysconf}/conf.d/pdo_sqlite.ini
%{extension_dir}/sqlite3.so
++++++ php-5.3.22.tar.bz2 -> php-5.4.13.tar.bz2 ++++++
/work/SRC/openSUSE:Factory/php5/php-5.3.22.tar.bz2 /work/SRC/openSUSE:Factory/.php5.new/php-5.4.13.tar.bz2 differ: char 11, line 1
++++++ php-suse-addons.tar.bz2 ++++++
++++++ php-5.2.9-BNC-457056.patch -> php5-BNC-457056.patch ++++++
++++++ php-cloexec.patch -> php5-cloexec.patch ++++++
--- /work/SRC/openSUSE:Factory/php5/php-cloexec.patch 2011-09-23 12:39:47.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.php5.new/php5-cloexec.patch 2013-03-26 07:01:11.000000000 +0100
@@ -1,43 +1,41 @@
Index: ext/standard/exec.c
===================================================================
---- ext/standard/exec.c.orig 2010-03-12 11:28:59.000000000 +0100
-+++ ext/standard/exec.c 2010-08-03 06:31:21.692327000 +0200
-@@ -107,8 +107,12 @@ PHPAPI int php_exec(int type, char *cmd,
+--- ext/standard/exec.c.orig
++++ ext/standard/exec.c
+@@ -76,7 +76,11 @@ PHPAPI int php_exec(int type, char *cmd,
#ifdef PHP_WIN32
- fp = VCWD_POPEN(cmd_p, "rb");
+ fp = VCWD_POPEN(cmd, "rb");
#else
-+#if defined(__linux__) && __GLIBC_PREREQ(2, 9)
-+ fp = VCWD_POPEN(cmd_p, "re");
-+#else
- fp = VCWD_POPEN(cmd_p, "r");
++ #if defined(__linux__) && __GLIBC_PREREQ(2, 9)
++ fp = VCWD_POPEN(cmd, "re");
++ #else
+ fp = VCWD_POPEN(cmd, "r");
++ #endif
#endif
-+#endif
if (!fp) {
php_error_docref(NULL TSRMLS_CC, E_WARNING, "Unable to fork [%s]", cmd);
- goto err;
Index: ext/standard/file.c
===================================================================
---- ext/standard/file.c.orig 2010-05-02 22:11:22.000000000 +0200
-+++ ext/standard/file.c 2010-08-03 06:31:21.701320000 +0200
-@@ -957,6 +957,13 @@ PHP_FUNCTION(popen)
+--- ext/standard/file.c.orig
++++ ext/standard/file.c
+@@ -925,6 +925,12 @@ PHP_FUNCTION(popen)
}
}
#endif
+#if defined(__linux__) && __GLIBC_PREREQ(2, 9)
-+ char *e = memchr(posix_mode, 'e', mode_len);
-+ if (e) {
-+ memmove(e, e + 1, mode_len - (e - posix_mode));
-+ }
++ char *e = memchr(posix_mode, 'e', mode_len);
++ if (e) {
++ memmove(e, e + 1, mode_len - (e - posix_mode));
++ }
+#endif
-+
- if (PG(safe_mode)){
- b = strchr(command, ' ');
- if (!b) {
+
+ fp = VCWD_POPEN(command, posix_mode);
+ if (!fp) {
Index: ext/standard/mail.c
===================================================================
---- ext/standard/mail.c.orig 2010-07-19 15:38:53.000000000 +0200
-+++ ext/standard/mail.c 2010-08-03 06:31:21.709286000 +0200
-@@ -294,8 +294,12 @@ PHPAPI int php_mail(char *to, char *subj
+--- ext/standard/mail.c.orig
++++ ext/standard/mail.c
+@@ -286,8 +286,12 @@ PHPAPI int php_mail(char *to, char *subj
* (e.g. the shell can't be executed) we explicitely set it to 0 to be
* sure we don't catch any older errno value. */
errno = 0;
++++++ php-5.3.8-crypt-tests.patch -> php5-crypt-tests.patch ++++++
++++++ php-5.3.4-format-string-issues.patch -> php5-format-string-issues.patch ++++++
++++++ php-5.3.6-gcc_builtins.patch -> php5-gcc_builtins.patch ++++++
++++++ php-5.3.2-ini.patch -> php5-ini.patch ++++++
--- /work/SRC/openSUSE:Factory/php5/php-5.3.2-ini.patch 2011-09-23 12:39:46.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.php5.new/php5-ini.patch 2013-03-26 07:01:11.000000000 +0100
@@ -1,8 +1,8 @@
Index: php.ini-production
===================================================================
---- php.ini-production.orig 2010-06-24 02:15:12.000000000 +0200
-+++ php.ini-production 2010-08-03 06:31:20.319461000 +0200
-@@ -781,7 +781,7 @@ default_mimetype = "text/html"
+--- php.ini-production.orig
++++ php.ini-production
+@@ -702,7 +702,7 @@ default_mimetype = "text/html"
;;;;;;;;;;;;;;;;;;;;;;;;;
; UNIX: "/path1:/path2"
@@ -11,7 +11,16 @@
;
; Windows: "\path1;\path2"
;include_path = ".;c:\php\includes"
-@@ -1189,7 +1189,7 @@ mysql.allow_local_infile = On
+@@ -916,7 +916,7 @@ cli_server.color = On
+ [Date]
+ ; Defines the default timezone used by the date functions
+ ; http://php.net/date.timezone
+-;date.timezone =
++date.timezone = 'UTC'
+
+ ; http://php.net/date.default-latitude
+ ;date.default_latitude = 31.7667
+@@ -1106,7 +1106,7 @@ mysql.allow_local_infile = On
; Allow or prevent persistent links.
; http://php.net/mysql.allow-persistent
@@ -20,7 +29,7 @@
; If mysqlnd is used: Number of cache slots for the internal result set cache
; http://php.net/mysql.cache_size
-@@ -1252,7 +1252,7 @@ mysqli.max_persistent = -1
+@@ -1169,7 +1169,7 @@ mysqli.max_persistent = -1
; Allow or prevent persistent links.
; http://php.net/mysqli.allow-persistent
@@ -29,7 +38,7 @@
; Maximum number of links. -1 means no limit.
; http://php.net/mysqli.max-links
-@@ -1474,7 +1474,7 @@ session.save_handler = files
+@@ -1391,7 +1391,7 @@ session.save_handler = files
; where MODE is the octal representation of the mode. Note that this
; does not overwrite the process's umask.
; http://php.net/session.save-path
@@ -38,24 +47,25 @@
; Whether to use cookies.
; http://php.net/session.use-cookies
-@@ -1590,14 +1590,14 @@ session.referer_check =
+@@ -1507,7 +1507,7 @@ session.referer_check =
; How many bytes to read from the file.
; http://php.net/session.entropy-length
--session.entropy_length = 0
+-;session.entropy_length = 32
+session.entropy_length = 32
; Specified here to create the session id.
; http://php.net/session.entropy-file
- ; On systems that don't have /dev/urandom /dev/arandom can be used
- ; On windows, setting the entropy_length setting will activate the
+@@ -1516,7 +1516,7 @@ session.referer_check =
+ ; If neither are found at compile time, the default is no entropy file.
+ ; On windows, setting the entropy_length setting will activate the
; Windows random source (using the CryptoAPI)
-;session.entropy_file = /dev/urandom
+session.entropy_file = /dev/urandom
; Set to {nocache,private,public,} to determine HTTP caching aspects
; or leave this empty to avoid sending anti-caching headers.
-@@ -1628,7 +1628,7 @@ session.use_trans_sid = 0
+@@ -1547,7 +1547,7 @@ session.use_trans_sid = 0
; the hash extension. A list of available hashes is returned by the hash_algos()
; function.
; http://php.net/session.hash-function
++++++ php5-mbstring-missing-return.patch ++++++
Index: php-5.4.4/ext/mbstring/libmbfl/filters/mbfilter_sjis_2004.c
===================================================================
--- php-5.4.4.orig/ext/mbstring/libmbfl/filters/mbfilter_sjis_2004.c
+++ php-5.4.4/ext/mbstring/libmbfl/filters/mbfilter_sjis_2004.c
@@ -672,6 +672,8 @@ retry:
CK(mbfl_filt_conv_illegal_output(c, filter));
}
}
+
+ return c;
}
int
++++++ php5-missing-extdeps.patch ++++++
--- /var/tmp/diff_new_pack.SQLBfU/_old 2013-03-26 07:01:14.000000000 +0100
+++ /var/tmp/diff_new_pack.SQLBfU/_new 2013-03-26 07:01:14.000000000 +0100
@@ -1,15 +1,8 @@
+Index: ext/soap/soap.c
+===================================================================
--- ext/soap/soap.c.orig
+++ ext/soap/soap.c
-@@ -439,7 +439,7 @@ unsigned char arginfo_soapclient___soapc
- # define arginfo_soapserver_setobject NULL
- # define arginfo_soapserver_addfunction NULL
- # define arginfo_soapserver_getfunctions NULL
--# defina arginfo_soapserver_handle NULL
-+# define arginfo_soapserver_handle NULL
- # define arginfo_soapserver_fault NULL
- # define arginfo_soapserver_addsoapheader NULL
-
-@@ -516,10 +516,18 @@ static const zend_function_entry soap_he
+@@ -442,10 +442,18 @@ static const zend_function_entry soap_he
PHP_FE_END
};
@@ -31,6 +24,8 @@
"soap",
soap_functions,
PHP_MINIT(soap),
+Index: ext/wddx/wddx.c
+===================================================================
--- ext/wddx/wddx.c.orig
+++ ext/wddx/wddx.c
@@ -154,10 +154,21 @@ ZEND_GET_MODULE(wddx)
@@ -56,6 +51,8 @@
"wddx",
wddx_functions,
PHP_MINIT(wddx),
+Index: ext/filter/filter.c
+===================================================================
--- ext/filter/filter.c.orig
+++ ext/filter/filter.c
@@ -132,12 +132,17 @@ static const zend_function_entry filter_
@@ -79,26 +76,28 @@
"filter",
filter_functions,
PHP_MINIT(filter),
+Index: ext/mbstring/mbstring.c
+===================================================================
--- ext/mbstring/mbstring.c.orig
+++ ext/mbstring/mbstring.c
-@@ -561,9 +561,19 @@ const zend_function_entry mbstring_funct
+@@ -570,9 +570,19 @@ const zend_function_entry mbstring_funct
};
/* }}} */
+/* {{{ mbstring dependencies */
+static const zend_module_dep mbstring_module_deps[] = {
-+ ZEND_MOD_REQUIRED("standard")
++ ZEND_MOD_REQUIRED("standard")
+#if (HAVE_PCRE || HAVE_BUNDLED_PCRE) && !HAVE_ONIG
-+ ZEND_MOD_REQUIRED("pcre")
++ ZEND_MOD_REQUIRED("pcre")
+#endif
-+ {NULL, NULL, NULL}
++ {NULL, NULL, NULL}
+};
+
/* {{{ zend_module_entry mbstring_module_entry */
zend_module_entry mbstring_module_entry = {
-- STANDARD_MODULE_HEADER,
-+ STANDARD_MODULE_HEADER_EX, NULL,
-+ mbstring_module_deps,
+- STANDARD_MODULE_HEADER,
++ STANDARD_MODULE_HEADER_EX, NULL,
++ mbstring_module_deps,
"mbstring",
mbstring_functions,
PHP_MINIT(mbstring),
++++++ php-5.3.2-no-build-date.patch -> php5-no-build-date.patch ++++++
--- /work/SRC/openSUSE:Factory/php5/php-5.3.2-no-build-date.patch 2013-03-08 11:20:50.000000000 +0100
+++ /work/SRC/openSUSE:Factory/.php5.new/php5-no-build-date.patch 2013-03-26 07:01:11.000000000 +0100
@@ -24,7 +24,7 @@
===================================================================
--- sapi/fpm/fpm/fpm_main.c.orig
+++ sapi/fpm/fpm/fpm_main.c
-@@ -1719,7 +1719,7 @@ int main(int argc, char *argv[])
+@@ -1710,7 +1710,7 @@ int main(int argc, char *argv[])
#if ZEND_DEBUG
php_printf("PHP %s (%s) (built: %s %s) (DEBUG)\nCopyright (c) 1997-2013 The PHP Group\n%s", PHP_VERSION, sapi_module.name, __DATE__, __TIME__, get_zend_version());
#else
@@ -37,7 +37,7 @@
===================================================================
--- configure.in.orig
+++ configure.in
-@@ -1202,8 +1202,8 @@ fi
+@@ -1257,8 +1257,8 @@ fi
EXTRA_LDFLAGS="$EXTRA_LDFLAGS $PHP_LDFLAGS"
EXTRA_LDFLAGS_PROGRAM="$EXTRA_LDFLAGS_PROGRAM $PHP_LDFLAGS"
@@ -48,7 +48,7 @@
AC_DEFINE_UNQUOTED(PHP_BUILD_DATE,"$PHP_BUILD_DATE",[PHP build date])
case $host_alias in
-@@ -1214,7 +1214,8 @@ case $host_alias in
+@@ -1269,7 +1269,8 @@ case $host_alias in
AC_DEFINE_UNQUOTED(PHP_UNAME,"$PHP_UNAME",[hardcode for each of the cross compiler host])
;;
*)
@@ -62,14 +62,14 @@
===================================================================
--- sapi/cli/php_cli.c.orig
+++ sapi/cli/php_cli.c
-@@ -826,8 +826,8 @@ int main(int argc, char *argv[])
- }
+@@ -687,8 +687,8 @@ static int do_cli(int argc, char **argv
+ goto out;
- request_started = 1;
+ case 'v': /* show php version & quit */
- php_printf("PHP %s (%s) (built: %s %s) %s\nCopyright (c) 1997-2013 The PHP Group\n%s",
-- PHP_VERSION, sapi_module.name, __DATE__, __TIME__,
+- PHP_VERSION, cli_sapi_module.name, __DATE__, __TIME__,
+ php_printf("PHP %s (%s) %s\nCopyright (c) 1997-2013 The PHP Group\n%s",
-+ PHP_VERSION, sapi_module.name,
++ PHP_VERSION, cli_sapi_module.name,
#if ZEND_DEBUG && defined(HAVE_GCOV)
"(DEBUG GCOV)",
#elif ZEND_DEBUG
@@ -77,7 +77,7 @@
===================================================================
--- sapi/cgi/cgi_main.c.orig
+++ sapi/cgi/cgi_main.c
-@@ -1958,7 +1958,7 @@ consult the installation file that came
+@@ -2218,7 +2218,7 @@ consult the installation file that came
#if ZEND_DEBUG
php_printf("PHP %s (%s) (built: %s %s) (DEBUG)\nCopyright (c) 1997-2013 The PHP Group\n%s", PHP_VERSION, sapi_module.name, __DATE__, __TIME__, get_zend_version());
#else
++++++ php-5.3.8-no-reentrant-crypt.patch -> php5-no-reentrant-crypt.patch ++++++
++++++ php5-openssl.patch ++++++
--- /var/tmp/diff_new_pack.SQLBfU/_old 2013-03-26 07:01:14.000000000 +0100
+++ /var/tmp/diff_new_pack.SQLBfU/_new 2013-03-26 07:01:14.000000000 +0100
@@ -1,6 +1,8 @@
+Index: ext/openssl/openssl.c
+===================================================================
--- ext/openssl/openssl.c.orig
+++ ext/openssl/openssl.c
-@@ -47,6 +47,7 @@
+@@ -51,6 +51,7 @@
#include <openssl/rand.h>
#include <openssl/ssl.h>
#include <openssl/pkcs12.h>
@@ -8,7 +10,7 @@
/* Common */
#include <time.h>
-@@ -979,10 +980,16 @@ PHP_MINIT_FUNCTION(openssl)
+@@ -1015,10 +1016,16 @@ PHP_MINIT_FUNCTION(openssl)
le_x509 = zend_register_list_destructors_ex(php_x509_free, NULL, "OpenSSL X.509", module_number);
le_csr = zend_register_list_destructors_ex(php_csr_free, NULL, "OpenSSL X.509 CSR", module_number);
@@ -23,18 +25,20 @@
+ ENGINE_register_all_complete();
+
- ERR_load_ERR_strings();
- ERR_load_crypto_strings();
+ SSL_load_error_strings();
+
+Index: ext/openssl/xp_ssl.c
+===================================================================
--- ext/openssl/xp_ssl.c.orig
+++ ext/openssl/xp_ssl.c
-@@ -376,7 +376,9 @@ static inline int php_openssl_setup_cryp
- php_error_docref(NULL TSRMLS_CC, E_WARNING, "failed to create an SSL context");
+@@ -378,6 +378,10 @@ static inline int php_openssl_setup_cryp
return -1;
}
--
+
+#ifdef SSL_MODE_RELEASE_BUFFERS
+ SSL_CTX_set_mode(sslsock->ctx, SSL_MODE_RELEASE_BUFFERS);
+#endif
- SSL_CTX_set_options(sslsock->ctx, SSL_OP_ALL);
-
- #if OPENSSL_VERSION_NUMBER >= 0x0090806fL
++
+ #if OPENSSL_VERSION_NUMBER >= 0x0090605fL
+ ssl_ctx_options &= ~SSL_OP_DONT_INSERT_EMPTY_FRAGMENTS;
+ #endif
++++++ php5-phpize.patch ++++++
--- /var/tmp/diff_new_pack.SQLBfU/_old 2013-03-26 07:01:14.000000000 +0100
+++ /var/tmp/diff_new_pack.SQLBfU/_new 2013-03-26 07:01:14.000000000 +0100
@@ -5,8 +5,8 @@
Index: scripts/Makefile.frag
===================================================================
---- scripts/Makefile.frag.orig 2010-07-13 19:24:13.000000000 +0200
-+++ scripts/Makefile.frag 2010-08-03 06:31:18.109614000 +0200
+--- scripts/Makefile.frag.orig
++++ scripts/Makefile.frag
@@ -3,8 +3,8 @@
# Build environment install
#
@@ -20,11 +20,11 @@
scripts/phpize.m4 \
Index: scripts/phpize.in
===================================================================
---- scripts/phpize.in.orig 2009-06-24 09:42:33.000000000 +0200
-+++ scripts/phpize.in 2010-08-03 06:31:18.115618000 +0200
-@@ -3,8 +3,8 @@
- # Variable declaration
+--- scripts/phpize.in.orig
++++ scripts/phpize.in
+@@ -4,8 +4,8 @@
prefix='@prefix@'
+ datarootdir='@datarootdir@'
exec_prefix="`eval echo @exec_prefix@`"
-phpdir="`eval echo @libdir@`/build"
-includedir="`eval echo @includedir@`/php"
++++++ php-5.3.4-pts.patch -> php5-pts.patch ++++++
++++++ php5-suhosin-php54.patch ++++++
++++ 714 lines (skipped)
++++++ php-5.3.1-systzdata-v7.patch -> php5-systzdata-v7.patch ++++++
--
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 perl-Image-ExifTool for openSUSE:Factory checked in at 2013-03-26 07:00:24
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/perl-Image-ExifTool (Old)
and /work/SRC/openSUSE:Factory/.perl-Image-ExifTool.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "perl-Image-ExifTool", Maintainer is ""
Changes:
--------
--- /work/SRC/openSUSE:Factory/perl-Image-ExifTool/perl-Image-ExifTool.changes 2012-10-03 08:47:23.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.perl-Image-ExifTool.new/perl-Image-ExifTool.changes 2013-03-26 07:00:26.000000000 +0100
@@ -1,0 +2,13 @@
+Mon Mar 25 16:40:17 UTC 2013 - Greg.Freemyer(a)gmail.com
+
+- Update to Version 9.13 (production release)
+
+ - Added ability to read FileInodeChangeDate (non-Windows only)
+ - API Changes:
+ - Enhanced SetFileModifyDate() to write FileCreateDate (Windows only)
+ - Added RequestAll option
+ - Fixed problem in SetNewValue when setting the Raw value of some tags
+ - Enhanced GetValue() to allow return of 'Rational' value
+ - Numerous device support and other improvements - see Changes file
+
+-------------------------------------------------------------------
Old:
----
Image-ExifTool-9.01.tar.gz
New:
----
Image-ExifTool-9.13.tar.gz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ perl-Image-ExifTool.spec ++++++
--- /var/tmp/diff_new_pack.OahHfw/_old 2013-03-26 07:00:28.000000000 +0100
+++ /var/tmp/diff_new_pack.OahHfw/_new 2013-03-26 07:00:28.000000000 +0100
@@ -1,7 +1,7 @@
#
# spec file for package perl-Image-ExifTool
#
-# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -17,7 +17,7 @@
Name: perl-Image-ExifTool
-Version: 9.01
+Version: 9.13
Release: 0
%define cpan_name Image-ExifTool
Summary: Perl module to read and write meta information
++++++ Image-ExifTool-9.01.tar.gz -> Image-ExifTool-9.13.tar.gz ++++++
++++ 39303 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 dosfstools for openSUSE:Factory checked in at 2013-03-26 07:00:02
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/dosfstools (Old)
and /work/SRC/openSUSE:Factory/.dosfstools.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "dosfstools", Maintainer is "PGajdos(a)suse.com"
Changes:
--------
--- /work/SRC/openSUSE:Factory/dosfstools/dosfstools.changes 2013-03-12 11:08:27.000000000 +0100
+++ /work/SRC/openSUSE:Factory/.dosfstools.new/dosfstools.changes 2013-03-26 07:00:03.000000000 +0100
@@ -1,0 +2,6 @@
+Mon Mar 25 15:24:47 UTC 2013 - mmeister(a)suse.com
+
+- Added url as source.
+ Please see http://en.opensuse.org/SourceUrls
+
+-------------------------------------------------------------------
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ dosfstools.spec ++++++
--- /var/tmp/diff_new_pack.N9FQnr/_old 2013-03-26 07:00:04.000000000 +0100
+++ /var/tmp/diff_new_pack.N9FQnr/_new 2013-03-26 07:00:04.000000000 +0100
@@ -25,7 +25,7 @@
Version: 3.0.16
Release: 0
Url: http://freshmeat.net/projects/dosfstools
-Source: %{name}_%{version}.orig.tar.xz
+Source: http://ftp.de.debian.org/debian/pool/main/d/%{name}/%{name}_%{version}.orig…
Patch0: %{name}-suse-dirs.patch
# workaround for
# https://bugs.launchpad.net/ubuntu/+source/dosfstools/+bug/746262
--
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 dmidecode for openSUSE:Factory checked in at 2013-03-26 06:59:47
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/dmidecode (Old)
and /work/SRC/openSUSE:Factory/.dmidecode.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "dmidecode", Maintainer is "JDelvare(a)suse.com"
Changes:
--------
--- /work/SRC/openSUSE:Factory/dmidecode/dmidecode.changes 2011-10-21 16:28:24.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.dmidecode.new/dmidecode.changes 2013-03-26 06:59:48.000000000 +0100
@@ -1,0 +2,6 @@
+Mon Mar 25 15:09:35 UTC 2013 - mmeister(a)suse.com
+
+- Added url as source.
+ Please see http://en.opensuse.org/SourceUrls
+
+-------------------------------------------------------------------
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ dmidecode.spec ++++++
--- /var/tmp/diff_new_pack.KPzwcj/_old 2013-03-26 06:59:49.000000000 +0100
+++ /var/tmp/diff_new_pack.KPzwcj/_new 2013-03-26 06:59:49.000000000 +0100
@@ -1,7 +1,7 @@
#
# spec file for package dmidecode
#
-# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -16,16 +16,15 @@
#
-
Name: dmidecode
Url: http://www.nongnu.org/dmidecode/
Version: 2.11
-Release: 18
-License: GPL-2.0+
-Group: System/Console
+Release: 0
Provides: pmtools:/usr/sbin/dmidecode
Summary: DMI table decoder
-Source: %{name}-%{version}.tar.bz2
+License: GPL-2.0+
+Group: System/Console
+Source: http://download.savannah.gnu.org/releases/%{name}/%{name}-%{version}.tar.bz2
Patch1: dmidecode-fix-memory-array-location-overrun.patch
Patch2: dmidecode-add-SMBIOS-2_7_1-support.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-build
--
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 at-spi for openSUSE:Factory checked in at 2013-03-26 06:59:39
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/at-spi (Old)
and /work/SRC/openSUSE:Factory/.at-spi.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "at-spi", Maintainer is "gnome-maintainers(a)suse.de"
Changes:
--------
--- /work/SRC/openSUSE:Factory/at-spi/at-spi.changes 2012-02-21 12:37:54.000000000 +0100
+++ /work/SRC/openSUSE:Factory/.at-spi.new/at-spi.changes 2013-03-26 06:59:41.000000000 +0100
@@ -1,0 +2,11 @@
+Mon Mar 25 13:25:35 UTC 2013 - cfarrell(a)suse.com
+
+- license update: LGPL-2.0+
+ No evidence of GPL-2.0+ except as py-compile
+
+-------------------------------------------------------------------
+Wed Mar 20 20:49:16 UTC 2013 - dimstar(a)opensuse.org
+
+- Spec-cleanup using format_spec_file service.
+
+-------------------------------------------------------------------
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ at-spi.spec ++++++
--- /var/tmp/diff_new_pack.PEPG3m/_old 2013-03-26 06:59:43.000000000 +0100
+++ /var/tmp/diff_new_pack.PEPG3m/_new 2013-03-26 06:59:43.000000000 +0100
@@ -1,7 +1,7 @@
#
# spec file for package at-spi
#
-# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -23,7 +23,7 @@
Version: 1.32.0
Release: 0
Summary: Assistive Technology Service Provider Interface
-License: GPL-2.0+ ; LGPL-2.1+
+License: LGPL-2.0+
Group: Development/Libraries/GNOME
Url: http://www.gnome.org/
Source: %{name}-%{version}.tar.bz2
--
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 xdg-user-dirs-gtk for openSUSE:Factory checked in at 2013-03-25 20:45:58
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/xdg-user-dirs-gtk (Old)
and /work/SRC/openSUSE:Factory/.xdg-user-dirs-gtk.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "xdg-user-dirs-gtk", Maintainer is "gnome-maintainers(a)suse.de"
Changes:
--------
--- /work/SRC/openSUSE:Factory/xdg-user-dirs-gtk/xdg-user-dirs-gtk.changes 2012-04-12 09:56:47.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.xdg-user-dirs-gtk.new/xdg-user-dirs-gtk.changes 2013-03-25 20:45:59.000000000 +0100
@@ -1,0 +2,6 @@
+Mon Feb 4 18:58:12 UTC 2013 - p.drouand(a)gmail.com
+
+- Update to version 0.10:
+ + Use new location for GTK+ bookmarks file.
+
+-------------------------------------------------------------------
Old:
----
xdg-user-dirs-gtk-0.9.tar.xz
New:
----
xdg-user-dirs-gtk-0.10.tar.xz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ xdg-user-dirs-gtk.spec ++++++
--- /var/tmp/diff_new_pack.pHUJYn/_old 2013-03-25 20:46:02.000000000 +0100
+++ /var/tmp/diff_new_pack.pHUJYn/_new 2013-03-25 20:46:02.000000000 +0100
@@ -1,7 +1,7 @@
#
# spec file for package xdg-user-dirs-gtk
#
-# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -20,10 +20,10 @@
Summary: xdg-user-dir support for Gnome and Gtk+ applications
License: GPL-2.0+
Group: System/GUI/GNOME
-Version: 0.9
+Version: 0.10
Release: 0
Url: http://download.gnome.org/sources/xdg-user-dirs-gtk
-Source0: http://download.gnome.org/sources/xdg-user-dirs-gtk/0.9/%{name}-%{version}.…
+Source0: http://download.gnome.org/sources/xdg-user-dirs-gtk/0.10/%{name}-%{version}…
# PATCH-FIX-UPSTREAM xdg-user-dirs-gtk-XFCE-LXDE-autostart.patch fdo#33107 gber(a)opensuse.org -- Start xdg-user-dirs-gtk in Xfce sessions as well
Patch1: %{name}-XFCE-autostart.patch
BuildRequires: gtk3-devel
++++++ xdg-user-dirs-gtk-0.9.tar.xz -> xdg-user-dirs-gtk-0.10.tar.xz ++++++
++++ 7961 lines of diff (skipped)
++++ retrying with extended exclude list
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xdg-user-dirs-gtk-0.9/NEWS new/xdg-user-dirs-gtk-0.10/NEWS
--- old/xdg-user-dirs-gtk-0.9/NEWS 2012-04-03 17:34:14.000000000 +0200
+++ new/xdg-user-dirs-gtk-0.10/NEWS 2013-01-21 14:54:41.000000000 +0100
@@ -1,3 +1,6 @@
+Major changes in 0.10 are:
+* Use new location for GTK+ bookmarks file
+
Major changes in 0.9 are:
* Port to Gtk 3
* Add Unity and LXDE to desktop file OnlyShowIn
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xdg-user-dirs-gtk-0.9/configure.ac new/xdg-user-dirs-gtk-0.10/configure.ac
--- old/xdg-user-dirs-gtk-0.9/configure.ac 2012-04-03 17:28:59.000000000 +0200
+++ new/xdg-user-dirs-gtk-0.10/configure.ac 2013-01-21 14:54:41.000000000 +0100
@@ -1,8 +1,11 @@
-AC_INIT(parse.c)
+AC_PREREQ(2.53)
+
+AC_INIT([xdg-user-dirs-gtk], [0.10],
+ [http://bugzilla.gnome.org/enter_bug.cgi?product=xdg-user-dirs-gtk]
+AC_CONFIG_SRCDIR([parse.c])
+AM_INIT_AUTOMAKE([1.9 dist-xz no-dist-gzip tar-ustar foreign])
+AC_CONFIG_HEADERS([config.h])
-AM_INIT_AUTOMAKE(xdg-user-dirs-gtk, 0.9)
-AM_CONFIG_HEADER(config.h)
-
AM_SANITY_CHECK
AM_MAINTAINER_MODE
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xdg-user-dirs-gtk-0.9/missing new/xdg-user-dirs-gtk-0.10/missing
--- old/xdg-user-dirs-gtk-0.9/missing 2012-04-03 17:31:00.000000000 +0200
+++ new/xdg-user-dirs-gtk-0.10/missing 2013-01-21 14:54:01.000000000 +0100
@@ -1,11 +1,10 @@
#! /bin/sh
-# Common stub for a few missing GNU programs while installing.
+# Common wrapper for a few potentially missing GNU programs.
-scriptversion=2009-04-28.21; # UTC
+scriptversion=2012-06-26.16; # UTC
-# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004, 2005, 2006,
-# 2008, 2009 Free Software Foundation, Inc.
-# Originally by Fran,cois Pinard <pinard(a)iro.umontreal.ca>, 1996.
+# Copyright (C) 1996-2013 Free Software Foundation, Inc.
+# Originally written by Fran,cois Pinard <pinard(a)iro.umontreal.ca>, 1996.
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
@@ -26,69 +25,40 @@
# the same distribution terms that you use for the rest of that program.
if test $# -eq 0; then
- echo 1>&2 "Try \`$0 --help' for more information"
+ echo 1>&2 "Try '$0 --help' for more information"
exit 1
fi
-run=:
-sed_output='s/.* --output[ =]\([^ ]*\).*/\1/p'
-sed_minuso='s/.* -o \([^ ]*\).*/\1/p'
-
-# In the cases where this matters, `missing' is being run in the
-# srcdir already.
-if test -f configure.ac; then
- configure_ac=configure.ac
-else
- configure_ac=configure.in
-fi
+case $1 in
-msg="missing on your system"
+ --is-lightweight)
+ # Used by our autoconf macros to check whether the available missing
+ # script is modern enough.
+ exit 0
+ ;;
-case $1 in
---run)
- # Try to run requested program, and just exit if it succeeds.
- run=
- shift
- "$@" && exit 0
- # Exit code 63 means version mismatch. This often happens
- # when the user try to use an ancient version of a tool on
- # a file that requires a minimum version. In this case we
- # we should proceed has if the program had been absent, or
- # if --run hadn't been passed.
- if test $? = 63; then
- run=:
- msg="probably too old"
- fi
- ;;
+ --run)
+ # Back-compat with the calling convention used by older automake.
+ shift
+ ;;
-h|--h|--he|--hel|--help)
echo "\
$0 [OPTION]... PROGRAM [ARGUMENT]...
-Handle \`PROGRAM [ARGUMENT]...' for when PROGRAM is missing, or return an
-error status if there is no known handling for PROGRAM.
+Run 'PROGRAM [ARGUMENT]...', returning a proper advice when this fails due
+to PROGRAM being missing or too old.
Options:
-h, --help display this help and exit
-v, --version output version information and exit
- --run try to run the given command, and emulate it if it fails
Supported PROGRAM values:
- aclocal touch file \`aclocal.m4'
- autoconf touch file \`configure'
- autoheader touch file \`config.h.in'
- autom4te touch the output file, or create a stub one
- automake touch all \`Makefile.in' files
- bison create \`y.tab.[ch]', if possible, from existing .[ch]
- flex create \`lex.yy.c', if possible, from existing .c
- help2man touch the output file
- lex create \`lex.yy.c', if possible, from existing .c
- makeinfo touch the output file
- tar try tar, gnutar, gtar, then tar without non-portable flags
- yacc create \`y.tab.[ch]', if possible, from existing .[ch]
+ aclocal autoconf autoheader autom4te automake makeinfo
+ bison yacc flex lex help2man
-Version suffixes to PROGRAM as well as the prefixes \`gnu-', \`gnu', and
-\`g' are ignored when checking the name.
+Version suffixes to PROGRAM as well as the prefixes 'gnu-', 'gnu', and
+'g' are ignored when checking the name.
Send bug reports to <bug-automake(a)gnu.org>."
exit $?
@@ -100,272 +70,141 @@
;;
-*)
- echo 1>&2 "$0: Unknown \`$1' option"
- echo 1>&2 "Try \`$0 --help' for more information"
+ echo 1>&2 "$0: unknown '$1' option"
+ echo 1>&2 "Try '$0 --help' for more information"
exit 1
;;
esac
-# normalize program name to check for.
-program=`echo "$1" | sed '
- s/^gnu-//; t
- s/^gnu//; t
- s/^g//; t'`
-
-# Now exit if we have it, but it failed. Also exit now if we
-# don't have it and --version was passed (most likely to detect
-# the program). This is about non-GNU programs, so use $1 not
-# $program.
-case $1 in
- lex*|yacc*)
- # Not GNU programs, they don't have --version.
- ;;
-
- tar*)
- if test -n "$run"; then
- echo 1>&2 "ERROR: \`tar' requires --run"
- exit 1
- elif test "x$2" = "x--version" || test "x$2" = "x--help"; then
- exit 1
- fi
- ;;
+# Run the given program, remember its exit status.
+"$@"; st=$?
- *)
- if test -z "$run" && ($1 --version) > /dev/null 2>&1; then
- # We have it, but it failed.
- exit 1
- elif test "x$2" = "x--version" || test "x$2" = "x--help"; then
- # Could not run --version or --help. This is probably someone
- # running `$TOOL --version' or `$TOOL --help' to check whether
- # $TOOL exists and not knowing $TOOL uses missing.
- exit 1
- fi
- ;;
-esac
-
-# If it does not exist, or fails to run (possibly an outdated version),
-# try to emulate it.
-case $program in
- aclocal*)
- echo 1>&2 "\
-WARNING: \`$1' is $msg. You should only need it if
- you modified \`acinclude.m4' or \`${configure_ac}'. You might want
- to install the \`Automake' and \`Perl' packages. Grab them from
- any GNU archive site."
- touch aclocal.m4
- ;;
-
- autoconf*)
- echo 1>&2 "\
-WARNING: \`$1' is $msg. You should only need it if
- you modified \`${configure_ac}'. You might want to install the
- \`Autoconf' and \`GNU m4' packages. Grab them from any GNU
- archive site."
- touch configure
- ;;
-
- autoheader*)
- echo 1>&2 "\
-WARNING: \`$1' is $msg. You should only need it if
- you modified \`acconfig.h' or \`${configure_ac}'. You might want
- to install the \`Autoconf' and \`GNU m4' packages. Grab them
- from any GNU archive site."
- files=`sed -n 's/^[ ]*A[CM]_CONFIG_HEADER(\([^)]*\)).*/\1/p' ${configure_ac}`
- test -z "$files" && files="config.h"
- touch_files=
- for f in $files; do
- case $f in
- *:*) touch_files="$touch_files "`echo "$f" |
- sed -e 's/^[^:]*://' -e 's/:.*//'`;;
- *) touch_files="$touch_files $f.in";;
- esac
- done
- touch $touch_files
- ;;
-
- automake*)
- echo 1>&2 "\
-WARNING: \`$1' is $msg. You should only need it if
- you modified \`Makefile.am', \`acinclude.m4' or \`${configure_ac}'.
- You might want to install the \`Automake' and \`Perl' packages.
- Grab them from any GNU archive site."
- find . -type f -name Makefile.am -print |
- sed 's/\.am$/.in/' |
- while read f; do touch "$f"; done
- ;;
+# If it succeeded, we are done.
+test $st -eq 0 && exit 0
- autom4te*)
- echo 1>&2 "\
-WARNING: \`$1' is needed, but is $msg.
- You might have modified some files without having the
- proper tools for further handling them.
- You can get \`$1' as part of \`Autoconf' from any GNU
- archive site."
-
- file=`echo "$*" | sed -n "$sed_output"`
- test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"`
- if test -f "$file"; then
- touch $file
- else
- test -z "$file" || exec >$file
- echo "#! /bin/sh"
- echo "# Created by GNU Automake missing as a replacement of"
- echo "# $ $@"
- echo "exit 0"
- chmod +x $file
- exit 1
- fi
- ;;
-
- bison*|yacc*)
- echo 1>&2 "\
-WARNING: \`$1' $msg. You should only need it if
- you modified a \`.y' file. You may need the \`Bison' package
- in order for those modifications to take effect. You can get
- \`Bison' from any GNU archive site."
- rm -f y.tab.c y.tab.h
- if test $# -ne 1; then
- eval LASTARG="\${$#}"
- case $LASTARG in
- *.y)
- SRCFILE=`echo "$LASTARG" | sed 's/y$/c/'`
- if test -f "$SRCFILE"; then
- cp "$SRCFILE" y.tab.c
- fi
- SRCFILE=`echo "$LASTARG" | sed 's/y$/h/'`
- if test -f "$SRCFILE"; then
- cp "$SRCFILE" y.tab.h
- fi
- ;;
- esac
- fi
- if test ! -f y.tab.h; then
- echo >y.tab.h
- fi
- if test ! -f y.tab.c; then
- echo 'main() { return 0; }' >y.tab.c
- fi
- ;;
-
- lex*|flex*)
- echo 1>&2 "\
-WARNING: \`$1' is $msg. You should only need it if
- you modified a \`.l' file. You may need the \`Flex' package
- in order for those modifications to take effect. You can get
- \`Flex' from any GNU archive site."
- rm -f lex.yy.c
- if test $# -ne 1; then
- eval LASTARG="\${$#}"
- case $LASTARG in
- *.l)
- SRCFILE=`echo "$LASTARG" | sed 's/l$/c/'`
- if test -f "$SRCFILE"; then
- cp "$SRCFILE" lex.yy.c
- fi
- ;;
- esac
- fi
- if test ! -f lex.yy.c; then
- echo 'main() { return 0; }' >lex.yy.c
- fi
- ;;
-
- help2man*)
- echo 1>&2 "\
-WARNING: \`$1' is $msg. You should only need it if
- you modified a dependency of a manual page. You may need the
- \`Help2man' package in order for those modifications to take
- effect. You can get \`Help2man' from any GNU archive site."
-
- file=`echo "$*" | sed -n "$sed_output"`
- test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"`
- if test -f "$file"; then
- touch $file
- else
- test -z "$file" || exec >$file
- echo ".ab help2man is required to generate this page"
- exit $?
- fi
- ;;
-
- makeinfo*)
- echo 1>&2 "\
-WARNING: \`$1' is $msg. You should only need it if
- you modified a \`.texi' or \`.texinfo' file, or any other file
- indirectly affecting the aspect of the manual. The spurious
- call might also be the consequence of using a buggy \`make' (AIX,
- DU, IRIX). You might want to install the \`Texinfo' package or
- the \`GNU make' package. Grab either from any GNU archive site."
- # The file to touch is that specified with -o ...
- file=`echo "$*" | sed -n "$sed_output"`
- test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"`
- if test -z "$file"; then
- # ... or it is the one specified with @setfilename ...
- infile=`echo "$*" | sed 's/.* \([^ ]*\) *$/\1/'`
- file=`sed -n '
- /^@setfilename/{
- s/.* \([^ ]*\) *$/\1/
- p
- q
- }' $infile`
- # ... or it is derived from the source name (dir/f.texi becomes f.info)
- test -z "$file" && file=`echo "$infile" | sed 's,.*/,,;s,.[^.]*$,,'`.info
- fi
- # If the file does not exist, the user really needs makeinfo;
- # let's fail without touching anything.
- test -f $file || exit 1
- touch $file
- ;;
-
- tar*)
- shift
-
- # We have already tried tar in the generic part.
- # Look for gnutar/gtar before invocation to avoid ugly error
- # messages.
- if (gnutar --version > /dev/null 2>&1); then
- gnutar "$@" && exit 0
- fi
- if (gtar --version > /dev/null 2>&1); then
- gtar "$@" && exit 0
- fi
- firstarg="$1"
- if shift; then
- case $firstarg in
- *o*)
- firstarg=`echo "$firstarg" | sed s/o//`
- tar "$firstarg" "$@" && exit 0
- ;;
- esac
- case $firstarg in
- *h*)
- firstarg=`echo "$firstarg" | sed s/h//`
- tar "$firstarg" "$@" && exit 0
- ;;
- esac
- fi
-
- echo 1>&2 "\
-WARNING: I can't seem to be able to run \`tar' with the given arguments.
- You may want to install GNU tar or Free paxutils, or check the
- command line arguments."
- exit 1
- ;;
-
- *)
- echo 1>&2 "\
-WARNING: \`$1' is needed, and is $msg.
- You might have modified some files without having the
- proper tools for further handling them. Check the \`README' file,
- it often tells you about the needed prerequisites for installing
- this package. You may also peek at any GNU archive site, in case
- some other package would contain this missing \`$1' program."
- exit 1
- ;;
-esac
+# Also exit now if we it failed (or wasn't found), and '--version' was
+# passed; such an option is passed most likely to detect whether the
+# program is present and works.
+case $2 in --version|--help) exit $st;; esac
+
+# Exit code 63 means version mismatch. This often happens when the user
+# tries to use an ancient version of a tool on a file that requires a
+# minimum version.
+if test $st -eq 63; then
+ msg="probably too old"
+elif test $st -eq 127; then
+ # Program was missing.
+ msg="missing on your system"
+else
+ # Program was found and executed, but failed. Give up.
+ exit $st
+fi
-exit 0
+perl_URL=http://www.perl.org/
+flex_URL=http://flex.sourceforge.net/
+gnu_software_URL=http://www.gnu.org/software
+
+program_details ()
+{
+ case $1 in
+ aclocal|automake)
+ echo "The '$1' program is part of the GNU Automake package:"
+ echo "<$gnu_software_URL/automake>"
+ echo "It also requires GNU Autoconf, GNU m4 and Perl in order to run:"
+ echo "<$gnu_software_URL/autoconf>"
+ echo "<$gnu_software_URL/m4/>"
+ echo "<$perl_URL>"
+ ;;
+ autoconf|autom4te|autoheader)
+ echo "The '$1' program is part of the GNU Autoconf package:"
+ echo "<$gnu_software_URL/autoconf/>"
+ echo "It also requires GNU m4 and Perl in order to run:"
+ echo "<$gnu_software_URL/m4/>"
+ echo "<$perl_URL>"
+ ;;
+ esac
+}
+
+give_advice ()
+{
+ # Normalize program name to check for.
+ normalized_program=`echo "$1" | sed '
+ s/^gnu-//; t
+ s/^gnu//; t
+ s/^g//; t'`
+
+ printf '%s\n' "'$1' is $msg."
+
+ configure_deps="'configure.ac' or m4 files included by 'configure.ac'"
+ case $normalized_program in
+ autoconf*)
+ echo "You should only need it if you modified 'configure.ac',"
+ echo "or m4 files included by it."
+ program_details 'autoconf'
+ ;;
+ autoheader*)
+ echo "You should only need it if you modified 'acconfig.h' or"
+ echo "$configure_deps."
+ program_details 'autoheader'
+ ;;
+ automake*)
+ echo "You should only need it if you modified 'Makefile.am' or"
+ echo "$configure_deps."
+ program_details 'automake'
+ ;;
+ aclocal*)
+ echo "You should only need it if you modified 'acinclude.m4' or"
+ echo "$configure_deps."
+ program_details 'aclocal'
+ ;;
+ autom4te*)
+ echo "You might have modified some maintainer files that require"
+ echo "the 'automa4te' program to be rebuilt."
+ program_details 'autom4te'
+ ;;
+ bison*|yacc*)
+ echo "You should only need it if you modified a '.y' file."
+ echo "You may want to install the GNU Bison package:"
+ echo "<$gnu_software_URL/bison/>"
+ ;;
+ lex*|flex*)
+ echo "You should only need it if you modified a '.l' file."
+ echo "You may want to install the Fast Lexical Analyzer package:"
+ echo "<$flex_URL>"
+ ;;
+ help2man*)
+ echo "You should only need it if you modified a dependency" \
+ "of a man page."
+ echo "You may want to install the GNU Help2man package:"
+ echo "<$gnu_software_URL/help2man/>"
+ ;;
+ makeinfo*)
+ echo "You should only need it if you modified a '.texi' file, or"
+ echo "any other file indirectly affecting the aspect of the manual."
+ echo "You might want to install the Texinfo package:"
+ echo "<$gnu_software_URL/texinfo/>"
+ echo "The spurious makeinfo call might also be the consequence of"
+ echo "using a buggy 'make' (AIX, DU, IRIX), in which case you might"
+ echo "want to install GNU make:"
+ echo "<$gnu_software_URL/make/>"
+ ;;
+ *)
+ echo "You might have modified some files without having the proper"
+ echo "tools for further handling them. Check the 'README' file, it"
+ echo "often tells you about the needed prerequisites for installing"
+ echo "this package. You may also peek at any GNU archive site, in"
+ echo "case some other package contains this missing '$1' program."
+ ;;
+ esac
+}
+
+give_advice "$1" | sed -e '1s/^/WARNING: /' \
+ -e '2,$s/^/ /' >&2
+
+# Propagate the correct exit status (expected to be 127 for a program
+# not found, 63 for a program that failed due to version mismatch).
+exit $st
# Local variables:
# eval: (add-hook 'write-file-hooks 'time-stamp)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xdg-user-dirs-gtk-0.9/parse.c new/xdg-user-dirs-gtk-0.10/parse.c
--- old/xdg-user-dirs-gtk-0.9/parse.c 2012-04-03 17:28:59.000000000 +0200
+++ new/xdg-user-dirs-gtk-0.10/parse.c 2013-01-21 14:20:04.000000000 +0100
@@ -1,6 +1,33 @@
#include "parse.h"
#include <string.h>
+static char *
+get_gtk_bookmarks_filename (void)
+{
+ char *filename, *legacy_filename;
+ gboolean exists, legacy_exists;
+
+ filename = g_build_filename (g_get_user_config_dir (), "gtk-3.0", "bookmarks", NULL);
+ exists = g_file_test (filename, G_FILE_TEST_EXISTS);
+
+ if (exists)
+ return filename;
+
+ legacy_filename = g_build_filename (g_get_home_dir (), ".gtk-bookmarks", NULL);
+ legacy_exists = g_file_test (legacy_filename, G_FILE_TEST_EXISTS);
+
+ if (legacy_exists)
+ {
+ g_free (filename);
+ return legacy_filename;
+ }
+
+ g_free (legacy_filename);
+
+ /* if neither exist, return the new filename */
+ return filename;
+}
+
char *
parse_xdg_dirs_locale (void)
{
@@ -112,24 +139,16 @@
}
GList *
-parse_gtk_bookmarks (const char *filename)
+parse_gtk_bookmarks (void)
{
- char *filename_free, *contents;
+ char *filename, *contents;
GError **error = NULL;
char **lines;
int i;
GtkBookmark *bookmark;
GList *bookmarks;
- filename_free = NULL;
- if (filename == NULL)
- {
- filename_free = g_build_filename (g_get_home_dir (),
- ".gtk-bookmarks",
- NULL);
- filename = (const char *)filename_free;
- }
-
+ filename = get_gtk_bookmarks_filename ();
bookmarks = NULL;
/* Read new list from file */
@@ -161,29 +180,20 @@
}
g_strfreev (lines);
}
- g_free (filename_free);
+ g_free (filename);
return bookmarks;
}
void
-save_gtk_bookmarks (const char *filename,
- GList *bookmarks)
+save_gtk_bookmarks (GList *bookmarks)
{
- char *filename_free;
+ char *filename, *dirname;
GString *str;
GList *l;
GtkBookmark *bookmark;
- filename_free = NULL;
- if (filename == NULL)
- {
- filename_free = g_build_filename (g_get_home_dir (),
- ".gtk-bookmarks",
- NULL);
- filename = (const char *)filename_free;
- }
-
+ filename = get_gtk_bookmarks_filename ();
str = g_string_new ("");
for (l = bookmarks; l != NULL; l = l->next)
@@ -196,8 +206,11 @@
g_string_append_printf (str, "%s\n", bookmark->uri);
}
- g_file_set_contents (filename, str->str, str->len, NULL);
-
+ dirname = g_path_get_dirname (filename);
+ if (g_mkdir_with_parents (dirname, 0700) == 0)
+ g_file_set_contents (filename, str->str, str->len, NULL);
+
g_string_free (str, TRUE);
- g_free (filename_free);
+ g_free (filename);
+ g_free (dirname);
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xdg-user-dirs-gtk-0.9/parse.h new/xdg-user-dirs-gtk-0.10/parse.h
--- old/xdg-user-dirs-gtk-0.9/parse.h 2012-04-03 17:28:59.000000000 +0200
+++ new/xdg-user-dirs-gtk-0.10/parse.h 2013-01-21 14:18:54.000000000 +0100
@@ -12,7 +12,6 @@
XdgDirEntry *parse_xdg_dirs (const char *config_file);
char *parse_xdg_dirs_locale (void);
-GList * parse_gtk_bookmarks (const char *filename);
-void save_gtk_bookmarks (const char *filename,
- GList *bookmarks);
+GList * parse_gtk_bookmarks (void);
+void save_gtk_bookmarks (GList *bookmarks);
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xdg-user-dirs-gtk-0.9/po/ChangeLog new/xdg-user-dirs-gtk-0.10/po/ChangeLog
--- old/xdg-user-dirs-gtk-0.9/po/ChangeLog 2012-04-03 17:28:59.000000000 +0200
+++ new/xdg-user-dirs-gtk-0.10/po/ChangeLog 2013-01-21 14:18:32.000000000 +0100
@@ -1,3 +1,7 @@
+2012-08-30 Danishka Navin <danishka(a)gmail.com>
+
+ * si.po: Added Sinhala (si) Translations.
+
2010-03-15 Nils-Christoph Fiedler <fiedler(a)medienkompanie.de>
* nds.po: Added Low German Translations.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xdg-user-dirs-gtk-0.9/po/LINGUAS new/xdg-user-dirs-gtk-0.10/po/LINGUAS
--- old/xdg-user-dirs-gtk-0.9/po/LINGUAS 2012-04-03 17:28:59.000000000 +0200
+++ new/xdg-user-dirs-gtk-0.10/po/LINGUAS 2013-01-21 14:18:32.000000000 +0100
@@ -10,6 +10,7 @@
ca
crh
cs
+csb
da
de
dz
@@ -52,6 +53,7 @@
pt_BR
ro
ru
+si
sk
sl
sq
@@ -61,6 +63,7 @@
ta
te
th
+tr
uk
vi
zh_CN
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xdg-user-dirs-gtk-0.9/po/Makefile.in.in new/xdg-user-dirs-gtk-0.10/po/Makefile.in.in
--- old/xdg-user-dirs-gtk-0.9/po/Makefile.in.in 2012-04-03 17:30:59.000000000 +0200
+++ new/xdg-user-dirs-gtk-0.10/po/Makefile.in.in 2013-01-21 14:53:56.000000000 +0100
@@ -49,8 +49,8 @@
XGETTEXT = @XGETTEXT@
INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
-MSGMERGE = INTLTOOL_EXTRACT=$(INTLTOOL_EXTRACT) srcdir=$(srcdir) $(INTLTOOL_UPDATE) --gettext-package $(GETTEXT_PACKAGE) --dist
-GENPOT = INTLTOOL_EXTRACT=$(INTLTOOL_EXTRACT) srcdir=$(srcdir) $(INTLTOOL_UPDATE) --gettext-package $(GETTEXT_PACKAGE) --pot
+MSGMERGE = INTLTOOL_EXTRACT="$(INTLTOOL_EXTRACT)" XGETTEXT="$(XGETTEXT)" srcdir=$(srcdir) $(INTLTOOL_UPDATE) --gettext-package $(GETTEXT_PACKAGE) --dist
+GENPOT = INTLTOOL_EXTRACT="$(INTLTOOL_EXTRACT)" XGETTEXT="$(XGETTEXT)" srcdir=$(srcdir) $(INTLTOOL_UPDATE) --gettext-package $(GETTEXT_PACKAGE) --pot
ALL_LINGUAS = @ALL_LINGUAS@
@@ -73,15 +73,20 @@
.SUFFIXES:
.SUFFIXES: .po .pox .gmo .mo .msg .cat
+AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
+INTLTOOL_V_MSGFMT = $(INTLTOOL__v_MSGFMT_$(V))
+INTLTOOL__v_MSGFMT_= $(INTLTOOL__v_MSGFMT_$(AM_DEFAULT_VERBOSITY))
+INTLTOOL__v_MSGFMT_0 = @echo " MSGFMT" $@;
+
.po.pox:
$(MAKE) $(GETTEXT_PACKAGE).pot
$(MSGMERGE) $< $(GETTEXT_PACKAGE).pot -o $*.pox
.po.mo:
- $(MSGFMT) -o $@ $<
+ $(INTLTOOL_V_MSGFMT)$(MSGFMT) -o $@ $<
.po.gmo:
- file=`echo $* | sed 's,.*/,,'`.gmo \
+ $(INTLTOOL_V_MSGFMT)file=`echo $* | sed 's,.*/,,'`.gmo \
&& rm -f $$file && $(GMSGFMT) -o $$file $<
.po.cat:
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xdg-user-dirs-gtk-0.9/po/csb.po new/xdg-user-dirs-gtk-0.10/po/csb.po
--- old/xdg-user-dirs-gtk-0.9/po/csb.po 1970-01-01 01:00:00.000000000 +0100
+++ new/xdg-user-dirs-gtk-0.10/po/csb.po 2013-01-21 14:18:32.000000000 +0100
@@ -0,0 +1,67 @@
+# Kashubian translation for xdg-user-dirs-gtk
+# Copyright (c) 2009 Rosetta Contributors and Canonical Ltd 2009
+# This file is distributed under the same license as the xdg-user-dirs-gtk package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2009.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: xdg-user-dirs-gtk\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2012-04-16 19:38+0200\n"
+"PO-Revision-Date: 2009-10-28 22:11+0000\n"
+"Last-Translator: Mark Kwidzińsczi <Unknown>\n"
+"Language-Team: Kashubian <csb(a)li.org>\n"
+"Language: csb\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#: ../update.c:159
+msgid "Update standard folders to current language?"
+msgstr "Zaktualnic standardowé katalodżi do aktualnegò jãzëka?"
+
+#: ../update.c:161
+msgid ""
+"You have logged in in a new language. You can automatically update the names "
+"of some standard folders in your home folder to match this language. The "
+"update would change the following folders:"
+msgstr ""
+"Jes wlogòwóny z nowim jãzëkã. Mòże aùtomatno zaktualnic miona niejednych "
+"standardowich katalogów w domôcym katalogù, abë dopasowac je do nowégò "
+"jãzëka. Zaktualnioné bãdą nôslédné katalodżi:"
+
+#: ../update.c:164
+msgid "_Keep Old Names"
+msgstr "Ù_trzëmôj stôré miona"
+
+#: ../update.c:165
+msgid "_Update Names"
+msgstr "_Zaktualni miona"
+
+#: ../update.c:191
+msgid "Current folder name"
+msgstr "Aktualné miono katalaga"
+
+#: ../update.c:196
+msgid "New folder name"
+msgstr "Nowé miono kataloga"
+
+#: ../update.c:206
+msgid "Note that existing content will not be moved."
+msgstr "Egzystëjącô zamkłosc ni mòże bëc przesëniãtô."
+
+#: ../update.c:213
+msgid "_Don't ask me this again"
+msgstr "_Nie pëtôj znowa"
+
+#: ../update.c:230
+msgid "There was an error updating the folders"
+msgstr "Fela przë aktualizacëji katalogów"
+
+#: ../user-dirs-update-gtk.desktop.in.h:1
+msgid "User folders update"
+msgstr "Aktualizacëjô kataloga brëkòwnika"
+
+#: ../user-dirs-update-gtk.desktop.in.h:2
+msgid "Update common folders names to match current locale"
+msgstr "Aktualizacëjô nowich mionów katalogów do aktualnegò nastôwù jãzëka"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xdg-user-dirs-gtk-0.9/po/pl.po new/xdg-user-dirs-gtk-0.10/po/pl.po
--- old/xdg-user-dirs-gtk-0.9/po/pl.po 2012-04-03 17:28:59.000000000 +0200
+++ new/xdg-user-dirs-gtk-0.10/po/pl.po 2013-01-21 14:18:32.000000000 +0100
@@ -4,21 +4,23 @@
# pomóc w jego rozwijaniu i pielęgnowaniu, napisz do nas:
# gnomepl(a)aviary.pl
# -=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-
-# translation of xdg-user-dirs-gtk to Polish
-# Copyright (C) 2009 Aviary.pl
-# This file is distributed under the same license as the xdg-user-dirs-gtk package.
-# Tomasz Dominikowski <tdominikowski(a)aviary.pl>, 2007 - 2009
+# Tomasz Dominikowski <dominikowski(a)gmail.com>, 2007-2009.
+# Piotr Drąg <piotrdrag(a)gmail.com>, 2012.
+# Aviary.pl <gnomepl(a)aviary.pl>, 2007-2012.
msgid ""
msgstr ""
"Project-Id-Version: xdg-user-dirs-gtk\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-06-03 00:03+0200\n"
-"PO-Revision-Date: 2009-06-03 00:02+0100\n"
-"Last-Translator: Tomasz Dominikowski <dominikowski(a)gmail.com>\n"
+"POT-Creation-Date: 2012-09-04 21:25+0200\n"
+"PO-Revision-Date: 2012-09-04 21:27+0200\n"
+"Last-Translator: Piotr Drąg <piotrdrag(a)gmail.com>\n"
"Language-Team: Polish <gnomepl(a)aviary.pl>\n"
+"Language: pl\n"
"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=utf-8\n"
+"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 "
+"|| n%100>=20) ? 1 : 2);\n"
"X-Poedit-Language: Polish\n"
"X-Poedit-Country: Poland\n"
@@ -32,7 +34,7 @@
"of some standard folders in your home folder to match this language. The "
"update would change the following folders:"
msgstr ""
-"Zalogowano z nowym językiem. Można automatycznie zaktualizować nazwy "
+"Zalogowano w nowym języku. Można automatycznie zaktualizować nazwy "
"niektórych standardowych katalogów w katalogu domowym, aby dopasować je do "
"nowego języka. Aktualizacji podlegałyby następujące katalogi:"
@@ -44,33 +46,30 @@
msgid "_Update Names"
msgstr "_Zaktualizuj nazwy"
-#: ../update.c:190
+#: ../update.c:191
msgid "Current folder name"
msgstr "Bieżąca nazwa katalogu"
-#: ../update.c:195
+#: ../update.c:196
msgid "New folder name"
msgstr "Nowa nazwa katalogu"
-#: ../update.c:205
+#: ../update.c:206
msgid "Note that existing content will not be moved."
-msgstr "Bieżąca zawartość nie zostanie przeniesiona."
+msgstr "Obecna zawartość nie zostanie przeniesiona."
-#: ../update.c:212
+#: ../update.c:213
msgid "_Don't ask me this again"
-msgstr "_Bez ponownego pytania"
+msgstr "_Bez pytania ponownie"
-#: ../update.c:229
+#: ../update.c:230
msgid "There was an error updating the folders"
msgstr "Wystąpił błąd podczas aktualizowania katalogów"
#: ../user-dirs-update-gtk.desktop.in.h:1
-msgid "Update common folders names to match current locale"
-msgstr "Aktualizowanie nazw katalogów do bieżących ustawień językowych"
-
-#: ../user-dirs-update-gtk.desktop.in.h:2
msgid "User folders update"
msgstr "Aktualizacja katalogów użytkownika"
-#~ msgid "The update would change the following folders:"
-#~ msgstr "Aktualizacja zmieniłaby nazwy następujących folderów:"
+#: ../user-dirs-update-gtk.desktop.in.h:2
+msgid "Update common folders names to match current locale"
+msgstr "Aktualizowanie nazw katalogów do bieżących ustawień językowych"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xdg-user-dirs-gtk-0.9/po/si.po new/xdg-user-dirs-gtk-0.10/po/si.po
--- old/xdg-user-dirs-gtk-0.9/po/si.po 1970-01-01 01:00:00.000000000 +0100
+++ new/xdg-user-dirs-gtk-0.10/po/si.po 2013-01-21 14:18:32.000000000 +0100
@@ -0,0 +1,65 @@
+# Sinhalese translation for xdg-user-dirs-gtk
+# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
+# This file is distributed under the same license as the xdg-user-dirs-gtk package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: xdg-user-dirs-gtk\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-07-20 05:15+0000\n"
+"PO-Revision-Date: 2012-05-23 04:25+0000\n"
+"Last-Translator: පසිඳු කාවින්ද <info(a)pk-soft.tk>\n"
+"Language-Team: Sinhalese <si(a)li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2012-08-31 05:00+0000\n"
+"X-Generator: Launchpad (build 15887)\n"
+
+#: ../update.c:159
+msgid "Update standard folders to current language?"
+msgstr ""
+
+#: ../update.c:161
+msgid ""
+"You have logged in in a new language. You can automatically update the names "
+"of some standard folders in your home folder to match this language. The "
+"update would change the following folders:"
+msgstr ""
+
+#: ../update.c:164
+msgid "_Keep Old Names"
+msgstr "පැරණි නම් තබාගන්න (_K)"
+
+#: ../update.c:165
+msgid "_Update Names"
+msgstr "නම් යාවත්කාලීන කරන්න (_U)"
+
+#: ../update.c:191
+msgid "Current folder name"
+msgstr "වත්මන් බහාලුමේ නම"
+
+#: ../update.c:196
+msgid "New folder name"
+msgstr "නව බහාලුමේ නම"
+
+#: ../update.c:206
+msgid "Note that existing content will not be moved."
+msgstr "දැනටමත් පවතින අන්තර්ගතය නොගෙන යන බව මතක තබාගන්න."
+
+#: ../update.c:213
+msgid "_Don't ask me this again"
+msgstr "මගෙන් නැවත නොවිමසන්න (_D)"
+
+#: ../update.c:230
+msgid "There was an error updating the folders"
+msgstr "බහාලුම් යාවත්කාලීන කිරීමේදී දෝෂයක් හට ගැනුණි"
+
+#: ../user-dirs-update-gtk.desktop.in.h:1
+msgid "User folders update"
+msgstr "පරිශීලක බහාලුම් යාවත්කාලීනය"
+
+#: ../user-dirs-update-gtk.desktop.in.h:2
+msgid "Update common folders names to match current locale"
+msgstr ""
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xdg-user-dirs-gtk-0.9/po/tr.po new/xdg-user-dirs-gtk-0.10/po/tr.po
--- old/xdg-user-dirs-gtk-0.9/po/tr.po 1970-01-01 01:00:00.000000000 +0100
+++ new/xdg-user-dirs-gtk-0.10/po/tr.po 2013-01-21 14:18:32.000000000 +0100
@@ -0,0 +1,73 @@
+# Turkish translation for xdg-user-dirs-gtk
+# Copyright (c) 2009 Rosetta Contributors and Canonical Ltd 2009
+# This file is distributed under the same license as the xdg-user-dirs-gtk package.
+# Muhammet Kara <muhammetk(a)acikkaynak.name.tr>, 2012.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: xdg-user-dirs-gtk\n"
+"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=xdg-"
+"user-dirs-gtk&keywords=I18N+L10N&component=general\n"
+"POT-Creation-Date: 2012-08-31 05:44+0000\n"
+"PO-Revision-Date: 2012-09-04 00:52+0000\n"
+"Last-Translator: Muhammet Kara <muhammetk(a)acikkaynak.name.tr>\n"
+"Language-Team: Turkish <gnome-turk(a)gnome.org>\n"
+"Language: tr\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
+"X-Launchpad-Export-Date: 2012-08-31 05:00+0000\n"
+"X-Generator: Launchpad (build 15887)\n"
+
+#: ../update.c:159
+msgid "Update standard folders to current language?"
+msgstr "Standart klasörler geçerli dile güncelleştirilsin mi ?"
+
+#: ../update.c:161
+msgid ""
+"You have logged in in a new language. You can automatically update the names "
+"of some standard folders in your home folder to match this language. The "
+"update would change the following folders:"
+msgstr ""
+"Yeni bir dil ile giriş yaptınız. Başlangıç klasörünüzde bu dille "
+"uyuşmayan standart klasör adlarını otomatik olarak bu dile "
+"güncelleştirebilirsiniz. Güncelleştirme şu dizinlerin adlarını "
+"değiştirecektir:"
+
+#: ../update.c:164
+msgid "_Keep Old Names"
+msgstr "_Eski Adları Koru"
+
+#: ../update.c:165
+msgid "_Update Names"
+msgstr "_Adları Güncelleştir"
+
+#: ../update.c:191
+msgid "Current folder name"
+msgstr "Geçerli klasör adı"
+
+#: ../update.c:196
+msgid "New folder name"
+msgstr "Yeni klasör adı"
+
+#: ../update.c:206
+msgid "Note that existing content will not be moved."
+msgstr "Varolan içeriğin taşınmayacağını unutmayın."
+
+#: ../update.c:213
+msgid "_Don't ask me this again"
+msgstr "_Bunu bir daha sorma"
+
+#: ../update.c:230
+msgid "There was an error updating the folders"
+msgstr "Klasörler güncelleştirilirken hata oluştu"
+
+#: ../user-dirs-update-gtk.desktop.in.h:1
+msgid "User folders update"
+msgstr "Kullanıcı klasörlerinin güncelleştirilmesi"
+
+#: ../user-dirs-update-gtk.desktop.in.h:2
+msgid "Update common folders names to match current locale"
+msgstr ""
+"Genel klasör adlarını geçerli dile uyumlu hale getirmek için güncelleştir"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xdg-user-dirs-gtk-0.9/update.c new/xdg-user-dirs-gtk-0.10/update.c
--- old/xdg-user-dirs-gtk-0.9/update.c 2012-04-03 17:28:59.000000000 +0200
+++ new/xdg-user-dirs-gtk-0.10/update.c 2013-01-21 14:50:11.000000000 +0100
@@ -305,7 +305,7 @@
new_entries = parse_xdg_dirs (NULL);
- bookmarks = parse_gtk_bookmarks (NULL);
+ bookmarks = parse_gtk_bookmarks ();
modified_bookmarks = FALSE;
if (bookmarks == NULL)
@@ -372,7 +372,7 @@
}
if (modified_bookmarks)
- save_gtk_bookmarks (NULL, bookmarks);
+ save_gtk_bookmarks (bookmarks);
g_free (new_entries);
g_free (old_entries);
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org
For additional commands, e-mail: opensuse-commit+help(a)opensuse.org
1
0