upgrade-0.9-bincimap.patch
author Tomas Zeman <tzeman@volny.cz>
Wed, 15 Feb 2012 15:09:08 +0100
changeset 95 10ab1ccef2cc
parent 79 5385aee34169
permissions -rw-r--r--
diet-ucspi-ipc.patch: folded w/ upgrade-0.9-diet-ucspi-ipc.patch
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
79
5385aee34169 upgrade-0.9.patch: split into pkg diffs
Tomas Zeman <tzeman@volny.cz>
parents:
diff changeset
     1
bincimap: upgrade for Frugalware 0.9
5385aee34169 upgrade-0.9.patch: split into pkg diffs
Tomas Zeman <tzeman@volny.cz>
parents:
diff changeset
     2
5385aee34169 upgrade-0.9.patch: split into pkg diffs
Tomas Zeman <tzeman@volny.cz>
parents:
diff changeset
     3
diff --git a/source/custom/bincimap/FrugalBuild b/source/custom/bincimap/FrugalBuild
5385aee34169 upgrade-0.9.patch: split into pkg diffs
Tomas Zeman <tzeman@volny.cz>
parents:
diff changeset
     4
index 74900bf..99eaac6 100644
5385aee34169 upgrade-0.9.patch: split into pkg diffs
Tomas Zeman <tzeman@volny.cz>
parents:
diff changeset
     5
--- a/source/custom/bincimap/FrugalBuild
5385aee34169 upgrade-0.9.patch: split into pkg diffs
Tomas Zeman <tzeman@volny.cz>
parents:
diff changeset
     6
+++ b/source/custom/bincimap/FrugalBuild
5385aee34169 upgrade-0.9.patch: split into pkg diffs
Tomas Zeman <tzeman@volny.cz>
parents:
diff changeset
     7
@@ -2,7 +2,7 @@
5385aee34169 upgrade-0.9.patch: split into pkg diffs
Tomas Zeman <tzeman@volny.cz>
parents:
diff changeset
     8
 
5385aee34169 upgrade-0.9.patch: split into pkg diffs
Tomas Zeman <tzeman@volny.cz>
parents:
diff changeset
     9
 pkgname=bincimap
5385aee34169 upgrade-0.9.patch: split into pkg diffs
Tomas Zeman <tzeman@volny.cz>
parents:
diff changeset
    10
 pkgver=1.2.13
5385aee34169 upgrade-0.9.patch: split into pkg diffs
Tomas Zeman <tzeman@volny.cz>
parents:
diff changeset
    11
-pkgrel=1
5385aee34169 upgrade-0.9.patch: split into pkg diffs
Tomas Zeman <tzeman@volny.cz>
parents:
diff changeset
    12
+pkgrel=2
5385aee34169 upgrade-0.9.patch: split into pkg diffs
Tomas Zeman <tzeman@volny.cz>
parents:
diff changeset
    13
 pkgdesc="A well designed, modular IMAP server for Maildir."
5385aee34169 upgrade-0.9.patch: split into pkg diffs
Tomas Zeman <tzeman@volny.cz>
parents:
diff changeset
    14
 url="http://www.bincimap.org"
5385aee34169 upgrade-0.9.patch: split into pkg diffs
Tomas Zeman <tzeman@volny.cz>
parents:
diff changeset
    15
 archs=(i686)
5385aee34169 upgrade-0.9.patch: split into pkg diffs
Tomas Zeman <tzeman@volny.cz>
parents:
diff changeset
    16
@@ -10,12 +10,14 @@ up2date="lynx $url -dump -nolist|grep 'latest stable'|head -1|sed -e 's/.*is \([
5385aee34169 upgrade-0.9.patch: split into pkg diffs
Tomas Zeman <tzeman@volny.cz>
parents:
diff changeset
    17
 depends=('openssl')
5385aee34169 upgrade-0.9.patch: split into pkg diffs
Tomas Zeman <tzeman@volny.cz>
parents:
diff changeset
    18
 install="$pkgname.install"
5385aee34169 upgrade-0.9.patch: split into pkg diffs
Tomas Zeman <tzeman@volny.cz>
parents:
diff changeset
    19
 backup=(etc/bincimap/bincimap.conf)
