ALT Linux Team development discussions
 help / color / mirror / Atom feed
From: Vladislav Zavjalov <slazav@altlinux.org>
To: ALT Linux Team development discussions <devel@lists.altlinux.org>
Subject: Re: [devel] Fwd: fuse-encfs-1.5.2-alt7: Sisyphus/x86_64 test rebuild failed [3]
Date: Fri, 12 Mar 2010 00:58:06 +0300
Message-ID: <20100311215806.GB29975@imap.altlinux.org> (raw)
In-Reply-To: <20100311204259.GA29975@imap.altlinux.org>

[-- Attachment #1: Type: text/plain, Size: 144 bytes --]

> Так что проблема в boost, и как ее хорошо обойти  в fuse-encfs -
> непонятно...

Придумал не слишком красивенький обход (в приложении)

Слава

[-- Attachment #2: 0001-boost-serialization-version-workaround.patch --]
[-- Type: text/plain, Size: 2267 bytes --]

>From 37e22a7215e7cd68aa5ee49a996bbed302b7c25e Mon Sep 17 00:00:00 2001
From: Vladislav Zavjalov <slazav@altlinux.org>
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<class Archive>
         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<class Archive>
         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<class Archive>
-        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


  reply	other threads:[~2010-03-11 21:58 UTC|newest]

Thread overview: 8+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2010-03-11 12:49 ` Denis Smirnov
2010-03-11 13:03   ` Dmitry V. Levin
2010-03-11 17:52     ` Денис Смирнов
2010-03-11 20:42       ` Vladislav Zavjalov
2010-03-11 21:58         ` Vladislav Zavjalov [this message]
2010-03-12 15:21           ` Денис Смирнов
2010-03-12 15:49             ` Vladislav Zavjalov
2010-03-12 16:33               ` Денис Смирнов

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20100311215806.GB29975@imap.altlinux.org \
    --to=slazav@altlinux.org \
    --cc=devel@lists.altlinux.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link

ALT Linux Team development discussions

This inbox may be cloned and mirrored by anyone:

	git clone --mirror http://lore.altlinux.org/devel/0 devel/git/0.git

	# If you have public-inbox 1.1+ installed, you may
	# initialize and index your mirror using the following commands:
	public-inbox-init -V2 devel devel/ http://lore.altlinux.org/devel \
		devel@altlinux.org devel@altlinux.ru devel@lists.altlinux.org devel@lists.altlinux.ru devel@linux.iplabs.ru mandrake-russian@linuxteam.iplabs.ru sisyphus@linuxteam.iplabs.ru
	public-inbox-index devel

Example config snippet for mirrors.
Newsgroup available over NNTP:
	nntp://lore.altlinux.org/org.altlinux.lists.devel


AGPL code for this site: git clone https://public-inbox.org/public-inbox.git