From owner-svn-ports-head@FreeBSD.ORG Wed Apr 8 11:46:22 2015 Return-Path: Delivered-To: svn-ports-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id CD0A8930; Wed, 8 Apr 2015 11:46:22 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 9EA5F9B1; Wed, 8 Apr 2015 11:46:22 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t38BkMNg069431; Wed, 8 Apr 2015 11:46:22 GMT (envelope-from kwm@FreeBSD.org) Received: (from kwm@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t38BkMCM069429; Wed, 8 Apr 2015 11:46:22 GMT (envelope-from kwm@FreeBSD.org) Message-Id: <201504081146.t38BkMCM069429@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: kwm set sender to kwm@FreeBSD.org using -f From: Koop Mast Date: Wed, 8 Apr 2015 11:46:22 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r383564 - in head/mail/evolution: . files X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 08 Apr 2015 11:46:22 -0000 Author: kwm Date: Wed Apr 8 11:46:21 2015 New Revision: 383564 URL: https://svnweb.freebsd.org/changeset/ports/383564 Log: Fix the backup/restore feature of evolution. Reported by: Randall R. King Obtained from: upstream (patch by Ting-Wei Lan) Added: head/mail/evolution/files/patch-modules_backup-restore_evolution-backup-tool.c (contents, props changed) Modified: head/mail/evolution/Makefile Modified: head/mail/evolution/Makefile ============================================================================== --- head/mail/evolution/Makefile Wed Apr 8 11:29:32 2015 (r383563) +++ head/mail/evolution/Makefile Wed Apr 8 11:46:21 2015 (r383564) @@ -4,6 +4,7 @@ PORTNAME= evolution PORTVERSION= 3.12.11 +PORTREVISION= 1 CATEGORIES= mail gnome MASTER_SITES= GNOME DIST_SUBDIR= gnome3 Added: head/mail/evolution/files/patch-modules_backup-restore_evolution-backup-tool.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/mail/evolution/files/patch-modules_backup-restore_evolution-backup-tool.c Wed Apr 8 11:46:21 2015 (r383564) @@ -0,0 +1,33 @@ +From d9e63d55cd8ce597d9668dd4dd6f78c0900c9a94 Mon Sep 17 00:00:00 2001 +From: Ting-Wei Lan +Date: Wed, 8 Apr 2015 12:21:47 +0200 +Subject: Bug 747461 - The tar command used to restore backups doesn't work on + FreeBSD + + +diff --git a/modules/backup-restore/evolution-backup-tool.c b/modules/backup-restore/evolution-backup-tool.c +index 840cee1..a288ce6 100644 +--- modules/backup-restore/evolution-backup-tool.c ++++ modules/backup-restore/evolution-backup-tool.c +@@ -538,14 +538,14 @@ restore (const gchar *filename, + g_mkdir_with_parents (e_get_user_config_dir (), 0700); + + command = g_strdup_printf ( +- "cd $DATADIR && tar xzf %s %s --strip-components=%d", +- quotedfname, data_dir, get_dir_level (data_dir)); ++ "cd $DATADIR && tar --strip-components %d -xzf %s %s", ++ get_dir_level (data_dir), quotedfname, data_dir); + run_cmd (command); + g_free (command); + + command = g_strdup_printf ( +- "cd $CONFIGDIR && tar xzf %s %s --strip-components=%d", +- quotedfname, config_dir, get_dir_level (config_dir)); ++ "cd $CONFIGDIR && tar --strip-components %d -xzf %s %s", ++ get_dir_level (config_dir), quotedfname, config_dir); + run_cmd (command); + g_free (command); + +-- +cgit v0.10.2 +