openSUSE Commits
Threads by month
- ----- 2024 -----
- 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
February 2017
- 1 participants
- 1918 discussions
Hello community,
here is the log from the commit of package keepalived for openSUSE:Factory checked in at 2017-02-25 00:55:05
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/keepalived (Old)
and /work/SRC/openSUSE:Factory/.keepalived.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "keepalived"
Changes:
--------
--- /work/SRC/openSUSE:Factory/keepalived/keepalived.changes 2017-01-04 19:34:44.966729490 +0100
+++ /work/SRC/openSUSE:Factory/.keepalived.new/keepalived.changes 2017-02-25 00:55:06.442212939 +0100
@@ -1,0 +2,14 @@
+Thu Feb 16 12:27:53 UTC 2017 - mrueckert(a)suse.de
+
+- use tarball from https://github.com/acassen/keepalived/issues/524
+ the original tarball did not build. This has the necessary fix
+ applied. for the 1.3.4 update see the TODO entry in the preamble.
+
+-------------------------------------------------------------------
+Wed Feb 15 11:38:16 UTC 2017 - mrueckert(a)suse.de
+
+- update to 1.3.3
+ Some minor fix, extensions and updates. snapcraft support. Refer
+ to /usr/share/doc/packages/keepalived/ChangeLog for more infos.
+
+-------------------------------------------------------------------
Old:
----
keepalived-1.3.2.tar.gz
New:
----
keepalived-1.3.3.tar.gz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ keepalived.spec ++++++
--- /var/tmp/diff_new_pack.qmkcZ9/_old 2017-02-25 00:55:07.294082249 +0100
+++ /var/tmp/diff_new_pack.qmkcZ9/_new 2017-02-25 00:55:07.298081636 +0100
@@ -1,7 +1,7 @@
#
# spec file for package keepalived
#
-# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -24,13 +24,15 @@
%bcond_with dbus
Name: keepalived
-Version: 1.3.2
+Version: 1.3.3
Release: 0
Summary: A strong & robust keepalive facility for linux
License: GPL-2.0+
Group: Productivity/Networking/Routing
Url: http://www.keepalived.org/
-Source: http://www.keepalived.org/software/keepalived-%{version}.tar.gz
+# TODO: revert to old source line with 1.3.4 update
+# Source: http://www.keepalived.org/software/keepalived-%{version}.tar.gz
+Source: https://github.com/acassen/keepalived/files/779998/keepalived-1.3.3.tar.gz
Source1: keepalived.service
Source2: keepalive-rpmlintrc
Patch1: keepalive-init.patch
++++++ keepalived-1.3.2.tar.gz -> keepalived-1.3.3.tar.gz ++++++
++++ 3316 lines of diff (skipped)
1
0
Hello community,
here is the log from the commit of package php5-ice for openSUSE:Factory checked in at 2017-02-25 00:54:51
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/php5-ice (Old)
and /work/SRC/openSUSE:Factory/.php5-ice.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "php5-ice"
Changes:
--------
--- /work/SRC/openSUSE:Factory/php5-ice/php5-ice.changes 2017-02-19 01:04:36.977370161 +0100
+++ /work/SRC/openSUSE:Factory/.php5-ice.new/php5-ice.changes 2017-02-25 00:54:52.504351246 +0100
@@ -1,0 +2,6 @@
+Fri Feb 24 00:26:18 UTC 2017 - mruz(a)poczta.onet.pl
+
+- Ice 1.2.9
+ * Unique validator, fix mongodb
+
+-------------------------------------------------------------------
Old:
----
php5-ice-1.2.8.tar.gz
New:
----
php5-ice-1.2.9.tar.gz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ php5-ice.spec ++++++
--- /var/tmp/diff_new_pack.OLoYXF/_old 2017-02-25 00:54:53.148252460 +0100
+++ /var/tmp/diff_new_pack.OLoYXF/_new 2017-02-25 00:54:53.148252460 +0100
@@ -22,7 +22,7 @@
%define _name ice
Name: %{_php}-%{_name}
-Version: 1.2.8
+Version: 1.2.9
Release: 0
Summary: Simple and fast PHP framework delivered as C-extension
License: BSD-3-Clause
++++++ php5-ice-1.2.8.tar.gz -> php5-ice-1.2.9.tar.gz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/framework-1.2.8/CHANGELOG.md new/framework-1.2.9/CHANGELOG.md
--- old/framework-1.2.8/CHANGELOG.md 2017-02-18 19:55:14.000000000 +0100
+++ new/framework-1.2.9/CHANGELOG.md 2017-02-24 01:36:45.000000000 +0100
@@ -1,4 +1,10 @@
-------------------------------------------------------------------
+Fri Feb 24 00:26:18 UTC 2017
+
+- Ice 1.2.9
+ * Unique validator, fix mongodb
+
+-------------------------------------------------------------------
Sat Feb 18 18:50:05 UTC 2017
- Ice 1.2.8
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/framework-1.2.8/build/php5/ice/validation/validator/unique.zep.c new/framework-1.2.9/build/php5/ice/validation/validator/unique.zep.c
--- old/framework-1.2.8/build/php5/ice/validation/validator/unique.zep.c 2017-02-18 19:55:14.000000000 +0100
+++ new/framework-1.2.9/build/php5/ice/validation/validator/unique.zep.c 2017-02-24 01:36:45.000000000 +0100
@@ -69,13 +69,13 @@
*/
PHP_METHOD(Ice_Validation_Validator_Unique, validate) {
- zval *_21$$18, *_22$$19;
+ zval *_22$$18, *_23$$19;
zephir_nts_static zend_class_entry *_17$$15 = NULL;
- zend_bool _0, _30$$20;
+ zend_bool _0, _31$$20;
zephir_fcall_cache_entry *_1 = NULL;
int ZEPHIR_LAST_CALL_STATUS;
zval *field = NULL;
- zval *validation, *field_param = NULL, *value = NULL, *label = NULL, *message = NULL, *i18n = NULL, *replace = NULL, *di = NULL, *db = NULL, *from = NULL, *custom = NULL, *except = NULL, *tmp = NULL, *caseInsensitive = NULL, *result = NULL, *id = NULL, *_2 = NULL, *_3 = NULL, *_6 = NULL, *_9 = NULL, *_12 = NULL, *_4$$4, *_5$$5, *_7$$6, *_8$$7, *_10$$9, *_11$$10, *_13$$11, *_14$$12, *_15$$13 = NULL, *_16$$14 = NULL, *_18$$15, *_19$$16, *_20$$18 = NULL, *_23$$20 = NULL, *_24$$20 = NULL, *_26$$20 = NULL, *_29$$20 = NULL, *_31$$20 = NULL, *_32$$20 = NULL, *_36$$20 = NULL, *_25$$21, *_27$$23, *_28$$24, *_33$$25 = NULL, *_34$$25, *_35$$25 = NULL;
+ zval *validation, *field_param = NULL, *value = NULL, *label = NULL, *message = NULL, *i18n = NULL, *replace = NULL, *di = NULL, *db = NULL, *from = NULL, *custom = NULL, *except = NULL, *tmp = NULL, *caseInsensitive = NULL, *result = NULL, *id = NULL, *_2 = NULL, *_3 = NULL, *_6 = NULL, *_9 = NULL, *_12 = NULL, *_4$$4, *_5$$5, *_7$$6, *_8$$7, *_10$$9, *_11$$10, *_13$$11, *_14$$12, *_15$$13 = NULL, *_16$$14 = NULL, *_18$$15, *_19$$15, *_20$$16, *_21$$18 = NULL, *_24$$20 = NULL, *_25$$20 = NULL, *_27$$20 = NULL, *_30$$20 = NULL, *_32$$20 = NULL, *_33$$20 = NULL, *_37$$20 = NULL, *_26$$21, *_28$$23, *_29$$24, *_34$$25 = NULL, *_35$$25, *_36$$25 = NULL;
ZEPHIR_MM_GROW();
zephir_fetch_params(1, 2, 0, &validation, &field_param);
@@ -190,16 +190,18 @@
object_init_ex(value, _17$$15);
if (zephir_has_constructor(value TSRMLS_CC)) {
ZEPHIR_INIT_VAR(_18$$15);
- ZVAL_STRING(_18$$15, "i", ZEPHIR_TEMP_PARAM_COPY);
- ZEPHIR_CALL_METHOD(NULL, value, "__construct", NULL, 0, tmp, _18$$15);
- zephir_check_temp_parameter(_18$$15);
+ ZEPHIR_CONCAT_SVS(_18$$15, "^", tmp, "$");
+ ZEPHIR_INIT_VAR(_19$$15);
+ ZVAL_STRING(_19$$15, "i", ZEPHIR_TEMP_PARAM_COPY);
+ ZEPHIR_CALL_METHOD(NULL, value, "__construct", NULL, 0, _18$$15, _19$$15);
+ zephir_check_temp_parameter(_19$$15);
zephir_check_call_status();
}
} else {
object_init_ex(value, zephir_get_internal_ce(SS("mongoregex") TSRMLS_CC));
- ZEPHIR_INIT_VAR(_19$$16);
- ZEPHIR_CONCAT_SVS(_19$$16, "/^", tmp, "$/i");
- ZEPHIR_CALL_METHOD(NULL, value, "__construct", NULL, 0, _19$$16);
+ ZEPHIR_INIT_VAR(_20$$16);
+ ZEPHIR_CONCAT_SVS(_20$$16, "/^", tmp, "$/i");
+ ZEPHIR_CALL_METHOD(NULL, value, "__construct", NULL, 0, _20$$16);
zephir_check_call_status();
}
} else {
@@ -210,92 +212,92 @@
if (zephir_is_true(except)) {
ZEPHIR_INIT_VAR(id);
zephir_create_array(id, 1, 0 TSRMLS_CC);
- ZEPHIR_CALL_METHOD(&_20$$18, db, "getidvalue", NULL, 0, except);
+ ZEPHIR_CALL_METHOD(&_21$$18, db, "getidvalue", NULL, 0, except);
zephir_check_call_status();
- zephir_array_update_string(&id, SL("!="), &_20$$18, PH_COPY | PH_SEPARATE);
- ZEPHIR_INIT_VAR(_21$$18);
- zephir_create_array(_21$$18, 2, 0 TSRMLS_CC);
- zephir_array_update_zval(&_21$$18, custom, &value, PH_COPY);
- ZEPHIR_CALL_METHOD(&_20$$18, db, "getid", NULL, 0);
- zephir_check_call_status();
- zephir_array_update_zval(&_21$$18, _20$$18, &id, PH_COPY);
- ZEPHIR_CALL_METHOD(&result, db, "findone", NULL, 0, from, _21$$18);
- zephir_check_call_status();
- } else {
- ZEPHIR_INIT_VAR(_22$$19);
- zephir_create_array(_22$$19, 1, 0 TSRMLS_CC);
- zephir_array_update_zval(&_22$$19, custom, &value, PH_COPY);
- ZEPHIR_CALL_METHOD(&result, db, "findone", NULL, 0, from, _22$$19);
+ zephir_array_update_string(&id, SL("!="), &_21$$18, PH_COPY | PH_SEPARATE);
+ ZEPHIR_INIT_VAR(_22$$18);
+ zephir_create_array(_22$$18, 2, 0 TSRMLS_CC);
+ zephir_array_update_zval(&_22$$18, custom, &value, PH_COPY);
+ ZEPHIR_CALL_METHOD(&_21$$18, db, "getid", NULL, 0);
+ zephir_check_call_status();
+ zephir_array_update_zval(&_22$$18, _21$$18, &id, PH_COPY);
+ ZEPHIR_CALL_METHOD(&result, db, "findone", NULL, 0, from, _22$$18);
+ zephir_check_call_status();
+ } else {
+ ZEPHIR_INIT_VAR(_23$$19);
+ zephir_create_array(_23$$19, 1, 0 TSRMLS_CC);
+ zephir_array_update_zval(&_23$$19, custom, &value, PH_COPY);
+ ZEPHIR_CALL_METHOD(&result, db, "findone", NULL, 0, from, _23$$19);
zephir_check_call_status();
}
if (zephir_is_true(result)) {
- ZEPHIR_INIT_VAR(_24$$20);
- ZVAL_STRING(_24$$20, "label", ZEPHIR_TEMP_PARAM_COPY);
- ZEPHIR_CALL_METHOD(&_23$$20, this_ptr, "has", NULL, 0, _24$$20);
- zephir_check_temp_parameter(_24$$20);
- zephir_check_call_status();
- if (zephir_is_true(_23$$20)) {
- ZEPHIR_INIT_VAR(_25$$21);
- ZVAL_STRING(_25$$21, "label", ZEPHIR_TEMP_PARAM_COPY);
- ZEPHIR_CALL_METHOD(&label, this_ptr, "get", NULL, 0, _25$$21);
- zephir_check_temp_parameter(_25$$21);
+ ZEPHIR_INIT_VAR(_25$$20);
+ ZVAL_STRING(_25$$20, "label", ZEPHIR_TEMP_PARAM_COPY);
+ ZEPHIR_CALL_METHOD(&_24$$20, this_ptr, "has", NULL, 0, _25$$20);
+ zephir_check_temp_parameter(_25$$20);
+ zephir_check_call_status();
+ if (zephir_is_true(_24$$20)) {
+ ZEPHIR_INIT_VAR(_26$$21);
+ ZVAL_STRING(_26$$21, "label", ZEPHIR_TEMP_PARAM_COPY);
+ ZEPHIR_CALL_METHOD(&label, this_ptr, "get", NULL, 0, _26$$21);
+ zephir_check_temp_parameter(_26$$21);
zephir_check_call_status();
} else {
ZEPHIR_CALL_METHOD(&label, validation, "getlabel", NULL, 0, field);
zephir_check_call_status();
}
- ZEPHIR_INIT_NVAR(_24$$20);
- ZVAL_STRING(_24$$20, "message", ZEPHIR_TEMP_PARAM_COPY);
- ZEPHIR_CALL_METHOD(&_26$$20, this_ptr, "has", NULL, 0, _24$$20);
- zephir_check_temp_parameter(_24$$20);
- zephir_check_call_status();
- if (zephir_is_true(_26$$20)) {
- ZEPHIR_INIT_VAR(_27$$23);
- ZVAL_STRING(_27$$23, "message", ZEPHIR_TEMP_PARAM_COPY);
- ZEPHIR_CALL_METHOD(&message, this_ptr, "get", NULL, 0, _27$$23);
- zephir_check_temp_parameter(_27$$23);
+ ZEPHIR_INIT_NVAR(_25$$20);
+ ZVAL_STRING(_25$$20, "message", ZEPHIR_TEMP_PARAM_COPY);
+ ZEPHIR_CALL_METHOD(&_27$$20, this_ptr, "has", NULL, 0, _25$$20);
+ zephir_check_temp_parameter(_25$$20);
+ zephir_check_call_status();
+ if (zephir_is_true(_27$$20)) {
+ ZEPHIR_INIT_VAR(_28$$23);
+ ZVAL_STRING(_28$$23, "message", ZEPHIR_TEMP_PARAM_COPY);
+ ZEPHIR_CALL_METHOD(&message, this_ptr, "get", NULL, 0, _28$$23);
+ zephir_check_temp_parameter(_28$$23);
zephir_check_call_status();
} else {
- ZEPHIR_INIT_VAR(_28$$24);
- ZVAL_STRING(_28$$24, "unique", ZEPHIR_TEMP_PARAM_COPY);
- ZEPHIR_CALL_METHOD(&message, validation, "getdefaultmessage", NULL, 0, _28$$24);
- zephir_check_temp_parameter(_28$$24);
+ ZEPHIR_INIT_VAR(_29$$24);
+ ZVAL_STRING(_29$$24, "unique", ZEPHIR_TEMP_PARAM_COPY);
+ ZEPHIR_CALL_METHOD(&message, validation, "getdefaultmessage", NULL, 0, _29$$24);
+ zephir_check_temp_parameter(_29$$24);
zephir_check_call_status();
}
- ZEPHIR_CALL_METHOD(&_29$$20, validation, "gettranslate", NULL, 0);
+ ZEPHIR_CALL_METHOD(&_30$$20, validation, "gettranslate", NULL, 0);
zephir_check_call_status();
- _30$$20 = ZEPHIR_IS_TRUE_IDENTICAL(_29$$20);
- if (_30$$20) {
- ZEPHIR_CALL_METHOD(&_31$$20, validation, "getdi", NULL, 0);
- zephir_check_call_status();
- ZEPHIR_INIT_NVAR(_24$$20);
- ZVAL_STRING(_24$$20, "i18n", ZEPHIR_TEMP_PARAM_COPY);
- ZEPHIR_CALL_METHOD(&_32$$20, _31$$20, "has", NULL, 0, _24$$20);
- zephir_check_temp_parameter(_24$$20);
+ _31$$20 = ZEPHIR_IS_TRUE_IDENTICAL(_30$$20);
+ if (_31$$20) {
+ ZEPHIR_CALL_METHOD(&_32$$20, validation, "getdi", NULL, 0);
+ zephir_check_call_status();
+ ZEPHIR_INIT_NVAR(_25$$20);
+ ZVAL_STRING(_25$$20, "i18n", ZEPHIR_TEMP_PARAM_COPY);
+ ZEPHIR_CALL_METHOD(&_33$$20, _32$$20, "has", NULL, 0, _25$$20);
+ zephir_check_temp_parameter(_25$$20);
zephir_check_call_status();
- _30$$20 = zephir_is_true(_32$$20);
+ _31$$20 = zephir_is_true(_33$$20);
}
- if (_30$$20) {
- ZEPHIR_CALL_METHOD(&_33$$25, validation, "getdi", NULL, 0);
+ if (_31$$20) {
+ ZEPHIR_CALL_METHOD(&_34$$25, validation, "getdi", NULL, 0);
zephir_check_call_status();
- ZEPHIR_INIT_VAR(_34$$25);
- ZVAL_STRING(_34$$25, "i18n", ZEPHIR_TEMP_PARAM_COPY);
- ZEPHIR_CALL_METHOD(&i18n, _33$$25, "get", NULL, 0, _34$$25);
- zephir_check_temp_parameter(_34$$25);
+ ZEPHIR_INIT_VAR(_35$$25);
+ ZVAL_STRING(_35$$25, "i18n", ZEPHIR_TEMP_PARAM_COPY);
+ ZEPHIR_CALL_METHOD(&i18n, _34$$25, "get", NULL, 0, _35$$25);
+ zephir_check_temp_parameter(_35$$25);
zephir_check_call_status();
- ZEPHIR_CALL_METHOD(&_35$$25, i18n, "translate", NULL, 0, label);
+ ZEPHIR_CALL_METHOD(&_36$$25, i18n, "translate", NULL, 0, label);
zephir_check_call_status();
- ZEPHIR_CPY_WRT(label, _35$$25);
- ZEPHIR_CALL_METHOD(&_35$$25, i18n, "translate", NULL, 0, message);
+ ZEPHIR_CPY_WRT(label, _36$$25);
+ ZEPHIR_CALL_METHOD(&_36$$25, i18n, "translate", NULL, 0, message);
zephir_check_call_status();
- ZEPHIR_CPY_WRT(message, _35$$25);
+ ZEPHIR_CPY_WRT(message, _36$$25);
}
ZEPHIR_INIT_VAR(replace);
zephir_create_array(replace, 1, 0 TSRMLS_CC);
zephir_array_update_string(&replace, SL(":field"), &label, PH_COPY | PH_SEPARATE);
- ZEPHIR_CALL_FUNCTION(&_36$$20, "strtr", NULL, 88, message, replace);
+ ZEPHIR_CALL_FUNCTION(&_37$$20, "strtr", NULL, 88, message, replace);
zephir_check_call_status();
- ZEPHIR_CALL_METHOD(NULL, validation, "addmessage", NULL, 0, field, _36$$20);
+ ZEPHIR_CALL_METHOD(NULL, validation, "addmessage", NULL, 0, field, _37$$20);
zephir_check_call_status();
RETURN_MM_BOOL(0);
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/framework-1.2.8/build/php5/ice/version.zep.c new/framework-1.2.9/build/php5/ice/version.zep.c
--- old/framework-1.2.8/build/php5/ice/version.zep.c 2017-02-18 19:55:14.000000000 +0100
+++ new/framework-1.2.9/build/php5/ice/version.zep.c 2017-02-24 01:36:45.000000000 +0100
@@ -47,7 +47,7 @@
zend_declare_class_constant_long(ice_version_ce, SL("MINOR"), 2 TSRMLS_CC);
- zend_declare_class_constant_long(ice_version_ce, SL("PATCH"), 8 TSRMLS_CC);
+ zend_declare_class_constant_long(ice_version_ce, SL("PATCH"), 9 TSRMLS_CC);
zend_declare_class_constant_long(ice_version_ce, SL("STAGE"), 4 TSRMLS_CC);
@@ -69,7 +69,7 @@
zephir_create_array(return_value, 5, 0 TSRMLS_CC);
add_assoc_long_ex(return_value, SS("major"), 1);
add_assoc_long_ex(return_value, SS("minor"), 2);
- add_assoc_long_ex(return_value, SS("patch"), 8);
+ add_assoc_long_ex(return_value, SS("patch"), 9);
add_assoc_long_ex(return_value, SS("stage"), 4);
add_assoc_long_ex(return_value, SS("build"), 0);
return;
@@ -138,7 +138,7 @@
ZEPHIR_SINIT_VAR(_8);
ZVAL_LONG(&_8, 2);
ZEPHIR_SINIT_VAR(_9);
- ZVAL_LONG(&_9, 8);
+ ZVAL_LONG(&_9, 9);
ZEPHIR_CONCAT_VSVSVV(return_value, &_7, ".", &_8, ".", &_9, suffix);
RETURN_MM();
@@ -171,7 +171,7 @@
ZEPHIR_SINIT_NVAR(_1);
ZVAL_STRING(&_1, "%02s", 0);
ZEPHIR_SINIT_NVAR(_2);
- ZVAL_LONG(&_2, 8);
+ ZVAL_LONG(&_2, 9);
ZEPHIR_CALL_FUNCTION(&_5, "sprintf", &_4, 12, &_1, &_2);
zephir_check_call_status();
ZEPHIR_SINIT_NVAR(_1);
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/framework-1.2.8/build/php5/php_ice.h new/framework-1.2.9/build/php5/php_ice.h
--- old/framework-1.2.8/build/php5/php_ice.h 2017-02-18 19:55:14.000000000 +0100
+++ new/framework-1.2.9/build/php5/php_ice.h 2017-02-24 01:36:45.000000000 +0100
@@ -11,7 +11,7 @@
#include "kernel/globals.h"
#define PHP_ICE_NAME "ice"
-#define PHP_ICE_VERSION "1.2.8"
+#define PHP_ICE_VERSION "1.2.9"
#define PHP_ICE_EXTNAME "ice"
#define PHP_ICE_AUTHOR "Ice Team"
#define PHP_ICE_ZEPVERSION "0.9.6a-dev-aef205594b"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/framework-1.2.8/build/php7/ice/validation/validator/unique.zep.c new/framework-1.2.9/build/php7/ice/validation/validator/unique.zep.c
--- old/framework-1.2.8/build/php7/ice/validation/validator/unique.zep.c 2017-02-18 19:55:14.000000000 +0100
+++ new/framework-1.2.9/build/php7/ice/validation/validator/unique.zep.c 2017-02-24 01:36:45.000000000 +0100
@@ -69,13 +69,13 @@
*/
PHP_METHOD(Ice_Validation_Validator_Unique, validate) {
- zval _22$$18, _23$$19;
+ zval _23$$18, _24$$19;
zephir_nts_static zend_class_entry *_18$$15 = NULL;
- zend_bool _0, _31$$20;
+ zend_bool _0, _32$$20;
zephir_fcall_cache_entry *_1 = NULL;
int ZEPHIR_LAST_CALL_STATUS;
zval field;
- zval *validation, validation_sub, *field_param = NULL, value, label, message, i18n, replace, di, db, from, custom, except, tmp, caseInsensitive, result, id, _2, _3, _4, _7, _10, _13, _5$$4, _6$$5, _8$$6, _9$$7, _11$$9, _12$$10, _14$$11, _15$$12, _16$$13, _17$$14, _19$$15, _20$$16, _21$$18, _24$$20, _25$$20, _27$$20, _30$$20, _32$$20, _33$$20, _37$$20, _26$$21, _28$$23, _29$$24, _34$$25, _35$$25, _36$$25;
+ zval *validation, validation_sub, *field_param = NULL, value, label, message, i18n, replace, di, db, from, custom, except, tmp, caseInsensitive, result, id, _2, _3, _4, _7, _10, _13, _5$$4, _6$$5, _8$$6, _9$$7, _11$$9, _12$$10, _14$$11, _15$$12, _16$$13, _17$$14, _19$$15, _20$$15, _21$$16, _22$$18, _25$$20, _26$$20, _28$$20, _31$$20, _33$$20, _34$$20, _38$$20, _27$$21, _29$$23, _30$$24, _35$$25, _36$$25, _37$$25;
ZEPHIR_INIT_THIS();
ZVAL_UNDEF(&validation_sub);
@@ -110,24 +110,25 @@
ZVAL_UNDEF(&_16$$13);
ZVAL_UNDEF(&_17$$14);
ZVAL_UNDEF(&_19$$15);
- ZVAL_UNDEF(&_20$$16);
- ZVAL_UNDEF(&_21$$18);
- ZVAL_UNDEF(&_24$$20);
+ ZVAL_UNDEF(&_20$$15);
+ ZVAL_UNDEF(&_21$$16);
+ ZVAL_UNDEF(&_22$$18);
ZVAL_UNDEF(&_25$$20);
- ZVAL_UNDEF(&_27$$20);
- ZVAL_UNDEF(&_30$$20);
- ZVAL_UNDEF(&_32$$20);
+ ZVAL_UNDEF(&_26$$20);
+ ZVAL_UNDEF(&_28$$20);
+ ZVAL_UNDEF(&_31$$20);
ZVAL_UNDEF(&_33$$20);
- ZVAL_UNDEF(&_37$$20);
- ZVAL_UNDEF(&_26$$21);
- ZVAL_UNDEF(&_28$$23);
- ZVAL_UNDEF(&_29$$24);
- ZVAL_UNDEF(&_34$$25);
+ ZVAL_UNDEF(&_34$$20);
+ ZVAL_UNDEF(&_38$$20);
+ ZVAL_UNDEF(&_27$$21);
+ ZVAL_UNDEF(&_29$$23);
+ ZVAL_UNDEF(&_30$$24);
ZVAL_UNDEF(&_35$$25);
ZVAL_UNDEF(&_36$$25);
+ ZVAL_UNDEF(&_37$$25);
ZVAL_UNDEF(&field);
- ZVAL_UNDEF(&_22$$18);
- ZVAL_UNDEF(&_23$$19);
+ ZVAL_UNDEF(&_23$$18);
+ ZVAL_UNDEF(&_24$$19);
ZEPHIR_MM_GROW();
zephir_fetch_params(1, 2, 0, &validation, &field_param);
@@ -229,16 +230,18 @@
object_init_ex(&value, _18$$15);
if (zephir_has_constructor(&value TSRMLS_CC)) {
ZEPHIR_INIT_VAR(&_19$$15);
- ZVAL_STRING(&_19$$15, "i");
- ZEPHIR_CALL_METHOD(NULL, &value, "__construct", NULL, 0, &tmp, &_19$$15);
+ ZEPHIR_CONCAT_SVS(&_19$$15, "^", &tmp, "$");
+ ZEPHIR_INIT_VAR(&_20$$15);
+ ZVAL_STRING(&_20$$15, "i");
+ ZEPHIR_CALL_METHOD(NULL, &value, "__construct", NULL, 0, &_19$$15, &_20$$15);
zephir_check_call_status();
}
} else {
object_init_ex(&value, zephir_get_internal_ce(SL("mongoregex")));
if (zephir_has_constructor(&value TSRMLS_CC)) {
- ZEPHIR_INIT_VAR(&_20$$16);
- ZEPHIR_CONCAT_SVS(&_20$$16, "/^", &tmp, "$/i");
- ZEPHIR_CALL_METHOD(NULL, &value, "__construct", NULL, 0, &_20$$16);
+ ZEPHIR_INIT_VAR(&_21$$16);
+ ZEPHIR_CONCAT_SVS(&_21$$16, "/^", &tmp, "$/i");
+ ZEPHIR_CALL_METHOD(NULL, &value, "__construct", NULL, 0, &_21$$16);
zephir_check_call_status();
}
}
@@ -250,85 +253,85 @@
if (zephir_is_true(&except)) {
ZEPHIR_INIT_VAR(&id);
zephir_create_array(&id, 1, 0 TSRMLS_CC);
- ZEPHIR_CALL_METHOD(&_21$$18, &db, "getidvalue", NULL, 0, &except);
+ ZEPHIR_CALL_METHOD(&_22$$18, &db, "getidvalue", NULL, 0, &except);
zephir_check_call_status();
- zephir_array_update_string(&id, SL("!="), &_21$$18, PH_COPY | PH_SEPARATE);
- ZEPHIR_INIT_VAR(&_22$$18);
- zephir_create_array(&_22$$18, 2, 0 TSRMLS_CC);
- zephir_array_update_zval(&_22$$18, &custom, &value, PH_COPY);
- ZEPHIR_CALL_METHOD(&_21$$18, &db, "getid", NULL, 0);
+ zephir_array_update_string(&id, SL("!="), &_22$$18, PH_COPY | PH_SEPARATE);
+ ZEPHIR_INIT_VAR(&_23$$18);
+ zephir_create_array(&_23$$18, 2, 0 TSRMLS_CC);
+ zephir_array_update_zval(&_23$$18, &custom, &value, PH_COPY);
+ ZEPHIR_CALL_METHOD(&_22$$18, &db, "getid", NULL, 0);
zephir_check_call_status();
- zephir_array_update_zval(&_22$$18, &_21$$18, &id, PH_COPY);
- ZEPHIR_CALL_METHOD(&result, &db, "findone", NULL, 0, &from, &_22$$18);
+ zephir_array_update_zval(&_23$$18, &_22$$18, &id, PH_COPY);
+ ZEPHIR_CALL_METHOD(&result, &db, "findone", NULL, 0, &from, &_23$$18);
zephir_check_call_status();
} else {
- ZEPHIR_INIT_VAR(&_23$$19);
- zephir_create_array(&_23$$19, 1, 0 TSRMLS_CC);
- zephir_array_update_zval(&_23$$19, &custom, &value, PH_COPY);
- ZEPHIR_CALL_METHOD(&result, &db, "findone", NULL, 0, &from, &_23$$19);
+ ZEPHIR_INIT_VAR(&_24$$19);
+ zephir_create_array(&_24$$19, 1, 0 TSRMLS_CC);
+ zephir_array_update_zval(&_24$$19, &custom, &value, PH_COPY);
+ ZEPHIR_CALL_METHOD(&result, &db, "findone", NULL, 0, &from, &_24$$19);
zephir_check_call_status();
}
if (zephir_is_true(&result)) {
- ZEPHIR_INIT_VAR(&_25$$20);
- ZVAL_STRING(&_25$$20, "label");
- ZEPHIR_CALL_METHOD(&_24$$20, this_ptr, "has", NULL, 0, &_25$$20);
- zephir_check_call_status();
- if (zephir_is_true(&_24$$20)) {
- ZEPHIR_INIT_VAR(&_26$$21);
- ZVAL_STRING(&_26$$21, "label");
- ZEPHIR_CALL_METHOD(&label, this_ptr, "get", NULL, 0, &_26$$21);
+ ZEPHIR_INIT_VAR(&_26$$20);
+ ZVAL_STRING(&_26$$20, "label");
+ ZEPHIR_CALL_METHOD(&_25$$20, this_ptr, "has", NULL, 0, &_26$$20);
+ zephir_check_call_status();
+ if (zephir_is_true(&_25$$20)) {
+ ZEPHIR_INIT_VAR(&_27$$21);
+ ZVAL_STRING(&_27$$21, "label");
+ ZEPHIR_CALL_METHOD(&label, this_ptr, "get", NULL, 0, &_27$$21);
zephir_check_call_status();
} else {
ZEPHIR_CALL_METHOD(&label, validation, "getlabel", NULL, 0, &field);
zephir_check_call_status();
}
- ZEPHIR_INIT_NVAR(&_25$$20);
- ZVAL_STRING(&_25$$20, "message");
- ZEPHIR_CALL_METHOD(&_27$$20, this_ptr, "has", NULL, 0, &_25$$20);
- zephir_check_call_status();
- if (zephir_is_true(&_27$$20)) {
- ZEPHIR_INIT_VAR(&_28$$23);
- ZVAL_STRING(&_28$$23, "message");
- ZEPHIR_CALL_METHOD(&message, this_ptr, "get", NULL, 0, &_28$$23);
+ ZEPHIR_INIT_NVAR(&_26$$20);
+ ZVAL_STRING(&_26$$20, "message");
+ ZEPHIR_CALL_METHOD(&_28$$20, this_ptr, "has", NULL, 0, &_26$$20);
+ zephir_check_call_status();
+ if (zephir_is_true(&_28$$20)) {
+ ZEPHIR_INIT_VAR(&_29$$23);
+ ZVAL_STRING(&_29$$23, "message");
+ ZEPHIR_CALL_METHOD(&message, this_ptr, "get", NULL, 0, &_29$$23);
zephir_check_call_status();
} else {
- ZEPHIR_INIT_VAR(&_29$$24);
- ZVAL_STRING(&_29$$24, "unique");
- ZEPHIR_CALL_METHOD(&message, validation, "getdefaultmessage", NULL, 0, &_29$$24);
+ ZEPHIR_INIT_VAR(&_30$$24);
+ ZVAL_STRING(&_30$$24, "unique");
+ ZEPHIR_CALL_METHOD(&message, validation, "getdefaultmessage", NULL, 0, &_30$$24);
zephir_check_call_status();
}
- ZEPHIR_CALL_METHOD(&_30$$20, validation, "gettranslate", NULL, 0);
+ ZEPHIR_CALL_METHOD(&_31$$20, validation, "gettranslate", NULL, 0);
zephir_check_call_status();
- _31$$20 = ZEPHIR_IS_TRUE_IDENTICAL(&_30$$20);
- if (_31$$20) {
- ZEPHIR_CALL_METHOD(&_32$$20, validation, "getdi", NULL, 0);
+ _32$$20 = ZEPHIR_IS_TRUE_IDENTICAL(&_31$$20);
+ if (_32$$20) {
+ ZEPHIR_CALL_METHOD(&_33$$20, validation, "getdi", NULL, 0);
zephir_check_call_status();
- ZEPHIR_INIT_NVAR(&_25$$20);
- ZVAL_STRING(&_25$$20, "i18n");
- ZEPHIR_CALL_METHOD(&_33$$20, &_32$$20, "has", NULL, 0, &_25$$20);
+ ZEPHIR_INIT_NVAR(&_26$$20);
+ ZVAL_STRING(&_26$$20, "i18n");
+ ZEPHIR_CALL_METHOD(&_34$$20, &_33$$20, "has", NULL, 0, &_26$$20);
zephir_check_call_status();
- _31$$20 = zephir_is_true(&_33$$20);
+ _32$$20 = zephir_is_true(&_34$$20);
}
- if (_31$$20) {
- ZEPHIR_CALL_METHOD(&_34$$25, validation, "getdi", NULL, 0);
+ if (_32$$20) {
+ ZEPHIR_CALL_METHOD(&_35$$25, validation, "getdi", NULL, 0);
zephir_check_call_status();
- ZEPHIR_INIT_VAR(&_35$$25);
- ZVAL_STRING(&_35$$25, "i18n");
- ZEPHIR_CALL_METHOD(&i18n, &_34$$25, "get", NULL, 0, &_35$$25);
+ ZEPHIR_INIT_VAR(&_36$$25);
+ ZVAL_STRING(&_36$$25, "i18n");
+ ZEPHIR_CALL_METHOD(&i18n, &_35$$25, "get", NULL, 0, &_36$$25);
zephir_check_call_status();
- ZEPHIR_CALL_METHOD(&_36$$25, &i18n, "translate", NULL, 0, &label);
+ ZEPHIR_CALL_METHOD(&_37$$25, &i18n, "translate", NULL, 0, &label);
zephir_check_call_status();
- ZEPHIR_CPY_WRT(&label, &_36$$25);
- ZEPHIR_CALL_METHOD(&_36$$25, &i18n, "translate", NULL, 0, &message);
+ ZEPHIR_CPY_WRT(&label, &_37$$25);
+ ZEPHIR_CALL_METHOD(&_37$$25, &i18n, "translate", NULL, 0, &message);
zephir_check_call_status();
- ZEPHIR_CPY_WRT(&message, &_36$$25);
+ ZEPHIR_CPY_WRT(&message, &_37$$25);
}
ZEPHIR_INIT_VAR(&replace);
zephir_create_array(&replace, 1, 0 TSRMLS_CC);
zephir_array_update_string(&replace, SL(":field"), &label, PH_COPY | PH_SEPARATE);
- ZEPHIR_CALL_FUNCTION(&_37$$20, "strtr", NULL, 87, &message, &replace);
+ ZEPHIR_CALL_FUNCTION(&_38$$20, "strtr", NULL, 87, &message, &replace);
zephir_check_call_status();
- ZEPHIR_CALL_METHOD(NULL, validation, "addmessage", NULL, 0, &field, &_37$$20);
+ ZEPHIR_CALL_METHOD(NULL, validation, "addmessage", NULL, 0, &field, &_38$$20);
zephir_check_call_status();
RETURN_MM_BOOL(0);
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/framework-1.2.8/build/php7/ice/version.zep.c new/framework-1.2.9/build/php7/ice/version.zep.c
--- old/framework-1.2.8/build/php7/ice/version.zep.c 2017-02-18 19:55:14.000000000 +0100
+++ new/framework-1.2.9/build/php7/ice/version.zep.c 2017-02-24 01:36:45.000000000 +0100
@@ -47,7 +47,7 @@
zephir_declare_class_constant_long(ice_version_ce, SL("MINOR"), 2);
- zephir_declare_class_constant_long(ice_version_ce, SL("PATCH"), 8);
+ zephir_declare_class_constant_long(ice_version_ce, SL("PATCH"), 9);
zephir_declare_class_constant_long(ice_version_ce, SL("STAGE"), 4);
@@ -70,7 +70,7 @@
zephir_create_array(return_value, 5, 0 TSRMLS_CC);
add_assoc_long_ex(return_value, SL("major"), 1);
add_assoc_long_ex(return_value, SL("minor"), 2);
- add_assoc_long_ex(return_value, SL("patch"), 8);
+ add_assoc_long_ex(return_value, SL("patch"), 9);
add_assoc_long_ex(return_value, SL("stage"), 4);
add_assoc_long_ex(return_value, SL("build"), 0);
return;
@@ -151,7 +151,7 @@
ZEPHIR_SINIT_VAR(_8);
ZVAL_LONG(&_8, 2);
ZEPHIR_SINIT_VAR(_9);
- ZVAL_LONG(&_9, 8);
+ ZVAL_LONG(&_9, 9);
ZEPHIR_CONCAT_VSVSVV(return_value, &_7, ".", &_8, ".", &_9, &suffix);
RETURN_MM();
@@ -192,7 +192,7 @@
zephir_check_call_status();
ZEPHIR_INIT_NVAR(&_1);
ZVAL_STRING(&_1, "%02s");
- ZVAL_LONG(&_2, 8);
+ ZVAL_LONG(&_2, 9);
ZEPHIR_CALL_FUNCTION(&_5, "sprintf", &_4, 12, &_1, &_2);
zephir_check_call_status();
ZEPHIR_SINIT_VAR(_6);
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/framework-1.2.8/build/php7/php_ice.h new/framework-1.2.9/build/php7/php_ice.h
--- old/framework-1.2.8/build/php7/php_ice.h 2017-02-18 19:55:14.000000000 +0100
+++ new/framework-1.2.9/build/php7/php_ice.h 2017-02-24 01:36:45.000000000 +0100
@@ -11,7 +11,7 @@
#include "kernel/globals.h"
#define PHP_ICE_NAME "ice"
-#define PHP_ICE_VERSION "1.2.8"
+#define PHP_ICE_VERSION "1.2.9"
#define PHP_ICE_EXTNAME "ice"
#define PHP_ICE_AUTHOR "Ice Team"
#define PHP_ICE_ZEPVERSION "0.9.6a-dev-aef205594b"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/framework-1.2.8/config.json new/framework-1.2.9/config.json
--- old/framework-1.2.8/config.json 2017-02-18 19:55:14.000000000 +0100
+++ new/framework-1.2.9/config.json 2017-02-24 01:36:45.000000000 +0100
@@ -3,7 +3,7 @@
"name": "ice",
"description": "Simple and fast PHP framework delivered as C-extension.<br>Copyright (c) 2014-2016 Ice Team.",
"author": "Ice Team",
- "version": "1.2.8",
+ "version": "1.2.9",
"verbose": false,
"info": [
{
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/framework-1.2.8/ice/validation/validator/unique.zep new/framework-1.2.9/ice/validation/validator/unique.zep
--- old/framework-1.2.8/ice/validation/validator/unique.zep 2017-02-18 19:55:14.000000000 +0100
+++ new/framework-1.2.9/ice/validation/validator/unique.zep 2017-02-24 01:36:45.000000000 +0100
@@ -93,7 +93,7 @@
if db->getType() == "NOSQL" {
if db->getDriver() instanceof Mongodb {
- let value = new \MongoDB\BSON\Regex(tmp, "i");
+ let value = new \MongoDB\BSON\Regex("^" . tmp . "$", "i");
} else {
let value = new \MongoRegex("/^" . tmp . "$/i");
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/framework-1.2.8/ice/version.zep new/framework-1.2.9/ice/version.zep
--- old/framework-1.2.8/ice/version.zep 2017-02-18 19:55:14.000000000 +0100
+++ new/framework-1.2.9/ice/version.zep 2017-02-24 01:36:45.000000000 +0100
@@ -22,7 +22,7 @@
// Don't forget to update config.json and run zephir fullclean
const MAJOR = 1;
const MINOR = 2;
- const PATCH = 8;
+ const PATCH = 9;
const STAGE = self::STABLE;
const BUILD = 0;
1
0
Hello community,
here is the log from the commit of package notmuch for openSUSE:Factory checked in at 2017-02-25 00:54:44
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/notmuch (Old)
and /work/SRC/openSUSE:Factory/.notmuch.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "notmuch"
Changes:
--------
--- /work/SRC/openSUSE:Factory/notmuch/notmuch.changes 2016-12-29 22:51:16.489644291 +0100
+++ /work/SRC/openSUSE:Factory/.notmuch.new/notmuch.changes 2017-02-25 00:54:45.541419499 +0100
@@ -1,0 +2,7 @@
+Thu Feb 23 20:05:08 UTC 2017 - mvetter(a)suse.com
+
+- Update to version 0.23.5:
+ * Fix quoting bug in configure. This had introduced a RUNPATH into the
+ notmuch binary in cases where it was not not needed.
+
+-------------------------------------------------------------------
Old:
----
notmuch-0.23.4.tar.gz
notmuch-0.23.4.tar.gz.sha1
notmuch-0.23.4.tar.gz.sha1.asc
New:
----
notmuch-0.23.5.tar.gz
notmuch-0.23.5.tar.gz.sha1
notmuch-0.23.5.tar.gz.sha1.asc
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ notmuch.spec ++++++
--- /var/tmp/diff_new_pack.520EiQ/_old 2017-02-25 00:54:46.453279600 +0100
+++ /var/tmp/diff_new_pack.520EiQ/_new 2017-02-25 00:54:46.457278987 +0100
@@ -1,7 +1,7 @@
#
# spec file for package notmuch
#
-# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -17,7 +17,7 @@
Name: notmuch
-Version: 0.23.4
+Version: 0.23.5
Release: 0
Summary: The mail indexer
License: GPL-3.0+
++++++ notmuch-0.23.4.tar.gz -> notmuch-0.23.5.tar.gz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/notmuch-0.23.4/NEWS new/notmuch-0.23.5/NEWS
--- old/notmuch-0.23.4/NEWS 2016-12-24 09:52:11.000000000 +0100
+++ new/notmuch-0.23.5/NEWS 2017-01-09 11:25:01.000000000 +0100
@@ -1,3 +1,12 @@
+Notmuch 0.23.5 (2017-01-09)
+===========================
+
+Build system
+------------
+
+Fix quoting bug in configure. This had introduced a RUNPATH into the
+notmuch binary in cases where it was not not needed.
+
Notmuch 0.23.4 (2016-12-24)
===========================
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/notmuch-0.23.4/bindings/python/notmuch/version.py new/notmuch-0.23.5/bindings/python/notmuch/version.py
--- old/notmuch-0.23.4/bindings/python/notmuch/version.py 2016-12-24 09:52:11.000000000 +0100
+++ new/notmuch-0.23.5/bindings/python/notmuch/version.py 2017-01-09 11:25:01.000000000 +0100
@@ -1,3 +1,3 @@
# this file should be kept in sync with ../../../version
-__VERSION__ = '0.23.4'
+__VERSION__ = '0.23.5'
SOVERSION = '4'
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/notmuch-0.23.4/configure new/notmuch-0.23.5/configure
--- old/notmuch-0.23.4/configure 2016-12-24 09:52:11.000000000 +0100
+++ new/notmuch-0.23.5/configure 2017-01-09 11:25:01.000000000 +0100
@@ -274,7 +274,7 @@
libdir_expanded="${PREFIX}/lib"
else
# very non-general variable expansion
- libdir_expanded=$(echo "$LIBDIR" | sed "s|\\${prefix}|${PREFIX}|g; s|\\$prefix/|${PREFIX}/|; s|//*|/|g")
+ libdir_expanded=$(printf %s "$LIBDIR" | sed "s|\${prefix}|${PREFIX}|; s|\$prefix\>|${PREFIX}|; s|//*|/|g")
fi
cat <<EOF
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/notmuch-0.23.4/debian/changelog new/notmuch-0.23.5/debian/changelog
--- old/notmuch-0.23.4/debian/changelog 2016-12-24 09:52:11.000000000 +0100
+++ new/notmuch-0.23.5/debian/changelog 2017-01-09 11:25:01.000000000 +0100
@@ -1,3 +1,9 @@
+notmuch (0.23.5-1) unstable; urgency=medium
+
+ * Remove RUNPATH from /usr/bin/notmuch
+
+ -- David Bremner <bremner(a)debian.org> Mon, 09 Jan 2017 06:24:39 -0400
+
notmuch (0.23.4-1) unstable; urgency=medium
* Improve error handling in notmuch insert
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/notmuch-0.23.4/doc/conf.py new/notmuch-0.23.5/doc/conf.py
--- old/notmuch-0.23.4/doc/conf.py 2016-12-24 09:52:11.000000000 +0100
+++ new/notmuch-0.23.5/doc/conf.py 2017-01-09 11:25:01.000000000 +0100
@@ -12,7 +12,7 @@
# General information about the project.
project = u'notmuch'
-copyright = u'2009-2016, Carl Worth and many others'
+copyright = u'2009-2017, Carl Worth and many others'
location = os.path.dirname(__file__)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/notmuch-0.23.4/version new/notmuch-0.23.5/version
--- old/notmuch-0.23.4/version 2016-12-24 10:00:40.000000000 +0100
+++ new/notmuch-0.23.5/version 2017-01-09 11:29:27.000000000 +0100
@@ -1 +1 @@
-0.23.4
+0.23.5
++++++ notmuch-0.23.4.tar.gz.sha1 -> notmuch-0.23.5.tar.gz.sha1 ++++++
--- /work/SRC/openSUSE:Factory/notmuch/notmuch-0.23.4.tar.gz.sha1 2016-12-29 22:51:16.245678785 +0100
+++ /work/SRC/openSUSE:Factory/.notmuch.new/notmuch-0.23.5.tar.gz.sha1 2017-02-25 00:54:45.489427475 +0100
@@ -1 +1 @@
-a4464cef5509defde6bd87834ed3c08e3824498f notmuch-0.23.4.tar.gz
+98094da0f6a0851a2eb0b8208bc65a609bef2d61 notmuch-0.23.5.tar.gz
1
0
Hello community,
here is the log from the commit of package wcd for openSUSE:Factory checked in at 2017-02-25 00:54:37
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/wcd (Old)
and /work/SRC/openSUSE:Factory/.wcd.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "wcd"
Changes:
--------
--- /work/SRC/openSUSE:Factory/wcd/wcd.changes 2017-01-09 11:00:05.398736760 +0100
+++ /work/SRC/openSUSE:Factory/.wcd.new/wcd.changes 2017-02-25 00:54:38.534494512 +0100
@@ -1,0 +2,5 @@
+Thu Feb 23 19:30:55 UTC 2017 - waterlan(a)xs4all.nl
+
+- Update to 6.0.0
+
+-------------------------------------------------------------------
Old:
----
wcd-5.3.4.tar.gz
New:
----
wcd-6.0.0.tar.gz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ wcd.spec ++++++
--- /var/tmp/diff_new_pack.mHlPZv/_old 2017-02-25 00:54:39.178395723 +0100
+++ /var/tmp/diff_new_pack.mHlPZv/_new 2017-02-25 00:54:39.182395110 +0100
@@ -18,7 +18,7 @@
%define wcd_docdir %{_defaultdocdir}/%{name}
Name: wcd
-Version: 5.3.4
+Version: 6.0.0
Release: 0
Summary: Chdir for DOS and Unix
License: GPL-2.0
++++++ wcd-5.3.4.tar.gz -> wcd-6.0.0.tar.gz ++++++
++++ 21495 lines of diff (skipped)
1
0
Hello community,
here is the log from the commit of package geary for openSUSE:Factory checked in at 2017-02-25 00:54:30
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/geary (Old)
and /work/SRC/openSUSE:Factory/.geary.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "geary"
Changes:
--------
--- /work/SRC/openSUSE:Factory/geary/geary.changes 2017-01-10 10:51:26.416065146 +0100
+++ /work/SRC/openSUSE:Factory/.geary.new/geary.changes 2017-02-25 00:54:32.155473203 +0100
@@ -1,0 +2,73 @@
+Wed Feb 22 19:48:57 UTC 2017 - dimstar(a)opensuse.org
+
+- Update to version 0.11.3+20170222:
+ + Add tooltips to composer spellcheck popover.
+ + Fix compilation for clang (bgo#778046).
+ + Don't merge emails if they do not share the same Message-ID
+ (bgo#713530).
+ + Update symbolic icon for 0.12.
+ + Don't insert multiple blank lines in the composer (bgo#778125).
+ + Don't abort the application if password could not be saved in
+ the secrets manager (bgo#776139).
+ + Report the branch & state rather than last tag in dev version
+ string.
+ + Prevent messages from setting a broken body height
+ (bgo#750075).
+ + Tidy up ConversationWebView's CSS a bit.
+ + Add IdleManager class for sane main loop idle scheduling.
+ + Fix segfault closing client after starting it without network
+ access.
+ + Fix editing additional email addresses from account prefs
+ (bgo#778364).
+ + Add ContentType methods for determining file name extenions and
+ type sniffing.
+ + Add ContentType.is_default and unit test.
+ + Tidy up Geary.Attachment API a bit.
+ + Clean up DB handling of attachments without specified file
+ names.
+ + Clean up default filename when saving attachments.
+ + Ensure mixed landscape/portrait attachment previews are centred
+ vertically.
+ + Re-implement alt text filename fallback when saving inline
+ images.
+ + Fix a crash replying to a message.
+ + Workaround libsoup cache crashing when cancellable is actually
+ cancelled.
+ + Don't breifly show the message body progress bar when loading
+ cached.
+ + Make ConversationListBox::check_mark_read private.
+ + Re-enable standard keyboard scrolling for conversations.
+ + Updated translations.
+
+-------------------------------------------------------------------
+Wed Feb 01 03:19:24 UTC 2017 - zaitor(a)opensuse.org
+
+- Update to version 0.11.3~20170201:
+ + Fix some more issues on earlier GTK versions.
+ + Really fix JS error calling ComposerWebView::save_selection.
+ + Don't build and run tests by default.
+ + Update some test code attributions.
+ + Make ClientWebView-based tests execute a bit faster.
+ + Fix brown-paper-bag bug in Geary.JS::escape_string.
+ + Fix more issues hiding/showing collapsed quotes.
+ + Split composer web view up into multiple parts.
+ + Query Webview for supported image types instead of hardcoding
+ them.
+ + Explicitly allow loading only geary:body in ClientWebView.
+ + Port to WebKit2 (bgo#728002).
+- Drop geary-master.patch, switched to source service.
+- Replace pkgconfig(webkitgtk-3.0) for pkgconfig(webkit2gtk-4.0)
+ BuildRequires following upstreams port.
+- Add pkgconfig(iso-codes) BuildRequires: New dependency.
+
+-------------------------------------------------------------------
+Mon Jan 16 16:09:02 UTC 2017 - dimstar(a)opensuse.org
+
+- Add geary-master.patch: fast forward to 6abd78 in order to fix
+ build against GNOME 3.23.x.
+- Pass -DGSETTINGS_COMPILE_IN_PLACE=ON (instead of =OFF) to cmake:
+ recent git tree does not build otherwise.
+- Add pkgconfig(enchant), pkgconfig(libsoup-2.4) and
+ pkgconfig(libxml-2.0) BuildRequires: new dependencies.
+
+-------------------------------------------------------------------
Old:
----
geary-0.11.3.tar.xz
New:
----
_service
_servicedata
geary-0.11.3+20170222.tar.xz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ geary.spec ++++++
--- /var/tmp/diff_new_pack.jiGMRh/_old 2017-02-25 00:54:32.735384230 +0100
+++ /var/tmp/diff_new_pack.jiGMRh/_new 2017-02-25 00:54:32.735384230 +0100
@@ -1,7 +1,7 @@
#
# spec file for package geary
#
-# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -17,33 +17,39 @@
Name: geary
-Version: 0.11.3
+Version: 0.11.3+20170222
Release: 0
Summary: A lightweight email reader for the GNOME desktop
License: LGPL-2.0+
Group: Productivity/Networking/Email/Clients
-Url: http://yorba.org/geary
-Source: http://download.gnome.org/sources/geary/0.11/%{name}-%{version}.tar.xz
+Url: https://wiki.gnome.org/Apps/Geary
+Source: %{name}-%{version}.tar.xz
+#Source: http://download.gnome.org/sources/geary/0.11/%{name}-%{version}.tar.xz
BuildRequires: cmake
BuildRequires: fdupes
BuildRequires: intltool
BuildRequires: update-desktop-files
BuildRequires: xml2po
+BuildRequires: pkgconfig(enchant) >= 1.6
BuildRequires: pkgconfig(gcr-3) >= 3.10.1
BuildRequires: pkgconfig(gee-0.8) >= 0.8.5
-BuildRequires: pkgconfig(gio-2.0) >= 2.28.0
-BuildRequires: pkgconfig(glib-2.0) >= 2.32.0
-BuildRequires: pkgconfig(gmime-2.6) >= 2.6.0
+BuildRequires: pkgconfig(gio-2.0) >= 2.42.0
+BuildRequires: pkgconfig(glib-2.0) >= 2.42.0
+BuildRequires: pkgconfig(gmime-2.6) >= 2.6.17
BuildRequires: pkgconfig(gobject-introspection-1.0)
BuildRequires: pkgconfig(gthread-2.0)
-BuildRequires: pkgconfig(gtk+-3.0) >= 3.4.0
+BuildRequires: pkgconfig(gtk+-3.0) >= 3.14.0
+BuildRequires: pkgconfig(iso-codes)
BuildRequires: pkgconfig(libcanberra) >= 0.28
BuildRequires: pkgconfig(libnotify) >= 0.7.5
BuildRequires: pkgconfig(libsecret-1) >= 0.11
+BuildRequires: pkgconfig(libsoup-2.4) >= 2.48
+BuildRequires: pkgconfig(libxml-2.0) >= 2.7.8
BuildRequires: pkgconfig(sqlite3) >= 3.7.4
BuildRequires: pkgconfig(unique-3.0) >= 3.0.0
BuildRequires: pkgconfig(vapigen) >= 0.22.1
-BuildRequires: pkgconfig(webkitgtk-3.0) >= 1.8.0
+BuildRequires: pkgconfig(webkit2gtk-4.0) >= 2.4.0
+
Recommends: %{name}-lang
BuildRoot: %{_tmppath}/%{name}-%{version}-build
%glib2_gsettings_schema_requires
@@ -62,14 +68,14 @@
%cmake -DVALA_EXECUTABLE:FILEPATH=%{_bindir}/valac%{?vala_version_suffix} \
-DVAPIGEN:FILEPATH=%{_bindir}/vapigen%{?vala_version_suffix} \
-DGSETTINGS_COMPILE=OFF \
- -DGSETTINGS_COMPILE_IN_PLACE=OFF \
+ -DGSETTINGS_COMPILE_IN_PLACE=ON \
-DICON_UPDATE=OFF \
-DDESKTOP_UPDATE=OFF
make %{?_smp_mflags}
%install
%cmake_install
-%suse_update_desktop_file %{name}
+%suse_update_desktop_file org.gnome.Geary
%find_lang %{name} %{?no_lang_C}
%fdupes %{buildroot}%{_datadir}
@@ -93,14 +99,17 @@
%{_bindir}/%{name}
%{_bindir}/geary-attach
%{_datadir}/%{name}/
+%dir %{_libexecdir}/%{name}
+%dir %{_libexecdir}/%{name}/web-extensions
+%{_libexecdir}/%{name}/web-extensions/libgeary-web-process.so
%dir %{_datadir}/appdata
-%{_datadir}/appdata/geary.appdata.xml
-%{_datadir}/applications/%{name}.desktop
+%{_datadir}/appdata/org.gnome.Geary.appdata.xml
+%{_datadir}/applications/org.gnome.Geary.desktop
%{_datadir}/applications/geary-autostart.desktop
%dir %{_datadir}/contractor/
%{_datadir}/contractor/geary-attach.contract
%{_datadir}/icons/hicolor/
-%{_datadir}/glib-2.0/schemas/org.yorba.geary.gschema.xml
+%{_datadir}/glib-2.0/schemas/org.gnome.Geary.gschema.xml
%files lang -f %{name}.lang
++++++ _service ++++++
<services>
<service name="tar_scm" mode="disabled">
<param name="url">git://git.gnome.org/geary</param>
<param name="scm">git</param>
<param name="versionformat">0.11.3+%cd</param>
<param name="changesgenerate">enable</param>
</service>
<service name="recompress" mode="disabled">
<param name="file">*.tar</param>
<param name="compression">xz</param>
</service>
<service name="set_version" mode="disabled"/>
</services>
++++++ _servicedata ++++++
<servicedata>
<service name="tar_scm">
<param name="url">git://git.gnome.org/geary</param>
<param name="changesrevision">7d4573a9cd284caec0ac05e50115cfc585381900</param></service></servicedata>
1
0
Hello community,
here is the log from the commit of package lightdm for openSUSE:Factory checked in at 2017-02-25 00:54:23
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/lightdm (Old)
and /work/SRC/openSUSE:Factory/.lightdm.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "lightdm"
Changes:
--------
--- /work/SRC/openSUSE:Factory/lightdm/lightdm.changes 2017-02-03 17:49:08.683584106 +0100
+++ /work/SRC/openSUSE:Factory/.lightdm.new/lightdm.changes 2017-02-25 00:54:24.404662372 +0100
@@ -1,0 +2,13 @@
+Thu Feb 23 13:13:21 UTC 2017 - sor.alexei(a)meowr.ru
+
+- Update to version 1.21.5 (changes since 1.21.3):
+ * Use power management functions from ConsoleKit2 if available.
+ * Correctly pass return value from sessions to LightDM.
+ * Retry VT_WAITACTIVE if we get EINTR.
+ * Ignore SIGHUP by default.
+ * Use SA_RESTART with SIGPIPE.
+ * liblightdm-qt: Use liblightdm-gobject power methods instead of
+ re-implementing in Qt.
+- Rebase lightdm-disable-utmp-handling.patch.
+
+-------------------------------------------------------------------
Old:
----
lightdm-1.21.3.tar.xz
lightdm-1.21.3.tar.xz.asc
New:
----
lightdm-1.21.5.tar.xz
lightdm-1.21.5.tar.xz.asc
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ lightdm.spec ++++++
--- /var/tmp/diff_new_pack.jxGnF0/_old 2017-02-25 00:54:26.036412019 +0100
+++ /var/tmp/diff_new_pack.jxGnF0/_new 2017-02-25 00:54:26.040411405 +0100
@@ -27,7 +27,7 @@
%define typelibname typelib-1_0-LightDM-1
%define rundir /run
Name: lightdm
-Version: 1.21.3
+Version: 1.21.5
Release: 0
Summary: Lightweight, Cross-desktop Display Manager
License: GPL-3.0+
++++++ lightdm-1.21.3.tar.xz -> lightdm-1.21.5.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lightdm-1.21.3/NEWS new/lightdm-1.21.5/NEWS
--- old/lightdm-1.21.3/NEWS 2016-12-09 02:05:05.000000000 +0100
+++ new/lightdm-1.21.5/NEWS 2017-02-13 04:32:02.000000000 +0100
@@ -1,3 +1,13 @@
+Overview of changes in lightdm 1.21.4
+
+ * Use power management functions from ConsoleKit2 if available.
+ * Correctly pass return value from sessions to LightDM.
+ * Retry VT_WAITACTIVE if we get EINTR.
+ * Ignore SIGHUP by default.
+ * Use SA_RESTART with SIGPIPE.
+ * liblightdm-qt: Use liblightdm-gobject power methods instead of
+ re-implementing in Qt.
+
Overview of changes in lightdm 1.21.3
* Fix crashes introduced in 1.21.2 due to environment variable changes
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lightdm-1.21.3/configure new/lightdm-1.21.5/configure
--- old/lightdm-1.21.3/configure 2016-12-09 02:05:22.000000000 +0100
+++ new/lightdm-1.21.5/configure 2017-02-22 00:30:31.000000000 +0100
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.69 for lightdm 1.21.3.
+# Generated by GNU Autoconf 2.69 for lightdm 1.21.5.
#
#
# Copyright (C) 1992-1996, 1998-2012 Free Software Foundation, Inc.
@@ -587,8 +587,8 @@
# Identity of this package.
PACKAGE_NAME='lightdm'
PACKAGE_TARNAME='lightdm'
-PACKAGE_VERSION='1.21.3'
-PACKAGE_STRING='lightdm 1.21.3'
+PACKAGE_VERSION='1.21.5'
+PACKAGE_STRING='lightdm 1.21.5'
PACKAGE_BUGREPORT=''
PACKAGE_URL=''
@@ -1487,7 +1487,7 @@
# Omit some internal or obsolete options to make the list less imposing.
# This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF
-\`configure' configures lightdm 1.21.3 to adapt to many kinds of systems.
+\`configure' configures lightdm 1.21.5 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1558,7 +1558,7 @@
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of lightdm 1.21.3:";;
+ short | recursive ) echo "Configuration of lightdm 1.21.5:";;
esac
cat <<\_ACEOF
@@ -1736,7 +1736,7 @@
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-lightdm configure 1.21.3
+lightdm configure 1.21.5
generated by GNU Autoconf 2.69
Copyright (C) 2012 Free Software Foundation, Inc.
@@ -2222,7 +2222,7 @@
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
-It was created by lightdm $as_me 1.21.3, which was
+It was created by lightdm $as_me 1.21.5, which was
generated by GNU Autoconf 2.69. Invocation command line was
$ $0 $@
@@ -3088,7 +3088,7 @@
# Define the identity of the package.
PACKAGE='lightdm'
- VERSION='1.21.3'
+ VERSION='1.21.5'
cat >>confdefs.h <<_ACEOF
@@ -19884,7 +19884,7 @@
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
-This file was extended by lightdm $as_me 1.21.3, which was
+This file was extended by lightdm $as_me 1.21.5, which was
generated by GNU Autoconf 2.69. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -19950,7 +19950,7 @@
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
ac_cs_version="\\
-lightdm config.status 1.21.3
+lightdm config.status 1.21.5
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/lightdm-1.21.3/configure.ac new/lightdm-1.21.5/configure.ac
--- old/lightdm-1.21.3/configure.ac 2016-12-09 02:04:38.000000000 +0100
+++ new/lightdm-1.21.5/configure.ac 2017-02-22 00:30:09.000000000 +0100
@@ -1,6 +1,6 @@
dnl Process this file with autoconf to produce a configure script.
-AC_INIT(lightdm, 1.21.3)
+AC_INIT(lightdm, 1.21.5)
AC_CONFIG_MACRO_DIR(m4)
AC_CONFIG_HEADER(config.h)
AM_INIT_AUTOMAKE([1.11 no-dist-gzip dist-xz foreign])
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lightdm-1.21.3/doc/Makefile.in new/lightdm-1.21.5/doc/Makefile.in
--- old/lightdm-1.21.3/doc/Makefile.in 2016-12-09 02:05:23.000000000 +0100
+++ new/lightdm-1.21.5/doc/Makefile.in 2017-02-22 00:30:31.000000000 +0100
@@ -722,6 +722,7 @@
if test -f $(abs_builddir)/$$file ; then \
cp $(abs_builddir)/$$file $(abs_builddir)/html; \
fi; \
+ test -f $$file && cp $$file $(abs_builddir)/html; \
done;
$(GTK_DOC_V_XREF)gtkdoc-fixxref --module=$(DOC_MODULE) --module-dir=html --html-dir=$(HTML_DIR) $(FIXXREF_OPTIONS)
$(AM_V_at)touch html-build.stamp
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lightdm-1.21.3/gtk-doc.make new/lightdm-1.21.5/gtk-doc.make
--- old/lightdm-1.21.3/gtk-doc.make 2016-12-09 02:05:14.000000000 +0100
+++ new/lightdm-1.21.5/gtk-doc.make 2017-02-22 00:30:25.000000000 +0100
@@ -196,6 +196,7 @@
if test -f $(abs_builddir)/$$file ; then \
cp $(abs_builddir)/$$file $(abs_builddir)/html; \
fi; \
+ test -f $$file && cp $$file $(abs_builddir)/html; \
done;
$(GTK_DOC_V_XREF)gtkdoc-fixxref --module=$(DOC_MODULE) --module-dir=html --html-dir=$(HTML_DIR) $(FIXXREF_OPTIONS)
$(AM_V_at)touch html-build.stamp
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lightdm-1.21.3/liblightdm-gobject/power.c new/lightdm-1.21.5/liblightdm-gobject/power.c
--- old/lightdm-1.21.3/liblightdm-gobject/power.c 2016-11-02 08:34:51.000000000 +0100
+++ new/lightdm-1.21.5/liblightdm-gobject/power.c 2017-01-12 00:56:40.000000000 +0100
@@ -84,6 +84,36 @@
return r;
}
+static GVariant *
+ck_call_function (const gchar *function, GVariant *parameters, GError **error)
+{
+ GVariant *r;
+
+ if (!ck_proxy)
+ {
+ ck_proxy = g_dbus_proxy_new_for_bus_sync (G_BUS_TYPE_SYSTEM,
+ G_DBUS_PROXY_FLAGS_NONE,
+ NULL,
+ "org.freedesktop.ConsoleKit",
+ "/org/freedesktop/ConsoleKit/Manager",
+ "org.freedesktop.ConsoleKit.Manager",
+ NULL,
+ error);
+ if (!ck_proxy)
+ return FALSE;
+ }
+
+ r = g_dbus_proxy_call_sync (ck_proxy,
+ function,
+ parameters,
+ G_DBUS_CALL_FLAGS_NONE,
+ -1,
+ NULL,
+ error);
+
+ return r;
+}
+
/**
* lightdm_get_can_suspend:
*
@@ -107,7 +137,13 @@
can_suspend = g_strcmp0 (result, "yes") == 0;
}
}
- else
+ if (!r)
+ {
+ r = ck_call_function ("CanSuspend", NULL, NULL);
+ if (r && g_variant_is_of_type (r, G_VARIANT_TYPE ("(b)")))
+ g_variant_get (r, "(b)", &can_suspend);
+ }
+ if (!r)
{
r = upower_call_function ("SuspendAllowed", NULL);
if (r && g_variant_is_of_type (r, G_VARIANT_TYPE ("(b)")))
@@ -137,7 +173,14 @@
if (!result)
{
if (error)
- g_debug ("Can't suspend using logind; falling back to UPower: %s", (*error)->message);
+ g_debug ("Can't suspend using logind; falling back to ConsoleKit: %s", (*error)->message);
+ g_clear_error (error);
+ result = ck_call_function ("Suspend", g_variant_new ("(b)", FALSE), error);
+ }
+ if (!result)
+ {
+ if (error)
+ g_debug ("Can't suspend using logind or ConsoleKit; falling back to UPower: %s", (*error)->message);
g_clear_error (error);
result = upower_call_function ("Suspend", error);
}
@@ -172,7 +215,13 @@
can_hibernate = g_strcmp0 (result, "yes") == 0;
}
}
- else
+ if (!r)
+ {
+ r = ck_call_function ("CanHibernate", NULL, NULL);
+ if (r && g_variant_is_of_type (r, G_VARIANT_TYPE ("(b)")))
+ g_variant_get (r, "(b)", &can_hibernate);
+ }
+ if (!r)
{
r = upower_call_function ("HibernateAllowed", NULL);
if (r && g_variant_is_of_type (r, G_VARIANT_TYPE ("(b)")))
@@ -202,7 +251,14 @@
if (!result)
{
if (error)
- g_debug ("Can't hibernate using logind; falling back to UPower: %s", (*error)->message);
+ g_debug ("Can't hibernate using logind; falling back to ConsoleKit: %s", (*error)->message);
+ g_clear_error (error);
+ result = ck_call_function ("Hibernate", g_variant_new ("(b)", FALSE), error);
+ }
+ if (!result)
+ {
+ if (error)
+ g_debug ("Can't hibernate using logind or ConsoleKit; falling back to UPower: %s", (*error)->message);
g_clear_error (error);
result = upower_call_function ("Hibernate", error);
}
@@ -214,36 +270,6 @@
return hibernated;
}
-static GVariant *
-ck_call_function (const gchar *function, GError **error)
-{
- GVariant *r;
-
- if (!ck_proxy)
- {
- ck_proxy = g_dbus_proxy_new_for_bus_sync (G_BUS_TYPE_SYSTEM,
- G_DBUS_PROXY_FLAGS_NONE,
- NULL,
- "org.freedesktop.ConsoleKit",
- "/org/freedesktop/ConsoleKit/Manager",
- "org.freedesktop.ConsoleKit.Manager",
- NULL,
- error);
- if (!ck_proxy)
- return FALSE;
- }
-
- r = g_dbus_proxy_call_sync (ck_proxy,
- function,
- NULL,
- G_DBUS_CALL_FLAGS_NONE,
- -1,
- NULL,
- error);
-
- return r;
-}
-
/**
* lightdm_get_can_restart:
*
@@ -269,7 +295,7 @@
}
else
{
- r = ck_call_function ("CanRestart", NULL);
+ r = ck_call_function ("CanRestart", NULL, NULL);
if (r && g_variant_is_of_type (r, G_VARIANT_TYPE ("(b)")))
g_variant_get (r, "(b)", &can_restart);
}
@@ -297,7 +323,7 @@
if (!r)
{
g_clear_error (error);
- r = ck_call_function ("Restart", error);
+ r = ck_call_function ("Restart", NULL, error);
}
restarted = r != NULL;
if (r)
@@ -331,7 +357,7 @@
}
else
{
- r = ck_call_function ("CanStop", NULL);
+ r = ck_call_function ("CanStop", NULL, NULL);
if (r && g_variant_is_of_type (r, G_VARIANT_TYPE ("(b)")))
g_variant_get (r, "(b)", &can_shutdown);
}
@@ -359,7 +385,7 @@
if (!r)
{
g_clear_error (error);
- r = ck_call_function ("Stop", error);
+ r = ck_call_function ("Stop", NULL, error);
}
shutdown = r != NULL;
if (r)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lightdm-1.21.3/liblightdm-qt/power.cpp new/lightdm-1.21.5/liblightdm-qt/power.cpp
--- old/lightdm-1.21.3/liblightdm-qt/power.cpp 2015-08-10 01:30:00.000000000 +0200
+++ new/lightdm-1.21.5/liblightdm-qt/power.cpp 2017-01-12 01:10:42.000000000 +0100
@@ -12,12 +12,7 @@
#include "QLightDM/power.h"
-#include <QtCore/QVariant>
-#include <QtDBus/QDBusInterface>
-#include <QtDBus/QDBusReply>
-#include <QDebug>
-
-#include "config.h"
+#include <lightdm.h>
using namespace QLightDM;
@@ -25,15 +20,9 @@
{
public:
PowerInterfacePrivate();
- QScopedPointer<QDBusInterface> powerManagementInterface;
- QScopedPointer<QDBusInterface> consoleKitInterface;
- QScopedPointer<QDBusInterface> login1Interface;
};
-PowerInterface::PowerInterfacePrivate::PowerInterfacePrivate() :
- powerManagementInterface(new QDBusInterface("org.freedesktop.UPower","/org/freedesktop/UPower", "org.freedesktop.UPower", QDBusConnection::systemBus())),
- consoleKitInterface(new QDBusInterface("org.freedesktop.ConsoleKit", "/org/freedesktop/ConsoleKit/Manager", "org.freedesktop.ConsoleKit.Manager", QDBusConnection::systemBus())),
- login1Interface(new QDBusInterface("org.freedesktop.login1", "/org/freedesktop/login1", "org.freedesktop.login1.Manager", QDBusConnection::systemBus()))
+PowerInterface::PowerInterfacePrivate::PowerInterfacePrivate()
{
}
@@ -51,124 +40,42 @@
bool PowerInterface::canSuspend()
{
- if (d->login1Interface->isValid())
- {
- QDBusReply<QString> reply = d->login1Interface->call("CanSuspend");
- if (reply.isValid())
- {
- return reply.value() == "yes";
- }
- }
-
- qWarning() << d->login1Interface->lastError();
-
- QDBusReply<bool> reply = d->powerManagementInterface->call("SuspendAllowed");
- if (reply.isValid()) {
- return reply.value();
- }
- else {
- return false;
- }
+ return lightdm_get_can_suspend ();
}
bool PowerInterface::suspend()
{
- QDBusReply<void> reply;
- if (d->login1Interface->isValid())
- reply = d->login1Interface->call("Suspend", false);
- else
- reply = d->powerManagementInterface->call("Suspend");
-
- return reply.isValid ();
+ return lightdm_suspend (NULL);
}
bool PowerInterface::canHibernate()
{
- if (d->login1Interface->isValid())
- {
- QDBusReply<QString> reply = d->login1Interface->call("CanHibernate");
- if (reply.isValid())
- {
- return reply.value() == "yes";
- }
- }
-
- qWarning() << d->login1Interface->lastError();
-
- QDBusReply<bool> reply = d->powerManagementInterface->call("HibernateAllowed");
- if (reply.isValid()) {
- return reply.value();
- }
- else {
- return false;
- }
+ return lightdm_get_can_hibernate ();
}
bool PowerInterface::hibernate()
{
- QDBusReply<void> reply;
- if (d->login1Interface->isValid())
- reply = d->login1Interface->call("Hibernate", false);
- else
- reply = d->powerManagementInterface->call("Hibernate");
-
- return reply.isValid ();
+ return lightdm_hibernate (NULL);
}
bool PowerInterface::canShutdown()
{
- if (d->login1Interface->isValid()) {
- QDBusReply<QString> reply1 = d->login1Interface->call("CanPowerOff");
- if (reply1.isValid()) {
- return reply1.value() == "yes";
- }
- }
- qWarning() << d->login1Interface->lastError();
-
- QDBusReply<bool> reply = d->consoleKitInterface->call("CanStop");
- if (reply.isValid()) {
- return reply.value();
- }
-
- return false;
+ return lightdm_get_can_shutdown ();
}
bool PowerInterface::shutdown()
{
- QDBusReply<void> reply;
- if (d->login1Interface->isValid())
- reply = d->login1Interface->call("PowerOff", false);
- else
- reply = d->consoleKitInterface->call("Stop");
- return reply.isValid();
+ return lightdm_shutdown (NULL);
}
bool PowerInterface::canRestart()
{
- if (d->login1Interface->isValid()) {
- QDBusReply<QString> reply1 = d->login1Interface->call("CanReboot");
- if (reply1.isValid()) {
- return reply1.value() == "yes";
- }
- }
- qWarning() << d->login1Interface->lastError();
-
- QDBusReply<bool> reply = d->consoleKitInterface->call("CanRestart");
- if (reply.isValid()) {
- return reply.value();
- }
-
- return false;
+ return lightdm_get_can_restart ();
}
bool PowerInterface::restart()
{
- QDBusReply<void> reply;
- if (d->login1Interface->isValid())
- reply = d->login1Interface->call("Reboot", false);
- else
- reply = d->consoleKitInterface->call("Restart");
- return reply.isValid();
+ return lightdm_restart (NULL);
}
#if QT_VERSION >= QT_VERSION_CHECK(5, 0, 0)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lightdm-1.21.3/src/lightdm.c new/lightdm-1.21.5/src/lightdm.c
--- old/lightdm-1.21.3/src/lightdm.c 2016-12-07 03:20:55.000000000 +0100
+++ new/lightdm-1.21.5/src/lightdm.c 2017-01-27 00:04:43.000000000 +0100
@@ -597,6 +597,7 @@
int
main (int argc, char **argv)
{
+ struct sigaction action;
FILE *pid_file;
GOptionContext *option_context;
gboolean result;
@@ -645,10 +646,15 @@
GError *error = NULL;
/* Disable the SIGPIPE handler - this is a stupid Unix hangover behaviour.
- * We will handle piples / sockets being closed instead of having the whole daemon be killed...
+ * We will handle pipes / sockets being closed instead of having the whole daemon be killed...
* http://stackoverflow.com/questions/8369506/why-does-sigpipe-exist
+ * Similar case for SIGHUP.
*/
- signal (SIGPIPE, SIG_IGN);
+ action.sa_handler = SIG_IGN;
+ sigemptyset (&action.sa_mask);
+ action.sa_flags = SA_RESTART;
+ sigaction (SIGPIPE, &action, NULL);
+ sigaction (SIGHUP, &action, NULL);
/* When lightdm starts sessions it needs to run itself in a new mode */
if (argc >= 2 && strcmp (argv[1], "--session-child") == 0)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lightdm-1.21.3/src/process.c new/lightdm-1.21.5/src/process.c
--- old/lightdm-1.21.3/src/process.c 2016-12-08 22:38:14.000000000 +0100
+++ new/lightdm-1.21.5/src/process.c 2017-01-26 23:04:26.000000000 +0100
@@ -461,7 +461,6 @@
action.sa_flags = SA_SIGINFO | SA_RESTART;
sigaction (SIGTERM, &action, NULL);
sigaction (SIGINT, &action, NULL);
- sigaction (SIGHUP, &action, NULL);
sigaction (SIGUSR1, &action, NULL);
sigaction (SIGUSR2, &action, NULL);
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lightdm-1.21.3/src/session-child.c new/lightdm-1.21.5/src/session-child.c
--- old/lightdm-1.21.3/src/session-child.c 2016-10-19 14:20:14.000000000 +0200
+++ new/lightdm-1.21.5/src/session-child.c 2017-01-26 22:11:24.000000000 +0100
@@ -722,6 +722,8 @@
/* Wait for the command to complete (blocks) */
if (child_pid > 0)
{
+ int child_status;
+
/* Log to utmp */
if (g_strcmp0 (pam_getenv (pam_handle, "XDG_SESSION_CLASS"), "greeter") != 0)
{
@@ -756,8 +758,12 @@
#endif
}
- waitpid (child_pid, &return_code, 0);
+ waitpid (child_pid, &child_status, 0);
child_pid = 0;
+ if (WIFEXITED (child_status))
+ return_code = WEXITSTATUS (child_status);
+ else
+ return_code = EXIT_FAILURE;
/* Log to utmp */
if (g_strcmp0 (pam_getenv (pam_handle, "XDG_SESSION_CLASS"), "greeter") != 0)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lightdm-1.21.3/src/session.c new/lightdm-1.21.5/src/session.c
--- old/lightdm-1.21.3/src/session.c 2016-11-28 04:35:42.000000000 +0100
+++ new/lightdm-1.21.5/src/session.c 2017-02-21 23:45:54.000000000 +0100
@@ -913,6 +913,10 @@
{
g_return_if_fail (session != NULL);
+ if (session->priv->stopping)
+ return;
+ session->priv->stopping = TRUE;
+
/* Kill remaining processes in our logind session to avoid them leaking
* to the user session (they share the same $DISPLAY) */
if (getuid () == 0 && session->priv->login1_session_id)
@@ -936,10 +940,6 @@
return;
}
- if (session->priv->stopping)
- return;
- session->priv->stopping = TRUE;
-
return SESSION_GET_CLASS (session)->stop (session);
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lightdm-1.21.3/src/vt.c new/lightdm-1.21.5/src/vt.c
--- old/lightdm-1.21.3/src/vt.c 2016-11-01 22:02:24.000000000 +0100
+++ new/lightdm-1.21.5/src/vt.c 2017-01-27 00:09:04.000000000 +0100
@@ -101,8 +101,17 @@
/* Wait for the VT to become active to avoid a suspected
* race condition somewhere between LightDM, X, ConsoleKit and the kernel.
* See https://bugs.launchpad.net/bugs/851612 */
- if (ioctl (tty_fd, VT_WAITACTIVE, n) < 0)
- g_warning ("Error using VT_WAITACTIVE %d on /dev/tty0: %s", n, strerror (errno));
+ /* This call sometimes get interrupted (not sure what signal is causing it), so retry if that is the case */
+ while (TRUE)
+ {
+ if (ioctl (tty_fd, VT_WAITACTIVE, n) < 0)
+ {
+ if (errno == EINTR)
+ continue;
+ g_warning ("Error using VT_WAITACTIVE %d on /dev/tty0: %s", n, strerror (errno));
+ }
+ break;
+ }
close (tty_fd);
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lightdm-1.21.3/tests/Makefile.am new/lightdm-1.21.5/tests/Makefile.am
--- old/lightdm-1.21.3/tests/Makefile.am 2016-12-07 03:32:53.000000000 +0100
+++ new/lightdm-1.21.5/tests/Makefile.am 2017-02-13 04:35:09.000000000 +0100
@@ -116,6 +116,7 @@
test-login-remote-session-gobject \
test-login-session-crash \
test-login-xserver-crash \
+ test-login-greeter-return-failure \
test-multiple-authenticate \
test-xserver-no-share \
test-home-dir-on-authenticate \
@@ -137,7 +138,7 @@
test-upstart-autologin \
test-upstart-login \
test-dbus \
- test-no-dbus \
+ test-no-dbus \
test-lock-seat \
test-lock-seat-after-vt-switch \
test-lock-seat-twice \
@@ -157,6 +158,7 @@
test-switch-to-greeter-return-session \
test-switch-to-greeter-return-session-pam \
test-switch-to-greeter-return-session-logout \
+ test-switch-to-greeter-return-session-repeat \
test-switch-to-guest \
test-switch-to-guest-disabled \
test-switch-to-guest-fail-resettable \
@@ -224,9 +226,10 @@
test-no-login1 \
test-no-console-kit-or-login1 \
test-power-gobject \
- test-power-no-console-kit-gobject \
- test-power-no-login1-gobject \
- test-power-no-services-gobject \
+ test-power-no-console-kit \
+ test-power-no-login1 \
+ test-power-no-login1-or-console-kit \
+ test-power-no-services \
test-open-file-descriptors \
test-xdmcp-server-open-file-descriptors \
test-add-local-x-seat \
@@ -314,10 +317,7 @@
test-login-remote-session-python \
test-autologin-timeout-python \
test-autologin-guest-timeout-python \
- test-power-python \
- test-power-no-console-kit-python \
- test-power-no-login1-python \
- test-power-no-services-python
+ test-power-python
if COMPILE_LIBLIGHTDM_QT4
TESTS += \
@@ -351,10 +351,7 @@
test-login-remote-session-qt4 \
test-sessions-qt4 \
test-users-qt4 \
- test-power-qt4 \
- test-power-no-console-kit-qt4 \
- test-power-no-login1-qt4 \
- test-power-no-services-qt4
+ test-power-qt4
endif
if COMPILE_LIBLIGHTDM_QT5
@@ -389,10 +386,7 @@
test-login-remote-session-qt5 \
test-sessions-qt5 \
test-users-qt5 \
- test-power-qt5 \
- test-power-no-console-kit-qt5 \
- test-power-no-login1-qt5 \
- test-power-no-services-qt5
+ test-power-qt5
endif
EXTRA_DIST = \
@@ -495,6 +489,7 @@
scripts/login1-terminate.conf \
scripts/login.conf \
scripts/login-crash-authenticate.conf \
+ scripts/login-greeter-return-failure.conf \
scripts/login-guest.conf \
scripts/login-guest-disabled.conf \
scripts/login-guest-fail-setup-script.conf \
@@ -555,6 +550,7 @@
scripts/power-no-console-kit.conf \
scripts/power-no-services.conf \
scripts/power-no-login1.conf \
+ scripts/power-no-login1-or-console-kit.conf \
scripts/plymouth-active-vt.conf \
scripts/plymouth-inactive-vt.conf \
scripts/plymouth-no-seat.conf \
@@ -595,6 +591,7 @@
scripts/switch-to-greeter-return-session.conf \
scripts/switch-to-greeter-return-session-logout.conf \
scripts/switch-to-greeter-return-session-pam.conf \
+ scripts/switch-to-greeter-return-session-repeat.conf \
scripts/switch-to-guest.conf \
scripts/switch-to-guest-disabled.conf \
scripts/switch-to-guest-fail-resettable.conf \
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lightdm-1.21.3/tests/Makefile.in new/lightdm-1.21.5/tests/Makefile.in
--- old/lightdm-1.21.3/tests/Makefile.in 2016-12-09 02:05:23.000000000 +0100
+++ new/lightdm-1.21.5/tests/Makefile.in 2017-02-22 00:30:32.000000000 +0100
@@ -118,10 +118,7 @@
@COMPILE_LIBLIGHTDM_QT4_TRUE@ test-login-remote-session-qt4 \
@COMPILE_LIBLIGHTDM_QT4_TRUE@ test-sessions-qt4 \
@COMPILE_LIBLIGHTDM_QT4_TRUE@ test-users-qt4 \
-@COMPILE_LIBLIGHTDM_QT4_TRUE@ test-power-qt4 \
-@COMPILE_LIBLIGHTDM_QT4_TRUE@ test-power-no-console-kit-qt4 \
-@COMPILE_LIBLIGHTDM_QT4_TRUE@ test-power-no-login1-qt4 \
-@COMPILE_LIBLIGHTDM_QT4_TRUE@ test-power-no-services-qt4
+@COMPILE_LIBLIGHTDM_QT4_TRUE@ test-power-qt4
@COMPILE_LIBLIGHTDM_QT5_TRUE@am__append_2 = \
@COMPILE_LIBLIGHTDM_QT5_TRUE@ test-autologin-timeout-qt5 \
@@ -154,10 +151,7 @@
@COMPILE_LIBLIGHTDM_QT5_TRUE@ test-login-remote-session-qt5 \
@COMPILE_LIBLIGHTDM_QT5_TRUE@ test-sessions-qt5 \
@COMPILE_LIBLIGHTDM_QT5_TRUE@ test-users-qt5 \
-@COMPILE_LIBLIGHTDM_QT5_TRUE@ test-power-qt5 \
-@COMPILE_LIBLIGHTDM_QT5_TRUE@ test-power-no-console-kit-qt5 \
-@COMPILE_LIBLIGHTDM_QT5_TRUE@ test-power-no-login1-qt5 \
-@COMPILE_LIBLIGHTDM_QT5_TRUE@ test-power-no-services-qt5
+@COMPILE_LIBLIGHTDM_QT5_TRUE@ test-power-qt5
subdir = tests
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
@@ -723,11 +717,12 @@
test-login-guest-fail-setup-script-gobject \
test-login-guest-logout-gobject \
test-login-remote-session-gobject test-login-session-crash \
- test-login-xserver-crash test-multiple-authenticate \
- test-xserver-no-share test-home-dir-on-authenticate \
- test-home-dir-on-session test-plymouth-active-vt \
- test-plymouth-inactive-vt test-plymouth-no-seat \
- test-script-hooks test-script-hook-display-setup-fail \
+ test-login-xserver-crash test-login-greeter-return-failure \
+ test-multiple-authenticate test-xserver-no-share \
+ test-home-dir-on-authenticate test-home-dir-on-session \
+ test-plymouth-active-vt test-plymouth-inactive-vt \
+ test-plymouth-no-seat test-script-hooks \
+ test-script-hook-display-setup-fail \
test-script-hook-display-setup-missing \
test-script-hook-greeter-setup-fail \
test-script-hook-greeter-setup-missing \
@@ -750,6 +745,7 @@
test-switch-to-greeter-return-session \
test-switch-to-greeter-return-session-pam \
test-switch-to-greeter-return-session-logout \
+ test-switch-to-greeter-return-session-repeat \
test-switch-to-guest test-switch-to-guest-disabled \
test-switch-to-guest-fail-resettable test-switch-to-user \
test-switch-to-user-disabled test-switch-to-user-no-password \
@@ -794,8 +790,9 @@
test-console-kit-no-xdg-runtime test-no-console-kit \
test-login1-terminate test-no-login1 \
test-no-console-kit-or-login1 test-power-gobject \
- test-power-no-console-kit-gobject test-power-no-login1-gobject \
- test-power-no-services-gobject test-open-file-descriptors \
+ test-power-no-console-kit test-power-no-login1 \
+ test-power-no-login1-or-console-kit test-power-no-services \
+ test-open-file-descriptors \
test-xdmcp-server-open-file-descriptors test-add-local-x-seat \
test-multi-seat test-multi-seat-login \
test-multi-seat-autologin-seat0 \
@@ -846,8 +843,7 @@
test-login-guest-logout-python \
test-login-remote-session-python test-autologin-timeout-python \
test-autologin-guest-timeout-python test-power-python \
- test-power-no-console-kit-python test-power-no-login1-python \
- test-power-no-services-python $(am__append_1) $(am__append_2)
+ $(am__append_1) $(am__append_2)
EXTRA_DIST = \
$(TESTS) \
data/remote-sessions/test-remote.desktop \
@@ -948,6 +944,7 @@
scripts/login1-terminate.conf \
scripts/login.conf \
scripts/login-crash-authenticate.conf \
+ scripts/login-greeter-return-failure.conf \
scripts/login-guest.conf \
scripts/login-guest-disabled.conf \
scripts/login-guest-fail-setup-script.conf \
@@ -1008,6 +1005,7 @@
scripts/power-no-console-kit.conf \
scripts/power-no-services.conf \
scripts/power-no-login1.conf \
+ scripts/power-no-login1-or-console-kit.conf \
scripts/plymouth-active-vt.conf \
scripts/plymouth-inactive-vt.conf \
scripts/plymouth-no-seat.conf \
@@ -1048,6 +1046,7 @@
scripts/switch-to-greeter-return-session.conf \
scripts/switch-to-greeter-return-session-logout.conf \
scripts/switch-to-greeter-return-session-pam.conf \
+ scripts/switch-to-greeter-return-session-repeat.conf \
scripts/switch-to-guest.conf \
scripts/switch-to-guest-disabled.conf \
scripts/switch-to-guest-fail-resettable.conf \
@@ -2230,6 +2229,13 @@
--log-file $$b.log --trs-file $$b.trs \
$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
"$$tst" $(AM_TESTS_FD_REDIRECT)
+test-login-greeter-return-failure.log: test-login-greeter-return-failure
+ @p='test-login-greeter-return-failure'; \
+ b='test-login-greeter-return-failure'; \
+ $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+ --log-file $$b.log --trs-file $$b.trs \
+ $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+ "$$tst" $(AM_TESTS_FD_REDIRECT)
test-multiple-authenticate.log: test-multiple-authenticate
@p='test-multiple-authenticate'; \
b='test-multiple-authenticate'; \
@@ -2517,6 +2523,13 @@
--log-file $$b.log --trs-file $$b.trs \
$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
"$$tst" $(AM_TESTS_FD_REDIRECT)
+test-switch-to-greeter-return-session-repeat.log: test-switch-to-greeter-return-session-repeat
+ @p='test-switch-to-greeter-return-session-repeat'; \
+ b='test-switch-to-greeter-return-session-repeat'; \
+ $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+ --log-file $$b.log --trs-file $$b.trs \
+ $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+ "$$tst" $(AM_TESTS_FD_REDIRECT)
test-switch-to-guest.log: test-switch-to-guest
@p='test-switch-to-guest'; \
b='test-switch-to-guest'; \
@@ -2986,23 +2999,30 @@
--log-file $$b.log --trs-file $$b.trs \
$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
"$$tst" $(AM_TESTS_FD_REDIRECT)
-test-power-no-console-kit-gobject.log: test-power-no-console-kit-gobject
- @p='test-power-no-console-kit-gobject'; \
- b='test-power-no-console-kit-gobject'; \
+test-power-no-console-kit.log: test-power-no-console-kit
+ @p='test-power-no-console-kit'; \
+ b='test-power-no-console-kit'; \
+ $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+ --log-file $$b.log --trs-file $$b.trs \
+ $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+ "$$tst" $(AM_TESTS_FD_REDIRECT)
+test-power-no-login1.log: test-power-no-login1
+ @p='test-power-no-login1'; \
+ b='test-power-no-login1'; \
$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
--log-file $$b.log --trs-file $$b.trs \
$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
"$$tst" $(AM_TESTS_FD_REDIRECT)
-test-power-no-login1-gobject.log: test-power-no-login1-gobject
- @p='test-power-no-login1-gobject'; \
- b='test-power-no-login1-gobject'; \
+test-power-no-login1-or-console-kit.log: test-power-no-login1-or-console-kit
+ @p='test-power-no-login1-or-console-kit'; \
+ b='test-power-no-login1-or-console-kit'; \
$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
--log-file $$b.log --trs-file $$b.trs \
$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
"$$tst" $(AM_TESTS_FD_REDIRECT)
-test-power-no-services-gobject.log: test-power-no-services-gobject
- @p='test-power-no-services-gobject'; \
- b='test-power-no-services-gobject'; \
+test-power-no-services.log: test-power-no-services
+ @p='test-power-no-services'; \
+ b='test-power-no-services'; \
$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
--log-file $$b.log --trs-file $$b.trs \
$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
@@ -3560,27 +3580,6 @@
--log-file $$b.log --trs-file $$b.trs \
$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
"$$tst" $(AM_TESTS_FD_REDIRECT)
-test-power-no-console-kit-python.log: test-power-no-console-kit-python
- @p='test-power-no-console-kit-python'; \
- b='test-power-no-console-kit-python'; \
- $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
- --log-file $$b.log --trs-file $$b.trs \
- $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
- "$$tst" $(AM_TESTS_FD_REDIRECT)
-test-power-no-login1-python.log: test-power-no-login1-python
- @p='test-power-no-login1-python'; \
- b='test-power-no-login1-python'; \
- $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
- --log-file $$b.log --trs-file $$b.trs \
- $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
- "$$tst" $(AM_TESTS_FD_REDIRECT)
-test-power-no-services-python.log: test-power-no-services-python
- @p='test-power-no-services-python'; \
- b='test-power-no-services-python'; \
- $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
- --log-file $$b.log --trs-file $$b.trs \
- $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
- "$$tst" $(AM_TESTS_FD_REDIRECT)
test-autologin-timeout-qt4.log: test-autologin-timeout-qt4
@p='test-autologin-timeout-qt4'; \
b='test-autologin-timeout-qt4'; \
@@ -3798,27 +3797,6 @@
--log-file $$b.log --trs-file $$b.trs \
$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
"$$tst" $(AM_TESTS_FD_REDIRECT)
-test-power-no-console-kit-qt4.log: test-power-no-console-kit-qt4
- @p='test-power-no-console-kit-qt4'; \
- b='test-power-no-console-kit-qt4'; \
- $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
- --log-file $$b.log --trs-file $$b.trs \
- $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
- "$$tst" $(AM_TESTS_FD_REDIRECT)
-test-power-no-login1-qt4.log: test-power-no-login1-qt4
- @p='test-power-no-login1-qt4'; \
- b='test-power-no-login1-qt4'; \
- $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
- --log-file $$b.log --trs-file $$b.trs \
- $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
- "$$tst" $(AM_TESTS_FD_REDIRECT)
-test-power-no-services-qt4.log: test-power-no-services-qt4
- @p='test-power-no-services-qt4'; \
- b='test-power-no-services-qt4'; \
- $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
- --log-file $$b.log --trs-file $$b.trs \
- $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
- "$$tst" $(AM_TESTS_FD_REDIRECT)
test-autologin-timeout-qt5.log: test-autologin-timeout-qt5
@p='test-autologin-timeout-qt5'; \
b='test-autologin-timeout-qt5'; \
@@ -4035,27 +4013,6 @@
$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
--log-file $$b.log --trs-file $$b.trs \
$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
- "$$tst" $(AM_TESTS_FD_REDIRECT)
-test-power-no-console-kit-qt5.log: test-power-no-console-kit-qt5
- @p='test-power-no-console-kit-qt5'; \
- b='test-power-no-console-kit-qt5'; \
- $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
- --log-file $$b.log --trs-file $$b.trs \
- $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
- "$$tst" $(AM_TESTS_FD_REDIRECT)
-test-power-no-login1-qt5.log: test-power-no-login1-qt5
- @p='test-power-no-login1-qt5'; \
- b='test-power-no-login1-qt5'; \
- $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
- --log-file $$b.log --trs-file $$b.trs \
- $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
- "$$tst" $(AM_TESTS_FD_REDIRECT)
-test-power-no-services-qt5.log: test-power-no-services-qt5
- @p='test-power-no-services-qt5'; \
- b='test-power-no-services-qt5'; \
- $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
- --log-file $$b.log --trs-file $$b.trs \
- $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
"$$tst" $(AM_TESTS_FD_REDIRECT)
.test.log:
@p='$<'; \
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lightdm-1.21.3/tests/scripts/greeter-fail-start.conf new/lightdm-1.21.5/tests/scripts/greeter-fail-start.conf
--- old/lightdm-1.21.3/tests/scripts/greeter-fail-start.conf 2016-06-20 01:06:46.000000000 +0200
+++ new/lightdm-1.21.5/tests/scripts/greeter-fail-start.conf 2017-01-26 22:19:11.000000000 +0100
@@ -3,6 +3,7 @@
#
[test-greeter-config]
+exit-on-startup=true
return-value=1
#?*START-DAEMON
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lightdm-1.21.3/tests/scripts/greeter-not-installed.conf new/lightdm-1.21.5/tests/scripts/greeter-not-installed.conf
--- old/lightdm-1.21.3/tests/scripts/greeter-not-installed.conf 2016-06-20 01:06:46.000000000 +0200
+++ new/lightdm-1.21.5/tests/scripts/greeter-not-installed.conf 2017-01-26 22:20:11.000000000 +0100
@@ -2,9 +2,6 @@
# Check that LightDM quits when the greeter does not exist
#
-[test-greeter-config]
-return-value=1
-
#?*START-DAEMON
#?RUNNER DAEMON-START
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lightdm-1.21.3/tests/scripts/login-greeter-return-failure.conf new/lightdm-1.21.5/tests/scripts/login-greeter-return-failure.conf
--- old/lightdm-1.21.3/tests/scripts/login-greeter-return-failure.conf 1970-01-01 01:00:00.000000000 +0100
+++ new/lightdm-1.21.5/tests/scripts/login-greeter-return-failure.conf 2017-01-26 22:22:53.000000000 +0100
@@ -0,0 +1,48 @@
+#
+# Check can login even if the greeter returns an error code (it otherwise works fine)
+#
+
+[Seat:*]
+user-session=default
+
+[test-greeter-config]
+return-value=1
+
+#?*START-DAEMON
+#?RUNNER DAEMON-START
+
+# X server starts
+#?XSERVER-0 START VT=7 SEAT=seat0
+
+# Daemon connects when X server is ready
+#?*XSERVER-0 INDICATE-READY
+#?XSERVER-0 INDICATE-READY
+#?XSERVER-0 ACCEPT-CONNECT
+
+# Greeter starts
+#?GREETER-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_SESSION_CLASS=greeter
+#?LOGIN1 ACTIVATE-SESSION SESSION=c0
+#?XSERVER-0 ACCEPT-CONNECT
+#?GREETER-X-0 CONNECT-XSERVER
+#?GREETER-X-0 CONNECT-TO-DAEMON
+#?GREETER-X-0 CONNECTED-TO-DAEMON
+
+# Log into account with a password
+#?*GREETER-X-0 AUTHENTICATE USERNAME=have-password1
+#?GREETER-X-0 SHOW-PROMPT TEXT="Password:"
+#?*GREETER-X-0 RESPOND TEXT="password"
+#?GREETER-X-0 AUTHENTICATION-COMPLETE USERNAME=have-password1 AUTHENTICATED=TRUE
+#?*GREETER-X-0 START-SESSION
+#?GREETER-X-0 TERMINATE SIGNAL=15
+
+# Session starts
+#?SESSION-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_GREETER_DATA_DIR=.*/have-password1 XDG_SESSION_TYPE=x11 XDG_SESSION_DESKTOP=default USER=have-password1
+#?LOGIN1 ACTIVATE-SESSION SESSION=c1
+#?XSERVER-0 ACCEPT-CONNECT
+#?SESSION-X-0 CONNECT-XSERVER
+
+# Cleanup
+#?*STOP-DAEMON
+#?SESSION-X-0 TERMINATE SIGNAL=15
+#?XSERVER-0 TERMINATE SIGNAL=15
+#?RUNNER DAEMON-EXIT STATUS=0
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lightdm-1.21.3/tests/scripts/power-no-login1-or-console-kit.conf new/lightdm-1.21.5/tests/scripts/power-no-login1-or-console-kit.conf
--- old/lightdm-1.21.3/tests/scripts/power-no-login1-or-console-kit.conf 1970-01-01 01:00:00.000000000 +0100
+++ new/lightdm-1.21.5/tests/scripts/power-no-login1-or-console-kit.conf 2017-01-12 02:48:07.000000000 +0100
@@ -0,0 +1,65 @@
+#
+# Check can do power operations from the greeter when no login1 or ConsoleKit service (falls back to upower for some)
+#
+
+[test-runner-config]
+disable-login1=true
+disable-console-kit=true
+
+#?*START-DAEMON
+#?RUNNER DAEMON-START
+
+# X server starts
+#?XSERVER-0 START VT=7 SEAT=seat0
+
+# Daemon connects when X server is ready
+#?*XSERVER-0 INDICATE-READY
+#?XSERVER-0 INDICATE-READY
+#?XSERVER-0 ACCEPT-CONNECT
+
+# Greeter starts
+#?GREETER-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_SESSION_CLASS=greeter
+#?XSERVER-0 ACCEPT-CONNECT
+#?GREETER-X-0 CONNECT-XSERVER
+#?GREETER-X-0 CONNECT-TO-DAEMON
+#?GREETER-X-0 CONNECTED-TO-DAEMON
+
+# See if can suspend
+#?*GREETER-X-0 GET-CAN-SUSPEND
+#?UPOWER SUSPEND-ALLOWED
+#?GREETER-X-0 CAN-SUSPEND ALLOWED=TRUE
+
+# Suspend
+#?*GREETER-X-0 SUSPEND
+#?UPOWER SUSPEND
+
+# See if can hibernate
+#?*GREETER-X-0 GET-CAN-HIBERNATE
+#?UPOWER HIBERNATE-ALLOWED
+#?GREETER-X-0 CAN-HIBERNATE ALLOWED=TRUE
+
+# Hibernate
+#?*GREETER-X-0 HIBERNATE
+#?UPOWER HIBERNATE
+
+# See if can restart
+#?*GREETER-X-0 GET-CAN-RESTART
+#?GREETER-X-0 CAN-RESTART ALLOWED=FALSE
+
+# Restart
+#?*GREETER-X-0 RESTART
+#?GREETER-X-0 FAIL-RESTART
+
+# See if can shutdown
+#?*GREETER-X-0 GET-CAN-SHUTDOWN
+#?GREETER-X-0 CAN-SHUTDOWN ALLOWED=FALSE
+
+# Shutdown
+#?*GREETER-X-0 SHUTDOWN
+#?GREETER-X-0 FAIL-SHUTDOWN
+
+# Cleanup
+#?*STOP-DAEMON
+#?GREETER-X-0 TERMINATE SIGNAL=15
+#?XSERVER-0 TERMINATE SIGNAL=15
+#?RUNNER DAEMON-EXIT STATUS=0
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lightdm-1.21.3/tests/scripts/power-no-login1.conf new/lightdm-1.21.5/tests/scripts/power-no-login1.conf
--- old/lightdm-1.21.3/tests/scripts/power-no-login1.conf 2016-06-20 01:06:46.000000000 +0200
+++ new/lightdm-1.21.5/tests/scripts/power-no-login1.conf 2017-01-12 01:32:04.000000000 +0100
@@ -26,21 +26,21 @@
# See if can suspend
#?*GREETER-X-0 GET-CAN-SUSPEND
-#?UPOWER SUSPEND-ALLOWED
+#?CONSOLE-KIT CAN-SUSPEND
#?GREETER-X-0 CAN-SUSPEND ALLOWED=TRUE
# Suspend
#?*GREETER-X-0 SUSPEND
-#?UPOWER SUSPEND
+#?CONSOLE-KIT SUSPEND
# See if can hibernate
#?*GREETER-X-0 GET-CAN-HIBERNATE
-#?UPOWER HIBERNATE-ALLOWED
+#?CONSOLE-KIT CAN-HIBERNATE
#?GREETER-X-0 CAN-HIBERNATE ALLOWED=TRUE
# Hibernate
#?*GREETER-X-0 HIBERNATE
-#?UPOWER HIBERNATE
+#?CONSOLE-KIT HIBERNATE
# See if can restart
#?*GREETER-X-0 GET-CAN-RESTART
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lightdm-1.21.3/tests/scripts/switch-to-greeter-return-session-repeat.conf new/lightdm-1.21.5/tests/scripts/switch-to-greeter-return-session-repeat.conf
--- old/lightdm-1.21.3/tests/scripts/switch-to-greeter-return-session-repeat.conf 1970-01-01 01:00:00.000000000 +0100
+++ new/lightdm-1.21.5/tests/scripts/switch-to-greeter-return-session-repeat.conf 2017-01-26 23:25:06.000000000 +0100
@@ -0,0 +1,162 @@
+#
+# Use D-Bus interface to show the greeter, then return to the same session (repeat three times)
+#
+
+[Seat:*]
+autologin-user=have-password1
+user-session=default
+
+#?*START-DAEMON
+#?RUNNER DAEMON-START
+
+# X server starts
+#?XSERVER-0 START VT=7 SEAT=seat0
+
+# Daemon connects when X server is ready
+#?*XSERVER-0 INDICATE-READY
+#?XSERVER-0 INDICATE-READY
+#?XSERVER-0 ACCEPT-CONNECT
+
+# Session starts
+#?SESSION-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_GREETER_DATA_DIR=.*/have-password1 XDG_SESSION_TYPE=x11 XDG_SESSION_DESKTOP=default USER=have-password1
+#?LOGIN1 ACTIVATE-SESSION SESSION=c0
+#?XSERVER-0 ACCEPT-CONNECT
+#?SESSION-X-0 CONNECT-XSERVER
+
+# Show the greeter
+#?*SWITCH-TO-GREETER
+#?RUNNER SWITCH-TO-GREETER
+
+# New X server starts
+#?XSERVER-1 START VT=8 SEAT=seat0
+
+# Daemon connects when X server is ready
+#?*XSERVER-1 INDICATE-READY
+#?XSERVER-1 INDICATE-READY
+#?XSERVER-1 ACCEPT-CONNECT
+
+# Session is locked
+#?LOGIN1 LOCK-SESSION SESSION=c0
+
+# Greeter starts
+#?GREETER-X-1 START XDG_SEAT=seat0 XDG_VTNR=8 XDG_SESSION_CLASS=greeter
+#?XSERVER-1 ACCEPT-CONNECT
+#?GREETER-X-1 CONNECT-XSERVER
+#?GREETER-X-1 CONNECT-TO-DAEMON
+#?GREETER-X-1 CONNECTED-TO-DAEMON
+
+# Switch to greeter
+#?LOGIN1 ACTIVATE-SESSION SESSION=c1
+#?VT ACTIVATE VT=8
+
+# Login as existing user
+#?*GREETER-X-1 AUTHENTICATE USERNAME=have-password1
+#?GREETER-X-1 SHOW-PROMPT TEXT="Password:"
+#?*GREETER-X-1 RESPOND TEXT="password"
+#?GREETER-X-1 AUTHENTICATION-COMPLETE USERNAME=have-password1 AUTHENTICATED=TRUE
+#?*GREETER-X-1 START-SESSION
+
+# Session is unlocked
+#?LOGIN1 UNLOCK-SESSION SESSION=c0
+
+# Switch to session
+#?LOGIN1 ACTIVATE-SESSION SESSION=c0
+#?VT ACTIVATE VT=7
+
+# Greeter and X server stop
+#?GREETER-X-1 TERMINATE SIGNAL=15
+#?XSERVER-1 TERMINATE SIGNAL=15
+
+# Show the greeter
+#?*SWITCH-TO-GREETER
+#?RUNNER SWITCH-TO-GREETER
+
+# New X server starts
+#?XSERVER-2 START VT=9 SEAT=seat0
+
+# Daemon connects when X server is ready
+#?*XSERVER-2 INDICATE-READY
+#?XSERVER-2 INDICATE-READY
+#?XSERVER-2 ACCEPT-CONNECT
+
+# Session is locked
+#?LOGIN1 LOCK-SESSION SESSION=c0
+
+# Greeter starts
+#?GREETER-X-2 START XDG_SEAT=seat0 XDG_VTNR=9 XDG_SESSION_CLASS=greeter
+#?XSERVER-2 ACCEPT-CONNECT
+#?GREETER-X-2 CONNECT-XSERVER
+#?GREETER-X-2 CONNECT-TO-DAEMON
+#?GREETER-X-2 CONNECTED-TO-DAEMON
+
+# Switch to greeter
+#?LOGIN1 ACTIVATE-SESSION SESSION=c2
+#?VT ACTIVATE VT=9
+
+# Login as existing user
+#?*GREETER-X-2 AUTHENTICATE USERNAME=have-password1
+#?GREETER-X-2 SHOW-PROMPT TEXT="Password:"
+#?*GREETER-X-2 RESPOND TEXT="password"
+#?GREETER-X-2 AUTHENTICATION-COMPLETE USERNAME=have-password1 AUTHENTICATED=TRUE
+#?*GREETER-X-2 START-SESSION
+
+# Session is unlocked
+#?LOGIN1 UNLOCK-SESSION SESSION=c0
+
+# Switch to session
+#?LOGIN1 ACTIVATE-SESSION SESSION=c0
+#?VT ACTIVATE VT=7
+
+# Greeter and X server stop
+#?GREETER-X-2 TERMINATE SIGNAL=15
+#?XSERVER-2 TERMINATE SIGNAL=15
+
+# Show the greeter
+#?*SWITCH-TO-GREETER
+#?RUNNER SWITCH-TO-GREETER
+
+# New X server starts
+#?XSERVER-1 START VT=8 SEAT=seat0
+
+# Daemon connects when X server is ready
+#?*XSERVER-1 INDICATE-READY
+#?XSERVER-1 INDICATE-READY
+#?XSERVER-1 ACCEPT-CONNECT
+
+# Session is locked
+#?LOGIN1 LOCK-SESSION SESSION=c0
+
+# Greeter starts
+#?GREETER-X-1 START XDG_SEAT=seat0 XDG_VTNR=8 XDG_SESSION_CLASS=greeter
+#?XSERVER-1 ACCEPT-CONNECT
+#?GREETER-X-1 CONNECT-XSERVER
+#?GREETER-X-1 CONNECT-TO-DAEMON
+#?GREETER-X-1 CONNECTED-TO-DAEMON
+
+# Switch to greeter
+#?LOGIN1 ACTIVATE-SESSION SESSION=c3
+#?VT ACTIVATE VT=8
+
+# Login as existing user
+#?*GREETER-X-1 AUTHENTICATE USERNAME=have-password1
+#?GREETER-X-1 SHOW-PROMPT TEXT="Password:"
+#?*GREETER-X-1 RESPOND TEXT="password"
+#?GREETER-X-1 AUTHENTICATION-COMPLETE USERNAME=have-password1 AUTHENTICATED=TRUE
+#?*GREETER-X-1 START-SESSION
+
+# Session is unlocked
+#?LOGIN1 UNLOCK-SESSION SESSION=c0
+
+# Switch to session
+#?LOGIN1 ACTIVATE-SESSION SESSION=c0
+#?VT ACTIVATE VT=7
+
+# Greeter and X server stop
+#?GREETER-X-1 TERMINATE SIGNAL=15
+#?XSERVER-1 TERMINATE SIGNAL=15
+
+# Cleanup
+#?*STOP-DAEMON
+#?SESSION-X-0 TERMINATE SIGNAL=15
+#?XSERVER-0 TERMINATE SIGNAL=15
+#?RUNNER DAEMON-EXIT STATUS=0
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lightdm-1.21.3/tests/src/test-gobject-greeter.c new/lightdm-1.21.5/tests/src/test-gobject-greeter.c
--- old/lightdm-1.21.3/tests/src/test-gobject-greeter.c 2016-11-22 04:44:20.000000000 +0100
+++ new/lightdm-1.21.5/tests/src/test-gobject-greeter.c 2017-01-26 22:22:13.000000000 +0100
@@ -520,7 +520,7 @@
g_key_file_load_from_file (config, path, G_KEY_FILE_NONE, NULL);
g_free (path);
- if (g_key_file_has_key (config, "test-greeter-config", "return-value", NULL))
+ if (g_key_file_get_boolean (config, "test-greeter-config", "exit-on-startup", NULL))
{
int return_value = g_key_file_get_integer (config, "test-greeter-config", "return-value", NULL);
status_notify ("%s EXIT CODE=%d", greeter_id, return_value);
@@ -561,5 +561,11 @@
g_main_loop_run (loop);
+ if (g_key_file_has_key (config, "test-greeter-config", "return-value", NULL))
+ {
+ int return_value = g_key_file_get_integer (config, "test-greeter-config", "return-value", NULL);
+ return return_value;
+ }
+
return exit_code;
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lightdm-1.21.3/tests/src/test-runner.c new/lightdm-1.21.5/tests/src/test-runner.c
--- old/lightdm-1.21.3/tests/src/test-runner.c 2016-12-07 03:44:18.000000000 +0100
+++ new/lightdm-1.21.5/tests/src/test-runner.c 2017-01-12 01:26:44.000000000 +0100
@@ -1401,6 +1401,16 @@
check_status ("CONSOLE-KIT CAN-STOP");
g_dbus_method_invocation_return_value (invocation, g_variant_new ("(b)", TRUE));
}
+ else if (strcmp (method_name, "CanSuspend") == 0)
+ {
+ check_status ("CONSOLE-KIT CAN-SUSPEND");
+ g_dbus_method_invocation_return_value (invocation, g_variant_new ("(b)", TRUE));
+ }
+ else if (strcmp (method_name, "CanHibernate") == 0)
+ {
+ check_status ("CONSOLE-KIT CAN-HIBERNATE");
+ g_dbus_method_invocation_return_value (invocation, g_variant_new ("(b)", TRUE));
+ }
else if (strcmp (method_name, "CloseSession") == 0)
g_dbus_method_invocation_return_value (invocation, g_variant_new ("(b)", TRUE));
else if (strcmp (method_name, "OpenSession") == 0)
@@ -1444,6 +1454,16 @@
check_status ("CONSOLE-KIT STOP");
g_dbus_method_invocation_return_value (invocation, g_variant_new ("()"));
}
+ else if (strcmp (method_name, "Suspend") == 0)
+ {
+ check_status ("CONSOLE-KIT SUSPEND");
+ g_dbus_method_invocation_return_value (invocation, g_variant_new ("()"));
+ }
+ else if (strcmp (method_name, "Hibernate") == 0)
+ {
+ check_status ("CONSOLE-KIT HIBERNATE");
+ g_dbus_method_invocation_return_value (invocation, g_variant_new ("()"));
+ }
else
g_dbus_method_invocation_return_error (invocation, G_DBUS_ERROR, G_DBUS_ERROR_FAILED, "No such method: %s", method_name);
}
@@ -1504,6 +1524,12 @@
" <method name='CanStop'>"
" <arg name='can_stop' direction='out' type='b'/>"
" </method>"
+ " <method name='CanSuspend'>"
+ " <arg name='can_suspend' direction='out' type='b'/>"
+ " </method>"
+ " <method name='CanHibernate'>"
+ " <arg name='can_hibernate' direction='out' type='b'/>"
+ " </method>"
" <method name='CloseSession'>"
" <arg name='cookie' direction='in' type='s'/>"
" <arg name='result' direction='out' type='b'/>"
@@ -1521,6 +1547,12 @@
" </method>"
" <method name='Restart'/>"
" <method name='Stop'/>"
+ " <method name='Suspend'>"
+ " <arg name='policykit_interactivity' direction='in' type='b'/>"
+ " </method>"
+ " <method name='Hibernate'>"
+ " <arg name='policykit_interactivity' direction='in' type='b'/>"
+ " </method>"
" <signal name='SeatAdded'>"
" <arg name='seat' type='o'/>"
" </signal>"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lightdm-1.21.3/tests/test-login-greeter-return-failure new/lightdm-1.21.5/tests/test-login-greeter-return-failure
--- old/lightdm-1.21.3/tests/test-login-greeter-return-failure 1970-01-01 01:00:00.000000000 +0100
+++ new/lightdm-1.21.5/tests/test-login-greeter-return-failure 2017-01-26 22:23:24.000000000 +0100
@@ -0,0 +1,2 @@
+#!/bin/sh
+./src/dbus-env ./src/test-runner login-greeter-return-failure test-gobject-greeter
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lightdm-1.21.3/tests/test-power-no-console-kit new/lightdm-1.21.5/tests/test-power-no-console-kit
--- old/lightdm-1.21.3/tests/test-power-no-console-kit 1970-01-01 01:00:00.000000000 +0100
+++ new/lightdm-1.21.5/tests/test-power-no-console-kit 2015-08-10 01:30:00.000000000 +0200
@@ -0,0 +1,2 @@
+#!/bin/sh
+./src/dbus-env ./src/test-runner power-no-console-kit test-gobject-greeter
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lightdm-1.21.3/tests/test-power-no-console-kit-gobject new/lightdm-1.21.5/tests/test-power-no-console-kit-gobject
--- old/lightdm-1.21.3/tests/test-power-no-console-kit-gobject 2015-08-10 01:30:00.000000000 +0200
+++ new/lightdm-1.21.5/tests/test-power-no-console-kit-gobject 1970-01-01 01:00:00.000000000 +0100
@@ -1,2 +0,0 @@
-#!/bin/sh
-./src/dbus-env ./src/test-runner power-no-console-kit test-gobject-greeter
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lightdm-1.21.3/tests/test-power-no-console-kit-python new/lightdm-1.21.5/tests/test-power-no-console-kit-python
--- old/lightdm-1.21.3/tests/test-power-no-console-kit-python 2015-08-10 01:30:00.000000000 +0200
+++ new/lightdm-1.21.5/tests/test-power-no-console-kit-python 1970-01-01 01:00:00.000000000 +0100
@@ -1,2 +0,0 @@
-#!/bin/sh
-./src/dbus-env ./src/test-runner power-no-console-kit test-python-greeter
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lightdm-1.21.3/tests/test-power-no-console-kit-qt4 new/lightdm-1.21.5/tests/test-power-no-console-kit-qt4
--- old/lightdm-1.21.3/tests/test-power-no-console-kit-qt4 2015-08-10 01:30:00.000000000 +0200
+++ new/lightdm-1.21.5/tests/test-power-no-console-kit-qt4 1970-01-01 01:00:00.000000000 +0100
@@ -1,2 +0,0 @@
-#!/bin/sh
-./src/dbus-env ./src/test-runner power-no-console-kit test-qt4-greeter
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lightdm-1.21.3/tests/test-power-no-console-kit-qt5 new/lightdm-1.21.5/tests/test-power-no-console-kit-qt5
--- old/lightdm-1.21.3/tests/test-power-no-console-kit-qt5 2015-08-10 01:30:00.000000000 +0200
+++ new/lightdm-1.21.5/tests/test-power-no-console-kit-qt5 1970-01-01 01:00:00.000000000 +0100
@@ -1,2 +0,0 @@
-#!/bin/sh
-./src/dbus-env ./src/test-runner power-no-console-kit test-qt5-greeter
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lightdm-1.21.3/tests/test-power-no-login1 new/lightdm-1.21.5/tests/test-power-no-login1
--- old/lightdm-1.21.3/tests/test-power-no-login1 1970-01-01 01:00:00.000000000 +0100
+++ new/lightdm-1.21.5/tests/test-power-no-login1 2015-08-10 01:30:00.000000000 +0200
@@ -0,0 +1,2 @@
+#!/bin/sh
+./src/dbus-env ./src/test-runner power-no-login1 test-gobject-greeter
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lightdm-1.21.3/tests/test-power-no-login1-gobject new/lightdm-1.21.5/tests/test-power-no-login1-gobject
--- old/lightdm-1.21.3/tests/test-power-no-login1-gobject 2015-08-10 01:30:00.000000000 +0200
+++ new/lightdm-1.21.5/tests/test-power-no-login1-gobject 1970-01-01 01:00:00.000000000 +0100
@@ -1,2 +0,0 @@
-#!/bin/sh
-./src/dbus-env ./src/test-runner power-no-login1 test-gobject-greeter
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lightdm-1.21.3/tests/test-power-no-login1-or-console-kit new/lightdm-1.21.5/tests/test-power-no-login1-or-console-kit
--- old/lightdm-1.21.3/tests/test-power-no-login1-or-console-kit 1970-01-01 01:00:00.000000000 +0100
+++ new/lightdm-1.21.5/tests/test-power-no-login1-or-console-kit 2017-01-12 01:31:26.000000000 +0100
@@ -0,0 +1,2 @@
+#!/bin/sh
+./src/dbus-env ./src/test-runner power-no-login1-or-console-kit test-gobject-greeter
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lightdm-1.21.3/tests/test-power-no-login1-python new/lightdm-1.21.5/tests/test-power-no-login1-python
--- old/lightdm-1.21.3/tests/test-power-no-login1-python 2015-08-10 01:30:00.000000000 +0200
+++ new/lightdm-1.21.5/tests/test-power-no-login1-python 1970-01-01 01:00:00.000000000 +0100
@@ -1,2 +0,0 @@
-#!/bin/sh
-./src/dbus-env ./src/test-runner power-no-login1 test-python-greeter
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lightdm-1.21.3/tests/test-power-no-login1-qt4 new/lightdm-1.21.5/tests/test-power-no-login1-qt4
--- old/lightdm-1.21.3/tests/test-power-no-login1-qt4 2015-08-10 01:30:00.000000000 +0200
+++ new/lightdm-1.21.5/tests/test-power-no-login1-qt4 1970-01-01 01:00:00.000000000 +0100
@@ -1,2 +0,0 @@
-#!/bin/sh
-./src/dbus-env ./src/test-runner power-no-login1 test-qt4-greeter
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lightdm-1.21.3/tests/test-power-no-login1-qt5 new/lightdm-1.21.5/tests/test-power-no-login1-qt5
--- old/lightdm-1.21.3/tests/test-power-no-login1-qt5 2015-08-10 01:30:00.000000000 +0200
+++ new/lightdm-1.21.5/tests/test-power-no-login1-qt5 1970-01-01 01:00:00.000000000 +0100
@@ -1,2 +0,0 @@
-#!/bin/sh
-./src/dbus-env ./src/test-runner power-no-login1 test-qt5-greeter
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lightdm-1.21.3/tests/test-power-no-services new/lightdm-1.21.5/tests/test-power-no-services
--- old/lightdm-1.21.3/tests/test-power-no-services 1970-01-01 01:00:00.000000000 +0100
+++ new/lightdm-1.21.5/tests/test-power-no-services 2015-08-10 01:30:00.000000000 +0200
@@ -0,0 +1,2 @@
+#!/bin/sh
+./src/dbus-env ./src/test-runner power-no-services test-gobject-greeter
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lightdm-1.21.3/tests/test-power-no-services-gobject new/lightdm-1.21.5/tests/test-power-no-services-gobject
--- old/lightdm-1.21.3/tests/test-power-no-services-gobject 2015-08-10 01:30:00.000000000 +0200
+++ new/lightdm-1.21.5/tests/test-power-no-services-gobject 1970-01-01 01:00:00.000000000 +0100
@@ -1,2 +0,0 @@
-#!/bin/sh
-./src/dbus-env ./src/test-runner power-no-services test-gobject-greeter
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lightdm-1.21.3/tests/test-power-no-services-python new/lightdm-1.21.5/tests/test-power-no-services-python
--- old/lightdm-1.21.3/tests/test-power-no-services-python 2015-08-10 01:30:00.000000000 +0200
+++ new/lightdm-1.21.5/tests/test-power-no-services-python 1970-01-01 01:00:00.000000000 +0100
@@ -1,2 +0,0 @@
-#!/bin/sh
-./src/dbus-env ./src/test-runner power-no-services test-python-greeter
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lightdm-1.21.3/tests/test-power-no-services-qt4 new/lightdm-1.21.5/tests/test-power-no-services-qt4
--- old/lightdm-1.21.3/tests/test-power-no-services-qt4 2015-08-10 01:30:00.000000000 +0200
+++ new/lightdm-1.21.5/tests/test-power-no-services-qt4 1970-01-01 01:00:00.000000000 +0100
@@ -1,2 +0,0 @@
-#!/bin/sh
-./src/dbus-env ./src/test-runner power-no-services test-qt4-greeter
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lightdm-1.21.3/tests/test-power-no-services-qt5 new/lightdm-1.21.5/tests/test-power-no-services-qt5
--- old/lightdm-1.21.3/tests/test-power-no-services-qt5 2015-08-10 01:30:00.000000000 +0200
+++ new/lightdm-1.21.5/tests/test-power-no-services-qt5 1970-01-01 01:00:00.000000000 +0100
@@ -1,2 +0,0 @@
-#!/bin/sh
-./src/dbus-env ./src/test-runner power-no-services test-qt5-greeter
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lightdm-1.21.3/tests/test-switch-to-greeter-return-session-repeat new/lightdm-1.21.5/tests/test-switch-to-greeter-return-session-repeat
--- old/lightdm-1.21.3/tests/test-switch-to-greeter-return-session-repeat 1970-01-01 01:00:00.000000000 +0100
+++ new/lightdm-1.21.5/tests/test-switch-to-greeter-return-session-repeat 2017-01-26 23:21:27.000000000 +0100
@@ -0,0 +1,2 @@
+#!/bin/sh
+./src/dbus-env ./src/test-runner switch-to-greeter-return-session-repeat test-gobject-greeter
++++++ lightdm-disable-utmp-handling.patch ++++++
--- /var/tmp/diff_new_pack.jxGnF0/_old 2017-02-25 00:54:26.552332863 +0100
+++ /var/tmp/diff_new_pack.jxGnF0/_new 2017-02-25 00:54:26.552332863 +0100
@@ -2,10 +2,8 @@
# Parent ce2ab1b9285a9408ec9673b555b398c2af18de62
disable utmp handling since this is handled in the Xstartup/Xreset scripts
-Index: lightdm-1.17.3/src/session-child.c
-===================================================================
---- lightdm-1.17.3.orig/src/session-child.c
-+++ lightdm-1.17.3/src/session-child.c
+--- a/src/session-child.c
++++ b/src/session-child.c
@@ -13,8 +13,10 @@
#include <grp.h>
#include <glib.h>
@@ -41,7 +39,7 @@
struct utmpx ut;
struct timeval tv;
-@@ -425,6 +430,8 @@ session_child_run (int argc, char **argv
+@@ -422,6 +427,8 @@ session_child_run (int argc, char **argv
updwtmpx ("/var/log/btmp", &ut);
@@ -50,28 +48,32 @@
#if HAVE_LIBAUDIT
audit_event (AUDIT_USER_LOGIN, username, -1, remote_host_name, tty, FALSE);
#endif
-@@ -713,6 +720,7 @@ session_child_run (int argc, char **argv
- /* Wait for the command to complete (blocks) */
- if (child_pid > 0)
+@@ -726,6 +733,7 @@ session_child_run (int argc, char **argv
{
+ int child_status;
+
+#if 0
/* Log to utmp */
if (g_strcmp0 (pam_getenv (pam_handle, "XDG_SESSION_CLASS"), "greeter") != 0)
{
-@@ -749,10 +757,10 @@ session_child_run (int argc, char **argv
+@@ -759,14 +767,14 @@ session_child_run (int argc, char **argv
audit_event (AUDIT_USER_LOGIN, username, uid, remote_host_name, tty, TRUE);
#endif
}
-
+#endif
- waitpid (child_pid, &return_code, 0);
+ waitpid (child_pid, &child_status, 0);
child_pid = 0;
+ if (WIFEXITED (child_status))
+ return_code = WEXITSTATUS (child_status);
+ else
+ return_code = EXIT_FAILURE;
-
+#if 0
/* Log to utmp */
if (g_strcmp0 (pam_getenv (pam_handle, "XDG_SESSION_CLASS"), "greeter") != 0)
{
-@@ -789,6 +797,7 @@ session_child_run (int argc, char **argv
+@@ -800,6 +808,7 @@ session_child_run (int argc, char **argv
audit_event (AUDIT_USER_LOGOUT, username, uid, remote_host_name, tty, TRUE);
#endif
}
1
0
Hello community,
here is the log from the commit of package filezilla for openSUSE:Factory checked in at 2017-02-25 00:54:15
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/filezilla (Old)
and /work/SRC/openSUSE:Factory/.filezilla.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "filezilla"
Changes:
--------
--- /work/SRC/openSUSE:Factory/filezilla/filezilla.changes 2017-01-24 10:33:15.531610414 +0100
+++ /work/SRC/openSUSE:Factory/.filezilla.new/filezilla.changes 2017-02-25 00:54:17.897660720 +0100
@@ -1,0 +2,14 @@
+Thu Feb 23 07:39:30 UTC 2017 - ecsos(a)opensuse.org
+
+- update to 3.24.1
+ * Bugfixes and minor changes:
+ - Fixed rendering icons in the remote directory tree when DPI
+ scaling is enabled on Windows Vista and some Windows 7
+ machines
+ - SFTP components have been updated and are now based on
+ PuTTY 0.68
+ - Updated builtin pugixml to version 1.8
+- Add patch filezilla-3.24.1-config_parse_error.patch to prevent
+ build error.
+
+-------------------------------------------------------------------
Old:
----
FileZilla_3.24.0_src.tar.bz2
New:
----
FileZilla_3.24.1_src.tar.bz2
filezilla-3.24.1-config_parse_error.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ filezilla.spec ++++++
--- /var/tmp/diff_new_pack.YrgKBp/_old 2017-02-25 00:54:18.789523884 +0100
+++ /var/tmp/diff_new_pack.YrgKBp/_new 2017-02-25 00:54:18.789523884 +0100
@@ -17,7 +17,7 @@
Name: filezilla
-Version: 3.24.0
+Version: 3.24.1
Release: 0
Summary: A GUI FTP and SFTP Client
License: GPL-2.0+
@@ -28,6 +28,8 @@
Patch0: putty-no_DATE_and_TIME_.patch
# PATCH-FIX-OPENSUSE filezilla-3.22.2-buildinfo-no-date.patch
Patch1: filezilla-3.22.2-buildinfo-no-date.patch
+# PATCH-FIX-OPENSUSE filezilla-3.24.1-config_parse_error.patch
+Patch2: filezilla-3.24.1-config_parse_error.patch
BuildRequires: autoconf
BuildRequires: automake
BuildRequires: fdupes
@@ -81,6 +83,7 @@
%setup -q
%patch0
%patch1 -p1
+%patch2 -p1
# Fix invalid translation locales:
cd locales
++++++ FileZilla_3.24.0_src.tar.bz2 -> FileZilla_3.24.1_src.tar.bz2 ++++++
++++ 7821 lines of diff (skipped)
++++++ filezilla-3.24.1-config_parse_error.patch ++++++
diff -Pdpru filezilla-3.24.1.orig/data/filezilla.desktop filezilla-3.24.1/data/filezilla.desktop
--- filezilla-3.24.1.orig/data/filezilla.desktop 2017-02-18 11:46:43.000000000 +0100
+++ filezilla-3.24.1/data/filezilla.desktop 2017-02-23 09:27:25.572029151 +0100
@@ -1,4 +1,4 @@
-[Desktop Entry]
+[Desktop Entry]
Name=FileZilla
GenericName=FTP client
GenericName[da]=FTP-klient
1
0
Hello community,
here is the log from the commit of package libfilezilla for openSUSE:Factory checked in at 2017-02-25 00:54:08
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/libfilezilla (Old)
and /work/SRC/openSUSE:Factory/.libfilezilla.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "libfilezilla"
Changes:
--------
--- /work/SRC/openSUSE:Factory/libfilezilla/libfilezilla.changes 2016-12-09 09:38:38.596918173 +0100
+++ /work/SRC/openSUSE:Factory/.libfilezilla.new/libfilezilla.changes 2017-02-25 00:54:09.882890417 +0100
@@ -1,0 +2,12 @@
+Thu Feb 23 07:35:49 UTC 2017 - ecsos(a)opensuse.org
+
+- update to 0.9.1
+ * New features:
+ - Added a small helper function to fz::file to get the current
+ position in the file
+ - Added another version of fz::to_wstring_from_utf8 that takes
+ a char buffer + length
+ * Bugfixes and minor changes:
+ - Fixed extraction of single-character tokens in fz::strtok
+
+-------------------------------------------------------------------
Old:
----
libfilezilla-0.9.0.tar.bz2
New:
----
libfilezilla-0.9.1.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ libfilezilla.spec ++++++
--- /var/tmp/diff_new_pack.FF2JFq/_old 2017-02-25 00:54:10.786751738 +0100
+++ /var/tmp/diff_new_pack.FF2JFq/_new 2017-02-25 00:54:10.786751738 +0100
@@ -1,7 +1,7 @@
#
# spec file for package libfilezilla
#
-# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -20,7 +20,7 @@
%define libname %{name}%{major}
%define develname %{name}-devel
Name: libfilezilla
-Version: 0.9.0
+Version: 0.9.1
Release: 0
Summary: C++ library for filezilla
License: GPL-2.0+
++++++ libfilezilla-0.9.0.tar.bz2 -> libfilezilla-0.9.1.tar.bz2 ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libfilezilla-0.9.0/NEWS new/libfilezilla-0.9.1/NEWS
--- old/libfilezilla-0.9.0/NEWS 2016-11-28 17:34:31.000000000 +0100
+++ new/libfilezilla-0.9.1/NEWS 2017-02-20 23:08:47.000000000 +0100
@@ -1,3 +1,9 @@
+0.9.1 (2017-02-20)
+
++ Added a small helper function to fz::file to get the current position in the file
++ Added another version of fz::to_wstring_from_utf8 that takes a char buffer + length
+- Fixed extraction of single-character tokens in fz::strtok
+
0.9.0 (2016-11-28)
+ Added parameter to fz::to_integral to specify which value is returned on error.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libfilezilla-0.9.0/README new/libfilezilla-0.9.1/README
--- old/libfilezilla-0.9.0/README 2016-01-31 11:35:01.000000000 +0100
+++ new/libfilezilla-0.9.1/README 2017-02-20 23:08:59.000000000 +0100
@@ -1,7 +1,7 @@
libfilezilla
-------------
- Copyright (C) 2016 Tim Kosse
+ Copyright (C) 2017 Tim Kosse
https://lib.filezilla-project.org/
Overview
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libfilezilla-0.9.0/configure new/libfilezilla-0.9.1/configure
--- old/libfilezilla-0.9.0/configure 2016-11-28 17:34:57.000000000 +0100
+++ new/libfilezilla-0.9.1/configure 2017-02-20 23:10:00.000000000 +0100
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.69 for libfilezilla 0.9.0.
+# Generated by GNU Autoconf 2.69 for libfilezilla 0.9.1.
#
# Report bugs to <tim.kosse(a)filezilla-project.org>.
#
@@ -590,8 +590,8 @@
# Identity of this package.
PACKAGE_NAME='libfilezilla'
PACKAGE_TARNAME='libfilezilla'
-PACKAGE_VERSION='0.9.0'
-PACKAGE_STRING='libfilezilla 0.9.0'
+PACKAGE_VERSION='0.9.1'
+PACKAGE_STRING='libfilezilla 0.9.1'
PACKAGE_BUGREPORT='tim.kosse(a)filezilla-project.org'
PACKAGE_URL='https://lib.filezilla-project.org/'
@@ -1396,7 +1396,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 libfilezilla 0.9.0 to adapt to many kinds of systems.
+\`configure' configures libfilezilla 0.9.1 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1466,7 +1466,7 @@
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of libfilezilla 0.9.0:";;
+ short | recursive ) echo "Configuration of libfilezilla 0.9.1:";;
esac
cat <<\_ACEOF
@@ -1591,7 +1591,7 @@
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-libfilezilla configure 0.9.0
+libfilezilla configure 0.9.1
generated by GNU Autoconf 2.69
Copyright (C) 2012 Free Software Foundation, Inc.
@@ -2036,7 +2036,7 @@
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
-It was created by libfilezilla $as_me 0.9.0, which was
+It was created by libfilezilla $as_me 0.9.1, which was
generated by GNU Autoconf 2.69. Invocation command line was
$ $0 $@
@@ -2902,7 +2902,7 @@
# Define the identity of the package.
PACKAGE='libfilezilla'
- VERSION='0.9.0'
+ VERSION='0.9.1'
cat >>confdefs.h <<_ACEOF
@@ -20214,7 +20214,7 @@
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
-This file was extended by libfilezilla $as_me 0.9.0, which was
+This file was extended by libfilezilla $as_me 0.9.1, which was
generated by GNU Autoconf 2.69. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -20281,7 +20281,7 @@
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
ac_cs_version="\\
-libfilezilla config.status 0.9.0
+libfilezilla config.status 0.9.1
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/libfilezilla-0.9.0/configure.ac new/libfilezilla-0.9.1/configure.ac
--- old/libfilezilla-0.9.0/configure.ac 2016-11-28 17:33:58.000000000 +0100
+++ new/libfilezilla-0.9.1/configure.ac 2017-02-20 23:08:14.000000000 +0100
@@ -1,4 +1,4 @@
-AC_INIT([libfilezilla],[0.9.0],[tim.kosse@filezilla-project.org],[],[https://lib.filezilla-project.org/])
+AC_INIT([libfilezilla],[0.9.1],[tim.kosse@filezilla-project.org],[],[https://lib.filezilla-project.org/])
AC_CONFIG_HEADERS([lib/libfilezilla/private/config.hpp])
AC_CONFIG_MACRO_DIR([m4])
AC_CONFIG_AUX_DIR(config)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libfilezilla-0.9.0/lib/libfilezilla/file.hpp new/libfilezilla-0.9.1/lib/libfilezilla/file.hpp
--- old/libfilezilla-0.9.0/lib/libfilezilla/file.hpp 2016-11-28 17:32:55.000000000 +0100
+++ new/libfilezilla-0.9.1/lib/libfilezilla/file.hpp 2017-02-20 22:19:51.000000000 +0100
@@ -90,6 +90,9 @@
*/
int64_t seek(int64_t offset, seek_mode m);
+ /** \brief Get Current position in file */
+ int64_t position() { return seek(0, current); }
+
/** \brief Truncate the file to the current position of the file pointer.
*
* Despite its name, this function can extend the size of the file
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libfilezilla-0.9.0/lib/libfilezilla/local_filesys.hpp new/libfilezilla-0.9.1/lib/libfilezilla/local_filesys.hpp
--- old/libfilezilla-0.9.0/lib/libfilezilla/local_filesys.hpp 2015-11-19 14:20:07.000000000 +0100
+++ new/libfilezilla-0.9.1/lib/libfilezilla/local_filesys.hpp 2017-02-20 22:19:51.000000000 +0100
@@ -88,7 +88,7 @@
private:
#ifndef FZ_WINDOWS
- void alloc_path_buffer(char const* file); // Ensures m_raw_path is large enough to hold path and filename
+ void alloc_path_buffer(char const* filename); // Ensures m_raw_path is large enough to hold path and filename
#endif
// State for directory enumeration
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libfilezilla-0.9.0/lib/libfilezilla/string.hpp new/libfilezilla-0.9.1/lib/libfilezilla/string.hpp
--- old/libfilezilla-0.9.0/lib/libfilezilla/string.hpp 2016-11-28 17:32:55.000000000 +0100
+++ new/libfilezilla-0.9.1/lib/libfilezilla/string.hpp 2017-02-20 22:19:51.000000000 +0100
@@ -142,6 +142,7 @@
* \return the converted string on success. On failure an empty string is returned.
*/
std::wstring FZ_PUBLIC_SYMBOL to_wstring_from_utf8(std::string const& in);
+std::wstring FZ_PUBLIC_SYMBOL to_wstring_from_utf8(char const* s, size_t len);
/** \brief Converts from std::wstring into std::string in system encoding
*
@@ -328,11 +329,11 @@
// Not found, we're at ends;
if (pos == String::npos) {
- if (start + 1 < s.size()) {
+ if (start < s.size()) {
ret.emplace_back(s.substr(start));
}
}
- else if (pos > start + 1) {
+ else if (pos > start) {
// Non-empty substring
ret.emplace_back(s.substr(start, pos - start));
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libfilezilla-0.9.0/lib/libfilezilla/version.hpp new/libfilezilla-0.9.1/lib/libfilezilla/version.hpp
--- old/libfilezilla-0.9.0/lib/libfilezilla/version.hpp 2016-11-28 17:35:00.000000000 +0100
+++ new/libfilezilla-0.9.1/lib/libfilezilla/version.hpp 2017-02-20 23:10:02.000000000 +0100
@@ -9,15 +9,15 @@
#include <tuple>
/// \brief Version string of the libfilezilla headers
-#define LIBFILEZILLA_VERSION "0.9.0"
+#define LIBFILEZILLA_VERSION "0.9.1"
#define LIBFILEZILLA_VERSION_MAJOR 0
#define LIBFILEZILLA_VERSION_MINOR 9
-#define LIBFILEZILLA_VERSION_MICRO 0
+#define LIBFILEZILLA_VERSION_MICRO 1
#define LIBFILEZILLA_VERSION_NANO 0
/// \brief Suffix string, e.g. "rc1"
-#define LIBFILEZILLA_VERSION_SUFFIX "0.9.0"
+#define LIBFILEZILLA_VERSION_SUFFIX "0.9.1"
namespace fz {
/// \brief Get version string of libfilezilla
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libfilezilla-0.9.0/lib/local_filesys.cpp new/libfilezilla-0.9.1/lib/local_filesys.cpp
--- old/libfilezilla-0.9.0/lib/local_filesys.cpp 2016-06-20 10:08:07.000000000 +0200
+++ new/libfilezilla-0.9.1/lib/local_filesys.cpp 2017-02-20 22:19:51.000000000 +0100
@@ -40,8 +40,9 @@
#ifdef FZ_WINDOWS
DWORD result = GetFileAttributes(path.c_str());
- if (result == INVALID_FILE_ATTRIBUTES)
+ if (result == INVALID_FILE_ATTRIBUTES) {
return unknown;
+ }
bool is_dir = (result & FILE_ATTRIBUTE_DIRECTORY) != 0;
@@ -80,15 +81,16 @@
return link;
}
- int result = stat(path.c_str(), &buf);
+ result = stat(path.c_str(), &buf);
if (result) {
return unknown;
}
}
#endif
- if (S_ISDIR(buf.st_mode))
+ if (S_ISDIR(buf.st_mode)) {
return dir;
+ }
return file;
#endif
@@ -108,12 +110,15 @@
WIN32_FILE_ATTRIBUTE_DATA attributes;
BOOL result = GetFileAttributesEx(fixed_path.c_str(), GetFileExInfoStandard, &attributes);
if (!result) {
- if (size)
+ if (size) {
*size = -1;
- if (mode)
+ }
+ if (mode) {
*mode = 0;
- if (modification_time)
+ }
+ if (modification_time) {
*modification_time = datetime();
+ }
return unknown;
}
@@ -135,28 +140,34 @@
}
}
- if (mode)
+ if (mode) {
*mode = (int)info.dwFileAttributes;
+ }
if (info.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY) {
- if (size)
+ if (size) {
*size = -1;
+ }
return dir;
}
- if (size)
+ if (size) {
*size = make_int64fzT(info.nFileSizeHigh, info.nFileSizeLow);
+ }
return file;
}
}
- if (size)
+ if (size) {
*size = -1;
- if (mode)
+ }
+ if (mode) {
*mode = 0;
- if (modification_time)
+ }
+ if (modification_time) {
*modification_time = datetime();
+ }
return is_dir ? dir : unknown;
}
@@ -167,17 +178,20 @@
}
}
- if (mode)
+ if (mode) {
*mode = (int)attributes.dwFileAttributes;
+ }
if (is_dir) {
- if (size)
+ if (size) {
*size = -1;
+ }
return dir;
}
else {
- if (size)
+ if (size) {
*size = make_int64fzT(attributes.nFileSizeHigh, attributes.nFileSizeLow);
+ }
return file;
}
#else
@@ -193,26 +207,32 @@
int result = lstat(path.c_str(), &buf);
if (result) {
is_link = false;
- if (size)
+ if (size) {
*size = -1;
- if (mode)
+ }
+ if (mode) {
*mode = -1;
- if (modification_time)
+ }
+ if (modification_time) {
*modification_time = datetime();
+ }
return unknown;
}
#ifdef S_ISLNK
if (S_ISLNK(buf.st_mode)) {
is_link = true;
- int result = stat(path.c_str(), &buf);
+ result = stat(path.c_str(), &buf);
if (result) {
- if (size)
+ if (size) {
*size = -1;
- if (mode)
+ }
+ if (mode) {
*mode = -1;
- if (modification_time)
+ }
+ if (modification_time) {
*modification_time = datetime();
+ }
return unknown;
}
}
@@ -220,20 +240,24 @@
#endif
is_link = false;
- if (modification_time)
+ if (modification_time) {
*modification_time = datetime(buf.st_mtime, datetime::seconds);
+ }
- if (mode)
+ if (mode) {
*mode = buf.st_mode & 0x777;
+ }
if (S_ISDIR(buf.st_mode)) {
- if (size)
+ if (size) {
*size = -1;
+ }
return dir;
}
- if (size)
+ if (size) {
*size = buf.st_size;
+ }
return file;
#endif
@@ -523,16 +547,16 @@
}
#ifndef FZ_WINDOWS
-void local_filesys::alloc_path_buffer(char const* file)
+void local_filesys::alloc_path_buffer(char const* filename)
{
- int len = strlen(file);
+ int len = strlen(filename);
int pathlen = m_file_part - m_raw_path;
if (len + pathlen >= m_buffer_length) {
m_buffer_length = (len + pathlen) * 2;
char* tmp = new char[m_buffer_length];
memcpy(tmp, m_raw_path, pathlen);
- delete[] m_raw_path;
+ delete [] m_raw_path;
m_raw_path = tmp;
m_file_part = m_raw_path + pathlen;
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libfilezilla-0.9.0/lib/recursive_remove.cpp new/libfilezilla-0.9.1/lib/recursive_remove.cpp
--- old/libfilezilla-0.9.0/lib/recursive_remove.cpp 2015-11-19 14:20:07.000000000 +0100
+++ new/libfilezilla-0.9.1/lib/recursive_remove.cpp 2017-02-20 22:19:51.000000000 +0100
@@ -40,8 +40,9 @@
if (!dir.empty() && local_filesys::is_separator(dir.back())) {
dir.pop_back();
}
- if (local_filesys::get_file_type(dir) == local_filesys::unknown)
+ if (local_filesys::get_file_type(dir) == local_filesys::unknown) {
continue;
+ }
wcscpy(p, dir.c_str());
p += dir.size() + 1;
@@ -115,16 +116,18 @@
native_string const fullName = path + fzT("/") + file;
- if (local_filesys::get_file_type(fullName) == local_filesys::dir)
+ if (local_filesys::get_file_type(fullName) == local_filesys::dir) {
dirsToVisit.push_back(fullName);
- else
+ }
+ else {
filesToDelete.push_back(fullName);
+ }
}
fs.end_find_files();
// Delete all files and links in current directory enumerated before
- for (auto const& file : filesToDelete) {
- if (unlink(file.c_str()) != 0) {
+ for (auto const& filename : filesToDelete) {
+ if (unlink(filename.c_str()) != 0) {
success = false;
}
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libfilezilla-0.9.0/lib/string.cpp new/libfilezilla-0.9.1/lib/string.cpp
--- old/libfilezilla-0.9.0/lib/string.cpp 2016-10-25 15:03:50.000000000 +0200
+++ new/libfilezilla-0.9.1/lib/string.cpp 2017-02-20 22:19:51.000000000 +0100
@@ -160,28 +160,31 @@
std::wstring to_wstring_from_utf8(std::string const& in)
{
+ return to_wstring_from_utf8(in.c_str(), in.size());
+}
+
+std::wstring to_wstring_from_utf8(char const* s, size_t len)
+{
std::wstring ret;
- if (!in.empty()) {
+ if (len != 0) {
#if FZ_WINDOWS
- char const* const in_p = in.c_str();
- int len = MultiByteToWideChar(CP_UTF8, MB_ERR_INVALID_CHARS, in_p, static_cast<int>(in.size()), 0, 0);
- if (len > 0) {
- ret.resize(len);
+ char const* const in_p = s;
+ int out_len = MultiByteToWideChar(CP_UTF8, MB_ERR_INVALID_CHARS, in_p, static_cast<int>(len), 0, 0);
+ if (out_len > 0) {
+ ret.resize(out_len);
wchar_t* out_p = &ret[0];
- MultiByteToWideChar(CP_UTF8, MB_ERR_INVALID_CHARS, in_p, static_cast<int>(in.size()), out_p, len);
+ MultiByteToWideChar(CP_UTF8, MB_ERR_INVALID_CHARS, in_p, static_cast<int>(len), out_p, out_len);
}
#else
iconv_t cd = iconv_open(wchar_t_encoding(), "UTF-8");
if (cd != reinterpret_cast<iconv_t>(-1)) {
- auto in_p = const_cast<iconv_second_arg_type>(in.c_str());
- size_t in_len = in.size();
-
- size_t out_len = in_len * sizeof(wchar_t) * 2;
+ auto in_p = const_cast<iconv_second_arg_type>(s);
+ size_t out_len = len * sizeof(wchar_t) * 2;
char* out_buf = new char[out_len];
char* out_p = out_buf;
- size_t r = iconv(cd, &in_p, &in_len, &out_p, &out_len);
+ size_t r = iconv(cd, &in_p, &len, &out_p, &out_len);
if (r != static_cast<size_t>(-1)) {
ret.assign(reinterpret_cast<wchar_t*>(out_buf), reinterpret_cast<wchar_t*>(out_p));
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libfilezilla-0.9.0/tests/dispatch.cpp new/libfilezilla-0.9.1/tests/dispatch.cpp
--- old/libfilezilla-0.9.0/tests/dispatch.cpp 2016-05-20 18:31:53.000000000 +0200
+++ new/libfilezilla-0.9.1/tests/dispatch.cpp 2017-02-20 22:19:51.000000000 +0100
@@ -2,7 +2,7 @@
#include <cppunit/extensions/HelperMacros.h>
-class DispatchTest : public CppUnit::TestFixture
+class DispatchTest final : public CppUnit::TestFixture
{
CPPUNIT_TEST_SUITE(DispatchTest);
CPPUNIT_TEST(testSingle);
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libfilezilla-0.9.0/tests/eventloop.cpp new/libfilezilla-0.9.1/tests/eventloop.cpp
--- old/libfilezilla-0.9.0/tests/eventloop.cpp 2016-05-09 17:28:54.000000000 +0200
+++ new/libfilezilla-0.9.1/tests/eventloop.cpp 2017-02-20 22:19:51.000000000 +0100
@@ -3,7 +3,7 @@
#include <cppunit/extensions/HelperMacros.h>
-class EventloopTest : public CppUnit::TestFixture
+class EventloopTest final : public CppUnit::TestFixture
{
CPPUNIT_TEST_SUITE(EventloopTest);
CPPUNIT_TEST(testSimple);
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libfilezilla-0.9.0/tests/format.cpp new/libfilezilla-0.9.1/tests/format.cpp
--- old/libfilezilla-0.9.0/tests/format.cpp 2016-10-25 15:03:50.000000000 +0200
+++ new/libfilezilla-0.9.1/tests/format.cpp 2017-02-20 22:19:51.000000000 +0100
@@ -6,7 +6,7 @@
* string formatting functions
*/
-class format_test : public CppUnit::TestFixture
+class format_test final : public CppUnit::TestFixture
{
CPPUNIT_TEST_SUITE(format_test);
CPPUNIT_TEST(test_sprintf);
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libfilezilla-0.9.0/tests/iputils.cpp new/libfilezilla-0.9.1/tests/iputils.cpp
--- old/libfilezilla-0.9.0/tests/iputils.cpp 2016-01-31 11:35:01.000000000 +0100
+++ new/libfilezilla-0.9.1/tests/iputils.cpp 2017-02-20 22:19:51.000000000 +0100
@@ -6,7 +6,7 @@
* functions handling IP addresses
*/
-class ip_address_test : public CppUnit::TestFixture
+class ip_address_test final : public CppUnit::TestFixture
{
CPPUNIT_TEST_SUITE(ip_address_test);
CPPUNIT_TEST(test_addresses);
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libfilezilla-0.9.0/tests/smart_pointer.cpp new/libfilezilla-0.9.1/tests/smart_pointer.cpp
--- old/libfilezilla-0.9.0/tests/smart_pointer.cpp 2016-02-22 14:42:43.000000000 +0100
+++ new/libfilezilla-0.9.1/tests/smart_pointer.cpp 2017-02-20 22:19:51.000000000 +0100
@@ -7,7 +7,7 @@
* functions handling IP addresses
*/
-class smart_pointer_test : public CppUnit::TestFixture
+class smart_pointer_test final : public CppUnit::TestFixture
{
CPPUNIT_TEST_SUITE(smart_pointer_test);
CPPUNIT_TEST(test_optional);
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libfilezilla-0.9.0/tests/string.cpp new/libfilezilla-0.9.1/tests/string.cpp
--- old/libfilezilla-0.9.0/tests/string.cpp 2016-11-28 17:32:55.000000000 +0100
+++ new/libfilezilla-0.9.1/tests/string.cpp 2017-02-20 22:19:51.000000000 +0100
@@ -6,7 +6,7 @@
* string functions
*/
-class string_test : public CppUnit::TestFixture
+class string_test final : public CppUnit::TestFixture
{
CPPUNIT_TEST_SUITE(string_test);
CPPUNIT_TEST(test_conversion);
@@ -14,6 +14,7 @@
CPPUNIT_TEST(test_conversion_utf8);
CPPUNIT_TEST(test_base64);
CPPUNIT_TEST(test_trim);
+ CPPUNIT_TEST(test_strtok);
CPPUNIT_TEST_SUITE_END();
public:
@@ -25,6 +26,7 @@
void test_conversion_utf8();
void test_base64();
void test_trim();
+ void test_strtok();
};
CPPUNIT_TEST_SUITE_REGISTRATION(string_test);
@@ -32,7 +34,7 @@
void string_test::test_conversion()
{
std::string const s("hello world!");
-
+
std::wstring const w = fz::to_wstring(s);
CPPUNIT_ASSERT_EQUAL(s.size(), w.size());
@@ -124,3 +126,24 @@
CPPUNIT_ASSERT_EQUAL(std::string("foo"), fz::trimmed(std::string("\t foo ")));
CPPUNIT_ASSERT_EQUAL(std::string(""), fz::trimmed(std::string(" \t\r \n \t")));
}
+
+void string_test::test_strtok()
+{
+ auto tokens = fz::strtok<std::string>("hello world", ' ');
+ CPPUNIT_ASSERT_EQUAL(size_t(2), tokens.size());
+ CPPUNIT_ASSERT_EQUAL(std::string("hello"), tokens[0]);
+ CPPUNIT_ASSERT_EQUAL(std::string("world"), tokens[1]);
+
+ tokens = fz::strtok<std::string>(" hello world ", " eo");
+ CPPUNIT_ASSERT_EQUAL(size_t(4), tokens.size());
+ CPPUNIT_ASSERT_EQUAL(std::string("h"), tokens[0]);
+ CPPUNIT_ASSERT_EQUAL(std::string("ll"), tokens[1]);
+ CPPUNIT_ASSERT_EQUAL(std::string("w"), tokens[2]);
+ CPPUNIT_ASSERT_EQUAL(std::string("rld"), tokens[3]);
+
+ tokens = fz::strtok<std::string>("a b c", ' ');
+ CPPUNIT_ASSERT_EQUAL(size_t(3), tokens.size());
+ CPPUNIT_ASSERT_EQUAL(std::string("a"), tokens[0]);
+ CPPUNIT_ASSERT_EQUAL(std::string("b"), tokens[1]);
+ CPPUNIT_ASSERT_EQUAL(std::string("c"), tokens[2]);
+}
1
0
Hello community,
here is the log from the commit of package rust for openSUSE:Factory checked in at 2017-02-25 00:53:55
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/rust (Old)
and /work/SRC/openSUSE:Factory/.rust.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "rust"
Changes:
--------
--- /work/SRC/openSUSE:Factory/rust/rust.changes 2017-02-16 17:06:13.349901428 +0100
+++ /work/SRC/openSUSE:Factory/.rust.new/rust.changes 2017-02-25 00:53:56.244982901 +0100
@@ -1,0 +2,6 @@
+Thu Feb 23 07:36:17 UTC 2017 - bg(a)suse.com
+
+- remove bootstrap for s390x as binaries are available in
+ openSUSE:Factory:zSystems
+
+-------------------------------------------------------------------
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ rust.spec ++++++
--- /var/tmp/diff_new_pack.KLMVeX/_old 2017-02-25 00:53:58.164688355 +0100
+++ /var/tmp/diff_new_pack.KLMVeX/_new 2017-02-25 00:53:58.172687128 +0100
@@ -19,6 +19,9 @@
%global prev_version 1.14.0
%global abi gnu
+%ifarch s390x
+%global _arch s390x
+%endif
%ifarch armv7hl
%global _arch armv7
%global abi gnueabihf
@@ -70,10 +73,6 @@
BuildRequires: fdupes
%endif
-%ifarch s390x
-BuildRequires: cargo-bootstrap
-BuildRequires: rustc-bootstrap >= %{prev_version}
-%else
# There are no successful builds for less than TW or Leap 42.2, so bootstrap
# until such time that there is.
%if %{with bootstrap} || (0%{?suse_version} < 1330 && 0%{?sle_version} <= 120100)
@@ -83,7 +82,6 @@
BuildRequires: cargo
BuildRequires: rust >= %{prev_version}
%endif
-%endif
%description
Rust is a systems programming language focused on three goals:
1
0
Hello community,
here is the log from the commit of package amavisd-new for openSUSE:Factory checked in at 2017-02-25 00:53:47
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/amavisd-new (Old)
and /work/SRC/openSUSE:Factory/.amavisd-new.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "amavisd-new"
Changes:
--------
--- /work/SRC/openSUSE:Factory/amavisd-new/amavisd-new.changes 2016-05-30 09:56:47.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.amavisd-new.new/amavisd-new.changes 2017-02-25 00:53:48.466176437 +0100
@@ -1,0 +2,12 @@
+Wed Feb 22 22:25:51 UTC 2017 - wr(a)rosenauer.org
+
+- fixed DKIM signing by recognizing ORIGINATING
+ (regression in 2.11.0) (dkim-signing.diff)
+ (https://lists.amavis.org/pipermail/amavis-users/2016-July/004428.html)
+
+-------------------------------------------------------------------
+Mon Feb 20 15:14:45 CET 2017 - kukuk(a)suse.de
+
+- Don't require insserv if we don't need it.
+
+-------------------------------------------------------------------
New:
----
dkim-signing.diff
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ amavisd-new.spec ++++++
--- /var/tmp/diff_new_pack.dQlKWn/_old 2017-02-25 00:53:49.617999706 +0100
+++ /var/tmp/diff_new_pack.dQlKWn/_new 2017-02-25 00:53:49.617999706 +0100
@@ -1,7 +1,7 @@
#
# spec file for package amavisd-new
#
-# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -39,6 +39,8 @@
Patch1: activate_virus_scanner.diff
# PATCH-FIX-UPSTREAM -- detect myhostname via Net::Domain::hostfqdn()
Patch2: amavisd-new-2.10.1-myhostname.patch
+# PATCH-FIX-UPSTREAM -- originating was not recognized for DKIM signing
+Patch3: dkim-signing.diff
BuildRequires: sed
BuildRequires: sendmail
BuildRequires: sendmail-devel
@@ -67,7 +69,9 @@
PreReq: coreutils
PreReq: net-tools
PreReq: pwdutils
+%if 0%{?suse_version} < 1230
PreReq: %insserv_prereq
+%endif
PreReq: util-linux
%if 0%{?suse_version} < 1120
Requires: lha
@@ -120,6 +124,7 @@
%setup -q -a 4
%patch1 -p1
%patch2 -p1
+%patch3 -p1
for i in $(find -maxdepth 1 -name "amavisd*" | sed s#./##); do
if [[ $i == *patch ]] ; then continue; fi
if [[ $i == *patch ]] ; then continue; fi
@@ -171,7 +176,7 @@
install -m 755 %{S:2} %{buildroot}/etc/init.d/amavis
ln -s ../../etc/init.d/amavis %{buildroot}/%{_sbindir}/rcamavis
%else
-ln -s ../../sbin/service %{buildroot}/%{_sbindir}/rcamavis
+ln -s service %{buildroot}/%{_sbindir}/rcamavis
%endif
install -m 755 %{S:6} %{buildroot}%{_sbindir}/
cd amavisd-milter*
++++++ dkim-signing.diff ++++++
diff --git a/amavisd b/amavisd
index 7f93194..3ff4028 100755
--- a/amavisd
+++ b/amavisd
@@ -34338,6 +34338,7 @@ sub collect_some_dkim_info($) {
$sig_ind++;
}
Amavis::load_policy_bank($_,$msginfo) for @bank_names;
+ $msginfo->originating(c('originating'));
$msginfo->dkim_signatures_valid(\@signatures_valid) if @signatures_valid;
# if (ll(5) && $sig_ind > 0) {
# # show which header fields are covered by which signature
1
0