5385aee34169 upgrade-0.9.patch: split into pkg diffs
Tomas Zeman <tzeman@volny.cz>
parents:
diff changeset
    20
-source=($url/dl/tarballs/1.2/$pkgname-${pkgver}final.tar.bz2)
5385aee34169 upgrade-0.9.patch: split into pkg diffs
Tomas Zeman <tzeman@volny.cz>
parents:
diff changeset
    21
-sha1sums=('cdbc1bf95decbe76e0a218025c351b8174b4b485')
5385aee34169 upgrade-0.9.patch: split into pkg diffs
Tomas Zeman <tzeman@volny.cz>
parents:
diff changeset
    22
+source=($url/dl/tarballs/1.2/$pkgname-${pkgver}final.tar.bz2 bincimap-1.2.13-gcc43.patch)
5385aee34169 upgrade-0.9.patch: split into pkg diffs
Tomas Zeman <tzeman@volny.cz>
parents:
diff changeset
    23
+sha1sums=('cdbc1bf95decbe76e0a218025c351b8174b4b485' \
5385aee34169 upgrade-0.9.patch: split into pkg diffs
Tomas Zeman <tzeman@volny.cz>
parents:
diff changeset
    24
+          'ec98f1d1b30688e237bc1682a960fc02a0f4888b')
5385aee34169 upgrade-0.9.patch: split into pkg diffs
Tomas Zeman <tzeman@volny.cz>
parents:
diff changeset
    25
 provides=('imap-server')
5385aee34169 upgrade-0.9.patch: split into pkg diffs
Tomas Zeman <tzeman@volny.cz>
parents:
diff changeset
    26
 
