commit: 674f36586e924f5df98f5cc05f72b95cdcd0faab
Author: Andrew Savchenko <bircoph <AT> gmail <DOT> com>
AuthorDate: Wed Jan 28 17:41:39 2015 +0000
Commit: Andrew Savchenko <bircoph <AT> gmail <DOT> com>
CommitDate: Wed Jan 28 17:41:39 2015 +0000
URL:
http://sources.gentoo.org/gitweb/?p=dev/bircoph.git;a=commit;h=674f3658
add missed patch
---
app-admin/clsync/ChangeLog | 4 +++
app-admin/clsync/Manifest | 2 +-
app-admin/clsync/files/clsync-0.4-unset_env.patch | 43 +++++++++++++++++++++++
3 files changed, 48 insertions(+), 1 deletion(-)
diff --git a/app-admin/clsync/ChangeLog b/app-admin/clsync/ChangeLog
index e74681b..8e90b0d 100644
--- a/app-admin/clsync/ChangeLog
+++ b/app-admin/clsync/ChangeLog
@@ -2,6 +2,10 @@
# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
# $Header: $
+ 28 Jan 2015; Andrew Savchenko <birc...@gentoo.org>
+ +files/clsync-0.4-unset_env.patch:
+ Add missed patch
+
*clsync-0.4-r1 (28 Jan 2015)
28 Jan 2015; Andrew Savchenko <birc...@gentoo.org> -clsync-0.4.ebuild,
diff --git a/app-admin/clsync/Manifest b/app-admin/clsync/Manifest
index a840240..cde05f9 100644
--- a/app-admin/clsync/Manifest
+++ b/app-admin/clsync/Manifest
@@ -18,5 +18,5 @@ EBUILD clsync-0.2.1.ebuild 2148 SHA256
9069d6bbba621a368ce6f1fd1602d984aa0c37a52
EBUILD clsync-0.3.ebuild 2219 SHA256
71f1c52b62d0379c1bf03ce4a49fe2cc612697008aabbf58d3b7b882952c35ec SHA512
2cb4ce6f305a1ebb020157915324f824cf554ccd95761ebe13b4099f8418676173b9953994095c29c16b11942d7fb6a3029cdb5b94c572803ca0af183d16c659
WHIRLPOOL
37766e003335286b13a4dad913d838f3cb4b75d3b216b5b3265d93a36353f15e365c93d0768341d6bbaaf4fbb785ff2774f554fd57d009fc396ae2fb6aaacac3
EBUILD clsync-0.4-r1.ebuild 3282 SHA256
52524cd9c462298077f4ead0e55ade91b5f6ae9c3484da1f5dc9fae5b00f7a95 SHA512
d4f39fd3298c5a854059b4dc892b25033eec495549b10511fe7e766e78ce7c78a30c47c3d8aa23e34cf17836cdf03b834a82c5d5ce6891fba9085216598682a2
WHIRLPOOL
7a27af4438dfed039554f2b95f88cad32883a8639e64f2d6800e09dfb2c08c99339bc43007e06cfe39e6fe89b346486d92e1b731267a122de0730821591dcbe5
EBUILD clsync-9999.ebuild 2921 SHA256
368bc238e62e6fc786f7b658e46a4675826df7f15031f9e0b4e433c293ae76a1 SHA512
b3a180645cc867d6a552472adbf4f59c35a05e43d3dc7dadafb8806266db8c3834eef0650dbb097e2cbb7344db5da46c73f17867949e56ecba17d4bb757f3d19
WHIRLPOOL
597b2f3e058c2e33c61105dd80d0afc30f719a7874d1d87fc394edbfa8442cf4114dd6ad7bbd26ef437b7e454f23914f45bcbcc77c6df86f6f6b345f7b70d34c
-MISC ChangeLog 4523 SHA256
9803a2ae1798952b6b5f214e2b166a9c0f90283b20d3b456022348cc2fa4b1c8 SHA512
5837f659f569f81daa1729d36b3b5e9eb27ef6d6118acfa3189a22244f3d2a70a9c653adb1485f061fb49dda90213629ac7765143b51099a3b176fbd238a949f
WHIRLPOOL
1774f8fd52b83a060fc5fc193e55280824da2119766dcba118e0cebfe31a4a0d916aab36c915d936e0440340c5f41bf99899dbb92be6d42c748a39a3bfb32638
+MISC ChangeLog 4633 SHA256
be9571b8f258f3bbef28621c158043f321baf85d12c4769bddb89d0d1b41c5ea SHA512
ac973920cd56c09ebe43179093f3a6a6a1411d897ed1d4898bfd456229805a7dd010a439fc7524749d24c19f01716dae1993b038f091b99eeb9477d501e52ecb
WHIRLPOOL
1dada80b9b93cf565ba66cd6490351f3bbe7a42865da3cdf0ccb28f63f9d345c840661e207c1a768852dbd360224ceaf99a85c4b58284ca72035d290b6b3cb9d
MISC metadata.xml 1668 SHA256
b11ec92e63438d8968523e38977cfca79c2598fd5b78a663fe647393f322c5b8 SHA512
9d24c1fbb0eb18971aea4bead3ee6d28b48891699c17bfe238866317f90fbe3974d65af2d3673397f6370c96de7d34d9f3b08e62b99dc0dc285bbf35bdf96bf5
WHIRLPOOL
42087cfebd77371e899b50a370334c589f917f4368d877041d874abc836d52ed70b1d24ea475b08f906df81d65b87c105a170b27e747558fb789795196dd4f77
diff --git a/app-admin/clsync/files/clsync-0.4-unset_env.patch
b/app-admin/clsync/files/clsync-0.4-unset_env.patch
new file mode 100644
index 0000000..54a45d2
--- /dev/null
+++ b/app-admin/clsync/files/clsync-0.4-unset_env.patch
@@ -0,0 +1,43 @@
+commit 596f79fa65af66afdff4cf24b9135935bf511108
+Author: Dmitry Yu Okunev <dyoku...@ut.mephi.ru>
+Date: Wed Jan 28 14:27:51 2015 +0300
+
+ Fixed a segfault on non-set "HOME" environment variable
+
+diff --git a/main.c b/main.c
+index 792f1e4..176e1f4 100644
+--- a/main.c
++++ b/main.c
+@@ -1731,18 +1731,18 @@ int configs_parse(ctx_t *ctx_p, paramsource_t
paramsource) {
+ char **config_path_p = config_paths, *config_path_real =
xmalloc(PATH_MAX);
+ size_t config_path_real_size=PATH_MAX;
+
+- char *homedir = getenv("HOME");
+- size_t homedir_len = strlen(homedir);
++ char *homedir = getenv("HOME");
++ size_t homedir_len = (homedir == NULL ? 0 :strlen(homedir));
+
+- while(*config_path_p != NULL) {
++ while (*config_path_p != NULL) {
+ size_t config_path_len = strlen(*config_path_p);
+
+- if(config_path_len+homedir_len+3 >
config_path_real_size) {
++ if (config_path_len+homedir_len+3 >
config_path_real_size) {
+ config_path_real_size =
config_path_len+homedir_len+3;
+ config_path_real =
xmalloc(config_path_real_size);
+ }
+
+- if(*config_path_p[0] != '/') {
++ if ((*config_path_p[0] != '/') && (homedir_len >= 0)) {
+ memcpy(config_path_real, homedir, homedir_len);
+ config_path_real[homedir_len] = '/';
+ memcpy(&config_path_real[homedir_len+1],
*config_path_p, config_path_len+1);
+@@ -1750,7 +1750,7 @@ int configs_parse(ctx_t *ctx_p, paramsource_t
paramsource) {
+ memcpy(config_path_real, *config_path_p,
config_path_len+1);
+
+ debug(1, "Trying config-file \"%s\" (case #1)",
config_path_real);
+- if(!g_key_file_load_from_file(gkf, config_path_real,
G_KEY_FILE_NONE, NULL)) {
++ if (!g_key_file_load_from_file(gkf, config_path_real,
G_KEY_FILE_NONE, NULL)) {
+ debug(1, "Cannot open/parse file \"%s\"",
config_path_real);
+ config_path_p++;
+ continue;
