diff options
Diffstat (limited to 'network/offlineimap')
4 files changed, 132 insertions, 26 deletions
diff --git a/network/offlineimap/offlineimap.SlackBuild b/network/offlineimap/offlineimap.SlackBuild index 7acacb47f979c..2e32bd9e1e9fd 100644 --- a/network/offlineimap/offlineimap.SlackBuild +++ b/network/offlineimap/offlineimap.SlackBuild @@ -1,9 +1,9 @@ #!/bin/sh # Slackware build script for OfflineIMAP -# Home Page https://github.com/nicolas33/offlineimap +# Home Page http://offlineimap.org/ -# Copyright (c) 2008-2011, Nishant Limbachia, Hoffman Estates, IL, USA +# Copyright (c) 2008-2013, Nishant Limbachia, Hoffman Estates, IL, USA # <nishant _AT_ mnspace _DOT_ net> # All rights reserved. # @@ -25,9 +25,8 @@ # NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS # SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -SRCNAM="nicolas33-offlineimap-v6.4.0-0-gc1120c9" PRGNAM="offlineimap" -VERSION=${VERSION:-6.4.0} +VERSION=${VERSION:-6.5.4} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} @@ -52,8 +51,8 @@ set -e # Exit on most errors rm -fr $TMP/$PRGNAM-$VERSION $PKG mkdir -p $TMP $PKG $OUTPUT cd $TMP -tar xvf $CWD/$SRCNAM.tar.gz -mv nicolas33-offlineimap-b1bff15 $PRGNAM-$VERSION +tar xvf $CWD/$PRGNAM-$VERSION.tar.gz +#mv nicolas33-offlineimap-b1bff15 $PRGNAM-$VERSION cd $PRGNAM-$VERSION chown -R root.root . @@ -63,14 +62,16 @@ find . \ \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ -exec chmod 644 {} \; -### Patch makefile to disable building dev docs -patch -p0 < $CWD/patches/Makefile.doc.patch +# apply patch - more details about the patch are at: +# http://permalink.gmane.org/gmane.mail.imap.offlineimap.general/5539 + +patch -p1 < $CWD/patches/0001-Python-2.6-required-numbered-or-named-format-strings.patch || exit 1 ### build and install python setup.py install --root=$PKG ### make and install docs -make doc +make man mkdir -p $PKG/usr/{man/man1,doc/$PRGNAM-$VERSION/html} $PKG/etc ### install config file @@ -83,10 +84,9 @@ install -m 0644 docs/$PRGNAM.1 $PKG/usr/man/man1 gzip -9 $PKG/usr/man/man1/$PRGNAM.1 cp -a \ - COPYING COPYRIGHT $PRGNAM.conf* \ + COPYING README $PRGNAM.conf* \ $PKG/usr/doc/$PRGNAM-$VERSION -cp -a readme.html docs/FAQ.html docs/INSTALL.html docs/MANUAL.html \ - docs/UPGRADE.html $PKG/usr/doc/$PRGNAM-$VERSION/html +cp -a docs/INSTALL.html docs/MANUAL.html $PKG/usr/doc/$PRGNAM-$VERSION/html cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild mkdir -p $PKG/install diff --git a/network/offlineimap/offlineimap.info b/network/offlineimap/offlineimap.info index 43d215ad299ea..2310c2932cb4e 100644 --- a/network/offlineimap/offlineimap.info +++ b/network/offlineimap/offlineimap.info @@ -1,8 +1,8 @@ PRGNAM="offlineimap" -VERSION="6.4.0" -HOMEPAGE="https://github.com/nicolas33/offlineimap" -DOWNLOAD="https://github.com/nicolas33/offlineimap/tarball/v6.4.0" -MD5SUM="b7596598ca61347b8c96f8412cfd7dc0" +VERSION="6.5.4" +HOMEPAGE="http://offlineimap.org/" +DOWNLOAD="https://github.com/OfflineIMAP/offlineimap/archive/v6.5.4.tar.gz" +MD5SUM="d9ef4374b72235fb431a27ff4ca7f7fe" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="docutils" diff --git a/network/offlineimap/patches/0001-Python-2.6-required-numbered-or-named-format-strings.patch b/network/offlineimap/patches/0001-Python-2.6-required-numbered-or-named-format-strings.patch new file mode 100644 index 0000000000000..60301392f2c26 --- /dev/null +++ b/network/offlineimap/patches/0001-Python-2.6-required-numbered-or-named-format-strings.patch @@ -0,0 +1,116 @@ +From b95b1d017fed7dbb2ecefe26c97b438c7949566e Mon Sep 17 00:00:00 2001 +From: Allan Wind <allan_wind@lifeintegrity.com> +Date: Tue, 17 Apr 2012 01:06:47 -0400 +Subject: [PATCH 1/2] Python 2.6 required numbered (or named) format strings + +--- + offlineimap/folder/Base.py | 2 +- + offlineimap/ui/UIBase.py | 10 +++++----- + test/OLItest/TestRunner.py | 2 +- + test/tests/test_01_basic.py | 8 ++++---- + 4 files changed, 11 insertions(+), 11 deletions(-) + +diff --git a/offlineimap/folder/Base.py b/offlineimap/folder/Base.py +index 6f6f364..b1f5a56 100644 +--- a/offlineimap/folder/Base.py ++++ b/offlineimap/folder/Base.py +@@ -386,7 +386,7 @@ class BaseFolder(object): + self.getmessageuidlist()) + num_to_copy = len(copylist) + if num_to_copy and self.repository.account.dryrun: +- self.ui.info("[DRYRUN] Copy {} messages from {}[{}] to {}".format( ++ self.ui.info("[DRYRUN] Copy {0} messages from {1}[{2}] to {3}".format( + num_to_copy, self, self.repository, dstfolder.repository)) + return + for num, uid in enumerate(copylist): +diff --git a/offlineimap/ui/UIBase.py b/offlineimap/ui/UIBase.py +index eea929d..a268c21 100644 +--- a/offlineimap/ui/UIBase.py ++++ b/offlineimap/ui/UIBase.py +@@ -301,7 +301,7 @@ class UIBase(object): + def makefolder(self, repo, foldername): + """Called when a folder is created""" + prefix = "[DRYRUN] " if self.dryrun else "" +- self.info("{}Creating folder {}[{}]".format( ++ self.info("{0}Creating folder {1}[{2}]".format( + prefix, foldername, repo)) + + def syncingfolder(self, srcrepos, srcfolder, destrepos, destfolder): +@@ -346,9 +346,9 @@ class UIBase(object): + def deletingmessages(self, uidlist, destlist): + ds = self.folderlist(destlist) + prefix = "[DRYRUN] " if self.dryrun else "" +- self.info("{}Deleting {} messages ({}) in {}".format( +- prefix, len(uidlist), +- offlineimap.imaputil.uid_sequence(uidlist), ds)) ++ self.info("{0}Deleting {1} messages ({2}) in {3}".format( ++ prefix, len(uidlist), offlineimap.imaputil.uid_sequence(uidlist), ds ++ )) + + def addingflags(self, uidlist, flags, dest): + self.logger.info("Adding flag %s to %d messages on %s" % ( +@@ -474,7 +474,7 @@ class UIBase(object): + + def callhook(self, msg): + if self.dryrun: +- self.info("[DRYRUN] {}".format(msg)) ++ self.info("[DRYRUN] {0}".format(msg)) + else: + self.info(msg) + +diff --git a/test/OLItest/TestRunner.py b/test/OLItest/TestRunner.py +index 3535b61..c6b58b7 100644 +--- a/test/OLItest/TestRunner.py ++++ b/test/OLItest/TestRunner.py +@@ -163,7 +163,7 @@ class OLITestLib(): + for folder in dirs: + res_t, data = imapobj.delete(b'\"'+folder+b'\"') + assert res_t == 'OK', "Folder deletion of {} failed with error"\ +- ":\n{} {}".format(folder.decode('utf-8'), res_t, data) ++ ":\n{0} {1}".format(folder.decode('utf-8'), res_t, data) + imapobj.logout() + + @classmethod +diff --git a/test/tests/test_01_basic.py b/test/tests/test_01_basic.py +index f5a0ea1..a53b6f0 100644 +--- a/test/tests/test_01_basic.py ++++ b/test/tests/test_01_basic.py +@@ -67,7 +67,7 @@ class TestBasicFunctions(unittest.TestCase): + self.assertEqual(res, "") + boxes, mails = OLITestLib.count_maildir_mails('') + self.assertTrue((boxes, mails)==(0,0), msg="Expected 0 folders and 0 " +- "mails, but sync led to {} folders and {} mails".format( ++ "mails, but sync led to {0} folders and {1} mails".format( + boxes, mails)) + + def test_02_createdir(self): +@@ -82,7 +82,7 @@ class TestBasicFunctions(unittest.TestCase): + self.assertEqual(res, "") + boxes, mails = OLITestLib.count_maildir_mails('') + self.assertTrue((boxes, mails)==(2,0), msg="Expected 2 folders and 0 " +- "mails, but sync led to {} folders and {} mails".format( ++ "mails, but sync led to {0} folders and {1} mails".format( + boxes, mails)) + + def test_03_nametransmismatch(self): +@@ -101,7 +101,7 @@ class TestBasicFunctions(unittest.TestCase): + mismatch = "ERROR: INFINITE FOLDER CREATION DETECTED!" in res + self.assertEqual(mismatch, True, msg="Mismatching nametrans rules did " + "NOT trigger an 'infinite folder generation' error. Output was:\n" +- "{}".format(res)) ++ "{0}".format(res)) + # Write out default config file again + OLITestLib.write_config_file() + +@@ -120,7 +120,7 @@ class TestBasicFunctions(unittest.TestCase): + self.assertEqual(res, "") + boxes, mails = OLITestLib.count_maildir_mails('') + self.assertTrue((boxes, mails)==(1,1), msg="Expected 1 folders and 1 " +- "mails, but sync led to {} folders and {} mails".format( ++ "mails, but sync led to {0} folders and {1} mails".format( + boxes, mails)) + # The local Mail should have been assigned a proper UID now, check! + uids = OLITestLib.get_maildir_uids('INBOX.OLItest') +-- +1.7.2.5 + diff --git a/network/offlineimap/patches/Makefile.doc.patch b/network/offlineimap/patches/Makefile.doc.patch deleted file mode 100644 index 3540a7aed18a4..0000000000000 --- a/network/offlineimap/patches/Makefile.doc.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- Makefile.orig 2011-12-03 12:09:16.547477510 -0600 -+++ Makefile 2011-12-03 12:09:45.284443743 -0600 -@@ -44,7 +44,6 @@ - @$(MAKE) -C docs man - - doc: -- @$(MAKE) -C docs - $(RST2HTML) README.rst readme.html - $(RST2HTML) SubmittingPatches.rst SubmittingPatches.html - $(RST2HTML) Changelog.rst Changelog.html |