5385aee34169 upgrade-0.9.patch: split into pkg diffs
Tomas Zeman <tzeman@volny.cz>
parents:
diff changeset
    27
 build() {
5385aee34169 upgrade-0.9.patch: split into pkg diffs
Tomas Zeman <tzeman@volny.cz>
parents:
diff changeset
    28
 	Fcd $pkgname-${pkgver}final
5385aee34169 upgrade-0.9.patch: split into pkg diffs
Tomas Zeman <tzeman@volny.cz>
parents:
diff changeset
    29
+	Fpatchall
5385aee34169 upgrade-0.9.patch: split into pkg diffs
Tomas Zeman <tzeman@volny.cz>
parents:
diff changeset
    30
 	./configure --prefix=/usr --sysconfdir=/etc/bincimap \
5385aee34169 upgrade-0.9.patch: split into pkg diffs
Tomas Zeman <tzeman@volny.cz>
parents:
diff changeset
    31
 		--localstatedir=/var --with-ssl
5385aee34169 upgrade-0.9.patch: split into pkg diffs
Tomas Zeman <tzeman@volny.cz>
parents:
diff changeset
    32
 	make || Fdie
5385aee34169 upgrade-0.9.patch: split into pkg diffs
Tomas Zeman <tzeman@volny.cz>
parents:
diff changeset
    33
diff --git a/source/custom/bincimap/bincimap-1.2.13-gcc43.patch b/source/custom/bincimap/bincimap-1.2.13-gcc43.patch
5385aee34169 upgrade-0.9.patch: split into pkg diffs
Tomas Zeman <tzeman@volny.cz>
parents:
diff changeset
    34
new file mode 100644
5385aee34169 upgrade-0.9.patch: split into pkg diffs
Tomas Zeman <tzeman@volny.cz>
parents:
diff changeset
    35
index 0000000..76cb3a9
5385aee34169 upgrade-0.9.patch: split into pkg diffs
Tomas Zeman <tzeman@volny.cz>
parents:
diff changeset
    36
--- /dev/null
5385aee34169 upgrade-0.9.patch: split into pkg diffs
Tomas Zeman <tzeman@volny.cz>
parents:
diff changeset
    37
+++ b/source/custom/bincimap/bincimap-1.2.13-gcc43.patch
5385aee34169 upgrade-0.9.patch: split into pkg diffs
Tomas Zeman <tzeman@volny.cz>
parents:
diff changeset
    38
@@ -0,0 +1,64 @@
5385aee34169 upgrade-0.9.patch: split into pkg diffs
Tomas Zeman <tzeman@volny.cz>
parents:
diff changeset
    39
+diff -NrU5 bincimap-1.2.13final.orig/src/convert.cc bincimap-1.2.13final/src/convert.cc
5385aee34169 upgrade-0.9.patch: split into pkg diffs
Tomas Zeman <tzeman@volny.cz>
parents:
diff changeset
    40
+--- bincimap-1.2.13final.orig/src/convert.cc	2005-01-08 11:20:48.000000000 +0100
5385aee34169 upgrade-0.9.patch: split into pkg diffs
Tomas Zeman <tzeman@volny.cz>
parents:
diff changeset
    41
++++ bincimap-1.2.13final/src/convert.cc	2008-05-07 12:32:33.000000000 +0200
5385aee34169 upgrade-0.9.patch: split into pkg diffs
Tomas Zeman <tzeman@volny.cz>
parents:
diff changeset
    42
+@@ -37,10 +37,12 @@
5385aee34169 upgrade-0.9.patch: split into pkg diffs
Tomas Zeman <tzeman@volny.cz>
parents:
diff changeset
    43
+ 
5385aee34169 upgrade-0.9.patch: split into pkg diffs
Tomas Zeman <tzeman@volny.cz>
parents:
diff changeset
    44
+ #include "convert.h"
5385aee34169 upgrade-0.9.patch: split into pkg diffs
Tomas Zeman <tzeman@volny.cz>
parents:
diff changeset
    45
+ #include "io.h"
5385aee34169 upgrade-0.9.patch: split into pkg diffs
Tomas Zeman <tzeman@volny.cz>
parents:
diff changeset
    46
+ #include <string>
5385aee34169 upgrade-0.9.patch: split into pkg diffs
Tomas Zeman <tzeman@volny.cz>
parents:
diff changeset
    47
+ 
5385aee34169 upgrade-0.9.patch: split into pkg diffs
Tomas Zeman <tzeman@volny.cz>
parents:
diff changeset
    48
++#include <cstring>
5385aee34169 upgrade-0.9.patch: split into pkg diffs
Tomas Zeman <tzeman@volny.cz>
parents:
diff changeset
    49
++
5385aee34169 upgrade-0.9.patch: split into pkg diffs
Tomas Zeman <tzeman@volny.cz>
parents:
diff changeset
    50
+ using namespace ::std;
5385aee34169 upgrade-0.9.patch: split into pkg diffs
Tomas Zeman <tzeman@volny.cz>
parents:
diff changeset
    51
+ using namespace Binc;
5385aee34169 upgrade-0.9.patch: split into pkg diffs
Tomas Zeman <tzeman@volny.cz>
parents:
diff changeset
    52
+ 
5385aee34169 upgrade-0.9.patch: split into pkg diffs
Tomas Zeman <tzeman@volny.cz>
parents:
diff changeset
    53
+ //------------------------------------------------------------------------
5385aee34169 upgrade-0.9.patch: split into pkg diffs
Tomas Zeman <tzeman@volny.cz>
parents:
diff changeset
    54
+ BincStream::BincStream(void)
5385aee34169 upgrade-0.9.patch: split into pkg diffs
Tomas Zeman <tzeman@volny.cz>
parents:
diff changeset
    55
+diff -NrU5 bincimap-1.2.13final.orig/src/convert.h bincimap-1.2.13final/src/convert.h
5385aee34169 upgrade-0.9.patch: split into pkg diffs
Tomas Zeman <tzeman@volny.cz>
parents:
diff changeset
    56
+--- bincimap-1.2.13final.orig/src/convert.h	2005-02-08 21:30:22.000000000 +0100
5385aee34169 upgrade-0.9.patch: split into pkg diffs
Tomas Zeman <tzeman@volny.cz>
parents:
diff changeset
    57
++++ bincimap-1.2.13final/src/convert.h	2008-05-07 12:32:33.000000000 +0200
5385aee34169 upgrade-0.9.patch: split into pkg diffs
Tomas Zeman <tzeman@volny.cz>
parents:
diff changeset
    58
+@@ -35,10 +35,11 @@
5385aee34169 upgrade-0.9.patch: split into pkg diffs
Tomas Zeman <tzeman@volny.cz>
parents:
diff changeset
    59
+ #include <config.h>
5385aee34169 upgrade-0.9.patch: split into pkg diffs
Tomas Zeman <tzeman@volny.cz>
parents:
diff changeset
    60
+ #endif
5385aee34169 upgrade-0.9.patch: split into pkg diffs
Tomas Zeman <tzeman@volny.cz>
parents:
diff changeset
    61
+ 
5385aee34169 upgrade-0.9.patch: split into pkg diffs
Tomas Zeman <tzeman@volny.cz>
parents:
diff changeset
    62
+ #ifndef convert_h_included
5385aee34169 upgrade-0.9.patch: split into pkg diffs
Tomas Zeman <tzeman@volny.cz>
parents:
diff changeset
    63
+ #define convert_h_included
5385aee34169 upgrade-0.9.patch: split into pkg diffs
Tomas Zeman <tzeman@volny.cz>
parents:
diff changeset
    64
++#include <cstdlib>
5385aee34169 upgrade-0.9.patch: split into pkg diffs
Tomas Zeman <tzeman@volny.cz>
parents:
diff changeset
    65
+ #include <string>
5385aee34169 upgrade-0.9.patch: split into pkg diffs
Tomas Zeman <tzeman@volny.cz>
parents:
diff changeset
    66
+ #include <vector>
5385aee34169 upgrade-0.9.patch: split into pkg diffs
Tomas Zeman <tzeman@volny.cz>
parents:
diff changeset
    67
+ #include <iomanip>
5385aee34169 upgrade-0.9.patch: split into pkg diffs
Tomas Zeman <tzeman@volny.cz>
parents:
diff changeset
    68
+ #include <iostream>
5385aee34169 upgrade-0.9.patch: split into pkg diffs
Tomas Zeman <tzeman@volny.cz>
parents:
diff changeset
    69
+ 
5385aee34169 upgrade-0.9.patch: split into pkg diffs
Tomas Zeman <tzeman@volny.cz>
parents:
diff changeset
    70
+@@ -46,10 +47,12 @@
5385aee34169 upgrade-0.9.patch: split into pkg diffs
Tomas Zeman <tzeman@volny.cz>
parents:
diff changeset
    71
+ #include <sys/stat.h>
5385aee34169 upgrade-0.9.patch: split into pkg diffs
Tomas Zeman <tzeman@volny.cz>
parents:
diff changeset
    72
+ 
5385aee34169 upgrade-0.9.patch: split into pkg diffs
Tomas Zeman <tzeman@volny.cz>
parents:
diff changeset
    73
+ #include "address.h"
5385aee34169 upgrade-0.9.patch: split into pkg diffs
Tomas Zeman <tzeman@volny.cz>
parents:
diff changeset
    74
+ #include "depot.h"
5385aee34169 upgrade-0.9.patch: split into pkg diffs
Tomas Zeman <tzeman@volny.cz>
parents:
diff changeset
    75
+ 
5385aee34169 upgrade-0.9.patch: split into pkg diffs
Tomas Zeman <tzeman@volny.cz>
parents:
diff changeset
    76
++#include <cstring>
5385aee34169 upgrade-0.9.patch: split into pkg diffs
Tomas Zeman <tzeman@volny.cz>
parents:
diff changeset
    77
++
5385aee34169 upgrade-0.9.patch: split into pkg diffs
Tomas Zeman <tzeman@volny.cz>
parents:
diff changeset
    78
+ namespace Binc {
5385aee34169 upgrade-0.9.patch: split into pkg diffs
Tomas Zeman <tzeman@volny.cz>
parents:
diff changeset
    79
+ 
5385aee34169 upgrade-0.9.patch: split into pkg diffs
Tomas Zeman <tzeman@volny.cz>
parents:
diff changeset
    80
+   //----------------------------------------------------------------------
5385aee34169 upgrade-0.9.patch: split into pkg diffs
Tomas Zeman <tzeman@volny.cz>
parents:
diff changeset
    81
+   inline std::string toString(int i_in)
5385aee34169 upgrade-0.9.patch: split into pkg diffs
Tomas Zeman <tzeman@volny.cz>
parents:
diff changeset
    82
+   {
5385aee34169 upgrade-0.9.patch: split into pkg diffs
Tomas Zeman <tzeman@volny.cz>
parents:
diff changeset
    83
+diff -NrU5 bincimap-1.2.13final.orig/src/tools.cc bincimap-1.2.13final/src/tools.cc
5385aee34169 upgrade-0.9.patch: split into pkg diffs
Tomas Zeman <tzeman@volny.cz>
parents:
diff changeset
    84
+--- bincimap-1.2.13final.orig/src/tools.cc	2005-01-08 11:20:48.000000000 +0100
5385aee34169 upgrade-0.9.patch: split into pkg diffs
Tomas Zeman <tzeman@volny.cz>
parents:
diff changeset
    85
++++ bincimap-1.2.13final/src/tools.cc	2008-05-07 12:32:33.000000000 +0200
5385aee34169 upgrade-0.9.patch: split into pkg diffs
Tomas Zeman <tzeman@volny.cz>
parents:
diff changeset
    86
+@@ -33,13 +33,16 @@
5385aee34169 upgrade-0.9.patch: split into pkg diffs
Tomas Zeman <tzeman@volny.cz>
parents:
diff changeset
    87
+  */
5385aee34169 upgrade-0.9.patch: split into pkg diffs
Tomas Zeman <tzeman@volny.cz>
parents:
diff changeset
    88
+ #ifdef HAVE_CONFIG_H
5385aee34169 upgrade-0.9.patch: split into pkg diffs
Tomas Zeman <tzeman@volny.cz>
parents:
diff changeset
    89
+ #include <config.h>
5385aee34169 upgrade-0.9.patch: split into pkg diffs
Tomas Zeman <tzeman@volny.cz>
parents:
diff changeset
    90
+ #endif
5385aee34169 upgrade-0.9.patch: split into pkg diffs
Tomas Zeman <tzeman@volny.cz>
parents:
diff changeset
    91
+ #include <errno.h>
5385aee34169 upgrade-0.9.patch: split into pkg diffs
Tomas Zeman <tzeman@volny.cz>
parents:
diff changeset
    92
++#include <cstdlib>
5385aee34169 upgrade-0.9.patch: split into pkg diffs
Tomas Zeman <tzeman@volny.cz>
parents:
diff changeset
    93
+ 
5385aee34169 upgrade-0.9.patch: split into pkg diffs
Tomas Zeman <tzeman@volny.cz>
parents:
diff changeset
    94
+ #include "tools.h"
5385aee34169 upgrade-0.9.patch: split into pkg diffs
Tomas Zeman <tzeman@volny.cz>
parents:
diff changeset
    95
+ 
5385aee34169 upgrade-0.9.patch: split into pkg diffs
Tomas Zeman <tzeman@volny.cz>
parents:
diff changeset
    96
++#include <cstring>
5385aee34169 upgrade-0.9.patch: split into pkg diffs
Tomas Zeman <tzeman@volny.cz>
parents:
diff changeset
    97
++
5385aee34169 upgrade-0.9.patch: split into pkg diffs
Tomas Zeman <tzeman@volny.cz>
parents:
diff changeset
    98
+ using namespace ::std;
5385aee34169 upgrade-0.9.patch: split into pkg diffs
Tomas Zeman <tzeman@volny.cz>
parents:
diff changeset
    99
+ using namespace Binc;
5385aee34169 upgrade-0.9.patch: split into pkg diffs
Tomas Zeman <tzeman@volny.cz>
parents:
diff changeset
   100
+ 
5385aee34169 upgrade-0.9.patch: split into pkg diffs
Tomas Zeman <tzeman@volny.cz>
parents:
diff changeset
   101
+ //------------------------------------------------------------------------
5385aee34169 upgrade-0.9.patch: split into pkg diffs
Tomas Zeman <tzeman@volny.cz>
parents:
diff changeset
   102
+ Tools::Tools(void)