From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Date: Fri, 12 Mar 2010 00:58:06 +0300 From: Vladislav Zavjalov To: ALT Linux Team development discussions Message-ID: <20100311215806.GB29975@imap.altlinux.org> References: <20100310082425.5886C1D96765@ssh.git.orion.altlinux.org> <20100311130353.GA22496@wo.int.altlinux.org> <20100311175205.GB4491@mw.office.seiros.ru> <20100311204259.GA29975@imap.altlinux.org> Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="5mCyUwZo2JvN/JJP" Content-Disposition: inline Content-Transfer-Encoding: 8bit In-Reply-To: <20100311204259.GA29975@imap.altlinux.org> User-Agent: Mutt/1.4.2.3i Subject: Re: [devel] Fwd: fuse-encfs-1.5.2-alt7: Sisyphus/x86_64 test rebuild failed [3] X-BeenThere: devel@lists.altlinux.org X-Mailman-Version: 2.1.12 Precedence: list Reply-To: ALT Linux Team development discussions List-Id: ALT Linux Team development discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 11 Mar 2010 21:58:06 -0000 Archived-At: List-Archive: List-Post: --5mCyUwZo2JvN/JJP Content-Type: text/plain; charset=koi8-r Content-Disposition: inline Content-Transfer-Encoding: 8bit > Так что проблема в boost, и как ее хорошо обойти в fuse-encfs - > непонятно... Придумал не слишком красивенький обход (в приложении) Слава --5mCyUwZo2JvN/JJP Content-Type: text/plain; charset=us-ascii Content-Disposition: attachment; filename="0001-boost-serialization-version-workaround.patch" >>From 37e22a7215e7cd68aa5ee49a996bbed302b7c25e Mon Sep 17 00:00:00 2001 From: Vladislav Zavjalov Date: Fri, 12 Mar 2010 03:44:21 +0300 Subject: [PATCH] boost::serialization::version workaround --- fuse-encfs/encfs/FileUtils.cpp | 18 +++++++++++++++++- 1 files changed, 17 insertions(+), 1 deletions(-) diff --git a/fuse-encfs/encfs/FileUtils.cpp b/fuse-encfs/encfs/FileUtils.cpp index 73a589f..9e69b57 100644 --- a/fuse-encfs/encfs/FileUtils.cpp +++ b/fuse-encfs/encfs/FileUtils.cpp @@ -131,6 +131,10 @@ namespace boost void save(Archive &ar, const EncFSConfig &cfg, unsigned int version) { + //workaround: some boost versions wraps version to 65536! + //works for years 2006..2012 + if (version < 65536) version+=65536*306; + (void)version; ar << make_nvp("creator", cfg.creator); ar << make_nvp("cipherAlg", cfg.cipherIface); @@ -161,6 +165,10 @@ namespace boost template void load(Archive &ar, EncFSConfig &cfg, unsigned int version) { + //workaround: some boost versions wraps version to 65536! + //works for years 2006..2012 + if (version < 65536) version+=65536*306; + cfg.subVersion = version; ar >> make_nvp("creator", cfg.creator); ar >> make_nvp("cipherAlg", cfg.cipherIface); @@ -207,12 +215,20 @@ namespace boost template void serialize(Archive &ar, EncFSConfig &cfg, unsigned int version) { + //workaround: some boost versions wraps version to 65536! + //works for years 2006..2012 + if (version < 65536) version+=65536*306; + split_free(ar, cfg, version); } template - void serialize(Archive &ar, Interface &i, const unsigned int version) + void serialize(Archive &ar, Interface &i, unsigned int version) { + //workaround: some boost versions wraps version to 65536! + //works for years 2006..2012 + if (version < 65536) version+=65536*306; + (void)version; ar & make_nvp("name", i.name()); ar & make_nvp("major", i.current()); -- 1.6.5.3 --5mCyUwZo2JvN/JJP--