Merge branch '2.6' into 2.7

2010-07-24 21:26:58 +02:00 · 2010-07-24 21:26:58 +02:00 · 9f0f262e05
commit 9f0f262e05
parent cf1193a28e ebc5943f3c
9 changed files with 25 additions and 8 deletions
--- a/dovecot/.md5sum
+++ b/dovecot/.md5sum
@ -1,3 +1,3 @@
 7eaa958040fbd7169c86134439d4b632  dovecot
-cc8e5c53cd0943ce0b5e1087356ad4ea  dovecot-1.2.12.tar.gz
+aaee3b5fd59e01780305553248f686bc  dovecot-1.2.13.tar.gz
 874e21f6db1c6bef18269af16059ae7e  dovecot-config.patch
--- a/dovecot/Pkgfile
+++ b/dovecot/Pkgfile
@ -4,7 +4,7 @@
 # Depends on:  zlib bzip2 openssl

 name=dovecot
-version=1.2.12
+version=1.2.13
 release=1
 source=(http://dovecot.org/releases/1.2/$name-$version.tar.gz \
        dovecot-config.patch dovecot)
--- a/masqmail/.md5sum
+++ b/masqmail/.md5sum
@ -1,5 +1,5 @@
 3740a79250c65218a41e9591d3a20434  inet.route
 413f66f053693a10abc4c9c632fd0659  masqmail
-3e088c3721625c50c67476cf5f32b1a5  masqmail-0.2.27.tar.gz
+04ba5e62b8b3e44644b58c0ae7135d52  masqmail-0.2.28.tar.gz
 75ed683dec31e6712a4083b04e2e2a15  masqmail.alias
 1e617333b5268d7d2db9380418b60f3c  masqmail.conf
--- a/masqmail/Pkgfile
+++ b/masqmail/Pkgfile
@ -4,7 +4,7 @@
 # Depends on:  glib

 name=masqmail
-version=0.2.27
+version=0.2.28
 release=1
 source=(http://marmaro.de/prog/masqmail/files/$name-$version.tar.gz
        masqmail masqmail.conf masqmail.alias inet.route)
@ -16,6 +16,7 @@ build () {
                --mandir=/usr/man \
                --enable-auth \
                --enable-maildir \
+                --enable-ident \
                --with-user=mail \
                --with-group=mail
    make
--- a/sitecopy/.md5sum
+++ b/sitecopy/.md5sum
@ -1 +1,2 @@
+814282a82e98bd96bfe550759b39b982  sitecopy-0.16.6.patch
 b3aeb5a5f00af3db90b408e8c32a6c01  sitecopy-0.16.6.tar.gz
--- a/sitecopy/Pkgfile
+++ b/sitecopy/Pkgfile
@ -5,11 +5,14 @@

 name=sitecopy
 version=0.16.6
-release=1
-source=(http://www.manyfish.co.uk/sitecopy/$name-$version.tar.gz)
+release=2
+source=(http://www.manyfish.co.uk/sitecopy/$name-$version.tar.gz
+        $name-$version.patch)

 build () {
    cd $name-$version
+    patch -p1 -i $SRC/$name-$version.patch
+    autoconf
    ./configure --prefix=/usr \
                --mandir=/usr/man \
                --with-neon=/usr \
--- a/sitecopy/sitecopy-0.16.6.patch
+++ b/sitecopy/sitecopy-0.16.6.patch
@ -0,0 +1,12 @@
+diff -Nru sitecopy-0.16.6.orig/configure.in sitecopy-0.16.6/configure.in
+--- sitecopy-0.16.6.orig/configure.in	2010-07-23 21:56:43.027136877 +0200
+++ sitecopy-0.16.6/configure.in	2010-07-23 21:57:19.377136926 +0200
+@@ -113,7 +113,7 @@
+ fi
+ 
+ # Support neon 0.24 through 0.28
+-NE_REQUIRE_VERSIONS([0], [24 25 26 27 28])
+NE_REQUIRE_VERSIONS([0], [24 25 26 27 28 29])
+ 
+ dnl But we don't use zlib or ACL support
+ NEON_WITHOUT_ZLIB
--- a/sqlite3/.md5sum
+++ b/sqlite3/.md5sum
@ -1 +1 @@
-ed585bb3d4e5c643843ebb1e318644ce  sqlite-amalgamation-3.6.23.1.tar.gz
+61b85f108760f91b79afc7833e6e6cb4  sqlite-amalgamation-3.7.0.tar.gz
--- a/sqlite3/Pkgfile
+++ b/sqlite3/Pkgfile
@ -4,7 +4,7 @@
 # Depends on:  ncurses, readline

 name=sqlite3
-version=3.6.23.1
+version=3.7.0
 release=1

 source=(http://www.sqlite.org/sqlite-amalgamation-$version.tar.gz)